Index: gnu/usr.bin/perl/.editorconfig =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/.editorconfig,v diff -u -p -a -u -p -r1.1.1.1 .editorconfig --- gnu/usr.bin/perl/.editorconfig 15 Feb 2023 01:31:58 -0000 1.1.1.1 +++ gnu/usr.bin/perl/.editorconfig 16 Nov 2026 00:57:36 -0000 @@ -8,3 +8,12 @@ tab_width = 8 end_of_line = lf trim_trailing_whitespace = true insert_final_newline = true + +[**/*.xs] +charset = utf-8 +indent_style = space +indent_size = 4 +tab_width = 8 +end_of_line = lf +trim_trailing_whitespace = true +insert_final_newline = true Index: gnu/usr.bin/perl/AUTHORS =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/AUTHORS,v diff -u -p -a -u -p -r1.15 AUTHORS --- gnu/usr.bin/perl/AUTHORS 21 Sep 2026 18:20:27 -0000 1.15 +++ gnu/usr.bin/perl/AUTHORS 16 Nov 2026 00:57:36 -0000 @@ -19,7 +19,7 @@ # you wish to remove yourself. If you wish to register a new email # against one of these names you should update the .mailmap file # instead. --- +-- A. C. Yardley A. Sinan Unur Aaron B. Dossett @@ -74,6 +74,7 @@ Alexander Gernler Alexander Hartmaier Alexander Kanavin +Alexander Karelas Alexander Klimov Alexander Nikolov Alexander Smishlajev @@ -204,7 +205,6 @@ Brad Gilbert Brad Hughes Brad Lanam -Brad Smith Bradley Dean Bram Brandon Black @@ -276,6 +276,7 @@ Chris Lamb Chris Nandor Chris Pepper +Chris Prather Chris R. Donnelly Chris Travers Chris Tubutis @@ -350,6 +351,7 @@ Daniel Muiño Daniel Perrett Daniel S. Lewart +Daniel Tang Daniel Yacob danielnachun Danny R. Faught @@ -361,7 +363,7 @@ Darrell Schiebel Dave Bailey Dave Bianchi -Dave Cross +Dave Cross Dave Hartnoll Dave Lambley Dave Liney @@ -421,6 +423,7 @@ DH dLux Dmitri Tikhonov +Dmitrii Kuvaiskii Dmitry Karasik Dmitry Ulanov Dominic Dunlop @@ -472,7 +475,7 @@ Erik Eryq Etienne Grossman -Eugen Konkov +Eugen Konkov Eugene Alterman Eugene Alvin Villar Evan Miller @@ -598,6 +601,7 @@ Ian Phillipps Ignasi Roca Carrió Igor Sutton +Igor Todorovski Igor Zaytsev Ilmari Karonen Ilya Martynov @@ -630,7 +634,8 @@ James James Bence James Clarke -James E Keenan +James Cook +James E Keenan James FitzGibbon James Jurach James Mastros @@ -779,6 +784,7 @@ juna Justin Banks Justin Case +Jörg Thomas Jörg Walter Ka-Ping Yee kafka @@ -937,6 +943,7 @@ Marty Pauley Marvin Humphrey Masahiro Honma +Masahiro Iuchi Masahiro KAJIURA Mashrab Kuvatov Mathias Kende @@ -965,6 +972,7 @@ Mattia Barbon Max Baker Max Maischein +Maxim Vuets Maxwell Carey Merijn Broeren Michael A Chase @@ -1217,7 +1225,7 @@ Rob Napier Robert Millan Robert Partington -Robert Rothenberg +Robert Rothenberg Robert Sanders Robert Sebastian Gerus Robert Spier @@ -1242,6 +1250,7 @@ Russ Allbery Russell Fulton Russell Mosemann +Ryan Carsten Schmidt Ryan Herbert Ryan Voots Salvador Fandiño @@ -1252,6 +1261,7 @@ Sam Vilain Samuel Smith Samuel Thibault +Samuel Young Samuli Kärkkäinen Santtu Ojanperä Sascha Blank @@ -1307,8 +1317,10 @@ Solar Designer Spiros Denaxas Sreeji K Das +Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com> Stanislaw Pusep Stas Bekman +Stefan Adams Stefan Seifert Steffen Müller Steffen Schwigon Index: gnu/usr.bin/perl/Configure =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Configure,v diff -u -p -a -u -p -r1.62 Configure --- gnu/usr.bin/perl/Configure 21 Sep 2026 18:20:27 -0000 1.62 +++ gnu/usr.bin/perl/Configure 16 Nov 2026 00:57:36 -0000 @@ -519,6 +519,7 @@ d_gai_strerror='' d_Gconvert='' d_getaddrinfo='' d_getcwd='' +d_getentropy='' d_getenv_preserves_other_thread='' d_getespwnam='' d_getfsstat='' @@ -1052,6 +1053,7 @@ i_quadmath='' i_shadow='' i_socks='' i_stdbool='' +i_stdckdint='' i_stdint='' i_stdlib='' i_sunmath='' @@ -1070,6 +1072,7 @@ i_sysmount='' i_sysndir='' i_sysparam='' i_syspoll='' +i_sysrandom='' i_sysresrc='' i_syssecrt='' i_sysselct='' @@ -1110,6 +1113,7 @@ installprefix='' installprefixexp='' installstyle='' installusrbinperl='' +intmaxsize='' intsize='' longsize='' shortsize='' @@ -1363,7 +1367,6 @@ usedefaultstrict='' dtrace='' usedtrace='' usefaststdio='' -usegetexecpath='' usekernprocpathname='' ccflags_uselargefiles='' ldflags_uselargefiles='' @@ -5417,11 +5420,12 @@ echo " "; echo "Checking if your compiler accepts $flag" >&4; [ "X$sysroot" != "X" ] && echo "For sysroot = $sysroot"; echo "int main(void) { return 0; }" > gcctest.c; -if $cc $_sysroot -O2 $flag -o gcctest gcctest.c 2>gcctest.out && $run ./gcctest; then +if $cc $_sysroot -O2 $flag -o gcctest gcctest.c 2>gcctest_raw.out && $run ./gcctest; then echo "Yes, it does." >&4; + grep -v "when in C++ mode, this behavior is deprecated" gcctest_raw.out > gcctest.out; if $test -s gcctest.out ; then - echo "But your platform does not like it:"; - cat gcctest.out; + echo "But your platform does not like it:" >&4; + cat gcctest.out >&4; else case "$ccflags" in *$check*) @@ -5774,7 +5778,7 @@ y) ;; n) echo "OK, that should do.";; esac -$rm_try gcctest gcctest.out +$rm_try gcctest gcctest.out gcctest_raw.out : define a shorthand compile call compile=' @@ -5795,105 +5799,6 @@ $cc -o ${mc_file} $optimize $ccflags $ld : stub, used only to satisfy other units i_stdlib='define' -: check for lengths of integral types -echo " " -case "$intsize" in -'') - echo "Checking to see how big your integers are..." >&4 - $cat >try.c < -#$i_stdlib I_STDLIB -#ifdef I_STDLIB -#include -#endif -#include -int main() -{ - printf("intsize=%d;\n", (int)sizeof(int)); - printf("longsize=%d;\n", (int)sizeof(long)); - printf("shortsize=%d;\n", (int)sizeof(short)); - exit(0); -} -EOCP - set try - if eval $compile_ok && $run ./try > /dev/null; then - eval `$run ./try` - echo "Your integers are $intsize bytes long." - echo "Your long integers are $longsize bytes long." - echo "Your short integers are $shortsize bytes long." - else - $cat >&4 <&4 -echo 'int main() { long long x = 7; return 0; }' > try.c -set try -if eval $compile; then - val="$define" - echo "You have long long." -else - val="$undef" - echo "You do not have long long." -fi -$rm_try -set d_longlong -eval $setvar - -: check for length of long long -case "${d_longlong}${longlongsize}" in -$define) - echo " " - echo "Checking to see how big your long longs are..." >&4 - $cat >try.c <<'EOCP' -#include -int main() -{ - printf("%d\n", (int)sizeof(long long)); - return(0); -} -EOCP - set try - if eval $compile_ok; then - longlongsize=`$run ./try` - echo "Your long longs are $longlongsize bytes long." - else - dflt='8' - echo " " - echo "(I can't seem to compile the test program. Guessing...)" - rp="What is the size of a long long (in bytes)?" - . ./myread - longlongsize="$ans" - fi - if $test "X$longsize" = "X$longlongsize"; then - echo "(That isn't any different from an ordinary long.)" - fi - ;; -esac -$rm_try - : determine filename position in cpp output echo " " echo "Computing filename position in cpp output for #include directives..." >&4 @@ -6006,6 +5911,119 @@ do set $yyy; var=$2; eval "was=\$$2"; set $yyy; shift; shift; yyy=$@; done' +: stdint.h should be available, but this makes sure it gets in config.h +set stdint.h i_stdint +eval $inhdr + +: check for lengths of integral types +echo " " +case "$intsize" in +'') + echo "Checking to see how big your integers are..." >&4 + $cat >try.c < +#$i_stdlib I_STDLIB +#ifdef I_STDLIB +#include +#endif +#$i_stdint I_STDINT +#ifdef I_STDINT +#include +#endif +#include +int main() +{ + printf("intsize=%d;\n", (int)sizeof(int)); + printf("longsize=%d;\n", (int)sizeof(long)); + printf("shortsize=%d;\n", (int)sizeof(short)); + printf("intmaxsize=%d;\n", (int)sizeof(intmax_t)); + exit(0); +} +EOCP + set try + if eval $compile_ok && $run ./try > /dev/null; then + eval `$run ./try` + echo "Your integers are $intsize bytes long." + echo "Your long integers are $longsize bytes long." + echo "Your short integers are $shortsize bytes long." + echo "Your longest integers are $intmaxsize bytes long." + else + $cat >&4 <&4 +echo 'int main() { long long x = 7; return 0; }' > try.c +set try +if eval $compile; then + val="$define" + echo "You have long long." +else + val="$undef" + echo "You do not have long long." +fi +$rm_try +set d_longlong +eval $setvar + +: check for length of long long +case "${d_longlong}${longlongsize}" in +$define) + echo " " + echo "Checking to see how big your long longs are..." >&4 + $cat >try.c <<'EOCP' +#include +int main() +{ + printf("%d\n", (int)sizeof(long long)); + return(0); +} +EOCP + set try + if eval $compile_ok; then + longlongsize=`$run ./try` + echo "Your long longs are $longlongsize bytes long." + else + dflt='8' + echo " " + echo "(I can't seem to compile the test program. Guessing...)" + rp="What is the size of a long long (in bytes)?" + . ./myread + longlongsize="$ans" + fi + if $test "X$longsize" = "X$longlongsize"; then + echo "(That isn't any different from an ordinary long.)" + fi + ;; +esac +$rm_try + : see if inttypes.h is available : we want a real compile instead of Inhdr because some systems : have an inttypes.h which includes non-existent headers @@ -14388,6 +14406,10 @@ eval $inlibc set getcwd d_getcwd eval $inlibc +: see if getentropy exists +set getentropy d_getentropy +eval $inlibc + : check for getenv behavior case "$d_getenv_preserves_other_thread" in '') @@ -17503,16 +17525,16 @@ $rm_try esac esac +: Check the syntax of LC_ALL when categories are set to different locales case "$perl_lc_all_separator$perl_lc_all_category_positions_init" in "") -: Check the syntax of LC_ALL when categories are set to different locales -echo " " -$echo "Checking the syntax of LC_ALL when categories are set to different locales..." >&4 + echo " " + $echo "Checking the syntax of LC_ALL when categories are set to different locales..." >&4 -case $d_setlocale in - $define) -$rm -f try try.* -$cat >try.c <<'EOF' + case $d_setlocale in + $define) + $rm -f try try.* + $cat >try.c <<'EOF' #include #include #include @@ -17842,47 +17864,47 @@ main (const int argc, const char ** argv #endif EOF -set try -if eval $compile_ok; then - output=`$run ./try 2>/dev/null` - separator=`echo "$output" | $sed 1q` - case $separator in - "\"=;\"") - d_perl_lc_all_uses_name_value_pairs="$define" - d_perl_lc_all_separator="$undef" - perl_lc_all_separator= - d_perl_lc_all_category_positions_init="$undef" - perl_lc_all_category_positions_init= - ;; - "") d_perl_lc_all_uses_name_value_pairs="$undef" - d_perl_lc_all_separator="$undef" - perl_lc_all_separator= - d_perl_lc_all_category_positions_init="$undef" - perl_lc_all_category_positions_init= - ;; - *) d_perl_lc_all_uses_name_value_pairs="$undef" - d_perl_lc_all_separator="$define" - perl_lc_all_separator="$separator" - d_perl_lc_all_category_positions_init="$define" - perl_lc_all_category_positions_init=`echo "$output" | sed -n 2p` - ;; - esac -else - $echo "Failed to compile lc_all probe" >&4 -fi -$rm -f try try.* -;; -*) d_perl_lc_all_separator="$undef" - perl_lc_all_separator= - d_perl_lc_all_category_positions_init="$undef" - perl_lc_all_category_positions_init= - - # No setlocale(), but using this default allows our code to compile - # and run without having to have a bunch more #ifdef's - d_perl_lc_all_uses_name_value_pairs="$define" -;; -esac -;; + set try + if eval $compile_ok; then + output=`$run ./try 2>/dev/null` + separator=`echo "$output" | $sed 1q` + case $separator in + "\"=;\"") + d_perl_lc_all_uses_name_value_pairs="$define" + d_perl_lc_all_separator="$undef" + perl_lc_all_separator= + d_perl_lc_all_category_positions_init="$undef" + perl_lc_all_category_positions_init= + ;; + "") d_perl_lc_all_uses_name_value_pairs="$undef" + d_perl_lc_all_separator="$undef" + perl_lc_all_separator= + d_perl_lc_all_category_positions_init="$undef" + perl_lc_all_category_positions_init= + ;; + *) d_perl_lc_all_uses_name_value_pairs="$undef" + d_perl_lc_all_separator="$define" + perl_lc_all_separator="$separator" + d_perl_lc_all_category_positions_init="$define" + perl_lc_all_category_positions_init=`echo "$output" | sed -n 2p` + ;; + esac + else + $echo "Failed to compile lc_all probe" >&4 + fi + $rm -f try try.* + ;; + *) d_perl_lc_all_separator="$undef" + perl_lc_all_separator= + d_perl_lc_all_category_positions_init="$undef" + perl_lc_all_category_positions_init= + + # No setlocale(), but using this default allows our code to + # compile and run without having to have a bunch more #ifdef's + d_perl_lc_all_uses_name_value_pairs="$define" + ;; + esac # case on $d_setlocale + ;; *) # Has an lc_all definition passed-in case "$perl_lc_all_separator" in @@ -23561,44 +23583,6 @@ esac set usedefaultstrict eval $setvar -: Determine if we can use getexecpath to find executing program -echo " " -echo "Determining whether we can use getexecpath to find executing program..." >&4 -$cat >try.c <<'EOM' - -#include -#include - -int -main(int argc, char **argv) { - char buf[MAXPATHLEN]; - - if (getexecpath(buf, sizeof(buf)) != 0) - return 2; - - return 0; -} -EOM - -val=$undef -set try -if eval $compile; then - if $run ./try; then - echo "You can use getexecpath to find the executing program." >&4 - val="$define" - else - echo "Nope, getexecpath doesn't work here." >&4 - val="$undef" - fi -else - echo "I'm unable to compile the test program." >&4 - echo "I'll assume no getexecpath here." >&4 - val="$undef" -fi -$rm_try -set usegetexecpath -eval $setvar - : Determine if we can use sysctl with KERN_PROC_PATHNAME to find executing program echo " " echo "Determining whether we can use sysctl with KERN_PROC_PATHNAME to find executing program..." >&4 @@ -24303,9 +24287,42 @@ $rm_try set i_stdbool eval $setvar -: see if stdint is available -set stdint.h i_stdint -eval $inhdr +: see if C23 stdckdint is available +: we want a real compile instead of Inhdr because some FreeBSD systems +: have stdckdint.h, but it is not compatible with C++. +case "$i_stdckdint" in +'') + echo " " + $cat >try.c < +#include +int func(long *resultptr, long a, long b) +{ + return (ckd_add(resultptr, a, b) || + ckd_sub(resultptr, a, b) || + ckd_mul(resultptr, a, b)) ? 1 : 0; +} +int main(int argc, char **argv) +{ + long result; + return func(&result, 42L, 53L); +} +EOCP + set try + if eval $compile; then + echo " found." >&4 + val="$define" + else + echo " NOT found." >&4 + val="$undef" + fi ;; +*) + val="$i_stdckdint" ;; +esac + +$rm_try +set i_stdckdint +eval $setvar : see if sys/access.h is available set sys/access.h i_sysaccess @@ -24364,6 +24381,10 @@ eval $inhdr set sys/poll.h i_syspoll eval $inhdr +: see if this is a sys/random.h system +set sys/random.h i_sysrandom +eval $inhdr + : see if sys/resource.h has to be included set sys/resource.h i_sysresrc eval $inhdr @@ -25167,6 +25188,7 @@ d_gdbm_ndbm_h_uses_prototypes='$d_gdbm_n d_gdbmndbm_h_uses_prototypes='$d_gdbmndbm_h_uses_prototypes' d_getaddrinfo='$d_getaddrinfo' d_getcwd='$d_getcwd' +d_getentropy='$d_getentropy' d_getenv_preserves_other_thread='$d_getenv_preserves_other_thread' d_getespwnam='$d_getespwnam' d_getfsstat='$d_getfsstat' @@ -25716,6 +25738,7 @@ i_sgtty='$i_sgtty' i_shadow='$i_shadow' i_socks='$i_socks' i_stdbool='$i_stdbool' +i_stdckdint='$i_stdckdint' i_stdint='$i_stdint' i_stdlib='$i_stdlib' i_sunmath='$i_sunmath' @@ -25732,6 +25755,7 @@ i_sysmount='$i_sysmount' i_sysndir='$i_sysndir' i_sysparam='$i_sysparam' i_syspoll='$i_syspoll' +i_sysrandom='$i_sysrandom' i_sysresrc='$i_sysresrc' i_syssecrt='$i_syssecrt' i_sysselct='$i_sysselct' @@ -25794,6 +25818,7 @@ installvendorlib='$installvendorlib' installvendorman1dir='$installvendorman1dir' installvendorman3dir='$installvendorman3dir' installvendorscript='$installvendorscript' +intmaxsize='$intmaxsize' intsize='$intsize' issymlink='$issymlink' ivdformat='$ivdformat' @@ -26085,7 +26110,6 @@ usedevel='$usedevel' usedl='$usedl' usedtrace='$usedtrace' usefaststdio='$usefaststdio' -usegetexecpath='$usegetexecpath' useithreads='$useithreads' usekernprocpathname='$usekernprocpathname' uselanginfo='$uselanginfo' Index: gnu/usr.bin/perl/EXTERN.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/EXTERN.h,v diff -u -p -a -u -p -r1.15 EXTERN.h --- gnu/usr.bin/perl/EXTERN.h 14 May 2024 19:38:53 -0000 1.15 +++ gnu/usr.bin/perl/EXTERN.h 16 Nov 2026 00:57:36 -0000 @@ -8,13 +8,8 @@ * */ -/* - * EXT: designates a global var which is defined in perl.h - * - * dEXT: designates a global var which is defined in another - * file, so we can't count on finding it in perl.h - * (this practice should be avoided). - */ +/* These are documented in INTERN.h */ + #undef EXT #undef dEXT #undef EXTCONST Index: gnu/usr.bin/perl/INSTALL =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/INSTALL,v diff -u -p -a -u -p -r1.35 INSTALL --- gnu/usr.bin/perl/INSTALL 19 Aug 2026 00:19:00 -0000 1.35 +++ gnu/usr.bin/perl/INSTALL 16 Nov 2026 00:57:36 -0000 @@ -17,16 +17,16 @@ subreleases (like 5.40.x and 5.42.x) are odd-numbered subreleases (like 5.41.x and 5.43.x) are unstable development releases. Development releases should not be used in production environments. Fixes and new features are first carefully -tested in development releases and only if they prove themselves to be +tested in development releases, and only if they prove themselves to be worthy will they be migrated to the maintenance releases. The basic steps to build and install perl 5 on a Unix system with all the defaults are to run, from a freshly unpacked source tree: - sh Configure -de - make - make test - make install + sh Configure -de + make + make test + make install Each of these is explained in further detail below. @@ -53,19 +53,48 @@ L<"Reporting Problems"> below. For information on what's new in this release, see the F file. For more information about how to find more -specific detail about changes, see the Changes file. +specific detail about changes, see the F file. -=head1 DESCRIPTION +=begin comment + +=head1 FORMAT OF THIS DOCUMENT This document is written in pod format as an easy way to indicate its -structure. The pod format is described in F, but you can -read it as is with any pager or editor. Headings and items are marked -by lines beginning with '='. The other mark-up used is - - B embolden text, used for switches, programs or commands - C literal code - L A link (cross reference) to name +structure. On many systems, you can just type + + perldoc INSTALL + +and get a nicely formatted version. But if not, you can read it as is with any +pager or editor. If you are doing that, here are a few hints. Lines that have +an "=" in column 1 are commands to perldoc. You've already seen lines like + + =head1 NAME + +This makes a top level heading containing the word "NAME". "=head2" would make +a secondary-level heading, and so forth. Other commands are + + =over increase indentation + =back decrease indentation + =item introduces an item in a list + =for ignore these lines; they are directives to help various + tools, such as creating documentation cross referencing + =begin comment ignore this line + =end comment ignore this line + +The styling of text is changed by these in-line mark-up commands + + B embolden "text", used for switches, programs or commands + C literal code + L A link (cross reference) to name; you may have to squint + hard to make out the name from other stuff F A filename + S "text" is output all on the same line + +More detail on pod format is given in F. + +=end comment + +=head1 DESCRIPTION Although most of the defaults are probably fine for most users, you should probably at least skim through this document before @@ -92,10 +121,10 @@ to F for more detaile =head3 Compatibility with earlier versions -B This version is not binary compatible with versions of Perl -earlier than 5.42.0. If you have built extensions (i.e. modules that -include C code) using an earlier version of Perl, you will need to -rebuild and reinstall those extensions. +B This version is not binary compatible with earlier versions +of Perl. If you have built extensions (i.e. modules that include C code) +using an earlier version of Perl, you will need to rebuild and reinstall +those extensions. Pure perl modules without XS or C code should continue to work fine without reinstallation. See the discussion below on @@ -162,20 +191,20 @@ almost always okay. It is normal for so since Configure often searches for many different ways of performing the same function. -At any Configure prompt, you can type &-d and Configure will use the +At any Configure prompt, you can type C<&-d> and Configure will use the defaults from then on. After it runs, Configure will perform variable substitution on all the -*.SH files and offer to run make depend. +*.SH files and offer to run S>. -The results of a Configure run are stored in the config.sh and Policy.sh +The results of a Configure run are stored in the F and F files. =head2 Common Configure options Configure supports a number of useful options. Run - Configure -h + Configure -h to get a listing. @@ -211,7 +240,7 @@ Configure variables you can set and thei To compile with gcc, if it's not the default compiler on your system, you should run - sh Configure -Dcc=gcc + sh Configure -Dcc=gcc This is the preferred way to specify gcc (or any another alternative compiler) so that the hints files can set appropriate defaults. @@ -227,7 +256,7 @@ You can specify a different 'prefix' for directory when Configure prompts you, or by using the Configure command line option C<-Dprefix='/some/directory'>, e.g. - sh Configure -Dprefix=/opt/perl + sh Configure -Dprefix=/opt/perl If your prefix contains the string "perl", then the suggested directory structure is simplified. For example, if you use @@ -250,7 +279,7 @@ vendor unless you are sure you know what on replacing your vendor's perl, useful information on how it was configured may be found with - perl -V:config_args + perl -V:config_args (Check the output carefully, however, since this doesn't preserve spaces in arguments to Configure. For that, you have to look carefully @@ -259,7 +288,7 @@ at config_arg1, config_arg2, etc.) By default, Configure will not try to link F to the current version of perl. You can turn on that behavior by running - Configure -Dinstallusrbinperl + Configure -Dinstallusrbinperl or by answering 'yes' to the appropriate Configure prompt. @@ -271,9 +300,10 @@ obvious and convenient place. =item Building a development release For development releases (odd subreleases, like 5.9.x) if you want to -use Configure -d, you will also need to supply -Dusedevel to Configure, +use S>, you will also need to supply C<-Dusedevel> to +Configure, because the default answer to the question "do you really want to -Configure a development version?" is "no". The -Dusedevel skips that +Configure a development version?" is "no". The C<-Dusedevel> skips that sanity check. =back @@ -281,27 +311,27 @@ sanity check. If you are willing to accept all the defaults, and you want terse output, you can run - sh Configure -des + sh Configure -des =head2 Altering Configure variables for C compiler switches etc. For most users, most of the Configure defaults are fine, or can easily be set on the Configure command line. However, if Configure doesn't have an option to do what you want, you can change Configure variables -after the platform hints have been run by using Configure's -A switch. +after the platform hints have been run by using Configure's C<-A> switch. For example, here's how to add a couple of extra flags to C compiler invocations: - sh Configure -Accflags="-DPERL_EXTERNAL_GLOB -DNO_HASH_SEED" + sh Configure -Accflags="-DPERL_EXTERNAL_GLOB -DNO_HASH_SEED" To clarify, those ccflags values are not Configure options; if passed to Configure directly, they won't do anything useful (they will define a -variable in config.sh, but without taking any action based upon it). +variable in F, but without taking any action based upon it). But when passed to the compiler, those flags will activate #ifdefd code. For more help on Configure switches, run - sh Configure -h + sh Configure -h =head2 Major Configure-time Build Options @@ -315,7 +345,7 @@ some of the main things you can change. On some platforms, perl can be compiled with support for threads. To enable this, run - sh Configure -Dusethreads + sh Configure -Dusethreads The default is to compile without thread support. C<-Duseithreads> is currently synonymous with C<-Dusethreads>. @@ -336,7 +366,8 @@ This buffer starts small, but it will ke fits. To get a fixed upper limit, you should compile Perl with PERL_REENTRANT_MAXSIZE defined to be the number of bytes you want. One way to do this is to run Configure with -C<-Accflags=-DPERL_REENTRANT_MAXSIZE=65536>. + + -Accflags=-DPERL_REENTRANT_MAXSIZE=65536 =head3 Large file support @@ -345,7 +376,7 @@ Since Perl 5.6.0, Perl has supported lar support is on by default. This is both good and bad. It is good in that you can use large files, -seek(), stat(), and -s them. It is bad in that if you are interfacing +seek(), stat(), and C<-s> them. It is bad in that if you are interfacing Perl using some extension, the components you are connecting to must also be large file aware: if Perl thinks files can be large but the other parts of the software puzzle do not understand the concept, bad things @@ -367,8 +398,8 @@ them with compiler flags and/or C> and the second one using S>. The difference is that the first one is minimal and the second one maximal. The first works in more places than the second. The C option does only as much as is required to get @@ -381,22 +412,22 @@ you will be able to have 64 bit-wide sca The C option goes all the way by attempting to switch integers (if it can), longs (and pointers) to being 64-bit. This may -create an even more binary incompatible Perl than -Duse64bitint: the +create an even more binary incompatible Perl than C<-Duse64bitint>: the resulting executable may not run at all in a 32-bit box, or you may have to reboot/reconfigure/rebuild your operating system to be 64-bit aware. -Natively 64-bit systems need neither -Duse64bitint nor -Duse64bitall. +Natively 64-bit systems need neither C<-Duse64bitint> nor C<-Duse64bitall>. On these systems, it might be the default compilation mode, and there is currently no guarantee that passing no use64bitall option to the -Configure process will build a 32bit perl. Implementing -Duse32bit* +Configure process will build a 32bit perl. Implementing C<-Duse32bit*> options is planned for a future release of perl. =head3 Long doubles In some systems you may be able to use long doubles to enhance the range and precision of your double precision floating point numbers -(that is, Perl's numbers). Use Configure -Duselongdouble to enable +(that is, Perl's numbers). Use S> to enable this support (if it is available). Note that the exact format and range of long doubles varies: @@ -405,7 +436,7 @@ but there are others, with different man =head3 "more bits" -You can "Configure -Dusemorebits" to turn on both the 64-bit support +You can S> to turn on both the 64-bit support and the long double support. =head3 quadmath @@ -416,7 +447,7 @@ called quadmath, which implements the IE works at least on x86 and ia64 platforms. It may be part of your gcc installation, or you may need to install it separately. -With "Configure -Dusequadmath" you can try enabling its use, but note +With S> you can try enabling its use, but note the compiler dependency, you may need to also add "-Dcc=...". At C level the type is called C<__float128> (note, not "long double"), but Perl source knows it as NV. (This is not "long doubles".) @@ -481,6 +512,10 @@ to be, with the one believed to be most PERL_HASH_FUNC_SIPHASH13 PERL_HASH_FUNC_ZAPHOD32 +=for apidoc Amnh;||PERL_HASH_FUNC_SIPHASH +=for apidoc_item ||PERL_HASH_FUNC_SIPHASH13 +=for apidoc_item ||PERL_HASH_FUNC_ZAPHOD32 + In addition, these, (or custom hash functions), may be "fronted" by the SBOX32 hash function for keys under a chosen size. This hash function is special in that it has proven theoretical security properties, and is very @@ -497,6 +532,8 @@ with something like this -Accflags='-DPERL_HASH_USE_SBOX32_ALSO=0' +=for apidoc Amnh||PERL_HASH_USE_SBOX32_ALSO + or alternatively you can use the simple define C like this: -Accflags='-DPERL_HASH_NO_SBOX32' @@ -508,6 +545,8 @@ this: -Accflags='-DSBOX_MAX_LEN=128' +=for apidoc Amn|U32|SBOX32_MAX_LEN + As of Perl 5.18 the order returned by keys(), values(), and each() is non-deterministic and distinct per hash, and the insert order for colliding keys is randomized as well, and perl allows for controlling this @@ -526,6 +565,10 @@ or -Accflags='-DPERL_PERTURB_KEYS_DETERMINISTIC' +=for apidoc Amnh;||PERL_PERTURB_KEYS_DETERMINISTIC +=for apidoc_item ||PERL_PERTURB_KEYS_DISABLED +=for apidoc_item ||PERL_PERTURB_KEYS_RANDOM + Since Perl 5.18 the seed used for the hash function is randomly selected at process start, which can be overridden by specifying a seed by setting the PERL_HASH_SEED environment variable. Be aware that @@ -544,7 +587,9 @@ seed with the define C by -Accflags='-DNO_HASH_SEED' -Note that if you do this you should modify the code in hv_func.h to specify +=for apidoc Amnh||NO_HASH_SEED + +Note that if you do this you should modify the code in F to specify your own key. In the future this define may be renamed and replaced with one that requires you to specify the key to use. @@ -581,6 +626,8 @@ settings. =item PERL_MAX_NESTED_EVAL_BEGIN_BLOCKS_DEFAULT +=for apidoc Amnh||PERL_MAX_NESTED_EVAL_BEGIN_BLOCKS_DEFAULT + This define is used to control the default maximum number of nested eval/BEGIN statements, and in this context require should be understood to be a special form of eval so this means require/BEGIN @@ -607,7 +654,7 @@ C<${^MAX_NESTED_EVAL_BEGIN_BLOCKS}> inst Perl can be configured to be 'socksified', that is, to use the SOCKS TCP/IP proxy protocol library. SOCKS is used to give applications access to transport layer network proxies. Perl supports only SOCKS -Version 5. The corresponding Configure option is -Dusesocks. +Version 5. The corresponding Configure option is C<-Dusesocks>. You can find more about SOCKS from wikipedia at L. @@ -616,59 +663,59 @@ L. By default, Configure will compile perl to use dynamic loading. If you want to force perl to be compiled completely statically, you can either choose this when Configure prompts you or -you can use the Configure command line option -Uusedl. +you can use the Configure command line option C<-Uusedl>. With this option, you won't be able to use any new extension (XS) module without recompiling perl itself. =head3 Building a shared Perl library Currently, for most systems, the main perl executable is built by -linking the "perl library" libperl.a with perlmain.o, your static -extensions, and various extra libraries, such as -lm. +linking the "perl library" F with F, your static +extensions, and various extra libraries, such as C<-lm>. On systems that support dynamic loading, it may be possible to -replace libperl.a with a shared libperl.so. If you anticipate building +replace F with a shared F. If you anticipate building several different perl binaries (e.g. by embedding libperl into different programs, or by using the optional compiler extension), then -you might wish to build a shared libperl.so so that all your binaries +you might wish to build a shared F so that all your binaries can share the same library. The disadvantages are that there may be a significant performance -penalty associated with the shared libperl.so, and that the overall +penalty associated with the shared F, and that the overall mechanism is still rather fragile with respect to different versions and upgrades. In terms of performance, on my test system (Solaris 2.5_x86) the perl -test suite took roughly 15% longer to run with the shared libperl.so. +test suite took roughly 15% longer to run with the shared F. Your system and typical applications may well give quite different results. The default name for the shared library is typically something like -libperl.so.5.8.8 (for Perl 5.8.8), or libperl.so.588, or simply -libperl.so. Configure tries to guess a sensible naming convention +F (for Perl 5.8.8), or F, or simply +F. Configure tries to guess a sensible naming convention based on your C library name. Since the library gets installed in a version-specific architecture-dependent directory, the exact name isn't very important anyway, as long as your linker is happy. You can elect to build a shared libperl by - sh Configure -Duseshrplib + sh Configure -Duseshrplib To build a shared libperl, the environment variable controlling shared library search (LD_LIBRARY_PATH in most systems, DYLD_LIBRARY_PATH for Darwin, LD_LIBRARY_PATH/SHLIB_PATH for HP-UX, LIBPATH for AIX and z/OS, PATH for Cygwin) must be set up to include the Perl build directory because that's where the shared libperl will -be created. Configure arranges makefile to have the correct shared +be created. Configure arranges F to have the correct shared library search settings. You can find the name of the environment variable Perl thinks works in your your system by - grep ldlibpthname config.sh + grep ldlibpthname config.sh However, there are some special cases where manually setting the shared library path might be required. For example, if you want to run something like the following with the newly-built but not-yet-installed -./perl: +F<./perl>: ./perl -I. -MTestInit t/misc/failing_test.t @@ -686,23 +733,23 @@ for Bourne-style shells, or setenv LD_LIBRARY_PATH `pwd` for Csh-style shells. (This procedure may also be needed if for some -unexpected reason Configure fails to set up makefile correctly.) (And +unexpected reason Configure fails to set up F correctly.) (And again, it may be something other than LD_LIBRARY_PATH for you, see above.) You can often recognize failures to build/use a shared libperl from error -messages complaining about a missing libperl.so (or libperl.sl in HP-UX), +messages complaining about a missing F (or F in HP-UX), for example: - 18126:./miniperl: /sbin/loader: Fatal Error: cannot map libperl.so + 18126:./miniperl: /sbin/loader: Fatal Error: cannot map F There is also a potential problem with the shared perl library if you want to have more than one "flavor" of the same version of perl (e.g. -with and without -DDEBUGGING). For example, suppose you build and +with and without C<-DDEBUGGING>). For example, suppose you build and install a standard Perl 5.10.0 with a shared library. Then, suppose you -try to build Perl 5.10.0 with -DDEBUGGING enabled, but everything else +try to build Perl 5.10.0 with C<-DDEBUGGING> enabled, but everything else the same, including all the installation directories. How can you ensure that your newly built perl will link with your newly built -libperl.so.8 rather with the installed libperl.so.8? The answer is +F rather with the installed F? The answer is that you might not be able to. The installation directory is encoded in the perl binary with the LD_RUN_PATH environment variable (or equivalent ld command-line option). On Solaris, you can override that @@ -716,8 +763,8 @@ with a shared library if $archlib/CORE/$ previous build. A good workaround is to specify a different directory for the -architecture-dependent library for your -DDEBUGGING version of perl. -You can do this by changing all the *archlib* variables in config.sh to +architecture-dependent library for your C<-DDEBUGGING> version of perl. +You can do this by changing all the *archlib* variables in F to point to your new architecture-dependent library. =head3 External glob @@ -735,7 +782,7 @@ slashes on directory names. At any poin you can answer a question with &-d and Configure will use the defaults from then on. Alternatively, you can - grep '^install' config.sh + grep '^install' config.sh after Configure has run to verify the installation paths. @@ -751,27 +798,27 @@ The directories set up by Configure fall =item Directories for the perl distribution -By default, Configure will use the following directories for 5.42.3. +By default, Configure will use the following directories for 5.44.0. $version is the full perl version number, including subversion, e.g. 5.12.3, and $archname is a string like sun4-sunos, determined by Configure. The full definitions of all Configure variables are in the file Porting/Glossary. - Configure variable Default value - $prefixexp /usr/local - $binexp $prefixexp/bin - $scriptdirexp $prefixexp/bin - $privlibexp $prefixexp/lib/perl5/$version - $archlibexp $prefixexp/lib/perl5/$version/$archname - $man1direxp $prefixexp/man/man1 - $man3direxp $prefixexp/man/man3 - $html1direxp (none) - $html3direxp (none) + Configure variable Default value + $prefixexp /usr/local + $binexp $prefixexp/bin + $scriptdirexp $prefixexp/bin + $privlibexp $prefixexp/lib/perl5/$version + $archlibexp $prefixexp/lib/perl5/$version/$archname + $man1direxp $prefixexp/man/man1 + $man3direxp $prefixexp/man/man3 + $html1direxp (none) + $html3direxp (none) $prefixexp is generated from $prefix, with ~ expansion done to convert home directories into absolute paths. Similarly for the other variables listed. As file system calls do not do this, you should always reference -the ...exp variables, to support users who build perl in their home +the C<...exp> variables, to support users who build perl in their home directory. Actually, Configure recognizes the SVR3-style @@ -884,10 +931,12 @@ version-specific subdirectories) for add For example, if you have a bundle of perl libraries from a previous installation, perhaps in a strange place: - sh Configure -Dotherlibdirs=/usr/lib/perl5/site_perl/5.8.1 + sh Configure -Dotherlibdirs=/usr/lib/perl5/site_perl/5.8.1 =item APPLLIB_EXP +=for apidoc Amnh||APPLLIB_EXP + There is one other way of adding paths to @INC at perl build time, and that is by setting the APPLLIB_EXP C pre-processor token to a colon- separated list of directories, like this @@ -901,14 +950,14 @@ touching the perl distribution proper. version and architecture specific subdirectories are also searched, if present, at run time. Of course, you can still search other @INC directories ahead of those in APPLLIB_EXP by using any of the standard -run-time methods: $PERLLIB, $PERL5LIB, -I, use lib, etc. +run-time methods: C<$PERLLIB>, C<$PERL5LIB>, -I, use lib, etc. =item default_inc_excludes_dot Since version 5.26.0, default perl builds no longer includes C<'.'> as the last element of @INC. The old behaviour can restored using - sh Configure -Udefault_inc_excludes_dot + sh Configure -Udefault_inc_excludes_dot Note that this is likely to make programs run under such a perl interpreter less secure. @@ -917,7 +966,7 @@ interpreter less secure. Run-time customization of @INC can be enabled with: - sh Configure -Dusesitecustomize + sh Configure -Dusesitecustomize which will define USE_SITECUSTOMIZE and $Config{usesitecustomize}. When enabled, this makes perl run F<$sitelibexp/sitecustomize.pl> before @@ -928,13 +977,13 @@ entries to @INC. By default, man pages will be installed in $man1dir and $man3dir, which are normally /usr/local/man/man1 and /usr/local/man/man3. If you -want to use a .3pm suffix for perl man pages, you can do that with +want to use a C<.3pm> suffix for perl man pages, you can do that with - sh Configure -Dman3ext=3pm + sh Configure -Dman3ext=3pm You can disable installation of man pages completely using - sh Configure -Dman1dir=none -Dman3dir=none + sh Configure -Dman1dir=none -Dman3dir=none =item HTML pages @@ -966,11 +1015,11 @@ suggesting $prefix/lib/perl5/, Configure Thus, for example, if you Configure with -Dprefix=/opt/perl, then the default library directories for 5.9.0 are - Configure variable Default value - $privlib /opt/perl/lib/5.9.0 - $archlib /opt/perl/lib/5.9.0/$archname - $sitelib /opt/perl/lib/site_perl/5.9.0 - $sitearch /opt/perl/lib/site_perl/5.9.0/$archname + Configure variable Default value + $privlib /opt/perl/lib/5.9.0 + $archlib /opt/perl/lib/5.9.0/$archname + $sitelib /opt/perl/lib/site_perl/5.9.0 + $sitearch /opt/perl/lib/site_perl/5.9.0/$archname =head2 Changing the installation directory @@ -1005,7 +1054,7 @@ If you need to install perl on many iden to compile it once and create an archive that can be installed on multiple systems. Suppose, for example, that you want to create an archive that can be installed in /opt/perl. One way to do that is by -using the DESTDIR variable during C. The DESTDIR is +using the C variable during C. The DESTDIR is automatically prepended to all the installation paths. Thus you simply do: @@ -1035,15 +1084,15 @@ install is done to the original configur This option is not compatible with the building of a shared libperl ("-Duseshrplib"), because in that case perl is linked with an hard-coded -rpath that points at the libperl.so, that cannot be relocated. +rpath that points at the F, that cannot be relocated. =head2 Site-wide Policy settings After Configure runs, it stores a number of common site-wide "policy" -answers (such as installation directories) in the Policy.sh file. +answers (such as installation directories) in the F file. If you want to build perl on another system using the same policy -defaults, simply copy the Policy.sh file to the new system's perl build -directory, and Configure will use it. This will work even if Policy.sh was +defaults, simply copy the F file to the new system's perl build +directory, and Configure will use it. This will work even if F was generated for another version of Perl, or on a system with a different architecture and/or operating system. However, in such cases, you should review the contents of the file before using it: for @@ -1053,13 +1102,13 @@ as the system on which the file was gene Alternatively, if you wish to change some or all of those policy answers, you should - rm -f Policy.sh + rm -f Policy.sh to ensure that Configure doesn't re-use them. -Further information is in the Policy_sh.SH file itself. +Further information is in the F file itself. -If the generated Policy.sh file is unsuitable, you may freely edit it +If the generated F file is unsuitable, you may freely edit it to contain any valid shell commands. It will be run just after the platform-specific hints files. @@ -1084,7 +1133,7 @@ directories separately, eg. sh Configure -Dinc_version_list="5.16.0/x86_64-linux 5.16.0" ... When using the newer perl, you can add these paths again in the -PERL5LIB environment variable or with perl's -I runtime option. +C environment variable or with perl's -I runtime option. =head2 Building Perl outside of the source directory @@ -1094,17 +1143,17 @@ read-only, or if you want to share the s architectures. You can do this (if your file system supports symbolic links) by - mkdir /tmp/perl/build/directory - cd /tmp/perl/build/directory - sh /path/to/perl/source/Configure -Dmksymlinks ... + mkdir /tmp/perl/build/directory + cd /tmp/perl/build/directory + sh /path/to/perl/source/Configure -Dmksymlinks ... This will create in /tmp/perl/build/directory a tree of symbolic links pointing to files in /path/to/perl/source. The original files are left unaffected. After Configure has finished you can just say - make - make test - make install + make + make test + make install as usual, and Perl will be built in /tmp/perl/build/directory. @@ -1113,20 +1162,20 @@ as usual, and Perl will be built in /tmp You can run perl scripts under the perl debugger at any time with B. If, however, you want to debug perl itself, you probably want to have support for perl internal debugging code -(activated by adding -DDEBUGGING to ccflags), and/or support for the -system debugger by adding -g to the optimisation flags. +(activated by adding C<-DDEBUGGING> to ccflags), and/or support for the +system debugger by adding C<-g> to the optimisation flags. A perl compiled with the DEBUGGING C preprocessor macro will support the C<-D> perl command-line switch, have assertions enabled, and have many extra checks compiled into the code; but will execute much more slowly (typically 2-3x) and the binary will be much larger (typically 2-3x). -As a convenience, debugging code (-DDEBUGGING) and debugging symbols (-g) +As a convenience, debugging code (C<-DDEBUGGING>) and debugging symbols (-g) can be enabled jointly or separately using a Configure switch, also -(somewhat confusingly) named -DDEBUGGING. For a more eye appealing call, --DEBUGGING is defined to be an alias for -DDEBUGGING. For both, the -U +(somewhat confusingly) named C<-DDEBUGGING>. For a more eye appealing call, +-DEBUGGING is defined to be an alias for C<-DDEBUGGING>. For both, the -U calls are also supported, in order to be able to overrule the hints or -Policy.sh settings. +F settings. Here are the DEBUGGING modes: @@ -1138,38 +1187,38 @@ Here are the DEBUGGING modes: =item Configure -DEBUGGING=both -Sets both -DDEBUGGING in the ccflags, and adds -g to optimize. +Sets both C<-DDEBUGGING> in the ccflags, and adds C<-g> to optimize. -You can actually specify -g and -DDEBUGGING independently (see below), +You can actually specify C<-g> and C<-DDEBUGGING> independently (see below), but usually it's convenient to have both. =item Configure -DEBUGGING=-g =item Configure -Doptimize=-g -Adds -g to optimize, but does not set -DDEBUGGING. +Adds C<-g> to optimize, but does not set C<-DDEBUGGING>. -(Note: Your system may actually require something like cc -g2. +(Note: Your system may actually require something like S>. Check your man pages for cc(1) and also any hint file for your system.) =item Configure -DEBUGGING=none =item Configure -UDEBUGGING -Removes -g from optimize, and -DDEBUGGING from ccflags. +Removes C<-g> from optimize, and C<-DDEBUGGING> from ccflags. =back If you are using a shared libperl, see the warnings about multiple versions of perl under L. -Note that a perl built with -DDEBUGGING will be much bigger and will run +Note that a perl built with C<-DDEBUGGING> will be much bigger and will run much, much more slowly than a standard perl. =head2 DTrace support On platforms where DTrace is available, it may be enabled by -using the -Dusedtrace option to Configure. DTrace probes are available +using the C<-Dusedtrace> option to Configure. DTrace probes are available for subroutine entry (sub-entry) and subroutine exit (sub-exit). Here's a simple D script that uses them: @@ -1189,7 +1238,7 @@ to be supported. For example, Configure only if it is able to find the gdbm library. To disable certain extensions so that they are not built, use the --Dnoextensions=... and -Donlyextensions=... options. They both accept +C<-Dnoextensions=>... and C<-Donlyextensions=>... options. They both accept a space-separated list of extensions, such as C. The extensions listed in C are removed from the list of extensions to build, while @@ -1210,11 +1259,11 @@ has been installed. However, if you wis extensions statically linked into the perl binary, then this offers a convenient way to do that in one step. (It is not necessary, however; you can build and install extensions just fine even if you don't have -dynamic loading. See lib/ExtUtils/MakeMaker.pm for more details.) +dynamic loading. See F for more details.) Another way of specifying extra modules is described in L<"Adding extra modules to the build"> below. -If you re-use an old config.sh but change your system (e.g. by +If you re-use an old F but change your system (e.g. by adding libgdbm) Configure will still offer your old choices of extensions for the default answer, but it will also point out the discrepancy to you. @@ -1229,10 +1278,10 @@ to be specified explicitly (see LI option when prompted by Configure. If your libraries are not in a directory normally searched by your C compiler and linker, then you will -need to include the appropriate -L/your/directory option when prompted +need to include the appropriate C<-L/>I option when prompted by Configure. See the examples below. =head3 Examples @@ -1242,15 +1291,15 @@ by Configure. See the examples below. =item gdbm in /usr/local Suppose you have gdbm and want Configure to find it and build the -GDBM_File extension. This example assumes you have gdbm.h -installed in /usr/local/include/gdbm.h and libgdbm.a installed in -/usr/local/lib/libgdbm.a. Configure should figure all the +GDBM_File extension. This example assumes you have F +installed in F and F installed in +F. Configure should figure all the necessary steps out automatically. Specifically, when Configure prompts you for flags for -your C compiler, you should include -I/usr/local/include, if it's +your C compiler, you should include C<-I/usr/local/include>, if it's not here yet. Similarly, when Configure prompts you for linker flags, -you should include -L/usr/local/lib. +you should include C<-L/usr/local/lib>. If you are using dynamic loading, then when Configure prompts you for linker flags for dynamic loading, you should again include @@ -1264,11 +1313,11 @@ you have gdbm installed in any of (/usr/ The version of BerkeleyDB distributed by Oracle installs in a version-specific directory by default, typically something like -/usr/local/BerkeleyDB.4.7. To have Configure find that, you need to add --I/usr/local/BerkeleyDB.4.7/include to cc flags, as in the previous +F. To have Configure find that, you need to add +C<-I/usr/local/BerkeleyDB.4.7/include> to cc flags, as in the previous example, and you will also have to take extra steps to help Configure -find -ldb. Specifically, when Configure prompts you for library -directories, add /usr/local/BerkeleyDB.4.7/lib to the list. Also, you +find C<-ldb>. Specifically, when Configure prompts you for library +directories, add C to the list. Also, you will need to add appropriate linker flags to tell the runtime linker where to find the BerkeleyDB shared libraries. @@ -1282,13 +1331,13 @@ line): -Aldflags='-R/usr/local/BerkeleyDB.4.7/lib' locincpth is a space-separated list of include directories to search. -Configure will automatically add the appropriate -I directives. +Configure will automatically add the appropriate C<-I> directives. loclibpth is a space-separated list of library directories to search. -Configure will automatically add the appropriate -L directives. +Configure will automatically add the appropriate C<-L> directives. The addition to ldflags is so that the dynamic linker knows where to find -the BerkeleyDB libraries. For Linux and Solaris, the -R option does that. +the BerkeleyDB libraries. For Linux and Solaris, the C<-R> option does that. Other systems may use different flags. Use the appropriate flag for your system. @@ -1309,14 +1358,14 @@ ExtUtils::MakeMaker, and other extension =head2 GNU-style configure If you prefer the GNU-style configure command line interface, you can -use the supplied configure.gnu command, e.g. +use the supplied F command, e.g. - CC=gcc ./configure.gnu + CC=gcc ./configure.gnu -The configure.gnu script emulates a few of the more common configure +The F script emulates a few of the more common configure options. Try - ./configure.gnu --help + ./configure.gnu --help for a listing. @@ -1327,7 +1376,7 @@ build a threaded perl with: CC=gcc ./configure.gnu -Dusethreads -(The file is called configure.gnu to avoid problems on systems +(The file is called F to avoid problems on systems that would not distinguish the files "Configure" and "configure".) =head2 Malloc Issues @@ -1350,7 +1399,7 @@ that call malloc, then you should probab To build without perl's malloc, you can use the Configure command - sh Configure -Uusemymalloc + sh Configure -Uusemymalloc or you can answer 'n' at the appropriate interactive Configure prompt. @@ -1360,7 +1409,9 @@ systems), Configure chooses to use the s See the appropriate file in the F directory to see how the default is set. -=item -DPERL_POLLUTE_MALLOC +=item C<-DPERL_POLLUTE_MALLOC> + +=for apidoc Amnh||PERL_POLLUTE_MALLOC NOTE: This flag is enabled automatically on some platforms if you just run Configure to accept all the defaults. @@ -1379,7 +1430,9 @@ from the linker for malloc et al. In su does not allow its malloc functions to be fully replaced with custom versions. -=item -DPERL_DEBUGGING_MSTATS +=item C<-DPERL_DEBUGGING_MSTATS> + +=for apidoc Amnh||PERL_DEBUGGING_MSTATS This flag enables debugging mstats, which is required to use the Devel::Peek::mstat() function. You cannot enable this unless you are @@ -1406,7 +1459,7 @@ guesses. All the installation questions have been moved to the top, so you don't have to wait for them. Once you've handled them (and your C compiler and -flags) you can type &-d at the next Configure prompt and Configure +flags) you can type C<&-d> at the next Configure prompt and Configure will use the defaults from then on. If you find yourself trying obscure command line incantations and @@ -1447,9 +1500,9 @@ not to, you should accept its offer. Several of the hint files contain additional important information. If you have any problems, it is a good idea to read the relevant hint -file for further information. See hints/solaris_2.sh for an extensive +file for further information. See F for an extensive example. More information about writing good hints is in the -hints/README.hints file, which also explains hint files known as +F file, which also explains hint files known as callback-units. Note that any hint file is read before any Policy file, meaning that @@ -1457,20 +1510,20 @@ Policy overrides hints -- see L, it's possible that Configure detects different values from the ones specified in this file. You will almost always want to keep the previous value, unless you have changed something on your system. -For example, suppose you have added libgdbm.a to your system +For example, suppose you have added F to your system and you decide to reconfigure perl to use GDBM_File. When you run -Configure again, you will need to add -lgdbm to the list of libraries. +Configure again, you will need to add C<-lgdbm> to the list of libraries. Now, Configure will find your gdbm include file and library and will issue a message: *** WHOA THERE!!! *** - The previous value for $i_gdbm on this machine was "undef"! - Keep the previous value? [y] + The previous value for $i_gdbm on this machine was "undef"! + Keep the previous value? [y] In this case, you do not want to keep the previous value, so you should answer 'n'. (You'll also have to manually add GDBM_File to @@ -1479,50 +1532,50 @@ the list of dynamic extensions to build. =item Changing Compilers If you change compilers or make other significant changes, you should -probably not re-use your old config.sh. Simply remove it or +probably not re-use your old F. Simply remove it or rename it, then rerun Configure with the options you want to use. -=item Propagating your changes to config.sh +=item Propagating your changes to F -If you make any changes to config.sh, you should propagate +If you make any changes to F, you should propagate them to all the .SH files by running - sh Configure -S + sh Configure -S You will then have to rebuild by running - make depend - make + make depend + make -=item config.over and config.arch +=Fover and F -You can also supply a shell script config.over to override +You can also supply a shell script F to override Configure's guesses. It will get loaded up at the very end, just -before config.sh is created. You have to be careful with this, +before F is created. You have to be careful with this, however, as Configure does no checking that your changes make sense. This file is usually good for site-specific customizations. There is also another file that, if it exists, is loaded before the -config.over, called config.arch. This file is intended to be per +F, called F. This file is intended to be per architecture, not per site, and usually it's the architecture-specific -hints file that creates the config.arch. +hints file that creates the F. -=item config.h +=item F -Many of the system dependencies are contained in config.h. -Configure builds config.h by running the config_h.SH script. -The values for the variables are taken from config.sh. +Many of the system dependencies are contained in F. +Configure builds F by running the F script. +The values for the variables are taken from F. -If there are any problems, you can edit config.h directly. Beware, +If there are any problems, you can edit F directly. Beware, though, that the next time you run Configure, your changes will be lost. =item cflags If you have any additional changes to make to the C compiler command -line, they can be made in cflags.SH. For instance, to turn off the -optimizer on toke.c, find the switch structure marked 'or customize here', -and add a line for toke.c ahead of the catch-all *) so that it now reads: +line, they can be made in F. For instance, to turn off the +optimizer on F, find the switch structure marked 'or customize here', +and add a line for F ahead of the catch-all *) so that it now reads: : or customize here @@ -1531,22 +1584,22 @@ and add a line for toke.c ahead of the c *) ;; You should not edit the generated file cflags directly, as your changes -will be lost the next time you run Configure, or if you edit config.sh. +will be lost the next time you run Configure, or if you edit F. To explore various ways of changing ccflags from within a hint file, -see the file hints/README.hints. +see the file hints/F. -To change the C flags for all the files, edit config.sh and change either +To change the C flags for all the files, edit F and change either $ccflags or $optimize, and then re-run - sh Configure -S - make depend + sh Configure -S + make depend =item No sh If you don't have sh, you'll have to copy the sample file -Porting/config.sh to config.sh and edit your config.sh to reflect your -system's peculiarities. See Porting/pumpkin.pod for more information. +F to F and edit your F to reflect your +system's peculiarities. See F for more information. You'll probably also have to extensively modify the extension building mechanism. @@ -1554,7 +1607,7 @@ mechanism. Specific information for the OS/2, Plan 9, VMS and Win32 ports is in the corresponding README files and subdirectories. Additional information, -including a glossary of all those config.sh variables, is in the Porting +including a glossary of all those F variables, is in the Porting subdirectory. Porting/Glossary should especially come in handy. Ports for other systems may also be available. You should check out @@ -1563,7 +1616,7 @@ various other operating systems. If you plan to port Perl to a new architecture, study carefully the section titled "Philosophical Issues in Patching and Porting Perl" -in the file Porting/pumpkin.pod and the file pod/perlgit.pod. +in the file F and the file F. Study also how other non-UNIX ports have solved problems. =back @@ -1571,10 +1624,10 @@ Study also how other non-UNIX ports have =head2 Adding extra modules to the build You can specify extra modules or module bundles to be fetched from the -CPAN and installed as part of the Perl build. Either use the -Dextras=... +CPAN and installed as part of the Perl build. Either use the C<-Dextras=>... command line parameter to Configure, for example like this: - Configure -Dextras="Bundle::LWP DBI" + Configure -Dextras="Bundle::LWP DBI" or answer first 'y' to the question 'Install any extra modules?' and then answer "Bundle::LWP DBI" to the 'Extras?' question. @@ -1602,12 +1655,12 @@ changes in privileges, such as B. =head1 make depend -This will look for all the includes. The output is stored in makefile. -The only difference between Makefile and makefile is the dependencies at -the bottom of makefile. If you have to make any changes, you should edit -makefile, not Makefile, since the Unix make command reads makefile first. +This will look for all the includes. The output is stored in F. +The only difference between F and F is the dependencies at +the bottom of F. If you have to make any changes, you should edit +F, not F, since the Unix make command reads F first. (On non-Unix systems, the output may be stored in a different file. -Check the value of $firstmakefile in your config.sh if in doubt.) +Check the value of C<$firstmakefile> in your F if in doubt.) Configure will offer to do this step for you, so it isn't listed explicitly above. @@ -1644,7 +1697,7 @@ for further tips and information. If you can successfully build miniperl, but the process crashes during the building of extensions, run - make minitest + make minitest to test your version of miniperl. @@ -1652,18 +1705,18 @@ to test your version of miniperl. If you have any locale-related environment variables set, try unsetting them. I have some reports that some versions of IRIX hang while -running B<./miniperl configpm> with locales other than the C locale. +running C<./miniperl configpm> with locales other than the C locale. See the discussion under L<"make test"> below about locales and the whole L section in the file -pod/perllocale.pod. The latter is especially useful if you see something +F. The latter is especially useful if you see something like this - perl: warning: Setting locale failed. - perl: warning: Please check that your locale settings: - LC_ALL = "En_US", - LANG = (unset) - are supported and installed on your system. - perl: warning: Falling back to the standard locale ("C"). + perl: warning: Setting locale failed. + perl: warning: Please check that your locale settings: + LC_ALL = "En_US", + LANG = (unset) + are supported and installed on your system. + perl: warning: Falling back to the standard locale ("C"). at Perl startup. @@ -1684,7 +1737,7 @@ retesting with the various PERL variable If you run into dynamic loading problems, check your setting of the LD_LIBRARY_PATH environment variable (or on some systems the equivalent with a different name, see L). If you're -creating a static Perl library (libperl.a rather than libperl.so) it should +creating a static Perl library (F rather than F) it should build fine with LD_LIBRARY_PATH unset, though that may depend on details of your local setup. @@ -1694,17 +1747,17 @@ If Configure seems to be having trouble try not using nm extraction. You can do this from the command line with - sh Configure -Uusenm + sh Configure -Uusenm or by answering the nm extraction question interactively. If you have previously run Configure, you should not reuse your old -config.sh. +F. =item umask not found If the build processes encounters errors relating to umask(), the problem is probably that Configure couldn't find your umask() system call. -Check your config.sh. You should have d_umask='define'. If you don't, +Check your F. You should have d_umask='define'. If you don't, this is probably the L<"nm extraction"> problem discussed above. Also, try reading the hints file for your system for further information. @@ -1719,8 +1772,8 @@ on L<"nm extraction">. If you receive unresolved symbol errors during Perl build and/or test referring to __inet_* symbols, check to see whether BIND 8.1 is -installed. It installs a /usr/local/include/arpa/inet.h that refers to -these symbols. Versions of BIND later than 8.1 do not install inet.h +installed. It installs a F that refers to +these symbols. Versions of BIND later than 8.1 do not install F in that location and avoid the errors. You should probably update to a newer version of BIND (and remove the files the old one left behind). If you can't, you can either link with the updated resolver library @@ -1733,10 +1786,10 @@ On a related note, if you see a bunch of reentrant functions -- specifically networking-related ones -- being present but without prototypes available, check to see if BIND 8.1 (or possibly other BIND 8 versions) is (or has been) installed. They install -header files such as netdb.h into places such as /usr/local/include (or +header files such as F into places such as /usr/local/include (or into another directory as specified at build/install time), at least optionally. Remove them or put them in someplace that isn't in the C -preprocessor's header file include search path (determined by -I options +preprocessor's header file include search path (determined by C<-I> options plus defaults, normally /usr/include). =item #error "No DATAMODEL_NATIVE specified" @@ -1750,39 +1803,39 @@ update your gcc installation. =item Optimizer If you can't compile successfully, try turning off your compiler's -optimizer. Edit config.sh and change the line +optimizer. Edit F and change the line - optimize='-O' + optimize='-O' to - optimize=' ' + optimize=' ' -then propagate your changes with B and rebuild +then propagate your changes with S> and rebuild with B. =item Missing functions and Undefined symbols If the build of miniperl fails with a long list of missing functions or -undefined symbols, check the libs variable in the config.sh file. It +undefined symbols, check the libs variable in the F file. It should look something like - libs='-lsocket -lnsl -ldl -lm -lc' + libs='-lsocket -lnsl -ldl -lm -lc' The exact libraries will vary from system to system, but you typically -need to include at least the math library -lm. Normally, Configure +need to include at least the math library C<-lm>. Normally, Configure will suggest the correct defaults. If the libs variable is empty, you need to start all over again. Run - make distclean + make distclean and start from the very beginning. This time, unless you are sure of what you are doing, accept the default list of libraries suggested by Configure. -If the libs variable is missing -lm, there is a chance that libm.so.1 -is available, but the required (symbolic) link to libm.so is missing. -(same could be the case for other libraries like libcrypt.so). You +If the libs variable is missing C<-lm>, there is a chance that F +is available, but the required (symbolic) link to F is missing. +(same could be the case for other libraries like F). You should check your installation for packages that create that link, and if no package is installed that supplies that link or you cannot install them, make the symbolic link yourself e.g.: @@ -1803,16 +1856,16 @@ If you still have missing routines or un need to add some library or other, make a symbolic link like described above, or you need to undefine some feature that Configure thought was there but is defective or incomplete. If you used a hint file, see if -it has any relevant advice. You can also look through config.h +it has any relevant advice. You can also look through F for likely suspects. -=item toke.c +=item F Some compilers will not compile or optimize the larger files (such as -toke.c) without some extra switches to use larger jump offsets or +F) without some extra switches to use larger jump offsets or allocate larger internal tables. You can customize the switches for -each file in cflags.SH. It's okay to insert rules for specific files -into makefile since a default rule only takes effect in the absence of a +each file in F. It's okay to insert rules for specific files +into F since a default rule only takes effect in the absence of a specific rule. =item Missing dbmclose @@ -1845,7 +1898,7 @@ error, as the header file is broken. The If you see such a message during the building of an extension, but the extension passes its tests anyway (see L<"make test"> below), then don't worry about the warning message. The extension -Makefile.PL goes looking for various libraries needed on various +F goes looking for various libraries needed on various systems; few systems will need all the possible libraries listed. Most users will see warnings for the ones they don't have. The phrase 'mostly harmless' is intended to reassure you that nothing @@ -1858,7 +1911,7 @@ message then it's likely you're going to run into trouble somewhere along the line, since it's hard to see how you can use the GDBM_File -extension without the -lgdbm library. +extension without the C<-lgdbm> library. It is true that, in principle, Configure could have figured all of this out, but Configure and the extension building process are not @@ -1902,7 +1955,7 @@ may lead into linking problems. Either under your current operating system release, or modify your PATH not to include the GNU utils before running Configure, or specify the vendor-supplied utilities explicitly to Configure, for example by -Configure -Dar=/bin/ar. +S>. =item THIS PACKAGE SEEMS TO BE INCOMPLETE @@ -1938,8 +1991,8 @@ configured in the kernel. Perl tries to you will get a message telling you what to do. Building Perl on a system that has also BIND (headers and libraries) -installed may run into troubles because BIND installs its own netdb.h -and socket.h, which may not agree with the operating system's ideas of +installed may run into troubles because BIND installs its own F +and F, which may not agree with the operating system's ideas of the same files. Similarly, including -lbind may conflict with libc's view of the world. You may have to tweak -Dlocincpth and -Dloclibpth to avoid the BIND. @@ -1972,16 +2025,16 @@ the particular platforms: =item Android -L<"Cross-compilation" in README.android or +L<"Cross-compilation" in F or perlandroid|perlandroid/Cross-compilation> =item Blackberry -L<"Cross-compilation" in README.qnx or perlqnx|perlqnx/Cross-compilation> +L<"Cross-compilation" in F or perlqnx|perlqnx/Cross-compilation> =item Solaris -L<"CROSS-COMPILATION" in README.solaris or +L<"CROSS-COMPILATION" in F or perlsolaris|perlsolaris/CROSS-COMPILATION> =item Linux @@ -2006,7 +2059,7 @@ The more common one requires some way of executables in the target system, such as an ssh connection; this is the C<./Configure -Dusecrosscompile -Dtargethost=...> route. The second method doesn't need access to the target system, but requires you to -provide a config.sh, and a canned Makefile; the rest of this section +provide a F, and a canned F; the rest of this section describes the former. This cross-compilation setup of Configure has successfully been used in @@ -2157,13 +2210,13 @@ a few tty tests will be skipped. =head2 What if make test doesn't work? -If make test bombs out, just cd to the t directory and run ./TEST +If make test bombs out, just cd to the t directory and run F<./TEST> by hand to see if it makes any difference. One way to get more detailed information about failed tests and individual subtests is to run the harness from the t directory: - cd t ; ./perl harness + cd t ; ./perl harness (this assumes that most basic tests succeed, since harness uses complicated constructs). If no list of tests is provided, harness @@ -2172,13 +2225,13 @@ will run all tests. If individual tests fail, you can often run them by hand (from the main perl directory), e.g., - ./perl -I. -MTestInit t/op/groups.t + ./perl -I. -MTestInit t/op/groups.t You should also read the individual tests to see if there are any helpful comments that apply to your system. You may also need to setup your shared library path if you get errors like: - /sbin/loader: Fatal Error: cannot map libperl.so + /sbin/loader: Fatal Error: cannot map libperl.so The file t/README in the t subdirectory contains more information about running and modifying tests. @@ -2198,11 +2251,11 @@ are known to cause programs to exhibit m If you have any of the above environment variables set, please try - setenv LC_ALL C + setenv LC_ALL C (for C shell) or - LC_ALL=C;export LC_ALL + LC_ALL=C;export LC_ALL for Bourne or Korn shell) from the command line and then retry make test. If the tests then succeed, you may have a broken program that @@ -2233,24 +2286,24 @@ different. =item Out of memory On some systems, particularly those with smaller amounts of RAM, some -of the tests in t/op/pat.t may fail with an "Out of memory" message. +of the tests in F may fail with an "Out of memory" message. For example, on my SparcStation IPC with 12 MB of RAM, in perl5.5.670, test 85 will fail if run under either t/TEST or t/harness. Try stopping other jobs on the system and then running the test by itself: - ./perl -I. -MTestInit t/op/pat.t + ./perl -I. -MTestInit t/op/pat.t to see if you have any better luck. If your perl still fails this test, it does not necessarily mean you have a broken perl. This test tries to exercise the regular expression subsystem quite thoroughly, and may well be far more demanding than your normal usage. -=item libgcc_s.so.1: cannot open shared object file +=item F: cannot open shared object file This message has been reported on gcc-3.2.3 and earlier installed with a non-standard prefix. Setting the LD_LIBRARY_PATH environment variable -(or equivalent) to include gcc's lib/ directory with the libgcc_s.so.1 +(or equivalent) to include gcc's lib/ directory with the F shared library should fix the problem. =item Failures from lib/File/Temp/t/security saying "system possibly insecure" @@ -2353,7 +2406,7 @@ Without this the versioned binary would You can install perl under a different destination directory by using the DESTDIR variable during C, with a command like - make install DESTDIR=/tmp/perl5 + make install DESTDIR=/tmp/perl5 DESTDIR is automatically prepended to all the installation paths. See the example in L<"DESTDIR"> above. @@ -2363,64 +2416,64 @@ the example in L<"DESTDIR"> above. If you want to see exactly what will happen without installing anything, you can run - ./perl installperl -n - ./perl installman -n + ./perl installperl -n + ./perl installman -n make install will install the following: binaries - perl, - perl5.n.n where 5.n.n is the current release number. This - will be a link to perl. + perl, + perl5.n.n where 5.n.n is the current release number. This + will be a link to perl. scripts - cppstdin This is used by the deprecated switch perl -P, - if your cc -E can't read from stdin. - corelist Shows versions of modules that come with + cppstdin This is used by the deprecated switch perl -P, + if your cc -E can't read from stdin. + corelist Shows versions of modules that come with different - versions of perl. - cpan The CPAN shell. - enc2xs Encoding module generator. - h2ph Extract constants and simple macros from C + versions of perl. + cpan The CPAN shell. + enc2xs Encoding module generator. + h2ph Extract constants and simple macros from C headers. - h2xs Converts C .h header files to Perl extensions. - instmodsh A shell to examine installed modules. - libnetcfg Configure libnet. - perlbug Tool to report bugs in Perl. - perldoc Tool to read perl's pod documentation. - perlivp Perl Installation Verification Procedure. - piconv A Perl implementation of the encoding conversion - utility iconv. - pl2pm Convert Perl 4 .pl files to Perl 5 .pm modules. - pod2html, Converters from perl's pod documentation format - pod2man, - pod2text, - pod2usage - podchecker POD syntax checker. - podselect Prints sections of POD documentation. - prove A command-line tool for running tests. - psed A Perl implementation of sed. - ptar A Perl implementation of tar. - ptardiff A diff for tar archives. - ptargrep A grep for tar archives. - shasum A tool to print or check SHA checksums. - splain Describe Perl warnings and errors. - xsubpp Compiler to convert Perl XS code into C code. - zipdetails display the internal structure of zip files + h2xs Converts C .h header files to Perl extensions. + instmodsh A shell to examine installed modules. + libnetcfg Configure libnet. + perlbug Tool to report bugs in Perl. + perldoc Tool to read perl's pod documentation. + perlivp Perl Installation Verification Procedure. + piconv A Perl implementation of the encoding conversion + utility iconv. + pl2pm Convert Perl 4 .pl files to Perl 5 .pm modules. + pod2html, Converters from perl's pod documentation format + pod2man, + pod2text, + pod2usage + podchecker POD syntax checker. + podselect Prints sections of POD documentation. + prove A command-line tool for running tests. + psed A Perl implementation of sed. + ptar A Perl implementation of tar. + ptardiff A diff for tar archives. + ptargrep A grep for tar archives. + shasum A tool to print or check SHA checksums. + splain Describe Perl warnings and errors. + xsubpp Compiler to convert Perl XS code into C code. + zipdetails display the internal structure of zip files library files - in $privlib and $archlib specified to - Configure, usually under /usr/local/lib/perl5/. + in $privlib and $archlib specified to + Configure, usually under /usr/local/lib/perl5/. documentation - man pages in $man1dir, usually /usr/local/man/man1. - module man - pages in $man3dir, usually /usr/local/man/man3. - pod/*.pod in $privlib/pod/. + man pages in $man1dir, usually /usr/local/man/man1. + module man + pages in $man3dir, usually /usr/local/man/man3. + pod/*.pod in $privlib/pod/. installperl will also create the directories listed above in L<"Installation Directories">. @@ -2437,12 +2490,12 @@ version-specific suffix. For example, y version of perl alongside an already installed production version. To only install the version-specific parts of the perl installation, run - Configure -Dversiononly + Configure -Dversiononly or answer 'y' to the appropriate Configure prompt. Alternatively, you can just manually run - ./perl installperl -v + ./perl installperl -v and skip installman altogether. @@ -2469,7 +2522,7 @@ Some sites may wish to make perl documen format. The installhtml utility can be used to convert pod documentation into linked HTML files and install them. -Currently, the supplied ./installhtml script does not make use of the +Currently, the supplied F<./installhtml> script does not make use of the html Configure variables. This should be fixed in a future release. The following command-line is an example of one used to convert @@ -2499,37 +2552,37 @@ the number of "cannot resolve" warnings. Some sites may also wish to make the documentation in the pod/ directory available in TeX format. Type - (cd pod && make tex && ) + (cd pod && make tex && ) =head1 Starting all over again If you wish to rebuild perl from the same build directory, you should clean it out with the command - make distclean + make distclean or - make realclean + make realclean The only difference between the two is that make distclean also removes -your old config.sh and Policy.sh files. (A plain 'make clean' is now +your old F and F files. (A plain 'make clean' is now equivalent to 'make realclean'.) If you are upgrading from a previous version of perl, or if you change systems or compilers or make other significant changes, or if you are experiencing difficulties building perl, you should not reuse -your old config.sh. +your old F. -If your reason to reuse your old config.sh is to save your particular +If your reason to reuse your old F is to save your particular installation choices, then you can probably achieve the same effect by -using the Policy.sh file. See the section on L<"Site-wide Policy +using the F file. See the section on L<"Site-wide Policy settings"> above. =head1 Reporting Problems Please report problems to the GitHub issue tracker at -https://github.com/Perl/perl5/issues, which will ask for the +L, which will ask for the appropriate summary configuration information about your perl, which may help us track down problems far more quickly. But first you should read the advice in this file, carefully re-read the error message and @@ -2543,11 +2596,11 @@ without installing perl, then you can ru directory with C<./perl -V>. If the build fails too early to run perl, then please -B the C<./myconfig> shell script, and include its output along +B the F<./myconfig> shell script, and include its output along with an accurate description of your problem. -If Configure itself fails, and does not generate a config.sh file -(needed to run C<./myconfig>), then please open an issue with the +If Configure itself fails, and does not generate a F file +(needed to run F<./myconfig>), then please open an issue with the description of how Configure fails along with details of your system -- for example the output from running C. @@ -2558,7 +2611,7 @@ the important technical details of the p not whether your grammar and spelling is flawless. Trim out unnecessary information. Do not include large files (such as -config.sh or a complete Configure or make log) unless absolutely +F or a complete Configure or make log) unless absolutely necessary. Do not include a complete transcript of your build session. Just include the failing commands, the relevant error messages, and whatever preceding commands are necessary to give the @@ -2575,8 +2628,8 @@ L Perl modules having binary parts (meaning that a C compiler is used) will have to be recompiled to be -used with 5.42.3. If you find you do need to rebuild an extension with -5.42.3, you may safely do so without disturbing the older +used with 5.44.0. If you find you do need to rebuild an extension with +5.44.0, you may safely do so without disturbing the older installations. (See L<"Coexistence with earlier versions of perl 5"> above.) -See your installed copy of the perllocal.pod file for a (possibly +See your installed copy of the F file for a (possibly incomplete) list of locally installed modules. Note that you want -perllocal.pod, not perllocale.pod, for installed module information. +F, not F, for installed module information. =head1 Minimizing the Perl installation @@ -2704,15 +2757,15 @@ Firstly, the bare minimum to run this sc print("$f\n"); } -in Linux with perl-5.42.3 is as follows (under $Config{prefix}): +in Linux with perl-5.44.0 is as follows (under $Config{prefix}): ./bin/perl - ./lib/perl5/5.42.3/strict.pm - ./lib/perl5/5.42.3/warnings.pm - ./lib/perl5/5.42.3/i686-linux/File/Glob.pm - ./lib/perl5/5.42.3/feature.pm - ./lib/perl5/5.42.3/XSLoader.pm - ./lib/perl5/5.42.3/i686-linux/auto/File/Glob/Glob.so + ./lib/perl5/5.44.0/strict.pm + ./lib/perl5/5.44.0/warnings.pm + ./lib/perl5/5.44.0/i686-linux/File/Glob.pm + ./lib/perl5/5.44.0/feature.pm + ./lib/perl5/5.44.0/XSLoader.pm + ./lib/perl5/5.44.0/i686-linux/auto/File/Glob/Glob.so Secondly, for perl-5.10.1, the Debian perl-base package contains 591 files, (of which 510 are for lib/unicore) totaling about 3.5MB in its @@ -2839,8 +2892,8 @@ perl will ignore the C e Read the manual entries before running perl. The main documentation is in the F subdirectory and should have been installed during the -build process. Type B to get started. Alternatively, you -can type B to use the supplied perldoc script. This is +build process. Type C to get started. Alternatively, you +can type C to use the supplied perldoc script. This is sometimes useful for finding things in the library modules. =head1 AUTHOR Index: gnu/usr.bin/perl/INTERN.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/INTERN.h,v diff -u -p -a -u -p -r1.12 INTERN.h --- gnu/usr.bin/perl/INTERN.h 14 May 2024 19:38:53 -0000 1.12 +++ gnu/usr.bin/perl/INTERN.h 16 Nov 2026 00:57:36 -0000 @@ -9,11 +9,37 @@ */ /* - * EXT designates a global var which is defined in perl.h - * dEXT designates a global var which is defined in another - * file, so we can't count on finding it in perl.h - * (this practice should be avoided). + +=for apidoc CmU||EXT +=for apidoc_item EXTCONST +=for apidoc_item dEXT +=for apidoc_item dEXTCONST + +These each designate a global variable. The C forms indicate that it is +constant. + +Use them like this: + + Include either EXTERN.h or INTERN.h, but not both + ... + #include "perl.h" + ... + EXT char PL_WARN_ALL INIT(0); + EXTCONST U8 PL_revision INIT(PERL_REVISION); + +This will handle everything for you regarding whether they are to actually be +defined and initialized or just declared C. + +If the initialization is complex, you may have to use C>. + +If some constants you wish to reference will not become defined by #including +F, instead use C and C for them and include whatever +files you need to to get them. This is currently very rare, and should be +avoided. + +=cut */ + #undef EXT #undef dEXT #undef EXTCONST @@ -45,7 +71,38 @@ # endif # endif +/* +=for apidoc Cm||INIT|const_expr + +Macro to initialize something, used like so: + + EXTCONST char PL_memory_wrap[] INIT("panic: memory wrap"); + +It expands to nothing in F. + +=cut +*/ #undef INIT #define INIT(...) = __VA_ARGS__ +/* +=for apidoc C#||DOINIT + +This is defined in F, undefined in F + +Most of the time you can use C> to initialize your data structures. +But not always. In such cases, you can do the following: + + #ifdef DOINIT + ... do the declaration and definition ... + #else + declaration only + #endif + +A typical reason for needing this is when the definition includes #ifdef's. +You can't put that portably in a call to C, as a macro generally can't +itself contain preprocessor directives. + +=cut +*/ #define DOINIT Index: gnu/usr.bin/perl/MANIFEST =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/MANIFEST,v diff -u -p -a -u -p -r1.80 MANIFEST --- gnu/usr.bin/perl/MANIFEST 19 Aug 2026 00:19:00 -0000 1.80 +++ gnu/usr.bin/perl/MANIFEST 16 Nov 2026 00:57:36 -0000 @@ -63,11 +63,12 @@ keywords.h The keyword numbers l1_char_class_tab.h 256 word bit table of character classes (for handy.h) locale.c locale-specific utility functions locale_table.h header for locale.c +long_names.c for use when NO_SHORT_NAMES is defined make_ext.pl Used by Makefile to execute extension Makefiles make_patchnum.pl Script to generate git_version.h and lib/Config_git.pl files for all OS'es makedef.pl Create symbol export lists for linking makedepend.SH Precursor to makedepend -makedepend_file.SH Precursor to makedepend_file +makedependfile.SH Precursor to makedependfile Makefile.SH A script that generates Makefile malloc.c A version of malloc you might not want malloc_ctl.h A version of malloc you might not want @@ -491,6 +492,8 @@ cpan/Config-Perl-V/t/43_plv53710rcs.t Co cpan/Config-Perl-V/t/44_plv5380tqm.t Config::Perl::V cpan/Config-Perl-V/t/45_plv5400tqm.t Config::Perl::V cpan/Config-Perl-V/t/46_plv5411tqmrcs.t Config::Perl::V +cpan/Config-Perl-V/t/47_plv5420tqm.t Config-Perl-V +cpan/Config-Perl-V/t/48_plv5437.t Config-Perl-V cpan/Config-Perl-V/V.pm Config::Perl::V cpan/CPAN/lib/App/Cpan.pm helper package for CPAN.pm cpan/CPAN/lib/CPAN.pm Interface to Comprehensive Perl Archive Network @@ -544,110 +547,110 @@ cpan/CPAN/t/03pkgs.t See if CPAN::Ve cpan/CPAN/t/10version.t See if CPAN the module works cpan/CPAN/t/11mirroredby.t See if CPAN::Mirrored::By works cpan/CPAN/t/32pushyhttps.t Test file related to CPAN -cpan/CPAN-Meta/corpus/BadMETA.yml -cpan/CPAN-Meta/corpus/bareyaml.meta -cpan/CPAN-Meta/corpus/CL018_yaml.meta -cpan/CPAN-Meta/corpus/json.meta -cpan/CPAN-Meta/corpus/META-VR.json -cpan/CPAN-Meta/corpus/META-VR.yml -cpan/CPAN-Meta/corpus/yaml.meta -cpan/CPAN-Meta/lib/CPAN/Meta.pm -cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm -cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm -cpan/CPAN-Meta/lib/CPAN/Meta/History.pm -cpan/CPAN-Meta/lib/CPAN/Meta/History/Meta_1_0.pod -cpan/CPAN-Meta/lib/CPAN/Meta/History/Meta_1_1.pod -cpan/CPAN-Meta/lib/CPAN/Meta/History/Meta_1_2.pod -cpan/CPAN-Meta/lib/CPAN/Meta/History/Meta_1_3.pod -cpan/CPAN-Meta/lib/CPAN/Meta/History/Meta_1_4.pod -cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm -cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm -cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm -cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm -cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm -cpan/CPAN-Meta/t/converter.t -cpan/CPAN-Meta/t/converter-bad.t -cpan/CPAN-Meta/t/converter-fail.t -cpan/CPAN-Meta/t/converter-fragments.t -cpan/CPAN-Meta/t/data-fail/META-1_0.yml -cpan/CPAN-Meta/t/data-fail/META-1_1.yml -cpan/CPAN-Meta/t/data-fail/META-1_2.yml -cpan/CPAN-Meta/t/data-fail/META-1_3.yml -cpan/CPAN-Meta/t/data-fail/META-1_4.yml -cpan/CPAN-Meta/t/data-fail/META-2.json -cpan/CPAN-Meta/t/data-fixable/107650337-META.yml -cpan/CPAN-Meta/t/data-fixable/1598804075-META.yml -cpan/CPAN-Meta/t/data-fixable/1927486199-META.yml -cpan/CPAN-Meta/t/data-fixable/1985980974-META.yml -cpan/CPAN-Meta/t/data-fixable/2031017050-META.yml -cpan/CPAN-Meta/t/data-fixable/284247103-META.yml -cpan/CPAN-Meta/t/data-fixable/344981821-META.yml -cpan/CPAN-Meta/t/data-fixable/35478989-META.yml -cpan/CPAN-Meta/t/data-fixable/98042513-META.yml -cpan/CPAN-Meta/t/data-fixable/invalid-meta-spec-version.json -cpan/CPAN-Meta/t/data-fixable/invalid-meta-spec-version.yml -cpan/CPAN-Meta/t/data-fixable/META-1_2.yml -cpan/CPAN-Meta/t/data-fixable/META-1_3.yml -cpan/CPAN-Meta/t/data-fixable/META-1_4.yml -cpan/CPAN-Meta/t/data-fixable/META-2.json -cpan/CPAN-Meta/t/data-fixable/meta-spec-version-trailing-zeros.json -cpan/CPAN-Meta/t/data-fixable/meta-spec-version-trailing-zeros.yml -cpan/CPAN-Meta/t/data-fixable/restrictive-2.json -cpan/CPAN-Meta/t/data-fixable/version-ranges-2.json -cpan/CPAN-Meta/t/data-test/gpl-1_4.yml -cpan/CPAN-Meta/t/data-test/META-1_0.yml -cpan/CPAN-Meta/t/data-test/META-1_1.yml -cpan/CPAN-Meta/t/data-test/META-1_2.yml -cpan/CPAN-Meta/t/data-test/META-1_3.yml -cpan/CPAN-Meta/t/data-test/META-1_4.yml -cpan/CPAN-Meta/t/data-test/META-2.json -cpan/CPAN-Meta/t/data-test/META-2.meta -cpan/CPAN-Meta/t/data-test/preserve-release-status.yml -cpan/CPAN-Meta/t/data-test/provides-version-missing.json -cpan/CPAN-Meta/t/data-test/resources.yml -cpan/CPAN-Meta/t/data-test/restricted-2.json -cpan/CPAN-Meta/t/data-test/restrictive-1_4.yml -cpan/CPAN-Meta/t/data-test/unicode.yml -cpan/CPAN-Meta/t/data-test/version-not-normal.json -cpan/CPAN-Meta/t/data-test/version-ranges-1_4.yml -cpan/CPAN-Meta/t/data-test/version-ranges-2.json -cpan/CPAN-Meta/t/data-test/x_deprecated-META.json -cpan/CPAN-Meta/t/data-valid/1122575719-META.yml -cpan/CPAN-Meta/t/data-valid/1206545041-META.yml -cpan/CPAN-Meta/t/data-valid/1985684504-META.yml -cpan/CPAN-Meta/t/data-valid/476602558-META.yml -cpan/CPAN-Meta/t/data-valid/META-1_0.yml -cpan/CPAN-Meta/t/data-valid/META-1_1.yml -cpan/CPAN-Meta/t/data-valid/META-1_4.yml -cpan/CPAN-Meta/t/data-valid/META-2.json -cpan/CPAN-Meta/t/data-valid/scalar-meta-spec.yml -cpan/CPAN-Meta/t/data-valid/x_deprecated-META.yml -cpan/CPAN-Meta/t/lib/Parse/CPAN/Meta/Test.pm -cpan/CPAN-Meta/t/load-bad.t -cpan/CPAN-Meta/t/merge.t -cpan/CPAN-Meta/t/meta-obj.t -cpan/CPAN-Meta/t/no-index.t -cpan/CPAN-Meta/t/optional_feature-merge.t -cpan/CPAN-Meta/t/parse-cpan-meta/02_api.t -cpan/CPAN-Meta/t/parse-cpan-meta/03_functions.t -cpan/CPAN-Meta/t/parse-cpan-meta/04_export.t -cpan/CPAN-Meta/t/parse-cpan-meta/05_errors.t -cpan/CPAN-Meta/t/prereqs.t -cpan/CPAN-Meta/t/prereqs-finalize.t -cpan/CPAN-Meta/t/prereqs-merge.t -cpan/CPAN-Meta/t/README-data.txt -cpan/CPAN-Meta/t/repository.t -cpan/CPAN-Meta/t/save-load.t -cpan/CPAN-Meta/t/validator.t -cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm -cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm -cpan/CPAN-Meta-Requirements/t/accepts.t -cpan/CPAN-Meta-Requirements/t/bad_version_hook.t -cpan/CPAN-Meta-Requirements/t/basic.t -cpan/CPAN-Meta-Requirements/t/finalize.t -cpan/CPAN-Meta-Requirements/t/from-hash.t -cpan/CPAN-Meta-Requirements/t/merge.t -cpan/CPAN-Meta-Requirements/t/strings.t +cpan/CPAN-Meta/corpus/BadMETA.yml CPAN::Meta +cpan/CPAN-Meta/corpus/bareyaml.meta CPAN::Meta +cpan/CPAN-Meta/corpus/CL018_yaml.meta CPAN::Meta +cpan/CPAN-Meta/corpus/json.meta CPAN::Meta +cpan/CPAN-Meta/corpus/META-VR.json CPAN::Meta +cpan/CPAN-Meta/corpus/META-VR.yml CPAN::Meta +cpan/CPAN-Meta/corpus/yaml.meta CPAN::Meta +cpan/CPAN-Meta/lib/CPAN/Meta.pm Module related to CPAN::Meta +cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm Module related to CPAN::Meta +cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm Module related to CPAN::Meta +cpan/CPAN-Meta/lib/CPAN/Meta/History.pm Module related to CPAN::Meta +cpan/CPAN-Meta/lib/CPAN/Meta/History/Meta_1_0.pod CPAN::Meta +cpan/CPAN-Meta/lib/CPAN/Meta/History/Meta_1_1.pod CPAN::Meta +cpan/CPAN-Meta/lib/CPAN/Meta/History/Meta_1_2.pod CPAN::Meta +cpan/CPAN-Meta/lib/CPAN/Meta/History/Meta_1_3.pod CPAN::Meta +cpan/CPAN-Meta/lib/CPAN/Meta/History/Meta_1_4.pod CPAN::Meta +cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm Module related to CPAN::Meta +cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm Module related to CPAN::Meta +cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm Module related to CPAN::Meta +cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm Module related to CPAN::Meta +cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm Module related to CPAN::Meta +cpan/CPAN-Meta/t/converter.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/converter-bad.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/converter-fail.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/converter-fragments.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/data-fail/META-1_0.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fail/META-1_1.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fail/META-1_2.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fail/META-1_3.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fail/META-1_4.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fail/META-2.json CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/107650337-META.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/1598804075-META.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/1927486199-META.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/1985980974-META.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/2031017050-META.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/284247103-META.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/344981821-META.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/35478989-META.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/98042513-META.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/invalid-meta-spec-version.json CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/invalid-meta-spec-version.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/META-1_2.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/META-1_3.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/META-1_4.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/META-2.json CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/meta-spec-version-trailing-zeros.json CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/meta-spec-version-trailing-zeros.yml CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/restrictive-2.json CPAN::Meta +cpan/CPAN-Meta/t/data-fixable/version-ranges-2.json CPAN::Meta +cpan/CPAN-Meta/t/data-test/gpl-1_4.yml CPAN::Meta +cpan/CPAN-Meta/t/data-test/META-1_0.yml CPAN::Meta +cpan/CPAN-Meta/t/data-test/META-1_1.yml CPAN::Meta +cpan/CPAN-Meta/t/data-test/META-1_2.yml CPAN::Meta +cpan/CPAN-Meta/t/data-test/META-1_3.yml CPAN::Meta +cpan/CPAN-Meta/t/data-test/META-1_4.yml CPAN::Meta +cpan/CPAN-Meta/t/data-test/META-2.json CPAN::Meta +cpan/CPAN-Meta/t/data-test/META-2.meta CPAN::Meta +cpan/CPAN-Meta/t/data-test/preserve-release-status.yml CPAN::Meta +cpan/CPAN-Meta/t/data-test/provides-version-missing.json CPAN::Meta +cpan/CPAN-Meta/t/data-test/resources.yml CPAN::Meta +cpan/CPAN-Meta/t/data-test/restricted-2.json CPAN::Meta +cpan/CPAN-Meta/t/data-test/restrictive-1_4.yml CPAN::Meta +cpan/CPAN-Meta/t/data-test/unicode.yml CPAN::Meta +cpan/CPAN-Meta/t/data-test/version-not-normal.json CPAN::Meta +cpan/CPAN-Meta/t/data-test/version-ranges-1_4.yml CPAN::Meta +cpan/CPAN-Meta/t/data-test/version-ranges-2.json CPAN::Meta +cpan/CPAN-Meta/t/data-test/x_deprecated-META.json CPAN::Meta +cpan/CPAN-Meta/t/data-valid/1122575719-META.yml CPAN::Meta +cpan/CPAN-Meta/t/data-valid/1206545041-META.yml CPAN::Meta +cpan/CPAN-Meta/t/data-valid/1985684504-META.yml CPAN::Meta +cpan/CPAN-Meta/t/data-valid/476602558-META.yml CPAN::Meta +cpan/CPAN-Meta/t/data-valid/META-1_0.yml CPAN::Meta +cpan/CPAN-Meta/t/data-valid/META-1_1.yml CPAN::Meta +cpan/CPAN-Meta/t/data-valid/META-1_4.yml CPAN::Meta +cpan/CPAN-Meta/t/data-valid/META-2.json CPAN::Meta +cpan/CPAN-Meta/t/data-valid/scalar-meta-spec.yml CPAN::Meta +cpan/CPAN-Meta/t/data-valid/x_deprecated-META.yml CPAN::Meta +cpan/CPAN-Meta/t/lib/Parse/CPAN/Meta/Test.pm Module related to CPAN::Meta +cpan/CPAN-Meta/t/load-bad.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/merge.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/meta-obj.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/no-index.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/optional_feature-merge.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/parse-cpan-meta/02_api.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/parse-cpan-meta/03_functions.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/parse-cpan-meta/04_export.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/parse-cpan-meta/05_errors.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/prereqs.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/prereqs-finalize.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/prereqs-merge.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/README-data.txt Test file related to CPAN::Meta +cpan/CPAN-Meta/t/repository.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/save-load.t Test file related to CPAN::Meta +cpan/CPAN-Meta/t/validator.t Test file related to CPAN::Meta +cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm Module related to CPAN::Meta::Requirements +cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm Module related to CPAN::Meta::Requirements +cpan/CPAN-Meta-Requirements/t/accepts.t Test file related to CPAN::Meta::Requirements +cpan/CPAN-Meta-Requirements/t/bad_version_hook.t Test file related to CPAN::Meta::Requirements +cpan/CPAN-Meta-Requirements/t/basic.t Test file related to CPAN::Meta::Requirements +cpan/CPAN-Meta-Requirements/t/finalize.t Test file related to CPAN::Meta::Requirements +cpan/CPAN-Meta-Requirements/t/from-hash.t Test file related to CPAN::Meta::Requirements +cpan/CPAN-Meta-Requirements/t/merge.t Test file related to CPAN::Meta::Requirements +cpan/CPAN-Meta-Requirements/t/strings.t Test file related to CPAN::Meta::Requirements cpan/CPAN-Meta-YAML/lib/CPAN/Meta/YAML.pm CPAN-Meta-YAML files cpan/CPAN-Meta-YAML/t/01_api.t Test file related to CPAN::Meta::YAML cpan/CPAN-Meta-YAML/t/01_compile.t CPAN-Meta-YAML files @@ -1113,7 +1116,7 @@ cpan/ExtUtils-MakeMaker/t/prereq.t cpan/ExtUtils-MakeMaker/t/prereq_print.t See if PREREQ_PRINT works cpan/ExtUtils-MakeMaker/t/problems.t How MakeMaker reacts to build problems cpan/ExtUtils-MakeMaker/t/prompt.t See if E::MM::prompt() works -cpan/ExtUtils-MakeMaker/t/rec_att_keys.t +cpan/ExtUtils-MakeMaker/t/rec_att_keys.t Test file related to ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/recurs.t See if recursive builds work cpan/ExtUtils-MakeMaker/t/revision.t See if $Revision is correct cpan/ExtUtils-MakeMaker/t/several_authors.t See if multiple AUTHORs work @@ -1134,7 +1137,7 @@ cpan/ExtUtils-PL2Bat/lib/ExtUtils/PL2Bat cpan/ExtUtils-PL2Bat/t/make_executable.t Tests if ExtUtils::PL2Bat makes bat files that are executable cpan/File-Fetch/lib/File/Fetch.pm File::Fetch cpan/File-Fetch/t/01_File-Fetch.t File::Fetch tests -cpan/File-Fetch/t/null_subclass.t +cpan/File-Fetch/t/null_subclass.t Test file related to File::Fetch cpan/File-Path/lib/File/Path.pm Do things like 'mkdir -p' and 'rm -r' cpan/File-Path/t/FilePathTest.pm See if File::Path works cpan/File-Path/t/Path.t See if File::Path works @@ -1156,9 +1159,9 @@ cpan/Filter-Util-Call/Call.pm Filter:: cpan/Filter-Util-Call/Call.xs Filter::Util::Call extension external subroutines cpan/Filter-Util-Call/filter-util.pl See if Filter::Util::Call works cpan/Filter-Util-Call/t/call.t See if Filter::Util::Call works -cpan/Filter-Util-Call/t/rt_101033.pm -cpan/Filter-Util-Call/t/rt_101033.t -cpan/Filter-Util-Call/t/rt_54452-rebless.t +cpan/Filter-Util-Call/t/rt_101033.pm Module related to Filter::Util::Call +cpan/Filter-Util-Call/t/rt_101033.t Test file related to Filter::Util::Call +cpan/Filter-Util-Call/t/rt_54452-rebless.t Test file related to Filter::Util::Call cpan/Getopt-Long/lib/Getopt/Long.pm Fetch command options (GetOptions) cpan/Getopt-Long/lib/Getopt/Long/Parser.pm Getopt-Long cpan/Getopt-Long/t/gol-basic.t See if Getopt::Long works @@ -1242,20 +1245,20 @@ cpan/HTTP-Tiny/corpus/redirect-07.txt Te cpan/HTTP-Tiny/corpus/redirect-08.txt Test file related to HTTP::Tiny cpan/HTTP-Tiny/corpus/redirect-09.txt Test file related to HTTP::Tiny cpan/HTTP-Tiny/corpus/redirect-10.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-11.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-12.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-13.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-14.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-15.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-16.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-17.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-18.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-19.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-20.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-21.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-22.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-23.txt Test file related to HTTP::Tiny -cpan/HTTP-Tiny/corpus/redirect-24.txt Test file related to HTTP::Tiny +cpan/HTTP-Tiny/corpus/redirect-11.txt HTTP-Tiny +cpan/HTTP-Tiny/corpus/redirect-12.txt HTTP-Tiny +cpan/HTTP-Tiny/corpus/redirect-13.txt HTTP-Tiny +cpan/HTTP-Tiny/corpus/redirect-14.txt HTTP-Tiny +cpan/HTTP-Tiny/corpus/redirect-15.txt HTTP-Tiny +cpan/HTTP-Tiny/corpus/redirect-16.txt HTTP-Tiny +cpan/HTTP-Tiny/corpus/redirect-17.txt HTTP-Tiny +cpan/HTTP-Tiny/corpus/redirect-18.txt HTTP-Tiny +cpan/HTTP-Tiny/corpus/redirect-19.txt HTTP-Tiny +cpan/HTTP-Tiny/corpus/redirect-20.txt HTTP-Tiny +cpan/HTTP-Tiny/corpus/redirect-21.txt HTTP-Tiny +cpan/HTTP-Tiny/corpus/redirect-22.txt HTTP-Tiny +cpan/HTTP-Tiny/corpus/redirect-23.txt HTTP-Tiny +cpan/HTTP-Tiny/corpus/redirect-24.txt HTTP-Tiny cpan/HTTP-Tiny/corpus/snake-oil.crt Test file related to HTTP::Tiny cpan/HTTP-Tiny/lib/HTTP/Tiny.pm Module related to HTTP::Tiny cpan/HTTP-Tiny/t/000_load.t Test file related to HTTP::Tiny @@ -1736,22 +1739,22 @@ cpan/Module-Load-Conditional/t/to_load/N cpan/Module-Load-Conditional/t/to_load/ToBeLoaded Module::Conditional tests cpan/Module-Loaded/lib/Module/Loaded.pm Module::Loaded cpan/Module-Loaded/t/01_Module-Loaded.t Module::Loaded tests -cpan/Module-Metadata/corpus/BOMTest/UTF16BE.pm -cpan/Module-Metadata/corpus/BOMTest/UTF16LE.pm -cpan/Module-Metadata/corpus/BOMTest/UTF8.pm -cpan/Module-Metadata/lib/Module/Metadata.pm -cpan/Module-Metadata/t/contains_pod.t -cpan/Module-Metadata/t/encoding.t -cpan/Module-Metadata/t/endpod.t -cpan/Module-Metadata/t/extract-package.t -cpan/Module-Metadata/t/extract-version.t -cpan/Module-Metadata/t/lib/0_1/Foo.pm -cpan/Module-Metadata/t/lib/0_2/Foo.pm -cpan/Module-Metadata/t/lib/ENDPOD.pm -cpan/Module-Metadata/t/lib/GeneratePackage.pm -cpan/Module-Metadata/t/metadata.t -cpan/Module-Metadata/t/taint.t -cpan/Module-Metadata/t/version.t +cpan/Module-Metadata/corpus/BOMTest/UTF16BE.pm Module related to Module::Metadata +cpan/Module-Metadata/corpus/BOMTest/UTF16LE.pm Module related to Module::Metadata +cpan/Module-Metadata/corpus/BOMTest/UTF8.pm Module related to Module::Metadata +cpan/Module-Metadata/lib/Module/Metadata.pm Module related to Module::Metadata +cpan/Module-Metadata/t/contains_pod.t Test file related to Module::Metadata +cpan/Module-Metadata/t/encoding.t Test file related to Module::Metadata +cpan/Module-Metadata/t/endpod.t Test file related to Module::Metadata +cpan/Module-Metadata/t/extract-package.t Test file related to Module::Metadata +cpan/Module-Metadata/t/extract-version.t Test file related to Module::Metadata +cpan/Module-Metadata/t/lib/0_1/Foo.pm Module related to Module::Metadata +cpan/Module-Metadata/t/lib/0_2/Foo.pm Module related to Module::Metadata +cpan/Module-Metadata/t/lib/ENDPOD.pm Module related to Module::Metadata +cpan/Module-Metadata/t/lib/GeneratePackage.pm Module related to Module::Metadata +cpan/Module-Metadata/t/metadata.t Test file related to Module::Metadata +cpan/Module-Metadata/t/taint.t Test file related to Module::Metadata +cpan/Module-Metadata/t/version.t Test file related to Module::Metadata cpan/NEXT/lib/NEXT.pm Pseudo-class NEXT for method redispatch cpan/NEXT/t/actual.t NEXT cpan/NEXT/t/actuns.t NEXT @@ -1971,6 +1974,8 @@ cpan/Pod-Simple/t/fcodes.t Pod::Simpl cpan/Pod-Simple/t/fcodes_e.t Pod::Simple test file cpan/Pod-Simple/t/fcodes_l.t Pod::Simple test file cpan/Pod-Simple/t/fcodes_s.t Pod::Simple test file +cpan/Pod-Simple/t/filter.t Pod-Simple +cpan/Pod-Simple/t/filter-html.t Pod-Simple cpan/Pod-Simple/t/for.t Pod::Simple test file cpan/Pod-Simple/t/fornot.t Pod::Simple test file cpan/Pod-Simple/t/github_issue_79.t Test file related to Pod::Simple @@ -2362,6 +2367,8 @@ cpan/Term-Table/t/Table.t Term-Table cpan/Term-Table/t/Table/Cell.t Term-Table cpan/Term-Table/t/Table/CellStack.t Term-Table cpan/Term-Table/t/Table/LineBreak.t Term-Table +cpan/Term-Table/t/Term-ReadKey.t Term-Table +cpan/Term-Table/t/Term-Size-Any.t Term-Table cpan/Test-Harness/bin/prove The prove harness utility cpan/Test-Harness/lib/App/Prove.pm Gubbins for the prove utility cpan/Test-Harness/lib/App/Prove/State.pm Gubbins for the prove utility @@ -2659,6 +2666,7 @@ cpan/Test-Simple/lib/Test2/EventFacet/Re cpan/Test-Simple/lib/Test2/EventFacet/Trace.pm Module related to Test::Simple cpan/Test-Simple/lib/Test2/Formatter.pm Module related to Test::Simple cpan/Test-Simple/lib/Test2/Formatter/TAP.pm Module related to Test::Simple +cpan/Test-Simple/lib/Test2/Handle.pm Test-Simple cpan/Test-Simple/lib/Test2/Hub.pm Module related to Test::Simple cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm Module related to Test::Simple cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm Module related to Test::Simple @@ -2756,6 +2764,9 @@ cpan/Test-Simple/lib/Test2/Util/Term.pm cpan/Test-Simple/lib/Test2/Util/Times.pm Test-Simple cpan/Test-Simple/lib/Test2/Util/Trace.pm Module related to Test::Simple cpan/Test-Simple/lib/Test2/V0.pm Test-Simple +cpan/Test-Simple/lib/Test2/V1.pm Test-Simple +cpan/Test-Simple/lib/Test2/V1/Base.pm Test-Simple +cpan/Test-Simple/lib/Test2/V1/Handle.pm Test-Simple cpan/Test-Simple/lib/Test2/Workflow.pm Test-Simple cpan/Test-Simple/lib/Test2/Workflow/BlockBase.pm Test-Simple cpan/Test-Simple/lib/Test2/Workflow/Build.pm Test-Simple @@ -2978,6 +2989,7 @@ cpan/Test-Simple/t/modules/Compare/Set.t cpan/Test-Simple/t/modules/Compare/String.t Test-Simple cpan/Test-Simple/t/modules/Compare/Undef.t Test-Simple cpan/Test-Simple/t/modules/Compare/Wildcard.t Test-Simple +cpan/Test-Simple/t/modules/Handle.t Test-Simple cpan/Test-Simple/t/modules/Mock.t Test-Simple cpan/Test-Simple/t/modules/Plugin.t Test-Simple cpan/Test-Simple/t/modules/Plugin/BailOnFail.t Test-Simple @@ -3034,6 +3046,9 @@ cpan/Test-Simple/t/modules/Util/Table/Ce cpan/Test-Simple/t/modules/Util/Table/LineBreak.t Test-Simple cpan/Test-Simple/t/modules/Util/Times.t Test-Simple cpan/Test-Simple/t/modules/V0.t Test-Simple +cpan/Test-Simple/t/modules/V1.t Test-Simple +cpan/Test-Simple/t/modules/V1/Base.t Test-Simple +cpan/Test-Simple/t/modules/V1/Handle.t Test-Simple cpan/Test-Simple/t/modules/Workflow.t Test-Simple cpan/Test-Simple/t/modules/Workflow/BlockBase.t Test-Simple cpan/Test-Simple/t/modules/Workflow/Build.t Test-Simple @@ -3202,23 +3217,25 @@ cpan/Tie-RefHash/t/storable.t Test for cpan/Tie-RefHash/t/threaded.t Test for Tie::RefHash with threads cpan/Time-Local/lib/Time/Local.pm Reverse translation of localtime, gmtime cpan/Time-Local/t/Local.t See if Time::Local works -cpan/Time-Piece/Piece.pm Time::Piece extension -cpan/Time-Piece/Piece.xs Time::Piece extension -cpan/Time-Piece/Seconds.pm Time::Piece extension -cpan/Time-Piece/t/01base.t Test for Time::Piece -cpan/Time-Piece/t/02core.t Test for Time::Piece -cpan/Time-Piece/t/02core_dst.t Test file related to Time::Piece -cpan/Time-Piece/t/03compare.t Test for Time::Piece -cpan/Time-Piece/t/04mjd.t Test for Time::Piece -cpan/Time-Piece/t/05overload.t Test for Time::Piece -cpan/Time-Piece/t/06large.t Test file related to Time::Piece -cpan/Time-Piece/t/06subclass.t Test for Time::Piece -cpan/Time-Piece/t/07arith.t Test for Time::Piece -cpan/Time-Piece/t/08truncate.t Test file related to Time::Piece -cpan/Time-Piece/t/09locales.t Test file related to Time::Piece -cpan/Time-Piece/t/10overload.t Test file related to Time::Piece -cpan/Time-Piece/t/99legacy.t Test file related to Time::Piece -cpan/Time-Piece/t/lib/Time/Piece/Twin.pm Module related to Time::Piece +cpan/Time-Piece/Piece.pm Time::Piece extension +cpan/Time-Piece/Piece.xs Time::Piece extension +cpan/Time-Piece/Seconds.pm Time::Piece extension +cpan/Time-Piece/t/01base.t Test for Time::Piece +cpan/Time-Piece/t/02core.t Test for Time::Piece +cpan/Time-Piece/t/02core_dst.t Test file related to Time::Piece +cpan/Time-Piece/t/03compare.t Test for Time::Piece +cpan/Time-Piece/t/04mjd.t Test for Time::Piece +cpan/Time-Piece/t/05overload.t Test for Time::Piece +cpan/Time-Piece/t/06large.t Test file related to Time::Piece +cpan/Time-Piece/t/06subclass.t Test for Time::Piece +cpan/Time-Piece/t/07arith.t Test for Time::Piece +cpan/Time-Piece/t/08truncate.t Test file related to Time::Piece +cpan/Time-Piece/t/09locales.t Test file related to Time::Piece +cpan/Time-Piece/t/10overload.t Test file related to Time::Piece +cpan/Time-Piece/t/11strptime_defaults.t Time-Piece +cpan/Time-Piece/t/12strptime_timezones.t Time-Piece +cpan/Time-Piece/t/13date_arithmetic_edge_cases.t Time-Piece +cpan/Time-Piece/t/lib/Time/Piece/Twin.pm Module related to Time::Piece cpan/Unicode-Collate/Collate.pm Unicode::Collate cpan/Unicode-Collate/Collate.xs Unicode::Collate cpan/Unicode-Collate/Collate/allkeys.txt Unicode::Collate @@ -4226,59 +4243,58 @@ dist/ExtUtils-ParseXS/lib/ExtUtils/xsubp dist/ExtUtils-ParseXS/lib/perlxs.pod Perl XS application programming interface dist/ExtUtils-ParseXS/lib/perlxstut.pod Perl XS tutorial dist/ExtUtils-ParseXS/lib/perlxstypemap.pod Perl XS C/Perl type conversion tools -dist/ExtUtils-ParseXS/t/001-basic.t See if ExtUtils::ParseXS works -dist/ExtUtils-ParseXS/t/002-more.t Extended ExtUtils::ParseXS testing -dist/ExtUtils-ParseXS/t/003-usage.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/101-standard_typemap_locations.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/102-trim_whitespace.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/103-tidy_type.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/104-map_type.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/105-valid_proto_string.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/106-process_typemaps.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/108-map_type.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/109-standard_XS_defs.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/111-analyze_preprocessor_statements.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/112-set_cond.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/113-check_cond_preproc_statements.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/114-blurt_death_Warn.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/115-avoid-noise.t ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/501-t-compile.t ExtUtils::Typemaps tests -dist/ExtUtils-ParseXS/t/510-t-bare.t ExtUtils::Typemaps tests -dist/ExtUtils-ParseXS/t/511-t-whitespace.t ExtUtils::Typemaps tests -dist/ExtUtils-ParseXS/t/512-t-file.t ExtUtils::Typemaps tests -dist/ExtUtils-ParseXS/t/513-t-merge.t ExtUtils::Typemaps tests -dist/ExtUtils-ParseXS/t/514-t-embed.t ExtUtils::Typemaps tests -dist/ExtUtils-ParseXS/t/515-t-cmd.t ExtUtils::Typemaps tests -dist/ExtUtils-ParseXS/t/516-t-clone.t ExtUtils::Typemaps tests -dist/ExtUtils-ParseXS/t/517-t-targetable.t ExtUtils::Typemaps tests -dist/ExtUtils-ParseXS/t/600-t-compat.t ExtUtils::Typemaps tests -dist/ExtUtils-ParseXS/t/data/b.typemap ExtUtils::Typemaps test data -dist/ExtUtils-ParseXS/t/data/combined.typemap ExtUtils::Typemaps test data -dist/ExtUtils-ParseXS/t/data/confl_repl.typemap ExtUtils::Typemaps test data -dist/ExtUtils-ParseXS/t/data/confl_skip.typemap ExtUtils::Typemaps test data -dist/ExtUtils-ParseXS/t/data/conflicting.typemap ExtUtils::Typemaps test data -dist/ExtUtils-ParseXS/t/data/other.typemap ExtUtils::Typemaps test data -dist/ExtUtils-ParseXS/t/data/perl.typemap ExtUtils::Typemaps test data -dist/ExtUtils-ParseXS/t/data/simple.typemap ExtUtils::Typemaps test data +dist/ExtUtils-ParseXS/t/000-version.t See if ExtUtils::ParseXS loads and has the right version num +dist/ExtUtils-ParseXS/t/001-parse-basic.t See if ExtUtils::ParseXS basic parsing works +dist/ExtUtils-ParseXS/t/002-parse-file-scope.t test ExtUtils::ParseXS file-scoped syntax +dist/ExtUtils-ParseXS/t/003-parse-file-scope-keywords.t test ExtUtils::ParseXS file-scoped keywords syntax +dist/ExtUtils-ParseXS/t/004-parse-xsub-declaration.t test ExtUtils::ParseXS XSUB declaration syntax +dist/ExtUtils-ParseXS/t/005-parse-parameters.t test ExtUtils::ParseXS XSUB parameter syntax +dist/ExtUtils-ParseXS/t/006-parse-return-type.t test ExtUtils::ParseXS XSUB return type +dist/ExtUtils-ParseXS/t/007-parse-input-output.t test ExtUtils::ParseXS XSUB INPUT and OUTPUT keywords +dist/ExtUtils-ParseXS/t/008-parse-xsub-keywords.t test ExtUtils::ParseXS XSUB keywords +dist/ExtUtils-ParseXS/t/009-parse-c-plusplus.t test ExtUtils::ParseXS C++ support +dist/ExtUtils-ParseXS/t/101-api-standard_typemap_locations.t ExtUtils::ParseXS tests +dist/ExtUtils-ParseXS/t/102-api-trim_whitespace.t ExtUtils::ParseXS tests +dist/ExtUtils-ParseXS/t/103-api-tidy_type.t ExtUtils::ParseXS tests +dist/ExtUtils-ParseXS/t/104-api-map_type.t ExtUtils::ParseXS tests +dist/ExtUtils-ParseXS/t/105-api-valid_proto_string.t ExtUtils::ParseXS tests +dist/ExtUtils-ParseXS/t/106-api-process_typemaps.t ExtUtils::ParseXS tests +dist/ExtUtils-ParseXS/t/113-api-check_cond_preproc_statements.t ExtUtils::ParseXS tests +dist/ExtUtils-ParseXS/t/114-api-blurt_death_Warn.t ExtUtils::ParseXS tests +dist/ExtUtils-ParseXS/t/301-run-basic.t See if ExtUtils::ParseXS can compile and run a file +dist/ExtUtils-ParseXS/t/302-run-more.t Extended ExtUtils::ParseXS compile and run +dist/ExtUtils-ParseXS/t/303-run-usage.t ExtUtils::ParseXS tests +dist/ExtUtils-ParseXS/t/501-typemaps-compile.t ExtUtils::Typemaps tests +dist/ExtUtils-ParseXS/t/510-typemaps-bare.t ExtUtils::Typemaps tests +dist/ExtUtils-ParseXS/t/511-typemaps-whitespace.t ExtUtils::Typemaps tests +dist/ExtUtils-ParseXS/t/512-typemaps-file.t ExtUtils::Typemaps tests +dist/ExtUtils-ParseXS/t/513-typemaps-merge.t ExtUtils::Typemaps tests +dist/ExtUtils-ParseXS/t/514-typemaps-embed.t ExtUtils::Typemaps tests +dist/ExtUtils-ParseXS/t/515-typemaps-cmd.t ExtUtils::Typemaps tests +dist/ExtUtils-ParseXS/t/516-typemaps-clone.t ExtUtils::Typemaps tests +dist/ExtUtils-ParseXS/t/517-typemaps-targetable.t ExtUtils::Typemaps tests +dist/ExtUtils-ParseXS/t/518-typemaps-compat.t ExtUtils::Typemaps tests dist/ExtUtils-ParseXS/t/lib/ExtUtils/Typemaps/Test.pm ExtUtils::Typemaps tests dist/ExtUtils-ParseXS/t/lib/IncludeTester.pm ExtUtils::ParseXS testing utility dist/ExtUtils-ParseXS/t/lib/PrimitiveCapture.pm Primitive STDOUT/ERR capturing for tests +dist/ExtUtils-ParseXS/t/lib/TestMany.pm Tool for running XS parser tests dist/ExtUtils-ParseXS/t/lib/TypemapTest/Foo.pm ExtUtils::Typemaps tests -dist/ExtUtils-ParseXS/t/pseudotypemap1 A test-typemap +dist/ExtUtils-ParseXS/t/test_typemaps/b.typemap ExtUtils::Typemaps test data +dist/ExtUtils-ParseXS/t/test_typemaps/combined.typemap ExtUtils::Typemaps test data +dist/ExtUtils-ParseXS/t/test_typemaps/confl_repl.typemap ExtUtils::Typemaps test data +dist/ExtUtils-ParseXS/t/test_typemaps/confl_skip.typemap ExtUtils::Typemaps test data +dist/ExtUtils-ParseXS/t/test_typemaps/conflicting.typemap ExtUtils::Typemaps test data +dist/ExtUtils-ParseXS/t/test_typemaps/other.typemap ExtUtils::Typemaps test data +dist/ExtUtils-ParseXS/t/test_typemaps/perl.typemap ExtUtils::Typemaps test data +dist/ExtUtils-ParseXS/t/test_typemaps/simple.typemap ExtUtils::Typemaps test data dist/ExtUtils-ParseXS/t/typemap Standard typemap for controlled testing -dist/ExtUtils-ParseXS/t/XSAlias.xs Test file for ExtUtils::ParseXS ALIAS tests -dist/ExtUtils-ParseXS/t/XSBroken.xs Test file for ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/XSFalsePositive.xs Test file for ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/XSFalsePositive2.xs Test file for ExtUtils::ParseXS tests dist/ExtUtils-ParseXS/t/XSInclude.xsh Test file for ExtUtils::ParseXS tests +dist/ExtUtils-ParseXS/t/XSloop.xsh Test file for ExtUtils::ParseXS tests dist/ExtUtils-ParseXS/t/XSMore.xs Test file for ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/XSNoMap.xs dist/ExtUtils-ParseXS/t/XSTest.pm Test file for ExtUtils::ParseXS tests dist/ExtUtils-ParseXS/t/XSTest.xs Test file for ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/XSTightDirectives.xs Test file for ExtUtils::ParseXS tests dist/ExtUtils-ParseXS/t/XSUsage.pm ExtUtils::ParseXS tests dist/ExtUtils-ParseXS/t/XSUsage.xs ExtUtils::ParseXS tests -dist/ExtUtils-ParseXS/t/XSWarn.xs ExtUtils::ParseXS tests dist/Filter-Simple/Changes History of change for Filter::Simple dist/Filter-Simple/lib/Filter/Simple.pm Simple frontend to Filter::Util::Call dist/Filter-Simple/Makefile.PL Build Filter::Simple @@ -4781,6 +4797,7 @@ ext/B/Makefile.PL Compiler backend mak ext/B/O.pm Compiler front-end module (-MO=...) ext/B/t/b.t See if B works ext/B/t/B/success.pm Test module for ext/B/t/o.t +ext/B/t/b_uni.t See if B works with Unicode ext/B/t/bool.t See if B works for bool ext/B/t/concise.t See whether B::Concise works ext/B/t/concise-xs.t See whether B::Concise recognizes XS functions @@ -4796,6 +4813,7 @@ ext/B/t/optree_constants.t B::Concise r ext/B/t/optree_for.t for loops ext/B/t/optree_misc.t misc optree tests ext/B/t/optree_samples.t various basic codes: if for while +ext/B/t/optree_signatures.t test B output on subroutine signatures ext/B/t/optree_sort.t inplace sort optimization regression ext/B/t/optree_specials.t BEGIN, END, etc code ext/B/t/optree_varinit.t my,our,local var init optimization @@ -5135,6 +5153,7 @@ ext/XS-APItest/t/callregexec.t XS::API ext/XS-APItest/t/check_warnings.t test scope of "Too late for CHECK" ext/XS-APItest/t/cleanup.t test stack behaviour on unwinding ext/XS-APItest/t/clone-with-stack.t test clone with CLONEf_COPY_STACKS works +ext/XS-APItest/t/cop_warnings.t test cop_*_warning ext/XS-APItest/t/cophh.t test COPHH API ext/XS-APItest/t/coplabel.t test cop_*_label ext/XS-APItest/t/copstash.t test alloccopstash @@ -5222,7 +5241,10 @@ ext/XS-APItest/t/stuff_modify_bug.t tes ext/XS-APItest/t/stuff_svcur_bug.t test for a bug in lex_stuff_pvn ext/XS-APItest/t/subcall.t Test XSUB calls ext/XS-APItest/t/subsignature.t Test parse_subsignature() +ext/XS-APItest/t/sv_numcmp.t Test sv_numcmp ext/XS-APItest/t/sv_numeq.t Test sv_numeq +ext/XS-APItest/t/sv_numlget.t Test sv_num[lg][et] +ext/XS-APItest/t/sv_numne.t Test sv_numne ext/XS-APItest/t/sv_streq.t Test sv_streq ext/XS-APItest/t/svcat.t Test sv_catpvn ext/XS-APItest/t/svcatpvf.t Test sv_catpvf argument reordering @@ -5614,6 +5636,7 @@ lib/unicore/lib/Age/V130.pl Unicode ch lib/unicore/lib/Age/V140.pl Unicode character database lib/unicore/lib/Age/V150.pl Unicode character database lib/unicore/lib/Age/V160.pl Unicode character database +lib/unicore/lib/Age/V170.pl Unicode character database lib/unicore/lib/Age/V20.pl Unicode character database lib/unicore/lib/Age/V30.pl Unicode character database lib/unicore/lib/Age/V31.pl Unicode character database @@ -5655,6 +5678,7 @@ lib/unicore/lib/Ccc/AR.pl Unicode char lib/unicore/lib/Ccc/ATAR.pl Unicode character database lib/unicore/lib/Ccc/B.pl Unicode character database lib/unicore/lib/Ccc/BR.pl Unicode character database +lib/unicore/lib/Ccc/DA.pl Unicode character database lib/unicore/lib/Ccc/DB.pl Unicode character database lib/unicore/lib/Ccc/NK.pl Unicode character database lib/unicore/lib/Ccc/NR.pl Unicode character database @@ -5770,6 +5794,7 @@ lib/unicore/lib/In/14_0.pl Unicode cha lib/unicore/lib/In/15_0.pl Unicode character database lib/unicore/lib/In/15_1.pl Unicode character database lib/unicore/lib/In/16_0.pl Unicode character database +lib/unicore/lib/In/17_0.pl Unicode character database lib/unicore/lib/In/2_0.pl Unicode character database lib/unicore/lib/In/2_1.pl Unicode character database lib/unicore/lib/In/3_0.pl Unicode character database @@ -5855,6 +5880,9 @@ lib/unicore/lib/Jt/L.pl Unicode chara lib/unicore/lib/Jt/R.pl Unicode character database lib/unicore/lib/Jt/T.pl Unicode character database lib/unicore/lib/Jt/U.pl Unicode character database +lib/unicore/lib/kEHCore/C.pl Unicode character database +lib/unicore/lib/kEHCore/L.pl Unicode character database +lib/unicore/lib/kEHCore/N.pl Unicode character database lib/unicore/lib/kEHNoMirror/Y.pl Unicode character database lib/unicore/lib/kEHNoRotate/Y.pl Unicode character database lib/unicore/lib/Lb/AI.pl Unicode character database @@ -5870,6 +5898,7 @@ lib/unicore/lib/Lb/CM.pl Unicode chara lib/unicore/lib/Lb/CP.pl Unicode character database lib/unicore/lib/Lb/EX.pl Unicode character database lib/unicore/lib/Lb/GL.pl Unicode character database +lib/unicore/lib/Lb/HH.pl Unicode character database lib/unicore/lib/Lb/ID.pl Unicode character database lib/unicore/lib/Lb/IN.pl Unicode character database lib/unicore/lib/Lb/IS.pl Unicode character database @@ -5975,6 +6004,7 @@ lib/unicore/lib/Perl/_PerlPat.pl Unicod lib/unicore/lib/Perl/_PerlPr2.pl Unicode character database lib/unicore/lib/Perl/_PerlPro.pl Unicode character database lib/unicore/lib/Perl/_PerlQuo.pl Unicode character database +lib/unicore/lib/Perl/_PerlWor.pl Unicode character database lib/unicore/lib/Perl/Alnum.pl Unicode character database lib/unicore/lib/Perl/Assigned.pl Unicode character database lib/unicore/lib/Perl/Blank.pl Unicode character database @@ -6094,6 +6124,7 @@ lib/unicore/lib/Scx/Mong.pl Unicode ch lib/unicore/lib/Scx/Mult.pl Unicode character database lib/unicore/lib/Scx/Mymr.pl Unicode character database lib/unicore/lib/Scx/Nand.pl Unicode character database +lib/unicore/lib/Scx/Newa.pl Unicode character database lib/unicore/lib/Scx/Nko.pl Unicode character database lib/unicore/lib/Scx/Orya.pl Unicode character database lib/unicore/lib/Scx/Osge.pl Unicode character database @@ -6195,6 +6226,7 @@ lib/unicore/To/InSC.pl Unicode charac lib/unicore/To/Isc.pl Unicode character database lib/unicore/To/Jg.pl Unicode character database lib/unicore/To/Jt.pl Unicode character database +lib/unicore/To/kEHAltSe.pl Unicode character database lib/unicore/To/kEHCat.pl Unicode character database lib/unicore/To/kEHCore.pl Unicode character database lib/unicore/To/kEHDesc.pl Unicode character database @@ -6204,6 +6236,9 @@ lib/unicore/To/kEHHG.pl Unicode chara lib/unicore/To/kEHIFAO.pl Unicode character database lib/unicore/To/kEHJSesh.pl Unicode character database lib/unicore/To/kEHUniK.pl Unicode character database +lib/unicore/To/kMandari.pl Unicode character database +lib/unicore/To/kTotalSt.pl Unicode character database +lib/unicore/To/kUnihanC.pl Unicode character database lib/unicore/To/Lb.pl Unicode character database lib/unicore/To/Lc.pl Unicode character database lib/unicore/To/Na1.pl Unicode character database @@ -6304,6 +6339,7 @@ os2/os2thread.h pthread-like typedefs os2/perl2cmd.pl Corrects installed binaries under OS/2 os2/perlrexx.c Support perl interpreter embedded in REXX os2/perlrexx.cmd Test perl interpreter embedded in REXX +os390/os390.c z/OS specific code plan9/9front.patch Plan9 port: patch for 9front-specific flavor of Plan 9 plan9/aperl Plan9 port: shell to make Perl error messages Acme-friendly plan9/arpa/inet.h Plan9 port: replacement C header file @@ -6559,6 +6595,7 @@ Porting/makerel Release making utili Porting/manicheck Check against MANIFEST Porting/manifest_lib.pl Library for checking and sorting the MANIFEST Porting/manisort Sort the MANIFEST +Porting/merge-deltas.pl Merge developments deltas into the final perldelta Porting/mksample Generate Porting/config_H and Porting/config.sh Porting/new-perldelta.pl Generate a new perldelta Porting/newtests-perldelta.pl Generate Perldelta stub for newly added tests @@ -6644,6 +6681,7 @@ t/class/accessor.t See if accessor met t/class/class.t See if class declarations work t/class/construct.t See if class constructors work t/class/destruct.t See if class destruction works +t/class/EndsWithADJUST.pm Helper module for test for GH#23758 in t/class/phasers.t t/class/field.t See if class field declarations work t/class/gh22169.t Test defining a class that previously failed to define t/class/gh23511.t Test defining a reader after a strict 'vars' violation @@ -6755,7 +6793,9 @@ t/lib/croak/pp Test croak calls from t/lib/croak/pp_ctl Test croak calls from pp_ctl.c t/lib/croak/pp_hot Test croak calls from pp_hot.c t/lib/croak/pp_sys Test croak calls from pp_sys.c +t/lib/croak/refalias Test croak calls from refalias-related behaviours t/lib/croak/regcomp Test croak calls from regcomp.c +t/lib/croak/signatures Test croak calls from compiling subroutine signatures t/lib/croak/toke Test croak calls from toke.c t/lib/croak/toke_l1 Test croak calls from toke.c; file is not UTF-8 encoded t/lib/cygwin.t Builtin cygwin function tests @@ -6831,6 +6871,7 @@ t/lib/warnings/pp_sys Tests for pp_sys t/lib/warnings/regcomp Tests for regcomp.c for warnings.t t/lib/warnings/regexec Tests for regexec.c for warnings.t t/lib/warnings/run Tests for run.c for warnings.t +t/lib/warnings/signatures Tests for signatures-related warnings for warnings.t t/lib/warnings/sv Tests for sv.c for warnings.t t/lib/warnings/taint Tests for taint.c for warnings.t t/lib/warnings/toke Tests for toke.c for warnings.t @@ -6988,6 +7029,7 @@ t/op/getppid.t See if getppid works t/op/glob.t See if <*> works t/op/gmagic.t See if GMAGIC works t/op/goto.t See if goto works +t/op/goto-sub.t See if goto &NAME works t/op/goto_xs.t See if "goto &sub" works on XSUBs t/op/grent.t See if getgr*() functions work t/op/grep.t See if grep() and map() work @@ -7191,6 +7233,7 @@ t/porting/libperl.t Check libperl.a sa t/porting/maintainers.t Test that Porting/Maintainers.pl is up to date t/porting/makerel.t Test that files used by Porting/makerel exist t/porting/manifest.t Test that this MANIFEST file is well formed +t/porting/merge-deltas.t Test that the Porting/merge-deltas.pl script does its job t/porting/perlfunc.t Test that Functions_pm.PL can parse perlfunc.pod t/porting/pod_rules.t Check that various pod lists are consistent t/porting/podcheck.t Test the POD of shipped modules is well formed @@ -7322,9 +7365,11 @@ t/run/switchx3.aux Data for switchx.t t/run/todo.t TODO tests t/TEST The regression tester t/test.pl Simple testing library +t/test_pl.pod Documentation for test.pl t/test_pl/_num_to_alpha.t Tests for the simple testing library t/test_pl/can_isa_ok.t Tests for the simple testing library t/test_pl/display.t Tests for the simple testing library +t/test_pl/examples.t Tests for the simple testing library t/test_pl/plan_skip_all.t Tests for the simple testing library t/test_pl/tempfile.t Tests for the simple testing library t/thread_it.pl Run regression tests in a new thread @@ -7422,6 +7467,7 @@ win32/config_H.gc Win32 config header win32/config_h.PL Perl code to convert Win32 config.sh to config.h win32/config_H.vc Win32 config header (Visual C++ build) win32/config_sh.PL Perl code to update Win32 config.sh from Makefile +win32/configure/have_stdckdint.c check for availability of stdckdint.h win32/configure/rt.c identify default runtime win32/create_perllibst_h.pl creates perllibst.h file for inclusion from perllib.c win32/distclean.bat Remove _ALL_ files not listed here in MANIFEST Index: gnu/usr.bin/perl/META.json =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/META.json,v diff -u -p -a -u -p -r1.19 META.json --- gnu/usr.bin/perl/META.json 19 Aug 2026 00:19:00 -0000 1.19 +++ gnu/usr.bin/perl/META.json 16 Nov 2026 00:57:36 -0000 @@ -4,7 +4,7 @@ "perl5-porters@perl.org" ], "dynamic_config" : 1, - "generated_by" : "CPAN::Meta version 2.150010", + "generated_by" : "CPAN::Meta version 2.150013", "license" : [ "perl_5" ], @@ -118,6 +118,6 @@ "url" : "https://github.com/Perl/perl5" } }, - "version" : "5.042003", + "version" : "5.044000", "x_serialization_backend" : "JSON::PP version 4.16" } Index: gnu/usr.bin/perl/META.yml =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/META.yml,v diff -u -p -a -u -p -r1.19 META.yml --- gnu/usr.bin/perl/META.yml 19 Aug 2026 00:19:00 -0000 1.19 +++ gnu/usr.bin/perl/META.yml 16 Nov 2026 00:57:36 -0000 @@ -4,7 +4,7 @@ author: - perl5-porters@perl.org build_requires: {} dynamic_config: 1 -generated_by: 'CPAN::Meta version 2.150010, CPAN::Meta::Converter version 2.150010' +generated_by: 'CPAN::Meta version 2.150013, CPAN::Meta::Converter version 2.150013' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -105,5 +105,5 @@ resources: homepage: https://www.perl.org/ license: https://dev.perl.org/licenses/ repository: https://github.com/Perl/perl5 -version: '5.042003' +version: '5.044000' x_serialization_backend: 'CPAN::Meta::YAML version 0.020' Index: gnu/usr.bin/perl/Makefile.SH =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Makefile.SH,v diff -u -p -a -u -p -r1.73 Makefile.SH --- gnu/usr.bin/perl/Makefile.SH 19 Aug 2026 00:19:00 -0000 1.73 +++ gnu/usr.bin/perl/Makefile.SH 16 Nov 2026 00:57:36 -0000 @@ -64,7 +64,7 @@ true) ${revision}.${patchlevel}.${subversion}" case "$osvers" in 1[5-9]*|[2-9]*) - shrpldflags="$shrpldflags -install_name `pwd`/\$@ -Xlinker -headerpad_max_install_names" + shrpldflags="$shrpldflags -install_name `pwd -P`/\$@ -Xlinker -headerpad_max_install_names" exeldflags="-Xlinker -headerpad_max_install_names" ;; *) @@ -126,15 +126,8 @@ true) linklibperl="-L `pwd | sed 's/\/UU$//'` -Wl,+s -Wl,+b$archlibexp/CORE -lperl" ;; os390*) - case "$use64bitall" in - define|true|[yY]*) shrpldflags='-Wl,LP64,dll' - linklibperl='libperl.x' - ;; - *) shrpldflags='-Wl,XPLINK,dll' - linklibperl='libperl.x' - ;; - esac - ;; + shrpldflags='-shared' + linklibperl='libperl.x' esac case "$ldlibpthname" in '') ;; @@ -499,7 +492,10 @@ SH_to_target() { echo $@ | sed -e s/\\\.SH//g -e s/_/./g } -SH='Makefile.SH cflags.SH config_h.SH makedepend.SH myconfig.SH runtests.SH pod/Makefile.SH' +# Declare in SH variable all scripts that generate an underlying file. +# In doing so, it creates a makefile target for each underlying file. +# This target can be used as a dependency to automatically regenerate the underlying file when the script has been modified. +SH='Makefile.SH cflags.SH config_h.SH makedependfile.SH makedepend.SH myconfig.SH runtests.SH pod/Makefile.SH' shextract=`SH_to_target $SH` ## In the following dollars and backticks do not need the extra backslash. @@ -548,8 +544,8 @@ h = \ c_base = \ av.c builtin.c caretx.c class.c deb.c doio.c doop.c dquote.c dump.c \ - globals.c gv.c hv.c keywords.c locale.c mathoms.c mg.c mro_core.c \ - numeric.c op.c pad.c peep.c perl.c perlio.c perly.c \ + globals.c gv.c hv.c keywords.c locale.c long_names.c mathoms.c mg.c \ + mro_core.c numeric.c op.c pad.c peep.c perl.c perlio.c perly.c \ pp.c pp_ctl.c pp_hot.c pp_pack.c pp_sort.c pp_sys.c \ reentr.c regcomp.c regcomp_debug.c regcomp_invlist.c regcomp_study.c \ regcomp_trie.c regexec.c run.c scope.c sv.c taint.c time64.c toke.c \ @@ -576,15 +572,16 @@ common_objs = \ av$(OBJ_EXT) builtin$(OBJ_EXT) caretx$(OBJ_EXT) class$(OBJ_EXT) \ deb$(OBJ_EXT) doio$(OBJ_EXT) doop$(OBJ_EXT) dquote$(OBJ_EXT) \ dump$(OBJ_EXT) globals$(OBJ_EXT) gv$(OBJ_EXT) hv$(OBJ_EXT) \ - keywords$(OBJ_EXT) locale$(OBJ_EXT) mathoms$(OBJ_EXT) mg$(OBJ_EXT) \ - mro_core$(OBJ_EXT) numeric$(OBJ_EXT) pad$(OBJ_EXT) peep$(OBJ_EXT) \ - perlio$(OBJ_EXT) perly$(OBJ_EXT) pp$(OBJ_EXT) pp_ctl$(OBJ_EXT) \ - pp_hot$(OBJ_EXT) pp_pack$(OBJ_EXT) pp_sort$(OBJ_EXT) pp_sys$(OBJ_EXT) \ - reentr$(OBJ_EXT) regcomp$(OBJ_EXT) regcomp_debug$(OBJ_EXT) \ - regcomp_invlist$(OBJ_EXT) regcomp_study$(OBJ_EXT) regcomp_trie$(OBJ_EXT) \ - regexec$(OBJ_EXT) run$(OBJ_EXT) scope$(OBJ_EXT) sv$(OBJ_EXT) \ - taint$(OBJ_EXT) time64$(OBJ_EXT) toke$(OBJ_EXT) utf8$(OBJ_EXT) \ - util$(OBJ_EXT) syscall_emulator$(OBJ_EXT) \ + keywords$(OBJ_EXT) locale$(OBJ_EXT) long_names$(OBJ_EXT) \ + mathoms$(OBJ_EXT) mg$(OBJ_EXT) mro_core$(OBJ_EXT) numeric$(OBJ_EXT) \ + pad$(OBJ_EXT) peep$(OBJ_EXT) perlio$(OBJ_EXT) perly$(OBJ_EXT) \ + pp$(OBJ_EXT) pp_ctl$(OBJ_EXT) pp_hot$(OBJ_EXT) pp_pack$(OBJ_EXT) \ + pp_sort$(OBJ_EXT) pp_sys$(OBJ_EXT) reentr$(OBJ_EXT) regcomp$(OBJ_EXT) \ + regcomp_debug$(OBJ_EXT) regcomp_invlist$(OBJ_EXT) \ + regcomp_study$(OBJ_EXT) regcomp_trie$(OBJ_EXT) regexec$(OBJ_EXT) \ + run$(OBJ_EXT) scope$(OBJ_EXT) sv$(OBJ_EXT) taint$(OBJ_EXT) \ + time64$(OBJ_EXT) toke$(OBJ_EXT) utf8$(OBJ_EXT) util$(OBJ_EXT) \ + syscall_emulator$(OBJ_EXT) \ $(mallocobj) $(ARCHOBJS) miniperl_objs_nodt = $(mini_only_objs) $(common_objs) miniperlmain$(OBJ_EXT) @@ -636,7 +633,7 @@ esac $spitshell >>$Makefile <<'!NO!SUBS!' -perltoc_pod_prereqs = extra.pods pod/perl5423delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod +perltoc_pod_prereqs = extra.pods pod/perl5440delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs) generated_headers = uudmap.h bitcount.h mg_data.h @@ -1143,9 +1140,9 @@ pod/perlintern.pod: $(MINIPERL_EXE) auto pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST $(MINIPERL) pod/perlmodlib.PL -q -pod/perl5423delta.pod: pod/perldelta.pod - $(RMS) pod/perl5423delta.pod - $(LNS) perldelta.pod pod/perl5423delta.pod +pod/perl5440delta.pod: pod/perldelta.pod + $(RMS) pod/perl5440delta.pod + $(LNS) perldelta.pod pod/perl5440delta.pod extra.pods: $(MINIPERL_EXE) -@test ! -f extra.pods || rm -f `cat extra.pods` @@ -1366,7 +1363,7 @@ veryclean: _verycleaner _mopup _clobber _mopup: rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c $(mini_only_src) generate_uudmap$(EXE_EXT) $(generated_headers) -rmdir .depending - -rm *.depends makedepend_file + -rm *.depends -@test -f extra.pods && rm -f `cat extra.pods` -@test -f vms/README_vms.pod && rm -f vms/README_vms.pod -rm -f perl.exp ext.libs $(generated_pods) uni.data $(mini_only_objs) pod/roffitall @@ -1426,8 +1423,8 @@ _cleaner2: -rmdir lib/Win32API lib/VMS lib/Unicode/Collate/Locale -rmdir lib/Unicode/Collate/CJK lib/Unicode/Collate lib/Tie/Hash -rmdir lib/Thread lib/Text lib/Test2/Workflow/Task lib/Test2/Workflow - -rmdir lib/Test2/Util/Table lib/Test2/Util lib/Test2/Tools - -rmdir lib/Test2/Require lib/Test2/Plugin + -rmdir lib/Test2/V1 lib/Test2/Util/Table lib/Test2/Util + -rmdir lib/Test2/Tools lib/Test2/Require lib/Test2/Plugin -rmdir lib/Test2/Manual/Tooling/Plugin lib/Test2/Manual/Tooling -rmdir lib/Test2/Manual/Testing lib/Test2/Manual/Anatomy -rmdir lib/Test2/Manual lib/Test2/IPC/Driver lib/Test2/IPC @@ -1494,16 +1491,21 @@ cscopeflags = -Rb # Recursive, build-on cscope.out cscope: $(c) $(h) cscope $(cscopeflags) -# Need to unset during recursion to go out of loop. +# $(FIRSTMAKEFILE) is generated by the makedepend script. +# The makedepend script uses the makedependfile script. + +# Need to unset MAKEDEPEND during recursion to go out of loop. # The README below ensures that the dependency list is never empty and # that when MAKEDEPEND is empty $(FIRSTMAKEFILE) doesn't need rebuilding. -MAKEDEPEND = Makefile makedepend_file makedepend +MAKEDEPEND = Makefile makedependfile makedepend $(FIRSTMAKEFILE): README $(MAKEDEPEND) $(MAKE) depend MAKEDEPEND= !NO!SUBS! +# Targets generating the underlying file from the scripts defined in SH variable. + for f in $SH; do file=`SH_to_target $f` $spitshell >>$Makefile <>$Makefile <<'!NO!SUBS!' .PHONY: depend -depend: makedepend $(DTRACE_H) $(generated_headers) +depend: makedependfile makedepend $(DTRACE_H) $(generated_headers) sh ./makedepend MAKE="$(MAKE)" cflags .c.c.depends: - sh ./makedepend_file $< $@ cflags + sh ./makedependfile $< $@ cflags .PHONY: test check test_prep test_prep_nodll test_prep_pre \ test_prep_reonly test_tty test-tty test_notty test-notty \ Index: gnu/usr.bin/perl/Makefile.bsd-wrapper1 =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Makefile.bsd-wrapper1,v diff -u -p -a -u -p -r1.50 Makefile.bsd-wrapper1 --- gnu/usr.bin/perl/Makefile.bsd-wrapper1 19 Aug 2026 00:19:00 -0000 1.50 +++ gnu/usr.bin/perl/Makefile.bsd-wrapper1 16 Nov 2026 00:57:36 -0000 @@ -106,7 +106,7 @@ _quick3p= perl5420delta 1 pod/perl5420delta.pod \ perl5421delta 1 pod/perl5421delta.pod \ perl5422delta 1 pod/perl5422delta.pod \ - perl5423delta 1 pod/perl5423delta.pod \ + perl5440delta 1 pod/perl5440delta.pod \ perl561delta 1 pod/perl561delta.pod \ perl56delta 1 pod/perl56delta.pod \ perl581delta 1 pod/perl581delta.pod \ @@ -788,6 +788,7 @@ _quick3p= Test2::EventFacet::Trace 3p lib/Test2/EventFacet/Trace.pm \ Test2::Formatter 3p lib/Test2/Formatter.pm \ Test2::Formatter::TAP 3p lib/Test2/Formatter/TAP.pm \ + Test2::Handle 3p lib/Test2/Handle.pm \ Test2::Hub 3p lib/Test2/Hub.pm \ Test2::Hub::Interceptor 3p lib/Test2/Hub/Interceptor.pm \ Test2::Hub::Interceptor::Terminator 3p lib/Test2/Hub/Interceptor/Terminator.pm \ @@ -883,6 +884,9 @@ _quick3p= Test2::Util::Times 3p lib/Test2/Util/Times.pm \ Test2::Util::Trace 3p lib/Test2/Util/Trace.pm \ Test2::V0 3p lib/Test2/V0.pm \ + Test2::V1 3p lib/Test2/V1.pm \ + Test2::V1::Base 3p lib/Test2/V1/Base.pm \ + Test2::V1::Handle 3p lib/Test2/V1/Handle.pm \ Test2::Workflow 3p lib/Test2/Workflow.pm \ Test2::Workflow::BlockBase 3p lib/Test2/Workflow/BlockBase.pm \ Test2::Workflow::Build 3p lib/Test2/Workflow/Build.pm \ Index: gnu/usr.bin/perl/README.aix =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/README.aix,v diff -u -p -a -u -p -r1.5 README.aix --- gnu/usr.bin/perl/README.aix 14 May 2024 19:38:53 -0000 1.5 +++ gnu/usr.bin/perl/README.aix 16 Nov 2026 00:57:36 -0000 @@ -28,7 +28,8 @@ the AIX Toolbox which is shipped with AI Currently all versions of IBM's "xlc", "xlc_r", "cc", "cc_r" or "vac" ANSI/C compiler will work for building Perl if that compiler -works on your system. +works on your system. ibm-clang and ibm-clang_r will work as well, +which is recommended on AIX 7.2 and 7.3. If you plan to link Perl to any module that requires thread-support, like DBD::Oracle, it is better to use the _r version of the compiler. @@ -55,10 +56,20 @@ from IBM (April 2009 PTF for XL C/C++ En If you choose XL C/C++ V11 you need the April 2010 PTF (or newer) installed otherwise you will not get a working Perl version. -Perl can be compiled with either IBM's ANSI C compiler or with gcc. -The former is recommended, as not only it can compile Perl with no -difficulty, but also can take advantage of features listed later -that require the use of IBM compiler-specific command-line flags. +I is also supported for AIX 7.2 and 7.3. +As of 2025-07, the following version is supported: + + IBM Open XL C/C++ for AIX V17 + +If you choose the Open XL C/C++ compiler (ibm-clang/ibm-clang_r), it should +work out of the box. + +Perl can be compiled with either IBM's ANSI C compiler, IBM's Open XL clang +compiler, or with gcc. It is recommended to use the Open XL clang compiler, as +not only can it compile Perl with no difficulty, but also can take advantage +of features listed later that require the use of IBM compiler-specific +command-line flags and support newer compiler features only available in clang +and gcc. If you decide to use gcc, make sure your installation is recent and complete, and be sure to read the Perl INSTALL file for more gcc-specific @@ -127,7 +138,7 @@ Should yield no problems. =head2 Threaded Perl -Should yield no problems with AIX 5.1 / 5.2 / 5.3 / 6.1 / 7.1. +Should yield no problems with AIX 5.1 / 5.2 / 5.3 / 6.1 / 7.1 / 7.2 / 7.3. IBM uses the AIX system Perl (V5.6.0 on AIX 5.1 and V5.8.2 on AIX 5.2 / 5.3 and 6.1; V5.8.8 on AIX 5.3 TL11 and AIX 6.1 TL4; V5.10.1 @@ -175,6 +186,22 @@ enable long doubles, for most of the bro workarounds, but the handling of the special values infinity and NaN remains badly broken: for example infinity plus zero results in NaN. +=head2 Recommended Options AIX 7.2 and 7.3 (threaded/32-bit) + +With the following options you get a threaded Perl version which +passes all make tests in threaded 32-bit mode. + + rm config.sh + ./Configure \ + -d \ + -Dcc=/opt/IBM/openxlC/17.1.3/bin/ibm-clang_r + -Duseshrplib \ + -Dusethreads \ + -Dprefix=/usr/opt/perl5_32 + +The -Dprefix option will install Perl in a directory parallel to the +IBM AIX system Perl installation. + =head2 Recommended Options AIX 5.1/5.2/5.3/6.1 and 7.1 (threaded/32-bit) With the following options you get a threaded Perl version which @@ -189,12 +216,27 @@ configuration for the Perl builds that A -Dusethreads \ -Dprefix=/usr/opt/perl5_32 -The -Dprefix option will install Perl in a directory parallel to the +The -Dprefix option will install Perl in a directory parallel to the +IBM AIX system Perl installation. + +=head2 Recommended Options AIX 7.2 and 7.3 (32-bit) + +With the following options you get a Perl version which passes +all make tests in 32-bit mode. + + rm config.sh + ./Configure \ + -d \ + -Dcc=/opt/IBM/openxlC/17.1.3/bin/ibm-clang_r + -Duseshrplib \ + -Dprefix=/usr/opt/perl5_32 + +The -Dprefix option will install Perl in a directory parallel to the IBM AIX system Perl installation. =head2 Recommended Options AIX 5.1/5.2/5.3/6.1 and 7.1 (32-bit) -With the following options you get a Perl version which passes +With the following options you get a Perl version which passes all make tests in 32-bit mode. rm config.sh @@ -207,36 +249,72 @@ all make tests in 32-bit mode. The -Dprefix option will install Perl in a directory parallel to the IBM AIX system Perl installation. +=head2 Recommended Options AIX 7.2 and 7.3 (threaded/64-bit) + +With the following options you get a threaded Perl version which +passes all make tests in threaded 64-bit mode. + + export OBJECT_MODE=64 + # or (depending on your shell) + setenv OBJECT_MODE 64 + rm config.sh + ./Configure \ + -d \ + -Dcc=/opt/IBM/openxlC/17.1.3/bin/ibm-clang_r + -Duseshrplib \ + -Dusethreads \ + -Duse64bitall \ + -Dprefix=/usr/opt/perl5_64 + =head2 Recommended Options AIX 5.1/5.2/5.3/6.1 and 7.1 (threaded/64-bit) With the following options you get a threaded Perl version which passes all make tests in 64-bit mode. - export OBJECT_MODE=64 / setenv OBJECT_MODE 64 (depending on your shell) + export OBJECT_MODE=64 + # or (depending on your shell) + setenv OBJECT_MODE 64 + rm config.sh + ./Configure \ + -d \ + -Dcc=cc_r \ + -Duseshrplib \ + -Dusethreads \ + -Duse64bitall \ + -Dprefix=/usr/opt/perl5_64 + +=head2 Recommended Options AIX 7.2 and 7.3 (64-bit) + +With the following options you get a threaded Perl version which +passes all make tests in threaded 64-bit mode. + + export OBJECT_MODE=64 + # or (depending on your shell) + setenv OBJECT_MODE 64 + rm config.sh + ./Configure \ + -d \ + -Dcc=/opt/IBM/openxlC/17.1.3/bin/ibm-clang_r + -Duseshrplib \ + -Duse64bitall \ + -Dprefix=/usr/opt/perl5_64 - rm config.sh - ./Configure \ - -d \ - -Dcc=cc_r \ - -Duseshrplib \ - -Dusethreads \ - -Duse64bitall \ - -Dprefix=/usr/opt/perl5_64 =head2 Recommended Options AIX 5.1/5.2/5.3/6.1 and 7.1 (64-bit) With the following options you get a Perl version which passes all -make tests in 64-bit mode. +make tests in 64-bit mode. - export OBJECT_MODE=64 / setenv OBJECT_MODE 64 (depending on your shell) - - rm config.sh - ./Configure \ - -d \ - -Dcc=cc_r \ - -Duseshrplib \ - -Duse64bitall \ - -Dprefix=/usr/opt/perl5_64 + export OBJECT_MODE=64 + # or (depending on your shell) + setenv OBJECT_MODE 64 + rm config.sh + ./Configure \ + -d \ + -Dcc=cc_r \ + -Duseshrplib \ + -Duse64bitall \ + -Dprefix=/usr/opt/perl5_64 The -Dprefix option will install Perl in a directory parallel to the IBM AIX system Perl installation. @@ -246,7 +324,6 @@ following option: -Dcc='gcc -maix64' - =head2 Compiling Perl 5 on AIX 7.1.0 A regression in AIX 7 causes a failure in make test in Time::Piece during @@ -255,7 +332,6 @@ test to see if it's required, assuming i in Eastern Time, would be to run C< TZ=EST5 date +%Z >. This will come back with C normally, but nothing if you have the problem. - =head2 Compiling Perl 5 on older AIX versions up to 4.3.3 Due to the fact that AIX 4.3.3 reached end-of-service in December 31, @@ -482,7 +558,7 @@ threads are used in combination with 64- You may get a warning when doing a threaded build: - "pp_sys.c", line 4640.39: 1506-280 (W) Function argument assignment + "pp_sys.c", line 4640.39: 1506-280 (W) Function argument assignment between types "unsigned char*" and "const void*" is not allowed. The exact line number may vary, but if the warning (W) comes from a line Index: gnu/usr.bin/perl/README.haiku =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/README.haiku,v diff -u -p -a -u -p -r1.19 README.haiku --- gnu/usr.bin/perl/README.haiku 19 Aug 2026 00:19:00 -0000 1.19 +++ gnu/usr.bin/perl/README.haiku 16 Nov 2026 00:57:36 -0000 @@ -24,9 +24,9 @@ The build procedure is completely standa Make perl executable and create a symlink for libperl: chmod a+x /boot/common/bin/perl - cd /boot/common/lib; ln -s perl5/5.42.3/BePC-haiku/CORE/libperl.so . + cd /boot/common/lib; ln -s perl5/5.44.0/BePC-haiku/CORE/libperl.so . -Replace C<5.42.3> with your respective version of Perl. +Replace C<5.44.0> with your respective version of Perl. =head1 KNOWN PROBLEMS Index: gnu/usr.bin/perl/README.linux =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/README.linux,v diff -u -p -a -u -p -r1.4 README.linux --- gnu/usr.bin/perl/README.linux 14 May 2024 19:38:53 -0000 1.4 +++ gnu/usr.bin/perl/README.linux 16 Nov 2026 00:57:36 -0000 @@ -16,9 +16,9 @@ version 5 (hereafter just Perl) is compi =head2 Deploying Perl on Linux Normally one can install F on Linux using your distribution's -package manager (e.g: C, or +package manager (e.g., C, or C). Note that sometimes one needs to install some -extra system packages in order to be able to use CPAN frontends, and that +extra system packages in order to be able to use CPAN packages, and that messing with the system's perl is not always recommended. One can use L to avoid such issues. @@ -32,7 +32,7 @@ Linux. As of May 2019, the last stable buy support contracts for them. There are some special instructions for building Perl with Sun Studio on -Linux. Following the normal C, you have to run make as follows: +Linux. Following the normal C, you have to run F as follows: LDLOADLIBS=-lc make Index: gnu/usr.bin/perl/README.macosx =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/README.macosx,v diff -u -p -a -u -p -r1.19 README.macosx --- gnu/usr.bin/perl/README.macosx 19 Aug 2026 00:19:00 -0000 1.19 +++ gnu/usr.bin/perl/README.macosx 16 Nov 2026 00:57:36 -0000 @@ -12,9 +12,9 @@ perlmacosx - Perl under Mac OS X This document briefly describes Perl under Mac OS X. - curl -O https://www.cpan.org/src/perl-5.42.3.tar.gz - tar -xzf perl-5.42.3.tar.gz - cd perl-5.42.3 + curl -O https://www.cpan.org/src/perl-5.44.0.tar.gz + tar -xzf perl-5.44.0.tar.gz + cd perl-5.44.0 ./Configure -des -Dprefix=/usr/local/ make make test @@ -22,7 +22,7 @@ This document briefly describes Perl und =head1 DESCRIPTION -The latest Perl release (5.42.3 as of this writing) builds without changes +The latest Perl release (5.44.0 as of this writing) builds without changes under all versions of Mac OS X from 10.3 "Panther" onwards. In order to build your own version of Perl you will need 'make', Index: gnu/usr.bin/perl/README.openbsd =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/README.openbsd,v diff -u -p -a -u -p -r1.3 README.openbsd --- gnu/usr.bin/perl/README.openbsd 14 May 2024 19:38:53 -0000 1.3 +++ gnu/usr.bin/perl/README.openbsd 16 Nov 2026 00:57:36 -0000 @@ -17,9 +17,9 @@ version 5 (hereafter just Perl) is compi When Perl is configured to use ithreads, it will use re-entrant library calls in preference to non-re-entrant versions. There is an incompatibility in -OpenBSD's C and C function in versions 3.7 +OpenBSD's C and C functions in versions 3.7 and later that will cause a SEGV when called without doing a C on -their return structs prior to calling these functions. Current Perl's +their return structs prior to calling these functions. Current Perls should handle this problem correctly. Older threaded Perls (5.8.6 or earlier) will run into this problem. If you want to run a threaded Perl on OpenBSD 3.7 or higher, you will need to upgrade to at least Perl 5.8.7. Index: gnu/usr.bin/perl/README.os2 =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/README.os2,v diff -u -p -a -u -p -r1.35 README.os2 --- gnu/usr.bin/perl/README.os2 19 Aug 2026 00:19:00 -0000 1.35 +++ gnu/usr.bin/perl/README.os2 16 Nov 2026 00:57:36 -0000 @@ -621,7 +621,7 @@ C in F, =item Additional Perl modules - unzip perl_ste.zip -d f:/perllib/lib/site_perl/5.42.3/ + unzip perl_ste.zip -d f:/perllib/lib/site_perl/5.44.0/ Same remark as above applies. Additionally, if this directory is not one of directories on @INC (and @INC is influenced by C), you Index: gnu/usr.bin/perl/README.os390 =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/README.os390,v diff -u -p -a -u -p -r1.7 README.os390 --- gnu/usr.bin/perl/README.os390 14 May 2024 19:38:53 -0000 1.7 +++ gnu/usr.bin/perl/README.os390 16 Nov 2026 00:57:36 -0000 @@ -15,315 +15,274 @@ on z/OS Unix System Services. =head1 DESCRIPTION -This is a ported Perl for z/OS. It has been tested on z/OS 2.4 and -should work fine with z/OS 2.5. -It may work on other versions or releases, but those are -the ones it has been tested on. - -The native character set for z/OS is EBCDIC, but it can also run in ASCII mode. -Perl can support either, but you have to compile it explicitly for one or the -other. You could have both an ASCII perl, and an EBCDIC perl on the same -machine. If you use ASCII mode and an ASCII perl, the Encode module shipped -with perl can be used to translate files from various EBCDIC code pages for -handling by perl, and then back on output - -This document describes how to build a 64-bit Dynamic Perl, either ASCII or -EBCDIC. You can interactively choose other configurations, as well as many -other options in the Configure script that is run as part of the build -process. You may need to carry out some system configuration tasks before -running Configure, as detailed below. +Perl 5.44 on z/OS has been tested on z/OS 3.1 using "Unix System Services". +There have been extensive changes in the build process (such as using a +different compiler) from earlier releases, which were tested on earlier +versions of z/OS. It could well be that this release of Perl will work on +different z/OS versions. + +=head2 EBCDIC vs ASCII + +The native character set for z/OS is EBCDIC (code page 1047 in North America), +but recent z/OS releases have added the ability for it to handle ASCII as well. +And an open source project now exists to port many open source tools, such as +C, and yes C to take advantage of these new capabilities. (A blog +post about its early development is here +L.) + +Hiding a machine's character set without sacrificing too much performance +requires extensive wizardry, not all of which is transparent, and not all of +which yet works. The project is being actively developed with significant +contributions by IBM of staff and machine time. The project is called B. L brings you to its landing page. + +Basically, files and streams need to have extra information about their +character set. This can easily require manual intervention to get things to +work. For background, including what steps you must do to get this to work +on your inputs, see +L + +You can obtain this Perl port at L. At the +moment this is written, one configuration of perl is available: dynamic +loading, unthreaded, non-debugging. You can customize it to some extent by +modifying the file F. Refer to L below for hints +on that. Also, refer to L below. + +=head2 EBCDIC perl + +The rest of this document describes how to build a perl that runs native EBCDIC +on z/OS. + +z/OS Unix System Services has a native shell much like C or C, and +Unix commands that are similar to ones in Linux, such as C. Available +options for these may differ from the Linux ones. + +There aren't any known 32-bit z/OS systems in existence anymore, so this +document describes how to build a 64-bit EBCDIC Perl. + +Most CPAN modules have been written assuming ASCII. They may or may not work +on EBCDIC. What we have found is that many do work, either mostly or +completely, but may not appear to pass all their tests. Often the failures are +in edge cases that may not come up in mainstream uses. Also any given failure +may not actually be a real failure, but a problem with the test. This is +because the typical test compares results with expected values which the test's +author often hard-coded assuming ASCII, so the test is wrong, and the code is +correct. Also, some failures may not be important for you. For example, if you +do a plain C, ASCII will have the digits first, uppercase letters next, +and lowercase last. EBCDIC sorts the opposite. If your application really +needs ASCII ordering, the module won't give the proper results; but often you +just need a consistent sorting, and for that purpose the module could work +perfectly well. + +Perl itself is shipped with some CPAN modules included. Some of these do not +yet work fully on EBCDIC, and therefore testing of them is suppressed. See +L =head2 Tools -You will want to get GNU make 4.1 or later. GNU make can be downloaded from a -port that Rocket Software provides. You will need the z/OS c99 compiler from -IBM (though xlc in c99 mode without optimization turned on works in EBCDIC). - -If you want the latest development version of Perl, you will need git. -You can use git on another platform and transfer the result via sftp or ftp to -z/OS. But there is a z/OS native git client port available through Rocket -Software. - -You may also need the gunzip client port that Rocket Software provides to unzip -any zipped tarball you upload to z/OS. - -=head2 Building a 64-bit Dynamic ASCII Perl - -For building from an official stable release of Perl, go to -L and choose any one of the -"Download latest stable source" buttons. This will get you a tarball. The -name of that tarball will be something like 'perl-V.R.M,tar,gz', where V.R.M is -the version/release/modification of the perl you are downloading. Do +The tools required for building perl are available as: - gunzip perl-V.R.M.tar.gz +=over -Then one of: +=item * native commands on z/OS - tar -xvf perl-V.R.M.tar +z/OS has versions of many tools that come with the Linux OS. Some of these +don't have as many options as replacements available in the next group: - pax -r -f perl-V.R.M.tar +=item * through the zopen community -Either of these will create the source directory. You can rename it to -whatever you like; for these instructions, 'perl' is assumed to be the name. +C and C for example. Also you can get C itself. -If instead you want the latest unstable development release, using the native -git on z/OS, clone Perl: +=item * at no cost from IBM - git clone https://github.com/Perl/perl5.git perl +L. These +include GNU make, which you will need. -Either way, once you have a 'perl' directory containing the source, cd into it, -and tag all the code as ASCII: - - cd perl - chtag -R -h -t -cISO8859-1 * +=back -Configure the build environment as 64-bit, Dynamic, ASCII, development, -deploying it to F: +=head2 Building EBCDIC Perl on z/OS - export PATH=$PWD:$PATH - export LIBPATH=$PWD:$PATH - ./Configure -Dprefix=/usr/local/perl/ascii -des -Dusedevel \ - -Duse64bitall -Dusedl - -If you are building from a stable source, you don't need "-Dusedevel". -(If you run Configure without options, it will interactively ask you about -every possible option based on its probing of what's available on your -particular machine, so you can choose as you go along.) +=head3 Getting perl source -Run GNU make to build Perl +You'll first need a tarball. At the moment this is written, there are no +EBCDIC tarballs published, but it is easy to create one given that you have +access to a system with any relatively modern perl. - make +Get an ASCII tarball. Choose one of the following: -Run tests to ensure Perl is working correctly. Currently, there are about a -dozen failing tests out of nearly 2500 +=over 4 - make test_harness +=item Official stable release -Install Perl into F: +Go to L and choose any one of the "Download +latest Linuxy stable source" buttons. The name of that tarball will be +something like I, where V.R.M is the +version/release/modification of the perl you are downloading. Do - make install + gunzip perl-V.R.M.tar.gz + pax -r -f perl-V.R.M.tar -=head2 Building a 64-bit Dynamic EBCDIC Perl +(or C instead of C) -You will need a working perl on some box with connectivity to the destination -machine. On z/OS, it could be an ASCII perl, or a previous EBCDIC one. -Many machines will already have a pre-built perl already running, or one can -easily be downloaded from L. +This will create a directory named I, which you can rename to be +whatever you want. The instructions below assume you choose F. -Follow the directions above in "Building a 64-bit Dynamic ASCII Perl" as far as -getting a populated 'perl' directory. Then come back here to proceed. +=item Development release -The downloaded perl will need to be converted to 1047 EBCDIC. To do this: +If instead you want the latest unstable development release, clone Perl: - cd perl - Porting/makerel -e + git clone https://github.com/Perl/perl5.git perl -If the Porting/makerel step fails with an error that it can not issue the tar -command, proceed to issue the command interactively, where V.R.M is the -version/release/modification of Perl you are uploading: +=back - cd ../ - tar cf - --format=ustar perl-V.R.M | gzip --best > perl-V.R.M.tar.gz +Either way, after getting the C directory populated, do -Use sftp to upload the zipped tar file to z/OS: + cd perl + perl Porting/makerel -e - sftp - cd /tmp - put perl-V.R.M.tar.gz +This will use whatever perl already is on the system to create an EBCDIC +tarball named I. -Unzip and untar the zipped tar file on z/OS: +Use C or C to copy the tarball to the target z/OS system. Then, from +the directory where it is located, do - cd /tmp gunzip perl-V.R.M.tar.gz - -Then one of: - - tar -xvf perl-V.R.M.tar - pax -r -f perl-V.R.M.tar + mv perl-V.R.M perl + cd perl + +(You likely can't use C instead of C here.) -You now have the source code for the EBCDIC Perl on z/OS and can proceed to -build it. This is analagous to how you would build the code for ASCII, but -note: you B tag the code but instead leave it untagged. +=head3 Configuring perl -Configure the build environment as 64-bit, Dynamic, native, development, -deploying it to F: +Now it is time to Configure it to your needs. If you need a dynamically +loading perl (see below), first do: export PATH=$PWD:$PATH - export LIBPATH=$PWD:$PATH - ./Configure -Dprefix=/usr/local/perl/ebcdic -des -Dusedevel \ - -Duse64bitall -Dusedl - -If you are building from a stable source, you don't need "-Dusedevel". -(If you run Configure without options, it will interactively ask you about -every possible option based on its probing of what's available on your -particular machine, so you can choose as you go along.) + export LIBPATH=$PWD:$LIBPATH -Run GNU make to build Perl +Then run Configure - make + ./Configure -Dprefix=/path-to/install/directory -des \ + OTHER-OPTIONS-AS-BELOW -Run tests to ensure Perl is working correctly. +C<-d> means to use the default configuration values. This is important, as we +have set those up specifically for z/OS. - make test_harness +C<-e> means to continue on to the bitter end, not stopping the process early. -You might also want to have GNU groff for OS/390 installed before -running the "make install" step for Perl. +C<-s> means to avoid unnecessary output verbiage. This parameter is optional. -Install Perl into F: +If the perl is an unstable development release, add C<-Dusedevel> as one of the +C - make install - -EBCDIC Perl is still a work in progress. All the core code works as far as we -know, but various modules you might want to download from CPAN do not. The -failures range from very minor to catastrophic. Many of them are simply bugs -in the tests, with the module actually working properly. This happens because, -for example, the test is coded to expect a certain character ASCII code point; -when it gets the EBCDIC value back instead, it complains. But the code -actually worked. Other potential failures that aren't really failures stem -from checksums coming out differently, since C, for example, has a different -bit representation between the character sets. A test that is expecting the -ASCII value will show failure, even if the module is working perfectly. Also -in sorting, uppercase letters come before lowercase letters on ASCII systems; -the reverse on EBCDIC. - -Some CPAN modules come bundled with the downloaded perl. And a few of those -have yet to be fixed to pass on EBCDIC platforms. As a result they are skipped -when you run 'make test'. The current list is: - - Archive::Tar - Config::Perl::V - CPAN::Meta - CPAN::Meta::YAML - Digest::MD5 - Digest::SHA - Encode - ExtUtils::MakeMaker - ExtUtils::Manifest - HTTP::Tiny - IO::Compress - IPC::Cmd - JSON::PP - libnet - MIME::Base64 - Module::Metadata - PerlIO::via-QuotedPrint - Pod::Checker - podlators - Pod::Simple - Socket - Test::Harness - -See also F for other potential gotchas. - -=head2 Setup and utilities for Perl on OS/390 - -This may also be a good time to ensure that your F file -and either your F or F files are in place. -The IBM document that describes such USS system setup issues is -"z/OS UNIX System Services Planning" - -For successful testing you may need to turn on the sticky bit for your -world readable /tmp directory if you have not already done so (see man chmod). +If you think you may want to debug the perl, add C<-DDEBUGGING -Aoptimize=-g3 +-Aoptimize=-ggdb3>. -=head2 Useful files for trouble-shooting +To silence some unnecessary compilation warnings, you can add +C<-Accflags=-Wno-deprecated>. -If your configuration is failing, read hints/os390.sh -This file provides z/OS specific options to direct the build process. +To optimize the resultant perl binary, add C<-Aoptimize=-O2>, or C<-O3>, both +of which have been tested on z/OS 3.1. -=head3 Shell +If you will want to use modules from CPAN (like C (and Cs), +C, and C), consider using dynamic loading. This isn't +necessary if all such modules you might want are written only in Perl, but if +some of them are compiled (meaning they contain XS code), you'll either need to +recompile all of perl when you add one, or set it up initially to use dynamic +loading. To do this, add C<-Dusedl> to the Configure options. -A message of the form: +When Configure is run using the z/OS native shell, you'll see a message like (I see you are using the Korn shell. Some ksh's blow up on Configure, mainly on older exotic systems. If yours does, try the Bourne shell instead.) -is nothing to worry about at all. +The native shell looks like C, and it works fine, so just ignore the +message. -=head3 Dynamic loading +F currently will output errors in finding the header dependencies +various object files have. This just means that they may be recompiled +unnecessarily. -Dynamic loading is required if you want to use XS modules from CPAN (like -DBI (and DBD's), JSON::XS, and Text::CSV_XS) or update CORE modules from -CPAN with newer versions (like Encode) without rebuilding all of the perl -binary. +=head3 Building perl + +Run GNU make to build Perl + + make -The instructions above will create a dynamic Perl. If you do not want to -use dynamic loading, remove the -Dusedl option. -See the comments in hints/os390.sh for more information on dynamic loading. +This will currently likely crash in making the Encode module. To work around +that, execute the following command -=head3 Optimizing + chtag -tc IBM-1047 cpan/Encode/Makefile -Optimization has not been turned on yet. There may be issues if Perl -is optimized. +and rerun C. You may have to repeat this a second time. -=head2 Build Anomalies with Perl on OS/390 +=head3 Testing perl -"Out of memory!" messages during the build of Perl are most often fixed -by re building the GNU make utility for OS/390 from a source code kit. + TEST_JOBS=n make test_harness -Within USS your F or F<$HOME/.profile> may limit your ulimit -settings. Check that the following command returns reasonable values: +where I is the number of tests to run in parallel. On hardware that is +single core, 2 or 3 work well. A common value (if you aren't crowding out +other users) is to set I to twice the number of cores available, plus 1. - ulimit -a +Some tests currently fail. -To conserve memory you should have your compiler modules loaded into the -Link Pack Area (LPA/ELPA) rather than in a link list or step lib. +The failing tests in C, C, F, and +F are false alarms. -If the compiler complains of syntax errors during the build of the -Socket extension then be sure to fix the syntax error in the system -header /usr/include/sys/socket.h. +The failing tests in F show that the generated +warning for a particular very edge case is not exactly as expected and is +somewhat misleading. -=head2 Testing Anomalies with Perl on OS/390 +=head3 Known Bugs -The "make test" step runs a Perl Verification Procedure, usually before -installation. You might encounter STDERR messages even during a successful -run of "make test". Here is a guide to some of the more commonly seen -anomalies: +If zopen is installed on your machine, it is important to get the C +variable correct. When running the zopen port of Perl, its directories should +come first. When running the EBCDIC perl, the zopen directories should either +not be in the PATH variable, or come last. For example, F needs to +have precedence over the zopen version in this case. -=head3 Out of Memory (31-bit only) +=head4 Bugs in both EBCDIC and ASCII versions -Out of memory problems should not be an issue, unless you are attempting to build -a 31-bit Perl. +ExtUtils::MakeMaker does not work properly on perls built for dynamic loading. -If you _are_ building a 31-bit Perl, the constrained environment may mean you -need to change memory options for Perl. -In addition to the comments -above on memory limitations it is also worth checking for _CEE_RUNOPTS -in your environment. Perl now has (in miniperlmain.c) a C #pragma for 31-bit only -to set CEE run options, but the environment variable wins. +=head4 Bugs only in the EBCDIC mode -The 31-bit C code asks for: +Some cpan modules shipped with perl do not yet work fully on EBCDIC, and +therefore testing of them is suppressed. You can see which by examining +F and searching for EBCDIC. Almost all of the problems with these are +in the cases where their input is from some other encoding. These could be +because they communicate with a remote ASCII system, or read from a file +containing some other encoding. So, for example, L works fine on +files encoded in EBCDIC, but will fail miserably for files encoded in a +Cyrillic encoding. - #pragma runopts(HEAP(2M,500K,ANYWHERE,KEEP,8K,4K) STACK(,,ANY,) ALL31(ON)) +Fixes for these are under active development. -The important parts of that are the second argument (the increment) to HEAP, -and allowing the stack to be "Above the (16M) line". If the heap -increment is too small then when perl (for example loading unicode/Name.pl) tries -to create a "big" (400K+) string it cannot fit in a single segment -and you get "Out of Memory!" - even if there is still plenty of memory -available. +=head4 Bugs only in the ASCII mode -A related issue is use with perl's malloc. Perl's malloc uses C -to get memory, and C is limited to the first allocation so in this -case something like: +Currently, in the zopen port of Perl, there are some issues when using UTF-8 +locales; some of these lead to segfaults. - HEAP(8M,500K,ANYWHERE,KEEP,8K,4K) +=head3 Installing perl -is needed to get through the test suite. + make install -=head2 Usage Hints for Perl on z/OS +will install perl into the directory you gave in the command -When using Perl on z/OS please keep in mind that the EBCDIC and ASCII -character sets are different. See L for more on such character -set issues. Perl builtin functions that may behave differently under -EBCDIC are also mentioned in the perlport.pod document. + ./Configure -Dprefix=/path-to/install/directory ... -If you are having trouble with square brackets then consider switching your -rlogin or telnet client. Try to avoid older 3270 emulators and ISHELL for -working with Perl on USS. +=head2 Optimization -=head2 Modules and Extensions for Perl on z/OS (Static Only) +Perl is now built using the C compiler. Previous releases used +different compilers, and for them, optimization seemed iffy, so we recommended +against doing it. (And we didn't revisit that advice with newer releases to +see if things had gotten fixed, so that recommendation may have been outdated.) +But with C it does seem to work, and L above gives +instructions for enabling it. + +=head2 Installing other modules Pure Perl (that is non XS) modules may be installed via the usual: @@ -332,7 +291,7 @@ Pure Perl (that is non XS) modules may b make test make install -If you built perl with dynamic loading capability then that would also +If you built perl with dynamic loading capability, then that would also be the way to build XS based extensions. However, if you built perl with static linking you can still build XS based extensions for z/OS but you will need to follow the instructions in ExtUtils::MakeMaker for @@ -346,36 +305,12 @@ building a static perl + XS extension bo make install make -f Makefile.aperl inst_perl MAP_TARGET=perl -=head2 Running Perl on z/OS +=head2 Running EBCDIC Perl on z/OS To run the 64-bit Dynamic Perl environment, update your PATH and LIBPATH to include the location you installed Perl into, and then run the perl you installed as perlV.R.M where V/R/M is the Version/Release/Modification level of the current development level. -If you are running the ASCII/EBCDIC Bi-Modal Perl environment, you also need to -set up your ASCII/EBCDIC Bi-Modal environment variables, and ensure any Perl -source code you run is tagged appropriately as ASCII or EBCDIC using -"chtag -t -c": - -=over - -=item For ASCII Only: - - export _BPXK_AUTOCVT=ON - export _CEE_RUNOPTS="FILETAG(AUTOCVT,AUTOTAG),POSIX(ON)" - export _TAG_REDIR_ERR="txt" - export _TAG_REDIR_IN="txt" - export _TAG_REDIR_OUT="txt" - -=item For ASCII or EBCDIC: - - export PATH=/usr/local/perl/ascii:$PATH - export LIBPATH=/usr/local/perl/ascii/lib:$LIBPATH - perlV.R.M args - -=back - -If tcsh is your login shell then use the setenv command. =head1 AUTHORS @@ -388,15 +323,11 @@ Thanks to John Goodyear for dynamic load Mike Fulton and Karl Williamson have provided updates for UTF8, DLL, 64-bit and ASCII/EBCDIC Bi-Modal support -=head1 OTHER SITES - -L provides documentation and tools -for building various z/OS Perl configurations and has some useful tools in the -'bin' directory you may want to use for building z/OS Perl yourself. - =head1 HISTORY -Updated 24 December 2021 to enable initial ASCII support +Updated 25 May 2026 to reflect Perl v5.44 and L. + +Updated 24 December 2021 to enable initial ASCII support. Updated 03 October 2019 for perl-5.33.3+ @@ -416,4 +347,3 @@ This document was originally written by release of Perl. =cut - Index: gnu/usr.bin/perl/README.vms =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/README.vms,v diff -u -p -a -u -p -r1.36 README.vms --- gnu/usr.bin/perl/README.vms 19 Aug 2026 00:19:00 -0000 1.36 +++ gnu/usr.bin/perl/README.vms 16 Nov 2026 00:57:36 -0000 @@ -139,11 +139,11 @@ You may need to set up a foreign symbol choice. Once you have done so, use a command like the following to unpack the archive: - vmstar -xvf perl-5^.42^.3.tar + vmstar -xvf perl-5^.44^.0.tar Then set default to the top-level source directory like so: - set default [.perl-5^.42^.3] + set default [.perl-5^.44^.0] and proceed with configuration as described in the next section. Index: gnu/usr.bin/perl/README.win32 =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/README.win32,v diff -u -p -a -u -p -r1.25 README.win32 --- gnu/usr.bin/perl/README.win32 26 Dec 2025 22:14:12 -0000 1.25 +++ gnu/usr.bin/perl/README.win32 16 Nov 2026 00:57:36 -0000 @@ -14,7 +14,7 @@ These are instructions for building Perl =head1 DESCRIPTION -Before you start, you should glance through the README file +Before you start, you should glance through the F file found in the top-level directory to which the Perl distribution was extracted. Make sure you read and understand the terms under which this software is being distributed. @@ -22,13 +22,13 @@ which this software is being distributed Also make sure you read L below for the known limitations of this port. -The INSTALL file in the perl top-level has much information that is +The F file in the perl top-level has much information that is only relevant to people building Perl on Unix-like systems. In particular, you can safely ignore any information that talks about -"Configure". +F. You may also want to look at one other option for building a perl that -will work on Windows: the README.cygwin file, which give a different +will work on Windows: the F file, which give a different set of rules to build a perl for Windows. This method will probably enable you to build a more Unix-compatible perl, but you will also need to download and use various other build-time and run-time support @@ -43,30 +43,30 @@ following compilers on the Intel x86 and Microsoft Visual C++ Visual C++ 2015 (version 14.0) or later Intel C++ Compiler (experimental) - Gcc by mingw.org gcc version 3.4.5-5.3.0 - Gcc by mingw-w64.org gcc version 4.4.3 or later + GCC by mingw.org GCC version 3.4.5-5.3.0 + GCC by mingw-w64.org GCC version 4.4.3 or later Note that the last two of these are actually competing projects both -delivering complete gcc toolchain for MS Windows: +delivering complete GCC toolchain for MS Windows: =over 4 =item L -Delivers gcc toolchain building 32-bit executables (which can be used both 32 and 64 bit Windows platforms) +Delivers GCC toolchain building 32-bit executables (which can be used both 32 and 64 bit Windows platforms) =item L -Delivers gcc toolchain targeting both 64-bit Windows and 32-bit Windows -platforms (despite the project name "mingw-w64" they are not only 64-bit -oriented). They deliver the native gcc compilers and cross-compilers +Delivers GCC toolchain targeting both 64-bit Windows and 32-bit Windows +platforms (despite the project name I they are not only 64-bit +oriented). They deliver the native GCC compilers and cross-compilers that are also supported by perl's makefile. =back The Microsoft Visual C++ compilers are also now being given away free. They -are available as "Visual C++ 2015-2022 Community Edition" and are the same -compilers that ship with "Visual C++ 2015-2022 Professional". +are available as "Visual C++ 2015-2026 Community Edition" and are the same +compilers that ship with "Visual C++ 2015-2026 Professional". The MinGW64 compiler is available at L. The latter is actually a cross-compiler targeting Win64. There's also a trimmed @@ -74,9 +74,9 @@ down compiler (no java, or gfortran) sui L NOTE: If you're using a 32-bit compiler to build perl on a 64-bit Windows -operating system, then you should set the WIN64 environment variable to "undef". -Also, the trimmed down compiler only passes tests when USE_ITHREADS *= define -(as opposed to undef) and when the CFG *= Debug line is commented out. +operating system, then you should set the C environment variable to C. +Also, the trimmed down compiler only passes tests when C +(as opposed to C) and when the C line is commented out. This port fully supports MakeMaker (the set of modules that is used to build extensions to perl). Therefore, you should be @@ -90,14 +90,14 @@ See L =item Make You need a "make" program to build the sources. If you are using -Visual C++, you can use nmake supplied with Visual C++. -You may also use gmake instead of nmake. Builds using gcc need -gmake. nmake is not supported for gcc builds. Parallel building is only -supported with gmake, not nmake. +Visual C++, you can use C supplied with Visual C++. +You may also use C instead of C. Builds using GCC need +C. C is not supported for GCC builds. Parallel building is only +supported with C, not C. =item Command Shell -Use the default "cmd" shell that comes with Windows. Some versions of the +Use the default C shell that comes with Windows. Some versions of the popular 4DOS/NT shell have incompatibilities that may cause you trouble. If the build fails under that shell, try building again with the cmd shell. @@ -116,22 +116,22 @@ compiler product, these batch files will environment variable so you may just type them without an absolute path into your console. If you need to find the absolute path to the batch file, it is usually found somewhere like -C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC. +F. With some newer Microsoft C products (released after ~2004), the installer will put a shortcut in the start menu to launch a new console window with the console already set up for your target architecture (x86-32 or x86-64 or IA64). With the newer compilers, you may also use the older batch files if you choose so. -=item Microsoft Visual C++ 2015-2022 Community Edition +=item Microsoft Visual C++ 2015-2026 Community Edition -These free versions of Visual C++ 2015-2022 Professional contain the same +These free versions of Visual C++ 2015-2026 Professional contain the same compilers and linkers that ship with the full versions, and also contain everything necessary to build Perl. These packages can be downloaded from L. -Install Visual C++ 2015-2022 Community, then setup your environment +Install Visual C++ 2015-2026 Community, then setup your environment using, e.g. F @@ -139,7 +139,7 @@ F. You will need to edit that -file to set C to one of C-C first. +file to set C to one of C-C first. =item Microsoft C++ Build Tools @@ -151,14 +151,14 @@ This is also referred to as I L -You also need gmake. Usually it comes with MinGW but its executable may have -a different name, such as mingw32-make.exe. +You also need C. Usually it comes with MinGW but its executable may have +a different name, such as F. Note that the MinGW build currently fails with version 6.3.0 or later. @@ -192,12 +192,12 @@ Make sure you are in the F subdir This directory contains a F that will work with versions of C that come with Visual C++, and a GNU make F that will work for all supported compilers. -The defaults in the C makefile are set up to build with MinGW/gcc. +The defaults in the C makefile are set up to build with MinGW/GCC. =item * -Edit the F (or F, if you're using F) and change -the values of I and C. You can also enable various build +Edit the F (or F, if you're using C) and change +the values of C and C. You can also enable various build flags. These are explained in the makefiles. Note that it is generally not a good idea to try to build a C with @@ -213,7 +213,7 @@ should be the directory that contains th F directories. If building with the cross-compiler provided by -mingw-w64.org you'll need to uncomment the line that sets +L you'll need to uncomment the line that sets C in the F. Do this only if it's the cross-compiler, ie. only if the F folder doesn't contain a F. (The cross-compiler does not provide a F, F, F, etc. Instead, all of these @@ -233,7 +233,7 @@ Be sure to read the instructions near th Type C (or C if you are using that version of C). This should build everything. Specifically, it will create F, -F at the perl toplevel, and various other extension DLL's +F at the perl toplevel, and various other extension DLL's under the F directory. If the build fails for any reason, make sure you have done the previous steps correctly. @@ -253,7 +253,7 @@ is the most commonly launched program du =head2 Testing Perl on Windows -Type "gmake test" (or "nmake test"). This will run most +Type C (or C). This will run most of the tests from the testsuite (many tests will be skipped). There should be no test failures. @@ -263,8 +263,8 @@ may crash (after all its tests have pass Universal CRT introduced in the Windows 10 April 2018 Update, and will be fixed in the May 2019 Update, as explained here: L. -If you build with certain versions (e.g. 4.8.1) of gcc from mingw then -F may fail test 17 due to a known bug in those gcc builds: +If you build with certain versions (e.g. 4.8.1) of GCC from MinGW then +F may fail test 17 due to a known bug in those GCC builds: see L. Some test failures may occur if you use a command shell other than the @@ -272,7 +272,7 @@ native "cmd.exe", or if you are building spaces. So don't do that. If you are running the tests from a emacs shell window, you may see -failures in op/stat.t. Run "gmake test-notty" in that case. +failures in F. Run C in that case. Furthermore, you should make sure that during C you do not have any GNU tool packages in your path: some toolkits like Unixutils @@ -291,7 +291,7 @@ Please report any other failures as desc =head2 Installation of Perl on Windows -Type "gmake install" ("nmake install"). This will +Type C (C). This will put the newly built perl and the libraries under whatever C points to in the Makefile. It will also install the pod documentation under C<$INST_TOP\$INST_VER\lib\pod> and HTML versions of the same @@ -770,7 +770,7 @@ and borrowed from the Hip Communications at the time. Various people have made numerous and sundry hacks since then. -GCC/mingw32 support was added in 5.005 (Nick Ing-Simmons). +GCC/MinGW32 support was added in 5.005 (Nick Ing-Simmons). Support for PERL_OBJECT was added in 5.005 (ActiveState Tool Corp). Index: gnu/usr.bin/perl/XSUB.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/XSUB.h,v diff -u -p -a -u -p -r1.24 XSUB.h --- gnu/usr.bin/perl/XSUB.h 26 Dec 2025 22:14:12 -0000 1.24 +++ gnu/usr.bin/perl/XSUB.h 16 Nov 2026 00:57:36 -0000 @@ -30,7 +30,7 @@ C>. =for apidoc Amnu|type|RETVAL Variable which is setup by C to hold the return value for an XSUB. This is always the proper type for the XSUB. See -L. +L. =for apidoc Amnu|type|THIS Variable which is setup by C to designate the object in a C++ @@ -44,7 +44,7 @@ must be called prior to setup the C to indicate the number of -items on the stack. See L. +items on the stack. See L. =for apidoc Amn|I32|ix Variable which is setup by C to indicate which of an @@ -53,12 +53,12 @@ XSUB's aliases was used to invoke it. S =for apidoc Am|SV*|ST|int ix Used to access elements on the XSUB's stack. -=for apidoc Ay||XS|name +=for apidoc Am||XS|name Macro to declare an XSUB and its C parameter list. This is handled by C. It is the same as using the more explicit C macro; the latter is preferred. -=for apidoc Ayu||XS_INTERNAL|name +=for apidoc Amu||XS_INTERNAL|name Macro to declare an XSUB and its C parameter list without exporting the symbols. This is handled by C and generally preferable over exporting the XSUB symbols unnecessarily. @@ -67,10 +67,10 @@ symbols unnecessarily. XS_INTERNAL marked 'u' because declaring a function static within our test function doesn't work -=for apidoc Ay||XS_EXTERNAL|name +=for apidoc Am||XS_EXTERNAL|name Macro to declare an XSUB and its C parameter list explicitly exporting the symbols. -=for apidoc Ay||XSPROTO|name +=for apidoc Am||XSPROTO|name Macro used by C> and C> to declare a function prototype. You probably shouldn't be using this directly yourself. @@ -128,7 +128,7 @@ is a lexical C<$_> in scope. * XS macro. * * XS_EXTERNAL is the same as XS_INTERNAL except it does not include - * "STATIC", ie. it exports XSUB symbols. You probably don't want that. + * "static", ie. it exports XSUB symbols. You probably don't want that. */ #define XSPROTO(name) void name(pTHX_ CV* cv __attribute__unused__) @@ -143,7 +143,7 @@ is a lexical C<$_> in scope. #else # define XS_EXTERNAL(name) XSPROTO(name) #endif -#define XS_INTERNAL(name) STATIC XSPROTO(name) +#define XS_INTERNAL(name) static XSPROTO(name) /* We do export xsub symbols by default for the public XS macro. * Try explicitly using XS_INTERNAL/XS_EXTERNAL instead, please. */ Index: gnu/usr.bin/perl/autodoc.pl =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/autodoc.pl,v diff -u -p -a -u -p -r1.9 autodoc.pl --- gnu/usr.bin/perl/autodoc.pl 26 Dec 2025 22:14:12 -0000 1.9 +++ gnu/usr.bin/perl/autodoc.pl 16 Nov 2026 00:57:36 -0000 @@ -7,6 +7,7 @@ use Text::Tabs; # # pod/perlintern.pod # pod/perlapi.pod +# h flag means no details. my $api = "pod/perlapi.pod"; my $intern = "pod/perlintern.pod"; @@ -74,22 +75,38 @@ use strict; use warnings; my $known_flags_re = - qr/[aA bC dD eE fF Gh iI mM nN oO pP rR sS T uU vW xX y;#?]/xx; + qr/[ aA bC dD eE fF h iI mM nN oO pP rR sS T uU v W xX y ;@\#? ] /xx; # Flags that don't apply to this program, like implementation details. -my $irrelevant_flags_re = qr/[ab eE G iI P rR vX?]/xx; +my $irrelevant_flags_re = qr/[ ab eE iI P rR X? ]/xx; # Only certain flags dealing with what gets displayed, are acceptable for # apidoc_item my $item_flags_re = qr/[dD fF mM nN oO pT uU Wx;]/xx; +# Only certain flags are acceptable for apidoc_flag +my $flag_flags_re = qr/[ A C dD eE h m n p u X ] /xx; + +# Certain functions have plain and no_context versions, and meet the criteria +# stated here. Each of their pods has been modified to have a marker line +# which this program replaces by this wording. This way we can tweak the +# wording in one place, and still have it placed in the individual pod entries +# where it makes the most sense. +my $PLAIN_vs_NOCONTEXT_wording = <<~EOT; + C and C behave identically when called from outside + the perl core unless C has been explicitly #defined. + When it has, or when called from inside the core, they differ only in that + C requires the thread context (C) to be available. + EOT + use constant { NOT_APIDOC => -1, ILLEGAL_APIDOC => 0, # Must be 0 so evaluates to 'false' APIDOC_DEFN => 1, PLAIN_APIDOC => 2, APIDOC_ITEM => 3, - APIDOC_SECTION => 4, + APIDOC_FLAG => 4, + APIDOC_SECTION => 5, # This is the line type used for elements parsed in config.h. # Since that file is parsed after everything else, everything is @@ -99,7 +116,7 @@ use constant { # doesn't have to get involved. There are just a few of these, # with little likelihood of changes needed. They were manually # added to handy.h via 51b56f5c7c7. - CONDITIONAL_APIDOC => 5, + CONDITIONAL_APIDOC => 6, }; my $config_h = 'config.h'; @@ -185,6 +202,7 @@ my $filesystem_scn = 'Filesystem configu my $filters_scn = 'Source Filters'; my $floating_scn = 'Floating point'; my $genconfig_scn = 'General Configuration'; +my $global_definitions_scn = 'Declaration and Initialization of Globals'; my $globals_scn = 'Global Variables'; my $GV_scn = 'GV Handling and Stashes'; my $hook_scn = 'Hook manipulation'; @@ -232,6 +250,27 @@ my $XS_scn = 'XS'; # Kept separate at end my $undocumented_scn = 'Undocumented elements'; +my @has_defs; +my @has_r_defs; # Reentrant symbols +my @include_defs; +my %list_only = ( + has_defs => { + list => \@has_defs, + header => "List of capability C> symbols", + placement => '__HAS_LIST__', + }, + has_r_defs => { + list => \@has_r_defs, + header => "List of capability C> symbols", + placement => '__HAS_R_LIST__', + }, + include_defs => { + list => \@include_defs, + header => "List of C<#include> needed symbols", + placement => '__INCLUDE_LIST__', + }, +); + my %valid_sections = ( $AV_scn => {}, $callback_scn => {}, @@ -242,7 +281,15 @@ my %valid_sections = ( $compiler_scn => {}, $directives_scn => {}, $concurrency_scn => {}, - $COP_scn => {}, + $COP_scn => { + header => <<~'EOT', + COP stands for "Current Operation". It is the type used for + nextstate and dbstate ops, storing the filename and line number, + warning bits, hints bits, feature flags, I, and a sort of + incremental representation of the hints hash for the code that + follows. + EOT + }, $CV_scn => { header => <<~'EOT', This section documents functions to manipulate CVs which are @@ -281,9 +328,9 @@ my %valid_sections = ( footer => <<~EOT, - =head2 List of capability C> symbols + =head2 $list_only{has_defs}{header} - This is a list of those symbols that dont appear elsewhere in ths + This is a list of those symbols that dont appear elsewhere in this document that indicate if the current platform has a certain capability. Their names all begin with C. Only those symbols whose capability is directly derived from the name are @@ -300,11 +347,11 @@ my %valid_sections = ( split so that the ones that indicate there is a reentrant version of a capability are listed separately - __HAS_LIST__ + $list_only{has_defs}{placement} And, the reentrant capabilities: - __HAS_R_LIST__ + $list_only{has_r_defs}{placement} Example usage: @@ -318,7 +365,7 @@ my %valid_sections = ( =back - =head2 List of C<#include> needed symbols + =head2 $list_only{include_defs}{header} This list contains symbols that indicate if certain C<#include> files are present on the platform. If your code accesses the @@ -326,7 +373,7 @@ my %valid_sections = ( C<#include> it if the symbol on this list is C<#define>d. For more detail, see the corresponding entry in F<$config_h>. - __INCLUDE_LIST__ + $list_only{include_defs}{placement} Example usage: @@ -339,6 +386,49 @@ my %valid_sections = ( =back EOT }, + $global_definitions_scn => { + header => <<~'EOT', + Global variables are defined and initialized in one place, but + referred to from multiple files. They need to be defined and any + initialization done in that one place, but extern declarations + made for them in each file that may refer to them. Note that + there is no harm in declaring a global and not using it. + + Perl has a mechanism that allows both purposes to be served while + minimizing code duplication. F and F define + the same relatively few macros, but their definitions are + different. In F, the macros expand to + declarations of the globals as external to the file. In + F they actually cause the space to be allocated and + possibly initialized. + + Most files will follow this paradigm: + + #include "EXTERN.h" + ... + #include "perl.h"> + + This causes every global symbol that is referred to in F + and every file it includes (which is nearly every top level Perl + header file) to be declared as external. + + The very few files that define globals will instead do + + #include "INTERN.h" + ... + #include "perl.h"> + include the file + + It doesn't work for a file to both define some globals and refer + to others as externs. That is, you can only include one of + F and F. + + This section documents the macros that are defined in these two + header files. F has many uses of them that can serve as + paradigms for you. + EOT + may_be_empty_in_perlapi => 1, + }, $globals_scn => {}, $GV_scn => {}, $hook_scn => {}, @@ -441,6 +531,8 @@ my %initial_file_section = ( 'gv.c' => $GV_scn, 'gv.h' => $GV_scn, 'hv.h' => $HV_scn, + 'INTERN.h' => $global_definitions_scn, + 'invlist_inline.h' => $unicode_scn, 'locale.c' => $locale_scn, 'malloc.c' => $memory_scn, 'numeric.c' => $numeric_scn, @@ -479,6 +571,20 @@ sub where_from_string ($file, $line_num return "at $file, line $line_num"; } +sub make_verbatim_list(@entries) { + + # This takes a list and creates an alphabetized verbatim table of its + # entries for convenient display + + my @list = sort dictionary_order @entries; + + # Give the table a width one less than you might expect, as we indent each + # line by one, to mark it as verbatim. + my $table = columnarize_list(\@list, $max_width - 1); + + return $table =~ s/^/ /gmr; +} + sub check_and_add_proto_defn { my ($element, $file, $line_num, $raw_flags, $ret_type, $args_ref, $definition_type @@ -537,9 +643,27 @@ sub check_and_add_proto_defn { } $flags .= "m" if $flags =~ /M/; + $flags .= "U" if $flags =~ /@/; # No usage output for @arrays + $flags .= "n" if $flags =~ /[#v]/; # No threads, arguments for #ifdef's, + # plain values + + if ($flags =~ /N/) { + state %escapes = ( + '<' => 'lt', + '>' => 'gt', + '|' => 'verbar', + '/' => 'sol', + '"' => 'quot' + ); + my $has_lt = $element =~ / | ]) /E<$escapes{$1}>/gxx; + + # Don't need to escape '/' if there are no '<'s + $element =~ s/(\/)/E<$escapes{$1}>/g if $has_lt; + } my @munged_args= $args_ref->@*; - s/\b(?:NN|NULLOK)\b\s+//g for @munged_args; + s/\b(?:NN|NULLOK|[SM]PTR|EPTR\w+)\b\s+//g for @munged_args; my $flags_sans_d = $flags; my $docs_expected = $flags_sans_d =~ s/d//g; @@ -708,7 +832,9 @@ sub classify_input_line ($file, $line_nu ? APIDOC_DEFN : ($type_name eq 'section') ? APIDOC_SECTION - : ILLEGAL_APIDOC; + : ($type_name eq 'flag') + ? APIDOC_FLAG + : ILLEGAL_APIDOC; my $mostly_proper_form = ( $type != ILLEGAL_APIDOC @@ -926,8 +1052,8 @@ sub autodoc ($fh, $file) { # parse a fi push @items, $leader_ref; - # Now look for any 'apidoc_item' lines. These are in a block - # consisting solely of them, or all-blank lines + # Now look for any 'apidoc_(flag|item)' lines. These are in a + # block consisting solely of them, or all-blank lines while (1) { (my $item_line_type, $arg) = $get_next_line->(); last unless defined $item_line_type; @@ -938,7 +1064,37 @@ sub autodoc ($fh, $file) { # parse a fi next; } - last unless $item_line_type == APIDOC_ITEM; + # Currently not much is done with these + if ($item_line_type == APIDOC_FLAG) { + my @components = split /\|+/, $arg; + my ($name, $flags); + if (@components == 1) { + $name = $components[0]; + } + elsif (@components == 2) { + $flags = $components[0]; + $name = $components[1]; + if (my $illegal = $flags =~ s/$flag_flags_re//gr) { + die "[$illegal] illegal in apidoc_flag " + . where_from_string($file, $line_num) + . " :\n$arg"; + } + + # Only mention the flags that go to the parent's pod + next if destination_pod($flags) ne $destpod; + } + else { + die "Unexpected '| in ", $arg; + } + + + # We just make an X<> entry for it. + $docs{$destpod}{$section}{X_tags}{$name} = $file; + next; + } + else { + last unless $item_line_type == APIDOC_ITEM; + } # Reset $text; those blank lines it contains merely are # separating 'apidoc_item' lines @@ -1068,9 +1224,6 @@ sub autodoc ($fh, $file) { # parse a fi } my %configs; -my @has_defs; -my @has_r_defs; # Reentrant symbols -my @include_defs; sub parse_config_h { use re '/aa'; # Everything is ASCII in this file @@ -1741,6 +1894,13 @@ sub docout ($fh, $section_name, $element } chomp $pod; # Make sure prints pod with a single trailing \n + + # Replace this marker line in the pod with what we say it should expand + # to. + $pod =~ s{ \b __PLAIN_vs_NOCONTEXT_wording__ \( (\w+) \) }{ + my $this = $1; + $PLAIN_vs_NOCONTEXT_wording =~ s/WHICH/$this/gr + }xeg; print $fh "\n", $pod, "\n"; # Accumulate the usage section of the entry into this array. Output below @@ -1819,9 +1979,9 @@ sub docout ($fh, $section_name, $element my $has_args = $flags !~ /n/; if (! $has_args) { - warn "$name: n flag without m" + warn "$name: n flag without [mv#] " . where_from_string($item->{file}, $item->{line_num}) - unless $flags =~ /m/; + unless $flags =~ /[mv#]/; if ($item->{args} && $item->{args}->@*) { warn "$name: n flag but apparently has args" @@ -1854,28 +2014,17 @@ sub docout ($fh, $section_name, $element } # If only the Perl_foo form is to be displayed, change the - # name of this item to be that. This happens for either of - # two reasons: - # 1) The flags say we want "Perl_", but also to not create - # an entry in embed.h to #define a short name for it. + # name of this item to be that. This happens when the flags + # say we want "Perl_", but also to not create an entry in + # embed.h to #define a short name for it. my $needs_Perl_entry = ( $flags =~ /p/ && $flags =~ /o/ && $flags !~ /M/); - # 2) The function takes a format string and a thread context - # parameter. We can't cope with that because our macros - # expect both the thread context and the format to be the - # first parameter to the function; and only one can be in - # that position. - my $cant_use_short_name = ( $flags =~ /f/ - && $flags !~ /T/ - && $name !~ /strftime/); - # We also create a 'Perl_foo' entry if $additional_long_form # is set, as that explicitly indicates we want one if ( $additional_long_form - || $needs_Perl_entry - || $cant_use_short_name) + || $needs_Perl_entry) { # An all uppercase macro name gets an uppercase prefix. my $perl = ($flags =~ /m/ && $name !~ /[[:lower:]]/) @@ -2185,13 +2334,8 @@ sub construct_missings_section ($missing # Sort the elements. my @missings = sort dictionary_order $missings_ref->@*; - # Make a table of the missings in columns. Give the subroutine a width - # one less than you might expect, as we indent each line by one, to mark - # it as verbatim. - my $table .= columnarize_list(\@missings, $max_width - 1); - $table =~ s/^/ /gm; - - return $text . "\n\n" . $table; + # Make a table of the missings in columns. + return $text . "\n\n" . make_verbatim_list(@missings); } sub dictionary_order { @@ -2268,10 +2412,14 @@ sub output ($destpod) { # Output a comp for my $section_name (sort dictionary_order keys %valid_sections) { my $section_info = $dochash->{$section_name}; - # We allow empty sections in perlintern. - if (! $section_info && $podname eq $api) { - warn "Empty section '$section_name' for $podname; skipped"; - next; + if (! $section_info) { + # We always allow empty sections in perlintern. + if ( $podname eq $api + && ! $valid_sections{$section_name}{may_be_empty_in_perlapi}) + { + warn "Empty section '$section_name' for $podname; skipped"; + next; + } } print $fh "\n=head1 $section_name\n"; @@ -2282,7 +2430,8 @@ sub output ($destpod) { # Output a comp delete $section_info->{X_tags}; } - if ($podname eq $api) { + my $has_entries = $section_info && keys $section_info->%*; + if ($has_entries) { print $fh "\n", $valid_sections{$section_name}{header}, "\n" if defined $valid_sections{$section_name}{header}; @@ -2294,7 +2443,7 @@ sub output ($destpod) { # Output a comp } } - if (! $section_info || ! keys $section_info->%*) { + if (! $has_entries) { my $pod_type = ($podname eq $api) ? "public" : "internal"; print $fh "\nThere are currently no $pod_type API items in ", $section_name, "\n"; @@ -2401,7 +2550,7 @@ sub output ($destpod) { # Output a comp goto spliced; } - die "Unexpecedly \@items doesn't contain $leaders[$which]"; + die "Unexpectedly \@items doesn't contain $leaders[$which]"; spliced: # The array now includes the out-of-order items. Save, @@ -2512,13 +2661,9 @@ foreach (@{(setup_embed())[0]}) { my $embed= $_->{embed} or next; my $file = $_->{source}; - my ($flags, $ret_type, $func, $args) = - @{$embed}{qw(flags return_type name args)}; - check_and_add_proto_defn($func, $file, - # embed.fnc data doesn't currently furnish the - # line number - undef, - + my ($flags, $ret_type, $func, $args, $line_num) = + @{$embed}{qw(flags return_type name args start_line_num)}; + check_and_add_proto_defn($func, $file, $line_num, $flags, $ret_type, $args, # This is like an 'apidoc_defn' line, in that it @@ -2665,7 +2810,7 @@ for my $which_pod (keys %docs) { # how this item is displayed. if ($element->{flags}) { $element->{flags} .= - $leader->{flags} =~ s/$item_flags_re//r; + $leader->{flags} =~ s/$item_flags_re//gr; } else { $element->{flags} = $leader->{flags}; @@ -2704,7 +2849,7 @@ for my $which (\%api, \%intern) { next if $which == \%intern && $element->{flags} =~ /A/; if ($element->{docs_found}) { - warn "'$name' missing 'd' flag" + warn "'$name' missing 'd' flag " . where_from_string($element->{file}, $element->{line_num}) if ! $element->{docs_expected}; } @@ -2744,18 +2889,12 @@ my $places_other_than_intern = join ", " my $places_other_than_api = join ", ", map { "L<$_>" } sort dictionary_order 'perlintern', @other_places; -# The S< > makes things less densely packed, hence more readable -my $has_defs_text .= join ",S< > ", map { "C<$_>" } - sort dictionary_order @has_defs; -my $has_r_defs_text .= join ",S< > ", map { "C<$_>" } - sort dictionary_order @has_r_defs; -$valid_sections{$genconfig_scn}{footer} =~ s/__HAS_LIST__/$has_defs_text/; -$valid_sections{$genconfig_scn}{footer} =~ s/__HAS_R_LIST__/$has_r_defs_text/; - -my $include_defs_text .= join ",S< > ", map { "C<$_>" } - sort dictionary_order @include_defs; -$valid_sections{$genconfig_scn}{footer} - =~ s/__INCLUDE_LIST__/$include_defs_text/; + +foreach my $name (keys %list_only) { + my $text = make_verbatim_list($list_only{$name}{list}->@*); + $valid_sections{$genconfig_scn}{footer} + =~ s/$list_only{$name}{placement}/$text/; +} my $section_list = join "\n\n", map { "=item L" } sort(dictionary_order keys %valid_sections), @@ -2782,6 +2921,20 @@ $api{hdr} = <<"_EOB_"; |L is a list of functions which have yet |to be documented. Patches welcome! The interfaces of these are subject to |change without notice. +| +|To find out what release an element came into being, use +| +| perl dist/ppport.h --api-info=element +| +|You may also use a pattern +| +| perl dist/ppport.h --api-info=/./ +| +|displays all possible public api elements, but not items in L. +|Some elements have been backported in L so that they are +|usable in earlier versions than they otherwise would be available. The +|display also includes information as to what the earliest possible version +|such an element may be used in; as well as some hints and cautions. | |Some of the functions documented here are consolidated so that a single entry |serves for multiple functions which all do basically the same thing, but have Index: gnu/usr.bin/perl/av.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/av.c,v diff -u -p -a -u -p -r1.25 av.c --- gnu/usr.bin/perl/av.c 26 Dec 2025 22:14:12 -0000 1.25 +++ gnu/usr.bin/perl/av.c 16 Nov 2026 00:57:36 -0000 @@ -22,10 +22,9 @@ void Perl_av_reify(pTHX_ AV *av) { - SSize_t key; - PERL_ARGS_ASSERT_AV_REIFY; - assert(SvTYPE(av) == SVt_PVAV); + + SSize_t key; if (AvREAL(av)) return; @@ -65,10 +64,9 @@ array method with an argument of C<(key+ void Perl_av_extend(pTHX_ AV *av, SSize_t key) { - MAGIC *mg; - PERL_ARGS_ASSERT_AV_EXTEND; - assert(SvTYPE(av) == SVt_PVAV); + + MAGIC *mg; mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied); if (mg) { @@ -83,7 +81,7 @@ Perl_av_extend(pTHX_ AV *av, SSize_t key * we call the tied method. */ sv_setiv(arg1, (IV)(key + 1)); - Perl_magic_methcall(aTHX_ MUTABLE_SV(av), mg, SV_CONST(EXTEND), G_DISCARD, 1, + magic_methcall(MUTABLE_SV(av), mg, SV_CONST(EXTEND), G_DISCARD, 1, arg1); return; } @@ -268,11 +266,7 @@ S_adjust_index(pTHX_ AV *av, const MAGIC SV** Perl_av_fetch(pTHX_ AV *av, SSize_t key, I32 lval) { - SSize_t neg; - SSize_t size; - PERL_ARGS_ASSERT_AV_FETCH; - assert(SvTYPE(av) == SVt_PVAV); if (UNLIKELY(SvRMAGICAL(av))) { const MAGIC * const tied_magic @@ -294,24 +288,23 @@ Perl_av_fetch(pTHX_ AV *av, SSize_t key, } } - neg = (key < 0); - size = AvFILLp(av) + 1; - key += neg * size; /* handle negative index without using branch */ + /* recalculating key early helps branch prediction */ + SSize_t neg = key < 0; + SSize_t size = AvFILLp(av) + 1; + key += neg * size; /* the cast from SSize_t to Size_t allows both (key < 0) and (key >= size) * to be tested as a single condition */ - if ((Size_t)key >= (Size_t)size) { - if (UNLIKELY(neg)) - return NULL; - goto emptiness; - } - - if (!AvARRAY(av)[key]) { - emptiness: - return lval ? av_store(av,key,newSV_type(SVt_NULL)) : NULL; - } + if ((Size_t)key >= (Size_t)size) + /* Only non-negative out of bounds keys are eligible for lvalue + * treatment, so adjust lval by setting value to 0 if the key was + * negative */ + lval *= !neg; + else if (AvARRAY(av)[key]) + return &AvARRAY(av)[key]; - return &AvARRAY(av)[key]; + /* value does not exist in the array */ + return lval ? av_store(av, key, newSV_type(SVt_NULL)) : NULL; } /* @@ -339,10 +332,9 @@ more information on how to use this func SV** Perl_av_store(pTHX_ AV *av, SSize_t key, SV *val) { - SV** ary; - PERL_ARGS_ASSERT_AV_STORE; - assert(SvTYPE(av) == SVt_PVAV); + + SV** ary; /* S_regclass relies on being able to pass in a NULL sv (unicode_alternate may be NULL). @@ -369,7 +361,7 @@ Perl_av_store(pTHX_ AV *av, SSize_t key, return NULL; } - if (SvREADONLY(av) && key >= AvFILL(av)) + if (SvREADONLY(av) && key > AvFILL(av)) croak_no_modify(); if (!AvREAL(av) && AvREIFY(av)) @@ -465,9 +457,10 @@ Perl equivalent: C SV * Perl_av_pop(pTHX_ AV *av) { + PERL_ARGS_ASSERT_AV_POP; + SV *retval; MAGIC* mg; - PERL_ARGS_ASSERT_AV_POP; - assert(SvTYPE(av) == SVt_PVAV); - if (SvREADONLY(av)) croak_no_modify(); if ((mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied))) { - retval = Perl_magic_methcall(aTHX_ MUTABLE_SV(av), mg, SV_CONST(POP), 0, 0); + retval = magic_methcall(MUTABLE_SV(av), mg, SV_CONST(POP), 0, 0); if (retval) retval = newSVsv(retval); return retval; @@ -880,17 +867,16 @@ Perl equivalent: S SV * Perl_av_shift(pTHX_ AV *av) { + PERL_ARGS_ASSERT_AV_SHIFT; + SV *retval; MAGIC* mg; - PERL_ARGS_ASSERT_AV_SHIFT; - assert(SvTYPE(av) == SVt_PVAV); - if (SvREADONLY(av)) croak_no_modify(); if ((mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied))) { - retval = Perl_magic_methcall(aTHX_ MUTABLE_SV(av), mg, SV_CONST(SHIFT), 0, 0); + retval = magic_methcall(MUTABLE_SV(av), mg, SV_CONST(SHIFT), 0, 0); if (retval) retval = newSVsv(retval); return retval; @@ -1024,17 +1009,16 @@ the same as C. void Perl_av_fill(pTHX_ AV *av, SSize_t fill) { - MAGIC *mg; - PERL_ARGS_ASSERT_AV_FILL; - assert(SvTYPE(av) == SVt_PVAV); + + MAGIC *mg; if (fill < 0) fill = -1; if ((mg = SvTIED_mg((const SV *)av, PERL_MAGIC_tied))) { SV *arg1 = sv_newmortal(); sv_setiv(arg1, (IV)(fill + 1)); - Perl_magic_methcall(aTHX_ MUTABLE_SV(av), mg, SV_CONST(STORESIZE), G_DISCARD, + magic_methcall(MUTABLE_SV(av), mg, SV_CONST(STORESIZE), G_DISCARD, 1, arg1); return; } @@ -1077,10 +1061,9 @@ C in void context if Cmg_obj); } IV * -Perl_av_iter_p(pTHX_ AV *av) { - MAGIC *const mg = get_aux_mg(av); - +Perl_av_iter_p(pTHX_ AV *av) +{ PERL_ARGS_ASSERT_AV_ITER_P; - assert(SvTYPE(av) == SVt_PVAV); + + MAGIC *const mg = get_aux_mg(av); if (sizeof(IV) == sizeof(SSize_t)) { return (IV *)&(mg->mg_len); @@ -1258,9 +1240,11 @@ Perl_av_iter_p(pTHX_ AV *av) { } SV * -Perl_av_nonelem(pTHX_ AV *av, SSize_t ix) { - SV * const sv = newSV_type(SVt_NULL); +Perl_av_nonelem(pTHX_ AV *av, SSize_t ix) +{ PERL_ARGS_ASSERT_AV_NONELEM; + + SV * const sv = newSV_type(SVt_NULL); if (!av_store(av,ix,sv)) return sv_2mortal(sv); /* has tie magic */ sv_magic(sv, NULL, PERL_MAGIC_nonelem, NULL, 0); Index: gnu/usr.bin/perl/av.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/av.h,v diff -u -p -a -u -p -r1.20 av.h --- gnu/usr.bin/perl/av.h 26 Dec 2025 22:14:12 -0000 1.20 +++ gnu/usr.bin/perl/av.h 16 Nov 2026 00:57:36 -0000 @@ -10,7 +10,7 @@ struct xpvav { HV* xmg_stash; /* class package */ - union _xmgu xmg_u; + union xmgu_ xmg_u; SSize_t xav_fill; /* Index of last element present */ SSize_t xav_max; /* max index for which array has space */ SV** xav_alloc; /* pointer to beginning of C array of SVs */ @@ -114,8 +114,7 @@ If all you need is to look up an array e =for apidoc_defn ARm|SSize_t|av_top_index |NN AV *av =cut */ -#define AvFILL(av) ((SvRMAGICAL((const SV *) (av))) \ - ? mg_size(MUTABLE_SV(av)) : AvFILLp(av)) +#define AvFILL(av) AvFILL_(MUTABLE_AV(av)) #define av_top_index(av) AvFILL(av) #define av_tindex(av) av_top_index(av) @@ -123,7 +122,7 @@ If all you need is to look up an array e * SvGETMAGIC(av); IV x = av_tindex_nomg(av); */ # define av_top_index_skip_len_mg(av) \ - (__ASSERT_(SvTYPE(av) == SVt_PVAV) AvFILLp(av)) + (assert(SvTYPE(av) == SVt_PVAV), AvFILLp(av)) # define av_tindex_skip_len_mg(av) av_top_index_skip_len_mg(av) #define NEGATIVE_INDICES_VAR "NEGATIVE_INDICES" @@ -139,7 +138,7 @@ Note that there are both real and fake A =for apidoc_item newAV_alloc_xz These all create a new AV, setting the reference count to 1. If you also know -the initial elements of the array with, see L>. +the initial elements of the array, see L>. As background, an array consists of three things: Index: gnu/usr.bin/perl/builtin.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/builtin.c,v diff -u -p -a -u -p -r1.1.1.4 builtin.c --- gnu/usr.bin/perl/builtin.c 26 Dec 2025 22:12:28 -0000 1.1.1.4 +++ gnu/usr.bin/perl/builtin.c 16 Nov 2026 00:57:36 -0000 @@ -23,10 +23,10 @@ struct BuiltinFuncDescriptor { const char *name; U16 since_ver; + bool is_experimental; XSUBADDR_t xsub; OP *(*checker)(pTHX_ OP *, GV *, SV *); IV ckval; - bool is_experimental; }; #define warn_experimental_builtin(name) S_warn_experimental_builtin(aTHX_ name) @@ -43,6 +43,8 @@ static void S_warn_experimental_builtin( void Perl_prepare_export_lexical(pTHX) { + PERL_ARGS_ASSERT_PREPARE_EXPORT_LEXICAL; + assert(PL_compcv); /* We need to have PL_comppad / PL_curpad set correctly for lexical importing */ @@ -64,6 +66,8 @@ static void S_export_lexical(pTHX_ SV *n void Perl_finish_export_lexical(pTHX) { + PERL_ARGS_ASSERT_FINISH_EXPORT_LEXICAL; + intro_my(); LEAVE; @@ -330,7 +334,7 @@ XS(XS_builtin_export_lexically) default: /* overwrites the pointer on the stack; but this is fine, the * caller's value isn't modified */ - ST(i) = name = sv_2mortal(Perl_newSVpvf(aTHX_ "&%" SVf, SVfARG(name))); + ST(i) = name = sv_2mortal(newSVpvf("&%" SVf, SVfARG(name))); /* FALLTHROUGH */ case '&': @@ -492,8 +496,9 @@ static OP *ck_builtin_func1(pTHX_ OP *en void Perl_XS_builtin_indexed(pTHX_ CV *cv) { - dXSARGS; PERL_ARGS_ASSERT_XS_BUILTIN_INDEXED; + + dXSARGS; PERL_UNUSED_VAR(cv); switch(GIMME_V) { @@ -615,35 +620,35 @@ static const char builtin_not_recognised static const struct BuiltinFuncDescriptor builtins[] = { /* constants */ - { "true", SHORTVER(5,39), &XS_builtin_true, &ck_builtin_const, BUILTIN_CONST_TRUE, false }, - { "false", SHORTVER(5,39), &XS_builtin_false, &ck_builtin_const, BUILTIN_CONST_FALSE, false }, - { "inf", NO_BUNDLE, &XS_builtin_inf, &ck_builtin_const, BUILTIN_CONST_INF, true }, - { "nan", NO_BUNDLE, &XS_builtin_nan, &ck_builtin_const, BUILTIN_CONST_NAN, true }, + { "true", SHORTVER(5,39), false, &XS_builtin_true, &ck_builtin_const, BUILTIN_CONST_TRUE }, + { "false", SHORTVER(5,39), false, &XS_builtin_false, &ck_builtin_const, BUILTIN_CONST_FALSE }, + { "inf", NO_BUNDLE, true, &XS_builtin_inf, &ck_builtin_const, BUILTIN_CONST_INF }, + { "nan", NO_BUNDLE, true, &XS_builtin_nan, &ck_builtin_const, BUILTIN_CONST_NAN }, /* unary functions */ - { "is_bool", NO_BUNDLE, &XS_builtin_func1_scalar, &ck_builtin_func1, OP_IS_BOOL, true }, - { "weaken", SHORTVER(5,39), &XS_builtin_func1_void, &ck_builtin_func1, OP_WEAKEN, false }, - { "unweaken", SHORTVER(5,39), &XS_builtin_func1_void, &ck_builtin_func1, OP_UNWEAKEN, false }, - { "is_weak", SHORTVER(5,39), &XS_builtin_func1_scalar, &ck_builtin_func1, OP_IS_WEAK, false }, - { "blessed", SHORTVER(5,39), &XS_builtin_func1_scalar, &ck_builtin_func1, OP_BLESSED, false }, - { "refaddr", SHORTVER(5,39), &XS_builtin_func1_scalar, &ck_builtin_func1, OP_REFADDR, false }, - { "reftype", SHORTVER(5,39), &XS_builtin_func1_scalar, &ck_builtin_func1, OP_REFTYPE, false }, - { "ceil", SHORTVER(5,39), &XS_builtin_func1_scalar, &ck_builtin_func1, OP_CEIL, false }, - { "floor", SHORTVER(5,39), &XS_builtin_func1_scalar, &ck_builtin_func1, OP_FLOOR, false }, - { "is_tainted", SHORTVER(5,39), &XS_builtin_func1_scalar, &ck_builtin_func1, OP_IS_TAINTED, false }, - { "trim", SHORTVER(5,39), &XS_builtin_trim, &ck_builtin_func1, 0, false }, - { "stringify", NO_BUNDLE, &XS_builtin_func1_scalar, &ck_builtin_func1, OP_STRINGIFY, true }, + { "is_bool", NO_BUNDLE, true, &XS_builtin_func1_scalar, &ck_builtin_func1, OP_IS_BOOL }, + { "weaken", SHORTVER(5,39), false, &XS_builtin_func1_void, &ck_builtin_func1, OP_WEAKEN }, + { "unweaken", SHORTVER(5,39), false, &XS_builtin_func1_void, &ck_builtin_func1, OP_UNWEAKEN }, + { "is_weak", SHORTVER(5,39), false, &XS_builtin_func1_scalar, &ck_builtin_func1, OP_IS_WEAK }, + { "blessed", SHORTVER(5,39), false, &XS_builtin_func1_scalar, &ck_builtin_func1, OP_BLESSED }, + { "refaddr", SHORTVER(5,39), false, &XS_builtin_func1_scalar, &ck_builtin_func1, OP_REFADDR }, + { "reftype", SHORTVER(5,39), false, &XS_builtin_func1_scalar, &ck_builtin_func1, OP_REFTYPE }, + { "ceil", SHORTVER(5,39), false, &XS_builtin_func1_scalar, &ck_builtin_func1, OP_CEIL }, + { "floor", SHORTVER(5,39), false, &XS_builtin_func1_scalar, &ck_builtin_func1, OP_FLOOR }, + { "is_tainted", SHORTVER(5,39), false, &XS_builtin_func1_scalar, &ck_builtin_func1, OP_IS_TAINTED }, + { "trim", SHORTVER(5,39), false, &XS_builtin_trim, &ck_builtin_func1, 0 }, + { "stringify", NO_BUNDLE, true, &XS_builtin_func1_scalar, &ck_builtin_func1, OP_STRINGIFY }, - { "created_as_string", NO_BUNDLE, &XS_builtin_created_as_string, &ck_builtin_func1, 0, true }, - { "created_as_number", NO_BUNDLE, &XS_builtin_created_as_number, &ck_builtin_func1, 0, true }, + { "created_as_string", NO_BUNDLE, true, &XS_builtin_created_as_string, &ck_builtin_func1, 0 }, + { "created_as_number", NO_BUNDLE, true, &XS_builtin_created_as_number, &ck_builtin_func1, 0 }, - { "load_module", NO_BUNDLE, &XS_builtin_load_module, &ck_builtin_func1, 0, true }, + { "load_module", NO_BUNDLE, true, &XS_builtin_load_module, &ck_builtin_func1, 0 }, /* list functions */ - { "indexed", SHORTVER(5,39), &Perl_XS_builtin_indexed, &ck_builtin_funcN, 0, false }, - { "export_lexically", NO_BUNDLE, &XS_builtin_export_lexically, NULL, 0, true }, + { "indexed", SHORTVER(5,39), false, &Perl_XS_builtin_indexed, &ck_builtin_funcN, 0 }, + { "export_lexically", NO_BUNDLE, true, &XS_builtin_export_lexically, NULL, 0 }, - { NULL, 0, NULL, NULL, 0, false } + { NULL, 0, false, NULL, NULL, 0 } }; static bool S_parse_version(const char *vstr, const char *vend, UV *vmajor, UV *vminor) @@ -690,8 +695,8 @@ static bool S_parse_version(const char * #define import_sym(sym) S_import_sym(aTHX_ sym) static void S_import_sym(pTHX_ SV *sym) { - SV *ampname = sv_2mortal(Perl_newSVpvf(aTHX_ "&%" SVf, SVfARG(sym))); - SV *fqname = sv_2mortal(Perl_newSVpvf(aTHX_ "builtin::%" SVf, SVfARG(sym))); + SV *ampname = sv_2mortal(newSVpvf("&%" SVf, SVfARG(sym))); + SV *fqname = sv_2mortal(newSVpvf("builtin::%" SVf, SVfARG(sym))); CV *cv = get_cv(SvPV_nolen(fqname), SvUTF8(fqname) ? SVf_UTF8 : 0); if(!cv) @@ -710,6 +715,8 @@ static bool S_cv_is_builtin(pTHX_ CV *cv void Perl_import_builtin_bundle(pTHX_ U16 ver) { + PERL_ARGS_ASSERT_IMPORT_BUILTIN_BUNDLE; + SV *ampname = sv_newmortal(); for(int i = 0; builtins[i].name; i++) { @@ -776,6 +783,8 @@ XS(XS_builtin_import) void Perl_boot_core_builtin(pTHX) { + PERL_ARGS_ASSERT_BOOT_CORE_BUILTIN; + I32 i; for(i = 0; builtins[i].name; i++) { const struct BuiltinFuncDescriptor *builtin = &builtins[i]; Index: gnu/usr.bin/perl/caretx.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/caretx.c,v diff -u -p -a -u -p -r1.8 caretx.c --- gnu/usr.bin/perl/caretx.c 21 Sep 2026 18:20:27 -0000 1.8 +++ gnu/usr.bin/perl/caretx.c 16 Nov 2026 00:57:36 -0000 @@ -21,7 +21,7 @@ /* This file contains a single function, set_caret_X, to set the $^X * variable. It's only used in perl.c, but has various OS dependencies, * so its been moved to its own file to reduce header pollution. - * See RT 120314 for details. + * See GH #13363 for details. */ #if defined(PERL_IS_MINIPERL) && !defined(USE_SITECUSTOMIZE) @@ -41,7 +41,10 @@ #endif void -Perl_set_caret_X(pTHX) { +Perl_set_caret_X(pTHX) +{ + PERL_ARGS_ASSERT_SET_CARET_X; + GV* tmpgv = gv_fetchpvs("\030", GV_ADD|GV_NOTQUAL, SVt_PV); /* $^X */ SV *const caret_x = GvSV(tmpgv); #if defined(OS2) @@ -58,14 +61,7 @@ Perl_set_caret_X(pTHX) { #else /* We can try a platform-specific one if possible; if it fails, or we * aren't running on a suitable platform, we'll fall back to argv[0]. */ -# ifdef USE_GETEXECPATH - char buf[MAXPATHLEN]; - - if (getexecpath(buf, sizeof(buf)) == 0) { - sv_setpv(caret_x, buf); - return; - } -# elif defined(USE_KERN_PROC_PATHNAME) +# ifdef USE_KERN_PROC_PATHNAME size_t size = 0; int mib[4]; mib[0] = CTL_KERN; Index: gnu/usr.bin/perl/cflags.SH =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cflags.SH,v diff -u -p -a -u -p -r1.21 cflags.SH --- gnu/usr.bin/perl/cflags.SH 26 Dec 2025 22:14:12 -0000 1.21 +++ gnu/usr.bin/perl/cflags.SH 16 Nov 2026 00:57:36 -0000 @@ -184,12 +184,21 @@ Intel*) ;; # # Is that you, Intel C++? # NOTE 3: the relative order of these options matters: # -Wextra before -Wno-long-long -Wno-declaration-after-statement # +# NOTE 4: If a function has __attribute__nonnull__(n), gcc generates many +# warnings for macros that have the generality to check for NULLness on +# parameter n. We could write versions of those macros that eliminate +# that check, but why?. It complicates our code and gains no +# perceptible performance except in very hot code that the compiler +# has chosen to not optimize away. So turn these off with +# -Wno-nonnull-compare + *) warns="$pedantic \ -Werror=pointer-arith \ -Werror=vla \ -Wextra \ -Wno-long-long -Wno-declaration-after-statement \ - -Wc++-compat -Wwrite-strings" + -Wno-nonnull-compare \ + -Wc++-compat -Wno-c++-keyword -Wwrite-strings" case " $ccflags " in *" -std="*) ;; # Already have -std=... *) warns="-std=c99 $warns" ;; @@ -296,7 +305,7 @@ case "$gccversion" in *"Apple LLVM "[34]*|*"Apple LLVM version "[34]*) for f in -Wno-unused-value do - echo "cflags.SH: Adding $f because clang version '$gccversion'" + echo "cflags.SH: Adding $f because clang version '$gccversion'" warn="$warn $f" done ;; @@ -505,3 +514,4 @@ done !NO!SUBS! chmod 755 cflags $eunicefix cflags + Index: gnu/usr.bin/perl/charclass_invlists.inc =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/charclass_invlists.inc,v diff -u -p -a -u -p -r1.1.1.1 charclass_invlists.inc --- gnu/usr.bin/perl/charclass_invlists.inc 26 Dec 2025 22:12:25 -0000 1.1.1.1 +++ gnu/usr.bin/perl/charclass_invlists.inc 16 Nov 2026 00:57:36 -0000 @@ -38,7 +38,7 @@ static const UV * const InBitmap_invlist # if 'A' == 65 /* ASCII/Latin1 */ static const UV Case_Folding_invlist[] = { /* for ASCII/Latin1 */ - 1424, /* Number of elements */ + 1432, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -1415,8 +1415,14 @@ static const UV Case_Folding_invlist[] = 0xA7CB, 0xA7CC, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -1464,6 +1470,8 @@ static const UV Case_Folding_invlist[] = 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -3469,8 +3477,14 @@ static const I32 Case_Folding_invmap[] = 0x264, 0xA7CD, 0, + 0xA7CF, + 0, 0xA7D1, 0, + 0xA7D3, + 0, + 0xA7D5, + 0, 0xA7D7, 0, 0xA7D9, @@ -3518,6 +3532,8 @@ static const I32 Case_Folding_invmap[] = 0, 0x16E60, 0, + 0x16EBB, + 0, 0x1E922, 0 }; @@ -3534,7 +3550,7 @@ static const I32 Case_Folding_invmap[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV Case_Folding_invlist[] = { /* for EBCDIC 1047 */ - 1443, /* Number of elements */ + 1451, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -4930,8 +4946,14 @@ static const UV Case_Folding_invlist[] = 0xA7CB, 0xA7CC, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -4979,6 +5001,8 @@ static const UV Case_Folding_invlist[] = 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -7006,8 +7030,14 @@ static const I32 Case_Folding_invmap[] = 0x264, 0xA7CD, 0, + 0xA7CF, + 0, 0xA7D1, 0, + 0xA7D3, + 0, + 0xA7D5, + 0, 0xA7D7, 0, 0xA7D9, @@ -7055,6 +7085,8 @@ static const I32 Case_Folding_invmap[] = 0, 0x16E60, 0, + 0x16EBB, + 0, 0x1E922, 0 }; @@ -7071,7 +7103,7 @@ static const I32 Case_Folding_invmap[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV Case_Folding_invlist[] = { /* for EBCDIC 037 */ - 1439, /* Number of elements */ + 1447, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -8463,8 +8495,14 @@ static const UV Case_Folding_invlist[] = 0xA7CB, 0xA7CC, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -8512,6 +8550,8 @@ static const UV Case_Folding_invlist[] = 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -10535,8 +10575,14 @@ static const I32 Case_Folding_invmap[] = 0x264, 0xA7CD, 0, + 0xA7CF, + 0, 0xA7D1, 0, + 0xA7D3, + 0, + 0xA7D5, + 0, 0xA7D7, 0, 0xA7D9, @@ -10584,6 +10630,8 @@ static const I32 Case_Folding_invmap[] = 0, 0x16E60, 0, + 0x16EBB, + 0, 0x1E922, 0 }; @@ -10597,7 +10645,7 @@ static const I32 Case_Folding_invmap[] = # if 'A' == 65 /* ASCII/Latin1 */ static const UV Lowercase_Mapping_invlist[] = { /* for ASCII/Latin1 */ - 1289, /* Number of elements */ + 1297, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -11854,8 +11902,14 @@ static const UV Lowercase_Mapping_invlis 0xA7CB, 0xA7CC, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -11888,6 +11942,8 @@ static const UV Lowercase_Mapping_invlis 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -13183,8 +13239,14 @@ static const I32 Lowercase_Mapping_invma 0x264, 0xA7CD, 0, + 0xA7CF, + 0, 0xA7D1, 0, + 0xA7D3, + 0, + 0xA7D5, + 0, 0xA7D7, 0, 0xA7D9, @@ -13217,6 +13279,8 @@ static const I32 Lowercase_Mapping_invma 0, 0x16E60, 0, + 0x16EBB, + 0, 0x1E922, 0 }; @@ -13233,7 +13297,7 @@ static const I32 Lowercase_Mapping_invma && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV Lowercase_Mapping_invlist[] = { /* for EBCDIC 1047 */ - 1307, /* Number of elements */ + 1315, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -14508,8 +14572,14 @@ static const UV Lowercase_Mapping_invlis 0xA7CB, 0xA7CC, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -14542,6 +14612,8 @@ static const UV Lowercase_Mapping_invlis 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -15858,8 +15930,14 @@ static const I32 Lowercase_Mapping_invma 0x264, 0xA7CD, 0, + 0xA7CF, + 0, 0xA7D1, 0, + 0xA7D3, + 0, + 0xA7D5, + 0, 0xA7D7, 0, 0xA7D9, @@ -15892,6 +15970,8 @@ static const I32 Lowercase_Mapping_invma 0, 0x16E60, 0, + 0x16EBB, + 0, 0x1E922, 0 }; @@ -15908,7 +15988,7 @@ static const I32 Lowercase_Mapping_invma && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV Lowercase_Mapping_invlist[] = { /* for EBCDIC 037 */ - 1303, /* Number of elements */ + 1311, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -17179,8 +17259,14 @@ static const UV Lowercase_Mapping_invlis 0xA7CB, 0xA7CC, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -17213,6 +17299,8 @@ static const UV Lowercase_Mapping_invlis 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -18525,8 +18613,14 @@ static const I32 Lowercase_Mapping_invma 0x264, 0xA7CD, 0, + 0xA7CF, + 0, 0xA7D1, 0, + 0xA7D3, + 0, + 0xA7D5, + 0, 0xA7D7, 0, 0xA7D9, @@ -18559,6 +18653,8 @@ static const I32 Lowercase_Mapping_invma 0, 0x16E60, 0, + 0x16EBB, + 0, 0x1E922, 0 }; @@ -18570,7 +18666,7 @@ static const I32 Lowercase_Mapping_invma #if (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) static const UV _Perl_CCC_non0_non230_invlist[] = { /* for all charsets */ - 385, /* Number of elements */ + 393, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -18773,6 +18869,12 @@ static const UV _Perl_CCC_non0_non230_in 0x1AC5, 0x1ACA, 0x1ACB, + 0x1ADD, + 0x1ADE, + 0x1AE6, + 0x1AE7, + 0x1AEB, + 0x1AEC, 0x1B34, 0x1B35, 0x1B44, @@ -18859,6 +18961,8 @@ static const UV _Perl_CCC_non0_non230_in 0x10A40, 0x10AE6, 0x10AE7, + 0x10EFA, + 0x10EFC, 0x10EFD, 0x10F00, 0x10F46, @@ -18964,7 +19068,7 @@ static const UV _Perl_CCC_non0_non230_in # if 'A' == 65 /* ASCII/Latin1 */ static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */ - 1917, /* Number of elements */ + 2168, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -19305,19 +19409,28 @@ static const UV _Perl_GCB_invlist[] = { 0xFBD, 0xFC6, 0xFC7, + 0x1000, + 0x102B, 0x102D, 0x1031, 0x1032, 0x1038, 0x1039, + 0x103A, 0x103B, 0x103D, 0x103F, + 0x1040, + 0x1050, 0x1056, 0x1058, 0x105A, 0x105E, 0x1061, + 0x1062, + 0x1065, + 0x1067, + 0x106E, 0x1071, 0x1075, 0x1082, @@ -19327,6 +19440,7 @@ static const UV _Perl_GCB_invlist[] = { 0x1087, 0x108D, 0x108E, + 0x108F, 0x109D, 0x109E, 0x1100, @@ -19343,6 +19457,7 @@ static const UV _Perl_GCB_invlist[] = { 0x1754, 0x1772, 0x1774, + 0x1780, 0x17B4, 0x17B6, 0x17B7, @@ -19350,6 +19465,8 @@ static const UV _Perl_GCB_invlist[] = { 0x17C6, 0x17C7, 0x17C9, + 0x17D2, + 0x17D3, 0x17D4, 0x17DD, 0x17DE, @@ -19375,6 +19492,7 @@ static const UV _Perl_GCB_invlist[] = { 0x1A19, 0x1A1B, 0x1A1C, + 0x1A20, 0x1A55, 0x1A56, 0x1A57, @@ -19391,14 +19509,21 @@ static const UV _Perl_GCB_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B05, + 0x1B0B, + 0x1B0D, + 0x1B13, 0x1B34, 0x1B3E, 0x1B42, + 0x1B44, 0x1B45, + 0x1B4D, 0x1B6B, 0x1B74, 0x1B80, @@ -19408,7 +19533,12 @@ static const UV _Perl_GCB_invlist[] = { 0x1BA2, 0x1BA6, 0x1BA8, + 0x1BAB, + 0x1BAC, 0x1BAE, + 0x1BB0, + 0x1BBB, + 0x1BBE, 0x1BE6, 0x1BE7, 0x1BE8, @@ -19464,8 +19594,6 @@ static const UV _Perl_GCB_invlist[] = { 0x231C, 0x2328, 0x2329, - 0x2388, - 0x2389, 0x23CF, 0x23D0, 0x23E9, @@ -19483,14 +19611,90 @@ static const UV _Perl_GCB_invlist[] = { 0x25FB, 0x25FF, 0x2600, - 0x2606, - 0x2607, - 0x2613, + 0x2605, + 0x260E, + 0x260F, + 0x2611, + 0x2612, 0x2614, - 0x2686, - 0x2690, + 0x2616, + 0x2618, + 0x2619, + 0x261D, + 0x261E, + 0x2620, + 0x2621, + 0x2622, + 0x2624, + 0x2626, + 0x2627, + 0x262A, + 0x262B, + 0x262E, + 0x2630, + 0x2638, + 0x263B, + 0x2640, + 0x2641, + 0x2642, + 0x2643, + 0x2648, + 0x2654, + 0x265F, + 0x2661, + 0x2663, + 0x2664, + 0x2665, + 0x2667, + 0x2668, + 0x2669, + 0x267B, + 0x267C, + 0x267E, + 0x2680, + 0x2692, + 0x2698, + 0x2699, + 0x269A, + 0x269B, + 0x269D, + 0x26A0, + 0x26A2, + 0x26A7, + 0x26A8, + 0x26AA, + 0x26AC, + 0x26B0, + 0x26B2, + 0x26BD, + 0x26BF, + 0x26C4, + 0x26C6, + 0x26C8, + 0x26C9, + 0x26CE, + 0x26D0, + 0x26D1, + 0x26D2, + 0x26D3, + 0x26D5, + 0x26E9, + 0x26EB, + 0x26F0, + 0x26F6, + 0x26F7, + 0x26FB, + 0x26FD, + 0x26FE, + 0x2702, + 0x2703, + 0x2705, 0x2706, 0x2708, + 0x270E, + 0x270F, + 0x2710, + 0x2712, 0x2713, 0x2714, 0x2715, @@ -19517,7 +19721,7 @@ static const UV _Perl_GCB_invlist[] = { 0x2757, 0x2758, 0x2763, - 0x2768, + 0x2765, 0x2795, 0x2798, 0x27A1, @@ -19593,6 +19797,9 @@ static const UV _Perl_GCB_invlist[] = { 0xA980, 0xA983, 0xA984, + 0xA989, + 0xA98C, + 0xA98F, 0xA9B3, 0xA9B4, 0xA9B6, @@ -19601,8 +19808,13 @@ static const UV _Perl_GCB_invlist[] = { 0xA9BE, 0xA9C0, 0xA9C1, + 0xA9E0, 0xA9E5, 0xA9E6, + 0xA9E7, + 0xA9F0, + 0xA9FA, + 0xA9FF, 0xAA29, 0xAA2F, 0xAA31, @@ -19614,8 +19826,16 @@ static const UV _Perl_GCB_invlist[] = { 0xAA4C, 0xAA4D, 0xAA4E, + 0xAA60, + 0xAA70, + 0xAA71, + 0xAA74, + 0xAA7A, + 0xAA7B, 0xAA7C, 0xAA7D, + 0xAA7E, + 0xAA80, 0xAAB0, 0xAAB1, 0xAAB2, @@ -19626,6 +19846,7 @@ static const UV _Perl_GCB_invlist[] = { 0xAAC0, 0xAAC1, 0xAAC2, + 0xAAE0, 0xAAEB, 0xAAEC, 0xAAEE, @@ -19633,6 +19854,8 @@ static const UV _Perl_GCB_invlist[] = { 0xAAF5, 0xAAF6, 0xAAF7, + 0xABC0, + 0xABDB, 0xABE3, 0xABE5, 0xABE6, @@ -20463,12 +20686,18 @@ static const UV _Perl_GCB_invlist[] = { 0x102E1, 0x10376, 0x1037B, + 0x10A00, 0x10A01, 0x10A04, 0x10A05, 0x10A07, 0x10A0C, 0x10A10, + 0x10A14, + 0x10A15, + 0x10A18, + 0x10A19, + 0x10A36, 0x10A38, 0x10A3B, 0x10A3F, @@ -20481,7 +20710,7 @@ static const UV _Perl_GCB_invlist[] = { 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -20516,9 +20745,13 @@ static const UV _Perl_GCB_invlist[] = { 0x11127, 0x1112C, 0x1112D, + 0x11133, + 0x11134, 0x11135, + 0x11144, 0x11145, 0x11147, + 0x11148, 0x11173, 0x11174, 0x11180, @@ -20572,6 +20805,14 @@ static const UV _Perl_GCB_invlist[] = { 0x1136D, 0x11370, 0x11375, + 0x11380, + 0x1138A, + 0x1138B, + 0x1138C, + 0x1138E, + 0x1138F, + 0x11390, + 0x113B6, 0x113B8, 0x113B9, 0x113BB, @@ -20585,6 +20826,7 @@ static const UV _Perl_GCB_invlist[] = { 0x113CB, 0x113CC, 0x113CE, + 0x113D0, 0x113D1, 0x113D2, 0x113D3, @@ -20648,12 +20890,22 @@ static const UV _Perl_GCB_invlist[] = { 0x11838, 0x11839, 0x1183B, + 0x11900, + 0x11907, + 0x11909, + 0x1190A, + 0x1190C, + 0x11914, + 0x11915, + 0x11917, + 0x11918, 0x11930, 0x11931, 0x11936, 0x11937, 0x11939, 0x1193B, + 0x1193E, 0x1193F, 0x11940, 0x11941, @@ -20669,6 +20921,7 @@ static const UV _Perl_GCB_invlist[] = { 0x119E1, 0x119E4, 0x119E5, + 0x11A00, 0x11A01, 0x11A0B, 0x11A33, @@ -20678,6 +20931,7 @@ static const UV _Perl_GCB_invlist[] = { 0x11A3F, 0x11A47, 0x11A48, + 0x11A50, 0x11A51, 0x11A57, 0x11A59, @@ -20686,7 +20940,15 @@ static const UV _Perl_GCB_invlist[] = { 0x11A8A, 0x11A97, 0x11A98, + 0x11A99, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, + 0x11B68, 0x11C2F, 0x11C30, 0x11C37, @@ -20729,11 +20991,14 @@ static const UV _Perl_GCB_invlist[] = { 0x11F02, 0x11F03, 0x11F04, + 0x11F11, + 0x11F12, 0x11F34, 0x11F36, 0x11F3B, 0x11F3E, 0x11F40, + 0x11F42, 0x11F43, 0x11F5A, 0x11F5B, @@ -20818,17 +21083,33 @@ static const UV _Perl_GCB_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, 0x1E94B, - 0x1F000, + 0x1F004, + 0x1F005, + 0x1F02C, + 0x1F030, + 0x1F094, + 0x1F0A0, + 0x1F0AF, + 0x1F0B1, + 0x1F0C0, + 0x1F0C1, + 0x1F0CF, + 0x1F0D1, + 0x1F0F6, 0x1F100, - 0x1F10D, - 0x1F110, - 0x1F12F, - 0x1F130, - 0x1F16C, + 0x1F170, 0x1F172, 0x1F17E, 0x1F180, @@ -20836,7 +21117,7 @@ static const UV _Perl_GCB_invlist[] = { 0x1F18F, 0x1F191, 0x1F19B, - 0x1F1AD, + 0x1F1AE, 0x1F1E6, 0x1F200, 0x1F201, @@ -20850,16 +21131,80 @@ static const UV _Perl_GCB_invlist[] = { 0x1F23C, 0x1F240, 0x1F249, + 0x1F260, + 0x1F266, + 0x1F322, + 0x1F324, + 0x1F394, + 0x1F396, + 0x1F398, + 0x1F399, + 0x1F39C, + 0x1F39E, + 0x1F3F1, + 0x1F3F3, + 0x1F3F6, + 0x1F3F7, 0x1F3FB, 0x1F400, + 0x1F4FE, + 0x1F4FF, 0x1F53E, - 0x1F546, + 0x1F549, + 0x1F54F, + 0x1F550, + 0x1F568, + 0x1F56F, + 0x1F571, + 0x1F573, + 0x1F57B, + 0x1F587, + 0x1F588, + 0x1F58A, + 0x1F58E, + 0x1F590, + 0x1F591, + 0x1F595, + 0x1F597, + 0x1F5A4, + 0x1F5A6, + 0x1F5A8, + 0x1F5A9, + 0x1F5B1, + 0x1F5B3, + 0x1F5BC, + 0x1F5BD, + 0x1F5C2, + 0x1F5C5, + 0x1F5D1, + 0x1F5D4, + 0x1F5DC, + 0x1F5DF, + 0x1F5E1, + 0x1F5E2, + 0x1F5E3, + 0x1F5E4, + 0x1F5E8, + 0x1F5E9, + 0x1F5EF, + 0x1F5F0, + 0x1F5F3, + 0x1F5F4, + 0x1F5FA, 0x1F650, 0x1F680, + 0x1F6C6, + 0x1F6CB, + 0x1F6D3, + 0x1F6D5, + 0x1F6E6, + 0x1F6E9, + 0x1F6EA, + 0x1F6EB, + 0x1F6F1, + 0x1F6F3, 0x1F700, - 0x1F774, - 0x1F780, - 0x1F7D5, + 0x1F7DA, 0x1F800, 0x1F80C, 0x1F810, @@ -20870,12 +21215,22 @@ static const UV _Perl_GCB_invlist[] = { 0x1F888, 0x1F890, 0x1F8AE, + 0x1F8B0, + 0x1F8BC, + 0x1F8C0, + 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1F93B, 0x1F93C, 0x1F946, 0x1F947, + 0x1FA00, + 0x1FA58, + 0x1FA60, + 0x1FA6E, 0x1FB00, 0x1FC00, 0x1FFFE, @@ -21262,27 +21617,37 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Linker_EX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, - GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -21300,6 +21665,7 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -21307,6 +21673,8 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -21332,12 +21700,13 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, - GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -21350,21 +21719,33 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, + GCB_Other, + GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, @@ -21493,6 +21874,80 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_ExtPict_XX, GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, @@ -21550,16 +22005,24 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, - GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -21571,8 +22034,16 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, @@ -21583,12 +22054,15 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, GCB_SpacingMark, - GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -22420,16 +22894,22 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, - GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Linker_EX, + GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, @@ -22469,12 +22949,16 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Prepend, GCB_Other, GCB_InCB_Extend_EX, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -22529,6 +23013,14 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -22542,6 +23034,7 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Prepend, GCB_InCB_Extend_EX, GCB_Other, @@ -22605,12 +23098,22 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, GCB_SpacingMark, GCB_Other, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Prepend, GCB_SpacingMark, GCB_Prepend, @@ -22626,23 +23129,33 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_SpacingMark, GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, - GCB_Prepend, - GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Linker_EX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_Prepend, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_Other, + GCB_InCB_Extend_EX, + GCB_SpacingMark, + GCB_InCB_Extend_EX, + GCB_SpacingMark, + GCB_InCB_Extend_EX, + GCB_SpacingMark, GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -22685,12 +23198,15 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_Prepend, GCB_SpacingMark, + GCB_InCB_Consonant_XX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -22779,6 +23295,22 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Extend_EX, + GCB_Other, + GCB_InCB_Extend_EX, + GCB_Other, + GCB_InCB_Extend_EX, + GCB_Other, + GCB_InCB_Extend_EX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, GCB_ExtPict_XX, GCB_Other, GCB_ExtPict_XX, @@ -22807,6 +23339,20 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_ExtPict_XX, GCB_Other, GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, GCB_InCB_Extend_EX, GCB_ExtPict_XX, GCB_Other, @@ -22836,6 +23382,66 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_ExtPict_XX, GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, GCB_Control, GCB_InCB_Extend_EX, GCB_Control, @@ -22856,7 +23462,7 @@ static const GCB_enum _Perl_GCB_invmap[] && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */ - 1918, /* Number of elements */ + 2169, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -23198,19 +23804,28 @@ static const UV _Perl_GCB_invlist[] = { 0xFBD, 0xFC6, 0xFC7, + 0x1000, + 0x102B, 0x102D, 0x1031, 0x1032, 0x1038, 0x1039, + 0x103A, 0x103B, 0x103D, 0x103F, + 0x1040, + 0x1050, 0x1056, 0x1058, 0x105A, 0x105E, 0x1061, + 0x1062, + 0x1065, + 0x1067, + 0x106E, 0x1071, 0x1075, 0x1082, @@ -23220,6 +23835,7 @@ static const UV _Perl_GCB_invlist[] = { 0x1087, 0x108D, 0x108E, + 0x108F, 0x109D, 0x109E, 0x1100, @@ -23236,6 +23852,7 @@ static const UV _Perl_GCB_invlist[] = { 0x1754, 0x1772, 0x1774, + 0x1780, 0x17B4, 0x17B6, 0x17B7, @@ -23243,6 +23860,8 @@ static const UV _Perl_GCB_invlist[] = { 0x17C6, 0x17C7, 0x17C9, + 0x17D2, + 0x17D3, 0x17D4, 0x17DD, 0x17DE, @@ -23268,6 +23887,7 @@ static const UV _Perl_GCB_invlist[] = { 0x1A19, 0x1A1B, 0x1A1C, + 0x1A20, 0x1A55, 0x1A56, 0x1A57, @@ -23284,14 +23904,21 @@ static const UV _Perl_GCB_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B05, + 0x1B0B, + 0x1B0D, + 0x1B13, 0x1B34, 0x1B3E, 0x1B42, + 0x1B44, 0x1B45, + 0x1B4D, 0x1B6B, 0x1B74, 0x1B80, @@ -23301,7 +23928,12 @@ static const UV _Perl_GCB_invlist[] = { 0x1BA2, 0x1BA6, 0x1BA8, + 0x1BAB, + 0x1BAC, 0x1BAE, + 0x1BB0, + 0x1BBB, + 0x1BBE, 0x1BE6, 0x1BE7, 0x1BE8, @@ -23357,8 +23989,6 @@ static const UV _Perl_GCB_invlist[] = { 0x231C, 0x2328, 0x2329, - 0x2388, - 0x2389, 0x23CF, 0x23D0, 0x23E9, @@ -23376,14 +24006,90 @@ static const UV _Perl_GCB_invlist[] = { 0x25FB, 0x25FF, 0x2600, - 0x2606, - 0x2607, - 0x2613, + 0x2605, + 0x260E, + 0x260F, + 0x2611, + 0x2612, 0x2614, - 0x2686, - 0x2690, + 0x2616, + 0x2618, + 0x2619, + 0x261D, + 0x261E, + 0x2620, + 0x2621, + 0x2622, + 0x2624, + 0x2626, + 0x2627, + 0x262A, + 0x262B, + 0x262E, + 0x2630, + 0x2638, + 0x263B, + 0x2640, + 0x2641, + 0x2642, + 0x2643, + 0x2648, + 0x2654, + 0x265F, + 0x2661, + 0x2663, + 0x2664, + 0x2665, + 0x2667, + 0x2668, + 0x2669, + 0x267B, + 0x267C, + 0x267E, + 0x2680, + 0x2692, + 0x2698, + 0x2699, + 0x269A, + 0x269B, + 0x269D, + 0x26A0, + 0x26A2, + 0x26A7, + 0x26A8, + 0x26AA, + 0x26AC, + 0x26B0, + 0x26B2, + 0x26BD, + 0x26BF, + 0x26C4, + 0x26C6, + 0x26C8, + 0x26C9, + 0x26CE, + 0x26D0, + 0x26D1, + 0x26D2, + 0x26D3, + 0x26D5, + 0x26E9, + 0x26EB, + 0x26F0, + 0x26F6, + 0x26F7, + 0x26FB, + 0x26FD, + 0x26FE, + 0x2702, + 0x2703, + 0x2705, 0x2706, 0x2708, + 0x270E, + 0x270F, + 0x2710, + 0x2712, 0x2713, 0x2714, 0x2715, @@ -23410,7 +24116,7 @@ static const UV _Perl_GCB_invlist[] = { 0x2757, 0x2758, 0x2763, - 0x2768, + 0x2765, 0x2795, 0x2798, 0x27A1, @@ -23486,6 +24192,9 @@ static const UV _Perl_GCB_invlist[] = { 0xA980, 0xA983, 0xA984, + 0xA989, + 0xA98C, + 0xA98F, 0xA9B3, 0xA9B4, 0xA9B6, @@ -23494,8 +24203,13 @@ static const UV _Perl_GCB_invlist[] = { 0xA9BE, 0xA9C0, 0xA9C1, + 0xA9E0, 0xA9E5, 0xA9E6, + 0xA9E7, + 0xA9F0, + 0xA9FA, + 0xA9FF, 0xAA29, 0xAA2F, 0xAA31, @@ -23507,8 +24221,16 @@ static const UV _Perl_GCB_invlist[] = { 0xAA4C, 0xAA4D, 0xAA4E, + 0xAA60, + 0xAA70, + 0xAA71, + 0xAA74, + 0xAA7A, + 0xAA7B, 0xAA7C, 0xAA7D, + 0xAA7E, + 0xAA80, 0xAAB0, 0xAAB1, 0xAAB2, @@ -23519,6 +24241,7 @@ static const UV _Perl_GCB_invlist[] = { 0xAAC0, 0xAAC1, 0xAAC2, + 0xAAE0, 0xAAEB, 0xAAEC, 0xAAEE, @@ -23526,6 +24249,8 @@ static const UV _Perl_GCB_invlist[] = { 0xAAF5, 0xAAF6, 0xAAF7, + 0xABC0, + 0xABDB, 0xABE3, 0xABE5, 0xABE6, @@ -24356,12 +25081,18 @@ static const UV _Perl_GCB_invlist[] = { 0x102E1, 0x10376, 0x1037B, + 0x10A00, 0x10A01, 0x10A04, 0x10A05, 0x10A07, 0x10A0C, 0x10A10, + 0x10A14, + 0x10A15, + 0x10A18, + 0x10A19, + 0x10A36, 0x10A38, 0x10A3B, 0x10A3F, @@ -24374,7 +25105,7 @@ static const UV _Perl_GCB_invlist[] = { 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -24409,9 +25140,13 @@ static const UV _Perl_GCB_invlist[] = { 0x11127, 0x1112C, 0x1112D, + 0x11133, + 0x11134, 0x11135, + 0x11144, 0x11145, 0x11147, + 0x11148, 0x11173, 0x11174, 0x11180, @@ -24465,6 +25200,14 @@ static const UV _Perl_GCB_invlist[] = { 0x1136D, 0x11370, 0x11375, + 0x11380, + 0x1138A, + 0x1138B, + 0x1138C, + 0x1138E, + 0x1138F, + 0x11390, + 0x113B6, 0x113B8, 0x113B9, 0x113BB, @@ -24478,6 +25221,7 @@ static const UV _Perl_GCB_invlist[] = { 0x113CB, 0x113CC, 0x113CE, + 0x113D0, 0x113D1, 0x113D2, 0x113D3, @@ -24541,12 +25285,22 @@ static const UV _Perl_GCB_invlist[] = { 0x11838, 0x11839, 0x1183B, + 0x11900, + 0x11907, + 0x11909, + 0x1190A, + 0x1190C, + 0x11914, + 0x11915, + 0x11917, + 0x11918, 0x11930, 0x11931, 0x11936, 0x11937, 0x11939, 0x1193B, + 0x1193E, 0x1193F, 0x11940, 0x11941, @@ -24562,6 +25316,7 @@ static const UV _Perl_GCB_invlist[] = { 0x119E1, 0x119E4, 0x119E5, + 0x11A00, 0x11A01, 0x11A0B, 0x11A33, @@ -24571,6 +25326,7 @@ static const UV _Perl_GCB_invlist[] = { 0x11A3F, 0x11A47, 0x11A48, + 0x11A50, 0x11A51, 0x11A57, 0x11A59, @@ -24579,7 +25335,15 @@ static const UV _Perl_GCB_invlist[] = { 0x11A8A, 0x11A97, 0x11A98, + 0x11A99, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, + 0x11B68, 0x11C2F, 0x11C30, 0x11C37, @@ -24622,11 +25386,14 @@ static const UV _Perl_GCB_invlist[] = { 0x11F02, 0x11F03, 0x11F04, + 0x11F11, + 0x11F12, 0x11F34, 0x11F36, 0x11F3B, 0x11F3E, 0x11F40, + 0x11F42, 0x11F43, 0x11F5A, 0x11F5B, @@ -24711,17 +25478,33 @@ static const UV _Perl_GCB_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, 0x1E94B, - 0x1F000, + 0x1F004, + 0x1F005, + 0x1F02C, + 0x1F030, + 0x1F094, + 0x1F0A0, + 0x1F0AF, + 0x1F0B1, + 0x1F0C0, + 0x1F0C1, + 0x1F0CF, + 0x1F0D1, + 0x1F0F6, 0x1F100, - 0x1F10D, - 0x1F110, - 0x1F12F, - 0x1F130, - 0x1F16C, + 0x1F170, 0x1F172, 0x1F17E, 0x1F180, @@ -24729,7 +25512,7 @@ static const UV _Perl_GCB_invlist[] = { 0x1F18F, 0x1F191, 0x1F19B, - 0x1F1AD, + 0x1F1AE, 0x1F1E6, 0x1F200, 0x1F201, @@ -24743,16 +25526,80 @@ static const UV _Perl_GCB_invlist[] = { 0x1F23C, 0x1F240, 0x1F249, + 0x1F260, + 0x1F266, + 0x1F322, + 0x1F324, + 0x1F394, + 0x1F396, + 0x1F398, + 0x1F399, + 0x1F39C, + 0x1F39E, + 0x1F3F1, + 0x1F3F3, + 0x1F3F6, + 0x1F3F7, 0x1F3FB, 0x1F400, + 0x1F4FE, + 0x1F4FF, 0x1F53E, - 0x1F546, + 0x1F549, + 0x1F54F, + 0x1F550, + 0x1F568, + 0x1F56F, + 0x1F571, + 0x1F573, + 0x1F57B, + 0x1F587, + 0x1F588, + 0x1F58A, + 0x1F58E, + 0x1F590, + 0x1F591, + 0x1F595, + 0x1F597, + 0x1F5A4, + 0x1F5A6, + 0x1F5A8, + 0x1F5A9, + 0x1F5B1, + 0x1F5B3, + 0x1F5BC, + 0x1F5BD, + 0x1F5C2, + 0x1F5C5, + 0x1F5D1, + 0x1F5D4, + 0x1F5DC, + 0x1F5DF, + 0x1F5E1, + 0x1F5E2, + 0x1F5E3, + 0x1F5E4, + 0x1F5E8, + 0x1F5E9, + 0x1F5EF, + 0x1F5F0, + 0x1F5F3, + 0x1F5F4, + 0x1F5FA, 0x1F650, 0x1F680, + 0x1F6C6, + 0x1F6CB, + 0x1F6D3, + 0x1F6D5, + 0x1F6E6, + 0x1F6E9, + 0x1F6EA, + 0x1F6EB, + 0x1F6F1, + 0x1F6F3, 0x1F700, - 0x1F774, - 0x1F780, - 0x1F7D5, + 0x1F7DA, 0x1F800, 0x1F80C, 0x1F810, @@ -24763,12 +25610,22 @@ static const UV _Perl_GCB_invlist[] = { 0x1F888, 0x1F890, 0x1F8AE, + 0x1F8B0, + 0x1F8BC, + 0x1F8C0, + 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1F93B, 0x1F93C, 0x1F946, 0x1F947, + 0x1FA00, + 0x1FA58, + 0x1FA60, + 0x1FA6E, 0x1FB00, 0x1FC00, 0x1FFFE, @@ -25159,27 +26016,37 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Linker_EX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, - GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -25197,6 +26064,7 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -25204,6 +26072,8 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -25229,12 +26099,13 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, - GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -25247,21 +26118,33 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, + GCB_Other, + GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, @@ -25390,6 +26273,80 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_ExtPict_XX, GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, @@ -25447,16 +26404,24 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, - GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -25468,8 +26433,16 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, @@ -25480,12 +26453,15 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, GCB_SpacingMark, - GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -26317,16 +27293,22 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, - GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Linker_EX, + GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, @@ -26366,12 +27348,16 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Prepend, GCB_Other, GCB_InCB_Extend_EX, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -26426,6 +27412,14 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -26439,6 +27433,7 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Prepend, GCB_InCB_Extend_EX, GCB_Other, @@ -26502,12 +27497,22 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, GCB_SpacingMark, GCB_Other, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Prepend, GCB_SpacingMark, GCB_Prepend, @@ -26523,23 +27528,33 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_SpacingMark, GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, - GCB_Prepend, - GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Linker_EX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_Prepend, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_Other, + GCB_InCB_Extend_EX, + GCB_SpacingMark, + GCB_InCB_Extend_EX, + GCB_SpacingMark, + GCB_InCB_Extend_EX, + GCB_SpacingMark, GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -26582,12 +27597,15 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_Prepend, GCB_SpacingMark, + GCB_InCB_Consonant_XX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -26676,6 +27694,22 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Extend_EX, + GCB_Other, + GCB_InCB_Extend_EX, + GCB_Other, + GCB_InCB_Extend_EX, + GCB_Other, + GCB_InCB_Extend_EX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, GCB_ExtPict_XX, GCB_Other, GCB_ExtPict_XX, @@ -26704,6 +27738,20 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_ExtPict_XX, GCB_Other, GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, GCB_InCB_Extend_EX, GCB_ExtPict_XX, GCB_Other, @@ -26733,6 +27781,66 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_ExtPict_XX, GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, GCB_Control, GCB_InCB_Extend_EX, GCB_Control, @@ -26753,7 +27861,7 @@ static const GCB_enum _Perl_GCB_invmap[] && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */ - 1918, /* Number of elements */ + 2169, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -27095,19 +28203,28 @@ static const UV _Perl_GCB_invlist[] = { 0xFBD, 0xFC6, 0xFC7, + 0x1000, + 0x102B, 0x102D, 0x1031, 0x1032, 0x1038, 0x1039, + 0x103A, 0x103B, 0x103D, 0x103F, + 0x1040, + 0x1050, 0x1056, 0x1058, 0x105A, 0x105E, 0x1061, + 0x1062, + 0x1065, + 0x1067, + 0x106E, 0x1071, 0x1075, 0x1082, @@ -27117,6 +28234,7 @@ static const UV _Perl_GCB_invlist[] = { 0x1087, 0x108D, 0x108E, + 0x108F, 0x109D, 0x109E, 0x1100, @@ -27133,6 +28251,7 @@ static const UV _Perl_GCB_invlist[] = { 0x1754, 0x1772, 0x1774, + 0x1780, 0x17B4, 0x17B6, 0x17B7, @@ -27140,6 +28259,8 @@ static const UV _Perl_GCB_invlist[] = { 0x17C6, 0x17C7, 0x17C9, + 0x17D2, + 0x17D3, 0x17D4, 0x17DD, 0x17DE, @@ -27165,6 +28286,7 @@ static const UV _Perl_GCB_invlist[] = { 0x1A19, 0x1A1B, 0x1A1C, + 0x1A20, 0x1A55, 0x1A56, 0x1A57, @@ -27181,14 +28303,21 @@ static const UV _Perl_GCB_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B05, + 0x1B0B, + 0x1B0D, + 0x1B13, 0x1B34, 0x1B3E, 0x1B42, + 0x1B44, 0x1B45, + 0x1B4D, 0x1B6B, 0x1B74, 0x1B80, @@ -27198,7 +28327,12 @@ static const UV _Perl_GCB_invlist[] = { 0x1BA2, 0x1BA6, 0x1BA8, + 0x1BAB, + 0x1BAC, 0x1BAE, + 0x1BB0, + 0x1BBB, + 0x1BBE, 0x1BE6, 0x1BE7, 0x1BE8, @@ -27254,8 +28388,6 @@ static const UV _Perl_GCB_invlist[] = { 0x231C, 0x2328, 0x2329, - 0x2388, - 0x2389, 0x23CF, 0x23D0, 0x23E9, @@ -27273,14 +28405,90 @@ static const UV _Perl_GCB_invlist[] = { 0x25FB, 0x25FF, 0x2600, - 0x2606, - 0x2607, - 0x2613, + 0x2605, + 0x260E, + 0x260F, + 0x2611, + 0x2612, 0x2614, - 0x2686, - 0x2690, + 0x2616, + 0x2618, + 0x2619, + 0x261D, + 0x261E, + 0x2620, + 0x2621, + 0x2622, + 0x2624, + 0x2626, + 0x2627, + 0x262A, + 0x262B, + 0x262E, + 0x2630, + 0x2638, + 0x263B, + 0x2640, + 0x2641, + 0x2642, + 0x2643, + 0x2648, + 0x2654, + 0x265F, + 0x2661, + 0x2663, + 0x2664, + 0x2665, + 0x2667, + 0x2668, + 0x2669, + 0x267B, + 0x267C, + 0x267E, + 0x2680, + 0x2692, + 0x2698, + 0x2699, + 0x269A, + 0x269B, + 0x269D, + 0x26A0, + 0x26A2, + 0x26A7, + 0x26A8, + 0x26AA, + 0x26AC, + 0x26B0, + 0x26B2, + 0x26BD, + 0x26BF, + 0x26C4, + 0x26C6, + 0x26C8, + 0x26C9, + 0x26CE, + 0x26D0, + 0x26D1, + 0x26D2, + 0x26D3, + 0x26D5, + 0x26E9, + 0x26EB, + 0x26F0, + 0x26F6, + 0x26F7, + 0x26FB, + 0x26FD, + 0x26FE, + 0x2702, + 0x2703, + 0x2705, 0x2706, 0x2708, + 0x270E, + 0x270F, + 0x2710, + 0x2712, 0x2713, 0x2714, 0x2715, @@ -27307,7 +28515,7 @@ static const UV _Perl_GCB_invlist[] = { 0x2757, 0x2758, 0x2763, - 0x2768, + 0x2765, 0x2795, 0x2798, 0x27A1, @@ -27383,6 +28591,9 @@ static const UV _Perl_GCB_invlist[] = { 0xA980, 0xA983, 0xA984, + 0xA989, + 0xA98C, + 0xA98F, 0xA9B3, 0xA9B4, 0xA9B6, @@ -27391,8 +28602,13 @@ static const UV _Perl_GCB_invlist[] = { 0xA9BE, 0xA9C0, 0xA9C1, + 0xA9E0, 0xA9E5, 0xA9E6, + 0xA9E7, + 0xA9F0, + 0xA9FA, + 0xA9FF, 0xAA29, 0xAA2F, 0xAA31, @@ -27404,8 +28620,16 @@ static const UV _Perl_GCB_invlist[] = { 0xAA4C, 0xAA4D, 0xAA4E, + 0xAA60, + 0xAA70, + 0xAA71, + 0xAA74, + 0xAA7A, + 0xAA7B, 0xAA7C, 0xAA7D, + 0xAA7E, + 0xAA80, 0xAAB0, 0xAAB1, 0xAAB2, @@ -27416,6 +28640,7 @@ static const UV _Perl_GCB_invlist[] = { 0xAAC0, 0xAAC1, 0xAAC2, + 0xAAE0, 0xAAEB, 0xAAEC, 0xAAEE, @@ -27423,6 +28648,8 @@ static const UV _Perl_GCB_invlist[] = { 0xAAF5, 0xAAF6, 0xAAF7, + 0xABC0, + 0xABDB, 0xABE3, 0xABE5, 0xABE6, @@ -28253,12 +29480,18 @@ static const UV _Perl_GCB_invlist[] = { 0x102E1, 0x10376, 0x1037B, + 0x10A00, 0x10A01, 0x10A04, 0x10A05, 0x10A07, 0x10A0C, 0x10A10, + 0x10A14, + 0x10A15, + 0x10A18, + 0x10A19, + 0x10A36, 0x10A38, 0x10A3B, 0x10A3F, @@ -28271,7 +29504,7 @@ static const UV _Perl_GCB_invlist[] = { 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -28306,9 +29539,13 @@ static const UV _Perl_GCB_invlist[] = { 0x11127, 0x1112C, 0x1112D, + 0x11133, + 0x11134, 0x11135, + 0x11144, 0x11145, 0x11147, + 0x11148, 0x11173, 0x11174, 0x11180, @@ -28362,6 +29599,14 @@ static const UV _Perl_GCB_invlist[] = { 0x1136D, 0x11370, 0x11375, + 0x11380, + 0x1138A, + 0x1138B, + 0x1138C, + 0x1138E, + 0x1138F, + 0x11390, + 0x113B6, 0x113B8, 0x113B9, 0x113BB, @@ -28375,6 +29620,7 @@ static const UV _Perl_GCB_invlist[] = { 0x113CB, 0x113CC, 0x113CE, + 0x113D0, 0x113D1, 0x113D2, 0x113D3, @@ -28438,12 +29684,22 @@ static const UV _Perl_GCB_invlist[] = { 0x11838, 0x11839, 0x1183B, + 0x11900, + 0x11907, + 0x11909, + 0x1190A, + 0x1190C, + 0x11914, + 0x11915, + 0x11917, + 0x11918, 0x11930, 0x11931, 0x11936, 0x11937, 0x11939, 0x1193B, + 0x1193E, 0x1193F, 0x11940, 0x11941, @@ -28459,6 +29715,7 @@ static const UV _Perl_GCB_invlist[] = { 0x119E1, 0x119E4, 0x119E5, + 0x11A00, 0x11A01, 0x11A0B, 0x11A33, @@ -28468,6 +29725,7 @@ static const UV _Perl_GCB_invlist[] = { 0x11A3F, 0x11A47, 0x11A48, + 0x11A50, 0x11A51, 0x11A57, 0x11A59, @@ -28476,7 +29734,15 @@ static const UV _Perl_GCB_invlist[] = { 0x11A8A, 0x11A97, 0x11A98, + 0x11A99, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, + 0x11B68, 0x11C2F, 0x11C30, 0x11C37, @@ -28519,11 +29785,14 @@ static const UV _Perl_GCB_invlist[] = { 0x11F02, 0x11F03, 0x11F04, + 0x11F11, + 0x11F12, 0x11F34, 0x11F36, 0x11F3B, 0x11F3E, 0x11F40, + 0x11F42, 0x11F43, 0x11F5A, 0x11F5B, @@ -28608,17 +29877,33 @@ static const UV _Perl_GCB_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, 0x1E94B, - 0x1F000, + 0x1F004, + 0x1F005, + 0x1F02C, + 0x1F030, + 0x1F094, + 0x1F0A0, + 0x1F0AF, + 0x1F0B1, + 0x1F0C0, + 0x1F0C1, + 0x1F0CF, + 0x1F0D1, + 0x1F0F6, 0x1F100, - 0x1F10D, - 0x1F110, - 0x1F12F, - 0x1F130, - 0x1F16C, + 0x1F170, 0x1F172, 0x1F17E, 0x1F180, @@ -28626,7 +29911,7 @@ static const UV _Perl_GCB_invlist[] = { 0x1F18F, 0x1F191, 0x1F19B, - 0x1F1AD, + 0x1F1AE, 0x1F1E6, 0x1F200, 0x1F201, @@ -28640,16 +29925,80 @@ static const UV _Perl_GCB_invlist[] = { 0x1F23C, 0x1F240, 0x1F249, + 0x1F260, + 0x1F266, + 0x1F322, + 0x1F324, + 0x1F394, + 0x1F396, + 0x1F398, + 0x1F399, + 0x1F39C, + 0x1F39E, + 0x1F3F1, + 0x1F3F3, + 0x1F3F6, + 0x1F3F7, 0x1F3FB, 0x1F400, + 0x1F4FE, + 0x1F4FF, 0x1F53E, - 0x1F546, + 0x1F549, + 0x1F54F, + 0x1F550, + 0x1F568, + 0x1F56F, + 0x1F571, + 0x1F573, + 0x1F57B, + 0x1F587, + 0x1F588, + 0x1F58A, + 0x1F58E, + 0x1F590, + 0x1F591, + 0x1F595, + 0x1F597, + 0x1F5A4, + 0x1F5A6, + 0x1F5A8, + 0x1F5A9, + 0x1F5B1, + 0x1F5B3, + 0x1F5BC, + 0x1F5BD, + 0x1F5C2, + 0x1F5C5, + 0x1F5D1, + 0x1F5D4, + 0x1F5DC, + 0x1F5DF, + 0x1F5E1, + 0x1F5E2, + 0x1F5E3, + 0x1F5E4, + 0x1F5E8, + 0x1F5E9, + 0x1F5EF, + 0x1F5F0, + 0x1F5F3, + 0x1F5F4, + 0x1F5FA, 0x1F650, 0x1F680, + 0x1F6C6, + 0x1F6CB, + 0x1F6D3, + 0x1F6D5, + 0x1F6E6, + 0x1F6E9, + 0x1F6EA, + 0x1F6EB, + 0x1F6F1, + 0x1F6F3, 0x1F700, - 0x1F774, - 0x1F780, - 0x1F7D5, + 0x1F7DA, 0x1F800, 0x1F80C, 0x1F810, @@ -28660,12 +30009,22 @@ static const UV _Perl_GCB_invlist[] = { 0x1F888, 0x1F890, 0x1F8AE, + 0x1F8B0, + 0x1F8BC, + 0x1F8C0, + 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1F93B, 0x1F93C, 0x1F946, 0x1F947, + 0x1FA00, + 0x1FA58, + 0x1FA60, + 0x1FA6E, 0x1FB00, 0x1FC00, 0x1FFFE, @@ -29056,27 +30415,37 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Linker_EX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, - GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -29094,6 +30463,7 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -29101,6 +30471,8 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -29126,12 +30498,13 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, - GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -29144,21 +30517,33 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, + GCB_Other, + GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, @@ -29287,6 +30672,80 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_ExtPict_XX, GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, @@ -29344,16 +30803,24 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, - GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -29365,8 +30832,16 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, @@ -29377,12 +30852,15 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, GCB_SpacingMark, - GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -30214,16 +31692,22 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, GCB_Other, - GCB_InCB_Extend_EX, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Linker_EX, + GCB_Other, GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, @@ -30263,12 +31747,16 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Prepend, GCB_Other, GCB_InCB_Extend_EX, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, + GCB_InCB_Consonant_XX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -30323,6 +31811,14 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -30336,6 +31832,7 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Prepend, GCB_InCB_Extend_EX, GCB_Other, @@ -30399,12 +31896,22 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_Other, GCB_SpacingMark, GCB_Other, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Prepend, GCB_SpacingMark, GCB_Prepend, @@ -30420,23 +31927,33 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_SpacingMark, GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, - GCB_Prepend, - GCB_InCB_Extend_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Linker_EX, + GCB_Other, + GCB_InCB_Consonant_XX, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, - GCB_Other, + GCB_InCB_Consonant_XX, GCB_Prepend, GCB_InCB_Extend_EX, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, + GCB_Other, + GCB_InCB_Extend_EX, + GCB_SpacingMark, + GCB_InCB_Extend_EX, + GCB_SpacingMark, + GCB_InCB_Extend_EX, + GCB_SpacingMark, GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, @@ -30479,12 +31996,15 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_InCB_Extend_EX, GCB_Prepend, GCB_SpacingMark, + GCB_InCB_Consonant_XX, GCB_Other, + GCB_InCB_Consonant_XX, GCB_SpacingMark, GCB_InCB_Extend_EX, GCB_Other, GCB_SpacingMark, GCB_InCB_Extend_EX, + GCB_InCB_Linker_EX, GCB_Other, GCB_InCB_Extend_EX, GCB_Other, @@ -30573,6 +32093,22 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_InCB_Extend_EX, GCB_Other, + GCB_InCB_Extend_EX, + GCB_Other, + GCB_InCB_Extend_EX, + GCB_Other, + GCB_InCB_Extend_EX, + GCB_Other, + GCB_InCB_Extend_EX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, GCB_ExtPict_XX, GCB_Other, GCB_ExtPict_XX, @@ -30601,6 +32137,20 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_ExtPict_XX, GCB_Other, GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, GCB_InCB_Extend_EX, GCB_ExtPict_XX, GCB_Other, @@ -30630,6 +32180,66 @@ static const GCB_enum _Perl_GCB_invmap[] GCB_Other, GCB_ExtPict_XX, GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, + GCB_ExtPict_XX, + GCB_Other, GCB_Control, GCB_InCB_Extend_EX, GCB_Control, @@ -30647,7 +32257,7 @@ static const GCB_enum _Perl_GCB_invmap[] # if 'A' == 65 /* ASCII/Latin1 */ static const UV _Perl_IVCF_invlist[] = { /* for ASCII/Latin1 */ - 1343, /* Number of elements */ + 1351, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -31955,8 +33565,14 @@ static const UV _Perl_IVCF_invlist[] = { 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -31992,6 +33608,8 @@ static const UV _Perl_IVCF_invlist[] = { 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -33557,8 +35175,14 @@ static const I32 _Perl_IVCF_invmap[] = { 0, 0xA7CC, 0, + 0xA7CE, + 0, 0xA7D0, 0, + 0xA7D2, + 0, + 0xA7D4, + 0, 0xA7D6, 0, 0xA7D8, @@ -33594,6 +35218,8 @@ static const I32 _Perl_IVCF_invmap[] = { 0, 0x16E40, 0, + 0x16EA0, + 0, 0x1E900, 0 }; @@ -33610,7 +35236,7 @@ static const I32 _Perl_IVCF_invmap[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV _Perl_IVCF_invlist[] = { /* for EBCDIC 1047 */ - 1358, /* Number of elements */ + 1366, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -34933,8 +36559,14 @@ static const UV _Perl_IVCF_invlist[] = { 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -34970,6 +36602,8 @@ static const UV _Perl_IVCF_invlist[] = { 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -36553,8 +38187,14 @@ static const I32 _Perl_IVCF_invmap[] = { 0, 0xA7CC, 0, + 0xA7CE, + 0, 0xA7D0, 0, + 0xA7D2, + 0, + 0xA7D4, + 0, 0xA7D6, 0, 0xA7D8, @@ -36590,6 +38230,8 @@ static const I32 _Perl_IVCF_invmap[] = { 0, 0x16E40, 0, + 0x16EA0, + 0, 0x1E900, 0 }; @@ -36606,7 +38248,7 @@ static const I32 _Perl_IVCF_invmap[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV _Perl_IVCF_invlist[] = { /* for EBCDIC 037 */ - 1356, /* Number of elements */ + 1364, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -37927,8 +39569,14 @@ static const UV _Perl_IVCF_invlist[] = { 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -37964,6 +39612,8 @@ static const UV _Perl_IVCF_invlist[] = { 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -39545,8 +41195,14 @@ static const I32 _Perl_IVCF_invmap[] = { 0, 0xA7CC, 0, + 0xA7CE, + 0, 0xA7D0, 0, + 0xA7D2, + 0, + 0xA7D4, + 0, 0xA7D6, 0, 0xA7D8, @@ -39582,6 +41238,8 @@ static const I32 _Perl_IVCF_invmap[] = { 0, 0x16E40, 0, + 0x16EA0, + 0, 0x1E900, 0 }; @@ -39595,7 +41253,7 @@ static const I32 _Perl_IVCF_invmap[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */ - 2867, /* Number of elements */ + 2971, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -39665,8 +41323,6 @@ static const UV _Perl_LB_invlist[] = { 0x2DF, 0x2E0, 0x300, - 0x34F, - 0x350, 0x35C, 0x363, 0x370, @@ -40088,7 +41744,10 @@ static const UV _Perl_LB_invlist[] = { 0x1A90, 0x1A9A, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEB, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -40239,8 +41898,6 @@ static const UV _Perl_LB_invlist[] = { 0x2329, 0x232A, 0x232B, - 0x2388, - 0x2389, 0x23CF, 0x23D0, 0x23E9, @@ -40266,9 +41923,11 @@ static const UV _Perl_LB_invlist[] = { 0x25FF, 0x2600, 0x2604, - 0x2606, - 0x2607, - 0x2613, + 0x2605, + 0x260E, + 0x260F, + 0x2611, + 0x2612, 0x2614, 0x2616, 0x2618, @@ -40277,33 +41936,68 @@ static const UV _Perl_LB_invlist[] = { 0x261D, 0x261E, 0x2620, + 0x2621, + 0x2622, + 0x2624, + 0x2626, + 0x2627, + 0x262A, + 0x262B, + 0x262E, 0x2630, 0x2638, 0x2639, + 0x263B, 0x263C, + 0x2640, + 0x2641, + 0x2642, + 0x2643, 0x2648, 0x2654, + 0x265F, + 0x2661, + 0x2663, + 0x2664, + 0x2665, + 0x2667, 0x2668, 0x2669, + 0x267B, + 0x267C, + 0x267E, 0x267F, 0x2680, - 0x2686, 0x268A, 0x2690, + 0x2692, 0x2693, 0x2694, + 0x2698, + 0x2699, + 0x269A, + 0x269B, + 0x269D, + 0x26A0, 0x26A1, 0x26A2, + 0x26A7, + 0x26A8, 0x26AA, 0x26AC, + 0x26B0, + 0x26B2, 0x26BD, 0x26BF, 0x26C4, 0x26C6, + 0x26C8, 0x26C9, 0x26CD, 0x26CE, 0x26CF, + 0x26D0, + 0x26D1, 0x26D2, 0x26D3, 0x26D4, @@ -40314,8 +42008,10 @@ static const UV _Perl_LB_invlist[] = { 0x26DD, 0x26DF, 0x26E2, + 0x26E9, 0x26EA, 0x26EB, + 0x26F0, 0x26F1, 0x26F2, 0x26F4, @@ -40327,12 +42023,17 @@ static const UV _Perl_LB_invlist[] = { 0x26FB, 0x26FD, 0x26FE, + 0x2702, + 0x2703, 0x2705, 0x2706, 0x2708, 0x270A, 0x270C, 0x270E, + 0x270F, + 0x2710, + 0x2712, 0x2713, 0x2714, 0x2715, @@ -40401,6 +42102,8 @@ static const UV _Perl_LB_invlist[] = { 0x27EE, 0x27EF, 0x27F0, + 0x2800, + 0x2801, 0x2934, 0x2936, 0x2983, @@ -40496,6 +42199,7 @@ static const UV _Perl_LB_invlist[] = { 0x2E3C, 0x2E3F, 0x2E40, + 0x2E41, 0x2E42, 0x2E43, 0x2E4B, @@ -41733,7 +43437,9 @@ static const UV _Perl_LB_invlist[] = { 0x10EAB, 0x10EAD, 0x10EAE, - 0x10EFC, + 0x10ED0, + 0x10ED1, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -41975,6 +43681,8 @@ static const UV _Perl_LB_invlist[] = { 0x11AA3, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BF0, 0x11BFA, 0x11C2F, @@ -42012,6 +43720,8 @@ static const UV _Perl_LB_invlist[] = { 0x11D98, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF2, 0x11EF3, @@ -42103,14 +43813,16 @@ static const UV _Perl_LB_invlist[] = { 0x16FE5, 0x16FF0, 0x16FF2, + 0x16FF4, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18B00, 0x18CD6, 0x18CFF, 0x18D00, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -42199,6 +43911,14 @@ static const UV _Perl_LB_invlist[] = { 0x1E5F0, 0x1E5F1, 0x1E5FB, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -42227,11 +43947,7 @@ static const UV _Perl_LB_invlist[] = { 0x1F0D1, 0x1F0F6, 0x1F100, - 0x1F10D, - 0x1F110, - 0x1F12F, - 0x1F130, - 0x1F16C, + 0x1F170, 0x1F172, 0x1F17E, 0x1F180, @@ -42239,7 +43955,6 @@ static const UV _Perl_LB_invlist[] = { 0x1F18F, 0x1F191, 0x1F19B, - 0x1F1AD, 0x1F1AE, 0x1F1E6, 0x1F200, @@ -42261,6 +43976,8 @@ static const UV _Perl_LB_invlist[] = { 0x1F266, 0x1F300, 0x1F321, + 0x1F322, + 0x1F324, 0x1F32D, 0x1F336, 0x1F337, @@ -42269,6 +43986,9 @@ static const UV _Perl_LB_invlist[] = { 0x1F385, 0x1F386, 0x1F394, + 0x1F396, + 0x1F398, + 0x1F399, 0x1F39C, 0x1F39E, 0x1F3A0, @@ -42287,8 +44007,11 @@ static const UV _Perl_LB_invlist[] = { 0x1F3D4, 0x1F3E0, 0x1F3F1, + 0x1F3F3, 0x1F3F4, 0x1F3F5, + 0x1F3F6, + 0x1F3F7, 0x1F3F8, 0x1F3FB, 0x1F400, @@ -42324,6 +44047,7 @@ static const UV _Perl_LB_invlist[] = { 0x1F4B1, 0x1F4B3, 0x1F4FD, + 0x1F4FE, 0x1F4FF, 0x1F500, 0x1F507, @@ -42331,24 +44055,51 @@ static const UV _Perl_LB_invlist[] = { 0x1F525, 0x1F532, 0x1F53E, - 0x1F546, + 0x1F549, 0x1F54A, 0x1F54B, 0x1F54F, 0x1F550, 0x1F568, + 0x1F56F, + 0x1F571, + 0x1F573, 0x1F574, 0x1F576, 0x1F57A, 0x1F57B, + 0x1F587, + 0x1F588, + 0x1F58A, + 0x1F58E, 0x1F590, 0x1F591, 0x1F595, 0x1F597, 0x1F5A4, 0x1F5A5, + 0x1F5A6, + 0x1F5A8, + 0x1F5A9, + 0x1F5B1, + 0x1F5B3, + 0x1F5BC, + 0x1F5BD, + 0x1F5C2, + 0x1F5C5, + 0x1F5D1, 0x1F5D4, 0x1F5DC, + 0x1F5DF, + 0x1F5E1, + 0x1F5E2, + 0x1F5E3, + 0x1F5E4, + 0x1F5E8, + 0x1F5E9, + 0x1F5EF, + 0x1F5F0, + 0x1F5F3, 0x1F5F4, 0x1F5FA, 0x1F5FB, @@ -42367,17 +44118,23 @@ static const UV _Perl_LB_invlist[] = { 0x1F6C0, 0x1F6C1, 0x1F6C6, + 0x1F6CB, 0x1F6CC, 0x1F6CD, 0x1F6D0, 0x1F6D3, 0x1F6D5, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6E0, + 0x1F6E6, + 0x1F6E9, + 0x1F6EA, 0x1F6EB, 0x1F6ED, 0x1F6F0, + 0x1F6F1, + 0x1F6F3, 0x1F6F4, 0x1F6FD, 0x1F700, @@ -42405,6 +44162,8 @@ static const UV _Perl_LB_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1F90D, @@ -42434,21 +44193,24 @@ static const UV _Perl_LB_invlist[] = { 0x1F9D1, 0x1F9DE, 0x1FA00, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC3, 0x1FAC6, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, + 0x1FAEB, + 0x1FAEF, 0x1FAF0, 0x1FAF9, 0x1FB00, @@ -42518,28 +44280,28 @@ typedef enum { LB_Glue = 38, LB_H2 = 39, LB_H3 = 40, - LB_Hebrew_Letter = 41, - LB_Hyphen = 42, - LB_Ideographic = 43, - LB_Inseparable = 44, - LB_Infix_Numeric = 45, - LB_JL = 46, - LB_JT = 47, - LB_JV = 48, - LB_Line_Feed = 49, - LB_Next_Line = 50, - LB_Nonstarter = 51, - LB_Numeric = 52, - LB_Open_Punctuation = 53, - LB_Pf_QU = 54, - LB_Pi_QU = 55, - LB_Postfix_Numeric = 56, - LB_Prefix_Numeric = 57, - LB_Quotation = 58, - LB_Regional_Indicator = 59, - LB_Space = 60, - LB_Break_Symbols = 61, - LB_U2010_BA = 62, + LB_Unambiguous_Hyphen = 41, + LB_Hebrew_Letter = 42, + LB_Hyphen = 43, + LB_Ideographic = 44, + LB_Inseparable = 45, + LB_Infix_Numeric = 46, + LB_JL = 47, + LB_JT = 48, + LB_JV = 49, + LB_Line_Feed = 50, + LB_Next_Line = 51, + LB_Nonstarter = 52, + LB_Numeric = 53, + LB_Open_Punctuation = 54, + LB_Pf_QU = 55, + LB_Pi_QU = 56, + LB_Postfix_Numeric = 57, + LB_Prefix_Numeric = 58, + LB_Quotation = 59, + LB_Regional_Indicator = 60, + LB_Space = 61, + LB_Break_Symbols = 62, LB_Virama_Final = 63, LB_Virama = 64, LB_Word_Joiner = 65, @@ -42551,7 +44313,7 @@ typedef enum { LB_Dotted_Circle = 69, LB_East_Asian_CP = 69, LB_East_Asian_OP = 69, - LB_U2010 = 69, + LB_HH = 69, LB_VF = 69, LB_VI = 69 } LB_enum; @@ -42625,20 +44387,18 @@ static const LB_enum _Perl_LB_invmap[] = LB_Combining_Mark, LB_Glue, LB_Combining_Mark, - LB_Glue, - LB_Combining_Mark, LB_Alphabetic, LB_Infix_Numeric, LB_Alphabetic, LB_Combining_Mark, LB_Alphabetic, LB_Infix_Numeric, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Alphabetic, LB_Prefix_Numeric, LB_Alphabetic, LB_Combining_Mark, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Combining_Mark, LB_Alphabetic, LB_Combining_Mark, @@ -42979,7 +44739,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Break_After, LB_Alphabetic, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Alphabetic, LB_Break_After, LB_Alphabetic, @@ -43048,6 +44808,9 @@ static const LB_enum _Perl_LB_invmap[] = LB_Combining_Mark, LB_Alphabetic, LB_Combining_Mark, + LB_Glue, + LB_Alphabetic, + LB_Combining_Mark, LB_Aksara, LB_Combining_Mark, LB_Virama, @@ -43106,9 +44869,9 @@ static const LB_enum _Perl_LB_invmap[] = LB_Combining_Mark, LB_ZWJ, LB_Combining_Mark, - LB_U2010_BA, + LB_Unambiguous_Hyphen, LB_Glue, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Break_Both, LB_Alphabetic, LB_Pi_QU, @@ -43199,8 +44962,6 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, - LB_ExtPict_AL, - LB_Alphabetic, LB_EA_ExtPict_AL, LB_ExtPict_AL, LB_EA_ExtPict_ID, @@ -43227,69 +44988,113 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, - LB_EA_ExtPict_ID, - LB_ExtPict_AL, - LB_ExtPict_ID, LB_ExtPict_AL, + LB_Alphabetic, + LB_EA_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_ID, + LB_Alphabetic, + LB_Ideographic, LB_E_Base, - LB_ExtPict_ID, + LB_Ideographic, LB_ExtPict_AL, - LB_EA_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_EA_AL, LB_ExtPict_AL, LB_ExtPict_ID, + LB_Ideographic, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, + LB_Alphabetic, LB_EA_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_AL, - LB_EA_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_AL, + LB_EA_ExtPict_ID, LB_Alphabetic, LB_EA_AL, + LB_Alphabetic, LB_ExtPict_AL, LB_EA_ExtPict_AL, LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, LB_EA_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, + LB_Alphabetic, LB_EA_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, + LB_Alphabetic, LB_EA_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, - LB_ExtPict_AL, - LB_ExtPict_ID, + LB_Alphabetic, + LB_Ideographic, LB_EA_ExtPict_AL, LB_ExtPict_ID, - LB_ExtPict_AL, - LB_ExtPict_ID, - LB_EA_ExtPict_ID, - LB_ExtPict_AL, - LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Ideographic, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_ID, + LB_EA_ExtPict_ID, + LB_Alphabetic, + LB_Ideographic, + LB_Alphabetic, + LB_Ideographic, + LB_Alphabetic, + LB_Ideographic, + LB_Alphabetic, LB_ExtPict_AL, LB_EA_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_AL, LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, LB_EA_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_ID, LB_E_Base, LB_EA_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_AL, LB_Alphabetic, LB_ExtPict_ID, LB_EA_EB, LB_E_Base, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, LB_ExtPict_AL, @@ -43321,7 +45126,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Exclamation, LB_ExtPict_EX, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_Open_Punctuation, LB_Close_Punctuation, LB_Open_Punctuation, @@ -43359,6 +45164,8 @@ static const LB_enum _Perl_LB_invmap[] = LB_Open_Punctuation, LB_Close_Punctuation, LB_Alphabetic, + LB_Break_After, + LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, LB_Open_Punctuation, @@ -43426,7 +45233,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Pf_QU, LB_Break_After, LB_Alphabetic, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Open_Punctuation, LB_Break_After, LB_Alphabetic, @@ -43453,6 +45260,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Break_Both, LB_Break_After, LB_Alphabetic, + LB_Unambiguous_Hyphen, LB_Break_After, LB_Open_Punctuation, LB_Break_After, @@ -43470,7 +45278,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Close_Parenthesis, LB_Open_Punctuation, LB_Close_Parenthesis, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Alphabetic, LB_EA_ID, LB_Alphabetic, @@ -44686,9 +46494,11 @@ static const LB_enum _Perl_LB_invmap[] = LB_Numeric, LB_Alphabetic, LB_Combining_Mark, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Alphabetic, LB_Combining_Mark, + LB_Unambiguous_Hyphen, + LB_Alphabetic, LB_Break_After, LB_Alphabetic, LB_Combining_Mark, @@ -44933,6 +46743,8 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Break_Before, LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, LB_Numeric, LB_Alphabetic, LB_Combining_Mark, @@ -44970,6 +46782,8 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Numeric, LB_Alphabetic, + LB_Numeric, + LB_Alphabetic, LB_Aksara_Start, LB_Break_After, LB_Combining_Mark, @@ -45060,7 +46874,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_GL, LB_Alphabetic, LB_EA_CM, - LB_Alphabetic, + LB_EA_NS, LB_EA_ID, LB_Alphabetic, LB_EA_ID, @@ -45069,6 +46883,8 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_AL, LB_EA_ID, LB_Alphabetic, + LB_EA_ID, + LB_Alphabetic, LB_EA_AL, LB_Alphabetic, LB_EA_AL, @@ -45161,6 +46977,14 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Combining_Mark, LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, LB_Numeric, LB_Alphabetic, LB_Open_Punctuation, @@ -45169,35 +46993,30 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Postfix_Numeric, LB_Alphabetic, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, - LB_ExtPict_AL, - LB_Alphabetic, - LB_ExtPict_AL, - LB_Alphabetic, LB_EA_ExtPict_AL, LB_Alphabetic, LB_EA_ExtPict_AL, LB_Alphabetic, - LB_ExtPict_AL, LB_Cn_ExtPict_ExtPict_ID, LB_Regional_Indicator, LB_EA_ID, @@ -45215,10 +47034,12 @@ static const LB_enum _Perl_LB_invmap[] = LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, - LB_EA_ExtPict_ID, + LB_EA_ID, LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, LB_EA_ExtPict_ID, @@ -45226,8 +47047,11 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_ID, LB_EA_EB, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Ideographic, + LB_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_EA_ExtPict_AL, @@ -45244,9 +47068,12 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_ID, LB_ExtPict_ID, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_E_Modifier, LB_EA_ExtPict_ID, @@ -45282,6 +47109,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_AL, LB_EA_ExtPict_ID, LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_EA_ExtPict_AL, LB_EA_ExtPict_ID, @@ -45292,22 +47120,49 @@ static const LB_enum _Perl_LB_invmap[] = LB_ExtPict_AL, LB_ExtPict_ID, LB_EA_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, LB_E_Base, LB_ExtPict_ID, LB_EA_EB, + LB_Ideographic, LB_ExtPict_ID, - LB_E_Base, + LB_Ideographic, LB_ExtPict_ID, + LB_Ideographic, + LB_E_Base, + LB_Ideographic, LB_EA_EB, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Ideographic, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Alphabetic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_EA_EB, @@ -45324,26 +47179,32 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_ID, LB_EA_EB, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, LB_EA_EB, LB_ExtPict_ID, LB_EA_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, - LB_EA_ExtPict_ID, - LB_Cn_ExtPict_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, - LB_Alphabetic, LB_ExtPict_ID, - LB_Cn_ExtPict_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, + LB_EA_ExtPict_ID, + LB_Cn_ExtPict_ExtPict_ID, LB_Alphabetic, - LB_ExtPict_ID, + LB_Ideographic, + LB_Alphabetic, + LB_Ideographic, + LB_Alphabetic, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, @@ -45359,9 +47220,11 @@ static const LB_enum _Perl_LB_invmap[] = LB_Cn_ExtPict_ExtPict_AL, LB_Alphabetic, LB_Cn_ExtPict_ExtPict_AL, - LB_ExtPict_AL, + LB_Alphabetic, LB_Cn_ExtPict_ExtPict_AL, - LB_ExtPict_AL, + LB_Alphabetic, + LB_Cn_ExtPict_ExtPict_AL, + LB_Alphabetic, LB_Cn_ExtPict_ExtPict_AL, LB_Alphabetic, LB_EA_EB, @@ -45391,9 +47254,9 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_ID, LB_EA_EB, LB_EA_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, @@ -45407,6 +47270,9 @@ static const LB_enum _Perl_LB_invmap[] = LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, + LB_EA_ExtPict_ID, + LB_Cn_ExtPict_ExtPict_ID, + LB_EA_ExtPict_ID, LB_EA_EB, LB_Cn_ExtPict_ExtPict_ID, LB_Alphabetic, @@ -45438,7 +47304,7 @@ static const LB_enum _Perl_LB_invmap[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */ - 2881, /* Number of elements */ + 2985, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -45522,8 +47388,6 @@ static const UV _Perl_LB_invlist[] = { 0x2DF, 0x2E0, 0x300, - 0x34F, - 0x350, 0x35C, 0x363, 0x370, @@ -45945,7 +47809,10 @@ static const UV _Perl_LB_invlist[] = { 0x1A90, 0x1A9A, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEB, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -46096,8 +47963,6 @@ static const UV _Perl_LB_invlist[] = { 0x2329, 0x232A, 0x232B, - 0x2388, - 0x2389, 0x23CF, 0x23D0, 0x23E9, @@ -46123,9 +47988,11 @@ static const UV _Perl_LB_invlist[] = { 0x25FF, 0x2600, 0x2604, - 0x2606, - 0x2607, - 0x2613, + 0x2605, + 0x260E, + 0x260F, + 0x2611, + 0x2612, 0x2614, 0x2616, 0x2618, @@ -46134,33 +48001,68 @@ static const UV _Perl_LB_invlist[] = { 0x261D, 0x261E, 0x2620, + 0x2621, + 0x2622, + 0x2624, + 0x2626, + 0x2627, + 0x262A, + 0x262B, + 0x262E, 0x2630, 0x2638, 0x2639, + 0x263B, 0x263C, + 0x2640, + 0x2641, + 0x2642, + 0x2643, 0x2648, 0x2654, + 0x265F, + 0x2661, + 0x2663, + 0x2664, + 0x2665, + 0x2667, 0x2668, 0x2669, + 0x267B, + 0x267C, + 0x267E, 0x267F, 0x2680, - 0x2686, 0x268A, 0x2690, + 0x2692, 0x2693, 0x2694, + 0x2698, + 0x2699, + 0x269A, + 0x269B, + 0x269D, + 0x26A0, 0x26A1, 0x26A2, + 0x26A7, + 0x26A8, 0x26AA, 0x26AC, + 0x26B0, + 0x26B2, 0x26BD, 0x26BF, 0x26C4, 0x26C6, + 0x26C8, 0x26C9, 0x26CD, 0x26CE, 0x26CF, + 0x26D0, + 0x26D1, 0x26D2, 0x26D3, 0x26D4, @@ -46171,8 +48073,10 @@ static const UV _Perl_LB_invlist[] = { 0x26DD, 0x26DF, 0x26E2, + 0x26E9, 0x26EA, 0x26EB, + 0x26F0, 0x26F1, 0x26F2, 0x26F4, @@ -46184,12 +48088,17 @@ static const UV _Perl_LB_invlist[] = { 0x26FB, 0x26FD, 0x26FE, + 0x2702, + 0x2703, 0x2705, 0x2706, 0x2708, 0x270A, 0x270C, 0x270E, + 0x270F, + 0x2710, + 0x2712, 0x2713, 0x2714, 0x2715, @@ -46258,6 +48167,8 @@ static const UV _Perl_LB_invlist[] = { 0x27EE, 0x27EF, 0x27F0, + 0x2800, + 0x2801, 0x2934, 0x2936, 0x2983, @@ -46353,6 +48264,7 @@ static const UV _Perl_LB_invlist[] = { 0x2E3C, 0x2E3F, 0x2E40, + 0x2E41, 0x2E42, 0x2E43, 0x2E4B, @@ -47590,7 +49502,9 @@ static const UV _Perl_LB_invlist[] = { 0x10EAB, 0x10EAD, 0x10EAE, - 0x10EFC, + 0x10ED0, + 0x10ED1, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -47832,6 +49746,8 @@ static const UV _Perl_LB_invlist[] = { 0x11AA3, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BF0, 0x11BFA, 0x11C2F, @@ -47869,6 +49785,8 @@ static const UV _Perl_LB_invlist[] = { 0x11D98, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF2, 0x11EF3, @@ -47960,14 +49878,16 @@ static const UV _Perl_LB_invlist[] = { 0x16FE5, 0x16FF0, 0x16FF2, + 0x16FF4, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18B00, 0x18CD6, 0x18CFF, 0x18D00, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -48056,6 +49976,14 @@ static const UV _Perl_LB_invlist[] = { 0x1E5F0, 0x1E5F1, 0x1E5FB, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -48084,11 +50012,7 @@ static const UV _Perl_LB_invlist[] = { 0x1F0D1, 0x1F0F6, 0x1F100, - 0x1F10D, - 0x1F110, - 0x1F12F, - 0x1F130, - 0x1F16C, + 0x1F170, 0x1F172, 0x1F17E, 0x1F180, @@ -48096,7 +50020,6 @@ static const UV _Perl_LB_invlist[] = { 0x1F18F, 0x1F191, 0x1F19B, - 0x1F1AD, 0x1F1AE, 0x1F1E6, 0x1F200, @@ -48118,6 +50041,8 @@ static const UV _Perl_LB_invlist[] = { 0x1F266, 0x1F300, 0x1F321, + 0x1F322, + 0x1F324, 0x1F32D, 0x1F336, 0x1F337, @@ -48126,6 +50051,9 @@ static const UV _Perl_LB_invlist[] = { 0x1F385, 0x1F386, 0x1F394, + 0x1F396, + 0x1F398, + 0x1F399, 0x1F39C, 0x1F39E, 0x1F3A0, @@ -48144,8 +50072,11 @@ static const UV _Perl_LB_invlist[] = { 0x1F3D4, 0x1F3E0, 0x1F3F1, + 0x1F3F3, 0x1F3F4, 0x1F3F5, + 0x1F3F6, + 0x1F3F7, 0x1F3F8, 0x1F3FB, 0x1F400, @@ -48181,6 +50112,7 @@ static const UV _Perl_LB_invlist[] = { 0x1F4B1, 0x1F4B3, 0x1F4FD, + 0x1F4FE, 0x1F4FF, 0x1F500, 0x1F507, @@ -48188,24 +50120,51 @@ static const UV _Perl_LB_invlist[] = { 0x1F525, 0x1F532, 0x1F53E, - 0x1F546, + 0x1F549, 0x1F54A, 0x1F54B, 0x1F54F, 0x1F550, 0x1F568, + 0x1F56F, + 0x1F571, + 0x1F573, 0x1F574, 0x1F576, 0x1F57A, 0x1F57B, + 0x1F587, + 0x1F588, + 0x1F58A, + 0x1F58E, 0x1F590, 0x1F591, 0x1F595, 0x1F597, 0x1F5A4, 0x1F5A5, + 0x1F5A6, + 0x1F5A8, + 0x1F5A9, + 0x1F5B1, + 0x1F5B3, + 0x1F5BC, + 0x1F5BD, + 0x1F5C2, + 0x1F5C5, + 0x1F5D1, 0x1F5D4, 0x1F5DC, + 0x1F5DF, + 0x1F5E1, + 0x1F5E2, + 0x1F5E3, + 0x1F5E4, + 0x1F5E8, + 0x1F5E9, + 0x1F5EF, + 0x1F5F0, + 0x1F5F3, 0x1F5F4, 0x1F5FA, 0x1F5FB, @@ -48224,17 +50183,23 @@ static const UV _Perl_LB_invlist[] = { 0x1F6C0, 0x1F6C1, 0x1F6C6, + 0x1F6CB, 0x1F6CC, 0x1F6CD, 0x1F6D0, 0x1F6D3, 0x1F6D5, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6E0, + 0x1F6E6, + 0x1F6E9, + 0x1F6EA, 0x1F6EB, 0x1F6ED, 0x1F6F0, + 0x1F6F1, + 0x1F6F3, 0x1F6F4, 0x1F6FD, 0x1F700, @@ -48262,6 +50227,8 @@ static const UV _Perl_LB_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1F90D, @@ -48291,21 +50258,24 @@ static const UV _Perl_LB_invlist[] = { 0x1F9D1, 0x1F9DE, 0x1FA00, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC3, 0x1FAC6, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, + 0x1FAEB, + 0x1FAEF, 0x1FAF0, 0x1FAF9, 0x1FB00, @@ -48378,28 +50348,28 @@ typedef enum { LB_Glue = 38, LB_H2 = 39, LB_H3 = 40, - LB_Hebrew_Letter = 41, - LB_Hyphen = 42, - LB_Ideographic = 43, - LB_Inseparable = 44, - LB_Infix_Numeric = 45, - LB_JL = 46, - LB_JT = 47, - LB_JV = 48, - LB_Line_Feed = 49, - LB_Next_Line = 50, - LB_Nonstarter = 51, - LB_Numeric = 52, - LB_Open_Punctuation = 53, - LB_Pf_QU = 54, - LB_Pi_QU = 55, - LB_Postfix_Numeric = 56, - LB_Prefix_Numeric = 57, - LB_Quotation = 58, - LB_Regional_Indicator = 59, - LB_Space = 60, - LB_Break_Symbols = 61, - LB_U2010_BA = 62, + LB_Unambiguous_Hyphen = 41, + LB_Hebrew_Letter = 42, + LB_Hyphen = 43, + LB_Ideographic = 44, + LB_Inseparable = 45, + LB_Infix_Numeric = 46, + LB_JL = 47, + LB_JT = 48, + LB_JV = 49, + LB_Line_Feed = 50, + LB_Next_Line = 51, + LB_Nonstarter = 52, + LB_Numeric = 53, + LB_Open_Punctuation = 54, + LB_Pf_QU = 55, + LB_Pi_QU = 56, + LB_Postfix_Numeric = 57, + LB_Prefix_Numeric = 58, + LB_Quotation = 59, + LB_Regional_Indicator = 60, + LB_Space = 61, + LB_Break_Symbols = 62, LB_Virama_Final = 63, LB_Virama = 64, LB_Word_Joiner = 65, @@ -48411,7 +50381,7 @@ typedef enum { LB_Dotted_Circle = 69, LB_East_Asian_CP = 69, LB_East_Asian_OP = 69, - LB_U2010 = 69, + LB_HH = 69, LB_VF = 69, LB_VI = 69 } LB_enum; @@ -48499,20 +50469,18 @@ static const LB_enum _Perl_LB_invmap[] = LB_Combining_Mark, LB_Glue, LB_Combining_Mark, - LB_Glue, - LB_Combining_Mark, LB_Alphabetic, LB_Infix_Numeric, LB_Alphabetic, LB_Combining_Mark, LB_Alphabetic, LB_Infix_Numeric, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Alphabetic, LB_Prefix_Numeric, LB_Alphabetic, LB_Combining_Mark, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Combining_Mark, LB_Alphabetic, LB_Combining_Mark, @@ -48853,7 +50821,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Break_After, LB_Alphabetic, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Alphabetic, LB_Break_After, LB_Alphabetic, @@ -48922,6 +50890,9 @@ static const LB_enum _Perl_LB_invmap[] = LB_Combining_Mark, LB_Alphabetic, LB_Combining_Mark, + LB_Glue, + LB_Alphabetic, + LB_Combining_Mark, LB_Aksara, LB_Combining_Mark, LB_Virama, @@ -48980,9 +50951,9 @@ static const LB_enum _Perl_LB_invmap[] = LB_Combining_Mark, LB_ZWJ, LB_Combining_Mark, - LB_U2010_BA, + LB_Unambiguous_Hyphen, LB_Glue, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Break_Both, LB_Alphabetic, LB_Pi_QU, @@ -49073,8 +51044,6 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, - LB_ExtPict_AL, - LB_Alphabetic, LB_EA_ExtPict_AL, LB_ExtPict_AL, LB_EA_ExtPict_ID, @@ -49101,69 +51070,113 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, - LB_EA_ExtPict_ID, - LB_ExtPict_AL, - LB_ExtPict_ID, LB_ExtPict_AL, + LB_Alphabetic, + LB_EA_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_ID, + LB_Alphabetic, + LB_Ideographic, LB_E_Base, - LB_ExtPict_ID, + LB_Ideographic, LB_ExtPict_AL, - LB_EA_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_EA_AL, LB_ExtPict_AL, LB_ExtPict_ID, + LB_Ideographic, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, + LB_Alphabetic, LB_EA_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_AL, - LB_EA_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_AL, + LB_EA_ExtPict_ID, LB_Alphabetic, LB_EA_AL, + LB_Alphabetic, LB_ExtPict_AL, LB_EA_ExtPict_AL, LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, LB_EA_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, + LB_Alphabetic, LB_EA_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, + LB_Alphabetic, LB_EA_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, - LB_ExtPict_AL, - LB_ExtPict_ID, + LB_Alphabetic, + LB_Ideographic, LB_EA_ExtPict_AL, LB_ExtPict_ID, - LB_ExtPict_AL, - LB_ExtPict_ID, - LB_EA_ExtPict_ID, - LB_ExtPict_AL, - LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Ideographic, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_ID, + LB_EA_ExtPict_ID, + LB_Alphabetic, + LB_Ideographic, + LB_Alphabetic, + LB_Ideographic, + LB_Alphabetic, + LB_Ideographic, + LB_Alphabetic, LB_ExtPict_AL, LB_EA_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_AL, LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, LB_EA_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_ID, LB_E_Base, LB_EA_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_AL, LB_Alphabetic, LB_ExtPict_ID, LB_EA_EB, LB_E_Base, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, LB_ExtPict_AL, @@ -49195,7 +51208,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Exclamation, LB_ExtPict_EX, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_Open_Punctuation, LB_Close_Punctuation, LB_Open_Punctuation, @@ -49233,6 +51246,8 @@ static const LB_enum _Perl_LB_invmap[] = LB_Open_Punctuation, LB_Close_Punctuation, LB_Alphabetic, + LB_Break_After, + LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, LB_Open_Punctuation, @@ -49300,7 +51315,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Pf_QU, LB_Break_After, LB_Alphabetic, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Open_Punctuation, LB_Break_After, LB_Alphabetic, @@ -49327,6 +51342,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Break_Both, LB_Break_After, LB_Alphabetic, + LB_Unambiguous_Hyphen, LB_Break_After, LB_Open_Punctuation, LB_Break_After, @@ -49344,7 +51360,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Close_Parenthesis, LB_Open_Punctuation, LB_Close_Parenthesis, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Alphabetic, LB_EA_ID, LB_Alphabetic, @@ -50560,9 +52576,11 @@ static const LB_enum _Perl_LB_invmap[] = LB_Numeric, LB_Alphabetic, LB_Combining_Mark, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Alphabetic, LB_Combining_Mark, + LB_Unambiguous_Hyphen, + LB_Alphabetic, LB_Break_After, LB_Alphabetic, LB_Combining_Mark, @@ -50807,6 +52825,8 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Break_Before, LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, LB_Numeric, LB_Alphabetic, LB_Combining_Mark, @@ -50844,6 +52864,8 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Numeric, LB_Alphabetic, + LB_Numeric, + LB_Alphabetic, LB_Aksara_Start, LB_Break_After, LB_Combining_Mark, @@ -50934,7 +52956,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_GL, LB_Alphabetic, LB_EA_CM, - LB_Alphabetic, + LB_EA_NS, LB_EA_ID, LB_Alphabetic, LB_EA_ID, @@ -50943,6 +52965,8 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_AL, LB_EA_ID, LB_Alphabetic, + LB_EA_ID, + LB_Alphabetic, LB_EA_AL, LB_Alphabetic, LB_EA_AL, @@ -51035,6 +53059,14 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Combining_Mark, LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, LB_Numeric, LB_Alphabetic, LB_Open_Punctuation, @@ -51043,35 +53075,30 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Postfix_Numeric, LB_Alphabetic, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, - LB_ExtPict_AL, - LB_Alphabetic, - LB_ExtPict_AL, - LB_Alphabetic, LB_EA_ExtPict_AL, LB_Alphabetic, LB_EA_ExtPict_AL, LB_Alphabetic, - LB_ExtPict_AL, LB_Cn_ExtPict_ExtPict_ID, LB_Regional_Indicator, LB_EA_ID, @@ -51089,10 +53116,12 @@ static const LB_enum _Perl_LB_invmap[] = LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, - LB_EA_ExtPict_ID, + LB_EA_ID, LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, LB_EA_ExtPict_ID, @@ -51100,8 +53129,11 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_ID, LB_EA_EB, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Ideographic, + LB_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_EA_ExtPict_AL, @@ -51118,9 +53150,12 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_ID, LB_ExtPict_ID, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_E_Modifier, LB_EA_ExtPict_ID, @@ -51156,6 +53191,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_AL, LB_EA_ExtPict_ID, LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_EA_ExtPict_AL, LB_EA_ExtPict_ID, @@ -51166,22 +53202,49 @@ static const LB_enum _Perl_LB_invmap[] = LB_ExtPict_AL, LB_ExtPict_ID, LB_EA_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, LB_E_Base, LB_ExtPict_ID, LB_EA_EB, + LB_Ideographic, LB_ExtPict_ID, - LB_E_Base, + LB_Ideographic, LB_ExtPict_ID, + LB_Ideographic, + LB_E_Base, + LB_Ideographic, LB_EA_EB, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Ideographic, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Alphabetic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_EA_EB, @@ -51198,26 +53261,32 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_ID, LB_EA_EB, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, LB_EA_EB, LB_ExtPict_ID, LB_EA_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, LB_Alphabetic, - LB_ExtPict_ID, - LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Alphabetic, - LB_ExtPict_ID, + LB_Ideographic, + LB_Alphabetic, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, @@ -51233,9 +53302,11 @@ static const LB_enum _Perl_LB_invmap[] = LB_Cn_ExtPict_ExtPict_AL, LB_Alphabetic, LB_Cn_ExtPict_ExtPict_AL, - LB_ExtPict_AL, + LB_Alphabetic, LB_Cn_ExtPict_ExtPict_AL, - LB_ExtPict_AL, + LB_Alphabetic, + LB_Cn_ExtPict_ExtPict_AL, + LB_Alphabetic, LB_Cn_ExtPict_ExtPict_AL, LB_Alphabetic, LB_EA_EB, @@ -51265,9 +53336,9 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_ID, LB_EA_EB, LB_EA_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, @@ -51281,6 +53352,9 @@ static const LB_enum _Perl_LB_invmap[] = LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, + LB_EA_ExtPict_ID, + LB_Cn_ExtPict_ExtPict_ID, + LB_EA_ExtPict_ID, LB_EA_EB, LB_Cn_ExtPict_ExtPict_ID, LB_Alphabetic, @@ -51312,7 +53386,7 @@ static const LB_enum _Perl_LB_invmap[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */ - 2881, /* Number of elements */ + 2985, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -51396,8 +53470,6 @@ static const UV _Perl_LB_invlist[] = { 0x2DF, 0x2E0, 0x300, - 0x34F, - 0x350, 0x35C, 0x363, 0x370, @@ -51819,7 +53891,10 @@ static const UV _Perl_LB_invlist[] = { 0x1A90, 0x1A9A, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEB, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -51970,8 +54045,6 @@ static const UV _Perl_LB_invlist[] = { 0x2329, 0x232A, 0x232B, - 0x2388, - 0x2389, 0x23CF, 0x23D0, 0x23E9, @@ -51997,9 +54070,11 @@ static const UV _Perl_LB_invlist[] = { 0x25FF, 0x2600, 0x2604, - 0x2606, - 0x2607, - 0x2613, + 0x2605, + 0x260E, + 0x260F, + 0x2611, + 0x2612, 0x2614, 0x2616, 0x2618, @@ -52008,33 +54083,68 @@ static const UV _Perl_LB_invlist[] = { 0x261D, 0x261E, 0x2620, + 0x2621, + 0x2622, + 0x2624, + 0x2626, + 0x2627, + 0x262A, + 0x262B, + 0x262E, 0x2630, 0x2638, 0x2639, + 0x263B, 0x263C, + 0x2640, + 0x2641, + 0x2642, + 0x2643, 0x2648, 0x2654, + 0x265F, + 0x2661, + 0x2663, + 0x2664, + 0x2665, + 0x2667, 0x2668, 0x2669, + 0x267B, + 0x267C, + 0x267E, 0x267F, 0x2680, - 0x2686, 0x268A, 0x2690, + 0x2692, 0x2693, 0x2694, + 0x2698, + 0x2699, + 0x269A, + 0x269B, + 0x269D, + 0x26A0, 0x26A1, 0x26A2, + 0x26A7, + 0x26A8, 0x26AA, 0x26AC, + 0x26B0, + 0x26B2, 0x26BD, 0x26BF, 0x26C4, 0x26C6, + 0x26C8, 0x26C9, 0x26CD, 0x26CE, 0x26CF, + 0x26D0, + 0x26D1, 0x26D2, 0x26D3, 0x26D4, @@ -52045,8 +54155,10 @@ static const UV _Perl_LB_invlist[] = { 0x26DD, 0x26DF, 0x26E2, + 0x26E9, 0x26EA, 0x26EB, + 0x26F0, 0x26F1, 0x26F2, 0x26F4, @@ -52058,12 +54170,17 @@ static const UV _Perl_LB_invlist[] = { 0x26FB, 0x26FD, 0x26FE, + 0x2702, + 0x2703, 0x2705, 0x2706, 0x2708, 0x270A, 0x270C, 0x270E, + 0x270F, + 0x2710, + 0x2712, 0x2713, 0x2714, 0x2715, @@ -52132,6 +54249,8 @@ static const UV _Perl_LB_invlist[] = { 0x27EE, 0x27EF, 0x27F0, + 0x2800, + 0x2801, 0x2934, 0x2936, 0x2983, @@ -52227,6 +54346,7 @@ static const UV _Perl_LB_invlist[] = { 0x2E3C, 0x2E3F, 0x2E40, + 0x2E41, 0x2E42, 0x2E43, 0x2E4B, @@ -53464,7 +55584,9 @@ static const UV _Perl_LB_invlist[] = { 0x10EAB, 0x10EAD, 0x10EAE, - 0x10EFC, + 0x10ED0, + 0x10ED1, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -53706,6 +55828,8 @@ static const UV _Perl_LB_invlist[] = { 0x11AA3, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BF0, 0x11BFA, 0x11C2F, @@ -53743,6 +55867,8 @@ static const UV _Perl_LB_invlist[] = { 0x11D98, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF2, 0x11EF3, @@ -53834,14 +55960,16 @@ static const UV _Perl_LB_invlist[] = { 0x16FE5, 0x16FF0, 0x16FF2, + 0x16FF4, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18B00, 0x18CD6, 0x18CFF, 0x18D00, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -53930,6 +56058,14 @@ static const UV _Perl_LB_invlist[] = { 0x1E5F0, 0x1E5F1, 0x1E5FB, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -53958,11 +56094,7 @@ static const UV _Perl_LB_invlist[] = { 0x1F0D1, 0x1F0F6, 0x1F100, - 0x1F10D, - 0x1F110, - 0x1F12F, - 0x1F130, - 0x1F16C, + 0x1F170, 0x1F172, 0x1F17E, 0x1F180, @@ -53970,7 +56102,6 @@ static const UV _Perl_LB_invlist[] = { 0x1F18F, 0x1F191, 0x1F19B, - 0x1F1AD, 0x1F1AE, 0x1F1E6, 0x1F200, @@ -53992,6 +56123,8 @@ static const UV _Perl_LB_invlist[] = { 0x1F266, 0x1F300, 0x1F321, + 0x1F322, + 0x1F324, 0x1F32D, 0x1F336, 0x1F337, @@ -54000,6 +56133,9 @@ static const UV _Perl_LB_invlist[] = { 0x1F385, 0x1F386, 0x1F394, + 0x1F396, + 0x1F398, + 0x1F399, 0x1F39C, 0x1F39E, 0x1F3A0, @@ -54018,8 +56154,11 @@ static const UV _Perl_LB_invlist[] = { 0x1F3D4, 0x1F3E0, 0x1F3F1, + 0x1F3F3, 0x1F3F4, 0x1F3F5, + 0x1F3F6, + 0x1F3F7, 0x1F3F8, 0x1F3FB, 0x1F400, @@ -54055,6 +56194,7 @@ static const UV _Perl_LB_invlist[] = { 0x1F4B1, 0x1F4B3, 0x1F4FD, + 0x1F4FE, 0x1F4FF, 0x1F500, 0x1F507, @@ -54062,24 +56202,51 @@ static const UV _Perl_LB_invlist[] = { 0x1F525, 0x1F532, 0x1F53E, - 0x1F546, + 0x1F549, 0x1F54A, 0x1F54B, 0x1F54F, 0x1F550, 0x1F568, + 0x1F56F, + 0x1F571, + 0x1F573, 0x1F574, 0x1F576, 0x1F57A, 0x1F57B, + 0x1F587, + 0x1F588, + 0x1F58A, + 0x1F58E, 0x1F590, 0x1F591, 0x1F595, 0x1F597, 0x1F5A4, 0x1F5A5, + 0x1F5A6, + 0x1F5A8, + 0x1F5A9, + 0x1F5B1, + 0x1F5B3, + 0x1F5BC, + 0x1F5BD, + 0x1F5C2, + 0x1F5C5, + 0x1F5D1, 0x1F5D4, 0x1F5DC, + 0x1F5DF, + 0x1F5E1, + 0x1F5E2, + 0x1F5E3, + 0x1F5E4, + 0x1F5E8, + 0x1F5E9, + 0x1F5EF, + 0x1F5F0, + 0x1F5F3, 0x1F5F4, 0x1F5FA, 0x1F5FB, @@ -54098,17 +56265,23 @@ static const UV _Perl_LB_invlist[] = { 0x1F6C0, 0x1F6C1, 0x1F6C6, + 0x1F6CB, 0x1F6CC, 0x1F6CD, 0x1F6D0, 0x1F6D3, 0x1F6D5, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6E0, + 0x1F6E6, + 0x1F6E9, + 0x1F6EA, 0x1F6EB, 0x1F6ED, 0x1F6F0, + 0x1F6F1, + 0x1F6F3, 0x1F6F4, 0x1F6FD, 0x1F700, @@ -54136,6 +56309,8 @@ static const UV _Perl_LB_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1F90D, @@ -54165,21 +56340,24 @@ static const UV _Perl_LB_invlist[] = { 0x1F9D1, 0x1F9DE, 0x1FA00, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC3, 0x1FAC6, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, + 0x1FAEB, + 0x1FAEF, 0x1FAF0, 0x1FAF9, 0x1FB00, @@ -54252,28 +56430,28 @@ typedef enum { LB_Glue = 38, LB_H2 = 39, LB_H3 = 40, - LB_Hebrew_Letter = 41, - LB_Hyphen = 42, - LB_Ideographic = 43, - LB_Inseparable = 44, - LB_Infix_Numeric = 45, - LB_JL = 46, - LB_JT = 47, - LB_JV = 48, - LB_Line_Feed = 49, - LB_Next_Line = 50, - LB_Nonstarter = 51, - LB_Numeric = 52, - LB_Open_Punctuation = 53, - LB_Pf_QU = 54, - LB_Pi_QU = 55, - LB_Postfix_Numeric = 56, - LB_Prefix_Numeric = 57, - LB_Quotation = 58, - LB_Regional_Indicator = 59, - LB_Space = 60, - LB_Break_Symbols = 61, - LB_U2010_BA = 62, + LB_Unambiguous_Hyphen = 41, + LB_Hebrew_Letter = 42, + LB_Hyphen = 43, + LB_Ideographic = 44, + LB_Inseparable = 45, + LB_Infix_Numeric = 46, + LB_JL = 47, + LB_JT = 48, + LB_JV = 49, + LB_Line_Feed = 50, + LB_Next_Line = 51, + LB_Nonstarter = 52, + LB_Numeric = 53, + LB_Open_Punctuation = 54, + LB_Pf_QU = 55, + LB_Pi_QU = 56, + LB_Postfix_Numeric = 57, + LB_Prefix_Numeric = 58, + LB_Quotation = 59, + LB_Regional_Indicator = 60, + LB_Space = 61, + LB_Break_Symbols = 62, LB_Virama_Final = 63, LB_Virama = 64, LB_Word_Joiner = 65, @@ -54285,7 +56463,7 @@ typedef enum { LB_Dotted_Circle = 69, LB_East_Asian_CP = 69, LB_East_Asian_OP = 69, - LB_U2010 = 69, + LB_HH = 69, LB_VF = 69, LB_VI = 69 } LB_enum; @@ -54373,20 +56551,18 @@ static const LB_enum _Perl_LB_invmap[] = LB_Combining_Mark, LB_Glue, LB_Combining_Mark, - LB_Glue, - LB_Combining_Mark, LB_Alphabetic, LB_Infix_Numeric, LB_Alphabetic, LB_Combining_Mark, LB_Alphabetic, LB_Infix_Numeric, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Alphabetic, LB_Prefix_Numeric, LB_Alphabetic, LB_Combining_Mark, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Combining_Mark, LB_Alphabetic, LB_Combining_Mark, @@ -54727,7 +56903,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Break_After, LB_Alphabetic, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Alphabetic, LB_Break_After, LB_Alphabetic, @@ -54796,6 +56972,9 @@ static const LB_enum _Perl_LB_invmap[] = LB_Combining_Mark, LB_Alphabetic, LB_Combining_Mark, + LB_Glue, + LB_Alphabetic, + LB_Combining_Mark, LB_Aksara, LB_Combining_Mark, LB_Virama, @@ -54854,9 +57033,9 @@ static const LB_enum _Perl_LB_invmap[] = LB_Combining_Mark, LB_ZWJ, LB_Combining_Mark, - LB_U2010_BA, + LB_Unambiguous_Hyphen, LB_Glue, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Break_Both, LB_Alphabetic, LB_Pi_QU, @@ -54947,8 +57126,6 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, - LB_ExtPict_AL, - LB_Alphabetic, LB_EA_ExtPict_AL, LB_ExtPict_AL, LB_EA_ExtPict_ID, @@ -54975,69 +57152,113 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, - LB_EA_ExtPict_ID, - LB_ExtPict_AL, - LB_ExtPict_ID, LB_ExtPict_AL, + LB_Alphabetic, + LB_EA_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_ID, + LB_Alphabetic, + LB_Ideographic, LB_E_Base, - LB_ExtPict_ID, + LB_Ideographic, LB_ExtPict_AL, - LB_EA_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_EA_AL, LB_ExtPict_AL, LB_ExtPict_ID, + LB_Ideographic, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, + LB_Alphabetic, LB_EA_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_AL, - LB_EA_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_AL, + LB_EA_ExtPict_ID, LB_Alphabetic, LB_EA_AL, + LB_Alphabetic, LB_ExtPict_AL, LB_EA_ExtPict_AL, LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, + LB_ExtPict_AL, LB_EA_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, + LB_Alphabetic, LB_EA_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, + LB_Alphabetic, LB_EA_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, - LB_ExtPict_AL, - LB_ExtPict_ID, + LB_Alphabetic, + LB_Ideographic, LB_EA_ExtPict_AL, LB_ExtPict_ID, - LB_ExtPict_AL, - LB_ExtPict_ID, - LB_EA_ExtPict_ID, - LB_ExtPict_AL, - LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Ideographic, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_ID, + LB_EA_ExtPict_ID, + LB_Alphabetic, + LB_Ideographic, + LB_Alphabetic, + LB_Ideographic, + LB_Alphabetic, + LB_Ideographic, + LB_Alphabetic, LB_ExtPict_AL, LB_EA_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_AL, LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, LB_EA_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_ID, LB_E_Base, LB_EA_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_AL, LB_Alphabetic, LB_ExtPict_ID, LB_EA_EB, LB_E_Base, + LB_Alphabetic, + LB_ExtPict_AL, + LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, LB_ExtPict_AL, @@ -55069,7 +57290,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Exclamation, LB_ExtPict_EX, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_Open_Punctuation, LB_Close_Punctuation, LB_Open_Punctuation, @@ -55107,6 +57328,8 @@ static const LB_enum _Perl_LB_invmap[] = LB_Open_Punctuation, LB_Close_Punctuation, LB_Alphabetic, + LB_Break_After, + LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, LB_Open_Punctuation, @@ -55174,7 +57397,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Pf_QU, LB_Break_After, LB_Alphabetic, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Open_Punctuation, LB_Break_After, LB_Alphabetic, @@ -55201,6 +57424,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Break_Both, LB_Break_After, LB_Alphabetic, + LB_Unambiguous_Hyphen, LB_Break_After, LB_Open_Punctuation, LB_Break_After, @@ -55218,7 +57442,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_Close_Parenthesis, LB_Open_Punctuation, LB_Close_Parenthesis, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Alphabetic, LB_EA_ID, LB_Alphabetic, @@ -56434,9 +58658,11 @@ static const LB_enum _Perl_LB_invmap[] = LB_Numeric, LB_Alphabetic, LB_Combining_Mark, - LB_Break_After, + LB_Unambiguous_Hyphen, LB_Alphabetic, LB_Combining_Mark, + LB_Unambiguous_Hyphen, + LB_Alphabetic, LB_Break_After, LB_Alphabetic, LB_Combining_Mark, @@ -56681,6 +58907,8 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Break_Before, LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, LB_Numeric, LB_Alphabetic, LB_Combining_Mark, @@ -56718,6 +58946,8 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Numeric, LB_Alphabetic, + LB_Numeric, + LB_Alphabetic, LB_Aksara_Start, LB_Break_After, LB_Combining_Mark, @@ -56808,7 +59038,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_GL, LB_Alphabetic, LB_EA_CM, - LB_Alphabetic, + LB_EA_NS, LB_EA_ID, LB_Alphabetic, LB_EA_ID, @@ -56817,6 +59047,8 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_AL, LB_EA_ID, LB_Alphabetic, + LB_EA_ID, + LB_Alphabetic, LB_EA_AL, LB_Alphabetic, LB_EA_AL, @@ -56909,6 +59141,14 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Combining_Mark, LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, + LB_Combining_Mark, + LB_Alphabetic, LB_Numeric, LB_Alphabetic, LB_Open_Punctuation, @@ -56917,35 +59157,30 @@ static const LB_enum _Perl_LB_invmap[] = LB_Alphabetic, LB_Postfix_Numeric, LB_Alphabetic, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, LB_ExtPict_AL, LB_Alphabetic, - LB_ExtPict_AL, - LB_Alphabetic, - LB_ExtPict_AL, - LB_Alphabetic, LB_EA_ExtPict_AL, LB_Alphabetic, LB_EA_ExtPict_AL, LB_Alphabetic, - LB_ExtPict_AL, LB_Cn_ExtPict_ExtPict_ID, LB_Regional_Indicator, LB_EA_ID, @@ -56963,10 +59198,12 @@ static const LB_enum _Perl_LB_invmap[] = LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, - LB_EA_ExtPict_ID, + LB_EA_ID, LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, LB_EA_ExtPict_ID, @@ -56974,8 +59211,11 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_ID, LB_EA_EB, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Ideographic, + LB_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_EA_ExtPict_AL, @@ -56992,9 +59232,12 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_ID, LB_ExtPict_ID, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_E_Modifier, LB_EA_ExtPict_ID, @@ -57030,6 +59273,7 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_AL, LB_EA_ExtPict_ID, LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_EA_ExtPict_AL, LB_EA_ExtPict_ID, @@ -57040,22 +59284,49 @@ static const LB_enum _Perl_LB_invmap[] = LB_ExtPict_AL, LB_ExtPict_ID, LB_EA_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, LB_E_Base, LB_ExtPict_ID, LB_EA_EB, + LB_Ideographic, LB_ExtPict_ID, - LB_E_Base, + LB_Ideographic, LB_ExtPict_ID, + LB_Ideographic, + LB_E_Base, + LB_Ideographic, LB_EA_EB, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Ideographic, LB_ExtPict_ID, - LB_ExtPict_AL, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Alphabetic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Alphabetic, LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_EA_EB, @@ -57072,26 +59343,32 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_ID, LB_EA_EB, LB_EA_ExtPict_ID, + LB_Ideographic, LB_ExtPict_ID, LB_EA_EB, LB_ExtPict_ID, LB_EA_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, + LB_Ideographic, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, LB_ExtPict_ID, + LB_Ideographic, + LB_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, LB_Alphabetic, - LB_ExtPict_ID, - LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Alphabetic, - LB_ExtPict_ID, + LB_Ideographic, + LB_Alphabetic, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, @@ -57107,9 +59384,11 @@ static const LB_enum _Perl_LB_invmap[] = LB_Cn_ExtPict_ExtPict_AL, LB_Alphabetic, LB_Cn_ExtPict_ExtPict_AL, - LB_ExtPict_AL, + LB_Alphabetic, LB_Cn_ExtPict_ExtPict_AL, - LB_ExtPict_AL, + LB_Alphabetic, + LB_Cn_ExtPict_ExtPict_AL, + LB_Alphabetic, LB_Cn_ExtPict_ExtPict_AL, LB_Alphabetic, LB_EA_EB, @@ -57139,9 +59418,9 @@ static const LB_enum _Perl_LB_invmap[] = LB_EA_ExtPict_ID, LB_EA_EB, LB_EA_ExtPict_ID, - LB_ExtPict_AL, + LB_Alphabetic, LB_Cn_ExtPict_ExtPict_ID, - LB_ExtPict_ID, + LB_Ideographic, LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, @@ -57155,6 +59434,9 @@ static const LB_enum _Perl_LB_invmap[] = LB_Cn_ExtPict_ExtPict_ID, LB_EA_ExtPict_ID, LB_Cn_ExtPict_ExtPict_ID, + LB_EA_ExtPict_ID, + LB_Cn_ExtPict_ExtPict_ID, + LB_EA_ExtPict_ID, LB_EA_EB, LB_Cn_ExtPict_ExtPict_ID, LB_Alphabetic, @@ -57183,7 +59465,7 @@ static const LB_enum _Perl_LB_invmap[] = # if 'A' == 65 /* ASCII/Latin1 */ static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */ - 3337, /* Number of elements */ + 3363, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -57522,7 +59804,7 @@ static const UV _Perl_SB_invlist[] = { 0x24E, 0x24F, 0x294, - 0x295, + 0x296, 0x2B9, 0x2C0, 0x2C2, @@ -57899,7 +60181,6 @@ static const UV _Perl_SB_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, 0x890, 0x892, 0x897, @@ -58110,7 +60391,7 @@ static const UV _Perl_SB_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -58140,7 +60421,7 @@ static const UV _Perl_SB_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -58433,7 +60714,9 @@ static const UV _Perl_SB_invlist[] = { 0x1AA8, 0x1AAC, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -59356,6 +61639,7 @@ static const UV _Perl_SB_invlist[] = { 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, 0xA7D2, @@ -59370,7 +61654,7 @@ static const UV _Perl_SB_invlist[] = { 0xA7DB, 0xA7DC, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F6, 0xA7F7, @@ -59706,6 +61990,8 @@ static const UV _Perl_SB_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -59772,8 +62058,8 @@ static const UV _Perl_SB_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F00, 0x10F1D, 0x10F27, @@ -60052,6 +62338,8 @@ static const UV _Perl_SB_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -60104,6 +62392,10 @@ static const UV _Perl_SB_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF3, 0x11EF7, @@ -60185,6 +62477,10 @@ static const UV _Perl_SB_invlist[] = { 0x16E80, 0x16E98, 0x16E99, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -60201,12 +62497,13 @@ static const UV _Perl_SB_invlist[] = { 0x16FE5, 0x16FF0, 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -60405,6 +62702,19 @@ static const UV _Perl_SB_invlist[] = { 0x1E5F0, 0x1E5F1, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -60503,11 +62813,9 @@ static const UV _Perl_SB_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -60517,7 +62825,7 @@ static const UV _Perl_SB_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -61266,7 +63574,6 @@ static const SB_enum _Perl_SB_invmap[] = SB_OLetter, SB_Other, SB_OLetter, - SB_Other, SB_Numeric, SB_Other, SB_Extend, @@ -61802,6 +64109,8 @@ static const SB_enum _Perl_SB_invmap[] = SB_Extend, SB_Other, SB_Extend, + SB_Other, + SB_Extend, SB_OLetter, SB_Extend, SB_OLetter, @@ -62722,12 +65031,13 @@ static const SB_enum _Perl_SB_invmap[] = SB_Lower, SB_Upper, SB_Lower, - SB_Other, SB_Upper, SB_Lower, - SB_Other, + SB_Upper, SB_Lower, - SB_Other, + SB_Upper, + SB_Lower, + SB_Upper, SB_Lower, SB_Upper, SB_Lower, @@ -63078,6 +65388,8 @@ static const SB_enum _Perl_SB_invmap[] = SB_OLetter, SB_Other, SB_OLetter, + SB_Other, + SB_OLetter, SB_Extend, SB_Other, SB_Extend, @@ -63419,6 +65731,8 @@ static const SB_enum _Perl_SB_invmap[] = SB_Other, SB_OLetter, SB_Other, + SB_Extend, + SB_Other, SB_OLetter, SB_Other, SB_Numeric, @@ -63472,6 +65786,10 @@ static const SB_enum _Perl_SB_invmap[] = SB_Numeric, SB_Other, SB_OLetter, + SB_Other, + SB_Numeric, + SB_Other, + SB_OLetter, SB_Extend, SB_STerm, SB_Other, @@ -63552,6 +65870,10 @@ static const SB_enum _Perl_SB_invmap[] = SB_Other, SB_STerm, SB_Other, + SB_Upper, + SB_Other, + SB_Lower, + SB_Other, SB_OLetter, SB_Other, SB_Extend, @@ -63567,6 +65889,7 @@ static const SB_enum _Perl_SB_invmap[] = SB_Extend, SB_Other, SB_Extend, + SB_OLetter, SB_Other, SB_OLetter, SB_Other, @@ -63775,6 +66098,19 @@ static const SB_enum _Perl_SB_invmap[] = SB_OLetter, SB_Other, SB_OLetter, + SB_Extend, + SB_OLetter, + SB_Extend, + SB_OLetter, + SB_Extend, + SB_OLetter, + SB_Extend, + SB_Other, + SB_OLetter, + SB_Other, + SB_OLetter, + SB_Other, + SB_OLetter, SB_Other, SB_OLetter, SB_Other, @@ -63883,8 +66219,6 @@ static const SB_enum _Perl_SB_invmap[] = SB_Other, SB_OLetter, SB_Other, - SB_OLetter, - SB_Other, SB_Format, SB_Other, SB_Extend, @@ -63905,7 +66239,7 @@ static const SB_enum _Perl_SB_invmap[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */ - 3362, /* Number of elements */ + 3388, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -64269,7 +66603,7 @@ static const UV _Perl_SB_invlist[] = { 0x24E, 0x24F, 0x294, - 0x295, + 0x296, 0x2B9, 0x2C0, 0x2C2, @@ -64646,7 +66980,6 @@ static const UV _Perl_SB_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, 0x890, 0x892, 0x897, @@ -64857,7 +67190,7 @@ static const UV _Perl_SB_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -64887,7 +67220,7 @@ static const UV _Perl_SB_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -65180,7 +67513,9 @@ static const UV _Perl_SB_invlist[] = { 0x1AA8, 0x1AAC, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -66103,6 +68438,7 @@ static const UV _Perl_SB_invlist[] = { 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, 0xA7D2, @@ -66117,7 +68453,7 @@ static const UV _Perl_SB_invlist[] = { 0xA7DB, 0xA7DC, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F6, 0xA7F7, @@ -66453,6 +68789,8 @@ static const UV _Perl_SB_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -66519,8 +68857,8 @@ static const UV _Perl_SB_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F00, 0x10F1D, 0x10F27, @@ -66799,6 +69137,8 @@ static const UV _Perl_SB_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -66851,6 +69191,10 @@ static const UV _Perl_SB_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF3, 0x11EF7, @@ -66932,6 +69276,10 @@ static const UV _Perl_SB_invlist[] = { 0x16E80, 0x16E98, 0x16E99, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -66948,12 +69296,13 @@ static const UV _Perl_SB_invlist[] = { 0x16FE5, 0x16FF0, 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -67152,6 +69501,19 @@ static const UV _Perl_SB_invlist[] = { 0x1E5F0, 0x1E5F1, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -67250,11 +69612,9 @@ static const UV _Perl_SB_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -67264,7 +69624,7 @@ static const UV _Perl_SB_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -68041,7 +70401,6 @@ static const SB_enum _Perl_SB_invmap[] = SB_OLetter, SB_Other, SB_OLetter, - SB_Other, SB_Numeric, SB_Other, SB_Extend, @@ -68577,6 +70936,8 @@ static const SB_enum _Perl_SB_invmap[] = SB_Extend, SB_Other, SB_Extend, + SB_Other, + SB_Extend, SB_OLetter, SB_Extend, SB_OLetter, @@ -69497,12 +71858,13 @@ static const SB_enum _Perl_SB_invmap[] = SB_Lower, SB_Upper, SB_Lower, - SB_Other, SB_Upper, SB_Lower, - SB_Other, + SB_Upper, SB_Lower, - SB_Other, + SB_Upper, + SB_Lower, + SB_Upper, SB_Lower, SB_Upper, SB_Lower, @@ -69853,6 +72215,8 @@ static const SB_enum _Perl_SB_invmap[] = SB_OLetter, SB_Other, SB_OLetter, + SB_Other, + SB_OLetter, SB_Extend, SB_Other, SB_Extend, @@ -70194,6 +72558,8 @@ static const SB_enum _Perl_SB_invmap[] = SB_Other, SB_OLetter, SB_Other, + SB_Extend, + SB_Other, SB_OLetter, SB_Other, SB_Numeric, @@ -70247,6 +72613,10 @@ static const SB_enum _Perl_SB_invmap[] = SB_Numeric, SB_Other, SB_OLetter, + SB_Other, + SB_Numeric, + SB_Other, + SB_OLetter, SB_Extend, SB_STerm, SB_Other, @@ -70327,6 +72697,10 @@ static const SB_enum _Perl_SB_invmap[] = SB_Other, SB_STerm, SB_Other, + SB_Upper, + SB_Other, + SB_Lower, + SB_Other, SB_OLetter, SB_Other, SB_Extend, @@ -70342,6 +72716,7 @@ static const SB_enum _Perl_SB_invmap[] = SB_Extend, SB_Other, SB_Extend, + SB_OLetter, SB_Other, SB_OLetter, SB_Other, @@ -70550,6 +72925,19 @@ static const SB_enum _Perl_SB_invmap[] = SB_OLetter, SB_Other, SB_OLetter, + SB_Extend, + SB_OLetter, + SB_Extend, + SB_OLetter, + SB_Extend, + SB_OLetter, + SB_Extend, + SB_Other, + SB_OLetter, + SB_Other, + SB_OLetter, + SB_Other, + SB_OLetter, SB_Other, SB_OLetter, SB_Other, @@ -70658,8 +73046,6 @@ static const SB_enum _Perl_SB_invmap[] = SB_Other, SB_OLetter, SB_Other, - SB_OLetter, - SB_Other, SB_Format, SB_Other, SB_Extend, @@ -70680,7 +73066,7 @@ static const SB_enum _Perl_SB_invmap[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */ - 3358, /* Number of elements */ + 3384, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -71040,7 +73426,7 @@ static const UV _Perl_SB_invlist[] = { 0x24E, 0x24F, 0x294, - 0x295, + 0x296, 0x2B9, 0x2C0, 0x2C2, @@ -71417,7 +73803,6 @@ static const UV _Perl_SB_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, 0x890, 0x892, 0x897, @@ -71628,7 +74013,7 @@ static const UV _Perl_SB_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -71658,7 +74043,7 @@ static const UV _Perl_SB_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -71951,7 +74336,9 @@ static const UV _Perl_SB_invlist[] = { 0x1AA8, 0x1AAC, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -72874,6 +75261,7 @@ static const UV _Perl_SB_invlist[] = { 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, 0xA7D2, @@ -72888,7 +75276,7 @@ static const UV _Perl_SB_invlist[] = { 0xA7DB, 0xA7DC, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F6, 0xA7F7, @@ -73224,6 +75612,8 @@ static const UV _Perl_SB_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -73290,8 +75680,8 @@ static const UV _Perl_SB_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F00, 0x10F1D, 0x10F27, @@ -73570,6 +75960,8 @@ static const UV _Perl_SB_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -73622,6 +76014,10 @@ static const UV _Perl_SB_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF3, 0x11EF7, @@ -73703,6 +76099,10 @@ static const UV _Perl_SB_invlist[] = { 0x16E80, 0x16E98, 0x16E99, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -73719,12 +76119,13 @@ static const UV _Perl_SB_invlist[] = { 0x16FE5, 0x16FF0, 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -73923,6 +76324,19 @@ static const UV _Perl_SB_invlist[] = { 0x1E5F0, 0x1E5F1, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -74021,11 +76435,9 @@ static const UV _Perl_SB_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -74035,7 +76447,7 @@ static const UV _Perl_SB_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -74808,7 +77220,6 @@ static const SB_enum _Perl_SB_invmap[] = SB_OLetter, SB_Other, SB_OLetter, - SB_Other, SB_Numeric, SB_Other, SB_Extend, @@ -75344,6 +77755,8 @@ static const SB_enum _Perl_SB_invmap[] = SB_Extend, SB_Other, SB_Extend, + SB_Other, + SB_Extend, SB_OLetter, SB_Extend, SB_OLetter, @@ -76264,12 +78677,13 @@ static const SB_enum _Perl_SB_invmap[] = SB_Lower, SB_Upper, SB_Lower, - SB_Other, SB_Upper, SB_Lower, - SB_Other, + SB_Upper, SB_Lower, - SB_Other, + SB_Upper, + SB_Lower, + SB_Upper, SB_Lower, SB_Upper, SB_Lower, @@ -76620,6 +79034,8 @@ static const SB_enum _Perl_SB_invmap[] = SB_OLetter, SB_Other, SB_OLetter, + SB_Other, + SB_OLetter, SB_Extend, SB_Other, SB_Extend, @@ -76961,6 +79377,8 @@ static const SB_enum _Perl_SB_invmap[] = SB_Other, SB_OLetter, SB_Other, + SB_Extend, + SB_Other, SB_OLetter, SB_Other, SB_Numeric, @@ -77014,6 +79432,10 @@ static const SB_enum _Perl_SB_invmap[] = SB_Numeric, SB_Other, SB_OLetter, + SB_Other, + SB_Numeric, + SB_Other, + SB_OLetter, SB_Extend, SB_STerm, SB_Other, @@ -77094,6 +79516,10 @@ static const SB_enum _Perl_SB_invmap[] = SB_Other, SB_STerm, SB_Other, + SB_Upper, + SB_Other, + SB_Lower, + SB_Other, SB_OLetter, SB_Other, SB_Extend, @@ -77109,6 +79535,7 @@ static const SB_enum _Perl_SB_invmap[] = SB_Extend, SB_Other, SB_Extend, + SB_OLetter, SB_Other, SB_OLetter, SB_Other, @@ -77317,6 +79744,19 @@ static const SB_enum _Perl_SB_invmap[] = SB_OLetter, SB_Other, SB_OLetter, + SB_Extend, + SB_OLetter, + SB_Extend, + SB_OLetter, + SB_Extend, + SB_OLetter, + SB_Extend, + SB_Other, + SB_OLetter, + SB_Other, + SB_OLetter, + SB_Other, + SB_OLetter, SB_Other, SB_OLetter, SB_Other, @@ -77425,8 +79865,6 @@ static const SB_enum _Perl_SB_invmap[] = SB_Other, SB_OLetter, SB_Other, - SB_OLetter, - SB_Other, SB_Format, SB_Other, SB_Extend, @@ -77444,7 +79882,7 @@ static const SB_enum _Perl_SB_invmap[] = # if 'A' == 65 /* ASCII/Latin1 */ static const UV _Perl_SCX_invlist[] = { /* for ASCII/Latin1 */ - 1872, /* Number of elements */ + 1882, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -77502,8 +79940,6 @@ static const UV _Perl_SCX_invlist[] = { 0x312, 0x313, 0x314, - 0x320, - 0x321, 0x323, 0x324, 0x325, @@ -77609,8 +80045,6 @@ static const UV _Perl_SCX_invlist[] = { 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x8E2, @@ -77794,7 +80228,7 @@ static const UV _Perl_SCX_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -77819,7 +80253,7 @@ static const UV _Perl_SCX_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -78031,7 +80465,9 @@ static const UV _Perl_SCX_invlist[] = { 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -78058,6 +80494,7 @@ static const UV _Perl_SCX_invlist[] = { 0x1CD3, 0x1CD4, 0x1CD5, + 0x1CD6, 0x1CD7, 0x1CD8, 0x1CD9, @@ -78068,9 +80505,11 @@ static const UV _Perl_SCX_invlist[] = { 0x1CE0, 0x1CE1, 0x1CE2, + 0x1CE3, 0x1CE9, 0x1CEA, 0x1CEB, + 0x1CEC, 0x1CED, 0x1CEE, 0x1CF2, @@ -78152,7 +80591,7 @@ static const UV _Perl_SCX_invlist[] = { 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F0, 0x20F1, @@ -78177,8 +80616,6 @@ static const UV _Perl_SCX_invlist[] = { 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2C60, 0x2C80, @@ -78318,14 +80755,8 @@ static const UV _Perl_SCX_invlist[] = { 0xA722, 0xA788, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA800, 0xA82D, 0xA830, @@ -78422,14 +80853,8 @@ static const UV _Perl_SCX_invlist[] = { 0xFB45, 0xFB46, 0xFB50, - 0xFBC3, - 0xFBD3, 0xFD3E, 0xFD40, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFDF2, @@ -78606,6 +81031,7 @@ static const UV _Perl_SCX_invlist[] = { 0x1093A, 0x1093F, 0x10940, + 0x1095A, 0x10980, 0x109A0, 0x109B8, @@ -78678,8 +81104,10 @@ static const UV _Perl_SCX_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F00, 0x10F28, 0x10F30, @@ -78853,6 +81281,8 @@ static const UV _Perl_SCX_invlist[] = { 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -78897,6 +81327,10 @@ static const UV _Perl_SCX_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -78961,6 +81395,10 @@ static const UV _Perl_SCX_invlist[] = { 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -78973,15 +81411,15 @@ static const UV _Perl_SCX_invlist[] = { 0x16FE4, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18B00, 0x18CD6, 0x18CFF, 0x18D00, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -79013,9 +81451,13 @@ static const UV _Perl_SCX_invlist[] = { 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -79132,6 +81574,12 @@ static const UV _Perl_SCX_invlist[] = { 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -79249,14 +81697,12 @@ static const UV _Perl_SCX_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -79276,34 +81722,36 @@ static const UV _Perl_SCX_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -79313,7 +81761,7 @@ static const UV _Perl_SCX_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -79345,169 +81793,173 @@ typedef enum { SCX_Bassa_Vah = 9, SCX_Batak = 10, SCX_Bengali = 11, - SCX_Bhaiksuki = 12, - SCX_Bopomofo = 13, - SCX_Brahmi = 14, - SCX_Braille = 15, - SCX_Buginese = 16, - SCX_Buhid = 17, - SCX_Canadian_Aboriginal = 18, - SCX_Carian = 19, - SCX_Caucasian_Albanian = 20, - SCX_Chakma = 21, - SCX_Cham = 22, - SCX_Cherokee = 23, - SCX_Chorasmian = 24, - SCX_Common = 25, - SCX_Coptic = 26, - SCX_Cuneiform = 27, - SCX_Cypriot = 28, - SCX_Cypro_Minoan = 29, - SCX_Cyrillic = 30, - SCX_Deseret = 31, - SCX_Devanagari = 32, - SCX_Dives_Akuru = 33, - SCX_Dogra = 34, - SCX_Duployan = 35, - SCX_Egyptian_Hieroglyphs = 36, - SCX_Elbasan = 37, - SCX_Elymaic = 38, - SCX_Ethiopic = 39, - SCX_Garay = 40, - SCX_Georgian = 41, - SCX_Glagolitic = 42, - SCX_Gothic = 43, - SCX_Grantha = 44, - SCX_Greek = 45, - SCX_Gujarati = 46, - SCX_Gunjala_Gondi = 47, - SCX_Gurmukhi = 48, - SCX_Gurung_Khema = 49, - SCX_Han = 50, - SCX_Hanb = 51, - SCX_Hangul = 52, - SCX_Hanifi_Rohingya = 53, - SCX_Hanunoo = 54, - SCX_Hatran = 55, - SCX_Hebrew = 56, - SCX_Hiragana = 57, - SCX_Imperial_Aramaic = 58, - SCX_Inherited = 59, - SCX_Inscriptional_Pahlavi = 60, - SCX_Inscriptional_Parthian = 61, - SCX_INVALID = 62, - SCX_Javanese = 63, - SCX_Jpan = 64, - SCX_Kaithi = 65, - SCX_Kannada = 66, - SCX_Katakana = 67, - SCX_Kawi = 68, - SCX_Kayah_Li = 69, - SCX_Kharoshthi = 70, - SCX_Khitan_Small_Script = 71, - SCX_Khmer = 72, - SCX_Khojki = 73, - SCX_Khudawadi = 74, - SCX_Kirat_Rai = 75, - SCX_Kore = 76, - SCX_Lao = 77, - SCX_Latin = 78, - SCX_Lepcha = 79, - SCX_Limbu = 80, - SCX_Linear_A = 81, - SCX_Linear_B = 82, - SCX_Lisu = 83, - SCX_Lycian = 84, - SCX_Lydian = 85, - SCX_Mahajani = 86, - SCX_Makasar = 87, - SCX_Malayalam = 88, - SCX_Mandaic = 89, - SCX_Manichaean = 90, - SCX_Marchen = 91, - SCX_Masaram_Gondi = 92, - SCX_Medefaidrin = 93, - SCX_Meetei_Mayek = 94, - SCX_Mende_Kikakui = 95, - SCX_Meroitic_Cursive = 96, - SCX_Meroitic_Hieroglyphs = 97, - SCX_Miao = 98, - SCX_Modi = 99, - SCX_Mongolian = 100, - SCX_Mro = 101, - SCX_Multani = 102, - SCX_Myanmar = 103, - SCX_Nabataean = 104, - SCX_Nag_Mundari = 105, - SCX_Nandinagari = 106, - SCX_New_Tai_Lue = 107, - SCX_Newa = 108, - SCX_Nko = 109, - SCX_Nushu = 110, - SCX_Nyiakeng_Puachue_Hmong = 111, - SCX_Ogham = 112, - SCX_Ol_Chiki = 113, - SCX_Ol_Onal = 114, - SCX_Old_Hungarian = 115, - SCX_Old_Italic = 116, - SCX_Old_North_Arabian = 117, - SCX_Old_Permic = 118, - SCX_Old_Persian = 119, - SCX_Old_Sogdian = 120, - SCX_Old_South_Arabian = 121, - SCX_Old_Turkic = 122, - SCX_Old_Uyghur = 123, - SCX_Oriya = 124, - SCX_Osage = 125, - SCX_Osmanya = 126, - SCX_Pahawh_Hmong = 127, - SCX_Palmyrene = 128, - SCX_Pau_Cin_Hau = 129, - SCX_Phags_Pa = 130, - SCX_Phoenician = 131, - SCX_Psalter_Pahlavi = 132, - SCX_Rejang = 133, - SCX_Runic = 134, - SCX_Samaritan = 135, - SCX_Saurashtra = 136, - SCX_Sharada = 137, - SCX_Shavian = 138, - SCX_Siddham = 139, - SCX_SignWriting = 140, - SCX_Sinhala = 141, - SCX_Sogdian = 142, - SCX_Sora_Sompeng = 143, - SCX_Soyombo = 144, - SCX_Sundanese = 145, - SCX_Sunuwar = 146, - SCX_Syloti_Nagri = 147, - SCX_Syriac = 148, - SCX_Tagalog = 149, - SCX_Tagbanwa = 150, - SCX_Tai_Le = 151, - SCX_Tai_Tham = 152, - SCX_Tai_Viet = 153, - SCX_Takri = 154, - SCX_Tamil = 155, - SCX_Tangsa = 156, - SCX_Tangut = 157, - SCX_Telugu = 158, - SCX_Thaana = 159, - SCX_Thai = 160, - SCX_Tibetan = 161, - SCX_Tifinagh = 162, - SCX_Tirhuta = 163, - SCX_Todhri = 164, - SCX_Toto = 165, - SCX_Tulu_Tigalari = 166, - SCX_Ugaritic = 167, - SCX_Vai = 168, - SCX_Vithkuqi = 169, - SCX_Wancho = 170, - SCX_Warang_Citi = 171, - SCX_Yezidi = 172, - SCX_Yi = 173, - SCX_Zanabazar_Square = 174, + SCX_Beria_Erfe = 12, + SCX_Bhaiksuki = 13, + SCX_Bopomofo = 14, + SCX_Brahmi = 15, + SCX_Braille = 16, + SCX_Buginese = 17, + SCX_Buhid = 18, + SCX_Canadian_Aboriginal = 19, + SCX_Carian = 20, + SCX_Caucasian_Albanian = 21, + SCX_Chakma = 22, + SCX_Cham = 23, + SCX_Cherokee = 24, + SCX_Chorasmian = 25, + SCX_Common = 26, + SCX_Coptic = 27, + SCX_Cuneiform = 28, + SCX_Cypriot = 29, + SCX_Cypro_Minoan = 30, + SCX_Cyrillic = 31, + SCX_Deseret = 32, + SCX_Devanagari = 33, + SCX_Dives_Akuru = 34, + SCX_Dogra = 35, + SCX_Duployan = 36, + SCX_Egyptian_Hieroglyphs = 37, + SCX_Elbasan = 38, + SCX_Elymaic = 39, + SCX_Ethiopic = 40, + SCX_Garay = 41, + SCX_Georgian = 42, + SCX_Glagolitic = 43, + SCX_Gothic = 44, + SCX_Grantha = 45, + SCX_Greek = 46, + SCX_Gujarati = 47, + SCX_Gunjala_Gondi = 48, + SCX_Gurmukhi = 49, + SCX_Gurung_Khema = 50, + SCX_Han = 51, + SCX_Hanb = 52, + SCX_Hangul = 53, + SCX_Hanifi_Rohingya = 54, + SCX_Hanunoo = 55, + SCX_Hatran = 56, + SCX_Hebrew = 57, + SCX_Hiragana = 58, + SCX_Imperial_Aramaic = 59, + SCX_Inherited = 60, + SCX_Inscriptional_Pahlavi = 61, + SCX_Inscriptional_Parthian = 62, + SCX_INVALID = 63, + SCX_Javanese = 64, + SCX_Jpan = 65, + SCX_Kaithi = 66, + SCX_Kannada = 67, + SCX_Katakana = 68, + SCX_Kawi = 69, + SCX_Kayah_Li = 70, + SCX_Kharoshthi = 71, + SCX_Khitan_Small_Script = 72, + SCX_Khmer = 73, + SCX_Khojki = 74, + SCX_Khudawadi = 75, + SCX_Kirat_Rai = 76, + SCX_Kore = 77, + SCX_Lao = 78, + SCX_Latin = 79, + SCX_Lepcha = 80, + SCX_Limbu = 81, + SCX_Linear_A = 82, + SCX_Linear_B = 83, + SCX_Lisu = 84, + SCX_Lycian = 85, + SCX_Lydian = 86, + SCX_Mahajani = 87, + SCX_Makasar = 88, + SCX_Malayalam = 89, + SCX_Mandaic = 90, + SCX_Manichaean = 91, + SCX_Marchen = 92, + SCX_Masaram_Gondi = 93, + SCX_Medefaidrin = 94, + SCX_Meetei_Mayek = 95, + SCX_Mende_Kikakui = 96, + SCX_Meroitic_Cursive = 97, + SCX_Meroitic_Hieroglyphs = 98, + SCX_Miao = 99, + SCX_Modi = 100, + SCX_Mongolian = 101, + SCX_Mro = 102, + SCX_Multani = 103, + SCX_Myanmar = 104, + SCX_Nabataean = 105, + SCX_Nag_Mundari = 106, + SCX_Nandinagari = 107, + SCX_New_Tai_Lue = 108, + SCX_Newa = 109, + SCX_Nko = 110, + SCX_Nushu = 111, + SCX_Nyiakeng_Puachue_Hmong = 112, + SCX_Ogham = 113, + SCX_Ol_Chiki = 114, + SCX_Ol_Onal = 115, + SCX_Old_Hungarian = 116, + SCX_Old_Italic = 117, + SCX_Old_North_Arabian = 118, + SCX_Old_Permic = 119, + SCX_Old_Persian = 120, + SCX_Old_Sogdian = 121, + SCX_Old_South_Arabian = 122, + SCX_Old_Turkic = 123, + SCX_Old_Uyghur = 124, + SCX_Oriya = 125, + SCX_Osage = 126, + SCX_Osmanya = 127, + SCX_Pahawh_Hmong = 128, + SCX_Palmyrene = 129, + SCX_Pau_Cin_Hau = 130, + SCX_Phags_Pa = 131, + SCX_Phoenician = 132, + SCX_Psalter_Pahlavi = 133, + SCX_Rejang = 134, + SCX_Runic = 135, + SCX_Samaritan = 136, + SCX_Saurashtra = 137, + SCX_Sharada = 138, + SCX_Shavian = 139, + SCX_Siddham = 140, + SCX_Sidetic = 141, + SCX_SignWriting = 142, + SCX_Sinhala = 143, + SCX_Sogdian = 144, + SCX_Sora_Sompeng = 145, + SCX_Soyombo = 146, + SCX_Sundanese = 147, + SCX_Sunuwar = 148, + SCX_Syloti_Nagri = 149, + SCX_Syriac = 150, + SCX_Tagalog = 151, + SCX_Tagbanwa = 152, + SCX_Tai_Le = 153, + SCX_Tai_Tham = 154, + SCX_Tai_Viet = 155, + SCX_Tai_Yo = 156, + SCX_Takri = 157, + SCX_Tamil = 158, + SCX_Tangsa = 159, + SCX_Tangut = 160, + SCX_Telugu = 161, + SCX_Thaana = 162, + SCX_Thai = 163, + SCX_Tibetan = 164, + SCX_Tifinagh = 165, + SCX_Tirhuta = 166, + SCX_Todhri = 167, + SCX_Tolong_Siki = 168, + SCX_Toto = 169, + SCX_Tulu_Tigalari = 170, + SCX_Ugaritic = 171, + SCX_Vai = 172, + SCX_Vithkuqi = 173, + SCX_Wancho = 174, + SCX_Warang_Citi = 175, + SCX_Yezidi = 176, + SCX_Yi = 177, + SCX_Zanabazar_Square = 178, SCX_use_AUX_TABLE_1 = -1, SCX_use_AUX_TABLE_2 = -2, SCX_use_AUX_TABLE_3 = -3, @@ -79613,7 +82065,15 @@ typedef enum { SCX_use_AUX_TABLE_103 = -103, SCX_use_AUX_TABLE_104 = -104, SCX_use_AUX_TABLE_105 = -105, - SCX_use_AUX_TABLE_106 = -106 + SCX_use_AUX_TABLE_106 = -106, + SCX_use_AUX_TABLE_107 = -107, + SCX_use_AUX_TABLE_108 = -108, + SCX_use_AUX_TABLE_109 = -109, + SCX_use_AUX_TABLE_110 = -110, + SCX_use_AUX_TABLE_111 = -111, + SCX_use_AUX_TABLE_112 = -112, + SCX_use_AUX_TABLE_113 = -113, + SCX_use_AUX_TABLE_114 = -114 } SCX_enum; # endif /* ASCII/Latin1 */ @@ -79742,7 +82202,8 @@ static const SCX_enum SCX_AUX_TABLE_13[] SCX_Cyrillic, SCX_Greek, SCX_Latin, - SCX_Old_Permic + SCX_Old_Permic, + SCX_Tifinagh }; static const SCX_enum SCX_AUX_TABLE_14[] = { @@ -79767,7 +82228,8 @@ static const SCX_enum SCX_AUX_TABLE_15[] SCX_Latin, SCX_Old_Permic, SCX_Syriac, - SCX_Tai_Le + SCX_Tai_Le, + SCX_Tifinagh }; static const SCX_enum SCX_AUX_TABLE_16[] = { @@ -79818,22 +82280,23 @@ static const SCX_enum SCX_AUX_TABLE_23[] }; static const SCX_enum SCX_AUX_TABLE_24[] = { + SCX_Cherokee, + SCX_Duployan, + SCX_Jpan, + SCX_Katakana, SCX_Latin, - SCX_Syriac + SCX_Syriac, + SCX_Tifinagh }; static const SCX_enum SCX_AUX_TABLE_25[] = { SCX_Cherokee, SCX_Duployan, - SCX_Jpan, - SCX_Katakana, SCX_Latin, SCX_Syriac }; static const SCX_enum SCX_AUX_TABLE_26[] = { - SCX_Cherokee, - SCX_Duployan, SCX_Latin, SCX_Syriac }; @@ -79856,6 +82319,7 @@ static const SCX_enum SCX_AUX_TABLE_29[] SCX_Gothic, SCX_Latin, SCX_Sunuwar, + SCX_Syriac, SCX_Thai }; @@ -79960,6 +82424,8 @@ static const SCX_enum SCX_AUX_TABLE_44[] SCX_Kannada, SCX_Latin, SCX_Malayalam, + SCX_Nandinagari, + SCX_Newa, SCX_Oriya, SCX_Sharada, SCX_Tamil, @@ -79976,6 +82442,7 @@ static const SCX_enum SCX_AUX_TABLE_45[] SCX_Kannada, SCX_Latin, SCX_Malayalam, + SCX_Newa, SCX_Oriya, SCX_Tamil, SCX_Telugu, @@ -80110,16 +82577,38 @@ static const SCX_enum SCX_AUX_TABLE_60[] static const SCX_enum SCX_AUX_TABLE_61[] = { SCX_Bengali, - SCX_Devanagari + SCX_Devanagari, + SCX_Newa, + SCX_Telugu, + SCX_Tirhuta }; static const SCX_enum SCX_AUX_TABLE_62[] = { + SCX_Bengali, SCX_Devanagari, - SCX_Sharada + SCX_Telugu }; static const SCX_enum SCX_AUX_TABLE_63[] = { SCX_Devanagari, + SCX_Newa, + SCX_Sharada +}; + +static const SCX_enum SCX_AUX_TABLE_64[] = { + SCX_Bengali, + SCX_Devanagari, + SCX_Newa, + SCX_Telugu +}; + +static const SCX_enum SCX_AUX_TABLE_65[] = { + SCX_Devanagari, + SCX_Sharada +}; + +static const SCX_enum SCX_AUX_TABLE_66[] = { + SCX_Devanagari, SCX_Kannada, SCX_Malayalam, SCX_Oriya, @@ -80127,12 +82616,42 @@ static const SCX_enum SCX_AUX_TABLE_63[] SCX_Telugu }; -static const SCX_enum SCX_AUX_TABLE_64[] = { +static const SCX_enum SCX_AUX_TABLE_67[] = { + SCX_Bengali, + SCX_Devanagari +}; + +static const SCX_enum SCX_AUX_TABLE_68[] = { SCX_Devanagari, - SCX_Nandinagari + SCX_Newa, + SCX_Tirhuta }; -static const SCX_enum SCX_AUX_TABLE_65[] = { +static const SCX_enum SCX_AUX_TABLE_69[] = { + SCX_Devanagari, + SCX_Nandinagari, + SCX_Newa +}; + +static const SCX_enum SCX_AUX_TABLE_70[] = { + SCX_Bengali, + SCX_Devanagari, + SCX_Sharada +}; + +static const SCX_enum SCX_AUX_TABLE_71[] = { + SCX_Devanagari, + SCX_Newa +}; + +static const SCX_enum SCX_AUX_TABLE_72[] = { + SCX_Bengali, + SCX_Devanagari, + SCX_Newa, + SCX_Sharada +}; + +static const SCX_enum SCX_AUX_TABLE_73[] = { SCX_Bengali, SCX_Devanagari, SCX_Grantha, @@ -80146,36 +82665,36 @@ static const SCX_enum SCX_AUX_TABLE_65[] SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_66[] = { +static const SCX_enum SCX_AUX_TABLE_74[] = { SCX_Devanagari, SCX_Grantha }; -static const SCX_enum SCX_AUX_TABLE_67[] = { +static const SCX_enum SCX_AUX_TABLE_75[] = { SCX_Devanagari, SCX_Grantha, SCX_Kannada, SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_68[] = { +static const SCX_enum SCX_AUX_TABLE_76[] = { SCX_Cyrillic, SCX_Latin, SCX_Syriac }; -static const SCX_enum SCX_AUX_TABLE_69[] = { +static const SCX_enum SCX_AUX_TABLE_77[] = { SCX_Latin, SCX_Mongolian, SCX_Phags_Pa }; -static const SCX_enum SCX_AUX_TABLE_70[] = { +static const SCX_enum SCX_AUX_TABLE_78[] = { SCX_Adlam, SCX_Arabic }; -static const SCX_enum SCX_AUX_TABLE_71[] = { +static const SCX_enum SCX_AUX_TABLE_79[] = { SCX_Carian, SCX_Georgian, SCX_Glagolitic, @@ -80184,30 +82703,30 @@ static const SCX_enum SCX_AUX_TABLE_71[] SCX_Old_Turkic }; -static const SCX_enum SCX_AUX_TABLE_72[] = { +static const SCX_enum SCX_AUX_TABLE_80[] = { SCX_Carian, SCX_Greek, SCX_Meroitic_Hieroglyphs, SCX_Old_Hungarian }; -static const SCX_enum SCX_AUX_TABLE_73[] = { +static const SCX_enum SCX_AUX_TABLE_81[] = { SCX_Devanagari, SCX_Grantha, SCX_Latin }; -static const SCX_enum SCX_AUX_TABLE_74[] = { +static const SCX_enum SCX_AUX_TABLE_82[] = { SCX_Coptic, SCX_Latin }; -static const SCX_enum SCX_AUX_TABLE_75[] = { +static const SCX_enum SCX_AUX_TABLE_83[] = { SCX_Avestan, SCX_Old_Turkic }; -static const SCX_enum SCX_AUX_TABLE_76[] = { +static const SCX_enum SCX_AUX_TABLE_84[] = { SCX_Avestan, SCX_Carian, SCX_Georgian, @@ -80217,20 +82736,20 @@ static const SCX_enum SCX_AUX_TABLE_76[] SCX_Samaritan }; -static const SCX_enum SCX_AUX_TABLE_77[] = { +static const SCX_enum SCX_AUX_TABLE_85[] = { SCX_Adlam, SCX_Arabic, SCX_Old_Hungarian }; -static const SCX_enum SCX_AUX_TABLE_78[] = { +static const SCX_enum SCX_AUX_TABLE_86[] = { SCX_Han, SCX_Hanb, SCX_Jpan, SCX_Kore }; -static const SCX_enum SCX_AUX_TABLE_79[] = { +static const SCX_enum SCX_AUX_TABLE_87[] = { SCX_Han, SCX_Hanb, SCX_Jpan, @@ -80238,7 +82757,7 @@ static const SCX_enum SCX_AUX_TABLE_79[] SCX_Tangut }; -static const SCX_enum SCX_AUX_TABLE_80[] = { +static const SCX_enum SCX_AUX_TABLE_88[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -80251,7 +82770,7 @@ static const SCX_enum SCX_AUX_TABLE_80[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_81[] = { +static const SCX_enum SCX_AUX_TABLE_89[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -80265,7 +82784,7 @@ static const SCX_enum SCX_AUX_TABLE_81[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_82[] = { +static const SCX_enum SCX_AUX_TABLE_90[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -80276,7 +82795,7 @@ static const SCX_enum SCX_AUX_TABLE_82[] SCX_Kore }; -static const SCX_enum SCX_AUX_TABLE_83[] = { +static const SCX_enum SCX_AUX_TABLE_91[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -80290,7 +82809,7 @@ static const SCX_enum SCX_AUX_TABLE_83[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_84[] = { +static const SCX_enum SCX_AUX_TABLE_92[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -80305,7 +82824,7 @@ static const SCX_enum SCX_AUX_TABLE_84[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_85[] = { +static const SCX_enum SCX_AUX_TABLE_93[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -80317,7 +82836,7 @@ static const SCX_enum SCX_AUX_TABLE_85[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_86[] = { +static const SCX_enum SCX_AUX_TABLE_94[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -80325,13 +82844,13 @@ static const SCX_enum SCX_AUX_TABLE_86[] SCX_Kore }; -static const SCX_enum SCX_AUX_TABLE_87[] = { +static const SCX_enum SCX_AUX_TABLE_95[] = { SCX_Hiragana, SCX_Jpan, SCX_Katakana }; -static const SCX_enum SCX_AUX_TABLE_88[] = { +static const SCX_enum SCX_AUX_TABLE_96[] = { SCX_Han, SCX_Hanb, SCX_Hiragana, @@ -80340,17 +82859,17 @@ static const SCX_enum SCX_AUX_TABLE_88[] SCX_Kore }; -static const SCX_enum SCX_AUX_TABLE_89[] = { +static const SCX_enum SCX_AUX_TABLE_97[] = { SCX_Hiragana, SCX_Jpan }; -static const SCX_enum SCX_AUX_TABLE_90[] = { +static const SCX_enum SCX_AUX_TABLE_98[] = { SCX_Jpan, SCX_Katakana }; -static const SCX_enum SCX_AUX_TABLE_91[] = { +static const SCX_enum SCX_AUX_TABLE_99[] = { SCX_Han, SCX_Hanb, SCX_Jpan, @@ -80358,7 +82877,7 @@ static const SCX_enum SCX_AUX_TABLE_91[] SCX_Latin }; -static const SCX_enum SCX_AUX_TABLE_92[] = { +static const SCX_enum SCX_AUX_TABLE_100[] = { SCX_Devanagari, SCX_Dogra, SCX_Gujarati, @@ -80377,7 +82896,7 @@ static const SCX_enum SCX_AUX_TABLE_92[] SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_93[] = { +static const SCX_enum SCX_AUX_TABLE_101[] = { SCX_Devanagari, SCX_Dogra, SCX_Gujarati, @@ -80395,7 +82914,7 @@ static const SCX_enum SCX_AUX_TABLE_93[] SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_94[] = { +static const SCX_enum SCX_AUX_TABLE_102[] = { SCX_Devanagari, SCX_Dogra, SCX_Gujarati, @@ -80409,7 +82928,7 @@ static const SCX_enum SCX_AUX_TABLE_94[] SCX_Tirhuta }; -static const SCX_enum SCX_AUX_TABLE_95[] = { +static const SCX_enum SCX_AUX_TABLE_103[] = { SCX_Devanagari, SCX_Dogra, SCX_Gujarati, @@ -80424,61 +82943,61 @@ static const SCX_enum SCX_AUX_TABLE_95[] SCX_Tirhuta }; -static const SCX_enum SCX_AUX_TABLE_96[] = { +static const SCX_enum SCX_AUX_TABLE_104[] = { SCX_Bengali, SCX_Devanagari, SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_97[] = { +static const SCX_enum SCX_AUX_TABLE_105[] = { SCX_Devanagari, SCX_Tamil }; -static const SCX_enum SCX_AUX_TABLE_98[] = { +static const SCX_enum SCX_AUX_TABLE_106[] = { SCX_Kayah_Li, SCX_Latin, SCX_Myanmar }; -static const SCX_enum SCX_AUX_TABLE_99[] = { +static const SCX_enum SCX_AUX_TABLE_107[] = { SCX_Buginese, SCX_Javanese }; -static const SCX_enum SCX_AUX_TABLE_100[] = { +static const SCX_enum SCX_AUX_TABLE_108[] = { SCX_Arabic, SCX_Nko }; -static const SCX_enum SCX_AUX_TABLE_101[] = { +static const SCX_enum SCX_AUX_TABLE_109[] = { SCX_Arabic, SCX_Thaana }; -static const SCX_enum SCX_AUX_TABLE_102[] = { +static const SCX_enum SCX_AUX_TABLE_110[] = { SCX_Cypriot, SCX_Cypro_Minoan, SCX_Linear_B }; -static const SCX_enum SCX_AUX_TABLE_103[] = { +static const SCX_enum SCX_AUX_TABLE_111[] = { SCX_Cypriot, SCX_Linear_B }; -static const SCX_enum SCX_AUX_TABLE_104[] = { +static const SCX_enum SCX_AUX_TABLE_112[] = { SCX_Cypriot, SCX_Linear_A, SCX_Linear_B }; -static const SCX_enum SCX_AUX_TABLE_105[] = { +static const SCX_enum SCX_AUX_TABLE_113[] = { SCX_Arabic, SCX_Coptic }; -static const SCX_enum SCX_AUX_TABLE_106[] = { +static const SCX_enum SCX_AUX_TABLE_114[] = { SCX_Manichaean, SCX_Old_Uyghur }; @@ -80590,7 +83109,15 @@ static const SCX_enum * const SCX_AUX_TA SCX_AUX_TABLE_103, SCX_AUX_TABLE_104, SCX_AUX_TABLE_105, - SCX_AUX_TABLE_106 + SCX_AUX_TABLE_106, + SCX_AUX_TABLE_107, + SCX_AUX_TABLE_108, + SCX_AUX_TABLE_109, + SCX_AUX_TABLE_110, + SCX_AUX_TABLE_111, + SCX_AUX_TABLE_112, + SCX_AUX_TABLE_113, + SCX_AUX_TABLE_114 }; /* Parallel table to the above, giving the number of elements in each table @@ -80610,9 +83137,9 @@ static const U8 SCX_AUX_TABLE_lengths[] 5 /* SCX_AUX_TABLE_10 */, 11 /* SCX_AUX_TABLE_11 */, 7 /* SCX_AUX_TABLE_12 */, - 4 /* SCX_AUX_TABLE_13 */, + 5 /* SCX_AUX_TABLE_13 */, 9 /* SCX_AUX_TABLE_14 */, - 10 /* SCX_AUX_TABLE_15 */, + 11 /* SCX_AUX_TABLE_15 */, 2 /* SCX_AUX_TABLE_16 */, 3 /* SCX_AUX_TABLE_17 */, 4 /* SCX_AUX_TABLE_18 */, @@ -80621,12 +83148,12 @@ static const U8 SCX_AUX_TABLE_lengths[] 2 /* SCX_AUX_TABLE_21 */, 3 /* SCX_AUX_TABLE_22 */, 4 /* SCX_AUX_TABLE_23 */, - 2 /* SCX_AUX_TABLE_24 */, - 6 /* SCX_AUX_TABLE_25 */, - 4 /* SCX_AUX_TABLE_26 */, + 7 /* SCX_AUX_TABLE_24 */, + 4 /* SCX_AUX_TABLE_25 */, + 2 /* SCX_AUX_TABLE_26 */, 3 /* SCX_AUX_TABLE_27 */, 3 /* SCX_AUX_TABLE_28 */, - 6 /* SCX_AUX_TABLE_29 */, + 7 /* SCX_AUX_TABLE_29 */, 2 /* SCX_AUX_TABLE_30 */, 3 /* SCX_AUX_TABLE_31 */, 2 /* SCX_AUX_TABLE_32 */, @@ -80641,8 +83168,8 @@ static const U8 SCX_AUX_TABLE_lengths[] 2 /* SCX_AUX_TABLE_41 */, 3 /* SCX_AUX_TABLE_42 */, 2 /* SCX_AUX_TABLE_43 */, - 13 /* SCX_AUX_TABLE_44 */, - 12 /* SCX_AUX_TABLE_45 */, + 15 /* SCX_AUX_TABLE_44 */, + 13 /* SCX_AUX_TABLE_45 */, 21 /* SCX_AUX_TABLE_46 */, 23 /* SCX_AUX_TABLE_47 */, 4 /* SCX_AUX_TABLE_48 */, @@ -80658,52 +83185,60 @@ static const U8 SCX_AUX_TABLE_lengths[] 2 /* SCX_AUX_TABLE_58 */, 4 /* SCX_AUX_TABLE_59 */, 3 /* SCX_AUX_TABLE_60 */, - 2 /* SCX_AUX_TABLE_61 */, - 2 /* SCX_AUX_TABLE_62 */, - 6 /* SCX_AUX_TABLE_63 */, - 2 /* SCX_AUX_TABLE_64 */, - 11 /* SCX_AUX_TABLE_65 */, - 2 /* SCX_AUX_TABLE_66 */, - 4 /* SCX_AUX_TABLE_67 */, + 5 /* SCX_AUX_TABLE_61 */, + 3 /* SCX_AUX_TABLE_62 */, + 3 /* SCX_AUX_TABLE_63 */, + 4 /* SCX_AUX_TABLE_64 */, + 2 /* SCX_AUX_TABLE_65 */, + 6 /* SCX_AUX_TABLE_66 */, + 2 /* SCX_AUX_TABLE_67 */, 3 /* SCX_AUX_TABLE_68 */, 3 /* SCX_AUX_TABLE_69 */, - 2 /* SCX_AUX_TABLE_70 */, - 6 /* SCX_AUX_TABLE_71 */, + 3 /* SCX_AUX_TABLE_70 */, + 2 /* SCX_AUX_TABLE_71 */, 4 /* SCX_AUX_TABLE_72 */, - 3 /* SCX_AUX_TABLE_73 */, + 11 /* SCX_AUX_TABLE_73 */, 2 /* SCX_AUX_TABLE_74 */, - 2 /* SCX_AUX_TABLE_75 */, - 7 /* SCX_AUX_TABLE_76 */, + 4 /* SCX_AUX_TABLE_75 */, + 3 /* SCX_AUX_TABLE_76 */, 3 /* SCX_AUX_TABLE_77 */, - 4 /* SCX_AUX_TABLE_78 */, - 5 /* SCX_AUX_TABLE_79 */, - 10 /* SCX_AUX_TABLE_80 */, - 11 /* SCX_AUX_TABLE_81 */, - 8 /* SCX_AUX_TABLE_82 */, - 11 /* SCX_AUX_TABLE_83 */, - 12 /* SCX_AUX_TABLE_84 */, - 9 /* SCX_AUX_TABLE_85 */, - 5 /* SCX_AUX_TABLE_86 */, - 3 /* SCX_AUX_TABLE_87 */, - 6 /* SCX_AUX_TABLE_88 */, - 2 /* SCX_AUX_TABLE_89 */, - 2 /* SCX_AUX_TABLE_90 */, - 5 /* SCX_AUX_TABLE_91 */, - 16 /* SCX_AUX_TABLE_92 */, - 15 /* SCX_AUX_TABLE_93 */, - 11 /* SCX_AUX_TABLE_94 */, - 12 /* SCX_AUX_TABLE_95 */, - 3 /* SCX_AUX_TABLE_96 */, + 2 /* SCX_AUX_TABLE_78 */, + 6 /* SCX_AUX_TABLE_79 */, + 4 /* SCX_AUX_TABLE_80 */, + 3 /* SCX_AUX_TABLE_81 */, + 2 /* SCX_AUX_TABLE_82 */, + 2 /* SCX_AUX_TABLE_83 */, + 7 /* SCX_AUX_TABLE_84 */, + 3 /* SCX_AUX_TABLE_85 */, + 4 /* SCX_AUX_TABLE_86 */, + 5 /* SCX_AUX_TABLE_87 */, + 10 /* SCX_AUX_TABLE_88 */, + 11 /* SCX_AUX_TABLE_89 */, + 8 /* SCX_AUX_TABLE_90 */, + 11 /* SCX_AUX_TABLE_91 */, + 12 /* SCX_AUX_TABLE_92 */, + 9 /* SCX_AUX_TABLE_93 */, + 5 /* SCX_AUX_TABLE_94 */, + 3 /* SCX_AUX_TABLE_95 */, + 6 /* SCX_AUX_TABLE_96 */, 2 /* SCX_AUX_TABLE_97 */, - 3 /* SCX_AUX_TABLE_98 */, - 2 /* SCX_AUX_TABLE_99 */, - 2 /* SCX_AUX_TABLE_100 */, - 2 /* SCX_AUX_TABLE_101 */, - 3 /* SCX_AUX_TABLE_102 */, - 2 /* SCX_AUX_TABLE_103 */, + 2 /* SCX_AUX_TABLE_98 */, + 5 /* SCX_AUX_TABLE_99 */, + 16 /* SCX_AUX_TABLE_100 */, + 15 /* SCX_AUX_TABLE_101 */, + 11 /* SCX_AUX_TABLE_102 */, + 12 /* SCX_AUX_TABLE_103 */, 3 /* SCX_AUX_TABLE_104 */, 2 /* SCX_AUX_TABLE_105 */, - 2 /* SCX_AUX_TABLE_106 */ + 3 /* SCX_AUX_TABLE_106 */, + 2 /* SCX_AUX_TABLE_107 */, + 2 /* SCX_AUX_TABLE_108 */, + 2 /* SCX_AUX_TABLE_109 */, + 3 /* SCX_AUX_TABLE_110 */, + 2 /* SCX_AUX_TABLE_111 */, + 3 /* SCX_AUX_TABLE_112 */, + 2 /* SCX_AUX_TABLE_113 */, + 2 /* SCX_AUX_TABLE_114 */ }; /* This table, indexed by the script enum, gives the zero code point for that @@ -80723,6 +83258,7 @@ static const UV script_zeros[] = { '0', /* Bassa_Vah */ '0', /* Batak */ 0x9e6, /* Bengali */ + '0', /* Beria_Erfe */ 0x11c50, /* Bhaiksuki */ '0', /* Bopomofo */ 0x11066, /* Brahmi */ @@ -80851,6 +83387,7 @@ static const UV script_zeros[] = { 0x111d0, /* Sharada */ '0', /* Shavian */ '0', /* Siddham */ + '0', /* Sidetic */ '0', /* SignWriting */ 0xde6, /* Sinhala */ '0', /* Sogdian */ @@ -80865,6 +83402,7 @@ static const UV script_zeros[] = { 0x1040, /* Tai_Le */ 0, /* Tai_Tham */ '0', /* Tai_Viet */ + '0', /* Tai_Yo */ 0x116c0, /* Takri */ 0xbe6, /* Tamil */ 0x16ac0, /* Tangsa */ @@ -80876,6 +83414,7 @@ static const UV script_zeros[] = { '0', /* Tifinagh */ 0x114d0, /* Tirhuta */ '0', /* Todhri */ + 0x11de0, /* Tolong_Siki */ '0', /* Toto */ 0xce6, /* Tulu_Tigalari */ '0', /* Ugaritic */ @@ -80942,13 +83481,11 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_use_AUX_TABLE_23, SCX_Inherited, SCX_use_AUX_TABLE_24, - SCX_Inherited, SCX_use_AUX_TABLE_25, SCX_use_AUX_TABLE_26, - SCX_use_AUX_TABLE_24, SCX_Inherited, SCX_use_AUX_TABLE_27, - SCX_use_AUX_TABLE_24, + SCX_use_AUX_TABLE_26, SCX_Inherited, SCX_use_AUX_TABLE_28, SCX_use_AUX_TABLE_29, @@ -81050,8 +83587,6 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Arabic, SCX_Unknown, SCX_Arabic, - SCX_Unknown, - SCX_Arabic, SCX_Common, SCX_Arabic, SCX_Devanagari, @@ -81471,6 +84006,8 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Inherited, SCX_Unknown, + SCX_Inherited, + SCX_Unknown, SCX_Balinese, SCX_Unknown, SCX_Balinese, @@ -81498,26 +84035,29 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Devanagari, SCX_use_AUX_TABLE_61, SCX_use_AUX_TABLE_62, - SCX_use_AUX_TABLE_61, - SCX_use_AUX_TABLE_62, SCX_use_AUX_TABLE_63, + SCX_use_AUX_TABLE_64, + SCX_use_AUX_TABLE_65, + SCX_use_AUX_TABLE_66, SCX_Devanagari, - SCX_use_AUX_TABLE_62, + SCX_use_AUX_TABLE_65, SCX_Devanagari, - SCX_use_AUX_TABLE_62, - SCX_use_AUX_TABLE_61, + SCX_use_AUX_TABLE_65, + SCX_use_AUX_TABLE_67, + SCX_use_AUX_TABLE_68, SCX_Devanagari, - SCX_use_AUX_TABLE_64, - SCX_use_AUX_TABLE_61, + SCX_use_AUX_TABLE_69, + SCX_use_AUX_TABLE_70, + SCX_use_AUX_TABLE_71, SCX_Devanagari, - SCX_use_AUX_TABLE_61, + SCX_use_AUX_TABLE_72, SCX_Devanagari, - SCX_use_AUX_TABLE_65, - SCX_use_AUX_TABLE_66, + SCX_use_AUX_TABLE_73, + SCX_use_AUX_TABLE_74, + SCX_use_AUX_TABLE_75, SCX_use_AUX_TABLE_67, - SCX_use_AUX_TABLE_61, SCX_Bengali, - SCX_use_AUX_TABLE_66, + SCX_use_AUX_TABLE_74, SCX_Nandinagari, SCX_Unknown, SCX_Latin, @@ -81532,7 +84072,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Latin, SCX_Greek, SCX_Inherited, - SCX_use_AUX_TABLE_68, + SCX_use_AUX_TABLE_76, SCX_Inherited, SCX_Syriac, SCX_Inherited, @@ -81572,13 +84112,13 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Inherited, SCX_Common, - SCX_use_AUX_TABLE_69, + SCX_use_AUX_TABLE_77, SCX_Common, - SCX_use_AUX_TABLE_70, + SCX_use_AUX_TABLE_78, SCX_Common, - SCX_use_AUX_TABLE_71, + SCX_use_AUX_TABLE_79, SCX_Common, - SCX_use_AUX_TABLE_72, + SCX_use_AUX_TABLE_80, SCX_Common, SCX_Unknown, SCX_Common, @@ -81593,7 +84133,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Unknown, SCX_Inherited, - SCX_use_AUX_TABLE_73, + SCX_use_AUX_TABLE_81, SCX_Unknown, SCX_Common, SCX_Greek, @@ -81616,8 +84156,6 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Unknown, SCX_Common, - SCX_Unknown, - SCX_Common, SCX_Glagolitic, SCX_Latin, SCX_Coptic, @@ -81654,92 +84192,92 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Cyrillic, SCX_Common, - SCX_use_AUX_TABLE_74, + SCX_use_AUX_TABLE_82, SCX_Common, - SCX_use_AUX_TABLE_75, - SCX_use_AUX_TABLE_76, + SCX_use_AUX_TABLE_83, + SCX_use_AUX_TABLE_84, SCX_Common, SCX_Duployan, SCX_Common, - SCX_use_AUX_TABLE_77, + SCX_use_AUX_TABLE_85, SCX_Common, SCX_use_AUX_TABLE_34, SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_79, + SCX_use_AUX_TABLE_87, SCX_Common, - SCX_use_AUX_TABLE_80, - SCX_use_AUX_TABLE_81, - SCX_use_AUX_TABLE_82, + SCX_use_AUX_TABLE_88, + SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_90, SCX_Common, - SCX_use_AUX_TABLE_78, - SCX_use_AUX_TABLE_83, - SCX_use_AUX_TABLE_84, - SCX_use_AUX_TABLE_85, + SCX_use_AUX_TABLE_86, + SCX_use_AUX_TABLE_91, + SCX_use_AUX_TABLE_92, + SCX_use_AUX_TABLE_93, SCX_Common, - SCX_use_AUX_TABLE_82, - SCX_use_AUX_TABLE_85, - SCX_use_AUX_TABLE_82, + SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_93, + SCX_use_AUX_TABLE_90, SCX_Common, - SCX_use_AUX_TABLE_78, SCX_use_AUX_TABLE_86, + SCX_use_AUX_TABLE_94, SCX_use_AUX_TABLE_56, - SCX_use_AUX_TABLE_82, - SCX_use_AUX_TABLE_87, + SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_95, SCX_Common, - SCX_use_AUX_TABLE_82, - SCX_use_AUX_TABLE_78, - SCX_use_AUX_TABLE_88, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_86, + SCX_use_AUX_TABLE_96, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_97, SCX_Unknown, - SCX_use_AUX_TABLE_87, - SCX_use_AUX_TABLE_89, - SCX_use_AUX_TABLE_87, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_85, - SCX_use_AUX_TABLE_87, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_95, + SCX_use_AUX_TABLE_97, + SCX_use_AUX_TABLE_95, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_93, + SCX_use_AUX_TABLE_95, + SCX_use_AUX_TABLE_98, SCX_Unknown, SCX_use_AUX_TABLE_6, SCX_Unknown, SCX_use_AUX_TABLE_56, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_use_AUX_TABLE_6, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_79, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_87, + SCX_use_AUX_TABLE_98, SCX_use_AUX_TABLE_56, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, SCX_use_AUX_TABLE_56, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_78, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_86, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Yi, SCX_Unknown, SCX_Yi, @@ -81752,26 +84290,20 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Cyrillic, SCX_Bamum, SCX_Unknown, - SCX_use_AUX_TABLE_91, + SCX_use_AUX_TABLE_99, SCX_Common, SCX_Latin, SCX_Common, SCX_Latin, SCX_Unknown, SCX_Latin, - SCX_Unknown, - SCX_Latin, - SCX_Unknown, - SCX_Latin, - SCX_Unknown, - SCX_Latin, SCX_Syloti_Nagri, SCX_Unknown, - SCX_use_AUX_TABLE_92, - SCX_use_AUX_TABLE_93, - SCX_use_AUX_TABLE_94, - SCX_use_AUX_TABLE_95, - SCX_use_AUX_TABLE_94, + SCX_use_AUX_TABLE_100, + SCX_use_AUX_TABLE_101, + SCX_use_AUX_TABLE_102, + SCX_use_AUX_TABLE_103, + SCX_use_AUX_TABLE_102, SCX_Unknown, SCX_Phags_Pa, SCX_Unknown, @@ -81780,12 +84312,12 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Saurashtra, SCX_Unknown, SCX_Devanagari, - SCX_use_AUX_TABLE_96, + SCX_use_AUX_TABLE_104, SCX_Devanagari, - SCX_use_AUX_TABLE_97, + SCX_use_AUX_TABLE_105, SCX_Devanagari, SCX_Kayah_Li, - SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_106, SCX_Kayah_Li, SCX_Rejang, SCX_Unknown, @@ -81794,7 +84326,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Javanese, SCX_Unknown, - SCX_use_AUX_TABLE_99, + SCX_use_AUX_TABLE_107, SCX_Javanese, SCX_Unknown, SCX_Javanese, @@ -81841,9 +84373,9 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_use_AUX_TABLE_56, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, SCX_Latin, SCX_Unknown, @@ -81861,19 +84393,13 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Hebrew, SCX_Arabic, - SCX_Unknown, - SCX_Arabic, - SCX_use_AUX_TABLE_100, - SCX_Arabic, - SCX_Unknown, - SCX_Arabic, - SCX_Unknown, + SCX_use_AUX_TABLE_108, SCX_Arabic, SCX_Unknown, SCX_Arabic, - SCX_use_AUX_TABLE_101, + SCX_use_AUX_TABLE_109, SCX_Arabic, - SCX_use_AUX_TABLE_101, + SCX_use_AUX_TABLE_109, SCX_Arabic, SCX_Inherited, SCX_Common, @@ -81881,7 +84407,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Inherited, SCX_Cyrillic, SCX_Common, - SCX_use_AUX_TABLE_82, + SCX_use_AUX_TABLE_90, SCX_Common, SCX_Unknown, SCX_Common, @@ -81899,11 +84425,11 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Latin, SCX_Common, - SCX_use_AUX_TABLE_85, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_87, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_87, + SCX_use_AUX_TABLE_93, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_95, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_95, SCX_use_AUX_TABLE_56, SCX_Unknown, SCX_use_AUX_TABLE_56, @@ -81934,12 +84460,12 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Linear_B, SCX_Unknown, - SCX_use_AUX_TABLE_102, - SCX_use_AUX_TABLE_103, + SCX_use_AUX_TABLE_110, + SCX_use_AUX_TABLE_111, SCX_Unknown, - SCX_use_AUX_TABLE_104, + SCX_use_AUX_TABLE_112, SCX_Unknown, - SCX_use_AUX_TABLE_103, + SCX_use_AUX_TABLE_111, SCX_Greek, SCX_Unknown, SCX_Common, @@ -81953,7 +84479,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Carian, SCX_Unknown, - SCX_use_AUX_TABLE_105, + SCX_use_AUX_TABLE_113, SCX_Unknown, SCX_Old_Italic, SCX_Unknown, @@ -82044,6 +84570,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Lydian, SCX_Unknown, SCX_Lydian, + SCX_Sidetic, SCX_Unknown, SCX_Meroitic_Hieroglyphs, SCX_Meroitic_Cursive, @@ -82073,7 +84600,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Manichaean, SCX_Unknown, SCX_Manichaean, - SCX_use_AUX_TABLE_106, + SCX_use_AUX_TABLE_114, SCX_Manichaean, SCX_Unknown, SCX_Avestan, @@ -82119,6 +84646,8 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Arabic, SCX_Unknown, SCX_Arabic, + SCX_Unknown, + SCX_Arabic, SCX_Old_Sogdian, SCX_Unknown, SCX_Sogdian, @@ -82292,6 +84821,8 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Devanagari, SCX_Unknown, + SCX_Sharada, + SCX_Unknown, SCX_Sunuwar, SCX_Unknown, SCX_Sunuwar, @@ -82336,6 +84867,10 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Gunjala_Gondi, SCX_Unknown, + SCX_Tolong_Siki, + SCX_Unknown, + SCX_Tolong_Siki, + SCX_Unknown, SCX_Makasar, SCX_Unknown, SCX_Kawi, @@ -82400,6 +84935,10 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Medefaidrin, SCX_Unknown, + SCX_Beria_Erfe, + SCX_Unknown, + SCX_Beria_Erfe, + SCX_Unknown, SCX_Miao, SCX_Unknown, SCX_Miao, @@ -82408,12 +84947,10 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Tangut, SCX_Nushu, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Khitan_Small_Script, SCX_Unknown, - SCX_use_AUX_TABLE_78, - SCX_Unknown, - SCX_Tangut, + SCX_use_AUX_TABLE_86, SCX_Unknown, SCX_Tangut, SCX_Khitan_Small_Script, @@ -82421,23 +84958,25 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Khitan_Small_Script, SCX_Tangut, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_Tangut, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_98, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_98, SCX_Unknown, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_89, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_98, SCX_Unknown, - SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_97, + SCX_use_AUX_TABLE_98, SCX_Unknown, - SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_97, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_97, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_98, + SCX_Unknown, + SCX_use_AUX_TABLE_98, SCX_Unknown, SCX_Nushu, SCX_Unknown, @@ -82455,6 +84994,10 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Common, SCX_Unknown, + SCX_Common, + SCX_Unknown, + SCX_Common, + SCX_Unknown, SCX_Inherited, SCX_Unknown, SCX_Inherited, @@ -82483,7 +85026,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, SCX_Unknown, SCX_Common, @@ -82571,6 +85114,12 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Ol_Onal, SCX_Unknown, + SCX_Tai_Yo, + SCX_Unknown, + SCX_Tai_Yo, + SCX_Unknown, + SCX_Tai_Yo, + SCX_Unknown, SCX_Ethiopic, SCX_Unknown, SCX_Ethiopic, @@ -82676,14 +85225,14 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Unknown, SCX_Common, - SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_97, SCX_Common, SCX_Unknown, SCX_Common, SCX_Unknown, SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, SCX_Common, SCX_Unknown, @@ -82735,23 +85284,23 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, SCX_Common, SCX_Unknown, @@ -82773,7 +85322,7 @@ static const SCX_enum _Perl_SCX_invmap[] && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 1047 */ - 1898, /* Number of elements */ + 1908, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -82857,8 +85406,6 @@ static const UV _Perl_SCX_invlist[] = { 0x312, 0x313, 0x314, - 0x320, - 0x321, 0x323, 0x324, 0x325, @@ -82964,8 +85511,6 @@ static const UV _Perl_SCX_invlist[] = { 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x8E2, @@ -83149,7 +85694,7 @@ static const UV _Perl_SCX_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -83174,7 +85719,7 @@ static const UV _Perl_SCX_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -83386,7 +85931,9 @@ static const UV _Perl_SCX_invlist[] = { 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -83413,6 +85960,7 @@ static const UV _Perl_SCX_invlist[] = { 0x1CD3, 0x1CD4, 0x1CD5, + 0x1CD6, 0x1CD7, 0x1CD8, 0x1CD9, @@ -83423,9 +85971,11 @@ static const UV _Perl_SCX_invlist[] = { 0x1CE0, 0x1CE1, 0x1CE2, + 0x1CE3, 0x1CE9, 0x1CEA, 0x1CEB, + 0x1CEC, 0x1CED, 0x1CEE, 0x1CF2, @@ -83507,7 +86057,7 @@ static const UV _Perl_SCX_invlist[] = { 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F0, 0x20F1, @@ -83532,8 +86082,6 @@ static const UV _Perl_SCX_invlist[] = { 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2C60, 0x2C80, @@ -83673,14 +86221,8 @@ static const UV _Perl_SCX_invlist[] = { 0xA722, 0xA788, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA800, 0xA82D, 0xA830, @@ -83777,14 +86319,8 @@ static const UV _Perl_SCX_invlist[] = { 0xFB45, 0xFB46, 0xFB50, - 0xFBC3, - 0xFBD3, 0xFD3E, 0xFD40, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFDF2, @@ -83961,6 +86497,7 @@ static const UV _Perl_SCX_invlist[] = { 0x1093A, 0x1093F, 0x10940, + 0x1095A, 0x10980, 0x109A0, 0x109B8, @@ -84033,8 +86570,10 @@ static const UV _Perl_SCX_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F00, 0x10F28, 0x10F30, @@ -84208,6 +86747,8 @@ static const UV _Perl_SCX_invlist[] = { 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -84252,6 +86793,10 @@ static const UV _Perl_SCX_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -84316,6 +86861,10 @@ static const UV _Perl_SCX_invlist[] = { 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -84328,15 +86877,15 @@ static const UV _Perl_SCX_invlist[] = { 0x16FE4, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18B00, 0x18CD6, 0x18CFF, 0x18D00, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -84368,9 +86917,13 @@ static const UV _Perl_SCX_invlist[] = { 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -84487,6 +87040,12 @@ static const UV _Perl_SCX_invlist[] = { 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -84604,14 +87163,12 @@ static const UV _Perl_SCX_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -84631,34 +87188,36 @@ static const UV _Perl_SCX_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -84668,7 +87227,7 @@ static const UV _Perl_SCX_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -84703,169 +87262,173 @@ typedef enum { SCX_Bassa_Vah = 9, SCX_Batak = 10, SCX_Bengali = 11, - SCX_Bhaiksuki = 12, - SCX_Bopomofo = 13, - SCX_Brahmi = 14, - SCX_Braille = 15, - SCX_Buginese = 16, - SCX_Buhid = 17, - SCX_Canadian_Aboriginal = 18, - SCX_Carian = 19, - SCX_Caucasian_Albanian = 20, - SCX_Chakma = 21, - SCX_Cham = 22, - SCX_Cherokee = 23, - SCX_Chorasmian = 24, - SCX_Common = 25, - SCX_Coptic = 26, - SCX_Cuneiform = 27, - SCX_Cypriot = 28, - SCX_Cypro_Minoan = 29, - SCX_Cyrillic = 30, - SCX_Deseret = 31, - SCX_Devanagari = 32, - SCX_Dives_Akuru = 33, - SCX_Dogra = 34, - SCX_Duployan = 35, - SCX_Egyptian_Hieroglyphs = 36, - SCX_Elbasan = 37, - SCX_Elymaic = 38, - SCX_Ethiopic = 39, - SCX_Garay = 40, - SCX_Georgian = 41, - SCX_Glagolitic = 42, - SCX_Gothic = 43, - SCX_Grantha = 44, - SCX_Greek = 45, - SCX_Gujarati = 46, - SCX_Gunjala_Gondi = 47, - SCX_Gurmukhi = 48, - SCX_Gurung_Khema = 49, - SCX_Han = 50, - SCX_Hanb = 51, - SCX_Hangul = 52, - SCX_Hanifi_Rohingya = 53, - SCX_Hanunoo = 54, - SCX_Hatran = 55, - SCX_Hebrew = 56, - SCX_Hiragana = 57, - SCX_Imperial_Aramaic = 58, - SCX_Inherited = 59, - SCX_Inscriptional_Pahlavi = 60, - SCX_Inscriptional_Parthian = 61, - SCX_INVALID = 62, - SCX_Javanese = 63, - SCX_Jpan = 64, - SCX_Kaithi = 65, - SCX_Kannada = 66, - SCX_Katakana = 67, - SCX_Kawi = 68, - SCX_Kayah_Li = 69, - SCX_Kharoshthi = 70, - SCX_Khitan_Small_Script = 71, - SCX_Khmer = 72, - SCX_Khojki = 73, - SCX_Khudawadi = 74, - SCX_Kirat_Rai = 75, - SCX_Kore = 76, - SCX_Lao = 77, - SCX_Latin = 78, - SCX_Lepcha = 79, - SCX_Limbu = 80, - SCX_Linear_A = 81, - SCX_Linear_B = 82, - SCX_Lisu = 83, - SCX_Lycian = 84, - SCX_Lydian = 85, - SCX_Mahajani = 86, - SCX_Makasar = 87, - SCX_Malayalam = 88, - SCX_Mandaic = 89, - SCX_Manichaean = 90, - SCX_Marchen = 91, - SCX_Masaram_Gondi = 92, - SCX_Medefaidrin = 93, - SCX_Meetei_Mayek = 94, - SCX_Mende_Kikakui = 95, - SCX_Meroitic_Cursive = 96, - SCX_Meroitic_Hieroglyphs = 97, - SCX_Miao = 98, - SCX_Modi = 99, - SCX_Mongolian = 100, - SCX_Mro = 101, - SCX_Multani = 102, - SCX_Myanmar = 103, - SCX_Nabataean = 104, - SCX_Nag_Mundari = 105, - SCX_Nandinagari = 106, - SCX_New_Tai_Lue = 107, - SCX_Newa = 108, - SCX_Nko = 109, - SCX_Nushu = 110, - SCX_Nyiakeng_Puachue_Hmong = 111, - SCX_Ogham = 112, - SCX_Ol_Chiki = 113, - SCX_Ol_Onal = 114, - SCX_Old_Hungarian = 115, - SCX_Old_Italic = 116, - SCX_Old_North_Arabian = 117, - SCX_Old_Permic = 118, - SCX_Old_Persian = 119, - SCX_Old_Sogdian = 120, - SCX_Old_South_Arabian = 121, - SCX_Old_Turkic = 122, - SCX_Old_Uyghur = 123, - SCX_Oriya = 124, - SCX_Osage = 125, - SCX_Osmanya = 126, - SCX_Pahawh_Hmong = 127, - SCX_Palmyrene = 128, - SCX_Pau_Cin_Hau = 129, - SCX_Phags_Pa = 130, - SCX_Phoenician = 131, - SCX_Psalter_Pahlavi = 132, - SCX_Rejang = 133, - SCX_Runic = 134, - SCX_Samaritan = 135, - SCX_Saurashtra = 136, - SCX_Sharada = 137, - SCX_Shavian = 138, - SCX_Siddham = 139, - SCX_SignWriting = 140, - SCX_Sinhala = 141, - SCX_Sogdian = 142, - SCX_Sora_Sompeng = 143, - SCX_Soyombo = 144, - SCX_Sundanese = 145, - SCX_Sunuwar = 146, - SCX_Syloti_Nagri = 147, - SCX_Syriac = 148, - SCX_Tagalog = 149, - SCX_Tagbanwa = 150, - SCX_Tai_Le = 151, - SCX_Tai_Tham = 152, - SCX_Tai_Viet = 153, - SCX_Takri = 154, - SCX_Tamil = 155, - SCX_Tangsa = 156, - SCX_Tangut = 157, - SCX_Telugu = 158, - SCX_Thaana = 159, - SCX_Thai = 160, - SCX_Tibetan = 161, - SCX_Tifinagh = 162, - SCX_Tirhuta = 163, - SCX_Todhri = 164, - SCX_Toto = 165, - SCX_Tulu_Tigalari = 166, - SCX_Ugaritic = 167, - SCX_Vai = 168, - SCX_Vithkuqi = 169, - SCX_Wancho = 170, - SCX_Warang_Citi = 171, - SCX_Yezidi = 172, - SCX_Yi = 173, - SCX_Zanabazar_Square = 174, + SCX_Beria_Erfe = 12, + SCX_Bhaiksuki = 13, + SCX_Bopomofo = 14, + SCX_Brahmi = 15, + SCX_Braille = 16, + SCX_Buginese = 17, + SCX_Buhid = 18, + SCX_Canadian_Aboriginal = 19, + SCX_Carian = 20, + SCX_Caucasian_Albanian = 21, + SCX_Chakma = 22, + SCX_Cham = 23, + SCX_Cherokee = 24, + SCX_Chorasmian = 25, + SCX_Common = 26, + SCX_Coptic = 27, + SCX_Cuneiform = 28, + SCX_Cypriot = 29, + SCX_Cypro_Minoan = 30, + SCX_Cyrillic = 31, + SCX_Deseret = 32, + SCX_Devanagari = 33, + SCX_Dives_Akuru = 34, + SCX_Dogra = 35, + SCX_Duployan = 36, + SCX_Egyptian_Hieroglyphs = 37, + SCX_Elbasan = 38, + SCX_Elymaic = 39, + SCX_Ethiopic = 40, + SCX_Garay = 41, + SCX_Georgian = 42, + SCX_Glagolitic = 43, + SCX_Gothic = 44, + SCX_Grantha = 45, + SCX_Greek = 46, + SCX_Gujarati = 47, + SCX_Gunjala_Gondi = 48, + SCX_Gurmukhi = 49, + SCX_Gurung_Khema = 50, + SCX_Han = 51, + SCX_Hanb = 52, + SCX_Hangul = 53, + SCX_Hanifi_Rohingya = 54, + SCX_Hanunoo = 55, + SCX_Hatran = 56, + SCX_Hebrew = 57, + SCX_Hiragana = 58, + SCX_Imperial_Aramaic = 59, + SCX_Inherited = 60, + SCX_Inscriptional_Pahlavi = 61, + SCX_Inscriptional_Parthian = 62, + SCX_INVALID = 63, + SCX_Javanese = 64, + SCX_Jpan = 65, + SCX_Kaithi = 66, + SCX_Kannada = 67, + SCX_Katakana = 68, + SCX_Kawi = 69, + SCX_Kayah_Li = 70, + SCX_Kharoshthi = 71, + SCX_Khitan_Small_Script = 72, + SCX_Khmer = 73, + SCX_Khojki = 74, + SCX_Khudawadi = 75, + SCX_Kirat_Rai = 76, + SCX_Kore = 77, + SCX_Lao = 78, + SCX_Latin = 79, + SCX_Lepcha = 80, + SCX_Limbu = 81, + SCX_Linear_A = 82, + SCX_Linear_B = 83, + SCX_Lisu = 84, + SCX_Lycian = 85, + SCX_Lydian = 86, + SCX_Mahajani = 87, + SCX_Makasar = 88, + SCX_Malayalam = 89, + SCX_Mandaic = 90, + SCX_Manichaean = 91, + SCX_Marchen = 92, + SCX_Masaram_Gondi = 93, + SCX_Medefaidrin = 94, + SCX_Meetei_Mayek = 95, + SCX_Mende_Kikakui = 96, + SCX_Meroitic_Cursive = 97, + SCX_Meroitic_Hieroglyphs = 98, + SCX_Miao = 99, + SCX_Modi = 100, + SCX_Mongolian = 101, + SCX_Mro = 102, + SCX_Multani = 103, + SCX_Myanmar = 104, + SCX_Nabataean = 105, + SCX_Nag_Mundari = 106, + SCX_Nandinagari = 107, + SCX_New_Tai_Lue = 108, + SCX_Newa = 109, + SCX_Nko = 110, + SCX_Nushu = 111, + SCX_Nyiakeng_Puachue_Hmong = 112, + SCX_Ogham = 113, + SCX_Ol_Chiki = 114, + SCX_Ol_Onal = 115, + SCX_Old_Hungarian = 116, + SCX_Old_Italic = 117, + SCX_Old_North_Arabian = 118, + SCX_Old_Permic = 119, + SCX_Old_Persian = 120, + SCX_Old_Sogdian = 121, + SCX_Old_South_Arabian = 122, + SCX_Old_Turkic = 123, + SCX_Old_Uyghur = 124, + SCX_Oriya = 125, + SCX_Osage = 126, + SCX_Osmanya = 127, + SCX_Pahawh_Hmong = 128, + SCX_Palmyrene = 129, + SCX_Pau_Cin_Hau = 130, + SCX_Phags_Pa = 131, + SCX_Phoenician = 132, + SCX_Psalter_Pahlavi = 133, + SCX_Rejang = 134, + SCX_Runic = 135, + SCX_Samaritan = 136, + SCX_Saurashtra = 137, + SCX_Sharada = 138, + SCX_Shavian = 139, + SCX_Siddham = 140, + SCX_Sidetic = 141, + SCX_SignWriting = 142, + SCX_Sinhala = 143, + SCX_Sogdian = 144, + SCX_Sora_Sompeng = 145, + SCX_Soyombo = 146, + SCX_Sundanese = 147, + SCX_Sunuwar = 148, + SCX_Syloti_Nagri = 149, + SCX_Syriac = 150, + SCX_Tagalog = 151, + SCX_Tagbanwa = 152, + SCX_Tai_Le = 153, + SCX_Tai_Tham = 154, + SCX_Tai_Viet = 155, + SCX_Tai_Yo = 156, + SCX_Takri = 157, + SCX_Tamil = 158, + SCX_Tangsa = 159, + SCX_Tangut = 160, + SCX_Telugu = 161, + SCX_Thaana = 162, + SCX_Thai = 163, + SCX_Tibetan = 164, + SCX_Tifinagh = 165, + SCX_Tirhuta = 166, + SCX_Todhri = 167, + SCX_Tolong_Siki = 168, + SCX_Toto = 169, + SCX_Tulu_Tigalari = 170, + SCX_Ugaritic = 171, + SCX_Vai = 172, + SCX_Vithkuqi = 173, + SCX_Wancho = 174, + SCX_Warang_Citi = 175, + SCX_Yezidi = 176, + SCX_Yi = 177, + SCX_Zanabazar_Square = 178, SCX_use_AUX_TABLE_1 = -1, SCX_use_AUX_TABLE_2 = -2, SCX_use_AUX_TABLE_3 = -3, @@ -84971,7 +87534,15 @@ typedef enum { SCX_use_AUX_TABLE_103 = -103, SCX_use_AUX_TABLE_104 = -104, SCX_use_AUX_TABLE_105 = -105, - SCX_use_AUX_TABLE_106 = -106 + SCX_use_AUX_TABLE_106 = -106, + SCX_use_AUX_TABLE_107 = -107, + SCX_use_AUX_TABLE_108 = -108, + SCX_use_AUX_TABLE_109 = -109, + SCX_use_AUX_TABLE_110 = -110, + SCX_use_AUX_TABLE_111 = -111, + SCX_use_AUX_TABLE_112 = -112, + SCX_use_AUX_TABLE_113 = -113, + SCX_use_AUX_TABLE_114 = -114 } SCX_enum; # endif /* EBCDIC 1047 */ @@ -85103,7 +87674,8 @@ static const SCX_enum SCX_AUX_TABLE_13[] SCX_Cyrillic, SCX_Greek, SCX_Latin, - SCX_Old_Permic + SCX_Old_Permic, + SCX_Tifinagh }; static const SCX_enum SCX_AUX_TABLE_14[] = { @@ -85128,7 +87700,8 @@ static const SCX_enum SCX_AUX_TABLE_15[] SCX_Latin, SCX_Old_Permic, SCX_Syriac, - SCX_Tai_Le + SCX_Tai_Le, + SCX_Tifinagh }; static const SCX_enum SCX_AUX_TABLE_16[] = { @@ -85179,22 +87752,23 @@ static const SCX_enum SCX_AUX_TABLE_23[] }; static const SCX_enum SCX_AUX_TABLE_24[] = { + SCX_Cherokee, + SCX_Duployan, + SCX_Jpan, + SCX_Katakana, SCX_Latin, - SCX_Syriac + SCX_Syriac, + SCX_Tifinagh }; static const SCX_enum SCX_AUX_TABLE_25[] = { SCX_Cherokee, SCX_Duployan, - SCX_Jpan, - SCX_Katakana, SCX_Latin, SCX_Syriac }; static const SCX_enum SCX_AUX_TABLE_26[] = { - SCX_Cherokee, - SCX_Duployan, SCX_Latin, SCX_Syriac }; @@ -85217,6 +87791,7 @@ static const SCX_enum SCX_AUX_TABLE_29[] SCX_Gothic, SCX_Latin, SCX_Sunuwar, + SCX_Syriac, SCX_Thai }; @@ -85321,6 +87896,8 @@ static const SCX_enum SCX_AUX_TABLE_44[] SCX_Kannada, SCX_Latin, SCX_Malayalam, + SCX_Nandinagari, + SCX_Newa, SCX_Oriya, SCX_Sharada, SCX_Tamil, @@ -85337,6 +87914,7 @@ static const SCX_enum SCX_AUX_TABLE_45[] SCX_Kannada, SCX_Latin, SCX_Malayalam, + SCX_Newa, SCX_Oriya, SCX_Tamil, SCX_Telugu, @@ -85471,16 +88049,38 @@ static const SCX_enum SCX_AUX_TABLE_60[] static const SCX_enum SCX_AUX_TABLE_61[] = { SCX_Bengali, - SCX_Devanagari + SCX_Devanagari, + SCX_Newa, + SCX_Telugu, + SCX_Tirhuta }; static const SCX_enum SCX_AUX_TABLE_62[] = { + SCX_Bengali, SCX_Devanagari, - SCX_Sharada + SCX_Telugu }; static const SCX_enum SCX_AUX_TABLE_63[] = { SCX_Devanagari, + SCX_Newa, + SCX_Sharada +}; + +static const SCX_enum SCX_AUX_TABLE_64[] = { + SCX_Bengali, + SCX_Devanagari, + SCX_Newa, + SCX_Telugu +}; + +static const SCX_enum SCX_AUX_TABLE_65[] = { + SCX_Devanagari, + SCX_Sharada +}; + +static const SCX_enum SCX_AUX_TABLE_66[] = { + SCX_Devanagari, SCX_Kannada, SCX_Malayalam, SCX_Oriya, @@ -85488,12 +88088,42 @@ static const SCX_enum SCX_AUX_TABLE_63[] SCX_Telugu }; -static const SCX_enum SCX_AUX_TABLE_64[] = { +static const SCX_enum SCX_AUX_TABLE_67[] = { + SCX_Bengali, + SCX_Devanagari +}; + +static const SCX_enum SCX_AUX_TABLE_68[] = { + SCX_Devanagari, + SCX_Newa, + SCX_Tirhuta +}; + +static const SCX_enum SCX_AUX_TABLE_69[] = { SCX_Devanagari, - SCX_Nandinagari + SCX_Nandinagari, + SCX_Newa }; -static const SCX_enum SCX_AUX_TABLE_65[] = { +static const SCX_enum SCX_AUX_TABLE_70[] = { + SCX_Bengali, + SCX_Devanagari, + SCX_Sharada +}; + +static const SCX_enum SCX_AUX_TABLE_71[] = { + SCX_Devanagari, + SCX_Newa +}; + +static const SCX_enum SCX_AUX_TABLE_72[] = { + SCX_Bengali, + SCX_Devanagari, + SCX_Newa, + SCX_Sharada +}; + +static const SCX_enum SCX_AUX_TABLE_73[] = { SCX_Bengali, SCX_Devanagari, SCX_Grantha, @@ -85507,36 +88137,36 @@ static const SCX_enum SCX_AUX_TABLE_65[] SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_66[] = { +static const SCX_enum SCX_AUX_TABLE_74[] = { SCX_Devanagari, SCX_Grantha }; -static const SCX_enum SCX_AUX_TABLE_67[] = { +static const SCX_enum SCX_AUX_TABLE_75[] = { SCX_Devanagari, SCX_Grantha, SCX_Kannada, SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_68[] = { +static const SCX_enum SCX_AUX_TABLE_76[] = { SCX_Cyrillic, SCX_Latin, SCX_Syriac }; -static const SCX_enum SCX_AUX_TABLE_69[] = { +static const SCX_enum SCX_AUX_TABLE_77[] = { SCX_Latin, SCX_Mongolian, SCX_Phags_Pa }; -static const SCX_enum SCX_AUX_TABLE_70[] = { +static const SCX_enum SCX_AUX_TABLE_78[] = { SCX_Adlam, SCX_Arabic }; -static const SCX_enum SCX_AUX_TABLE_71[] = { +static const SCX_enum SCX_AUX_TABLE_79[] = { SCX_Carian, SCX_Georgian, SCX_Glagolitic, @@ -85545,30 +88175,30 @@ static const SCX_enum SCX_AUX_TABLE_71[] SCX_Old_Turkic }; -static const SCX_enum SCX_AUX_TABLE_72[] = { +static const SCX_enum SCX_AUX_TABLE_80[] = { SCX_Carian, SCX_Greek, SCX_Meroitic_Hieroglyphs, SCX_Old_Hungarian }; -static const SCX_enum SCX_AUX_TABLE_73[] = { +static const SCX_enum SCX_AUX_TABLE_81[] = { SCX_Devanagari, SCX_Grantha, SCX_Latin }; -static const SCX_enum SCX_AUX_TABLE_74[] = { +static const SCX_enum SCX_AUX_TABLE_82[] = { SCX_Coptic, SCX_Latin }; -static const SCX_enum SCX_AUX_TABLE_75[] = { +static const SCX_enum SCX_AUX_TABLE_83[] = { SCX_Avestan, SCX_Old_Turkic }; -static const SCX_enum SCX_AUX_TABLE_76[] = { +static const SCX_enum SCX_AUX_TABLE_84[] = { SCX_Avestan, SCX_Carian, SCX_Georgian, @@ -85578,20 +88208,20 @@ static const SCX_enum SCX_AUX_TABLE_76[] SCX_Samaritan }; -static const SCX_enum SCX_AUX_TABLE_77[] = { +static const SCX_enum SCX_AUX_TABLE_85[] = { SCX_Adlam, SCX_Arabic, SCX_Old_Hungarian }; -static const SCX_enum SCX_AUX_TABLE_78[] = { +static const SCX_enum SCX_AUX_TABLE_86[] = { SCX_Han, SCX_Hanb, SCX_Jpan, SCX_Kore }; -static const SCX_enum SCX_AUX_TABLE_79[] = { +static const SCX_enum SCX_AUX_TABLE_87[] = { SCX_Han, SCX_Hanb, SCX_Jpan, @@ -85599,7 +88229,7 @@ static const SCX_enum SCX_AUX_TABLE_79[] SCX_Tangut }; -static const SCX_enum SCX_AUX_TABLE_80[] = { +static const SCX_enum SCX_AUX_TABLE_88[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -85612,7 +88242,7 @@ static const SCX_enum SCX_AUX_TABLE_80[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_81[] = { +static const SCX_enum SCX_AUX_TABLE_89[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -85626,7 +88256,7 @@ static const SCX_enum SCX_AUX_TABLE_81[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_82[] = { +static const SCX_enum SCX_AUX_TABLE_90[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -85637,7 +88267,7 @@ static const SCX_enum SCX_AUX_TABLE_82[] SCX_Kore }; -static const SCX_enum SCX_AUX_TABLE_83[] = { +static const SCX_enum SCX_AUX_TABLE_91[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -85651,7 +88281,7 @@ static const SCX_enum SCX_AUX_TABLE_83[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_84[] = { +static const SCX_enum SCX_AUX_TABLE_92[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -85666,7 +88296,7 @@ static const SCX_enum SCX_AUX_TABLE_84[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_85[] = { +static const SCX_enum SCX_AUX_TABLE_93[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -85678,7 +88308,7 @@ static const SCX_enum SCX_AUX_TABLE_85[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_86[] = { +static const SCX_enum SCX_AUX_TABLE_94[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -85686,13 +88316,13 @@ static const SCX_enum SCX_AUX_TABLE_86[] SCX_Kore }; -static const SCX_enum SCX_AUX_TABLE_87[] = { +static const SCX_enum SCX_AUX_TABLE_95[] = { SCX_Hiragana, SCX_Jpan, SCX_Katakana }; -static const SCX_enum SCX_AUX_TABLE_88[] = { +static const SCX_enum SCX_AUX_TABLE_96[] = { SCX_Han, SCX_Hanb, SCX_Hiragana, @@ -85701,17 +88331,17 @@ static const SCX_enum SCX_AUX_TABLE_88[] SCX_Kore }; -static const SCX_enum SCX_AUX_TABLE_89[] = { +static const SCX_enum SCX_AUX_TABLE_97[] = { SCX_Hiragana, SCX_Jpan }; -static const SCX_enum SCX_AUX_TABLE_90[] = { +static const SCX_enum SCX_AUX_TABLE_98[] = { SCX_Jpan, SCX_Katakana }; -static const SCX_enum SCX_AUX_TABLE_91[] = { +static const SCX_enum SCX_AUX_TABLE_99[] = { SCX_Han, SCX_Hanb, SCX_Jpan, @@ -85719,7 +88349,7 @@ static const SCX_enum SCX_AUX_TABLE_91[] SCX_Latin }; -static const SCX_enum SCX_AUX_TABLE_92[] = { +static const SCX_enum SCX_AUX_TABLE_100[] = { SCX_Devanagari, SCX_Dogra, SCX_Gujarati, @@ -85738,7 +88368,7 @@ static const SCX_enum SCX_AUX_TABLE_92[] SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_93[] = { +static const SCX_enum SCX_AUX_TABLE_101[] = { SCX_Devanagari, SCX_Dogra, SCX_Gujarati, @@ -85756,7 +88386,7 @@ static const SCX_enum SCX_AUX_TABLE_93[] SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_94[] = { +static const SCX_enum SCX_AUX_TABLE_102[] = { SCX_Devanagari, SCX_Dogra, SCX_Gujarati, @@ -85770,7 +88400,7 @@ static const SCX_enum SCX_AUX_TABLE_94[] SCX_Tirhuta }; -static const SCX_enum SCX_AUX_TABLE_95[] = { +static const SCX_enum SCX_AUX_TABLE_103[] = { SCX_Devanagari, SCX_Dogra, SCX_Gujarati, @@ -85785,61 +88415,61 @@ static const SCX_enum SCX_AUX_TABLE_95[] SCX_Tirhuta }; -static const SCX_enum SCX_AUX_TABLE_96[] = { +static const SCX_enum SCX_AUX_TABLE_104[] = { SCX_Bengali, SCX_Devanagari, SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_97[] = { +static const SCX_enum SCX_AUX_TABLE_105[] = { SCX_Devanagari, SCX_Tamil }; -static const SCX_enum SCX_AUX_TABLE_98[] = { +static const SCX_enum SCX_AUX_TABLE_106[] = { SCX_Kayah_Li, SCX_Latin, SCX_Myanmar }; -static const SCX_enum SCX_AUX_TABLE_99[] = { +static const SCX_enum SCX_AUX_TABLE_107[] = { SCX_Buginese, SCX_Javanese }; -static const SCX_enum SCX_AUX_TABLE_100[] = { +static const SCX_enum SCX_AUX_TABLE_108[] = { SCX_Arabic, SCX_Nko }; -static const SCX_enum SCX_AUX_TABLE_101[] = { +static const SCX_enum SCX_AUX_TABLE_109[] = { SCX_Arabic, SCX_Thaana }; -static const SCX_enum SCX_AUX_TABLE_102[] = { +static const SCX_enum SCX_AUX_TABLE_110[] = { SCX_Cypriot, SCX_Cypro_Minoan, SCX_Linear_B }; -static const SCX_enum SCX_AUX_TABLE_103[] = { +static const SCX_enum SCX_AUX_TABLE_111[] = { SCX_Cypriot, SCX_Linear_B }; -static const SCX_enum SCX_AUX_TABLE_104[] = { +static const SCX_enum SCX_AUX_TABLE_112[] = { SCX_Cypriot, SCX_Linear_A, SCX_Linear_B }; -static const SCX_enum SCX_AUX_TABLE_105[] = { +static const SCX_enum SCX_AUX_TABLE_113[] = { SCX_Arabic, SCX_Coptic }; -static const SCX_enum SCX_AUX_TABLE_106[] = { +static const SCX_enum SCX_AUX_TABLE_114[] = { SCX_Manichaean, SCX_Old_Uyghur }; @@ -85951,7 +88581,15 @@ static const SCX_enum * const SCX_AUX_TA SCX_AUX_TABLE_103, SCX_AUX_TABLE_104, SCX_AUX_TABLE_105, - SCX_AUX_TABLE_106 + SCX_AUX_TABLE_106, + SCX_AUX_TABLE_107, + SCX_AUX_TABLE_108, + SCX_AUX_TABLE_109, + SCX_AUX_TABLE_110, + SCX_AUX_TABLE_111, + SCX_AUX_TABLE_112, + SCX_AUX_TABLE_113, + SCX_AUX_TABLE_114 }; /* Parallel table to the above, giving the number of elements in each table @@ -85971,9 +88609,9 @@ static const U8 SCX_AUX_TABLE_lengths[] 5 /* SCX_AUX_TABLE_10 */, 11 /* SCX_AUX_TABLE_11 */, 7 /* SCX_AUX_TABLE_12 */, - 4 /* SCX_AUX_TABLE_13 */, + 5 /* SCX_AUX_TABLE_13 */, 9 /* SCX_AUX_TABLE_14 */, - 10 /* SCX_AUX_TABLE_15 */, + 11 /* SCX_AUX_TABLE_15 */, 2 /* SCX_AUX_TABLE_16 */, 3 /* SCX_AUX_TABLE_17 */, 4 /* SCX_AUX_TABLE_18 */, @@ -85982,12 +88620,12 @@ static const U8 SCX_AUX_TABLE_lengths[] 2 /* SCX_AUX_TABLE_21 */, 3 /* SCX_AUX_TABLE_22 */, 4 /* SCX_AUX_TABLE_23 */, - 2 /* SCX_AUX_TABLE_24 */, - 6 /* SCX_AUX_TABLE_25 */, - 4 /* SCX_AUX_TABLE_26 */, + 7 /* SCX_AUX_TABLE_24 */, + 4 /* SCX_AUX_TABLE_25 */, + 2 /* SCX_AUX_TABLE_26 */, 3 /* SCX_AUX_TABLE_27 */, 3 /* SCX_AUX_TABLE_28 */, - 6 /* SCX_AUX_TABLE_29 */, + 7 /* SCX_AUX_TABLE_29 */, 2 /* SCX_AUX_TABLE_30 */, 3 /* SCX_AUX_TABLE_31 */, 2 /* SCX_AUX_TABLE_32 */, @@ -86002,8 +88640,8 @@ static const U8 SCX_AUX_TABLE_lengths[] 2 /* SCX_AUX_TABLE_41 */, 3 /* SCX_AUX_TABLE_42 */, 2 /* SCX_AUX_TABLE_43 */, - 13 /* SCX_AUX_TABLE_44 */, - 12 /* SCX_AUX_TABLE_45 */, + 15 /* SCX_AUX_TABLE_44 */, + 13 /* SCX_AUX_TABLE_45 */, 21 /* SCX_AUX_TABLE_46 */, 23 /* SCX_AUX_TABLE_47 */, 4 /* SCX_AUX_TABLE_48 */, @@ -86019,52 +88657,60 @@ static const U8 SCX_AUX_TABLE_lengths[] 2 /* SCX_AUX_TABLE_58 */, 4 /* SCX_AUX_TABLE_59 */, 3 /* SCX_AUX_TABLE_60 */, - 2 /* SCX_AUX_TABLE_61 */, - 2 /* SCX_AUX_TABLE_62 */, - 6 /* SCX_AUX_TABLE_63 */, - 2 /* SCX_AUX_TABLE_64 */, - 11 /* SCX_AUX_TABLE_65 */, - 2 /* SCX_AUX_TABLE_66 */, - 4 /* SCX_AUX_TABLE_67 */, + 5 /* SCX_AUX_TABLE_61 */, + 3 /* SCX_AUX_TABLE_62 */, + 3 /* SCX_AUX_TABLE_63 */, + 4 /* SCX_AUX_TABLE_64 */, + 2 /* SCX_AUX_TABLE_65 */, + 6 /* SCX_AUX_TABLE_66 */, + 2 /* SCX_AUX_TABLE_67 */, 3 /* SCX_AUX_TABLE_68 */, 3 /* SCX_AUX_TABLE_69 */, - 2 /* SCX_AUX_TABLE_70 */, - 6 /* SCX_AUX_TABLE_71 */, + 3 /* SCX_AUX_TABLE_70 */, + 2 /* SCX_AUX_TABLE_71 */, 4 /* SCX_AUX_TABLE_72 */, - 3 /* SCX_AUX_TABLE_73 */, + 11 /* SCX_AUX_TABLE_73 */, 2 /* SCX_AUX_TABLE_74 */, - 2 /* SCX_AUX_TABLE_75 */, - 7 /* SCX_AUX_TABLE_76 */, + 4 /* SCX_AUX_TABLE_75 */, + 3 /* SCX_AUX_TABLE_76 */, 3 /* SCX_AUX_TABLE_77 */, - 4 /* SCX_AUX_TABLE_78 */, - 5 /* SCX_AUX_TABLE_79 */, - 10 /* SCX_AUX_TABLE_80 */, - 11 /* SCX_AUX_TABLE_81 */, - 8 /* SCX_AUX_TABLE_82 */, - 11 /* SCX_AUX_TABLE_83 */, - 12 /* SCX_AUX_TABLE_84 */, - 9 /* SCX_AUX_TABLE_85 */, - 5 /* SCX_AUX_TABLE_86 */, - 3 /* SCX_AUX_TABLE_87 */, - 6 /* SCX_AUX_TABLE_88 */, - 2 /* SCX_AUX_TABLE_89 */, - 2 /* SCX_AUX_TABLE_90 */, - 5 /* SCX_AUX_TABLE_91 */, - 16 /* SCX_AUX_TABLE_92 */, - 15 /* SCX_AUX_TABLE_93 */, - 11 /* SCX_AUX_TABLE_94 */, - 12 /* SCX_AUX_TABLE_95 */, - 3 /* SCX_AUX_TABLE_96 */, + 2 /* SCX_AUX_TABLE_78 */, + 6 /* SCX_AUX_TABLE_79 */, + 4 /* SCX_AUX_TABLE_80 */, + 3 /* SCX_AUX_TABLE_81 */, + 2 /* SCX_AUX_TABLE_82 */, + 2 /* SCX_AUX_TABLE_83 */, + 7 /* SCX_AUX_TABLE_84 */, + 3 /* SCX_AUX_TABLE_85 */, + 4 /* SCX_AUX_TABLE_86 */, + 5 /* SCX_AUX_TABLE_87 */, + 10 /* SCX_AUX_TABLE_88 */, + 11 /* SCX_AUX_TABLE_89 */, + 8 /* SCX_AUX_TABLE_90 */, + 11 /* SCX_AUX_TABLE_91 */, + 12 /* SCX_AUX_TABLE_92 */, + 9 /* SCX_AUX_TABLE_93 */, + 5 /* SCX_AUX_TABLE_94 */, + 3 /* SCX_AUX_TABLE_95 */, + 6 /* SCX_AUX_TABLE_96 */, 2 /* SCX_AUX_TABLE_97 */, - 3 /* SCX_AUX_TABLE_98 */, - 2 /* SCX_AUX_TABLE_99 */, - 2 /* SCX_AUX_TABLE_100 */, - 2 /* SCX_AUX_TABLE_101 */, - 3 /* SCX_AUX_TABLE_102 */, - 2 /* SCX_AUX_TABLE_103 */, + 2 /* SCX_AUX_TABLE_98 */, + 5 /* SCX_AUX_TABLE_99 */, + 16 /* SCX_AUX_TABLE_100 */, + 15 /* SCX_AUX_TABLE_101 */, + 11 /* SCX_AUX_TABLE_102 */, + 12 /* SCX_AUX_TABLE_103 */, 3 /* SCX_AUX_TABLE_104 */, 2 /* SCX_AUX_TABLE_105 */, - 2 /* SCX_AUX_TABLE_106 */ + 3 /* SCX_AUX_TABLE_106 */, + 2 /* SCX_AUX_TABLE_107 */, + 2 /* SCX_AUX_TABLE_108 */, + 2 /* SCX_AUX_TABLE_109 */, + 3 /* SCX_AUX_TABLE_110 */, + 2 /* SCX_AUX_TABLE_111 */, + 3 /* SCX_AUX_TABLE_112 */, + 2 /* SCX_AUX_TABLE_113 */, + 2 /* SCX_AUX_TABLE_114 */ }; /* This table, indexed by the script enum, gives the zero code point for that @@ -86084,6 +88730,7 @@ static const UV script_zeros[] = { '0', /* Bassa_Vah */ '0', /* Batak */ 0x9e6, /* Bengali */ + '0', /* Beria_Erfe */ 0x11c50, /* Bhaiksuki */ '0', /* Bopomofo */ 0x11066, /* Brahmi */ @@ -86212,6 +88859,7 @@ static const UV script_zeros[] = { 0x111d0, /* Sharada */ '0', /* Shavian */ '0', /* Siddham */ + '0', /* Sidetic */ '0', /* SignWriting */ 0xde6, /* Sinhala */ '0', /* Sogdian */ @@ -86226,6 +88874,7 @@ static const UV script_zeros[] = { 0x1040, /* Tai_Le */ 0, /* Tai_Tham */ '0', /* Tai_Viet */ + '0', /* Tai_Yo */ 0x116c0, /* Takri */ 0xbe6, /* Tamil */ 0x16ac0, /* Tangsa */ @@ -86237,6 +88886,7 @@ static const UV script_zeros[] = { '0', /* Tifinagh */ 0x114d0, /* Tirhuta */ '0', /* Todhri */ + 0x11de0, /* Tolong_Siki */ '0', /* Toto */ 0xce6, /* Tulu_Tigalari */ '0', /* Ugaritic */ @@ -86329,13 +88979,11 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_use_AUX_TABLE_23, SCX_Inherited, SCX_use_AUX_TABLE_24, - SCX_Inherited, SCX_use_AUX_TABLE_25, SCX_use_AUX_TABLE_26, - SCX_use_AUX_TABLE_24, SCX_Inherited, SCX_use_AUX_TABLE_27, - SCX_use_AUX_TABLE_24, + SCX_use_AUX_TABLE_26, SCX_Inherited, SCX_use_AUX_TABLE_28, SCX_use_AUX_TABLE_29, @@ -86437,8 +89085,6 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Arabic, SCX_Unknown, SCX_Arabic, - SCX_Unknown, - SCX_Arabic, SCX_Common, SCX_Arabic, SCX_Devanagari, @@ -86858,6 +89504,8 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Inherited, SCX_Unknown, + SCX_Inherited, + SCX_Unknown, SCX_Balinese, SCX_Unknown, SCX_Balinese, @@ -86885,26 +89533,29 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Devanagari, SCX_use_AUX_TABLE_61, SCX_use_AUX_TABLE_62, - SCX_use_AUX_TABLE_61, - SCX_use_AUX_TABLE_62, SCX_use_AUX_TABLE_63, + SCX_use_AUX_TABLE_64, + SCX_use_AUX_TABLE_65, + SCX_use_AUX_TABLE_66, SCX_Devanagari, - SCX_use_AUX_TABLE_62, + SCX_use_AUX_TABLE_65, SCX_Devanagari, - SCX_use_AUX_TABLE_62, - SCX_use_AUX_TABLE_61, + SCX_use_AUX_TABLE_65, + SCX_use_AUX_TABLE_67, + SCX_use_AUX_TABLE_68, SCX_Devanagari, - SCX_use_AUX_TABLE_64, - SCX_use_AUX_TABLE_61, + SCX_use_AUX_TABLE_69, + SCX_use_AUX_TABLE_70, + SCX_use_AUX_TABLE_71, SCX_Devanagari, - SCX_use_AUX_TABLE_61, + SCX_use_AUX_TABLE_72, SCX_Devanagari, - SCX_use_AUX_TABLE_65, - SCX_use_AUX_TABLE_66, + SCX_use_AUX_TABLE_73, + SCX_use_AUX_TABLE_74, + SCX_use_AUX_TABLE_75, SCX_use_AUX_TABLE_67, - SCX_use_AUX_TABLE_61, SCX_Bengali, - SCX_use_AUX_TABLE_66, + SCX_use_AUX_TABLE_74, SCX_Nandinagari, SCX_Unknown, SCX_Latin, @@ -86919,7 +89570,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Latin, SCX_Greek, SCX_Inherited, - SCX_use_AUX_TABLE_68, + SCX_use_AUX_TABLE_76, SCX_Inherited, SCX_Syriac, SCX_Inherited, @@ -86959,13 +89610,13 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Inherited, SCX_Common, - SCX_use_AUX_TABLE_69, + SCX_use_AUX_TABLE_77, SCX_Common, - SCX_use_AUX_TABLE_70, + SCX_use_AUX_TABLE_78, SCX_Common, - SCX_use_AUX_TABLE_71, + SCX_use_AUX_TABLE_79, SCX_Common, - SCX_use_AUX_TABLE_72, + SCX_use_AUX_TABLE_80, SCX_Common, SCX_Unknown, SCX_Common, @@ -86980,7 +89631,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Unknown, SCX_Inherited, - SCX_use_AUX_TABLE_73, + SCX_use_AUX_TABLE_81, SCX_Unknown, SCX_Common, SCX_Greek, @@ -87003,8 +89654,6 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Unknown, SCX_Common, - SCX_Unknown, - SCX_Common, SCX_Glagolitic, SCX_Latin, SCX_Coptic, @@ -87041,92 +89690,92 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Cyrillic, SCX_Common, - SCX_use_AUX_TABLE_74, + SCX_use_AUX_TABLE_82, SCX_Common, - SCX_use_AUX_TABLE_75, - SCX_use_AUX_TABLE_76, + SCX_use_AUX_TABLE_83, + SCX_use_AUX_TABLE_84, SCX_Common, SCX_Duployan, SCX_Common, - SCX_use_AUX_TABLE_77, + SCX_use_AUX_TABLE_85, SCX_Common, SCX_use_AUX_TABLE_34, SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_79, + SCX_use_AUX_TABLE_87, SCX_Common, - SCX_use_AUX_TABLE_80, - SCX_use_AUX_TABLE_81, - SCX_use_AUX_TABLE_82, + SCX_use_AUX_TABLE_88, + SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_90, SCX_Common, - SCX_use_AUX_TABLE_78, - SCX_use_AUX_TABLE_83, - SCX_use_AUX_TABLE_84, - SCX_use_AUX_TABLE_85, + SCX_use_AUX_TABLE_86, + SCX_use_AUX_TABLE_91, + SCX_use_AUX_TABLE_92, + SCX_use_AUX_TABLE_93, SCX_Common, - SCX_use_AUX_TABLE_82, - SCX_use_AUX_TABLE_85, - SCX_use_AUX_TABLE_82, + SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_93, + SCX_use_AUX_TABLE_90, SCX_Common, - SCX_use_AUX_TABLE_78, SCX_use_AUX_TABLE_86, + SCX_use_AUX_TABLE_94, SCX_use_AUX_TABLE_56, - SCX_use_AUX_TABLE_82, - SCX_use_AUX_TABLE_87, + SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_95, SCX_Common, - SCX_use_AUX_TABLE_82, - SCX_use_AUX_TABLE_78, - SCX_use_AUX_TABLE_88, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_86, + SCX_use_AUX_TABLE_96, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_97, SCX_Unknown, - SCX_use_AUX_TABLE_87, - SCX_use_AUX_TABLE_89, - SCX_use_AUX_TABLE_87, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_85, - SCX_use_AUX_TABLE_87, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_95, + SCX_use_AUX_TABLE_97, + SCX_use_AUX_TABLE_95, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_93, + SCX_use_AUX_TABLE_95, + SCX_use_AUX_TABLE_98, SCX_Unknown, SCX_use_AUX_TABLE_6, SCX_Unknown, SCX_use_AUX_TABLE_56, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_use_AUX_TABLE_6, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_79, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_87, + SCX_use_AUX_TABLE_98, SCX_use_AUX_TABLE_56, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, SCX_use_AUX_TABLE_56, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_78, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_86, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Yi, SCX_Unknown, SCX_Yi, @@ -87139,26 +89788,20 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Cyrillic, SCX_Bamum, SCX_Unknown, - SCX_use_AUX_TABLE_91, + SCX_use_AUX_TABLE_99, SCX_Common, SCX_Latin, SCX_Common, SCX_Latin, SCX_Unknown, SCX_Latin, - SCX_Unknown, - SCX_Latin, - SCX_Unknown, - SCX_Latin, - SCX_Unknown, - SCX_Latin, SCX_Syloti_Nagri, SCX_Unknown, - SCX_use_AUX_TABLE_92, - SCX_use_AUX_TABLE_93, - SCX_use_AUX_TABLE_94, - SCX_use_AUX_TABLE_95, - SCX_use_AUX_TABLE_94, + SCX_use_AUX_TABLE_100, + SCX_use_AUX_TABLE_101, + SCX_use_AUX_TABLE_102, + SCX_use_AUX_TABLE_103, + SCX_use_AUX_TABLE_102, SCX_Unknown, SCX_Phags_Pa, SCX_Unknown, @@ -87167,12 +89810,12 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Saurashtra, SCX_Unknown, SCX_Devanagari, - SCX_use_AUX_TABLE_96, + SCX_use_AUX_TABLE_104, SCX_Devanagari, - SCX_use_AUX_TABLE_97, + SCX_use_AUX_TABLE_105, SCX_Devanagari, SCX_Kayah_Li, - SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_106, SCX_Kayah_Li, SCX_Rejang, SCX_Unknown, @@ -87181,7 +89824,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Javanese, SCX_Unknown, - SCX_use_AUX_TABLE_99, + SCX_use_AUX_TABLE_107, SCX_Javanese, SCX_Unknown, SCX_Javanese, @@ -87228,9 +89871,9 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_use_AUX_TABLE_56, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, SCX_Latin, SCX_Unknown, @@ -87248,19 +89891,13 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Hebrew, SCX_Arabic, - SCX_Unknown, - SCX_Arabic, - SCX_use_AUX_TABLE_100, - SCX_Arabic, - SCX_Unknown, - SCX_Arabic, - SCX_Unknown, + SCX_use_AUX_TABLE_108, SCX_Arabic, SCX_Unknown, SCX_Arabic, - SCX_use_AUX_TABLE_101, + SCX_use_AUX_TABLE_109, SCX_Arabic, - SCX_use_AUX_TABLE_101, + SCX_use_AUX_TABLE_109, SCX_Arabic, SCX_Inherited, SCX_Common, @@ -87268,7 +89905,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Inherited, SCX_Cyrillic, SCX_Common, - SCX_use_AUX_TABLE_82, + SCX_use_AUX_TABLE_90, SCX_Common, SCX_Unknown, SCX_Common, @@ -87286,11 +89923,11 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Latin, SCX_Common, - SCX_use_AUX_TABLE_85, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_87, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_87, + SCX_use_AUX_TABLE_93, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_95, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_95, SCX_use_AUX_TABLE_56, SCX_Unknown, SCX_use_AUX_TABLE_56, @@ -87321,12 +89958,12 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Linear_B, SCX_Unknown, - SCX_use_AUX_TABLE_102, - SCX_use_AUX_TABLE_103, + SCX_use_AUX_TABLE_110, + SCX_use_AUX_TABLE_111, SCX_Unknown, - SCX_use_AUX_TABLE_104, + SCX_use_AUX_TABLE_112, SCX_Unknown, - SCX_use_AUX_TABLE_103, + SCX_use_AUX_TABLE_111, SCX_Greek, SCX_Unknown, SCX_Common, @@ -87340,7 +89977,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Carian, SCX_Unknown, - SCX_use_AUX_TABLE_105, + SCX_use_AUX_TABLE_113, SCX_Unknown, SCX_Old_Italic, SCX_Unknown, @@ -87431,6 +90068,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Lydian, SCX_Unknown, SCX_Lydian, + SCX_Sidetic, SCX_Unknown, SCX_Meroitic_Hieroglyphs, SCX_Meroitic_Cursive, @@ -87460,7 +90098,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Manichaean, SCX_Unknown, SCX_Manichaean, - SCX_use_AUX_TABLE_106, + SCX_use_AUX_TABLE_114, SCX_Manichaean, SCX_Unknown, SCX_Avestan, @@ -87506,6 +90144,8 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Arabic, SCX_Unknown, SCX_Arabic, + SCX_Unknown, + SCX_Arabic, SCX_Old_Sogdian, SCX_Unknown, SCX_Sogdian, @@ -87679,6 +90319,8 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Devanagari, SCX_Unknown, + SCX_Sharada, + SCX_Unknown, SCX_Sunuwar, SCX_Unknown, SCX_Sunuwar, @@ -87723,6 +90365,10 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Gunjala_Gondi, SCX_Unknown, + SCX_Tolong_Siki, + SCX_Unknown, + SCX_Tolong_Siki, + SCX_Unknown, SCX_Makasar, SCX_Unknown, SCX_Kawi, @@ -87787,6 +90433,10 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Medefaidrin, SCX_Unknown, + SCX_Beria_Erfe, + SCX_Unknown, + SCX_Beria_Erfe, + SCX_Unknown, SCX_Miao, SCX_Unknown, SCX_Miao, @@ -87795,12 +90445,10 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Tangut, SCX_Nushu, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Khitan_Small_Script, SCX_Unknown, - SCX_use_AUX_TABLE_78, - SCX_Unknown, - SCX_Tangut, + SCX_use_AUX_TABLE_86, SCX_Unknown, SCX_Tangut, SCX_Khitan_Small_Script, @@ -87808,23 +90456,25 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Khitan_Small_Script, SCX_Tangut, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_Tangut, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_98, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_98, SCX_Unknown, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_89, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_98, SCX_Unknown, - SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_97, + SCX_use_AUX_TABLE_98, SCX_Unknown, - SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_97, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_97, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_98, + SCX_Unknown, + SCX_use_AUX_TABLE_98, SCX_Unknown, SCX_Nushu, SCX_Unknown, @@ -87842,6 +90492,10 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Common, SCX_Unknown, + SCX_Common, + SCX_Unknown, + SCX_Common, + SCX_Unknown, SCX_Inherited, SCX_Unknown, SCX_Inherited, @@ -87870,7 +90524,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, SCX_Unknown, SCX_Common, @@ -87958,6 +90612,12 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Ol_Onal, SCX_Unknown, + SCX_Tai_Yo, + SCX_Unknown, + SCX_Tai_Yo, + SCX_Unknown, + SCX_Tai_Yo, + SCX_Unknown, SCX_Ethiopic, SCX_Unknown, SCX_Ethiopic, @@ -88063,14 +90723,14 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Unknown, SCX_Common, - SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_97, SCX_Common, SCX_Unknown, SCX_Common, SCX_Unknown, SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, SCX_Common, SCX_Unknown, @@ -88122,23 +90782,23 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, SCX_Common, SCX_Unknown, @@ -88160,7 +90820,7 @@ static const SCX_enum _Perl_SCX_invmap[] && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV _Perl_SCX_invlist[] = { /* for EBCDIC 037 */ - 1894, /* Number of elements */ + 1904, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -88240,8 +90900,6 @@ static const UV _Perl_SCX_invlist[] = { 0x312, 0x313, 0x314, - 0x320, - 0x321, 0x323, 0x324, 0x325, @@ -88347,8 +91005,6 @@ static const UV _Perl_SCX_invlist[] = { 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x8E2, @@ -88532,7 +91188,7 @@ static const UV _Perl_SCX_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -88557,7 +91213,7 @@ static const UV _Perl_SCX_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -88769,7 +91425,9 @@ static const UV _Perl_SCX_invlist[] = { 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -88796,6 +91454,7 @@ static const UV _Perl_SCX_invlist[] = { 0x1CD3, 0x1CD4, 0x1CD5, + 0x1CD6, 0x1CD7, 0x1CD8, 0x1CD9, @@ -88806,9 +91465,11 @@ static const UV _Perl_SCX_invlist[] = { 0x1CE0, 0x1CE1, 0x1CE2, + 0x1CE3, 0x1CE9, 0x1CEA, 0x1CEB, + 0x1CEC, 0x1CED, 0x1CEE, 0x1CF2, @@ -88890,7 +91551,7 @@ static const UV _Perl_SCX_invlist[] = { 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F0, 0x20F1, @@ -88915,8 +91576,6 @@ static const UV _Perl_SCX_invlist[] = { 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2C60, 0x2C80, @@ -89056,14 +91715,8 @@ static const UV _Perl_SCX_invlist[] = { 0xA722, 0xA788, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA800, 0xA82D, 0xA830, @@ -89160,14 +91813,8 @@ static const UV _Perl_SCX_invlist[] = { 0xFB45, 0xFB46, 0xFB50, - 0xFBC3, - 0xFBD3, 0xFD3E, 0xFD40, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFDF2, @@ -89344,6 +91991,7 @@ static const UV _Perl_SCX_invlist[] = { 0x1093A, 0x1093F, 0x10940, + 0x1095A, 0x10980, 0x109A0, 0x109B8, @@ -89416,8 +92064,10 @@ static const UV _Perl_SCX_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F00, 0x10F28, 0x10F30, @@ -89591,6 +92241,8 @@ static const UV _Perl_SCX_invlist[] = { 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -89635,6 +92287,10 @@ static const UV _Perl_SCX_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -89699,6 +92355,10 @@ static const UV _Perl_SCX_invlist[] = { 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -89711,15 +92371,15 @@ static const UV _Perl_SCX_invlist[] = { 0x16FE4, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18B00, 0x18CD6, 0x18CFF, 0x18D00, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -89751,9 +92411,13 @@ static const UV _Perl_SCX_invlist[] = { 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -89870,6 +92534,12 @@ static const UV _Perl_SCX_invlist[] = { 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -89987,14 +92657,12 @@ static const UV _Perl_SCX_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -90014,34 +92682,36 @@ static const UV _Perl_SCX_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -90051,7 +92721,7 @@ static const UV _Perl_SCX_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -90086,169 +92756,173 @@ typedef enum { SCX_Bassa_Vah = 9, SCX_Batak = 10, SCX_Bengali = 11, - SCX_Bhaiksuki = 12, - SCX_Bopomofo = 13, - SCX_Brahmi = 14, - SCX_Braille = 15, - SCX_Buginese = 16, - SCX_Buhid = 17, - SCX_Canadian_Aboriginal = 18, - SCX_Carian = 19, - SCX_Caucasian_Albanian = 20, - SCX_Chakma = 21, - SCX_Cham = 22, - SCX_Cherokee = 23, - SCX_Chorasmian = 24, - SCX_Common = 25, - SCX_Coptic = 26, - SCX_Cuneiform = 27, - SCX_Cypriot = 28, - SCX_Cypro_Minoan = 29, - SCX_Cyrillic = 30, - SCX_Deseret = 31, - SCX_Devanagari = 32, - SCX_Dives_Akuru = 33, - SCX_Dogra = 34, - SCX_Duployan = 35, - SCX_Egyptian_Hieroglyphs = 36, - SCX_Elbasan = 37, - SCX_Elymaic = 38, - SCX_Ethiopic = 39, - SCX_Garay = 40, - SCX_Georgian = 41, - SCX_Glagolitic = 42, - SCX_Gothic = 43, - SCX_Grantha = 44, - SCX_Greek = 45, - SCX_Gujarati = 46, - SCX_Gunjala_Gondi = 47, - SCX_Gurmukhi = 48, - SCX_Gurung_Khema = 49, - SCX_Han = 50, - SCX_Hanb = 51, - SCX_Hangul = 52, - SCX_Hanifi_Rohingya = 53, - SCX_Hanunoo = 54, - SCX_Hatran = 55, - SCX_Hebrew = 56, - SCX_Hiragana = 57, - SCX_Imperial_Aramaic = 58, - SCX_Inherited = 59, - SCX_Inscriptional_Pahlavi = 60, - SCX_Inscriptional_Parthian = 61, - SCX_INVALID = 62, - SCX_Javanese = 63, - SCX_Jpan = 64, - SCX_Kaithi = 65, - SCX_Kannada = 66, - SCX_Katakana = 67, - SCX_Kawi = 68, - SCX_Kayah_Li = 69, - SCX_Kharoshthi = 70, - SCX_Khitan_Small_Script = 71, - SCX_Khmer = 72, - SCX_Khojki = 73, - SCX_Khudawadi = 74, - SCX_Kirat_Rai = 75, - SCX_Kore = 76, - SCX_Lao = 77, - SCX_Latin = 78, - SCX_Lepcha = 79, - SCX_Limbu = 80, - SCX_Linear_A = 81, - SCX_Linear_B = 82, - SCX_Lisu = 83, - SCX_Lycian = 84, - SCX_Lydian = 85, - SCX_Mahajani = 86, - SCX_Makasar = 87, - SCX_Malayalam = 88, - SCX_Mandaic = 89, - SCX_Manichaean = 90, - SCX_Marchen = 91, - SCX_Masaram_Gondi = 92, - SCX_Medefaidrin = 93, - SCX_Meetei_Mayek = 94, - SCX_Mende_Kikakui = 95, - SCX_Meroitic_Cursive = 96, - SCX_Meroitic_Hieroglyphs = 97, - SCX_Miao = 98, - SCX_Modi = 99, - SCX_Mongolian = 100, - SCX_Mro = 101, - SCX_Multani = 102, - SCX_Myanmar = 103, - SCX_Nabataean = 104, - SCX_Nag_Mundari = 105, - SCX_Nandinagari = 106, - SCX_New_Tai_Lue = 107, - SCX_Newa = 108, - SCX_Nko = 109, - SCX_Nushu = 110, - SCX_Nyiakeng_Puachue_Hmong = 111, - SCX_Ogham = 112, - SCX_Ol_Chiki = 113, - SCX_Ol_Onal = 114, - SCX_Old_Hungarian = 115, - SCX_Old_Italic = 116, - SCX_Old_North_Arabian = 117, - SCX_Old_Permic = 118, - SCX_Old_Persian = 119, - SCX_Old_Sogdian = 120, - SCX_Old_South_Arabian = 121, - SCX_Old_Turkic = 122, - SCX_Old_Uyghur = 123, - SCX_Oriya = 124, - SCX_Osage = 125, - SCX_Osmanya = 126, - SCX_Pahawh_Hmong = 127, - SCX_Palmyrene = 128, - SCX_Pau_Cin_Hau = 129, - SCX_Phags_Pa = 130, - SCX_Phoenician = 131, - SCX_Psalter_Pahlavi = 132, - SCX_Rejang = 133, - SCX_Runic = 134, - SCX_Samaritan = 135, - SCX_Saurashtra = 136, - SCX_Sharada = 137, - SCX_Shavian = 138, - SCX_Siddham = 139, - SCX_SignWriting = 140, - SCX_Sinhala = 141, - SCX_Sogdian = 142, - SCX_Sora_Sompeng = 143, - SCX_Soyombo = 144, - SCX_Sundanese = 145, - SCX_Sunuwar = 146, - SCX_Syloti_Nagri = 147, - SCX_Syriac = 148, - SCX_Tagalog = 149, - SCX_Tagbanwa = 150, - SCX_Tai_Le = 151, - SCX_Tai_Tham = 152, - SCX_Tai_Viet = 153, - SCX_Takri = 154, - SCX_Tamil = 155, - SCX_Tangsa = 156, - SCX_Tangut = 157, - SCX_Telugu = 158, - SCX_Thaana = 159, - SCX_Thai = 160, - SCX_Tibetan = 161, - SCX_Tifinagh = 162, - SCX_Tirhuta = 163, - SCX_Todhri = 164, - SCX_Toto = 165, - SCX_Tulu_Tigalari = 166, - SCX_Ugaritic = 167, - SCX_Vai = 168, - SCX_Vithkuqi = 169, - SCX_Wancho = 170, - SCX_Warang_Citi = 171, - SCX_Yezidi = 172, - SCX_Yi = 173, - SCX_Zanabazar_Square = 174, + SCX_Beria_Erfe = 12, + SCX_Bhaiksuki = 13, + SCX_Bopomofo = 14, + SCX_Brahmi = 15, + SCX_Braille = 16, + SCX_Buginese = 17, + SCX_Buhid = 18, + SCX_Canadian_Aboriginal = 19, + SCX_Carian = 20, + SCX_Caucasian_Albanian = 21, + SCX_Chakma = 22, + SCX_Cham = 23, + SCX_Cherokee = 24, + SCX_Chorasmian = 25, + SCX_Common = 26, + SCX_Coptic = 27, + SCX_Cuneiform = 28, + SCX_Cypriot = 29, + SCX_Cypro_Minoan = 30, + SCX_Cyrillic = 31, + SCX_Deseret = 32, + SCX_Devanagari = 33, + SCX_Dives_Akuru = 34, + SCX_Dogra = 35, + SCX_Duployan = 36, + SCX_Egyptian_Hieroglyphs = 37, + SCX_Elbasan = 38, + SCX_Elymaic = 39, + SCX_Ethiopic = 40, + SCX_Garay = 41, + SCX_Georgian = 42, + SCX_Glagolitic = 43, + SCX_Gothic = 44, + SCX_Grantha = 45, + SCX_Greek = 46, + SCX_Gujarati = 47, + SCX_Gunjala_Gondi = 48, + SCX_Gurmukhi = 49, + SCX_Gurung_Khema = 50, + SCX_Han = 51, + SCX_Hanb = 52, + SCX_Hangul = 53, + SCX_Hanifi_Rohingya = 54, + SCX_Hanunoo = 55, + SCX_Hatran = 56, + SCX_Hebrew = 57, + SCX_Hiragana = 58, + SCX_Imperial_Aramaic = 59, + SCX_Inherited = 60, + SCX_Inscriptional_Pahlavi = 61, + SCX_Inscriptional_Parthian = 62, + SCX_INVALID = 63, + SCX_Javanese = 64, + SCX_Jpan = 65, + SCX_Kaithi = 66, + SCX_Kannada = 67, + SCX_Katakana = 68, + SCX_Kawi = 69, + SCX_Kayah_Li = 70, + SCX_Kharoshthi = 71, + SCX_Khitan_Small_Script = 72, + SCX_Khmer = 73, + SCX_Khojki = 74, + SCX_Khudawadi = 75, + SCX_Kirat_Rai = 76, + SCX_Kore = 77, + SCX_Lao = 78, + SCX_Latin = 79, + SCX_Lepcha = 80, + SCX_Limbu = 81, + SCX_Linear_A = 82, + SCX_Linear_B = 83, + SCX_Lisu = 84, + SCX_Lycian = 85, + SCX_Lydian = 86, + SCX_Mahajani = 87, + SCX_Makasar = 88, + SCX_Malayalam = 89, + SCX_Mandaic = 90, + SCX_Manichaean = 91, + SCX_Marchen = 92, + SCX_Masaram_Gondi = 93, + SCX_Medefaidrin = 94, + SCX_Meetei_Mayek = 95, + SCX_Mende_Kikakui = 96, + SCX_Meroitic_Cursive = 97, + SCX_Meroitic_Hieroglyphs = 98, + SCX_Miao = 99, + SCX_Modi = 100, + SCX_Mongolian = 101, + SCX_Mro = 102, + SCX_Multani = 103, + SCX_Myanmar = 104, + SCX_Nabataean = 105, + SCX_Nag_Mundari = 106, + SCX_Nandinagari = 107, + SCX_New_Tai_Lue = 108, + SCX_Newa = 109, + SCX_Nko = 110, + SCX_Nushu = 111, + SCX_Nyiakeng_Puachue_Hmong = 112, + SCX_Ogham = 113, + SCX_Ol_Chiki = 114, + SCX_Ol_Onal = 115, + SCX_Old_Hungarian = 116, + SCX_Old_Italic = 117, + SCX_Old_North_Arabian = 118, + SCX_Old_Permic = 119, + SCX_Old_Persian = 120, + SCX_Old_Sogdian = 121, + SCX_Old_South_Arabian = 122, + SCX_Old_Turkic = 123, + SCX_Old_Uyghur = 124, + SCX_Oriya = 125, + SCX_Osage = 126, + SCX_Osmanya = 127, + SCX_Pahawh_Hmong = 128, + SCX_Palmyrene = 129, + SCX_Pau_Cin_Hau = 130, + SCX_Phags_Pa = 131, + SCX_Phoenician = 132, + SCX_Psalter_Pahlavi = 133, + SCX_Rejang = 134, + SCX_Runic = 135, + SCX_Samaritan = 136, + SCX_Saurashtra = 137, + SCX_Sharada = 138, + SCX_Shavian = 139, + SCX_Siddham = 140, + SCX_Sidetic = 141, + SCX_SignWriting = 142, + SCX_Sinhala = 143, + SCX_Sogdian = 144, + SCX_Sora_Sompeng = 145, + SCX_Soyombo = 146, + SCX_Sundanese = 147, + SCX_Sunuwar = 148, + SCX_Syloti_Nagri = 149, + SCX_Syriac = 150, + SCX_Tagalog = 151, + SCX_Tagbanwa = 152, + SCX_Tai_Le = 153, + SCX_Tai_Tham = 154, + SCX_Tai_Viet = 155, + SCX_Tai_Yo = 156, + SCX_Takri = 157, + SCX_Tamil = 158, + SCX_Tangsa = 159, + SCX_Tangut = 160, + SCX_Telugu = 161, + SCX_Thaana = 162, + SCX_Thai = 163, + SCX_Tibetan = 164, + SCX_Tifinagh = 165, + SCX_Tirhuta = 166, + SCX_Todhri = 167, + SCX_Tolong_Siki = 168, + SCX_Toto = 169, + SCX_Tulu_Tigalari = 170, + SCX_Ugaritic = 171, + SCX_Vai = 172, + SCX_Vithkuqi = 173, + SCX_Wancho = 174, + SCX_Warang_Citi = 175, + SCX_Yezidi = 176, + SCX_Yi = 177, + SCX_Zanabazar_Square = 178, SCX_use_AUX_TABLE_1 = -1, SCX_use_AUX_TABLE_2 = -2, SCX_use_AUX_TABLE_3 = -3, @@ -90354,7 +93028,15 @@ typedef enum { SCX_use_AUX_TABLE_103 = -103, SCX_use_AUX_TABLE_104 = -104, SCX_use_AUX_TABLE_105 = -105, - SCX_use_AUX_TABLE_106 = -106 + SCX_use_AUX_TABLE_106 = -106, + SCX_use_AUX_TABLE_107 = -107, + SCX_use_AUX_TABLE_108 = -108, + SCX_use_AUX_TABLE_109 = -109, + SCX_use_AUX_TABLE_110 = -110, + SCX_use_AUX_TABLE_111 = -111, + SCX_use_AUX_TABLE_112 = -112, + SCX_use_AUX_TABLE_113 = -113, + SCX_use_AUX_TABLE_114 = -114 } SCX_enum; # endif /* EBCDIC 037 */ @@ -90486,7 +93168,8 @@ static const SCX_enum SCX_AUX_TABLE_13[] SCX_Cyrillic, SCX_Greek, SCX_Latin, - SCX_Old_Permic + SCX_Old_Permic, + SCX_Tifinagh }; static const SCX_enum SCX_AUX_TABLE_14[] = { @@ -90511,7 +93194,8 @@ static const SCX_enum SCX_AUX_TABLE_15[] SCX_Latin, SCX_Old_Permic, SCX_Syriac, - SCX_Tai_Le + SCX_Tai_Le, + SCX_Tifinagh }; static const SCX_enum SCX_AUX_TABLE_16[] = { @@ -90562,22 +93246,23 @@ static const SCX_enum SCX_AUX_TABLE_23[] }; static const SCX_enum SCX_AUX_TABLE_24[] = { + SCX_Cherokee, + SCX_Duployan, + SCX_Jpan, + SCX_Katakana, SCX_Latin, - SCX_Syriac + SCX_Syriac, + SCX_Tifinagh }; static const SCX_enum SCX_AUX_TABLE_25[] = { SCX_Cherokee, SCX_Duployan, - SCX_Jpan, - SCX_Katakana, SCX_Latin, SCX_Syriac }; static const SCX_enum SCX_AUX_TABLE_26[] = { - SCX_Cherokee, - SCX_Duployan, SCX_Latin, SCX_Syriac }; @@ -90600,6 +93285,7 @@ static const SCX_enum SCX_AUX_TABLE_29[] SCX_Gothic, SCX_Latin, SCX_Sunuwar, + SCX_Syriac, SCX_Thai }; @@ -90704,6 +93390,8 @@ static const SCX_enum SCX_AUX_TABLE_44[] SCX_Kannada, SCX_Latin, SCX_Malayalam, + SCX_Nandinagari, + SCX_Newa, SCX_Oriya, SCX_Sharada, SCX_Tamil, @@ -90720,6 +93408,7 @@ static const SCX_enum SCX_AUX_TABLE_45[] SCX_Kannada, SCX_Latin, SCX_Malayalam, + SCX_Newa, SCX_Oriya, SCX_Tamil, SCX_Telugu, @@ -90854,16 +93543,38 @@ static const SCX_enum SCX_AUX_TABLE_60[] static const SCX_enum SCX_AUX_TABLE_61[] = { SCX_Bengali, - SCX_Devanagari + SCX_Devanagari, + SCX_Newa, + SCX_Telugu, + SCX_Tirhuta }; static const SCX_enum SCX_AUX_TABLE_62[] = { + SCX_Bengali, SCX_Devanagari, - SCX_Sharada + SCX_Telugu }; static const SCX_enum SCX_AUX_TABLE_63[] = { SCX_Devanagari, + SCX_Newa, + SCX_Sharada +}; + +static const SCX_enum SCX_AUX_TABLE_64[] = { + SCX_Bengali, + SCX_Devanagari, + SCX_Newa, + SCX_Telugu +}; + +static const SCX_enum SCX_AUX_TABLE_65[] = { + SCX_Devanagari, + SCX_Sharada +}; + +static const SCX_enum SCX_AUX_TABLE_66[] = { + SCX_Devanagari, SCX_Kannada, SCX_Malayalam, SCX_Oriya, @@ -90871,12 +93582,42 @@ static const SCX_enum SCX_AUX_TABLE_63[] SCX_Telugu }; -static const SCX_enum SCX_AUX_TABLE_64[] = { +static const SCX_enum SCX_AUX_TABLE_67[] = { + SCX_Bengali, + SCX_Devanagari +}; + +static const SCX_enum SCX_AUX_TABLE_68[] = { SCX_Devanagari, - SCX_Nandinagari + SCX_Newa, + SCX_Tirhuta }; -static const SCX_enum SCX_AUX_TABLE_65[] = { +static const SCX_enum SCX_AUX_TABLE_69[] = { + SCX_Devanagari, + SCX_Nandinagari, + SCX_Newa +}; + +static const SCX_enum SCX_AUX_TABLE_70[] = { + SCX_Bengali, + SCX_Devanagari, + SCX_Sharada +}; + +static const SCX_enum SCX_AUX_TABLE_71[] = { + SCX_Devanagari, + SCX_Newa +}; + +static const SCX_enum SCX_AUX_TABLE_72[] = { + SCX_Bengali, + SCX_Devanagari, + SCX_Newa, + SCX_Sharada +}; + +static const SCX_enum SCX_AUX_TABLE_73[] = { SCX_Bengali, SCX_Devanagari, SCX_Grantha, @@ -90890,36 +93631,36 @@ static const SCX_enum SCX_AUX_TABLE_65[] SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_66[] = { +static const SCX_enum SCX_AUX_TABLE_74[] = { SCX_Devanagari, SCX_Grantha }; -static const SCX_enum SCX_AUX_TABLE_67[] = { +static const SCX_enum SCX_AUX_TABLE_75[] = { SCX_Devanagari, SCX_Grantha, SCX_Kannada, SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_68[] = { +static const SCX_enum SCX_AUX_TABLE_76[] = { SCX_Cyrillic, SCX_Latin, SCX_Syriac }; -static const SCX_enum SCX_AUX_TABLE_69[] = { +static const SCX_enum SCX_AUX_TABLE_77[] = { SCX_Latin, SCX_Mongolian, SCX_Phags_Pa }; -static const SCX_enum SCX_AUX_TABLE_70[] = { +static const SCX_enum SCX_AUX_TABLE_78[] = { SCX_Adlam, SCX_Arabic }; -static const SCX_enum SCX_AUX_TABLE_71[] = { +static const SCX_enum SCX_AUX_TABLE_79[] = { SCX_Carian, SCX_Georgian, SCX_Glagolitic, @@ -90928,30 +93669,30 @@ static const SCX_enum SCX_AUX_TABLE_71[] SCX_Old_Turkic }; -static const SCX_enum SCX_AUX_TABLE_72[] = { +static const SCX_enum SCX_AUX_TABLE_80[] = { SCX_Carian, SCX_Greek, SCX_Meroitic_Hieroglyphs, SCX_Old_Hungarian }; -static const SCX_enum SCX_AUX_TABLE_73[] = { +static const SCX_enum SCX_AUX_TABLE_81[] = { SCX_Devanagari, SCX_Grantha, SCX_Latin }; -static const SCX_enum SCX_AUX_TABLE_74[] = { +static const SCX_enum SCX_AUX_TABLE_82[] = { SCX_Coptic, SCX_Latin }; -static const SCX_enum SCX_AUX_TABLE_75[] = { +static const SCX_enum SCX_AUX_TABLE_83[] = { SCX_Avestan, SCX_Old_Turkic }; -static const SCX_enum SCX_AUX_TABLE_76[] = { +static const SCX_enum SCX_AUX_TABLE_84[] = { SCX_Avestan, SCX_Carian, SCX_Georgian, @@ -90961,20 +93702,20 @@ static const SCX_enum SCX_AUX_TABLE_76[] SCX_Samaritan }; -static const SCX_enum SCX_AUX_TABLE_77[] = { +static const SCX_enum SCX_AUX_TABLE_85[] = { SCX_Adlam, SCX_Arabic, SCX_Old_Hungarian }; -static const SCX_enum SCX_AUX_TABLE_78[] = { +static const SCX_enum SCX_AUX_TABLE_86[] = { SCX_Han, SCX_Hanb, SCX_Jpan, SCX_Kore }; -static const SCX_enum SCX_AUX_TABLE_79[] = { +static const SCX_enum SCX_AUX_TABLE_87[] = { SCX_Han, SCX_Hanb, SCX_Jpan, @@ -90982,7 +93723,7 @@ static const SCX_enum SCX_AUX_TABLE_79[] SCX_Tangut }; -static const SCX_enum SCX_AUX_TABLE_80[] = { +static const SCX_enum SCX_AUX_TABLE_88[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -90995,7 +93736,7 @@ static const SCX_enum SCX_AUX_TABLE_80[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_81[] = { +static const SCX_enum SCX_AUX_TABLE_89[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -91009,7 +93750,7 @@ static const SCX_enum SCX_AUX_TABLE_81[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_82[] = { +static const SCX_enum SCX_AUX_TABLE_90[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -91020,7 +93761,7 @@ static const SCX_enum SCX_AUX_TABLE_82[] SCX_Kore }; -static const SCX_enum SCX_AUX_TABLE_83[] = { +static const SCX_enum SCX_AUX_TABLE_91[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -91034,7 +93775,7 @@ static const SCX_enum SCX_AUX_TABLE_83[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_84[] = { +static const SCX_enum SCX_AUX_TABLE_92[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -91049,7 +93790,7 @@ static const SCX_enum SCX_AUX_TABLE_84[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_85[] = { +static const SCX_enum SCX_AUX_TABLE_93[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -91061,7 +93802,7 @@ static const SCX_enum SCX_AUX_TABLE_85[] SCX_Yi }; -static const SCX_enum SCX_AUX_TABLE_86[] = { +static const SCX_enum SCX_AUX_TABLE_94[] = { SCX_Bopomofo, SCX_Han, SCX_Hanb, @@ -91069,13 +93810,13 @@ static const SCX_enum SCX_AUX_TABLE_86[] SCX_Kore }; -static const SCX_enum SCX_AUX_TABLE_87[] = { +static const SCX_enum SCX_AUX_TABLE_95[] = { SCX_Hiragana, SCX_Jpan, SCX_Katakana }; -static const SCX_enum SCX_AUX_TABLE_88[] = { +static const SCX_enum SCX_AUX_TABLE_96[] = { SCX_Han, SCX_Hanb, SCX_Hiragana, @@ -91084,17 +93825,17 @@ static const SCX_enum SCX_AUX_TABLE_88[] SCX_Kore }; -static const SCX_enum SCX_AUX_TABLE_89[] = { +static const SCX_enum SCX_AUX_TABLE_97[] = { SCX_Hiragana, SCX_Jpan }; -static const SCX_enum SCX_AUX_TABLE_90[] = { +static const SCX_enum SCX_AUX_TABLE_98[] = { SCX_Jpan, SCX_Katakana }; -static const SCX_enum SCX_AUX_TABLE_91[] = { +static const SCX_enum SCX_AUX_TABLE_99[] = { SCX_Han, SCX_Hanb, SCX_Jpan, @@ -91102,7 +93843,7 @@ static const SCX_enum SCX_AUX_TABLE_91[] SCX_Latin }; -static const SCX_enum SCX_AUX_TABLE_92[] = { +static const SCX_enum SCX_AUX_TABLE_100[] = { SCX_Devanagari, SCX_Dogra, SCX_Gujarati, @@ -91121,7 +93862,7 @@ static const SCX_enum SCX_AUX_TABLE_92[] SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_93[] = { +static const SCX_enum SCX_AUX_TABLE_101[] = { SCX_Devanagari, SCX_Dogra, SCX_Gujarati, @@ -91139,7 +93880,7 @@ static const SCX_enum SCX_AUX_TABLE_93[] SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_94[] = { +static const SCX_enum SCX_AUX_TABLE_102[] = { SCX_Devanagari, SCX_Dogra, SCX_Gujarati, @@ -91153,7 +93894,7 @@ static const SCX_enum SCX_AUX_TABLE_94[] SCX_Tirhuta }; -static const SCX_enum SCX_AUX_TABLE_95[] = { +static const SCX_enum SCX_AUX_TABLE_103[] = { SCX_Devanagari, SCX_Dogra, SCX_Gujarati, @@ -91168,61 +93909,61 @@ static const SCX_enum SCX_AUX_TABLE_95[] SCX_Tirhuta }; -static const SCX_enum SCX_AUX_TABLE_96[] = { +static const SCX_enum SCX_AUX_TABLE_104[] = { SCX_Bengali, SCX_Devanagari, SCX_Tulu_Tigalari }; -static const SCX_enum SCX_AUX_TABLE_97[] = { +static const SCX_enum SCX_AUX_TABLE_105[] = { SCX_Devanagari, SCX_Tamil }; -static const SCX_enum SCX_AUX_TABLE_98[] = { +static const SCX_enum SCX_AUX_TABLE_106[] = { SCX_Kayah_Li, SCX_Latin, SCX_Myanmar }; -static const SCX_enum SCX_AUX_TABLE_99[] = { +static const SCX_enum SCX_AUX_TABLE_107[] = { SCX_Buginese, SCX_Javanese }; -static const SCX_enum SCX_AUX_TABLE_100[] = { +static const SCX_enum SCX_AUX_TABLE_108[] = { SCX_Arabic, SCX_Nko }; -static const SCX_enum SCX_AUX_TABLE_101[] = { +static const SCX_enum SCX_AUX_TABLE_109[] = { SCX_Arabic, SCX_Thaana }; -static const SCX_enum SCX_AUX_TABLE_102[] = { +static const SCX_enum SCX_AUX_TABLE_110[] = { SCX_Cypriot, SCX_Cypro_Minoan, SCX_Linear_B }; -static const SCX_enum SCX_AUX_TABLE_103[] = { +static const SCX_enum SCX_AUX_TABLE_111[] = { SCX_Cypriot, SCX_Linear_B }; -static const SCX_enum SCX_AUX_TABLE_104[] = { +static const SCX_enum SCX_AUX_TABLE_112[] = { SCX_Cypriot, SCX_Linear_A, SCX_Linear_B }; -static const SCX_enum SCX_AUX_TABLE_105[] = { +static const SCX_enum SCX_AUX_TABLE_113[] = { SCX_Arabic, SCX_Coptic }; -static const SCX_enum SCX_AUX_TABLE_106[] = { +static const SCX_enum SCX_AUX_TABLE_114[] = { SCX_Manichaean, SCX_Old_Uyghur }; @@ -91334,7 +94075,15 @@ static const SCX_enum * const SCX_AUX_TA SCX_AUX_TABLE_103, SCX_AUX_TABLE_104, SCX_AUX_TABLE_105, - SCX_AUX_TABLE_106 + SCX_AUX_TABLE_106, + SCX_AUX_TABLE_107, + SCX_AUX_TABLE_108, + SCX_AUX_TABLE_109, + SCX_AUX_TABLE_110, + SCX_AUX_TABLE_111, + SCX_AUX_TABLE_112, + SCX_AUX_TABLE_113, + SCX_AUX_TABLE_114 }; /* Parallel table to the above, giving the number of elements in each table @@ -91354,9 +94103,9 @@ static const U8 SCX_AUX_TABLE_lengths[] 5 /* SCX_AUX_TABLE_10 */, 11 /* SCX_AUX_TABLE_11 */, 7 /* SCX_AUX_TABLE_12 */, - 4 /* SCX_AUX_TABLE_13 */, + 5 /* SCX_AUX_TABLE_13 */, 9 /* SCX_AUX_TABLE_14 */, - 10 /* SCX_AUX_TABLE_15 */, + 11 /* SCX_AUX_TABLE_15 */, 2 /* SCX_AUX_TABLE_16 */, 3 /* SCX_AUX_TABLE_17 */, 4 /* SCX_AUX_TABLE_18 */, @@ -91365,12 +94114,12 @@ static const U8 SCX_AUX_TABLE_lengths[] 2 /* SCX_AUX_TABLE_21 */, 3 /* SCX_AUX_TABLE_22 */, 4 /* SCX_AUX_TABLE_23 */, - 2 /* SCX_AUX_TABLE_24 */, - 6 /* SCX_AUX_TABLE_25 */, - 4 /* SCX_AUX_TABLE_26 */, + 7 /* SCX_AUX_TABLE_24 */, + 4 /* SCX_AUX_TABLE_25 */, + 2 /* SCX_AUX_TABLE_26 */, 3 /* SCX_AUX_TABLE_27 */, 3 /* SCX_AUX_TABLE_28 */, - 6 /* SCX_AUX_TABLE_29 */, + 7 /* SCX_AUX_TABLE_29 */, 2 /* SCX_AUX_TABLE_30 */, 3 /* SCX_AUX_TABLE_31 */, 2 /* SCX_AUX_TABLE_32 */, @@ -91385,8 +94134,8 @@ static const U8 SCX_AUX_TABLE_lengths[] 2 /* SCX_AUX_TABLE_41 */, 3 /* SCX_AUX_TABLE_42 */, 2 /* SCX_AUX_TABLE_43 */, - 13 /* SCX_AUX_TABLE_44 */, - 12 /* SCX_AUX_TABLE_45 */, + 15 /* SCX_AUX_TABLE_44 */, + 13 /* SCX_AUX_TABLE_45 */, 21 /* SCX_AUX_TABLE_46 */, 23 /* SCX_AUX_TABLE_47 */, 4 /* SCX_AUX_TABLE_48 */, @@ -91402,52 +94151,60 @@ static const U8 SCX_AUX_TABLE_lengths[] 2 /* SCX_AUX_TABLE_58 */, 4 /* SCX_AUX_TABLE_59 */, 3 /* SCX_AUX_TABLE_60 */, - 2 /* SCX_AUX_TABLE_61 */, - 2 /* SCX_AUX_TABLE_62 */, - 6 /* SCX_AUX_TABLE_63 */, - 2 /* SCX_AUX_TABLE_64 */, - 11 /* SCX_AUX_TABLE_65 */, - 2 /* SCX_AUX_TABLE_66 */, - 4 /* SCX_AUX_TABLE_67 */, + 5 /* SCX_AUX_TABLE_61 */, + 3 /* SCX_AUX_TABLE_62 */, + 3 /* SCX_AUX_TABLE_63 */, + 4 /* SCX_AUX_TABLE_64 */, + 2 /* SCX_AUX_TABLE_65 */, + 6 /* SCX_AUX_TABLE_66 */, + 2 /* SCX_AUX_TABLE_67 */, 3 /* SCX_AUX_TABLE_68 */, 3 /* SCX_AUX_TABLE_69 */, - 2 /* SCX_AUX_TABLE_70 */, - 6 /* SCX_AUX_TABLE_71 */, + 3 /* SCX_AUX_TABLE_70 */, + 2 /* SCX_AUX_TABLE_71 */, 4 /* SCX_AUX_TABLE_72 */, - 3 /* SCX_AUX_TABLE_73 */, + 11 /* SCX_AUX_TABLE_73 */, 2 /* SCX_AUX_TABLE_74 */, - 2 /* SCX_AUX_TABLE_75 */, - 7 /* SCX_AUX_TABLE_76 */, + 4 /* SCX_AUX_TABLE_75 */, + 3 /* SCX_AUX_TABLE_76 */, 3 /* SCX_AUX_TABLE_77 */, - 4 /* SCX_AUX_TABLE_78 */, - 5 /* SCX_AUX_TABLE_79 */, - 10 /* SCX_AUX_TABLE_80 */, - 11 /* SCX_AUX_TABLE_81 */, - 8 /* SCX_AUX_TABLE_82 */, - 11 /* SCX_AUX_TABLE_83 */, - 12 /* SCX_AUX_TABLE_84 */, - 9 /* SCX_AUX_TABLE_85 */, - 5 /* SCX_AUX_TABLE_86 */, - 3 /* SCX_AUX_TABLE_87 */, - 6 /* SCX_AUX_TABLE_88 */, - 2 /* SCX_AUX_TABLE_89 */, - 2 /* SCX_AUX_TABLE_90 */, - 5 /* SCX_AUX_TABLE_91 */, - 16 /* SCX_AUX_TABLE_92 */, - 15 /* SCX_AUX_TABLE_93 */, - 11 /* SCX_AUX_TABLE_94 */, - 12 /* SCX_AUX_TABLE_95 */, - 3 /* SCX_AUX_TABLE_96 */, + 2 /* SCX_AUX_TABLE_78 */, + 6 /* SCX_AUX_TABLE_79 */, + 4 /* SCX_AUX_TABLE_80 */, + 3 /* SCX_AUX_TABLE_81 */, + 2 /* SCX_AUX_TABLE_82 */, + 2 /* SCX_AUX_TABLE_83 */, + 7 /* SCX_AUX_TABLE_84 */, + 3 /* SCX_AUX_TABLE_85 */, + 4 /* SCX_AUX_TABLE_86 */, + 5 /* SCX_AUX_TABLE_87 */, + 10 /* SCX_AUX_TABLE_88 */, + 11 /* SCX_AUX_TABLE_89 */, + 8 /* SCX_AUX_TABLE_90 */, + 11 /* SCX_AUX_TABLE_91 */, + 12 /* SCX_AUX_TABLE_92 */, + 9 /* SCX_AUX_TABLE_93 */, + 5 /* SCX_AUX_TABLE_94 */, + 3 /* SCX_AUX_TABLE_95 */, + 6 /* SCX_AUX_TABLE_96 */, 2 /* SCX_AUX_TABLE_97 */, - 3 /* SCX_AUX_TABLE_98 */, - 2 /* SCX_AUX_TABLE_99 */, - 2 /* SCX_AUX_TABLE_100 */, - 2 /* SCX_AUX_TABLE_101 */, - 3 /* SCX_AUX_TABLE_102 */, - 2 /* SCX_AUX_TABLE_103 */, + 2 /* SCX_AUX_TABLE_98 */, + 5 /* SCX_AUX_TABLE_99 */, + 16 /* SCX_AUX_TABLE_100 */, + 15 /* SCX_AUX_TABLE_101 */, + 11 /* SCX_AUX_TABLE_102 */, + 12 /* SCX_AUX_TABLE_103 */, 3 /* SCX_AUX_TABLE_104 */, 2 /* SCX_AUX_TABLE_105 */, - 2 /* SCX_AUX_TABLE_106 */ + 3 /* SCX_AUX_TABLE_106 */, + 2 /* SCX_AUX_TABLE_107 */, + 2 /* SCX_AUX_TABLE_108 */, + 2 /* SCX_AUX_TABLE_109 */, + 3 /* SCX_AUX_TABLE_110 */, + 2 /* SCX_AUX_TABLE_111 */, + 3 /* SCX_AUX_TABLE_112 */, + 2 /* SCX_AUX_TABLE_113 */, + 2 /* SCX_AUX_TABLE_114 */ }; /* This table, indexed by the script enum, gives the zero code point for that @@ -91467,6 +94224,7 @@ static const UV script_zeros[] = { '0', /* Bassa_Vah */ '0', /* Batak */ 0x9e6, /* Bengali */ + '0', /* Beria_Erfe */ 0x11c50, /* Bhaiksuki */ '0', /* Bopomofo */ 0x11066, /* Brahmi */ @@ -91595,6 +94353,7 @@ static const UV script_zeros[] = { 0x111d0, /* Sharada */ '0', /* Shavian */ '0', /* Siddham */ + '0', /* Sidetic */ '0', /* SignWriting */ 0xde6, /* Sinhala */ '0', /* Sogdian */ @@ -91609,6 +94368,7 @@ static const UV script_zeros[] = { 0x1040, /* Tai_Le */ 0, /* Tai_Tham */ '0', /* Tai_Viet */ + '0', /* Tai_Yo */ 0x116c0, /* Takri */ 0xbe6, /* Tamil */ 0x16ac0, /* Tangsa */ @@ -91620,6 +94380,7 @@ static const UV script_zeros[] = { '0', /* Tifinagh */ 0x114d0, /* Tirhuta */ '0', /* Todhri */ + 0x11de0, /* Tolong_Siki */ '0', /* Toto */ 0xce6, /* Tulu_Tigalari */ '0', /* Ugaritic */ @@ -91708,13 +94469,11 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_use_AUX_TABLE_23, SCX_Inherited, SCX_use_AUX_TABLE_24, - SCX_Inherited, SCX_use_AUX_TABLE_25, SCX_use_AUX_TABLE_26, - SCX_use_AUX_TABLE_24, SCX_Inherited, SCX_use_AUX_TABLE_27, - SCX_use_AUX_TABLE_24, + SCX_use_AUX_TABLE_26, SCX_Inherited, SCX_use_AUX_TABLE_28, SCX_use_AUX_TABLE_29, @@ -91816,8 +94575,6 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Arabic, SCX_Unknown, SCX_Arabic, - SCX_Unknown, - SCX_Arabic, SCX_Common, SCX_Arabic, SCX_Devanagari, @@ -92237,6 +94994,8 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Inherited, SCX_Unknown, + SCX_Inherited, + SCX_Unknown, SCX_Balinese, SCX_Unknown, SCX_Balinese, @@ -92264,26 +95023,29 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Devanagari, SCX_use_AUX_TABLE_61, SCX_use_AUX_TABLE_62, - SCX_use_AUX_TABLE_61, - SCX_use_AUX_TABLE_62, SCX_use_AUX_TABLE_63, + SCX_use_AUX_TABLE_64, + SCX_use_AUX_TABLE_65, + SCX_use_AUX_TABLE_66, SCX_Devanagari, - SCX_use_AUX_TABLE_62, + SCX_use_AUX_TABLE_65, SCX_Devanagari, - SCX_use_AUX_TABLE_62, - SCX_use_AUX_TABLE_61, + SCX_use_AUX_TABLE_65, + SCX_use_AUX_TABLE_67, + SCX_use_AUX_TABLE_68, SCX_Devanagari, - SCX_use_AUX_TABLE_64, - SCX_use_AUX_TABLE_61, + SCX_use_AUX_TABLE_69, + SCX_use_AUX_TABLE_70, + SCX_use_AUX_TABLE_71, SCX_Devanagari, - SCX_use_AUX_TABLE_61, + SCX_use_AUX_TABLE_72, SCX_Devanagari, - SCX_use_AUX_TABLE_65, - SCX_use_AUX_TABLE_66, + SCX_use_AUX_TABLE_73, + SCX_use_AUX_TABLE_74, + SCX_use_AUX_TABLE_75, SCX_use_AUX_TABLE_67, - SCX_use_AUX_TABLE_61, SCX_Bengali, - SCX_use_AUX_TABLE_66, + SCX_use_AUX_TABLE_74, SCX_Nandinagari, SCX_Unknown, SCX_Latin, @@ -92298,7 +95060,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Latin, SCX_Greek, SCX_Inherited, - SCX_use_AUX_TABLE_68, + SCX_use_AUX_TABLE_76, SCX_Inherited, SCX_Syriac, SCX_Inherited, @@ -92338,13 +95100,13 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Inherited, SCX_Common, - SCX_use_AUX_TABLE_69, + SCX_use_AUX_TABLE_77, SCX_Common, - SCX_use_AUX_TABLE_70, + SCX_use_AUX_TABLE_78, SCX_Common, - SCX_use_AUX_TABLE_71, + SCX_use_AUX_TABLE_79, SCX_Common, - SCX_use_AUX_TABLE_72, + SCX_use_AUX_TABLE_80, SCX_Common, SCX_Unknown, SCX_Common, @@ -92359,7 +95121,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Unknown, SCX_Inherited, - SCX_use_AUX_TABLE_73, + SCX_use_AUX_TABLE_81, SCX_Unknown, SCX_Common, SCX_Greek, @@ -92382,8 +95144,6 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Unknown, SCX_Common, - SCX_Unknown, - SCX_Common, SCX_Glagolitic, SCX_Latin, SCX_Coptic, @@ -92420,92 +95180,92 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Cyrillic, SCX_Common, - SCX_use_AUX_TABLE_74, + SCX_use_AUX_TABLE_82, SCX_Common, - SCX_use_AUX_TABLE_75, - SCX_use_AUX_TABLE_76, + SCX_use_AUX_TABLE_83, + SCX_use_AUX_TABLE_84, SCX_Common, SCX_Duployan, SCX_Common, - SCX_use_AUX_TABLE_77, + SCX_use_AUX_TABLE_85, SCX_Common, SCX_use_AUX_TABLE_34, SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_79, + SCX_use_AUX_TABLE_87, SCX_Common, - SCX_use_AUX_TABLE_80, - SCX_use_AUX_TABLE_81, - SCX_use_AUX_TABLE_82, + SCX_use_AUX_TABLE_88, + SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_90, SCX_Common, - SCX_use_AUX_TABLE_78, - SCX_use_AUX_TABLE_83, - SCX_use_AUX_TABLE_84, - SCX_use_AUX_TABLE_85, + SCX_use_AUX_TABLE_86, + SCX_use_AUX_TABLE_91, + SCX_use_AUX_TABLE_92, + SCX_use_AUX_TABLE_93, SCX_Common, - SCX_use_AUX_TABLE_82, - SCX_use_AUX_TABLE_85, - SCX_use_AUX_TABLE_82, + SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_93, + SCX_use_AUX_TABLE_90, SCX_Common, - SCX_use_AUX_TABLE_78, SCX_use_AUX_TABLE_86, + SCX_use_AUX_TABLE_94, SCX_use_AUX_TABLE_56, - SCX_use_AUX_TABLE_82, - SCX_use_AUX_TABLE_87, + SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_95, SCX_Common, - SCX_use_AUX_TABLE_82, - SCX_use_AUX_TABLE_78, - SCX_use_AUX_TABLE_88, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_86, + SCX_use_AUX_TABLE_96, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_97, SCX_Unknown, - SCX_use_AUX_TABLE_87, - SCX_use_AUX_TABLE_89, - SCX_use_AUX_TABLE_87, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_85, - SCX_use_AUX_TABLE_87, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_95, + SCX_use_AUX_TABLE_97, + SCX_use_AUX_TABLE_95, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_93, + SCX_use_AUX_TABLE_95, + SCX_use_AUX_TABLE_98, SCX_Unknown, SCX_use_AUX_TABLE_6, SCX_Unknown, SCX_use_AUX_TABLE_56, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_use_AUX_TABLE_6, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_79, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_87, + SCX_use_AUX_TABLE_98, SCX_use_AUX_TABLE_56, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, SCX_use_AUX_TABLE_56, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_78, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_86, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Yi, SCX_Unknown, SCX_Yi, @@ -92518,26 +95278,20 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Cyrillic, SCX_Bamum, SCX_Unknown, - SCX_use_AUX_TABLE_91, + SCX_use_AUX_TABLE_99, SCX_Common, SCX_Latin, SCX_Common, SCX_Latin, SCX_Unknown, SCX_Latin, - SCX_Unknown, - SCX_Latin, - SCX_Unknown, - SCX_Latin, - SCX_Unknown, - SCX_Latin, SCX_Syloti_Nagri, SCX_Unknown, - SCX_use_AUX_TABLE_92, - SCX_use_AUX_TABLE_93, - SCX_use_AUX_TABLE_94, - SCX_use_AUX_TABLE_95, - SCX_use_AUX_TABLE_94, + SCX_use_AUX_TABLE_100, + SCX_use_AUX_TABLE_101, + SCX_use_AUX_TABLE_102, + SCX_use_AUX_TABLE_103, + SCX_use_AUX_TABLE_102, SCX_Unknown, SCX_Phags_Pa, SCX_Unknown, @@ -92546,12 +95300,12 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Saurashtra, SCX_Unknown, SCX_Devanagari, - SCX_use_AUX_TABLE_96, + SCX_use_AUX_TABLE_104, SCX_Devanagari, - SCX_use_AUX_TABLE_97, + SCX_use_AUX_TABLE_105, SCX_Devanagari, SCX_Kayah_Li, - SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_106, SCX_Kayah_Li, SCX_Rejang, SCX_Unknown, @@ -92560,7 +95314,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Javanese, SCX_Unknown, - SCX_use_AUX_TABLE_99, + SCX_use_AUX_TABLE_107, SCX_Javanese, SCX_Unknown, SCX_Javanese, @@ -92607,9 +95361,9 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_use_AUX_TABLE_56, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, SCX_Latin, SCX_Unknown, @@ -92627,19 +95381,13 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Hebrew, SCX_Arabic, - SCX_Unknown, - SCX_Arabic, - SCX_use_AUX_TABLE_100, - SCX_Arabic, - SCX_Unknown, - SCX_Arabic, - SCX_Unknown, + SCX_use_AUX_TABLE_108, SCX_Arabic, SCX_Unknown, SCX_Arabic, - SCX_use_AUX_TABLE_101, + SCX_use_AUX_TABLE_109, SCX_Arabic, - SCX_use_AUX_TABLE_101, + SCX_use_AUX_TABLE_109, SCX_Arabic, SCX_Inherited, SCX_Common, @@ -92647,7 +95395,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Inherited, SCX_Cyrillic, SCX_Common, - SCX_use_AUX_TABLE_82, + SCX_use_AUX_TABLE_90, SCX_Common, SCX_Unknown, SCX_Common, @@ -92665,11 +95413,11 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Latin, SCX_Common, - SCX_use_AUX_TABLE_85, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_87, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_87, + SCX_use_AUX_TABLE_93, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_95, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_95, SCX_use_AUX_TABLE_56, SCX_Unknown, SCX_use_AUX_TABLE_56, @@ -92700,12 +95448,12 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Linear_B, SCX_Unknown, - SCX_use_AUX_TABLE_102, - SCX_use_AUX_TABLE_103, + SCX_use_AUX_TABLE_110, + SCX_use_AUX_TABLE_111, SCX_Unknown, - SCX_use_AUX_TABLE_104, + SCX_use_AUX_TABLE_112, SCX_Unknown, - SCX_use_AUX_TABLE_103, + SCX_use_AUX_TABLE_111, SCX_Greek, SCX_Unknown, SCX_Common, @@ -92719,7 +95467,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Carian, SCX_Unknown, - SCX_use_AUX_TABLE_105, + SCX_use_AUX_TABLE_113, SCX_Unknown, SCX_Old_Italic, SCX_Unknown, @@ -92810,6 +95558,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Lydian, SCX_Unknown, SCX_Lydian, + SCX_Sidetic, SCX_Unknown, SCX_Meroitic_Hieroglyphs, SCX_Meroitic_Cursive, @@ -92839,7 +95588,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Manichaean, SCX_Unknown, SCX_Manichaean, - SCX_use_AUX_TABLE_106, + SCX_use_AUX_TABLE_114, SCX_Manichaean, SCX_Unknown, SCX_Avestan, @@ -92885,6 +95634,8 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Arabic, SCX_Unknown, SCX_Arabic, + SCX_Unknown, + SCX_Arabic, SCX_Old_Sogdian, SCX_Unknown, SCX_Sogdian, @@ -93058,6 +95809,8 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Devanagari, SCX_Unknown, + SCX_Sharada, + SCX_Unknown, SCX_Sunuwar, SCX_Unknown, SCX_Sunuwar, @@ -93102,6 +95855,10 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Gunjala_Gondi, SCX_Unknown, + SCX_Tolong_Siki, + SCX_Unknown, + SCX_Tolong_Siki, + SCX_Unknown, SCX_Makasar, SCX_Unknown, SCX_Kawi, @@ -93166,6 +95923,10 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Medefaidrin, SCX_Unknown, + SCX_Beria_Erfe, + SCX_Unknown, + SCX_Beria_Erfe, + SCX_Unknown, SCX_Miao, SCX_Unknown, SCX_Miao, @@ -93174,12 +95935,10 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Tangut, SCX_Nushu, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Khitan_Small_Script, SCX_Unknown, - SCX_use_AUX_TABLE_78, - SCX_Unknown, - SCX_Tangut, + SCX_use_AUX_TABLE_86, SCX_Unknown, SCX_Tangut, SCX_Khitan_Small_Script, @@ -93187,23 +95946,25 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Khitan_Small_Script, SCX_Tangut, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_Tangut, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_98, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_98, SCX_Unknown, - SCX_use_AUX_TABLE_90, - SCX_use_AUX_TABLE_89, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_98, SCX_Unknown, - SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_98, + SCX_use_AUX_TABLE_97, + SCX_use_AUX_TABLE_98, SCX_Unknown, - SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_97, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_97, SCX_Unknown, - SCX_use_AUX_TABLE_90, + SCX_use_AUX_TABLE_98, + SCX_Unknown, + SCX_use_AUX_TABLE_98, SCX_Unknown, SCX_Nushu, SCX_Unknown, @@ -93221,6 +95982,10 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Common, SCX_Unknown, + SCX_Common, + SCX_Unknown, + SCX_Common, + SCX_Unknown, SCX_Inherited, SCX_Unknown, SCX_Inherited, @@ -93249,7 +96014,7 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Common, SCX_Unknown, SCX_Common, @@ -93337,6 +96102,12 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Ol_Onal, SCX_Unknown, + SCX_Tai_Yo, + SCX_Unknown, + SCX_Tai_Yo, + SCX_Unknown, + SCX_Tai_Yo, + SCX_Unknown, SCX_Ethiopic, SCX_Unknown, SCX_Ethiopic, @@ -93442,14 +96213,14 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Common, SCX_Unknown, SCX_Common, - SCX_use_AUX_TABLE_89, + SCX_use_AUX_TABLE_97, SCX_Common, SCX_Unknown, SCX_Common, SCX_Unknown, SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, SCX_Common, SCX_Unknown, @@ -93501,23 +96272,23 @@ static const SCX_enum _Perl_SCX_invmap[] SCX_Unknown, SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_Common, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, - SCX_use_AUX_TABLE_78, + SCX_use_AUX_TABLE_86, SCX_Unknown, SCX_Common, SCX_Unknown, @@ -93536,7 +96307,7 @@ static const SCX_enum _Perl_SCX_invmap[] # if 'A' == 65 /* ASCII/Latin1 */ static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */ - 2035, /* Number of elements */ + 2212, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -93580,6 +96351,7 @@ static const UV _Perl_WB_invlist[] = { 0xB6, 0xB7, 0xB8, + 0xB9, 0xBA, 0xBB, 0xC0, @@ -93710,7 +96482,6 @@ static const UV _Perl_WB_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, 0x890, 0x892, 0x897, @@ -93921,7 +96692,7 @@ static const UV _Perl_WB_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -93951,7 +96722,7 @@ static const UV _Perl_WB_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -94190,7 +96961,9 @@ static const UV _Perl_WB_invlist[] = { 0x1A90, 0x1A9A, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -94351,8 +97124,6 @@ static const UV _Perl_WB_invlist[] = { 0x231C, 0x2328, 0x2329, - 0x2388, - 0x2389, 0x23CF, 0x23D0, 0x23E9, @@ -94372,14 +97143,90 @@ static const UV _Perl_WB_invlist[] = { 0x25FB, 0x25FF, 0x2600, - 0x2606, - 0x2607, - 0x2613, + 0x2605, + 0x260E, + 0x260F, + 0x2611, + 0x2612, 0x2614, - 0x2686, - 0x2690, + 0x2616, + 0x2618, + 0x2619, + 0x261D, + 0x261E, + 0x2620, + 0x2621, + 0x2622, + 0x2624, + 0x2626, + 0x2627, + 0x262A, + 0x262B, + 0x262E, + 0x2630, + 0x2638, + 0x263B, + 0x2640, + 0x2641, + 0x2642, + 0x2643, + 0x2648, + 0x2654, + 0x265F, + 0x2661, + 0x2663, + 0x2664, + 0x2665, + 0x2667, + 0x2668, + 0x2669, + 0x267B, + 0x267C, + 0x267E, + 0x2680, + 0x2692, + 0x2698, + 0x2699, + 0x269A, + 0x269B, + 0x269D, + 0x26A0, + 0x26A2, + 0x26A7, + 0x26A8, + 0x26AA, + 0x26AC, + 0x26B0, + 0x26B2, + 0x26BD, + 0x26BF, + 0x26C4, + 0x26C6, + 0x26C8, + 0x26C9, + 0x26CE, + 0x26D0, + 0x26D1, + 0x26D2, + 0x26D3, + 0x26D5, + 0x26E9, + 0x26EB, + 0x26F0, + 0x26F6, + 0x26F7, + 0x26FB, + 0x26FD, + 0x26FE, + 0x2702, + 0x2703, + 0x2705, 0x2706, 0x2708, + 0x270E, + 0x270F, + 0x2710, + 0x2712, 0x2713, 0x2714, 0x2715, @@ -94406,7 +97253,7 @@ static const UV _Perl_WB_invlist[] = { 0x2757, 0x2758, 0x2763, - 0x2768, + 0x2765, 0x2795, 0x2798, 0x27A1, @@ -94519,14 +97366,8 @@ static const UV _Perl_WB_invlist[] = { 0xA6F0, 0xA6F2, 0xA708, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -94811,6 +97652,8 @@ static const UV _Perl_WB_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -94873,8 +97716,8 @@ static const UV _Perl_WB_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F00, 0x10F1D, 0x10F27, @@ -95122,6 +97965,8 @@ static const UV _Perl_WB_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -95173,6 +98018,10 @@ static const UV _Perl_WB_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF3, 0x11EF7, @@ -95244,6 +98093,10 @@ static const UV _Perl_WB_invlist[] = { 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -95421,6 +98274,19 @@ static const UV _Perl_WB_invlist[] = { 0x1E5F0, 0x1E5F1, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -95505,16 +98371,24 @@ static const UV _Perl_WB_invlist[] = { 0x1EEAA, 0x1EEAB, 0x1EEBC, - 0x1F000, + 0x1F004, + 0x1F005, + 0x1F02C, + 0x1F030, + 0x1F094, + 0x1F0A0, + 0x1F0AF, + 0x1F0B1, + 0x1F0C0, + 0x1F0C1, + 0x1F0CF, + 0x1F0D1, + 0x1F0F6, 0x1F100, - 0x1F10D, - 0x1F110, - 0x1F12F, 0x1F130, 0x1F14A, 0x1F150, 0x1F16A, - 0x1F16C, 0x1F170, 0x1F172, 0x1F17E, @@ -95524,7 +98398,7 @@ static const UV _Perl_WB_invlist[] = { 0x1F18F, 0x1F191, 0x1F19B, - 0x1F1AD, + 0x1F1AE, 0x1F1E6, 0x1F200, 0x1F201, @@ -95538,16 +98412,80 @@ static const UV _Perl_WB_invlist[] = { 0x1F23C, 0x1F240, 0x1F249, + 0x1F260, + 0x1F266, + 0x1F322, + 0x1F324, + 0x1F394, + 0x1F396, + 0x1F398, + 0x1F399, + 0x1F39C, + 0x1F39E, + 0x1F3F1, + 0x1F3F3, + 0x1F3F6, + 0x1F3F7, 0x1F3FB, 0x1F400, + 0x1F4FE, + 0x1F4FF, 0x1F53E, - 0x1F546, + 0x1F549, + 0x1F54F, + 0x1F550, + 0x1F568, + 0x1F56F, + 0x1F571, + 0x1F573, + 0x1F57B, + 0x1F587, + 0x1F588, + 0x1F58A, + 0x1F58E, + 0x1F590, + 0x1F591, + 0x1F595, + 0x1F597, + 0x1F5A4, + 0x1F5A6, + 0x1F5A8, + 0x1F5A9, + 0x1F5B1, + 0x1F5B3, + 0x1F5BC, + 0x1F5BD, + 0x1F5C2, + 0x1F5C5, + 0x1F5D1, + 0x1F5D4, + 0x1F5DC, + 0x1F5DF, + 0x1F5E1, + 0x1F5E2, + 0x1F5E3, + 0x1F5E4, + 0x1F5E8, + 0x1F5E9, + 0x1F5EF, + 0x1F5F0, + 0x1F5F3, + 0x1F5F4, + 0x1F5FA, 0x1F650, 0x1F680, + 0x1F6C6, + 0x1F6CB, + 0x1F6D3, + 0x1F6D5, + 0x1F6E6, + 0x1F6E9, + 0x1F6EA, + 0x1F6EB, + 0x1F6F1, + 0x1F6F3, 0x1F700, - 0x1F774, - 0x1F780, - 0x1F7D5, + 0x1F7DA, 0x1F800, 0x1F80C, 0x1F810, @@ -95558,12 +98496,22 @@ static const UV _Perl_WB_invlist[] = { 0x1F888, 0x1F890, 0x1F8AE, + 0x1F8B0, + 0x1F8BC, + 0x1F8C0, + 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1F93B, 0x1F93C, 0x1F946, 0x1F947, + 0x1FA00, + 0x1FA58, + 0x1FA60, + 0x1FA6E, 0x1FB00, 0x1FBF0, 0x1FBFA, @@ -95655,6 +98603,7 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_MidLetter, + WB_ALetter, WB_Other, WB_ALetter, WB_Other, @@ -95786,7 +98735,6 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, - WB_Other, WB_Numeric, WB_Other, WB_Extend, @@ -96268,6 +99216,8 @@ static const WB_enum _Perl_WB_invmap[] = WB_Extend, WB_Other, WB_Extend, + WB_Other, + WB_Extend, WB_ALetter, WB_Extend, WB_ALetter, @@ -96433,8 +99383,6 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ExtPict_XX, WB_Other, - WB_ExtPict_XX, - WB_Other, WB_ALetter, WB_ExtPict_LE, WB_ALetter, @@ -96501,6 +99449,82 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ExtPict_XX, WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, WB_ALetter, WB_Other, WB_ALetter, @@ -96597,12 +99621,6 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, - WB_Other, - WB_ALetter, - WB_Other, - WB_ALetter, - WB_Other, - WB_ALetter, WB_Extend, WB_ALetter, WB_Extend, @@ -96892,6 +99910,8 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, + WB_Other, + WB_ALetter, WB_Extend, WB_Other, WB_Extend, @@ -97198,6 +100218,8 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ALetter, WB_Other, + WB_Extend, + WB_Other, WB_ALetter, WB_Other, WB_Numeric, @@ -97250,6 +100272,10 @@ static const WB_enum _Perl_WB_invmap[] = WB_Numeric, WB_Other, WB_ALetter, + WB_Other, + WB_Numeric, + WB_Other, + WB_ALetter, WB_Extend, WB_Other, WB_Extend, @@ -97322,6 +100348,10 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ALetter, WB_Other, + WB_ALetter, + WB_Other, + WB_ALetter, + WB_Other, WB_Extend, WB_ALetter, WB_Extend, @@ -97500,6 +100530,19 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, + WB_Extend, + WB_ALetter, + WB_Extend, + WB_ALetter, + WB_Extend, + WB_ALetter, + WB_Extend, + WB_Other, + WB_ALetter, + WB_Other, + WB_ALetter, + WB_Other, + WB_ALetter, WB_Other, WB_ALetter, WB_Other, @@ -97586,11 +100629,19 @@ static const WB_enum _Perl_WB_invmap[] = WB_ExtPict_XX, WB_Other, WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, WB_ALetter, WB_Other, WB_ALetter, WB_Other, - WB_ExtPict_XX, WB_ExtPict_LE, WB_ALetter, WB_ExtPict_LE, @@ -97614,6 +100665,20 @@ static const WB_enum _Perl_WB_invmap[] = WB_ExtPict_XX, WB_Other, WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, WB_Extend, WB_ExtPict_XX, WB_Other, @@ -97641,6 +100706,66 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ExtPict_XX, WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, WB_Numeric, WB_Other, WB_ExtPict_XX, @@ -97665,7 +100790,7 @@ static const WB_enum _Perl_WB_invmap[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */ - 2058, /* Number of elements */ + 2232, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -97706,8 +100831,6 @@ static const UV _Perl_WB_invlist[] = { 0x8C, 0x8F, 0x91, - 0x9D, - 0x9E, 0x9F, 0xA0, 0xA1, @@ -97862,7 +100985,6 @@ static const UV _Perl_WB_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, 0x890, 0x892, 0x897, @@ -98073,7 +101195,7 @@ static const UV _Perl_WB_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -98103,7 +101225,7 @@ static const UV _Perl_WB_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -98342,7 +101464,9 @@ static const UV _Perl_WB_invlist[] = { 0x1A90, 0x1A9A, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -98503,8 +101627,6 @@ static const UV _Perl_WB_invlist[] = { 0x231C, 0x2328, 0x2329, - 0x2388, - 0x2389, 0x23CF, 0x23D0, 0x23E9, @@ -98524,14 +101646,90 @@ static const UV _Perl_WB_invlist[] = { 0x25FB, 0x25FF, 0x2600, - 0x2606, - 0x2607, - 0x2613, + 0x2605, + 0x260E, + 0x260F, + 0x2611, + 0x2612, 0x2614, - 0x2686, - 0x2690, + 0x2616, + 0x2618, + 0x2619, + 0x261D, + 0x261E, + 0x2620, + 0x2621, + 0x2622, + 0x2624, + 0x2626, + 0x2627, + 0x262A, + 0x262B, + 0x262E, + 0x2630, + 0x2638, + 0x263B, + 0x2640, + 0x2641, + 0x2642, + 0x2643, + 0x2648, + 0x2654, + 0x265F, + 0x2661, + 0x2663, + 0x2664, + 0x2665, + 0x2667, + 0x2668, + 0x2669, + 0x267B, + 0x267C, + 0x267E, + 0x2680, + 0x2692, + 0x2698, + 0x2699, + 0x269A, + 0x269B, + 0x269D, + 0x26A0, + 0x26A2, + 0x26A7, + 0x26A8, + 0x26AA, + 0x26AC, + 0x26B0, + 0x26B2, + 0x26BD, + 0x26BF, + 0x26C4, + 0x26C6, + 0x26C8, + 0x26C9, + 0x26CE, + 0x26D0, + 0x26D1, + 0x26D2, + 0x26D3, + 0x26D5, + 0x26E9, + 0x26EB, + 0x26F0, + 0x26F6, + 0x26F7, + 0x26FB, + 0x26FD, + 0x26FE, + 0x2702, + 0x2703, + 0x2705, 0x2706, 0x2708, + 0x270E, + 0x270F, + 0x2710, + 0x2712, 0x2713, 0x2714, 0x2715, @@ -98558,7 +101756,7 @@ static const UV _Perl_WB_invlist[] = { 0x2757, 0x2758, 0x2763, - 0x2768, + 0x2765, 0x2795, 0x2798, 0x27A1, @@ -98671,14 +101869,8 @@ static const UV _Perl_WB_invlist[] = { 0xA6F0, 0xA6F2, 0xA708, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -98963,6 +102155,8 @@ static const UV _Perl_WB_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -99025,8 +102219,8 @@ static const UV _Perl_WB_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F00, 0x10F1D, 0x10F27, @@ -99274,6 +102468,8 @@ static const UV _Perl_WB_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -99325,6 +102521,10 @@ static const UV _Perl_WB_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF3, 0x11EF7, @@ -99396,6 +102596,10 @@ static const UV _Perl_WB_invlist[] = { 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -99573,6 +102777,19 @@ static const UV _Perl_WB_invlist[] = { 0x1E5F0, 0x1E5F1, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -99657,16 +102874,24 @@ static const UV _Perl_WB_invlist[] = { 0x1EEAA, 0x1EEAB, 0x1EEBC, - 0x1F000, + 0x1F004, + 0x1F005, + 0x1F02C, + 0x1F030, + 0x1F094, + 0x1F0A0, + 0x1F0AF, + 0x1F0B1, + 0x1F0C0, + 0x1F0C1, + 0x1F0CF, + 0x1F0D1, + 0x1F0F6, 0x1F100, - 0x1F10D, - 0x1F110, - 0x1F12F, 0x1F130, 0x1F14A, 0x1F150, 0x1F16A, - 0x1F16C, 0x1F170, 0x1F172, 0x1F17E, @@ -99676,7 +102901,7 @@ static const UV _Perl_WB_invlist[] = { 0x1F18F, 0x1F191, 0x1F19B, - 0x1F1AD, + 0x1F1AE, 0x1F1E6, 0x1F200, 0x1F201, @@ -99690,16 +102915,80 @@ static const UV _Perl_WB_invlist[] = { 0x1F23C, 0x1F240, 0x1F249, + 0x1F260, + 0x1F266, + 0x1F322, + 0x1F324, + 0x1F394, + 0x1F396, + 0x1F398, + 0x1F399, + 0x1F39C, + 0x1F39E, + 0x1F3F1, + 0x1F3F3, + 0x1F3F6, + 0x1F3F7, 0x1F3FB, 0x1F400, + 0x1F4FE, + 0x1F4FF, 0x1F53E, - 0x1F546, + 0x1F549, + 0x1F54F, + 0x1F550, + 0x1F568, + 0x1F56F, + 0x1F571, + 0x1F573, + 0x1F57B, + 0x1F587, + 0x1F588, + 0x1F58A, + 0x1F58E, + 0x1F590, + 0x1F591, + 0x1F595, + 0x1F597, + 0x1F5A4, + 0x1F5A6, + 0x1F5A8, + 0x1F5A9, + 0x1F5B1, + 0x1F5B3, + 0x1F5BC, + 0x1F5BD, + 0x1F5C2, + 0x1F5C5, + 0x1F5D1, + 0x1F5D4, + 0x1F5DC, + 0x1F5DF, + 0x1F5E1, + 0x1F5E2, + 0x1F5E3, + 0x1F5E4, + 0x1F5E8, + 0x1F5E9, + 0x1F5EF, + 0x1F5F0, + 0x1F5F3, + 0x1F5F4, + 0x1F5FA, 0x1F650, 0x1F680, + 0x1F6C6, + 0x1F6CB, + 0x1F6D3, + 0x1F6D5, + 0x1F6E6, + 0x1F6E9, + 0x1F6EA, + 0x1F6EB, + 0x1F6F1, + 0x1F6F3, 0x1F700, - 0x1F774, - 0x1F780, - 0x1F7D5, + 0x1F7DA, 0x1F800, 0x1F80C, 0x1F810, @@ -99710,12 +102999,22 @@ static const UV _Perl_WB_invlist[] = { 0x1F888, 0x1F890, 0x1F8AE, + 0x1F8B0, + 0x1F8BC, + 0x1F8C0, + 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1F93B, 0x1F93C, 0x1F946, 0x1F947, + 0x1FA00, + 0x1FA58, + 0x1FA60, + 0x1FA6E, 0x1FB00, 0x1FBF0, 0x1FBFA, @@ -99816,8 +103115,6 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, - WB_Other, - WB_ALetter, WB_ExtPict_XX, WB_Other, WB_MidLetter, @@ -99964,7 +103261,6 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, - WB_Other, WB_Numeric, WB_Other, WB_Extend, @@ -100446,6 +103742,8 @@ static const WB_enum _Perl_WB_invmap[] = WB_Extend, WB_Other, WB_Extend, + WB_Other, + WB_Extend, WB_ALetter, WB_Extend, WB_ALetter, @@ -100611,8 +103909,6 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ExtPict_XX, WB_Other, - WB_ExtPict_XX, - WB_Other, WB_ALetter, WB_ExtPict_LE, WB_ALetter, @@ -100679,6 +103975,82 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ExtPict_XX, WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, WB_ALetter, WB_Other, WB_ALetter, @@ -100775,12 +104147,6 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, - WB_Other, - WB_ALetter, - WB_Other, - WB_ALetter, - WB_Other, - WB_ALetter, WB_Extend, WB_ALetter, WB_Extend, @@ -101070,6 +104436,8 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, + WB_Other, + WB_ALetter, WB_Extend, WB_Other, WB_Extend, @@ -101376,6 +104744,8 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ALetter, WB_Other, + WB_Extend, + WB_Other, WB_ALetter, WB_Other, WB_Numeric, @@ -101428,6 +104798,10 @@ static const WB_enum _Perl_WB_invmap[] = WB_Numeric, WB_Other, WB_ALetter, + WB_Other, + WB_Numeric, + WB_Other, + WB_ALetter, WB_Extend, WB_Other, WB_Extend, @@ -101500,6 +104874,10 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ALetter, WB_Other, + WB_ALetter, + WB_Other, + WB_ALetter, + WB_Other, WB_Extend, WB_ALetter, WB_Extend, @@ -101678,6 +105056,19 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, + WB_Extend, + WB_ALetter, + WB_Extend, + WB_ALetter, + WB_Extend, + WB_ALetter, + WB_Extend, + WB_Other, + WB_ALetter, + WB_Other, + WB_ALetter, + WB_Other, + WB_ALetter, WB_Other, WB_ALetter, WB_Other, @@ -101764,11 +105155,19 @@ static const WB_enum _Perl_WB_invmap[] = WB_ExtPict_XX, WB_Other, WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, WB_ALetter, WB_Other, WB_ALetter, WB_Other, - WB_ExtPict_XX, WB_ExtPict_LE, WB_ALetter, WB_ExtPict_LE, @@ -101792,6 +105191,20 @@ static const WB_enum _Perl_WB_invmap[] = WB_ExtPict_XX, WB_Other, WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, WB_Extend, WB_ExtPict_XX, WB_Other, @@ -101819,6 +105232,66 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ExtPict_XX, WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, WB_Numeric, WB_Other, WB_ExtPict_XX, @@ -101843,7 +105316,7 @@ static const WB_enum _Perl_WB_invmap[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */ - 2054, /* Number of elements */ + 2228, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -101884,8 +105357,6 @@ static const UV _Perl_WB_invlist[] = { 0x8C, 0x8F, 0x91, - 0x9D, - 0x9E, 0x9F, 0xA0, 0xA1, @@ -102036,7 +105507,6 @@ static const UV _Perl_WB_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, 0x890, 0x892, 0x897, @@ -102247,7 +105717,7 @@ static const UV _Perl_WB_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -102277,7 +105747,7 @@ static const UV _Perl_WB_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -102516,7 +105986,9 @@ static const UV _Perl_WB_invlist[] = { 0x1A90, 0x1A9A, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -102677,8 +106149,6 @@ static const UV _Perl_WB_invlist[] = { 0x231C, 0x2328, 0x2329, - 0x2388, - 0x2389, 0x23CF, 0x23D0, 0x23E9, @@ -102698,14 +106168,90 @@ static const UV _Perl_WB_invlist[] = { 0x25FB, 0x25FF, 0x2600, - 0x2606, - 0x2607, - 0x2613, + 0x2605, + 0x260E, + 0x260F, + 0x2611, + 0x2612, 0x2614, - 0x2686, - 0x2690, - 0x2706, + 0x2616, + 0x2618, + 0x2619, + 0x261D, + 0x261E, + 0x2620, + 0x2621, + 0x2622, + 0x2624, + 0x2626, + 0x2627, + 0x262A, + 0x262B, + 0x262E, + 0x2630, + 0x2638, + 0x263B, + 0x2640, + 0x2641, + 0x2642, + 0x2643, + 0x2648, + 0x2654, + 0x265F, + 0x2661, + 0x2663, + 0x2664, + 0x2665, + 0x2667, + 0x2668, + 0x2669, + 0x267B, + 0x267C, + 0x267E, + 0x2680, + 0x2692, + 0x2698, + 0x2699, + 0x269A, + 0x269B, + 0x269D, + 0x26A0, + 0x26A2, + 0x26A7, + 0x26A8, + 0x26AA, + 0x26AC, + 0x26B0, + 0x26B2, + 0x26BD, + 0x26BF, + 0x26C4, + 0x26C6, + 0x26C8, + 0x26C9, + 0x26CE, + 0x26D0, + 0x26D1, + 0x26D2, + 0x26D3, + 0x26D5, + 0x26E9, + 0x26EB, + 0x26F0, + 0x26F6, + 0x26F7, + 0x26FB, + 0x26FD, + 0x26FE, + 0x2702, + 0x2703, + 0x2705, + 0x2706, 0x2708, + 0x270E, + 0x270F, + 0x2710, + 0x2712, 0x2713, 0x2714, 0x2715, @@ -102732,7 +106278,7 @@ static const UV _Perl_WB_invlist[] = { 0x2757, 0x2758, 0x2763, - 0x2768, + 0x2765, 0x2795, 0x2798, 0x27A1, @@ -102845,14 +106391,8 @@ static const UV _Perl_WB_invlist[] = { 0xA6F0, 0xA6F2, 0xA708, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -103137,6 +106677,8 @@ static const UV _Perl_WB_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -103199,8 +106741,8 @@ static const UV _Perl_WB_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F00, 0x10F1D, 0x10F27, @@ -103448,6 +106990,8 @@ static const UV _Perl_WB_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -103499,6 +107043,10 @@ static const UV _Perl_WB_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF3, 0x11EF7, @@ -103570,6 +107118,10 @@ static const UV _Perl_WB_invlist[] = { 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -103747,6 +107299,19 @@ static const UV _Perl_WB_invlist[] = { 0x1E5F0, 0x1E5F1, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -103831,16 +107396,24 @@ static const UV _Perl_WB_invlist[] = { 0x1EEAA, 0x1EEAB, 0x1EEBC, - 0x1F000, + 0x1F004, + 0x1F005, + 0x1F02C, + 0x1F030, + 0x1F094, + 0x1F0A0, + 0x1F0AF, + 0x1F0B1, + 0x1F0C0, + 0x1F0C1, + 0x1F0CF, + 0x1F0D1, + 0x1F0F6, 0x1F100, - 0x1F10D, - 0x1F110, - 0x1F12F, 0x1F130, 0x1F14A, 0x1F150, 0x1F16A, - 0x1F16C, 0x1F170, 0x1F172, 0x1F17E, @@ -103850,7 +107423,7 @@ static const UV _Perl_WB_invlist[] = { 0x1F18F, 0x1F191, 0x1F19B, - 0x1F1AD, + 0x1F1AE, 0x1F1E6, 0x1F200, 0x1F201, @@ -103864,16 +107437,80 @@ static const UV _Perl_WB_invlist[] = { 0x1F23C, 0x1F240, 0x1F249, + 0x1F260, + 0x1F266, + 0x1F322, + 0x1F324, + 0x1F394, + 0x1F396, + 0x1F398, + 0x1F399, + 0x1F39C, + 0x1F39E, + 0x1F3F1, + 0x1F3F3, + 0x1F3F6, + 0x1F3F7, 0x1F3FB, 0x1F400, + 0x1F4FE, + 0x1F4FF, 0x1F53E, - 0x1F546, + 0x1F549, + 0x1F54F, + 0x1F550, + 0x1F568, + 0x1F56F, + 0x1F571, + 0x1F573, + 0x1F57B, + 0x1F587, + 0x1F588, + 0x1F58A, + 0x1F58E, + 0x1F590, + 0x1F591, + 0x1F595, + 0x1F597, + 0x1F5A4, + 0x1F5A6, + 0x1F5A8, + 0x1F5A9, + 0x1F5B1, + 0x1F5B3, + 0x1F5BC, + 0x1F5BD, + 0x1F5C2, + 0x1F5C5, + 0x1F5D1, + 0x1F5D4, + 0x1F5DC, + 0x1F5DF, + 0x1F5E1, + 0x1F5E2, + 0x1F5E3, + 0x1F5E4, + 0x1F5E8, + 0x1F5E9, + 0x1F5EF, + 0x1F5F0, + 0x1F5F3, + 0x1F5F4, + 0x1F5FA, 0x1F650, 0x1F680, + 0x1F6C6, + 0x1F6CB, + 0x1F6D3, + 0x1F6D5, + 0x1F6E6, + 0x1F6E9, + 0x1F6EA, + 0x1F6EB, + 0x1F6F1, + 0x1F6F3, 0x1F700, - 0x1F774, - 0x1F780, - 0x1F7D5, + 0x1F7DA, 0x1F800, 0x1F80C, 0x1F810, @@ -103884,12 +107521,22 @@ static const UV _Perl_WB_invlist[] = { 0x1F888, 0x1F890, 0x1F8AE, + 0x1F8B0, + 0x1F8BC, + 0x1F8C0, + 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1F93B, 0x1F93C, 0x1F946, 0x1F947, + 0x1FA00, + 0x1FA58, + 0x1FA60, + 0x1FA6E, 0x1FB00, 0x1FBF0, 0x1FBFA, @@ -103988,8 +107635,6 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, - WB_Other, - WB_ALetter, WB_ExtPict_XX, WB_Other, WB_MidLetter, @@ -104134,7 +107779,6 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, - WB_Other, WB_Numeric, WB_Other, WB_Extend, @@ -104616,6 +108260,8 @@ static const WB_enum _Perl_WB_invmap[] = WB_Extend, WB_Other, WB_Extend, + WB_Other, + WB_Extend, WB_ALetter, WB_Extend, WB_ALetter, @@ -104781,8 +108427,6 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ExtPict_XX, WB_Other, - WB_ExtPict_XX, - WB_Other, WB_ALetter, WB_ExtPict_LE, WB_ALetter, @@ -104849,6 +108493,82 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ExtPict_XX, WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, WB_ALetter, WB_Other, WB_ALetter, @@ -104945,12 +108665,6 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, - WB_Other, - WB_ALetter, - WB_Other, - WB_ALetter, - WB_Other, - WB_ALetter, WB_Extend, WB_ALetter, WB_Extend, @@ -105240,6 +108954,8 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, + WB_Other, + WB_ALetter, WB_Extend, WB_Other, WB_Extend, @@ -105546,6 +109262,8 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ALetter, WB_Other, + WB_Extend, + WB_Other, WB_ALetter, WB_Other, WB_Numeric, @@ -105598,6 +109316,10 @@ static const WB_enum _Perl_WB_invmap[] = WB_Numeric, WB_Other, WB_ALetter, + WB_Other, + WB_Numeric, + WB_Other, + WB_ALetter, WB_Extend, WB_Other, WB_Extend, @@ -105670,6 +109392,10 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ALetter, WB_Other, + WB_ALetter, + WB_Other, + WB_ALetter, + WB_Other, WB_Extend, WB_ALetter, WB_Extend, @@ -105848,6 +109574,19 @@ static const WB_enum _Perl_WB_invmap[] = WB_ALetter, WB_Other, WB_ALetter, + WB_Extend, + WB_ALetter, + WB_Extend, + WB_ALetter, + WB_Extend, + WB_ALetter, + WB_Extend, + WB_Other, + WB_ALetter, + WB_Other, + WB_ALetter, + WB_Other, + WB_ALetter, WB_Other, WB_ALetter, WB_Other, @@ -105934,11 +109673,19 @@ static const WB_enum _Perl_WB_invmap[] = WB_ExtPict_XX, WB_Other, WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, WB_ALetter, WB_Other, WB_ALetter, WB_Other, - WB_ExtPict_XX, WB_ExtPict_LE, WB_ALetter, WB_ExtPict_LE, @@ -105962,6 +109709,20 @@ static const WB_enum _Perl_WB_invmap[] = WB_ExtPict_XX, WB_Other, WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, WB_Extend, WB_ExtPict_XX, WB_Other, @@ -105989,6 +109750,66 @@ static const WB_enum _Perl_WB_invmap[] = WB_Other, WB_ExtPict_XX, WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, + WB_ExtPict_XX, + WB_Other, WB_Numeric, WB_Other, WB_ExtPict_XX, @@ -106010,7 +109831,7 @@ static const WB_enum _Perl_WB_invmap[] = # if 'A' == 65 /* ASCII/Latin1 */ static const UV Simple_Case_Folding_invlist[] = { /* for ASCII/Latin1 */ - 1323, /* Number of elements */ + 1331, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -107297,8 +111118,14 @@ static const UV Simple_Case_Folding_invl 0xA7CB, 0xA7CC, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -107335,6 +111162,8 @@ static const UV Simple_Case_Folding_invl 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -108631,8 +112460,14 @@ static const I32 Simple_Case_Folding_inv 0x264, 0xA7CD, 0, + 0xA7CF, + 0, 0xA7D1, 0, + 0xA7D3, + 0, + 0xA7D5, + 0, 0xA7D7, 0, 0xA7D9, @@ -108669,6 +112504,8 @@ static const I32 Simple_Case_Folding_inv 0, 0x16E60, 0, + 0x16EBB, + 0, 0x1E922, 0 }; @@ -108685,7 +112522,7 @@ static const I32 Simple_Case_Folding_inv && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV Simple_Case_Folding_invlist[] = { /* for EBCDIC 1047 */ - 1341, /* Number of elements */ + 1349, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -109990,8 +113827,14 @@ static const UV Simple_Case_Folding_invl 0xA7CB, 0xA7CC, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -110028,6 +113871,8 @@ static const UV Simple_Case_Folding_invl 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -111345,8 +115190,14 @@ static const I32 Simple_Case_Folding_inv 0x264, 0xA7CD, 0, + 0xA7CF, + 0, 0xA7D1, 0, + 0xA7D3, + 0, + 0xA7D5, + 0, 0xA7D7, 0, 0xA7D9, @@ -111383,6 +115234,8 @@ static const I32 Simple_Case_Folding_inv 0, 0x16E60, 0, + 0x16EBB, + 0, 0x1E922, 0 }; @@ -111399,7 +115252,7 @@ static const I32 Simple_Case_Folding_inv && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV Simple_Case_Folding_invlist[] = { /* for EBCDIC 037 */ - 1337, /* Number of elements */ + 1345, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -112700,8 +116553,14 @@ static const UV Simple_Case_Folding_invl 0xA7CB, 0xA7CC, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -112738,6 +116597,8 @@ static const UV Simple_Case_Folding_invl 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -114051,8 +117912,14 @@ static const I32 Simple_Case_Folding_inv 0x264, 0xA7CD, 0, + 0xA7CF, + 0, 0xA7D1, 0, + 0xA7D3, + 0, + 0xA7D5, + 0, 0xA7D7, 0, 0xA7D9, @@ -114089,6 +117956,8 @@ static const I32 Simple_Case_Folding_inv 0, 0x16E60, 0, + 0x16EBB, + 0, 0x1E922, 0 }; @@ -114102,7 +117971,7 @@ static const I32 Simple_Case_Folding_inv # if 'A' == 65 /* ASCII/Latin1 */ static const UV Titlecase_Mapping_invlist[] = { /* for ASCII/Latin1 */ - 1365, /* Number of elements */ + 1373, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -115420,8 +119289,14 @@ static const UV Titlecase_Mapping_invlis 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -115469,6 +119344,8 @@ static const UV Titlecase_Mapping_invlis 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -117191,8 +121068,14 @@ static const I32 Titlecase_Mapping_invma 0, 0xA7CC, 0, + 0xA7CE, + 0, 0xA7D0, 0, + 0xA7D2, + 0, + 0xA7D4, + 0, 0xA7D6, 0, 0xA7D8, @@ -117240,6 +121123,8 @@ static const I32 Titlecase_Mapping_invma 0, 0x16E40, 0, + 0x16EA0, + 0, 0x1E900, 0 }; @@ -117256,7 +121141,7 @@ static const I32 Titlecase_Mapping_invma && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV Titlecase_Mapping_invlist[] = { /* for EBCDIC 1047 */ - 1381, /* Number of elements */ + 1389, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -118590,8 +122475,14 @@ static const UV Titlecase_Mapping_invlis 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -118639,6 +122530,8 @@ static const UV Titlecase_Mapping_invlis 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -120380,8 +124273,14 @@ static const I32 Titlecase_Mapping_invma 0, 0xA7CC, 0, + 0xA7CE, + 0, 0xA7D0, 0, + 0xA7D2, + 0, + 0xA7D4, + 0, 0xA7D6, 0, 0xA7D8, @@ -120429,6 +124328,8 @@ static const I32 Titlecase_Mapping_invma 0, 0x16E40, 0, + 0x16EA0, + 0, 0x1E900, 0 }; @@ -120445,7 +124346,7 @@ static const I32 Titlecase_Mapping_invma && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV Titlecase_Mapping_invlist[] = { /* for EBCDIC 037 */ - 1379, /* Number of elements */ + 1387, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -121777,8 +125678,14 @@ static const UV Titlecase_Mapping_invlis 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -121826,6 +125733,8 @@ static const UV Titlecase_Mapping_invlis 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -123565,8 +127474,14 @@ static const I32 Titlecase_Mapping_invma 0, 0xA7CC, 0, + 0xA7CE, + 0, 0xA7D0, 0, + 0xA7D2, + 0, + 0xA7D4, + 0, 0xA7D6, 0, 0xA7D8, @@ -123614,6 +127529,8 @@ static const I32 Titlecase_Mapping_invma 0, 0x16E40, 0, + 0x16EA0, + 0, 0x1E900, 0 }; @@ -123627,7 +127544,7 @@ static const I32 Titlecase_Mapping_invma # if 'A' == 65 /* ASCII/Latin1 */ static const UV Uppercase_Mapping_invlist[] = { /* for ASCII/Latin1 */ - 1416, /* Number of elements */ + 1424, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -124996,8 +128913,14 @@ static const UV Uppercase_Mapping_invlis 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -125045,6 +128968,8 @@ static const UV Uppercase_Mapping_invlis 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -127034,8 +130959,14 @@ static const I32 Uppercase_Mapping_invma 0, 0xA7CC, 0, + 0xA7CE, + 0, 0xA7D0, 0, + 0xA7D2, + 0, + 0xA7D4, + 0, 0xA7D6, 0, 0xA7D8, @@ -127083,6 +131014,8 @@ static const I32 Uppercase_Mapping_invma 0, 0x16E40, 0, + 0x16EA0, + 0, 0x1E900, 0 }; @@ -127099,7 +131032,7 @@ static const I32 Uppercase_Mapping_invma && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV Uppercase_Mapping_invlist[] = { /* for EBCDIC 1047 */ - 1432, /* Number of elements */ + 1440, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -128484,8 +132417,14 @@ static const UV Uppercase_Mapping_invlis 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -128533,6 +132472,8 @@ static const UV Uppercase_Mapping_invlis 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -130541,8 +134482,14 @@ static const I32 Uppercase_Mapping_invma 0, 0xA7CC, 0, + 0xA7CE, + 0, 0xA7D0, 0, + 0xA7D2, + 0, + 0xA7D4, + 0, 0xA7D6, 0, 0xA7D8, @@ -130590,6 +134537,8 @@ static const I32 Uppercase_Mapping_invma 0, 0x16E40, 0, + 0x16EA0, + 0, 0x1E900, 0 }; @@ -130606,7 +134555,7 @@ static const I32 Uppercase_Mapping_invma && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV Uppercase_Mapping_invlist[] = { /* for EBCDIC 037 */ - 1430, /* Number of elements */ + 1438, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -131989,8 +135938,14 @@ static const UV Uppercase_Mapping_invlis 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -132038,6 +135993,8 @@ static const UV Uppercase_Mapping_invlis 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -134044,8 +138001,14 @@ static const I32 Uppercase_Mapping_invma 0, 0xA7CC, 0, + 0xA7CE, + 0, 0xA7D0, 0, + 0xA7D2, + 0, + 0xA7D4, + 0, 0xA7D6, 0, 0xA7D8, @@ -134093,6 +138056,8 @@ static const I32 Uppercase_Mapping_invma 0, 0x16E40, 0, + 0x16EA0, + 0, 0x1E900, 0 }; @@ -134409,7 +138374,7 @@ static const UV UNI_ASCII_invlist[] = { # endif /* EBCDIC 037 */ static const UV UNI_ASSIGNED_invlist[] = { /* for all charsets */ - 1462, /* Number of elements */ + 1470, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -134456,8 +138421,6 @@ static const UV UNI_ASSIGNED_invlist[] = 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -134625,7 +138588,7 @@ static const UV UNI_ASSIGNED_invlist[] = 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -134649,7 +138612,7 @@ static const UV UNI_ASSIGNED_invlist[] = 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -134840,7 +138803,9 @@ static const UV UNI_ASSIGNED_invlist[] = 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -134898,7 +138863,7 @@ static const UV UNI_ASSIGNED_invlist[] = 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -134910,8 +138875,6 @@ static const UV UNI_ASSIGNED_invlist[] = 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -134972,14 +138935,8 @@ static const UV UNI_ASSIGNED_invlist[] = 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -135050,12 +139007,6 @@ static const UV UNI_ASSIGNED_invlist[] = 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -135198,7 +139149,7 @@ static const UV UNI_ASSIGNED_invlist[] = 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -135262,8 +139213,10 @@ static const UV UNI_ASSIGNED_invlist[] = 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -135429,6 +139382,8 @@ static const UV UNI_ASSIGNED_invlist[] = 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -135473,6 +139428,10 @@ static const UV UNI_ASSIGNED_invlist[] = 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -135531,6 +139490,10 @@ static const UV UNI_ASSIGNED_invlist[] = 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -135540,13 +139503,13 @@ static const UV UNI_ASSIGNED_invlist[] = 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -135576,9 +139539,13 @@ static const UV UNI_ASSIGNED_invlist[] = 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -135685,6 +139652,12 @@ static const UV UNI_ASSIGNED_invlist[] = 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -135800,14 +139773,12 @@ static const UV UNI_ASSIGNED_invlist[] = 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -135827,34 +139798,36 @@ static const UV UNI_ASSIGNED_invlist[] = 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -135864,7 +139837,7 @@ static const UV UNI_ASSIGNED_invlist[] = 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -135880,7 +139853,7 @@ static const UV UNI_ASSIGNED_invlist[] = # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_CASED_invlist[] = { /* for ASCII/Latin1 */ - 319, /* Number of elements */ + 317, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -135905,7 +139878,7 @@ static const UV UNI_CASED_invlist[] = { 0x1C0, 0x1C4, 0x294, - 0x295, + 0x296, 0x2B9, 0x2C0, 0x2C2, @@ -136060,14 +140033,8 @@ static const UV UNI_CASED_invlist[] = { 0xA78B, 0xA78F, 0xA790, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA7F7, 0xA7F8, 0xA7FB, @@ -136127,6 +140094,10 @@ static const UV UNI_CASED_invlist[] = { 0x118E0, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x1D400, 0x1D455, 0x1D456, @@ -136213,7 +140184,7 @@ static const UV UNI_CASED_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_CASED_invlist[] = { /* for EBCDIC 1047 */ - 345, /* Number of elements */ + 343, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -136264,7 +140235,7 @@ static const UV UNI_CASED_invlist[] = { 0x1C0, 0x1C4, 0x294, - 0x295, + 0x296, 0x2B9, 0x2C0, 0x2C2, @@ -136419,14 +140390,8 @@ static const UV UNI_CASED_invlist[] = { 0xA78B, 0xA78F, 0xA790, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA7F7, 0xA7F8, 0xA7FB, @@ -136486,6 +140451,10 @@ static const UV UNI_CASED_invlist[] = { 0x118E0, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x1D400, 0x1D455, 0x1D456, @@ -136572,7 +140541,7 @@ static const UV UNI_CASED_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_CASED_invlist[] = { /* for EBCDIC 037 */ - 341, /* Number of elements */ + 339, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -136619,7 +140588,7 @@ static const UV UNI_CASED_invlist[] = { 0x1C0, 0x1C4, 0x294, - 0x295, + 0x296, 0x2B9, 0x2C0, 0x2C2, @@ -136774,14 +140743,8 @@ static const UV UNI_CASED_invlist[] = { 0xA78B, 0xA78F, 0xA790, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA7F7, 0xA7F8, 0xA7FB, @@ -136841,6 +140804,10 @@ static const UV UNI_CASED_invlist[] = { 0x118E0, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x1D400, 0x1D455, 0x1D456, @@ -136924,7 +140891,7 @@ static const UV UNI_CASED_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_CASEDLETTER_invlist[] = { /* for ASCII/Latin1 */ - 291, /* Number of elements */ + 289, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -136945,7 +140912,7 @@ static const UV UNI_CASEDLETTER_invlist[ 0x1C0, 0x1C4, 0x294, - 0x295, + 0x296, 0x2B0, 0x370, 0x374, @@ -137092,12 +141059,6 @@ static const UV UNI_CASEDLETTER_invlist[ 0xA78B, 0xA78F, 0xA790, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, 0xA7F5, 0xA7F7, @@ -137151,6 +141112,10 @@ static const UV UNI_CASEDLETTER_invlist[ 0x118E0, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x1D400, 0x1D455, 0x1D456, @@ -137229,7 +141194,7 @@ static const UV UNI_CASEDLETTER_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_CASEDLETTER_invlist[] = { /* for EBCDIC 1047 */ - 323, /* Number of elements */ + 321, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -137282,7 +141247,7 @@ static const UV UNI_CASEDLETTER_invlist[ 0x1C0, 0x1C4, 0x294, - 0x295, + 0x296, 0x2B0, 0x370, 0x374, @@ -137429,12 +141394,6 @@ static const UV UNI_CASEDLETTER_invlist[ 0xA78B, 0xA78F, 0xA790, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, 0xA7F5, 0xA7F7, @@ -137488,6 +141447,10 @@ static const UV UNI_CASEDLETTER_invlist[ 0x118E0, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x1D400, 0x1D455, 0x1D456, @@ -137566,7 +141529,7 @@ static const UV UNI_CASEDLETTER_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_CASEDLETTER_invlist[] = { /* for EBCDIC 037 */ - 319, /* Number of elements */ + 317, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -137615,7 +141578,7 @@ static const UV UNI_CASEDLETTER_invlist[ 0x1C0, 0x1C4, 0x294, - 0x295, + 0x296, 0x2B0, 0x370, 0x374, @@ -137762,12 +141725,6 @@ static const UV UNI_CASEDLETTER_invlist[ 0xA78B, 0xA78F, 0xA790, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, 0xA7F5, 0xA7F7, @@ -137821,6 +141778,10 @@ static const UV UNI_CASEDLETTER_invlist[ 0x118E0, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x1D400, 0x1D455, 0x1D456, @@ -137896,7 +141857,7 @@ static const UV UNI_CASEDLETTER_invlist[ # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_LOWERCASELETTER_invlist[] = { /* for ASCII/Latin1 */ - 1325, /* Number of elements */ + 1329, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -138191,7 +142152,7 @@ static const UV UNI_LOWERCASELETTER_invl 0x24E, 0x24F, 0x294, - 0x295, + 0x296, 0x2B0, 0x371, 0x372, @@ -139113,6 +143074,8 @@ static const UV UNI_LOWERCASELETTER_invl 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, 0xA7D3, @@ -139161,6 +143124,8 @@ static const UV UNI_LOWERCASELETTER_invl 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1D41A, 0x1D434, 0x1D44E, @@ -139235,7 +143200,7 @@ static const UV UNI_LOWERCASELETTER_invl && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_LOWERCASELETTER_invlist[] = { /* for EBCDIC 1047 */ - 1339, /* Number of elements */ + 1343, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -139544,7 +143509,7 @@ static const UV UNI_LOWERCASELETTER_invl 0x24E, 0x24F, 0x294, - 0x295, + 0x296, 0x2B0, 0x371, 0x372, @@ -140466,6 +144431,8 @@ static const UV UNI_LOWERCASELETTER_invl 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, 0xA7D3, @@ -140514,6 +144481,8 @@ static const UV UNI_LOWERCASELETTER_invl 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1D41A, 0x1D434, 0x1D44E, @@ -140588,7 +144557,7 @@ static const UV UNI_LOWERCASELETTER_invl && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_LOWERCASELETTER_invlist[] = { /* for EBCDIC 037 */ - 1339, /* Number of elements */ + 1343, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -140897,7 +144866,7 @@ static const UV UNI_LOWERCASELETTER_invl 0x24E, 0x24F, 0x294, - 0x295, + 0x296, 0x2B0, 0x371, 0x372, @@ -141819,6 +145788,8 @@ static const UV UNI_LOWERCASELETTER_invl 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, 0xA7D3, @@ -141867,6 +145838,8 @@ static const UV UNI_LOWERCASELETTER_invl 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1D41A, 0x1D434, 0x1D44E, @@ -142925,7 +146898,7 @@ static const UV UNI_TITLE_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_UPPERCASELETTER_invlist[] = { /* for ASCII/Latin1 */ - 1303, /* Number of elements */ + 1311, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -144134,8 +148107,14 @@ static const UV UNI_UPPERCASELETTER_invl 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -144168,6 +148147,8 @@ static const UV UNI_UPPERCASELETTER_invl 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1D400, 0x1D41A, 0x1D434, @@ -144242,7 +148223,7 @@ static const UV UNI_UPPERCASELETTER_invl && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_UPPERCASELETTER_invlist[] = { /* for EBCDIC 1047 */ - 1321, /* Number of elements */ + 1329, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -145469,8 +149450,14 @@ static const UV UNI_UPPERCASELETTER_invl 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -145503,6 +149490,8 @@ static const UV UNI_UPPERCASELETTER_invl 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1D400, 0x1D41A, 0x1D434, @@ -145577,7 +149566,7 @@ static const UV UNI_UPPERCASELETTER_invl && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_UPPERCASELETTER_invlist[] = { /* for EBCDIC 037 */ - 1317, /* Number of elements */ + 1325, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -146800,8 +150789,14 @@ static const UV UNI_UPPERCASELETTER_invl 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -146834,6 +150829,8 @@ static const UV UNI_UPPERCASELETTER_invl 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1D400, 0x1D41A, 0x1D434, @@ -146969,7 +150966,7 @@ static const UV UNI_VERTSPACE_invlist[] # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_XPOSIXALNUM_invlist[] = { /* for ASCII/Latin1 */ - 1605, /* Number of elements */ + 1615, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -147081,7 +151078,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x898, 0x8A0, @@ -147270,7 +151267,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -147296,7 +151293,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0xCCD, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -147715,14 +151712,8 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA806, 0xA807, 0xA828, @@ -147946,6 +151937,8 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -147999,8 +151992,8 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10EFD, 0x10F00, 0x10F1D, @@ -148206,6 +152199,8 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -148258,6 +152253,10 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -148318,6 +152317,10 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -148329,13 +152332,13 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x16FE3, 0x16FE4, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -148468,6 +152471,12 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x1E5EE, 0x1E5F0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -148563,11 +152572,9 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -148577,7 +152584,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* ASCII/Latin1 */ @@ -148588,7 +152595,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_XPOSIXALNUM_invlist[] = { /* for EBCDIC 1047 */ - 1629, /* Number of elements */ + 1639, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -148724,7 +152731,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x898, 0x8A0, @@ -148913,7 +152920,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -148939,7 +152946,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0xCCD, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -149358,14 +153365,8 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA806, 0xA807, 0xA828, @@ -149589,6 +153590,8 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -149642,8 +153645,8 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10EFD, 0x10F00, 0x10F1D, @@ -149849,6 +153852,8 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -149901,6 +153906,10 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -149961,6 +153970,10 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -149972,13 +153985,13 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x16FE3, 0x16FE4, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -150111,6 +154124,12 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x1E5EE, 0x1E5F0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -150206,11 +154225,9 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -150220,7 +154237,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 1047 */ @@ -150231,7 +154248,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_XPOSIXALNUM_invlist[] = { /* for EBCDIC 037 */ - 1625, /* Number of elements */ + 1635, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -150363,7 +154380,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x898, 0x8A0, @@ -150552,7 +154569,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -150578,7 +154595,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0xCCD, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -150997,14 +155014,8 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA806, 0xA807, 0xA828, @@ -151228,6 +155239,8 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -151281,8 +155294,8 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10EFD, 0x10F00, 0x10F1D, @@ -151488,6 +155501,8 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -151540,6 +155555,10 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -151600,6 +155619,10 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -151611,13 +155634,13 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x16FE3, 0x16FE4, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -151750,6 +155773,12 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x1E5EE, 0x1E5F0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -151845,11 +155874,9 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -151859,7 +155886,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 037 */ @@ -151867,7 +155894,7 @@ static const UV UNI_XPOSIXALNUM_invlist[ # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_XPOSIXALPHA_invlist[] = { /* for ASCII/Latin1 */ - 1515, /* Number of elements */ + 1523, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -151979,7 +156006,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x898, 0x8A0, @@ -152160,7 +156187,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -152184,7 +156211,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0xCCD, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -152585,14 +156612,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA806, 0xA807, 0xA828, @@ -152810,6 +156831,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -152861,8 +156884,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10EFD, 0x10F00, 0x10F1D, @@ -153048,6 +157071,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11C00, @@ -153092,6 +157117,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x11D97, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF7, 0x11F00, @@ -153140,6 +157167,10 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -153151,13 +157182,13 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x16FE3, 0x16FE4, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -153280,6 +157311,12 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -153371,11 +157408,9 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -153385,7 +157420,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* ASCII/Latin1 */ @@ -153396,7 +157431,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_XPOSIXALPHA_invlist[] = { /* for EBCDIC 1047 */ - 1541, /* Number of elements */ + 1549, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -153534,7 +157569,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x898, 0x8A0, @@ -153715,7 +157750,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -153739,7 +157774,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0xCCD, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -154140,14 +158175,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA806, 0xA807, 0xA828, @@ -154365,6 +158394,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -154416,8 +158447,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10EFD, 0x10F00, 0x10F1D, @@ -154603,6 +158634,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11C00, @@ -154647,6 +158680,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x11D97, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF7, 0x11F00, @@ -154695,6 +158730,10 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -154706,13 +158745,13 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x16FE3, 0x16FE4, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -154835,6 +158874,12 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -154926,11 +158971,9 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -154940,7 +158983,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 1047 */ @@ -154951,7 +158994,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_XPOSIXALPHA_invlist[] = { /* for EBCDIC 037 */ - 1537, /* Number of elements */ + 1545, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -155085,7 +159128,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x898, 0x8A0, @@ -155266,7 +159309,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -155290,7 +159333,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0xCCD, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -155691,14 +159734,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA806, 0xA807, 0xA828, @@ -155916,6 +159953,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -155967,8 +160006,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10EFD, 0x10F00, 0x10F1D, @@ -156154,6 +160193,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11C00, @@ -156198,6 +160239,8 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x11D97, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF7, 0x11F00, @@ -156246,6 +160289,10 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -156257,13 +160304,13 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x16FE3, 0x16FE4, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -156386,6 +160433,12 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -156477,11 +160530,9 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -156491,7 +160542,7 @@ static const UV UNI_XPOSIXALPHA_invlist[ 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 037 */ @@ -156636,7 +160687,7 @@ static const UV UNI_XPOSIXCNTRL_invlist[ # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_XPOSIXDIGIT_invlist[] = { /* for ASCII/Latin1 */ - 143, /* Number of elements */ + 145, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -156755,6 +160806,8 @@ static const UV UNI_XPOSIXDIGIT_invlist[ 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x16130, @@ -156793,7 +160846,7 @@ static const UV UNI_XPOSIXDIGIT_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_XPOSIXDIGIT_invlist[] = { /* for EBCDIC 1047 */ - 143, /* Number of elements */ + 145, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -156912,6 +160965,8 @@ static const UV UNI_XPOSIXDIGIT_invlist[ 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x16130, @@ -156950,7 +161005,7 @@ static const UV UNI_XPOSIXDIGIT_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_XPOSIXDIGIT_invlist[] = { /* for EBCDIC 037 */ - 143, /* Number of elements */ + 145, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -157069,6 +161124,8 @@ static const UV UNI_XPOSIXDIGIT_invlist[ 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x16130, @@ -157104,7 +161161,7 @@ static const UV UNI_XPOSIXDIGIT_invlist[ # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_XPOSIXGRAPH_invlist[] = { /* for ASCII/Latin1 */ - 1475, /* Number of elements */ + 1483, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -157154,8 +161211,6 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -157323,7 +161378,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -157347,7 +161402,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -157540,7 +161595,9 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -157604,7 +161661,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -157616,8 +161673,6 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -157680,14 +161735,8 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -157758,12 +161807,6 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -157906,7 +161949,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -157970,8 +162013,10 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -158137,6 +162182,8 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -158181,6 +162228,10 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -158239,6 +162290,10 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -158248,13 +162303,13 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -158284,9 +162339,13 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -158393,6 +162452,12 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -158508,14 +162573,12 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -158535,34 +162598,36 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -158572,7 +162637,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -158593,7 +162658,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 1047 */ - 1475, /* Number of elements */ + 1483, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -158643,8 +162708,6 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -158812,7 +162875,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -158836,7 +162899,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -159029,7 +163092,9 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -159093,7 +163158,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -159105,8 +163170,6 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -159169,14 +163232,8 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -159247,12 +163304,6 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -159395,7 +163446,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -159459,8 +163510,10 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -159626,6 +163679,8 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -159670,6 +163725,10 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -159728,6 +163787,10 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -159737,13 +163800,13 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -159773,9 +163836,13 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -159882,6 +163949,12 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -159997,14 +164070,12 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -160024,34 +164095,36 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -160061,7 +164134,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -160082,7 +164155,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_XPOSIXGRAPH_invlist[] = { /* for EBCDIC 037 */ - 1475, /* Number of elements */ + 1483, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -160132,8 +164205,6 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -160301,7 +164372,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -160325,7 +164396,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -160518,7 +164589,9 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -160582,7 +164655,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -160594,8 +164667,6 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -160658,14 +164729,8 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -160736,12 +164801,6 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -160884,7 +164943,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -160948,8 +165007,10 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -161115,6 +165176,8 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -161159,6 +165222,10 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -161217,6 +165284,10 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -161226,13 +165297,13 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -161262,9 +165333,13 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -161371,6 +165446,12 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -161486,14 +165567,12 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -161513,34 +165592,36 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -161550,7 +165631,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -161568,7 +165649,7 @@ static const UV UNI_XPOSIXGRAPH_invlist[ # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_XPOSIXLOWER_invlist[] = { /* for ASCII/Latin1 */ - 1351, /* Number of elements */ + 1355, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -161867,7 +165948,7 @@ static const UV UNI_XPOSIXLOWER_invlist[ 0x24E, 0x24F, 0x294, - 0x295, + 0x296, 0x2B9, 0x2C0, 0x2C2, @@ -162799,6 +166880,8 @@ static const UV UNI_XPOSIXLOWER_invlist[ 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, 0xA7D3, @@ -162811,7 +166894,7 @@ static const UV UNI_XPOSIXLOWER_invlist[ 0xA7DA, 0xA7DB, 0xA7DC, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F6, 0xA7F7, @@ -162857,6 +166940,8 @@ static const UV UNI_XPOSIXLOWER_invlist[ 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1D41A, 0x1D434, 0x1D44E, @@ -162933,7 +167018,7 @@ static const UV UNI_XPOSIXLOWER_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_XPOSIXLOWER_invlist[] = { /* for EBCDIC 1047 */ - 1359, /* Number of elements */ + 1363, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -163240,7 +167325,7 @@ static const UV UNI_XPOSIXLOWER_invlist[ 0x24E, 0x24F, 0x294, - 0x295, + 0x296, 0x2B9, 0x2C0, 0x2C2, @@ -164172,6 +168257,8 @@ static const UV UNI_XPOSIXLOWER_invlist[ 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, 0xA7D3, @@ -164184,7 +168271,7 @@ static const UV UNI_XPOSIXLOWER_invlist[ 0xA7DA, 0xA7DB, 0xA7DC, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F6, 0xA7F7, @@ -164230,6 +168317,8 @@ static const UV UNI_XPOSIXLOWER_invlist[ 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1D41A, 0x1D434, 0x1D44E, @@ -164306,7 +168395,7 @@ static const UV UNI_XPOSIXLOWER_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_XPOSIXLOWER_invlist[] = { /* for EBCDIC 037 */ - 1359, /* Number of elements */ + 1363, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -164613,7 +168702,7 @@ static const UV UNI_XPOSIXLOWER_invlist[ 0x24E, 0x24F, 0x294, - 0x295, + 0x296, 0x2B9, 0x2C0, 0x2C2, @@ -165545,6 +169634,8 @@ static const UV UNI_XPOSIXLOWER_invlist[ 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, 0xA7D3, @@ -165557,7 +169648,7 @@ static const UV UNI_XPOSIXLOWER_invlist[ 0xA7DA, 0xA7DB, 0xA7DC, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F6, 0xA7F7, @@ -165603,6 +169694,8 @@ static const UV UNI_XPOSIXLOWER_invlist[ 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1D41A, 0x1D434, 0x1D44E, @@ -165676,7 +169769,7 @@ static const UV UNI_XPOSIXLOWER_invlist[ # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_XPOSIXPRINT_invlist[] = { /* for ASCII/Latin1 */ - 1467, /* Number of elements */ + 1475, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -165726,8 +169819,6 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -165895,7 +169986,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -165919,7 +170010,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -166110,7 +170201,9 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -166170,7 +170263,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -166182,8 +170275,6 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -166244,14 +170335,8 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -166322,12 +170407,6 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -166470,7 +170549,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -166534,8 +170613,10 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -166701,6 +170782,8 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -166745,6 +170828,10 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -166803,6 +170890,10 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -166812,13 +170903,13 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -166848,9 +170939,13 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -166957,6 +171052,12 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -167072,14 +171173,12 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -167099,34 +171198,36 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -167136,7 +171237,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -167157,7 +171258,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_XPOSIXPRINT_invlist[] = { /* for EBCDIC 1047 */ - 1467, /* Number of elements */ + 1475, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -167207,8 +171308,6 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -167376,7 +171475,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -167400,7 +171499,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -167591,7 +171690,9 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -167651,7 +171752,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -167663,8 +171764,6 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -167725,14 +171824,8 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -167803,12 +171896,6 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -167951,7 +172038,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -168015,8 +172102,10 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -168182,6 +172271,8 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -168226,6 +172317,10 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -168284,6 +172379,10 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -168293,13 +172392,13 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -168329,9 +172428,13 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -168438,6 +172541,12 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -168553,14 +172662,12 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -168580,34 +172687,36 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -168617,7 +172726,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -168638,7 +172747,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_XPOSIXPRINT_invlist[] = { /* for EBCDIC 037 */ - 1467, /* Number of elements */ + 1475, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -168688,8 +172797,6 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -168857,7 +172964,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -168881,7 +172988,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -169072,7 +173179,9 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -169132,7 +173241,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -169144,8 +173253,6 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -169206,14 +173313,8 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -169284,12 +173385,6 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -169432,7 +173527,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -169496,8 +173591,10 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -169663,6 +173760,8 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -169707,6 +173806,10 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -169765,6 +173868,10 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -169774,13 +173881,13 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -169810,9 +173917,13 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -169919,6 +174030,12 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -170034,14 +174151,12 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -170061,34 +174176,36 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -170098,7 +174215,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -170116,7 +174233,7 @@ static const UV UNI_XPOSIXPRINT_invlist[ # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_XPOSIXPUNCT_invlist[] = { /* for ASCII/Latin1 */ - 387, /* Number of elements */ + 389, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -170407,6 +174524,8 @@ static const UV UNI_XPOSIXPUNCT_invlist[ 0x10D6F, 0x10EAD, 0x10EAE, + 0x10ED0, + 0x10ED1, 0x10F55, 0x10F5A, 0x10F86, @@ -170517,7 +174636,7 @@ static const UV UNI_XPOSIXPUNCT_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 1047 */ - 395, /* Number of elements */ + 397, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -170816,6 +174935,8 @@ static const UV UNI_XPOSIXPUNCT_invlist[ 0x10D6F, 0x10EAD, 0x10EAE, + 0x10ED0, + 0x10ED1, 0x10F55, 0x10F5A, 0x10F86, @@ -170926,7 +175047,7 @@ static const UV UNI_XPOSIXPUNCT_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_XPOSIXPUNCT_invlist[] = { /* for EBCDIC 037 */ - 397, /* Number of elements */ + 399, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -171227,6 +175348,8 @@ static const UV UNI_XPOSIXPUNCT_invlist[ 0x10D6F, 0x10EAD, 0x10EAE, + 0x10ED0, + 0x10ED1, 0x10F55, 0x10F5A, 0x10F86, @@ -171440,7 +175563,7 @@ static const UV UNI_XPOSIXSPACE_invlist[ # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_XPOSIXUPPER_invlist[] = { /* for ASCII/Latin1 */ - 1313, /* Number of elements */ + 1321, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -172653,8 +176776,14 @@ static const UV UNI_XPOSIXUPPER_invlist[ 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -172687,6 +176816,8 @@ static const UV UNI_XPOSIXUPPER_invlist[ 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1D400, 0x1D41A, 0x1D434, @@ -172767,7 +176898,7 @@ static const UV UNI_XPOSIXUPPER_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_XPOSIXUPPER_invlist[] = { /* for EBCDIC 1047 */ - 1331, /* Number of elements */ + 1339, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -173998,8 +178129,14 @@ static const UV UNI_XPOSIXUPPER_invlist[ 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -174032,6 +178169,8 @@ static const UV UNI_XPOSIXUPPER_invlist[ 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1D400, 0x1D41A, 0x1D434, @@ -174112,7 +178251,7 @@ static const UV UNI_XPOSIXUPPER_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_XPOSIXUPPER_invlist[] = { /* for EBCDIC 037 */ - 1327, /* Number of elements */ + 1335, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -175339,8 +179478,14 @@ static const UV UNI_XPOSIXUPPER_invlist[ 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -175373,6 +179518,8 @@ static const UV UNI_XPOSIXUPPER_invlist[ 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1D400, 0x1D41A, 0x1D434, @@ -175450,7 +179597,7 @@ static const UV UNI_XPOSIXUPPER_invlist[ # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_XPOSIXWORD_invlist[] = { /* for ASCII/Latin1 */ - 1593, /* Number of elements */ + 1605, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -175558,7 +179705,7 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -175737,7 +179884,7 @@ static const UV UNI_XPOSIXWORD_invlist[] 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -175763,7 +179910,7 @@ static const UV UNI_XPOSIXWORD_invlist[] 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -175986,7 +180133,9 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x1AA7, 0x1AA8, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -176176,14 +180325,8 @@ static const UV UNI_XPOSIXWORD_invlist[] 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -176415,6 +180558,8 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -176472,8 +180617,8 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -176661,6 +180806,8 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -176705,6 +180852,10 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -176765,6 +180916,10 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -176776,13 +180931,13 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -176937,6 +181092,12 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -177030,11 +181191,9 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -177044,7 +181203,7 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -177057,7 +181216,7 @@ static const UV UNI_XPOSIXWORD_invlist[] && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_XPOSIXWORD_invlist[] = { /* for EBCDIC 1047 */ - 1617, /* Number of elements */ + 1629, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -177189,7 +181348,7 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -177368,7 +181527,7 @@ static const UV UNI_XPOSIXWORD_invlist[] 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -177394,7 +181553,7 @@ static const UV UNI_XPOSIXWORD_invlist[] 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -177617,7 +181776,9 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x1AA7, 0x1AA8, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -177807,14 +181968,8 @@ static const UV UNI_XPOSIXWORD_invlist[] 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -178046,6 +182201,8 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -178103,8 +182260,8 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -178292,6 +182449,8 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -178336,6 +182495,10 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -178396,6 +182559,10 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -178407,13 +182574,13 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -178568,6 +182735,12 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -178661,11 +182834,9 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -178675,7 +182846,7 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -178688,7 +182859,7 @@ static const UV UNI_XPOSIXWORD_invlist[] && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_XPOSIXWORD_invlist[] = { /* for EBCDIC 037 */ - 1613, /* Number of elements */ + 1625, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -178816,7 +182987,7 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -178995,7 +183166,7 @@ static const UV UNI_XPOSIXWORD_invlist[] 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -179021,7 +183192,7 @@ static const UV UNI_XPOSIXWORD_invlist[] 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -179244,7 +183415,9 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x1AA7, 0x1AA8, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -179434,14 +183607,8 @@ static const UV UNI_XPOSIXWORD_invlist[] 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -179673,6 +183840,8 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -179730,8 +183899,8 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -179919,6 +184088,8 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -179963,6 +184134,10 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -180023,6 +184198,10 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -180034,13 +184213,13 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -180195,6 +184374,12 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -180288,11 +184473,9 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -180302,7 +184485,7 @@ static const UV UNI_XPOSIXWORD_invlist[] 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -180622,10 +184805,6 @@ static const UV UNI__PERL_ANY_FOLDS_invl 0xA796, 0xA7AF, 0xA7B0, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D6, 0xA7DD, 0xA7F5, 0xA7F7, @@ -180675,6 +184854,10 @@ static const UV UNI__PERL_ANY_FOLDS_invl 0x118E0, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x1E900, 0x1E944 }; @@ -180951,10 +185134,6 @@ static const UV UNI__PERL_ANY_FOLDS_invl 0xA796, 0xA7AF, 0xA7B0, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D6, 0xA7DD, 0xA7F5, 0xA7F7, @@ -181004,6 +185183,10 @@ static const UV UNI__PERL_ANY_FOLDS_invl 0x118E0, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x1E900, 0x1E944 }; @@ -181276,10 +185459,6 @@ static const UV UNI__PERL_ANY_FOLDS_invl 0xA796, 0xA7AF, 0xA7B0, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D6, 0xA7DD, 0xA7F5, 0xA7F7, @@ -181329,6 +185508,10 @@ static const UV UNI__PERL_ANY_FOLDS_invl 0x118E0, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x1E900, 0x1E944 }; @@ -181338,7 +185521,7 @@ static const UV UNI__PERL_ANY_FOLDS_invl # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI__PERL_CHARNAME_BEGIN_invlist[] = { /* for ASCII/Latin1 */ - 1367, /* Number of elements */ + 1381, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -181444,7 +185627,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -181575,7 +185758,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -181593,7 +185776,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -181960,14 +186143,8 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -182211,6 +186388,8 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -182256,7 +186435,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -182441,6 +186620,8 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -182487,6 +186668,10 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -182497,12 +186682,14 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF4, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -182611,6 +186798,18 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -182694,11 +186893,9 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -182708,7 +186905,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* ASCII/Latin1 */ @@ -182719,7 +186916,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 1047 */ - 1393, /* Number of elements */ + 1407, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -182851,7 +187048,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -182982,7 +187179,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -183000,7 +187197,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -183367,14 +187564,8 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -183618,6 +187809,8 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -183663,7 +187856,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -183848,6 +188041,8 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -183894,6 +188089,10 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -183904,12 +188103,14 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF4, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -184018,6 +188219,18 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -184101,11 +188314,9 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -184115,7 +188326,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 1047 */ @@ -184126,7 +188337,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI__PERL_CHARNAME_BEGIN_invlist[] = { /* for EBCDIC 037 */ - 1389, /* Number of elements */ + 1403, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -184254,7 +188465,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -184385,7 +188596,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -184403,7 +188614,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -184770,14 +188981,8 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -185021,6 +189226,8 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -185066,7 +189273,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -185251,6 +189458,8 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -185297,6 +189506,10 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -185307,12 +189520,14 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF4, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -185421,6 +189636,18 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -185504,11 +189731,9 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -185518,7 +189743,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 037 */ @@ -185526,7 +189751,7 @@ static const UV UNI__PERL_CHARNAME_BEGIN # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI__PERL_CHARNAME_CONTINUE_invlist[] = { /* for ASCII/Latin1 */ - 1609, /* Number of elements */ + 1621, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -185642,7 +189867,7 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -185821,7 +190046,7 @@ static const UV UNI__PERL_CHARNAME_CONTI 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -185847,7 +190072,7 @@ static const UV UNI__PERL_CHARNAME_CONTI 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -186072,7 +190297,9 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -186262,14 +190489,8 @@ static const UV UNI__PERL_CHARNAME_CONTI 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -186513,6 +190734,8 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -186570,8 +190793,8 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -186759,6 +190982,8 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -186803,6 +191028,10 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -186863,6 +191092,10 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -186874,13 +191107,13 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -187035,6 +191268,12 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -187122,11 +191361,9 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -187136,7 +191373,7 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -187149,7 +191386,7 @@ static const UV UNI__PERL_CHARNAME_CONTI && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 1047 */ - 1635, /* Number of elements */ + 1647, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -187291,7 +191528,7 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -187470,7 +191707,7 @@ static const UV UNI__PERL_CHARNAME_CONTI 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -187496,7 +191733,7 @@ static const UV UNI__PERL_CHARNAME_CONTI 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -187721,7 +191958,9 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -187911,14 +192150,8 @@ static const UV UNI__PERL_CHARNAME_CONTI 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -188162,6 +192395,8 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -188219,8 +192454,8 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -188408,6 +192643,8 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -188452,6 +192689,10 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -188512,6 +192753,10 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -188523,13 +192768,13 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -188684,6 +192929,12 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -188771,11 +193022,9 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -188785,7 +193034,7 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -188798,7 +193047,7 @@ static const UV UNI__PERL_CHARNAME_CONTI && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI__PERL_CHARNAME_CONTINUE_invlist[] = { /* for EBCDIC 037 */ - 1631, /* Number of elements */ + 1643, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -188936,7 +193185,7 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -189115,7 +193364,7 @@ static const UV UNI__PERL_CHARNAME_CONTI 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -189141,7 +193390,7 @@ static const UV UNI__PERL_CHARNAME_CONTI 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -189366,7 +193615,9 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -189556,14 +193807,8 @@ static const UV UNI__PERL_CHARNAME_CONTI 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -189807,6 +194052,8 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -189864,8 +194111,8 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -190053,6 +194300,8 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -190097,6 +194346,10 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -190157,6 +194410,10 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -190168,13 +194425,13 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -190329,6 +194586,12 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -190416,11 +194679,9 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -190430,7 +194691,7 @@ static const UV UNI__PERL_CHARNAME_CONTI 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -190656,7 +194917,7 @@ static const UV UNI__PERL_FOLDS_TO_MULTI # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI__PERL_IDCONT_invlist[] = { /* for ASCII/Latin1 */ - 1603, /* Number of elements */ + 1615, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -190766,7 +195027,7 @@ static const UV UNI__PERL_IDCONT_invlist 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -190945,7 +195206,7 @@ static const UV UNI__PERL_IDCONT_invlist 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -190971,7 +195232,7 @@ static const UV UNI__PERL_IDCONT_invlist 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -191196,7 +195457,9 @@ static const UV UNI__PERL_IDCONT_invlist 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -191386,14 +195649,8 @@ static const UV UNI__PERL_IDCONT_invlist 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -191637,6 +195894,8 @@ static const UV UNI__PERL_IDCONT_invlist 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -191694,8 +195953,8 @@ static const UV UNI__PERL_IDCONT_invlist 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -191883,6 +196142,8 @@ static const UV UNI__PERL_IDCONT_invlist 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -191927,6 +196188,10 @@ static const UV UNI__PERL_IDCONT_invlist 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -191987,6 +196252,10 @@ static const UV UNI__PERL_IDCONT_invlist 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -191998,13 +196267,13 @@ static const UV UNI__PERL_IDCONT_invlist 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -192159,6 +196428,12 @@ static const UV UNI__PERL_IDCONT_invlist 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -192246,11 +196521,9 @@ static const UV UNI__PERL_IDCONT_invlist 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -192260,7 +196533,7 @@ static const UV UNI__PERL_IDCONT_invlist 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -192273,7 +196546,7 @@ static const UV UNI__PERL_IDCONT_invlist && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI__PERL_IDCONT_invlist[] = { /* for EBCDIC 1047 */ - 1627, /* Number of elements */ + 1639, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -192407,7 +196680,7 @@ static const UV UNI__PERL_IDCONT_invlist 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -192586,7 +196859,7 @@ static const UV UNI__PERL_IDCONT_invlist 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -192612,7 +196885,7 @@ static const UV UNI__PERL_IDCONT_invlist 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -192837,7 +197110,9 @@ static const UV UNI__PERL_IDCONT_invlist 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -193027,14 +197302,8 @@ static const UV UNI__PERL_IDCONT_invlist 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -193278,6 +197547,8 @@ static const UV UNI__PERL_IDCONT_invlist 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -193335,8 +197606,8 @@ static const UV UNI__PERL_IDCONT_invlist 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -193524,6 +197795,8 @@ static const UV UNI__PERL_IDCONT_invlist 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -193568,6 +197841,10 @@ static const UV UNI__PERL_IDCONT_invlist 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -193628,6 +197905,10 @@ static const UV UNI__PERL_IDCONT_invlist 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -193639,13 +197920,13 @@ static const UV UNI__PERL_IDCONT_invlist 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -193800,6 +198081,12 @@ static const UV UNI__PERL_IDCONT_invlist 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -193887,11 +198174,9 @@ static const UV UNI__PERL_IDCONT_invlist 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -193901,7 +198186,7 @@ static const UV UNI__PERL_IDCONT_invlist 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -193914,7 +198199,7 @@ static const UV UNI__PERL_IDCONT_invlist && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI__PERL_IDCONT_invlist[] = { /* for EBCDIC 037 */ - 1623, /* Number of elements */ + 1635, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -194044,7 +198329,7 @@ static const UV UNI__PERL_IDCONT_invlist 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -194223,7 +198508,7 @@ static const UV UNI__PERL_IDCONT_invlist 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -194249,7 +198534,7 @@ static const UV UNI__PERL_IDCONT_invlist 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -194474,7 +198759,9 @@ static const UV UNI__PERL_IDCONT_invlist 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -194664,14 +198951,8 @@ static const UV UNI__PERL_IDCONT_invlist 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -194915,6 +199196,8 @@ static const UV UNI__PERL_IDCONT_invlist 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -194972,8 +199255,8 @@ static const UV UNI__PERL_IDCONT_invlist 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -195161,6 +199444,8 @@ static const UV UNI__PERL_IDCONT_invlist 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -195205,6 +199490,10 @@ static const UV UNI__PERL_IDCONT_invlist 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -195265,6 +199554,10 @@ static const UV UNI__PERL_IDCONT_invlist 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -195276,13 +199569,13 @@ static const UV UNI__PERL_IDCONT_invlist 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -195437,6 +199730,12 @@ static const UV UNI__PERL_IDCONT_invlist 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -195524,11 +199823,9 @@ static const UV UNI__PERL_IDCONT_invlist 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -195538,7 +199835,7 @@ static const UV UNI__PERL_IDCONT_invlist 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -195548,7 +199845,7 @@ static const UV UNI__PERL_IDCONT_invlist # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI__PERL_IDSTART_invlist[] = { /* for ASCII/Latin1 */ - 1373, /* Number of elements */ + 1387, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -195656,7 +199953,7 @@ static const UV UNI__PERL_IDSTART_invlis 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -195787,7 +200084,7 @@ static const UV UNI__PERL_IDSTART_invlis 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -195805,7 +200102,7 @@ static const UV UNI__PERL_IDSTART_invlis 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -196172,14 +200469,8 @@ static const UV UNI__PERL_IDSTART_invlis 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -196425,6 +200716,8 @@ static const UV UNI__PERL_IDSTART_invlis 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -196470,7 +200763,7 @@ static const UV UNI__PERL_IDSTART_invlis 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -196655,6 +200948,8 @@ static const UV UNI__PERL_IDSTART_invlis 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -196703,6 +200998,10 @@ static const UV UNI__PERL_IDSTART_invlis 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -196713,12 +201012,14 @@ static const UV UNI__PERL_IDSTART_invlis 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -196827,6 +201128,18 @@ static const UV UNI__PERL_IDSTART_invlis 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -196910,11 +201223,9 @@ static const UV UNI__PERL_IDSTART_invlis 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -196924,7 +201235,7 @@ static const UV UNI__PERL_IDSTART_invlis 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* ASCII/Latin1 */ @@ -196935,7 +201246,7 @@ static const UV UNI__PERL_IDSTART_invlis && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI__PERL_IDSTART_invlist[] = { /* for EBCDIC 1047 */ - 1399, /* Number of elements */ + 1413, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -197069,7 +201380,7 @@ static const UV UNI__PERL_IDSTART_invlis 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -197200,7 +201511,7 @@ static const UV UNI__PERL_IDSTART_invlis 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -197218,7 +201529,7 @@ static const UV UNI__PERL_IDSTART_invlis 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -197585,14 +201896,8 @@ static const UV UNI__PERL_IDSTART_invlis 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -197838,6 +202143,8 @@ static const UV UNI__PERL_IDSTART_invlis 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -197883,7 +202190,7 @@ static const UV UNI__PERL_IDSTART_invlis 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -198068,6 +202375,8 @@ static const UV UNI__PERL_IDSTART_invlis 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -198116,6 +202425,10 @@ static const UV UNI__PERL_IDSTART_invlis 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -198126,12 +202439,14 @@ static const UV UNI__PERL_IDSTART_invlis 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -198240,6 +202555,18 @@ static const UV UNI__PERL_IDSTART_invlis 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -198323,11 +202650,9 @@ static const UV UNI__PERL_IDSTART_invlis 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -198337,7 +202662,7 @@ static const UV UNI__PERL_IDSTART_invlis 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 1047 */ @@ -198348,7 +202673,7 @@ static const UV UNI__PERL_IDSTART_invlis && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI__PERL_IDSTART_invlist[] = { /* for EBCDIC 037 */ - 1395, /* Number of elements */ + 1409, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -198478,7 +202803,7 @@ static const UV UNI__PERL_IDSTART_invlis 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -198609,7 +202934,7 @@ static const UV UNI__PERL_IDSTART_invlis 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -198627,7 +202952,7 @@ static const UV UNI__PERL_IDSTART_invlis 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -198994,14 +203319,8 @@ static const UV UNI__PERL_IDSTART_invlis 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -199247,6 +203566,8 @@ static const UV UNI__PERL_IDSTART_invlis 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -199292,7 +203613,7 @@ static const UV UNI__PERL_IDSTART_invlis 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -199477,6 +203798,8 @@ static const UV UNI__PERL_IDSTART_invlis 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -199525,6 +203848,10 @@ static const UV UNI__PERL_IDSTART_invlis 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -199535,12 +203862,14 @@ static const UV UNI__PERL_IDSTART_invlis 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -199649,6 +203978,18 @@ static const UV UNI__PERL_IDSTART_invlis 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -199732,11 +204073,9 @@ static const UV UNI__PERL_IDSTART_invlis 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -199746,7 +204085,7 @@ static const UV UNI__PERL_IDSTART_invlis 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 037 */ @@ -201258,6 +205597,108 @@ static const UV UNI_AGE__16_invlist[] = 0x1FBF0 }; +static const UV UNI_AGE__17_invlist[] = { /* for all charsets */ + 95, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x88F, + 0x890, + 0xC5C, + 0xC5D, + 0xCDC, + 0xCDD, + 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, + 0x20C1, + 0x20C2, + 0x2B96, + 0x2B97, + 0xA7CE, + 0xA7D0, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7F1, + 0xA7F2, + 0xFBC3, + 0xFBD3, + 0xFD90, + 0xFD92, + 0xFDC8, + 0xFDCF, + 0x10940, + 0x1095A, + 0x10EC5, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, + 0x10EFC, + 0x11B60, + 0x11B68, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, + 0x16FF2, + 0x16FF7, + 0x187F8, + 0x18800, + 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, + 0x1CCFA, + 0x1CCFD, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, + 0x1F6D8, + 0x1F6D9, + 0x1F777, + 0x1F77B, + 0x1F8D0, + 0x1F8D9, + 0x1FA54, + 0x1FA58, + 0x1FA8A, + 0x1FA8B, + 0x1FA8E, + 0x1FA8F, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, + 0x1FACE, + 0x1FAEA, + 0x1FAEB, + 0x1FAEF, + 0x1FAF0, + 0x1FBFA, + 0x1FBFB, + 0x2B73A, + 0x2B740, + 0x2CEA2, + 0x2CEAE, + 0x323B0, + 0x3347A +}; + static const UV UNI_AGE__2_invlist[] = { /* for all charsets */ 59, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -203642,7 +208083,7 @@ static const UV UNI_ANY_invlist[] = { / }; static const UV UNI_ARAB_invlist[] = { /* for all charsets */ - 111, /* Number of elements */ + 105, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -203656,8 +208097,6 @@ static const UV UNI_ARAB_invlist[] = { 0x750, 0x780, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x8E2, @@ -203668,12 +208107,6 @@ static const UV UNI_ARAB_invlist[] = { 0x2E41, 0x2E42, 0xFB50, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE00, @@ -203686,8 +208119,10 @@ static const UV UNI_ARAB_invlist[] = { 0x10E60, 0x10E7F, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F00, 0x1EE00, 0x1EE04, @@ -203994,7 +208429,7 @@ static const UV UNI_BATK_invlist[] = { }; static const UV UNI_BC__AL_invlist[] = { /* for all charsets */ - 59, /* Number of elements */ + 65, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -204030,9 +208465,13 @@ static const UV UNI_BC__AL_invlist[] = { 0x8A0, 0x8CA, 0xFB50, + 0xFBC3, + 0xFBD3, 0xFD3E, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDF0, 0xFDFD, 0xFE70, @@ -204044,7 +208483,9 @@ static const UV UNI_BC__AL_invlist[] = { 0x10D3A, 0x10D40, 0x10EC0, - 0x10EFC, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F30, 0x10F46, 0x10F51, @@ -204961,7 +209402,7 @@ static const UV UNI_BC__FSI_invlist[] = # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_BC__L_invlist[] = { /* for ASCII/Latin1 */ - 990, /* Number of elements */ + 1010, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -205260,7 +209701,9 @@ static const UV UNI_BC__L_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -205376,8 +209819,6 @@ static const UV UNI_BC__L_invlist[] = { 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -205705,6 +210146,12 @@ static const UV UNI_BC__L_invlist[] = { 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -205774,9 +210221,13 @@ static const UV UNI_BC__L_invlist[] = { 0x1CC00, 0x1CCD6, 0x1CCF0, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -205853,6 +210304,14 @@ static const UV UNI_BC__L_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E800, 0x1F02C, 0x1F030, @@ -205876,14 +210335,12 @@ static const UV UNI_BC__L_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -205903,26 +210360,30 @@ static const UV UNI_BC__L_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x1FFFE, 0x20000, 0x2FFFE, @@ -205965,7 +210426,7 @@ static const UV UNI_BC__L_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_BC__L_invlist[] = { /* for EBCDIC 1047 */ - 1016, /* Number of elements */ + 1036, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -206290,7 +210751,9 @@ static const UV UNI_BC__L_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -206406,8 +210869,6 @@ static const UV UNI_BC__L_invlist[] = { 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -206735,6 +211196,12 @@ static const UV UNI_BC__L_invlist[] = { 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -206804,9 +211271,13 @@ static const UV UNI_BC__L_invlist[] = { 0x1CC00, 0x1CCD6, 0x1CCF0, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -206883,6 +211354,14 @@ static const UV UNI_BC__L_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E800, 0x1F02C, 0x1F030, @@ -206906,14 +211385,12 @@ static const UV UNI_BC__L_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -206933,26 +211410,30 @@ static const UV UNI_BC__L_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x1FFFE, 0x20000, 0x2FFFE, @@ -206995,7 +211476,7 @@ static const UV UNI_BC__L_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_BC__L_invlist[] = { /* for EBCDIC 037 */ - 1012, /* Number of elements */ + 1032, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -207316,7 +211797,9 @@ static const UV UNI_BC__L_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -207432,8 +211915,6 @@ static const UV UNI_BC__L_invlist[] = { 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -207761,6 +212242,12 @@ static const UV UNI_BC__L_invlist[] = { 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -207830,9 +212317,13 @@ static const UV UNI_BC__L_invlist[] = { 0x1CC00, 0x1CCD6, 0x1CCF0, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -207909,6 +212400,14 @@ static const UV UNI_BC__L_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E800, 0x1F02C, 0x1F030, @@ -207932,14 +212431,12 @@ static const UV UNI_BC__L_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -207959,26 +212456,30 @@ static const UV UNI_BC__L_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x1FFFE, 0x20000, 0x2FFFE, @@ -208046,7 +212547,7 @@ static const UV UNI_BC__LRO_invlist[] = }; static const UV UNI_BC__NSM_invlist[] = { /* for all charsets */ - 705, /* Number of elements */ + 721, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -208330,7 +212831,9 @@ static const UV UNI_BC__NSM_invlist[] = 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -208489,7 +212992,7 @@ static const UV UNI_BC__NSM_invlist[] = 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -208641,6 +213144,12 @@ static const UV UNI_BC__NSM_invlist[] = 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -208749,6 +213258,14 @@ static const UV UNI_BC__NSM_invlist[] = 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -208760,7 +213277,7 @@ static const UV UNI_BC__NSM_invlist[] = # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_BC__ON_invlist[] = { /* for ASCII/Latin1 */ - 397, /* Number of elements */ + 411, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -208920,8 +213437,6 @@ static const UV UNI_BC__ON_invlist[] = { 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -208993,9 +213508,13 @@ static const UV UNI_BC__ON_invlist[] = { 0xA878, 0xAB6A, 0xAB6C, + 0xFBC3, + 0xFBD3, 0xFD3E, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDD0, 0xFDFD, 0xFE00, @@ -209047,6 +213566,8 @@ static const UV UNI_BC__ON_invlist[] = { 0x10B40, 0x10D6E, 0x10D6F, + 0x10ED0, + 0x10ED9, 0x11052, 0x11066, 0x11660, @@ -209059,8 +213580,14 @@ static const UV UNI_BC__ON_invlist[] = { 0x16FE3, 0x1CC00, 0x1CCD6, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1D1E9, 0x1D1EB, 0x1D200, @@ -209114,14 +213641,12 @@ static const UV UNI_BC__ON_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -209141,26 +213666,32 @@ static const UV UNI_BC__ON_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* ASCII/Latin1 */ @@ -209171,7 +213702,7 @@ static const UV UNI_BC__ON_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_BC__ON_invlist[] = { /* for EBCDIC 1047 */ - 405, /* Number of elements */ + 419, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -209339,8 +213870,6 @@ static const UV UNI_BC__ON_invlist[] = { 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -209412,9 +213941,13 @@ static const UV UNI_BC__ON_invlist[] = { 0xA878, 0xAB6A, 0xAB6C, + 0xFBC3, + 0xFBD3, 0xFD3E, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDD0, 0xFDFD, 0xFE00, @@ -209466,6 +213999,8 @@ static const UV UNI_BC__ON_invlist[] = { 0x10B40, 0x10D6E, 0x10D6F, + 0x10ED0, + 0x10ED9, 0x11052, 0x11066, 0x11660, @@ -209478,8 +214013,14 @@ static const UV UNI_BC__ON_invlist[] = { 0x16FE3, 0x1CC00, 0x1CCD6, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1D1E9, 0x1D1EB, 0x1D200, @@ -209533,14 +214074,12 @@ static const UV UNI_BC__ON_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -209560,26 +214099,32 @@ static const UV UNI_BC__ON_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* EBCDIC 1047 */ @@ -209590,7 +214135,7 @@ static const UV UNI_BC__ON_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_BC__ON_invlist[] = { /* for EBCDIC 037 */ - 401, /* Number of elements */ + 415, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -209754,8 +214299,6 @@ static const UV UNI_BC__ON_invlist[] = { 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -209827,9 +214370,13 @@ static const UV UNI_BC__ON_invlist[] = { 0xA878, 0xAB6A, 0xAB6C, + 0xFBC3, + 0xFBD3, 0xFD3E, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDD0, 0xFDFD, 0xFE00, @@ -209881,6 +214428,8 @@ static const UV UNI_BC__ON_invlist[] = { 0x10B40, 0x10D6E, 0x10D6F, + 0x10ED0, + 0x10ED9, 0x11052, 0x11066, 0x11660, @@ -209893,8 +214442,14 @@ static const UV UNI_BC__ON_invlist[] = { 0x16FE3, 0x1CC00, 0x1CCD6, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1D1E9, 0x1D1EB, 0x1D200, @@ -209948,14 +214503,12 @@ static const UV UNI_BC__ON_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -209975,26 +214528,32 @@ static const UV UNI_BC__ON_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* EBCDIC 037 */ @@ -210345,6 +214904,18 @@ static const UV UNI_BENG_invlist[] = { 0xA8F2 }; +static const UV UNI_BERF_invlist[] = { /* for all charsets */ + 5, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4 +}; + static const UV UNI_BHKS_invlist[] = { /* for all charsets */ 9, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -212304,7 +216875,7 @@ static const UV UNI_BYZANTINEMUSIC_invli # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_C_invlist[] = { /* for ASCII/Latin1 */ - 1471, /* Number of elements */ + 1481, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -212360,7 +216931,7 @@ static const UV UNI_C_invlist[] = { /* 0x860, 0x86B, 0x870, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -212529,7 +217100,7 @@ static const UV UNI_C_invlist[] = { /* 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -212553,7 +217124,7 @@ static const UV UNI_C_invlist[] = { /* 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -212746,7 +217317,9 @@ static const UV UNI_C_invlist[] = { /* 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -212808,7 +217381,7 @@ static const UV UNI_C_invlist[] = { /* 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -212820,8 +217393,6 @@ static const UV UNI_C_invlist[] = { /* 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -212882,14 +217453,8 @@ static const UV UNI_C_invlist[] = { /* 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -212960,12 +217525,6 @@ static const UV UNI_C_invlist[] = { /* 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -213106,7 +217665,7 @@ static const UV UNI_C_invlist[] = { /* 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -213170,8 +217729,10 @@ static const UV UNI_C_invlist[] = { /* 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -213337,6 +217898,8 @@ static const UV UNI_C_invlist[] = { /* 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -213381,6 +217944,10 @@ static const UV UNI_C_invlist[] = { /* 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -213441,6 +218008,10 @@ static const UV UNI_C_invlist[] = { /* 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -213450,13 +218021,13 @@ static const UV UNI_C_invlist[] = { /* 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -213486,9 +218057,13 @@ static const UV UNI_C_invlist[] = { /* 0x1BC9C, 0x1BCA0, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -213597,6 +218172,12 @@ static const UV UNI_C_invlist[] = { /* 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -213712,14 +218293,12 @@ static const UV UNI_C_invlist[] = { /* 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -213739,34 +218318,36 @@ static const UV UNI_C_invlist[] = { /* 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -213776,7 +218357,7 @@ static const UV UNI_C_invlist[] = { /* 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -213789,7 +218370,7 @@ static const UV UNI_C_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_C_invlist[] = { /* for EBCDIC 1047 */ - 1471, /* Number of elements */ + 1481, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -213845,7 +218426,7 @@ static const UV UNI_C_invlist[] = { /* 0x860, 0x86B, 0x870, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -214014,7 +218595,7 @@ static const UV UNI_C_invlist[] = { /* 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -214038,7 +218619,7 @@ static const UV UNI_C_invlist[] = { /* 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -214231,7 +218812,9 @@ static const UV UNI_C_invlist[] = { /* 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -214293,7 +218876,7 @@ static const UV UNI_C_invlist[] = { /* 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -214305,8 +218888,6 @@ static const UV UNI_C_invlist[] = { /* 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -214367,14 +218948,8 @@ static const UV UNI_C_invlist[] = { /* 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -214445,12 +219020,6 @@ static const UV UNI_C_invlist[] = { /* 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -214591,7 +219160,7 @@ static const UV UNI_C_invlist[] = { /* 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -214655,8 +219224,10 @@ static const UV UNI_C_invlist[] = { /* 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -214822,6 +219393,8 @@ static const UV UNI_C_invlist[] = { /* 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -214866,6 +219439,10 @@ static const UV UNI_C_invlist[] = { /* 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -214926,6 +219503,10 @@ static const UV UNI_C_invlist[] = { /* 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -214935,13 +219516,13 @@ static const UV UNI_C_invlist[] = { /* 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -214971,9 +219552,13 @@ static const UV UNI_C_invlist[] = { /* 0x1BC9C, 0x1BCA0, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -215082,6 +219667,12 @@ static const UV UNI_C_invlist[] = { /* 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -215197,14 +219788,12 @@ static const UV UNI_C_invlist[] = { /* 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -215224,34 +219813,36 @@ static const UV UNI_C_invlist[] = { /* 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -215261,7 +219852,7 @@ static const UV UNI_C_invlist[] = { /* 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -215274,7 +219865,7 @@ static const UV UNI_C_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_C_invlist[] = { /* for EBCDIC 037 */ - 1471, /* Number of elements */ + 1481, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -215330,7 +219921,7 @@ static const UV UNI_C_invlist[] = { /* 0x860, 0x86B, 0x870, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -215499,7 +220090,7 @@ static const UV UNI_C_invlist[] = { /* 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -215523,7 +220114,7 @@ static const UV UNI_C_invlist[] = { /* 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -215716,7 +220307,9 @@ static const UV UNI_C_invlist[] = { /* 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -215778,7 +220371,7 @@ static const UV UNI_C_invlist[] = { /* 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -215790,8 +220383,6 @@ static const UV UNI_C_invlist[] = { /* 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -215852,14 +220443,8 @@ static const UV UNI_C_invlist[] = { /* 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -215930,12 +220515,6 @@ static const UV UNI_C_invlist[] = { /* 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -216076,7 +220655,7 @@ static const UV UNI_C_invlist[] = { /* 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -216140,8 +220719,10 @@ static const UV UNI_C_invlist[] = { /* 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -216307,6 +220888,8 @@ static const UV UNI_C_invlist[] = { /* 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -216351,6 +220934,10 @@ static const UV UNI_C_invlist[] = { /* 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -216411,6 +220998,10 @@ static const UV UNI_C_invlist[] = { /* 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -216420,13 +221011,13 @@ static const UV UNI_C_invlist[] = { /* 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -216456,9 +221047,13 @@ static const UV UNI_C_invlist[] = { /* 0x1BC9C, 0x1BCA0, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -216567,6 +221162,12 @@ static const UV UNI_C_invlist[] = { /* 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -216682,14 +221283,12 @@ static const UV UNI_C_invlist[] = { /* 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -216709,34 +221308,36 @@ static const UV UNI_C_invlist[] = { /* 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -216746,7 +221347,7 @@ static const UV UNI_C_invlist[] = { /* 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -216856,7 +221457,7 @@ static const UV UNI_CARI_invlist[] = { # endif /* EBCDIC 037 */ static const UV UNI_CCC__0_invlist[] = { /* for all charsets */ - 393, /* Number of elements */ + 405, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -217018,7 +221619,9 @@ static const UV UNI_CCC__0_invlist[] = { 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B34, 0x1B35, 0x1B44, @@ -217127,6 +221730,8 @@ static const UV UNI_CCC__0_invlist[] = { 0x10D6E, 0x10EAB, 0x10EAD, + 0x10EFA, + 0x10EFC, 0x10EFD, 0x10F00, 0x10F46, @@ -217249,6 +221854,14 @@ static const UV UNI_CCC__0_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -217908,7 +222521,7 @@ static const UV UNI_CCC__91_invlist[] = }; static const UV UNI_CCC__A_invlist[] = { /* for all charsets */ - 263, /* Number of elements */ + 275, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -218044,7 +222657,11 @@ static const UV UNI_CCC__A_invlist[] = { 0x1AC5, 0x1ACA, 0x1ACB, - 0x1ACF, + 0x1ADD, + 0x1AE0, + 0x1AE6, + 0x1AE7, + 0x1AEB, 0x1B6B, 0x1B6C, 0x1B6D, @@ -218173,6 +222790,14 @@ static const UV UNI_CCC__A_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5EF, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E944, 0x1E94A }; @@ -218214,7 +222839,7 @@ static const UV UNI_CCC__AR_invlist[] = }; static const UV UNI_CCC__B_invlist[] = { /* for all charsets */ - 173, /* Number of elements */ + 179, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -218329,6 +222954,10 @@ static const UV UNI_CCC__B_invlist[] = { 0x1AC5, 0x1ACA, 0x1ACB, + 0x1ADD, + 0x1ADE, + 0x1AE6, + 0x1AE7, 0x1B6C, 0x1B6D, 0x1CD5, @@ -218369,6 +222998,8 @@ static const UV UNI_CCC__B_invlist[] = { 0x10A3B, 0x10AE6, 0x10AE7, + 0x10EFA, + 0x10EFC, 0x10EFD, 0x10F00, 0x10F46, @@ -218422,7 +223053,7 @@ static const UV UNI_CCC__BR_invlist[] = }; static const UV UNI_CCC__DA_invlist[] = { /* for all charsets */ - 7, /* Number of elements */ + 9, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -218431,6 +223062,8 @@ static const UV UNI_CCC__DA_invlist[] = 0x35F, 0x360, 0x362, + 0x1AEB, + 0x1AEC, 0x1DCD, 0x1DCE }; @@ -218796,7 +223429,7 @@ static const UV UNI_CHRS_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_CI_invlist[] = { /* for ASCII/Latin1 */ - 905, /* Number of elements */ + 929, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -219132,7 +223765,9 @@ static const UV UNI_CI_invlist[] = { /* 0x1AA7, 0x1AA8, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -219265,7 +223900,7 @@ static const UV UNI_CI_invlist[] = { /* 0xA771, 0xA788, 0xA78B, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -219411,7 +224046,9 @@ static const UV UNI_CI_invlist[] = { /* 0x10D70, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EC5, + 0x10EC6, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -219565,6 +224202,12 @@ static const UV UNI_CI_invlist[] = { /* 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -219595,6 +224238,8 @@ static const UV UNI_CI_invlist[] = { /* 0x11D96, 0x11D97, 0x11D98, + 0x11DD9, + 0x11DDA, 0x11EF3, 0x11EF5, 0x11F00, @@ -219633,6 +224278,8 @@ static const UV UNI_CI_invlist[] = { /* 0x16FE2, 0x16FE3, 0x16FE5, + 0x16FF2, + 0x16FF4, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -219693,6 +224340,16 @@ static const UV UNI_CI_invlist[] = { /* 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, + 0x1E6FF, + 0x1E700, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -219715,7 +224372,7 @@ static const UV UNI_CI_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_CI_invlist[] = { /* for EBCDIC 1047 */ - 903, /* Number of elements */ + 927, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -220049,7 +224706,9 @@ static const UV UNI_CI_invlist[] = { /* 0x1AA7, 0x1AA8, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -220182,7 +224841,7 @@ static const UV UNI_CI_invlist[] = { /* 0xA771, 0xA788, 0xA78B, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -220328,7 +224987,9 @@ static const UV UNI_CI_invlist[] = { /* 0x10D70, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EC5, + 0x10EC6, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -220482,6 +225143,12 @@ static const UV UNI_CI_invlist[] = { /* 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -220512,6 +225179,8 @@ static const UV UNI_CI_invlist[] = { /* 0x11D96, 0x11D97, 0x11D98, + 0x11DD9, + 0x11DDA, 0x11EF3, 0x11EF5, 0x11F00, @@ -220550,6 +225219,8 @@ static const UV UNI_CI_invlist[] = { /* 0x16FE2, 0x16FE3, 0x16FE5, + 0x16FF2, + 0x16FF4, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -220610,6 +225281,16 @@ static const UV UNI_CI_invlist[] = { /* 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, + 0x1E6FF, + 0x1E700, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -220632,7 +225313,7 @@ static const UV UNI_CI_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_CI_invlist[] = { /* for EBCDIC 037 */ - 901, /* Number of elements */ + 925, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -220964,7 +225645,9 @@ static const UV UNI_CI_invlist[] = { /* 0x1AA7, 0x1AA8, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -221097,7 +225780,7 @@ static const UV UNI_CI_invlist[] = { /* 0xA771, 0xA788, 0xA78B, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -221243,7 +225926,9 @@ static const UV UNI_CI_invlist[] = { /* 0x10D70, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EC5, + 0x10EC6, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -221397,6 +226082,12 @@ static const UV UNI_CI_invlist[] = { /* 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -221427,6 +226118,8 @@ static const UV UNI_CI_invlist[] = { /* 0x11D96, 0x11D97, 0x11D98, + 0x11DD9, + 0x11DDA, 0x11EF3, 0x11EF5, 0x11F00, @@ -221465,6 +226158,8 @@ static const UV UNI_CI_invlist[] = { /* 0x16FE2, 0x16FE3, 0x16FE5, + 0x16FF2, + 0x16FF4, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -221525,6 +226220,16 @@ static const UV UNI_CI_invlist[] = { /* 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, + 0x1E6FF, + 0x1E700, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -221681,6 +226386,16 @@ static const UV UNI_CJKEXTI_invlist[] = 0x2EE60 }; +static const UV UNI_CJKEXTJ_invlist[] = { /* for all charsets */ + 3, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x323B0, + 0x33480 +}; + static const UV UNI_CJKRADICALSSUP_invlist[] = { /* for all charsets */ 3, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -221712,7 +226427,7 @@ static const UV UNI_CJKSYMBOLS_invlist[] }; static const UV UNI_CN_invlist[] = { /* for all charsets */ - 1462, /* Number of elements */ + 1470, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -221759,8 +226474,6 @@ static const UV UNI_CN_invlist[] = { /* 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -221928,7 +226641,7 @@ static const UV UNI_CN_invlist[] = { /* 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -221952,7 +226665,7 @@ static const UV UNI_CN_invlist[] = { /* 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -222143,7 +226856,9 @@ static const UV UNI_CN_invlist[] = { /* 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -222201,7 +226916,7 @@ static const UV UNI_CN_invlist[] = { /* 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -222213,8 +226928,6 @@ static const UV UNI_CN_invlist[] = { /* 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -222275,14 +226988,8 @@ static const UV UNI_CN_invlist[] = { /* 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -222353,12 +227060,6 @@ static const UV UNI_CN_invlist[] = { /* 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -222501,7 +227202,7 @@ static const UV UNI_CN_invlist[] = { /* 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -222565,8 +227266,10 @@ static const UV UNI_CN_invlist[] = { /* 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -222732,6 +227435,8 @@ static const UV UNI_CN_invlist[] = { /* 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -222776,6 +227481,10 @@ static const UV UNI_CN_invlist[] = { /* 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -222834,6 +227543,10 @@ static const UV UNI_CN_invlist[] = { /* 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -222843,13 +227556,13 @@ static const UV UNI_CN_invlist[] = { /* 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -222879,9 +227592,13 @@ static const UV UNI_CN_invlist[] = { /* 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -222988,6 +227705,12 @@ static const UV UNI_CN_invlist[] = { /* 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -223103,14 +227826,12 @@ static const UV UNI_CN_invlist[] = { /* 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -223130,34 +227851,36 @@ static const UV UNI_CN_invlist[] = { /* 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -223167,7 +227890,7 @@ static const UV UNI_CN_invlist[] = { /* 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -223551,7 +228274,7 @@ static const UV UNI_CURRENCYSYMBOLS_invl # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_CWCF_invlist[] = { /* for ASCII/Latin1 */ - 1253, /* Number of elements */ + 1261, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -224766,8 +229489,14 @@ static const UV UNI_CWCF_invlist[] = { 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -224806,6 +229535,8 @@ static const UV UNI_CWCF_invlist[] = { 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -224818,7 +229549,7 @@ static const UV UNI_CWCF_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_CWCF_invlist[] = { /* for EBCDIC 1047 */ - 1273, /* Number of elements */ + 1281, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -226053,8 +230784,14 @@ static const UV UNI_CWCF_invlist[] = { 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -226093,6 +230830,8 @@ static const UV UNI_CWCF_invlist[] = { 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -226105,7 +230844,7 @@ static const UV UNI_CWCF_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_CWCF_invlist[] = { /* for EBCDIC 037 */ - 1269, /* Number of elements */ + 1277, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -227336,8 +232075,14 @@ static const UV UNI_CWCF_invlist[] = { 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -227376,6 +232121,8 @@ static const UV UNI_CWCF_invlist[] = { 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -227597,10 +232344,6 @@ static const UV UNI_CWCM_invlist[] = { 0xA796, 0xA7AF, 0xA7B0, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D6, 0xA7DD, 0xA7F5, 0xA7F7, @@ -227650,6 +232393,10 @@ static const UV UNI_CWCM_invlist[] = { 0x118E0, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x1E900, 0x1E944 }; @@ -227906,10 +232653,6 @@ static const UV UNI_CWCM_invlist[] = { 0xA796, 0xA7AF, 0xA7B0, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D6, 0xA7DD, 0xA7F5, 0xA7F7, @@ -227959,6 +232702,10 @@ static const UV UNI_CWCM_invlist[] = { 0x118E0, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x1E900, 0x1E944 }; @@ -228211,10 +232958,6 @@ static const UV UNI_CWCM_invlist[] = { 0xA796, 0xA7AF, 0xA7B0, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D6, 0xA7DD, 0xA7F5, 0xA7F7, @@ -228264,6 +233007,10 @@ static const UV UNI_CWCM_invlist[] = { 0x118E0, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x1E900, 0x1E944 }; @@ -228273,7 +233020,7 @@ static const UV UNI_CWCM_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_CWKCF_invlist[] = { /* for ASCII/Latin1 */ - 1689, /* Number of elements */ + 1697, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -229696,8 +234443,14 @@ static const UV UNI_CWKCF_invlist[] = { 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -229706,7 +234459,7 @@ static const UV UNI_CWKCF_invlist[] = { 0xA7DB, 0xA7DC, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA7F6, 0xA7F8, 0xA7FA, @@ -229820,6 +234573,8 @@ static const UV UNI_CWKCF_invlist[] = { 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1BCA0, 0x1BCA4, 0x1CCD6, @@ -229976,7 +234731,7 @@ static const UV UNI_CWKCF_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_CWKCF_invlist[] = { /* for EBCDIC 1047 */ - 1699, /* Number of elements */ + 1707, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -231409,8 +236164,14 @@ static const UV UNI_CWKCF_invlist[] = { 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -231419,7 +236180,7 @@ static const UV UNI_CWKCF_invlist[] = { 0xA7DB, 0xA7DC, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA7F6, 0xA7F8, 0xA7FA, @@ -231533,6 +236294,8 @@ static const UV UNI_CWKCF_invlist[] = { 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1BCA0, 0x1BCA4, 0x1CCD6, @@ -231689,7 +236452,7 @@ static const UV UNI_CWKCF_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_CWKCF_invlist[] = { /* for EBCDIC 037 */ - 1697, /* Number of elements */ + 1705, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -233120,8 +237883,14 @@ static const UV UNI_CWKCF_invlist[] = { 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -233130,7 +237899,7 @@ static const UV UNI_CWKCF_invlist[] = { 0xA7DB, 0xA7DC, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA7F6, 0xA7F8, 0xA7FA, @@ -233244,6 +238013,8 @@ static const UV UNI_CWKCF_invlist[] = { 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1BCA0, 0x1BCA4, 0x1CCD6, @@ -233397,7 +238168,7 @@ static const UV UNI_CWKCF_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_CWL_invlist[] = { /* for ASCII/Latin1 */ - 1229, /* Number of elements */ + 1237, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -234594,8 +239365,14 @@ static const UV UNI_CWL_invlist[] = { / 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -234628,6 +239405,8 @@ static const UV UNI_CWL_invlist[] = { / 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -234640,7 +239419,7 @@ static const UV UNI_CWL_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_CWL_invlist[] = { /* for EBCDIC 1047 */ - 1247, /* Number of elements */ + 1255, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -235855,8 +240634,14 @@ static const UV UNI_CWL_invlist[] = { / 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -235889,6 +240674,8 @@ static const UV UNI_CWL_invlist[] = { / 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -235901,7 +240688,7 @@ static const UV UNI_CWL_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_CWL_invlist[] = { /* for EBCDIC 037 */ - 1243, /* Number of elements */ + 1251, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -237112,8 +241899,14 @@ static const UV UNI_CWL_invlist[] = { / 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -237146,6 +241939,8 @@ static const UV UNI_CWL_invlist[] = { / 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1E900, 0x1E922 }; @@ -237155,7 +241950,7 @@ static const UV UNI_CWL_invlist[] = { / # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_CWT_invlist[] = { /* for ASCII/Latin1 */ - 1259, /* Number of elements */ + 1267, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -238376,8 +243171,14 @@ static const UV UNI_CWT_invlist[] = { / 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -238416,6 +243217,8 @@ static const UV UNI_CWT_invlist[] = { / 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -238428,7 +243231,7 @@ static const UV UNI_CWT_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_CWT_invlist[] = { /* for EBCDIC 1047 */ - 1273, /* Number of elements */ + 1281, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -239663,9 +244466,15 @@ static const UV UNI_CWT_invlist[] = { / 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, - 0xA7D7, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, + 0xA7D7, 0xA7D8, 0xA7D9, 0xA7DA, @@ -239703,6 +244512,8 @@ static const UV UNI_CWT_invlist[] = { / 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -239715,7 +244526,7 @@ static const UV UNI_CWT_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_CWT_invlist[] = { /* for EBCDIC 037 */ - 1273, /* Number of elements */ + 1281, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -240950,8 +245761,14 @@ static const UV UNI_CWT_invlist[] = { / 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -240990,6 +245807,8 @@ static const UV UNI_CWT_invlist[] = { / 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -240999,7 +245818,7 @@ static const UV UNI_CWT_invlist[] = { / # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_CWU_invlist[] = { /* for ASCII/Latin1 */ - 1261, /* Number of elements */ + 1269, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -242222,8 +247041,14 @@ static const UV UNI_CWU_invlist[] = { / 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -242262,6 +247087,8 @@ static const UV UNI_CWU_invlist[] = { / 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -242274,7 +247101,7 @@ static const UV UNI_CWU_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_CWU_invlist[] = { /* for EBCDIC 1047 */ - 1275, /* Number of elements */ + 1283, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -243511,8 +248338,14 @@ static const UV UNI_CWU_invlist[] = { / 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -243551,6 +248384,8 @@ static const UV UNI_CWU_invlist[] = { / 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -243563,7 +248398,7 @@ static const UV UNI_CWU_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_CWU_invlist[] = { /* for EBCDIC 037 */ - 1275, /* Number of elements */ + 1283, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -244800,8 +249635,14 @@ static const UV UNI_CWU_invlist[] = { / 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7D6, 0xA7D7, 0xA7D8, 0xA7D9, @@ -244840,6 +249681,8 @@ static const UV UNI_CWU_invlist[] = { / 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1E922, 0x1E944 }; @@ -245353,7 +250196,7 @@ static const UV UNI_DI_invlist[] = { /* # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_DIA_invlist[] = { /* for ASCII/Latin1 */ - 429, /* Number of elements */ + 441, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -245387,15 +250230,15 @@ static const UV UNI_DIA_invlist[] = { / 0x559, 0x55A, 0x591, - 0x5A2, - 0x5A3, 0x5BE, 0x5BF, 0x5C0, 0x5C1, 0x5C3, 0x5C4, - 0x5C5, + 0x5C6, + 0x5C7, + 0x5C8, 0x64B, 0x653, 0x657, @@ -245526,6 +250369,10 @@ static const UV UNI_DIA_invlist[] = { / 0x1ABF, 0x1AC1, 0x1ACC, + 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B34, 0x1B35, 0x1B44, @@ -245552,6 +250399,8 @@ static const UV UNI_DIA_invlist[] = { / 0x1CFA, 0x1D2C, 0x1D6B, + 0x1D9B, + 0x1DBF, 0x1DC4, 0x1DD0, 0x1DF5, @@ -245592,6 +250441,8 @@ static const UV UNI_DIA_invlist[] = { / 0xA722, 0xA788, 0xA78B, + 0xA7F1, + 0xA7F2, 0xA7F8, 0xA7FA, 0xA806, @@ -245658,6 +250509,8 @@ static const UV UNI_DIA_invlist[] = { / 0x10D4F, 0x10D69, 0x10D6E, + 0x10EFA, + 0x10EFB, 0x10EFD, 0x10F00, 0x10F46, @@ -245732,6 +250585,8 @@ static const UV UNI_DIA_invlist[] = { / 0x11D46, 0x11D97, 0x11D98, + 0x11DD9, + 0x11DDA, 0x11F41, 0x11F43, 0x11F5A, @@ -245796,7 +250651,7 @@ static const UV UNI_DIA_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_DIA_invlist[] = { /* for EBCDIC 1047 */ - 429, /* Number of elements */ + 441, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -245830,15 +250685,15 @@ static const UV UNI_DIA_invlist[] = { / 0x559, 0x55A, 0x591, - 0x5A2, - 0x5A3, 0x5BE, 0x5BF, 0x5C0, 0x5C1, 0x5C3, 0x5C4, - 0x5C5, + 0x5C6, + 0x5C7, + 0x5C8, 0x64B, 0x653, 0x657, @@ -245969,6 +250824,10 @@ static const UV UNI_DIA_invlist[] = { / 0x1ABF, 0x1AC1, 0x1ACC, + 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B34, 0x1B35, 0x1B44, @@ -245995,6 +250854,8 @@ static const UV UNI_DIA_invlist[] = { / 0x1CFA, 0x1D2C, 0x1D6B, + 0x1D9B, + 0x1DBF, 0x1DC4, 0x1DD0, 0x1DF5, @@ -246035,6 +250896,8 @@ static const UV UNI_DIA_invlist[] = { / 0xA722, 0xA788, 0xA78B, + 0xA7F1, + 0xA7F2, 0xA7F8, 0xA7FA, 0xA806, @@ -246101,6 +250964,8 @@ static const UV UNI_DIA_invlist[] = { / 0x10D4F, 0x10D69, 0x10D6E, + 0x10EFA, + 0x10EFB, 0x10EFD, 0x10F00, 0x10F46, @@ -246175,6 +251040,8 @@ static const UV UNI_DIA_invlist[] = { / 0x11D46, 0x11D97, 0x11D98, + 0x11DD9, + 0x11DDA, 0x11F41, 0x11F43, 0x11F5A, @@ -246239,7 +251106,7 @@ static const UV UNI_DIA_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_DIA_invlist[] = { /* for EBCDIC 037 */ - 427, /* Number of elements */ + 439, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -246271,15 +251138,15 @@ static const UV UNI_DIA_invlist[] = { / 0x559, 0x55A, 0x591, - 0x5A2, - 0x5A3, 0x5BE, 0x5BF, 0x5C0, 0x5C1, 0x5C3, 0x5C4, - 0x5C5, + 0x5C6, + 0x5C7, + 0x5C8, 0x64B, 0x653, 0x657, @@ -246410,6 +251277,10 @@ static const UV UNI_DIA_invlist[] = { / 0x1ABF, 0x1AC1, 0x1ACC, + 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B34, 0x1B35, 0x1B44, @@ -246436,6 +251307,8 @@ static const UV UNI_DIA_invlist[] = { / 0x1CFA, 0x1D2C, 0x1D6B, + 0x1D9B, + 0x1DBF, 0x1DC4, 0x1DD0, 0x1DF5, @@ -246476,6 +251349,8 @@ static const UV UNI_DIA_invlist[] = { / 0xA722, 0xA788, 0xA78B, + 0xA7F1, + 0xA7F2, 0xA7F8, 0xA7FA, 0xA806, @@ -246542,6 +251417,8 @@ static const UV UNI_DIA_invlist[] = { / 0x10D4F, 0x10D69, 0x10D6E, + 0x10EFA, + 0x10EFB, 0x10EFD, 0x10F00, 0x10F46, @@ -246616,6 +251493,8 @@ static const UV UNI_DIA_invlist[] = { / 0x11D46, 0x11D97, 0x11D98, + 0x11DD9, + 0x11DDA, 0x11F41, 0x11F43, 0x11F5A, @@ -250004,7 +254883,7 @@ static const UV UNI_DT__NONCANON_invlist 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -250411,7 +255290,7 @@ static const UV UNI_DT__NONCANON_invlist 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -250816,7 +255695,7 @@ static const UV UNI_DT__NONCANON_invlist 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -251570,7 +256449,7 @@ static const UV UNI_DT__NONE_invlist[] = 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -252399,7 +257278,7 @@ static const UV UNI_DT__NONE_invlist[] = 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -253230,7 +258109,7 @@ static const UV UNI_DT__NONE_invlist[] = 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -253608,7 +258487,7 @@ static const UV UNI_DT__SUP_invlist[] = 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -253687,7 +258566,7 @@ static const UV UNI_DT__SUP_invlist[] = 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -253766,7 +258645,7 @@ static const UV UNI_DT__SUP_invlist[] = 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -255071,7 +259950,7 @@ static const UV UNI_EA__H_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_EA__N_invlist[] = { /* for ASCII/Latin1 */ - 565, /* Number of elements */ + 567, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -255507,13 +260386,13 @@ static const UV UNI_EA__N_invlist[] = { 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -255601,7 +260480,7 @@ static const UV UNI_EA__N_invlist[] = { 0x1F6D0, 0x1F6D3, 0x1F6D5, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6E0, 0x1F6EB, @@ -255621,14 +260500,16 @@ static const UV UNI_EA__N_invlist[] = { 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x20000, 0x2FFFE, @@ -255650,7 +260531,7 @@ static const UV UNI_EA__N_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_EA__N_invlist[] = { /* for EBCDIC 1047 */ - 563, /* Number of elements */ + 565, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -256084,13 +260965,13 @@ static const UV UNI_EA__N_invlist[] = { 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -256178,7 +261059,7 @@ static const UV UNI_EA__N_invlist[] = { 0x1F6D0, 0x1F6D3, 0x1F6D5, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6E0, 0x1F6EB, @@ -256198,14 +261079,16 @@ static const UV UNI_EA__N_invlist[] = { 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x20000, 0x2FFFE, @@ -256227,7 +261110,7 @@ static const UV UNI_EA__N_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_EA__N_invlist[] = { /* for EBCDIC 037 */ - 563, /* Number of elements */ + 565, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -256661,13 +261544,13 @@ static const UV UNI_EA__N_invlist[] = { 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -256755,7 +261638,7 @@ static const UV UNI_EA__N_invlist[] = { 0x1F6D0, 0x1F6D3, 0x1F6D5, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6E0, 0x1F6EB, @@ -256775,14 +261658,16 @@ static const UV UNI_EA__N_invlist[] = { 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x20000, 0x2FFFE, @@ -256925,7 +261810,7 @@ static const UV UNI_EA__NA_invlist[] = { # endif /* EBCDIC 037 */ static const UV UNI_EA__W_invlist[] = { /* for all charsets */ - 243, /* Number of elements */ + 245, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -257049,13 +261934,13 @@ static const UV UNI_EA__W_invlist[] = { 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -257139,7 +262024,7 @@ static const UV UNI_EA__W_invlist[] = { 0x1F6D0, 0x1F6D3, 0x1F6D5, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6E0, 0x1F6EB, @@ -257159,14 +262044,16 @@ static const UV UNI_EA__W_invlist[] = { 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x20000, 0x2FFFE, @@ -257489,7 +262376,7 @@ static const UV UNI_EMOD_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_EMOJI_invlist[] = { /* for ASCII/Latin1 */ - 301, /* Number of elements */ + 303, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -257761,7 +262648,7 @@ static const UV UNI_EMOJI_invlist[] = { 0x1F6CB, 0x1F6D3, 0x1F6D5, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6E6, 0x1F6E9, @@ -257785,14 +262672,16 @@ static const UV UNI_EMOJI_invlist[] = { 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9 }; @@ -257804,7 +262693,7 @@ static const UV UNI_EMOJI_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_EMOJI_invlist[] = { /* for EBCDIC 1047 */ - 301, /* Number of elements */ + 303, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -258076,7 +262965,7 @@ static const UV UNI_EMOJI_invlist[] = { 0x1F6CB, 0x1F6D3, 0x1F6D5, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6E6, 0x1F6E9, @@ -258100,14 +262989,16 @@ static const UV UNI_EMOJI_invlist[] = { 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9 }; @@ -258119,7 +263010,7 @@ static const UV UNI_EMOJI_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_EMOJI_invlist[] = { /* for EBCDIC 037 */ - 301, /* Number of elements */ + 303, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -258391,7 +263282,7 @@ static const UV UNI_EMOJI_invlist[] = { 0x1F6CB, 0x1F6D3, 0x1F6D5, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6E6, 0x1F6E9, @@ -258415,14 +263306,16 @@ static const UV UNI_EMOJI_invlist[] = { 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9 }; @@ -258479,7 +263372,7 @@ static const UV UNI_ENCLOSEDIDEOGRAPHICS }; static const UV UNI_EPRES_invlist[] = { /* for all charsets */ - 161, /* Number of elements */ + 163, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -258615,7 +263508,7 @@ static const UV UNI_EPRES_invlist[] = { 0x1F6D0, 0x1F6D3, 0x1F6D5, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6E0, 0x1F6EB, @@ -258635,14 +263528,16 @@ static const UV UNI_EPRES_invlist[] = { 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9 }; @@ -258771,7 +263666,7 @@ static const UV UNI_ETHIOPICSUP_invlist[ # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_EXT_invlist[] = { /* for ASCII/Latin1 */ - 83, /* Number of elements */ + 87, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -258846,12 +263741,16 @@ static const UV UNI_EXT_invlist[] = { / 0x115C9, 0x11A98, 0x11A99, + 0x11DD9, + 0x11DDA, 0x16B42, 0x16B44, 0x16FE0, 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF4, 0x1E13C, 0x1E13E, 0x1E5EF, @@ -258868,7 +263767,7 @@ static const UV UNI_EXT_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_EXT_invlist[] = { /* for EBCDIC 1047 */ - 83, /* Number of elements */ + 87, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -258943,12 +263842,16 @@ static const UV UNI_EXT_invlist[] = { / 0x115C9, 0x11A98, 0x11A99, + 0x11DD9, + 0x11DDA, 0x16B42, 0x16B44, 0x16FE0, 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF4, 0x1E13C, 0x1E13E, 0x1E5EF, @@ -258965,7 +263868,7 @@ static const UV UNI_EXT_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_EXT_invlist[] = { /* for EBCDIC 037 */ - 83, /* Number of elements */ + 87, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -259040,12 +263943,16 @@ static const UV UNI_EXT_invlist[] = { / 0x115C9, 0x11A98, 0x11A99, + 0x11DD9, + 0x11DDA, 0x16B42, 0x16B44, 0x16FE0, 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF4, 0x1E13C, 0x1E13E, 0x1E5EF, @@ -259059,7 +263966,7 @@ static const UV UNI_EXT_invlist[] = { / # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_EXTPICT_invlist[] = { /* for ASCII/Latin1 */ - 157, /* Number of elements */ + 313, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -259084,8 +263991,6 @@ static const UV UNI_EXTPICT_invlist[] = 0x231C, 0x2328, 0x2329, - 0x2388, - 0x2389, 0x23CF, 0x23D0, 0x23E9, @@ -259103,14 +264008,90 @@ static const UV UNI_EXTPICT_invlist[] = 0x25FB, 0x25FF, 0x2600, - 0x2606, - 0x2607, - 0x2613, + 0x2605, + 0x260E, + 0x260F, + 0x2611, + 0x2612, 0x2614, - 0x2686, - 0x2690, + 0x2616, + 0x2618, + 0x2619, + 0x261D, + 0x261E, + 0x2620, + 0x2621, + 0x2622, + 0x2624, + 0x2626, + 0x2627, + 0x262A, + 0x262B, + 0x262E, + 0x2630, + 0x2638, + 0x263B, + 0x2640, + 0x2641, + 0x2642, + 0x2643, + 0x2648, + 0x2654, + 0x265F, + 0x2661, + 0x2663, + 0x2664, + 0x2665, + 0x2667, + 0x2668, + 0x2669, + 0x267B, + 0x267C, + 0x267E, + 0x2680, + 0x2692, + 0x2698, + 0x2699, + 0x269A, + 0x269B, + 0x269D, + 0x26A0, + 0x26A2, + 0x26A7, + 0x26A8, + 0x26AA, + 0x26AC, + 0x26B0, + 0x26B2, + 0x26BD, + 0x26BF, + 0x26C4, + 0x26C6, + 0x26C8, + 0x26C9, + 0x26CE, + 0x26D0, + 0x26D1, + 0x26D2, + 0x26D3, + 0x26D5, + 0x26E9, + 0x26EB, + 0x26F0, + 0x26F6, + 0x26F7, + 0x26FB, + 0x26FD, + 0x26FE, + 0x2702, + 0x2703, + 0x2705, 0x2706, 0x2708, + 0x270E, + 0x270F, + 0x2710, + 0x2712, 0x2713, 0x2714, 0x2715, @@ -259137,7 +264118,7 @@ static const UV UNI_EXTPICT_invlist[] = 0x2757, 0x2758, 0x2763, - 0x2768, + 0x2765, 0x2795, 0x2798, 0x27A1, @@ -259164,13 +264145,21 @@ static const UV UNI_EXTPICT_invlist[] = 0x3298, 0x3299, 0x329A, - 0x1F000, + 0x1F004, + 0x1F005, + 0x1F02C, + 0x1F030, + 0x1F094, + 0x1F0A0, + 0x1F0AF, + 0x1F0B1, + 0x1F0C0, + 0x1F0C1, + 0x1F0CF, + 0x1F0D1, + 0x1F0F6, 0x1F100, - 0x1F10D, - 0x1F110, - 0x1F12F, - 0x1F130, - 0x1F16C, + 0x1F170, 0x1F172, 0x1F17E, 0x1F180, @@ -259178,7 +264167,7 @@ static const UV UNI_EXTPICT_invlist[] = 0x1F18F, 0x1F191, 0x1F19B, - 0x1F1AD, + 0x1F1AE, 0x1F1E6, 0x1F201, 0x1F210, @@ -259191,16 +264180,80 @@ static const UV UNI_EXTPICT_invlist[] = 0x1F23C, 0x1F240, 0x1F249, + 0x1F260, + 0x1F266, + 0x1F322, + 0x1F324, + 0x1F394, + 0x1F396, + 0x1F398, + 0x1F399, + 0x1F39C, + 0x1F39E, + 0x1F3F1, + 0x1F3F3, + 0x1F3F6, + 0x1F3F7, 0x1F3FB, 0x1F400, + 0x1F4FE, + 0x1F4FF, 0x1F53E, - 0x1F546, + 0x1F549, + 0x1F54F, + 0x1F550, + 0x1F568, + 0x1F56F, + 0x1F571, + 0x1F573, + 0x1F57B, + 0x1F587, + 0x1F588, + 0x1F58A, + 0x1F58E, + 0x1F590, + 0x1F591, + 0x1F595, + 0x1F597, + 0x1F5A4, + 0x1F5A6, + 0x1F5A8, + 0x1F5A9, + 0x1F5B1, + 0x1F5B3, + 0x1F5BC, + 0x1F5BD, + 0x1F5C2, + 0x1F5C5, + 0x1F5D1, + 0x1F5D4, + 0x1F5DC, + 0x1F5DF, + 0x1F5E1, + 0x1F5E2, + 0x1F5E3, + 0x1F5E4, + 0x1F5E8, + 0x1F5E9, + 0x1F5EF, + 0x1F5F0, + 0x1F5F3, + 0x1F5F4, + 0x1F5FA, 0x1F650, 0x1F680, + 0x1F6C6, + 0x1F6CB, + 0x1F6D3, + 0x1F6D5, + 0x1F6E6, + 0x1F6E9, + 0x1F6EA, + 0x1F6EB, + 0x1F6F1, + 0x1F6F3, 0x1F700, - 0x1F774, - 0x1F780, - 0x1F7D5, + 0x1F7DA, 0x1F800, 0x1F80C, 0x1F810, @@ -259211,12 +264264,22 @@ static const UV UNI_EXTPICT_invlist[] = 0x1F888, 0x1F890, 0x1F8AE, + 0x1F8B0, + 0x1F8BC, + 0x1F8C0, + 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1F93B, 0x1F93C, 0x1F946, 0x1F947, + 0x1FA00, + 0x1FA58, + 0x1FA60, + 0x1FA6E, 0x1FB00, 0x1FC00, 0x1FFFE @@ -259230,7 +264293,7 @@ static const UV UNI_EXTPICT_invlist[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_EXTPICT_invlist[] = { /* for EBCDIC 1047 */ - 157, /* Number of elements */ + 313, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -259255,8 +264318,6 @@ static const UV UNI_EXTPICT_invlist[] = 0x231C, 0x2328, 0x2329, - 0x2388, - 0x2389, 0x23CF, 0x23D0, 0x23E9, @@ -259274,14 +264335,90 @@ static const UV UNI_EXTPICT_invlist[] = 0x25FB, 0x25FF, 0x2600, - 0x2606, - 0x2607, - 0x2613, + 0x2605, + 0x260E, + 0x260F, + 0x2611, + 0x2612, 0x2614, - 0x2686, - 0x2690, + 0x2616, + 0x2618, + 0x2619, + 0x261D, + 0x261E, + 0x2620, + 0x2621, + 0x2622, + 0x2624, + 0x2626, + 0x2627, + 0x262A, + 0x262B, + 0x262E, + 0x2630, + 0x2638, + 0x263B, + 0x2640, + 0x2641, + 0x2642, + 0x2643, + 0x2648, + 0x2654, + 0x265F, + 0x2661, + 0x2663, + 0x2664, + 0x2665, + 0x2667, + 0x2668, + 0x2669, + 0x267B, + 0x267C, + 0x267E, + 0x2680, + 0x2692, + 0x2698, + 0x2699, + 0x269A, + 0x269B, + 0x269D, + 0x26A0, + 0x26A2, + 0x26A7, + 0x26A8, + 0x26AA, + 0x26AC, + 0x26B0, + 0x26B2, + 0x26BD, + 0x26BF, + 0x26C4, + 0x26C6, + 0x26C8, + 0x26C9, + 0x26CE, + 0x26D0, + 0x26D1, + 0x26D2, + 0x26D3, + 0x26D5, + 0x26E9, + 0x26EB, + 0x26F0, + 0x26F6, + 0x26F7, + 0x26FB, + 0x26FD, + 0x26FE, + 0x2702, + 0x2703, + 0x2705, 0x2706, 0x2708, + 0x270E, + 0x270F, + 0x2710, + 0x2712, 0x2713, 0x2714, 0x2715, @@ -259308,7 +264445,7 @@ static const UV UNI_EXTPICT_invlist[] = 0x2757, 0x2758, 0x2763, - 0x2768, + 0x2765, 0x2795, 0x2798, 0x27A1, @@ -259335,13 +264472,21 @@ static const UV UNI_EXTPICT_invlist[] = 0x3298, 0x3299, 0x329A, - 0x1F000, + 0x1F004, + 0x1F005, + 0x1F02C, + 0x1F030, + 0x1F094, + 0x1F0A0, + 0x1F0AF, + 0x1F0B1, + 0x1F0C0, + 0x1F0C1, + 0x1F0CF, + 0x1F0D1, + 0x1F0F6, 0x1F100, - 0x1F10D, - 0x1F110, - 0x1F12F, - 0x1F130, - 0x1F16C, + 0x1F170, 0x1F172, 0x1F17E, 0x1F180, @@ -259349,7 +264494,7 @@ static const UV UNI_EXTPICT_invlist[] = 0x1F18F, 0x1F191, 0x1F19B, - 0x1F1AD, + 0x1F1AE, 0x1F1E6, 0x1F201, 0x1F210, @@ -259362,16 +264507,80 @@ static const UV UNI_EXTPICT_invlist[] = 0x1F23C, 0x1F240, 0x1F249, + 0x1F260, + 0x1F266, + 0x1F322, + 0x1F324, + 0x1F394, + 0x1F396, + 0x1F398, + 0x1F399, + 0x1F39C, + 0x1F39E, + 0x1F3F1, + 0x1F3F3, + 0x1F3F6, + 0x1F3F7, 0x1F3FB, 0x1F400, + 0x1F4FE, + 0x1F4FF, 0x1F53E, - 0x1F546, + 0x1F549, + 0x1F54F, + 0x1F550, + 0x1F568, + 0x1F56F, + 0x1F571, + 0x1F573, + 0x1F57B, + 0x1F587, + 0x1F588, + 0x1F58A, + 0x1F58E, + 0x1F590, + 0x1F591, + 0x1F595, + 0x1F597, + 0x1F5A4, + 0x1F5A6, + 0x1F5A8, + 0x1F5A9, + 0x1F5B1, + 0x1F5B3, + 0x1F5BC, + 0x1F5BD, + 0x1F5C2, + 0x1F5C5, + 0x1F5D1, + 0x1F5D4, + 0x1F5DC, + 0x1F5DF, + 0x1F5E1, + 0x1F5E2, + 0x1F5E3, + 0x1F5E4, + 0x1F5E8, + 0x1F5E9, + 0x1F5EF, + 0x1F5F0, + 0x1F5F3, + 0x1F5F4, + 0x1F5FA, 0x1F650, 0x1F680, + 0x1F6C6, + 0x1F6CB, + 0x1F6D3, + 0x1F6D5, + 0x1F6E6, + 0x1F6E9, + 0x1F6EA, + 0x1F6EB, + 0x1F6F1, + 0x1F6F3, 0x1F700, - 0x1F774, - 0x1F780, - 0x1F7D5, + 0x1F7DA, 0x1F800, 0x1F80C, 0x1F810, @@ -259382,12 +264591,22 @@ static const UV UNI_EXTPICT_invlist[] = 0x1F888, 0x1F890, 0x1F8AE, + 0x1F8B0, + 0x1F8BC, + 0x1F8C0, + 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1F93B, 0x1F93C, 0x1F946, 0x1F947, + 0x1FA00, + 0x1FA58, + 0x1FA60, + 0x1FA6E, 0x1FB00, 0x1FC00, 0x1FFFE @@ -259401,7 +264620,7 @@ static const UV UNI_EXTPICT_invlist[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_EXTPICT_invlist[] = { /* for EBCDIC 037 */ - 157, /* Number of elements */ + 313, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -259426,8 +264645,6 @@ static const UV UNI_EXTPICT_invlist[] = 0x231C, 0x2328, 0x2329, - 0x2388, - 0x2389, 0x23CF, 0x23D0, 0x23E9, @@ -259445,14 +264662,90 @@ static const UV UNI_EXTPICT_invlist[] = 0x25FB, 0x25FF, 0x2600, - 0x2606, - 0x2607, - 0x2613, + 0x2605, + 0x260E, + 0x260F, + 0x2611, + 0x2612, 0x2614, - 0x2686, - 0x2690, + 0x2616, + 0x2618, + 0x2619, + 0x261D, + 0x261E, + 0x2620, + 0x2621, + 0x2622, + 0x2624, + 0x2626, + 0x2627, + 0x262A, + 0x262B, + 0x262E, + 0x2630, + 0x2638, + 0x263B, + 0x2640, + 0x2641, + 0x2642, + 0x2643, + 0x2648, + 0x2654, + 0x265F, + 0x2661, + 0x2663, + 0x2664, + 0x2665, + 0x2667, + 0x2668, + 0x2669, + 0x267B, + 0x267C, + 0x267E, + 0x2680, + 0x2692, + 0x2698, + 0x2699, + 0x269A, + 0x269B, + 0x269D, + 0x26A0, + 0x26A2, + 0x26A7, + 0x26A8, + 0x26AA, + 0x26AC, + 0x26B0, + 0x26B2, + 0x26BD, + 0x26BF, + 0x26C4, + 0x26C6, + 0x26C8, + 0x26C9, + 0x26CE, + 0x26D0, + 0x26D1, + 0x26D2, + 0x26D3, + 0x26D5, + 0x26E9, + 0x26EB, + 0x26F0, + 0x26F6, + 0x26F7, + 0x26FB, + 0x26FD, + 0x26FE, + 0x2702, + 0x2703, + 0x2705, 0x2706, 0x2708, + 0x270E, + 0x270F, + 0x2710, + 0x2712, 0x2713, 0x2714, 0x2715, @@ -259479,7 +264772,7 @@ static const UV UNI_EXTPICT_invlist[] = 0x2757, 0x2758, 0x2763, - 0x2768, + 0x2765, 0x2795, 0x2798, 0x27A1, @@ -259506,13 +264799,21 @@ static const UV UNI_EXTPICT_invlist[] = 0x3298, 0x3299, 0x329A, - 0x1F000, + 0x1F004, + 0x1F005, + 0x1F02C, + 0x1F030, + 0x1F094, + 0x1F0A0, + 0x1F0AF, + 0x1F0B1, + 0x1F0C0, + 0x1F0C1, + 0x1F0CF, + 0x1F0D1, + 0x1F0F6, 0x1F100, - 0x1F10D, - 0x1F110, - 0x1F12F, - 0x1F130, - 0x1F16C, + 0x1F170, 0x1F172, 0x1F17E, 0x1F180, @@ -259520,7 +264821,7 @@ static const UV UNI_EXTPICT_invlist[] = 0x1F18F, 0x1F191, 0x1F19B, - 0x1F1AD, + 0x1F1AE, 0x1F1E6, 0x1F201, 0x1F210, @@ -259533,16 +264834,80 @@ static const UV UNI_EXTPICT_invlist[] = 0x1F23C, 0x1F240, 0x1F249, + 0x1F260, + 0x1F266, + 0x1F322, + 0x1F324, + 0x1F394, + 0x1F396, + 0x1F398, + 0x1F399, + 0x1F39C, + 0x1F39E, + 0x1F3F1, + 0x1F3F3, + 0x1F3F6, + 0x1F3F7, 0x1F3FB, 0x1F400, + 0x1F4FE, + 0x1F4FF, 0x1F53E, - 0x1F546, + 0x1F549, + 0x1F54F, + 0x1F550, + 0x1F568, + 0x1F56F, + 0x1F571, + 0x1F573, + 0x1F57B, + 0x1F587, + 0x1F588, + 0x1F58A, + 0x1F58E, + 0x1F590, + 0x1F591, + 0x1F595, + 0x1F597, + 0x1F5A4, + 0x1F5A6, + 0x1F5A8, + 0x1F5A9, + 0x1F5B1, + 0x1F5B3, + 0x1F5BC, + 0x1F5BD, + 0x1F5C2, + 0x1F5C5, + 0x1F5D1, + 0x1F5D4, + 0x1F5DC, + 0x1F5DF, + 0x1F5E1, + 0x1F5E2, + 0x1F5E3, + 0x1F5E4, + 0x1F5E8, + 0x1F5E9, + 0x1F5EF, + 0x1F5F0, + 0x1F5F3, + 0x1F5F4, + 0x1F5FA, 0x1F650, 0x1F680, + 0x1F6C6, + 0x1F6CB, + 0x1F6D3, + 0x1F6D5, + 0x1F6E6, + 0x1F6E9, + 0x1F6EA, + 0x1F6EB, + 0x1F6F1, + 0x1F6F3, 0x1F700, - 0x1F774, - 0x1F780, - 0x1F7D5, + 0x1F7DA, 0x1F800, 0x1F80C, 0x1F810, @@ -259553,12 +264918,22 @@ static const UV UNI_EXTPICT_invlist[] = 0x1F888, 0x1F890, 0x1F8AE, + 0x1F8B0, + 0x1F8BC, + 0x1F8C0, + 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1F93B, 0x1F93C, 0x1F946, 0x1F947, + 0x1FA00, + 0x1FA58, + 0x1FA60, + 0x1FA6E, 0x1FB00, 0x1FC00, 0x1FFFE @@ -259740,7 +265115,7 @@ static const UV UNI_GCB__CN_invlist[] = # endif /* EBCDIC 037 */ static const UV UNI_GCB__EX_invlist[] = { /* for all charsets */ - 753, /* Number of elements */ + 769, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -260048,7 +265423,9 @@ static const UV UNI_GCB__EX_invlist[] = 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -260209,7 +265586,7 @@ static const UV UNI_GCB__EX_invlist[] = 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -260375,6 +265752,12 @@ static const UV UNI_GCB__EX_invlist[] = 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -260487,6 +265870,14 @@ static const UV UNI_GCB__EX_invlist[] = 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -260512,7 +265903,7 @@ static const UV UNI_GCB__L_invlist[] = { }; static const UV UNI_GCB__PP_invlist[] = { /* for all charsets */ - 33, /* Number of elements */ + 31, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -260541,8 +265932,6 @@ static const UV UNI_GCB__PP_invlist[] = 0x11940, 0x11941, 0x11942, - 0x11A3A, - 0x11A3B, 0x11A84, 0x11A8A, 0x11D46, @@ -260552,7 +265941,7 @@ static const UV UNI_GCB__PP_invlist[] = }; static const UV UNI_GCB__SM_invlist[] = { /* for all charsets */ - 311, /* Number of elements */ + 317, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -260839,6 +266228,12 @@ static const UV UNI_GCB__SM_invlist[] = 0x11A59, 0x11A97, 0x11A98, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, + 0x11B68, 0x11C2F, 0x11C30, 0x11C3E, @@ -260900,7 +266295,7 @@ static const UV UNI_GCB__V_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_GCB__XX_invlist[] = { /* for ASCII/Latin1 */ - 682, /* Number of elements */ + 696, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -261193,7 +266588,9 @@ static const UV UNI_GCB__XX_invlist[] = 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -261344,7 +266741,7 @@ static const UV UNI_GCB__XX_invlist[] = 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -261461,6 +266858,8 @@ static const UV UNI_GCB__XX_invlist[] = 0x11A01, 0x11A0B, 0x11A33, + 0x11A3A, + 0x11A3B, 0x11A3F, 0x11A47, 0x11A48, @@ -261468,6 +266867,8 @@ static const UV UNI_GCB__XX_invlist[] = 0x11A5C, 0x11A84, 0x11A9A, + 0x11B60, + 0x11B68, 0x11C2F, 0x11C37, 0x11C38, @@ -261576,6 +266977,14 @@ static const UV UNI_GCB__XX_invlist[] = 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -261596,7 +267005,7 @@ static const UV UNI_GCB__XX_invlist[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_GCB__XX_invlist[] = { /* for EBCDIC 1047 */ - 682, /* Number of elements */ + 696, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -261889,7 +267298,9 @@ static const UV UNI_GCB__XX_invlist[] = 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -262040,7 +267451,7 @@ static const UV UNI_GCB__XX_invlist[] = 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -262157,6 +267568,8 @@ static const UV UNI_GCB__XX_invlist[] = 0x11A01, 0x11A0B, 0x11A33, + 0x11A3A, + 0x11A3B, 0x11A3F, 0x11A47, 0x11A48, @@ -262164,6 +267577,8 @@ static const UV UNI_GCB__XX_invlist[] = 0x11A5C, 0x11A84, 0x11A9A, + 0x11B60, + 0x11B68, 0x11C2F, 0x11C37, 0x11C38, @@ -262272,6 +267687,14 @@ static const UV UNI_GCB__XX_invlist[] = 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -262292,7 +267715,7 @@ static const UV UNI_GCB__XX_invlist[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_GCB__XX_invlist[] = { /* for EBCDIC 037 */ - 682, /* Number of elements */ + 696, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -262585,7 +268008,9 @@ static const UV UNI_GCB__XX_invlist[] = 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -262736,7 +268161,7 @@ static const UV UNI_GCB__XX_invlist[] = 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -262853,6 +268278,8 @@ static const UV UNI_GCB__XX_invlist[] = 0x11A01, 0x11A0B, 0x11A33, + 0x11A3A, + 0x11A3B, 0x11A3F, 0x11A47, 0x11A48, @@ -262860,6 +268287,8 @@ static const UV UNI_GCB__XX_invlist[] = 0x11A5C, 0x11A84, 0x11A9A, + 0x11B60, + 0x11B68, 0x11C2F, 0x11C37, 0x11C38, @@ -262968,6 +268397,14 @@ static const UV UNI_GCB__XX_invlist[] = 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -263537,7 +268974,7 @@ static const UV UNI_GRAN_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_GRBASE_invlist[] = { /* for ASCII/Latin1 */ - 1789, /* Number of elements */ + 1809, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -263627,7 +269064,7 @@ static const UV UNI_GRBASE_invlist[] = { 0x860, 0x86B, 0x870, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x903, @@ -263806,7 +269243,7 @@ static const UV UNI_GRBASE_invlist[] = { 0xC45, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -263830,7 +269267,7 @@ static const UV UNI_GRBASE_invlist[] = { 0xCC2, 0xCC3, 0xCC5, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -264183,7 +269620,7 @@ static const UV UNI_GRBASE_invlist[] = { 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x2100, 0x218C, 0x2190, @@ -264193,8 +269630,6 @@ static const UV UNI_GRBASE_invlist[] = { 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CEF, 0x2CF2, 0x2CF4, @@ -264267,14 +269702,8 @@ static const UV UNI_GRBASE_invlist[] = { 0xA6F2, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -264397,12 +269826,6 @@ static const UV UNI_GRBASE_invlist[] = { 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE00, @@ -264547,7 +269970,7 @@ static const UV UNI_GRBASE_invlist[] = { 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -264607,7 +270030,9 @@ static const UV UNI_GRBASE_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, + 0x10ED0, + 0x10ED9, 0x10F00, 0x10F28, 0x10F30, @@ -264874,6 +270299,12 @@ static const UV UNI_GRBASE_invlist[] = { 0x11AF9, 0x11B00, 0x11B0A, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -264920,6 +270351,10 @@ static const UV UNI_GRBASE_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF3, 0x11EF5, @@ -264990,6 +270425,10 @@ static const UV UNI_GRBASE_invlist[] = { 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -264998,12 +270437,14 @@ static const UV UNI_GRBASE_invlist[] = { 0x16FA0, 0x16FE0, 0x16FE4, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -265035,9 +270476,13 @@ static const UV UNI_GRBASE_invlist[] = { 0x1BC9F, 0x1BCA0, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -265148,6 +270593,18 @@ static const UV UNI_GRBASE_invlist[] = { 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -265265,14 +270722,12 @@ static const UV UNI_GRBASE_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -265292,34 +270747,36 @@ static const UV UNI_GRBASE_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -265329,7 +270786,7 @@ static const UV UNI_GRBASE_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* ASCII/Latin1 */ @@ -265340,7 +270797,7 @@ static const UV UNI_GRBASE_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_GRBASE_invlist[] = { /* for EBCDIC 1047 */ - 1789, /* Number of elements */ + 1809, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -265430,7 +270887,7 @@ static const UV UNI_GRBASE_invlist[] = { 0x860, 0x86B, 0x870, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x903, @@ -265609,7 +271066,7 @@ static const UV UNI_GRBASE_invlist[] = { 0xC45, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -265633,7 +271090,7 @@ static const UV UNI_GRBASE_invlist[] = { 0xCC2, 0xCC3, 0xCC5, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -265986,7 +271443,7 @@ static const UV UNI_GRBASE_invlist[] = { 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x2100, 0x218C, 0x2190, @@ -265996,8 +271453,6 @@ static const UV UNI_GRBASE_invlist[] = { 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CEF, 0x2CF2, 0x2CF4, @@ -266070,14 +271525,8 @@ static const UV UNI_GRBASE_invlist[] = { 0xA6F2, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -266200,12 +271649,6 @@ static const UV UNI_GRBASE_invlist[] = { 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE00, @@ -266350,7 +271793,7 @@ static const UV UNI_GRBASE_invlist[] = { 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -266410,7 +271853,9 @@ static const UV UNI_GRBASE_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, + 0x10ED0, + 0x10ED9, 0x10F00, 0x10F28, 0x10F30, @@ -266677,6 +272122,12 @@ static const UV UNI_GRBASE_invlist[] = { 0x11AF9, 0x11B00, 0x11B0A, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -266723,6 +272174,10 @@ static const UV UNI_GRBASE_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF3, 0x11EF5, @@ -266793,6 +272248,10 @@ static const UV UNI_GRBASE_invlist[] = { 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -266801,12 +272260,14 @@ static const UV UNI_GRBASE_invlist[] = { 0x16FA0, 0x16FE0, 0x16FE4, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -266838,9 +272299,13 @@ static const UV UNI_GRBASE_invlist[] = { 0x1BC9F, 0x1BCA0, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -266951,6 +272416,18 @@ static const UV UNI_GRBASE_invlist[] = { 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -267068,14 +272545,12 @@ static const UV UNI_GRBASE_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -267095,34 +272570,36 @@ static const UV UNI_GRBASE_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -267132,7 +272609,7 @@ static const UV UNI_GRBASE_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 1047 */ @@ -267143,7 +272620,7 @@ static const UV UNI_GRBASE_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_GRBASE_invlist[] = { /* for EBCDIC 037 */ - 1789, /* Number of elements */ + 1809, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -267233,7 +272710,7 @@ static const UV UNI_GRBASE_invlist[] = { 0x860, 0x86B, 0x870, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x903, @@ -267412,7 +272889,7 @@ static const UV UNI_GRBASE_invlist[] = { 0xC45, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -267436,7 +272913,7 @@ static const UV UNI_GRBASE_invlist[] = { 0xCC2, 0xCC3, 0xCC5, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -267789,7 +273266,7 @@ static const UV UNI_GRBASE_invlist[] = { 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x2100, 0x218C, 0x2190, @@ -267799,8 +273276,6 @@ static const UV UNI_GRBASE_invlist[] = { 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CEF, 0x2CF2, 0x2CF4, @@ -267873,14 +273348,8 @@ static const UV UNI_GRBASE_invlist[] = { 0xA6F2, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -268003,12 +273472,6 @@ static const UV UNI_GRBASE_invlist[] = { 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE00, @@ -268153,7 +273616,7 @@ static const UV UNI_GRBASE_invlist[] = { 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -268213,7 +273676,9 @@ static const UV UNI_GRBASE_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, + 0x10ED0, + 0x10ED9, 0x10F00, 0x10F28, 0x10F30, @@ -268480,6 +273945,12 @@ static const UV UNI_GRBASE_invlist[] = { 0x11AF9, 0x11B00, 0x11B0A, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -268526,6 +273997,10 @@ static const UV UNI_GRBASE_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF3, 0x11EF5, @@ -268596,6 +274071,10 @@ static const UV UNI_GRBASE_invlist[] = { 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -268604,12 +274083,14 @@ static const UV UNI_GRBASE_invlist[] = { 0x16FA0, 0x16FE0, 0x16FE4, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -268641,9 +274122,13 @@ static const UV UNI_GRBASE_invlist[] = { 0x1BC9F, 0x1BCA0, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -268754,6 +274239,18 @@ static const UV UNI_GRBASE_invlist[] = { 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -268871,14 +274368,12 @@ static const UV UNI_GRBASE_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -268898,34 +274393,36 @@ static const UV UNI_GRBASE_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -268935,7 +274432,7 @@ static const UV UNI_GRBASE_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 037 */ @@ -269257,7 +274754,7 @@ static const UV UNI_GREK_invlist[] = { # endif /* EBCDIC 037 */ static const UV UNI_GREXT_invlist[] = { /* for all charsets */ - 751, /* Number of elements */ + 767, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -269565,7 +275062,9 @@ static const UV UNI_GREXT_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -269726,7 +275225,7 @@ static const UV UNI_GREXT_invlist[] = { 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -269892,6 +275391,12 @@ static const UV UNI_GREXT_invlist[] = { 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -270004,6 +275509,14 @@ static const UV UNI_GREXT_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -270137,7 +275650,7 @@ static const UV UNI_HALFMARKS_invlist[] # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_HAN_invlist[] = { /* for ASCII/Latin1 */ - 85, /* Number of elements */ + 83, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -270203,7 +275716,7 @@ static const UV UNI_HAN_invlist[] = { / 0x16FE2, 0x16FE4, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x1D360, 0x1D372, 0x1F250, @@ -270211,11 +275724,9 @@ static const UV UNI_HAN_invlist[] = { / 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -270225,7 +275736,7 @@ static const UV UNI_HAN_invlist[] = { / 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* ASCII/Latin1 */ @@ -270236,7 +275747,7 @@ static const UV UNI_HAN_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_HAN_invlist[] = { /* for EBCDIC 1047 */ - 85, /* Number of elements */ + 83, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -270302,7 +275813,7 @@ static const UV UNI_HAN_invlist[] = { / 0x16FE2, 0x16FE4, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x1D360, 0x1D372, 0x1F250, @@ -270310,11 +275821,9 @@ static const UV UNI_HAN_invlist[] = { / 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -270324,7 +275833,7 @@ static const UV UNI_HAN_invlist[] = { / 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 1047 */ @@ -270335,7 +275844,7 @@ static const UV UNI_HAN_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_HAN_invlist[] = { /* for EBCDIC 037 */ - 85, /* Number of elements */ + 83, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -270401,7 +275910,7 @@ static const UV UNI_HAN_invlist[] = { / 0x16FE2, 0x16FE4, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x1D360, 0x1D372, 0x1F250, @@ -270409,11 +275918,9 @@ static const UV UNI_HAN_invlist[] = { / 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -270423,7 +275930,7 @@ static const UV UNI_HAN_invlist[] = { / 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 037 */ @@ -270793,7 +276300,7 @@ static const UV UNI_HYPHEN_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_IDC_invlist[] = { /* for ASCII/Latin1 */ - 1587, /* Number of elements */ + 1599, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -270903,7 +276410,7 @@ static const UV UNI_IDC_invlist[] = { / 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -271082,7 +276589,7 @@ static const UV UNI_IDC_invlist[] = { / 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -271108,7 +276615,7 @@ static const UV UNI_IDC_invlist[] = { / 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -271335,7 +276842,9 @@ static const UV UNI_IDC_invlist[] = { / 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -271519,14 +277028,8 @@ static const UV UNI_IDC_invlist[] = { / 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -271758,6 +277261,8 @@ static const UV UNI_IDC_invlist[] = { / 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -271815,8 +277320,8 @@ static const UV UNI_IDC_invlist[] = { / 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -272004,6 +277509,8 @@ static const UV UNI_IDC_invlist[] = { / 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -272048,6 +277555,10 @@ static const UV UNI_IDC_invlist[] = { / 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -272108,6 +277619,10 @@ static const UV UNI_IDC_invlist[] = { / 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -272119,13 +277634,13 @@ static const UV UNI_IDC_invlist[] = { / 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -272280,6 +277795,12 @@ static const UV UNI_IDC_invlist[] = { / 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -272367,11 +277888,9 @@ static const UV UNI_IDC_invlist[] = { / 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -272381,7 +277900,7 @@ static const UV UNI_IDC_invlist[] = { / 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -272394,7 +277913,7 @@ static const UV UNI_IDC_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_IDC_invlist[] = { /* for EBCDIC 1047 */ - 1611, /* Number of elements */ + 1623, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -272528,7 +278047,7 @@ static const UV UNI_IDC_invlist[] = { / 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -272707,7 +278226,7 @@ static const UV UNI_IDC_invlist[] = { / 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -272733,7 +278252,7 @@ static const UV UNI_IDC_invlist[] = { / 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -272960,7 +278479,9 @@ static const UV UNI_IDC_invlist[] = { / 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -273144,14 +278665,8 @@ static const UV UNI_IDC_invlist[] = { / 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -273383,6 +278898,8 @@ static const UV UNI_IDC_invlist[] = { / 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -273440,8 +278957,8 @@ static const UV UNI_IDC_invlist[] = { / 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -273629,6 +279146,8 @@ static const UV UNI_IDC_invlist[] = { / 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -273673,6 +279192,10 @@ static const UV UNI_IDC_invlist[] = { / 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -273733,6 +279256,10 @@ static const UV UNI_IDC_invlist[] = { / 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -273744,13 +279271,13 @@ static const UV UNI_IDC_invlist[] = { / 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -273905,6 +279432,12 @@ static const UV UNI_IDC_invlist[] = { / 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -273992,11 +279525,9 @@ static const UV UNI_IDC_invlist[] = { / 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -274006,7 +279537,7 @@ static const UV UNI_IDC_invlist[] = { / 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -274019,7 +279550,7 @@ static const UV UNI_IDC_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_IDC_invlist[] = { /* for EBCDIC 037 */ - 1607, /* Number of elements */ + 1619, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -274149,7 +279680,7 @@ static const UV UNI_IDC_invlist[] = { / 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -274328,7 +279859,7 @@ static const UV UNI_IDC_invlist[] = { / 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -274354,7 +279885,7 @@ static const UV UNI_IDC_invlist[] = { / 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -274581,7 +280112,9 @@ static const UV UNI_IDC_invlist[] = { / 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -274765,14 +280298,8 @@ static const UV UNI_IDC_invlist[] = { / 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -275004,6 +280531,8 @@ static const UV UNI_IDC_invlist[] = { / 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -275061,8 +280590,8 @@ static const UV UNI_IDC_invlist[] = { / 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -275250,6 +280779,8 @@ static const UV UNI_IDC_invlist[] = { / 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -275294,6 +280825,10 @@ static const UV UNI_IDC_invlist[] = { / 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -275354,6 +280889,10 @@ static const UV UNI_IDC_invlist[] = { / 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -275365,13 +280904,13 @@ static const UV UNI_IDC_invlist[] = { / 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -275526,6 +281065,12 @@ static const UV UNI_IDC_invlist[] = { / 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -275613,11 +281158,9 @@ static const UV UNI_IDC_invlist[] = { / 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -275627,7 +281170,7 @@ static const UV UNI_IDC_invlist[] = { / 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -275825,7 +281368,7 @@ static const UV UNI_IDCOMPATMATHSTART_in # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_IDENTIFIERSTATUS__ALLOWED_invlist[] = { /* for ASCII/Latin1 */ - 783, /* Number of elements */ + 3225, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -275849,67 +281392,97 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xD8, 0xF7, 0xF8, + 0x114, + 0x116, + 0x12C, + 0x12E, 0x132, 0x134, + 0x138, + 0x139, 0x13F, 0x141, 0x149, 0x14A, + 0x14E, + 0x150, + 0x156, + 0x158, + 0x162, + 0x164, 0x17F, - 0x18F, - 0x190, + 0x181, + 0x182, + 0x186, + 0x187, + 0x189, + 0x18B, + 0x18E, + 0x193, + 0x194, + 0x195, + 0x196, + 0x19A, + 0x19D, + 0x19E, 0x1A0, 0x1A2, 0x1AF, 0x1B1, + 0x1B2, + 0x1B5, + 0x1B7, + 0x1B8, 0x1CD, + 0x1D5, 0x1DD, 0x1DE, - 0x1E4, 0x1E6, - 0x1F1, - 0x1F4, - 0x1F6, + 0x1EA, + 0x1EE, + 0x1F0, 0x1F8, + 0x1FA, + 0x218, 0x21C, - 0x21E, - 0x220, - 0x226, - 0x234, + 0x244, + 0x245, + 0x24C, + 0x24E, + 0x253, + 0x255, + 0x256, + 0x258, 0x259, 0x25A, - 0x2BB, - 0x2BD, - 0x2EC, - 0x2ED, - 0x300, - 0x305, + 0x25B, + 0x25C, + 0x263, + 0x264, + 0x268, + 0x26A, + 0x272, + 0x273, + 0x289, + 0x28A, + 0x28B, + 0x28C, + 0x292, + 0x293, + 0x2BB, + 0x2BD, + 0x300, + 0x305, 0x306, 0x30D, - 0x30F, - 0x312, - 0x313, - 0x315, 0x31B, 0x31C, 0x323, + 0x324, + 0x326, 0x329, - 0x32D, - 0x32F, - 0x330, + 0x331, 0x332, - 0x335, - 0x336, - 0x338, - 0x33A, - 0x342, - 0x343, - 0x345, - 0x346, - 0x375, - 0x376, - 0x37B, - 0x37E, 0x386, 0x387, 0x388, @@ -275920,80 +281493,140 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x3A2, 0x3A3, 0x3CF, - 0x3FC, + 0x401, + 0x40D, + 0x40E, + 0x450, + 0x451, + 0x45D, + 0x45E, 0x460, - 0x48A, - 0x500, - 0x510, - 0x52A, - 0x52E, - 0x530, + 0x490, + 0x49C, + 0x49E, + 0x4A6, + 0x4A8, + 0x4B8, + 0x4BA, + 0x4C1, + 0x4CF, + 0x4DA, + 0x4DC, + 0x4EA, + 0x4EE, + 0x4F6, + 0x4F8, + 0x4FA, + 0x524, + 0x526, 0x531, 0x557, - 0x559, - 0x55A, 0x561, 0x587, 0x58A, 0x58B, - 0x5B4, - 0x5B5, 0x5D0, 0x5EB, - 0x5EF, + 0x5F3, 0x5F5, 0x620, - 0x640, + 0x63B, + 0x63D, + 0x63E, 0x641, + 0x653, + 0x654, 0x656, 0x660, 0x66A, 0x670, + 0x671, + 0x672, 0x673, 0x674, 0x675, 0x679, - 0x68E, - 0x68F, + 0x690, + 0x691, + 0x69B, + 0x69F, 0x6A1, 0x6A2, + 0x6A3, + 0x6A4, + 0x6AC, + 0x6AD, + 0x6B2, + 0x6B3, + 0x6B4, + 0x6B5, + 0x6B8, + 0x6BA, + 0x6BF, + 0x6C0, 0x6D4, 0x6D5, 0x6D6, - 0x6E5, - 0x6E7, 0x6EE, + 0x6FA, + 0x6FD, 0x700, - 0x750, + 0x751, + 0x753, + 0x756, + 0x757, + 0x760, + 0x761, + 0x762, + 0x764, + 0x766, + 0x769, + 0x76A, + 0x76B, + 0x76E, + 0x772, + 0x780, 0x7B2, - 0x870, - 0x888, - 0x889, 0x88F, + 0x890, 0x8A0, - 0x8AD, - 0x8B2, - 0x8B3, - 0x8B5, - 0x8CA, + 0x8A1, + 0x8A2, + 0x8AA, + 0x8BB, + 0x8C3, + 0x8C7, + 0x8C8, 0x901, + 0x904, + 0x905, + 0x90C, + 0x90D, + 0x929, + 0x92A, + 0x934, + 0x935, + 0x93D, + 0x93E, + 0x944, + 0x945, 0x94E, 0x94F, - 0x951, + 0x950, 0x956, 0x958, - 0x960, - 0x964, 0x966, 0x970, - 0x971, + 0x972, 0x978, - 0x979, + 0x97B, + 0x97D, + 0x97E, 0x980, 0x981, 0x984, 0x985, - 0x98D, + 0x98C, 0x98F, 0x991, 0x993, @@ -276005,21 +281638,17 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x9B6, 0x9BA, 0x9BC, + 0x9BD, + 0x9BE, 0x9C5, 0x9C7, 0x9C9, 0x9CB, 0x9CF, - 0x9D7, - 0x9D8, - 0x9E0, - 0x9E4, 0x9E6, 0x9F2, - 0x9FE, - 0x9FF, - 0xA01, - 0xA04, + 0xA02, + 0xA03, 0xA05, 0xA0B, 0xA0F, @@ -276044,9 +281673,9 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xA4E, 0xA5C, 0xA5D, - 0xA66, - 0xA75, - 0xA81, + 0xA70, + 0xA72, + 0xA82, 0xA84, 0xA85, 0xA8E, @@ -276061,23 +281690,19 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xAB5, 0xABA, 0xABC, + 0xABD, + 0xABE, 0xAC6, 0xAC7, 0xACA, 0xACB, 0xACE, - 0xAD0, - 0xAD1, - 0xAE0, - 0xAE4, 0xAE6, 0xAF0, - 0xAFA, - 0xB00, 0xB01, 0xB04, 0xB05, - 0xB0D, + 0xB0C, 0xB0F, 0xB11, 0xB13, @@ -276086,23 +281711,23 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xB31, 0xB32, 0xB34, - 0xB35, + 0xB36, 0xB3A, 0xB3C, + 0xB3D, + 0xB3E, 0xB44, 0xB47, 0xB49, 0xB4B, 0xB4E, - 0xB55, - 0xB58, + 0xB56, + 0xB57, 0xB5F, - 0xB62, - 0xB66, - 0xB70, + 0xB60, 0xB71, 0xB72, - 0xB82, + 0xB83, 0xB84, 0xB85, 0xB8B, @@ -276128,99 +281753,79 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xBC9, 0xBCA, 0xBCE, - 0xBD0, - 0xBD1, - 0xBD7, - 0xBD8, - 0xBE6, - 0xBF0, - 0xC01, - 0xC0D, + 0xC02, + 0xC04, + 0xC05, + 0xC0C, 0xC0E, 0xC11, 0xC12, 0xC29, 0xC2A, + 0xC31, + 0xC32, 0xC34, 0xC35, 0xC3A, - 0xC3C, + 0xC3E, 0xC45, 0xC46, 0xC49, 0xC4A, 0xC4E, - 0xC55, - 0xC57, - 0xC5D, - 0xC5E, - 0xC60, - 0xC62, - 0xC66, - 0xC70, - 0xC80, - 0xC81, 0xC82, 0xC84, 0xC85, - 0xC8D, + 0xC8C, 0xC8E, 0xC91, 0xC92, 0xCA9, 0xCAA, + 0xCB1, + 0xCB2, 0xCB4, 0xCB5, 0xCBA, - 0xCBC, - 0xCC5, + 0xCBE, + 0xCC4, 0xCC6, 0xCC9, 0xCCA, 0xCCE, - 0xCD5, - 0xCD7, - 0xCDD, - 0xCDE, - 0xCE0, - 0xCE4, 0xCE6, 0xCF0, - 0xCF1, - 0xCF4, - 0xD00, - 0xD01, 0xD02, 0xD04, 0xD05, - 0xD0D, + 0xD0C, 0xD0E, 0xD11, 0xD12, - 0xD3B, - 0xD3D, + 0xD29, + 0xD2A, + 0xD3A, + 0xD3E, 0xD44, 0xD46, 0xD49, 0xD4A, - 0xD4F, - 0xD54, + 0xD4C, + 0xD4D, + 0xD4E, + 0xD57, 0xD58, - 0xD60, - 0xD62, - 0xD66, - 0xD70, 0xD7A, 0xD80, 0xD82, 0xD84, 0xD85, - 0xD8F, + 0xD8E, 0xD91, 0xD97, 0xD9A, - 0xDA6, - 0xDA7, + 0xD9E, + 0xD9F, 0xDB2, 0xDB3, 0xDBC, @@ -276243,44 +281848,52 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xE34, 0xE3B, 0xE40, - 0xE4F, + 0xE4E, 0xE50, 0xE5A, 0xE81, 0xE83, 0xE84, 0xE85, - 0xE86, + 0xE87, + 0xE89, + 0xE8A, 0xE8B, - 0xE8C, + 0xE8D, + 0xE8E, + 0xE94, + 0xE98, + 0xE99, + 0xEA0, + 0xEA1, 0xEA4, 0xEA5, 0xEA6, 0xEA7, + 0xEA8, + 0xEAA, + 0xEAC, + 0xEAD, + 0xEAF, + 0xEB0, 0xEB3, 0xEB4, + 0xEBA, + 0xEBB, 0xEBE, 0xEC0, 0xEC5, 0xEC6, 0xEC7, 0xEC8, - 0xECF, + 0xECE, 0xED0, 0xEDA, - 0xEDE, - 0xEE0, - 0xF00, - 0xF01, 0xF0B, 0xF0C, 0xF20, 0xF2A, - 0xF35, - 0xF36, - 0xF37, - 0xF38, - 0xF3E, + 0xF40, 0xF43, 0xF44, 0xF48, @@ -276294,17 +281907,15 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xF5C, 0xF5D, 0xF69, - 0xF6A, - 0xF6D, 0xF71, 0xF73, 0xF74, 0xF75, 0xF7A, 0xF81, - 0xF82, + 0xF84, 0xF85, - 0xF86, + 0xF90, 0xF93, 0xF94, 0xF98, @@ -276317,26 +281928,28 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xFA8, 0xFAC, 0xFAD, + 0xFAE, + 0xFB1, 0xFB9, 0xFBA, 0xFBD, - 0xFC6, - 0xFC7, 0x1000, 0x104A, - 0x1050, - 0x109E, + 0x105A, + 0x1065, + 0x1075, + 0x108B, + 0x108F, + 0x1090, 0x10C7, 0x10C8, 0x10CD, 0x10CE, 0x10D0, 0x10F1, - 0x10F7, - 0x10FB, - 0x10FD, - 0x1100, 0x1200, + 0x1207, + 0x1208, 0x1249, 0x124A, 0x124E, @@ -276347,10 +281960,14 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x125A, 0x125E, 0x1260, + 0x1287, + 0x1288, 0x1289, 0x128A, 0x128E, 0x1290, + 0x12AF, + 0x12B0, 0x12B1, 0x12B2, 0x12B6, @@ -276363,20 +281980,26 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x12C8, 0x12D7, 0x12D8, + 0x12F8, + 0x1300, + 0x130F, + 0x1310, 0x1311, 0x1312, 0x1316, 0x1318, - 0x135B, - 0x135D, - 0x1360, - 0x1380, - 0x1390, + 0x131F, + 0x1320, + 0x1347, + 0x1348, + 0x135A, 0x1780, + 0x179D, + 0x179F, 0x17A3, 0x17A5, 0x17A8, - 0x17A9, + 0x17AA, 0x17B4, 0x17B6, 0x17CE, @@ -276384,210 +282007,2472 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x17D1, 0x17D2, 0x17D3, - 0x17D7, - 0x17D8, - 0x17DC, - 0x17DD, 0x17E0, 0x17EA, 0x1C90, 0x1CBB, 0x1CBD, 0x1CC0, - 0x1E00, - 0x1E9A, + 0x1E0C, + 0x1E0E, + 0x1E12, + 0x1E14, + 0x1E20, + 0x1E22, + 0x1E24, + 0x1E26, + 0x1E36, + 0x1E38, + 0x1E3C, + 0x1E40, + 0x1E42, + 0x1E4C, + 0x1E5A, + 0x1E5C, + 0x1E62, + 0x1E64, + 0x1E6C, + 0x1E6E, + 0x1E70, + 0x1E72, + 0x1E8C, + 0x1E8E, + 0x1E92, + 0x1E94, 0x1E9E, 0x1E9F, 0x1EA0, 0x1EFA, - 0x1F00, - 0x1F16, - 0x1F18, - 0x1F1E, - 0x1F20, - 0x1F46, - 0x1F48, - 0x1F4E, - 0x1F50, - 0x1F58, - 0x1F59, - 0x1F5A, - 0x1F5B, - 0x1F5C, - 0x1F5D, - 0x1F5E, - 0x1F5F, - 0x1F71, - 0x1F72, - 0x1F73, - 0x1F74, - 0x1F75, - 0x1F76, - 0x1F77, - 0x1F78, - 0x1F79, - 0x1F7A, - 0x1F7B, - 0x1F7C, - 0x1F7D, - 0x1F80, + 0x1FA0, + 0x1FB0, + 0x1FB2, 0x1FB5, - 0x1FB6, - 0x1FBB, - 0x1FBC, - 0x1FBD, - 0x1FC2, - 0x1FC5, - 0x1FC6, - 0x1FC9, - 0x1FCA, - 0x1FCB, - 0x1FCC, - 0x1FCD, - 0x1FD0, - 0x1FD3, - 0x1FD6, - 0x1FDB, - 0x1FE0, - 0x1FE3, - 0x1FE4, - 0x1FEB, 0x1FEC, 0x1FED, - 0x1FF2, - 0x1FF5, - 0x1FF6, - 0x1FF9, - 0x1FFA, - 0x1FFB, - 0x1FFC, - 0x1FFD, 0x2010, 0x2011, 0x2019, 0x201A, 0x2027, 0x2028, - 0x2D27, - 0x2D28, - 0x2D2D, - 0x2D2E, - 0x2D80, - 0x2D97, - 0x2DA0, - 0x2DA7, - 0x2DA8, - 0x2DAF, - 0x2DB0, - 0x2DB7, - 0x2DB8, - 0x2DBF, - 0x2DC0, - 0x2DC7, - 0x2DC8, - 0x2DCF, - 0x2DD0, - 0x2DD7, - 0x2DD8, - 0x2DDF, 0x3005, 0x3008, 0x3041, 0x3097, - 0x3099, - 0x309B, 0x309D, 0x309F, 0x30A0, 0x30FF, - 0x3105, - 0x312E, - 0x312F, - 0x3130, - 0x31A0, - 0x31C0, - 0x3400, - 0x4DC0, + 0x3447, + 0x3448, + 0x3473, + 0x3474, + 0x34E4, + 0x34E5, + 0x3577, + 0x3578, + 0x359E, + 0x359F, + 0x35A1, + 0x35A2, + 0x35AD, + 0x35AE, + 0x35BF, + 0x35C0, + 0x35CE, + 0x35CF, + 0x35F3, + 0x35F4, + 0x35FE, + 0x35FF, + 0x360E, + 0x360F, + 0x361A, + 0x361B, + 0x3918, + 0x3919, + 0x3960, + 0x3961, + 0x396E, + 0x396F, + 0x39CF, + 0x39D1, + 0x39DB, + 0x39DC, + 0x39DF, + 0x39E0, + 0x39F8, + 0x39F9, + 0x39FE, + 0x39FF, + 0x3A18, + 0x3A19, + 0x3A52, + 0x3A53, + 0x3A5C, + 0x3A5D, + 0x3A67, + 0x3A68, + 0x3A73, + 0x3A74, + 0x3B39, + 0x3B3A, + 0x3B4E, + 0x3B4F, + 0x3BA3, + 0x3BA4, + 0x3C6E, + 0x3C6F, + 0x3CE0, + 0x3CE1, + 0x3DE7, + 0x3DE8, + 0x3DEB, + 0x3DEC, + 0x3E74, + 0x3E75, + 0x3ED0, + 0x3ED1, + 0x4056, + 0x4057, + 0x4065, + 0x4066, + 0x406A, + 0x406B, + 0x40BB, + 0x40BC, + 0x40DF, + 0x40E0, + 0x4137, + 0x4138, + 0x415F, + 0x4160, + 0x4337, + 0x4338, + 0x43AC, + 0x43AD, + 0x43B1, + 0x43B2, + 0x43D3, + 0x43D4, + 0x43DD, + 0x43DE, + 0x4443, + 0x4444, + 0x44D6, + 0x44D7, + 0x44EA, + 0x44EB, + 0x4606, + 0x4607, + 0x464C, + 0x464D, + 0x4661, + 0x4662, + 0x4723, + 0x4724, + 0x4729, + 0x472A, + 0x477C, + 0x477D, + 0x478D, + 0x478E, + 0x47F4, + 0x47F5, + 0x4882, + 0x4883, + 0x4947, + 0x4948, + 0x497A, + 0x497B, + 0x497D, + 0x497E, + 0x4982, + 0x4984, + 0x4985, + 0x4987, + 0x499B, + 0x499C, + 0x499F, + 0x49A0, + 0x49B6, + 0x49B8, + 0x4A12, + 0x4A13, + 0x4AB8, + 0x4AB9, + 0x4C77, + 0x4C78, + 0x4C7D, + 0x4C7E, + 0x4C81, + 0x4C82, + 0x4C85, + 0x4C86, + 0x4C9D, + 0x4CA4, + 0x4D13, + 0x4D1A, + 0x4DAE, + 0x4DAF, 0x4E00, - 0xA000, - 0xA67F, - 0xA680, - 0xA717, - 0xA720, - 0xA788, - 0xA789, + 0x4E12, + 0x4E13, + 0x4E29, + 0x4E2A, + 0x4E68, + 0x4E69, + 0x4E79, + 0x4E7A, + 0x4E96, + 0x4E97, + 0x4EA3, + 0x4EA4, + 0x4EBC, + 0x4EBD, + 0x4ECC, + 0x4ECD, + 0x4EE7, + 0x4EE8, + 0x4EF8, + 0x4EFB, + 0x4EFC, + 0x4EFD, + 0x4EFE, + 0x4EFF, + 0x4F07, + 0x4F08, + 0x4F16, + 0x4F17, + 0x4F28, + 0x4F29, + 0x4F31, + 0x4F32, + 0x4F35, + 0x4F36, + 0x4F37, + 0x4F38, + 0x4F40, + 0x4F41, + 0x4F44, + 0x4F45, + 0x4F71, + 0x4F72, + 0x4F8C, + 0x4F8D, + 0x4F8E, + 0x4F8F, + 0x4FA2, + 0x4FA3, + 0x4FBD, + 0x4FBE, + 0x4FC6, + 0x4FC7, + 0x4FC8, + 0x4FC9, + 0x4FCC, + 0x4FCD, + 0x4FE2, + 0x4FE3, + 0x4FFC, + 0x4FFE, + 0x5010, + 0x5011, + 0x5034, + 0x5035, + 0x5038, + 0x5039, + 0x503D, + 0x503E, + 0x5042, + 0x5043, + 0x5052, + 0x5053, + 0x5058, + 0x5059, + 0x507C, + 0x507D, + 0x5081, + 0x5082, + 0x5093, + 0x5094, + 0x5097, + 0x5098, + 0x509F, + 0x50A2, + 0x50B9, + 0x50BA, + 0x50C3, + 0x50C4, + 0x50D8, + 0x50D9, + 0x50DF, + 0x50E0, + 0x50E1, + 0x50E3, + 0x50EB, + 0x50EC, + 0x50F4, + 0x50F5, + 0x50F7, + 0x50F8, + 0x511B, + 0x511C, + 0x5128, + 0x5129, + 0x512B, + 0x512C, + 0x5142, + 0x5143, + 0x514A, + 0x514B, + 0x514F, + 0x5150, + 0x5153, + 0x5154, + 0x5158, + 0x5159, + 0x5160, + 0x5161, + 0x5164, + 0x5165, + 0x5172, + 0x5173, + 0x517E, + 0x517F, + 0x5183, + 0x5185, + 0x518E, + 0x518F, + 0x51A1, + 0x51A2, + 0x51A3, + 0x51A4, + 0x51AD, + 0x51AE, + 0x51B8, + 0x51B9, + 0x51BA, + 0x51BB, + 0x51C2, + 0x51C3, + 0x51D2, + 0x51D4, + 0x51DF, + 0x51E0, + 0x51EC, + 0x51ED, + 0x51EE, + 0x51EF, + 0x51F2, + 0x51F3, + 0x5253, + 0x5254, + 0x5266, + 0x5267, + 0x5279, + 0x527A, + 0x5285, + 0x5286, + 0x528E, + 0x528F, + 0x52C4, + 0x52C5, + 0x52C8, + 0x52C9, + 0x52CC, + 0x52CD, + 0x52CE, + 0x52CF, + 0x52D1, + 0x52D2, + 0x52D4, + 0x52D5, + 0x52E1, + 0x52E2, + 0x52E5, + 0x52E6, + 0x52EE, + 0x52EF, + 0x5303, + 0x5305, + 0x5318, + 0x5319, + 0x531B, + 0x531C, + 0x531E, + 0x531F, + 0x5327, + 0x5328, + 0x5329, + 0x532A, + 0x5332, + 0x5333, + 0x5335, + 0x5337, + 0x5342, + 0x5343, + 0x535B, + 0x535C, + 0x535D, + 0x535E, + 0x536A, + 0x536B, + 0x536D, + 0x536E, + 0x5380, + 0x5381, + 0x53A1, + 0x53A2, + 0x53AA, + 0x53AC, + 0x53AF, + 0x53B0, + 0x53BA, + 0x53BB, + 0x53C5, + 0x53C6, + 0x53CF, + 0x53D0, + 0x53DD, + 0x53DF, + 0x53E7, + 0x53E8, + 0x53FF, + 0x5401, + 0x541A, + 0x541B, + 0x5422, + 0x5423, + 0x544C, + 0x544D, + 0x545D, + 0x545E, + 0x5469, + 0x546A, + 0x548A, + 0x548B, + 0x54B5, + 0x54B6, + 0x54F6, + 0x54F7, + 0x5515, + 0x5516, + 0x5518, + 0x551A, + 0x5547, + 0x5548, + 0x5560, + 0x5561, + 0x557A, + 0x557B, + 0x55E0, + 0x55E1, + 0x55F8, + 0x55F9, + 0x560A, + 0x560C, + 0x5620, + 0x5621, + 0x562B, + 0x562C, + 0x5637, + 0x5638, + 0x563C, + 0x563D, + 0x5644, + 0x5645, + 0x564B, + 0x564C, + 0x5651, + 0x5652, + 0x5656, + 0x5657, + 0x565F, + 0x5660, + 0x5661, + 0x5662, + 0x5675, + 0x5676, + 0x567D, + 0x567E, + 0x5688, + 0x5689, + 0x568B, + 0x568C, + 0x5696, + 0x5697, + 0x569E, + 0x569F, + 0x56BA, + 0x56BB, + 0x56CF, + 0x56D0, + 0x56D9, + 0x56DA, + 0x56E6, + 0x56E7, + 0x56F6, + 0x56F7, + 0x56F8, + 0x56F9, + 0x56FB, + 0x56FD, + 0x5705, + 0x5706, + 0x5711, + 0x5712, + 0x5717, + 0x5718, + 0x5721, + 0x5722, + 0x5724, + 0x5725, + 0x573D, + 0x573E, + 0x5743, + 0x5744, + 0x5748, + 0x5749, + 0x5755, + 0x5757, + 0x5758, + 0x5759, + 0x5763, + 0x5764, + 0x5778, + 0x5779, + 0x5781, + 0x5782, + 0x5787, + 0x5788, + 0x5796, + 0x5797, + 0x57A8, + 0x57A9, + 0x57CA, + 0x57CB, + 0x57D1, + 0x57D2, + 0x57DB, + 0x57DC, + 0x5817, + 0x5819, + 0x5850, + 0x5851, + 0x5856, + 0x5857, + 0x5860, + 0x5861, + 0x5866, + 0x5868, + 0x5877, + 0x5878, + 0x5895, + 0x5896, + 0x58AA, + 0x58AB, + 0x58B6, + 0x58B7, + 0x58C0, + 0x58C1, + 0x58C3, + 0x58C5, + 0x58CD, + 0x58CE, + 0x58D0, + 0x58D1, + 0x58E1, + 0x58E2, + 0x58E6, + 0x58E7, + 0x58F5, + 0x58F6, + 0x5901, + 0x5902, + 0x5905, + 0x5906, + 0x5908, + 0x5909, + 0x5911, + 0x5912, + 0x5913, + 0x5914, + 0x5923, + 0x5924, + 0x5933, + 0x5934, + 0x5936, + 0x5937, + 0x5959, + 0x595A, + 0x595B, + 0x595C, + 0x59B7, + 0x59B8, + 0x59E7, + 0x59E8, + 0x5A24, + 0x5A25, + 0x5A26, + 0x5A27, + 0x5A2C, + 0x5A2D, + 0x5A30, + 0x5A31, + 0x5A54, + 0x5A55, + 0x5A59, + 0x5A5A, + 0x5A6F, + 0x5A70, + 0x5A71, + 0x5A72, + 0x5A87, + 0x5A88, + 0x5A8D, + 0x5A8E, + 0x5AAB, + 0x5AAC, + 0x5AD3, + 0x5AD4, + 0x5AEF, + 0x5AF1, + 0x5B0A, + 0x5B0B, + 0x5B0D, + 0x5B0E, + 0x5B39, + 0x5B3A, + 0x5B46, + 0x5B47, + 0x5B4F, + 0x5B50, + 0x5B52, + 0x5B53, + 0x5B60, + 0x5B62, + 0x5B6F, + 0x5B70, + 0x5B79, + 0x5B7A, + 0x5B7E, + 0x5B7F, + 0x5B86, + 0x5B87, + 0x5B90, + 0x5B91, + 0x5BA9, + 0x5BAA, + 0x5BB2, + 0x5BB3, + 0x5BB7, + 0x5BB8, + 0x5BBC, + 0x5BBD, + 0x5BC8, + 0x5BC9, + 0x5BDA, + 0x5BDB, + 0x5C00, + 0x5C01, + 0x5C1B, + 0x5C1C, + 0x5C23, + 0x5C24, + 0x5C26, + 0x5C27, + 0x5C29, + 0x5C2A, + 0x5C36, + 0x5C37, + 0x5C5A, + 0x5C5B, + 0x5C85, + 0x5C86, + 0x5CB4, + 0x5CB5, + 0x5CB9, + 0x5CBA, + 0x5CD5, + 0x5CD6, + 0x5CDD, + 0x5CDE, + 0x5CF5, + 0x5CF6, + 0x5D2B, + 0x5D2C, + 0x5D2F, + 0x5D30, + 0x5D3B, + 0x5D3C, + 0x5D53, + 0x5D54, + 0x5D57, + 0x5D58, + 0x5D60, + 0x5D61, + 0x5D83, + 0x5D84, + 0x5D96, + 0x5D97, + 0x5DA3, + 0x5DA5, + 0x5DAB, + 0x5DAC, + 0x5DB3, + 0x5DB4, + 0x5DB9, + 0x5DBA, + 0x5DC4, + 0x5DC5, + 0x5DD7, + 0x5DD8, + 0x5DDA, + 0x5DDB, + 0x5DDC, + 0x5DDD, + 0x5DF6, + 0x5DF7, + 0x5E12, + 0x5E13, + 0x5E48, + 0x5E49, + 0x5E51, + 0x5E52, + 0x5E92, + 0x5E93, + 0x5EBA, + 0x5EBB, + 0x5EC0, + 0x5EC1, + 0x5EEB, + 0x5EEC, + 0x5EF9, + 0x5EFA, + 0x5F0E, + 0x5F0F, + 0x5F3B, + 0x5F3C, + 0x5F3D, + 0x5F3E, + 0x5F8F, + 0x5F90, + 0x5F9A, + 0x5F9B, + 0x5FA3, + 0x5FA5, + 0x5FB0, + 0x5FB1, + 0x5FC2, + 0x5FC3, + 0x5FCE, + 0x5FCF, + 0x5FDB, + 0x5FDC, + 0x5FE2, + 0x5FE3, + 0x5FEC, + 0x5FED, + 0x5FFC, + 0x5FFD, + 0x6023, + 0x6024, + 0x6056, + 0x6057, + 0x6061, + 0x6062, + 0x6071, + 0x6072, + 0x6074, + 0x6075, + 0x6091, + 0x6092, + 0x6093, + 0x6094, + 0x60A5, + 0x60A6, + 0x60D2, + 0x60D3, + 0x60D6, + 0x60D7, + 0x60DE, + 0x60DF, + 0x60E5, + 0x60E6, + 0x60FD, + 0x60FE, + 0x6102, + 0x6103, + 0x6107, + 0x6108, + 0x6111, + 0x6112, + 0x611E, + 0x611F, + 0x6131, + 0x6132, + 0x6133, + 0x6134, + 0x6135, + 0x6136, + 0x6138, + 0x613A, + 0x6160, + 0x6161, + 0x617B, + 0x617C, + 0x617F, + 0x6180, + 0x6186, + 0x6187, + 0x6197, + 0x6198, + 0x619C, + 0x619D, + 0x61B9, + 0x61BA, + 0x61BB, + 0x61BC, + 0x61D3, + 0x61D4, + 0x61D5, + 0x61D6, + 0x61EC, + 0x61ED, + 0x61EF, + 0x61F0, + 0x6205, + 0x6206, + 0x6235, + 0x6236, + 0x6239, + 0x623A, + 0x6257, + 0x6258, + 0x628D, + 0x628E, + 0x629D, + 0x629E, + 0x62DE, + 0x62DF, + 0x62EA, + 0x62EB, + 0x630A, + 0x630B, + 0x6317, + 0x6318, + 0x6331, + 0x6332, + 0x6337, + 0x6338, + 0x635B, + 0x635C, + 0x638B, + 0x638C, + 0x6393, + 0x6394, + 0x63D1, + 0x63D2, + 0x643B, + 0x643D, + 0x6449, + 0x644A, + 0x645A, + 0x645B, + 0x647E, + 0x647F, + 0x6486, + 0x6487, + 0x64A1, + 0x64A2, + 0x64AF, + 0x64B0, + 0x64B6, + 0x64B7, + 0x64C8, + 0x64C9, + 0x64D5, + 0x64D6, + 0x64EE, + 0x64EF, + 0x64F5, + 0x64F6, + 0x64F9, + 0x64FA, + 0x6502, + 0x6503, + 0x650A, + 0x650B, + 0x651F, + 0x6520, + 0x6528, + 0x6529, + 0x6540, + 0x6541, + 0x6542, + 0x6543, + 0x655A, + 0x655B, + 0x655F, + 0x6560, + 0x657D, + 0x657E, + 0x658A, + 0x658B, + 0x659A, + 0x659B, + 0x65B5, + 0x65B6, + 0x65BE, + 0x65BF, + 0x65C8, + 0x65CA, + 0x65D1, + 0x65D2, + 0x65D8, + 0x65D9, + 0x65DC, + 0x65DD, + 0x65E4, + 0x65E5, + 0x65EA, + 0x65EB, + 0x65F9, + 0x65FA, + 0x65FE, + 0x65FF, + 0x6617, + 0x6618, + 0x662C, + 0x662D, + 0x6637, + 0x6639, + 0x6648, + 0x6649, + 0x664D, + 0x664E, + 0x6660, + 0x6661, + 0x6663, + 0x6664, + 0x6692, + 0x6693, + 0x669C, + 0x669D, + 0x669E, + 0x669F, + 0x66AC, + 0x66AE, + 0x66D0, + 0x66D1, + 0x66D3, + 0x66D4, + 0x66D7, + 0x66D8, + 0x66DF, + 0x66E0, + 0x66EF, + 0x66F0, + 0x6702, + 0x6703, + 0x6707, + 0x6708, + 0x6719, + 0x671A, + 0x6724, + 0x6725, + 0x6729, + 0x672A, + 0x6767, + 0x6768, + 0x6788, + 0x6789, + 0x6796, + 0x6797, + 0x67BD, + 0x67BE, + 0x67BF, + 0x67C0, + 0x67D5, + 0x67D6, + 0x67D7, + 0x67D8, + 0x67F9, + 0x67FA, + 0x6801, + 0x6802, + 0x6815, + 0x6816, + 0x6827, + 0x6828, + 0x6830, + 0x6831, + 0x6858, + 0x6859, + 0x685A, + 0x685B, + 0x685E, + 0x685F, + 0x687A, + 0x687B, + 0x6895, + 0x6896, + 0x6899, + 0x689A, + 0x68A5, + 0x68A6, + 0x68B8, + 0x68B9, + 0x68C3, + 0x68C4, + 0x68D9, + 0x68DA, + 0x68E2, + 0x68E3, + 0x68E5, + 0x68E6, + 0x6909, + 0x690A, + 0x693E, + 0x693F, + 0x694D, + 0x694E, + 0x699F, + 0x69A0, + 0x69A2, + 0x69A3, + 0x69C0, + 0x69C1, + 0x69D1, + 0x69D3, + 0x69D5, + 0x69D8, + 0x6A03, + 0x6A04, + 0x6A1C, + 0x6A1D, + 0x6A24, + 0x6A25, + 0x6A37, + 0x6A38, + 0x6A4A, + 0x6A4B, + 0x6A5C, + 0x6A5D, + 0x6A6E, + 0x6A6F, + 0x6A70, + 0x6A71, + 0x6A86, + 0x6A87, + 0x6A8A, + 0x6A8B, + 0x6A8F, + 0x6A90, + 0x6A99, + 0x6A9A, + 0x6A9D, + 0x6A9E, + 0x6AB1, + 0x6AB2, + 0x6ABE, + 0x6ABF, + 0x6AC0, + 0x6AC1, + 0x6AC4, + 0x6AC5, + 0x6AC9, + 0x6ACA, + 0x6AD8, + 0x6AD9, + 0x6AE9, + 0x6AEA, + 0x6B0E, + 0x6B0F, + 0x6B1B, + 0x6B1C, + 0x6B2E, + 0x6B2F, + 0x6B35, + 0x6B36, + 0x6B40, + 0x6B41, + 0x6B57, + 0x6B59, + 0x6B5D, + 0x6B5E, + 0x6B68, + 0x6B69, + 0x6B6C, + 0x6B6D, + 0x6B6E, + 0x6B6F, + 0x6B71, + 0x6B72, + 0x6B75, + 0x6B76, + 0x6B7D, + 0x6B7E, + 0x6BB8, + 0x6BB9, + 0x6BE9, + 0x6BEA, + 0x6BF1, + 0x6BF2, + 0x6BF4, + 0x6BF5, + 0x6BFA, + 0x6BFB, + 0x6C0A, + 0x6C0B, + 0x6C1C, + 0x6C1D, + 0x6C2D, + 0x6C2E, + 0x6C3C, + 0x6C3D, + 0x6C45, + 0x6C46, + 0x6C6C, + 0x6C6D, + 0x6C6E, + 0x6C6F, + 0x6CA0, + 0x6CA1, + 0x6CD8, + 0x6CD9, + 0x6CF4, + 0x6CF5, + 0x6D02, + 0x6D03, + 0x6D1C, + 0x6D1D, + 0x6D24, + 0x6D25, + 0x6D71, + 0x6D72, + 0x6D81, + 0x6D82, + 0x6D96, + 0x6D97, + 0x6DB0, + 0x6DB2, + 0x6DB6, + 0x6DB7, + 0x6DFE, + 0x6E00, + 0x6E01, + 0x6E03, + 0x6E06, + 0x6E07, + 0x6E12, + 0x6E13, + 0x6E18, + 0x6E19, + 0x6E2A, + 0x6E2B, + 0x6E4C, + 0x6E4D, + 0x6E6C, + 0x6E6D, + 0x6E7B, + 0x6E7E, + 0x6E8B, + 0x6E8C, + 0x6E95, + 0x6E96, + 0x6EDB, + 0x6EDC, + 0x6EE3, + 0x6EE4, + 0x6F04, + 0x6F05, + 0x6F0B, + 0x6F0C, + 0x6F42, + 0x6F43, + 0x6F48, + 0x6F49, + 0x6F4A, + 0x6F4B, + 0x6F79, + 0x6F7A, + 0x6F98, + 0x6F99, + 0x6F9A, + 0x6F9B, + 0x6F9F, + 0x6FA0, + 0x6FB7, + 0x6FB8, + 0x6FC5, + 0x6FC6, + 0x6FD0, + 0x6FD1, + 0x6FD3, + 0x6FD4, + 0x6FF5, + 0x6FF6, + 0x6FFD, + 0x6FFE, + 0x7010, + 0x7011, + 0x7013, + 0x7014, + 0x7047, + 0x7048, + 0x704B, + 0x704C, + 0x704E, + 0x704F, + 0x7072, + 0x7074, + 0x707B, + 0x707C, + 0x7081, + 0x7082, + 0x708D, + 0x708E, + 0x7097, + 0x7098, + 0x709B, + 0x709C, + 0x70AA, + 0x70AB, + 0x70B2, + 0x70B3, + 0x70B6, + 0x70B7, + 0x70D5, + 0x70D6, + 0x70FE, + 0x70FF, + 0x7108, + 0x7109, + 0x7124, + 0x7125, + 0x7133, + 0x7135, + 0x7157, + 0x7158, + 0x716B, + 0x716C, + 0x716D, + 0x716E, + 0x718D, + 0x718E, + 0x7196, + 0x7197, + 0x71A6, + 0x71A7, + 0x71AB, + 0x71AC, + 0x71B6, + 0x71B7, + 0x71CC, + 0x71CD, + 0x71D3, + 0x71D4, + 0x71F3, + 0x71F4, + 0x71FA, + 0x71FB, + 0x720B, + 0x720C, + 0x7211, + 0x7212, + 0x7215, + 0x7216, + 0x7217, + 0x7218, + 0x7220, + 0x7221, + 0x7224, + 0x7226, + 0x722F, + 0x7230, + 0x7234, + 0x7235, + 0x7245, + 0x7246, + 0x724E, + 0x724F, + 0x7250, + 0x7251, + 0x7255, + 0x7256, + 0x72AB, + 0x72AC, + 0x72BE, + 0x72BF, + 0x7302, + 0x7303, + 0x7310, + 0x7311, + 0x7328, + 0x7329, + 0x7353, + 0x7354, + 0x739C, + 0x739D, + 0x73C1, + 0x73C2, + 0x73F3, + 0x73F4, + 0x73FB, + 0x73FC, + 0x7418, + 0x7419, + 0x7439, + 0x743A, + 0x743E, + 0x743F, + 0x7447, + 0x7448, + 0x7449, + 0x744A, + 0x7458, + 0x7459, + 0x747B, + 0x747C, + 0x7484, + 0x7485, + 0x7496, + 0x7497, + 0x749D, + 0x749E, + 0x74C7, + 0x74C8, + 0x74C9, + 0x74CA, + 0x74CC, + 0x74CD, + 0x74EB, + 0x74EC, + 0x7520, + 0x7521, + 0x7541, + 0x7542, + 0x7552, + 0x7553, + 0x7555, + 0x7556, + 0x755E, + 0x755F, + 0x7561, + 0x7562, + 0x7571, + 0x7572, + 0x757B, + 0x757C, + 0x7585, + 0x7586, + 0x75A9, + 0x75AA, + 0x75B7, + 0x75B8, + 0x75DC, + 0x75DD, + 0x75EE, + 0x75EF, + 0x762C, + 0x762D, + 0x7644, + 0x7646, + 0x7651, + 0x7652, + 0x7655, + 0x7656, + 0x7673, + 0x7674, + 0x768D, + 0x768E, + 0x76A1, + 0x76A3, + 0x76A5, + 0x76A6, + 0x76A8, + 0x76A9, + 0x76B3, + 0x76B4, + 0x76B6, + 0x76B7, + 0x76C1, + 0x76C2, + 0x76CB, + 0x76CC, + 0x76D9, + 0x76DA, + 0x76EB, + 0x76EC, + 0x7700, + 0x7701, + 0x7702, + 0x7703, + 0x770E, + 0x770F, + 0x7721, + 0x7722, + 0x772B, + 0x772C, + 0x773F, + 0x7740, + 0x7742, + 0x7743, + 0x7764, + 0x7765, + 0x7796, + 0x7797, + 0x77A4, + 0x77A5, + 0x77BE, + 0x77BF, + 0x77C1, + 0x77C2, + 0x77D2, + 0x77D3, + 0x77DD, + 0x77DE, + 0x77E4, + 0x77E5, + 0x77E6, + 0x77E7, + 0x77F4, + 0x77F6, + 0x7824, + 0x7825, + 0x7836, + 0x7837, + 0x7842, + 0x7843, + 0x7846, + 0x7847, + 0x784B, + 0x784C, + 0x7876, + 0x7877, + 0x7888, + 0x7889, + 0x78C2, + 0x78C3, + 0x78C7, + 0x78C8, + 0x78D2, + 0x78D3, + 0x78F0, + 0x78F1, + 0x78F8, + 0x78F9, + 0x7900, + 0x7901, + 0x7908, + 0x7909, + 0x790D, + 0x790E, + 0x7915, + 0x7916, + 0x791F, + 0x7921, + 0x7932, + 0x7933, + 0x7936, + 0x7937, + 0x7959, + 0x795A, + 0x796C, + 0x796D, + 0x796E, + 0x796F, + 0x7975, + 0x7977, + 0x7986, + 0x7988, + 0x799E, + 0x799F, + 0x79A9, + 0x79AA, + 0x79BC, + 0x79BD, + 0x79C4, + 0x79C5, + 0x79C7, + 0x79C8, + 0x79CC, + 0x79CD, + 0x79D4, + 0x79D5, + 0x79D7, + 0x79D8, + 0x7A01, + 0x7A02, + 0x7A07, + 0x7A08, + 0x7A09, + 0x7A0A, + 0x7A2C, + 0x7A2D, + 0x7A38, + 0x7A39, + 0x7A3A, + 0x7A3B, + 0x7A64, + 0x7A65, + 0x7A6A, + 0x7A6B, + 0x7A6F, + 0x7A70, + 0x7A82, + 0x7A83, + 0x7A9A, + 0x7A9C, + 0x7AB9, + 0x7ABA, + 0x7ABB, + 0x7ABE, + 0x7AC2, + 0x7AC3, + 0x7AC6, + 0x7AC7, + 0x7AE9, + 0x7AEA, + 0x7AF5, + 0x7AF6, + 0x7AFC, + 0x7AFD, + 0x7B07, + 0x7B08, + 0x7B1F, + 0x7B20, + 0x7B27, + 0x7B28, + 0x7B29, + 0x7B2A, + 0x7B42, + 0x7B43, + 0x7B53, + 0x7B54, + 0x7BA3, + 0x7BA4, + 0x7BA5, + 0x7BA6, + 0x7BB0, + 0x7BB1, + 0x7BB2, + 0x7BB3, + 0x7BFA, + 0x7BFB, + 0x7C1B, + 0x7C1C, + 0x7C2E, + 0x7C30, + 0x7C52, + 0x7C53, + 0x7C55, + 0x7C56, + 0x7C5D, + 0x7C5E, + 0x7C76, + 0x7C77, + 0x7C87, + 0x7C88, + 0x7C93, + 0x7C94, + 0x7C9A, + 0x7C9B, + 0x7CAC, + 0x7CAD, + 0x7CD3, + 0x7CD4, + 0x7CDA, + 0x7CDC, + 0x7CE1, + 0x7CE2, + 0x7CE3, + 0x7CE4, + 0x7CE5, + 0x7CE7, + 0x7CFC, + 0x7CFD, + 0x7CFF, + 0x7D00, + 0x7D23, + 0x7D24, + 0x7D2A, + 0x7D2B, + 0x7D2D, + 0x7D2E, + 0x7D48, + 0x7D49, + 0x7D4D, + 0x7D4E, + 0x7D5A, + 0x7D5B, + 0x7D64, + 0x7D65, + 0x7D78, + 0x7D79, + 0x7D82, + 0x7D83, + 0x7D95, + 0x7D96, + 0x7D98, + 0x7D99, + 0x7DA4, + 0x7DA5, + 0x7DA8, + 0x7DA9, + 0x7DCD, + 0x7DCE, + 0x7DD3, + 0x7DD4, + 0x7DE5, + 0x7DE6, + 0x7DEB, + 0x7DEC, + 0x7DFD, + 0x7E00, + 0x7E18, + 0x7E19, + 0x7E5B, + 0x7E5C, + 0x7E64, + 0x7E65, + 0x7E9D, + 0x7E9E, + 0x7F3B, + 0x7F3D, + 0x7F41, + 0x7F42, + 0x7F46, + 0x7F47, + 0x7F59, + 0x7F5A, + 0x7F84, + 0x7F85, + 0x7F90, + 0x7F91, + 0x7F97, + 0x7F98, + 0x7F99, + 0x7F9A, + 0x7FB4, + 0x7FB5, + 0x7FD6, + 0x7FD7, + 0x7FDD, + 0x7FDE, + 0x7FE4, + 0x7FE5, + 0x800A, + 0x800B, + 0x802F, + 0x8030, + 0x803C, + 0x803D, + 0x8040, + 0x8041, + 0x8066, + 0x8067, + 0x8088, + 0x8089, + 0x808E, + 0x808F, + 0x8094, + 0x8095, + 0x80A6, + 0x80A9, + 0x80B3, + 0x80B4, + 0x80B9, + 0x80BA, + 0x80DF, + 0x80E0, + 0x8103, + 0x8105, + 0x8134, + 0x8136, + 0x8184, + 0x8185, + 0x8190, + 0x8191, + 0x8196, + 0x8197, + 0x81CB, + 0x81CC, + 0x81E4, + 0x81E5, + 0x81EF, + 0x81F1, + 0x8213, + 0x8214, + 0x8224, + 0x8225, + 0x8241, + 0x8242, + 0x8265, + 0x8266, + 0x828C, + 0x828D, + 0x82B2, + 0x82B3, + 0x82E2, + 0x82E3, + 0x82FC, + 0x82FD, + 0x830A, + 0x830B, + 0x8310, + 0x8311, + 0x8330, + 0x8331, + 0x8355, + 0x8356, + 0x83BE, + 0x83BF, + 0x83E6, + 0x83E7, + 0x83ED, + 0x83EE, + 0x8414, + 0x8415, + 0x8416, + 0x8418, + 0x841F, + 0x8420, + 0x8458, + 0x8459, + 0x8483, + 0x8484, + 0x8495, + 0x8496, + 0x84B7, + 0x84B8, + 0x84C3, + 0x84C4, + 0x84ED, + 0x84EE, + 0x8505, + 0x8506, + 0x8510, + 0x8511, + 0x8532, + 0x8534, + 0x854C, + 0x854D, + 0x8550, + 0x8551, + 0x857F, + 0x8580, + 0x8593, + 0x8594, + 0x85B2, + 0x85B3, + 0x85BB, + 0x85BC, + 0x85CC, + 0x85CD, + 0x85EE, + 0x85EF, + 0x85F3, + 0x85F4, + 0x85FC, + 0x85FD, + 0x8603, + 0x8604, + 0x860D, + 0x860F, + 0x8610, + 0x8611, + 0x8615, + 0x8616, + 0x861D, + 0x861E, + 0x8637, + 0x8638, + 0x8657, + 0x8658, + 0x8675, + 0x8676, + 0x8689, + 0x868A, + 0x8692, + 0x8693, + 0x86A0, + 0x86A1, + 0x86A6, + 0x86A7, + 0x86D5, + 0x86D6, + 0x86E0, + 0x86E1, + 0x86E7, + 0x86E8, + 0x86FD, + 0x86FE, + 0x871D, + 0x871E, + 0x872F, + 0x8730, + 0x873D, + 0x873E, + 0x8745, + 0x8746, + 0x8771, + 0x8772, + 0x878E, + 0x878F, + 0x8799, + 0x879A, + 0x87DA, + 0x87DB, + 0x87F0, + 0x87F1, + 0x8807, + 0x8808, + 0x8812, + 0x8813, + 0x882D, + 0x882E, + 0x883A, + 0x883B, + 0x8847, + 0x8848, + 0x8858, + 0x8859, + 0x885C, + 0x885D, + 0x885F, + 0x8860, + 0x887A, + 0x887B, + 0x88E6, + 0x88E7, + 0x88E9, + 0x88EA, + 0x88ED, + 0x88EE, + 0x8903, + 0x8904, + 0x890F, + 0x8910, + 0x8924, + 0x8925, + 0x8965, + 0x8966, + 0x8975, + 0x8976, + 0x897D, + 0x897E, + 0x898D, + 0x898E, + 0x8990, + 0x8991, + 0x8994, + 0x8995, + 0x8999, + 0x899A, + 0x89B0, + 0x89B1, + 0x89B4, + 0x89B5, + 0x89BB, + 0x89BD, + 0x89EE, + 0x89EF, + 0x89F5, + 0x89F6, + 0x89F9, + 0x89FA, + 0x89FD, + 0x89FE, + 0x8A05, + 0x8A07, + 0x8A14, + 0x8A15, + 0x8A19, + 0x8A1A, + 0x8A20, + 0x8A22, + 0x8A2B, + 0x8A2C, + 0x8A3D, + 0x8A3E, + 0x8A4B, + 0x8A4C, + 0x8A64, + 0x8A65, + 0x8A78, + 0x8A79, + 0x8A7D, + 0x8A7E, + 0x8A88, + 0x8A89, + 0x8A9F, + 0x8AA0, + 0x8AAF, + 0x8AB0, + 0x8AB7, + 0x8AB8, + 0x8AD0, + 0x8AD1, + 0x8AEC, + 0x8AED, + 0x8B29, + 0x8B2A, + 0x8B32, + 0x8B33, + 0x8B38, + 0x8B39, + 0x8B3F, + 0x8B40, + 0x8B61, + 0x8B63, + 0x8B69, + 0x8B6A, + 0x8B75, + 0x8B76, + 0x8B7C, + 0x8B7D, + 0x8B81, + 0x8B82, + 0x8B87, + 0x8B88, + 0x8B8D, + 0x8B8E, + 0x8B8F, + 0x8B90, + 0x8B9B, + 0x8B9C, + 0x8C38, + 0x8C39, + 0x8C40, + 0x8C41, + 0x8C44, + 0x8C45, + 0x8C51, + 0x8C54, + 0x8C58, + 0x8C59, + 0x8C74, + 0x8C75, + 0x8C7F, + 0x8C80, + 0x8C83, + 0x8C84, + 0x8C87, + 0x8C88, + 0x8C8B, + 0x8C8C, + 0x8C9B, + 0x8C9C, + 0x8CA6, + 0x8CA7, + 0x8CCB, + 0x8CCC, + 0x8CD6, + 0x8CD7, + 0x8CD8, + 0x8CD9, + 0x8CE9, + 0x8CEA, + 0x8CF7, + 0x8CF8, + 0x8D01, + 0x8D02, + 0x8D11, + 0x8D13, + 0x8D7C, + 0x8D7D, + 0x8DA6, + 0x8DA7, + 0x8DC0, + 0x8DC1, + 0x8DE5, + 0x8DE6, + 0x8E01, + 0x8E02, + 0x8E0B, + 0x8E0C, + 0x8E32, + 0x8E33, + 0x8E46, + 0x8E47, + 0x8E4F, + 0x8E50, + 0x8E6E, + 0x8E6F, + 0x8E75, + 0x8E76, + 0x8E77, + 0x8E78, + 0x8E79, + 0x8E7A, + 0x8E9B, + 0x8E9C, + 0x8EA2, + 0x8EA3, + 0x8EB3, + 0x8EB4, + 0x8EB6, + 0x8EB8, + 0x8EC1, + 0x8EC2, + 0x8EC4, + 0x8EC5, + 0x8ED9, + 0x8EDA, + 0x8EF0, + 0x8EF1, + 0x8F0F, + 0x8F10, + 0x8F2D, + 0x8F2E, + 0x8F3A, + 0x8F3B, + 0x8F41, + 0x8F42, + 0x8F9D, + 0x8F9E, + 0x8FA4, + 0x8FA5, + 0x8FB3, + 0x8FB4, + 0x8FC3, + 0x8FC4, + 0x8FCA, + 0x8FCB, + 0x8FE7, + 0x8FE8, + 0x902A, + 0x902B, + 0x902C, + 0x902D, + 0x9037, + 0x9038, + 0x9040, + 0x9041, + 0x9046, + 0x9047, + 0x90AB, + 0x90AC, + 0x90CC, + 0x90CE, + 0x90D2, + 0x90D3, + 0x90F6, + 0x90F7, + 0x910A, + 0x910B, + 0x913C, + 0x913E, + 0x9159, + 0x915A, + 0x917B, + 0x917C, + 0x9195, + 0x9196, + 0x9198, + 0x9199, + 0x91A9, + 0x91AA, + 0x91BF, + 0x91C0, + 0x91C4, + 0x91C5, + 0x91E0, + 0x91E1, + 0x91EF, + 0x91F0, + 0x9213, + 0x9214, + 0x921F, + 0x9220, + 0x9222, + 0x9223, + 0x9243, + 0x9244, + 0x9269, + 0x926B, + 0x9281, + 0x9282, + 0x9284, + 0x9285, + 0x929E, + 0x929F, + 0x92BD, + 0x92BE, + 0x92D4, + 0x92D5, + 0x92DB, + 0x92DC, + 0x92E2, + 0x92E3, + 0x931C, + 0x931D, + 0x9330, + 0x9332, + 0x9362, + 0x9363, + 0x9368, + 0x9369, + 0x936B, + 0x936C, + 0x936F, + 0x9370, + 0x9373, + 0x9374, + 0x9378, + 0x9379, + 0x937F, + 0x9380, + 0x9381, + 0x9382, + 0x938B, + 0x938C, + 0x939C, + 0x939D, + 0x93A0, + 0x93A1, + 0x93AB, + 0x93AC, + 0x93BB, + 0x93BC, + 0x93E0, + 0x93E1, + 0x93F3, + 0x93F4, + 0x9402, + 0x9403, + 0x9417, + 0x9418, + 0x941C, + 0x941D, + 0x941E, + 0x9420, + 0x9424, + 0x9425, + 0x9443, + 0x9444, + 0x944E, + 0x944F, + 0x946C, + 0x946D, + 0x947B, + 0x947C, + 0x9578, + 0x957A, + 0x957E, + 0x957F, + 0x9585, + 0x9586, + 0x9597, + 0x9598, + 0x95B3, + 0x95B5, + 0x95B8, + 0x95B9, + 0x95C1, + 0x95C2, + 0x95D9, + 0x95DA, + 0x95DD, + 0x95DE, + 0x9625, + 0x9627, + 0x9629, + 0x962A, + 0x963E, + 0x963F, + 0x9656, + 0x9658, + 0x9679, + 0x967A, + 0x967B, + 0x967C, + 0x967F, + 0x9680, + 0x9681, + 0x9683, + 0x968C, + 0x968D, + 0x9696, + 0x9697, + 0x969A, + 0x969B, + 0x969D, + 0x969E, + 0x969F, + 0x96A0, + 0x96AB, + 0x96AC, + 0x96AF, + 0x96B0, + 0x96B5, + 0x96B6, + 0x96E4, + 0x96E5, + 0x96E6, + 0x96E8, + 0x96FC, + 0x96FD, + 0x9714, + 0x9715, + 0x9717, + 0x9718, + 0x971A, + 0x971C, + 0x9733, + 0x9735, + 0x9737, + 0x9738, + 0x9740, + 0x9742, + 0x974D, + 0x974E, + 0x9757, + 0x9758, + 0x9763, + 0x9764, + 0x9775, + 0x9776, + 0x9787, + 0x9788, + 0x9789, + 0x978A, + 0x979B, + 0x979C, + 0x97A9, + 0x97AA, + 0x97B0, + 0x97B2, + 0x97B5, + 0x97B6, + 0x97BE, + 0x97BF, + 0x97C0, + 0x97C1, + 0x97D2, + 0x97D3, + 0x97FC, + 0x97FD, + 0x981F, + 0x9820, + 0x9825, + 0x9826, + 0x982A, + 0x982B, + 0x9833, + 0x9834, + 0x983A, + 0x983B, + 0x983E, + 0x983F, + 0x9842, + 0x9843, + 0x9847, + 0x9848, + 0x9856, + 0x9857, + 0x9866, + 0x9867, + 0x9868, + 0x9869, + 0x98B7, + 0x98B8, + 0x98CA, + 0x98CB, + 0x98E4, + 0x98E5, + 0x98EC, + 0x98ED, + 0x98F1, + 0x98F2, + 0x98F8, + 0x98F9, + 0x98FB, + 0x98FC, + 0x9919, + 0x991A, + 0x993B, + 0x993C, + 0x9944, + 0x9945, + 0x995A, + 0x995B, + 0x995D, + 0x995E, + 0x99BF, + 0x99C0, + 0x99E0, + 0x99E1, + 0x99E6, + 0x99E7, + 0x99EB, + 0x99EC, + 0x99F5, + 0x99F6, + 0x9A10, + 0x9A11, + 0x9A17, + 0x9A19, + 0x9A3B, + 0x9A3C, + 0x9A51, + 0x9A52, + 0x9A58, + 0x9A59, + 0x9A5D, + 0x9A5E, + 0x9A63, + 0x9A64, + 0x9AA9, + 0x9AAA, + 0x9ABD, + 0x9ABE, + 0x9AC8, + 0x9AC9, + 0x9AD7, + 0x9AD8, + 0x9AE0, + 0x9AE1, + 0x9AE4, + 0x9AE5, + 0x9AE8, + 0x9AEA, + 0x9AF0, + 0x9AF1, + 0x9B00, + 0x9B01, + 0x9B02, + 0x9B03, + 0x9B09, + 0x9B0A, + 0x9B14, + 0x9B15, + 0x9B1B, + 0x9B1C, + 0x9B34, + 0x9B35, + 0x9B3D, + 0x9B3E, + 0x9B40, + 0x9B41, + 0x9B50, + 0x9B51, + 0x9B57, + 0x9B58, + 0x9B62, + 0x9B63, + 0x9B72, + 0x9B73, + 0x9B89, + 0x9B8A, + 0x9B8C, + 0x9B8D, + 0x9B99, + 0x9B9A, + 0x9BC2, + 0x9BC3, + 0x9BF6, + 0x9BF7, + 0x9C00, + 0x9C02, + 0x9C03, + 0x9C04, + 0x9C42, + 0x9C43, + 0x9C4F, + 0x9C50, + 0x9C51, + 0x9C52, + 0x9C61, + 0x9C62, + 0x9C64, + 0x9C65, + 0x9C7B, + 0x9C7C, + 0x9D0C, + 0x9D0E, + 0x9D11, + 0x9D12, + 0x9D27, + 0x9D28, + 0x9D35, + 0x9D36, + 0x9D3C, + 0x9D3D, + 0x9D6D, + 0x9D6E, + 0x9D95, + 0x9D96, + 0x9DAE, + 0x9DAF, + 0x9DBD, + 0x9DBE, + 0x9DC0, + 0x9DC1, + 0x9DEA, + 0x9DEB, + 0x9DFC, + 0x9DFD, + 0x9E0E, + 0x9E0F, + 0x9E16, + 0x9E17, + 0x9E1C, + 0x9E1D, + 0x9E7B, + 0x9E7C, + 0x9E8F, + 0x9E91, + 0x9E98, + 0x9E99, + 0x9E9E, + 0x9E9F, + 0x9EA2, + 0x9EA3, + 0x9EAB, + 0x9EAD, + 0x9EB1, + 0x9EB2, + 0x9EEC, + 0x9EED, + 0x9EF1, + 0x9EF2, + 0x9F03, + 0x9F04, + 0x9F11, + 0x9F12, + 0x9F14, + 0x9F15, + 0x9F26, + 0x9F27, + 0x9F45, + 0x9F46, + 0x9F53, + 0x9F54, + 0x9F6D, + 0x9F6E, + 0x9FA1, + 0x9FA2, + 0x9FA3, + 0x9FA4, + 0x9FA6, 0xA78D, 0xA78E, - 0xA792, - 0xA794, 0xA7AA, 0xA7AB, - 0xA7C0, - 0xA7CB, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, - 0xA7DA, - 0xA9E7, - 0xA9FF, - 0xAA60, - 0xAA77, - 0xAA7A, - 0xAA80, - 0xAB01, - 0xAB07, - 0xAB09, - 0xAB0F, - 0xAB11, - 0xAB17, - 0xAB20, - 0xAB27, - 0xAB28, - 0xAB2F, - 0xAB66, - 0xAB68, + 0xAA7B, + 0xAA7C, 0xAC00, 0xD7A4, - 0xFA0E, - 0xFA10, - 0xFA11, - 0xFA12, - 0xFA13, - 0xFA15, - 0xFA1F, - 0xFA20, - 0xFA21, - 0xFA22, - 0xFA23, - 0xFA25, - 0xFA27, - 0xFA2A, 0x11301, 0x11302, 0x11303, 0x11304, - 0x1133B, + 0x1133C, 0x1133D, - 0x16FF0, - 0x16FF2, - 0x1B11F, - 0x1B123, - 0x1B132, - 0x1B133, - 0x1B150, - 0x1B153, - 0x1B155, - 0x1B156, - 0x1B164, - 0x1B168, - 0x1DF00, - 0x1DF1F, - 0x1DF25, - 0x1DF2B, - 0x1E08F, - 0x1E090, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -276596,22 +284481,122 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x1E7EF, 0x1E7F0, 0x1E7FF, - 0x20000, - 0x2A6E0, - 0x2A700, - 0x2B73A, - 0x2B740, - 0x2B81E, - 0x2B820, - 0x2CEA2, - 0x2CEB0, - 0x2EBE1, - 0x2EBF0, - 0x2EE5E, - 0x30000, - 0x3134B, - 0x31350, - 0x323B0 + 0x2070E, + 0x2070F, + 0x20731, + 0x20732, + 0x20779, + 0x2077A, + 0x20C53, + 0x20C54, + 0x20C78, + 0x20C79, + 0x20C96, + 0x20C97, + 0x20CCF, + 0x20CD0, + 0x20CD5, + 0x20CD6, + 0x20D15, + 0x20D16, + 0x20D7C, + 0x20D7D, + 0x20D7F, + 0x20D80, + 0x20E0E, + 0x20E10, + 0x20E77, + 0x20E78, + 0x20E9D, + 0x20E9E, + 0x20EA2, + 0x20EA3, + 0x20ED7, + 0x20ED8, + 0x20EF9, + 0x20EFB, + 0x20F2D, + 0x20F2F, + 0x20F4C, + 0x20F4D, + 0x20FB4, + 0x20FB5, + 0x20FBC, + 0x20FBD, + 0x20FEA, + 0x20FEB, + 0x2105C, + 0x2105D, + 0x2106F, + 0x21070, + 0x21075, + 0x21077, + 0x2107B, + 0x2107C, + 0x210C1, + 0x210C2, + 0x210C9, + 0x210CA, + 0x211D9, + 0x211DA, + 0x220C7, + 0x220C8, + 0x227B5, + 0x227B6, + 0x22AD5, + 0x22AD6, + 0x22B43, + 0x22B44, + 0x22BCA, + 0x22BCB, + 0x22C51, + 0x22C52, + 0x22C55, + 0x22C56, + 0x22CC2, + 0x22CC3, + 0x22D08, + 0x22D09, + 0x22D4C, + 0x22D4D, + 0x22D67, + 0x22D68, + 0x22EB3, + 0x22EB4, + 0x23CB7, + 0x23CB8, + 0x244D3, + 0x244D4, + 0x24DB8, + 0x24DB9, + 0x24DEA, + 0x24DEB, + 0x2512B, + 0x2512C, + 0x26258, + 0x26259, + 0x267CC, + 0x267CD, + 0x269F2, + 0x269F3, + 0x269FA, + 0x269FB, + 0x27A3E, + 0x27A3F, + 0x2815D, + 0x2815E, + 0x28207, + 0x28208, + 0x282E2, + 0x282E3, + 0x28CCA, + 0x28CCB, + 0x28CCD, + 0x28CCE, + 0x28CD2, + 0x28CD3, + 0x29D98, + 0x29D99 }; # endif /* ASCII/Latin1 */ @@ -276622,7 +284607,7 @@ static const UV UNI_IDENTIFIERSTATUS__AL && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_IDENTIFIERSTATUS__ALLOWED_invlist[] = { /* for EBCDIC 1047 */ - 817, /* Number of elements */ + 3259, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -276680,67 +284665,97 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xFB, 0xFF, 0x100, + 0x114, + 0x116, + 0x12C, + 0x12E, 0x132, 0x134, + 0x138, + 0x139, 0x13F, 0x141, 0x149, 0x14A, + 0x14E, + 0x150, + 0x156, + 0x158, + 0x162, + 0x164, 0x17F, - 0x18F, - 0x190, + 0x181, + 0x182, + 0x186, + 0x187, + 0x189, + 0x18B, + 0x18E, + 0x193, + 0x194, + 0x195, + 0x196, + 0x19A, + 0x19D, + 0x19E, 0x1A0, 0x1A2, 0x1AF, 0x1B1, + 0x1B2, + 0x1B5, + 0x1B7, + 0x1B8, 0x1CD, + 0x1D5, 0x1DD, 0x1DE, - 0x1E4, 0x1E6, - 0x1F1, - 0x1F4, - 0x1F6, + 0x1EA, + 0x1EE, + 0x1F0, 0x1F8, + 0x1FA, + 0x218, 0x21C, - 0x21E, - 0x220, - 0x226, - 0x234, + 0x244, + 0x245, + 0x24C, + 0x24E, + 0x253, + 0x255, + 0x256, + 0x258, 0x259, 0x25A, + 0x25B, + 0x25C, + 0x263, + 0x264, + 0x268, + 0x26A, + 0x272, + 0x273, + 0x289, + 0x28A, + 0x28B, + 0x28C, + 0x292, + 0x293, 0x2BB, 0x2BD, - 0x2EC, - 0x2ED, 0x300, 0x305, 0x306, 0x30D, - 0x30F, - 0x312, - 0x313, - 0x315, 0x31B, 0x31C, 0x323, + 0x324, + 0x326, 0x329, - 0x32D, - 0x32F, - 0x330, + 0x331, 0x332, - 0x335, - 0x336, - 0x338, - 0x33A, - 0x342, - 0x343, - 0x345, - 0x346, - 0x375, - 0x376, - 0x37B, - 0x37E, 0x386, 0x387, 0x388, @@ -276751,80 +284766,140 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x3A2, 0x3A3, 0x3CF, - 0x3FC, + 0x401, + 0x40D, + 0x40E, + 0x450, + 0x451, + 0x45D, + 0x45E, 0x460, - 0x48A, - 0x500, - 0x510, - 0x52A, - 0x52E, - 0x530, + 0x490, + 0x49C, + 0x49E, + 0x4A6, + 0x4A8, + 0x4B8, + 0x4BA, + 0x4C1, + 0x4CF, + 0x4DA, + 0x4DC, + 0x4EA, + 0x4EE, + 0x4F6, + 0x4F8, + 0x4FA, + 0x524, + 0x526, 0x531, 0x557, - 0x559, - 0x55A, 0x561, 0x587, 0x58A, 0x58B, - 0x5B4, - 0x5B5, 0x5D0, 0x5EB, - 0x5EF, + 0x5F3, 0x5F5, 0x620, - 0x640, + 0x63B, + 0x63D, + 0x63E, 0x641, + 0x653, + 0x654, 0x656, 0x660, 0x66A, 0x670, + 0x671, + 0x672, 0x673, 0x674, 0x675, 0x679, - 0x68E, - 0x68F, + 0x690, + 0x691, + 0x69B, + 0x69F, 0x6A1, 0x6A2, + 0x6A3, + 0x6A4, + 0x6AC, + 0x6AD, + 0x6B2, + 0x6B3, + 0x6B4, + 0x6B5, + 0x6B8, + 0x6BA, + 0x6BF, + 0x6C0, 0x6D4, 0x6D5, 0x6D6, - 0x6E5, - 0x6E7, 0x6EE, + 0x6FA, + 0x6FD, 0x700, - 0x750, + 0x751, + 0x753, + 0x756, + 0x757, + 0x760, + 0x761, + 0x762, + 0x764, + 0x766, + 0x769, + 0x76A, + 0x76B, + 0x76E, + 0x772, + 0x780, 0x7B2, - 0x870, - 0x888, - 0x889, 0x88F, + 0x890, 0x8A0, - 0x8AD, - 0x8B2, - 0x8B3, - 0x8B5, - 0x8CA, + 0x8A1, + 0x8A2, + 0x8AA, + 0x8BB, + 0x8C3, + 0x8C7, + 0x8C8, 0x901, + 0x904, + 0x905, + 0x90C, + 0x90D, + 0x929, + 0x92A, + 0x934, + 0x935, + 0x93D, + 0x93E, + 0x944, + 0x945, 0x94E, 0x94F, - 0x951, + 0x950, 0x956, 0x958, - 0x960, - 0x964, 0x966, 0x970, - 0x971, + 0x972, 0x978, - 0x979, + 0x97B, + 0x97D, + 0x97E, 0x980, 0x981, 0x984, 0x985, - 0x98D, + 0x98C, 0x98F, 0x991, 0x993, @@ -276836,21 +284911,17 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x9B6, 0x9BA, 0x9BC, + 0x9BD, + 0x9BE, 0x9C5, 0x9C7, 0x9C9, 0x9CB, 0x9CF, - 0x9D7, - 0x9D8, - 0x9E0, - 0x9E4, 0x9E6, 0x9F2, - 0x9FE, - 0x9FF, - 0xA01, - 0xA04, + 0xA02, + 0xA03, 0xA05, 0xA0B, 0xA0F, @@ -276875,9 +284946,9 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xA4E, 0xA5C, 0xA5D, - 0xA66, - 0xA75, - 0xA81, + 0xA70, + 0xA72, + 0xA82, 0xA84, 0xA85, 0xA8E, @@ -276892,23 +284963,19 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xAB5, 0xABA, 0xABC, + 0xABD, + 0xABE, 0xAC6, 0xAC7, 0xACA, 0xACB, 0xACE, - 0xAD0, - 0xAD1, - 0xAE0, - 0xAE4, 0xAE6, 0xAF0, - 0xAFA, - 0xB00, 0xB01, 0xB04, 0xB05, - 0xB0D, + 0xB0C, 0xB0F, 0xB11, 0xB13, @@ -276917,23 +284984,23 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xB31, 0xB32, 0xB34, - 0xB35, + 0xB36, 0xB3A, 0xB3C, + 0xB3D, + 0xB3E, 0xB44, 0xB47, 0xB49, 0xB4B, 0xB4E, - 0xB55, - 0xB58, + 0xB56, + 0xB57, 0xB5F, - 0xB62, - 0xB66, - 0xB70, + 0xB60, 0xB71, 0xB72, - 0xB82, + 0xB83, 0xB84, 0xB85, 0xB8B, @@ -276959,99 +285026,79 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xBC9, 0xBCA, 0xBCE, - 0xBD0, - 0xBD1, - 0xBD7, - 0xBD8, - 0xBE6, - 0xBF0, - 0xC01, - 0xC0D, + 0xC02, + 0xC04, + 0xC05, + 0xC0C, 0xC0E, 0xC11, 0xC12, 0xC29, 0xC2A, + 0xC31, + 0xC32, 0xC34, 0xC35, 0xC3A, - 0xC3C, + 0xC3E, 0xC45, 0xC46, 0xC49, 0xC4A, 0xC4E, - 0xC55, - 0xC57, - 0xC5D, - 0xC5E, - 0xC60, - 0xC62, - 0xC66, - 0xC70, - 0xC80, - 0xC81, 0xC82, 0xC84, 0xC85, - 0xC8D, + 0xC8C, 0xC8E, 0xC91, 0xC92, 0xCA9, 0xCAA, + 0xCB1, + 0xCB2, 0xCB4, 0xCB5, 0xCBA, - 0xCBC, - 0xCC5, + 0xCBE, + 0xCC4, 0xCC6, 0xCC9, 0xCCA, 0xCCE, - 0xCD5, - 0xCD7, - 0xCDD, - 0xCDE, - 0xCE0, - 0xCE4, 0xCE6, 0xCF0, - 0xCF1, - 0xCF4, - 0xD00, - 0xD01, 0xD02, 0xD04, 0xD05, - 0xD0D, + 0xD0C, 0xD0E, 0xD11, 0xD12, - 0xD3B, - 0xD3D, + 0xD29, + 0xD2A, + 0xD3A, + 0xD3E, 0xD44, 0xD46, 0xD49, 0xD4A, - 0xD4F, - 0xD54, + 0xD4C, + 0xD4D, + 0xD4E, + 0xD57, 0xD58, - 0xD60, - 0xD62, - 0xD66, - 0xD70, 0xD7A, 0xD80, 0xD82, 0xD84, 0xD85, - 0xD8F, + 0xD8E, 0xD91, 0xD97, 0xD9A, - 0xDA6, - 0xDA7, + 0xD9E, + 0xD9F, 0xDB2, 0xDB3, 0xDBC, @@ -277074,44 +285121,52 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xE34, 0xE3B, 0xE40, - 0xE4F, + 0xE4E, 0xE50, 0xE5A, 0xE81, 0xE83, 0xE84, 0xE85, - 0xE86, + 0xE87, + 0xE89, + 0xE8A, 0xE8B, - 0xE8C, + 0xE8D, + 0xE8E, + 0xE94, + 0xE98, + 0xE99, + 0xEA0, + 0xEA1, 0xEA4, 0xEA5, 0xEA6, 0xEA7, + 0xEA8, + 0xEAA, + 0xEAC, + 0xEAD, + 0xEAF, + 0xEB0, 0xEB3, 0xEB4, + 0xEBA, + 0xEBB, 0xEBE, 0xEC0, 0xEC5, 0xEC6, 0xEC7, 0xEC8, - 0xECF, + 0xECE, 0xED0, 0xEDA, - 0xEDE, - 0xEE0, - 0xF00, - 0xF01, 0xF0B, 0xF0C, 0xF20, 0xF2A, - 0xF35, - 0xF36, - 0xF37, - 0xF38, - 0xF3E, + 0xF40, 0xF43, 0xF44, 0xF48, @@ -277125,17 +285180,15 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xF5C, 0xF5D, 0xF69, - 0xF6A, - 0xF6D, 0xF71, 0xF73, 0xF74, 0xF75, 0xF7A, 0xF81, - 0xF82, + 0xF84, 0xF85, - 0xF86, + 0xF90, 0xF93, 0xF94, 0xF98, @@ -277148,26 +285201,28 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xFA8, 0xFAC, 0xFAD, + 0xFAE, + 0xFB1, 0xFB9, 0xFBA, 0xFBD, - 0xFC6, - 0xFC7, 0x1000, 0x104A, - 0x1050, - 0x109E, + 0x105A, + 0x1065, + 0x1075, + 0x108B, + 0x108F, + 0x1090, 0x10C7, 0x10C8, 0x10CD, 0x10CE, 0x10D0, 0x10F1, - 0x10F7, - 0x10FB, - 0x10FD, - 0x1100, 0x1200, + 0x1207, + 0x1208, 0x1249, 0x124A, 0x124E, @@ -277178,10 +285233,14 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x125A, 0x125E, 0x1260, + 0x1287, + 0x1288, 0x1289, 0x128A, 0x128E, 0x1290, + 0x12AF, + 0x12B0, 0x12B1, 0x12B2, 0x12B6, @@ -277194,20 +285253,26 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x12C8, 0x12D7, 0x12D8, + 0x12F8, + 0x1300, + 0x130F, + 0x1310, 0x1311, 0x1312, 0x1316, 0x1318, - 0x135B, - 0x135D, - 0x1360, - 0x1380, - 0x1390, + 0x131F, + 0x1320, + 0x1347, + 0x1348, + 0x135A, 0x1780, + 0x179D, + 0x179F, 0x17A3, 0x17A5, 0x17A8, - 0x17A9, + 0x17AA, 0x17B4, 0x17B6, 0x17CE, @@ -277215,210 +285280,2472 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x17D1, 0x17D2, 0x17D3, - 0x17D7, - 0x17D8, - 0x17DC, - 0x17DD, 0x17E0, 0x17EA, 0x1C90, 0x1CBB, 0x1CBD, 0x1CC0, - 0x1E00, - 0x1E9A, + 0x1E0C, + 0x1E0E, + 0x1E12, + 0x1E14, + 0x1E20, + 0x1E22, + 0x1E24, + 0x1E26, + 0x1E36, + 0x1E38, + 0x1E3C, + 0x1E40, + 0x1E42, + 0x1E4C, + 0x1E5A, + 0x1E5C, + 0x1E62, + 0x1E64, + 0x1E6C, + 0x1E6E, + 0x1E70, + 0x1E72, + 0x1E8C, + 0x1E8E, + 0x1E92, + 0x1E94, 0x1E9E, 0x1E9F, 0x1EA0, 0x1EFA, - 0x1F00, - 0x1F16, - 0x1F18, - 0x1F1E, - 0x1F20, - 0x1F46, - 0x1F48, - 0x1F4E, - 0x1F50, - 0x1F58, - 0x1F59, - 0x1F5A, - 0x1F5B, - 0x1F5C, - 0x1F5D, - 0x1F5E, - 0x1F5F, - 0x1F71, - 0x1F72, - 0x1F73, - 0x1F74, - 0x1F75, - 0x1F76, - 0x1F77, - 0x1F78, - 0x1F79, - 0x1F7A, - 0x1F7B, - 0x1F7C, - 0x1F7D, - 0x1F80, + 0x1FA0, + 0x1FB0, + 0x1FB2, 0x1FB5, - 0x1FB6, - 0x1FBB, - 0x1FBC, - 0x1FBD, - 0x1FC2, - 0x1FC5, - 0x1FC6, - 0x1FC9, - 0x1FCA, - 0x1FCB, - 0x1FCC, - 0x1FCD, - 0x1FD0, - 0x1FD3, - 0x1FD6, - 0x1FDB, - 0x1FE0, - 0x1FE3, - 0x1FE4, - 0x1FEB, 0x1FEC, 0x1FED, - 0x1FF2, - 0x1FF5, - 0x1FF6, - 0x1FF9, - 0x1FFA, - 0x1FFB, - 0x1FFC, - 0x1FFD, 0x2010, 0x2011, 0x2019, 0x201A, 0x2027, 0x2028, - 0x2D27, - 0x2D28, - 0x2D2D, - 0x2D2E, - 0x2D80, - 0x2D97, - 0x2DA0, - 0x2DA7, - 0x2DA8, - 0x2DAF, - 0x2DB0, - 0x2DB7, - 0x2DB8, - 0x2DBF, - 0x2DC0, - 0x2DC7, - 0x2DC8, - 0x2DCF, - 0x2DD0, - 0x2DD7, - 0x2DD8, - 0x2DDF, 0x3005, 0x3008, 0x3041, 0x3097, - 0x3099, - 0x309B, 0x309D, 0x309F, 0x30A0, 0x30FF, - 0x3105, - 0x312E, - 0x312F, - 0x3130, - 0x31A0, - 0x31C0, - 0x3400, - 0x4DC0, + 0x3447, + 0x3448, + 0x3473, + 0x3474, + 0x34E4, + 0x34E5, + 0x3577, + 0x3578, + 0x359E, + 0x359F, + 0x35A1, + 0x35A2, + 0x35AD, + 0x35AE, + 0x35BF, + 0x35C0, + 0x35CE, + 0x35CF, + 0x35F3, + 0x35F4, + 0x35FE, + 0x35FF, + 0x360E, + 0x360F, + 0x361A, + 0x361B, + 0x3918, + 0x3919, + 0x3960, + 0x3961, + 0x396E, + 0x396F, + 0x39CF, + 0x39D1, + 0x39DB, + 0x39DC, + 0x39DF, + 0x39E0, + 0x39F8, + 0x39F9, + 0x39FE, + 0x39FF, + 0x3A18, + 0x3A19, + 0x3A52, + 0x3A53, + 0x3A5C, + 0x3A5D, + 0x3A67, + 0x3A68, + 0x3A73, + 0x3A74, + 0x3B39, + 0x3B3A, + 0x3B4E, + 0x3B4F, + 0x3BA3, + 0x3BA4, + 0x3C6E, + 0x3C6F, + 0x3CE0, + 0x3CE1, + 0x3DE7, + 0x3DE8, + 0x3DEB, + 0x3DEC, + 0x3E74, + 0x3E75, + 0x3ED0, + 0x3ED1, + 0x4056, + 0x4057, + 0x4065, + 0x4066, + 0x406A, + 0x406B, + 0x40BB, + 0x40BC, + 0x40DF, + 0x40E0, + 0x4137, + 0x4138, + 0x415F, + 0x4160, + 0x4337, + 0x4338, + 0x43AC, + 0x43AD, + 0x43B1, + 0x43B2, + 0x43D3, + 0x43D4, + 0x43DD, + 0x43DE, + 0x4443, + 0x4444, + 0x44D6, + 0x44D7, + 0x44EA, + 0x44EB, + 0x4606, + 0x4607, + 0x464C, + 0x464D, + 0x4661, + 0x4662, + 0x4723, + 0x4724, + 0x4729, + 0x472A, + 0x477C, + 0x477D, + 0x478D, + 0x478E, + 0x47F4, + 0x47F5, + 0x4882, + 0x4883, + 0x4947, + 0x4948, + 0x497A, + 0x497B, + 0x497D, + 0x497E, + 0x4982, + 0x4984, + 0x4985, + 0x4987, + 0x499B, + 0x499C, + 0x499F, + 0x49A0, + 0x49B6, + 0x49B8, + 0x4A12, + 0x4A13, + 0x4AB8, + 0x4AB9, + 0x4C77, + 0x4C78, + 0x4C7D, + 0x4C7E, + 0x4C81, + 0x4C82, + 0x4C85, + 0x4C86, + 0x4C9D, + 0x4CA4, + 0x4D13, + 0x4D1A, + 0x4DAE, + 0x4DAF, 0x4E00, - 0xA000, - 0xA67F, - 0xA680, - 0xA717, - 0xA720, - 0xA788, - 0xA789, - 0xA78D, - 0xA78E, - 0xA792, - 0xA794, + 0x4E12, + 0x4E13, + 0x4E29, + 0x4E2A, + 0x4E68, + 0x4E69, + 0x4E79, + 0x4E7A, + 0x4E96, + 0x4E97, + 0x4EA3, + 0x4EA4, + 0x4EBC, + 0x4EBD, + 0x4ECC, + 0x4ECD, + 0x4EE7, + 0x4EE8, + 0x4EF8, + 0x4EFB, + 0x4EFC, + 0x4EFD, + 0x4EFE, + 0x4EFF, + 0x4F07, + 0x4F08, + 0x4F16, + 0x4F17, + 0x4F28, + 0x4F29, + 0x4F31, + 0x4F32, + 0x4F35, + 0x4F36, + 0x4F37, + 0x4F38, + 0x4F40, + 0x4F41, + 0x4F44, + 0x4F45, + 0x4F71, + 0x4F72, + 0x4F8C, + 0x4F8D, + 0x4F8E, + 0x4F8F, + 0x4FA2, + 0x4FA3, + 0x4FBD, + 0x4FBE, + 0x4FC6, + 0x4FC7, + 0x4FC8, + 0x4FC9, + 0x4FCC, + 0x4FCD, + 0x4FE2, + 0x4FE3, + 0x4FFC, + 0x4FFE, + 0x5010, + 0x5011, + 0x5034, + 0x5035, + 0x5038, + 0x5039, + 0x503D, + 0x503E, + 0x5042, + 0x5043, + 0x5052, + 0x5053, + 0x5058, + 0x5059, + 0x507C, + 0x507D, + 0x5081, + 0x5082, + 0x5093, + 0x5094, + 0x5097, + 0x5098, + 0x509F, + 0x50A2, + 0x50B9, + 0x50BA, + 0x50C3, + 0x50C4, + 0x50D8, + 0x50D9, + 0x50DF, + 0x50E0, + 0x50E1, + 0x50E3, + 0x50EB, + 0x50EC, + 0x50F4, + 0x50F5, + 0x50F7, + 0x50F8, + 0x511B, + 0x511C, + 0x5128, + 0x5129, + 0x512B, + 0x512C, + 0x5142, + 0x5143, + 0x514A, + 0x514B, + 0x514F, + 0x5150, + 0x5153, + 0x5154, + 0x5158, + 0x5159, + 0x5160, + 0x5161, + 0x5164, + 0x5165, + 0x5172, + 0x5173, + 0x517E, + 0x517F, + 0x5183, + 0x5185, + 0x518E, + 0x518F, + 0x51A1, + 0x51A2, + 0x51A3, + 0x51A4, + 0x51AD, + 0x51AE, + 0x51B8, + 0x51B9, + 0x51BA, + 0x51BB, + 0x51C2, + 0x51C3, + 0x51D2, + 0x51D4, + 0x51DF, + 0x51E0, + 0x51EC, + 0x51ED, + 0x51EE, + 0x51EF, + 0x51F2, + 0x51F3, + 0x5253, + 0x5254, + 0x5266, + 0x5267, + 0x5279, + 0x527A, + 0x5285, + 0x5286, + 0x528E, + 0x528F, + 0x52C4, + 0x52C5, + 0x52C8, + 0x52C9, + 0x52CC, + 0x52CD, + 0x52CE, + 0x52CF, + 0x52D1, + 0x52D2, + 0x52D4, + 0x52D5, + 0x52E1, + 0x52E2, + 0x52E5, + 0x52E6, + 0x52EE, + 0x52EF, + 0x5303, + 0x5305, + 0x5318, + 0x5319, + 0x531B, + 0x531C, + 0x531E, + 0x531F, + 0x5327, + 0x5328, + 0x5329, + 0x532A, + 0x5332, + 0x5333, + 0x5335, + 0x5337, + 0x5342, + 0x5343, + 0x535B, + 0x535C, + 0x535D, + 0x535E, + 0x536A, + 0x536B, + 0x536D, + 0x536E, + 0x5380, + 0x5381, + 0x53A1, + 0x53A2, + 0x53AA, + 0x53AC, + 0x53AF, + 0x53B0, + 0x53BA, + 0x53BB, + 0x53C5, + 0x53C6, + 0x53CF, + 0x53D0, + 0x53DD, + 0x53DF, + 0x53E7, + 0x53E8, + 0x53FF, + 0x5401, + 0x541A, + 0x541B, + 0x5422, + 0x5423, + 0x544C, + 0x544D, + 0x545D, + 0x545E, + 0x5469, + 0x546A, + 0x548A, + 0x548B, + 0x54B5, + 0x54B6, + 0x54F6, + 0x54F7, + 0x5515, + 0x5516, + 0x5518, + 0x551A, + 0x5547, + 0x5548, + 0x5560, + 0x5561, + 0x557A, + 0x557B, + 0x55E0, + 0x55E1, + 0x55F8, + 0x55F9, + 0x560A, + 0x560C, + 0x5620, + 0x5621, + 0x562B, + 0x562C, + 0x5637, + 0x5638, + 0x563C, + 0x563D, + 0x5644, + 0x5645, + 0x564B, + 0x564C, + 0x5651, + 0x5652, + 0x5656, + 0x5657, + 0x565F, + 0x5660, + 0x5661, + 0x5662, + 0x5675, + 0x5676, + 0x567D, + 0x567E, + 0x5688, + 0x5689, + 0x568B, + 0x568C, + 0x5696, + 0x5697, + 0x569E, + 0x569F, + 0x56BA, + 0x56BB, + 0x56CF, + 0x56D0, + 0x56D9, + 0x56DA, + 0x56E6, + 0x56E7, + 0x56F6, + 0x56F7, + 0x56F8, + 0x56F9, + 0x56FB, + 0x56FD, + 0x5705, + 0x5706, + 0x5711, + 0x5712, + 0x5717, + 0x5718, + 0x5721, + 0x5722, + 0x5724, + 0x5725, + 0x573D, + 0x573E, + 0x5743, + 0x5744, + 0x5748, + 0x5749, + 0x5755, + 0x5757, + 0x5758, + 0x5759, + 0x5763, + 0x5764, + 0x5778, + 0x5779, + 0x5781, + 0x5782, + 0x5787, + 0x5788, + 0x5796, + 0x5797, + 0x57A8, + 0x57A9, + 0x57CA, + 0x57CB, + 0x57D1, + 0x57D2, + 0x57DB, + 0x57DC, + 0x5817, + 0x5819, + 0x5850, + 0x5851, + 0x5856, + 0x5857, + 0x5860, + 0x5861, + 0x5866, + 0x5868, + 0x5877, + 0x5878, + 0x5895, + 0x5896, + 0x58AA, + 0x58AB, + 0x58B6, + 0x58B7, + 0x58C0, + 0x58C1, + 0x58C3, + 0x58C5, + 0x58CD, + 0x58CE, + 0x58D0, + 0x58D1, + 0x58E1, + 0x58E2, + 0x58E6, + 0x58E7, + 0x58F5, + 0x58F6, + 0x5901, + 0x5902, + 0x5905, + 0x5906, + 0x5908, + 0x5909, + 0x5911, + 0x5912, + 0x5913, + 0x5914, + 0x5923, + 0x5924, + 0x5933, + 0x5934, + 0x5936, + 0x5937, + 0x5959, + 0x595A, + 0x595B, + 0x595C, + 0x59B7, + 0x59B8, + 0x59E7, + 0x59E8, + 0x5A24, + 0x5A25, + 0x5A26, + 0x5A27, + 0x5A2C, + 0x5A2D, + 0x5A30, + 0x5A31, + 0x5A54, + 0x5A55, + 0x5A59, + 0x5A5A, + 0x5A6F, + 0x5A70, + 0x5A71, + 0x5A72, + 0x5A87, + 0x5A88, + 0x5A8D, + 0x5A8E, + 0x5AAB, + 0x5AAC, + 0x5AD3, + 0x5AD4, + 0x5AEF, + 0x5AF1, + 0x5B0A, + 0x5B0B, + 0x5B0D, + 0x5B0E, + 0x5B39, + 0x5B3A, + 0x5B46, + 0x5B47, + 0x5B4F, + 0x5B50, + 0x5B52, + 0x5B53, + 0x5B60, + 0x5B62, + 0x5B6F, + 0x5B70, + 0x5B79, + 0x5B7A, + 0x5B7E, + 0x5B7F, + 0x5B86, + 0x5B87, + 0x5B90, + 0x5B91, + 0x5BA9, + 0x5BAA, + 0x5BB2, + 0x5BB3, + 0x5BB7, + 0x5BB8, + 0x5BBC, + 0x5BBD, + 0x5BC8, + 0x5BC9, + 0x5BDA, + 0x5BDB, + 0x5C00, + 0x5C01, + 0x5C1B, + 0x5C1C, + 0x5C23, + 0x5C24, + 0x5C26, + 0x5C27, + 0x5C29, + 0x5C2A, + 0x5C36, + 0x5C37, + 0x5C5A, + 0x5C5B, + 0x5C85, + 0x5C86, + 0x5CB4, + 0x5CB5, + 0x5CB9, + 0x5CBA, + 0x5CD5, + 0x5CD6, + 0x5CDD, + 0x5CDE, + 0x5CF5, + 0x5CF6, + 0x5D2B, + 0x5D2C, + 0x5D2F, + 0x5D30, + 0x5D3B, + 0x5D3C, + 0x5D53, + 0x5D54, + 0x5D57, + 0x5D58, + 0x5D60, + 0x5D61, + 0x5D83, + 0x5D84, + 0x5D96, + 0x5D97, + 0x5DA3, + 0x5DA5, + 0x5DAB, + 0x5DAC, + 0x5DB3, + 0x5DB4, + 0x5DB9, + 0x5DBA, + 0x5DC4, + 0x5DC5, + 0x5DD7, + 0x5DD8, + 0x5DDA, + 0x5DDB, + 0x5DDC, + 0x5DDD, + 0x5DF6, + 0x5DF7, + 0x5E12, + 0x5E13, + 0x5E48, + 0x5E49, + 0x5E51, + 0x5E52, + 0x5E92, + 0x5E93, + 0x5EBA, + 0x5EBB, + 0x5EC0, + 0x5EC1, + 0x5EEB, + 0x5EEC, + 0x5EF9, + 0x5EFA, + 0x5F0E, + 0x5F0F, + 0x5F3B, + 0x5F3C, + 0x5F3D, + 0x5F3E, + 0x5F8F, + 0x5F90, + 0x5F9A, + 0x5F9B, + 0x5FA3, + 0x5FA5, + 0x5FB0, + 0x5FB1, + 0x5FC2, + 0x5FC3, + 0x5FCE, + 0x5FCF, + 0x5FDB, + 0x5FDC, + 0x5FE2, + 0x5FE3, + 0x5FEC, + 0x5FED, + 0x5FFC, + 0x5FFD, + 0x6023, + 0x6024, + 0x6056, + 0x6057, + 0x6061, + 0x6062, + 0x6071, + 0x6072, + 0x6074, + 0x6075, + 0x6091, + 0x6092, + 0x6093, + 0x6094, + 0x60A5, + 0x60A6, + 0x60D2, + 0x60D3, + 0x60D6, + 0x60D7, + 0x60DE, + 0x60DF, + 0x60E5, + 0x60E6, + 0x60FD, + 0x60FE, + 0x6102, + 0x6103, + 0x6107, + 0x6108, + 0x6111, + 0x6112, + 0x611E, + 0x611F, + 0x6131, + 0x6132, + 0x6133, + 0x6134, + 0x6135, + 0x6136, + 0x6138, + 0x613A, + 0x6160, + 0x6161, + 0x617B, + 0x617C, + 0x617F, + 0x6180, + 0x6186, + 0x6187, + 0x6197, + 0x6198, + 0x619C, + 0x619D, + 0x61B9, + 0x61BA, + 0x61BB, + 0x61BC, + 0x61D3, + 0x61D4, + 0x61D5, + 0x61D6, + 0x61EC, + 0x61ED, + 0x61EF, + 0x61F0, + 0x6205, + 0x6206, + 0x6235, + 0x6236, + 0x6239, + 0x623A, + 0x6257, + 0x6258, + 0x628D, + 0x628E, + 0x629D, + 0x629E, + 0x62DE, + 0x62DF, + 0x62EA, + 0x62EB, + 0x630A, + 0x630B, + 0x6317, + 0x6318, + 0x6331, + 0x6332, + 0x6337, + 0x6338, + 0x635B, + 0x635C, + 0x638B, + 0x638C, + 0x6393, + 0x6394, + 0x63D1, + 0x63D2, + 0x643B, + 0x643D, + 0x6449, + 0x644A, + 0x645A, + 0x645B, + 0x647E, + 0x647F, + 0x6486, + 0x6487, + 0x64A1, + 0x64A2, + 0x64AF, + 0x64B0, + 0x64B6, + 0x64B7, + 0x64C8, + 0x64C9, + 0x64D5, + 0x64D6, + 0x64EE, + 0x64EF, + 0x64F5, + 0x64F6, + 0x64F9, + 0x64FA, + 0x6502, + 0x6503, + 0x650A, + 0x650B, + 0x651F, + 0x6520, + 0x6528, + 0x6529, + 0x6540, + 0x6541, + 0x6542, + 0x6543, + 0x655A, + 0x655B, + 0x655F, + 0x6560, + 0x657D, + 0x657E, + 0x658A, + 0x658B, + 0x659A, + 0x659B, + 0x65B5, + 0x65B6, + 0x65BE, + 0x65BF, + 0x65C8, + 0x65CA, + 0x65D1, + 0x65D2, + 0x65D8, + 0x65D9, + 0x65DC, + 0x65DD, + 0x65E4, + 0x65E5, + 0x65EA, + 0x65EB, + 0x65F9, + 0x65FA, + 0x65FE, + 0x65FF, + 0x6617, + 0x6618, + 0x662C, + 0x662D, + 0x6637, + 0x6639, + 0x6648, + 0x6649, + 0x664D, + 0x664E, + 0x6660, + 0x6661, + 0x6663, + 0x6664, + 0x6692, + 0x6693, + 0x669C, + 0x669D, + 0x669E, + 0x669F, + 0x66AC, + 0x66AE, + 0x66D0, + 0x66D1, + 0x66D3, + 0x66D4, + 0x66D7, + 0x66D8, + 0x66DF, + 0x66E0, + 0x66EF, + 0x66F0, + 0x6702, + 0x6703, + 0x6707, + 0x6708, + 0x6719, + 0x671A, + 0x6724, + 0x6725, + 0x6729, + 0x672A, + 0x6767, + 0x6768, + 0x6788, + 0x6789, + 0x6796, + 0x6797, + 0x67BD, + 0x67BE, + 0x67BF, + 0x67C0, + 0x67D5, + 0x67D6, + 0x67D7, + 0x67D8, + 0x67F9, + 0x67FA, + 0x6801, + 0x6802, + 0x6815, + 0x6816, + 0x6827, + 0x6828, + 0x6830, + 0x6831, + 0x6858, + 0x6859, + 0x685A, + 0x685B, + 0x685E, + 0x685F, + 0x687A, + 0x687B, + 0x6895, + 0x6896, + 0x6899, + 0x689A, + 0x68A5, + 0x68A6, + 0x68B8, + 0x68B9, + 0x68C3, + 0x68C4, + 0x68D9, + 0x68DA, + 0x68E2, + 0x68E3, + 0x68E5, + 0x68E6, + 0x6909, + 0x690A, + 0x693E, + 0x693F, + 0x694D, + 0x694E, + 0x699F, + 0x69A0, + 0x69A2, + 0x69A3, + 0x69C0, + 0x69C1, + 0x69D1, + 0x69D3, + 0x69D5, + 0x69D8, + 0x6A03, + 0x6A04, + 0x6A1C, + 0x6A1D, + 0x6A24, + 0x6A25, + 0x6A37, + 0x6A38, + 0x6A4A, + 0x6A4B, + 0x6A5C, + 0x6A5D, + 0x6A6E, + 0x6A6F, + 0x6A70, + 0x6A71, + 0x6A86, + 0x6A87, + 0x6A8A, + 0x6A8B, + 0x6A8F, + 0x6A90, + 0x6A99, + 0x6A9A, + 0x6A9D, + 0x6A9E, + 0x6AB1, + 0x6AB2, + 0x6ABE, + 0x6ABF, + 0x6AC0, + 0x6AC1, + 0x6AC4, + 0x6AC5, + 0x6AC9, + 0x6ACA, + 0x6AD8, + 0x6AD9, + 0x6AE9, + 0x6AEA, + 0x6B0E, + 0x6B0F, + 0x6B1B, + 0x6B1C, + 0x6B2E, + 0x6B2F, + 0x6B35, + 0x6B36, + 0x6B40, + 0x6B41, + 0x6B57, + 0x6B59, + 0x6B5D, + 0x6B5E, + 0x6B68, + 0x6B69, + 0x6B6C, + 0x6B6D, + 0x6B6E, + 0x6B6F, + 0x6B71, + 0x6B72, + 0x6B75, + 0x6B76, + 0x6B7D, + 0x6B7E, + 0x6BB8, + 0x6BB9, + 0x6BE9, + 0x6BEA, + 0x6BF1, + 0x6BF2, + 0x6BF4, + 0x6BF5, + 0x6BFA, + 0x6BFB, + 0x6C0A, + 0x6C0B, + 0x6C1C, + 0x6C1D, + 0x6C2D, + 0x6C2E, + 0x6C3C, + 0x6C3D, + 0x6C45, + 0x6C46, + 0x6C6C, + 0x6C6D, + 0x6C6E, + 0x6C6F, + 0x6CA0, + 0x6CA1, + 0x6CD8, + 0x6CD9, + 0x6CF4, + 0x6CF5, + 0x6D02, + 0x6D03, + 0x6D1C, + 0x6D1D, + 0x6D24, + 0x6D25, + 0x6D71, + 0x6D72, + 0x6D81, + 0x6D82, + 0x6D96, + 0x6D97, + 0x6DB0, + 0x6DB2, + 0x6DB6, + 0x6DB7, + 0x6DFE, + 0x6E00, + 0x6E01, + 0x6E03, + 0x6E06, + 0x6E07, + 0x6E12, + 0x6E13, + 0x6E18, + 0x6E19, + 0x6E2A, + 0x6E2B, + 0x6E4C, + 0x6E4D, + 0x6E6C, + 0x6E6D, + 0x6E7B, + 0x6E7E, + 0x6E8B, + 0x6E8C, + 0x6E95, + 0x6E96, + 0x6EDB, + 0x6EDC, + 0x6EE3, + 0x6EE4, + 0x6F04, + 0x6F05, + 0x6F0B, + 0x6F0C, + 0x6F42, + 0x6F43, + 0x6F48, + 0x6F49, + 0x6F4A, + 0x6F4B, + 0x6F79, + 0x6F7A, + 0x6F98, + 0x6F99, + 0x6F9A, + 0x6F9B, + 0x6F9F, + 0x6FA0, + 0x6FB7, + 0x6FB8, + 0x6FC5, + 0x6FC6, + 0x6FD0, + 0x6FD1, + 0x6FD3, + 0x6FD4, + 0x6FF5, + 0x6FF6, + 0x6FFD, + 0x6FFE, + 0x7010, + 0x7011, + 0x7013, + 0x7014, + 0x7047, + 0x7048, + 0x704B, + 0x704C, + 0x704E, + 0x704F, + 0x7072, + 0x7074, + 0x707B, + 0x707C, + 0x7081, + 0x7082, + 0x708D, + 0x708E, + 0x7097, + 0x7098, + 0x709B, + 0x709C, + 0x70AA, + 0x70AB, + 0x70B2, + 0x70B3, + 0x70B6, + 0x70B7, + 0x70D5, + 0x70D6, + 0x70FE, + 0x70FF, + 0x7108, + 0x7109, + 0x7124, + 0x7125, + 0x7133, + 0x7135, + 0x7157, + 0x7158, + 0x716B, + 0x716C, + 0x716D, + 0x716E, + 0x718D, + 0x718E, + 0x7196, + 0x7197, + 0x71A6, + 0x71A7, + 0x71AB, + 0x71AC, + 0x71B6, + 0x71B7, + 0x71CC, + 0x71CD, + 0x71D3, + 0x71D4, + 0x71F3, + 0x71F4, + 0x71FA, + 0x71FB, + 0x720B, + 0x720C, + 0x7211, + 0x7212, + 0x7215, + 0x7216, + 0x7217, + 0x7218, + 0x7220, + 0x7221, + 0x7224, + 0x7226, + 0x722F, + 0x7230, + 0x7234, + 0x7235, + 0x7245, + 0x7246, + 0x724E, + 0x724F, + 0x7250, + 0x7251, + 0x7255, + 0x7256, + 0x72AB, + 0x72AC, + 0x72BE, + 0x72BF, + 0x7302, + 0x7303, + 0x7310, + 0x7311, + 0x7328, + 0x7329, + 0x7353, + 0x7354, + 0x739C, + 0x739D, + 0x73C1, + 0x73C2, + 0x73F3, + 0x73F4, + 0x73FB, + 0x73FC, + 0x7418, + 0x7419, + 0x7439, + 0x743A, + 0x743E, + 0x743F, + 0x7447, + 0x7448, + 0x7449, + 0x744A, + 0x7458, + 0x7459, + 0x747B, + 0x747C, + 0x7484, + 0x7485, + 0x7496, + 0x7497, + 0x749D, + 0x749E, + 0x74C7, + 0x74C8, + 0x74C9, + 0x74CA, + 0x74CC, + 0x74CD, + 0x74EB, + 0x74EC, + 0x7520, + 0x7521, + 0x7541, + 0x7542, + 0x7552, + 0x7553, + 0x7555, + 0x7556, + 0x755E, + 0x755F, + 0x7561, + 0x7562, + 0x7571, + 0x7572, + 0x757B, + 0x757C, + 0x7585, + 0x7586, + 0x75A9, + 0x75AA, + 0x75B7, + 0x75B8, + 0x75DC, + 0x75DD, + 0x75EE, + 0x75EF, + 0x762C, + 0x762D, + 0x7644, + 0x7646, + 0x7651, + 0x7652, + 0x7655, + 0x7656, + 0x7673, + 0x7674, + 0x768D, + 0x768E, + 0x76A1, + 0x76A3, + 0x76A5, + 0x76A6, + 0x76A8, + 0x76A9, + 0x76B3, + 0x76B4, + 0x76B6, + 0x76B7, + 0x76C1, + 0x76C2, + 0x76CB, + 0x76CC, + 0x76D9, + 0x76DA, + 0x76EB, + 0x76EC, + 0x7700, + 0x7701, + 0x7702, + 0x7703, + 0x770E, + 0x770F, + 0x7721, + 0x7722, + 0x772B, + 0x772C, + 0x773F, + 0x7740, + 0x7742, + 0x7743, + 0x7764, + 0x7765, + 0x7796, + 0x7797, + 0x77A4, + 0x77A5, + 0x77BE, + 0x77BF, + 0x77C1, + 0x77C2, + 0x77D2, + 0x77D3, + 0x77DD, + 0x77DE, + 0x77E4, + 0x77E5, + 0x77E6, + 0x77E7, + 0x77F4, + 0x77F6, + 0x7824, + 0x7825, + 0x7836, + 0x7837, + 0x7842, + 0x7843, + 0x7846, + 0x7847, + 0x784B, + 0x784C, + 0x7876, + 0x7877, + 0x7888, + 0x7889, + 0x78C2, + 0x78C3, + 0x78C7, + 0x78C8, + 0x78D2, + 0x78D3, + 0x78F0, + 0x78F1, + 0x78F8, + 0x78F9, + 0x7900, + 0x7901, + 0x7908, + 0x7909, + 0x790D, + 0x790E, + 0x7915, + 0x7916, + 0x791F, + 0x7921, + 0x7932, + 0x7933, + 0x7936, + 0x7937, + 0x7959, + 0x795A, + 0x796C, + 0x796D, + 0x796E, + 0x796F, + 0x7975, + 0x7977, + 0x7986, + 0x7988, + 0x799E, + 0x799F, + 0x79A9, + 0x79AA, + 0x79BC, + 0x79BD, + 0x79C4, + 0x79C5, + 0x79C7, + 0x79C8, + 0x79CC, + 0x79CD, + 0x79D4, + 0x79D5, + 0x79D7, + 0x79D8, + 0x7A01, + 0x7A02, + 0x7A07, + 0x7A08, + 0x7A09, + 0x7A0A, + 0x7A2C, + 0x7A2D, + 0x7A38, + 0x7A39, + 0x7A3A, + 0x7A3B, + 0x7A64, + 0x7A65, + 0x7A6A, + 0x7A6B, + 0x7A6F, + 0x7A70, + 0x7A82, + 0x7A83, + 0x7A9A, + 0x7A9C, + 0x7AB9, + 0x7ABA, + 0x7ABB, + 0x7ABE, + 0x7AC2, + 0x7AC3, + 0x7AC6, + 0x7AC7, + 0x7AE9, + 0x7AEA, + 0x7AF5, + 0x7AF6, + 0x7AFC, + 0x7AFD, + 0x7B07, + 0x7B08, + 0x7B1F, + 0x7B20, + 0x7B27, + 0x7B28, + 0x7B29, + 0x7B2A, + 0x7B42, + 0x7B43, + 0x7B53, + 0x7B54, + 0x7BA3, + 0x7BA4, + 0x7BA5, + 0x7BA6, + 0x7BB0, + 0x7BB1, + 0x7BB2, + 0x7BB3, + 0x7BFA, + 0x7BFB, + 0x7C1B, + 0x7C1C, + 0x7C2E, + 0x7C30, + 0x7C52, + 0x7C53, + 0x7C55, + 0x7C56, + 0x7C5D, + 0x7C5E, + 0x7C76, + 0x7C77, + 0x7C87, + 0x7C88, + 0x7C93, + 0x7C94, + 0x7C9A, + 0x7C9B, + 0x7CAC, + 0x7CAD, + 0x7CD3, + 0x7CD4, + 0x7CDA, + 0x7CDC, + 0x7CE1, + 0x7CE2, + 0x7CE3, + 0x7CE4, + 0x7CE5, + 0x7CE7, + 0x7CFC, + 0x7CFD, + 0x7CFF, + 0x7D00, + 0x7D23, + 0x7D24, + 0x7D2A, + 0x7D2B, + 0x7D2D, + 0x7D2E, + 0x7D48, + 0x7D49, + 0x7D4D, + 0x7D4E, + 0x7D5A, + 0x7D5B, + 0x7D64, + 0x7D65, + 0x7D78, + 0x7D79, + 0x7D82, + 0x7D83, + 0x7D95, + 0x7D96, + 0x7D98, + 0x7D99, + 0x7DA4, + 0x7DA5, + 0x7DA8, + 0x7DA9, + 0x7DCD, + 0x7DCE, + 0x7DD3, + 0x7DD4, + 0x7DE5, + 0x7DE6, + 0x7DEB, + 0x7DEC, + 0x7DFD, + 0x7E00, + 0x7E18, + 0x7E19, + 0x7E5B, + 0x7E5C, + 0x7E64, + 0x7E65, + 0x7E9D, + 0x7E9E, + 0x7F3B, + 0x7F3D, + 0x7F41, + 0x7F42, + 0x7F46, + 0x7F47, + 0x7F59, + 0x7F5A, + 0x7F84, + 0x7F85, + 0x7F90, + 0x7F91, + 0x7F97, + 0x7F98, + 0x7F99, + 0x7F9A, + 0x7FB4, + 0x7FB5, + 0x7FD6, + 0x7FD7, + 0x7FDD, + 0x7FDE, + 0x7FE4, + 0x7FE5, + 0x800A, + 0x800B, + 0x802F, + 0x8030, + 0x803C, + 0x803D, + 0x8040, + 0x8041, + 0x8066, + 0x8067, + 0x8088, + 0x8089, + 0x808E, + 0x808F, + 0x8094, + 0x8095, + 0x80A6, + 0x80A9, + 0x80B3, + 0x80B4, + 0x80B9, + 0x80BA, + 0x80DF, + 0x80E0, + 0x8103, + 0x8105, + 0x8134, + 0x8136, + 0x8184, + 0x8185, + 0x8190, + 0x8191, + 0x8196, + 0x8197, + 0x81CB, + 0x81CC, + 0x81E4, + 0x81E5, + 0x81EF, + 0x81F1, + 0x8213, + 0x8214, + 0x8224, + 0x8225, + 0x8241, + 0x8242, + 0x8265, + 0x8266, + 0x828C, + 0x828D, + 0x82B2, + 0x82B3, + 0x82E2, + 0x82E3, + 0x82FC, + 0x82FD, + 0x830A, + 0x830B, + 0x8310, + 0x8311, + 0x8330, + 0x8331, + 0x8355, + 0x8356, + 0x83BE, + 0x83BF, + 0x83E6, + 0x83E7, + 0x83ED, + 0x83EE, + 0x8414, + 0x8415, + 0x8416, + 0x8418, + 0x841F, + 0x8420, + 0x8458, + 0x8459, + 0x8483, + 0x8484, + 0x8495, + 0x8496, + 0x84B7, + 0x84B8, + 0x84C3, + 0x84C4, + 0x84ED, + 0x84EE, + 0x8505, + 0x8506, + 0x8510, + 0x8511, + 0x8532, + 0x8534, + 0x854C, + 0x854D, + 0x8550, + 0x8551, + 0x857F, + 0x8580, + 0x8593, + 0x8594, + 0x85B2, + 0x85B3, + 0x85BB, + 0x85BC, + 0x85CC, + 0x85CD, + 0x85EE, + 0x85EF, + 0x85F3, + 0x85F4, + 0x85FC, + 0x85FD, + 0x8603, + 0x8604, + 0x860D, + 0x860F, + 0x8610, + 0x8611, + 0x8615, + 0x8616, + 0x861D, + 0x861E, + 0x8637, + 0x8638, + 0x8657, + 0x8658, + 0x8675, + 0x8676, + 0x8689, + 0x868A, + 0x8692, + 0x8693, + 0x86A0, + 0x86A1, + 0x86A6, + 0x86A7, + 0x86D5, + 0x86D6, + 0x86E0, + 0x86E1, + 0x86E7, + 0x86E8, + 0x86FD, + 0x86FE, + 0x871D, + 0x871E, + 0x872F, + 0x8730, + 0x873D, + 0x873E, + 0x8745, + 0x8746, + 0x8771, + 0x8772, + 0x878E, + 0x878F, + 0x8799, + 0x879A, + 0x87DA, + 0x87DB, + 0x87F0, + 0x87F1, + 0x8807, + 0x8808, + 0x8812, + 0x8813, + 0x882D, + 0x882E, + 0x883A, + 0x883B, + 0x8847, + 0x8848, + 0x8858, + 0x8859, + 0x885C, + 0x885D, + 0x885F, + 0x8860, + 0x887A, + 0x887B, + 0x88E6, + 0x88E7, + 0x88E9, + 0x88EA, + 0x88ED, + 0x88EE, + 0x8903, + 0x8904, + 0x890F, + 0x8910, + 0x8924, + 0x8925, + 0x8965, + 0x8966, + 0x8975, + 0x8976, + 0x897D, + 0x897E, + 0x898D, + 0x898E, + 0x8990, + 0x8991, + 0x8994, + 0x8995, + 0x8999, + 0x899A, + 0x89B0, + 0x89B1, + 0x89B4, + 0x89B5, + 0x89BB, + 0x89BD, + 0x89EE, + 0x89EF, + 0x89F5, + 0x89F6, + 0x89F9, + 0x89FA, + 0x89FD, + 0x89FE, + 0x8A05, + 0x8A07, + 0x8A14, + 0x8A15, + 0x8A19, + 0x8A1A, + 0x8A20, + 0x8A22, + 0x8A2B, + 0x8A2C, + 0x8A3D, + 0x8A3E, + 0x8A4B, + 0x8A4C, + 0x8A64, + 0x8A65, + 0x8A78, + 0x8A79, + 0x8A7D, + 0x8A7E, + 0x8A88, + 0x8A89, + 0x8A9F, + 0x8AA0, + 0x8AAF, + 0x8AB0, + 0x8AB7, + 0x8AB8, + 0x8AD0, + 0x8AD1, + 0x8AEC, + 0x8AED, + 0x8B29, + 0x8B2A, + 0x8B32, + 0x8B33, + 0x8B38, + 0x8B39, + 0x8B3F, + 0x8B40, + 0x8B61, + 0x8B63, + 0x8B69, + 0x8B6A, + 0x8B75, + 0x8B76, + 0x8B7C, + 0x8B7D, + 0x8B81, + 0x8B82, + 0x8B87, + 0x8B88, + 0x8B8D, + 0x8B8E, + 0x8B8F, + 0x8B90, + 0x8B9B, + 0x8B9C, + 0x8C38, + 0x8C39, + 0x8C40, + 0x8C41, + 0x8C44, + 0x8C45, + 0x8C51, + 0x8C54, + 0x8C58, + 0x8C59, + 0x8C74, + 0x8C75, + 0x8C7F, + 0x8C80, + 0x8C83, + 0x8C84, + 0x8C87, + 0x8C88, + 0x8C8B, + 0x8C8C, + 0x8C9B, + 0x8C9C, + 0x8CA6, + 0x8CA7, + 0x8CCB, + 0x8CCC, + 0x8CD6, + 0x8CD7, + 0x8CD8, + 0x8CD9, + 0x8CE9, + 0x8CEA, + 0x8CF7, + 0x8CF8, + 0x8D01, + 0x8D02, + 0x8D11, + 0x8D13, + 0x8D7C, + 0x8D7D, + 0x8DA6, + 0x8DA7, + 0x8DC0, + 0x8DC1, + 0x8DE5, + 0x8DE6, + 0x8E01, + 0x8E02, + 0x8E0B, + 0x8E0C, + 0x8E32, + 0x8E33, + 0x8E46, + 0x8E47, + 0x8E4F, + 0x8E50, + 0x8E6E, + 0x8E6F, + 0x8E75, + 0x8E76, + 0x8E77, + 0x8E78, + 0x8E79, + 0x8E7A, + 0x8E9B, + 0x8E9C, + 0x8EA2, + 0x8EA3, + 0x8EB3, + 0x8EB4, + 0x8EB6, + 0x8EB8, + 0x8EC1, + 0x8EC2, + 0x8EC4, + 0x8EC5, + 0x8ED9, + 0x8EDA, + 0x8EF0, + 0x8EF1, + 0x8F0F, + 0x8F10, + 0x8F2D, + 0x8F2E, + 0x8F3A, + 0x8F3B, + 0x8F41, + 0x8F42, + 0x8F9D, + 0x8F9E, + 0x8FA4, + 0x8FA5, + 0x8FB3, + 0x8FB4, + 0x8FC3, + 0x8FC4, + 0x8FCA, + 0x8FCB, + 0x8FE7, + 0x8FE8, + 0x902A, + 0x902B, + 0x902C, + 0x902D, + 0x9037, + 0x9038, + 0x9040, + 0x9041, + 0x9046, + 0x9047, + 0x90AB, + 0x90AC, + 0x90CC, + 0x90CE, + 0x90D2, + 0x90D3, + 0x90F6, + 0x90F7, + 0x910A, + 0x910B, + 0x913C, + 0x913E, + 0x9159, + 0x915A, + 0x917B, + 0x917C, + 0x9195, + 0x9196, + 0x9198, + 0x9199, + 0x91A9, + 0x91AA, + 0x91BF, + 0x91C0, + 0x91C4, + 0x91C5, + 0x91E0, + 0x91E1, + 0x91EF, + 0x91F0, + 0x9213, + 0x9214, + 0x921F, + 0x9220, + 0x9222, + 0x9223, + 0x9243, + 0x9244, + 0x9269, + 0x926B, + 0x9281, + 0x9282, + 0x9284, + 0x9285, + 0x929E, + 0x929F, + 0x92BD, + 0x92BE, + 0x92D4, + 0x92D5, + 0x92DB, + 0x92DC, + 0x92E2, + 0x92E3, + 0x931C, + 0x931D, + 0x9330, + 0x9332, + 0x9362, + 0x9363, + 0x9368, + 0x9369, + 0x936B, + 0x936C, + 0x936F, + 0x9370, + 0x9373, + 0x9374, + 0x9378, + 0x9379, + 0x937F, + 0x9380, + 0x9381, + 0x9382, + 0x938B, + 0x938C, + 0x939C, + 0x939D, + 0x93A0, + 0x93A1, + 0x93AB, + 0x93AC, + 0x93BB, + 0x93BC, + 0x93E0, + 0x93E1, + 0x93F3, + 0x93F4, + 0x9402, + 0x9403, + 0x9417, + 0x9418, + 0x941C, + 0x941D, + 0x941E, + 0x9420, + 0x9424, + 0x9425, + 0x9443, + 0x9444, + 0x944E, + 0x944F, + 0x946C, + 0x946D, + 0x947B, + 0x947C, + 0x9578, + 0x957A, + 0x957E, + 0x957F, + 0x9585, + 0x9586, + 0x9597, + 0x9598, + 0x95B3, + 0x95B5, + 0x95B8, + 0x95B9, + 0x95C1, + 0x95C2, + 0x95D9, + 0x95DA, + 0x95DD, + 0x95DE, + 0x9625, + 0x9627, + 0x9629, + 0x962A, + 0x963E, + 0x963F, + 0x9656, + 0x9658, + 0x9679, + 0x967A, + 0x967B, + 0x967C, + 0x967F, + 0x9680, + 0x9681, + 0x9683, + 0x968C, + 0x968D, + 0x9696, + 0x9697, + 0x969A, + 0x969B, + 0x969D, + 0x969E, + 0x969F, + 0x96A0, + 0x96AB, + 0x96AC, + 0x96AF, + 0x96B0, + 0x96B5, + 0x96B6, + 0x96E4, + 0x96E5, + 0x96E6, + 0x96E8, + 0x96FC, + 0x96FD, + 0x9714, + 0x9715, + 0x9717, + 0x9718, + 0x971A, + 0x971C, + 0x9733, + 0x9735, + 0x9737, + 0x9738, + 0x9740, + 0x9742, + 0x974D, + 0x974E, + 0x9757, + 0x9758, + 0x9763, + 0x9764, + 0x9775, + 0x9776, + 0x9787, + 0x9788, + 0x9789, + 0x978A, + 0x979B, + 0x979C, + 0x97A9, + 0x97AA, + 0x97B0, + 0x97B2, + 0x97B5, + 0x97B6, + 0x97BE, + 0x97BF, + 0x97C0, + 0x97C1, + 0x97D2, + 0x97D3, + 0x97FC, + 0x97FD, + 0x981F, + 0x9820, + 0x9825, + 0x9826, + 0x982A, + 0x982B, + 0x9833, + 0x9834, + 0x983A, + 0x983B, + 0x983E, + 0x983F, + 0x9842, + 0x9843, + 0x9847, + 0x9848, + 0x9856, + 0x9857, + 0x9866, + 0x9867, + 0x9868, + 0x9869, + 0x98B7, + 0x98B8, + 0x98CA, + 0x98CB, + 0x98E4, + 0x98E5, + 0x98EC, + 0x98ED, + 0x98F1, + 0x98F2, + 0x98F8, + 0x98F9, + 0x98FB, + 0x98FC, + 0x9919, + 0x991A, + 0x993B, + 0x993C, + 0x9944, + 0x9945, + 0x995A, + 0x995B, + 0x995D, + 0x995E, + 0x99BF, + 0x99C0, + 0x99E0, + 0x99E1, + 0x99E6, + 0x99E7, + 0x99EB, + 0x99EC, + 0x99F5, + 0x99F6, + 0x9A10, + 0x9A11, + 0x9A17, + 0x9A19, + 0x9A3B, + 0x9A3C, + 0x9A51, + 0x9A52, + 0x9A58, + 0x9A59, + 0x9A5D, + 0x9A5E, + 0x9A63, + 0x9A64, + 0x9AA9, + 0x9AAA, + 0x9ABD, + 0x9ABE, + 0x9AC8, + 0x9AC9, + 0x9AD7, + 0x9AD8, + 0x9AE0, + 0x9AE1, + 0x9AE4, + 0x9AE5, + 0x9AE8, + 0x9AEA, + 0x9AF0, + 0x9AF1, + 0x9B00, + 0x9B01, + 0x9B02, + 0x9B03, + 0x9B09, + 0x9B0A, + 0x9B14, + 0x9B15, + 0x9B1B, + 0x9B1C, + 0x9B34, + 0x9B35, + 0x9B3D, + 0x9B3E, + 0x9B40, + 0x9B41, + 0x9B50, + 0x9B51, + 0x9B57, + 0x9B58, + 0x9B62, + 0x9B63, + 0x9B72, + 0x9B73, + 0x9B89, + 0x9B8A, + 0x9B8C, + 0x9B8D, + 0x9B99, + 0x9B9A, + 0x9BC2, + 0x9BC3, + 0x9BF6, + 0x9BF7, + 0x9C00, + 0x9C02, + 0x9C03, + 0x9C04, + 0x9C42, + 0x9C43, + 0x9C4F, + 0x9C50, + 0x9C51, + 0x9C52, + 0x9C61, + 0x9C62, + 0x9C64, + 0x9C65, + 0x9C7B, + 0x9C7C, + 0x9D0C, + 0x9D0E, + 0x9D11, + 0x9D12, + 0x9D27, + 0x9D28, + 0x9D35, + 0x9D36, + 0x9D3C, + 0x9D3D, + 0x9D6D, + 0x9D6E, + 0x9D95, + 0x9D96, + 0x9DAE, + 0x9DAF, + 0x9DBD, + 0x9DBE, + 0x9DC0, + 0x9DC1, + 0x9DEA, + 0x9DEB, + 0x9DFC, + 0x9DFD, + 0x9E0E, + 0x9E0F, + 0x9E16, + 0x9E17, + 0x9E1C, + 0x9E1D, + 0x9E7B, + 0x9E7C, + 0x9E8F, + 0x9E91, + 0x9E98, + 0x9E99, + 0x9E9E, + 0x9E9F, + 0x9EA2, + 0x9EA3, + 0x9EAB, + 0x9EAD, + 0x9EB1, + 0x9EB2, + 0x9EEC, + 0x9EED, + 0x9EF1, + 0x9EF2, + 0x9F03, + 0x9F04, + 0x9F11, + 0x9F12, + 0x9F14, + 0x9F15, + 0x9F26, + 0x9F27, + 0x9F45, + 0x9F46, + 0x9F53, + 0x9F54, + 0x9F6D, + 0x9F6E, + 0x9FA1, + 0x9FA2, + 0x9FA3, + 0x9FA4, + 0x9FA6, + 0xA78D, + 0xA78E, 0xA7AA, 0xA7AB, - 0xA7C0, - 0xA7CB, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, - 0xA7DA, - 0xA9E7, - 0xA9FF, - 0xAA60, - 0xAA77, - 0xAA7A, - 0xAA80, - 0xAB01, - 0xAB07, - 0xAB09, - 0xAB0F, - 0xAB11, - 0xAB17, - 0xAB20, - 0xAB27, - 0xAB28, - 0xAB2F, - 0xAB66, - 0xAB68, + 0xAA7B, + 0xAA7C, 0xAC00, 0xD7A4, - 0xFA0E, - 0xFA10, - 0xFA11, - 0xFA12, - 0xFA13, - 0xFA15, - 0xFA1F, - 0xFA20, - 0xFA21, - 0xFA22, - 0xFA23, - 0xFA25, - 0xFA27, - 0xFA2A, 0x11301, 0x11302, 0x11303, 0x11304, - 0x1133B, + 0x1133C, 0x1133D, - 0x16FF0, - 0x16FF2, - 0x1B11F, - 0x1B123, - 0x1B132, - 0x1B133, - 0x1B150, - 0x1B153, - 0x1B155, - 0x1B156, - 0x1B164, - 0x1B168, - 0x1DF00, - 0x1DF1F, - 0x1DF25, - 0x1DF2B, - 0x1E08F, - 0x1E090, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -277427,22 +287754,122 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x1E7EF, 0x1E7F0, 0x1E7FF, - 0x20000, - 0x2A6E0, - 0x2A700, - 0x2B73A, - 0x2B740, - 0x2B81E, - 0x2B820, - 0x2CEA2, - 0x2CEB0, - 0x2EBE1, - 0x2EBF0, - 0x2EE5E, - 0x30000, - 0x3134B, - 0x31350, - 0x323B0 + 0x2070E, + 0x2070F, + 0x20731, + 0x20732, + 0x20779, + 0x2077A, + 0x20C53, + 0x20C54, + 0x20C78, + 0x20C79, + 0x20C96, + 0x20C97, + 0x20CCF, + 0x20CD0, + 0x20CD5, + 0x20CD6, + 0x20D15, + 0x20D16, + 0x20D7C, + 0x20D7D, + 0x20D7F, + 0x20D80, + 0x20E0E, + 0x20E10, + 0x20E77, + 0x20E78, + 0x20E9D, + 0x20E9E, + 0x20EA2, + 0x20EA3, + 0x20ED7, + 0x20ED8, + 0x20EF9, + 0x20EFB, + 0x20F2D, + 0x20F2F, + 0x20F4C, + 0x20F4D, + 0x20FB4, + 0x20FB5, + 0x20FBC, + 0x20FBD, + 0x20FEA, + 0x20FEB, + 0x2105C, + 0x2105D, + 0x2106F, + 0x21070, + 0x21075, + 0x21077, + 0x2107B, + 0x2107C, + 0x210C1, + 0x210C2, + 0x210C9, + 0x210CA, + 0x211D9, + 0x211DA, + 0x220C7, + 0x220C8, + 0x227B5, + 0x227B6, + 0x22AD5, + 0x22AD6, + 0x22B43, + 0x22B44, + 0x22BCA, + 0x22BCB, + 0x22C51, + 0x22C52, + 0x22C55, + 0x22C56, + 0x22CC2, + 0x22CC3, + 0x22D08, + 0x22D09, + 0x22D4C, + 0x22D4D, + 0x22D67, + 0x22D68, + 0x22EB3, + 0x22EB4, + 0x23CB7, + 0x23CB8, + 0x244D3, + 0x244D4, + 0x24DB8, + 0x24DB9, + 0x24DEA, + 0x24DEB, + 0x2512B, + 0x2512C, + 0x26258, + 0x26259, + 0x267CC, + 0x267CD, + 0x269F2, + 0x269F3, + 0x269FA, + 0x269FB, + 0x27A3E, + 0x27A3F, + 0x2815D, + 0x2815E, + 0x28207, + 0x28208, + 0x282E2, + 0x282E3, + 0x28CCA, + 0x28CCB, + 0x28CCD, + 0x28CCE, + 0x28CD2, + 0x28CD3, + 0x29D98, + 0x29D99 }; # endif /* EBCDIC 1047 */ @@ -277453,7 +287880,7 @@ static const UV UNI_IDENTIFIERSTATUS__AL && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_IDENTIFIERSTATUS__ALLOWED_invlist[] = { /* for EBCDIC 037 */ - 813, /* Number of elements */ + 3255, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -277507,67 +287934,97 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xFB, 0xFF, 0x100, + 0x114, + 0x116, + 0x12C, + 0x12E, 0x132, 0x134, + 0x138, + 0x139, 0x13F, 0x141, 0x149, 0x14A, + 0x14E, + 0x150, + 0x156, + 0x158, + 0x162, + 0x164, 0x17F, - 0x18F, - 0x190, + 0x181, + 0x182, + 0x186, + 0x187, + 0x189, + 0x18B, + 0x18E, + 0x193, + 0x194, + 0x195, + 0x196, + 0x19A, + 0x19D, + 0x19E, 0x1A0, 0x1A2, 0x1AF, 0x1B1, + 0x1B2, + 0x1B5, + 0x1B7, + 0x1B8, 0x1CD, + 0x1D5, 0x1DD, 0x1DE, - 0x1E4, 0x1E6, - 0x1F1, - 0x1F4, - 0x1F6, + 0x1EA, + 0x1EE, + 0x1F0, 0x1F8, + 0x1FA, + 0x218, 0x21C, - 0x21E, - 0x220, - 0x226, - 0x234, + 0x244, + 0x245, + 0x24C, + 0x24E, + 0x253, + 0x255, + 0x256, + 0x258, 0x259, 0x25A, + 0x25B, + 0x25C, + 0x263, + 0x264, + 0x268, + 0x26A, + 0x272, + 0x273, + 0x289, + 0x28A, + 0x28B, + 0x28C, + 0x292, + 0x293, 0x2BB, 0x2BD, - 0x2EC, - 0x2ED, 0x300, 0x305, 0x306, 0x30D, - 0x30F, - 0x312, - 0x313, - 0x315, 0x31B, 0x31C, 0x323, + 0x324, + 0x326, 0x329, - 0x32D, - 0x32F, - 0x330, + 0x331, 0x332, - 0x335, - 0x336, - 0x338, - 0x33A, - 0x342, - 0x343, - 0x345, - 0x346, - 0x375, - 0x376, - 0x37B, - 0x37E, 0x386, 0x387, 0x388, @@ -277578,80 +288035,140 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x3A2, 0x3A3, 0x3CF, - 0x3FC, + 0x401, + 0x40D, + 0x40E, + 0x450, + 0x451, + 0x45D, + 0x45E, 0x460, - 0x48A, - 0x500, - 0x510, - 0x52A, - 0x52E, - 0x530, + 0x490, + 0x49C, + 0x49E, + 0x4A6, + 0x4A8, + 0x4B8, + 0x4BA, + 0x4C1, + 0x4CF, + 0x4DA, + 0x4DC, + 0x4EA, + 0x4EE, + 0x4F6, + 0x4F8, + 0x4FA, + 0x524, + 0x526, 0x531, 0x557, - 0x559, - 0x55A, 0x561, 0x587, 0x58A, 0x58B, - 0x5B4, - 0x5B5, 0x5D0, 0x5EB, - 0x5EF, + 0x5F3, 0x5F5, 0x620, - 0x640, + 0x63B, + 0x63D, + 0x63E, 0x641, + 0x653, + 0x654, 0x656, 0x660, 0x66A, 0x670, + 0x671, + 0x672, 0x673, 0x674, 0x675, 0x679, - 0x68E, - 0x68F, + 0x690, + 0x691, + 0x69B, + 0x69F, 0x6A1, 0x6A2, + 0x6A3, + 0x6A4, + 0x6AC, + 0x6AD, + 0x6B2, + 0x6B3, + 0x6B4, + 0x6B5, + 0x6B8, + 0x6BA, + 0x6BF, + 0x6C0, 0x6D4, 0x6D5, 0x6D6, - 0x6E5, - 0x6E7, 0x6EE, + 0x6FA, + 0x6FD, 0x700, - 0x750, + 0x751, + 0x753, + 0x756, + 0x757, + 0x760, + 0x761, + 0x762, + 0x764, + 0x766, + 0x769, + 0x76A, + 0x76B, + 0x76E, + 0x772, + 0x780, 0x7B2, - 0x870, - 0x888, - 0x889, 0x88F, + 0x890, 0x8A0, - 0x8AD, - 0x8B2, - 0x8B3, - 0x8B5, - 0x8CA, + 0x8A1, + 0x8A2, + 0x8AA, + 0x8BB, + 0x8C3, + 0x8C7, + 0x8C8, 0x901, + 0x904, + 0x905, + 0x90C, + 0x90D, + 0x929, + 0x92A, + 0x934, + 0x935, + 0x93D, + 0x93E, + 0x944, + 0x945, 0x94E, 0x94F, - 0x951, + 0x950, 0x956, 0x958, - 0x960, - 0x964, 0x966, 0x970, - 0x971, + 0x972, 0x978, - 0x979, + 0x97B, + 0x97D, + 0x97E, 0x980, 0x981, 0x984, 0x985, - 0x98D, + 0x98C, 0x98F, 0x991, 0x993, @@ -277663,21 +288180,17 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x9B6, 0x9BA, 0x9BC, + 0x9BD, + 0x9BE, 0x9C5, 0x9C7, 0x9C9, 0x9CB, 0x9CF, - 0x9D7, - 0x9D8, - 0x9E0, - 0x9E4, 0x9E6, 0x9F2, - 0x9FE, - 0x9FF, - 0xA01, - 0xA04, + 0xA02, + 0xA03, 0xA05, 0xA0B, 0xA0F, @@ -277702,9 +288215,9 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xA4E, 0xA5C, 0xA5D, - 0xA66, - 0xA75, - 0xA81, + 0xA70, + 0xA72, + 0xA82, 0xA84, 0xA85, 0xA8E, @@ -277719,23 +288232,19 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xAB5, 0xABA, 0xABC, + 0xABD, + 0xABE, 0xAC6, 0xAC7, 0xACA, 0xACB, 0xACE, - 0xAD0, - 0xAD1, - 0xAE0, - 0xAE4, 0xAE6, 0xAF0, - 0xAFA, - 0xB00, 0xB01, 0xB04, 0xB05, - 0xB0D, + 0xB0C, 0xB0F, 0xB11, 0xB13, @@ -277744,23 +288253,23 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xB31, 0xB32, 0xB34, - 0xB35, + 0xB36, 0xB3A, 0xB3C, + 0xB3D, + 0xB3E, 0xB44, 0xB47, 0xB49, 0xB4B, 0xB4E, - 0xB55, - 0xB58, + 0xB56, + 0xB57, 0xB5F, - 0xB62, - 0xB66, - 0xB70, + 0xB60, 0xB71, 0xB72, - 0xB82, + 0xB83, 0xB84, 0xB85, 0xB8B, @@ -277786,99 +288295,79 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xBC9, 0xBCA, 0xBCE, - 0xBD0, - 0xBD1, - 0xBD7, - 0xBD8, - 0xBE6, - 0xBF0, - 0xC01, - 0xC0D, + 0xC02, + 0xC04, + 0xC05, + 0xC0C, 0xC0E, 0xC11, 0xC12, 0xC29, 0xC2A, + 0xC31, + 0xC32, 0xC34, 0xC35, 0xC3A, - 0xC3C, + 0xC3E, 0xC45, 0xC46, 0xC49, 0xC4A, 0xC4E, - 0xC55, - 0xC57, - 0xC5D, - 0xC5E, - 0xC60, - 0xC62, - 0xC66, - 0xC70, - 0xC80, - 0xC81, 0xC82, 0xC84, 0xC85, - 0xC8D, + 0xC8C, 0xC8E, 0xC91, 0xC92, 0xCA9, 0xCAA, + 0xCB1, + 0xCB2, 0xCB4, 0xCB5, 0xCBA, - 0xCBC, - 0xCC5, + 0xCBE, + 0xCC4, 0xCC6, 0xCC9, 0xCCA, 0xCCE, - 0xCD5, - 0xCD7, - 0xCDD, - 0xCDE, - 0xCE0, - 0xCE4, 0xCE6, 0xCF0, - 0xCF1, - 0xCF4, - 0xD00, - 0xD01, 0xD02, 0xD04, 0xD05, - 0xD0D, + 0xD0C, 0xD0E, 0xD11, 0xD12, - 0xD3B, - 0xD3D, + 0xD29, + 0xD2A, + 0xD3A, + 0xD3E, 0xD44, 0xD46, 0xD49, 0xD4A, - 0xD4F, - 0xD54, + 0xD4C, + 0xD4D, + 0xD4E, + 0xD57, 0xD58, - 0xD60, - 0xD62, - 0xD66, - 0xD70, 0xD7A, 0xD80, 0xD82, 0xD84, 0xD85, - 0xD8F, + 0xD8E, 0xD91, 0xD97, 0xD9A, - 0xDA6, - 0xDA7, + 0xD9E, + 0xD9F, 0xDB2, 0xDB3, 0xDBC, @@ -277901,44 +288390,52 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xE34, 0xE3B, 0xE40, - 0xE4F, + 0xE4E, 0xE50, 0xE5A, 0xE81, 0xE83, 0xE84, 0xE85, - 0xE86, + 0xE87, + 0xE89, + 0xE8A, 0xE8B, - 0xE8C, + 0xE8D, + 0xE8E, + 0xE94, + 0xE98, + 0xE99, + 0xEA0, + 0xEA1, 0xEA4, 0xEA5, 0xEA6, 0xEA7, + 0xEA8, + 0xEAA, + 0xEAC, + 0xEAD, + 0xEAF, + 0xEB0, 0xEB3, 0xEB4, + 0xEBA, + 0xEBB, 0xEBE, 0xEC0, 0xEC5, 0xEC6, 0xEC7, 0xEC8, - 0xECF, + 0xECE, 0xED0, 0xEDA, - 0xEDE, - 0xEE0, - 0xF00, - 0xF01, 0xF0B, 0xF0C, 0xF20, 0xF2A, - 0xF35, - 0xF36, - 0xF37, - 0xF38, - 0xF3E, + 0xF40, 0xF43, 0xF44, 0xF48, @@ -277952,17 +288449,15 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xF5C, 0xF5D, 0xF69, - 0xF6A, - 0xF6D, 0xF71, 0xF73, 0xF74, 0xF75, 0xF7A, 0xF81, - 0xF82, + 0xF84, 0xF85, - 0xF86, + 0xF90, 0xF93, 0xF94, 0xF98, @@ -277975,26 +288470,28 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0xFA8, 0xFAC, 0xFAD, + 0xFAE, + 0xFB1, 0xFB9, 0xFBA, 0xFBD, - 0xFC6, - 0xFC7, 0x1000, 0x104A, - 0x1050, - 0x109E, + 0x105A, + 0x1065, + 0x1075, + 0x108B, + 0x108F, + 0x1090, 0x10C7, 0x10C8, 0x10CD, 0x10CE, 0x10D0, 0x10F1, - 0x10F7, - 0x10FB, - 0x10FD, - 0x1100, 0x1200, + 0x1207, + 0x1208, 0x1249, 0x124A, 0x124E, @@ -278005,10 +288502,14 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x125A, 0x125E, 0x1260, + 0x1287, + 0x1288, 0x1289, 0x128A, 0x128E, 0x1290, + 0x12AF, + 0x12B0, 0x12B1, 0x12B2, 0x12B6, @@ -278021,20 +288522,26 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x12C8, 0x12D7, 0x12D8, + 0x12F8, + 0x1300, + 0x130F, + 0x1310, 0x1311, 0x1312, 0x1316, 0x1318, - 0x135B, - 0x135D, - 0x1360, - 0x1380, - 0x1390, + 0x131F, + 0x1320, + 0x1347, + 0x1348, + 0x135A, 0x1780, + 0x179D, + 0x179F, 0x17A3, 0x17A5, 0x17A8, - 0x17A9, + 0x17AA, 0x17B4, 0x17B6, 0x17CE, @@ -278042,210 +288549,2472 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x17D1, 0x17D2, 0x17D3, - 0x17D7, - 0x17D8, - 0x17DC, - 0x17DD, 0x17E0, 0x17EA, 0x1C90, 0x1CBB, 0x1CBD, 0x1CC0, - 0x1E00, - 0x1E9A, + 0x1E0C, + 0x1E0E, + 0x1E12, + 0x1E14, + 0x1E20, + 0x1E22, + 0x1E24, + 0x1E26, + 0x1E36, + 0x1E38, + 0x1E3C, + 0x1E40, + 0x1E42, + 0x1E4C, + 0x1E5A, + 0x1E5C, + 0x1E62, + 0x1E64, + 0x1E6C, + 0x1E6E, + 0x1E70, + 0x1E72, + 0x1E8C, + 0x1E8E, + 0x1E92, + 0x1E94, 0x1E9E, 0x1E9F, 0x1EA0, 0x1EFA, - 0x1F00, - 0x1F16, - 0x1F18, - 0x1F1E, - 0x1F20, - 0x1F46, - 0x1F48, - 0x1F4E, - 0x1F50, - 0x1F58, - 0x1F59, - 0x1F5A, - 0x1F5B, - 0x1F5C, - 0x1F5D, - 0x1F5E, - 0x1F5F, - 0x1F71, - 0x1F72, - 0x1F73, - 0x1F74, - 0x1F75, - 0x1F76, - 0x1F77, - 0x1F78, - 0x1F79, - 0x1F7A, - 0x1F7B, - 0x1F7C, - 0x1F7D, - 0x1F80, + 0x1FA0, + 0x1FB0, + 0x1FB2, 0x1FB5, - 0x1FB6, - 0x1FBB, - 0x1FBC, - 0x1FBD, - 0x1FC2, - 0x1FC5, - 0x1FC6, - 0x1FC9, - 0x1FCA, - 0x1FCB, - 0x1FCC, - 0x1FCD, - 0x1FD0, - 0x1FD3, - 0x1FD6, - 0x1FDB, - 0x1FE0, - 0x1FE3, - 0x1FE4, - 0x1FEB, 0x1FEC, 0x1FED, - 0x1FF2, - 0x1FF5, - 0x1FF6, - 0x1FF9, - 0x1FFA, - 0x1FFB, - 0x1FFC, - 0x1FFD, 0x2010, 0x2011, 0x2019, 0x201A, 0x2027, 0x2028, - 0x2D27, - 0x2D28, - 0x2D2D, - 0x2D2E, - 0x2D80, - 0x2D97, - 0x2DA0, - 0x2DA7, - 0x2DA8, - 0x2DAF, - 0x2DB0, - 0x2DB7, - 0x2DB8, - 0x2DBF, - 0x2DC0, - 0x2DC7, - 0x2DC8, - 0x2DCF, - 0x2DD0, - 0x2DD7, - 0x2DD8, - 0x2DDF, 0x3005, 0x3008, 0x3041, 0x3097, - 0x3099, - 0x309B, 0x309D, 0x309F, 0x30A0, 0x30FF, - 0x3105, - 0x312E, - 0x312F, - 0x3130, - 0x31A0, - 0x31C0, - 0x3400, - 0x4DC0, + 0x3447, + 0x3448, + 0x3473, + 0x3474, + 0x34E4, + 0x34E5, + 0x3577, + 0x3578, + 0x359E, + 0x359F, + 0x35A1, + 0x35A2, + 0x35AD, + 0x35AE, + 0x35BF, + 0x35C0, + 0x35CE, + 0x35CF, + 0x35F3, + 0x35F4, + 0x35FE, + 0x35FF, + 0x360E, + 0x360F, + 0x361A, + 0x361B, + 0x3918, + 0x3919, + 0x3960, + 0x3961, + 0x396E, + 0x396F, + 0x39CF, + 0x39D1, + 0x39DB, + 0x39DC, + 0x39DF, + 0x39E0, + 0x39F8, + 0x39F9, + 0x39FE, + 0x39FF, + 0x3A18, + 0x3A19, + 0x3A52, + 0x3A53, + 0x3A5C, + 0x3A5D, + 0x3A67, + 0x3A68, + 0x3A73, + 0x3A74, + 0x3B39, + 0x3B3A, + 0x3B4E, + 0x3B4F, + 0x3BA3, + 0x3BA4, + 0x3C6E, + 0x3C6F, + 0x3CE0, + 0x3CE1, + 0x3DE7, + 0x3DE8, + 0x3DEB, + 0x3DEC, + 0x3E74, + 0x3E75, + 0x3ED0, + 0x3ED1, + 0x4056, + 0x4057, + 0x4065, + 0x4066, + 0x406A, + 0x406B, + 0x40BB, + 0x40BC, + 0x40DF, + 0x40E0, + 0x4137, + 0x4138, + 0x415F, + 0x4160, + 0x4337, + 0x4338, + 0x43AC, + 0x43AD, + 0x43B1, + 0x43B2, + 0x43D3, + 0x43D4, + 0x43DD, + 0x43DE, + 0x4443, + 0x4444, + 0x44D6, + 0x44D7, + 0x44EA, + 0x44EB, + 0x4606, + 0x4607, + 0x464C, + 0x464D, + 0x4661, + 0x4662, + 0x4723, + 0x4724, + 0x4729, + 0x472A, + 0x477C, + 0x477D, + 0x478D, + 0x478E, + 0x47F4, + 0x47F5, + 0x4882, + 0x4883, + 0x4947, + 0x4948, + 0x497A, + 0x497B, + 0x497D, + 0x497E, + 0x4982, + 0x4984, + 0x4985, + 0x4987, + 0x499B, + 0x499C, + 0x499F, + 0x49A0, + 0x49B6, + 0x49B8, + 0x4A12, + 0x4A13, + 0x4AB8, + 0x4AB9, + 0x4C77, + 0x4C78, + 0x4C7D, + 0x4C7E, + 0x4C81, + 0x4C82, + 0x4C85, + 0x4C86, + 0x4C9D, + 0x4CA4, + 0x4D13, + 0x4D1A, + 0x4DAE, + 0x4DAF, 0x4E00, - 0xA000, - 0xA67F, - 0xA680, - 0xA717, - 0xA720, - 0xA788, - 0xA789, + 0x4E12, + 0x4E13, + 0x4E29, + 0x4E2A, + 0x4E68, + 0x4E69, + 0x4E79, + 0x4E7A, + 0x4E96, + 0x4E97, + 0x4EA3, + 0x4EA4, + 0x4EBC, + 0x4EBD, + 0x4ECC, + 0x4ECD, + 0x4EE7, + 0x4EE8, + 0x4EF8, + 0x4EFB, + 0x4EFC, + 0x4EFD, + 0x4EFE, + 0x4EFF, + 0x4F07, + 0x4F08, + 0x4F16, + 0x4F17, + 0x4F28, + 0x4F29, + 0x4F31, + 0x4F32, + 0x4F35, + 0x4F36, + 0x4F37, + 0x4F38, + 0x4F40, + 0x4F41, + 0x4F44, + 0x4F45, + 0x4F71, + 0x4F72, + 0x4F8C, + 0x4F8D, + 0x4F8E, + 0x4F8F, + 0x4FA2, + 0x4FA3, + 0x4FBD, + 0x4FBE, + 0x4FC6, + 0x4FC7, + 0x4FC8, + 0x4FC9, + 0x4FCC, + 0x4FCD, + 0x4FE2, + 0x4FE3, + 0x4FFC, + 0x4FFE, + 0x5010, + 0x5011, + 0x5034, + 0x5035, + 0x5038, + 0x5039, + 0x503D, + 0x503E, + 0x5042, + 0x5043, + 0x5052, + 0x5053, + 0x5058, + 0x5059, + 0x507C, + 0x507D, + 0x5081, + 0x5082, + 0x5093, + 0x5094, + 0x5097, + 0x5098, + 0x509F, + 0x50A2, + 0x50B9, + 0x50BA, + 0x50C3, + 0x50C4, + 0x50D8, + 0x50D9, + 0x50DF, + 0x50E0, + 0x50E1, + 0x50E3, + 0x50EB, + 0x50EC, + 0x50F4, + 0x50F5, + 0x50F7, + 0x50F8, + 0x511B, + 0x511C, + 0x5128, + 0x5129, + 0x512B, + 0x512C, + 0x5142, + 0x5143, + 0x514A, + 0x514B, + 0x514F, + 0x5150, + 0x5153, + 0x5154, + 0x5158, + 0x5159, + 0x5160, + 0x5161, + 0x5164, + 0x5165, + 0x5172, + 0x5173, + 0x517E, + 0x517F, + 0x5183, + 0x5185, + 0x518E, + 0x518F, + 0x51A1, + 0x51A2, + 0x51A3, + 0x51A4, + 0x51AD, + 0x51AE, + 0x51B8, + 0x51B9, + 0x51BA, + 0x51BB, + 0x51C2, + 0x51C3, + 0x51D2, + 0x51D4, + 0x51DF, + 0x51E0, + 0x51EC, + 0x51ED, + 0x51EE, + 0x51EF, + 0x51F2, + 0x51F3, + 0x5253, + 0x5254, + 0x5266, + 0x5267, + 0x5279, + 0x527A, + 0x5285, + 0x5286, + 0x528E, + 0x528F, + 0x52C4, + 0x52C5, + 0x52C8, + 0x52C9, + 0x52CC, + 0x52CD, + 0x52CE, + 0x52CF, + 0x52D1, + 0x52D2, + 0x52D4, + 0x52D5, + 0x52E1, + 0x52E2, + 0x52E5, + 0x52E6, + 0x52EE, + 0x52EF, + 0x5303, + 0x5305, + 0x5318, + 0x5319, + 0x531B, + 0x531C, + 0x531E, + 0x531F, + 0x5327, + 0x5328, + 0x5329, + 0x532A, + 0x5332, + 0x5333, + 0x5335, + 0x5337, + 0x5342, + 0x5343, + 0x535B, + 0x535C, + 0x535D, + 0x535E, + 0x536A, + 0x536B, + 0x536D, + 0x536E, + 0x5380, + 0x5381, + 0x53A1, + 0x53A2, + 0x53AA, + 0x53AC, + 0x53AF, + 0x53B0, + 0x53BA, + 0x53BB, + 0x53C5, + 0x53C6, + 0x53CF, + 0x53D0, + 0x53DD, + 0x53DF, + 0x53E7, + 0x53E8, + 0x53FF, + 0x5401, + 0x541A, + 0x541B, + 0x5422, + 0x5423, + 0x544C, + 0x544D, + 0x545D, + 0x545E, + 0x5469, + 0x546A, + 0x548A, + 0x548B, + 0x54B5, + 0x54B6, + 0x54F6, + 0x54F7, + 0x5515, + 0x5516, + 0x5518, + 0x551A, + 0x5547, + 0x5548, + 0x5560, + 0x5561, + 0x557A, + 0x557B, + 0x55E0, + 0x55E1, + 0x55F8, + 0x55F9, + 0x560A, + 0x560C, + 0x5620, + 0x5621, + 0x562B, + 0x562C, + 0x5637, + 0x5638, + 0x563C, + 0x563D, + 0x5644, + 0x5645, + 0x564B, + 0x564C, + 0x5651, + 0x5652, + 0x5656, + 0x5657, + 0x565F, + 0x5660, + 0x5661, + 0x5662, + 0x5675, + 0x5676, + 0x567D, + 0x567E, + 0x5688, + 0x5689, + 0x568B, + 0x568C, + 0x5696, + 0x5697, + 0x569E, + 0x569F, + 0x56BA, + 0x56BB, + 0x56CF, + 0x56D0, + 0x56D9, + 0x56DA, + 0x56E6, + 0x56E7, + 0x56F6, + 0x56F7, + 0x56F8, + 0x56F9, + 0x56FB, + 0x56FD, + 0x5705, + 0x5706, + 0x5711, + 0x5712, + 0x5717, + 0x5718, + 0x5721, + 0x5722, + 0x5724, + 0x5725, + 0x573D, + 0x573E, + 0x5743, + 0x5744, + 0x5748, + 0x5749, + 0x5755, + 0x5757, + 0x5758, + 0x5759, + 0x5763, + 0x5764, + 0x5778, + 0x5779, + 0x5781, + 0x5782, + 0x5787, + 0x5788, + 0x5796, + 0x5797, + 0x57A8, + 0x57A9, + 0x57CA, + 0x57CB, + 0x57D1, + 0x57D2, + 0x57DB, + 0x57DC, + 0x5817, + 0x5819, + 0x5850, + 0x5851, + 0x5856, + 0x5857, + 0x5860, + 0x5861, + 0x5866, + 0x5868, + 0x5877, + 0x5878, + 0x5895, + 0x5896, + 0x58AA, + 0x58AB, + 0x58B6, + 0x58B7, + 0x58C0, + 0x58C1, + 0x58C3, + 0x58C5, + 0x58CD, + 0x58CE, + 0x58D0, + 0x58D1, + 0x58E1, + 0x58E2, + 0x58E6, + 0x58E7, + 0x58F5, + 0x58F6, + 0x5901, + 0x5902, + 0x5905, + 0x5906, + 0x5908, + 0x5909, + 0x5911, + 0x5912, + 0x5913, + 0x5914, + 0x5923, + 0x5924, + 0x5933, + 0x5934, + 0x5936, + 0x5937, + 0x5959, + 0x595A, + 0x595B, + 0x595C, + 0x59B7, + 0x59B8, + 0x59E7, + 0x59E8, + 0x5A24, + 0x5A25, + 0x5A26, + 0x5A27, + 0x5A2C, + 0x5A2D, + 0x5A30, + 0x5A31, + 0x5A54, + 0x5A55, + 0x5A59, + 0x5A5A, + 0x5A6F, + 0x5A70, + 0x5A71, + 0x5A72, + 0x5A87, + 0x5A88, + 0x5A8D, + 0x5A8E, + 0x5AAB, + 0x5AAC, + 0x5AD3, + 0x5AD4, + 0x5AEF, + 0x5AF1, + 0x5B0A, + 0x5B0B, + 0x5B0D, + 0x5B0E, + 0x5B39, + 0x5B3A, + 0x5B46, + 0x5B47, + 0x5B4F, + 0x5B50, + 0x5B52, + 0x5B53, + 0x5B60, + 0x5B62, + 0x5B6F, + 0x5B70, + 0x5B79, + 0x5B7A, + 0x5B7E, + 0x5B7F, + 0x5B86, + 0x5B87, + 0x5B90, + 0x5B91, + 0x5BA9, + 0x5BAA, + 0x5BB2, + 0x5BB3, + 0x5BB7, + 0x5BB8, + 0x5BBC, + 0x5BBD, + 0x5BC8, + 0x5BC9, + 0x5BDA, + 0x5BDB, + 0x5C00, + 0x5C01, + 0x5C1B, + 0x5C1C, + 0x5C23, + 0x5C24, + 0x5C26, + 0x5C27, + 0x5C29, + 0x5C2A, + 0x5C36, + 0x5C37, + 0x5C5A, + 0x5C5B, + 0x5C85, + 0x5C86, + 0x5CB4, + 0x5CB5, + 0x5CB9, + 0x5CBA, + 0x5CD5, + 0x5CD6, + 0x5CDD, + 0x5CDE, + 0x5CF5, + 0x5CF6, + 0x5D2B, + 0x5D2C, + 0x5D2F, + 0x5D30, + 0x5D3B, + 0x5D3C, + 0x5D53, + 0x5D54, + 0x5D57, + 0x5D58, + 0x5D60, + 0x5D61, + 0x5D83, + 0x5D84, + 0x5D96, + 0x5D97, + 0x5DA3, + 0x5DA5, + 0x5DAB, + 0x5DAC, + 0x5DB3, + 0x5DB4, + 0x5DB9, + 0x5DBA, + 0x5DC4, + 0x5DC5, + 0x5DD7, + 0x5DD8, + 0x5DDA, + 0x5DDB, + 0x5DDC, + 0x5DDD, + 0x5DF6, + 0x5DF7, + 0x5E12, + 0x5E13, + 0x5E48, + 0x5E49, + 0x5E51, + 0x5E52, + 0x5E92, + 0x5E93, + 0x5EBA, + 0x5EBB, + 0x5EC0, + 0x5EC1, + 0x5EEB, + 0x5EEC, + 0x5EF9, + 0x5EFA, + 0x5F0E, + 0x5F0F, + 0x5F3B, + 0x5F3C, + 0x5F3D, + 0x5F3E, + 0x5F8F, + 0x5F90, + 0x5F9A, + 0x5F9B, + 0x5FA3, + 0x5FA5, + 0x5FB0, + 0x5FB1, + 0x5FC2, + 0x5FC3, + 0x5FCE, + 0x5FCF, + 0x5FDB, + 0x5FDC, + 0x5FE2, + 0x5FE3, + 0x5FEC, + 0x5FED, + 0x5FFC, + 0x5FFD, + 0x6023, + 0x6024, + 0x6056, + 0x6057, + 0x6061, + 0x6062, + 0x6071, + 0x6072, + 0x6074, + 0x6075, + 0x6091, + 0x6092, + 0x6093, + 0x6094, + 0x60A5, + 0x60A6, + 0x60D2, + 0x60D3, + 0x60D6, + 0x60D7, + 0x60DE, + 0x60DF, + 0x60E5, + 0x60E6, + 0x60FD, + 0x60FE, + 0x6102, + 0x6103, + 0x6107, + 0x6108, + 0x6111, + 0x6112, + 0x611E, + 0x611F, + 0x6131, + 0x6132, + 0x6133, + 0x6134, + 0x6135, + 0x6136, + 0x6138, + 0x613A, + 0x6160, + 0x6161, + 0x617B, + 0x617C, + 0x617F, + 0x6180, + 0x6186, + 0x6187, + 0x6197, + 0x6198, + 0x619C, + 0x619D, + 0x61B9, + 0x61BA, + 0x61BB, + 0x61BC, + 0x61D3, + 0x61D4, + 0x61D5, + 0x61D6, + 0x61EC, + 0x61ED, + 0x61EF, + 0x61F0, + 0x6205, + 0x6206, + 0x6235, + 0x6236, + 0x6239, + 0x623A, + 0x6257, + 0x6258, + 0x628D, + 0x628E, + 0x629D, + 0x629E, + 0x62DE, + 0x62DF, + 0x62EA, + 0x62EB, + 0x630A, + 0x630B, + 0x6317, + 0x6318, + 0x6331, + 0x6332, + 0x6337, + 0x6338, + 0x635B, + 0x635C, + 0x638B, + 0x638C, + 0x6393, + 0x6394, + 0x63D1, + 0x63D2, + 0x643B, + 0x643D, + 0x6449, + 0x644A, + 0x645A, + 0x645B, + 0x647E, + 0x647F, + 0x6486, + 0x6487, + 0x64A1, + 0x64A2, + 0x64AF, + 0x64B0, + 0x64B6, + 0x64B7, + 0x64C8, + 0x64C9, + 0x64D5, + 0x64D6, + 0x64EE, + 0x64EF, + 0x64F5, + 0x64F6, + 0x64F9, + 0x64FA, + 0x6502, + 0x6503, + 0x650A, + 0x650B, + 0x651F, + 0x6520, + 0x6528, + 0x6529, + 0x6540, + 0x6541, + 0x6542, + 0x6543, + 0x655A, + 0x655B, + 0x655F, + 0x6560, + 0x657D, + 0x657E, + 0x658A, + 0x658B, + 0x659A, + 0x659B, + 0x65B5, + 0x65B6, + 0x65BE, + 0x65BF, + 0x65C8, + 0x65CA, + 0x65D1, + 0x65D2, + 0x65D8, + 0x65D9, + 0x65DC, + 0x65DD, + 0x65E4, + 0x65E5, + 0x65EA, + 0x65EB, + 0x65F9, + 0x65FA, + 0x65FE, + 0x65FF, + 0x6617, + 0x6618, + 0x662C, + 0x662D, + 0x6637, + 0x6639, + 0x6648, + 0x6649, + 0x664D, + 0x664E, + 0x6660, + 0x6661, + 0x6663, + 0x6664, + 0x6692, + 0x6693, + 0x669C, + 0x669D, + 0x669E, + 0x669F, + 0x66AC, + 0x66AE, + 0x66D0, + 0x66D1, + 0x66D3, + 0x66D4, + 0x66D7, + 0x66D8, + 0x66DF, + 0x66E0, + 0x66EF, + 0x66F0, + 0x6702, + 0x6703, + 0x6707, + 0x6708, + 0x6719, + 0x671A, + 0x6724, + 0x6725, + 0x6729, + 0x672A, + 0x6767, + 0x6768, + 0x6788, + 0x6789, + 0x6796, + 0x6797, + 0x67BD, + 0x67BE, + 0x67BF, + 0x67C0, + 0x67D5, + 0x67D6, + 0x67D7, + 0x67D8, + 0x67F9, + 0x67FA, + 0x6801, + 0x6802, + 0x6815, + 0x6816, + 0x6827, + 0x6828, + 0x6830, + 0x6831, + 0x6858, + 0x6859, + 0x685A, + 0x685B, + 0x685E, + 0x685F, + 0x687A, + 0x687B, + 0x6895, + 0x6896, + 0x6899, + 0x689A, + 0x68A5, + 0x68A6, + 0x68B8, + 0x68B9, + 0x68C3, + 0x68C4, + 0x68D9, + 0x68DA, + 0x68E2, + 0x68E3, + 0x68E5, + 0x68E6, + 0x6909, + 0x690A, + 0x693E, + 0x693F, + 0x694D, + 0x694E, + 0x699F, + 0x69A0, + 0x69A2, + 0x69A3, + 0x69C0, + 0x69C1, + 0x69D1, + 0x69D3, + 0x69D5, + 0x69D8, + 0x6A03, + 0x6A04, + 0x6A1C, + 0x6A1D, + 0x6A24, + 0x6A25, + 0x6A37, + 0x6A38, + 0x6A4A, + 0x6A4B, + 0x6A5C, + 0x6A5D, + 0x6A6E, + 0x6A6F, + 0x6A70, + 0x6A71, + 0x6A86, + 0x6A87, + 0x6A8A, + 0x6A8B, + 0x6A8F, + 0x6A90, + 0x6A99, + 0x6A9A, + 0x6A9D, + 0x6A9E, + 0x6AB1, + 0x6AB2, + 0x6ABE, + 0x6ABF, + 0x6AC0, + 0x6AC1, + 0x6AC4, + 0x6AC5, + 0x6AC9, + 0x6ACA, + 0x6AD8, + 0x6AD9, + 0x6AE9, + 0x6AEA, + 0x6B0E, + 0x6B0F, + 0x6B1B, + 0x6B1C, + 0x6B2E, + 0x6B2F, + 0x6B35, + 0x6B36, + 0x6B40, + 0x6B41, + 0x6B57, + 0x6B59, + 0x6B5D, + 0x6B5E, + 0x6B68, + 0x6B69, + 0x6B6C, + 0x6B6D, + 0x6B6E, + 0x6B6F, + 0x6B71, + 0x6B72, + 0x6B75, + 0x6B76, + 0x6B7D, + 0x6B7E, + 0x6BB8, + 0x6BB9, + 0x6BE9, + 0x6BEA, + 0x6BF1, + 0x6BF2, + 0x6BF4, + 0x6BF5, + 0x6BFA, + 0x6BFB, + 0x6C0A, + 0x6C0B, + 0x6C1C, + 0x6C1D, + 0x6C2D, + 0x6C2E, + 0x6C3C, + 0x6C3D, + 0x6C45, + 0x6C46, + 0x6C6C, + 0x6C6D, + 0x6C6E, + 0x6C6F, + 0x6CA0, + 0x6CA1, + 0x6CD8, + 0x6CD9, + 0x6CF4, + 0x6CF5, + 0x6D02, + 0x6D03, + 0x6D1C, + 0x6D1D, + 0x6D24, + 0x6D25, + 0x6D71, + 0x6D72, + 0x6D81, + 0x6D82, + 0x6D96, + 0x6D97, + 0x6DB0, + 0x6DB2, + 0x6DB6, + 0x6DB7, + 0x6DFE, + 0x6E00, + 0x6E01, + 0x6E03, + 0x6E06, + 0x6E07, + 0x6E12, + 0x6E13, + 0x6E18, + 0x6E19, + 0x6E2A, + 0x6E2B, + 0x6E4C, + 0x6E4D, + 0x6E6C, + 0x6E6D, + 0x6E7B, + 0x6E7E, + 0x6E8B, + 0x6E8C, + 0x6E95, + 0x6E96, + 0x6EDB, + 0x6EDC, + 0x6EE3, + 0x6EE4, + 0x6F04, + 0x6F05, + 0x6F0B, + 0x6F0C, + 0x6F42, + 0x6F43, + 0x6F48, + 0x6F49, + 0x6F4A, + 0x6F4B, + 0x6F79, + 0x6F7A, + 0x6F98, + 0x6F99, + 0x6F9A, + 0x6F9B, + 0x6F9F, + 0x6FA0, + 0x6FB7, + 0x6FB8, + 0x6FC5, + 0x6FC6, + 0x6FD0, + 0x6FD1, + 0x6FD3, + 0x6FD4, + 0x6FF5, + 0x6FF6, + 0x6FFD, + 0x6FFE, + 0x7010, + 0x7011, + 0x7013, + 0x7014, + 0x7047, + 0x7048, + 0x704B, + 0x704C, + 0x704E, + 0x704F, + 0x7072, + 0x7074, + 0x707B, + 0x707C, + 0x7081, + 0x7082, + 0x708D, + 0x708E, + 0x7097, + 0x7098, + 0x709B, + 0x709C, + 0x70AA, + 0x70AB, + 0x70B2, + 0x70B3, + 0x70B6, + 0x70B7, + 0x70D5, + 0x70D6, + 0x70FE, + 0x70FF, + 0x7108, + 0x7109, + 0x7124, + 0x7125, + 0x7133, + 0x7135, + 0x7157, + 0x7158, + 0x716B, + 0x716C, + 0x716D, + 0x716E, + 0x718D, + 0x718E, + 0x7196, + 0x7197, + 0x71A6, + 0x71A7, + 0x71AB, + 0x71AC, + 0x71B6, + 0x71B7, + 0x71CC, + 0x71CD, + 0x71D3, + 0x71D4, + 0x71F3, + 0x71F4, + 0x71FA, + 0x71FB, + 0x720B, + 0x720C, + 0x7211, + 0x7212, + 0x7215, + 0x7216, + 0x7217, + 0x7218, + 0x7220, + 0x7221, + 0x7224, + 0x7226, + 0x722F, + 0x7230, + 0x7234, + 0x7235, + 0x7245, + 0x7246, + 0x724E, + 0x724F, + 0x7250, + 0x7251, + 0x7255, + 0x7256, + 0x72AB, + 0x72AC, + 0x72BE, + 0x72BF, + 0x7302, + 0x7303, + 0x7310, + 0x7311, + 0x7328, + 0x7329, + 0x7353, + 0x7354, + 0x739C, + 0x739D, + 0x73C1, + 0x73C2, + 0x73F3, + 0x73F4, + 0x73FB, + 0x73FC, + 0x7418, + 0x7419, + 0x7439, + 0x743A, + 0x743E, + 0x743F, + 0x7447, + 0x7448, + 0x7449, + 0x744A, + 0x7458, + 0x7459, + 0x747B, + 0x747C, + 0x7484, + 0x7485, + 0x7496, + 0x7497, + 0x749D, + 0x749E, + 0x74C7, + 0x74C8, + 0x74C9, + 0x74CA, + 0x74CC, + 0x74CD, + 0x74EB, + 0x74EC, + 0x7520, + 0x7521, + 0x7541, + 0x7542, + 0x7552, + 0x7553, + 0x7555, + 0x7556, + 0x755E, + 0x755F, + 0x7561, + 0x7562, + 0x7571, + 0x7572, + 0x757B, + 0x757C, + 0x7585, + 0x7586, + 0x75A9, + 0x75AA, + 0x75B7, + 0x75B8, + 0x75DC, + 0x75DD, + 0x75EE, + 0x75EF, + 0x762C, + 0x762D, + 0x7644, + 0x7646, + 0x7651, + 0x7652, + 0x7655, + 0x7656, + 0x7673, + 0x7674, + 0x768D, + 0x768E, + 0x76A1, + 0x76A3, + 0x76A5, + 0x76A6, + 0x76A8, + 0x76A9, + 0x76B3, + 0x76B4, + 0x76B6, + 0x76B7, + 0x76C1, + 0x76C2, + 0x76CB, + 0x76CC, + 0x76D9, + 0x76DA, + 0x76EB, + 0x76EC, + 0x7700, + 0x7701, + 0x7702, + 0x7703, + 0x770E, + 0x770F, + 0x7721, + 0x7722, + 0x772B, + 0x772C, + 0x773F, + 0x7740, + 0x7742, + 0x7743, + 0x7764, + 0x7765, + 0x7796, + 0x7797, + 0x77A4, + 0x77A5, + 0x77BE, + 0x77BF, + 0x77C1, + 0x77C2, + 0x77D2, + 0x77D3, + 0x77DD, + 0x77DE, + 0x77E4, + 0x77E5, + 0x77E6, + 0x77E7, + 0x77F4, + 0x77F6, + 0x7824, + 0x7825, + 0x7836, + 0x7837, + 0x7842, + 0x7843, + 0x7846, + 0x7847, + 0x784B, + 0x784C, + 0x7876, + 0x7877, + 0x7888, + 0x7889, + 0x78C2, + 0x78C3, + 0x78C7, + 0x78C8, + 0x78D2, + 0x78D3, + 0x78F0, + 0x78F1, + 0x78F8, + 0x78F9, + 0x7900, + 0x7901, + 0x7908, + 0x7909, + 0x790D, + 0x790E, + 0x7915, + 0x7916, + 0x791F, + 0x7921, + 0x7932, + 0x7933, + 0x7936, + 0x7937, + 0x7959, + 0x795A, + 0x796C, + 0x796D, + 0x796E, + 0x796F, + 0x7975, + 0x7977, + 0x7986, + 0x7988, + 0x799E, + 0x799F, + 0x79A9, + 0x79AA, + 0x79BC, + 0x79BD, + 0x79C4, + 0x79C5, + 0x79C7, + 0x79C8, + 0x79CC, + 0x79CD, + 0x79D4, + 0x79D5, + 0x79D7, + 0x79D8, + 0x7A01, + 0x7A02, + 0x7A07, + 0x7A08, + 0x7A09, + 0x7A0A, + 0x7A2C, + 0x7A2D, + 0x7A38, + 0x7A39, + 0x7A3A, + 0x7A3B, + 0x7A64, + 0x7A65, + 0x7A6A, + 0x7A6B, + 0x7A6F, + 0x7A70, + 0x7A82, + 0x7A83, + 0x7A9A, + 0x7A9C, + 0x7AB9, + 0x7ABA, + 0x7ABB, + 0x7ABE, + 0x7AC2, + 0x7AC3, + 0x7AC6, + 0x7AC7, + 0x7AE9, + 0x7AEA, + 0x7AF5, + 0x7AF6, + 0x7AFC, + 0x7AFD, + 0x7B07, + 0x7B08, + 0x7B1F, + 0x7B20, + 0x7B27, + 0x7B28, + 0x7B29, + 0x7B2A, + 0x7B42, + 0x7B43, + 0x7B53, + 0x7B54, + 0x7BA3, + 0x7BA4, + 0x7BA5, + 0x7BA6, + 0x7BB0, + 0x7BB1, + 0x7BB2, + 0x7BB3, + 0x7BFA, + 0x7BFB, + 0x7C1B, + 0x7C1C, + 0x7C2E, + 0x7C30, + 0x7C52, + 0x7C53, + 0x7C55, + 0x7C56, + 0x7C5D, + 0x7C5E, + 0x7C76, + 0x7C77, + 0x7C87, + 0x7C88, + 0x7C93, + 0x7C94, + 0x7C9A, + 0x7C9B, + 0x7CAC, + 0x7CAD, + 0x7CD3, + 0x7CD4, + 0x7CDA, + 0x7CDC, + 0x7CE1, + 0x7CE2, + 0x7CE3, + 0x7CE4, + 0x7CE5, + 0x7CE7, + 0x7CFC, + 0x7CFD, + 0x7CFF, + 0x7D00, + 0x7D23, + 0x7D24, + 0x7D2A, + 0x7D2B, + 0x7D2D, + 0x7D2E, + 0x7D48, + 0x7D49, + 0x7D4D, + 0x7D4E, + 0x7D5A, + 0x7D5B, + 0x7D64, + 0x7D65, + 0x7D78, + 0x7D79, + 0x7D82, + 0x7D83, + 0x7D95, + 0x7D96, + 0x7D98, + 0x7D99, + 0x7DA4, + 0x7DA5, + 0x7DA8, + 0x7DA9, + 0x7DCD, + 0x7DCE, + 0x7DD3, + 0x7DD4, + 0x7DE5, + 0x7DE6, + 0x7DEB, + 0x7DEC, + 0x7DFD, + 0x7E00, + 0x7E18, + 0x7E19, + 0x7E5B, + 0x7E5C, + 0x7E64, + 0x7E65, + 0x7E9D, + 0x7E9E, + 0x7F3B, + 0x7F3D, + 0x7F41, + 0x7F42, + 0x7F46, + 0x7F47, + 0x7F59, + 0x7F5A, + 0x7F84, + 0x7F85, + 0x7F90, + 0x7F91, + 0x7F97, + 0x7F98, + 0x7F99, + 0x7F9A, + 0x7FB4, + 0x7FB5, + 0x7FD6, + 0x7FD7, + 0x7FDD, + 0x7FDE, + 0x7FE4, + 0x7FE5, + 0x800A, + 0x800B, + 0x802F, + 0x8030, + 0x803C, + 0x803D, + 0x8040, + 0x8041, + 0x8066, + 0x8067, + 0x8088, + 0x8089, + 0x808E, + 0x808F, + 0x8094, + 0x8095, + 0x80A6, + 0x80A9, + 0x80B3, + 0x80B4, + 0x80B9, + 0x80BA, + 0x80DF, + 0x80E0, + 0x8103, + 0x8105, + 0x8134, + 0x8136, + 0x8184, + 0x8185, + 0x8190, + 0x8191, + 0x8196, + 0x8197, + 0x81CB, + 0x81CC, + 0x81E4, + 0x81E5, + 0x81EF, + 0x81F1, + 0x8213, + 0x8214, + 0x8224, + 0x8225, + 0x8241, + 0x8242, + 0x8265, + 0x8266, + 0x828C, + 0x828D, + 0x82B2, + 0x82B3, + 0x82E2, + 0x82E3, + 0x82FC, + 0x82FD, + 0x830A, + 0x830B, + 0x8310, + 0x8311, + 0x8330, + 0x8331, + 0x8355, + 0x8356, + 0x83BE, + 0x83BF, + 0x83E6, + 0x83E7, + 0x83ED, + 0x83EE, + 0x8414, + 0x8415, + 0x8416, + 0x8418, + 0x841F, + 0x8420, + 0x8458, + 0x8459, + 0x8483, + 0x8484, + 0x8495, + 0x8496, + 0x84B7, + 0x84B8, + 0x84C3, + 0x84C4, + 0x84ED, + 0x84EE, + 0x8505, + 0x8506, + 0x8510, + 0x8511, + 0x8532, + 0x8534, + 0x854C, + 0x854D, + 0x8550, + 0x8551, + 0x857F, + 0x8580, + 0x8593, + 0x8594, + 0x85B2, + 0x85B3, + 0x85BB, + 0x85BC, + 0x85CC, + 0x85CD, + 0x85EE, + 0x85EF, + 0x85F3, + 0x85F4, + 0x85FC, + 0x85FD, + 0x8603, + 0x8604, + 0x860D, + 0x860F, + 0x8610, + 0x8611, + 0x8615, + 0x8616, + 0x861D, + 0x861E, + 0x8637, + 0x8638, + 0x8657, + 0x8658, + 0x8675, + 0x8676, + 0x8689, + 0x868A, + 0x8692, + 0x8693, + 0x86A0, + 0x86A1, + 0x86A6, + 0x86A7, + 0x86D5, + 0x86D6, + 0x86E0, + 0x86E1, + 0x86E7, + 0x86E8, + 0x86FD, + 0x86FE, + 0x871D, + 0x871E, + 0x872F, + 0x8730, + 0x873D, + 0x873E, + 0x8745, + 0x8746, + 0x8771, + 0x8772, + 0x878E, + 0x878F, + 0x8799, + 0x879A, + 0x87DA, + 0x87DB, + 0x87F0, + 0x87F1, + 0x8807, + 0x8808, + 0x8812, + 0x8813, + 0x882D, + 0x882E, + 0x883A, + 0x883B, + 0x8847, + 0x8848, + 0x8858, + 0x8859, + 0x885C, + 0x885D, + 0x885F, + 0x8860, + 0x887A, + 0x887B, + 0x88E6, + 0x88E7, + 0x88E9, + 0x88EA, + 0x88ED, + 0x88EE, + 0x8903, + 0x8904, + 0x890F, + 0x8910, + 0x8924, + 0x8925, + 0x8965, + 0x8966, + 0x8975, + 0x8976, + 0x897D, + 0x897E, + 0x898D, + 0x898E, + 0x8990, + 0x8991, + 0x8994, + 0x8995, + 0x8999, + 0x899A, + 0x89B0, + 0x89B1, + 0x89B4, + 0x89B5, + 0x89BB, + 0x89BD, + 0x89EE, + 0x89EF, + 0x89F5, + 0x89F6, + 0x89F9, + 0x89FA, + 0x89FD, + 0x89FE, + 0x8A05, + 0x8A07, + 0x8A14, + 0x8A15, + 0x8A19, + 0x8A1A, + 0x8A20, + 0x8A22, + 0x8A2B, + 0x8A2C, + 0x8A3D, + 0x8A3E, + 0x8A4B, + 0x8A4C, + 0x8A64, + 0x8A65, + 0x8A78, + 0x8A79, + 0x8A7D, + 0x8A7E, + 0x8A88, + 0x8A89, + 0x8A9F, + 0x8AA0, + 0x8AAF, + 0x8AB0, + 0x8AB7, + 0x8AB8, + 0x8AD0, + 0x8AD1, + 0x8AEC, + 0x8AED, + 0x8B29, + 0x8B2A, + 0x8B32, + 0x8B33, + 0x8B38, + 0x8B39, + 0x8B3F, + 0x8B40, + 0x8B61, + 0x8B63, + 0x8B69, + 0x8B6A, + 0x8B75, + 0x8B76, + 0x8B7C, + 0x8B7D, + 0x8B81, + 0x8B82, + 0x8B87, + 0x8B88, + 0x8B8D, + 0x8B8E, + 0x8B8F, + 0x8B90, + 0x8B9B, + 0x8B9C, + 0x8C38, + 0x8C39, + 0x8C40, + 0x8C41, + 0x8C44, + 0x8C45, + 0x8C51, + 0x8C54, + 0x8C58, + 0x8C59, + 0x8C74, + 0x8C75, + 0x8C7F, + 0x8C80, + 0x8C83, + 0x8C84, + 0x8C87, + 0x8C88, + 0x8C8B, + 0x8C8C, + 0x8C9B, + 0x8C9C, + 0x8CA6, + 0x8CA7, + 0x8CCB, + 0x8CCC, + 0x8CD6, + 0x8CD7, + 0x8CD8, + 0x8CD9, + 0x8CE9, + 0x8CEA, + 0x8CF7, + 0x8CF8, + 0x8D01, + 0x8D02, + 0x8D11, + 0x8D13, + 0x8D7C, + 0x8D7D, + 0x8DA6, + 0x8DA7, + 0x8DC0, + 0x8DC1, + 0x8DE5, + 0x8DE6, + 0x8E01, + 0x8E02, + 0x8E0B, + 0x8E0C, + 0x8E32, + 0x8E33, + 0x8E46, + 0x8E47, + 0x8E4F, + 0x8E50, + 0x8E6E, + 0x8E6F, + 0x8E75, + 0x8E76, + 0x8E77, + 0x8E78, + 0x8E79, + 0x8E7A, + 0x8E9B, + 0x8E9C, + 0x8EA2, + 0x8EA3, + 0x8EB3, + 0x8EB4, + 0x8EB6, + 0x8EB8, + 0x8EC1, + 0x8EC2, + 0x8EC4, + 0x8EC5, + 0x8ED9, + 0x8EDA, + 0x8EF0, + 0x8EF1, + 0x8F0F, + 0x8F10, + 0x8F2D, + 0x8F2E, + 0x8F3A, + 0x8F3B, + 0x8F41, + 0x8F42, + 0x8F9D, + 0x8F9E, + 0x8FA4, + 0x8FA5, + 0x8FB3, + 0x8FB4, + 0x8FC3, + 0x8FC4, + 0x8FCA, + 0x8FCB, + 0x8FE7, + 0x8FE8, + 0x902A, + 0x902B, + 0x902C, + 0x902D, + 0x9037, + 0x9038, + 0x9040, + 0x9041, + 0x9046, + 0x9047, + 0x90AB, + 0x90AC, + 0x90CC, + 0x90CE, + 0x90D2, + 0x90D3, + 0x90F6, + 0x90F7, + 0x910A, + 0x910B, + 0x913C, + 0x913E, + 0x9159, + 0x915A, + 0x917B, + 0x917C, + 0x9195, + 0x9196, + 0x9198, + 0x9199, + 0x91A9, + 0x91AA, + 0x91BF, + 0x91C0, + 0x91C4, + 0x91C5, + 0x91E0, + 0x91E1, + 0x91EF, + 0x91F0, + 0x9213, + 0x9214, + 0x921F, + 0x9220, + 0x9222, + 0x9223, + 0x9243, + 0x9244, + 0x9269, + 0x926B, + 0x9281, + 0x9282, + 0x9284, + 0x9285, + 0x929E, + 0x929F, + 0x92BD, + 0x92BE, + 0x92D4, + 0x92D5, + 0x92DB, + 0x92DC, + 0x92E2, + 0x92E3, + 0x931C, + 0x931D, + 0x9330, + 0x9332, + 0x9362, + 0x9363, + 0x9368, + 0x9369, + 0x936B, + 0x936C, + 0x936F, + 0x9370, + 0x9373, + 0x9374, + 0x9378, + 0x9379, + 0x937F, + 0x9380, + 0x9381, + 0x9382, + 0x938B, + 0x938C, + 0x939C, + 0x939D, + 0x93A0, + 0x93A1, + 0x93AB, + 0x93AC, + 0x93BB, + 0x93BC, + 0x93E0, + 0x93E1, + 0x93F3, + 0x93F4, + 0x9402, + 0x9403, + 0x9417, + 0x9418, + 0x941C, + 0x941D, + 0x941E, + 0x9420, + 0x9424, + 0x9425, + 0x9443, + 0x9444, + 0x944E, + 0x944F, + 0x946C, + 0x946D, + 0x947B, + 0x947C, + 0x9578, + 0x957A, + 0x957E, + 0x957F, + 0x9585, + 0x9586, + 0x9597, + 0x9598, + 0x95B3, + 0x95B5, + 0x95B8, + 0x95B9, + 0x95C1, + 0x95C2, + 0x95D9, + 0x95DA, + 0x95DD, + 0x95DE, + 0x9625, + 0x9627, + 0x9629, + 0x962A, + 0x963E, + 0x963F, + 0x9656, + 0x9658, + 0x9679, + 0x967A, + 0x967B, + 0x967C, + 0x967F, + 0x9680, + 0x9681, + 0x9683, + 0x968C, + 0x968D, + 0x9696, + 0x9697, + 0x969A, + 0x969B, + 0x969D, + 0x969E, + 0x969F, + 0x96A0, + 0x96AB, + 0x96AC, + 0x96AF, + 0x96B0, + 0x96B5, + 0x96B6, + 0x96E4, + 0x96E5, + 0x96E6, + 0x96E8, + 0x96FC, + 0x96FD, + 0x9714, + 0x9715, + 0x9717, + 0x9718, + 0x971A, + 0x971C, + 0x9733, + 0x9735, + 0x9737, + 0x9738, + 0x9740, + 0x9742, + 0x974D, + 0x974E, + 0x9757, + 0x9758, + 0x9763, + 0x9764, + 0x9775, + 0x9776, + 0x9787, + 0x9788, + 0x9789, + 0x978A, + 0x979B, + 0x979C, + 0x97A9, + 0x97AA, + 0x97B0, + 0x97B2, + 0x97B5, + 0x97B6, + 0x97BE, + 0x97BF, + 0x97C0, + 0x97C1, + 0x97D2, + 0x97D3, + 0x97FC, + 0x97FD, + 0x981F, + 0x9820, + 0x9825, + 0x9826, + 0x982A, + 0x982B, + 0x9833, + 0x9834, + 0x983A, + 0x983B, + 0x983E, + 0x983F, + 0x9842, + 0x9843, + 0x9847, + 0x9848, + 0x9856, + 0x9857, + 0x9866, + 0x9867, + 0x9868, + 0x9869, + 0x98B7, + 0x98B8, + 0x98CA, + 0x98CB, + 0x98E4, + 0x98E5, + 0x98EC, + 0x98ED, + 0x98F1, + 0x98F2, + 0x98F8, + 0x98F9, + 0x98FB, + 0x98FC, + 0x9919, + 0x991A, + 0x993B, + 0x993C, + 0x9944, + 0x9945, + 0x995A, + 0x995B, + 0x995D, + 0x995E, + 0x99BF, + 0x99C0, + 0x99E0, + 0x99E1, + 0x99E6, + 0x99E7, + 0x99EB, + 0x99EC, + 0x99F5, + 0x99F6, + 0x9A10, + 0x9A11, + 0x9A17, + 0x9A19, + 0x9A3B, + 0x9A3C, + 0x9A51, + 0x9A52, + 0x9A58, + 0x9A59, + 0x9A5D, + 0x9A5E, + 0x9A63, + 0x9A64, + 0x9AA9, + 0x9AAA, + 0x9ABD, + 0x9ABE, + 0x9AC8, + 0x9AC9, + 0x9AD7, + 0x9AD8, + 0x9AE0, + 0x9AE1, + 0x9AE4, + 0x9AE5, + 0x9AE8, + 0x9AEA, + 0x9AF0, + 0x9AF1, + 0x9B00, + 0x9B01, + 0x9B02, + 0x9B03, + 0x9B09, + 0x9B0A, + 0x9B14, + 0x9B15, + 0x9B1B, + 0x9B1C, + 0x9B34, + 0x9B35, + 0x9B3D, + 0x9B3E, + 0x9B40, + 0x9B41, + 0x9B50, + 0x9B51, + 0x9B57, + 0x9B58, + 0x9B62, + 0x9B63, + 0x9B72, + 0x9B73, + 0x9B89, + 0x9B8A, + 0x9B8C, + 0x9B8D, + 0x9B99, + 0x9B9A, + 0x9BC2, + 0x9BC3, + 0x9BF6, + 0x9BF7, + 0x9C00, + 0x9C02, + 0x9C03, + 0x9C04, + 0x9C42, + 0x9C43, + 0x9C4F, + 0x9C50, + 0x9C51, + 0x9C52, + 0x9C61, + 0x9C62, + 0x9C64, + 0x9C65, + 0x9C7B, + 0x9C7C, + 0x9D0C, + 0x9D0E, + 0x9D11, + 0x9D12, + 0x9D27, + 0x9D28, + 0x9D35, + 0x9D36, + 0x9D3C, + 0x9D3D, + 0x9D6D, + 0x9D6E, + 0x9D95, + 0x9D96, + 0x9DAE, + 0x9DAF, + 0x9DBD, + 0x9DBE, + 0x9DC0, + 0x9DC1, + 0x9DEA, + 0x9DEB, + 0x9DFC, + 0x9DFD, + 0x9E0E, + 0x9E0F, + 0x9E16, + 0x9E17, + 0x9E1C, + 0x9E1D, + 0x9E7B, + 0x9E7C, + 0x9E8F, + 0x9E91, + 0x9E98, + 0x9E99, + 0x9E9E, + 0x9E9F, + 0x9EA2, + 0x9EA3, + 0x9EAB, + 0x9EAD, + 0x9EB1, + 0x9EB2, + 0x9EEC, + 0x9EED, + 0x9EF1, + 0x9EF2, + 0x9F03, + 0x9F04, + 0x9F11, + 0x9F12, + 0x9F14, + 0x9F15, + 0x9F26, + 0x9F27, + 0x9F45, + 0x9F46, + 0x9F53, + 0x9F54, + 0x9F6D, + 0x9F6E, + 0x9FA1, + 0x9FA2, + 0x9FA3, + 0x9FA4, + 0x9FA6, 0xA78D, 0xA78E, - 0xA792, - 0xA794, 0xA7AA, 0xA7AB, - 0xA7C0, - 0xA7CB, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, - 0xA7DA, - 0xA9E7, - 0xA9FF, - 0xAA60, - 0xAA77, - 0xAA7A, - 0xAA80, - 0xAB01, - 0xAB07, - 0xAB09, - 0xAB0F, - 0xAB11, - 0xAB17, - 0xAB20, - 0xAB27, - 0xAB28, - 0xAB2F, - 0xAB66, - 0xAB68, + 0xAA7B, + 0xAA7C, 0xAC00, 0xD7A4, - 0xFA0E, - 0xFA10, - 0xFA11, - 0xFA12, - 0xFA13, - 0xFA15, - 0xFA1F, - 0xFA20, - 0xFA21, - 0xFA22, - 0xFA23, - 0xFA25, - 0xFA27, - 0xFA2A, 0x11301, 0x11302, 0x11303, 0x11304, - 0x1133B, + 0x1133C, 0x1133D, - 0x16FF0, - 0x16FF2, - 0x1B11F, - 0x1B123, - 0x1B132, - 0x1B133, - 0x1B150, - 0x1B153, - 0x1B155, - 0x1B156, - 0x1B164, - 0x1B168, - 0x1DF00, - 0x1DF1F, - 0x1DF25, - 0x1DF2B, - 0x1E08F, - 0x1E090, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -278254,22 +291023,122 @@ static const UV UNI_IDENTIFIERSTATUS__AL 0x1E7EF, 0x1E7F0, 0x1E7FF, - 0x20000, - 0x2A6E0, - 0x2A700, - 0x2B73A, - 0x2B740, - 0x2B81E, - 0x2B820, - 0x2CEA2, - 0x2CEB0, - 0x2EBE1, - 0x2EBF0, - 0x2EE5E, - 0x30000, - 0x3134B, - 0x31350, - 0x323B0 + 0x2070E, + 0x2070F, + 0x20731, + 0x20732, + 0x20779, + 0x2077A, + 0x20C53, + 0x20C54, + 0x20C78, + 0x20C79, + 0x20C96, + 0x20C97, + 0x20CCF, + 0x20CD0, + 0x20CD5, + 0x20CD6, + 0x20D15, + 0x20D16, + 0x20D7C, + 0x20D7D, + 0x20D7F, + 0x20D80, + 0x20E0E, + 0x20E10, + 0x20E77, + 0x20E78, + 0x20E9D, + 0x20E9E, + 0x20EA2, + 0x20EA3, + 0x20ED7, + 0x20ED8, + 0x20EF9, + 0x20EFB, + 0x20F2D, + 0x20F2F, + 0x20F4C, + 0x20F4D, + 0x20FB4, + 0x20FB5, + 0x20FBC, + 0x20FBD, + 0x20FEA, + 0x20FEB, + 0x2105C, + 0x2105D, + 0x2106F, + 0x21070, + 0x21075, + 0x21077, + 0x2107B, + 0x2107C, + 0x210C1, + 0x210C2, + 0x210C9, + 0x210CA, + 0x211D9, + 0x211DA, + 0x220C7, + 0x220C8, + 0x227B5, + 0x227B6, + 0x22AD5, + 0x22AD6, + 0x22B43, + 0x22B44, + 0x22BCA, + 0x22BCB, + 0x22C51, + 0x22C52, + 0x22C55, + 0x22C56, + 0x22CC2, + 0x22CC3, + 0x22D08, + 0x22D09, + 0x22D4C, + 0x22D4D, + 0x22D67, + 0x22D68, + 0x22EB3, + 0x22EB4, + 0x23CB7, + 0x23CB8, + 0x244D3, + 0x244D4, + 0x24DB8, + 0x24DB9, + 0x24DEA, + 0x24DEB, + 0x2512B, + 0x2512C, + 0x26258, + 0x26259, + 0x267CC, + 0x267CD, + 0x269F2, + 0x269F3, + 0x269FA, + 0x269FB, + 0x27A3E, + 0x27A3F, + 0x2815D, + 0x2815E, + 0x28207, + 0x28208, + 0x282E2, + 0x282E3, + 0x28CCA, + 0x28CCB, + 0x28CCD, + 0x28CCE, + 0x28CD2, + 0x28CD3, + 0x29D98, + 0x29D99 }; # endif /* EBCDIC 037 */ @@ -278277,7 +291146,7 @@ static const UV UNI_IDENTIFIERSTATUS__AL # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_IDENTIFIERSTATUS__RESTRICTED_invlist[] = { /* for ASCII/Latin1 */ - 783, /* Number of elements */ + 3225, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -278301,67 +291170,97 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xD8, 0xF7, 0xF8, + 0x114, + 0x116, + 0x12C, + 0x12E, 0x132, 0x134, + 0x138, + 0x139, 0x13F, 0x141, 0x149, 0x14A, + 0x14E, + 0x150, + 0x156, + 0x158, + 0x162, + 0x164, 0x17F, - 0x18F, - 0x190, + 0x181, + 0x182, + 0x186, + 0x187, + 0x189, + 0x18B, + 0x18E, + 0x193, + 0x194, + 0x195, + 0x196, + 0x19A, + 0x19D, + 0x19E, 0x1A0, 0x1A2, 0x1AF, 0x1B1, + 0x1B2, + 0x1B5, + 0x1B7, + 0x1B8, 0x1CD, + 0x1D5, 0x1DD, 0x1DE, - 0x1E4, 0x1E6, - 0x1F1, - 0x1F4, - 0x1F6, + 0x1EA, + 0x1EE, + 0x1F0, 0x1F8, + 0x1FA, + 0x218, 0x21C, - 0x21E, - 0x220, - 0x226, - 0x234, + 0x244, + 0x245, + 0x24C, + 0x24E, + 0x253, + 0x255, + 0x256, + 0x258, 0x259, 0x25A, + 0x25B, + 0x25C, + 0x263, + 0x264, + 0x268, + 0x26A, + 0x272, + 0x273, + 0x289, + 0x28A, + 0x28B, + 0x28C, + 0x292, + 0x293, 0x2BB, 0x2BD, - 0x2EC, - 0x2ED, 0x300, 0x305, 0x306, 0x30D, - 0x30F, - 0x312, - 0x313, - 0x315, 0x31B, 0x31C, 0x323, + 0x324, + 0x326, 0x329, - 0x32D, - 0x32F, - 0x330, + 0x331, 0x332, - 0x335, - 0x336, - 0x338, - 0x33A, - 0x342, - 0x343, - 0x345, - 0x346, - 0x375, - 0x376, - 0x37B, - 0x37E, 0x386, 0x387, 0x388, @@ -278372,80 +291271,140 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x3A2, 0x3A3, 0x3CF, - 0x3FC, + 0x401, + 0x40D, + 0x40E, + 0x450, + 0x451, + 0x45D, + 0x45E, 0x460, - 0x48A, - 0x500, - 0x510, - 0x52A, - 0x52E, - 0x530, + 0x490, + 0x49C, + 0x49E, + 0x4A6, + 0x4A8, + 0x4B8, + 0x4BA, + 0x4C1, + 0x4CF, + 0x4DA, + 0x4DC, + 0x4EA, + 0x4EE, + 0x4F6, + 0x4F8, + 0x4FA, + 0x524, + 0x526, 0x531, 0x557, - 0x559, - 0x55A, 0x561, 0x587, 0x58A, 0x58B, - 0x5B4, - 0x5B5, 0x5D0, 0x5EB, - 0x5EF, + 0x5F3, 0x5F5, 0x620, - 0x640, + 0x63B, + 0x63D, + 0x63E, 0x641, + 0x653, + 0x654, 0x656, 0x660, 0x66A, 0x670, + 0x671, + 0x672, 0x673, 0x674, 0x675, 0x679, - 0x68E, - 0x68F, + 0x690, + 0x691, + 0x69B, + 0x69F, 0x6A1, 0x6A2, + 0x6A3, + 0x6A4, + 0x6AC, + 0x6AD, + 0x6B2, + 0x6B3, + 0x6B4, + 0x6B5, + 0x6B8, + 0x6BA, + 0x6BF, + 0x6C0, 0x6D4, 0x6D5, 0x6D6, - 0x6E5, - 0x6E7, 0x6EE, + 0x6FA, + 0x6FD, 0x700, - 0x750, + 0x751, + 0x753, + 0x756, + 0x757, + 0x760, + 0x761, + 0x762, + 0x764, + 0x766, + 0x769, + 0x76A, + 0x76B, + 0x76E, + 0x772, + 0x780, 0x7B2, - 0x870, - 0x888, - 0x889, 0x88F, + 0x890, 0x8A0, - 0x8AD, - 0x8B2, - 0x8B3, - 0x8B5, - 0x8CA, + 0x8A1, + 0x8A2, + 0x8AA, + 0x8BB, + 0x8C3, + 0x8C7, + 0x8C8, 0x901, + 0x904, + 0x905, + 0x90C, + 0x90D, + 0x929, + 0x92A, + 0x934, + 0x935, + 0x93D, + 0x93E, + 0x944, + 0x945, 0x94E, 0x94F, - 0x951, + 0x950, 0x956, 0x958, - 0x960, - 0x964, 0x966, 0x970, - 0x971, + 0x972, 0x978, - 0x979, + 0x97B, + 0x97D, + 0x97E, 0x980, 0x981, 0x984, 0x985, - 0x98D, + 0x98C, 0x98F, 0x991, 0x993, @@ -278457,21 +291416,17 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x9B6, 0x9BA, 0x9BC, + 0x9BD, + 0x9BE, 0x9C5, 0x9C7, 0x9C9, 0x9CB, 0x9CF, - 0x9D7, - 0x9D8, - 0x9E0, - 0x9E4, 0x9E6, 0x9F2, - 0x9FE, - 0x9FF, - 0xA01, - 0xA04, + 0xA02, + 0xA03, 0xA05, 0xA0B, 0xA0F, @@ -278496,9 +291451,9 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xA4E, 0xA5C, 0xA5D, - 0xA66, - 0xA75, - 0xA81, + 0xA70, + 0xA72, + 0xA82, 0xA84, 0xA85, 0xA8E, @@ -278513,23 +291468,19 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xAB5, 0xABA, 0xABC, + 0xABD, + 0xABE, 0xAC6, 0xAC7, 0xACA, 0xACB, 0xACE, - 0xAD0, - 0xAD1, - 0xAE0, - 0xAE4, 0xAE6, 0xAF0, - 0xAFA, - 0xB00, 0xB01, 0xB04, 0xB05, - 0xB0D, + 0xB0C, 0xB0F, 0xB11, 0xB13, @@ -278538,23 +291489,23 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xB31, 0xB32, 0xB34, - 0xB35, + 0xB36, 0xB3A, 0xB3C, + 0xB3D, + 0xB3E, 0xB44, 0xB47, 0xB49, 0xB4B, 0xB4E, - 0xB55, - 0xB58, + 0xB56, + 0xB57, 0xB5F, - 0xB62, - 0xB66, - 0xB70, + 0xB60, 0xB71, 0xB72, - 0xB82, + 0xB83, 0xB84, 0xB85, 0xB8B, @@ -278580,99 +291531,79 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xBC9, 0xBCA, 0xBCE, - 0xBD0, - 0xBD1, - 0xBD7, - 0xBD8, - 0xBE6, - 0xBF0, - 0xC01, - 0xC0D, + 0xC02, + 0xC04, + 0xC05, + 0xC0C, 0xC0E, 0xC11, 0xC12, 0xC29, 0xC2A, + 0xC31, + 0xC32, 0xC34, 0xC35, 0xC3A, - 0xC3C, + 0xC3E, 0xC45, 0xC46, 0xC49, 0xC4A, 0xC4E, - 0xC55, - 0xC57, - 0xC5D, - 0xC5E, - 0xC60, - 0xC62, - 0xC66, - 0xC70, - 0xC80, - 0xC81, 0xC82, 0xC84, 0xC85, - 0xC8D, + 0xC8C, 0xC8E, 0xC91, 0xC92, 0xCA9, 0xCAA, + 0xCB1, + 0xCB2, 0xCB4, 0xCB5, 0xCBA, - 0xCBC, - 0xCC5, + 0xCBE, + 0xCC4, 0xCC6, 0xCC9, 0xCCA, 0xCCE, - 0xCD5, - 0xCD7, - 0xCDD, - 0xCDE, - 0xCE0, - 0xCE4, 0xCE6, 0xCF0, - 0xCF1, - 0xCF4, - 0xD00, - 0xD01, 0xD02, 0xD04, 0xD05, - 0xD0D, + 0xD0C, 0xD0E, 0xD11, 0xD12, - 0xD3B, - 0xD3D, + 0xD29, + 0xD2A, + 0xD3A, + 0xD3E, 0xD44, 0xD46, 0xD49, 0xD4A, - 0xD4F, - 0xD54, + 0xD4C, + 0xD4D, + 0xD4E, + 0xD57, 0xD58, - 0xD60, - 0xD62, - 0xD66, - 0xD70, 0xD7A, 0xD80, 0xD82, 0xD84, 0xD85, - 0xD8F, + 0xD8E, 0xD91, 0xD97, 0xD9A, - 0xDA6, - 0xDA7, + 0xD9E, + 0xD9F, 0xDB2, 0xDB3, 0xDBC, @@ -278695,44 +291626,52 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xE34, 0xE3B, 0xE40, - 0xE4F, + 0xE4E, 0xE50, 0xE5A, 0xE81, 0xE83, 0xE84, 0xE85, - 0xE86, + 0xE87, + 0xE89, + 0xE8A, 0xE8B, - 0xE8C, + 0xE8D, + 0xE8E, + 0xE94, + 0xE98, + 0xE99, + 0xEA0, + 0xEA1, 0xEA4, 0xEA5, 0xEA6, 0xEA7, + 0xEA8, + 0xEAA, + 0xEAC, + 0xEAD, + 0xEAF, + 0xEB0, 0xEB3, 0xEB4, + 0xEBA, + 0xEBB, 0xEBE, 0xEC0, 0xEC5, 0xEC6, 0xEC7, 0xEC8, - 0xECF, + 0xECE, 0xED0, 0xEDA, - 0xEDE, - 0xEE0, - 0xF00, - 0xF01, 0xF0B, 0xF0C, 0xF20, 0xF2A, - 0xF35, - 0xF36, - 0xF37, - 0xF38, - 0xF3E, + 0xF40, 0xF43, 0xF44, 0xF48, @@ -278746,17 +291685,15 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xF5C, 0xF5D, 0xF69, - 0xF6A, - 0xF6D, 0xF71, 0xF73, 0xF74, 0xF75, 0xF7A, 0xF81, - 0xF82, + 0xF84, 0xF85, - 0xF86, + 0xF90, 0xF93, 0xF94, 0xF98, @@ -278769,26 +291706,28 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xFA8, 0xFAC, 0xFAD, + 0xFAE, + 0xFB1, 0xFB9, 0xFBA, 0xFBD, - 0xFC6, - 0xFC7, 0x1000, 0x104A, - 0x1050, - 0x109E, + 0x105A, + 0x1065, + 0x1075, + 0x108B, + 0x108F, + 0x1090, 0x10C7, 0x10C8, 0x10CD, 0x10CE, 0x10D0, 0x10F1, - 0x10F7, - 0x10FB, - 0x10FD, - 0x1100, 0x1200, + 0x1207, + 0x1208, 0x1249, 0x124A, 0x124E, @@ -278799,10 +291738,14 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x125A, 0x125E, 0x1260, + 0x1287, + 0x1288, 0x1289, 0x128A, 0x128E, 0x1290, + 0x12AF, + 0x12B0, 0x12B1, 0x12B2, 0x12B6, @@ -278815,20 +291758,26 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x12C8, 0x12D7, 0x12D8, + 0x12F8, + 0x1300, + 0x130F, + 0x1310, 0x1311, 0x1312, 0x1316, 0x1318, - 0x135B, - 0x135D, - 0x1360, - 0x1380, - 0x1390, + 0x131F, + 0x1320, + 0x1347, + 0x1348, + 0x135A, 0x1780, + 0x179D, + 0x179F, 0x17A3, 0x17A5, 0x17A8, - 0x17A9, + 0x17AA, 0x17B4, 0x17B6, 0x17CE, @@ -278836,210 +291785,2472 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x17D1, 0x17D2, 0x17D3, - 0x17D7, - 0x17D8, - 0x17DC, - 0x17DD, 0x17E0, 0x17EA, 0x1C90, 0x1CBB, 0x1CBD, 0x1CC0, - 0x1E00, - 0x1E9A, + 0x1E0C, + 0x1E0E, + 0x1E12, + 0x1E14, + 0x1E20, + 0x1E22, + 0x1E24, + 0x1E26, + 0x1E36, + 0x1E38, + 0x1E3C, + 0x1E40, + 0x1E42, + 0x1E4C, + 0x1E5A, + 0x1E5C, + 0x1E62, + 0x1E64, + 0x1E6C, + 0x1E6E, + 0x1E70, + 0x1E72, + 0x1E8C, + 0x1E8E, + 0x1E92, + 0x1E94, 0x1E9E, 0x1E9F, 0x1EA0, 0x1EFA, - 0x1F00, - 0x1F16, - 0x1F18, - 0x1F1E, - 0x1F20, - 0x1F46, - 0x1F48, - 0x1F4E, - 0x1F50, - 0x1F58, - 0x1F59, - 0x1F5A, - 0x1F5B, - 0x1F5C, - 0x1F5D, - 0x1F5E, - 0x1F5F, - 0x1F71, - 0x1F72, - 0x1F73, - 0x1F74, - 0x1F75, - 0x1F76, - 0x1F77, - 0x1F78, - 0x1F79, - 0x1F7A, - 0x1F7B, - 0x1F7C, - 0x1F7D, - 0x1F80, + 0x1FA0, + 0x1FB0, + 0x1FB2, 0x1FB5, - 0x1FB6, - 0x1FBB, - 0x1FBC, - 0x1FBD, - 0x1FC2, - 0x1FC5, - 0x1FC6, - 0x1FC9, - 0x1FCA, - 0x1FCB, - 0x1FCC, - 0x1FCD, - 0x1FD0, - 0x1FD3, - 0x1FD6, - 0x1FDB, - 0x1FE0, - 0x1FE3, - 0x1FE4, - 0x1FEB, 0x1FEC, 0x1FED, - 0x1FF2, - 0x1FF5, - 0x1FF6, - 0x1FF9, - 0x1FFA, - 0x1FFB, - 0x1FFC, - 0x1FFD, 0x2010, 0x2011, 0x2019, 0x201A, 0x2027, 0x2028, - 0x2D27, - 0x2D28, - 0x2D2D, - 0x2D2E, - 0x2D80, - 0x2D97, - 0x2DA0, - 0x2DA7, - 0x2DA8, - 0x2DAF, - 0x2DB0, - 0x2DB7, - 0x2DB8, - 0x2DBF, - 0x2DC0, - 0x2DC7, - 0x2DC8, - 0x2DCF, - 0x2DD0, - 0x2DD7, - 0x2DD8, - 0x2DDF, 0x3005, 0x3008, 0x3041, 0x3097, - 0x3099, - 0x309B, 0x309D, 0x309F, 0x30A0, 0x30FF, - 0x3105, - 0x312E, - 0x312F, - 0x3130, - 0x31A0, - 0x31C0, - 0x3400, - 0x4DC0, + 0x3447, + 0x3448, + 0x3473, + 0x3474, + 0x34E4, + 0x34E5, + 0x3577, + 0x3578, + 0x359E, + 0x359F, + 0x35A1, + 0x35A2, + 0x35AD, + 0x35AE, + 0x35BF, + 0x35C0, + 0x35CE, + 0x35CF, + 0x35F3, + 0x35F4, + 0x35FE, + 0x35FF, + 0x360E, + 0x360F, + 0x361A, + 0x361B, + 0x3918, + 0x3919, + 0x3960, + 0x3961, + 0x396E, + 0x396F, + 0x39CF, + 0x39D1, + 0x39DB, + 0x39DC, + 0x39DF, + 0x39E0, + 0x39F8, + 0x39F9, + 0x39FE, + 0x39FF, + 0x3A18, + 0x3A19, + 0x3A52, + 0x3A53, + 0x3A5C, + 0x3A5D, + 0x3A67, + 0x3A68, + 0x3A73, + 0x3A74, + 0x3B39, + 0x3B3A, + 0x3B4E, + 0x3B4F, + 0x3BA3, + 0x3BA4, + 0x3C6E, + 0x3C6F, + 0x3CE0, + 0x3CE1, + 0x3DE7, + 0x3DE8, + 0x3DEB, + 0x3DEC, + 0x3E74, + 0x3E75, + 0x3ED0, + 0x3ED1, + 0x4056, + 0x4057, + 0x4065, + 0x4066, + 0x406A, + 0x406B, + 0x40BB, + 0x40BC, + 0x40DF, + 0x40E0, + 0x4137, + 0x4138, + 0x415F, + 0x4160, + 0x4337, + 0x4338, + 0x43AC, + 0x43AD, + 0x43B1, + 0x43B2, + 0x43D3, + 0x43D4, + 0x43DD, + 0x43DE, + 0x4443, + 0x4444, + 0x44D6, + 0x44D7, + 0x44EA, + 0x44EB, + 0x4606, + 0x4607, + 0x464C, + 0x464D, + 0x4661, + 0x4662, + 0x4723, + 0x4724, + 0x4729, + 0x472A, + 0x477C, + 0x477D, + 0x478D, + 0x478E, + 0x47F4, + 0x47F5, + 0x4882, + 0x4883, + 0x4947, + 0x4948, + 0x497A, + 0x497B, + 0x497D, + 0x497E, + 0x4982, + 0x4984, + 0x4985, + 0x4987, + 0x499B, + 0x499C, + 0x499F, + 0x49A0, + 0x49B6, + 0x49B8, + 0x4A12, + 0x4A13, + 0x4AB8, + 0x4AB9, + 0x4C77, + 0x4C78, + 0x4C7D, + 0x4C7E, + 0x4C81, + 0x4C82, + 0x4C85, + 0x4C86, + 0x4C9D, + 0x4CA4, + 0x4D13, + 0x4D1A, + 0x4DAE, + 0x4DAF, 0x4E00, - 0xA000, - 0xA67F, - 0xA680, - 0xA717, - 0xA720, - 0xA788, - 0xA789, + 0x4E12, + 0x4E13, + 0x4E29, + 0x4E2A, + 0x4E68, + 0x4E69, + 0x4E79, + 0x4E7A, + 0x4E96, + 0x4E97, + 0x4EA3, + 0x4EA4, + 0x4EBC, + 0x4EBD, + 0x4ECC, + 0x4ECD, + 0x4EE7, + 0x4EE8, + 0x4EF8, + 0x4EFB, + 0x4EFC, + 0x4EFD, + 0x4EFE, + 0x4EFF, + 0x4F07, + 0x4F08, + 0x4F16, + 0x4F17, + 0x4F28, + 0x4F29, + 0x4F31, + 0x4F32, + 0x4F35, + 0x4F36, + 0x4F37, + 0x4F38, + 0x4F40, + 0x4F41, + 0x4F44, + 0x4F45, + 0x4F71, + 0x4F72, + 0x4F8C, + 0x4F8D, + 0x4F8E, + 0x4F8F, + 0x4FA2, + 0x4FA3, + 0x4FBD, + 0x4FBE, + 0x4FC6, + 0x4FC7, + 0x4FC8, + 0x4FC9, + 0x4FCC, + 0x4FCD, + 0x4FE2, + 0x4FE3, + 0x4FFC, + 0x4FFE, + 0x5010, + 0x5011, + 0x5034, + 0x5035, + 0x5038, + 0x5039, + 0x503D, + 0x503E, + 0x5042, + 0x5043, + 0x5052, + 0x5053, + 0x5058, + 0x5059, + 0x507C, + 0x507D, + 0x5081, + 0x5082, + 0x5093, + 0x5094, + 0x5097, + 0x5098, + 0x509F, + 0x50A2, + 0x50B9, + 0x50BA, + 0x50C3, + 0x50C4, + 0x50D8, + 0x50D9, + 0x50DF, + 0x50E0, + 0x50E1, + 0x50E3, + 0x50EB, + 0x50EC, + 0x50F4, + 0x50F5, + 0x50F7, + 0x50F8, + 0x511B, + 0x511C, + 0x5128, + 0x5129, + 0x512B, + 0x512C, + 0x5142, + 0x5143, + 0x514A, + 0x514B, + 0x514F, + 0x5150, + 0x5153, + 0x5154, + 0x5158, + 0x5159, + 0x5160, + 0x5161, + 0x5164, + 0x5165, + 0x5172, + 0x5173, + 0x517E, + 0x517F, + 0x5183, + 0x5185, + 0x518E, + 0x518F, + 0x51A1, + 0x51A2, + 0x51A3, + 0x51A4, + 0x51AD, + 0x51AE, + 0x51B8, + 0x51B9, + 0x51BA, + 0x51BB, + 0x51C2, + 0x51C3, + 0x51D2, + 0x51D4, + 0x51DF, + 0x51E0, + 0x51EC, + 0x51ED, + 0x51EE, + 0x51EF, + 0x51F2, + 0x51F3, + 0x5253, + 0x5254, + 0x5266, + 0x5267, + 0x5279, + 0x527A, + 0x5285, + 0x5286, + 0x528E, + 0x528F, + 0x52C4, + 0x52C5, + 0x52C8, + 0x52C9, + 0x52CC, + 0x52CD, + 0x52CE, + 0x52CF, + 0x52D1, + 0x52D2, + 0x52D4, + 0x52D5, + 0x52E1, + 0x52E2, + 0x52E5, + 0x52E6, + 0x52EE, + 0x52EF, + 0x5303, + 0x5305, + 0x5318, + 0x5319, + 0x531B, + 0x531C, + 0x531E, + 0x531F, + 0x5327, + 0x5328, + 0x5329, + 0x532A, + 0x5332, + 0x5333, + 0x5335, + 0x5337, + 0x5342, + 0x5343, + 0x535B, + 0x535C, + 0x535D, + 0x535E, + 0x536A, + 0x536B, + 0x536D, + 0x536E, + 0x5380, + 0x5381, + 0x53A1, + 0x53A2, + 0x53AA, + 0x53AC, + 0x53AF, + 0x53B0, + 0x53BA, + 0x53BB, + 0x53C5, + 0x53C6, + 0x53CF, + 0x53D0, + 0x53DD, + 0x53DF, + 0x53E7, + 0x53E8, + 0x53FF, + 0x5401, + 0x541A, + 0x541B, + 0x5422, + 0x5423, + 0x544C, + 0x544D, + 0x545D, + 0x545E, + 0x5469, + 0x546A, + 0x548A, + 0x548B, + 0x54B5, + 0x54B6, + 0x54F6, + 0x54F7, + 0x5515, + 0x5516, + 0x5518, + 0x551A, + 0x5547, + 0x5548, + 0x5560, + 0x5561, + 0x557A, + 0x557B, + 0x55E0, + 0x55E1, + 0x55F8, + 0x55F9, + 0x560A, + 0x560C, + 0x5620, + 0x5621, + 0x562B, + 0x562C, + 0x5637, + 0x5638, + 0x563C, + 0x563D, + 0x5644, + 0x5645, + 0x564B, + 0x564C, + 0x5651, + 0x5652, + 0x5656, + 0x5657, + 0x565F, + 0x5660, + 0x5661, + 0x5662, + 0x5675, + 0x5676, + 0x567D, + 0x567E, + 0x5688, + 0x5689, + 0x568B, + 0x568C, + 0x5696, + 0x5697, + 0x569E, + 0x569F, + 0x56BA, + 0x56BB, + 0x56CF, + 0x56D0, + 0x56D9, + 0x56DA, + 0x56E6, + 0x56E7, + 0x56F6, + 0x56F7, + 0x56F8, + 0x56F9, + 0x56FB, + 0x56FD, + 0x5705, + 0x5706, + 0x5711, + 0x5712, + 0x5717, + 0x5718, + 0x5721, + 0x5722, + 0x5724, + 0x5725, + 0x573D, + 0x573E, + 0x5743, + 0x5744, + 0x5748, + 0x5749, + 0x5755, + 0x5757, + 0x5758, + 0x5759, + 0x5763, + 0x5764, + 0x5778, + 0x5779, + 0x5781, + 0x5782, + 0x5787, + 0x5788, + 0x5796, + 0x5797, + 0x57A8, + 0x57A9, + 0x57CA, + 0x57CB, + 0x57D1, + 0x57D2, + 0x57DB, + 0x57DC, + 0x5817, + 0x5819, + 0x5850, + 0x5851, + 0x5856, + 0x5857, + 0x5860, + 0x5861, + 0x5866, + 0x5868, + 0x5877, + 0x5878, + 0x5895, + 0x5896, + 0x58AA, + 0x58AB, + 0x58B6, + 0x58B7, + 0x58C0, + 0x58C1, + 0x58C3, + 0x58C5, + 0x58CD, + 0x58CE, + 0x58D0, + 0x58D1, + 0x58E1, + 0x58E2, + 0x58E6, + 0x58E7, + 0x58F5, + 0x58F6, + 0x5901, + 0x5902, + 0x5905, + 0x5906, + 0x5908, + 0x5909, + 0x5911, + 0x5912, + 0x5913, + 0x5914, + 0x5923, + 0x5924, + 0x5933, + 0x5934, + 0x5936, + 0x5937, + 0x5959, + 0x595A, + 0x595B, + 0x595C, + 0x59B7, + 0x59B8, + 0x59E7, + 0x59E8, + 0x5A24, + 0x5A25, + 0x5A26, + 0x5A27, + 0x5A2C, + 0x5A2D, + 0x5A30, + 0x5A31, + 0x5A54, + 0x5A55, + 0x5A59, + 0x5A5A, + 0x5A6F, + 0x5A70, + 0x5A71, + 0x5A72, + 0x5A87, + 0x5A88, + 0x5A8D, + 0x5A8E, + 0x5AAB, + 0x5AAC, + 0x5AD3, + 0x5AD4, + 0x5AEF, + 0x5AF1, + 0x5B0A, + 0x5B0B, + 0x5B0D, + 0x5B0E, + 0x5B39, + 0x5B3A, + 0x5B46, + 0x5B47, + 0x5B4F, + 0x5B50, + 0x5B52, + 0x5B53, + 0x5B60, + 0x5B62, + 0x5B6F, + 0x5B70, + 0x5B79, + 0x5B7A, + 0x5B7E, + 0x5B7F, + 0x5B86, + 0x5B87, + 0x5B90, + 0x5B91, + 0x5BA9, + 0x5BAA, + 0x5BB2, + 0x5BB3, + 0x5BB7, + 0x5BB8, + 0x5BBC, + 0x5BBD, + 0x5BC8, + 0x5BC9, + 0x5BDA, + 0x5BDB, + 0x5C00, + 0x5C01, + 0x5C1B, + 0x5C1C, + 0x5C23, + 0x5C24, + 0x5C26, + 0x5C27, + 0x5C29, + 0x5C2A, + 0x5C36, + 0x5C37, + 0x5C5A, + 0x5C5B, + 0x5C85, + 0x5C86, + 0x5CB4, + 0x5CB5, + 0x5CB9, + 0x5CBA, + 0x5CD5, + 0x5CD6, + 0x5CDD, + 0x5CDE, + 0x5CF5, + 0x5CF6, + 0x5D2B, + 0x5D2C, + 0x5D2F, + 0x5D30, + 0x5D3B, + 0x5D3C, + 0x5D53, + 0x5D54, + 0x5D57, + 0x5D58, + 0x5D60, + 0x5D61, + 0x5D83, + 0x5D84, + 0x5D96, + 0x5D97, + 0x5DA3, + 0x5DA5, + 0x5DAB, + 0x5DAC, + 0x5DB3, + 0x5DB4, + 0x5DB9, + 0x5DBA, + 0x5DC4, + 0x5DC5, + 0x5DD7, + 0x5DD8, + 0x5DDA, + 0x5DDB, + 0x5DDC, + 0x5DDD, + 0x5DF6, + 0x5DF7, + 0x5E12, + 0x5E13, + 0x5E48, + 0x5E49, + 0x5E51, + 0x5E52, + 0x5E92, + 0x5E93, + 0x5EBA, + 0x5EBB, + 0x5EC0, + 0x5EC1, + 0x5EEB, + 0x5EEC, + 0x5EF9, + 0x5EFA, + 0x5F0E, + 0x5F0F, + 0x5F3B, + 0x5F3C, + 0x5F3D, + 0x5F3E, + 0x5F8F, + 0x5F90, + 0x5F9A, + 0x5F9B, + 0x5FA3, + 0x5FA5, + 0x5FB0, + 0x5FB1, + 0x5FC2, + 0x5FC3, + 0x5FCE, + 0x5FCF, + 0x5FDB, + 0x5FDC, + 0x5FE2, + 0x5FE3, + 0x5FEC, + 0x5FED, + 0x5FFC, + 0x5FFD, + 0x6023, + 0x6024, + 0x6056, + 0x6057, + 0x6061, + 0x6062, + 0x6071, + 0x6072, + 0x6074, + 0x6075, + 0x6091, + 0x6092, + 0x6093, + 0x6094, + 0x60A5, + 0x60A6, + 0x60D2, + 0x60D3, + 0x60D6, + 0x60D7, + 0x60DE, + 0x60DF, + 0x60E5, + 0x60E6, + 0x60FD, + 0x60FE, + 0x6102, + 0x6103, + 0x6107, + 0x6108, + 0x6111, + 0x6112, + 0x611E, + 0x611F, + 0x6131, + 0x6132, + 0x6133, + 0x6134, + 0x6135, + 0x6136, + 0x6138, + 0x613A, + 0x6160, + 0x6161, + 0x617B, + 0x617C, + 0x617F, + 0x6180, + 0x6186, + 0x6187, + 0x6197, + 0x6198, + 0x619C, + 0x619D, + 0x61B9, + 0x61BA, + 0x61BB, + 0x61BC, + 0x61D3, + 0x61D4, + 0x61D5, + 0x61D6, + 0x61EC, + 0x61ED, + 0x61EF, + 0x61F0, + 0x6205, + 0x6206, + 0x6235, + 0x6236, + 0x6239, + 0x623A, + 0x6257, + 0x6258, + 0x628D, + 0x628E, + 0x629D, + 0x629E, + 0x62DE, + 0x62DF, + 0x62EA, + 0x62EB, + 0x630A, + 0x630B, + 0x6317, + 0x6318, + 0x6331, + 0x6332, + 0x6337, + 0x6338, + 0x635B, + 0x635C, + 0x638B, + 0x638C, + 0x6393, + 0x6394, + 0x63D1, + 0x63D2, + 0x643B, + 0x643D, + 0x6449, + 0x644A, + 0x645A, + 0x645B, + 0x647E, + 0x647F, + 0x6486, + 0x6487, + 0x64A1, + 0x64A2, + 0x64AF, + 0x64B0, + 0x64B6, + 0x64B7, + 0x64C8, + 0x64C9, + 0x64D5, + 0x64D6, + 0x64EE, + 0x64EF, + 0x64F5, + 0x64F6, + 0x64F9, + 0x64FA, + 0x6502, + 0x6503, + 0x650A, + 0x650B, + 0x651F, + 0x6520, + 0x6528, + 0x6529, + 0x6540, + 0x6541, + 0x6542, + 0x6543, + 0x655A, + 0x655B, + 0x655F, + 0x6560, + 0x657D, + 0x657E, + 0x658A, + 0x658B, + 0x659A, + 0x659B, + 0x65B5, + 0x65B6, + 0x65BE, + 0x65BF, + 0x65C8, + 0x65CA, + 0x65D1, + 0x65D2, + 0x65D8, + 0x65D9, + 0x65DC, + 0x65DD, + 0x65E4, + 0x65E5, + 0x65EA, + 0x65EB, + 0x65F9, + 0x65FA, + 0x65FE, + 0x65FF, + 0x6617, + 0x6618, + 0x662C, + 0x662D, + 0x6637, + 0x6639, + 0x6648, + 0x6649, + 0x664D, + 0x664E, + 0x6660, + 0x6661, + 0x6663, + 0x6664, + 0x6692, + 0x6693, + 0x669C, + 0x669D, + 0x669E, + 0x669F, + 0x66AC, + 0x66AE, + 0x66D0, + 0x66D1, + 0x66D3, + 0x66D4, + 0x66D7, + 0x66D8, + 0x66DF, + 0x66E0, + 0x66EF, + 0x66F0, + 0x6702, + 0x6703, + 0x6707, + 0x6708, + 0x6719, + 0x671A, + 0x6724, + 0x6725, + 0x6729, + 0x672A, + 0x6767, + 0x6768, + 0x6788, + 0x6789, + 0x6796, + 0x6797, + 0x67BD, + 0x67BE, + 0x67BF, + 0x67C0, + 0x67D5, + 0x67D6, + 0x67D7, + 0x67D8, + 0x67F9, + 0x67FA, + 0x6801, + 0x6802, + 0x6815, + 0x6816, + 0x6827, + 0x6828, + 0x6830, + 0x6831, + 0x6858, + 0x6859, + 0x685A, + 0x685B, + 0x685E, + 0x685F, + 0x687A, + 0x687B, + 0x6895, + 0x6896, + 0x6899, + 0x689A, + 0x68A5, + 0x68A6, + 0x68B8, + 0x68B9, + 0x68C3, + 0x68C4, + 0x68D9, + 0x68DA, + 0x68E2, + 0x68E3, + 0x68E5, + 0x68E6, + 0x6909, + 0x690A, + 0x693E, + 0x693F, + 0x694D, + 0x694E, + 0x699F, + 0x69A0, + 0x69A2, + 0x69A3, + 0x69C0, + 0x69C1, + 0x69D1, + 0x69D3, + 0x69D5, + 0x69D8, + 0x6A03, + 0x6A04, + 0x6A1C, + 0x6A1D, + 0x6A24, + 0x6A25, + 0x6A37, + 0x6A38, + 0x6A4A, + 0x6A4B, + 0x6A5C, + 0x6A5D, + 0x6A6E, + 0x6A6F, + 0x6A70, + 0x6A71, + 0x6A86, + 0x6A87, + 0x6A8A, + 0x6A8B, + 0x6A8F, + 0x6A90, + 0x6A99, + 0x6A9A, + 0x6A9D, + 0x6A9E, + 0x6AB1, + 0x6AB2, + 0x6ABE, + 0x6ABF, + 0x6AC0, + 0x6AC1, + 0x6AC4, + 0x6AC5, + 0x6AC9, + 0x6ACA, + 0x6AD8, + 0x6AD9, + 0x6AE9, + 0x6AEA, + 0x6B0E, + 0x6B0F, + 0x6B1B, + 0x6B1C, + 0x6B2E, + 0x6B2F, + 0x6B35, + 0x6B36, + 0x6B40, + 0x6B41, + 0x6B57, + 0x6B59, + 0x6B5D, + 0x6B5E, + 0x6B68, + 0x6B69, + 0x6B6C, + 0x6B6D, + 0x6B6E, + 0x6B6F, + 0x6B71, + 0x6B72, + 0x6B75, + 0x6B76, + 0x6B7D, + 0x6B7E, + 0x6BB8, + 0x6BB9, + 0x6BE9, + 0x6BEA, + 0x6BF1, + 0x6BF2, + 0x6BF4, + 0x6BF5, + 0x6BFA, + 0x6BFB, + 0x6C0A, + 0x6C0B, + 0x6C1C, + 0x6C1D, + 0x6C2D, + 0x6C2E, + 0x6C3C, + 0x6C3D, + 0x6C45, + 0x6C46, + 0x6C6C, + 0x6C6D, + 0x6C6E, + 0x6C6F, + 0x6CA0, + 0x6CA1, + 0x6CD8, + 0x6CD9, + 0x6CF4, + 0x6CF5, + 0x6D02, + 0x6D03, + 0x6D1C, + 0x6D1D, + 0x6D24, + 0x6D25, + 0x6D71, + 0x6D72, + 0x6D81, + 0x6D82, + 0x6D96, + 0x6D97, + 0x6DB0, + 0x6DB2, + 0x6DB6, + 0x6DB7, + 0x6DFE, + 0x6E00, + 0x6E01, + 0x6E03, + 0x6E06, + 0x6E07, + 0x6E12, + 0x6E13, + 0x6E18, + 0x6E19, + 0x6E2A, + 0x6E2B, + 0x6E4C, + 0x6E4D, + 0x6E6C, + 0x6E6D, + 0x6E7B, + 0x6E7E, + 0x6E8B, + 0x6E8C, + 0x6E95, + 0x6E96, + 0x6EDB, + 0x6EDC, + 0x6EE3, + 0x6EE4, + 0x6F04, + 0x6F05, + 0x6F0B, + 0x6F0C, + 0x6F42, + 0x6F43, + 0x6F48, + 0x6F49, + 0x6F4A, + 0x6F4B, + 0x6F79, + 0x6F7A, + 0x6F98, + 0x6F99, + 0x6F9A, + 0x6F9B, + 0x6F9F, + 0x6FA0, + 0x6FB7, + 0x6FB8, + 0x6FC5, + 0x6FC6, + 0x6FD0, + 0x6FD1, + 0x6FD3, + 0x6FD4, + 0x6FF5, + 0x6FF6, + 0x6FFD, + 0x6FFE, + 0x7010, + 0x7011, + 0x7013, + 0x7014, + 0x7047, + 0x7048, + 0x704B, + 0x704C, + 0x704E, + 0x704F, + 0x7072, + 0x7074, + 0x707B, + 0x707C, + 0x7081, + 0x7082, + 0x708D, + 0x708E, + 0x7097, + 0x7098, + 0x709B, + 0x709C, + 0x70AA, + 0x70AB, + 0x70B2, + 0x70B3, + 0x70B6, + 0x70B7, + 0x70D5, + 0x70D6, + 0x70FE, + 0x70FF, + 0x7108, + 0x7109, + 0x7124, + 0x7125, + 0x7133, + 0x7135, + 0x7157, + 0x7158, + 0x716B, + 0x716C, + 0x716D, + 0x716E, + 0x718D, + 0x718E, + 0x7196, + 0x7197, + 0x71A6, + 0x71A7, + 0x71AB, + 0x71AC, + 0x71B6, + 0x71B7, + 0x71CC, + 0x71CD, + 0x71D3, + 0x71D4, + 0x71F3, + 0x71F4, + 0x71FA, + 0x71FB, + 0x720B, + 0x720C, + 0x7211, + 0x7212, + 0x7215, + 0x7216, + 0x7217, + 0x7218, + 0x7220, + 0x7221, + 0x7224, + 0x7226, + 0x722F, + 0x7230, + 0x7234, + 0x7235, + 0x7245, + 0x7246, + 0x724E, + 0x724F, + 0x7250, + 0x7251, + 0x7255, + 0x7256, + 0x72AB, + 0x72AC, + 0x72BE, + 0x72BF, + 0x7302, + 0x7303, + 0x7310, + 0x7311, + 0x7328, + 0x7329, + 0x7353, + 0x7354, + 0x739C, + 0x739D, + 0x73C1, + 0x73C2, + 0x73F3, + 0x73F4, + 0x73FB, + 0x73FC, + 0x7418, + 0x7419, + 0x7439, + 0x743A, + 0x743E, + 0x743F, + 0x7447, + 0x7448, + 0x7449, + 0x744A, + 0x7458, + 0x7459, + 0x747B, + 0x747C, + 0x7484, + 0x7485, + 0x7496, + 0x7497, + 0x749D, + 0x749E, + 0x74C7, + 0x74C8, + 0x74C9, + 0x74CA, + 0x74CC, + 0x74CD, + 0x74EB, + 0x74EC, + 0x7520, + 0x7521, + 0x7541, + 0x7542, + 0x7552, + 0x7553, + 0x7555, + 0x7556, + 0x755E, + 0x755F, + 0x7561, + 0x7562, + 0x7571, + 0x7572, + 0x757B, + 0x757C, + 0x7585, + 0x7586, + 0x75A9, + 0x75AA, + 0x75B7, + 0x75B8, + 0x75DC, + 0x75DD, + 0x75EE, + 0x75EF, + 0x762C, + 0x762D, + 0x7644, + 0x7646, + 0x7651, + 0x7652, + 0x7655, + 0x7656, + 0x7673, + 0x7674, + 0x768D, + 0x768E, + 0x76A1, + 0x76A3, + 0x76A5, + 0x76A6, + 0x76A8, + 0x76A9, + 0x76B3, + 0x76B4, + 0x76B6, + 0x76B7, + 0x76C1, + 0x76C2, + 0x76CB, + 0x76CC, + 0x76D9, + 0x76DA, + 0x76EB, + 0x76EC, + 0x7700, + 0x7701, + 0x7702, + 0x7703, + 0x770E, + 0x770F, + 0x7721, + 0x7722, + 0x772B, + 0x772C, + 0x773F, + 0x7740, + 0x7742, + 0x7743, + 0x7764, + 0x7765, + 0x7796, + 0x7797, + 0x77A4, + 0x77A5, + 0x77BE, + 0x77BF, + 0x77C1, + 0x77C2, + 0x77D2, + 0x77D3, + 0x77DD, + 0x77DE, + 0x77E4, + 0x77E5, + 0x77E6, + 0x77E7, + 0x77F4, + 0x77F6, + 0x7824, + 0x7825, + 0x7836, + 0x7837, + 0x7842, + 0x7843, + 0x7846, + 0x7847, + 0x784B, + 0x784C, + 0x7876, + 0x7877, + 0x7888, + 0x7889, + 0x78C2, + 0x78C3, + 0x78C7, + 0x78C8, + 0x78D2, + 0x78D3, + 0x78F0, + 0x78F1, + 0x78F8, + 0x78F9, + 0x7900, + 0x7901, + 0x7908, + 0x7909, + 0x790D, + 0x790E, + 0x7915, + 0x7916, + 0x791F, + 0x7921, + 0x7932, + 0x7933, + 0x7936, + 0x7937, + 0x7959, + 0x795A, + 0x796C, + 0x796D, + 0x796E, + 0x796F, + 0x7975, + 0x7977, + 0x7986, + 0x7988, + 0x799E, + 0x799F, + 0x79A9, + 0x79AA, + 0x79BC, + 0x79BD, + 0x79C4, + 0x79C5, + 0x79C7, + 0x79C8, + 0x79CC, + 0x79CD, + 0x79D4, + 0x79D5, + 0x79D7, + 0x79D8, + 0x7A01, + 0x7A02, + 0x7A07, + 0x7A08, + 0x7A09, + 0x7A0A, + 0x7A2C, + 0x7A2D, + 0x7A38, + 0x7A39, + 0x7A3A, + 0x7A3B, + 0x7A64, + 0x7A65, + 0x7A6A, + 0x7A6B, + 0x7A6F, + 0x7A70, + 0x7A82, + 0x7A83, + 0x7A9A, + 0x7A9C, + 0x7AB9, + 0x7ABA, + 0x7ABB, + 0x7ABE, + 0x7AC2, + 0x7AC3, + 0x7AC6, + 0x7AC7, + 0x7AE9, + 0x7AEA, + 0x7AF5, + 0x7AF6, + 0x7AFC, + 0x7AFD, + 0x7B07, + 0x7B08, + 0x7B1F, + 0x7B20, + 0x7B27, + 0x7B28, + 0x7B29, + 0x7B2A, + 0x7B42, + 0x7B43, + 0x7B53, + 0x7B54, + 0x7BA3, + 0x7BA4, + 0x7BA5, + 0x7BA6, + 0x7BB0, + 0x7BB1, + 0x7BB2, + 0x7BB3, + 0x7BFA, + 0x7BFB, + 0x7C1B, + 0x7C1C, + 0x7C2E, + 0x7C30, + 0x7C52, + 0x7C53, + 0x7C55, + 0x7C56, + 0x7C5D, + 0x7C5E, + 0x7C76, + 0x7C77, + 0x7C87, + 0x7C88, + 0x7C93, + 0x7C94, + 0x7C9A, + 0x7C9B, + 0x7CAC, + 0x7CAD, + 0x7CD3, + 0x7CD4, + 0x7CDA, + 0x7CDC, + 0x7CE1, + 0x7CE2, + 0x7CE3, + 0x7CE4, + 0x7CE5, + 0x7CE7, + 0x7CFC, + 0x7CFD, + 0x7CFF, + 0x7D00, + 0x7D23, + 0x7D24, + 0x7D2A, + 0x7D2B, + 0x7D2D, + 0x7D2E, + 0x7D48, + 0x7D49, + 0x7D4D, + 0x7D4E, + 0x7D5A, + 0x7D5B, + 0x7D64, + 0x7D65, + 0x7D78, + 0x7D79, + 0x7D82, + 0x7D83, + 0x7D95, + 0x7D96, + 0x7D98, + 0x7D99, + 0x7DA4, + 0x7DA5, + 0x7DA8, + 0x7DA9, + 0x7DCD, + 0x7DCE, + 0x7DD3, + 0x7DD4, + 0x7DE5, + 0x7DE6, + 0x7DEB, + 0x7DEC, + 0x7DFD, + 0x7E00, + 0x7E18, + 0x7E19, + 0x7E5B, + 0x7E5C, + 0x7E64, + 0x7E65, + 0x7E9D, + 0x7E9E, + 0x7F3B, + 0x7F3D, + 0x7F41, + 0x7F42, + 0x7F46, + 0x7F47, + 0x7F59, + 0x7F5A, + 0x7F84, + 0x7F85, + 0x7F90, + 0x7F91, + 0x7F97, + 0x7F98, + 0x7F99, + 0x7F9A, + 0x7FB4, + 0x7FB5, + 0x7FD6, + 0x7FD7, + 0x7FDD, + 0x7FDE, + 0x7FE4, + 0x7FE5, + 0x800A, + 0x800B, + 0x802F, + 0x8030, + 0x803C, + 0x803D, + 0x8040, + 0x8041, + 0x8066, + 0x8067, + 0x8088, + 0x8089, + 0x808E, + 0x808F, + 0x8094, + 0x8095, + 0x80A6, + 0x80A9, + 0x80B3, + 0x80B4, + 0x80B9, + 0x80BA, + 0x80DF, + 0x80E0, + 0x8103, + 0x8105, + 0x8134, + 0x8136, + 0x8184, + 0x8185, + 0x8190, + 0x8191, + 0x8196, + 0x8197, + 0x81CB, + 0x81CC, + 0x81E4, + 0x81E5, + 0x81EF, + 0x81F1, + 0x8213, + 0x8214, + 0x8224, + 0x8225, + 0x8241, + 0x8242, + 0x8265, + 0x8266, + 0x828C, + 0x828D, + 0x82B2, + 0x82B3, + 0x82E2, + 0x82E3, + 0x82FC, + 0x82FD, + 0x830A, + 0x830B, + 0x8310, + 0x8311, + 0x8330, + 0x8331, + 0x8355, + 0x8356, + 0x83BE, + 0x83BF, + 0x83E6, + 0x83E7, + 0x83ED, + 0x83EE, + 0x8414, + 0x8415, + 0x8416, + 0x8418, + 0x841F, + 0x8420, + 0x8458, + 0x8459, + 0x8483, + 0x8484, + 0x8495, + 0x8496, + 0x84B7, + 0x84B8, + 0x84C3, + 0x84C4, + 0x84ED, + 0x84EE, + 0x8505, + 0x8506, + 0x8510, + 0x8511, + 0x8532, + 0x8534, + 0x854C, + 0x854D, + 0x8550, + 0x8551, + 0x857F, + 0x8580, + 0x8593, + 0x8594, + 0x85B2, + 0x85B3, + 0x85BB, + 0x85BC, + 0x85CC, + 0x85CD, + 0x85EE, + 0x85EF, + 0x85F3, + 0x85F4, + 0x85FC, + 0x85FD, + 0x8603, + 0x8604, + 0x860D, + 0x860F, + 0x8610, + 0x8611, + 0x8615, + 0x8616, + 0x861D, + 0x861E, + 0x8637, + 0x8638, + 0x8657, + 0x8658, + 0x8675, + 0x8676, + 0x8689, + 0x868A, + 0x8692, + 0x8693, + 0x86A0, + 0x86A1, + 0x86A6, + 0x86A7, + 0x86D5, + 0x86D6, + 0x86E0, + 0x86E1, + 0x86E7, + 0x86E8, + 0x86FD, + 0x86FE, + 0x871D, + 0x871E, + 0x872F, + 0x8730, + 0x873D, + 0x873E, + 0x8745, + 0x8746, + 0x8771, + 0x8772, + 0x878E, + 0x878F, + 0x8799, + 0x879A, + 0x87DA, + 0x87DB, + 0x87F0, + 0x87F1, + 0x8807, + 0x8808, + 0x8812, + 0x8813, + 0x882D, + 0x882E, + 0x883A, + 0x883B, + 0x8847, + 0x8848, + 0x8858, + 0x8859, + 0x885C, + 0x885D, + 0x885F, + 0x8860, + 0x887A, + 0x887B, + 0x88E6, + 0x88E7, + 0x88E9, + 0x88EA, + 0x88ED, + 0x88EE, + 0x8903, + 0x8904, + 0x890F, + 0x8910, + 0x8924, + 0x8925, + 0x8965, + 0x8966, + 0x8975, + 0x8976, + 0x897D, + 0x897E, + 0x898D, + 0x898E, + 0x8990, + 0x8991, + 0x8994, + 0x8995, + 0x8999, + 0x899A, + 0x89B0, + 0x89B1, + 0x89B4, + 0x89B5, + 0x89BB, + 0x89BD, + 0x89EE, + 0x89EF, + 0x89F5, + 0x89F6, + 0x89F9, + 0x89FA, + 0x89FD, + 0x89FE, + 0x8A05, + 0x8A07, + 0x8A14, + 0x8A15, + 0x8A19, + 0x8A1A, + 0x8A20, + 0x8A22, + 0x8A2B, + 0x8A2C, + 0x8A3D, + 0x8A3E, + 0x8A4B, + 0x8A4C, + 0x8A64, + 0x8A65, + 0x8A78, + 0x8A79, + 0x8A7D, + 0x8A7E, + 0x8A88, + 0x8A89, + 0x8A9F, + 0x8AA0, + 0x8AAF, + 0x8AB0, + 0x8AB7, + 0x8AB8, + 0x8AD0, + 0x8AD1, + 0x8AEC, + 0x8AED, + 0x8B29, + 0x8B2A, + 0x8B32, + 0x8B33, + 0x8B38, + 0x8B39, + 0x8B3F, + 0x8B40, + 0x8B61, + 0x8B63, + 0x8B69, + 0x8B6A, + 0x8B75, + 0x8B76, + 0x8B7C, + 0x8B7D, + 0x8B81, + 0x8B82, + 0x8B87, + 0x8B88, + 0x8B8D, + 0x8B8E, + 0x8B8F, + 0x8B90, + 0x8B9B, + 0x8B9C, + 0x8C38, + 0x8C39, + 0x8C40, + 0x8C41, + 0x8C44, + 0x8C45, + 0x8C51, + 0x8C54, + 0x8C58, + 0x8C59, + 0x8C74, + 0x8C75, + 0x8C7F, + 0x8C80, + 0x8C83, + 0x8C84, + 0x8C87, + 0x8C88, + 0x8C8B, + 0x8C8C, + 0x8C9B, + 0x8C9C, + 0x8CA6, + 0x8CA7, + 0x8CCB, + 0x8CCC, + 0x8CD6, + 0x8CD7, + 0x8CD8, + 0x8CD9, + 0x8CE9, + 0x8CEA, + 0x8CF7, + 0x8CF8, + 0x8D01, + 0x8D02, + 0x8D11, + 0x8D13, + 0x8D7C, + 0x8D7D, + 0x8DA6, + 0x8DA7, + 0x8DC0, + 0x8DC1, + 0x8DE5, + 0x8DE6, + 0x8E01, + 0x8E02, + 0x8E0B, + 0x8E0C, + 0x8E32, + 0x8E33, + 0x8E46, + 0x8E47, + 0x8E4F, + 0x8E50, + 0x8E6E, + 0x8E6F, + 0x8E75, + 0x8E76, + 0x8E77, + 0x8E78, + 0x8E79, + 0x8E7A, + 0x8E9B, + 0x8E9C, + 0x8EA2, + 0x8EA3, + 0x8EB3, + 0x8EB4, + 0x8EB6, + 0x8EB8, + 0x8EC1, + 0x8EC2, + 0x8EC4, + 0x8EC5, + 0x8ED9, + 0x8EDA, + 0x8EF0, + 0x8EF1, + 0x8F0F, + 0x8F10, + 0x8F2D, + 0x8F2E, + 0x8F3A, + 0x8F3B, + 0x8F41, + 0x8F42, + 0x8F9D, + 0x8F9E, + 0x8FA4, + 0x8FA5, + 0x8FB3, + 0x8FB4, + 0x8FC3, + 0x8FC4, + 0x8FCA, + 0x8FCB, + 0x8FE7, + 0x8FE8, + 0x902A, + 0x902B, + 0x902C, + 0x902D, + 0x9037, + 0x9038, + 0x9040, + 0x9041, + 0x9046, + 0x9047, + 0x90AB, + 0x90AC, + 0x90CC, + 0x90CE, + 0x90D2, + 0x90D3, + 0x90F6, + 0x90F7, + 0x910A, + 0x910B, + 0x913C, + 0x913E, + 0x9159, + 0x915A, + 0x917B, + 0x917C, + 0x9195, + 0x9196, + 0x9198, + 0x9199, + 0x91A9, + 0x91AA, + 0x91BF, + 0x91C0, + 0x91C4, + 0x91C5, + 0x91E0, + 0x91E1, + 0x91EF, + 0x91F0, + 0x9213, + 0x9214, + 0x921F, + 0x9220, + 0x9222, + 0x9223, + 0x9243, + 0x9244, + 0x9269, + 0x926B, + 0x9281, + 0x9282, + 0x9284, + 0x9285, + 0x929E, + 0x929F, + 0x92BD, + 0x92BE, + 0x92D4, + 0x92D5, + 0x92DB, + 0x92DC, + 0x92E2, + 0x92E3, + 0x931C, + 0x931D, + 0x9330, + 0x9332, + 0x9362, + 0x9363, + 0x9368, + 0x9369, + 0x936B, + 0x936C, + 0x936F, + 0x9370, + 0x9373, + 0x9374, + 0x9378, + 0x9379, + 0x937F, + 0x9380, + 0x9381, + 0x9382, + 0x938B, + 0x938C, + 0x939C, + 0x939D, + 0x93A0, + 0x93A1, + 0x93AB, + 0x93AC, + 0x93BB, + 0x93BC, + 0x93E0, + 0x93E1, + 0x93F3, + 0x93F4, + 0x9402, + 0x9403, + 0x9417, + 0x9418, + 0x941C, + 0x941D, + 0x941E, + 0x9420, + 0x9424, + 0x9425, + 0x9443, + 0x9444, + 0x944E, + 0x944F, + 0x946C, + 0x946D, + 0x947B, + 0x947C, + 0x9578, + 0x957A, + 0x957E, + 0x957F, + 0x9585, + 0x9586, + 0x9597, + 0x9598, + 0x95B3, + 0x95B5, + 0x95B8, + 0x95B9, + 0x95C1, + 0x95C2, + 0x95D9, + 0x95DA, + 0x95DD, + 0x95DE, + 0x9625, + 0x9627, + 0x9629, + 0x962A, + 0x963E, + 0x963F, + 0x9656, + 0x9658, + 0x9679, + 0x967A, + 0x967B, + 0x967C, + 0x967F, + 0x9680, + 0x9681, + 0x9683, + 0x968C, + 0x968D, + 0x9696, + 0x9697, + 0x969A, + 0x969B, + 0x969D, + 0x969E, + 0x969F, + 0x96A0, + 0x96AB, + 0x96AC, + 0x96AF, + 0x96B0, + 0x96B5, + 0x96B6, + 0x96E4, + 0x96E5, + 0x96E6, + 0x96E8, + 0x96FC, + 0x96FD, + 0x9714, + 0x9715, + 0x9717, + 0x9718, + 0x971A, + 0x971C, + 0x9733, + 0x9735, + 0x9737, + 0x9738, + 0x9740, + 0x9742, + 0x974D, + 0x974E, + 0x9757, + 0x9758, + 0x9763, + 0x9764, + 0x9775, + 0x9776, + 0x9787, + 0x9788, + 0x9789, + 0x978A, + 0x979B, + 0x979C, + 0x97A9, + 0x97AA, + 0x97B0, + 0x97B2, + 0x97B5, + 0x97B6, + 0x97BE, + 0x97BF, + 0x97C0, + 0x97C1, + 0x97D2, + 0x97D3, + 0x97FC, + 0x97FD, + 0x981F, + 0x9820, + 0x9825, + 0x9826, + 0x982A, + 0x982B, + 0x9833, + 0x9834, + 0x983A, + 0x983B, + 0x983E, + 0x983F, + 0x9842, + 0x9843, + 0x9847, + 0x9848, + 0x9856, + 0x9857, + 0x9866, + 0x9867, + 0x9868, + 0x9869, + 0x98B7, + 0x98B8, + 0x98CA, + 0x98CB, + 0x98E4, + 0x98E5, + 0x98EC, + 0x98ED, + 0x98F1, + 0x98F2, + 0x98F8, + 0x98F9, + 0x98FB, + 0x98FC, + 0x9919, + 0x991A, + 0x993B, + 0x993C, + 0x9944, + 0x9945, + 0x995A, + 0x995B, + 0x995D, + 0x995E, + 0x99BF, + 0x99C0, + 0x99E0, + 0x99E1, + 0x99E6, + 0x99E7, + 0x99EB, + 0x99EC, + 0x99F5, + 0x99F6, + 0x9A10, + 0x9A11, + 0x9A17, + 0x9A19, + 0x9A3B, + 0x9A3C, + 0x9A51, + 0x9A52, + 0x9A58, + 0x9A59, + 0x9A5D, + 0x9A5E, + 0x9A63, + 0x9A64, + 0x9AA9, + 0x9AAA, + 0x9ABD, + 0x9ABE, + 0x9AC8, + 0x9AC9, + 0x9AD7, + 0x9AD8, + 0x9AE0, + 0x9AE1, + 0x9AE4, + 0x9AE5, + 0x9AE8, + 0x9AEA, + 0x9AF0, + 0x9AF1, + 0x9B00, + 0x9B01, + 0x9B02, + 0x9B03, + 0x9B09, + 0x9B0A, + 0x9B14, + 0x9B15, + 0x9B1B, + 0x9B1C, + 0x9B34, + 0x9B35, + 0x9B3D, + 0x9B3E, + 0x9B40, + 0x9B41, + 0x9B50, + 0x9B51, + 0x9B57, + 0x9B58, + 0x9B62, + 0x9B63, + 0x9B72, + 0x9B73, + 0x9B89, + 0x9B8A, + 0x9B8C, + 0x9B8D, + 0x9B99, + 0x9B9A, + 0x9BC2, + 0x9BC3, + 0x9BF6, + 0x9BF7, + 0x9C00, + 0x9C02, + 0x9C03, + 0x9C04, + 0x9C42, + 0x9C43, + 0x9C4F, + 0x9C50, + 0x9C51, + 0x9C52, + 0x9C61, + 0x9C62, + 0x9C64, + 0x9C65, + 0x9C7B, + 0x9C7C, + 0x9D0C, + 0x9D0E, + 0x9D11, + 0x9D12, + 0x9D27, + 0x9D28, + 0x9D35, + 0x9D36, + 0x9D3C, + 0x9D3D, + 0x9D6D, + 0x9D6E, + 0x9D95, + 0x9D96, + 0x9DAE, + 0x9DAF, + 0x9DBD, + 0x9DBE, + 0x9DC0, + 0x9DC1, + 0x9DEA, + 0x9DEB, + 0x9DFC, + 0x9DFD, + 0x9E0E, + 0x9E0F, + 0x9E16, + 0x9E17, + 0x9E1C, + 0x9E1D, + 0x9E7B, + 0x9E7C, + 0x9E8F, + 0x9E91, + 0x9E98, + 0x9E99, + 0x9E9E, + 0x9E9F, + 0x9EA2, + 0x9EA3, + 0x9EAB, + 0x9EAD, + 0x9EB1, + 0x9EB2, + 0x9EEC, + 0x9EED, + 0x9EF1, + 0x9EF2, + 0x9F03, + 0x9F04, + 0x9F11, + 0x9F12, + 0x9F14, + 0x9F15, + 0x9F26, + 0x9F27, + 0x9F45, + 0x9F46, + 0x9F53, + 0x9F54, + 0x9F6D, + 0x9F6E, + 0x9FA1, + 0x9FA2, + 0x9FA3, + 0x9FA4, + 0x9FA6, 0xA78D, 0xA78E, - 0xA792, - 0xA794, 0xA7AA, 0xA7AB, - 0xA7C0, - 0xA7CB, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, - 0xA7DA, - 0xA9E7, - 0xA9FF, - 0xAA60, - 0xAA77, - 0xAA7A, - 0xAA80, - 0xAB01, - 0xAB07, - 0xAB09, - 0xAB0F, - 0xAB11, - 0xAB17, - 0xAB20, - 0xAB27, - 0xAB28, - 0xAB2F, - 0xAB66, - 0xAB68, + 0xAA7B, + 0xAA7C, 0xAC00, 0xD7A4, - 0xFA0E, - 0xFA10, - 0xFA11, - 0xFA12, - 0xFA13, - 0xFA15, - 0xFA1F, - 0xFA20, - 0xFA21, - 0xFA22, - 0xFA23, - 0xFA25, - 0xFA27, - 0xFA2A, 0x11301, 0x11302, 0x11303, 0x11304, - 0x1133B, + 0x1133C, 0x1133D, - 0x16FF0, - 0x16FF2, - 0x1B11F, - 0x1B123, - 0x1B132, - 0x1B133, - 0x1B150, - 0x1B153, - 0x1B155, - 0x1B156, - 0x1B164, - 0x1B168, - 0x1DF00, - 0x1DF1F, - 0x1DF25, - 0x1DF2B, - 0x1E08F, - 0x1E090, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -279048,22 +294259,122 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x1E7EF, 0x1E7F0, 0x1E7FF, - 0x20000, - 0x2A6E0, - 0x2A700, - 0x2B73A, - 0x2B740, - 0x2B81E, - 0x2B820, - 0x2CEA2, - 0x2CEB0, - 0x2EBE1, - 0x2EBF0, - 0x2EE5E, - 0x30000, - 0x3134B, - 0x31350, - 0x323B0 + 0x2070E, + 0x2070F, + 0x20731, + 0x20732, + 0x20779, + 0x2077A, + 0x20C53, + 0x20C54, + 0x20C78, + 0x20C79, + 0x20C96, + 0x20C97, + 0x20CCF, + 0x20CD0, + 0x20CD5, + 0x20CD6, + 0x20D15, + 0x20D16, + 0x20D7C, + 0x20D7D, + 0x20D7F, + 0x20D80, + 0x20E0E, + 0x20E10, + 0x20E77, + 0x20E78, + 0x20E9D, + 0x20E9E, + 0x20EA2, + 0x20EA3, + 0x20ED7, + 0x20ED8, + 0x20EF9, + 0x20EFB, + 0x20F2D, + 0x20F2F, + 0x20F4C, + 0x20F4D, + 0x20FB4, + 0x20FB5, + 0x20FBC, + 0x20FBD, + 0x20FEA, + 0x20FEB, + 0x2105C, + 0x2105D, + 0x2106F, + 0x21070, + 0x21075, + 0x21077, + 0x2107B, + 0x2107C, + 0x210C1, + 0x210C2, + 0x210C9, + 0x210CA, + 0x211D9, + 0x211DA, + 0x220C7, + 0x220C8, + 0x227B5, + 0x227B6, + 0x22AD5, + 0x22AD6, + 0x22B43, + 0x22B44, + 0x22BCA, + 0x22BCB, + 0x22C51, + 0x22C52, + 0x22C55, + 0x22C56, + 0x22CC2, + 0x22CC3, + 0x22D08, + 0x22D09, + 0x22D4C, + 0x22D4D, + 0x22D67, + 0x22D68, + 0x22EB3, + 0x22EB4, + 0x23CB7, + 0x23CB8, + 0x244D3, + 0x244D4, + 0x24DB8, + 0x24DB9, + 0x24DEA, + 0x24DEB, + 0x2512B, + 0x2512C, + 0x26258, + 0x26259, + 0x267CC, + 0x267CD, + 0x269F2, + 0x269F3, + 0x269FA, + 0x269FB, + 0x27A3E, + 0x27A3F, + 0x2815D, + 0x2815E, + 0x28207, + 0x28208, + 0x282E2, + 0x282E3, + 0x28CCA, + 0x28CCB, + 0x28CCD, + 0x28CCE, + 0x28CD2, + 0x28CD3, + 0x29D98, + 0x29D99 }; # endif /* ASCII/Latin1 */ @@ -279074,7 +294385,7 @@ static const UV UNI_IDENTIFIERSTATUS__RE && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_IDENTIFIERSTATUS__RESTRICTED_invlist[] = { /* for EBCDIC 1047 */ - 817, /* Number of elements */ + 3259, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -279132,67 +294443,97 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xFB, 0xFF, 0x100, + 0x114, + 0x116, + 0x12C, + 0x12E, 0x132, 0x134, + 0x138, + 0x139, 0x13F, 0x141, 0x149, 0x14A, + 0x14E, + 0x150, + 0x156, + 0x158, + 0x162, + 0x164, 0x17F, - 0x18F, - 0x190, + 0x181, + 0x182, + 0x186, + 0x187, + 0x189, + 0x18B, + 0x18E, + 0x193, + 0x194, + 0x195, + 0x196, + 0x19A, + 0x19D, + 0x19E, 0x1A0, 0x1A2, 0x1AF, 0x1B1, + 0x1B2, + 0x1B5, + 0x1B7, + 0x1B8, 0x1CD, + 0x1D5, 0x1DD, 0x1DE, - 0x1E4, 0x1E6, - 0x1F1, - 0x1F4, - 0x1F6, + 0x1EA, + 0x1EE, + 0x1F0, 0x1F8, + 0x1FA, + 0x218, 0x21C, - 0x21E, - 0x220, - 0x226, - 0x234, + 0x244, + 0x245, + 0x24C, + 0x24E, + 0x253, + 0x255, + 0x256, + 0x258, 0x259, 0x25A, + 0x25B, + 0x25C, + 0x263, + 0x264, + 0x268, + 0x26A, + 0x272, + 0x273, + 0x289, + 0x28A, + 0x28B, + 0x28C, + 0x292, + 0x293, 0x2BB, 0x2BD, - 0x2EC, - 0x2ED, 0x300, 0x305, 0x306, 0x30D, - 0x30F, - 0x312, - 0x313, - 0x315, 0x31B, 0x31C, 0x323, + 0x324, + 0x326, 0x329, - 0x32D, - 0x32F, - 0x330, + 0x331, 0x332, - 0x335, - 0x336, - 0x338, - 0x33A, - 0x342, - 0x343, - 0x345, - 0x346, - 0x375, - 0x376, - 0x37B, - 0x37E, 0x386, 0x387, 0x388, @@ -279203,80 +294544,140 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x3A2, 0x3A3, 0x3CF, - 0x3FC, + 0x401, + 0x40D, + 0x40E, + 0x450, + 0x451, + 0x45D, + 0x45E, 0x460, - 0x48A, - 0x500, - 0x510, - 0x52A, - 0x52E, - 0x530, + 0x490, + 0x49C, + 0x49E, + 0x4A6, + 0x4A8, + 0x4B8, + 0x4BA, + 0x4C1, + 0x4CF, + 0x4DA, + 0x4DC, + 0x4EA, + 0x4EE, + 0x4F6, + 0x4F8, + 0x4FA, + 0x524, + 0x526, 0x531, 0x557, - 0x559, - 0x55A, 0x561, 0x587, 0x58A, 0x58B, - 0x5B4, - 0x5B5, 0x5D0, 0x5EB, - 0x5EF, + 0x5F3, 0x5F5, 0x620, - 0x640, + 0x63B, + 0x63D, + 0x63E, 0x641, + 0x653, + 0x654, 0x656, 0x660, 0x66A, 0x670, + 0x671, + 0x672, 0x673, 0x674, 0x675, 0x679, - 0x68E, - 0x68F, + 0x690, + 0x691, + 0x69B, + 0x69F, 0x6A1, 0x6A2, + 0x6A3, + 0x6A4, + 0x6AC, + 0x6AD, + 0x6B2, + 0x6B3, + 0x6B4, + 0x6B5, + 0x6B8, + 0x6BA, + 0x6BF, + 0x6C0, 0x6D4, 0x6D5, 0x6D6, - 0x6E5, - 0x6E7, 0x6EE, + 0x6FA, + 0x6FD, 0x700, - 0x750, + 0x751, + 0x753, + 0x756, + 0x757, + 0x760, + 0x761, + 0x762, + 0x764, + 0x766, + 0x769, + 0x76A, + 0x76B, + 0x76E, + 0x772, + 0x780, 0x7B2, - 0x870, - 0x888, - 0x889, 0x88F, + 0x890, 0x8A0, - 0x8AD, - 0x8B2, - 0x8B3, - 0x8B5, - 0x8CA, + 0x8A1, + 0x8A2, + 0x8AA, + 0x8BB, + 0x8C3, + 0x8C7, + 0x8C8, 0x901, + 0x904, + 0x905, + 0x90C, + 0x90D, + 0x929, + 0x92A, + 0x934, + 0x935, + 0x93D, + 0x93E, + 0x944, + 0x945, 0x94E, 0x94F, - 0x951, + 0x950, 0x956, 0x958, - 0x960, - 0x964, 0x966, 0x970, - 0x971, + 0x972, 0x978, - 0x979, + 0x97B, + 0x97D, + 0x97E, 0x980, 0x981, 0x984, 0x985, - 0x98D, + 0x98C, 0x98F, 0x991, 0x993, @@ -279288,21 +294689,17 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x9B6, 0x9BA, 0x9BC, + 0x9BD, + 0x9BE, 0x9C5, 0x9C7, 0x9C9, 0x9CB, 0x9CF, - 0x9D7, - 0x9D8, - 0x9E0, - 0x9E4, 0x9E6, 0x9F2, - 0x9FE, - 0x9FF, - 0xA01, - 0xA04, + 0xA02, + 0xA03, 0xA05, 0xA0B, 0xA0F, @@ -279327,9 +294724,9 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xA4E, 0xA5C, 0xA5D, - 0xA66, - 0xA75, - 0xA81, + 0xA70, + 0xA72, + 0xA82, 0xA84, 0xA85, 0xA8E, @@ -279344,23 +294741,19 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xAB5, 0xABA, 0xABC, + 0xABD, + 0xABE, 0xAC6, 0xAC7, 0xACA, 0xACB, 0xACE, - 0xAD0, - 0xAD1, - 0xAE0, - 0xAE4, 0xAE6, 0xAF0, - 0xAFA, - 0xB00, 0xB01, 0xB04, 0xB05, - 0xB0D, + 0xB0C, 0xB0F, 0xB11, 0xB13, @@ -279369,23 +294762,23 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xB31, 0xB32, 0xB34, - 0xB35, + 0xB36, 0xB3A, 0xB3C, + 0xB3D, + 0xB3E, 0xB44, 0xB47, 0xB49, 0xB4B, 0xB4E, - 0xB55, - 0xB58, + 0xB56, + 0xB57, 0xB5F, - 0xB62, - 0xB66, - 0xB70, + 0xB60, 0xB71, 0xB72, - 0xB82, + 0xB83, 0xB84, 0xB85, 0xB8B, @@ -279411,99 +294804,79 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xBC9, 0xBCA, 0xBCE, - 0xBD0, - 0xBD1, - 0xBD7, - 0xBD8, - 0xBE6, - 0xBF0, - 0xC01, - 0xC0D, + 0xC02, + 0xC04, + 0xC05, + 0xC0C, 0xC0E, 0xC11, 0xC12, 0xC29, 0xC2A, + 0xC31, + 0xC32, 0xC34, 0xC35, 0xC3A, - 0xC3C, + 0xC3E, 0xC45, 0xC46, 0xC49, 0xC4A, 0xC4E, - 0xC55, - 0xC57, - 0xC5D, - 0xC5E, - 0xC60, - 0xC62, - 0xC66, - 0xC70, - 0xC80, - 0xC81, 0xC82, 0xC84, 0xC85, - 0xC8D, + 0xC8C, 0xC8E, 0xC91, 0xC92, 0xCA9, 0xCAA, + 0xCB1, + 0xCB2, 0xCB4, 0xCB5, 0xCBA, - 0xCBC, - 0xCC5, + 0xCBE, + 0xCC4, 0xCC6, 0xCC9, 0xCCA, 0xCCE, - 0xCD5, - 0xCD7, - 0xCDD, - 0xCDE, - 0xCE0, - 0xCE4, 0xCE6, 0xCF0, - 0xCF1, - 0xCF4, - 0xD00, - 0xD01, 0xD02, 0xD04, 0xD05, - 0xD0D, + 0xD0C, 0xD0E, 0xD11, 0xD12, - 0xD3B, - 0xD3D, + 0xD29, + 0xD2A, + 0xD3A, + 0xD3E, 0xD44, 0xD46, 0xD49, 0xD4A, - 0xD4F, - 0xD54, + 0xD4C, + 0xD4D, + 0xD4E, + 0xD57, 0xD58, - 0xD60, - 0xD62, - 0xD66, - 0xD70, 0xD7A, 0xD80, 0xD82, 0xD84, 0xD85, - 0xD8F, + 0xD8E, 0xD91, 0xD97, 0xD9A, - 0xDA6, - 0xDA7, + 0xD9E, + 0xD9F, 0xDB2, 0xDB3, 0xDBC, @@ -279526,44 +294899,52 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xE34, 0xE3B, 0xE40, - 0xE4F, + 0xE4E, 0xE50, 0xE5A, 0xE81, 0xE83, 0xE84, 0xE85, - 0xE86, + 0xE87, + 0xE89, + 0xE8A, 0xE8B, - 0xE8C, + 0xE8D, + 0xE8E, + 0xE94, + 0xE98, + 0xE99, + 0xEA0, + 0xEA1, 0xEA4, 0xEA5, 0xEA6, 0xEA7, + 0xEA8, + 0xEAA, + 0xEAC, + 0xEAD, + 0xEAF, + 0xEB0, 0xEB3, 0xEB4, + 0xEBA, + 0xEBB, 0xEBE, 0xEC0, 0xEC5, 0xEC6, 0xEC7, 0xEC8, - 0xECF, + 0xECE, 0xED0, 0xEDA, - 0xEDE, - 0xEE0, - 0xF00, - 0xF01, 0xF0B, 0xF0C, 0xF20, 0xF2A, - 0xF35, - 0xF36, - 0xF37, - 0xF38, - 0xF3E, + 0xF40, 0xF43, 0xF44, 0xF48, @@ -279577,17 +294958,15 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xF5C, 0xF5D, 0xF69, - 0xF6A, - 0xF6D, 0xF71, 0xF73, 0xF74, 0xF75, 0xF7A, 0xF81, - 0xF82, + 0xF84, 0xF85, - 0xF86, + 0xF90, 0xF93, 0xF94, 0xF98, @@ -279600,26 +294979,28 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xFA8, 0xFAC, 0xFAD, + 0xFAE, + 0xFB1, 0xFB9, 0xFBA, 0xFBD, - 0xFC6, - 0xFC7, 0x1000, 0x104A, - 0x1050, - 0x109E, + 0x105A, + 0x1065, + 0x1075, + 0x108B, + 0x108F, + 0x1090, 0x10C7, 0x10C8, 0x10CD, 0x10CE, 0x10D0, 0x10F1, - 0x10F7, - 0x10FB, - 0x10FD, - 0x1100, 0x1200, + 0x1207, + 0x1208, 0x1249, 0x124A, 0x124E, @@ -279630,10 +295011,14 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x125A, 0x125E, 0x1260, + 0x1287, + 0x1288, 0x1289, 0x128A, 0x128E, 0x1290, + 0x12AF, + 0x12B0, 0x12B1, 0x12B2, 0x12B6, @@ -279646,20 +295031,26 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x12C8, 0x12D7, 0x12D8, + 0x12F8, + 0x1300, + 0x130F, + 0x1310, 0x1311, 0x1312, 0x1316, 0x1318, - 0x135B, - 0x135D, - 0x1360, - 0x1380, - 0x1390, + 0x131F, + 0x1320, + 0x1347, + 0x1348, + 0x135A, 0x1780, + 0x179D, + 0x179F, 0x17A3, 0x17A5, 0x17A8, - 0x17A9, + 0x17AA, 0x17B4, 0x17B6, 0x17CE, @@ -279667,210 +295058,2472 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x17D1, 0x17D2, 0x17D3, - 0x17D7, - 0x17D8, - 0x17DC, - 0x17DD, 0x17E0, 0x17EA, 0x1C90, 0x1CBB, 0x1CBD, 0x1CC0, - 0x1E00, - 0x1E9A, + 0x1E0C, + 0x1E0E, + 0x1E12, + 0x1E14, + 0x1E20, + 0x1E22, + 0x1E24, + 0x1E26, + 0x1E36, + 0x1E38, + 0x1E3C, + 0x1E40, + 0x1E42, + 0x1E4C, + 0x1E5A, + 0x1E5C, + 0x1E62, + 0x1E64, + 0x1E6C, + 0x1E6E, + 0x1E70, + 0x1E72, + 0x1E8C, + 0x1E8E, + 0x1E92, + 0x1E94, 0x1E9E, 0x1E9F, 0x1EA0, 0x1EFA, - 0x1F00, - 0x1F16, - 0x1F18, - 0x1F1E, - 0x1F20, - 0x1F46, - 0x1F48, - 0x1F4E, - 0x1F50, - 0x1F58, - 0x1F59, - 0x1F5A, - 0x1F5B, - 0x1F5C, - 0x1F5D, - 0x1F5E, - 0x1F5F, - 0x1F71, - 0x1F72, - 0x1F73, - 0x1F74, - 0x1F75, - 0x1F76, - 0x1F77, - 0x1F78, - 0x1F79, - 0x1F7A, - 0x1F7B, - 0x1F7C, - 0x1F7D, - 0x1F80, + 0x1FA0, + 0x1FB0, + 0x1FB2, 0x1FB5, - 0x1FB6, - 0x1FBB, - 0x1FBC, - 0x1FBD, - 0x1FC2, - 0x1FC5, - 0x1FC6, - 0x1FC9, - 0x1FCA, - 0x1FCB, - 0x1FCC, - 0x1FCD, - 0x1FD0, - 0x1FD3, - 0x1FD6, - 0x1FDB, - 0x1FE0, - 0x1FE3, - 0x1FE4, - 0x1FEB, 0x1FEC, 0x1FED, - 0x1FF2, - 0x1FF5, - 0x1FF6, - 0x1FF9, - 0x1FFA, - 0x1FFB, - 0x1FFC, - 0x1FFD, 0x2010, 0x2011, 0x2019, 0x201A, 0x2027, 0x2028, - 0x2D27, - 0x2D28, - 0x2D2D, - 0x2D2E, - 0x2D80, - 0x2D97, - 0x2DA0, - 0x2DA7, - 0x2DA8, - 0x2DAF, - 0x2DB0, - 0x2DB7, - 0x2DB8, - 0x2DBF, - 0x2DC0, - 0x2DC7, - 0x2DC8, - 0x2DCF, - 0x2DD0, - 0x2DD7, - 0x2DD8, - 0x2DDF, 0x3005, 0x3008, 0x3041, 0x3097, - 0x3099, - 0x309B, 0x309D, 0x309F, 0x30A0, 0x30FF, - 0x3105, - 0x312E, - 0x312F, - 0x3130, - 0x31A0, - 0x31C0, - 0x3400, - 0x4DC0, + 0x3447, + 0x3448, + 0x3473, + 0x3474, + 0x34E4, + 0x34E5, + 0x3577, + 0x3578, + 0x359E, + 0x359F, + 0x35A1, + 0x35A2, + 0x35AD, + 0x35AE, + 0x35BF, + 0x35C0, + 0x35CE, + 0x35CF, + 0x35F3, + 0x35F4, + 0x35FE, + 0x35FF, + 0x360E, + 0x360F, + 0x361A, + 0x361B, + 0x3918, + 0x3919, + 0x3960, + 0x3961, + 0x396E, + 0x396F, + 0x39CF, + 0x39D1, + 0x39DB, + 0x39DC, + 0x39DF, + 0x39E0, + 0x39F8, + 0x39F9, + 0x39FE, + 0x39FF, + 0x3A18, + 0x3A19, + 0x3A52, + 0x3A53, + 0x3A5C, + 0x3A5D, + 0x3A67, + 0x3A68, + 0x3A73, + 0x3A74, + 0x3B39, + 0x3B3A, + 0x3B4E, + 0x3B4F, + 0x3BA3, + 0x3BA4, + 0x3C6E, + 0x3C6F, + 0x3CE0, + 0x3CE1, + 0x3DE7, + 0x3DE8, + 0x3DEB, + 0x3DEC, + 0x3E74, + 0x3E75, + 0x3ED0, + 0x3ED1, + 0x4056, + 0x4057, + 0x4065, + 0x4066, + 0x406A, + 0x406B, + 0x40BB, + 0x40BC, + 0x40DF, + 0x40E0, + 0x4137, + 0x4138, + 0x415F, + 0x4160, + 0x4337, + 0x4338, + 0x43AC, + 0x43AD, + 0x43B1, + 0x43B2, + 0x43D3, + 0x43D4, + 0x43DD, + 0x43DE, + 0x4443, + 0x4444, + 0x44D6, + 0x44D7, + 0x44EA, + 0x44EB, + 0x4606, + 0x4607, + 0x464C, + 0x464D, + 0x4661, + 0x4662, + 0x4723, + 0x4724, + 0x4729, + 0x472A, + 0x477C, + 0x477D, + 0x478D, + 0x478E, + 0x47F4, + 0x47F5, + 0x4882, + 0x4883, + 0x4947, + 0x4948, + 0x497A, + 0x497B, + 0x497D, + 0x497E, + 0x4982, + 0x4984, + 0x4985, + 0x4987, + 0x499B, + 0x499C, + 0x499F, + 0x49A0, + 0x49B6, + 0x49B8, + 0x4A12, + 0x4A13, + 0x4AB8, + 0x4AB9, + 0x4C77, + 0x4C78, + 0x4C7D, + 0x4C7E, + 0x4C81, + 0x4C82, + 0x4C85, + 0x4C86, + 0x4C9D, + 0x4CA4, + 0x4D13, + 0x4D1A, + 0x4DAE, + 0x4DAF, 0x4E00, - 0xA000, - 0xA67F, - 0xA680, - 0xA717, - 0xA720, - 0xA788, - 0xA789, + 0x4E12, + 0x4E13, + 0x4E29, + 0x4E2A, + 0x4E68, + 0x4E69, + 0x4E79, + 0x4E7A, + 0x4E96, + 0x4E97, + 0x4EA3, + 0x4EA4, + 0x4EBC, + 0x4EBD, + 0x4ECC, + 0x4ECD, + 0x4EE7, + 0x4EE8, + 0x4EF8, + 0x4EFB, + 0x4EFC, + 0x4EFD, + 0x4EFE, + 0x4EFF, + 0x4F07, + 0x4F08, + 0x4F16, + 0x4F17, + 0x4F28, + 0x4F29, + 0x4F31, + 0x4F32, + 0x4F35, + 0x4F36, + 0x4F37, + 0x4F38, + 0x4F40, + 0x4F41, + 0x4F44, + 0x4F45, + 0x4F71, + 0x4F72, + 0x4F8C, + 0x4F8D, + 0x4F8E, + 0x4F8F, + 0x4FA2, + 0x4FA3, + 0x4FBD, + 0x4FBE, + 0x4FC6, + 0x4FC7, + 0x4FC8, + 0x4FC9, + 0x4FCC, + 0x4FCD, + 0x4FE2, + 0x4FE3, + 0x4FFC, + 0x4FFE, + 0x5010, + 0x5011, + 0x5034, + 0x5035, + 0x5038, + 0x5039, + 0x503D, + 0x503E, + 0x5042, + 0x5043, + 0x5052, + 0x5053, + 0x5058, + 0x5059, + 0x507C, + 0x507D, + 0x5081, + 0x5082, + 0x5093, + 0x5094, + 0x5097, + 0x5098, + 0x509F, + 0x50A2, + 0x50B9, + 0x50BA, + 0x50C3, + 0x50C4, + 0x50D8, + 0x50D9, + 0x50DF, + 0x50E0, + 0x50E1, + 0x50E3, + 0x50EB, + 0x50EC, + 0x50F4, + 0x50F5, + 0x50F7, + 0x50F8, + 0x511B, + 0x511C, + 0x5128, + 0x5129, + 0x512B, + 0x512C, + 0x5142, + 0x5143, + 0x514A, + 0x514B, + 0x514F, + 0x5150, + 0x5153, + 0x5154, + 0x5158, + 0x5159, + 0x5160, + 0x5161, + 0x5164, + 0x5165, + 0x5172, + 0x5173, + 0x517E, + 0x517F, + 0x5183, + 0x5185, + 0x518E, + 0x518F, + 0x51A1, + 0x51A2, + 0x51A3, + 0x51A4, + 0x51AD, + 0x51AE, + 0x51B8, + 0x51B9, + 0x51BA, + 0x51BB, + 0x51C2, + 0x51C3, + 0x51D2, + 0x51D4, + 0x51DF, + 0x51E0, + 0x51EC, + 0x51ED, + 0x51EE, + 0x51EF, + 0x51F2, + 0x51F3, + 0x5253, + 0x5254, + 0x5266, + 0x5267, + 0x5279, + 0x527A, + 0x5285, + 0x5286, + 0x528E, + 0x528F, + 0x52C4, + 0x52C5, + 0x52C8, + 0x52C9, + 0x52CC, + 0x52CD, + 0x52CE, + 0x52CF, + 0x52D1, + 0x52D2, + 0x52D4, + 0x52D5, + 0x52E1, + 0x52E2, + 0x52E5, + 0x52E6, + 0x52EE, + 0x52EF, + 0x5303, + 0x5305, + 0x5318, + 0x5319, + 0x531B, + 0x531C, + 0x531E, + 0x531F, + 0x5327, + 0x5328, + 0x5329, + 0x532A, + 0x5332, + 0x5333, + 0x5335, + 0x5337, + 0x5342, + 0x5343, + 0x535B, + 0x535C, + 0x535D, + 0x535E, + 0x536A, + 0x536B, + 0x536D, + 0x536E, + 0x5380, + 0x5381, + 0x53A1, + 0x53A2, + 0x53AA, + 0x53AC, + 0x53AF, + 0x53B0, + 0x53BA, + 0x53BB, + 0x53C5, + 0x53C6, + 0x53CF, + 0x53D0, + 0x53DD, + 0x53DF, + 0x53E7, + 0x53E8, + 0x53FF, + 0x5401, + 0x541A, + 0x541B, + 0x5422, + 0x5423, + 0x544C, + 0x544D, + 0x545D, + 0x545E, + 0x5469, + 0x546A, + 0x548A, + 0x548B, + 0x54B5, + 0x54B6, + 0x54F6, + 0x54F7, + 0x5515, + 0x5516, + 0x5518, + 0x551A, + 0x5547, + 0x5548, + 0x5560, + 0x5561, + 0x557A, + 0x557B, + 0x55E0, + 0x55E1, + 0x55F8, + 0x55F9, + 0x560A, + 0x560C, + 0x5620, + 0x5621, + 0x562B, + 0x562C, + 0x5637, + 0x5638, + 0x563C, + 0x563D, + 0x5644, + 0x5645, + 0x564B, + 0x564C, + 0x5651, + 0x5652, + 0x5656, + 0x5657, + 0x565F, + 0x5660, + 0x5661, + 0x5662, + 0x5675, + 0x5676, + 0x567D, + 0x567E, + 0x5688, + 0x5689, + 0x568B, + 0x568C, + 0x5696, + 0x5697, + 0x569E, + 0x569F, + 0x56BA, + 0x56BB, + 0x56CF, + 0x56D0, + 0x56D9, + 0x56DA, + 0x56E6, + 0x56E7, + 0x56F6, + 0x56F7, + 0x56F8, + 0x56F9, + 0x56FB, + 0x56FD, + 0x5705, + 0x5706, + 0x5711, + 0x5712, + 0x5717, + 0x5718, + 0x5721, + 0x5722, + 0x5724, + 0x5725, + 0x573D, + 0x573E, + 0x5743, + 0x5744, + 0x5748, + 0x5749, + 0x5755, + 0x5757, + 0x5758, + 0x5759, + 0x5763, + 0x5764, + 0x5778, + 0x5779, + 0x5781, + 0x5782, + 0x5787, + 0x5788, + 0x5796, + 0x5797, + 0x57A8, + 0x57A9, + 0x57CA, + 0x57CB, + 0x57D1, + 0x57D2, + 0x57DB, + 0x57DC, + 0x5817, + 0x5819, + 0x5850, + 0x5851, + 0x5856, + 0x5857, + 0x5860, + 0x5861, + 0x5866, + 0x5868, + 0x5877, + 0x5878, + 0x5895, + 0x5896, + 0x58AA, + 0x58AB, + 0x58B6, + 0x58B7, + 0x58C0, + 0x58C1, + 0x58C3, + 0x58C5, + 0x58CD, + 0x58CE, + 0x58D0, + 0x58D1, + 0x58E1, + 0x58E2, + 0x58E6, + 0x58E7, + 0x58F5, + 0x58F6, + 0x5901, + 0x5902, + 0x5905, + 0x5906, + 0x5908, + 0x5909, + 0x5911, + 0x5912, + 0x5913, + 0x5914, + 0x5923, + 0x5924, + 0x5933, + 0x5934, + 0x5936, + 0x5937, + 0x5959, + 0x595A, + 0x595B, + 0x595C, + 0x59B7, + 0x59B8, + 0x59E7, + 0x59E8, + 0x5A24, + 0x5A25, + 0x5A26, + 0x5A27, + 0x5A2C, + 0x5A2D, + 0x5A30, + 0x5A31, + 0x5A54, + 0x5A55, + 0x5A59, + 0x5A5A, + 0x5A6F, + 0x5A70, + 0x5A71, + 0x5A72, + 0x5A87, + 0x5A88, + 0x5A8D, + 0x5A8E, + 0x5AAB, + 0x5AAC, + 0x5AD3, + 0x5AD4, + 0x5AEF, + 0x5AF1, + 0x5B0A, + 0x5B0B, + 0x5B0D, + 0x5B0E, + 0x5B39, + 0x5B3A, + 0x5B46, + 0x5B47, + 0x5B4F, + 0x5B50, + 0x5B52, + 0x5B53, + 0x5B60, + 0x5B62, + 0x5B6F, + 0x5B70, + 0x5B79, + 0x5B7A, + 0x5B7E, + 0x5B7F, + 0x5B86, + 0x5B87, + 0x5B90, + 0x5B91, + 0x5BA9, + 0x5BAA, + 0x5BB2, + 0x5BB3, + 0x5BB7, + 0x5BB8, + 0x5BBC, + 0x5BBD, + 0x5BC8, + 0x5BC9, + 0x5BDA, + 0x5BDB, + 0x5C00, + 0x5C01, + 0x5C1B, + 0x5C1C, + 0x5C23, + 0x5C24, + 0x5C26, + 0x5C27, + 0x5C29, + 0x5C2A, + 0x5C36, + 0x5C37, + 0x5C5A, + 0x5C5B, + 0x5C85, + 0x5C86, + 0x5CB4, + 0x5CB5, + 0x5CB9, + 0x5CBA, + 0x5CD5, + 0x5CD6, + 0x5CDD, + 0x5CDE, + 0x5CF5, + 0x5CF6, + 0x5D2B, + 0x5D2C, + 0x5D2F, + 0x5D30, + 0x5D3B, + 0x5D3C, + 0x5D53, + 0x5D54, + 0x5D57, + 0x5D58, + 0x5D60, + 0x5D61, + 0x5D83, + 0x5D84, + 0x5D96, + 0x5D97, + 0x5DA3, + 0x5DA5, + 0x5DAB, + 0x5DAC, + 0x5DB3, + 0x5DB4, + 0x5DB9, + 0x5DBA, + 0x5DC4, + 0x5DC5, + 0x5DD7, + 0x5DD8, + 0x5DDA, + 0x5DDB, + 0x5DDC, + 0x5DDD, + 0x5DF6, + 0x5DF7, + 0x5E12, + 0x5E13, + 0x5E48, + 0x5E49, + 0x5E51, + 0x5E52, + 0x5E92, + 0x5E93, + 0x5EBA, + 0x5EBB, + 0x5EC0, + 0x5EC1, + 0x5EEB, + 0x5EEC, + 0x5EF9, + 0x5EFA, + 0x5F0E, + 0x5F0F, + 0x5F3B, + 0x5F3C, + 0x5F3D, + 0x5F3E, + 0x5F8F, + 0x5F90, + 0x5F9A, + 0x5F9B, + 0x5FA3, + 0x5FA5, + 0x5FB0, + 0x5FB1, + 0x5FC2, + 0x5FC3, + 0x5FCE, + 0x5FCF, + 0x5FDB, + 0x5FDC, + 0x5FE2, + 0x5FE3, + 0x5FEC, + 0x5FED, + 0x5FFC, + 0x5FFD, + 0x6023, + 0x6024, + 0x6056, + 0x6057, + 0x6061, + 0x6062, + 0x6071, + 0x6072, + 0x6074, + 0x6075, + 0x6091, + 0x6092, + 0x6093, + 0x6094, + 0x60A5, + 0x60A6, + 0x60D2, + 0x60D3, + 0x60D6, + 0x60D7, + 0x60DE, + 0x60DF, + 0x60E5, + 0x60E6, + 0x60FD, + 0x60FE, + 0x6102, + 0x6103, + 0x6107, + 0x6108, + 0x6111, + 0x6112, + 0x611E, + 0x611F, + 0x6131, + 0x6132, + 0x6133, + 0x6134, + 0x6135, + 0x6136, + 0x6138, + 0x613A, + 0x6160, + 0x6161, + 0x617B, + 0x617C, + 0x617F, + 0x6180, + 0x6186, + 0x6187, + 0x6197, + 0x6198, + 0x619C, + 0x619D, + 0x61B9, + 0x61BA, + 0x61BB, + 0x61BC, + 0x61D3, + 0x61D4, + 0x61D5, + 0x61D6, + 0x61EC, + 0x61ED, + 0x61EF, + 0x61F0, + 0x6205, + 0x6206, + 0x6235, + 0x6236, + 0x6239, + 0x623A, + 0x6257, + 0x6258, + 0x628D, + 0x628E, + 0x629D, + 0x629E, + 0x62DE, + 0x62DF, + 0x62EA, + 0x62EB, + 0x630A, + 0x630B, + 0x6317, + 0x6318, + 0x6331, + 0x6332, + 0x6337, + 0x6338, + 0x635B, + 0x635C, + 0x638B, + 0x638C, + 0x6393, + 0x6394, + 0x63D1, + 0x63D2, + 0x643B, + 0x643D, + 0x6449, + 0x644A, + 0x645A, + 0x645B, + 0x647E, + 0x647F, + 0x6486, + 0x6487, + 0x64A1, + 0x64A2, + 0x64AF, + 0x64B0, + 0x64B6, + 0x64B7, + 0x64C8, + 0x64C9, + 0x64D5, + 0x64D6, + 0x64EE, + 0x64EF, + 0x64F5, + 0x64F6, + 0x64F9, + 0x64FA, + 0x6502, + 0x6503, + 0x650A, + 0x650B, + 0x651F, + 0x6520, + 0x6528, + 0x6529, + 0x6540, + 0x6541, + 0x6542, + 0x6543, + 0x655A, + 0x655B, + 0x655F, + 0x6560, + 0x657D, + 0x657E, + 0x658A, + 0x658B, + 0x659A, + 0x659B, + 0x65B5, + 0x65B6, + 0x65BE, + 0x65BF, + 0x65C8, + 0x65CA, + 0x65D1, + 0x65D2, + 0x65D8, + 0x65D9, + 0x65DC, + 0x65DD, + 0x65E4, + 0x65E5, + 0x65EA, + 0x65EB, + 0x65F9, + 0x65FA, + 0x65FE, + 0x65FF, + 0x6617, + 0x6618, + 0x662C, + 0x662D, + 0x6637, + 0x6639, + 0x6648, + 0x6649, + 0x664D, + 0x664E, + 0x6660, + 0x6661, + 0x6663, + 0x6664, + 0x6692, + 0x6693, + 0x669C, + 0x669D, + 0x669E, + 0x669F, + 0x66AC, + 0x66AE, + 0x66D0, + 0x66D1, + 0x66D3, + 0x66D4, + 0x66D7, + 0x66D8, + 0x66DF, + 0x66E0, + 0x66EF, + 0x66F0, + 0x6702, + 0x6703, + 0x6707, + 0x6708, + 0x6719, + 0x671A, + 0x6724, + 0x6725, + 0x6729, + 0x672A, + 0x6767, + 0x6768, + 0x6788, + 0x6789, + 0x6796, + 0x6797, + 0x67BD, + 0x67BE, + 0x67BF, + 0x67C0, + 0x67D5, + 0x67D6, + 0x67D7, + 0x67D8, + 0x67F9, + 0x67FA, + 0x6801, + 0x6802, + 0x6815, + 0x6816, + 0x6827, + 0x6828, + 0x6830, + 0x6831, + 0x6858, + 0x6859, + 0x685A, + 0x685B, + 0x685E, + 0x685F, + 0x687A, + 0x687B, + 0x6895, + 0x6896, + 0x6899, + 0x689A, + 0x68A5, + 0x68A6, + 0x68B8, + 0x68B9, + 0x68C3, + 0x68C4, + 0x68D9, + 0x68DA, + 0x68E2, + 0x68E3, + 0x68E5, + 0x68E6, + 0x6909, + 0x690A, + 0x693E, + 0x693F, + 0x694D, + 0x694E, + 0x699F, + 0x69A0, + 0x69A2, + 0x69A3, + 0x69C0, + 0x69C1, + 0x69D1, + 0x69D3, + 0x69D5, + 0x69D8, + 0x6A03, + 0x6A04, + 0x6A1C, + 0x6A1D, + 0x6A24, + 0x6A25, + 0x6A37, + 0x6A38, + 0x6A4A, + 0x6A4B, + 0x6A5C, + 0x6A5D, + 0x6A6E, + 0x6A6F, + 0x6A70, + 0x6A71, + 0x6A86, + 0x6A87, + 0x6A8A, + 0x6A8B, + 0x6A8F, + 0x6A90, + 0x6A99, + 0x6A9A, + 0x6A9D, + 0x6A9E, + 0x6AB1, + 0x6AB2, + 0x6ABE, + 0x6ABF, + 0x6AC0, + 0x6AC1, + 0x6AC4, + 0x6AC5, + 0x6AC9, + 0x6ACA, + 0x6AD8, + 0x6AD9, + 0x6AE9, + 0x6AEA, + 0x6B0E, + 0x6B0F, + 0x6B1B, + 0x6B1C, + 0x6B2E, + 0x6B2F, + 0x6B35, + 0x6B36, + 0x6B40, + 0x6B41, + 0x6B57, + 0x6B59, + 0x6B5D, + 0x6B5E, + 0x6B68, + 0x6B69, + 0x6B6C, + 0x6B6D, + 0x6B6E, + 0x6B6F, + 0x6B71, + 0x6B72, + 0x6B75, + 0x6B76, + 0x6B7D, + 0x6B7E, + 0x6BB8, + 0x6BB9, + 0x6BE9, + 0x6BEA, + 0x6BF1, + 0x6BF2, + 0x6BF4, + 0x6BF5, + 0x6BFA, + 0x6BFB, + 0x6C0A, + 0x6C0B, + 0x6C1C, + 0x6C1D, + 0x6C2D, + 0x6C2E, + 0x6C3C, + 0x6C3D, + 0x6C45, + 0x6C46, + 0x6C6C, + 0x6C6D, + 0x6C6E, + 0x6C6F, + 0x6CA0, + 0x6CA1, + 0x6CD8, + 0x6CD9, + 0x6CF4, + 0x6CF5, + 0x6D02, + 0x6D03, + 0x6D1C, + 0x6D1D, + 0x6D24, + 0x6D25, + 0x6D71, + 0x6D72, + 0x6D81, + 0x6D82, + 0x6D96, + 0x6D97, + 0x6DB0, + 0x6DB2, + 0x6DB6, + 0x6DB7, + 0x6DFE, + 0x6E00, + 0x6E01, + 0x6E03, + 0x6E06, + 0x6E07, + 0x6E12, + 0x6E13, + 0x6E18, + 0x6E19, + 0x6E2A, + 0x6E2B, + 0x6E4C, + 0x6E4D, + 0x6E6C, + 0x6E6D, + 0x6E7B, + 0x6E7E, + 0x6E8B, + 0x6E8C, + 0x6E95, + 0x6E96, + 0x6EDB, + 0x6EDC, + 0x6EE3, + 0x6EE4, + 0x6F04, + 0x6F05, + 0x6F0B, + 0x6F0C, + 0x6F42, + 0x6F43, + 0x6F48, + 0x6F49, + 0x6F4A, + 0x6F4B, + 0x6F79, + 0x6F7A, + 0x6F98, + 0x6F99, + 0x6F9A, + 0x6F9B, + 0x6F9F, + 0x6FA0, + 0x6FB7, + 0x6FB8, + 0x6FC5, + 0x6FC6, + 0x6FD0, + 0x6FD1, + 0x6FD3, + 0x6FD4, + 0x6FF5, + 0x6FF6, + 0x6FFD, + 0x6FFE, + 0x7010, + 0x7011, + 0x7013, + 0x7014, + 0x7047, + 0x7048, + 0x704B, + 0x704C, + 0x704E, + 0x704F, + 0x7072, + 0x7074, + 0x707B, + 0x707C, + 0x7081, + 0x7082, + 0x708D, + 0x708E, + 0x7097, + 0x7098, + 0x709B, + 0x709C, + 0x70AA, + 0x70AB, + 0x70B2, + 0x70B3, + 0x70B6, + 0x70B7, + 0x70D5, + 0x70D6, + 0x70FE, + 0x70FF, + 0x7108, + 0x7109, + 0x7124, + 0x7125, + 0x7133, + 0x7135, + 0x7157, + 0x7158, + 0x716B, + 0x716C, + 0x716D, + 0x716E, + 0x718D, + 0x718E, + 0x7196, + 0x7197, + 0x71A6, + 0x71A7, + 0x71AB, + 0x71AC, + 0x71B6, + 0x71B7, + 0x71CC, + 0x71CD, + 0x71D3, + 0x71D4, + 0x71F3, + 0x71F4, + 0x71FA, + 0x71FB, + 0x720B, + 0x720C, + 0x7211, + 0x7212, + 0x7215, + 0x7216, + 0x7217, + 0x7218, + 0x7220, + 0x7221, + 0x7224, + 0x7226, + 0x722F, + 0x7230, + 0x7234, + 0x7235, + 0x7245, + 0x7246, + 0x724E, + 0x724F, + 0x7250, + 0x7251, + 0x7255, + 0x7256, + 0x72AB, + 0x72AC, + 0x72BE, + 0x72BF, + 0x7302, + 0x7303, + 0x7310, + 0x7311, + 0x7328, + 0x7329, + 0x7353, + 0x7354, + 0x739C, + 0x739D, + 0x73C1, + 0x73C2, + 0x73F3, + 0x73F4, + 0x73FB, + 0x73FC, + 0x7418, + 0x7419, + 0x7439, + 0x743A, + 0x743E, + 0x743F, + 0x7447, + 0x7448, + 0x7449, + 0x744A, + 0x7458, + 0x7459, + 0x747B, + 0x747C, + 0x7484, + 0x7485, + 0x7496, + 0x7497, + 0x749D, + 0x749E, + 0x74C7, + 0x74C8, + 0x74C9, + 0x74CA, + 0x74CC, + 0x74CD, + 0x74EB, + 0x74EC, + 0x7520, + 0x7521, + 0x7541, + 0x7542, + 0x7552, + 0x7553, + 0x7555, + 0x7556, + 0x755E, + 0x755F, + 0x7561, + 0x7562, + 0x7571, + 0x7572, + 0x757B, + 0x757C, + 0x7585, + 0x7586, + 0x75A9, + 0x75AA, + 0x75B7, + 0x75B8, + 0x75DC, + 0x75DD, + 0x75EE, + 0x75EF, + 0x762C, + 0x762D, + 0x7644, + 0x7646, + 0x7651, + 0x7652, + 0x7655, + 0x7656, + 0x7673, + 0x7674, + 0x768D, + 0x768E, + 0x76A1, + 0x76A3, + 0x76A5, + 0x76A6, + 0x76A8, + 0x76A9, + 0x76B3, + 0x76B4, + 0x76B6, + 0x76B7, + 0x76C1, + 0x76C2, + 0x76CB, + 0x76CC, + 0x76D9, + 0x76DA, + 0x76EB, + 0x76EC, + 0x7700, + 0x7701, + 0x7702, + 0x7703, + 0x770E, + 0x770F, + 0x7721, + 0x7722, + 0x772B, + 0x772C, + 0x773F, + 0x7740, + 0x7742, + 0x7743, + 0x7764, + 0x7765, + 0x7796, + 0x7797, + 0x77A4, + 0x77A5, + 0x77BE, + 0x77BF, + 0x77C1, + 0x77C2, + 0x77D2, + 0x77D3, + 0x77DD, + 0x77DE, + 0x77E4, + 0x77E5, + 0x77E6, + 0x77E7, + 0x77F4, + 0x77F6, + 0x7824, + 0x7825, + 0x7836, + 0x7837, + 0x7842, + 0x7843, + 0x7846, + 0x7847, + 0x784B, + 0x784C, + 0x7876, + 0x7877, + 0x7888, + 0x7889, + 0x78C2, + 0x78C3, + 0x78C7, + 0x78C8, + 0x78D2, + 0x78D3, + 0x78F0, + 0x78F1, + 0x78F8, + 0x78F9, + 0x7900, + 0x7901, + 0x7908, + 0x7909, + 0x790D, + 0x790E, + 0x7915, + 0x7916, + 0x791F, + 0x7921, + 0x7932, + 0x7933, + 0x7936, + 0x7937, + 0x7959, + 0x795A, + 0x796C, + 0x796D, + 0x796E, + 0x796F, + 0x7975, + 0x7977, + 0x7986, + 0x7988, + 0x799E, + 0x799F, + 0x79A9, + 0x79AA, + 0x79BC, + 0x79BD, + 0x79C4, + 0x79C5, + 0x79C7, + 0x79C8, + 0x79CC, + 0x79CD, + 0x79D4, + 0x79D5, + 0x79D7, + 0x79D8, + 0x7A01, + 0x7A02, + 0x7A07, + 0x7A08, + 0x7A09, + 0x7A0A, + 0x7A2C, + 0x7A2D, + 0x7A38, + 0x7A39, + 0x7A3A, + 0x7A3B, + 0x7A64, + 0x7A65, + 0x7A6A, + 0x7A6B, + 0x7A6F, + 0x7A70, + 0x7A82, + 0x7A83, + 0x7A9A, + 0x7A9C, + 0x7AB9, + 0x7ABA, + 0x7ABB, + 0x7ABE, + 0x7AC2, + 0x7AC3, + 0x7AC6, + 0x7AC7, + 0x7AE9, + 0x7AEA, + 0x7AF5, + 0x7AF6, + 0x7AFC, + 0x7AFD, + 0x7B07, + 0x7B08, + 0x7B1F, + 0x7B20, + 0x7B27, + 0x7B28, + 0x7B29, + 0x7B2A, + 0x7B42, + 0x7B43, + 0x7B53, + 0x7B54, + 0x7BA3, + 0x7BA4, + 0x7BA5, + 0x7BA6, + 0x7BB0, + 0x7BB1, + 0x7BB2, + 0x7BB3, + 0x7BFA, + 0x7BFB, + 0x7C1B, + 0x7C1C, + 0x7C2E, + 0x7C30, + 0x7C52, + 0x7C53, + 0x7C55, + 0x7C56, + 0x7C5D, + 0x7C5E, + 0x7C76, + 0x7C77, + 0x7C87, + 0x7C88, + 0x7C93, + 0x7C94, + 0x7C9A, + 0x7C9B, + 0x7CAC, + 0x7CAD, + 0x7CD3, + 0x7CD4, + 0x7CDA, + 0x7CDC, + 0x7CE1, + 0x7CE2, + 0x7CE3, + 0x7CE4, + 0x7CE5, + 0x7CE7, + 0x7CFC, + 0x7CFD, + 0x7CFF, + 0x7D00, + 0x7D23, + 0x7D24, + 0x7D2A, + 0x7D2B, + 0x7D2D, + 0x7D2E, + 0x7D48, + 0x7D49, + 0x7D4D, + 0x7D4E, + 0x7D5A, + 0x7D5B, + 0x7D64, + 0x7D65, + 0x7D78, + 0x7D79, + 0x7D82, + 0x7D83, + 0x7D95, + 0x7D96, + 0x7D98, + 0x7D99, + 0x7DA4, + 0x7DA5, + 0x7DA8, + 0x7DA9, + 0x7DCD, + 0x7DCE, + 0x7DD3, + 0x7DD4, + 0x7DE5, + 0x7DE6, + 0x7DEB, + 0x7DEC, + 0x7DFD, + 0x7E00, + 0x7E18, + 0x7E19, + 0x7E5B, + 0x7E5C, + 0x7E64, + 0x7E65, + 0x7E9D, + 0x7E9E, + 0x7F3B, + 0x7F3D, + 0x7F41, + 0x7F42, + 0x7F46, + 0x7F47, + 0x7F59, + 0x7F5A, + 0x7F84, + 0x7F85, + 0x7F90, + 0x7F91, + 0x7F97, + 0x7F98, + 0x7F99, + 0x7F9A, + 0x7FB4, + 0x7FB5, + 0x7FD6, + 0x7FD7, + 0x7FDD, + 0x7FDE, + 0x7FE4, + 0x7FE5, + 0x800A, + 0x800B, + 0x802F, + 0x8030, + 0x803C, + 0x803D, + 0x8040, + 0x8041, + 0x8066, + 0x8067, + 0x8088, + 0x8089, + 0x808E, + 0x808F, + 0x8094, + 0x8095, + 0x80A6, + 0x80A9, + 0x80B3, + 0x80B4, + 0x80B9, + 0x80BA, + 0x80DF, + 0x80E0, + 0x8103, + 0x8105, + 0x8134, + 0x8136, + 0x8184, + 0x8185, + 0x8190, + 0x8191, + 0x8196, + 0x8197, + 0x81CB, + 0x81CC, + 0x81E4, + 0x81E5, + 0x81EF, + 0x81F1, + 0x8213, + 0x8214, + 0x8224, + 0x8225, + 0x8241, + 0x8242, + 0x8265, + 0x8266, + 0x828C, + 0x828D, + 0x82B2, + 0x82B3, + 0x82E2, + 0x82E3, + 0x82FC, + 0x82FD, + 0x830A, + 0x830B, + 0x8310, + 0x8311, + 0x8330, + 0x8331, + 0x8355, + 0x8356, + 0x83BE, + 0x83BF, + 0x83E6, + 0x83E7, + 0x83ED, + 0x83EE, + 0x8414, + 0x8415, + 0x8416, + 0x8418, + 0x841F, + 0x8420, + 0x8458, + 0x8459, + 0x8483, + 0x8484, + 0x8495, + 0x8496, + 0x84B7, + 0x84B8, + 0x84C3, + 0x84C4, + 0x84ED, + 0x84EE, + 0x8505, + 0x8506, + 0x8510, + 0x8511, + 0x8532, + 0x8534, + 0x854C, + 0x854D, + 0x8550, + 0x8551, + 0x857F, + 0x8580, + 0x8593, + 0x8594, + 0x85B2, + 0x85B3, + 0x85BB, + 0x85BC, + 0x85CC, + 0x85CD, + 0x85EE, + 0x85EF, + 0x85F3, + 0x85F4, + 0x85FC, + 0x85FD, + 0x8603, + 0x8604, + 0x860D, + 0x860F, + 0x8610, + 0x8611, + 0x8615, + 0x8616, + 0x861D, + 0x861E, + 0x8637, + 0x8638, + 0x8657, + 0x8658, + 0x8675, + 0x8676, + 0x8689, + 0x868A, + 0x8692, + 0x8693, + 0x86A0, + 0x86A1, + 0x86A6, + 0x86A7, + 0x86D5, + 0x86D6, + 0x86E0, + 0x86E1, + 0x86E7, + 0x86E8, + 0x86FD, + 0x86FE, + 0x871D, + 0x871E, + 0x872F, + 0x8730, + 0x873D, + 0x873E, + 0x8745, + 0x8746, + 0x8771, + 0x8772, + 0x878E, + 0x878F, + 0x8799, + 0x879A, + 0x87DA, + 0x87DB, + 0x87F0, + 0x87F1, + 0x8807, + 0x8808, + 0x8812, + 0x8813, + 0x882D, + 0x882E, + 0x883A, + 0x883B, + 0x8847, + 0x8848, + 0x8858, + 0x8859, + 0x885C, + 0x885D, + 0x885F, + 0x8860, + 0x887A, + 0x887B, + 0x88E6, + 0x88E7, + 0x88E9, + 0x88EA, + 0x88ED, + 0x88EE, + 0x8903, + 0x8904, + 0x890F, + 0x8910, + 0x8924, + 0x8925, + 0x8965, + 0x8966, + 0x8975, + 0x8976, + 0x897D, + 0x897E, + 0x898D, + 0x898E, + 0x8990, + 0x8991, + 0x8994, + 0x8995, + 0x8999, + 0x899A, + 0x89B0, + 0x89B1, + 0x89B4, + 0x89B5, + 0x89BB, + 0x89BD, + 0x89EE, + 0x89EF, + 0x89F5, + 0x89F6, + 0x89F9, + 0x89FA, + 0x89FD, + 0x89FE, + 0x8A05, + 0x8A07, + 0x8A14, + 0x8A15, + 0x8A19, + 0x8A1A, + 0x8A20, + 0x8A22, + 0x8A2B, + 0x8A2C, + 0x8A3D, + 0x8A3E, + 0x8A4B, + 0x8A4C, + 0x8A64, + 0x8A65, + 0x8A78, + 0x8A79, + 0x8A7D, + 0x8A7E, + 0x8A88, + 0x8A89, + 0x8A9F, + 0x8AA0, + 0x8AAF, + 0x8AB0, + 0x8AB7, + 0x8AB8, + 0x8AD0, + 0x8AD1, + 0x8AEC, + 0x8AED, + 0x8B29, + 0x8B2A, + 0x8B32, + 0x8B33, + 0x8B38, + 0x8B39, + 0x8B3F, + 0x8B40, + 0x8B61, + 0x8B63, + 0x8B69, + 0x8B6A, + 0x8B75, + 0x8B76, + 0x8B7C, + 0x8B7D, + 0x8B81, + 0x8B82, + 0x8B87, + 0x8B88, + 0x8B8D, + 0x8B8E, + 0x8B8F, + 0x8B90, + 0x8B9B, + 0x8B9C, + 0x8C38, + 0x8C39, + 0x8C40, + 0x8C41, + 0x8C44, + 0x8C45, + 0x8C51, + 0x8C54, + 0x8C58, + 0x8C59, + 0x8C74, + 0x8C75, + 0x8C7F, + 0x8C80, + 0x8C83, + 0x8C84, + 0x8C87, + 0x8C88, + 0x8C8B, + 0x8C8C, + 0x8C9B, + 0x8C9C, + 0x8CA6, + 0x8CA7, + 0x8CCB, + 0x8CCC, + 0x8CD6, + 0x8CD7, + 0x8CD8, + 0x8CD9, + 0x8CE9, + 0x8CEA, + 0x8CF7, + 0x8CF8, + 0x8D01, + 0x8D02, + 0x8D11, + 0x8D13, + 0x8D7C, + 0x8D7D, + 0x8DA6, + 0x8DA7, + 0x8DC0, + 0x8DC1, + 0x8DE5, + 0x8DE6, + 0x8E01, + 0x8E02, + 0x8E0B, + 0x8E0C, + 0x8E32, + 0x8E33, + 0x8E46, + 0x8E47, + 0x8E4F, + 0x8E50, + 0x8E6E, + 0x8E6F, + 0x8E75, + 0x8E76, + 0x8E77, + 0x8E78, + 0x8E79, + 0x8E7A, + 0x8E9B, + 0x8E9C, + 0x8EA2, + 0x8EA3, + 0x8EB3, + 0x8EB4, + 0x8EB6, + 0x8EB8, + 0x8EC1, + 0x8EC2, + 0x8EC4, + 0x8EC5, + 0x8ED9, + 0x8EDA, + 0x8EF0, + 0x8EF1, + 0x8F0F, + 0x8F10, + 0x8F2D, + 0x8F2E, + 0x8F3A, + 0x8F3B, + 0x8F41, + 0x8F42, + 0x8F9D, + 0x8F9E, + 0x8FA4, + 0x8FA5, + 0x8FB3, + 0x8FB4, + 0x8FC3, + 0x8FC4, + 0x8FCA, + 0x8FCB, + 0x8FE7, + 0x8FE8, + 0x902A, + 0x902B, + 0x902C, + 0x902D, + 0x9037, + 0x9038, + 0x9040, + 0x9041, + 0x9046, + 0x9047, + 0x90AB, + 0x90AC, + 0x90CC, + 0x90CE, + 0x90D2, + 0x90D3, + 0x90F6, + 0x90F7, + 0x910A, + 0x910B, + 0x913C, + 0x913E, + 0x9159, + 0x915A, + 0x917B, + 0x917C, + 0x9195, + 0x9196, + 0x9198, + 0x9199, + 0x91A9, + 0x91AA, + 0x91BF, + 0x91C0, + 0x91C4, + 0x91C5, + 0x91E0, + 0x91E1, + 0x91EF, + 0x91F0, + 0x9213, + 0x9214, + 0x921F, + 0x9220, + 0x9222, + 0x9223, + 0x9243, + 0x9244, + 0x9269, + 0x926B, + 0x9281, + 0x9282, + 0x9284, + 0x9285, + 0x929E, + 0x929F, + 0x92BD, + 0x92BE, + 0x92D4, + 0x92D5, + 0x92DB, + 0x92DC, + 0x92E2, + 0x92E3, + 0x931C, + 0x931D, + 0x9330, + 0x9332, + 0x9362, + 0x9363, + 0x9368, + 0x9369, + 0x936B, + 0x936C, + 0x936F, + 0x9370, + 0x9373, + 0x9374, + 0x9378, + 0x9379, + 0x937F, + 0x9380, + 0x9381, + 0x9382, + 0x938B, + 0x938C, + 0x939C, + 0x939D, + 0x93A0, + 0x93A1, + 0x93AB, + 0x93AC, + 0x93BB, + 0x93BC, + 0x93E0, + 0x93E1, + 0x93F3, + 0x93F4, + 0x9402, + 0x9403, + 0x9417, + 0x9418, + 0x941C, + 0x941D, + 0x941E, + 0x9420, + 0x9424, + 0x9425, + 0x9443, + 0x9444, + 0x944E, + 0x944F, + 0x946C, + 0x946D, + 0x947B, + 0x947C, + 0x9578, + 0x957A, + 0x957E, + 0x957F, + 0x9585, + 0x9586, + 0x9597, + 0x9598, + 0x95B3, + 0x95B5, + 0x95B8, + 0x95B9, + 0x95C1, + 0x95C2, + 0x95D9, + 0x95DA, + 0x95DD, + 0x95DE, + 0x9625, + 0x9627, + 0x9629, + 0x962A, + 0x963E, + 0x963F, + 0x9656, + 0x9658, + 0x9679, + 0x967A, + 0x967B, + 0x967C, + 0x967F, + 0x9680, + 0x9681, + 0x9683, + 0x968C, + 0x968D, + 0x9696, + 0x9697, + 0x969A, + 0x969B, + 0x969D, + 0x969E, + 0x969F, + 0x96A0, + 0x96AB, + 0x96AC, + 0x96AF, + 0x96B0, + 0x96B5, + 0x96B6, + 0x96E4, + 0x96E5, + 0x96E6, + 0x96E8, + 0x96FC, + 0x96FD, + 0x9714, + 0x9715, + 0x9717, + 0x9718, + 0x971A, + 0x971C, + 0x9733, + 0x9735, + 0x9737, + 0x9738, + 0x9740, + 0x9742, + 0x974D, + 0x974E, + 0x9757, + 0x9758, + 0x9763, + 0x9764, + 0x9775, + 0x9776, + 0x9787, + 0x9788, + 0x9789, + 0x978A, + 0x979B, + 0x979C, + 0x97A9, + 0x97AA, + 0x97B0, + 0x97B2, + 0x97B5, + 0x97B6, + 0x97BE, + 0x97BF, + 0x97C0, + 0x97C1, + 0x97D2, + 0x97D3, + 0x97FC, + 0x97FD, + 0x981F, + 0x9820, + 0x9825, + 0x9826, + 0x982A, + 0x982B, + 0x9833, + 0x9834, + 0x983A, + 0x983B, + 0x983E, + 0x983F, + 0x9842, + 0x9843, + 0x9847, + 0x9848, + 0x9856, + 0x9857, + 0x9866, + 0x9867, + 0x9868, + 0x9869, + 0x98B7, + 0x98B8, + 0x98CA, + 0x98CB, + 0x98E4, + 0x98E5, + 0x98EC, + 0x98ED, + 0x98F1, + 0x98F2, + 0x98F8, + 0x98F9, + 0x98FB, + 0x98FC, + 0x9919, + 0x991A, + 0x993B, + 0x993C, + 0x9944, + 0x9945, + 0x995A, + 0x995B, + 0x995D, + 0x995E, + 0x99BF, + 0x99C0, + 0x99E0, + 0x99E1, + 0x99E6, + 0x99E7, + 0x99EB, + 0x99EC, + 0x99F5, + 0x99F6, + 0x9A10, + 0x9A11, + 0x9A17, + 0x9A19, + 0x9A3B, + 0x9A3C, + 0x9A51, + 0x9A52, + 0x9A58, + 0x9A59, + 0x9A5D, + 0x9A5E, + 0x9A63, + 0x9A64, + 0x9AA9, + 0x9AAA, + 0x9ABD, + 0x9ABE, + 0x9AC8, + 0x9AC9, + 0x9AD7, + 0x9AD8, + 0x9AE0, + 0x9AE1, + 0x9AE4, + 0x9AE5, + 0x9AE8, + 0x9AEA, + 0x9AF0, + 0x9AF1, + 0x9B00, + 0x9B01, + 0x9B02, + 0x9B03, + 0x9B09, + 0x9B0A, + 0x9B14, + 0x9B15, + 0x9B1B, + 0x9B1C, + 0x9B34, + 0x9B35, + 0x9B3D, + 0x9B3E, + 0x9B40, + 0x9B41, + 0x9B50, + 0x9B51, + 0x9B57, + 0x9B58, + 0x9B62, + 0x9B63, + 0x9B72, + 0x9B73, + 0x9B89, + 0x9B8A, + 0x9B8C, + 0x9B8D, + 0x9B99, + 0x9B9A, + 0x9BC2, + 0x9BC3, + 0x9BF6, + 0x9BF7, + 0x9C00, + 0x9C02, + 0x9C03, + 0x9C04, + 0x9C42, + 0x9C43, + 0x9C4F, + 0x9C50, + 0x9C51, + 0x9C52, + 0x9C61, + 0x9C62, + 0x9C64, + 0x9C65, + 0x9C7B, + 0x9C7C, + 0x9D0C, + 0x9D0E, + 0x9D11, + 0x9D12, + 0x9D27, + 0x9D28, + 0x9D35, + 0x9D36, + 0x9D3C, + 0x9D3D, + 0x9D6D, + 0x9D6E, + 0x9D95, + 0x9D96, + 0x9DAE, + 0x9DAF, + 0x9DBD, + 0x9DBE, + 0x9DC0, + 0x9DC1, + 0x9DEA, + 0x9DEB, + 0x9DFC, + 0x9DFD, + 0x9E0E, + 0x9E0F, + 0x9E16, + 0x9E17, + 0x9E1C, + 0x9E1D, + 0x9E7B, + 0x9E7C, + 0x9E8F, + 0x9E91, + 0x9E98, + 0x9E99, + 0x9E9E, + 0x9E9F, + 0x9EA2, + 0x9EA3, + 0x9EAB, + 0x9EAD, + 0x9EB1, + 0x9EB2, + 0x9EEC, + 0x9EED, + 0x9EF1, + 0x9EF2, + 0x9F03, + 0x9F04, + 0x9F11, + 0x9F12, + 0x9F14, + 0x9F15, + 0x9F26, + 0x9F27, + 0x9F45, + 0x9F46, + 0x9F53, + 0x9F54, + 0x9F6D, + 0x9F6E, + 0x9FA1, + 0x9FA2, + 0x9FA3, + 0x9FA4, + 0x9FA6, 0xA78D, 0xA78E, - 0xA792, - 0xA794, 0xA7AA, 0xA7AB, - 0xA7C0, - 0xA7CB, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, - 0xA7DA, - 0xA9E7, - 0xA9FF, - 0xAA60, - 0xAA77, - 0xAA7A, - 0xAA80, - 0xAB01, - 0xAB07, - 0xAB09, - 0xAB0F, - 0xAB11, - 0xAB17, - 0xAB20, - 0xAB27, - 0xAB28, - 0xAB2F, - 0xAB66, - 0xAB68, + 0xAA7B, + 0xAA7C, 0xAC00, 0xD7A4, - 0xFA0E, - 0xFA10, - 0xFA11, - 0xFA12, - 0xFA13, - 0xFA15, - 0xFA1F, - 0xFA20, - 0xFA21, - 0xFA22, - 0xFA23, - 0xFA25, - 0xFA27, - 0xFA2A, 0x11301, 0x11302, 0x11303, 0x11304, - 0x1133B, + 0x1133C, 0x1133D, - 0x16FF0, - 0x16FF2, - 0x1B11F, - 0x1B123, - 0x1B132, - 0x1B133, - 0x1B150, - 0x1B153, - 0x1B155, - 0x1B156, - 0x1B164, - 0x1B168, - 0x1DF00, - 0x1DF1F, - 0x1DF25, - 0x1DF2B, - 0x1E08F, - 0x1E090, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -279879,22 +297532,122 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x1E7EF, 0x1E7F0, 0x1E7FF, - 0x20000, - 0x2A6E0, - 0x2A700, - 0x2B73A, - 0x2B740, - 0x2B81E, - 0x2B820, - 0x2CEA2, - 0x2CEB0, - 0x2EBE1, - 0x2EBF0, - 0x2EE5E, - 0x30000, - 0x3134B, - 0x31350, - 0x323B0 + 0x2070E, + 0x2070F, + 0x20731, + 0x20732, + 0x20779, + 0x2077A, + 0x20C53, + 0x20C54, + 0x20C78, + 0x20C79, + 0x20C96, + 0x20C97, + 0x20CCF, + 0x20CD0, + 0x20CD5, + 0x20CD6, + 0x20D15, + 0x20D16, + 0x20D7C, + 0x20D7D, + 0x20D7F, + 0x20D80, + 0x20E0E, + 0x20E10, + 0x20E77, + 0x20E78, + 0x20E9D, + 0x20E9E, + 0x20EA2, + 0x20EA3, + 0x20ED7, + 0x20ED8, + 0x20EF9, + 0x20EFB, + 0x20F2D, + 0x20F2F, + 0x20F4C, + 0x20F4D, + 0x20FB4, + 0x20FB5, + 0x20FBC, + 0x20FBD, + 0x20FEA, + 0x20FEB, + 0x2105C, + 0x2105D, + 0x2106F, + 0x21070, + 0x21075, + 0x21077, + 0x2107B, + 0x2107C, + 0x210C1, + 0x210C2, + 0x210C9, + 0x210CA, + 0x211D9, + 0x211DA, + 0x220C7, + 0x220C8, + 0x227B5, + 0x227B6, + 0x22AD5, + 0x22AD6, + 0x22B43, + 0x22B44, + 0x22BCA, + 0x22BCB, + 0x22C51, + 0x22C52, + 0x22C55, + 0x22C56, + 0x22CC2, + 0x22CC3, + 0x22D08, + 0x22D09, + 0x22D4C, + 0x22D4D, + 0x22D67, + 0x22D68, + 0x22EB3, + 0x22EB4, + 0x23CB7, + 0x23CB8, + 0x244D3, + 0x244D4, + 0x24DB8, + 0x24DB9, + 0x24DEA, + 0x24DEB, + 0x2512B, + 0x2512C, + 0x26258, + 0x26259, + 0x267CC, + 0x267CD, + 0x269F2, + 0x269F3, + 0x269FA, + 0x269FB, + 0x27A3E, + 0x27A3F, + 0x2815D, + 0x2815E, + 0x28207, + 0x28208, + 0x282E2, + 0x282E3, + 0x28CCA, + 0x28CCB, + 0x28CCD, + 0x28CCE, + 0x28CD2, + 0x28CD3, + 0x29D98, + 0x29D99 }; # endif /* EBCDIC 1047 */ @@ -279905,7 +297658,7 @@ static const UV UNI_IDENTIFIERSTATUS__RE && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_IDENTIFIERSTATUS__RESTRICTED_invlist[] = { /* for EBCDIC 037 */ - 813, /* Number of elements */ + 3255, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -279959,67 +297712,97 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xFB, 0xFF, 0x100, + 0x114, + 0x116, + 0x12C, + 0x12E, 0x132, 0x134, + 0x138, + 0x139, 0x13F, 0x141, 0x149, 0x14A, + 0x14E, + 0x150, + 0x156, + 0x158, + 0x162, + 0x164, 0x17F, - 0x18F, - 0x190, + 0x181, + 0x182, + 0x186, + 0x187, + 0x189, + 0x18B, + 0x18E, + 0x193, + 0x194, + 0x195, + 0x196, + 0x19A, + 0x19D, + 0x19E, 0x1A0, 0x1A2, 0x1AF, 0x1B1, + 0x1B2, + 0x1B5, + 0x1B7, + 0x1B8, 0x1CD, + 0x1D5, 0x1DD, 0x1DE, - 0x1E4, 0x1E6, - 0x1F1, - 0x1F4, - 0x1F6, + 0x1EA, + 0x1EE, + 0x1F0, 0x1F8, + 0x1FA, + 0x218, 0x21C, - 0x21E, - 0x220, - 0x226, - 0x234, + 0x244, + 0x245, + 0x24C, + 0x24E, + 0x253, + 0x255, + 0x256, + 0x258, 0x259, 0x25A, + 0x25B, + 0x25C, + 0x263, + 0x264, + 0x268, + 0x26A, + 0x272, + 0x273, + 0x289, + 0x28A, + 0x28B, + 0x28C, + 0x292, + 0x293, 0x2BB, 0x2BD, - 0x2EC, - 0x2ED, 0x300, 0x305, 0x306, 0x30D, - 0x30F, - 0x312, - 0x313, - 0x315, 0x31B, 0x31C, 0x323, + 0x324, + 0x326, 0x329, - 0x32D, - 0x32F, - 0x330, + 0x331, 0x332, - 0x335, - 0x336, - 0x338, - 0x33A, - 0x342, - 0x343, - 0x345, - 0x346, - 0x375, - 0x376, - 0x37B, - 0x37E, 0x386, 0x387, 0x388, @@ -280030,80 +297813,140 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x3A2, 0x3A3, 0x3CF, - 0x3FC, + 0x401, + 0x40D, + 0x40E, + 0x450, + 0x451, + 0x45D, + 0x45E, 0x460, - 0x48A, - 0x500, - 0x510, - 0x52A, - 0x52E, - 0x530, + 0x490, + 0x49C, + 0x49E, + 0x4A6, + 0x4A8, + 0x4B8, + 0x4BA, + 0x4C1, + 0x4CF, + 0x4DA, + 0x4DC, + 0x4EA, + 0x4EE, + 0x4F6, + 0x4F8, + 0x4FA, + 0x524, + 0x526, 0x531, 0x557, - 0x559, - 0x55A, 0x561, 0x587, 0x58A, 0x58B, - 0x5B4, - 0x5B5, 0x5D0, 0x5EB, - 0x5EF, + 0x5F3, 0x5F5, 0x620, - 0x640, + 0x63B, + 0x63D, + 0x63E, 0x641, + 0x653, + 0x654, 0x656, 0x660, 0x66A, 0x670, + 0x671, + 0x672, 0x673, 0x674, 0x675, 0x679, - 0x68E, - 0x68F, + 0x690, + 0x691, + 0x69B, + 0x69F, 0x6A1, 0x6A2, + 0x6A3, + 0x6A4, + 0x6AC, + 0x6AD, + 0x6B2, + 0x6B3, + 0x6B4, + 0x6B5, + 0x6B8, + 0x6BA, + 0x6BF, + 0x6C0, 0x6D4, 0x6D5, 0x6D6, - 0x6E5, - 0x6E7, 0x6EE, + 0x6FA, + 0x6FD, 0x700, - 0x750, + 0x751, + 0x753, + 0x756, + 0x757, + 0x760, + 0x761, + 0x762, + 0x764, + 0x766, + 0x769, + 0x76A, + 0x76B, + 0x76E, + 0x772, + 0x780, 0x7B2, - 0x870, - 0x888, - 0x889, 0x88F, + 0x890, 0x8A0, - 0x8AD, - 0x8B2, - 0x8B3, - 0x8B5, - 0x8CA, + 0x8A1, + 0x8A2, + 0x8AA, + 0x8BB, + 0x8C3, + 0x8C7, + 0x8C8, 0x901, + 0x904, + 0x905, + 0x90C, + 0x90D, + 0x929, + 0x92A, + 0x934, + 0x935, + 0x93D, + 0x93E, + 0x944, + 0x945, 0x94E, 0x94F, - 0x951, + 0x950, 0x956, 0x958, - 0x960, - 0x964, 0x966, 0x970, - 0x971, + 0x972, 0x978, - 0x979, + 0x97B, + 0x97D, + 0x97E, 0x980, 0x981, 0x984, 0x985, - 0x98D, + 0x98C, 0x98F, 0x991, 0x993, @@ -280115,21 +297958,17 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x9B6, 0x9BA, 0x9BC, + 0x9BD, + 0x9BE, 0x9C5, 0x9C7, 0x9C9, 0x9CB, 0x9CF, - 0x9D7, - 0x9D8, - 0x9E0, - 0x9E4, 0x9E6, 0x9F2, - 0x9FE, - 0x9FF, - 0xA01, - 0xA04, + 0xA02, + 0xA03, 0xA05, 0xA0B, 0xA0F, @@ -280154,9 +297993,9 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xA4E, 0xA5C, 0xA5D, - 0xA66, - 0xA75, - 0xA81, + 0xA70, + 0xA72, + 0xA82, 0xA84, 0xA85, 0xA8E, @@ -280171,23 +298010,19 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xAB5, 0xABA, 0xABC, + 0xABD, + 0xABE, 0xAC6, 0xAC7, 0xACA, 0xACB, 0xACE, - 0xAD0, - 0xAD1, - 0xAE0, - 0xAE4, 0xAE6, 0xAF0, - 0xAFA, - 0xB00, 0xB01, 0xB04, 0xB05, - 0xB0D, + 0xB0C, 0xB0F, 0xB11, 0xB13, @@ -280196,23 +298031,23 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xB31, 0xB32, 0xB34, - 0xB35, + 0xB36, 0xB3A, 0xB3C, + 0xB3D, + 0xB3E, 0xB44, 0xB47, 0xB49, 0xB4B, 0xB4E, - 0xB55, - 0xB58, + 0xB56, + 0xB57, 0xB5F, - 0xB62, - 0xB66, - 0xB70, + 0xB60, 0xB71, 0xB72, - 0xB82, + 0xB83, 0xB84, 0xB85, 0xB8B, @@ -280238,99 +298073,79 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xBC9, 0xBCA, 0xBCE, - 0xBD0, - 0xBD1, - 0xBD7, - 0xBD8, - 0xBE6, - 0xBF0, - 0xC01, - 0xC0D, + 0xC02, + 0xC04, + 0xC05, + 0xC0C, 0xC0E, 0xC11, 0xC12, 0xC29, 0xC2A, + 0xC31, + 0xC32, 0xC34, 0xC35, 0xC3A, - 0xC3C, + 0xC3E, 0xC45, 0xC46, 0xC49, 0xC4A, 0xC4E, - 0xC55, - 0xC57, - 0xC5D, - 0xC5E, - 0xC60, - 0xC62, - 0xC66, - 0xC70, - 0xC80, - 0xC81, 0xC82, 0xC84, 0xC85, - 0xC8D, + 0xC8C, 0xC8E, 0xC91, 0xC92, 0xCA9, 0xCAA, + 0xCB1, + 0xCB2, 0xCB4, 0xCB5, 0xCBA, - 0xCBC, - 0xCC5, + 0xCBE, + 0xCC4, 0xCC6, 0xCC9, 0xCCA, 0xCCE, - 0xCD5, - 0xCD7, - 0xCDD, - 0xCDE, - 0xCE0, - 0xCE4, 0xCE6, 0xCF0, - 0xCF1, - 0xCF4, - 0xD00, - 0xD01, 0xD02, 0xD04, 0xD05, - 0xD0D, + 0xD0C, 0xD0E, 0xD11, 0xD12, - 0xD3B, - 0xD3D, + 0xD29, + 0xD2A, + 0xD3A, + 0xD3E, 0xD44, 0xD46, 0xD49, 0xD4A, - 0xD4F, - 0xD54, + 0xD4C, + 0xD4D, + 0xD4E, + 0xD57, 0xD58, - 0xD60, - 0xD62, - 0xD66, - 0xD70, 0xD7A, 0xD80, 0xD82, 0xD84, 0xD85, - 0xD8F, + 0xD8E, 0xD91, 0xD97, 0xD9A, - 0xDA6, - 0xDA7, + 0xD9E, + 0xD9F, 0xDB2, 0xDB3, 0xDBC, @@ -280353,44 +298168,52 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xE34, 0xE3B, 0xE40, - 0xE4F, + 0xE4E, 0xE50, 0xE5A, 0xE81, 0xE83, 0xE84, 0xE85, - 0xE86, + 0xE87, + 0xE89, + 0xE8A, 0xE8B, - 0xE8C, + 0xE8D, + 0xE8E, + 0xE94, + 0xE98, + 0xE99, + 0xEA0, + 0xEA1, 0xEA4, 0xEA5, 0xEA6, 0xEA7, + 0xEA8, + 0xEAA, + 0xEAC, + 0xEAD, + 0xEAF, + 0xEB0, 0xEB3, 0xEB4, + 0xEBA, + 0xEBB, 0xEBE, 0xEC0, 0xEC5, 0xEC6, 0xEC7, 0xEC8, - 0xECF, + 0xECE, 0xED0, 0xEDA, - 0xEDE, - 0xEE0, - 0xF00, - 0xF01, 0xF0B, 0xF0C, 0xF20, 0xF2A, - 0xF35, - 0xF36, - 0xF37, - 0xF38, - 0xF3E, + 0xF40, 0xF43, 0xF44, 0xF48, @@ -280404,17 +298227,15 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xF5C, 0xF5D, 0xF69, - 0xF6A, - 0xF6D, 0xF71, 0xF73, 0xF74, 0xF75, 0xF7A, 0xF81, - 0xF82, + 0xF84, 0xF85, - 0xF86, + 0xF90, 0xF93, 0xF94, 0xF98, @@ -280427,26 +298248,28 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0xFA8, 0xFAC, 0xFAD, + 0xFAE, + 0xFB1, 0xFB9, 0xFBA, 0xFBD, - 0xFC6, - 0xFC7, 0x1000, 0x104A, - 0x1050, - 0x109E, + 0x105A, + 0x1065, + 0x1075, + 0x108B, + 0x108F, + 0x1090, 0x10C7, 0x10C8, 0x10CD, 0x10CE, 0x10D0, 0x10F1, - 0x10F7, - 0x10FB, - 0x10FD, - 0x1100, 0x1200, + 0x1207, + 0x1208, 0x1249, 0x124A, 0x124E, @@ -280457,10 +298280,14 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x125A, 0x125E, 0x1260, + 0x1287, + 0x1288, 0x1289, 0x128A, 0x128E, 0x1290, + 0x12AF, + 0x12B0, 0x12B1, 0x12B2, 0x12B6, @@ -280473,20 +298300,26 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x12C8, 0x12D7, 0x12D8, + 0x12F8, + 0x1300, + 0x130F, + 0x1310, 0x1311, 0x1312, 0x1316, 0x1318, - 0x135B, - 0x135D, - 0x1360, - 0x1380, - 0x1390, + 0x131F, + 0x1320, + 0x1347, + 0x1348, + 0x135A, 0x1780, + 0x179D, + 0x179F, 0x17A3, 0x17A5, 0x17A8, - 0x17A9, + 0x17AA, 0x17B4, 0x17B6, 0x17CE, @@ -280494,210 +298327,2472 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x17D1, 0x17D2, 0x17D3, - 0x17D7, - 0x17D8, - 0x17DC, - 0x17DD, 0x17E0, 0x17EA, 0x1C90, 0x1CBB, 0x1CBD, 0x1CC0, - 0x1E00, - 0x1E9A, + 0x1E0C, + 0x1E0E, + 0x1E12, + 0x1E14, + 0x1E20, + 0x1E22, + 0x1E24, + 0x1E26, + 0x1E36, + 0x1E38, + 0x1E3C, + 0x1E40, + 0x1E42, + 0x1E4C, + 0x1E5A, + 0x1E5C, + 0x1E62, + 0x1E64, + 0x1E6C, + 0x1E6E, + 0x1E70, + 0x1E72, + 0x1E8C, + 0x1E8E, + 0x1E92, + 0x1E94, 0x1E9E, 0x1E9F, 0x1EA0, 0x1EFA, - 0x1F00, - 0x1F16, - 0x1F18, - 0x1F1E, - 0x1F20, - 0x1F46, - 0x1F48, - 0x1F4E, - 0x1F50, - 0x1F58, - 0x1F59, - 0x1F5A, - 0x1F5B, - 0x1F5C, - 0x1F5D, - 0x1F5E, - 0x1F5F, - 0x1F71, - 0x1F72, - 0x1F73, - 0x1F74, - 0x1F75, - 0x1F76, - 0x1F77, - 0x1F78, - 0x1F79, - 0x1F7A, - 0x1F7B, - 0x1F7C, - 0x1F7D, - 0x1F80, + 0x1FA0, + 0x1FB0, + 0x1FB2, 0x1FB5, - 0x1FB6, - 0x1FBB, - 0x1FBC, - 0x1FBD, - 0x1FC2, - 0x1FC5, - 0x1FC6, - 0x1FC9, - 0x1FCA, - 0x1FCB, - 0x1FCC, - 0x1FCD, - 0x1FD0, - 0x1FD3, - 0x1FD6, - 0x1FDB, - 0x1FE0, - 0x1FE3, - 0x1FE4, - 0x1FEB, 0x1FEC, 0x1FED, - 0x1FF2, - 0x1FF5, - 0x1FF6, - 0x1FF9, - 0x1FFA, - 0x1FFB, - 0x1FFC, - 0x1FFD, 0x2010, 0x2011, 0x2019, 0x201A, 0x2027, 0x2028, - 0x2D27, - 0x2D28, - 0x2D2D, - 0x2D2E, - 0x2D80, - 0x2D97, - 0x2DA0, - 0x2DA7, - 0x2DA8, - 0x2DAF, - 0x2DB0, - 0x2DB7, - 0x2DB8, - 0x2DBF, - 0x2DC0, - 0x2DC7, - 0x2DC8, - 0x2DCF, - 0x2DD0, - 0x2DD7, - 0x2DD8, - 0x2DDF, 0x3005, 0x3008, 0x3041, 0x3097, - 0x3099, - 0x309B, 0x309D, 0x309F, 0x30A0, 0x30FF, - 0x3105, - 0x312E, - 0x312F, - 0x3130, - 0x31A0, - 0x31C0, - 0x3400, - 0x4DC0, + 0x3447, + 0x3448, + 0x3473, + 0x3474, + 0x34E4, + 0x34E5, + 0x3577, + 0x3578, + 0x359E, + 0x359F, + 0x35A1, + 0x35A2, + 0x35AD, + 0x35AE, + 0x35BF, + 0x35C0, + 0x35CE, + 0x35CF, + 0x35F3, + 0x35F4, + 0x35FE, + 0x35FF, + 0x360E, + 0x360F, + 0x361A, + 0x361B, + 0x3918, + 0x3919, + 0x3960, + 0x3961, + 0x396E, + 0x396F, + 0x39CF, + 0x39D1, + 0x39DB, + 0x39DC, + 0x39DF, + 0x39E0, + 0x39F8, + 0x39F9, + 0x39FE, + 0x39FF, + 0x3A18, + 0x3A19, + 0x3A52, + 0x3A53, + 0x3A5C, + 0x3A5D, + 0x3A67, + 0x3A68, + 0x3A73, + 0x3A74, + 0x3B39, + 0x3B3A, + 0x3B4E, + 0x3B4F, + 0x3BA3, + 0x3BA4, + 0x3C6E, + 0x3C6F, + 0x3CE0, + 0x3CE1, + 0x3DE7, + 0x3DE8, + 0x3DEB, + 0x3DEC, + 0x3E74, + 0x3E75, + 0x3ED0, + 0x3ED1, + 0x4056, + 0x4057, + 0x4065, + 0x4066, + 0x406A, + 0x406B, + 0x40BB, + 0x40BC, + 0x40DF, + 0x40E0, + 0x4137, + 0x4138, + 0x415F, + 0x4160, + 0x4337, + 0x4338, + 0x43AC, + 0x43AD, + 0x43B1, + 0x43B2, + 0x43D3, + 0x43D4, + 0x43DD, + 0x43DE, + 0x4443, + 0x4444, + 0x44D6, + 0x44D7, + 0x44EA, + 0x44EB, + 0x4606, + 0x4607, + 0x464C, + 0x464D, + 0x4661, + 0x4662, + 0x4723, + 0x4724, + 0x4729, + 0x472A, + 0x477C, + 0x477D, + 0x478D, + 0x478E, + 0x47F4, + 0x47F5, + 0x4882, + 0x4883, + 0x4947, + 0x4948, + 0x497A, + 0x497B, + 0x497D, + 0x497E, + 0x4982, + 0x4984, + 0x4985, + 0x4987, + 0x499B, + 0x499C, + 0x499F, + 0x49A0, + 0x49B6, + 0x49B8, + 0x4A12, + 0x4A13, + 0x4AB8, + 0x4AB9, + 0x4C77, + 0x4C78, + 0x4C7D, + 0x4C7E, + 0x4C81, + 0x4C82, + 0x4C85, + 0x4C86, + 0x4C9D, + 0x4CA4, + 0x4D13, + 0x4D1A, + 0x4DAE, + 0x4DAF, 0x4E00, - 0xA000, - 0xA67F, - 0xA680, - 0xA717, - 0xA720, - 0xA788, - 0xA789, + 0x4E12, + 0x4E13, + 0x4E29, + 0x4E2A, + 0x4E68, + 0x4E69, + 0x4E79, + 0x4E7A, + 0x4E96, + 0x4E97, + 0x4EA3, + 0x4EA4, + 0x4EBC, + 0x4EBD, + 0x4ECC, + 0x4ECD, + 0x4EE7, + 0x4EE8, + 0x4EF8, + 0x4EFB, + 0x4EFC, + 0x4EFD, + 0x4EFE, + 0x4EFF, + 0x4F07, + 0x4F08, + 0x4F16, + 0x4F17, + 0x4F28, + 0x4F29, + 0x4F31, + 0x4F32, + 0x4F35, + 0x4F36, + 0x4F37, + 0x4F38, + 0x4F40, + 0x4F41, + 0x4F44, + 0x4F45, + 0x4F71, + 0x4F72, + 0x4F8C, + 0x4F8D, + 0x4F8E, + 0x4F8F, + 0x4FA2, + 0x4FA3, + 0x4FBD, + 0x4FBE, + 0x4FC6, + 0x4FC7, + 0x4FC8, + 0x4FC9, + 0x4FCC, + 0x4FCD, + 0x4FE2, + 0x4FE3, + 0x4FFC, + 0x4FFE, + 0x5010, + 0x5011, + 0x5034, + 0x5035, + 0x5038, + 0x5039, + 0x503D, + 0x503E, + 0x5042, + 0x5043, + 0x5052, + 0x5053, + 0x5058, + 0x5059, + 0x507C, + 0x507D, + 0x5081, + 0x5082, + 0x5093, + 0x5094, + 0x5097, + 0x5098, + 0x509F, + 0x50A2, + 0x50B9, + 0x50BA, + 0x50C3, + 0x50C4, + 0x50D8, + 0x50D9, + 0x50DF, + 0x50E0, + 0x50E1, + 0x50E3, + 0x50EB, + 0x50EC, + 0x50F4, + 0x50F5, + 0x50F7, + 0x50F8, + 0x511B, + 0x511C, + 0x5128, + 0x5129, + 0x512B, + 0x512C, + 0x5142, + 0x5143, + 0x514A, + 0x514B, + 0x514F, + 0x5150, + 0x5153, + 0x5154, + 0x5158, + 0x5159, + 0x5160, + 0x5161, + 0x5164, + 0x5165, + 0x5172, + 0x5173, + 0x517E, + 0x517F, + 0x5183, + 0x5185, + 0x518E, + 0x518F, + 0x51A1, + 0x51A2, + 0x51A3, + 0x51A4, + 0x51AD, + 0x51AE, + 0x51B8, + 0x51B9, + 0x51BA, + 0x51BB, + 0x51C2, + 0x51C3, + 0x51D2, + 0x51D4, + 0x51DF, + 0x51E0, + 0x51EC, + 0x51ED, + 0x51EE, + 0x51EF, + 0x51F2, + 0x51F3, + 0x5253, + 0x5254, + 0x5266, + 0x5267, + 0x5279, + 0x527A, + 0x5285, + 0x5286, + 0x528E, + 0x528F, + 0x52C4, + 0x52C5, + 0x52C8, + 0x52C9, + 0x52CC, + 0x52CD, + 0x52CE, + 0x52CF, + 0x52D1, + 0x52D2, + 0x52D4, + 0x52D5, + 0x52E1, + 0x52E2, + 0x52E5, + 0x52E6, + 0x52EE, + 0x52EF, + 0x5303, + 0x5305, + 0x5318, + 0x5319, + 0x531B, + 0x531C, + 0x531E, + 0x531F, + 0x5327, + 0x5328, + 0x5329, + 0x532A, + 0x5332, + 0x5333, + 0x5335, + 0x5337, + 0x5342, + 0x5343, + 0x535B, + 0x535C, + 0x535D, + 0x535E, + 0x536A, + 0x536B, + 0x536D, + 0x536E, + 0x5380, + 0x5381, + 0x53A1, + 0x53A2, + 0x53AA, + 0x53AC, + 0x53AF, + 0x53B0, + 0x53BA, + 0x53BB, + 0x53C5, + 0x53C6, + 0x53CF, + 0x53D0, + 0x53DD, + 0x53DF, + 0x53E7, + 0x53E8, + 0x53FF, + 0x5401, + 0x541A, + 0x541B, + 0x5422, + 0x5423, + 0x544C, + 0x544D, + 0x545D, + 0x545E, + 0x5469, + 0x546A, + 0x548A, + 0x548B, + 0x54B5, + 0x54B6, + 0x54F6, + 0x54F7, + 0x5515, + 0x5516, + 0x5518, + 0x551A, + 0x5547, + 0x5548, + 0x5560, + 0x5561, + 0x557A, + 0x557B, + 0x55E0, + 0x55E1, + 0x55F8, + 0x55F9, + 0x560A, + 0x560C, + 0x5620, + 0x5621, + 0x562B, + 0x562C, + 0x5637, + 0x5638, + 0x563C, + 0x563D, + 0x5644, + 0x5645, + 0x564B, + 0x564C, + 0x5651, + 0x5652, + 0x5656, + 0x5657, + 0x565F, + 0x5660, + 0x5661, + 0x5662, + 0x5675, + 0x5676, + 0x567D, + 0x567E, + 0x5688, + 0x5689, + 0x568B, + 0x568C, + 0x5696, + 0x5697, + 0x569E, + 0x569F, + 0x56BA, + 0x56BB, + 0x56CF, + 0x56D0, + 0x56D9, + 0x56DA, + 0x56E6, + 0x56E7, + 0x56F6, + 0x56F7, + 0x56F8, + 0x56F9, + 0x56FB, + 0x56FD, + 0x5705, + 0x5706, + 0x5711, + 0x5712, + 0x5717, + 0x5718, + 0x5721, + 0x5722, + 0x5724, + 0x5725, + 0x573D, + 0x573E, + 0x5743, + 0x5744, + 0x5748, + 0x5749, + 0x5755, + 0x5757, + 0x5758, + 0x5759, + 0x5763, + 0x5764, + 0x5778, + 0x5779, + 0x5781, + 0x5782, + 0x5787, + 0x5788, + 0x5796, + 0x5797, + 0x57A8, + 0x57A9, + 0x57CA, + 0x57CB, + 0x57D1, + 0x57D2, + 0x57DB, + 0x57DC, + 0x5817, + 0x5819, + 0x5850, + 0x5851, + 0x5856, + 0x5857, + 0x5860, + 0x5861, + 0x5866, + 0x5868, + 0x5877, + 0x5878, + 0x5895, + 0x5896, + 0x58AA, + 0x58AB, + 0x58B6, + 0x58B7, + 0x58C0, + 0x58C1, + 0x58C3, + 0x58C5, + 0x58CD, + 0x58CE, + 0x58D0, + 0x58D1, + 0x58E1, + 0x58E2, + 0x58E6, + 0x58E7, + 0x58F5, + 0x58F6, + 0x5901, + 0x5902, + 0x5905, + 0x5906, + 0x5908, + 0x5909, + 0x5911, + 0x5912, + 0x5913, + 0x5914, + 0x5923, + 0x5924, + 0x5933, + 0x5934, + 0x5936, + 0x5937, + 0x5959, + 0x595A, + 0x595B, + 0x595C, + 0x59B7, + 0x59B8, + 0x59E7, + 0x59E8, + 0x5A24, + 0x5A25, + 0x5A26, + 0x5A27, + 0x5A2C, + 0x5A2D, + 0x5A30, + 0x5A31, + 0x5A54, + 0x5A55, + 0x5A59, + 0x5A5A, + 0x5A6F, + 0x5A70, + 0x5A71, + 0x5A72, + 0x5A87, + 0x5A88, + 0x5A8D, + 0x5A8E, + 0x5AAB, + 0x5AAC, + 0x5AD3, + 0x5AD4, + 0x5AEF, + 0x5AF1, + 0x5B0A, + 0x5B0B, + 0x5B0D, + 0x5B0E, + 0x5B39, + 0x5B3A, + 0x5B46, + 0x5B47, + 0x5B4F, + 0x5B50, + 0x5B52, + 0x5B53, + 0x5B60, + 0x5B62, + 0x5B6F, + 0x5B70, + 0x5B79, + 0x5B7A, + 0x5B7E, + 0x5B7F, + 0x5B86, + 0x5B87, + 0x5B90, + 0x5B91, + 0x5BA9, + 0x5BAA, + 0x5BB2, + 0x5BB3, + 0x5BB7, + 0x5BB8, + 0x5BBC, + 0x5BBD, + 0x5BC8, + 0x5BC9, + 0x5BDA, + 0x5BDB, + 0x5C00, + 0x5C01, + 0x5C1B, + 0x5C1C, + 0x5C23, + 0x5C24, + 0x5C26, + 0x5C27, + 0x5C29, + 0x5C2A, + 0x5C36, + 0x5C37, + 0x5C5A, + 0x5C5B, + 0x5C85, + 0x5C86, + 0x5CB4, + 0x5CB5, + 0x5CB9, + 0x5CBA, + 0x5CD5, + 0x5CD6, + 0x5CDD, + 0x5CDE, + 0x5CF5, + 0x5CF6, + 0x5D2B, + 0x5D2C, + 0x5D2F, + 0x5D30, + 0x5D3B, + 0x5D3C, + 0x5D53, + 0x5D54, + 0x5D57, + 0x5D58, + 0x5D60, + 0x5D61, + 0x5D83, + 0x5D84, + 0x5D96, + 0x5D97, + 0x5DA3, + 0x5DA5, + 0x5DAB, + 0x5DAC, + 0x5DB3, + 0x5DB4, + 0x5DB9, + 0x5DBA, + 0x5DC4, + 0x5DC5, + 0x5DD7, + 0x5DD8, + 0x5DDA, + 0x5DDB, + 0x5DDC, + 0x5DDD, + 0x5DF6, + 0x5DF7, + 0x5E12, + 0x5E13, + 0x5E48, + 0x5E49, + 0x5E51, + 0x5E52, + 0x5E92, + 0x5E93, + 0x5EBA, + 0x5EBB, + 0x5EC0, + 0x5EC1, + 0x5EEB, + 0x5EEC, + 0x5EF9, + 0x5EFA, + 0x5F0E, + 0x5F0F, + 0x5F3B, + 0x5F3C, + 0x5F3D, + 0x5F3E, + 0x5F8F, + 0x5F90, + 0x5F9A, + 0x5F9B, + 0x5FA3, + 0x5FA5, + 0x5FB0, + 0x5FB1, + 0x5FC2, + 0x5FC3, + 0x5FCE, + 0x5FCF, + 0x5FDB, + 0x5FDC, + 0x5FE2, + 0x5FE3, + 0x5FEC, + 0x5FED, + 0x5FFC, + 0x5FFD, + 0x6023, + 0x6024, + 0x6056, + 0x6057, + 0x6061, + 0x6062, + 0x6071, + 0x6072, + 0x6074, + 0x6075, + 0x6091, + 0x6092, + 0x6093, + 0x6094, + 0x60A5, + 0x60A6, + 0x60D2, + 0x60D3, + 0x60D6, + 0x60D7, + 0x60DE, + 0x60DF, + 0x60E5, + 0x60E6, + 0x60FD, + 0x60FE, + 0x6102, + 0x6103, + 0x6107, + 0x6108, + 0x6111, + 0x6112, + 0x611E, + 0x611F, + 0x6131, + 0x6132, + 0x6133, + 0x6134, + 0x6135, + 0x6136, + 0x6138, + 0x613A, + 0x6160, + 0x6161, + 0x617B, + 0x617C, + 0x617F, + 0x6180, + 0x6186, + 0x6187, + 0x6197, + 0x6198, + 0x619C, + 0x619D, + 0x61B9, + 0x61BA, + 0x61BB, + 0x61BC, + 0x61D3, + 0x61D4, + 0x61D5, + 0x61D6, + 0x61EC, + 0x61ED, + 0x61EF, + 0x61F0, + 0x6205, + 0x6206, + 0x6235, + 0x6236, + 0x6239, + 0x623A, + 0x6257, + 0x6258, + 0x628D, + 0x628E, + 0x629D, + 0x629E, + 0x62DE, + 0x62DF, + 0x62EA, + 0x62EB, + 0x630A, + 0x630B, + 0x6317, + 0x6318, + 0x6331, + 0x6332, + 0x6337, + 0x6338, + 0x635B, + 0x635C, + 0x638B, + 0x638C, + 0x6393, + 0x6394, + 0x63D1, + 0x63D2, + 0x643B, + 0x643D, + 0x6449, + 0x644A, + 0x645A, + 0x645B, + 0x647E, + 0x647F, + 0x6486, + 0x6487, + 0x64A1, + 0x64A2, + 0x64AF, + 0x64B0, + 0x64B6, + 0x64B7, + 0x64C8, + 0x64C9, + 0x64D5, + 0x64D6, + 0x64EE, + 0x64EF, + 0x64F5, + 0x64F6, + 0x64F9, + 0x64FA, + 0x6502, + 0x6503, + 0x650A, + 0x650B, + 0x651F, + 0x6520, + 0x6528, + 0x6529, + 0x6540, + 0x6541, + 0x6542, + 0x6543, + 0x655A, + 0x655B, + 0x655F, + 0x6560, + 0x657D, + 0x657E, + 0x658A, + 0x658B, + 0x659A, + 0x659B, + 0x65B5, + 0x65B6, + 0x65BE, + 0x65BF, + 0x65C8, + 0x65CA, + 0x65D1, + 0x65D2, + 0x65D8, + 0x65D9, + 0x65DC, + 0x65DD, + 0x65E4, + 0x65E5, + 0x65EA, + 0x65EB, + 0x65F9, + 0x65FA, + 0x65FE, + 0x65FF, + 0x6617, + 0x6618, + 0x662C, + 0x662D, + 0x6637, + 0x6639, + 0x6648, + 0x6649, + 0x664D, + 0x664E, + 0x6660, + 0x6661, + 0x6663, + 0x6664, + 0x6692, + 0x6693, + 0x669C, + 0x669D, + 0x669E, + 0x669F, + 0x66AC, + 0x66AE, + 0x66D0, + 0x66D1, + 0x66D3, + 0x66D4, + 0x66D7, + 0x66D8, + 0x66DF, + 0x66E0, + 0x66EF, + 0x66F0, + 0x6702, + 0x6703, + 0x6707, + 0x6708, + 0x6719, + 0x671A, + 0x6724, + 0x6725, + 0x6729, + 0x672A, + 0x6767, + 0x6768, + 0x6788, + 0x6789, + 0x6796, + 0x6797, + 0x67BD, + 0x67BE, + 0x67BF, + 0x67C0, + 0x67D5, + 0x67D6, + 0x67D7, + 0x67D8, + 0x67F9, + 0x67FA, + 0x6801, + 0x6802, + 0x6815, + 0x6816, + 0x6827, + 0x6828, + 0x6830, + 0x6831, + 0x6858, + 0x6859, + 0x685A, + 0x685B, + 0x685E, + 0x685F, + 0x687A, + 0x687B, + 0x6895, + 0x6896, + 0x6899, + 0x689A, + 0x68A5, + 0x68A6, + 0x68B8, + 0x68B9, + 0x68C3, + 0x68C4, + 0x68D9, + 0x68DA, + 0x68E2, + 0x68E3, + 0x68E5, + 0x68E6, + 0x6909, + 0x690A, + 0x693E, + 0x693F, + 0x694D, + 0x694E, + 0x699F, + 0x69A0, + 0x69A2, + 0x69A3, + 0x69C0, + 0x69C1, + 0x69D1, + 0x69D3, + 0x69D5, + 0x69D8, + 0x6A03, + 0x6A04, + 0x6A1C, + 0x6A1D, + 0x6A24, + 0x6A25, + 0x6A37, + 0x6A38, + 0x6A4A, + 0x6A4B, + 0x6A5C, + 0x6A5D, + 0x6A6E, + 0x6A6F, + 0x6A70, + 0x6A71, + 0x6A86, + 0x6A87, + 0x6A8A, + 0x6A8B, + 0x6A8F, + 0x6A90, + 0x6A99, + 0x6A9A, + 0x6A9D, + 0x6A9E, + 0x6AB1, + 0x6AB2, + 0x6ABE, + 0x6ABF, + 0x6AC0, + 0x6AC1, + 0x6AC4, + 0x6AC5, + 0x6AC9, + 0x6ACA, + 0x6AD8, + 0x6AD9, + 0x6AE9, + 0x6AEA, + 0x6B0E, + 0x6B0F, + 0x6B1B, + 0x6B1C, + 0x6B2E, + 0x6B2F, + 0x6B35, + 0x6B36, + 0x6B40, + 0x6B41, + 0x6B57, + 0x6B59, + 0x6B5D, + 0x6B5E, + 0x6B68, + 0x6B69, + 0x6B6C, + 0x6B6D, + 0x6B6E, + 0x6B6F, + 0x6B71, + 0x6B72, + 0x6B75, + 0x6B76, + 0x6B7D, + 0x6B7E, + 0x6BB8, + 0x6BB9, + 0x6BE9, + 0x6BEA, + 0x6BF1, + 0x6BF2, + 0x6BF4, + 0x6BF5, + 0x6BFA, + 0x6BFB, + 0x6C0A, + 0x6C0B, + 0x6C1C, + 0x6C1D, + 0x6C2D, + 0x6C2E, + 0x6C3C, + 0x6C3D, + 0x6C45, + 0x6C46, + 0x6C6C, + 0x6C6D, + 0x6C6E, + 0x6C6F, + 0x6CA0, + 0x6CA1, + 0x6CD8, + 0x6CD9, + 0x6CF4, + 0x6CF5, + 0x6D02, + 0x6D03, + 0x6D1C, + 0x6D1D, + 0x6D24, + 0x6D25, + 0x6D71, + 0x6D72, + 0x6D81, + 0x6D82, + 0x6D96, + 0x6D97, + 0x6DB0, + 0x6DB2, + 0x6DB6, + 0x6DB7, + 0x6DFE, + 0x6E00, + 0x6E01, + 0x6E03, + 0x6E06, + 0x6E07, + 0x6E12, + 0x6E13, + 0x6E18, + 0x6E19, + 0x6E2A, + 0x6E2B, + 0x6E4C, + 0x6E4D, + 0x6E6C, + 0x6E6D, + 0x6E7B, + 0x6E7E, + 0x6E8B, + 0x6E8C, + 0x6E95, + 0x6E96, + 0x6EDB, + 0x6EDC, + 0x6EE3, + 0x6EE4, + 0x6F04, + 0x6F05, + 0x6F0B, + 0x6F0C, + 0x6F42, + 0x6F43, + 0x6F48, + 0x6F49, + 0x6F4A, + 0x6F4B, + 0x6F79, + 0x6F7A, + 0x6F98, + 0x6F99, + 0x6F9A, + 0x6F9B, + 0x6F9F, + 0x6FA0, + 0x6FB7, + 0x6FB8, + 0x6FC5, + 0x6FC6, + 0x6FD0, + 0x6FD1, + 0x6FD3, + 0x6FD4, + 0x6FF5, + 0x6FF6, + 0x6FFD, + 0x6FFE, + 0x7010, + 0x7011, + 0x7013, + 0x7014, + 0x7047, + 0x7048, + 0x704B, + 0x704C, + 0x704E, + 0x704F, + 0x7072, + 0x7074, + 0x707B, + 0x707C, + 0x7081, + 0x7082, + 0x708D, + 0x708E, + 0x7097, + 0x7098, + 0x709B, + 0x709C, + 0x70AA, + 0x70AB, + 0x70B2, + 0x70B3, + 0x70B6, + 0x70B7, + 0x70D5, + 0x70D6, + 0x70FE, + 0x70FF, + 0x7108, + 0x7109, + 0x7124, + 0x7125, + 0x7133, + 0x7135, + 0x7157, + 0x7158, + 0x716B, + 0x716C, + 0x716D, + 0x716E, + 0x718D, + 0x718E, + 0x7196, + 0x7197, + 0x71A6, + 0x71A7, + 0x71AB, + 0x71AC, + 0x71B6, + 0x71B7, + 0x71CC, + 0x71CD, + 0x71D3, + 0x71D4, + 0x71F3, + 0x71F4, + 0x71FA, + 0x71FB, + 0x720B, + 0x720C, + 0x7211, + 0x7212, + 0x7215, + 0x7216, + 0x7217, + 0x7218, + 0x7220, + 0x7221, + 0x7224, + 0x7226, + 0x722F, + 0x7230, + 0x7234, + 0x7235, + 0x7245, + 0x7246, + 0x724E, + 0x724F, + 0x7250, + 0x7251, + 0x7255, + 0x7256, + 0x72AB, + 0x72AC, + 0x72BE, + 0x72BF, + 0x7302, + 0x7303, + 0x7310, + 0x7311, + 0x7328, + 0x7329, + 0x7353, + 0x7354, + 0x739C, + 0x739D, + 0x73C1, + 0x73C2, + 0x73F3, + 0x73F4, + 0x73FB, + 0x73FC, + 0x7418, + 0x7419, + 0x7439, + 0x743A, + 0x743E, + 0x743F, + 0x7447, + 0x7448, + 0x7449, + 0x744A, + 0x7458, + 0x7459, + 0x747B, + 0x747C, + 0x7484, + 0x7485, + 0x7496, + 0x7497, + 0x749D, + 0x749E, + 0x74C7, + 0x74C8, + 0x74C9, + 0x74CA, + 0x74CC, + 0x74CD, + 0x74EB, + 0x74EC, + 0x7520, + 0x7521, + 0x7541, + 0x7542, + 0x7552, + 0x7553, + 0x7555, + 0x7556, + 0x755E, + 0x755F, + 0x7561, + 0x7562, + 0x7571, + 0x7572, + 0x757B, + 0x757C, + 0x7585, + 0x7586, + 0x75A9, + 0x75AA, + 0x75B7, + 0x75B8, + 0x75DC, + 0x75DD, + 0x75EE, + 0x75EF, + 0x762C, + 0x762D, + 0x7644, + 0x7646, + 0x7651, + 0x7652, + 0x7655, + 0x7656, + 0x7673, + 0x7674, + 0x768D, + 0x768E, + 0x76A1, + 0x76A3, + 0x76A5, + 0x76A6, + 0x76A8, + 0x76A9, + 0x76B3, + 0x76B4, + 0x76B6, + 0x76B7, + 0x76C1, + 0x76C2, + 0x76CB, + 0x76CC, + 0x76D9, + 0x76DA, + 0x76EB, + 0x76EC, + 0x7700, + 0x7701, + 0x7702, + 0x7703, + 0x770E, + 0x770F, + 0x7721, + 0x7722, + 0x772B, + 0x772C, + 0x773F, + 0x7740, + 0x7742, + 0x7743, + 0x7764, + 0x7765, + 0x7796, + 0x7797, + 0x77A4, + 0x77A5, + 0x77BE, + 0x77BF, + 0x77C1, + 0x77C2, + 0x77D2, + 0x77D3, + 0x77DD, + 0x77DE, + 0x77E4, + 0x77E5, + 0x77E6, + 0x77E7, + 0x77F4, + 0x77F6, + 0x7824, + 0x7825, + 0x7836, + 0x7837, + 0x7842, + 0x7843, + 0x7846, + 0x7847, + 0x784B, + 0x784C, + 0x7876, + 0x7877, + 0x7888, + 0x7889, + 0x78C2, + 0x78C3, + 0x78C7, + 0x78C8, + 0x78D2, + 0x78D3, + 0x78F0, + 0x78F1, + 0x78F8, + 0x78F9, + 0x7900, + 0x7901, + 0x7908, + 0x7909, + 0x790D, + 0x790E, + 0x7915, + 0x7916, + 0x791F, + 0x7921, + 0x7932, + 0x7933, + 0x7936, + 0x7937, + 0x7959, + 0x795A, + 0x796C, + 0x796D, + 0x796E, + 0x796F, + 0x7975, + 0x7977, + 0x7986, + 0x7988, + 0x799E, + 0x799F, + 0x79A9, + 0x79AA, + 0x79BC, + 0x79BD, + 0x79C4, + 0x79C5, + 0x79C7, + 0x79C8, + 0x79CC, + 0x79CD, + 0x79D4, + 0x79D5, + 0x79D7, + 0x79D8, + 0x7A01, + 0x7A02, + 0x7A07, + 0x7A08, + 0x7A09, + 0x7A0A, + 0x7A2C, + 0x7A2D, + 0x7A38, + 0x7A39, + 0x7A3A, + 0x7A3B, + 0x7A64, + 0x7A65, + 0x7A6A, + 0x7A6B, + 0x7A6F, + 0x7A70, + 0x7A82, + 0x7A83, + 0x7A9A, + 0x7A9C, + 0x7AB9, + 0x7ABA, + 0x7ABB, + 0x7ABE, + 0x7AC2, + 0x7AC3, + 0x7AC6, + 0x7AC7, + 0x7AE9, + 0x7AEA, + 0x7AF5, + 0x7AF6, + 0x7AFC, + 0x7AFD, + 0x7B07, + 0x7B08, + 0x7B1F, + 0x7B20, + 0x7B27, + 0x7B28, + 0x7B29, + 0x7B2A, + 0x7B42, + 0x7B43, + 0x7B53, + 0x7B54, + 0x7BA3, + 0x7BA4, + 0x7BA5, + 0x7BA6, + 0x7BB0, + 0x7BB1, + 0x7BB2, + 0x7BB3, + 0x7BFA, + 0x7BFB, + 0x7C1B, + 0x7C1C, + 0x7C2E, + 0x7C30, + 0x7C52, + 0x7C53, + 0x7C55, + 0x7C56, + 0x7C5D, + 0x7C5E, + 0x7C76, + 0x7C77, + 0x7C87, + 0x7C88, + 0x7C93, + 0x7C94, + 0x7C9A, + 0x7C9B, + 0x7CAC, + 0x7CAD, + 0x7CD3, + 0x7CD4, + 0x7CDA, + 0x7CDC, + 0x7CE1, + 0x7CE2, + 0x7CE3, + 0x7CE4, + 0x7CE5, + 0x7CE7, + 0x7CFC, + 0x7CFD, + 0x7CFF, + 0x7D00, + 0x7D23, + 0x7D24, + 0x7D2A, + 0x7D2B, + 0x7D2D, + 0x7D2E, + 0x7D48, + 0x7D49, + 0x7D4D, + 0x7D4E, + 0x7D5A, + 0x7D5B, + 0x7D64, + 0x7D65, + 0x7D78, + 0x7D79, + 0x7D82, + 0x7D83, + 0x7D95, + 0x7D96, + 0x7D98, + 0x7D99, + 0x7DA4, + 0x7DA5, + 0x7DA8, + 0x7DA9, + 0x7DCD, + 0x7DCE, + 0x7DD3, + 0x7DD4, + 0x7DE5, + 0x7DE6, + 0x7DEB, + 0x7DEC, + 0x7DFD, + 0x7E00, + 0x7E18, + 0x7E19, + 0x7E5B, + 0x7E5C, + 0x7E64, + 0x7E65, + 0x7E9D, + 0x7E9E, + 0x7F3B, + 0x7F3D, + 0x7F41, + 0x7F42, + 0x7F46, + 0x7F47, + 0x7F59, + 0x7F5A, + 0x7F84, + 0x7F85, + 0x7F90, + 0x7F91, + 0x7F97, + 0x7F98, + 0x7F99, + 0x7F9A, + 0x7FB4, + 0x7FB5, + 0x7FD6, + 0x7FD7, + 0x7FDD, + 0x7FDE, + 0x7FE4, + 0x7FE5, + 0x800A, + 0x800B, + 0x802F, + 0x8030, + 0x803C, + 0x803D, + 0x8040, + 0x8041, + 0x8066, + 0x8067, + 0x8088, + 0x8089, + 0x808E, + 0x808F, + 0x8094, + 0x8095, + 0x80A6, + 0x80A9, + 0x80B3, + 0x80B4, + 0x80B9, + 0x80BA, + 0x80DF, + 0x80E0, + 0x8103, + 0x8105, + 0x8134, + 0x8136, + 0x8184, + 0x8185, + 0x8190, + 0x8191, + 0x8196, + 0x8197, + 0x81CB, + 0x81CC, + 0x81E4, + 0x81E5, + 0x81EF, + 0x81F1, + 0x8213, + 0x8214, + 0x8224, + 0x8225, + 0x8241, + 0x8242, + 0x8265, + 0x8266, + 0x828C, + 0x828D, + 0x82B2, + 0x82B3, + 0x82E2, + 0x82E3, + 0x82FC, + 0x82FD, + 0x830A, + 0x830B, + 0x8310, + 0x8311, + 0x8330, + 0x8331, + 0x8355, + 0x8356, + 0x83BE, + 0x83BF, + 0x83E6, + 0x83E7, + 0x83ED, + 0x83EE, + 0x8414, + 0x8415, + 0x8416, + 0x8418, + 0x841F, + 0x8420, + 0x8458, + 0x8459, + 0x8483, + 0x8484, + 0x8495, + 0x8496, + 0x84B7, + 0x84B8, + 0x84C3, + 0x84C4, + 0x84ED, + 0x84EE, + 0x8505, + 0x8506, + 0x8510, + 0x8511, + 0x8532, + 0x8534, + 0x854C, + 0x854D, + 0x8550, + 0x8551, + 0x857F, + 0x8580, + 0x8593, + 0x8594, + 0x85B2, + 0x85B3, + 0x85BB, + 0x85BC, + 0x85CC, + 0x85CD, + 0x85EE, + 0x85EF, + 0x85F3, + 0x85F4, + 0x85FC, + 0x85FD, + 0x8603, + 0x8604, + 0x860D, + 0x860F, + 0x8610, + 0x8611, + 0x8615, + 0x8616, + 0x861D, + 0x861E, + 0x8637, + 0x8638, + 0x8657, + 0x8658, + 0x8675, + 0x8676, + 0x8689, + 0x868A, + 0x8692, + 0x8693, + 0x86A0, + 0x86A1, + 0x86A6, + 0x86A7, + 0x86D5, + 0x86D6, + 0x86E0, + 0x86E1, + 0x86E7, + 0x86E8, + 0x86FD, + 0x86FE, + 0x871D, + 0x871E, + 0x872F, + 0x8730, + 0x873D, + 0x873E, + 0x8745, + 0x8746, + 0x8771, + 0x8772, + 0x878E, + 0x878F, + 0x8799, + 0x879A, + 0x87DA, + 0x87DB, + 0x87F0, + 0x87F1, + 0x8807, + 0x8808, + 0x8812, + 0x8813, + 0x882D, + 0x882E, + 0x883A, + 0x883B, + 0x8847, + 0x8848, + 0x8858, + 0x8859, + 0x885C, + 0x885D, + 0x885F, + 0x8860, + 0x887A, + 0x887B, + 0x88E6, + 0x88E7, + 0x88E9, + 0x88EA, + 0x88ED, + 0x88EE, + 0x8903, + 0x8904, + 0x890F, + 0x8910, + 0x8924, + 0x8925, + 0x8965, + 0x8966, + 0x8975, + 0x8976, + 0x897D, + 0x897E, + 0x898D, + 0x898E, + 0x8990, + 0x8991, + 0x8994, + 0x8995, + 0x8999, + 0x899A, + 0x89B0, + 0x89B1, + 0x89B4, + 0x89B5, + 0x89BB, + 0x89BD, + 0x89EE, + 0x89EF, + 0x89F5, + 0x89F6, + 0x89F9, + 0x89FA, + 0x89FD, + 0x89FE, + 0x8A05, + 0x8A07, + 0x8A14, + 0x8A15, + 0x8A19, + 0x8A1A, + 0x8A20, + 0x8A22, + 0x8A2B, + 0x8A2C, + 0x8A3D, + 0x8A3E, + 0x8A4B, + 0x8A4C, + 0x8A64, + 0x8A65, + 0x8A78, + 0x8A79, + 0x8A7D, + 0x8A7E, + 0x8A88, + 0x8A89, + 0x8A9F, + 0x8AA0, + 0x8AAF, + 0x8AB0, + 0x8AB7, + 0x8AB8, + 0x8AD0, + 0x8AD1, + 0x8AEC, + 0x8AED, + 0x8B29, + 0x8B2A, + 0x8B32, + 0x8B33, + 0x8B38, + 0x8B39, + 0x8B3F, + 0x8B40, + 0x8B61, + 0x8B63, + 0x8B69, + 0x8B6A, + 0x8B75, + 0x8B76, + 0x8B7C, + 0x8B7D, + 0x8B81, + 0x8B82, + 0x8B87, + 0x8B88, + 0x8B8D, + 0x8B8E, + 0x8B8F, + 0x8B90, + 0x8B9B, + 0x8B9C, + 0x8C38, + 0x8C39, + 0x8C40, + 0x8C41, + 0x8C44, + 0x8C45, + 0x8C51, + 0x8C54, + 0x8C58, + 0x8C59, + 0x8C74, + 0x8C75, + 0x8C7F, + 0x8C80, + 0x8C83, + 0x8C84, + 0x8C87, + 0x8C88, + 0x8C8B, + 0x8C8C, + 0x8C9B, + 0x8C9C, + 0x8CA6, + 0x8CA7, + 0x8CCB, + 0x8CCC, + 0x8CD6, + 0x8CD7, + 0x8CD8, + 0x8CD9, + 0x8CE9, + 0x8CEA, + 0x8CF7, + 0x8CF8, + 0x8D01, + 0x8D02, + 0x8D11, + 0x8D13, + 0x8D7C, + 0x8D7D, + 0x8DA6, + 0x8DA7, + 0x8DC0, + 0x8DC1, + 0x8DE5, + 0x8DE6, + 0x8E01, + 0x8E02, + 0x8E0B, + 0x8E0C, + 0x8E32, + 0x8E33, + 0x8E46, + 0x8E47, + 0x8E4F, + 0x8E50, + 0x8E6E, + 0x8E6F, + 0x8E75, + 0x8E76, + 0x8E77, + 0x8E78, + 0x8E79, + 0x8E7A, + 0x8E9B, + 0x8E9C, + 0x8EA2, + 0x8EA3, + 0x8EB3, + 0x8EB4, + 0x8EB6, + 0x8EB8, + 0x8EC1, + 0x8EC2, + 0x8EC4, + 0x8EC5, + 0x8ED9, + 0x8EDA, + 0x8EF0, + 0x8EF1, + 0x8F0F, + 0x8F10, + 0x8F2D, + 0x8F2E, + 0x8F3A, + 0x8F3B, + 0x8F41, + 0x8F42, + 0x8F9D, + 0x8F9E, + 0x8FA4, + 0x8FA5, + 0x8FB3, + 0x8FB4, + 0x8FC3, + 0x8FC4, + 0x8FCA, + 0x8FCB, + 0x8FE7, + 0x8FE8, + 0x902A, + 0x902B, + 0x902C, + 0x902D, + 0x9037, + 0x9038, + 0x9040, + 0x9041, + 0x9046, + 0x9047, + 0x90AB, + 0x90AC, + 0x90CC, + 0x90CE, + 0x90D2, + 0x90D3, + 0x90F6, + 0x90F7, + 0x910A, + 0x910B, + 0x913C, + 0x913E, + 0x9159, + 0x915A, + 0x917B, + 0x917C, + 0x9195, + 0x9196, + 0x9198, + 0x9199, + 0x91A9, + 0x91AA, + 0x91BF, + 0x91C0, + 0x91C4, + 0x91C5, + 0x91E0, + 0x91E1, + 0x91EF, + 0x91F0, + 0x9213, + 0x9214, + 0x921F, + 0x9220, + 0x9222, + 0x9223, + 0x9243, + 0x9244, + 0x9269, + 0x926B, + 0x9281, + 0x9282, + 0x9284, + 0x9285, + 0x929E, + 0x929F, + 0x92BD, + 0x92BE, + 0x92D4, + 0x92D5, + 0x92DB, + 0x92DC, + 0x92E2, + 0x92E3, + 0x931C, + 0x931D, + 0x9330, + 0x9332, + 0x9362, + 0x9363, + 0x9368, + 0x9369, + 0x936B, + 0x936C, + 0x936F, + 0x9370, + 0x9373, + 0x9374, + 0x9378, + 0x9379, + 0x937F, + 0x9380, + 0x9381, + 0x9382, + 0x938B, + 0x938C, + 0x939C, + 0x939D, + 0x93A0, + 0x93A1, + 0x93AB, + 0x93AC, + 0x93BB, + 0x93BC, + 0x93E0, + 0x93E1, + 0x93F3, + 0x93F4, + 0x9402, + 0x9403, + 0x9417, + 0x9418, + 0x941C, + 0x941D, + 0x941E, + 0x9420, + 0x9424, + 0x9425, + 0x9443, + 0x9444, + 0x944E, + 0x944F, + 0x946C, + 0x946D, + 0x947B, + 0x947C, + 0x9578, + 0x957A, + 0x957E, + 0x957F, + 0x9585, + 0x9586, + 0x9597, + 0x9598, + 0x95B3, + 0x95B5, + 0x95B8, + 0x95B9, + 0x95C1, + 0x95C2, + 0x95D9, + 0x95DA, + 0x95DD, + 0x95DE, + 0x9625, + 0x9627, + 0x9629, + 0x962A, + 0x963E, + 0x963F, + 0x9656, + 0x9658, + 0x9679, + 0x967A, + 0x967B, + 0x967C, + 0x967F, + 0x9680, + 0x9681, + 0x9683, + 0x968C, + 0x968D, + 0x9696, + 0x9697, + 0x969A, + 0x969B, + 0x969D, + 0x969E, + 0x969F, + 0x96A0, + 0x96AB, + 0x96AC, + 0x96AF, + 0x96B0, + 0x96B5, + 0x96B6, + 0x96E4, + 0x96E5, + 0x96E6, + 0x96E8, + 0x96FC, + 0x96FD, + 0x9714, + 0x9715, + 0x9717, + 0x9718, + 0x971A, + 0x971C, + 0x9733, + 0x9735, + 0x9737, + 0x9738, + 0x9740, + 0x9742, + 0x974D, + 0x974E, + 0x9757, + 0x9758, + 0x9763, + 0x9764, + 0x9775, + 0x9776, + 0x9787, + 0x9788, + 0x9789, + 0x978A, + 0x979B, + 0x979C, + 0x97A9, + 0x97AA, + 0x97B0, + 0x97B2, + 0x97B5, + 0x97B6, + 0x97BE, + 0x97BF, + 0x97C0, + 0x97C1, + 0x97D2, + 0x97D3, + 0x97FC, + 0x97FD, + 0x981F, + 0x9820, + 0x9825, + 0x9826, + 0x982A, + 0x982B, + 0x9833, + 0x9834, + 0x983A, + 0x983B, + 0x983E, + 0x983F, + 0x9842, + 0x9843, + 0x9847, + 0x9848, + 0x9856, + 0x9857, + 0x9866, + 0x9867, + 0x9868, + 0x9869, + 0x98B7, + 0x98B8, + 0x98CA, + 0x98CB, + 0x98E4, + 0x98E5, + 0x98EC, + 0x98ED, + 0x98F1, + 0x98F2, + 0x98F8, + 0x98F9, + 0x98FB, + 0x98FC, + 0x9919, + 0x991A, + 0x993B, + 0x993C, + 0x9944, + 0x9945, + 0x995A, + 0x995B, + 0x995D, + 0x995E, + 0x99BF, + 0x99C0, + 0x99E0, + 0x99E1, + 0x99E6, + 0x99E7, + 0x99EB, + 0x99EC, + 0x99F5, + 0x99F6, + 0x9A10, + 0x9A11, + 0x9A17, + 0x9A19, + 0x9A3B, + 0x9A3C, + 0x9A51, + 0x9A52, + 0x9A58, + 0x9A59, + 0x9A5D, + 0x9A5E, + 0x9A63, + 0x9A64, + 0x9AA9, + 0x9AAA, + 0x9ABD, + 0x9ABE, + 0x9AC8, + 0x9AC9, + 0x9AD7, + 0x9AD8, + 0x9AE0, + 0x9AE1, + 0x9AE4, + 0x9AE5, + 0x9AE8, + 0x9AEA, + 0x9AF0, + 0x9AF1, + 0x9B00, + 0x9B01, + 0x9B02, + 0x9B03, + 0x9B09, + 0x9B0A, + 0x9B14, + 0x9B15, + 0x9B1B, + 0x9B1C, + 0x9B34, + 0x9B35, + 0x9B3D, + 0x9B3E, + 0x9B40, + 0x9B41, + 0x9B50, + 0x9B51, + 0x9B57, + 0x9B58, + 0x9B62, + 0x9B63, + 0x9B72, + 0x9B73, + 0x9B89, + 0x9B8A, + 0x9B8C, + 0x9B8D, + 0x9B99, + 0x9B9A, + 0x9BC2, + 0x9BC3, + 0x9BF6, + 0x9BF7, + 0x9C00, + 0x9C02, + 0x9C03, + 0x9C04, + 0x9C42, + 0x9C43, + 0x9C4F, + 0x9C50, + 0x9C51, + 0x9C52, + 0x9C61, + 0x9C62, + 0x9C64, + 0x9C65, + 0x9C7B, + 0x9C7C, + 0x9D0C, + 0x9D0E, + 0x9D11, + 0x9D12, + 0x9D27, + 0x9D28, + 0x9D35, + 0x9D36, + 0x9D3C, + 0x9D3D, + 0x9D6D, + 0x9D6E, + 0x9D95, + 0x9D96, + 0x9DAE, + 0x9DAF, + 0x9DBD, + 0x9DBE, + 0x9DC0, + 0x9DC1, + 0x9DEA, + 0x9DEB, + 0x9DFC, + 0x9DFD, + 0x9E0E, + 0x9E0F, + 0x9E16, + 0x9E17, + 0x9E1C, + 0x9E1D, + 0x9E7B, + 0x9E7C, + 0x9E8F, + 0x9E91, + 0x9E98, + 0x9E99, + 0x9E9E, + 0x9E9F, + 0x9EA2, + 0x9EA3, + 0x9EAB, + 0x9EAD, + 0x9EB1, + 0x9EB2, + 0x9EEC, + 0x9EED, + 0x9EF1, + 0x9EF2, + 0x9F03, + 0x9F04, + 0x9F11, + 0x9F12, + 0x9F14, + 0x9F15, + 0x9F26, + 0x9F27, + 0x9F45, + 0x9F46, + 0x9F53, + 0x9F54, + 0x9F6D, + 0x9F6E, + 0x9FA1, + 0x9FA2, + 0x9FA3, + 0x9FA4, + 0x9FA6, 0xA78D, 0xA78E, - 0xA792, - 0xA794, 0xA7AA, 0xA7AB, - 0xA7C0, - 0xA7CB, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, - 0xA7DA, - 0xA9E7, - 0xA9FF, - 0xAA60, - 0xAA77, - 0xAA7A, - 0xAA80, - 0xAB01, - 0xAB07, - 0xAB09, - 0xAB0F, - 0xAB11, - 0xAB17, - 0xAB20, - 0xAB27, - 0xAB28, - 0xAB2F, - 0xAB66, - 0xAB68, + 0xAA7B, + 0xAA7C, 0xAC00, 0xD7A4, - 0xFA0E, - 0xFA10, - 0xFA11, - 0xFA12, - 0xFA13, - 0xFA15, - 0xFA1F, - 0xFA20, - 0xFA21, - 0xFA22, - 0xFA23, - 0xFA25, - 0xFA27, - 0xFA2A, 0x11301, 0x11302, 0x11303, 0x11304, - 0x1133B, + 0x1133C, 0x1133D, - 0x16FF0, - 0x16FF2, - 0x1B11F, - 0x1B123, - 0x1B132, - 0x1B133, - 0x1B150, - 0x1B153, - 0x1B155, - 0x1B156, - 0x1B164, - 0x1B168, - 0x1DF00, - 0x1DF1F, - 0x1DF25, - 0x1DF2B, - 0x1E08F, - 0x1E090, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -280706,22 +300801,122 @@ static const UV UNI_IDENTIFIERSTATUS__RE 0x1E7EF, 0x1E7F0, 0x1E7FF, - 0x20000, - 0x2A6E0, - 0x2A700, - 0x2B73A, - 0x2B740, - 0x2B81E, - 0x2B820, - 0x2CEA2, - 0x2CEB0, - 0x2EBE1, - 0x2EBF0, - 0x2EE5E, - 0x30000, - 0x3134B, - 0x31350, - 0x323B0 + 0x2070E, + 0x2070F, + 0x20731, + 0x20732, + 0x20779, + 0x2077A, + 0x20C53, + 0x20C54, + 0x20C78, + 0x20C79, + 0x20C96, + 0x20C97, + 0x20CCF, + 0x20CD0, + 0x20CD5, + 0x20CD6, + 0x20D15, + 0x20D16, + 0x20D7C, + 0x20D7D, + 0x20D7F, + 0x20D80, + 0x20E0E, + 0x20E10, + 0x20E77, + 0x20E78, + 0x20E9D, + 0x20E9E, + 0x20EA2, + 0x20EA3, + 0x20ED7, + 0x20ED8, + 0x20EF9, + 0x20EFB, + 0x20F2D, + 0x20F2F, + 0x20F4C, + 0x20F4D, + 0x20FB4, + 0x20FB5, + 0x20FBC, + 0x20FBD, + 0x20FEA, + 0x20FEB, + 0x2105C, + 0x2105D, + 0x2106F, + 0x21070, + 0x21075, + 0x21077, + 0x2107B, + 0x2107C, + 0x210C1, + 0x210C2, + 0x210C9, + 0x210CA, + 0x211D9, + 0x211DA, + 0x220C7, + 0x220C8, + 0x227B5, + 0x227B6, + 0x22AD5, + 0x22AD6, + 0x22B43, + 0x22B44, + 0x22BCA, + 0x22BCB, + 0x22C51, + 0x22C52, + 0x22C55, + 0x22C56, + 0x22CC2, + 0x22CC3, + 0x22D08, + 0x22D09, + 0x22D4C, + 0x22D4D, + 0x22D67, + 0x22D68, + 0x22EB3, + 0x22EB4, + 0x23CB7, + 0x23CB8, + 0x244D3, + 0x244D4, + 0x24DB8, + 0x24DB9, + 0x24DEA, + 0x24DEB, + 0x2512B, + 0x2512C, + 0x26258, + 0x26259, + 0x267CC, + 0x267CD, + 0x269F2, + 0x269F3, + 0x269FA, + 0x269FB, + 0x27A3E, + 0x27A3F, + 0x2815D, + 0x2815E, + 0x28207, + 0x28208, + 0x282E2, + 0x282E3, + 0x28CCA, + 0x28CCB, + 0x28CCD, + 0x28CCE, + 0x28CD2, + 0x28CD3, + 0x29D98, + 0x29D99 }; # endif /* EBCDIC 037 */ @@ -280877,7 +301072,7 @@ static const UV UNI_IDENTIFIERTYPE__DEFA # endif /* EBCDIC 037 */ static const UV UNI_IDENTIFIERTYPE__EXCLUSION_invlist[] = { /* for all charsets */ - 493, /* Number of elements */ + 521, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -281027,7 +301222,7 @@ static const UV UNI_IDENTIFIERTYPE__EXCL 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -281240,6 +301435,8 @@ static const UV UNI_IDENTIFIERTYPE__EXCL 0x11AA3, 0x11AC0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -281272,6 +301469,22 @@ static const UV UNI_IDENTIFIERTYPE__EXCL 0x11D48, 0x11D50, 0x11D5A, + 0x11D60, + 0x11D66, + 0x11D67, + 0x11D69, + 0x11D6A, + 0x11D8F, + 0x11D90, + 0x11D92, + 0x11D93, + 0x11D99, + 0x11DA0, + 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -281324,16 +301537,20 @@ static const UV UNI_IDENTIFIERTYPE__EXCL 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16FE0, 0x16FE2, 0x16FE4, 0x16FE5, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1B170, 0x1B2FC, 0x1BC00, @@ -281370,6 +301587,12 @@ static const UV UNI_IDENTIFIERTYPE__EXCL 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E800, 0x1E8C5, 0x1E8C7, @@ -281392,8 +301615,8 @@ static const UV UNI_IDENTIFIERTYPE__INCL 0x3B, 0xB7, 0xB8, - 0x375, - 0x376, + 0x2BB, + 0x2BD, 0x58A, 0x58B, 0x5F3, @@ -281437,8 +301660,8 @@ static const UV UNI_IDENTIFIERTYPE__INCL 0x7E, 0xB3, 0xB4, - 0x375, - 0x376, + 0x2BB, + 0x2BD, 0x58A, 0x58B, 0x5F3, @@ -281482,8 +301705,8 @@ static const UV UNI_IDENTIFIERTYPE__INCL 0x7E, 0xB3, 0xB4, - 0x375, - 0x376, + 0x2BB, + 0x2BD, 0x58A, 0x58B, 0x5F3, @@ -281507,11 +301730,13 @@ static const UV UNI_IDENTIFIERTYPE__INCL # endif /* EBCDIC 037 */ static const UV UNI_IDENTIFIERTYPE__LIMITEDUSE_invlist[] = { /* for all charsets */ - 173, /* Number of elements */ + 167, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ 0x0, + 0x2EA, + 0x2EC, 0x700, 0x70E, 0x70F, @@ -281586,6 +301811,10 @@ static const UV UNI_IDENTIFIERTYPE__LIMI 0x2D71, 0x2D7F, 0x2D80, + 0x3105, + 0x3130, + 0x31A0, + 0x31C0, 0xA000, 0xA48D, 0xA490, @@ -281644,18 +301873,6 @@ static const UV UNI_IDENTIFIERTYPE__LIMI 0x11462, 0x11AB0, 0x11AC0, - 0x11D60, - 0x11D66, - 0x11D67, - 0x11D69, - 0x11D6A, - 0x11D8F, - 0x11D90, - 0x11D92, - 0x11D93, - 0x11D99, - 0x11DA0, - 0x11DAA, 0x11FB0, 0x11FB1, 0x16800, @@ -281689,7 +301906,7 @@ static const UV UNI_IDENTIFIERTYPE__LIMI # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_IDENTIFIERTYPE__NOTCHARACTER_invlist[] = { /* for ASCII/Latin1 */ - 1465, /* Number of elements */ + 1473, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -281743,8 +301960,6 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -281912,7 +302127,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -281936,7 +302151,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -282127,7 +302342,9 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -282185,7 +302402,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -282197,8 +302414,6 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -282259,14 +302474,8 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -282337,12 +302546,6 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -282485,7 +302688,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -282549,8 +302752,10 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -282716,6 +302921,8 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -282760,6 +302967,10 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -282818,6 +303029,10 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -282827,13 +303042,13 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -282863,9 +303078,13 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -282972,6 +303191,12 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -283087,14 +303312,12 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -283114,34 +303337,36 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -283151,7 +303376,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -283168,7 +303393,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_IDENTIFIERTYPE__NOTCHARACTER_invlist[] = { /* for EBCDIC 1047 */ - 1469, /* Number of elements */ + 1477, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -283226,8 +303451,6 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -283395,7 +303618,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -283419,7 +303642,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -283610,7 +303833,9 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -283668,7 +303893,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -283680,8 +303905,6 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -283742,14 +303965,8 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -283820,12 +304037,6 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -283968,7 +304179,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -284032,8 +304243,10 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -284199,6 +304412,8 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -284243,6 +304458,10 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -284301,6 +304520,10 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -284310,13 +304533,13 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -284346,9 +304569,13 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -284455,6 +304682,12 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -284570,14 +304803,12 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -284597,34 +304828,36 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -284634,7 +304867,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -284651,7 +304884,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_IDENTIFIERTYPE__NOTCHARACTER_invlist[] = { /* for EBCDIC 037 */ - 1469, /* Number of elements */ + 1477, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -284709,8 +304942,6 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -284878,7 +305109,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -284902,7 +305133,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -285093,7 +305324,9 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -285151,7 +305384,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -285163,8 +305396,6 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -285225,14 +305456,8 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -285303,12 +305528,6 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -285451,7 +305670,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -285515,8 +305734,10 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -285682,6 +305903,8 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -285726,6 +305949,10 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -285784,6 +306011,10 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -285793,13 +306024,13 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -285829,9 +306060,13 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -285938,6 +306173,12 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -286053,14 +306294,12 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -286080,34 +306319,36 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -286117,7 +306358,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTC 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -286422,7 +306663,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTN 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -286957,7 +307198,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTN 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -287490,7 +307731,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTN 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -287725,7 +307966,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTN # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_IDENTIFIERTYPE__NOTXID_invlist[] = { /* for ASCII/Latin1 */ - 731, /* Number of elements */ + 745, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -287780,6 +308021,8 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x2EE, 0x2EF, 0x300, + 0x375, + 0x376, 0x3F6, 0x3F7, 0x482, @@ -287979,7 +308222,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x20A0, 0x20A8, 0x20A9, - 0x20C1, + 0x20C2, 0x20DD, 0x20E1, 0x20E2, @@ -288031,8 +308274,6 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x2ADD, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -288125,10 +308366,12 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0xABEB, 0xABEC, 0xFBB2, - 0xFBC3, + 0xFBD3, 0xFD3E, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDD0, 0xFDFD, 0xFE00, @@ -288212,6 +308455,8 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x10E7F, 0x10EAD, 0x10EAE, + 0x10ED0, + 0x10ED9, 0x10F1D, 0x10F27, 0x10F51, @@ -288328,8 +308573,14 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x1BCA0, 0x1CC00, 0x1CCD6, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -288413,14 +308664,12 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -288440,26 +308689,32 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* ASCII/Latin1 */ @@ -288470,7 +308725,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTX && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_IDENTIFIERTYPE__NOTXID_invlist[] = { /* for EBCDIC 1047 */ - 745, /* Number of elements */ + 759, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -288539,6 +308794,8 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x2EE, 0x2EF, 0x300, + 0x375, + 0x376, 0x3F6, 0x3F7, 0x482, @@ -288738,7 +308995,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x20A0, 0x20A8, 0x20A9, - 0x20C1, + 0x20C2, 0x20DD, 0x20E1, 0x20E2, @@ -288790,8 +309047,6 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x2ADD, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -288884,10 +309139,12 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0xABEB, 0xABEC, 0xFBB2, - 0xFBC3, + 0xFBD3, 0xFD3E, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDD0, 0xFDFD, 0xFE00, @@ -288971,6 +309228,8 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x10E7F, 0x10EAD, 0x10EAE, + 0x10ED0, + 0x10ED9, 0x10F1D, 0x10F27, 0x10F51, @@ -289087,8 +309346,14 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x1BCA0, 0x1CC00, 0x1CCD6, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -289172,14 +309437,12 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -289199,26 +309462,32 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* EBCDIC 1047 */ @@ -289229,7 +309498,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTX && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_IDENTIFIERTYPE__NOTXID_invlist[] = { /* for EBCDIC 037 */ - 743, /* Number of elements */ + 757, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -289296,6 +309565,8 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x2EE, 0x2EF, 0x300, + 0x375, + 0x376, 0x3F6, 0x3F7, 0x482, @@ -289495,7 +309766,7 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x20A0, 0x20A8, 0x20A9, - 0x20C1, + 0x20C2, 0x20DD, 0x20E1, 0x20E2, @@ -289547,8 +309818,6 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x2ADD, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -289641,10 +309910,12 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0xABEB, 0xABEC, 0xFBB2, - 0xFBC3, + 0xFBD3, 0xFD3E, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDD0, 0xFDFD, 0xFE00, @@ -289728,6 +309999,8 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x10E7F, 0x10EAD, 0x10EAE, + 0x10ED0, + 0x10ED9, 0x10F1D, 0x10F27, 0x10F51, @@ -289844,8 +310117,14 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x1BCA0, 0x1CC00, 0x1CCD6, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -289929,14 +310208,12 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -289956,36 +310233,44 @@ static const UV UNI_IDENTIFIERTYPE__NOTX 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* EBCDIC 037 */ static const UV UNI_IDENTIFIERTYPE__OBSOLETE_invlist[] = { /* for all charsets */ - 211, /* Number of elements */ + 365, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ 0x0, + 0x138, + 0x139, 0x18D, 0x18E, 0x1AA, @@ -290004,10 +310289,14 @@ static const UV UNI_IDENTIFIERTYPE__OBSO 0x27D, 0x29E, 0x29F, + 0x345, + 0x346, 0x363, 0x374, 0x376, 0x378, + 0x37B, + 0x37E, 0x37F, 0x380, 0x3D8, @@ -290017,61 +310306,127 @@ static const UV UNI_IDENTIFIERTYPE__OBSO 0x3F7, 0x3F9, 0x3FA, - 0x3FC, + 0x400, 0x460, 0x48A, + 0x49C, + 0x49E, + 0x4A6, + 0x4A8, + 0x4B8, + 0x4BA, 0x500, 0x510, - 0x52A, - 0x52E, + 0x514, + 0x524, + 0x526, + 0x530, 0x5A2, 0x5A3, 0x5C5, 0x5C7, - 0x640, + 0x63B, + 0x63D, + 0x63E, 0x641, 0x66E, 0x670, - 0x68E, - 0x68F, - 0x6A1, - 0x6A2, + 0x690, + 0x691, + 0x6AC, + 0x6AD, + 0x77E, + 0x780, 0x7E8, 0x7EB, 0x7FA, 0x7FB, + 0x88E, + 0x88F, 0x8AD, 0x8B2, + 0x8B5, + 0x8B6, + 0x90C, + 0x90D, + 0x93D, + 0x93E, 0x94E, 0x94F, 0x951, 0x953, + 0x960, + 0x964, + 0x971, + 0x972, 0x978, 0x979, 0x980, 0x981, + 0x9BD, + 0x9BE, + 0x9E0, + 0x9E4, 0x9FC, 0x9FD, + 0xABD, + 0xABE, + 0xAE0, + 0xAE4, + 0xB3D, + 0xB3E, + 0xB60, + 0xB62, 0xC00, 0xC01, 0xC34, 0xC35, + 0xC3D, + 0xC3E, 0xC58, 0xC5A, + 0xC5C, + 0xC5D, + 0xC60, + 0xC62, 0xC81, 0xC82, + 0xC8C, + 0xC8D, + 0xCB1, + 0xCB2, + 0xCBD, + 0xCBE, + 0xCDC, + 0xCDD, 0xCDE, 0xCDF, + 0xCE0, + 0xCE4, + 0xCF1, + 0xCF3, 0xD01, 0xD02, 0xD04, 0xD05, - 0xD3B, - 0xD3D, + 0xD3A, + 0xD3E, + 0xD4C, + 0xD4D, + 0xD4E, + 0xD4F, 0xD5F, - 0xD60, - 0xDE6, - 0xDF0, + 0xD62, + 0xD9E, + 0xD9F, + 0xF6A, + 0xF6B, + 0xF82, + 0xF84, + 0xF86, + 0xF90, + 0x1050, + 0x105A, 0x10A0, 0x10C6, 0x10F1, @@ -290090,7 +310445,7 @@ static const UV UNI_IDENTIFIERTYPE__OBSO 0x17D4, 0x17D8, 0x17D9, - 0x17DD, + 0x17DC, 0x17DE, 0x1AB0, 0x1ABE, @@ -290104,6 +310459,68 @@ static const UV UNI_IDENTIFIERTYPE__OBSO 0x1DCF, 0x1DD1, 0x1DE7, + 0x1F00, + 0x1F16, + 0x1F18, + 0x1F1E, + 0x1F20, + 0x1F46, + 0x1F48, + 0x1F4E, + 0x1F50, + 0x1F58, + 0x1F59, + 0x1F5A, + 0x1F5B, + 0x1F5C, + 0x1F5D, + 0x1F5E, + 0x1F5F, + 0x1F71, + 0x1F72, + 0x1F73, + 0x1F74, + 0x1F75, + 0x1F76, + 0x1F77, + 0x1F78, + 0x1F79, + 0x1F7A, + 0x1F7B, + 0x1F7C, + 0x1F7D, + 0x1F80, + 0x1FA0, + 0x1FB0, + 0x1FB2, + 0x1FB6, + 0x1FBB, + 0x1FBC, + 0x1FBD, + 0x1FC2, + 0x1FC5, + 0x1FC6, + 0x1FC9, + 0x1FCA, + 0x1FCB, + 0x1FCC, + 0x1FCD, + 0x1FD0, + 0x1FD3, + 0x1FD6, + 0x1FDB, + 0x1FE0, + 0x1FE3, + 0x1FE4, + 0x1FEB, + 0x1FF2, + 0x1FF5, + 0x1FF6, + 0x1FF9, + 0x1FFA, + 0x1FFB, + 0x1FFC, + 0x1FFD, 0x2056, 0x2057, 0x2058, @@ -290148,7 +310565,7 @@ static const UV UNI_IDENTIFIERTYPE__OBSO 0xA66F, 0xA670, 0xA67C, - 0xA680, + 0xA67F, 0xA69C, 0xA69E, 0xA6A0, @@ -290166,6 +310583,14 @@ static const UV UNI_IDENTIFIERTYPE__OBSO 0xA7AE, 0xA7B0, 0xA7B2, + 0xA7C0, + 0xA7C2, + 0xA7C4, + 0xA7C5, + 0xA7C7, + 0xA7CB, + 0xA7D0, + 0xA7DA, 0xA7F5, 0xA7F8, 0xA7FB, @@ -290192,16 +310617,28 @@ static const UV UNI_IDENTIFIERTYPE__OBSO 0x102FC, 0x16FE3, 0x16FE4, + 0x16FF0, + 0x16FF2, 0x1B000, - 0x1B11F, + 0x1B123, + 0x1B132, + 0x1B133, + 0x1B150, + 0x1B153, + 0x1B155, + 0x1B156, + 0x1B164, + 0x1B168, 0x1D200, - 0x1D246 + 0x1D246, + 0x1E08F, + 0x1E090 }; # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_IDENTIFIERTYPE__RECOMMENDED_invlist[] = { /* for ASCII/Latin1 */ - 769, /* Number of elements */ + 3207, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -290219,65 +310656,95 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xD8, 0xF7, 0xF8, + 0x114, + 0x116, + 0x12C, + 0x12E, 0x132, 0x134, + 0x138, + 0x139, 0x13F, 0x141, 0x149, 0x14A, + 0x14E, + 0x150, + 0x156, + 0x158, + 0x162, + 0x164, 0x17F, - 0x18F, - 0x190, + 0x181, + 0x182, + 0x186, + 0x187, + 0x189, + 0x18B, + 0x18E, + 0x193, + 0x194, + 0x195, + 0x196, + 0x19A, + 0x19D, + 0x19E, 0x1A0, 0x1A2, 0x1AF, 0x1B1, + 0x1B2, + 0x1B5, + 0x1B7, + 0x1B8, 0x1CD, + 0x1D5, 0x1DD, 0x1DE, - 0x1E4, 0x1E6, - 0x1F1, - 0x1F4, - 0x1F6, + 0x1EA, + 0x1EE, + 0x1F0, 0x1F8, + 0x1FA, + 0x218, 0x21C, - 0x21E, - 0x220, - 0x226, - 0x234, + 0x244, + 0x245, + 0x24C, + 0x24E, + 0x253, + 0x255, + 0x256, + 0x258, 0x259, 0x25A, - 0x2BB, - 0x2BD, - 0x2EC, - 0x2ED, + 0x25B, + 0x25C, + 0x263, + 0x264, + 0x268, + 0x26A, + 0x272, + 0x273, + 0x289, + 0x28A, + 0x28B, + 0x28C, + 0x292, + 0x293, 0x300, 0x305, 0x306, 0x30D, - 0x30F, - 0x312, - 0x313, - 0x315, 0x31B, 0x31C, 0x323, + 0x324, + 0x326, 0x329, - 0x32D, - 0x32F, - 0x330, + 0x331, 0x332, - 0x335, - 0x336, - 0x338, - 0x33A, - 0x342, - 0x343, - 0x345, - 0x346, - 0x37B, - 0x37E, 0x386, 0x387, 0x388, @@ -290288,80 +310755,136 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x3A2, 0x3A3, 0x3CF, - 0x3FC, + 0x401, + 0x40D, + 0x40E, + 0x450, + 0x451, + 0x45D, + 0x45E, 0x460, - 0x48A, - 0x500, - 0x510, - 0x52A, - 0x52E, - 0x530, + 0x490, + 0x49C, + 0x49E, + 0x4A6, + 0x4A8, + 0x4B8, + 0x4BA, + 0x4C1, + 0x4CF, + 0x4DA, + 0x4DC, + 0x4EA, + 0x4EE, + 0x4F6, + 0x4F8, + 0x4FA, + 0x524, + 0x526, 0x531, 0x557, - 0x559, - 0x55A, 0x561, 0x587, - 0x5B4, - 0x5B5, 0x5D0, 0x5EB, - 0x5EF, - 0x5F3, 0x620, - 0x640, + 0x63B, + 0x63D, + 0x63E, 0x641, + 0x653, + 0x654, 0x656, 0x660, 0x66A, 0x670, + 0x671, + 0x672, 0x673, 0x674, 0x675, 0x679, - 0x68E, - 0x68F, + 0x690, + 0x691, + 0x69B, + 0x69F, 0x6A1, 0x6A2, + 0x6A3, + 0x6A4, + 0x6AC, + 0x6AD, + 0x6B2, + 0x6B3, + 0x6B4, + 0x6B5, + 0x6B8, + 0x6BA, + 0x6BF, + 0x6C0, 0x6D4, 0x6D5, 0x6D6, - 0x6E5, - 0x6E7, 0x6EE, - 0x6FD, + 0x6FA, 0x6FF, 0x700, - 0x750, + 0x751, + 0x753, + 0x756, + 0x757, + 0x760, + 0x761, + 0x762, + 0x764, + 0x766, + 0x769, + 0x76A, + 0x76B, + 0x76E, + 0x772, + 0x780, 0x7B2, - 0x870, - 0x888, - 0x889, 0x88F, + 0x890, 0x8A0, - 0x8AD, - 0x8B2, - 0x8B3, - 0x8B5, - 0x8CA, + 0x8A1, + 0x8A2, + 0x8AA, + 0x8BB, + 0x8C3, + 0x8C7, + 0x8C8, 0x901, + 0x904, + 0x905, + 0x90C, + 0x90D, + 0x929, + 0x92A, + 0x934, + 0x935, + 0x93D, + 0x93E, + 0x944, + 0x945, 0x94E, 0x94F, - 0x951, + 0x950, 0x956, 0x958, - 0x960, - 0x964, 0x966, 0x970, - 0x971, + 0x972, 0x978, - 0x979, + 0x97B, + 0x97D, + 0x97E, 0x980, 0x981, 0x984, 0x985, - 0x98D, + 0x98C, 0x98F, 0x991, 0x993, @@ -290373,21 +310896,17 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x9B6, 0x9BA, 0x9BC, + 0x9BD, + 0x9BE, 0x9C5, 0x9C7, 0x9C9, 0x9CB, 0x9CF, - 0x9D7, - 0x9D8, - 0x9E0, - 0x9E4, 0x9E6, 0x9F2, - 0x9FE, - 0x9FF, - 0xA01, - 0xA04, + 0xA02, + 0xA03, 0xA05, 0xA0B, 0xA0F, @@ -290412,9 +310931,9 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xA4E, 0xA5C, 0xA5D, - 0xA66, - 0xA75, - 0xA81, + 0xA70, + 0xA72, + 0xA82, 0xA84, 0xA85, 0xA8E, @@ -290429,23 +310948,19 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xAB5, 0xABA, 0xABC, + 0xABD, + 0xABE, 0xAC6, 0xAC7, 0xACA, 0xACB, 0xACE, - 0xAD0, - 0xAD1, - 0xAE0, - 0xAE4, 0xAE6, 0xAF0, - 0xAFA, - 0xB00, 0xB01, 0xB04, 0xB05, - 0xB0D, + 0xB0C, 0xB0F, 0xB11, 0xB13, @@ -290454,23 +310969,23 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xB31, 0xB32, 0xB34, - 0xB35, + 0xB36, 0xB3A, 0xB3C, + 0xB3D, + 0xB3E, 0xB44, 0xB47, 0xB49, 0xB4B, 0xB4E, - 0xB55, - 0xB58, + 0xB56, + 0xB57, 0xB5F, - 0xB62, - 0xB66, - 0xB70, + 0xB60, 0xB71, 0xB72, - 0xB82, + 0xB83, 0xB84, 0xB85, 0xB8B, @@ -290496,99 +311011,79 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xBC9, 0xBCA, 0xBCE, - 0xBD0, - 0xBD1, - 0xBD7, - 0xBD8, - 0xBE6, - 0xBF0, - 0xC01, - 0xC0D, + 0xC02, + 0xC04, + 0xC05, + 0xC0C, 0xC0E, 0xC11, 0xC12, 0xC29, 0xC2A, + 0xC31, + 0xC32, 0xC34, 0xC35, 0xC3A, - 0xC3C, + 0xC3E, 0xC45, 0xC46, 0xC49, 0xC4A, 0xC4E, - 0xC55, - 0xC57, - 0xC5D, - 0xC5E, - 0xC60, - 0xC62, - 0xC66, - 0xC70, - 0xC80, - 0xC81, 0xC82, 0xC84, 0xC85, - 0xC8D, + 0xC8C, 0xC8E, 0xC91, 0xC92, 0xCA9, 0xCAA, + 0xCB1, + 0xCB2, 0xCB4, 0xCB5, 0xCBA, - 0xCBC, - 0xCC5, + 0xCBE, + 0xCC4, 0xCC6, 0xCC9, 0xCCA, 0xCCE, - 0xCD5, - 0xCD7, - 0xCDD, - 0xCDE, - 0xCE0, - 0xCE4, 0xCE6, 0xCF0, - 0xCF1, - 0xCF4, - 0xD00, - 0xD01, 0xD02, 0xD04, 0xD05, - 0xD0D, + 0xD0C, 0xD0E, 0xD11, 0xD12, - 0xD3B, - 0xD3D, + 0xD29, + 0xD2A, + 0xD3A, + 0xD3E, 0xD44, 0xD46, 0xD49, 0xD4A, - 0xD4F, - 0xD54, + 0xD4C, + 0xD4D, + 0xD4E, + 0xD57, 0xD58, - 0xD60, - 0xD62, - 0xD66, - 0xD70, 0xD7A, 0xD80, 0xD82, 0xD84, 0xD85, - 0xD8F, + 0xD8E, 0xD91, 0xD97, 0xD9A, - 0xDA6, - 0xDA7, + 0xD9E, + 0xD9F, 0xDB2, 0xDB3, 0xDBC, @@ -290611,42 +311106,50 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xE34, 0xE3B, 0xE40, - 0xE4F, + 0xE4E, 0xE50, 0xE5A, 0xE81, 0xE83, 0xE84, 0xE85, - 0xE86, + 0xE87, + 0xE89, + 0xE8A, 0xE8B, - 0xE8C, + 0xE8D, + 0xE8E, + 0xE94, + 0xE98, + 0xE99, + 0xEA0, + 0xEA1, 0xEA4, 0xEA5, 0xEA6, 0xEA7, + 0xEA8, + 0xEAA, + 0xEAC, + 0xEAD, + 0xEAF, + 0xEB0, 0xEB3, 0xEB4, + 0xEBA, + 0xEBB, 0xEBE, 0xEC0, 0xEC5, 0xEC6, 0xEC7, 0xEC8, - 0xECF, + 0xECE, 0xED0, 0xEDA, - 0xEDE, - 0xEE0, - 0xF00, - 0xF01, 0xF20, 0xF2A, - 0xF35, - 0xF36, - 0xF37, - 0xF38, - 0xF3E, + 0xF40, 0xF43, 0xF44, 0xF48, @@ -290660,17 +311163,15 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xF5C, 0xF5D, 0xF69, - 0xF6A, - 0xF6D, 0xF71, 0xF73, 0xF74, 0xF75, 0xF7A, 0xF81, - 0xF82, + 0xF84, 0xF85, - 0xF86, + 0xF90, 0xF93, 0xF94, 0xF98, @@ -290683,26 +311184,28 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xFA8, 0xFAC, 0xFAD, + 0xFAE, + 0xFB1, 0xFB9, 0xFBA, 0xFBD, - 0xFC6, - 0xFC7, 0x1000, 0x104A, - 0x1050, - 0x109E, + 0x105A, + 0x1065, + 0x1075, + 0x108B, + 0x108F, + 0x1090, 0x10C7, 0x10C8, 0x10CD, 0x10CE, 0x10D0, 0x10F1, - 0x10F7, - 0x10FB, - 0x10FD, - 0x1100, 0x1200, + 0x1207, + 0x1208, 0x1249, 0x124A, 0x124E, @@ -290713,10 +311216,14 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x125A, 0x125E, 0x1260, + 0x1287, + 0x1288, 0x1289, 0x128A, 0x128E, 0x1290, + 0x12AF, + 0x12B0, 0x12B1, 0x12B2, 0x12B6, @@ -290729,20 +311236,26 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x12C8, 0x12D7, 0x12D8, + 0x12F8, + 0x1300, + 0x130F, + 0x1310, 0x1311, 0x1312, 0x1316, 0x1318, - 0x135B, - 0x135D, - 0x1360, - 0x1380, - 0x1390, + 0x131F, + 0x1320, + 0x1347, + 0x1348, + 0x135A, 0x1780, + 0x179D, + 0x179F, 0x17A3, 0x17A5, 0x17A8, - 0x17A9, + 0x17AA, 0x17B4, 0x17B6, 0x17CE, @@ -290750,206 +311263,2468 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x17D1, 0x17D2, 0x17D3, - 0x17D7, - 0x17D8, - 0x17DC, - 0x17DD, 0x17E0, 0x17EA, 0x1C90, 0x1CBB, 0x1CBD, 0x1CC0, - 0x1E00, - 0x1E9A, + 0x1E0C, + 0x1E0E, + 0x1E12, + 0x1E14, + 0x1E20, + 0x1E22, + 0x1E24, + 0x1E26, + 0x1E36, + 0x1E38, + 0x1E3C, + 0x1E40, + 0x1E42, + 0x1E4C, + 0x1E5A, + 0x1E5C, + 0x1E62, + 0x1E64, + 0x1E6C, + 0x1E6E, + 0x1E70, + 0x1E72, + 0x1E8C, + 0x1E8E, + 0x1E92, + 0x1E94, 0x1E9E, 0x1E9F, 0x1EA0, 0x1EFA, - 0x1F00, - 0x1F16, - 0x1F18, - 0x1F1E, - 0x1F20, - 0x1F46, - 0x1F48, - 0x1F4E, - 0x1F50, - 0x1F58, - 0x1F59, - 0x1F5A, - 0x1F5B, - 0x1F5C, - 0x1F5D, - 0x1F5E, - 0x1F5F, - 0x1F71, - 0x1F72, - 0x1F73, - 0x1F74, - 0x1F75, - 0x1F76, - 0x1F77, - 0x1F78, - 0x1F79, - 0x1F7A, - 0x1F7B, - 0x1F7C, - 0x1F7D, - 0x1F80, + 0x1FA0, + 0x1FB0, + 0x1FB2, 0x1FB5, - 0x1FB6, - 0x1FBB, - 0x1FBC, - 0x1FBD, - 0x1FC2, - 0x1FC5, - 0x1FC6, - 0x1FC9, - 0x1FCA, - 0x1FCB, - 0x1FCC, - 0x1FCD, - 0x1FD0, - 0x1FD3, - 0x1FD6, - 0x1FDB, - 0x1FE0, - 0x1FE3, - 0x1FE4, - 0x1FEB, 0x1FEC, 0x1FED, - 0x1FF2, - 0x1FF5, - 0x1FF6, - 0x1FF9, - 0x1FFA, - 0x1FFB, - 0x1FFC, - 0x1FFD, - 0x2D27, - 0x2D28, - 0x2D2D, - 0x2D2E, - 0x2D80, - 0x2D97, - 0x2DA0, - 0x2DA7, - 0x2DA8, - 0x2DAF, - 0x2DB0, - 0x2DB7, - 0x2DB8, - 0x2DBF, - 0x2DC0, - 0x2DC7, - 0x2DC8, - 0x2DCF, - 0x2DD0, - 0x2DD7, - 0x2DD8, - 0x2DDF, 0x3005, 0x3008, 0x3041, 0x3097, - 0x3099, - 0x309B, 0x309D, 0x309F, 0x30A1, 0x30FB, 0x30FC, 0x30FF, - 0x3105, - 0x312E, - 0x312F, - 0x3130, - 0x31A0, - 0x31C0, - 0x3400, - 0x4DC0, + 0x3447, + 0x3448, + 0x3473, + 0x3474, + 0x34E4, + 0x34E5, + 0x3577, + 0x3578, + 0x359E, + 0x359F, + 0x35A1, + 0x35A2, + 0x35AD, + 0x35AE, + 0x35BF, + 0x35C0, + 0x35CE, + 0x35CF, + 0x35F3, + 0x35F4, + 0x35FE, + 0x35FF, + 0x360E, + 0x360F, + 0x361A, + 0x361B, + 0x3918, + 0x3919, + 0x3960, + 0x3961, + 0x396E, + 0x396F, + 0x39CF, + 0x39D1, + 0x39DB, + 0x39DC, + 0x39DF, + 0x39E0, + 0x39F8, + 0x39F9, + 0x39FE, + 0x39FF, + 0x3A18, + 0x3A19, + 0x3A52, + 0x3A53, + 0x3A5C, + 0x3A5D, + 0x3A67, + 0x3A68, + 0x3A73, + 0x3A74, + 0x3B39, + 0x3B3A, + 0x3B4E, + 0x3B4F, + 0x3BA3, + 0x3BA4, + 0x3C6E, + 0x3C6F, + 0x3CE0, + 0x3CE1, + 0x3DE7, + 0x3DE8, + 0x3DEB, + 0x3DEC, + 0x3E74, + 0x3E75, + 0x3ED0, + 0x3ED1, + 0x4056, + 0x4057, + 0x4065, + 0x4066, + 0x406A, + 0x406B, + 0x40BB, + 0x40BC, + 0x40DF, + 0x40E0, + 0x4137, + 0x4138, + 0x415F, + 0x4160, + 0x4337, + 0x4338, + 0x43AC, + 0x43AD, + 0x43B1, + 0x43B2, + 0x43D3, + 0x43D4, + 0x43DD, + 0x43DE, + 0x4443, + 0x4444, + 0x44D6, + 0x44D7, + 0x44EA, + 0x44EB, + 0x4606, + 0x4607, + 0x464C, + 0x464D, + 0x4661, + 0x4662, + 0x4723, + 0x4724, + 0x4729, + 0x472A, + 0x477C, + 0x477D, + 0x478D, + 0x478E, + 0x47F4, + 0x47F5, + 0x4882, + 0x4883, + 0x4947, + 0x4948, + 0x497A, + 0x497B, + 0x497D, + 0x497E, + 0x4982, + 0x4984, + 0x4985, + 0x4987, + 0x499B, + 0x499C, + 0x499F, + 0x49A0, + 0x49B6, + 0x49B8, + 0x4A12, + 0x4A13, + 0x4AB8, + 0x4AB9, + 0x4C77, + 0x4C78, + 0x4C7D, + 0x4C7E, + 0x4C81, + 0x4C82, + 0x4C85, + 0x4C86, + 0x4C9D, + 0x4CA4, + 0x4D13, + 0x4D1A, + 0x4DAE, + 0x4DAF, 0x4E00, - 0xA000, - 0xA67F, - 0xA680, - 0xA717, - 0xA720, - 0xA788, - 0xA789, + 0x4E12, + 0x4E13, + 0x4E29, + 0x4E2A, + 0x4E68, + 0x4E69, + 0x4E79, + 0x4E7A, + 0x4E96, + 0x4E97, + 0x4EA3, + 0x4EA4, + 0x4EBC, + 0x4EBD, + 0x4ECC, + 0x4ECD, + 0x4EE7, + 0x4EE8, + 0x4EF8, + 0x4EFB, + 0x4EFC, + 0x4EFD, + 0x4EFE, + 0x4EFF, + 0x4F07, + 0x4F08, + 0x4F16, + 0x4F17, + 0x4F28, + 0x4F29, + 0x4F31, + 0x4F32, + 0x4F35, + 0x4F36, + 0x4F37, + 0x4F38, + 0x4F40, + 0x4F41, + 0x4F44, + 0x4F45, + 0x4F71, + 0x4F72, + 0x4F8C, + 0x4F8D, + 0x4F8E, + 0x4F8F, + 0x4FA2, + 0x4FA3, + 0x4FBD, + 0x4FBE, + 0x4FC6, + 0x4FC7, + 0x4FC8, + 0x4FC9, + 0x4FCC, + 0x4FCD, + 0x4FE2, + 0x4FE3, + 0x4FFC, + 0x4FFE, + 0x5010, + 0x5011, + 0x5034, + 0x5035, + 0x5038, + 0x5039, + 0x503D, + 0x503E, + 0x5042, + 0x5043, + 0x5052, + 0x5053, + 0x5058, + 0x5059, + 0x507C, + 0x507D, + 0x5081, + 0x5082, + 0x5093, + 0x5094, + 0x5097, + 0x5098, + 0x509F, + 0x50A2, + 0x50B9, + 0x50BA, + 0x50C3, + 0x50C4, + 0x50D8, + 0x50D9, + 0x50DF, + 0x50E0, + 0x50E1, + 0x50E3, + 0x50EB, + 0x50EC, + 0x50F4, + 0x50F5, + 0x50F7, + 0x50F8, + 0x511B, + 0x511C, + 0x5128, + 0x5129, + 0x512B, + 0x512C, + 0x5142, + 0x5143, + 0x514A, + 0x514B, + 0x514F, + 0x5150, + 0x5153, + 0x5154, + 0x5158, + 0x5159, + 0x5160, + 0x5161, + 0x5164, + 0x5165, + 0x5172, + 0x5173, + 0x517E, + 0x517F, + 0x5183, + 0x5185, + 0x518E, + 0x518F, + 0x51A1, + 0x51A2, + 0x51A3, + 0x51A4, + 0x51AD, + 0x51AE, + 0x51B8, + 0x51B9, + 0x51BA, + 0x51BB, + 0x51C2, + 0x51C3, + 0x51D2, + 0x51D4, + 0x51DF, + 0x51E0, + 0x51EC, + 0x51ED, + 0x51EE, + 0x51EF, + 0x51F2, + 0x51F3, + 0x5253, + 0x5254, + 0x5266, + 0x5267, + 0x5279, + 0x527A, + 0x5285, + 0x5286, + 0x528E, + 0x528F, + 0x52C4, + 0x52C5, + 0x52C8, + 0x52C9, + 0x52CC, + 0x52CD, + 0x52CE, + 0x52CF, + 0x52D1, + 0x52D2, + 0x52D4, + 0x52D5, + 0x52E1, + 0x52E2, + 0x52E5, + 0x52E6, + 0x52EE, + 0x52EF, + 0x5303, + 0x5305, + 0x5318, + 0x5319, + 0x531B, + 0x531C, + 0x531E, + 0x531F, + 0x5327, + 0x5328, + 0x5329, + 0x532A, + 0x5332, + 0x5333, + 0x5335, + 0x5337, + 0x5342, + 0x5343, + 0x535B, + 0x535C, + 0x535D, + 0x535E, + 0x536A, + 0x536B, + 0x536D, + 0x536E, + 0x5380, + 0x5381, + 0x53A1, + 0x53A2, + 0x53AA, + 0x53AC, + 0x53AF, + 0x53B0, + 0x53BA, + 0x53BB, + 0x53C5, + 0x53C6, + 0x53CF, + 0x53D0, + 0x53DD, + 0x53DF, + 0x53E7, + 0x53E8, + 0x53FF, + 0x5401, + 0x541A, + 0x541B, + 0x5422, + 0x5423, + 0x544C, + 0x544D, + 0x545D, + 0x545E, + 0x5469, + 0x546A, + 0x548A, + 0x548B, + 0x54B5, + 0x54B6, + 0x54F6, + 0x54F7, + 0x5515, + 0x5516, + 0x5518, + 0x551A, + 0x5547, + 0x5548, + 0x5560, + 0x5561, + 0x557A, + 0x557B, + 0x55E0, + 0x55E1, + 0x55F8, + 0x55F9, + 0x560A, + 0x560C, + 0x5620, + 0x5621, + 0x562B, + 0x562C, + 0x5637, + 0x5638, + 0x563C, + 0x563D, + 0x5644, + 0x5645, + 0x564B, + 0x564C, + 0x5651, + 0x5652, + 0x5656, + 0x5657, + 0x565F, + 0x5660, + 0x5661, + 0x5662, + 0x5675, + 0x5676, + 0x567D, + 0x567E, + 0x5688, + 0x5689, + 0x568B, + 0x568C, + 0x5696, + 0x5697, + 0x569E, + 0x569F, + 0x56BA, + 0x56BB, + 0x56CF, + 0x56D0, + 0x56D9, + 0x56DA, + 0x56E6, + 0x56E7, + 0x56F6, + 0x56F7, + 0x56F8, + 0x56F9, + 0x56FB, + 0x56FD, + 0x5705, + 0x5706, + 0x5711, + 0x5712, + 0x5717, + 0x5718, + 0x5721, + 0x5722, + 0x5724, + 0x5725, + 0x573D, + 0x573E, + 0x5743, + 0x5744, + 0x5748, + 0x5749, + 0x5755, + 0x5757, + 0x5758, + 0x5759, + 0x5763, + 0x5764, + 0x5778, + 0x5779, + 0x5781, + 0x5782, + 0x5787, + 0x5788, + 0x5796, + 0x5797, + 0x57A8, + 0x57A9, + 0x57CA, + 0x57CB, + 0x57D1, + 0x57D2, + 0x57DB, + 0x57DC, + 0x5817, + 0x5819, + 0x5850, + 0x5851, + 0x5856, + 0x5857, + 0x5860, + 0x5861, + 0x5866, + 0x5868, + 0x5877, + 0x5878, + 0x5895, + 0x5896, + 0x58AA, + 0x58AB, + 0x58B6, + 0x58B7, + 0x58C0, + 0x58C1, + 0x58C3, + 0x58C5, + 0x58CD, + 0x58CE, + 0x58D0, + 0x58D1, + 0x58E1, + 0x58E2, + 0x58E6, + 0x58E7, + 0x58F5, + 0x58F6, + 0x5901, + 0x5902, + 0x5905, + 0x5906, + 0x5908, + 0x5909, + 0x5911, + 0x5912, + 0x5913, + 0x5914, + 0x5923, + 0x5924, + 0x5933, + 0x5934, + 0x5936, + 0x5937, + 0x5959, + 0x595A, + 0x595B, + 0x595C, + 0x59B7, + 0x59B8, + 0x59E7, + 0x59E8, + 0x5A24, + 0x5A25, + 0x5A26, + 0x5A27, + 0x5A2C, + 0x5A2D, + 0x5A30, + 0x5A31, + 0x5A54, + 0x5A55, + 0x5A59, + 0x5A5A, + 0x5A6F, + 0x5A70, + 0x5A71, + 0x5A72, + 0x5A87, + 0x5A88, + 0x5A8D, + 0x5A8E, + 0x5AAB, + 0x5AAC, + 0x5AD3, + 0x5AD4, + 0x5AEF, + 0x5AF1, + 0x5B0A, + 0x5B0B, + 0x5B0D, + 0x5B0E, + 0x5B39, + 0x5B3A, + 0x5B46, + 0x5B47, + 0x5B4F, + 0x5B50, + 0x5B52, + 0x5B53, + 0x5B60, + 0x5B62, + 0x5B6F, + 0x5B70, + 0x5B79, + 0x5B7A, + 0x5B7E, + 0x5B7F, + 0x5B86, + 0x5B87, + 0x5B90, + 0x5B91, + 0x5BA9, + 0x5BAA, + 0x5BB2, + 0x5BB3, + 0x5BB7, + 0x5BB8, + 0x5BBC, + 0x5BBD, + 0x5BC8, + 0x5BC9, + 0x5BDA, + 0x5BDB, + 0x5C00, + 0x5C01, + 0x5C1B, + 0x5C1C, + 0x5C23, + 0x5C24, + 0x5C26, + 0x5C27, + 0x5C29, + 0x5C2A, + 0x5C36, + 0x5C37, + 0x5C5A, + 0x5C5B, + 0x5C85, + 0x5C86, + 0x5CB4, + 0x5CB5, + 0x5CB9, + 0x5CBA, + 0x5CD5, + 0x5CD6, + 0x5CDD, + 0x5CDE, + 0x5CF5, + 0x5CF6, + 0x5D2B, + 0x5D2C, + 0x5D2F, + 0x5D30, + 0x5D3B, + 0x5D3C, + 0x5D53, + 0x5D54, + 0x5D57, + 0x5D58, + 0x5D60, + 0x5D61, + 0x5D83, + 0x5D84, + 0x5D96, + 0x5D97, + 0x5DA3, + 0x5DA5, + 0x5DAB, + 0x5DAC, + 0x5DB3, + 0x5DB4, + 0x5DB9, + 0x5DBA, + 0x5DC4, + 0x5DC5, + 0x5DD7, + 0x5DD8, + 0x5DDA, + 0x5DDB, + 0x5DDC, + 0x5DDD, + 0x5DF6, + 0x5DF7, + 0x5E12, + 0x5E13, + 0x5E48, + 0x5E49, + 0x5E51, + 0x5E52, + 0x5E92, + 0x5E93, + 0x5EBA, + 0x5EBB, + 0x5EC0, + 0x5EC1, + 0x5EEB, + 0x5EEC, + 0x5EF9, + 0x5EFA, + 0x5F0E, + 0x5F0F, + 0x5F3B, + 0x5F3C, + 0x5F3D, + 0x5F3E, + 0x5F8F, + 0x5F90, + 0x5F9A, + 0x5F9B, + 0x5FA3, + 0x5FA5, + 0x5FB0, + 0x5FB1, + 0x5FC2, + 0x5FC3, + 0x5FCE, + 0x5FCF, + 0x5FDB, + 0x5FDC, + 0x5FE2, + 0x5FE3, + 0x5FEC, + 0x5FED, + 0x5FFC, + 0x5FFD, + 0x6023, + 0x6024, + 0x6056, + 0x6057, + 0x6061, + 0x6062, + 0x6071, + 0x6072, + 0x6074, + 0x6075, + 0x6091, + 0x6092, + 0x6093, + 0x6094, + 0x60A5, + 0x60A6, + 0x60D2, + 0x60D3, + 0x60D6, + 0x60D7, + 0x60DE, + 0x60DF, + 0x60E5, + 0x60E6, + 0x60FD, + 0x60FE, + 0x6102, + 0x6103, + 0x6107, + 0x6108, + 0x6111, + 0x6112, + 0x611E, + 0x611F, + 0x6131, + 0x6132, + 0x6133, + 0x6134, + 0x6135, + 0x6136, + 0x6138, + 0x613A, + 0x6160, + 0x6161, + 0x617B, + 0x617C, + 0x617F, + 0x6180, + 0x6186, + 0x6187, + 0x6197, + 0x6198, + 0x619C, + 0x619D, + 0x61B9, + 0x61BA, + 0x61BB, + 0x61BC, + 0x61D3, + 0x61D4, + 0x61D5, + 0x61D6, + 0x61EC, + 0x61ED, + 0x61EF, + 0x61F0, + 0x6205, + 0x6206, + 0x6235, + 0x6236, + 0x6239, + 0x623A, + 0x6257, + 0x6258, + 0x628D, + 0x628E, + 0x629D, + 0x629E, + 0x62DE, + 0x62DF, + 0x62EA, + 0x62EB, + 0x630A, + 0x630B, + 0x6317, + 0x6318, + 0x6331, + 0x6332, + 0x6337, + 0x6338, + 0x635B, + 0x635C, + 0x638B, + 0x638C, + 0x6393, + 0x6394, + 0x63D1, + 0x63D2, + 0x643B, + 0x643D, + 0x6449, + 0x644A, + 0x645A, + 0x645B, + 0x647E, + 0x647F, + 0x6486, + 0x6487, + 0x64A1, + 0x64A2, + 0x64AF, + 0x64B0, + 0x64B6, + 0x64B7, + 0x64C8, + 0x64C9, + 0x64D5, + 0x64D6, + 0x64EE, + 0x64EF, + 0x64F5, + 0x64F6, + 0x64F9, + 0x64FA, + 0x6502, + 0x6503, + 0x650A, + 0x650B, + 0x651F, + 0x6520, + 0x6528, + 0x6529, + 0x6540, + 0x6541, + 0x6542, + 0x6543, + 0x655A, + 0x655B, + 0x655F, + 0x6560, + 0x657D, + 0x657E, + 0x658A, + 0x658B, + 0x659A, + 0x659B, + 0x65B5, + 0x65B6, + 0x65BE, + 0x65BF, + 0x65C8, + 0x65CA, + 0x65D1, + 0x65D2, + 0x65D8, + 0x65D9, + 0x65DC, + 0x65DD, + 0x65E4, + 0x65E5, + 0x65EA, + 0x65EB, + 0x65F9, + 0x65FA, + 0x65FE, + 0x65FF, + 0x6617, + 0x6618, + 0x662C, + 0x662D, + 0x6637, + 0x6639, + 0x6648, + 0x6649, + 0x664D, + 0x664E, + 0x6660, + 0x6661, + 0x6663, + 0x6664, + 0x6692, + 0x6693, + 0x669C, + 0x669D, + 0x669E, + 0x669F, + 0x66AC, + 0x66AE, + 0x66D0, + 0x66D1, + 0x66D3, + 0x66D4, + 0x66D7, + 0x66D8, + 0x66DF, + 0x66E0, + 0x66EF, + 0x66F0, + 0x6702, + 0x6703, + 0x6707, + 0x6708, + 0x6719, + 0x671A, + 0x6724, + 0x6725, + 0x6729, + 0x672A, + 0x6767, + 0x6768, + 0x6788, + 0x6789, + 0x6796, + 0x6797, + 0x67BD, + 0x67BE, + 0x67BF, + 0x67C0, + 0x67D5, + 0x67D6, + 0x67D7, + 0x67D8, + 0x67F9, + 0x67FA, + 0x6801, + 0x6802, + 0x6815, + 0x6816, + 0x6827, + 0x6828, + 0x6830, + 0x6831, + 0x6858, + 0x6859, + 0x685A, + 0x685B, + 0x685E, + 0x685F, + 0x687A, + 0x687B, + 0x6895, + 0x6896, + 0x6899, + 0x689A, + 0x68A5, + 0x68A6, + 0x68B8, + 0x68B9, + 0x68C3, + 0x68C4, + 0x68D9, + 0x68DA, + 0x68E2, + 0x68E3, + 0x68E5, + 0x68E6, + 0x6909, + 0x690A, + 0x693E, + 0x693F, + 0x694D, + 0x694E, + 0x699F, + 0x69A0, + 0x69A2, + 0x69A3, + 0x69C0, + 0x69C1, + 0x69D1, + 0x69D3, + 0x69D5, + 0x69D8, + 0x6A03, + 0x6A04, + 0x6A1C, + 0x6A1D, + 0x6A24, + 0x6A25, + 0x6A37, + 0x6A38, + 0x6A4A, + 0x6A4B, + 0x6A5C, + 0x6A5D, + 0x6A6E, + 0x6A6F, + 0x6A70, + 0x6A71, + 0x6A86, + 0x6A87, + 0x6A8A, + 0x6A8B, + 0x6A8F, + 0x6A90, + 0x6A99, + 0x6A9A, + 0x6A9D, + 0x6A9E, + 0x6AB1, + 0x6AB2, + 0x6ABE, + 0x6ABF, + 0x6AC0, + 0x6AC1, + 0x6AC4, + 0x6AC5, + 0x6AC9, + 0x6ACA, + 0x6AD8, + 0x6AD9, + 0x6AE9, + 0x6AEA, + 0x6B0E, + 0x6B0F, + 0x6B1B, + 0x6B1C, + 0x6B2E, + 0x6B2F, + 0x6B35, + 0x6B36, + 0x6B40, + 0x6B41, + 0x6B57, + 0x6B59, + 0x6B5D, + 0x6B5E, + 0x6B68, + 0x6B69, + 0x6B6C, + 0x6B6D, + 0x6B6E, + 0x6B6F, + 0x6B71, + 0x6B72, + 0x6B75, + 0x6B76, + 0x6B7D, + 0x6B7E, + 0x6BB8, + 0x6BB9, + 0x6BE9, + 0x6BEA, + 0x6BF1, + 0x6BF2, + 0x6BF4, + 0x6BF5, + 0x6BFA, + 0x6BFB, + 0x6C0A, + 0x6C0B, + 0x6C1C, + 0x6C1D, + 0x6C2D, + 0x6C2E, + 0x6C3C, + 0x6C3D, + 0x6C45, + 0x6C46, + 0x6C6C, + 0x6C6D, + 0x6C6E, + 0x6C6F, + 0x6CA0, + 0x6CA1, + 0x6CD8, + 0x6CD9, + 0x6CF4, + 0x6CF5, + 0x6D02, + 0x6D03, + 0x6D1C, + 0x6D1D, + 0x6D24, + 0x6D25, + 0x6D71, + 0x6D72, + 0x6D81, + 0x6D82, + 0x6D96, + 0x6D97, + 0x6DB0, + 0x6DB2, + 0x6DB6, + 0x6DB7, + 0x6DFE, + 0x6E00, + 0x6E01, + 0x6E03, + 0x6E06, + 0x6E07, + 0x6E12, + 0x6E13, + 0x6E18, + 0x6E19, + 0x6E2A, + 0x6E2B, + 0x6E4C, + 0x6E4D, + 0x6E6C, + 0x6E6D, + 0x6E7B, + 0x6E7E, + 0x6E8B, + 0x6E8C, + 0x6E95, + 0x6E96, + 0x6EDB, + 0x6EDC, + 0x6EE3, + 0x6EE4, + 0x6F04, + 0x6F05, + 0x6F0B, + 0x6F0C, + 0x6F42, + 0x6F43, + 0x6F48, + 0x6F49, + 0x6F4A, + 0x6F4B, + 0x6F79, + 0x6F7A, + 0x6F98, + 0x6F99, + 0x6F9A, + 0x6F9B, + 0x6F9F, + 0x6FA0, + 0x6FB7, + 0x6FB8, + 0x6FC5, + 0x6FC6, + 0x6FD0, + 0x6FD1, + 0x6FD3, + 0x6FD4, + 0x6FF5, + 0x6FF6, + 0x6FFD, + 0x6FFE, + 0x7010, + 0x7011, + 0x7013, + 0x7014, + 0x7047, + 0x7048, + 0x704B, + 0x704C, + 0x704E, + 0x704F, + 0x7072, + 0x7074, + 0x707B, + 0x707C, + 0x7081, + 0x7082, + 0x708D, + 0x708E, + 0x7097, + 0x7098, + 0x709B, + 0x709C, + 0x70AA, + 0x70AB, + 0x70B2, + 0x70B3, + 0x70B6, + 0x70B7, + 0x70D5, + 0x70D6, + 0x70FE, + 0x70FF, + 0x7108, + 0x7109, + 0x7124, + 0x7125, + 0x7133, + 0x7135, + 0x7157, + 0x7158, + 0x716B, + 0x716C, + 0x716D, + 0x716E, + 0x718D, + 0x718E, + 0x7196, + 0x7197, + 0x71A6, + 0x71A7, + 0x71AB, + 0x71AC, + 0x71B6, + 0x71B7, + 0x71CC, + 0x71CD, + 0x71D3, + 0x71D4, + 0x71F3, + 0x71F4, + 0x71FA, + 0x71FB, + 0x720B, + 0x720C, + 0x7211, + 0x7212, + 0x7215, + 0x7216, + 0x7217, + 0x7218, + 0x7220, + 0x7221, + 0x7224, + 0x7226, + 0x722F, + 0x7230, + 0x7234, + 0x7235, + 0x7245, + 0x7246, + 0x724E, + 0x724F, + 0x7250, + 0x7251, + 0x7255, + 0x7256, + 0x72AB, + 0x72AC, + 0x72BE, + 0x72BF, + 0x7302, + 0x7303, + 0x7310, + 0x7311, + 0x7328, + 0x7329, + 0x7353, + 0x7354, + 0x739C, + 0x739D, + 0x73C1, + 0x73C2, + 0x73F3, + 0x73F4, + 0x73FB, + 0x73FC, + 0x7418, + 0x7419, + 0x7439, + 0x743A, + 0x743E, + 0x743F, + 0x7447, + 0x7448, + 0x7449, + 0x744A, + 0x7458, + 0x7459, + 0x747B, + 0x747C, + 0x7484, + 0x7485, + 0x7496, + 0x7497, + 0x749D, + 0x749E, + 0x74C7, + 0x74C8, + 0x74C9, + 0x74CA, + 0x74CC, + 0x74CD, + 0x74EB, + 0x74EC, + 0x7520, + 0x7521, + 0x7541, + 0x7542, + 0x7552, + 0x7553, + 0x7555, + 0x7556, + 0x755E, + 0x755F, + 0x7561, + 0x7562, + 0x7571, + 0x7572, + 0x757B, + 0x757C, + 0x7585, + 0x7586, + 0x75A9, + 0x75AA, + 0x75B7, + 0x75B8, + 0x75DC, + 0x75DD, + 0x75EE, + 0x75EF, + 0x762C, + 0x762D, + 0x7644, + 0x7646, + 0x7651, + 0x7652, + 0x7655, + 0x7656, + 0x7673, + 0x7674, + 0x768D, + 0x768E, + 0x76A1, + 0x76A3, + 0x76A5, + 0x76A6, + 0x76A8, + 0x76A9, + 0x76B3, + 0x76B4, + 0x76B6, + 0x76B7, + 0x76C1, + 0x76C2, + 0x76CB, + 0x76CC, + 0x76D9, + 0x76DA, + 0x76EB, + 0x76EC, + 0x7700, + 0x7701, + 0x7702, + 0x7703, + 0x770E, + 0x770F, + 0x7721, + 0x7722, + 0x772B, + 0x772C, + 0x773F, + 0x7740, + 0x7742, + 0x7743, + 0x7764, + 0x7765, + 0x7796, + 0x7797, + 0x77A4, + 0x77A5, + 0x77BE, + 0x77BF, + 0x77C1, + 0x77C2, + 0x77D2, + 0x77D3, + 0x77DD, + 0x77DE, + 0x77E4, + 0x77E5, + 0x77E6, + 0x77E7, + 0x77F4, + 0x77F6, + 0x7824, + 0x7825, + 0x7836, + 0x7837, + 0x7842, + 0x7843, + 0x7846, + 0x7847, + 0x784B, + 0x784C, + 0x7876, + 0x7877, + 0x7888, + 0x7889, + 0x78C2, + 0x78C3, + 0x78C7, + 0x78C8, + 0x78D2, + 0x78D3, + 0x78F0, + 0x78F1, + 0x78F8, + 0x78F9, + 0x7900, + 0x7901, + 0x7908, + 0x7909, + 0x790D, + 0x790E, + 0x7915, + 0x7916, + 0x791F, + 0x7921, + 0x7932, + 0x7933, + 0x7936, + 0x7937, + 0x7959, + 0x795A, + 0x796C, + 0x796D, + 0x796E, + 0x796F, + 0x7975, + 0x7977, + 0x7986, + 0x7988, + 0x799E, + 0x799F, + 0x79A9, + 0x79AA, + 0x79BC, + 0x79BD, + 0x79C4, + 0x79C5, + 0x79C7, + 0x79C8, + 0x79CC, + 0x79CD, + 0x79D4, + 0x79D5, + 0x79D7, + 0x79D8, + 0x7A01, + 0x7A02, + 0x7A07, + 0x7A08, + 0x7A09, + 0x7A0A, + 0x7A2C, + 0x7A2D, + 0x7A38, + 0x7A39, + 0x7A3A, + 0x7A3B, + 0x7A64, + 0x7A65, + 0x7A6A, + 0x7A6B, + 0x7A6F, + 0x7A70, + 0x7A82, + 0x7A83, + 0x7A9A, + 0x7A9C, + 0x7AB9, + 0x7ABA, + 0x7ABB, + 0x7ABE, + 0x7AC2, + 0x7AC3, + 0x7AC6, + 0x7AC7, + 0x7AE9, + 0x7AEA, + 0x7AF5, + 0x7AF6, + 0x7AFC, + 0x7AFD, + 0x7B07, + 0x7B08, + 0x7B1F, + 0x7B20, + 0x7B27, + 0x7B28, + 0x7B29, + 0x7B2A, + 0x7B42, + 0x7B43, + 0x7B53, + 0x7B54, + 0x7BA3, + 0x7BA4, + 0x7BA5, + 0x7BA6, + 0x7BB0, + 0x7BB1, + 0x7BB2, + 0x7BB3, + 0x7BFA, + 0x7BFB, + 0x7C1B, + 0x7C1C, + 0x7C2E, + 0x7C30, + 0x7C52, + 0x7C53, + 0x7C55, + 0x7C56, + 0x7C5D, + 0x7C5E, + 0x7C76, + 0x7C77, + 0x7C87, + 0x7C88, + 0x7C93, + 0x7C94, + 0x7C9A, + 0x7C9B, + 0x7CAC, + 0x7CAD, + 0x7CD3, + 0x7CD4, + 0x7CDA, + 0x7CDC, + 0x7CE1, + 0x7CE2, + 0x7CE3, + 0x7CE4, + 0x7CE5, + 0x7CE7, + 0x7CFC, + 0x7CFD, + 0x7CFF, + 0x7D00, + 0x7D23, + 0x7D24, + 0x7D2A, + 0x7D2B, + 0x7D2D, + 0x7D2E, + 0x7D48, + 0x7D49, + 0x7D4D, + 0x7D4E, + 0x7D5A, + 0x7D5B, + 0x7D64, + 0x7D65, + 0x7D78, + 0x7D79, + 0x7D82, + 0x7D83, + 0x7D95, + 0x7D96, + 0x7D98, + 0x7D99, + 0x7DA4, + 0x7DA5, + 0x7DA8, + 0x7DA9, + 0x7DCD, + 0x7DCE, + 0x7DD3, + 0x7DD4, + 0x7DE5, + 0x7DE6, + 0x7DEB, + 0x7DEC, + 0x7DFD, + 0x7E00, + 0x7E18, + 0x7E19, + 0x7E5B, + 0x7E5C, + 0x7E64, + 0x7E65, + 0x7E9D, + 0x7E9E, + 0x7F3B, + 0x7F3D, + 0x7F41, + 0x7F42, + 0x7F46, + 0x7F47, + 0x7F59, + 0x7F5A, + 0x7F84, + 0x7F85, + 0x7F90, + 0x7F91, + 0x7F97, + 0x7F98, + 0x7F99, + 0x7F9A, + 0x7FB4, + 0x7FB5, + 0x7FD6, + 0x7FD7, + 0x7FDD, + 0x7FDE, + 0x7FE4, + 0x7FE5, + 0x800A, + 0x800B, + 0x802F, + 0x8030, + 0x803C, + 0x803D, + 0x8040, + 0x8041, + 0x8066, + 0x8067, + 0x8088, + 0x8089, + 0x808E, + 0x808F, + 0x8094, + 0x8095, + 0x80A6, + 0x80A9, + 0x80B3, + 0x80B4, + 0x80B9, + 0x80BA, + 0x80DF, + 0x80E0, + 0x8103, + 0x8105, + 0x8134, + 0x8136, + 0x8184, + 0x8185, + 0x8190, + 0x8191, + 0x8196, + 0x8197, + 0x81CB, + 0x81CC, + 0x81E4, + 0x81E5, + 0x81EF, + 0x81F1, + 0x8213, + 0x8214, + 0x8224, + 0x8225, + 0x8241, + 0x8242, + 0x8265, + 0x8266, + 0x828C, + 0x828D, + 0x82B2, + 0x82B3, + 0x82E2, + 0x82E3, + 0x82FC, + 0x82FD, + 0x830A, + 0x830B, + 0x8310, + 0x8311, + 0x8330, + 0x8331, + 0x8355, + 0x8356, + 0x83BE, + 0x83BF, + 0x83E6, + 0x83E7, + 0x83ED, + 0x83EE, + 0x8414, + 0x8415, + 0x8416, + 0x8418, + 0x841F, + 0x8420, + 0x8458, + 0x8459, + 0x8483, + 0x8484, + 0x8495, + 0x8496, + 0x84B7, + 0x84B8, + 0x84C3, + 0x84C4, + 0x84ED, + 0x84EE, + 0x8505, + 0x8506, + 0x8510, + 0x8511, + 0x8532, + 0x8534, + 0x854C, + 0x854D, + 0x8550, + 0x8551, + 0x857F, + 0x8580, + 0x8593, + 0x8594, + 0x85B2, + 0x85B3, + 0x85BB, + 0x85BC, + 0x85CC, + 0x85CD, + 0x85EE, + 0x85EF, + 0x85F3, + 0x85F4, + 0x85FC, + 0x85FD, + 0x8603, + 0x8604, + 0x860D, + 0x860F, + 0x8610, + 0x8611, + 0x8615, + 0x8616, + 0x861D, + 0x861E, + 0x8637, + 0x8638, + 0x8657, + 0x8658, + 0x8675, + 0x8676, + 0x8689, + 0x868A, + 0x8692, + 0x8693, + 0x86A0, + 0x86A1, + 0x86A6, + 0x86A7, + 0x86D5, + 0x86D6, + 0x86E0, + 0x86E1, + 0x86E7, + 0x86E8, + 0x86FD, + 0x86FE, + 0x871D, + 0x871E, + 0x872F, + 0x8730, + 0x873D, + 0x873E, + 0x8745, + 0x8746, + 0x8771, + 0x8772, + 0x878E, + 0x878F, + 0x8799, + 0x879A, + 0x87DA, + 0x87DB, + 0x87F0, + 0x87F1, + 0x8807, + 0x8808, + 0x8812, + 0x8813, + 0x882D, + 0x882E, + 0x883A, + 0x883B, + 0x8847, + 0x8848, + 0x8858, + 0x8859, + 0x885C, + 0x885D, + 0x885F, + 0x8860, + 0x887A, + 0x887B, + 0x88E6, + 0x88E7, + 0x88E9, + 0x88EA, + 0x88ED, + 0x88EE, + 0x8903, + 0x8904, + 0x890F, + 0x8910, + 0x8924, + 0x8925, + 0x8965, + 0x8966, + 0x8975, + 0x8976, + 0x897D, + 0x897E, + 0x898D, + 0x898E, + 0x8990, + 0x8991, + 0x8994, + 0x8995, + 0x8999, + 0x899A, + 0x89B0, + 0x89B1, + 0x89B4, + 0x89B5, + 0x89BB, + 0x89BD, + 0x89EE, + 0x89EF, + 0x89F5, + 0x89F6, + 0x89F9, + 0x89FA, + 0x89FD, + 0x89FE, + 0x8A05, + 0x8A07, + 0x8A14, + 0x8A15, + 0x8A19, + 0x8A1A, + 0x8A20, + 0x8A22, + 0x8A2B, + 0x8A2C, + 0x8A3D, + 0x8A3E, + 0x8A4B, + 0x8A4C, + 0x8A64, + 0x8A65, + 0x8A78, + 0x8A79, + 0x8A7D, + 0x8A7E, + 0x8A88, + 0x8A89, + 0x8A9F, + 0x8AA0, + 0x8AAF, + 0x8AB0, + 0x8AB7, + 0x8AB8, + 0x8AD0, + 0x8AD1, + 0x8AEC, + 0x8AED, + 0x8B29, + 0x8B2A, + 0x8B32, + 0x8B33, + 0x8B38, + 0x8B39, + 0x8B3F, + 0x8B40, + 0x8B61, + 0x8B63, + 0x8B69, + 0x8B6A, + 0x8B75, + 0x8B76, + 0x8B7C, + 0x8B7D, + 0x8B81, + 0x8B82, + 0x8B87, + 0x8B88, + 0x8B8D, + 0x8B8E, + 0x8B8F, + 0x8B90, + 0x8B9B, + 0x8B9C, + 0x8C38, + 0x8C39, + 0x8C40, + 0x8C41, + 0x8C44, + 0x8C45, + 0x8C51, + 0x8C54, + 0x8C58, + 0x8C59, + 0x8C74, + 0x8C75, + 0x8C7F, + 0x8C80, + 0x8C83, + 0x8C84, + 0x8C87, + 0x8C88, + 0x8C8B, + 0x8C8C, + 0x8C9B, + 0x8C9C, + 0x8CA6, + 0x8CA7, + 0x8CCB, + 0x8CCC, + 0x8CD6, + 0x8CD7, + 0x8CD8, + 0x8CD9, + 0x8CE9, + 0x8CEA, + 0x8CF7, + 0x8CF8, + 0x8D01, + 0x8D02, + 0x8D11, + 0x8D13, + 0x8D7C, + 0x8D7D, + 0x8DA6, + 0x8DA7, + 0x8DC0, + 0x8DC1, + 0x8DE5, + 0x8DE6, + 0x8E01, + 0x8E02, + 0x8E0B, + 0x8E0C, + 0x8E32, + 0x8E33, + 0x8E46, + 0x8E47, + 0x8E4F, + 0x8E50, + 0x8E6E, + 0x8E6F, + 0x8E75, + 0x8E76, + 0x8E77, + 0x8E78, + 0x8E79, + 0x8E7A, + 0x8E9B, + 0x8E9C, + 0x8EA2, + 0x8EA3, + 0x8EB3, + 0x8EB4, + 0x8EB6, + 0x8EB8, + 0x8EC1, + 0x8EC2, + 0x8EC4, + 0x8EC5, + 0x8ED9, + 0x8EDA, + 0x8EF0, + 0x8EF1, + 0x8F0F, + 0x8F10, + 0x8F2D, + 0x8F2E, + 0x8F3A, + 0x8F3B, + 0x8F41, + 0x8F42, + 0x8F9D, + 0x8F9E, + 0x8FA4, + 0x8FA5, + 0x8FB3, + 0x8FB4, + 0x8FC3, + 0x8FC4, + 0x8FCA, + 0x8FCB, + 0x8FE7, + 0x8FE8, + 0x902A, + 0x902B, + 0x902C, + 0x902D, + 0x9037, + 0x9038, + 0x9040, + 0x9041, + 0x9046, + 0x9047, + 0x90AB, + 0x90AC, + 0x90CC, + 0x90CE, + 0x90D2, + 0x90D3, + 0x90F6, + 0x90F7, + 0x910A, + 0x910B, + 0x913C, + 0x913E, + 0x9159, + 0x915A, + 0x917B, + 0x917C, + 0x9195, + 0x9196, + 0x9198, + 0x9199, + 0x91A9, + 0x91AA, + 0x91BF, + 0x91C0, + 0x91C4, + 0x91C5, + 0x91E0, + 0x91E1, + 0x91EF, + 0x91F0, + 0x9213, + 0x9214, + 0x921F, + 0x9220, + 0x9222, + 0x9223, + 0x9243, + 0x9244, + 0x9269, + 0x926B, + 0x9281, + 0x9282, + 0x9284, + 0x9285, + 0x929E, + 0x929F, + 0x92BD, + 0x92BE, + 0x92D4, + 0x92D5, + 0x92DB, + 0x92DC, + 0x92E2, + 0x92E3, + 0x931C, + 0x931D, + 0x9330, + 0x9332, + 0x9362, + 0x9363, + 0x9368, + 0x9369, + 0x936B, + 0x936C, + 0x936F, + 0x9370, + 0x9373, + 0x9374, + 0x9378, + 0x9379, + 0x937F, + 0x9380, + 0x9381, + 0x9382, + 0x938B, + 0x938C, + 0x939C, + 0x939D, + 0x93A0, + 0x93A1, + 0x93AB, + 0x93AC, + 0x93BB, + 0x93BC, + 0x93E0, + 0x93E1, + 0x93F3, + 0x93F4, + 0x9402, + 0x9403, + 0x9417, + 0x9418, + 0x941C, + 0x941D, + 0x941E, + 0x9420, + 0x9424, + 0x9425, + 0x9443, + 0x9444, + 0x944E, + 0x944F, + 0x946C, + 0x946D, + 0x947B, + 0x947C, + 0x9578, + 0x957A, + 0x957E, + 0x957F, + 0x9585, + 0x9586, + 0x9597, + 0x9598, + 0x95B3, + 0x95B5, + 0x95B8, + 0x95B9, + 0x95C1, + 0x95C2, + 0x95D9, + 0x95DA, + 0x95DD, + 0x95DE, + 0x9625, + 0x9627, + 0x9629, + 0x962A, + 0x963E, + 0x963F, + 0x9656, + 0x9658, + 0x9679, + 0x967A, + 0x967B, + 0x967C, + 0x967F, + 0x9680, + 0x9681, + 0x9683, + 0x968C, + 0x968D, + 0x9696, + 0x9697, + 0x969A, + 0x969B, + 0x969D, + 0x969E, + 0x969F, + 0x96A0, + 0x96AB, + 0x96AC, + 0x96AF, + 0x96B0, + 0x96B5, + 0x96B6, + 0x96E4, + 0x96E5, + 0x96E6, + 0x96E8, + 0x96FC, + 0x96FD, + 0x9714, + 0x9715, + 0x9717, + 0x9718, + 0x971A, + 0x971C, + 0x9733, + 0x9735, + 0x9737, + 0x9738, + 0x9740, + 0x9742, + 0x974D, + 0x974E, + 0x9757, + 0x9758, + 0x9763, + 0x9764, + 0x9775, + 0x9776, + 0x9787, + 0x9788, + 0x9789, + 0x978A, + 0x979B, + 0x979C, + 0x97A9, + 0x97AA, + 0x97B0, + 0x97B2, + 0x97B5, + 0x97B6, + 0x97BE, + 0x97BF, + 0x97C0, + 0x97C1, + 0x97D2, + 0x97D3, + 0x97FC, + 0x97FD, + 0x981F, + 0x9820, + 0x9825, + 0x9826, + 0x982A, + 0x982B, + 0x9833, + 0x9834, + 0x983A, + 0x983B, + 0x983E, + 0x983F, + 0x9842, + 0x9843, + 0x9847, + 0x9848, + 0x9856, + 0x9857, + 0x9866, + 0x9867, + 0x9868, + 0x9869, + 0x98B7, + 0x98B8, + 0x98CA, + 0x98CB, + 0x98E4, + 0x98E5, + 0x98EC, + 0x98ED, + 0x98F1, + 0x98F2, + 0x98F8, + 0x98F9, + 0x98FB, + 0x98FC, + 0x9919, + 0x991A, + 0x993B, + 0x993C, + 0x9944, + 0x9945, + 0x995A, + 0x995B, + 0x995D, + 0x995E, + 0x99BF, + 0x99C0, + 0x99E0, + 0x99E1, + 0x99E6, + 0x99E7, + 0x99EB, + 0x99EC, + 0x99F5, + 0x99F6, + 0x9A10, + 0x9A11, + 0x9A17, + 0x9A19, + 0x9A3B, + 0x9A3C, + 0x9A51, + 0x9A52, + 0x9A58, + 0x9A59, + 0x9A5D, + 0x9A5E, + 0x9A63, + 0x9A64, + 0x9AA9, + 0x9AAA, + 0x9ABD, + 0x9ABE, + 0x9AC8, + 0x9AC9, + 0x9AD7, + 0x9AD8, + 0x9AE0, + 0x9AE1, + 0x9AE4, + 0x9AE5, + 0x9AE8, + 0x9AEA, + 0x9AF0, + 0x9AF1, + 0x9B00, + 0x9B01, + 0x9B02, + 0x9B03, + 0x9B09, + 0x9B0A, + 0x9B14, + 0x9B15, + 0x9B1B, + 0x9B1C, + 0x9B34, + 0x9B35, + 0x9B3D, + 0x9B3E, + 0x9B40, + 0x9B41, + 0x9B50, + 0x9B51, + 0x9B57, + 0x9B58, + 0x9B62, + 0x9B63, + 0x9B72, + 0x9B73, + 0x9B89, + 0x9B8A, + 0x9B8C, + 0x9B8D, + 0x9B99, + 0x9B9A, + 0x9BC2, + 0x9BC3, + 0x9BF6, + 0x9BF7, + 0x9C00, + 0x9C02, + 0x9C03, + 0x9C04, + 0x9C42, + 0x9C43, + 0x9C4F, + 0x9C50, + 0x9C51, + 0x9C52, + 0x9C61, + 0x9C62, + 0x9C64, + 0x9C65, + 0x9C7B, + 0x9C7C, + 0x9D0C, + 0x9D0E, + 0x9D11, + 0x9D12, + 0x9D27, + 0x9D28, + 0x9D35, + 0x9D36, + 0x9D3C, + 0x9D3D, + 0x9D6D, + 0x9D6E, + 0x9D95, + 0x9D96, + 0x9DAE, + 0x9DAF, + 0x9DBD, + 0x9DBE, + 0x9DC0, + 0x9DC1, + 0x9DEA, + 0x9DEB, + 0x9DFC, + 0x9DFD, + 0x9E0E, + 0x9E0F, + 0x9E16, + 0x9E17, + 0x9E1C, + 0x9E1D, + 0x9E7B, + 0x9E7C, + 0x9E8F, + 0x9E91, + 0x9E98, + 0x9E99, + 0x9E9E, + 0x9E9F, + 0x9EA2, + 0x9EA3, + 0x9EAB, + 0x9EAD, + 0x9EB1, + 0x9EB2, + 0x9EEC, + 0x9EED, + 0x9EF1, + 0x9EF2, + 0x9F03, + 0x9F04, + 0x9F11, + 0x9F12, + 0x9F14, + 0x9F15, + 0x9F26, + 0x9F27, + 0x9F45, + 0x9F46, + 0x9F53, + 0x9F54, + 0x9F6D, + 0x9F6E, + 0x9FA1, + 0x9FA2, + 0x9FA3, + 0x9FA4, + 0x9FA6, 0xA78D, 0xA78E, - 0xA792, - 0xA794, 0xA7AA, 0xA7AB, - 0xA7C0, - 0xA7CB, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, - 0xA7DA, - 0xA9E7, - 0xA9FF, - 0xAA60, - 0xAA77, - 0xAA7A, - 0xAA80, - 0xAB01, - 0xAB07, - 0xAB09, - 0xAB0F, - 0xAB11, - 0xAB17, - 0xAB20, - 0xAB27, - 0xAB28, - 0xAB2F, - 0xAB66, - 0xAB68, + 0xAA7B, + 0xAA7C, 0xAC00, 0xD7A4, - 0xFA0E, - 0xFA10, - 0xFA11, - 0xFA12, - 0xFA13, - 0xFA15, - 0xFA1F, - 0xFA20, - 0xFA21, - 0xFA22, - 0xFA23, - 0xFA25, - 0xFA27, - 0xFA2A, 0x11301, 0x11302, 0x11303, 0x11304, - 0x1133B, + 0x1133C, 0x1133D, - 0x16FF0, - 0x16FF2, - 0x1B11F, - 0x1B123, - 0x1B132, - 0x1B133, - 0x1B150, - 0x1B153, - 0x1B155, - 0x1B156, - 0x1B164, - 0x1B168, - 0x1DF00, - 0x1DF1F, - 0x1DF25, - 0x1DF2B, - 0x1E08F, - 0x1E090, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -290958,22 +313733,122 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x1E7EF, 0x1E7F0, 0x1E7FF, - 0x20000, - 0x2A6E0, - 0x2A700, - 0x2B73A, - 0x2B740, - 0x2B81E, - 0x2B820, - 0x2CEA2, - 0x2CEB0, - 0x2EBE1, - 0x2EBF0, - 0x2EE5E, - 0x30000, - 0x3134B, - 0x31350, - 0x323B0 + 0x2070E, + 0x2070F, + 0x20731, + 0x20732, + 0x20779, + 0x2077A, + 0x20C53, + 0x20C54, + 0x20C78, + 0x20C79, + 0x20C96, + 0x20C97, + 0x20CCF, + 0x20CD0, + 0x20CD5, + 0x20CD6, + 0x20D15, + 0x20D16, + 0x20D7C, + 0x20D7D, + 0x20D7F, + 0x20D80, + 0x20E0E, + 0x20E10, + 0x20E77, + 0x20E78, + 0x20E9D, + 0x20E9E, + 0x20EA2, + 0x20EA3, + 0x20ED7, + 0x20ED8, + 0x20EF9, + 0x20EFB, + 0x20F2D, + 0x20F2F, + 0x20F4C, + 0x20F4D, + 0x20FB4, + 0x20FB5, + 0x20FBC, + 0x20FBD, + 0x20FEA, + 0x20FEB, + 0x2105C, + 0x2105D, + 0x2106F, + 0x21070, + 0x21075, + 0x21077, + 0x2107B, + 0x2107C, + 0x210C1, + 0x210C2, + 0x210C9, + 0x210CA, + 0x211D9, + 0x211DA, + 0x220C7, + 0x220C8, + 0x227B5, + 0x227B6, + 0x22AD5, + 0x22AD6, + 0x22B43, + 0x22B44, + 0x22BCA, + 0x22BCB, + 0x22C51, + 0x22C52, + 0x22C55, + 0x22C56, + 0x22CC2, + 0x22CC3, + 0x22D08, + 0x22D09, + 0x22D4C, + 0x22D4D, + 0x22D67, + 0x22D68, + 0x22EB3, + 0x22EB4, + 0x23CB7, + 0x23CB8, + 0x244D3, + 0x244D4, + 0x24DB8, + 0x24DB9, + 0x24DEA, + 0x24DEB, + 0x2512B, + 0x2512C, + 0x26258, + 0x26259, + 0x267CC, + 0x267CD, + 0x269F2, + 0x269F3, + 0x269FA, + 0x269FB, + 0x27A3E, + 0x27A3F, + 0x2815D, + 0x2815E, + 0x28207, + 0x28208, + 0x282E2, + 0x282E3, + 0x28CCA, + 0x28CCB, + 0x28CCD, + 0x28CCE, + 0x28CD2, + 0x28CD3, + 0x29D98, + 0x29D99 }; # endif /* ASCII/Latin1 */ @@ -290984,7 +313859,7 @@ static const UV UNI_IDENTIFIERTYPE__RECO && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_IDENTIFIERTYPE__RECOMMENDED_invlist[] = { /* for EBCDIC 1047 */ - 799, /* Number of elements */ + 3237, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -291032,65 +313907,95 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xFB, 0xFF, 0x100, + 0x114, + 0x116, + 0x12C, + 0x12E, 0x132, 0x134, + 0x138, + 0x139, 0x13F, 0x141, 0x149, 0x14A, + 0x14E, + 0x150, + 0x156, + 0x158, + 0x162, + 0x164, 0x17F, - 0x18F, - 0x190, + 0x181, + 0x182, + 0x186, + 0x187, + 0x189, + 0x18B, + 0x18E, + 0x193, + 0x194, + 0x195, + 0x196, + 0x19A, + 0x19D, + 0x19E, 0x1A0, 0x1A2, 0x1AF, 0x1B1, + 0x1B2, + 0x1B5, + 0x1B7, + 0x1B8, 0x1CD, + 0x1D5, 0x1DD, 0x1DE, - 0x1E4, 0x1E6, - 0x1F1, - 0x1F4, - 0x1F6, + 0x1EA, + 0x1EE, + 0x1F0, 0x1F8, + 0x1FA, + 0x218, 0x21C, - 0x21E, - 0x220, - 0x226, - 0x234, + 0x244, + 0x245, + 0x24C, + 0x24E, + 0x253, + 0x255, + 0x256, + 0x258, 0x259, 0x25A, - 0x2BB, - 0x2BD, - 0x2EC, - 0x2ED, + 0x25B, + 0x25C, + 0x263, + 0x264, + 0x268, + 0x26A, + 0x272, + 0x273, + 0x289, + 0x28A, + 0x28B, + 0x28C, + 0x292, + 0x293, 0x300, 0x305, 0x306, 0x30D, - 0x30F, - 0x312, - 0x313, - 0x315, 0x31B, 0x31C, 0x323, + 0x324, + 0x326, 0x329, - 0x32D, - 0x32F, - 0x330, + 0x331, 0x332, - 0x335, - 0x336, - 0x338, - 0x33A, - 0x342, - 0x343, - 0x345, - 0x346, - 0x37B, - 0x37E, 0x386, 0x387, 0x388, @@ -291101,80 +314006,136 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x3A2, 0x3A3, 0x3CF, - 0x3FC, + 0x401, + 0x40D, + 0x40E, + 0x450, + 0x451, + 0x45D, + 0x45E, 0x460, - 0x48A, - 0x500, - 0x510, - 0x52A, - 0x52E, - 0x530, + 0x490, + 0x49C, + 0x49E, + 0x4A6, + 0x4A8, + 0x4B8, + 0x4BA, + 0x4C1, + 0x4CF, + 0x4DA, + 0x4DC, + 0x4EA, + 0x4EE, + 0x4F6, + 0x4F8, + 0x4FA, + 0x524, + 0x526, 0x531, 0x557, - 0x559, - 0x55A, 0x561, 0x587, - 0x5B4, - 0x5B5, 0x5D0, 0x5EB, - 0x5EF, - 0x5F3, 0x620, - 0x640, + 0x63B, + 0x63D, + 0x63E, 0x641, + 0x653, + 0x654, 0x656, 0x660, 0x66A, 0x670, + 0x671, + 0x672, 0x673, 0x674, 0x675, 0x679, - 0x68E, - 0x68F, + 0x690, + 0x691, + 0x69B, + 0x69F, 0x6A1, 0x6A2, + 0x6A3, + 0x6A4, + 0x6AC, + 0x6AD, + 0x6B2, + 0x6B3, + 0x6B4, + 0x6B5, + 0x6B8, + 0x6BA, + 0x6BF, + 0x6C0, 0x6D4, 0x6D5, 0x6D6, - 0x6E5, - 0x6E7, 0x6EE, - 0x6FD, + 0x6FA, 0x6FF, 0x700, - 0x750, + 0x751, + 0x753, + 0x756, + 0x757, + 0x760, + 0x761, + 0x762, + 0x764, + 0x766, + 0x769, + 0x76A, + 0x76B, + 0x76E, + 0x772, + 0x780, 0x7B2, - 0x870, - 0x888, - 0x889, 0x88F, + 0x890, 0x8A0, - 0x8AD, - 0x8B2, - 0x8B3, - 0x8B5, - 0x8CA, + 0x8A1, + 0x8A2, + 0x8AA, + 0x8BB, + 0x8C3, + 0x8C7, + 0x8C8, 0x901, + 0x904, + 0x905, + 0x90C, + 0x90D, + 0x929, + 0x92A, + 0x934, + 0x935, + 0x93D, + 0x93E, + 0x944, + 0x945, 0x94E, 0x94F, - 0x951, + 0x950, 0x956, 0x958, - 0x960, - 0x964, 0x966, 0x970, - 0x971, + 0x972, 0x978, - 0x979, + 0x97B, + 0x97D, + 0x97E, 0x980, 0x981, 0x984, 0x985, - 0x98D, + 0x98C, 0x98F, 0x991, 0x993, @@ -291186,21 +314147,17 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x9B6, 0x9BA, 0x9BC, + 0x9BD, + 0x9BE, 0x9C5, 0x9C7, 0x9C9, 0x9CB, 0x9CF, - 0x9D7, - 0x9D8, - 0x9E0, - 0x9E4, 0x9E6, 0x9F2, - 0x9FE, - 0x9FF, - 0xA01, - 0xA04, + 0xA02, + 0xA03, 0xA05, 0xA0B, 0xA0F, @@ -291225,9 +314182,9 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xA4E, 0xA5C, 0xA5D, - 0xA66, - 0xA75, - 0xA81, + 0xA70, + 0xA72, + 0xA82, 0xA84, 0xA85, 0xA8E, @@ -291242,23 +314199,19 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xAB5, 0xABA, 0xABC, + 0xABD, + 0xABE, 0xAC6, 0xAC7, 0xACA, 0xACB, 0xACE, - 0xAD0, - 0xAD1, - 0xAE0, - 0xAE4, 0xAE6, 0xAF0, - 0xAFA, - 0xB00, 0xB01, 0xB04, 0xB05, - 0xB0D, + 0xB0C, 0xB0F, 0xB11, 0xB13, @@ -291267,23 +314220,23 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xB31, 0xB32, 0xB34, - 0xB35, + 0xB36, 0xB3A, 0xB3C, + 0xB3D, + 0xB3E, 0xB44, 0xB47, 0xB49, 0xB4B, 0xB4E, - 0xB55, - 0xB58, + 0xB56, + 0xB57, 0xB5F, - 0xB62, - 0xB66, - 0xB70, + 0xB60, 0xB71, 0xB72, - 0xB82, + 0xB83, 0xB84, 0xB85, 0xB8B, @@ -291309,99 +314262,79 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xBC9, 0xBCA, 0xBCE, - 0xBD0, - 0xBD1, - 0xBD7, - 0xBD8, - 0xBE6, - 0xBF0, - 0xC01, - 0xC0D, + 0xC02, + 0xC04, + 0xC05, + 0xC0C, 0xC0E, 0xC11, 0xC12, 0xC29, 0xC2A, + 0xC31, + 0xC32, 0xC34, 0xC35, 0xC3A, - 0xC3C, + 0xC3E, 0xC45, 0xC46, 0xC49, 0xC4A, 0xC4E, - 0xC55, - 0xC57, - 0xC5D, - 0xC5E, - 0xC60, - 0xC62, - 0xC66, - 0xC70, - 0xC80, - 0xC81, 0xC82, 0xC84, 0xC85, - 0xC8D, + 0xC8C, 0xC8E, 0xC91, 0xC92, 0xCA9, 0xCAA, + 0xCB1, + 0xCB2, 0xCB4, 0xCB5, 0xCBA, - 0xCBC, - 0xCC5, + 0xCBE, + 0xCC4, 0xCC6, 0xCC9, 0xCCA, 0xCCE, - 0xCD5, - 0xCD7, - 0xCDD, - 0xCDE, - 0xCE0, - 0xCE4, 0xCE6, 0xCF0, - 0xCF1, - 0xCF4, - 0xD00, - 0xD01, 0xD02, 0xD04, 0xD05, - 0xD0D, + 0xD0C, 0xD0E, 0xD11, 0xD12, - 0xD3B, - 0xD3D, + 0xD29, + 0xD2A, + 0xD3A, + 0xD3E, 0xD44, 0xD46, 0xD49, 0xD4A, - 0xD4F, - 0xD54, + 0xD4C, + 0xD4D, + 0xD4E, + 0xD57, 0xD58, - 0xD60, - 0xD62, - 0xD66, - 0xD70, 0xD7A, 0xD80, 0xD82, 0xD84, 0xD85, - 0xD8F, + 0xD8E, 0xD91, 0xD97, 0xD9A, - 0xDA6, - 0xDA7, + 0xD9E, + 0xD9F, 0xDB2, 0xDB3, 0xDBC, @@ -291424,42 +314357,50 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xE34, 0xE3B, 0xE40, - 0xE4F, + 0xE4E, 0xE50, 0xE5A, 0xE81, 0xE83, 0xE84, 0xE85, - 0xE86, + 0xE87, + 0xE89, + 0xE8A, 0xE8B, - 0xE8C, + 0xE8D, + 0xE8E, + 0xE94, + 0xE98, + 0xE99, + 0xEA0, + 0xEA1, 0xEA4, 0xEA5, 0xEA6, 0xEA7, + 0xEA8, + 0xEAA, + 0xEAC, + 0xEAD, + 0xEAF, + 0xEB0, 0xEB3, 0xEB4, + 0xEBA, + 0xEBB, 0xEBE, 0xEC0, 0xEC5, 0xEC6, 0xEC7, 0xEC8, - 0xECF, + 0xECE, 0xED0, 0xEDA, - 0xEDE, - 0xEE0, - 0xF00, - 0xF01, 0xF20, 0xF2A, - 0xF35, - 0xF36, - 0xF37, - 0xF38, - 0xF3E, + 0xF40, 0xF43, 0xF44, 0xF48, @@ -291473,17 +314414,15 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xF5C, 0xF5D, 0xF69, - 0xF6A, - 0xF6D, 0xF71, 0xF73, 0xF74, 0xF75, 0xF7A, 0xF81, - 0xF82, + 0xF84, 0xF85, - 0xF86, + 0xF90, 0xF93, 0xF94, 0xF98, @@ -291496,26 +314435,28 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xFA8, 0xFAC, 0xFAD, + 0xFAE, + 0xFB1, 0xFB9, 0xFBA, 0xFBD, - 0xFC6, - 0xFC7, 0x1000, 0x104A, - 0x1050, - 0x109E, + 0x105A, + 0x1065, + 0x1075, + 0x108B, + 0x108F, + 0x1090, 0x10C7, 0x10C8, 0x10CD, 0x10CE, 0x10D0, 0x10F1, - 0x10F7, - 0x10FB, - 0x10FD, - 0x1100, 0x1200, + 0x1207, + 0x1208, 0x1249, 0x124A, 0x124E, @@ -291526,10 +314467,14 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x125A, 0x125E, 0x1260, + 0x1287, + 0x1288, 0x1289, 0x128A, 0x128E, 0x1290, + 0x12AF, + 0x12B0, 0x12B1, 0x12B2, 0x12B6, @@ -291542,20 +314487,26 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x12C8, 0x12D7, 0x12D8, + 0x12F8, + 0x1300, + 0x130F, + 0x1310, 0x1311, 0x1312, 0x1316, 0x1318, - 0x135B, - 0x135D, - 0x1360, - 0x1380, - 0x1390, + 0x131F, + 0x1320, + 0x1347, + 0x1348, + 0x135A, 0x1780, + 0x179D, + 0x179F, 0x17A3, 0x17A5, 0x17A8, - 0x17A9, + 0x17AA, 0x17B4, 0x17B6, 0x17CE, @@ -291563,206 +314514,2468 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x17D1, 0x17D2, 0x17D3, - 0x17D7, - 0x17D8, - 0x17DC, - 0x17DD, 0x17E0, 0x17EA, 0x1C90, 0x1CBB, 0x1CBD, 0x1CC0, - 0x1E00, - 0x1E9A, + 0x1E0C, + 0x1E0E, + 0x1E12, + 0x1E14, + 0x1E20, + 0x1E22, + 0x1E24, + 0x1E26, + 0x1E36, + 0x1E38, + 0x1E3C, + 0x1E40, + 0x1E42, + 0x1E4C, + 0x1E5A, + 0x1E5C, + 0x1E62, + 0x1E64, + 0x1E6C, + 0x1E6E, + 0x1E70, + 0x1E72, + 0x1E8C, + 0x1E8E, + 0x1E92, + 0x1E94, 0x1E9E, 0x1E9F, 0x1EA0, 0x1EFA, - 0x1F00, - 0x1F16, - 0x1F18, - 0x1F1E, - 0x1F20, - 0x1F46, - 0x1F48, - 0x1F4E, - 0x1F50, - 0x1F58, - 0x1F59, - 0x1F5A, - 0x1F5B, - 0x1F5C, - 0x1F5D, - 0x1F5E, - 0x1F5F, - 0x1F71, - 0x1F72, - 0x1F73, - 0x1F74, - 0x1F75, - 0x1F76, - 0x1F77, - 0x1F78, - 0x1F79, - 0x1F7A, - 0x1F7B, - 0x1F7C, - 0x1F7D, - 0x1F80, + 0x1FA0, + 0x1FB0, + 0x1FB2, 0x1FB5, - 0x1FB6, - 0x1FBB, - 0x1FBC, - 0x1FBD, - 0x1FC2, - 0x1FC5, - 0x1FC6, - 0x1FC9, - 0x1FCA, - 0x1FCB, - 0x1FCC, - 0x1FCD, - 0x1FD0, - 0x1FD3, - 0x1FD6, - 0x1FDB, - 0x1FE0, - 0x1FE3, - 0x1FE4, - 0x1FEB, 0x1FEC, 0x1FED, - 0x1FF2, - 0x1FF5, - 0x1FF6, - 0x1FF9, - 0x1FFA, - 0x1FFB, - 0x1FFC, - 0x1FFD, - 0x2D27, - 0x2D28, - 0x2D2D, - 0x2D2E, - 0x2D80, - 0x2D97, - 0x2DA0, - 0x2DA7, - 0x2DA8, - 0x2DAF, - 0x2DB0, - 0x2DB7, - 0x2DB8, - 0x2DBF, - 0x2DC0, - 0x2DC7, - 0x2DC8, - 0x2DCF, - 0x2DD0, - 0x2DD7, - 0x2DD8, - 0x2DDF, 0x3005, 0x3008, 0x3041, 0x3097, - 0x3099, - 0x309B, 0x309D, 0x309F, 0x30A1, 0x30FB, 0x30FC, 0x30FF, - 0x3105, - 0x312E, - 0x312F, - 0x3130, - 0x31A0, - 0x31C0, - 0x3400, - 0x4DC0, + 0x3447, + 0x3448, + 0x3473, + 0x3474, + 0x34E4, + 0x34E5, + 0x3577, + 0x3578, + 0x359E, + 0x359F, + 0x35A1, + 0x35A2, + 0x35AD, + 0x35AE, + 0x35BF, + 0x35C0, + 0x35CE, + 0x35CF, + 0x35F3, + 0x35F4, + 0x35FE, + 0x35FF, + 0x360E, + 0x360F, + 0x361A, + 0x361B, + 0x3918, + 0x3919, + 0x3960, + 0x3961, + 0x396E, + 0x396F, + 0x39CF, + 0x39D1, + 0x39DB, + 0x39DC, + 0x39DF, + 0x39E0, + 0x39F8, + 0x39F9, + 0x39FE, + 0x39FF, + 0x3A18, + 0x3A19, + 0x3A52, + 0x3A53, + 0x3A5C, + 0x3A5D, + 0x3A67, + 0x3A68, + 0x3A73, + 0x3A74, + 0x3B39, + 0x3B3A, + 0x3B4E, + 0x3B4F, + 0x3BA3, + 0x3BA4, + 0x3C6E, + 0x3C6F, + 0x3CE0, + 0x3CE1, + 0x3DE7, + 0x3DE8, + 0x3DEB, + 0x3DEC, + 0x3E74, + 0x3E75, + 0x3ED0, + 0x3ED1, + 0x4056, + 0x4057, + 0x4065, + 0x4066, + 0x406A, + 0x406B, + 0x40BB, + 0x40BC, + 0x40DF, + 0x40E0, + 0x4137, + 0x4138, + 0x415F, + 0x4160, + 0x4337, + 0x4338, + 0x43AC, + 0x43AD, + 0x43B1, + 0x43B2, + 0x43D3, + 0x43D4, + 0x43DD, + 0x43DE, + 0x4443, + 0x4444, + 0x44D6, + 0x44D7, + 0x44EA, + 0x44EB, + 0x4606, + 0x4607, + 0x464C, + 0x464D, + 0x4661, + 0x4662, + 0x4723, + 0x4724, + 0x4729, + 0x472A, + 0x477C, + 0x477D, + 0x478D, + 0x478E, + 0x47F4, + 0x47F5, + 0x4882, + 0x4883, + 0x4947, + 0x4948, + 0x497A, + 0x497B, + 0x497D, + 0x497E, + 0x4982, + 0x4984, + 0x4985, + 0x4987, + 0x499B, + 0x499C, + 0x499F, + 0x49A0, + 0x49B6, + 0x49B8, + 0x4A12, + 0x4A13, + 0x4AB8, + 0x4AB9, + 0x4C77, + 0x4C78, + 0x4C7D, + 0x4C7E, + 0x4C81, + 0x4C82, + 0x4C85, + 0x4C86, + 0x4C9D, + 0x4CA4, + 0x4D13, + 0x4D1A, + 0x4DAE, + 0x4DAF, 0x4E00, - 0xA000, - 0xA67F, - 0xA680, - 0xA717, - 0xA720, - 0xA788, - 0xA789, + 0x4E12, + 0x4E13, + 0x4E29, + 0x4E2A, + 0x4E68, + 0x4E69, + 0x4E79, + 0x4E7A, + 0x4E96, + 0x4E97, + 0x4EA3, + 0x4EA4, + 0x4EBC, + 0x4EBD, + 0x4ECC, + 0x4ECD, + 0x4EE7, + 0x4EE8, + 0x4EF8, + 0x4EFB, + 0x4EFC, + 0x4EFD, + 0x4EFE, + 0x4EFF, + 0x4F07, + 0x4F08, + 0x4F16, + 0x4F17, + 0x4F28, + 0x4F29, + 0x4F31, + 0x4F32, + 0x4F35, + 0x4F36, + 0x4F37, + 0x4F38, + 0x4F40, + 0x4F41, + 0x4F44, + 0x4F45, + 0x4F71, + 0x4F72, + 0x4F8C, + 0x4F8D, + 0x4F8E, + 0x4F8F, + 0x4FA2, + 0x4FA3, + 0x4FBD, + 0x4FBE, + 0x4FC6, + 0x4FC7, + 0x4FC8, + 0x4FC9, + 0x4FCC, + 0x4FCD, + 0x4FE2, + 0x4FE3, + 0x4FFC, + 0x4FFE, + 0x5010, + 0x5011, + 0x5034, + 0x5035, + 0x5038, + 0x5039, + 0x503D, + 0x503E, + 0x5042, + 0x5043, + 0x5052, + 0x5053, + 0x5058, + 0x5059, + 0x507C, + 0x507D, + 0x5081, + 0x5082, + 0x5093, + 0x5094, + 0x5097, + 0x5098, + 0x509F, + 0x50A2, + 0x50B9, + 0x50BA, + 0x50C3, + 0x50C4, + 0x50D8, + 0x50D9, + 0x50DF, + 0x50E0, + 0x50E1, + 0x50E3, + 0x50EB, + 0x50EC, + 0x50F4, + 0x50F5, + 0x50F7, + 0x50F8, + 0x511B, + 0x511C, + 0x5128, + 0x5129, + 0x512B, + 0x512C, + 0x5142, + 0x5143, + 0x514A, + 0x514B, + 0x514F, + 0x5150, + 0x5153, + 0x5154, + 0x5158, + 0x5159, + 0x5160, + 0x5161, + 0x5164, + 0x5165, + 0x5172, + 0x5173, + 0x517E, + 0x517F, + 0x5183, + 0x5185, + 0x518E, + 0x518F, + 0x51A1, + 0x51A2, + 0x51A3, + 0x51A4, + 0x51AD, + 0x51AE, + 0x51B8, + 0x51B9, + 0x51BA, + 0x51BB, + 0x51C2, + 0x51C3, + 0x51D2, + 0x51D4, + 0x51DF, + 0x51E0, + 0x51EC, + 0x51ED, + 0x51EE, + 0x51EF, + 0x51F2, + 0x51F3, + 0x5253, + 0x5254, + 0x5266, + 0x5267, + 0x5279, + 0x527A, + 0x5285, + 0x5286, + 0x528E, + 0x528F, + 0x52C4, + 0x52C5, + 0x52C8, + 0x52C9, + 0x52CC, + 0x52CD, + 0x52CE, + 0x52CF, + 0x52D1, + 0x52D2, + 0x52D4, + 0x52D5, + 0x52E1, + 0x52E2, + 0x52E5, + 0x52E6, + 0x52EE, + 0x52EF, + 0x5303, + 0x5305, + 0x5318, + 0x5319, + 0x531B, + 0x531C, + 0x531E, + 0x531F, + 0x5327, + 0x5328, + 0x5329, + 0x532A, + 0x5332, + 0x5333, + 0x5335, + 0x5337, + 0x5342, + 0x5343, + 0x535B, + 0x535C, + 0x535D, + 0x535E, + 0x536A, + 0x536B, + 0x536D, + 0x536E, + 0x5380, + 0x5381, + 0x53A1, + 0x53A2, + 0x53AA, + 0x53AC, + 0x53AF, + 0x53B0, + 0x53BA, + 0x53BB, + 0x53C5, + 0x53C6, + 0x53CF, + 0x53D0, + 0x53DD, + 0x53DF, + 0x53E7, + 0x53E8, + 0x53FF, + 0x5401, + 0x541A, + 0x541B, + 0x5422, + 0x5423, + 0x544C, + 0x544D, + 0x545D, + 0x545E, + 0x5469, + 0x546A, + 0x548A, + 0x548B, + 0x54B5, + 0x54B6, + 0x54F6, + 0x54F7, + 0x5515, + 0x5516, + 0x5518, + 0x551A, + 0x5547, + 0x5548, + 0x5560, + 0x5561, + 0x557A, + 0x557B, + 0x55E0, + 0x55E1, + 0x55F8, + 0x55F9, + 0x560A, + 0x560C, + 0x5620, + 0x5621, + 0x562B, + 0x562C, + 0x5637, + 0x5638, + 0x563C, + 0x563D, + 0x5644, + 0x5645, + 0x564B, + 0x564C, + 0x5651, + 0x5652, + 0x5656, + 0x5657, + 0x565F, + 0x5660, + 0x5661, + 0x5662, + 0x5675, + 0x5676, + 0x567D, + 0x567E, + 0x5688, + 0x5689, + 0x568B, + 0x568C, + 0x5696, + 0x5697, + 0x569E, + 0x569F, + 0x56BA, + 0x56BB, + 0x56CF, + 0x56D0, + 0x56D9, + 0x56DA, + 0x56E6, + 0x56E7, + 0x56F6, + 0x56F7, + 0x56F8, + 0x56F9, + 0x56FB, + 0x56FD, + 0x5705, + 0x5706, + 0x5711, + 0x5712, + 0x5717, + 0x5718, + 0x5721, + 0x5722, + 0x5724, + 0x5725, + 0x573D, + 0x573E, + 0x5743, + 0x5744, + 0x5748, + 0x5749, + 0x5755, + 0x5757, + 0x5758, + 0x5759, + 0x5763, + 0x5764, + 0x5778, + 0x5779, + 0x5781, + 0x5782, + 0x5787, + 0x5788, + 0x5796, + 0x5797, + 0x57A8, + 0x57A9, + 0x57CA, + 0x57CB, + 0x57D1, + 0x57D2, + 0x57DB, + 0x57DC, + 0x5817, + 0x5819, + 0x5850, + 0x5851, + 0x5856, + 0x5857, + 0x5860, + 0x5861, + 0x5866, + 0x5868, + 0x5877, + 0x5878, + 0x5895, + 0x5896, + 0x58AA, + 0x58AB, + 0x58B6, + 0x58B7, + 0x58C0, + 0x58C1, + 0x58C3, + 0x58C5, + 0x58CD, + 0x58CE, + 0x58D0, + 0x58D1, + 0x58E1, + 0x58E2, + 0x58E6, + 0x58E7, + 0x58F5, + 0x58F6, + 0x5901, + 0x5902, + 0x5905, + 0x5906, + 0x5908, + 0x5909, + 0x5911, + 0x5912, + 0x5913, + 0x5914, + 0x5923, + 0x5924, + 0x5933, + 0x5934, + 0x5936, + 0x5937, + 0x5959, + 0x595A, + 0x595B, + 0x595C, + 0x59B7, + 0x59B8, + 0x59E7, + 0x59E8, + 0x5A24, + 0x5A25, + 0x5A26, + 0x5A27, + 0x5A2C, + 0x5A2D, + 0x5A30, + 0x5A31, + 0x5A54, + 0x5A55, + 0x5A59, + 0x5A5A, + 0x5A6F, + 0x5A70, + 0x5A71, + 0x5A72, + 0x5A87, + 0x5A88, + 0x5A8D, + 0x5A8E, + 0x5AAB, + 0x5AAC, + 0x5AD3, + 0x5AD4, + 0x5AEF, + 0x5AF1, + 0x5B0A, + 0x5B0B, + 0x5B0D, + 0x5B0E, + 0x5B39, + 0x5B3A, + 0x5B46, + 0x5B47, + 0x5B4F, + 0x5B50, + 0x5B52, + 0x5B53, + 0x5B60, + 0x5B62, + 0x5B6F, + 0x5B70, + 0x5B79, + 0x5B7A, + 0x5B7E, + 0x5B7F, + 0x5B86, + 0x5B87, + 0x5B90, + 0x5B91, + 0x5BA9, + 0x5BAA, + 0x5BB2, + 0x5BB3, + 0x5BB7, + 0x5BB8, + 0x5BBC, + 0x5BBD, + 0x5BC8, + 0x5BC9, + 0x5BDA, + 0x5BDB, + 0x5C00, + 0x5C01, + 0x5C1B, + 0x5C1C, + 0x5C23, + 0x5C24, + 0x5C26, + 0x5C27, + 0x5C29, + 0x5C2A, + 0x5C36, + 0x5C37, + 0x5C5A, + 0x5C5B, + 0x5C85, + 0x5C86, + 0x5CB4, + 0x5CB5, + 0x5CB9, + 0x5CBA, + 0x5CD5, + 0x5CD6, + 0x5CDD, + 0x5CDE, + 0x5CF5, + 0x5CF6, + 0x5D2B, + 0x5D2C, + 0x5D2F, + 0x5D30, + 0x5D3B, + 0x5D3C, + 0x5D53, + 0x5D54, + 0x5D57, + 0x5D58, + 0x5D60, + 0x5D61, + 0x5D83, + 0x5D84, + 0x5D96, + 0x5D97, + 0x5DA3, + 0x5DA5, + 0x5DAB, + 0x5DAC, + 0x5DB3, + 0x5DB4, + 0x5DB9, + 0x5DBA, + 0x5DC4, + 0x5DC5, + 0x5DD7, + 0x5DD8, + 0x5DDA, + 0x5DDB, + 0x5DDC, + 0x5DDD, + 0x5DF6, + 0x5DF7, + 0x5E12, + 0x5E13, + 0x5E48, + 0x5E49, + 0x5E51, + 0x5E52, + 0x5E92, + 0x5E93, + 0x5EBA, + 0x5EBB, + 0x5EC0, + 0x5EC1, + 0x5EEB, + 0x5EEC, + 0x5EF9, + 0x5EFA, + 0x5F0E, + 0x5F0F, + 0x5F3B, + 0x5F3C, + 0x5F3D, + 0x5F3E, + 0x5F8F, + 0x5F90, + 0x5F9A, + 0x5F9B, + 0x5FA3, + 0x5FA5, + 0x5FB0, + 0x5FB1, + 0x5FC2, + 0x5FC3, + 0x5FCE, + 0x5FCF, + 0x5FDB, + 0x5FDC, + 0x5FE2, + 0x5FE3, + 0x5FEC, + 0x5FED, + 0x5FFC, + 0x5FFD, + 0x6023, + 0x6024, + 0x6056, + 0x6057, + 0x6061, + 0x6062, + 0x6071, + 0x6072, + 0x6074, + 0x6075, + 0x6091, + 0x6092, + 0x6093, + 0x6094, + 0x60A5, + 0x60A6, + 0x60D2, + 0x60D3, + 0x60D6, + 0x60D7, + 0x60DE, + 0x60DF, + 0x60E5, + 0x60E6, + 0x60FD, + 0x60FE, + 0x6102, + 0x6103, + 0x6107, + 0x6108, + 0x6111, + 0x6112, + 0x611E, + 0x611F, + 0x6131, + 0x6132, + 0x6133, + 0x6134, + 0x6135, + 0x6136, + 0x6138, + 0x613A, + 0x6160, + 0x6161, + 0x617B, + 0x617C, + 0x617F, + 0x6180, + 0x6186, + 0x6187, + 0x6197, + 0x6198, + 0x619C, + 0x619D, + 0x61B9, + 0x61BA, + 0x61BB, + 0x61BC, + 0x61D3, + 0x61D4, + 0x61D5, + 0x61D6, + 0x61EC, + 0x61ED, + 0x61EF, + 0x61F0, + 0x6205, + 0x6206, + 0x6235, + 0x6236, + 0x6239, + 0x623A, + 0x6257, + 0x6258, + 0x628D, + 0x628E, + 0x629D, + 0x629E, + 0x62DE, + 0x62DF, + 0x62EA, + 0x62EB, + 0x630A, + 0x630B, + 0x6317, + 0x6318, + 0x6331, + 0x6332, + 0x6337, + 0x6338, + 0x635B, + 0x635C, + 0x638B, + 0x638C, + 0x6393, + 0x6394, + 0x63D1, + 0x63D2, + 0x643B, + 0x643D, + 0x6449, + 0x644A, + 0x645A, + 0x645B, + 0x647E, + 0x647F, + 0x6486, + 0x6487, + 0x64A1, + 0x64A2, + 0x64AF, + 0x64B0, + 0x64B6, + 0x64B7, + 0x64C8, + 0x64C9, + 0x64D5, + 0x64D6, + 0x64EE, + 0x64EF, + 0x64F5, + 0x64F6, + 0x64F9, + 0x64FA, + 0x6502, + 0x6503, + 0x650A, + 0x650B, + 0x651F, + 0x6520, + 0x6528, + 0x6529, + 0x6540, + 0x6541, + 0x6542, + 0x6543, + 0x655A, + 0x655B, + 0x655F, + 0x6560, + 0x657D, + 0x657E, + 0x658A, + 0x658B, + 0x659A, + 0x659B, + 0x65B5, + 0x65B6, + 0x65BE, + 0x65BF, + 0x65C8, + 0x65CA, + 0x65D1, + 0x65D2, + 0x65D8, + 0x65D9, + 0x65DC, + 0x65DD, + 0x65E4, + 0x65E5, + 0x65EA, + 0x65EB, + 0x65F9, + 0x65FA, + 0x65FE, + 0x65FF, + 0x6617, + 0x6618, + 0x662C, + 0x662D, + 0x6637, + 0x6639, + 0x6648, + 0x6649, + 0x664D, + 0x664E, + 0x6660, + 0x6661, + 0x6663, + 0x6664, + 0x6692, + 0x6693, + 0x669C, + 0x669D, + 0x669E, + 0x669F, + 0x66AC, + 0x66AE, + 0x66D0, + 0x66D1, + 0x66D3, + 0x66D4, + 0x66D7, + 0x66D8, + 0x66DF, + 0x66E0, + 0x66EF, + 0x66F0, + 0x6702, + 0x6703, + 0x6707, + 0x6708, + 0x6719, + 0x671A, + 0x6724, + 0x6725, + 0x6729, + 0x672A, + 0x6767, + 0x6768, + 0x6788, + 0x6789, + 0x6796, + 0x6797, + 0x67BD, + 0x67BE, + 0x67BF, + 0x67C0, + 0x67D5, + 0x67D6, + 0x67D7, + 0x67D8, + 0x67F9, + 0x67FA, + 0x6801, + 0x6802, + 0x6815, + 0x6816, + 0x6827, + 0x6828, + 0x6830, + 0x6831, + 0x6858, + 0x6859, + 0x685A, + 0x685B, + 0x685E, + 0x685F, + 0x687A, + 0x687B, + 0x6895, + 0x6896, + 0x6899, + 0x689A, + 0x68A5, + 0x68A6, + 0x68B8, + 0x68B9, + 0x68C3, + 0x68C4, + 0x68D9, + 0x68DA, + 0x68E2, + 0x68E3, + 0x68E5, + 0x68E6, + 0x6909, + 0x690A, + 0x693E, + 0x693F, + 0x694D, + 0x694E, + 0x699F, + 0x69A0, + 0x69A2, + 0x69A3, + 0x69C0, + 0x69C1, + 0x69D1, + 0x69D3, + 0x69D5, + 0x69D8, + 0x6A03, + 0x6A04, + 0x6A1C, + 0x6A1D, + 0x6A24, + 0x6A25, + 0x6A37, + 0x6A38, + 0x6A4A, + 0x6A4B, + 0x6A5C, + 0x6A5D, + 0x6A6E, + 0x6A6F, + 0x6A70, + 0x6A71, + 0x6A86, + 0x6A87, + 0x6A8A, + 0x6A8B, + 0x6A8F, + 0x6A90, + 0x6A99, + 0x6A9A, + 0x6A9D, + 0x6A9E, + 0x6AB1, + 0x6AB2, + 0x6ABE, + 0x6ABF, + 0x6AC0, + 0x6AC1, + 0x6AC4, + 0x6AC5, + 0x6AC9, + 0x6ACA, + 0x6AD8, + 0x6AD9, + 0x6AE9, + 0x6AEA, + 0x6B0E, + 0x6B0F, + 0x6B1B, + 0x6B1C, + 0x6B2E, + 0x6B2F, + 0x6B35, + 0x6B36, + 0x6B40, + 0x6B41, + 0x6B57, + 0x6B59, + 0x6B5D, + 0x6B5E, + 0x6B68, + 0x6B69, + 0x6B6C, + 0x6B6D, + 0x6B6E, + 0x6B6F, + 0x6B71, + 0x6B72, + 0x6B75, + 0x6B76, + 0x6B7D, + 0x6B7E, + 0x6BB8, + 0x6BB9, + 0x6BE9, + 0x6BEA, + 0x6BF1, + 0x6BF2, + 0x6BF4, + 0x6BF5, + 0x6BFA, + 0x6BFB, + 0x6C0A, + 0x6C0B, + 0x6C1C, + 0x6C1D, + 0x6C2D, + 0x6C2E, + 0x6C3C, + 0x6C3D, + 0x6C45, + 0x6C46, + 0x6C6C, + 0x6C6D, + 0x6C6E, + 0x6C6F, + 0x6CA0, + 0x6CA1, + 0x6CD8, + 0x6CD9, + 0x6CF4, + 0x6CF5, + 0x6D02, + 0x6D03, + 0x6D1C, + 0x6D1D, + 0x6D24, + 0x6D25, + 0x6D71, + 0x6D72, + 0x6D81, + 0x6D82, + 0x6D96, + 0x6D97, + 0x6DB0, + 0x6DB2, + 0x6DB6, + 0x6DB7, + 0x6DFE, + 0x6E00, + 0x6E01, + 0x6E03, + 0x6E06, + 0x6E07, + 0x6E12, + 0x6E13, + 0x6E18, + 0x6E19, + 0x6E2A, + 0x6E2B, + 0x6E4C, + 0x6E4D, + 0x6E6C, + 0x6E6D, + 0x6E7B, + 0x6E7E, + 0x6E8B, + 0x6E8C, + 0x6E95, + 0x6E96, + 0x6EDB, + 0x6EDC, + 0x6EE3, + 0x6EE4, + 0x6F04, + 0x6F05, + 0x6F0B, + 0x6F0C, + 0x6F42, + 0x6F43, + 0x6F48, + 0x6F49, + 0x6F4A, + 0x6F4B, + 0x6F79, + 0x6F7A, + 0x6F98, + 0x6F99, + 0x6F9A, + 0x6F9B, + 0x6F9F, + 0x6FA0, + 0x6FB7, + 0x6FB8, + 0x6FC5, + 0x6FC6, + 0x6FD0, + 0x6FD1, + 0x6FD3, + 0x6FD4, + 0x6FF5, + 0x6FF6, + 0x6FFD, + 0x6FFE, + 0x7010, + 0x7011, + 0x7013, + 0x7014, + 0x7047, + 0x7048, + 0x704B, + 0x704C, + 0x704E, + 0x704F, + 0x7072, + 0x7074, + 0x707B, + 0x707C, + 0x7081, + 0x7082, + 0x708D, + 0x708E, + 0x7097, + 0x7098, + 0x709B, + 0x709C, + 0x70AA, + 0x70AB, + 0x70B2, + 0x70B3, + 0x70B6, + 0x70B7, + 0x70D5, + 0x70D6, + 0x70FE, + 0x70FF, + 0x7108, + 0x7109, + 0x7124, + 0x7125, + 0x7133, + 0x7135, + 0x7157, + 0x7158, + 0x716B, + 0x716C, + 0x716D, + 0x716E, + 0x718D, + 0x718E, + 0x7196, + 0x7197, + 0x71A6, + 0x71A7, + 0x71AB, + 0x71AC, + 0x71B6, + 0x71B7, + 0x71CC, + 0x71CD, + 0x71D3, + 0x71D4, + 0x71F3, + 0x71F4, + 0x71FA, + 0x71FB, + 0x720B, + 0x720C, + 0x7211, + 0x7212, + 0x7215, + 0x7216, + 0x7217, + 0x7218, + 0x7220, + 0x7221, + 0x7224, + 0x7226, + 0x722F, + 0x7230, + 0x7234, + 0x7235, + 0x7245, + 0x7246, + 0x724E, + 0x724F, + 0x7250, + 0x7251, + 0x7255, + 0x7256, + 0x72AB, + 0x72AC, + 0x72BE, + 0x72BF, + 0x7302, + 0x7303, + 0x7310, + 0x7311, + 0x7328, + 0x7329, + 0x7353, + 0x7354, + 0x739C, + 0x739D, + 0x73C1, + 0x73C2, + 0x73F3, + 0x73F4, + 0x73FB, + 0x73FC, + 0x7418, + 0x7419, + 0x7439, + 0x743A, + 0x743E, + 0x743F, + 0x7447, + 0x7448, + 0x7449, + 0x744A, + 0x7458, + 0x7459, + 0x747B, + 0x747C, + 0x7484, + 0x7485, + 0x7496, + 0x7497, + 0x749D, + 0x749E, + 0x74C7, + 0x74C8, + 0x74C9, + 0x74CA, + 0x74CC, + 0x74CD, + 0x74EB, + 0x74EC, + 0x7520, + 0x7521, + 0x7541, + 0x7542, + 0x7552, + 0x7553, + 0x7555, + 0x7556, + 0x755E, + 0x755F, + 0x7561, + 0x7562, + 0x7571, + 0x7572, + 0x757B, + 0x757C, + 0x7585, + 0x7586, + 0x75A9, + 0x75AA, + 0x75B7, + 0x75B8, + 0x75DC, + 0x75DD, + 0x75EE, + 0x75EF, + 0x762C, + 0x762D, + 0x7644, + 0x7646, + 0x7651, + 0x7652, + 0x7655, + 0x7656, + 0x7673, + 0x7674, + 0x768D, + 0x768E, + 0x76A1, + 0x76A3, + 0x76A5, + 0x76A6, + 0x76A8, + 0x76A9, + 0x76B3, + 0x76B4, + 0x76B6, + 0x76B7, + 0x76C1, + 0x76C2, + 0x76CB, + 0x76CC, + 0x76D9, + 0x76DA, + 0x76EB, + 0x76EC, + 0x7700, + 0x7701, + 0x7702, + 0x7703, + 0x770E, + 0x770F, + 0x7721, + 0x7722, + 0x772B, + 0x772C, + 0x773F, + 0x7740, + 0x7742, + 0x7743, + 0x7764, + 0x7765, + 0x7796, + 0x7797, + 0x77A4, + 0x77A5, + 0x77BE, + 0x77BF, + 0x77C1, + 0x77C2, + 0x77D2, + 0x77D3, + 0x77DD, + 0x77DE, + 0x77E4, + 0x77E5, + 0x77E6, + 0x77E7, + 0x77F4, + 0x77F6, + 0x7824, + 0x7825, + 0x7836, + 0x7837, + 0x7842, + 0x7843, + 0x7846, + 0x7847, + 0x784B, + 0x784C, + 0x7876, + 0x7877, + 0x7888, + 0x7889, + 0x78C2, + 0x78C3, + 0x78C7, + 0x78C8, + 0x78D2, + 0x78D3, + 0x78F0, + 0x78F1, + 0x78F8, + 0x78F9, + 0x7900, + 0x7901, + 0x7908, + 0x7909, + 0x790D, + 0x790E, + 0x7915, + 0x7916, + 0x791F, + 0x7921, + 0x7932, + 0x7933, + 0x7936, + 0x7937, + 0x7959, + 0x795A, + 0x796C, + 0x796D, + 0x796E, + 0x796F, + 0x7975, + 0x7977, + 0x7986, + 0x7988, + 0x799E, + 0x799F, + 0x79A9, + 0x79AA, + 0x79BC, + 0x79BD, + 0x79C4, + 0x79C5, + 0x79C7, + 0x79C8, + 0x79CC, + 0x79CD, + 0x79D4, + 0x79D5, + 0x79D7, + 0x79D8, + 0x7A01, + 0x7A02, + 0x7A07, + 0x7A08, + 0x7A09, + 0x7A0A, + 0x7A2C, + 0x7A2D, + 0x7A38, + 0x7A39, + 0x7A3A, + 0x7A3B, + 0x7A64, + 0x7A65, + 0x7A6A, + 0x7A6B, + 0x7A6F, + 0x7A70, + 0x7A82, + 0x7A83, + 0x7A9A, + 0x7A9C, + 0x7AB9, + 0x7ABA, + 0x7ABB, + 0x7ABE, + 0x7AC2, + 0x7AC3, + 0x7AC6, + 0x7AC7, + 0x7AE9, + 0x7AEA, + 0x7AF5, + 0x7AF6, + 0x7AFC, + 0x7AFD, + 0x7B07, + 0x7B08, + 0x7B1F, + 0x7B20, + 0x7B27, + 0x7B28, + 0x7B29, + 0x7B2A, + 0x7B42, + 0x7B43, + 0x7B53, + 0x7B54, + 0x7BA3, + 0x7BA4, + 0x7BA5, + 0x7BA6, + 0x7BB0, + 0x7BB1, + 0x7BB2, + 0x7BB3, + 0x7BFA, + 0x7BFB, + 0x7C1B, + 0x7C1C, + 0x7C2E, + 0x7C30, + 0x7C52, + 0x7C53, + 0x7C55, + 0x7C56, + 0x7C5D, + 0x7C5E, + 0x7C76, + 0x7C77, + 0x7C87, + 0x7C88, + 0x7C93, + 0x7C94, + 0x7C9A, + 0x7C9B, + 0x7CAC, + 0x7CAD, + 0x7CD3, + 0x7CD4, + 0x7CDA, + 0x7CDC, + 0x7CE1, + 0x7CE2, + 0x7CE3, + 0x7CE4, + 0x7CE5, + 0x7CE7, + 0x7CFC, + 0x7CFD, + 0x7CFF, + 0x7D00, + 0x7D23, + 0x7D24, + 0x7D2A, + 0x7D2B, + 0x7D2D, + 0x7D2E, + 0x7D48, + 0x7D49, + 0x7D4D, + 0x7D4E, + 0x7D5A, + 0x7D5B, + 0x7D64, + 0x7D65, + 0x7D78, + 0x7D79, + 0x7D82, + 0x7D83, + 0x7D95, + 0x7D96, + 0x7D98, + 0x7D99, + 0x7DA4, + 0x7DA5, + 0x7DA8, + 0x7DA9, + 0x7DCD, + 0x7DCE, + 0x7DD3, + 0x7DD4, + 0x7DE5, + 0x7DE6, + 0x7DEB, + 0x7DEC, + 0x7DFD, + 0x7E00, + 0x7E18, + 0x7E19, + 0x7E5B, + 0x7E5C, + 0x7E64, + 0x7E65, + 0x7E9D, + 0x7E9E, + 0x7F3B, + 0x7F3D, + 0x7F41, + 0x7F42, + 0x7F46, + 0x7F47, + 0x7F59, + 0x7F5A, + 0x7F84, + 0x7F85, + 0x7F90, + 0x7F91, + 0x7F97, + 0x7F98, + 0x7F99, + 0x7F9A, + 0x7FB4, + 0x7FB5, + 0x7FD6, + 0x7FD7, + 0x7FDD, + 0x7FDE, + 0x7FE4, + 0x7FE5, + 0x800A, + 0x800B, + 0x802F, + 0x8030, + 0x803C, + 0x803D, + 0x8040, + 0x8041, + 0x8066, + 0x8067, + 0x8088, + 0x8089, + 0x808E, + 0x808F, + 0x8094, + 0x8095, + 0x80A6, + 0x80A9, + 0x80B3, + 0x80B4, + 0x80B9, + 0x80BA, + 0x80DF, + 0x80E0, + 0x8103, + 0x8105, + 0x8134, + 0x8136, + 0x8184, + 0x8185, + 0x8190, + 0x8191, + 0x8196, + 0x8197, + 0x81CB, + 0x81CC, + 0x81E4, + 0x81E5, + 0x81EF, + 0x81F1, + 0x8213, + 0x8214, + 0x8224, + 0x8225, + 0x8241, + 0x8242, + 0x8265, + 0x8266, + 0x828C, + 0x828D, + 0x82B2, + 0x82B3, + 0x82E2, + 0x82E3, + 0x82FC, + 0x82FD, + 0x830A, + 0x830B, + 0x8310, + 0x8311, + 0x8330, + 0x8331, + 0x8355, + 0x8356, + 0x83BE, + 0x83BF, + 0x83E6, + 0x83E7, + 0x83ED, + 0x83EE, + 0x8414, + 0x8415, + 0x8416, + 0x8418, + 0x841F, + 0x8420, + 0x8458, + 0x8459, + 0x8483, + 0x8484, + 0x8495, + 0x8496, + 0x84B7, + 0x84B8, + 0x84C3, + 0x84C4, + 0x84ED, + 0x84EE, + 0x8505, + 0x8506, + 0x8510, + 0x8511, + 0x8532, + 0x8534, + 0x854C, + 0x854D, + 0x8550, + 0x8551, + 0x857F, + 0x8580, + 0x8593, + 0x8594, + 0x85B2, + 0x85B3, + 0x85BB, + 0x85BC, + 0x85CC, + 0x85CD, + 0x85EE, + 0x85EF, + 0x85F3, + 0x85F4, + 0x85FC, + 0x85FD, + 0x8603, + 0x8604, + 0x860D, + 0x860F, + 0x8610, + 0x8611, + 0x8615, + 0x8616, + 0x861D, + 0x861E, + 0x8637, + 0x8638, + 0x8657, + 0x8658, + 0x8675, + 0x8676, + 0x8689, + 0x868A, + 0x8692, + 0x8693, + 0x86A0, + 0x86A1, + 0x86A6, + 0x86A7, + 0x86D5, + 0x86D6, + 0x86E0, + 0x86E1, + 0x86E7, + 0x86E8, + 0x86FD, + 0x86FE, + 0x871D, + 0x871E, + 0x872F, + 0x8730, + 0x873D, + 0x873E, + 0x8745, + 0x8746, + 0x8771, + 0x8772, + 0x878E, + 0x878F, + 0x8799, + 0x879A, + 0x87DA, + 0x87DB, + 0x87F0, + 0x87F1, + 0x8807, + 0x8808, + 0x8812, + 0x8813, + 0x882D, + 0x882E, + 0x883A, + 0x883B, + 0x8847, + 0x8848, + 0x8858, + 0x8859, + 0x885C, + 0x885D, + 0x885F, + 0x8860, + 0x887A, + 0x887B, + 0x88E6, + 0x88E7, + 0x88E9, + 0x88EA, + 0x88ED, + 0x88EE, + 0x8903, + 0x8904, + 0x890F, + 0x8910, + 0x8924, + 0x8925, + 0x8965, + 0x8966, + 0x8975, + 0x8976, + 0x897D, + 0x897E, + 0x898D, + 0x898E, + 0x8990, + 0x8991, + 0x8994, + 0x8995, + 0x8999, + 0x899A, + 0x89B0, + 0x89B1, + 0x89B4, + 0x89B5, + 0x89BB, + 0x89BD, + 0x89EE, + 0x89EF, + 0x89F5, + 0x89F6, + 0x89F9, + 0x89FA, + 0x89FD, + 0x89FE, + 0x8A05, + 0x8A07, + 0x8A14, + 0x8A15, + 0x8A19, + 0x8A1A, + 0x8A20, + 0x8A22, + 0x8A2B, + 0x8A2C, + 0x8A3D, + 0x8A3E, + 0x8A4B, + 0x8A4C, + 0x8A64, + 0x8A65, + 0x8A78, + 0x8A79, + 0x8A7D, + 0x8A7E, + 0x8A88, + 0x8A89, + 0x8A9F, + 0x8AA0, + 0x8AAF, + 0x8AB0, + 0x8AB7, + 0x8AB8, + 0x8AD0, + 0x8AD1, + 0x8AEC, + 0x8AED, + 0x8B29, + 0x8B2A, + 0x8B32, + 0x8B33, + 0x8B38, + 0x8B39, + 0x8B3F, + 0x8B40, + 0x8B61, + 0x8B63, + 0x8B69, + 0x8B6A, + 0x8B75, + 0x8B76, + 0x8B7C, + 0x8B7D, + 0x8B81, + 0x8B82, + 0x8B87, + 0x8B88, + 0x8B8D, + 0x8B8E, + 0x8B8F, + 0x8B90, + 0x8B9B, + 0x8B9C, + 0x8C38, + 0x8C39, + 0x8C40, + 0x8C41, + 0x8C44, + 0x8C45, + 0x8C51, + 0x8C54, + 0x8C58, + 0x8C59, + 0x8C74, + 0x8C75, + 0x8C7F, + 0x8C80, + 0x8C83, + 0x8C84, + 0x8C87, + 0x8C88, + 0x8C8B, + 0x8C8C, + 0x8C9B, + 0x8C9C, + 0x8CA6, + 0x8CA7, + 0x8CCB, + 0x8CCC, + 0x8CD6, + 0x8CD7, + 0x8CD8, + 0x8CD9, + 0x8CE9, + 0x8CEA, + 0x8CF7, + 0x8CF8, + 0x8D01, + 0x8D02, + 0x8D11, + 0x8D13, + 0x8D7C, + 0x8D7D, + 0x8DA6, + 0x8DA7, + 0x8DC0, + 0x8DC1, + 0x8DE5, + 0x8DE6, + 0x8E01, + 0x8E02, + 0x8E0B, + 0x8E0C, + 0x8E32, + 0x8E33, + 0x8E46, + 0x8E47, + 0x8E4F, + 0x8E50, + 0x8E6E, + 0x8E6F, + 0x8E75, + 0x8E76, + 0x8E77, + 0x8E78, + 0x8E79, + 0x8E7A, + 0x8E9B, + 0x8E9C, + 0x8EA2, + 0x8EA3, + 0x8EB3, + 0x8EB4, + 0x8EB6, + 0x8EB8, + 0x8EC1, + 0x8EC2, + 0x8EC4, + 0x8EC5, + 0x8ED9, + 0x8EDA, + 0x8EF0, + 0x8EF1, + 0x8F0F, + 0x8F10, + 0x8F2D, + 0x8F2E, + 0x8F3A, + 0x8F3B, + 0x8F41, + 0x8F42, + 0x8F9D, + 0x8F9E, + 0x8FA4, + 0x8FA5, + 0x8FB3, + 0x8FB4, + 0x8FC3, + 0x8FC4, + 0x8FCA, + 0x8FCB, + 0x8FE7, + 0x8FE8, + 0x902A, + 0x902B, + 0x902C, + 0x902D, + 0x9037, + 0x9038, + 0x9040, + 0x9041, + 0x9046, + 0x9047, + 0x90AB, + 0x90AC, + 0x90CC, + 0x90CE, + 0x90D2, + 0x90D3, + 0x90F6, + 0x90F7, + 0x910A, + 0x910B, + 0x913C, + 0x913E, + 0x9159, + 0x915A, + 0x917B, + 0x917C, + 0x9195, + 0x9196, + 0x9198, + 0x9199, + 0x91A9, + 0x91AA, + 0x91BF, + 0x91C0, + 0x91C4, + 0x91C5, + 0x91E0, + 0x91E1, + 0x91EF, + 0x91F0, + 0x9213, + 0x9214, + 0x921F, + 0x9220, + 0x9222, + 0x9223, + 0x9243, + 0x9244, + 0x9269, + 0x926B, + 0x9281, + 0x9282, + 0x9284, + 0x9285, + 0x929E, + 0x929F, + 0x92BD, + 0x92BE, + 0x92D4, + 0x92D5, + 0x92DB, + 0x92DC, + 0x92E2, + 0x92E3, + 0x931C, + 0x931D, + 0x9330, + 0x9332, + 0x9362, + 0x9363, + 0x9368, + 0x9369, + 0x936B, + 0x936C, + 0x936F, + 0x9370, + 0x9373, + 0x9374, + 0x9378, + 0x9379, + 0x937F, + 0x9380, + 0x9381, + 0x9382, + 0x938B, + 0x938C, + 0x939C, + 0x939D, + 0x93A0, + 0x93A1, + 0x93AB, + 0x93AC, + 0x93BB, + 0x93BC, + 0x93E0, + 0x93E1, + 0x93F3, + 0x93F4, + 0x9402, + 0x9403, + 0x9417, + 0x9418, + 0x941C, + 0x941D, + 0x941E, + 0x9420, + 0x9424, + 0x9425, + 0x9443, + 0x9444, + 0x944E, + 0x944F, + 0x946C, + 0x946D, + 0x947B, + 0x947C, + 0x9578, + 0x957A, + 0x957E, + 0x957F, + 0x9585, + 0x9586, + 0x9597, + 0x9598, + 0x95B3, + 0x95B5, + 0x95B8, + 0x95B9, + 0x95C1, + 0x95C2, + 0x95D9, + 0x95DA, + 0x95DD, + 0x95DE, + 0x9625, + 0x9627, + 0x9629, + 0x962A, + 0x963E, + 0x963F, + 0x9656, + 0x9658, + 0x9679, + 0x967A, + 0x967B, + 0x967C, + 0x967F, + 0x9680, + 0x9681, + 0x9683, + 0x968C, + 0x968D, + 0x9696, + 0x9697, + 0x969A, + 0x969B, + 0x969D, + 0x969E, + 0x969F, + 0x96A0, + 0x96AB, + 0x96AC, + 0x96AF, + 0x96B0, + 0x96B5, + 0x96B6, + 0x96E4, + 0x96E5, + 0x96E6, + 0x96E8, + 0x96FC, + 0x96FD, + 0x9714, + 0x9715, + 0x9717, + 0x9718, + 0x971A, + 0x971C, + 0x9733, + 0x9735, + 0x9737, + 0x9738, + 0x9740, + 0x9742, + 0x974D, + 0x974E, + 0x9757, + 0x9758, + 0x9763, + 0x9764, + 0x9775, + 0x9776, + 0x9787, + 0x9788, + 0x9789, + 0x978A, + 0x979B, + 0x979C, + 0x97A9, + 0x97AA, + 0x97B0, + 0x97B2, + 0x97B5, + 0x97B6, + 0x97BE, + 0x97BF, + 0x97C0, + 0x97C1, + 0x97D2, + 0x97D3, + 0x97FC, + 0x97FD, + 0x981F, + 0x9820, + 0x9825, + 0x9826, + 0x982A, + 0x982B, + 0x9833, + 0x9834, + 0x983A, + 0x983B, + 0x983E, + 0x983F, + 0x9842, + 0x9843, + 0x9847, + 0x9848, + 0x9856, + 0x9857, + 0x9866, + 0x9867, + 0x9868, + 0x9869, + 0x98B7, + 0x98B8, + 0x98CA, + 0x98CB, + 0x98E4, + 0x98E5, + 0x98EC, + 0x98ED, + 0x98F1, + 0x98F2, + 0x98F8, + 0x98F9, + 0x98FB, + 0x98FC, + 0x9919, + 0x991A, + 0x993B, + 0x993C, + 0x9944, + 0x9945, + 0x995A, + 0x995B, + 0x995D, + 0x995E, + 0x99BF, + 0x99C0, + 0x99E0, + 0x99E1, + 0x99E6, + 0x99E7, + 0x99EB, + 0x99EC, + 0x99F5, + 0x99F6, + 0x9A10, + 0x9A11, + 0x9A17, + 0x9A19, + 0x9A3B, + 0x9A3C, + 0x9A51, + 0x9A52, + 0x9A58, + 0x9A59, + 0x9A5D, + 0x9A5E, + 0x9A63, + 0x9A64, + 0x9AA9, + 0x9AAA, + 0x9ABD, + 0x9ABE, + 0x9AC8, + 0x9AC9, + 0x9AD7, + 0x9AD8, + 0x9AE0, + 0x9AE1, + 0x9AE4, + 0x9AE5, + 0x9AE8, + 0x9AEA, + 0x9AF0, + 0x9AF1, + 0x9B00, + 0x9B01, + 0x9B02, + 0x9B03, + 0x9B09, + 0x9B0A, + 0x9B14, + 0x9B15, + 0x9B1B, + 0x9B1C, + 0x9B34, + 0x9B35, + 0x9B3D, + 0x9B3E, + 0x9B40, + 0x9B41, + 0x9B50, + 0x9B51, + 0x9B57, + 0x9B58, + 0x9B62, + 0x9B63, + 0x9B72, + 0x9B73, + 0x9B89, + 0x9B8A, + 0x9B8C, + 0x9B8D, + 0x9B99, + 0x9B9A, + 0x9BC2, + 0x9BC3, + 0x9BF6, + 0x9BF7, + 0x9C00, + 0x9C02, + 0x9C03, + 0x9C04, + 0x9C42, + 0x9C43, + 0x9C4F, + 0x9C50, + 0x9C51, + 0x9C52, + 0x9C61, + 0x9C62, + 0x9C64, + 0x9C65, + 0x9C7B, + 0x9C7C, + 0x9D0C, + 0x9D0E, + 0x9D11, + 0x9D12, + 0x9D27, + 0x9D28, + 0x9D35, + 0x9D36, + 0x9D3C, + 0x9D3D, + 0x9D6D, + 0x9D6E, + 0x9D95, + 0x9D96, + 0x9DAE, + 0x9DAF, + 0x9DBD, + 0x9DBE, + 0x9DC0, + 0x9DC1, + 0x9DEA, + 0x9DEB, + 0x9DFC, + 0x9DFD, + 0x9E0E, + 0x9E0F, + 0x9E16, + 0x9E17, + 0x9E1C, + 0x9E1D, + 0x9E7B, + 0x9E7C, + 0x9E8F, + 0x9E91, + 0x9E98, + 0x9E99, + 0x9E9E, + 0x9E9F, + 0x9EA2, + 0x9EA3, + 0x9EAB, + 0x9EAD, + 0x9EB1, + 0x9EB2, + 0x9EEC, + 0x9EED, + 0x9EF1, + 0x9EF2, + 0x9F03, + 0x9F04, + 0x9F11, + 0x9F12, + 0x9F14, + 0x9F15, + 0x9F26, + 0x9F27, + 0x9F45, + 0x9F46, + 0x9F53, + 0x9F54, + 0x9F6D, + 0x9F6E, + 0x9FA1, + 0x9FA2, + 0x9FA3, + 0x9FA4, + 0x9FA6, 0xA78D, 0xA78E, - 0xA792, - 0xA794, 0xA7AA, 0xA7AB, - 0xA7C0, - 0xA7CB, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, - 0xA7DA, - 0xA9E7, - 0xA9FF, - 0xAA60, - 0xAA77, - 0xAA7A, - 0xAA80, - 0xAB01, - 0xAB07, - 0xAB09, - 0xAB0F, - 0xAB11, - 0xAB17, - 0xAB20, - 0xAB27, - 0xAB28, - 0xAB2F, - 0xAB66, - 0xAB68, + 0xAA7B, + 0xAA7C, 0xAC00, 0xD7A4, - 0xFA0E, - 0xFA10, - 0xFA11, - 0xFA12, - 0xFA13, - 0xFA15, - 0xFA1F, - 0xFA20, - 0xFA21, - 0xFA22, - 0xFA23, - 0xFA25, - 0xFA27, - 0xFA2A, 0x11301, 0x11302, 0x11303, 0x11304, - 0x1133B, + 0x1133C, 0x1133D, - 0x16FF0, - 0x16FF2, - 0x1B11F, - 0x1B123, - 0x1B132, - 0x1B133, - 0x1B150, - 0x1B153, - 0x1B155, - 0x1B156, - 0x1B164, - 0x1B168, - 0x1DF00, - 0x1DF1F, - 0x1DF25, - 0x1DF2B, - 0x1E08F, - 0x1E090, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -291771,22 +316984,122 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x1E7EF, 0x1E7F0, 0x1E7FF, - 0x20000, - 0x2A6E0, - 0x2A700, - 0x2B73A, - 0x2B740, - 0x2B81E, - 0x2B820, - 0x2CEA2, - 0x2CEB0, - 0x2EBE1, - 0x2EBF0, - 0x2EE5E, - 0x30000, - 0x3134B, - 0x31350, - 0x323B0 + 0x2070E, + 0x2070F, + 0x20731, + 0x20732, + 0x20779, + 0x2077A, + 0x20C53, + 0x20C54, + 0x20C78, + 0x20C79, + 0x20C96, + 0x20C97, + 0x20CCF, + 0x20CD0, + 0x20CD5, + 0x20CD6, + 0x20D15, + 0x20D16, + 0x20D7C, + 0x20D7D, + 0x20D7F, + 0x20D80, + 0x20E0E, + 0x20E10, + 0x20E77, + 0x20E78, + 0x20E9D, + 0x20E9E, + 0x20EA2, + 0x20EA3, + 0x20ED7, + 0x20ED8, + 0x20EF9, + 0x20EFB, + 0x20F2D, + 0x20F2F, + 0x20F4C, + 0x20F4D, + 0x20FB4, + 0x20FB5, + 0x20FBC, + 0x20FBD, + 0x20FEA, + 0x20FEB, + 0x2105C, + 0x2105D, + 0x2106F, + 0x21070, + 0x21075, + 0x21077, + 0x2107B, + 0x2107C, + 0x210C1, + 0x210C2, + 0x210C9, + 0x210CA, + 0x211D9, + 0x211DA, + 0x220C7, + 0x220C8, + 0x227B5, + 0x227B6, + 0x22AD5, + 0x22AD6, + 0x22B43, + 0x22B44, + 0x22BCA, + 0x22BCB, + 0x22C51, + 0x22C52, + 0x22C55, + 0x22C56, + 0x22CC2, + 0x22CC3, + 0x22D08, + 0x22D09, + 0x22D4C, + 0x22D4D, + 0x22D67, + 0x22D68, + 0x22EB3, + 0x22EB4, + 0x23CB7, + 0x23CB8, + 0x244D3, + 0x244D4, + 0x24DB8, + 0x24DB9, + 0x24DEA, + 0x24DEB, + 0x2512B, + 0x2512C, + 0x26258, + 0x26259, + 0x267CC, + 0x267CD, + 0x269F2, + 0x269F3, + 0x269FA, + 0x269FB, + 0x27A3E, + 0x27A3F, + 0x2815D, + 0x2815E, + 0x28207, + 0x28208, + 0x282E2, + 0x282E3, + 0x28CCA, + 0x28CCB, + 0x28CCD, + 0x28CCE, + 0x28CD2, + 0x28CD3, + 0x29D98, + 0x29D99 }; # endif /* EBCDIC 1047 */ @@ -291797,7 +317110,7 @@ static const UV UNI_IDENTIFIERTYPE__RECO && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_IDENTIFIERTYPE__RECOMMENDED_invlist[] = { /* for EBCDIC 037 */ - 795, /* Number of elements */ + 3233, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -291841,65 +317154,95 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xFB, 0xFF, 0x100, + 0x114, + 0x116, + 0x12C, + 0x12E, 0x132, 0x134, + 0x138, + 0x139, 0x13F, 0x141, 0x149, 0x14A, + 0x14E, + 0x150, + 0x156, + 0x158, + 0x162, + 0x164, 0x17F, - 0x18F, - 0x190, + 0x181, + 0x182, + 0x186, + 0x187, + 0x189, + 0x18B, + 0x18E, + 0x193, + 0x194, + 0x195, + 0x196, + 0x19A, + 0x19D, + 0x19E, 0x1A0, 0x1A2, 0x1AF, 0x1B1, + 0x1B2, + 0x1B5, + 0x1B7, + 0x1B8, 0x1CD, + 0x1D5, 0x1DD, 0x1DE, - 0x1E4, 0x1E6, - 0x1F1, - 0x1F4, - 0x1F6, + 0x1EA, + 0x1EE, + 0x1F0, 0x1F8, + 0x1FA, + 0x218, 0x21C, - 0x21E, - 0x220, - 0x226, - 0x234, + 0x244, + 0x245, + 0x24C, + 0x24E, + 0x253, + 0x255, + 0x256, + 0x258, 0x259, 0x25A, - 0x2BB, - 0x2BD, - 0x2EC, - 0x2ED, + 0x25B, + 0x25C, + 0x263, + 0x264, + 0x268, + 0x26A, + 0x272, + 0x273, + 0x289, + 0x28A, + 0x28B, + 0x28C, + 0x292, + 0x293, 0x300, 0x305, 0x306, 0x30D, - 0x30F, - 0x312, - 0x313, - 0x315, 0x31B, 0x31C, 0x323, + 0x324, + 0x326, 0x329, - 0x32D, - 0x32F, - 0x330, + 0x331, 0x332, - 0x335, - 0x336, - 0x338, - 0x33A, - 0x342, - 0x343, - 0x345, - 0x346, - 0x37B, - 0x37E, 0x386, 0x387, 0x388, @@ -291910,80 +317253,136 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x3A2, 0x3A3, 0x3CF, - 0x3FC, + 0x401, + 0x40D, + 0x40E, + 0x450, + 0x451, + 0x45D, + 0x45E, 0x460, - 0x48A, - 0x500, - 0x510, - 0x52A, - 0x52E, - 0x530, + 0x490, + 0x49C, + 0x49E, + 0x4A6, + 0x4A8, + 0x4B8, + 0x4BA, + 0x4C1, + 0x4CF, + 0x4DA, + 0x4DC, + 0x4EA, + 0x4EE, + 0x4F6, + 0x4F8, + 0x4FA, + 0x524, + 0x526, 0x531, 0x557, - 0x559, - 0x55A, 0x561, 0x587, - 0x5B4, - 0x5B5, 0x5D0, 0x5EB, - 0x5EF, - 0x5F3, 0x620, - 0x640, + 0x63B, + 0x63D, + 0x63E, 0x641, + 0x653, + 0x654, 0x656, 0x660, 0x66A, 0x670, + 0x671, + 0x672, 0x673, 0x674, 0x675, 0x679, - 0x68E, - 0x68F, + 0x690, + 0x691, + 0x69B, + 0x69F, 0x6A1, 0x6A2, + 0x6A3, + 0x6A4, + 0x6AC, + 0x6AD, + 0x6B2, + 0x6B3, + 0x6B4, + 0x6B5, + 0x6B8, + 0x6BA, + 0x6BF, + 0x6C0, 0x6D4, 0x6D5, 0x6D6, - 0x6E5, - 0x6E7, 0x6EE, - 0x6FD, + 0x6FA, 0x6FF, 0x700, - 0x750, + 0x751, + 0x753, + 0x756, + 0x757, + 0x760, + 0x761, + 0x762, + 0x764, + 0x766, + 0x769, + 0x76A, + 0x76B, + 0x76E, + 0x772, + 0x780, 0x7B2, - 0x870, - 0x888, - 0x889, 0x88F, + 0x890, 0x8A0, - 0x8AD, - 0x8B2, - 0x8B3, - 0x8B5, - 0x8CA, + 0x8A1, + 0x8A2, + 0x8AA, + 0x8BB, + 0x8C3, + 0x8C7, + 0x8C8, 0x901, + 0x904, + 0x905, + 0x90C, + 0x90D, + 0x929, + 0x92A, + 0x934, + 0x935, + 0x93D, + 0x93E, + 0x944, + 0x945, 0x94E, 0x94F, - 0x951, + 0x950, 0x956, 0x958, - 0x960, - 0x964, 0x966, 0x970, - 0x971, + 0x972, 0x978, - 0x979, + 0x97B, + 0x97D, + 0x97E, 0x980, 0x981, 0x984, 0x985, - 0x98D, + 0x98C, 0x98F, 0x991, 0x993, @@ -291995,21 +317394,17 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x9B6, 0x9BA, 0x9BC, + 0x9BD, + 0x9BE, 0x9C5, 0x9C7, 0x9C9, 0x9CB, 0x9CF, - 0x9D7, - 0x9D8, - 0x9E0, - 0x9E4, 0x9E6, 0x9F2, - 0x9FE, - 0x9FF, - 0xA01, - 0xA04, + 0xA02, + 0xA03, 0xA05, 0xA0B, 0xA0F, @@ -292034,9 +317429,9 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xA4E, 0xA5C, 0xA5D, - 0xA66, - 0xA75, - 0xA81, + 0xA70, + 0xA72, + 0xA82, 0xA84, 0xA85, 0xA8E, @@ -292051,23 +317446,19 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xAB5, 0xABA, 0xABC, + 0xABD, + 0xABE, 0xAC6, 0xAC7, 0xACA, 0xACB, 0xACE, - 0xAD0, - 0xAD1, - 0xAE0, - 0xAE4, 0xAE6, 0xAF0, - 0xAFA, - 0xB00, 0xB01, 0xB04, 0xB05, - 0xB0D, + 0xB0C, 0xB0F, 0xB11, 0xB13, @@ -292076,23 +317467,23 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xB31, 0xB32, 0xB34, - 0xB35, + 0xB36, 0xB3A, 0xB3C, + 0xB3D, + 0xB3E, 0xB44, 0xB47, 0xB49, 0xB4B, 0xB4E, - 0xB55, - 0xB58, + 0xB56, + 0xB57, 0xB5F, - 0xB62, - 0xB66, - 0xB70, + 0xB60, 0xB71, 0xB72, - 0xB82, + 0xB83, 0xB84, 0xB85, 0xB8B, @@ -292118,99 +317509,79 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xBC9, 0xBCA, 0xBCE, - 0xBD0, - 0xBD1, - 0xBD7, - 0xBD8, - 0xBE6, - 0xBF0, - 0xC01, - 0xC0D, + 0xC02, + 0xC04, + 0xC05, + 0xC0C, 0xC0E, 0xC11, 0xC12, 0xC29, 0xC2A, + 0xC31, + 0xC32, 0xC34, 0xC35, 0xC3A, - 0xC3C, + 0xC3E, 0xC45, 0xC46, 0xC49, 0xC4A, 0xC4E, - 0xC55, - 0xC57, - 0xC5D, - 0xC5E, - 0xC60, - 0xC62, - 0xC66, - 0xC70, - 0xC80, - 0xC81, 0xC82, 0xC84, 0xC85, - 0xC8D, + 0xC8C, 0xC8E, 0xC91, 0xC92, 0xCA9, 0xCAA, + 0xCB1, + 0xCB2, 0xCB4, 0xCB5, 0xCBA, - 0xCBC, - 0xCC5, + 0xCBE, + 0xCC4, 0xCC6, 0xCC9, 0xCCA, 0xCCE, - 0xCD5, - 0xCD7, - 0xCDD, - 0xCDE, - 0xCE0, - 0xCE4, 0xCE6, 0xCF0, - 0xCF1, - 0xCF4, - 0xD00, - 0xD01, 0xD02, 0xD04, 0xD05, - 0xD0D, + 0xD0C, 0xD0E, 0xD11, 0xD12, - 0xD3B, - 0xD3D, + 0xD29, + 0xD2A, + 0xD3A, + 0xD3E, 0xD44, 0xD46, 0xD49, 0xD4A, - 0xD4F, - 0xD54, + 0xD4C, + 0xD4D, + 0xD4E, + 0xD57, 0xD58, - 0xD60, - 0xD62, - 0xD66, - 0xD70, 0xD7A, 0xD80, 0xD82, 0xD84, 0xD85, - 0xD8F, + 0xD8E, 0xD91, 0xD97, 0xD9A, - 0xDA6, - 0xDA7, + 0xD9E, + 0xD9F, 0xDB2, 0xDB3, 0xDBC, @@ -292233,42 +317604,50 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xE34, 0xE3B, 0xE40, - 0xE4F, + 0xE4E, 0xE50, 0xE5A, 0xE81, 0xE83, 0xE84, 0xE85, - 0xE86, + 0xE87, + 0xE89, + 0xE8A, 0xE8B, - 0xE8C, + 0xE8D, + 0xE8E, + 0xE94, + 0xE98, + 0xE99, + 0xEA0, + 0xEA1, 0xEA4, 0xEA5, 0xEA6, 0xEA7, + 0xEA8, + 0xEAA, + 0xEAC, + 0xEAD, + 0xEAF, + 0xEB0, 0xEB3, 0xEB4, + 0xEBA, + 0xEBB, 0xEBE, 0xEC0, 0xEC5, 0xEC6, 0xEC7, 0xEC8, - 0xECF, + 0xECE, 0xED0, 0xEDA, - 0xEDE, - 0xEE0, - 0xF00, - 0xF01, 0xF20, 0xF2A, - 0xF35, - 0xF36, - 0xF37, - 0xF38, - 0xF3E, + 0xF40, 0xF43, 0xF44, 0xF48, @@ -292282,17 +317661,15 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xF5C, 0xF5D, 0xF69, - 0xF6A, - 0xF6D, 0xF71, 0xF73, 0xF74, 0xF75, 0xF7A, 0xF81, - 0xF82, + 0xF84, 0xF85, - 0xF86, + 0xF90, 0xF93, 0xF94, 0xF98, @@ -292305,26 +317682,28 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0xFA8, 0xFAC, 0xFAD, + 0xFAE, + 0xFB1, 0xFB9, 0xFBA, 0xFBD, - 0xFC6, - 0xFC7, 0x1000, 0x104A, - 0x1050, - 0x109E, + 0x105A, + 0x1065, + 0x1075, + 0x108B, + 0x108F, + 0x1090, 0x10C7, 0x10C8, 0x10CD, 0x10CE, 0x10D0, 0x10F1, - 0x10F7, - 0x10FB, - 0x10FD, - 0x1100, 0x1200, + 0x1207, + 0x1208, 0x1249, 0x124A, 0x124E, @@ -292335,10 +317714,14 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x125A, 0x125E, 0x1260, + 0x1287, + 0x1288, 0x1289, 0x128A, 0x128E, 0x1290, + 0x12AF, + 0x12B0, 0x12B1, 0x12B2, 0x12B6, @@ -292351,20 +317734,26 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x12C8, 0x12D7, 0x12D8, + 0x12F8, + 0x1300, + 0x130F, + 0x1310, 0x1311, 0x1312, 0x1316, 0x1318, - 0x135B, - 0x135D, - 0x1360, - 0x1380, - 0x1390, + 0x131F, + 0x1320, + 0x1347, + 0x1348, + 0x135A, 0x1780, + 0x179D, + 0x179F, 0x17A3, 0x17A5, 0x17A8, - 0x17A9, + 0x17AA, 0x17B4, 0x17B6, 0x17CE, @@ -292372,206 +317761,2468 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x17D1, 0x17D2, 0x17D3, - 0x17D7, - 0x17D8, - 0x17DC, - 0x17DD, 0x17E0, 0x17EA, 0x1C90, 0x1CBB, 0x1CBD, 0x1CC0, - 0x1E00, - 0x1E9A, + 0x1E0C, + 0x1E0E, + 0x1E12, + 0x1E14, + 0x1E20, + 0x1E22, + 0x1E24, + 0x1E26, + 0x1E36, + 0x1E38, + 0x1E3C, + 0x1E40, + 0x1E42, + 0x1E4C, + 0x1E5A, + 0x1E5C, + 0x1E62, + 0x1E64, + 0x1E6C, + 0x1E6E, + 0x1E70, + 0x1E72, + 0x1E8C, + 0x1E8E, + 0x1E92, + 0x1E94, 0x1E9E, 0x1E9F, 0x1EA0, 0x1EFA, - 0x1F00, - 0x1F16, - 0x1F18, - 0x1F1E, - 0x1F20, - 0x1F46, - 0x1F48, - 0x1F4E, - 0x1F50, - 0x1F58, - 0x1F59, - 0x1F5A, - 0x1F5B, - 0x1F5C, - 0x1F5D, - 0x1F5E, - 0x1F5F, - 0x1F71, - 0x1F72, - 0x1F73, - 0x1F74, - 0x1F75, - 0x1F76, - 0x1F77, - 0x1F78, - 0x1F79, - 0x1F7A, - 0x1F7B, - 0x1F7C, - 0x1F7D, - 0x1F80, + 0x1FA0, + 0x1FB0, + 0x1FB2, 0x1FB5, - 0x1FB6, - 0x1FBB, - 0x1FBC, - 0x1FBD, - 0x1FC2, - 0x1FC5, - 0x1FC6, - 0x1FC9, - 0x1FCA, - 0x1FCB, - 0x1FCC, - 0x1FCD, - 0x1FD0, - 0x1FD3, - 0x1FD6, - 0x1FDB, - 0x1FE0, - 0x1FE3, - 0x1FE4, - 0x1FEB, 0x1FEC, 0x1FED, - 0x1FF2, - 0x1FF5, - 0x1FF6, - 0x1FF9, - 0x1FFA, - 0x1FFB, - 0x1FFC, - 0x1FFD, - 0x2D27, - 0x2D28, - 0x2D2D, - 0x2D2E, - 0x2D80, - 0x2D97, - 0x2DA0, - 0x2DA7, - 0x2DA8, - 0x2DAF, - 0x2DB0, - 0x2DB7, - 0x2DB8, - 0x2DBF, - 0x2DC0, - 0x2DC7, - 0x2DC8, - 0x2DCF, - 0x2DD0, - 0x2DD7, - 0x2DD8, - 0x2DDF, 0x3005, 0x3008, 0x3041, 0x3097, - 0x3099, - 0x309B, 0x309D, 0x309F, 0x30A1, 0x30FB, 0x30FC, 0x30FF, - 0x3105, - 0x312E, - 0x312F, - 0x3130, - 0x31A0, - 0x31C0, - 0x3400, - 0x4DC0, + 0x3447, + 0x3448, + 0x3473, + 0x3474, + 0x34E4, + 0x34E5, + 0x3577, + 0x3578, + 0x359E, + 0x359F, + 0x35A1, + 0x35A2, + 0x35AD, + 0x35AE, + 0x35BF, + 0x35C0, + 0x35CE, + 0x35CF, + 0x35F3, + 0x35F4, + 0x35FE, + 0x35FF, + 0x360E, + 0x360F, + 0x361A, + 0x361B, + 0x3918, + 0x3919, + 0x3960, + 0x3961, + 0x396E, + 0x396F, + 0x39CF, + 0x39D1, + 0x39DB, + 0x39DC, + 0x39DF, + 0x39E0, + 0x39F8, + 0x39F9, + 0x39FE, + 0x39FF, + 0x3A18, + 0x3A19, + 0x3A52, + 0x3A53, + 0x3A5C, + 0x3A5D, + 0x3A67, + 0x3A68, + 0x3A73, + 0x3A74, + 0x3B39, + 0x3B3A, + 0x3B4E, + 0x3B4F, + 0x3BA3, + 0x3BA4, + 0x3C6E, + 0x3C6F, + 0x3CE0, + 0x3CE1, + 0x3DE7, + 0x3DE8, + 0x3DEB, + 0x3DEC, + 0x3E74, + 0x3E75, + 0x3ED0, + 0x3ED1, + 0x4056, + 0x4057, + 0x4065, + 0x4066, + 0x406A, + 0x406B, + 0x40BB, + 0x40BC, + 0x40DF, + 0x40E0, + 0x4137, + 0x4138, + 0x415F, + 0x4160, + 0x4337, + 0x4338, + 0x43AC, + 0x43AD, + 0x43B1, + 0x43B2, + 0x43D3, + 0x43D4, + 0x43DD, + 0x43DE, + 0x4443, + 0x4444, + 0x44D6, + 0x44D7, + 0x44EA, + 0x44EB, + 0x4606, + 0x4607, + 0x464C, + 0x464D, + 0x4661, + 0x4662, + 0x4723, + 0x4724, + 0x4729, + 0x472A, + 0x477C, + 0x477D, + 0x478D, + 0x478E, + 0x47F4, + 0x47F5, + 0x4882, + 0x4883, + 0x4947, + 0x4948, + 0x497A, + 0x497B, + 0x497D, + 0x497E, + 0x4982, + 0x4984, + 0x4985, + 0x4987, + 0x499B, + 0x499C, + 0x499F, + 0x49A0, + 0x49B6, + 0x49B8, + 0x4A12, + 0x4A13, + 0x4AB8, + 0x4AB9, + 0x4C77, + 0x4C78, + 0x4C7D, + 0x4C7E, + 0x4C81, + 0x4C82, + 0x4C85, + 0x4C86, + 0x4C9D, + 0x4CA4, + 0x4D13, + 0x4D1A, + 0x4DAE, + 0x4DAF, 0x4E00, - 0xA000, - 0xA67F, - 0xA680, - 0xA717, - 0xA720, - 0xA788, - 0xA789, + 0x4E12, + 0x4E13, + 0x4E29, + 0x4E2A, + 0x4E68, + 0x4E69, + 0x4E79, + 0x4E7A, + 0x4E96, + 0x4E97, + 0x4EA3, + 0x4EA4, + 0x4EBC, + 0x4EBD, + 0x4ECC, + 0x4ECD, + 0x4EE7, + 0x4EE8, + 0x4EF8, + 0x4EFB, + 0x4EFC, + 0x4EFD, + 0x4EFE, + 0x4EFF, + 0x4F07, + 0x4F08, + 0x4F16, + 0x4F17, + 0x4F28, + 0x4F29, + 0x4F31, + 0x4F32, + 0x4F35, + 0x4F36, + 0x4F37, + 0x4F38, + 0x4F40, + 0x4F41, + 0x4F44, + 0x4F45, + 0x4F71, + 0x4F72, + 0x4F8C, + 0x4F8D, + 0x4F8E, + 0x4F8F, + 0x4FA2, + 0x4FA3, + 0x4FBD, + 0x4FBE, + 0x4FC6, + 0x4FC7, + 0x4FC8, + 0x4FC9, + 0x4FCC, + 0x4FCD, + 0x4FE2, + 0x4FE3, + 0x4FFC, + 0x4FFE, + 0x5010, + 0x5011, + 0x5034, + 0x5035, + 0x5038, + 0x5039, + 0x503D, + 0x503E, + 0x5042, + 0x5043, + 0x5052, + 0x5053, + 0x5058, + 0x5059, + 0x507C, + 0x507D, + 0x5081, + 0x5082, + 0x5093, + 0x5094, + 0x5097, + 0x5098, + 0x509F, + 0x50A2, + 0x50B9, + 0x50BA, + 0x50C3, + 0x50C4, + 0x50D8, + 0x50D9, + 0x50DF, + 0x50E0, + 0x50E1, + 0x50E3, + 0x50EB, + 0x50EC, + 0x50F4, + 0x50F5, + 0x50F7, + 0x50F8, + 0x511B, + 0x511C, + 0x5128, + 0x5129, + 0x512B, + 0x512C, + 0x5142, + 0x5143, + 0x514A, + 0x514B, + 0x514F, + 0x5150, + 0x5153, + 0x5154, + 0x5158, + 0x5159, + 0x5160, + 0x5161, + 0x5164, + 0x5165, + 0x5172, + 0x5173, + 0x517E, + 0x517F, + 0x5183, + 0x5185, + 0x518E, + 0x518F, + 0x51A1, + 0x51A2, + 0x51A3, + 0x51A4, + 0x51AD, + 0x51AE, + 0x51B8, + 0x51B9, + 0x51BA, + 0x51BB, + 0x51C2, + 0x51C3, + 0x51D2, + 0x51D4, + 0x51DF, + 0x51E0, + 0x51EC, + 0x51ED, + 0x51EE, + 0x51EF, + 0x51F2, + 0x51F3, + 0x5253, + 0x5254, + 0x5266, + 0x5267, + 0x5279, + 0x527A, + 0x5285, + 0x5286, + 0x528E, + 0x528F, + 0x52C4, + 0x52C5, + 0x52C8, + 0x52C9, + 0x52CC, + 0x52CD, + 0x52CE, + 0x52CF, + 0x52D1, + 0x52D2, + 0x52D4, + 0x52D5, + 0x52E1, + 0x52E2, + 0x52E5, + 0x52E6, + 0x52EE, + 0x52EF, + 0x5303, + 0x5305, + 0x5318, + 0x5319, + 0x531B, + 0x531C, + 0x531E, + 0x531F, + 0x5327, + 0x5328, + 0x5329, + 0x532A, + 0x5332, + 0x5333, + 0x5335, + 0x5337, + 0x5342, + 0x5343, + 0x535B, + 0x535C, + 0x535D, + 0x535E, + 0x536A, + 0x536B, + 0x536D, + 0x536E, + 0x5380, + 0x5381, + 0x53A1, + 0x53A2, + 0x53AA, + 0x53AC, + 0x53AF, + 0x53B0, + 0x53BA, + 0x53BB, + 0x53C5, + 0x53C6, + 0x53CF, + 0x53D0, + 0x53DD, + 0x53DF, + 0x53E7, + 0x53E8, + 0x53FF, + 0x5401, + 0x541A, + 0x541B, + 0x5422, + 0x5423, + 0x544C, + 0x544D, + 0x545D, + 0x545E, + 0x5469, + 0x546A, + 0x548A, + 0x548B, + 0x54B5, + 0x54B6, + 0x54F6, + 0x54F7, + 0x5515, + 0x5516, + 0x5518, + 0x551A, + 0x5547, + 0x5548, + 0x5560, + 0x5561, + 0x557A, + 0x557B, + 0x55E0, + 0x55E1, + 0x55F8, + 0x55F9, + 0x560A, + 0x560C, + 0x5620, + 0x5621, + 0x562B, + 0x562C, + 0x5637, + 0x5638, + 0x563C, + 0x563D, + 0x5644, + 0x5645, + 0x564B, + 0x564C, + 0x5651, + 0x5652, + 0x5656, + 0x5657, + 0x565F, + 0x5660, + 0x5661, + 0x5662, + 0x5675, + 0x5676, + 0x567D, + 0x567E, + 0x5688, + 0x5689, + 0x568B, + 0x568C, + 0x5696, + 0x5697, + 0x569E, + 0x569F, + 0x56BA, + 0x56BB, + 0x56CF, + 0x56D0, + 0x56D9, + 0x56DA, + 0x56E6, + 0x56E7, + 0x56F6, + 0x56F7, + 0x56F8, + 0x56F9, + 0x56FB, + 0x56FD, + 0x5705, + 0x5706, + 0x5711, + 0x5712, + 0x5717, + 0x5718, + 0x5721, + 0x5722, + 0x5724, + 0x5725, + 0x573D, + 0x573E, + 0x5743, + 0x5744, + 0x5748, + 0x5749, + 0x5755, + 0x5757, + 0x5758, + 0x5759, + 0x5763, + 0x5764, + 0x5778, + 0x5779, + 0x5781, + 0x5782, + 0x5787, + 0x5788, + 0x5796, + 0x5797, + 0x57A8, + 0x57A9, + 0x57CA, + 0x57CB, + 0x57D1, + 0x57D2, + 0x57DB, + 0x57DC, + 0x5817, + 0x5819, + 0x5850, + 0x5851, + 0x5856, + 0x5857, + 0x5860, + 0x5861, + 0x5866, + 0x5868, + 0x5877, + 0x5878, + 0x5895, + 0x5896, + 0x58AA, + 0x58AB, + 0x58B6, + 0x58B7, + 0x58C0, + 0x58C1, + 0x58C3, + 0x58C5, + 0x58CD, + 0x58CE, + 0x58D0, + 0x58D1, + 0x58E1, + 0x58E2, + 0x58E6, + 0x58E7, + 0x58F5, + 0x58F6, + 0x5901, + 0x5902, + 0x5905, + 0x5906, + 0x5908, + 0x5909, + 0x5911, + 0x5912, + 0x5913, + 0x5914, + 0x5923, + 0x5924, + 0x5933, + 0x5934, + 0x5936, + 0x5937, + 0x5959, + 0x595A, + 0x595B, + 0x595C, + 0x59B7, + 0x59B8, + 0x59E7, + 0x59E8, + 0x5A24, + 0x5A25, + 0x5A26, + 0x5A27, + 0x5A2C, + 0x5A2D, + 0x5A30, + 0x5A31, + 0x5A54, + 0x5A55, + 0x5A59, + 0x5A5A, + 0x5A6F, + 0x5A70, + 0x5A71, + 0x5A72, + 0x5A87, + 0x5A88, + 0x5A8D, + 0x5A8E, + 0x5AAB, + 0x5AAC, + 0x5AD3, + 0x5AD4, + 0x5AEF, + 0x5AF1, + 0x5B0A, + 0x5B0B, + 0x5B0D, + 0x5B0E, + 0x5B39, + 0x5B3A, + 0x5B46, + 0x5B47, + 0x5B4F, + 0x5B50, + 0x5B52, + 0x5B53, + 0x5B60, + 0x5B62, + 0x5B6F, + 0x5B70, + 0x5B79, + 0x5B7A, + 0x5B7E, + 0x5B7F, + 0x5B86, + 0x5B87, + 0x5B90, + 0x5B91, + 0x5BA9, + 0x5BAA, + 0x5BB2, + 0x5BB3, + 0x5BB7, + 0x5BB8, + 0x5BBC, + 0x5BBD, + 0x5BC8, + 0x5BC9, + 0x5BDA, + 0x5BDB, + 0x5C00, + 0x5C01, + 0x5C1B, + 0x5C1C, + 0x5C23, + 0x5C24, + 0x5C26, + 0x5C27, + 0x5C29, + 0x5C2A, + 0x5C36, + 0x5C37, + 0x5C5A, + 0x5C5B, + 0x5C85, + 0x5C86, + 0x5CB4, + 0x5CB5, + 0x5CB9, + 0x5CBA, + 0x5CD5, + 0x5CD6, + 0x5CDD, + 0x5CDE, + 0x5CF5, + 0x5CF6, + 0x5D2B, + 0x5D2C, + 0x5D2F, + 0x5D30, + 0x5D3B, + 0x5D3C, + 0x5D53, + 0x5D54, + 0x5D57, + 0x5D58, + 0x5D60, + 0x5D61, + 0x5D83, + 0x5D84, + 0x5D96, + 0x5D97, + 0x5DA3, + 0x5DA5, + 0x5DAB, + 0x5DAC, + 0x5DB3, + 0x5DB4, + 0x5DB9, + 0x5DBA, + 0x5DC4, + 0x5DC5, + 0x5DD7, + 0x5DD8, + 0x5DDA, + 0x5DDB, + 0x5DDC, + 0x5DDD, + 0x5DF6, + 0x5DF7, + 0x5E12, + 0x5E13, + 0x5E48, + 0x5E49, + 0x5E51, + 0x5E52, + 0x5E92, + 0x5E93, + 0x5EBA, + 0x5EBB, + 0x5EC0, + 0x5EC1, + 0x5EEB, + 0x5EEC, + 0x5EF9, + 0x5EFA, + 0x5F0E, + 0x5F0F, + 0x5F3B, + 0x5F3C, + 0x5F3D, + 0x5F3E, + 0x5F8F, + 0x5F90, + 0x5F9A, + 0x5F9B, + 0x5FA3, + 0x5FA5, + 0x5FB0, + 0x5FB1, + 0x5FC2, + 0x5FC3, + 0x5FCE, + 0x5FCF, + 0x5FDB, + 0x5FDC, + 0x5FE2, + 0x5FE3, + 0x5FEC, + 0x5FED, + 0x5FFC, + 0x5FFD, + 0x6023, + 0x6024, + 0x6056, + 0x6057, + 0x6061, + 0x6062, + 0x6071, + 0x6072, + 0x6074, + 0x6075, + 0x6091, + 0x6092, + 0x6093, + 0x6094, + 0x60A5, + 0x60A6, + 0x60D2, + 0x60D3, + 0x60D6, + 0x60D7, + 0x60DE, + 0x60DF, + 0x60E5, + 0x60E6, + 0x60FD, + 0x60FE, + 0x6102, + 0x6103, + 0x6107, + 0x6108, + 0x6111, + 0x6112, + 0x611E, + 0x611F, + 0x6131, + 0x6132, + 0x6133, + 0x6134, + 0x6135, + 0x6136, + 0x6138, + 0x613A, + 0x6160, + 0x6161, + 0x617B, + 0x617C, + 0x617F, + 0x6180, + 0x6186, + 0x6187, + 0x6197, + 0x6198, + 0x619C, + 0x619D, + 0x61B9, + 0x61BA, + 0x61BB, + 0x61BC, + 0x61D3, + 0x61D4, + 0x61D5, + 0x61D6, + 0x61EC, + 0x61ED, + 0x61EF, + 0x61F0, + 0x6205, + 0x6206, + 0x6235, + 0x6236, + 0x6239, + 0x623A, + 0x6257, + 0x6258, + 0x628D, + 0x628E, + 0x629D, + 0x629E, + 0x62DE, + 0x62DF, + 0x62EA, + 0x62EB, + 0x630A, + 0x630B, + 0x6317, + 0x6318, + 0x6331, + 0x6332, + 0x6337, + 0x6338, + 0x635B, + 0x635C, + 0x638B, + 0x638C, + 0x6393, + 0x6394, + 0x63D1, + 0x63D2, + 0x643B, + 0x643D, + 0x6449, + 0x644A, + 0x645A, + 0x645B, + 0x647E, + 0x647F, + 0x6486, + 0x6487, + 0x64A1, + 0x64A2, + 0x64AF, + 0x64B0, + 0x64B6, + 0x64B7, + 0x64C8, + 0x64C9, + 0x64D5, + 0x64D6, + 0x64EE, + 0x64EF, + 0x64F5, + 0x64F6, + 0x64F9, + 0x64FA, + 0x6502, + 0x6503, + 0x650A, + 0x650B, + 0x651F, + 0x6520, + 0x6528, + 0x6529, + 0x6540, + 0x6541, + 0x6542, + 0x6543, + 0x655A, + 0x655B, + 0x655F, + 0x6560, + 0x657D, + 0x657E, + 0x658A, + 0x658B, + 0x659A, + 0x659B, + 0x65B5, + 0x65B6, + 0x65BE, + 0x65BF, + 0x65C8, + 0x65CA, + 0x65D1, + 0x65D2, + 0x65D8, + 0x65D9, + 0x65DC, + 0x65DD, + 0x65E4, + 0x65E5, + 0x65EA, + 0x65EB, + 0x65F9, + 0x65FA, + 0x65FE, + 0x65FF, + 0x6617, + 0x6618, + 0x662C, + 0x662D, + 0x6637, + 0x6639, + 0x6648, + 0x6649, + 0x664D, + 0x664E, + 0x6660, + 0x6661, + 0x6663, + 0x6664, + 0x6692, + 0x6693, + 0x669C, + 0x669D, + 0x669E, + 0x669F, + 0x66AC, + 0x66AE, + 0x66D0, + 0x66D1, + 0x66D3, + 0x66D4, + 0x66D7, + 0x66D8, + 0x66DF, + 0x66E0, + 0x66EF, + 0x66F0, + 0x6702, + 0x6703, + 0x6707, + 0x6708, + 0x6719, + 0x671A, + 0x6724, + 0x6725, + 0x6729, + 0x672A, + 0x6767, + 0x6768, + 0x6788, + 0x6789, + 0x6796, + 0x6797, + 0x67BD, + 0x67BE, + 0x67BF, + 0x67C0, + 0x67D5, + 0x67D6, + 0x67D7, + 0x67D8, + 0x67F9, + 0x67FA, + 0x6801, + 0x6802, + 0x6815, + 0x6816, + 0x6827, + 0x6828, + 0x6830, + 0x6831, + 0x6858, + 0x6859, + 0x685A, + 0x685B, + 0x685E, + 0x685F, + 0x687A, + 0x687B, + 0x6895, + 0x6896, + 0x6899, + 0x689A, + 0x68A5, + 0x68A6, + 0x68B8, + 0x68B9, + 0x68C3, + 0x68C4, + 0x68D9, + 0x68DA, + 0x68E2, + 0x68E3, + 0x68E5, + 0x68E6, + 0x6909, + 0x690A, + 0x693E, + 0x693F, + 0x694D, + 0x694E, + 0x699F, + 0x69A0, + 0x69A2, + 0x69A3, + 0x69C0, + 0x69C1, + 0x69D1, + 0x69D3, + 0x69D5, + 0x69D8, + 0x6A03, + 0x6A04, + 0x6A1C, + 0x6A1D, + 0x6A24, + 0x6A25, + 0x6A37, + 0x6A38, + 0x6A4A, + 0x6A4B, + 0x6A5C, + 0x6A5D, + 0x6A6E, + 0x6A6F, + 0x6A70, + 0x6A71, + 0x6A86, + 0x6A87, + 0x6A8A, + 0x6A8B, + 0x6A8F, + 0x6A90, + 0x6A99, + 0x6A9A, + 0x6A9D, + 0x6A9E, + 0x6AB1, + 0x6AB2, + 0x6ABE, + 0x6ABF, + 0x6AC0, + 0x6AC1, + 0x6AC4, + 0x6AC5, + 0x6AC9, + 0x6ACA, + 0x6AD8, + 0x6AD9, + 0x6AE9, + 0x6AEA, + 0x6B0E, + 0x6B0F, + 0x6B1B, + 0x6B1C, + 0x6B2E, + 0x6B2F, + 0x6B35, + 0x6B36, + 0x6B40, + 0x6B41, + 0x6B57, + 0x6B59, + 0x6B5D, + 0x6B5E, + 0x6B68, + 0x6B69, + 0x6B6C, + 0x6B6D, + 0x6B6E, + 0x6B6F, + 0x6B71, + 0x6B72, + 0x6B75, + 0x6B76, + 0x6B7D, + 0x6B7E, + 0x6BB8, + 0x6BB9, + 0x6BE9, + 0x6BEA, + 0x6BF1, + 0x6BF2, + 0x6BF4, + 0x6BF5, + 0x6BFA, + 0x6BFB, + 0x6C0A, + 0x6C0B, + 0x6C1C, + 0x6C1D, + 0x6C2D, + 0x6C2E, + 0x6C3C, + 0x6C3D, + 0x6C45, + 0x6C46, + 0x6C6C, + 0x6C6D, + 0x6C6E, + 0x6C6F, + 0x6CA0, + 0x6CA1, + 0x6CD8, + 0x6CD9, + 0x6CF4, + 0x6CF5, + 0x6D02, + 0x6D03, + 0x6D1C, + 0x6D1D, + 0x6D24, + 0x6D25, + 0x6D71, + 0x6D72, + 0x6D81, + 0x6D82, + 0x6D96, + 0x6D97, + 0x6DB0, + 0x6DB2, + 0x6DB6, + 0x6DB7, + 0x6DFE, + 0x6E00, + 0x6E01, + 0x6E03, + 0x6E06, + 0x6E07, + 0x6E12, + 0x6E13, + 0x6E18, + 0x6E19, + 0x6E2A, + 0x6E2B, + 0x6E4C, + 0x6E4D, + 0x6E6C, + 0x6E6D, + 0x6E7B, + 0x6E7E, + 0x6E8B, + 0x6E8C, + 0x6E95, + 0x6E96, + 0x6EDB, + 0x6EDC, + 0x6EE3, + 0x6EE4, + 0x6F04, + 0x6F05, + 0x6F0B, + 0x6F0C, + 0x6F42, + 0x6F43, + 0x6F48, + 0x6F49, + 0x6F4A, + 0x6F4B, + 0x6F79, + 0x6F7A, + 0x6F98, + 0x6F99, + 0x6F9A, + 0x6F9B, + 0x6F9F, + 0x6FA0, + 0x6FB7, + 0x6FB8, + 0x6FC5, + 0x6FC6, + 0x6FD0, + 0x6FD1, + 0x6FD3, + 0x6FD4, + 0x6FF5, + 0x6FF6, + 0x6FFD, + 0x6FFE, + 0x7010, + 0x7011, + 0x7013, + 0x7014, + 0x7047, + 0x7048, + 0x704B, + 0x704C, + 0x704E, + 0x704F, + 0x7072, + 0x7074, + 0x707B, + 0x707C, + 0x7081, + 0x7082, + 0x708D, + 0x708E, + 0x7097, + 0x7098, + 0x709B, + 0x709C, + 0x70AA, + 0x70AB, + 0x70B2, + 0x70B3, + 0x70B6, + 0x70B7, + 0x70D5, + 0x70D6, + 0x70FE, + 0x70FF, + 0x7108, + 0x7109, + 0x7124, + 0x7125, + 0x7133, + 0x7135, + 0x7157, + 0x7158, + 0x716B, + 0x716C, + 0x716D, + 0x716E, + 0x718D, + 0x718E, + 0x7196, + 0x7197, + 0x71A6, + 0x71A7, + 0x71AB, + 0x71AC, + 0x71B6, + 0x71B7, + 0x71CC, + 0x71CD, + 0x71D3, + 0x71D4, + 0x71F3, + 0x71F4, + 0x71FA, + 0x71FB, + 0x720B, + 0x720C, + 0x7211, + 0x7212, + 0x7215, + 0x7216, + 0x7217, + 0x7218, + 0x7220, + 0x7221, + 0x7224, + 0x7226, + 0x722F, + 0x7230, + 0x7234, + 0x7235, + 0x7245, + 0x7246, + 0x724E, + 0x724F, + 0x7250, + 0x7251, + 0x7255, + 0x7256, + 0x72AB, + 0x72AC, + 0x72BE, + 0x72BF, + 0x7302, + 0x7303, + 0x7310, + 0x7311, + 0x7328, + 0x7329, + 0x7353, + 0x7354, + 0x739C, + 0x739D, + 0x73C1, + 0x73C2, + 0x73F3, + 0x73F4, + 0x73FB, + 0x73FC, + 0x7418, + 0x7419, + 0x7439, + 0x743A, + 0x743E, + 0x743F, + 0x7447, + 0x7448, + 0x7449, + 0x744A, + 0x7458, + 0x7459, + 0x747B, + 0x747C, + 0x7484, + 0x7485, + 0x7496, + 0x7497, + 0x749D, + 0x749E, + 0x74C7, + 0x74C8, + 0x74C9, + 0x74CA, + 0x74CC, + 0x74CD, + 0x74EB, + 0x74EC, + 0x7520, + 0x7521, + 0x7541, + 0x7542, + 0x7552, + 0x7553, + 0x7555, + 0x7556, + 0x755E, + 0x755F, + 0x7561, + 0x7562, + 0x7571, + 0x7572, + 0x757B, + 0x757C, + 0x7585, + 0x7586, + 0x75A9, + 0x75AA, + 0x75B7, + 0x75B8, + 0x75DC, + 0x75DD, + 0x75EE, + 0x75EF, + 0x762C, + 0x762D, + 0x7644, + 0x7646, + 0x7651, + 0x7652, + 0x7655, + 0x7656, + 0x7673, + 0x7674, + 0x768D, + 0x768E, + 0x76A1, + 0x76A3, + 0x76A5, + 0x76A6, + 0x76A8, + 0x76A9, + 0x76B3, + 0x76B4, + 0x76B6, + 0x76B7, + 0x76C1, + 0x76C2, + 0x76CB, + 0x76CC, + 0x76D9, + 0x76DA, + 0x76EB, + 0x76EC, + 0x7700, + 0x7701, + 0x7702, + 0x7703, + 0x770E, + 0x770F, + 0x7721, + 0x7722, + 0x772B, + 0x772C, + 0x773F, + 0x7740, + 0x7742, + 0x7743, + 0x7764, + 0x7765, + 0x7796, + 0x7797, + 0x77A4, + 0x77A5, + 0x77BE, + 0x77BF, + 0x77C1, + 0x77C2, + 0x77D2, + 0x77D3, + 0x77DD, + 0x77DE, + 0x77E4, + 0x77E5, + 0x77E6, + 0x77E7, + 0x77F4, + 0x77F6, + 0x7824, + 0x7825, + 0x7836, + 0x7837, + 0x7842, + 0x7843, + 0x7846, + 0x7847, + 0x784B, + 0x784C, + 0x7876, + 0x7877, + 0x7888, + 0x7889, + 0x78C2, + 0x78C3, + 0x78C7, + 0x78C8, + 0x78D2, + 0x78D3, + 0x78F0, + 0x78F1, + 0x78F8, + 0x78F9, + 0x7900, + 0x7901, + 0x7908, + 0x7909, + 0x790D, + 0x790E, + 0x7915, + 0x7916, + 0x791F, + 0x7921, + 0x7932, + 0x7933, + 0x7936, + 0x7937, + 0x7959, + 0x795A, + 0x796C, + 0x796D, + 0x796E, + 0x796F, + 0x7975, + 0x7977, + 0x7986, + 0x7988, + 0x799E, + 0x799F, + 0x79A9, + 0x79AA, + 0x79BC, + 0x79BD, + 0x79C4, + 0x79C5, + 0x79C7, + 0x79C8, + 0x79CC, + 0x79CD, + 0x79D4, + 0x79D5, + 0x79D7, + 0x79D8, + 0x7A01, + 0x7A02, + 0x7A07, + 0x7A08, + 0x7A09, + 0x7A0A, + 0x7A2C, + 0x7A2D, + 0x7A38, + 0x7A39, + 0x7A3A, + 0x7A3B, + 0x7A64, + 0x7A65, + 0x7A6A, + 0x7A6B, + 0x7A6F, + 0x7A70, + 0x7A82, + 0x7A83, + 0x7A9A, + 0x7A9C, + 0x7AB9, + 0x7ABA, + 0x7ABB, + 0x7ABE, + 0x7AC2, + 0x7AC3, + 0x7AC6, + 0x7AC7, + 0x7AE9, + 0x7AEA, + 0x7AF5, + 0x7AF6, + 0x7AFC, + 0x7AFD, + 0x7B07, + 0x7B08, + 0x7B1F, + 0x7B20, + 0x7B27, + 0x7B28, + 0x7B29, + 0x7B2A, + 0x7B42, + 0x7B43, + 0x7B53, + 0x7B54, + 0x7BA3, + 0x7BA4, + 0x7BA5, + 0x7BA6, + 0x7BB0, + 0x7BB1, + 0x7BB2, + 0x7BB3, + 0x7BFA, + 0x7BFB, + 0x7C1B, + 0x7C1C, + 0x7C2E, + 0x7C30, + 0x7C52, + 0x7C53, + 0x7C55, + 0x7C56, + 0x7C5D, + 0x7C5E, + 0x7C76, + 0x7C77, + 0x7C87, + 0x7C88, + 0x7C93, + 0x7C94, + 0x7C9A, + 0x7C9B, + 0x7CAC, + 0x7CAD, + 0x7CD3, + 0x7CD4, + 0x7CDA, + 0x7CDC, + 0x7CE1, + 0x7CE2, + 0x7CE3, + 0x7CE4, + 0x7CE5, + 0x7CE7, + 0x7CFC, + 0x7CFD, + 0x7CFF, + 0x7D00, + 0x7D23, + 0x7D24, + 0x7D2A, + 0x7D2B, + 0x7D2D, + 0x7D2E, + 0x7D48, + 0x7D49, + 0x7D4D, + 0x7D4E, + 0x7D5A, + 0x7D5B, + 0x7D64, + 0x7D65, + 0x7D78, + 0x7D79, + 0x7D82, + 0x7D83, + 0x7D95, + 0x7D96, + 0x7D98, + 0x7D99, + 0x7DA4, + 0x7DA5, + 0x7DA8, + 0x7DA9, + 0x7DCD, + 0x7DCE, + 0x7DD3, + 0x7DD4, + 0x7DE5, + 0x7DE6, + 0x7DEB, + 0x7DEC, + 0x7DFD, + 0x7E00, + 0x7E18, + 0x7E19, + 0x7E5B, + 0x7E5C, + 0x7E64, + 0x7E65, + 0x7E9D, + 0x7E9E, + 0x7F3B, + 0x7F3D, + 0x7F41, + 0x7F42, + 0x7F46, + 0x7F47, + 0x7F59, + 0x7F5A, + 0x7F84, + 0x7F85, + 0x7F90, + 0x7F91, + 0x7F97, + 0x7F98, + 0x7F99, + 0x7F9A, + 0x7FB4, + 0x7FB5, + 0x7FD6, + 0x7FD7, + 0x7FDD, + 0x7FDE, + 0x7FE4, + 0x7FE5, + 0x800A, + 0x800B, + 0x802F, + 0x8030, + 0x803C, + 0x803D, + 0x8040, + 0x8041, + 0x8066, + 0x8067, + 0x8088, + 0x8089, + 0x808E, + 0x808F, + 0x8094, + 0x8095, + 0x80A6, + 0x80A9, + 0x80B3, + 0x80B4, + 0x80B9, + 0x80BA, + 0x80DF, + 0x80E0, + 0x8103, + 0x8105, + 0x8134, + 0x8136, + 0x8184, + 0x8185, + 0x8190, + 0x8191, + 0x8196, + 0x8197, + 0x81CB, + 0x81CC, + 0x81E4, + 0x81E5, + 0x81EF, + 0x81F1, + 0x8213, + 0x8214, + 0x8224, + 0x8225, + 0x8241, + 0x8242, + 0x8265, + 0x8266, + 0x828C, + 0x828D, + 0x82B2, + 0x82B3, + 0x82E2, + 0x82E3, + 0x82FC, + 0x82FD, + 0x830A, + 0x830B, + 0x8310, + 0x8311, + 0x8330, + 0x8331, + 0x8355, + 0x8356, + 0x83BE, + 0x83BF, + 0x83E6, + 0x83E7, + 0x83ED, + 0x83EE, + 0x8414, + 0x8415, + 0x8416, + 0x8418, + 0x841F, + 0x8420, + 0x8458, + 0x8459, + 0x8483, + 0x8484, + 0x8495, + 0x8496, + 0x84B7, + 0x84B8, + 0x84C3, + 0x84C4, + 0x84ED, + 0x84EE, + 0x8505, + 0x8506, + 0x8510, + 0x8511, + 0x8532, + 0x8534, + 0x854C, + 0x854D, + 0x8550, + 0x8551, + 0x857F, + 0x8580, + 0x8593, + 0x8594, + 0x85B2, + 0x85B3, + 0x85BB, + 0x85BC, + 0x85CC, + 0x85CD, + 0x85EE, + 0x85EF, + 0x85F3, + 0x85F4, + 0x85FC, + 0x85FD, + 0x8603, + 0x8604, + 0x860D, + 0x860F, + 0x8610, + 0x8611, + 0x8615, + 0x8616, + 0x861D, + 0x861E, + 0x8637, + 0x8638, + 0x8657, + 0x8658, + 0x8675, + 0x8676, + 0x8689, + 0x868A, + 0x8692, + 0x8693, + 0x86A0, + 0x86A1, + 0x86A6, + 0x86A7, + 0x86D5, + 0x86D6, + 0x86E0, + 0x86E1, + 0x86E7, + 0x86E8, + 0x86FD, + 0x86FE, + 0x871D, + 0x871E, + 0x872F, + 0x8730, + 0x873D, + 0x873E, + 0x8745, + 0x8746, + 0x8771, + 0x8772, + 0x878E, + 0x878F, + 0x8799, + 0x879A, + 0x87DA, + 0x87DB, + 0x87F0, + 0x87F1, + 0x8807, + 0x8808, + 0x8812, + 0x8813, + 0x882D, + 0x882E, + 0x883A, + 0x883B, + 0x8847, + 0x8848, + 0x8858, + 0x8859, + 0x885C, + 0x885D, + 0x885F, + 0x8860, + 0x887A, + 0x887B, + 0x88E6, + 0x88E7, + 0x88E9, + 0x88EA, + 0x88ED, + 0x88EE, + 0x8903, + 0x8904, + 0x890F, + 0x8910, + 0x8924, + 0x8925, + 0x8965, + 0x8966, + 0x8975, + 0x8976, + 0x897D, + 0x897E, + 0x898D, + 0x898E, + 0x8990, + 0x8991, + 0x8994, + 0x8995, + 0x8999, + 0x899A, + 0x89B0, + 0x89B1, + 0x89B4, + 0x89B5, + 0x89BB, + 0x89BD, + 0x89EE, + 0x89EF, + 0x89F5, + 0x89F6, + 0x89F9, + 0x89FA, + 0x89FD, + 0x89FE, + 0x8A05, + 0x8A07, + 0x8A14, + 0x8A15, + 0x8A19, + 0x8A1A, + 0x8A20, + 0x8A22, + 0x8A2B, + 0x8A2C, + 0x8A3D, + 0x8A3E, + 0x8A4B, + 0x8A4C, + 0x8A64, + 0x8A65, + 0x8A78, + 0x8A79, + 0x8A7D, + 0x8A7E, + 0x8A88, + 0x8A89, + 0x8A9F, + 0x8AA0, + 0x8AAF, + 0x8AB0, + 0x8AB7, + 0x8AB8, + 0x8AD0, + 0x8AD1, + 0x8AEC, + 0x8AED, + 0x8B29, + 0x8B2A, + 0x8B32, + 0x8B33, + 0x8B38, + 0x8B39, + 0x8B3F, + 0x8B40, + 0x8B61, + 0x8B63, + 0x8B69, + 0x8B6A, + 0x8B75, + 0x8B76, + 0x8B7C, + 0x8B7D, + 0x8B81, + 0x8B82, + 0x8B87, + 0x8B88, + 0x8B8D, + 0x8B8E, + 0x8B8F, + 0x8B90, + 0x8B9B, + 0x8B9C, + 0x8C38, + 0x8C39, + 0x8C40, + 0x8C41, + 0x8C44, + 0x8C45, + 0x8C51, + 0x8C54, + 0x8C58, + 0x8C59, + 0x8C74, + 0x8C75, + 0x8C7F, + 0x8C80, + 0x8C83, + 0x8C84, + 0x8C87, + 0x8C88, + 0x8C8B, + 0x8C8C, + 0x8C9B, + 0x8C9C, + 0x8CA6, + 0x8CA7, + 0x8CCB, + 0x8CCC, + 0x8CD6, + 0x8CD7, + 0x8CD8, + 0x8CD9, + 0x8CE9, + 0x8CEA, + 0x8CF7, + 0x8CF8, + 0x8D01, + 0x8D02, + 0x8D11, + 0x8D13, + 0x8D7C, + 0x8D7D, + 0x8DA6, + 0x8DA7, + 0x8DC0, + 0x8DC1, + 0x8DE5, + 0x8DE6, + 0x8E01, + 0x8E02, + 0x8E0B, + 0x8E0C, + 0x8E32, + 0x8E33, + 0x8E46, + 0x8E47, + 0x8E4F, + 0x8E50, + 0x8E6E, + 0x8E6F, + 0x8E75, + 0x8E76, + 0x8E77, + 0x8E78, + 0x8E79, + 0x8E7A, + 0x8E9B, + 0x8E9C, + 0x8EA2, + 0x8EA3, + 0x8EB3, + 0x8EB4, + 0x8EB6, + 0x8EB8, + 0x8EC1, + 0x8EC2, + 0x8EC4, + 0x8EC5, + 0x8ED9, + 0x8EDA, + 0x8EF0, + 0x8EF1, + 0x8F0F, + 0x8F10, + 0x8F2D, + 0x8F2E, + 0x8F3A, + 0x8F3B, + 0x8F41, + 0x8F42, + 0x8F9D, + 0x8F9E, + 0x8FA4, + 0x8FA5, + 0x8FB3, + 0x8FB4, + 0x8FC3, + 0x8FC4, + 0x8FCA, + 0x8FCB, + 0x8FE7, + 0x8FE8, + 0x902A, + 0x902B, + 0x902C, + 0x902D, + 0x9037, + 0x9038, + 0x9040, + 0x9041, + 0x9046, + 0x9047, + 0x90AB, + 0x90AC, + 0x90CC, + 0x90CE, + 0x90D2, + 0x90D3, + 0x90F6, + 0x90F7, + 0x910A, + 0x910B, + 0x913C, + 0x913E, + 0x9159, + 0x915A, + 0x917B, + 0x917C, + 0x9195, + 0x9196, + 0x9198, + 0x9199, + 0x91A9, + 0x91AA, + 0x91BF, + 0x91C0, + 0x91C4, + 0x91C5, + 0x91E0, + 0x91E1, + 0x91EF, + 0x91F0, + 0x9213, + 0x9214, + 0x921F, + 0x9220, + 0x9222, + 0x9223, + 0x9243, + 0x9244, + 0x9269, + 0x926B, + 0x9281, + 0x9282, + 0x9284, + 0x9285, + 0x929E, + 0x929F, + 0x92BD, + 0x92BE, + 0x92D4, + 0x92D5, + 0x92DB, + 0x92DC, + 0x92E2, + 0x92E3, + 0x931C, + 0x931D, + 0x9330, + 0x9332, + 0x9362, + 0x9363, + 0x9368, + 0x9369, + 0x936B, + 0x936C, + 0x936F, + 0x9370, + 0x9373, + 0x9374, + 0x9378, + 0x9379, + 0x937F, + 0x9380, + 0x9381, + 0x9382, + 0x938B, + 0x938C, + 0x939C, + 0x939D, + 0x93A0, + 0x93A1, + 0x93AB, + 0x93AC, + 0x93BB, + 0x93BC, + 0x93E0, + 0x93E1, + 0x93F3, + 0x93F4, + 0x9402, + 0x9403, + 0x9417, + 0x9418, + 0x941C, + 0x941D, + 0x941E, + 0x9420, + 0x9424, + 0x9425, + 0x9443, + 0x9444, + 0x944E, + 0x944F, + 0x946C, + 0x946D, + 0x947B, + 0x947C, + 0x9578, + 0x957A, + 0x957E, + 0x957F, + 0x9585, + 0x9586, + 0x9597, + 0x9598, + 0x95B3, + 0x95B5, + 0x95B8, + 0x95B9, + 0x95C1, + 0x95C2, + 0x95D9, + 0x95DA, + 0x95DD, + 0x95DE, + 0x9625, + 0x9627, + 0x9629, + 0x962A, + 0x963E, + 0x963F, + 0x9656, + 0x9658, + 0x9679, + 0x967A, + 0x967B, + 0x967C, + 0x967F, + 0x9680, + 0x9681, + 0x9683, + 0x968C, + 0x968D, + 0x9696, + 0x9697, + 0x969A, + 0x969B, + 0x969D, + 0x969E, + 0x969F, + 0x96A0, + 0x96AB, + 0x96AC, + 0x96AF, + 0x96B0, + 0x96B5, + 0x96B6, + 0x96E4, + 0x96E5, + 0x96E6, + 0x96E8, + 0x96FC, + 0x96FD, + 0x9714, + 0x9715, + 0x9717, + 0x9718, + 0x971A, + 0x971C, + 0x9733, + 0x9735, + 0x9737, + 0x9738, + 0x9740, + 0x9742, + 0x974D, + 0x974E, + 0x9757, + 0x9758, + 0x9763, + 0x9764, + 0x9775, + 0x9776, + 0x9787, + 0x9788, + 0x9789, + 0x978A, + 0x979B, + 0x979C, + 0x97A9, + 0x97AA, + 0x97B0, + 0x97B2, + 0x97B5, + 0x97B6, + 0x97BE, + 0x97BF, + 0x97C0, + 0x97C1, + 0x97D2, + 0x97D3, + 0x97FC, + 0x97FD, + 0x981F, + 0x9820, + 0x9825, + 0x9826, + 0x982A, + 0x982B, + 0x9833, + 0x9834, + 0x983A, + 0x983B, + 0x983E, + 0x983F, + 0x9842, + 0x9843, + 0x9847, + 0x9848, + 0x9856, + 0x9857, + 0x9866, + 0x9867, + 0x9868, + 0x9869, + 0x98B7, + 0x98B8, + 0x98CA, + 0x98CB, + 0x98E4, + 0x98E5, + 0x98EC, + 0x98ED, + 0x98F1, + 0x98F2, + 0x98F8, + 0x98F9, + 0x98FB, + 0x98FC, + 0x9919, + 0x991A, + 0x993B, + 0x993C, + 0x9944, + 0x9945, + 0x995A, + 0x995B, + 0x995D, + 0x995E, + 0x99BF, + 0x99C0, + 0x99E0, + 0x99E1, + 0x99E6, + 0x99E7, + 0x99EB, + 0x99EC, + 0x99F5, + 0x99F6, + 0x9A10, + 0x9A11, + 0x9A17, + 0x9A19, + 0x9A3B, + 0x9A3C, + 0x9A51, + 0x9A52, + 0x9A58, + 0x9A59, + 0x9A5D, + 0x9A5E, + 0x9A63, + 0x9A64, + 0x9AA9, + 0x9AAA, + 0x9ABD, + 0x9ABE, + 0x9AC8, + 0x9AC9, + 0x9AD7, + 0x9AD8, + 0x9AE0, + 0x9AE1, + 0x9AE4, + 0x9AE5, + 0x9AE8, + 0x9AEA, + 0x9AF0, + 0x9AF1, + 0x9B00, + 0x9B01, + 0x9B02, + 0x9B03, + 0x9B09, + 0x9B0A, + 0x9B14, + 0x9B15, + 0x9B1B, + 0x9B1C, + 0x9B34, + 0x9B35, + 0x9B3D, + 0x9B3E, + 0x9B40, + 0x9B41, + 0x9B50, + 0x9B51, + 0x9B57, + 0x9B58, + 0x9B62, + 0x9B63, + 0x9B72, + 0x9B73, + 0x9B89, + 0x9B8A, + 0x9B8C, + 0x9B8D, + 0x9B99, + 0x9B9A, + 0x9BC2, + 0x9BC3, + 0x9BF6, + 0x9BF7, + 0x9C00, + 0x9C02, + 0x9C03, + 0x9C04, + 0x9C42, + 0x9C43, + 0x9C4F, + 0x9C50, + 0x9C51, + 0x9C52, + 0x9C61, + 0x9C62, + 0x9C64, + 0x9C65, + 0x9C7B, + 0x9C7C, + 0x9D0C, + 0x9D0E, + 0x9D11, + 0x9D12, + 0x9D27, + 0x9D28, + 0x9D35, + 0x9D36, + 0x9D3C, + 0x9D3D, + 0x9D6D, + 0x9D6E, + 0x9D95, + 0x9D96, + 0x9DAE, + 0x9DAF, + 0x9DBD, + 0x9DBE, + 0x9DC0, + 0x9DC1, + 0x9DEA, + 0x9DEB, + 0x9DFC, + 0x9DFD, + 0x9E0E, + 0x9E0F, + 0x9E16, + 0x9E17, + 0x9E1C, + 0x9E1D, + 0x9E7B, + 0x9E7C, + 0x9E8F, + 0x9E91, + 0x9E98, + 0x9E99, + 0x9E9E, + 0x9E9F, + 0x9EA2, + 0x9EA3, + 0x9EAB, + 0x9EAD, + 0x9EB1, + 0x9EB2, + 0x9EEC, + 0x9EED, + 0x9EF1, + 0x9EF2, + 0x9F03, + 0x9F04, + 0x9F11, + 0x9F12, + 0x9F14, + 0x9F15, + 0x9F26, + 0x9F27, + 0x9F45, + 0x9F46, + 0x9F53, + 0x9F54, + 0x9F6D, + 0x9F6E, + 0x9FA1, + 0x9FA2, + 0x9FA3, + 0x9FA4, + 0x9FA6, 0xA78D, 0xA78E, - 0xA792, - 0xA794, 0xA7AA, 0xA7AB, - 0xA7C0, - 0xA7CB, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, - 0xA7DA, - 0xA9E7, - 0xA9FF, - 0xAA60, - 0xAA77, - 0xAA7A, - 0xAA80, - 0xAB01, - 0xAB07, - 0xAB09, - 0xAB0F, - 0xAB11, - 0xAB17, - 0xAB20, - 0xAB27, - 0xAB28, - 0xAB2F, - 0xAB66, - 0xAB68, + 0xAA7B, + 0xAA7C, 0xAC00, 0xD7A4, - 0xFA0E, - 0xFA10, - 0xFA11, - 0xFA12, - 0xFA13, - 0xFA15, - 0xFA1F, - 0xFA20, - 0xFA21, - 0xFA22, - 0xFA23, - 0xFA25, - 0xFA27, - 0xFA2A, 0x11301, 0x11302, 0x11303, 0x11304, - 0x1133B, + 0x1133C, 0x1133D, - 0x16FF0, - 0x16FF2, - 0x1B11F, - 0x1B123, - 0x1B132, - 0x1B133, - 0x1B150, - 0x1B153, - 0x1B155, - 0x1B156, - 0x1B164, - 0x1B168, - 0x1DF00, - 0x1DF1F, - 0x1DF25, - 0x1DF2B, - 0x1E08F, - 0x1E090, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -292580,28 +320231,128 @@ static const UV UNI_IDENTIFIERTYPE__RECO 0x1E7EF, 0x1E7F0, 0x1E7FF, - 0x20000, - 0x2A6E0, - 0x2A700, - 0x2B73A, - 0x2B740, - 0x2B81E, - 0x2B820, - 0x2CEA2, - 0x2CEB0, - 0x2EBE1, - 0x2EBF0, - 0x2EE5E, - 0x30000, - 0x3134B, - 0x31350, - 0x323B0 + 0x2070E, + 0x2070F, + 0x20731, + 0x20732, + 0x20779, + 0x2077A, + 0x20C53, + 0x20C54, + 0x20C78, + 0x20C79, + 0x20C96, + 0x20C97, + 0x20CCF, + 0x20CD0, + 0x20CD5, + 0x20CD6, + 0x20D15, + 0x20D16, + 0x20D7C, + 0x20D7D, + 0x20D7F, + 0x20D80, + 0x20E0E, + 0x20E10, + 0x20E77, + 0x20E78, + 0x20E9D, + 0x20E9E, + 0x20EA2, + 0x20EA3, + 0x20ED7, + 0x20ED8, + 0x20EF9, + 0x20EFB, + 0x20F2D, + 0x20F2F, + 0x20F4C, + 0x20F4D, + 0x20FB4, + 0x20FB5, + 0x20FBC, + 0x20FBD, + 0x20FEA, + 0x20FEB, + 0x2105C, + 0x2105D, + 0x2106F, + 0x21070, + 0x21075, + 0x21077, + 0x2107B, + 0x2107C, + 0x210C1, + 0x210C2, + 0x210C9, + 0x210CA, + 0x211D9, + 0x211DA, + 0x220C7, + 0x220C8, + 0x227B5, + 0x227B6, + 0x22AD5, + 0x22AD6, + 0x22B43, + 0x22B44, + 0x22BCA, + 0x22BCB, + 0x22C51, + 0x22C52, + 0x22C55, + 0x22C56, + 0x22CC2, + 0x22CC3, + 0x22D08, + 0x22D09, + 0x22D4C, + 0x22D4D, + 0x22D67, + 0x22D68, + 0x22EB3, + 0x22EB4, + 0x23CB7, + 0x23CB8, + 0x244D3, + 0x244D4, + 0x24DB8, + 0x24DB9, + 0x24DEA, + 0x24DEB, + 0x2512B, + 0x2512C, + 0x26258, + 0x26259, + 0x267CC, + 0x267CD, + 0x269F2, + 0x269F3, + 0x269FA, + 0x269FB, + 0x27A3E, + 0x27A3F, + 0x2815D, + 0x2815E, + 0x28207, + 0x28208, + 0x282E2, + 0x282E3, + 0x28CCA, + 0x28CCB, + 0x28CCD, + 0x28CCE, + 0x28CD2, + 0x28CD3, + 0x29D98, + 0x29D99 }; # endif /* EBCDIC 037 */ static const UV UNI_IDENTIFIERTYPE__TECHNICAL_invlist[] = { /* for all charsets */ - 199, /* Number of elements */ + 291, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -292618,11 +320369,31 @@ static const UV UNI_IDENTIFIERTYPE__TECH 0x1BF, 0x1C0, 0x1C4, + 0x200, + 0x218, 0x234, 0x237, 0x250, + 0x253, + 0x255, + 0x256, + 0x258, 0x259, 0x25A, + 0x25B, + 0x25C, + 0x263, + 0x264, + 0x268, + 0x26A, + 0x272, + 0x273, + 0x289, + 0x28A, + 0x28B, + 0x28C, + 0x292, + 0x293, 0x2B0, 0x2B9, 0x2BB, @@ -292630,66 +320401,106 @@ static const UV UNI_IDENTIFIERTYPE__TECH 0x2C2, 0x2C6, 0x2D2, + 0x2EC, + 0x2ED, 0x2EE, 0x2EF, 0x30E, - 0x30F, - 0x312, - 0x313, - 0x315, 0x316, 0x317, 0x31B, 0x31C, 0x321, + 0x324, + 0x326, 0x329, - 0x32D, - 0x32F, - 0x330, + 0x331, 0x333, 0x334, + 0x335, + 0x336, 0x337, - 0x338, - 0x33A, 0x340, + 0x342, + 0x343, 0x346, 0x34F, 0x350, 0x358, 0x359, 0x363, + 0x375, + 0x376, 0x3CF, 0x3D0, 0x3D7, 0x3D8, 0x3F3, 0x3F4, + 0x3FC, + 0x3FD, 0x484, 0x488, + 0x559, + 0x55A, 0x560, 0x561, 0x588, 0x589, 0x5C7, 0x5C8, + 0x653, + 0x654, + 0x671, + 0x672, + 0x6E5, + 0x6E7, 0x740, 0x74B, + 0x870, + 0x889, + 0x8C9, + 0x8CA, + 0x950, + 0x951, 0x953, 0x955, + 0x97D, + 0x97E, + 0xA74, + 0xA75, + 0xAD0, + 0xAD1, + 0xB82, + 0xB83, + 0xBD0, + 0xBD1, 0xD04, 0xD05, 0xD81, 0xD82, 0xD8F, 0xD91, - 0xDA6, - 0xDA7, 0xDDF, 0xDE0, 0xDF3, 0xDF4, + 0xEAF, + 0xEB0, + 0xF00, + 0xF01, 0xF18, 0xF1A, + 0xF35, + 0xF36, + 0xF37, + 0xF38, + 0xF3E, + 0xF40, + 0xFC6, + 0xFC7, + 0x10F9, + 0x10FB, 0x17CE, 0x17D0, 0x17D1, @@ -292698,6 +320509,10 @@ static const UV UNI_IDENTIFIERTYPE__TECH 0x17DE, 0x1ABF, 0x1AC1, + 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B6B, 0x1B74, 0x1D00, @@ -292713,13 +320528,21 @@ static const UV UNI_IDENTIFIERTYPE__TECH 0x1D79, 0x1D9B, 0x1DC0, - 0x1E00, + 0x1E02, + 0x1E18, + 0x1E1C, + 0x1E2A, + 0x1E2E, + 0x1E72, + 0x1E78, 0x1E9C, 0x1E9E, 0x1E9F, 0x1EA0, 0x1EFA, 0x1F00, + 0x1FB0, + 0x1FB2, 0x203F, 0x2041, 0x20D0, @@ -292740,6 +320563,10 @@ static const UV UNI_IDENTIFIERTYPE__TECH 0x2C7C, 0x2CF0, 0x2CF2, + 0x2D27, + 0x2D28, + 0x2D2D, + 0x2D2E, 0x2E00, 0x2E0E, 0x3021, @@ -292753,15 +320580,19 @@ static const UV UNI_IDENTIFIERTYPE__TECH 0x4DC0, 0x4E00, 0xA708, - 0xA717, + 0xA720, 0xA722, 0xA730, + 0xA788, + 0xA789, 0xA78E, 0xA78F, 0xA7AE, 0xA7B0, 0xA7BA, 0xA7C0, + 0xA7C5, + 0xA7C7, 0xA7FA, 0xA7FB, 0xAB68, @@ -292769,10 +320600,12 @@ static const UV UNI_IDENTIFIERTYPE__TECH 0xFB1E, 0xFB1F, 0xFBB2, - 0xFBC3, + 0xFBD3, 0xFD3E, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDD0, 0xFDFD, 0xFE00, @@ -292782,6 +320615,12 @@ static const UV UNI_IDENTIFIERTYPE__TECH 0xFE47, 0xFE73, 0xFE74, + 0x10EC5, + 0x10EC7, + 0x10EFB, + 0x10EFC, + 0x16FF2, + 0x16FF7, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -292803,53 +320642,75 @@ static const UV UNI_IDENTIFIERTYPE__TECH 0x1D242, 0x1D245, 0x1D300, - 0x1D357 + 0x1D357, + 0x1DF00, + 0x1DF1F, + 0x1DF25, + 0x1DF2B }; static const UV UNI_IDENTIFIERTYPE__UNCOMMONUSE_invlist[] = { /* for all charsets */ - 179, /* Number of elements */ + 3037, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ 0x0, - 0x181, + 0x114, + 0x116, + 0x12C, + 0x12E, + 0x14E, + 0x150, + 0x156, + 0x158, + 0x162, + 0x164, + 0x182, + 0x186, + 0x187, + 0x189, + 0x18B, 0x18D, - 0x18E, - 0x18F, - 0x190, + 0x193, + 0x194, + 0x195, + 0x196, + 0x19A, + 0x19D, + 0x19E, 0x1A0, 0x1A2, 0x1AA, 0x1AC, 0x1AF, 0x1B1, + 0x1B2, + 0x1B5, + 0x1B7, + 0x1B8, 0x1B9, 0x1BC, 0x1BE, + 0x1D5, 0x1DD, 0x1DE, - 0x1E4, 0x1E6, - 0x220, - 0x226, + 0x1EA, + 0x1EE, + 0x1F0, + 0x1F1, + 0x1F4, + 0x1F6, + 0x1FA, + 0x200, + 0x21E, + 0x234, 0x237, + 0x244, + 0x245, + 0x24C, + 0x24E, 0x250, - 0x253, - 0x255, - 0x256, - 0x258, - 0x25B, - 0x25C, - 0x263, - 0x264, - 0x268, - 0x26A, - 0x272, - 0x273, - 0x289, - 0x28A, - 0x292, - 0x293, 0x305, 0x306, 0x30D, @@ -292866,9 +320727,29 @@ static const UV UNI_IDENTIFIERTYPE__UNCO 0x337, 0x358, 0x359, + 0x400, + 0x401, + 0x40D, + 0x40E, + 0x450, + 0x451, + 0x45D, + 0x45E, + 0x48A, + 0x490, + 0x4C1, + 0x4CF, + 0x4DA, + 0x4DC, + 0x4EA, + 0x4EE, + 0x4F6, + 0x4F8, + 0x4FA, + 0x500, + 0x510, + 0x514, 0x591, - 0x5B4, - 0x5B5, 0x5BE, 0x5BF, 0x5C0, @@ -292878,10 +320759,28 @@ static const UV UNI_IDENTIFIERTYPE__UNCO 0x5C6, 0x5C7, 0x5C8, + 0x5EF, + 0x5F3, 0x610, 0x61B, + 0x653, + 0x654, 0x656, 0x660, + 0x69B, + 0x69F, + 0x6A1, + 0x6A2, + 0x6A3, + 0x6A4, + 0x6B2, + 0x6B3, + 0x6B4, + 0x6B5, + 0x6B8, + 0x6BA, + 0x6BF, + 0x6C0, 0x6D6, 0x6DD, 0x6DF, @@ -292890,50 +320789,260 @@ static const UV UNI_IDENTIFIERTYPE__UNCO 0x6E9, 0x6EA, 0x6EE, + 0x6FA, + 0x6FD, + 0x750, + 0x751, + 0x753, + 0x756, + 0x757, + 0x760, + 0x761, + 0x762, + 0x764, + 0x766, + 0x769, + 0x76A, + 0x76B, + 0x76E, + 0x772, + 0x77E, + 0x889, + 0x88E, 0x897, 0x8A0, - 0x8B3, + 0x8A1, + 0x8A2, + 0x8AA, + 0x8AD, + 0x8B2, 0x8B5, + 0x8B6, + 0x8BB, + 0x8C3, + 0x8C7, + 0x8C8, + 0x8C9, 0x8CA, 0x8E2, 0x8E3, 0x901, + 0x904, + 0x905, + 0x929, + 0x92A, + 0x934, + 0x935, + 0x944, + 0x945, 0x955, 0x956, + 0x979, + 0x97B, + 0x98C, + 0x98D, + 0x9D7, + 0x9D8, + 0x9FE, + 0x9FF, + 0xA01, + 0xA02, + 0xA03, + 0xA04, 0xA51, 0xA52, + 0xA66, + 0xA70, + 0xA72, + 0xA74, 0xA75, 0xA76, + 0xA81, + 0xA82, 0xAF9, - 0xAFA, + 0xB00, + 0xB0C, + 0xB0D, + 0xB35, + 0xB36, 0xB44, 0xB45, + 0xB55, + 0xB56, + 0xB57, + 0xB58, 0xB62, 0xB64, + 0xB66, + 0xB70, + 0xBD7, + 0xBD8, + 0xBE6, + 0xBF0, + 0xC01, + 0xC02, + 0xC04, + 0xC05, + 0xC0C, + 0xC0D, + 0xC31, + 0xC32, + 0xC3C, + 0xC3D, + 0xC55, + 0xC57, 0xC5A, 0xC5B, + 0xC5D, + 0xC5E, 0xC62, 0xC64, + 0xC66, + 0xC70, + 0xC80, + 0xC81, + 0xCBC, + 0xCBD, + 0xCC4, + 0xCC5, + 0xCD5, + 0xCD7, + 0xCDD, + 0xCDE, + 0xCF3, + 0xCF4, + 0xD00, + 0xD01, + 0xD0C, + 0xD0D, + 0xD29, + 0xD2A, 0xD44, 0xD45, + 0xD54, + 0xD57, 0xD62, 0xD64, - 0xD8F, + 0xD66, + 0xD70, + 0xD8E, 0xD91, - 0xDA6, - 0xDA7, 0xDDF, 0xDE0, + 0xDE6, + 0xDF0, 0xDF3, 0xDF4, + 0xE4E, + 0xE4F, + 0xE86, + 0xE87, + 0xE89, + 0xE8A, + 0xE8C, + 0xE8D, + 0xE8E, + 0xE94, + 0xE98, + 0xE99, + 0xEA0, + 0xEA1, + 0xEA8, + 0xEAA, + 0xEAC, + 0xEAD, + 0xEBA, + 0xEBB, + 0xECE, + 0xECF, + 0xEDE, + 0xEE0, 0xF39, 0xF3A, + 0xF6A, + 0xF6D, + 0xF82, + 0xF84, + 0xFAE, + 0xFB1, + 0xFC6, + 0xFC7, + 0x1050, + 0x105A, + 0x1065, + 0x1075, + 0x108B, + 0x108F, + 0x1090, + 0x109E, + 0x10F7, + 0x10FB, + 0x10FD, + 0x1100, + 0x1207, + 0x1208, + 0x1287, + 0x1288, + 0x12AF, + 0x12B0, + 0x12F8, + 0x1300, + 0x130F, + 0x1310, + 0x131F, + 0x1320, + 0x1347, + 0x1348, + 0x135A, + 0x135B, + 0x135D, + 0x1360, + 0x1380, + 0x1390, + 0x179D, + 0x179F, + 0x17A9, + 0x17AA, + 0x17D7, + 0x17D8, 0x18A9, 0x18AA, 0x1AC1, 0x1ACF, 0x1C89, 0x1C8B, + 0x1E02, + 0x1E0C, + 0x1E0E, + 0x1E12, + 0x1E14, + 0x1E18, + 0x1E1C, + 0x1E20, + 0x1E22, + 0x1E24, + 0x1E26, + 0x1E2A, + 0x1E2E, + 0x1E36, + 0x1E38, + 0x1E3C, + 0x1E40, + 0x1E42, + 0x1E4C, + 0x1E5A, + 0x1E5C, + 0x1E62, + 0x1E64, + 0x1E6C, + 0x1E6E, + 0x1E70, + 0x1E78, + 0x1E8C, + 0x1E8E, + 0x1E92, + 0x1E94, + 0x1E9A, 0x2054, 0x2055, 0x218A, @@ -292942,6 +321051,2424 @@ static const UV UNI_IDENTIFIERTYPE__UNCO 0x2BF0, 0x2C68, 0x2C6D, + 0x2D80, + 0x2D97, + 0x2DA0, + 0x2DA7, + 0x2DA8, + 0x2DAF, + 0x2DB0, + 0x2DB7, + 0x2DB8, + 0x2DBF, + 0x2DC0, + 0x2DC7, + 0x2DC8, + 0x2DCF, + 0x2DD0, + 0x2DD7, + 0x2DD8, + 0x2DDF, + 0x3099, + 0x309B, + 0x3400, + 0x3447, + 0x3448, + 0x3473, + 0x3474, + 0x34E4, + 0x34E5, + 0x3577, + 0x3578, + 0x359E, + 0x359F, + 0x35A1, + 0x35A2, + 0x35AD, + 0x35AE, + 0x35BF, + 0x35C0, + 0x35CE, + 0x35CF, + 0x35F3, + 0x35F4, + 0x35FE, + 0x35FF, + 0x360E, + 0x360F, + 0x361A, + 0x361B, + 0x3918, + 0x3919, + 0x3960, + 0x3961, + 0x396E, + 0x396F, + 0x39CF, + 0x39D1, + 0x39DB, + 0x39DC, + 0x39DF, + 0x39E0, + 0x39F8, + 0x39F9, + 0x39FE, + 0x39FF, + 0x3A18, + 0x3A19, + 0x3A52, + 0x3A53, + 0x3A5C, + 0x3A5D, + 0x3A67, + 0x3A68, + 0x3A73, + 0x3A74, + 0x3B39, + 0x3B3A, + 0x3B4E, + 0x3B4F, + 0x3BA3, + 0x3BA4, + 0x3C6E, + 0x3C6F, + 0x3CE0, + 0x3CE1, + 0x3DE7, + 0x3DE8, + 0x3DEB, + 0x3DEC, + 0x3E74, + 0x3E75, + 0x3ED0, + 0x3ED1, + 0x4056, + 0x4057, + 0x4065, + 0x4066, + 0x406A, + 0x406B, + 0x40BB, + 0x40BC, + 0x40DF, + 0x40E0, + 0x4137, + 0x4138, + 0x415F, + 0x4160, + 0x4337, + 0x4338, + 0x43AC, + 0x43AD, + 0x43B1, + 0x43B2, + 0x43D3, + 0x43D4, + 0x43DD, + 0x43DE, + 0x4443, + 0x4444, + 0x44D6, + 0x44D7, + 0x44EA, + 0x44EB, + 0x4606, + 0x4607, + 0x464C, + 0x464D, + 0x4661, + 0x4662, + 0x4723, + 0x4724, + 0x4729, + 0x472A, + 0x477C, + 0x477D, + 0x478D, + 0x478E, + 0x47F4, + 0x47F5, + 0x4882, + 0x4883, + 0x4947, + 0x4948, + 0x497A, + 0x497B, + 0x497D, + 0x497E, + 0x4982, + 0x4984, + 0x4985, + 0x4987, + 0x499B, + 0x499C, + 0x499F, + 0x49A0, + 0x49B6, + 0x49B8, + 0x4A12, + 0x4A13, + 0x4AB8, + 0x4AB9, + 0x4C77, + 0x4C78, + 0x4C7D, + 0x4C7E, + 0x4C81, + 0x4C82, + 0x4C85, + 0x4C86, + 0x4C9D, + 0x4CA4, + 0x4D13, + 0x4D1A, + 0x4DAE, + 0x4DAF, + 0x4DC0, + 0x4E12, + 0x4E13, + 0x4E29, + 0x4E2A, + 0x4E68, + 0x4E69, + 0x4E79, + 0x4E7A, + 0x4E96, + 0x4E97, + 0x4EA3, + 0x4EA4, + 0x4EBC, + 0x4EBD, + 0x4ECC, + 0x4ECD, + 0x4EE7, + 0x4EE8, + 0x4EF8, + 0x4EFB, + 0x4EFC, + 0x4EFD, + 0x4EFE, + 0x4EFF, + 0x4F07, + 0x4F08, + 0x4F16, + 0x4F17, + 0x4F28, + 0x4F29, + 0x4F31, + 0x4F32, + 0x4F35, + 0x4F36, + 0x4F37, + 0x4F38, + 0x4F40, + 0x4F41, + 0x4F44, + 0x4F45, + 0x4F71, + 0x4F72, + 0x4F8C, + 0x4F8D, + 0x4F8E, + 0x4F8F, + 0x4FA2, + 0x4FA3, + 0x4FBD, + 0x4FBE, + 0x4FC6, + 0x4FC7, + 0x4FC8, + 0x4FC9, + 0x4FCC, + 0x4FCD, + 0x4FE2, + 0x4FE3, + 0x4FFC, + 0x4FFE, + 0x5010, + 0x5011, + 0x5034, + 0x5035, + 0x5038, + 0x5039, + 0x503D, + 0x503E, + 0x5042, + 0x5043, + 0x5052, + 0x5053, + 0x5058, + 0x5059, + 0x507C, + 0x507D, + 0x5081, + 0x5082, + 0x5093, + 0x5094, + 0x5097, + 0x5098, + 0x509F, + 0x50A2, + 0x50B9, + 0x50BA, + 0x50C3, + 0x50C4, + 0x50D8, + 0x50D9, + 0x50DF, + 0x50E0, + 0x50E1, + 0x50E3, + 0x50EB, + 0x50EC, + 0x50F4, + 0x50F5, + 0x50F7, + 0x50F8, + 0x511B, + 0x511C, + 0x5128, + 0x5129, + 0x512B, + 0x512C, + 0x5142, + 0x5143, + 0x514A, + 0x514B, + 0x514F, + 0x5150, + 0x5153, + 0x5154, + 0x5158, + 0x5159, + 0x5160, + 0x5161, + 0x5164, + 0x5165, + 0x5172, + 0x5173, + 0x517E, + 0x517F, + 0x5183, + 0x5185, + 0x518E, + 0x518F, + 0x51A1, + 0x51A2, + 0x51A3, + 0x51A4, + 0x51AD, + 0x51AE, + 0x51B8, + 0x51B9, + 0x51BA, + 0x51BB, + 0x51C2, + 0x51C3, + 0x51D2, + 0x51D4, + 0x51DF, + 0x51E0, + 0x51EC, + 0x51ED, + 0x51EE, + 0x51EF, + 0x51F2, + 0x51F3, + 0x5253, + 0x5254, + 0x5266, + 0x5267, + 0x5279, + 0x527A, + 0x5285, + 0x5286, + 0x528E, + 0x528F, + 0x52C4, + 0x52C5, + 0x52C8, + 0x52C9, + 0x52CC, + 0x52CD, + 0x52CE, + 0x52CF, + 0x52D1, + 0x52D2, + 0x52D4, + 0x52D5, + 0x52E1, + 0x52E2, + 0x52E5, + 0x52E6, + 0x52EE, + 0x52EF, + 0x5303, + 0x5305, + 0x5318, + 0x5319, + 0x531B, + 0x531C, + 0x531E, + 0x531F, + 0x5327, + 0x5328, + 0x5329, + 0x532A, + 0x5332, + 0x5333, + 0x5335, + 0x5337, + 0x5342, + 0x5343, + 0x535B, + 0x535C, + 0x535D, + 0x535E, + 0x536A, + 0x536B, + 0x536D, + 0x536E, + 0x5380, + 0x5381, + 0x53A1, + 0x53A2, + 0x53AA, + 0x53AC, + 0x53AF, + 0x53B0, + 0x53BA, + 0x53BB, + 0x53C5, + 0x53C6, + 0x53CF, + 0x53D0, + 0x53DD, + 0x53DF, + 0x53E7, + 0x53E8, + 0x53FF, + 0x5401, + 0x541A, + 0x541B, + 0x5422, + 0x5423, + 0x544C, + 0x544D, + 0x545D, + 0x545E, + 0x5469, + 0x546A, + 0x548A, + 0x548B, + 0x54B5, + 0x54B6, + 0x54F6, + 0x54F7, + 0x5515, + 0x5516, + 0x5518, + 0x551A, + 0x5547, + 0x5548, + 0x5560, + 0x5561, + 0x557A, + 0x557B, + 0x55E0, + 0x55E1, + 0x55F8, + 0x55F9, + 0x560A, + 0x560C, + 0x5620, + 0x5621, + 0x562B, + 0x562C, + 0x5637, + 0x5638, + 0x563C, + 0x563D, + 0x5644, + 0x5645, + 0x564B, + 0x564C, + 0x5651, + 0x5652, + 0x5656, + 0x5657, + 0x565F, + 0x5660, + 0x5661, + 0x5662, + 0x5675, + 0x5676, + 0x567D, + 0x567E, + 0x5688, + 0x5689, + 0x568B, + 0x568C, + 0x5696, + 0x5697, + 0x569E, + 0x569F, + 0x56BA, + 0x56BB, + 0x56CF, + 0x56D0, + 0x56D9, + 0x56DA, + 0x56E6, + 0x56E7, + 0x56F6, + 0x56F7, + 0x56F8, + 0x56F9, + 0x56FB, + 0x56FD, + 0x5705, + 0x5706, + 0x5711, + 0x5712, + 0x5717, + 0x5718, + 0x5721, + 0x5722, + 0x5724, + 0x5725, + 0x573D, + 0x573E, + 0x5743, + 0x5744, + 0x5748, + 0x5749, + 0x5755, + 0x5757, + 0x5758, + 0x5759, + 0x5763, + 0x5764, + 0x5778, + 0x5779, + 0x5781, + 0x5782, + 0x5787, + 0x5788, + 0x5796, + 0x5797, + 0x57A8, + 0x57A9, + 0x57CA, + 0x57CB, + 0x57D1, + 0x57D2, + 0x57DB, + 0x57DC, + 0x5817, + 0x5819, + 0x5850, + 0x5851, + 0x5856, + 0x5857, + 0x5860, + 0x5861, + 0x5866, + 0x5868, + 0x5877, + 0x5878, + 0x5895, + 0x5896, + 0x58AA, + 0x58AB, + 0x58B6, + 0x58B7, + 0x58C0, + 0x58C1, + 0x58C3, + 0x58C5, + 0x58CD, + 0x58CE, + 0x58D0, + 0x58D1, + 0x58E1, + 0x58E2, + 0x58E6, + 0x58E7, + 0x58F5, + 0x58F6, + 0x5901, + 0x5902, + 0x5905, + 0x5906, + 0x5908, + 0x5909, + 0x5911, + 0x5912, + 0x5913, + 0x5914, + 0x5923, + 0x5924, + 0x5933, + 0x5934, + 0x5936, + 0x5937, + 0x5959, + 0x595A, + 0x595B, + 0x595C, + 0x59B7, + 0x59B8, + 0x59E7, + 0x59E8, + 0x5A24, + 0x5A25, + 0x5A26, + 0x5A27, + 0x5A2C, + 0x5A2D, + 0x5A30, + 0x5A31, + 0x5A54, + 0x5A55, + 0x5A59, + 0x5A5A, + 0x5A6F, + 0x5A70, + 0x5A71, + 0x5A72, + 0x5A87, + 0x5A88, + 0x5A8D, + 0x5A8E, + 0x5AAB, + 0x5AAC, + 0x5AD3, + 0x5AD4, + 0x5AEF, + 0x5AF1, + 0x5B0A, + 0x5B0B, + 0x5B0D, + 0x5B0E, + 0x5B39, + 0x5B3A, + 0x5B46, + 0x5B47, + 0x5B4F, + 0x5B50, + 0x5B52, + 0x5B53, + 0x5B60, + 0x5B62, + 0x5B6F, + 0x5B70, + 0x5B79, + 0x5B7A, + 0x5B7E, + 0x5B7F, + 0x5B86, + 0x5B87, + 0x5B90, + 0x5B91, + 0x5BA9, + 0x5BAA, + 0x5BB2, + 0x5BB3, + 0x5BB7, + 0x5BB8, + 0x5BBC, + 0x5BBD, + 0x5BC8, + 0x5BC9, + 0x5BDA, + 0x5BDB, + 0x5C00, + 0x5C01, + 0x5C1B, + 0x5C1C, + 0x5C23, + 0x5C24, + 0x5C26, + 0x5C27, + 0x5C29, + 0x5C2A, + 0x5C36, + 0x5C37, + 0x5C5A, + 0x5C5B, + 0x5C85, + 0x5C86, + 0x5CB4, + 0x5CB5, + 0x5CB9, + 0x5CBA, + 0x5CD5, + 0x5CD6, + 0x5CDD, + 0x5CDE, + 0x5CF5, + 0x5CF6, + 0x5D2B, + 0x5D2C, + 0x5D2F, + 0x5D30, + 0x5D3B, + 0x5D3C, + 0x5D53, + 0x5D54, + 0x5D57, + 0x5D58, + 0x5D60, + 0x5D61, + 0x5D83, + 0x5D84, + 0x5D96, + 0x5D97, + 0x5DA3, + 0x5DA5, + 0x5DAB, + 0x5DAC, + 0x5DB3, + 0x5DB4, + 0x5DB9, + 0x5DBA, + 0x5DC4, + 0x5DC5, + 0x5DD7, + 0x5DD8, + 0x5DDA, + 0x5DDB, + 0x5DDC, + 0x5DDD, + 0x5DF6, + 0x5DF7, + 0x5E12, + 0x5E13, + 0x5E48, + 0x5E49, + 0x5E51, + 0x5E52, + 0x5E92, + 0x5E93, + 0x5EBA, + 0x5EBB, + 0x5EC0, + 0x5EC1, + 0x5EEB, + 0x5EEC, + 0x5EF9, + 0x5EFA, + 0x5F0E, + 0x5F0F, + 0x5F3B, + 0x5F3C, + 0x5F3D, + 0x5F3E, + 0x5F8F, + 0x5F90, + 0x5F9A, + 0x5F9B, + 0x5FA3, + 0x5FA5, + 0x5FB0, + 0x5FB1, + 0x5FC2, + 0x5FC3, + 0x5FCE, + 0x5FCF, + 0x5FDB, + 0x5FDC, + 0x5FE2, + 0x5FE3, + 0x5FEC, + 0x5FED, + 0x5FFC, + 0x5FFD, + 0x6023, + 0x6024, + 0x6056, + 0x6057, + 0x6061, + 0x6062, + 0x6071, + 0x6072, + 0x6074, + 0x6075, + 0x6091, + 0x6092, + 0x6093, + 0x6094, + 0x60A5, + 0x60A6, + 0x60D2, + 0x60D3, + 0x60D6, + 0x60D7, + 0x60DE, + 0x60DF, + 0x60E5, + 0x60E6, + 0x60FD, + 0x60FE, + 0x6102, + 0x6103, + 0x6107, + 0x6108, + 0x6111, + 0x6112, + 0x611E, + 0x611F, + 0x6131, + 0x6132, + 0x6133, + 0x6134, + 0x6135, + 0x6136, + 0x6138, + 0x613A, + 0x6160, + 0x6161, + 0x617B, + 0x617C, + 0x617F, + 0x6180, + 0x6186, + 0x6187, + 0x6197, + 0x6198, + 0x619C, + 0x619D, + 0x61B9, + 0x61BA, + 0x61BB, + 0x61BC, + 0x61D3, + 0x61D4, + 0x61D5, + 0x61D6, + 0x61EC, + 0x61ED, + 0x61EF, + 0x61F0, + 0x6205, + 0x6206, + 0x6235, + 0x6236, + 0x6239, + 0x623A, + 0x6257, + 0x6258, + 0x628D, + 0x628E, + 0x629D, + 0x629E, + 0x62DE, + 0x62DF, + 0x62EA, + 0x62EB, + 0x630A, + 0x630B, + 0x6317, + 0x6318, + 0x6331, + 0x6332, + 0x6337, + 0x6338, + 0x635B, + 0x635C, + 0x638B, + 0x638C, + 0x6393, + 0x6394, + 0x63D1, + 0x63D2, + 0x643B, + 0x643D, + 0x6449, + 0x644A, + 0x645A, + 0x645B, + 0x647E, + 0x647F, + 0x6486, + 0x6487, + 0x64A1, + 0x64A2, + 0x64AF, + 0x64B0, + 0x64B6, + 0x64B7, + 0x64C8, + 0x64C9, + 0x64D5, + 0x64D6, + 0x64EE, + 0x64EF, + 0x64F5, + 0x64F6, + 0x64F9, + 0x64FA, + 0x6502, + 0x6503, + 0x650A, + 0x650B, + 0x651F, + 0x6520, + 0x6528, + 0x6529, + 0x6540, + 0x6541, + 0x6542, + 0x6543, + 0x655A, + 0x655B, + 0x655F, + 0x6560, + 0x657D, + 0x657E, + 0x658A, + 0x658B, + 0x659A, + 0x659B, + 0x65B5, + 0x65B6, + 0x65BE, + 0x65BF, + 0x65C8, + 0x65CA, + 0x65D1, + 0x65D2, + 0x65D8, + 0x65D9, + 0x65DC, + 0x65DD, + 0x65E4, + 0x65E5, + 0x65EA, + 0x65EB, + 0x65F9, + 0x65FA, + 0x65FE, + 0x65FF, + 0x6617, + 0x6618, + 0x662C, + 0x662D, + 0x6637, + 0x6639, + 0x6648, + 0x6649, + 0x664D, + 0x664E, + 0x6660, + 0x6661, + 0x6663, + 0x6664, + 0x6692, + 0x6693, + 0x669C, + 0x669D, + 0x669E, + 0x669F, + 0x66AC, + 0x66AE, + 0x66D0, + 0x66D1, + 0x66D3, + 0x66D4, + 0x66D7, + 0x66D8, + 0x66DF, + 0x66E0, + 0x66EF, + 0x66F0, + 0x6702, + 0x6703, + 0x6707, + 0x6708, + 0x6719, + 0x671A, + 0x6724, + 0x6725, + 0x6729, + 0x672A, + 0x6767, + 0x6768, + 0x6788, + 0x6789, + 0x6796, + 0x6797, + 0x67BD, + 0x67BE, + 0x67BF, + 0x67C0, + 0x67D5, + 0x67D6, + 0x67D7, + 0x67D8, + 0x67F9, + 0x67FA, + 0x6801, + 0x6802, + 0x6815, + 0x6816, + 0x6827, + 0x6828, + 0x6830, + 0x6831, + 0x6858, + 0x6859, + 0x685A, + 0x685B, + 0x685E, + 0x685F, + 0x687A, + 0x687B, + 0x6895, + 0x6896, + 0x6899, + 0x689A, + 0x68A5, + 0x68A6, + 0x68B8, + 0x68B9, + 0x68C3, + 0x68C4, + 0x68D9, + 0x68DA, + 0x68E2, + 0x68E3, + 0x68E5, + 0x68E6, + 0x6909, + 0x690A, + 0x693E, + 0x693F, + 0x694D, + 0x694E, + 0x699F, + 0x69A0, + 0x69A2, + 0x69A3, + 0x69C0, + 0x69C1, + 0x69D1, + 0x69D3, + 0x69D5, + 0x69D8, + 0x6A03, + 0x6A04, + 0x6A1C, + 0x6A1D, + 0x6A24, + 0x6A25, + 0x6A37, + 0x6A38, + 0x6A4A, + 0x6A4B, + 0x6A5C, + 0x6A5D, + 0x6A6E, + 0x6A6F, + 0x6A70, + 0x6A71, + 0x6A86, + 0x6A87, + 0x6A8A, + 0x6A8B, + 0x6A8F, + 0x6A90, + 0x6A99, + 0x6A9A, + 0x6A9D, + 0x6A9E, + 0x6AB1, + 0x6AB2, + 0x6ABE, + 0x6ABF, + 0x6AC0, + 0x6AC1, + 0x6AC4, + 0x6AC5, + 0x6AC9, + 0x6ACA, + 0x6AD8, + 0x6AD9, + 0x6AE9, + 0x6AEA, + 0x6B0E, + 0x6B0F, + 0x6B1B, + 0x6B1C, + 0x6B2E, + 0x6B2F, + 0x6B35, + 0x6B36, + 0x6B40, + 0x6B41, + 0x6B57, + 0x6B59, + 0x6B5D, + 0x6B5E, + 0x6B68, + 0x6B69, + 0x6B6C, + 0x6B6D, + 0x6B6E, + 0x6B6F, + 0x6B71, + 0x6B72, + 0x6B75, + 0x6B76, + 0x6B7D, + 0x6B7E, + 0x6BB8, + 0x6BB9, + 0x6BE9, + 0x6BEA, + 0x6BF1, + 0x6BF2, + 0x6BF4, + 0x6BF5, + 0x6BFA, + 0x6BFB, + 0x6C0A, + 0x6C0B, + 0x6C1C, + 0x6C1D, + 0x6C2D, + 0x6C2E, + 0x6C3C, + 0x6C3D, + 0x6C45, + 0x6C46, + 0x6C6C, + 0x6C6D, + 0x6C6E, + 0x6C6F, + 0x6CA0, + 0x6CA1, + 0x6CD8, + 0x6CD9, + 0x6CF4, + 0x6CF5, + 0x6D02, + 0x6D03, + 0x6D1C, + 0x6D1D, + 0x6D24, + 0x6D25, + 0x6D71, + 0x6D72, + 0x6D81, + 0x6D82, + 0x6D96, + 0x6D97, + 0x6DB0, + 0x6DB2, + 0x6DB6, + 0x6DB7, + 0x6DFE, + 0x6E00, + 0x6E01, + 0x6E03, + 0x6E06, + 0x6E07, + 0x6E12, + 0x6E13, + 0x6E18, + 0x6E19, + 0x6E2A, + 0x6E2B, + 0x6E4C, + 0x6E4D, + 0x6E6C, + 0x6E6D, + 0x6E7B, + 0x6E7E, + 0x6E8B, + 0x6E8C, + 0x6E95, + 0x6E96, + 0x6EDB, + 0x6EDC, + 0x6EE3, + 0x6EE4, + 0x6F04, + 0x6F05, + 0x6F0B, + 0x6F0C, + 0x6F42, + 0x6F43, + 0x6F48, + 0x6F49, + 0x6F4A, + 0x6F4B, + 0x6F79, + 0x6F7A, + 0x6F98, + 0x6F99, + 0x6F9A, + 0x6F9B, + 0x6F9F, + 0x6FA0, + 0x6FB7, + 0x6FB8, + 0x6FC5, + 0x6FC6, + 0x6FD0, + 0x6FD1, + 0x6FD3, + 0x6FD4, + 0x6FF5, + 0x6FF6, + 0x6FFD, + 0x6FFE, + 0x7010, + 0x7011, + 0x7013, + 0x7014, + 0x7047, + 0x7048, + 0x704B, + 0x704C, + 0x704E, + 0x704F, + 0x7072, + 0x7074, + 0x707B, + 0x707C, + 0x7081, + 0x7082, + 0x708D, + 0x708E, + 0x7097, + 0x7098, + 0x709B, + 0x709C, + 0x70AA, + 0x70AB, + 0x70B2, + 0x70B3, + 0x70B6, + 0x70B7, + 0x70D5, + 0x70D6, + 0x70FE, + 0x70FF, + 0x7108, + 0x7109, + 0x7124, + 0x7125, + 0x7133, + 0x7135, + 0x7157, + 0x7158, + 0x716B, + 0x716C, + 0x716D, + 0x716E, + 0x718D, + 0x718E, + 0x7196, + 0x7197, + 0x71A6, + 0x71A7, + 0x71AB, + 0x71AC, + 0x71B6, + 0x71B7, + 0x71CC, + 0x71CD, + 0x71D3, + 0x71D4, + 0x71F3, + 0x71F4, + 0x71FA, + 0x71FB, + 0x720B, + 0x720C, + 0x7211, + 0x7212, + 0x7215, + 0x7216, + 0x7217, + 0x7218, + 0x7220, + 0x7221, + 0x7224, + 0x7226, + 0x722F, + 0x7230, + 0x7234, + 0x7235, + 0x7245, + 0x7246, + 0x724E, + 0x724F, + 0x7250, + 0x7251, + 0x7255, + 0x7256, + 0x72AB, + 0x72AC, + 0x72BE, + 0x72BF, + 0x7302, + 0x7303, + 0x7310, + 0x7311, + 0x7328, + 0x7329, + 0x7353, + 0x7354, + 0x739C, + 0x739D, + 0x73C1, + 0x73C2, + 0x73F3, + 0x73F4, + 0x73FB, + 0x73FC, + 0x7418, + 0x7419, + 0x7439, + 0x743A, + 0x743E, + 0x743F, + 0x7447, + 0x7448, + 0x7449, + 0x744A, + 0x7458, + 0x7459, + 0x747B, + 0x747C, + 0x7484, + 0x7485, + 0x7496, + 0x7497, + 0x749D, + 0x749E, + 0x74C7, + 0x74C8, + 0x74C9, + 0x74CA, + 0x74CC, + 0x74CD, + 0x74EB, + 0x74EC, + 0x7520, + 0x7521, + 0x7541, + 0x7542, + 0x7552, + 0x7553, + 0x7555, + 0x7556, + 0x755E, + 0x755F, + 0x7561, + 0x7562, + 0x7571, + 0x7572, + 0x757B, + 0x757C, + 0x7585, + 0x7586, + 0x75A9, + 0x75AA, + 0x75B7, + 0x75B8, + 0x75DC, + 0x75DD, + 0x75EE, + 0x75EF, + 0x762C, + 0x762D, + 0x7644, + 0x7646, + 0x7651, + 0x7652, + 0x7655, + 0x7656, + 0x7673, + 0x7674, + 0x768D, + 0x768E, + 0x76A1, + 0x76A3, + 0x76A5, + 0x76A6, + 0x76A8, + 0x76A9, + 0x76B3, + 0x76B4, + 0x76B6, + 0x76B7, + 0x76C1, + 0x76C2, + 0x76CB, + 0x76CC, + 0x76D9, + 0x76DA, + 0x76EB, + 0x76EC, + 0x7700, + 0x7701, + 0x7702, + 0x7703, + 0x770E, + 0x770F, + 0x7721, + 0x7722, + 0x772B, + 0x772C, + 0x773F, + 0x7740, + 0x7742, + 0x7743, + 0x7764, + 0x7765, + 0x7796, + 0x7797, + 0x77A4, + 0x77A5, + 0x77BE, + 0x77BF, + 0x77C1, + 0x77C2, + 0x77D2, + 0x77D3, + 0x77DD, + 0x77DE, + 0x77E4, + 0x77E5, + 0x77E6, + 0x77E7, + 0x77F4, + 0x77F6, + 0x7824, + 0x7825, + 0x7836, + 0x7837, + 0x7842, + 0x7843, + 0x7846, + 0x7847, + 0x784B, + 0x784C, + 0x7876, + 0x7877, + 0x7888, + 0x7889, + 0x78C2, + 0x78C3, + 0x78C7, + 0x78C8, + 0x78D2, + 0x78D3, + 0x78F0, + 0x78F1, + 0x78F8, + 0x78F9, + 0x7900, + 0x7901, + 0x7908, + 0x7909, + 0x790D, + 0x790E, + 0x7915, + 0x7916, + 0x791F, + 0x7921, + 0x7932, + 0x7933, + 0x7936, + 0x7937, + 0x7959, + 0x795A, + 0x796C, + 0x796D, + 0x796E, + 0x796F, + 0x7975, + 0x7977, + 0x7986, + 0x7988, + 0x799E, + 0x799F, + 0x79A9, + 0x79AA, + 0x79BC, + 0x79BD, + 0x79C4, + 0x79C5, + 0x79C7, + 0x79C8, + 0x79CC, + 0x79CD, + 0x79D4, + 0x79D5, + 0x79D7, + 0x79D8, + 0x7A01, + 0x7A02, + 0x7A07, + 0x7A08, + 0x7A09, + 0x7A0A, + 0x7A2C, + 0x7A2D, + 0x7A38, + 0x7A39, + 0x7A3A, + 0x7A3B, + 0x7A64, + 0x7A65, + 0x7A6A, + 0x7A6B, + 0x7A6F, + 0x7A70, + 0x7A82, + 0x7A83, + 0x7A9A, + 0x7A9C, + 0x7AB9, + 0x7ABA, + 0x7ABB, + 0x7ABE, + 0x7AC2, + 0x7AC3, + 0x7AC6, + 0x7AC7, + 0x7AE9, + 0x7AEA, + 0x7AF5, + 0x7AF6, + 0x7AFC, + 0x7AFD, + 0x7B07, + 0x7B08, + 0x7B1F, + 0x7B20, + 0x7B27, + 0x7B28, + 0x7B29, + 0x7B2A, + 0x7B42, + 0x7B43, + 0x7B53, + 0x7B54, + 0x7BA3, + 0x7BA4, + 0x7BA5, + 0x7BA6, + 0x7BB0, + 0x7BB1, + 0x7BB2, + 0x7BB3, + 0x7BFA, + 0x7BFB, + 0x7C1B, + 0x7C1C, + 0x7C2E, + 0x7C30, + 0x7C52, + 0x7C53, + 0x7C55, + 0x7C56, + 0x7C5D, + 0x7C5E, + 0x7C76, + 0x7C77, + 0x7C87, + 0x7C88, + 0x7C93, + 0x7C94, + 0x7C9A, + 0x7C9B, + 0x7CAC, + 0x7CAD, + 0x7CD3, + 0x7CD4, + 0x7CDA, + 0x7CDC, + 0x7CE1, + 0x7CE2, + 0x7CE3, + 0x7CE4, + 0x7CE5, + 0x7CE7, + 0x7CFC, + 0x7CFD, + 0x7CFF, + 0x7D00, + 0x7D23, + 0x7D24, + 0x7D2A, + 0x7D2B, + 0x7D2D, + 0x7D2E, + 0x7D48, + 0x7D49, + 0x7D4D, + 0x7D4E, + 0x7D5A, + 0x7D5B, + 0x7D64, + 0x7D65, + 0x7D78, + 0x7D79, + 0x7D82, + 0x7D83, + 0x7D95, + 0x7D96, + 0x7D98, + 0x7D99, + 0x7DA4, + 0x7DA5, + 0x7DA8, + 0x7DA9, + 0x7DCD, + 0x7DCE, + 0x7DD3, + 0x7DD4, + 0x7DE5, + 0x7DE6, + 0x7DEB, + 0x7DEC, + 0x7DFD, + 0x7E00, + 0x7E18, + 0x7E19, + 0x7E5B, + 0x7E5C, + 0x7E64, + 0x7E65, + 0x7E9D, + 0x7E9E, + 0x7F3B, + 0x7F3D, + 0x7F41, + 0x7F42, + 0x7F46, + 0x7F47, + 0x7F59, + 0x7F5A, + 0x7F84, + 0x7F85, + 0x7F90, + 0x7F91, + 0x7F97, + 0x7F98, + 0x7F99, + 0x7F9A, + 0x7FB4, + 0x7FB5, + 0x7FD6, + 0x7FD7, + 0x7FDD, + 0x7FDE, + 0x7FE4, + 0x7FE5, + 0x800A, + 0x800B, + 0x802F, + 0x8030, + 0x803C, + 0x803D, + 0x8040, + 0x8041, + 0x8066, + 0x8067, + 0x8088, + 0x8089, + 0x808E, + 0x808F, + 0x8094, + 0x8095, + 0x80A6, + 0x80A9, + 0x80B3, + 0x80B4, + 0x80B9, + 0x80BA, + 0x80DF, + 0x80E0, + 0x8103, + 0x8105, + 0x8134, + 0x8136, + 0x8184, + 0x8185, + 0x8190, + 0x8191, + 0x8196, + 0x8197, + 0x81CB, + 0x81CC, + 0x81E4, + 0x81E5, + 0x81EF, + 0x81F1, + 0x8213, + 0x8214, + 0x8224, + 0x8225, + 0x8241, + 0x8242, + 0x8265, + 0x8266, + 0x828C, + 0x828D, + 0x82B2, + 0x82B3, + 0x82E2, + 0x82E3, + 0x82FC, + 0x82FD, + 0x830A, + 0x830B, + 0x8310, + 0x8311, + 0x8330, + 0x8331, + 0x8355, + 0x8356, + 0x83BE, + 0x83BF, + 0x83E6, + 0x83E7, + 0x83ED, + 0x83EE, + 0x8414, + 0x8415, + 0x8416, + 0x8418, + 0x841F, + 0x8420, + 0x8458, + 0x8459, + 0x8483, + 0x8484, + 0x8495, + 0x8496, + 0x84B7, + 0x84B8, + 0x84C3, + 0x84C4, + 0x84ED, + 0x84EE, + 0x8505, + 0x8506, + 0x8510, + 0x8511, + 0x8532, + 0x8534, + 0x854C, + 0x854D, + 0x8550, + 0x8551, + 0x857F, + 0x8580, + 0x8593, + 0x8594, + 0x85B2, + 0x85B3, + 0x85BB, + 0x85BC, + 0x85CC, + 0x85CD, + 0x85EE, + 0x85EF, + 0x85F3, + 0x85F4, + 0x85FC, + 0x85FD, + 0x8603, + 0x8604, + 0x860D, + 0x860F, + 0x8610, + 0x8611, + 0x8615, + 0x8616, + 0x861D, + 0x861E, + 0x8637, + 0x8638, + 0x8657, + 0x8658, + 0x8675, + 0x8676, + 0x8689, + 0x868A, + 0x8692, + 0x8693, + 0x86A0, + 0x86A1, + 0x86A6, + 0x86A7, + 0x86D5, + 0x86D6, + 0x86E0, + 0x86E1, + 0x86E7, + 0x86E8, + 0x86FD, + 0x86FE, + 0x871D, + 0x871E, + 0x872F, + 0x8730, + 0x873D, + 0x873E, + 0x8745, + 0x8746, + 0x8771, + 0x8772, + 0x878E, + 0x878F, + 0x8799, + 0x879A, + 0x87DA, + 0x87DB, + 0x87F0, + 0x87F1, + 0x8807, + 0x8808, + 0x8812, + 0x8813, + 0x882D, + 0x882E, + 0x883A, + 0x883B, + 0x8847, + 0x8848, + 0x8858, + 0x8859, + 0x885C, + 0x885D, + 0x885F, + 0x8860, + 0x887A, + 0x887B, + 0x88E6, + 0x88E7, + 0x88E9, + 0x88EA, + 0x88ED, + 0x88EE, + 0x8903, + 0x8904, + 0x890F, + 0x8910, + 0x8924, + 0x8925, + 0x8965, + 0x8966, + 0x8975, + 0x8976, + 0x897D, + 0x897E, + 0x898D, + 0x898E, + 0x8990, + 0x8991, + 0x8994, + 0x8995, + 0x8999, + 0x899A, + 0x89B0, + 0x89B1, + 0x89B4, + 0x89B5, + 0x89BB, + 0x89BD, + 0x89EE, + 0x89EF, + 0x89F5, + 0x89F6, + 0x89F9, + 0x89FA, + 0x89FD, + 0x89FE, + 0x8A05, + 0x8A07, + 0x8A14, + 0x8A15, + 0x8A19, + 0x8A1A, + 0x8A20, + 0x8A22, + 0x8A2B, + 0x8A2C, + 0x8A3D, + 0x8A3E, + 0x8A4B, + 0x8A4C, + 0x8A64, + 0x8A65, + 0x8A78, + 0x8A79, + 0x8A7D, + 0x8A7E, + 0x8A88, + 0x8A89, + 0x8A9F, + 0x8AA0, + 0x8AAF, + 0x8AB0, + 0x8AB7, + 0x8AB8, + 0x8AD0, + 0x8AD1, + 0x8AEC, + 0x8AED, + 0x8B29, + 0x8B2A, + 0x8B32, + 0x8B33, + 0x8B38, + 0x8B39, + 0x8B3F, + 0x8B40, + 0x8B61, + 0x8B63, + 0x8B69, + 0x8B6A, + 0x8B75, + 0x8B76, + 0x8B7C, + 0x8B7D, + 0x8B81, + 0x8B82, + 0x8B87, + 0x8B88, + 0x8B8D, + 0x8B8E, + 0x8B8F, + 0x8B90, + 0x8B9B, + 0x8B9C, + 0x8C38, + 0x8C39, + 0x8C40, + 0x8C41, + 0x8C44, + 0x8C45, + 0x8C51, + 0x8C54, + 0x8C58, + 0x8C59, + 0x8C74, + 0x8C75, + 0x8C7F, + 0x8C80, + 0x8C83, + 0x8C84, + 0x8C87, + 0x8C88, + 0x8C8B, + 0x8C8C, + 0x8C9B, + 0x8C9C, + 0x8CA6, + 0x8CA7, + 0x8CCB, + 0x8CCC, + 0x8CD6, + 0x8CD7, + 0x8CD8, + 0x8CD9, + 0x8CE9, + 0x8CEA, + 0x8CF7, + 0x8CF8, + 0x8D01, + 0x8D02, + 0x8D11, + 0x8D13, + 0x8D7C, + 0x8D7D, + 0x8DA6, + 0x8DA7, + 0x8DC0, + 0x8DC1, + 0x8DE5, + 0x8DE6, + 0x8E01, + 0x8E02, + 0x8E0B, + 0x8E0C, + 0x8E32, + 0x8E33, + 0x8E46, + 0x8E47, + 0x8E4F, + 0x8E50, + 0x8E6E, + 0x8E6F, + 0x8E75, + 0x8E76, + 0x8E77, + 0x8E78, + 0x8E79, + 0x8E7A, + 0x8E9B, + 0x8E9C, + 0x8EA2, + 0x8EA3, + 0x8EB3, + 0x8EB4, + 0x8EB6, + 0x8EB8, + 0x8EC1, + 0x8EC2, + 0x8EC4, + 0x8EC5, + 0x8ED9, + 0x8EDA, + 0x8EF0, + 0x8EF1, + 0x8F0F, + 0x8F10, + 0x8F2D, + 0x8F2E, + 0x8F3A, + 0x8F3B, + 0x8F41, + 0x8F42, + 0x8F9D, + 0x8F9E, + 0x8FA4, + 0x8FA5, + 0x8FB3, + 0x8FB4, + 0x8FC3, + 0x8FC4, + 0x8FCA, + 0x8FCB, + 0x8FE7, + 0x8FE8, + 0x902A, + 0x902B, + 0x902C, + 0x902D, + 0x9037, + 0x9038, + 0x9040, + 0x9041, + 0x9046, + 0x9047, + 0x90AB, + 0x90AC, + 0x90CC, + 0x90CE, + 0x90D2, + 0x90D3, + 0x90F6, + 0x90F7, + 0x910A, + 0x910B, + 0x913C, + 0x913E, + 0x9159, + 0x915A, + 0x917B, + 0x917C, + 0x9195, + 0x9196, + 0x9198, + 0x9199, + 0x91A9, + 0x91AA, + 0x91BF, + 0x91C0, + 0x91C4, + 0x91C5, + 0x91E0, + 0x91E1, + 0x91EF, + 0x91F0, + 0x9213, + 0x9214, + 0x921F, + 0x9220, + 0x9222, + 0x9223, + 0x9243, + 0x9244, + 0x9269, + 0x926B, + 0x9281, + 0x9282, + 0x9284, + 0x9285, + 0x929E, + 0x929F, + 0x92BD, + 0x92BE, + 0x92D4, + 0x92D5, + 0x92DB, + 0x92DC, + 0x92E2, + 0x92E3, + 0x931C, + 0x931D, + 0x9330, + 0x9332, + 0x9362, + 0x9363, + 0x9368, + 0x9369, + 0x936B, + 0x936C, + 0x936F, + 0x9370, + 0x9373, + 0x9374, + 0x9378, + 0x9379, + 0x937F, + 0x9380, + 0x9381, + 0x9382, + 0x938B, + 0x938C, + 0x939C, + 0x939D, + 0x93A0, + 0x93A1, + 0x93AB, + 0x93AC, + 0x93BB, + 0x93BC, + 0x93E0, + 0x93E1, + 0x93F3, + 0x93F4, + 0x9402, + 0x9403, + 0x9417, + 0x9418, + 0x941C, + 0x941D, + 0x941E, + 0x9420, + 0x9424, + 0x9425, + 0x9443, + 0x9444, + 0x944E, + 0x944F, + 0x946C, + 0x946D, + 0x947B, + 0x947C, + 0x9578, + 0x957A, + 0x957E, + 0x957F, + 0x9585, + 0x9586, + 0x9597, + 0x9598, + 0x95B3, + 0x95B5, + 0x95B8, + 0x95B9, + 0x95C1, + 0x95C2, + 0x95D9, + 0x95DA, + 0x95DD, + 0x95DE, + 0x9625, + 0x9627, + 0x9629, + 0x962A, + 0x963E, + 0x963F, + 0x9656, + 0x9658, + 0x9679, + 0x967A, + 0x967B, + 0x967C, + 0x967F, + 0x9680, + 0x9681, + 0x9683, + 0x968C, + 0x968D, + 0x9696, + 0x9697, + 0x969A, + 0x969B, + 0x969D, + 0x969E, + 0x969F, + 0x96A0, + 0x96AB, + 0x96AC, + 0x96AF, + 0x96B0, + 0x96B5, + 0x96B6, + 0x96E4, + 0x96E5, + 0x96E6, + 0x96E8, + 0x96FC, + 0x96FD, + 0x9714, + 0x9715, + 0x9717, + 0x9718, + 0x971A, + 0x971C, + 0x9733, + 0x9735, + 0x9737, + 0x9738, + 0x9740, + 0x9742, + 0x974D, + 0x974E, + 0x9757, + 0x9758, + 0x9763, + 0x9764, + 0x9775, + 0x9776, + 0x9787, + 0x9788, + 0x9789, + 0x978A, + 0x979B, + 0x979C, + 0x97A9, + 0x97AA, + 0x97B0, + 0x97B2, + 0x97B5, + 0x97B6, + 0x97BE, + 0x97BF, + 0x97C0, + 0x97C1, + 0x97D2, + 0x97D3, + 0x97FC, + 0x97FD, + 0x981F, + 0x9820, + 0x9825, + 0x9826, + 0x982A, + 0x982B, + 0x9833, + 0x9834, + 0x983A, + 0x983B, + 0x983E, + 0x983F, + 0x9842, + 0x9843, + 0x9847, + 0x9848, + 0x9856, + 0x9857, + 0x9866, + 0x9867, + 0x9868, + 0x9869, + 0x98B7, + 0x98B8, + 0x98CA, + 0x98CB, + 0x98E4, + 0x98E5, + 0x98EC, + 0x98ED, + 0x98F1, + 0x98F2, + 0x98F8, + 0x98F9, + 0x98FB, + 0x98FC, + 0x9919, + 0x991A, + 0x993B, + 0x993C, + 0x9944, + 0x9945, + 0x995A, + 0x995B, + 0x995D, + 0x995E, + 0x99BF, + 0x99C0, + 0x99E0, + 0x99E1, + 0x99E6, + 0x99E7, + 0x99EB, + 0x99EC, + 0x99F5, + 0x99F6, + 0x9A10, + 0x9A11, + 0x9A17, + 0x9A19, + 0x9A3B, + 0x9A3C, + 0x9A51, + 0x9A52, + 0x9A58, + 0x9A59, + 0x9A5D, + 0x9A5E, + 0x9A63, + 0x9A64, + 0x9AA9, + 0x9AAA, + 0x9ABD, + 0x9ABE, + 0x9AC8, + 0x9AC9, + 0x9AD7, + 0x9AD8, + 0x9AE0, + 0x9AE1, + 0x9AE4, + 0x9AE5, + 0x9AE8, + 0x9AEA, + 0x9AF0, + 0x9AF1, + 0x9B00, + 0x9B01, + 0x9B02, + 0x9B03, + 0x9B09, + 0x9B0A, + 0x9B14, + 0x9B15, + 0x9B1B, + 0x9B1C, + 0x9B34, + 0x9B35, + 0x9B3D, + 0x9B3E, + 0x9B40, + 0x9B41, + 0x9B50, + 0x9B51, + 0x9B57, + 0x9B58, + 0x9B62, + 0x9B63, + 0x9B72, + 0x9B73, + 0x9B89, + 0x9B8A, + 0x9B8C, + 0x9B8D, + 0x9B99, + 0x9B9A, + 0x9BC2, + 0x9BC3, + 0x9BF6, + 0x9BF7, + 0x9C00, + 0x9C02, + 0x9C03, + 0x9C04, + 0x9C42, + 0x9C43, + 0x9C4F, + 0x9C50, + 0x9C51, + 0x9C52, + 0x9C61, + 0x9C62, + 0x9C64, + 0x9C65, + 0x9C7B, + 0x9C7C, + 0x9D0C, + 0x9D0E, + 0x9D11, + 0x9D12, + 0x9D27, + 0x9D28, + 0x9D35, + 0x9D36, + 0x9D3C, + 0x9D3D, + 0x9D6D, + 0x9D6E, + 0x9D95, + 0x9D96, + 0x9DAE, + 0x9DAF, + 0x9DBD, + 0x9DBE, + 0x9DC0, + 0x9DC1, + 0x9DEA, + 0x9DEB, + 0x9DFC, + 0x9DFD, + 0x9E0E, + 0x9E0F, + 0x9E16, + 0x9E17, + 0x9E1C, + 0x9E1D, + 0x9E7B, + 0x9E7C, + 0x9E8F, + 0x9E91, + 0x9E98, + 0x9E99, + 0x9E9E, + 0x9E9F, + 0x9EA2, + 0x9EA3, + 0x9EAB, + 0x9EAD, + 0x9EB1, + 0x9EB2, + 0x9EEC, + 0x9EED, + 0x9EF1, + 0x9EF2, + 0x9F03, + 0x9F04, + 0x9F11, + 0x9F12, + 0x9F14, + 0x9F15, + 0x9F26, + 0x9F27, + 0x9F45, + 0x9F46, + 0x9F53, + 0x9F54, + 0x9F6D, + 0x9F6E, + 0x9FA1, + 0x9FA2, + 0x9FA3, + 0x9FA4, + 0x9FA6, + 0xA000, 0xA66F, 0xA670, 0xA67C, @@ -292952,18 +323479,56 @@ static const UV UNI_IDENTIFIERTYPE__UNCO 0xA78D, 0xA78F, 0xA790, + 0xA792, + 0xA794, 0xA7B2, 0xA7BA, + 0xA7C2, + 0xA7C4, 0xA7CB, - 0xA7CE, + 0xA7D0, 0xA7DA, 0xA7DD, 0xA8FC, 0xA8FE, 0xA9CF, 0xA9D0, + 0xA9E7, + 0xA9FF, + 0xAA60, + 0xAA77, + 0xAA7A, + 0xAA7B, + 0xAA7C, + 0xAA80, + 0xAB01, + 0xAB07, + 0xAB09, + 0xAB0F, + 0xAB11, + 0xAB17, + 0xAB20, + 0xAB27, + 0xAB28, + 0xAB2F, 0xAB60, 0xAB64, + 0xAB66, + 0xAB68, + 0xFA0E, + 0xFA10, + 0xFA11, + 0xFA12, + 0xFA13, + 0xFA15, + 0xFA1F, + 0xFA20, + 0xFA21, + 0xFA22, + 0xFA23, + 0xFA25, + 0xFA27, + 0xFA2A, 0xFB1E, 0xFB1F, 0xFE2E, @@ -292972,8 +323537,14 @@ static const UV UNI_IDENTIFIERTYPE__UNCO 0x10781, 0x10EC2, 0x10EC5, + 0x10EC7, + 0x10EC8, + 0x10EFA, + 0x10EFB, 0x10EFC, 0x10F00, + 0x1133B, + 0x1133C, 0x116D0, 0x116E4, 0x16A40, @@ -292989,7 +323560,137 @@ static const UV UNI_IDENTIFIERTYPE__UNCO 0x1D1DE, 0x1D1E9, 0x1F54F, - 0x1F550 + 0x1F550, + 0x20000, + 0x2070E, + 0x2070F, + 0x20731, + 0x20732, + 0x20779, + 0x2077A, + 0x20C53, + 0x20C54, + 0x20C78, + 0x20C79, + 0x20C96, + 0x20C97, + 0x20CCF, + 0x20CD0, + 0x20CD5, + 0x20CD6, + 0x20D15, + 0x20D16, + 0x20D7C, + 0x20D7D, + 0x20D7F, + 0x20D80, + 0x20E0E, + 0x20E10, + 0x20E77, + 0x20E78, + 0x20E9D, + 0x20E9E, + 0x20EA2, + 0x20EA3, + 0x20ED7, + 0x20ED8, + 0x20EF9, + 0x20EFB, + 0x20F2D, + 0x20F2F, + 0x20F4C, + 0x20F4D, + 0x20FB4, + 0x20FB5, + 0x20FBC, + 0x20FBD, + 0x20FEA, + 0x20FEB, + 0x2105C, + 0x2105D, + 0x2106F, + 0x21070, + 0x21075, + 0x21077, + 0x2107B, + 0x2107C, + 0x210C1, + 0x210C2, + 0x210C9, + 0x210CA, + 0x211D9, + 0x211DA, + 0x220C7, + 0x220C8, + 0x227B5, + 0x227B6, + 0x22AD5, + 0x22AD6, + 0x22B43, + 0x22B44, + 0x22BCA, + 0x22BCB, + 0x22C51, + 0x22C52, + 0x22C55, + 0x22C56, + 0x22CC2, + 0x22CC3, + 0x22D08, + 0x22D09, + 0x22D4C, + 0x22D4D, + 0x22D67, + 0x22D68, + 0x22EB3, + 0x22EB4, + 0x23CB7, + 0x23CB8, + 0x244D3, + 0x244D4, + 0x24DB8, + 0x24DB9, + 0x24DEA, + 0x24DEB, + 0x2512B, + 0x2512C, + 0x26258, + 0x26259, + 0x267CC, + 0x267CD, + 0x269F2, + 0x269F3, + 0x269FA, + 0x269FB, + 0x27A3E, + 0x27A3F, + 0x2815D, + 0x2815E, + 0x28207, + 0x28208, + 0x282E2, + 0x282E3, + 0x28CCA, + 0x28CCB, + 0x28CCD, + 0x28CCE, + 0x28CD2, + 0x28CD3, + 0x29D98, + 0x29D99, + 0x2A6E0, + 0x2A700, + 0x2B81E, + 0x2B820, + 0x2CEAE, + 0x2CEB0, + 0x2EBE1, + 0x2EBF0, + 0x2EE5E, + 0x30000, + 0x3134B, + 0x31350, + 0x3347A }; static const UV UNI_IDEO_invlist[] = { /* for all charsets */ @@ -293014,22 +323715,22 @@ static const UV UNI_IDEO_invlist[] = { 0xFADA, 0x16FE4, 0x16FE5, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1B170, 0x1B2FC, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -293039,7 +323740,7 @@ static const UV UNI_IDEO_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; static const UV UNI_IDEOGRAPHICSYMBOLS_invlist[] = { /* for all charsets */ @@ -293055,7 +323756,7 @@ static const UV UNI_IDEOGRAPHICSYMBOLS_i # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_IDS_invlist[] = { /* for ASCII/Latin1 */ - 1355, /* Number of elements */ + 1369, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -293161,7 +323862,7 @@ static const UV UNI_IDS_invlist[] = { / 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -293292,7 +323993,7 @@ static const UV UNI_IDS_invlist[] = { / 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -293310,7 +324011,7 @@ static const UV UNI_IDS_invlist[] = { / 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -293675,14 +324376,8 @@ static const UV UNI_IDS_invlist[] = { / 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -293914,6 +324609,8 @@ static const UV UNI_IDS_invlist[] = { / 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -293959,7 +324656,7 @@ static const UV UNI_IDS_invlist[] = { / 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -294144,6 +324841,8 @@ static const UV UNI_IDS_invlist[] = { / 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -294192,6 +324891,10 @@ static const UV UNI_IDS_invlist[] = { / 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -294202,12 +324905,14 @@ static const UV UNI_IDS_invlist[] = { / 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -294316,6 +325021,18 @@ static const UV UNI_IDS_invlist[] = { / 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -294399,11 +325116,9 @@ static const UV UNI_IDS_invlist[] = { / 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -294413,7 +325128,7 @@ static const UV UNI_IDS_invlist[] = { / 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* ASCII/Latin1 */ @@ -294424,7 +325139,7 @@ static const UV UNI_IDS_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_IDS_invlist[] = { /* for EBCDIC 1047 */ - 1381, /* Number of elements */ + 1395, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -294556,7 +325271,7 @@ static const UV UNI_IDS_invlist[] = { / 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -294687,7 +325402,7 @@ static const UV UNI_IDS_invlist[] = { / 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -294705,7 +325420,7 @@ static const UV UNI_IDS_invlist[] = { / 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -295070,14 +325785,8 @@ static const UV UNI_IDS_invlist[] = { / 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -295309,6 +326018,8 @@ static const UV UNI_IDS_invlist[] = { / 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -295354,7 +326065,7 @@ static const UV UNI_IDS_invlist[] = { / 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -295539,6 +326250,8 @@ static const UV UNI_IDS_invlist[] = { / 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -295587,6 +326300,10 @@ static const UV UNI_IDS_invlist[] = { / 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -295597,12 +326314,14 @@ static const UV UNI_IDS_invlist[] = { / 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -295711,6 +326430,18 @@ static const UV UNI_IDS_invlist[] = { / 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -295794,11 +326525,9 @@ static const UV UNI_IDS_invlist[] = { / 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -295808,7 +326537,7 @@ static const UV UNI_IDS_invlist[] = { / 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 1047 */ @@ -295819,7 +326548,7 @@ static const UV UNI_IDS_invlist[] = { / && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_IDS_invlist[] = { /* for EBCDIC 037 */ - 1377, /* Number of elements */ + 1391, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -295947,7 +326676,7 @@ static const UV UNI_IDS_invlist[] = { / 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -296078,7 +326807,7 @@ static const UV UNI_IDS_invlist[] = { / 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -296096,7 +326825,7 @@ static const UV UNI_IDS_invlist[] = { / 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -296461,14 +327190,8 @@ static const UV UNI_IDS_invlist[] = { / 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -296700,6 +327423,8 @@ static const UV UNI_IDS_invlist[] = { / 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -296745,7 +327470,7 @@ static const UV UNI_IDS_invlist[] = { / 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -296930,6 +327655,8 @@ static const UV UNI_IDS_invlist[] = { / 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -296978,6 +327705,10 @@ static const UV UNI_IDS_invlist[] = { / 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -296988,12 +327719,14 @@ static const UV UNI_IDS_invlist[] = { / 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -297102,6 +327835,18 @@ static const UV UNI_IDS_invlist[] = { / 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -297185,11 +327930,9 @@ static const UV UNI_IDS_invlist[] = { / 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -297199,7 +327942,7 @@ static const UV UNI_IDS_invlist[] = { / 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 037 */ @@ -297821,8 +328564,1333 @@ static const UV UNI_IN__1_DOT_1_invlist[ 0x10000 }; -static const UV UNI_IN__10_invlist[] = { /* for all charsets */ - 1318, /* Number of elements */ +static const UV UNI_IN__10_invlist[] = { /* for all charsets */ + 1318, /* Number of elements */ + 148565664, /* Version and data structure type */ + 0, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x378, + 0x37A, + 0x380, + 0x384, + 0x38B, + 0x38C, + 0x38D, + 0x38E, + 0x3A2, + 0x3A3, + 0x530, + 0x531, + 0x557, + 0x559, + 0x560, + 0x561, + 0x588, + 0x589, + 0x58B, + 0x58D, + 0x590, + 0x591, + 0x5C8, + 0x5D0, + 0x5EB, + 0x5F0, + 0x5F5, + 0x600, + 0x61D, + 0x61E, + 0x70E, + 0x70F, + 0x74B, + 0x74D, + 0x7B2, + 0x7C0, + 0x7FB, + 0x800, + 0x82E, + 0x830, + 0x83F, + 0x840, + 0x85C, + 0x85E, + 0x85F, + 0x860, + 0x86B, + 0x8A0, + 0x8B5, + 0x8B6, + 0x8BE, + 0x8D4, + 0x984, + 0x985, + 0x98D, + 0x98F, + 0x991, + 0x993, + 0x9A9, + 0x9AA, + 0x9B1, + 0x9B2, + 0x9B3, + 0x9B6, + 0x9BA, + 0x9BC, + 0x9C5, + 0x9C7, + 0x9C9, + 0x9CB, + 0x9CF, + 0x9D7, + 0x9D8, + 0x9DC, + 0x9DE, + 0x9DF, + 0x9E4, + 0x9E6, + 0x9FE, + 0xA01, + 0xA04, + 0xA05, + 0xA0B, + 0xA0F, + 0xA11, + 0xA13, + 0xA29, + 0xA2A, + 0xA31, + 0xA32, + 0xA34, + 0xA35, + 0xA37, + 0xA38, + 0xA3A, + 0xA3C, + 0xA3D, + 0xA3E, + 0xA43, + 0xA47, + 0xA49, + 0xA4B, + 0xA4E, + 0xA51, + 0xA52, + 0xA59, + 0xA5D, + 0xA5E, + 0xA5F, + 0xA66, + 0xA76, + 0xA81, + 0xA84, + 0xA85, + 0xA8E, + 0xA8F, + 0xA92, + 0xA93, + 0xAA9, + 0xAAA, + 0xAB1, + 0xAB2, + 0xAB4, + 0xAB5, + 0xABA, + 0xABC, + 0xAC6, + 0xAC7, + 0xACA, + 0xACB, + 0xACE, + 0xAD0, + 0xAD1, + 0xAE0, + 0xAE4, + 0xAE6, + 0xAF2, + 0xAF9, + 0xB00, + 0xB01, + 0xB04, + 0xB05, + 0xB0D, + 0xB0F, + 0xB11, + 0xB13, + 0xB29, + 0xB2A, + 0xB31, + 0xB32, + 0xB34, + 0xB35, + 0xB3A, + 0xB3C, + 0xB45, + 0xB47, + 0xB49, + 0xB4B, + 0xB4E, + 0xB56, + 0xB58, + 0xB5C, + 0xB5E, + 0xB5F, + 0xB64, + 0xB66, + 0xB78, + 0xB82, + 0xB84, + 0xB85, + 0xB8B, + 0xB8E, + 0xB91, + 0xB92, + 0xB96, + 0xB99, + 0xB9B, + 0xB9C, + 0xB9D, + 0xB9E, + 0xBA0, + 0xBA3, + 0xBA5, + 0xBA8, + 0xBAB, + 0xBAE, + 0xBBA, + 0xBBE, + 0xBC3, + 0xBC6, + 0xBC9, + 0xBCA, + 0xBCE, + 0xBD0, + 0xBD1, + 0xBD7, + 0xBD8, + 0xBE6, + 0xBFB, + 0xC00, + 0xC04, + 0xC05, + 0xC0D, + 0xC0E, + 0xC11, + 0xC12, + 0xC29, + 0xC2A, + 0xC3A, + 0xC3D, + 0xC45, + 0xC46, + 0xC49, + 0xC4A, + 0xC4E, + 0xC55, + 0xC57, + 0xC58, + 0xC5B, + 0xC60, + 0xC64, + 0xC66, + 0xC70, + 0xC78, + 0xC84, + 0xC85, + 0xC8D, + 0xC8E, + 0xC91, + 0xC92, + 0xCA9, + 0xCAA, + 0xCB4, + 0xCB5, + 0xCBA, + 0xCBC, + 0xCC5, + 0xCC6, + 0xCC9, + 0xCCA, + 0xCCE, + 0xCD5, + 0xCD7, + 0xCDE, + 0xCDF, + 0xCE0, + 0xCE4, + 0xCE6, + 0xCF0, + 0xCF1, + 0xCF3, + 0xD00, + 0xD04, + 0xD05, + 0xD0D, + 0xD0E, + 0xD11, + 0xD12, + 0xD45, + 0xD46, + 0xD49, + 0xD4A, + 0xD50, + 0xD54, + 0xD64, + 0xD66, + 0xD80, + 0xD82, + 0xD84, + 0xD85, + 0xD97, + 0xD9A, + 0xDB2, + 0xDB3, + 0xDBC, + 0xDBD, + 0xDBE, + 0xDC0, + 0xDC7, + 0xDCA, + 0xDCB, + 0xDCF, + 0xDD5, + 0xDD6, + 0xDD7, + 0xDD8, + 0xDE0, + 0xDE6, + 0xDF0, + 0xDF2, + 0xDF5, + 0xE01, + 0xE3B, + 0xE3F, + 0xE5C, + 0xE81, + 0xE83, + 0xE84, + 0xE85, + 0xE87, + 0xE89, + 0xE8A, + 0xE8B, + 0xE8D, + 0xE8E, + 0xE94, + 0xE98, + 0xE99, + 0xEA0, + 0xEA1, + 0xEA4, + 0xEA5, + 0xEA6, + 0xEA7, + 0xEA8, + 0xEAA, + 0xEAC, + 0xEAD, + 0xEBA, + 0xEBB, + 0xEBE, + 0xEC0, + 0xEC5, + 0xEC6, + 0xEC7, + 0xEC8, + 0xECE, + 0xED0, + 0xEDA, + 0xEDC, + 0xEE0, + 0xF00, + 0xF48, + 0xF49, + 0xF6D, + 0xF71, + 0xF98, + 0xF99, + 0xFBD, + 0xFBE, + 0xFCD, + 0xFCE, + 0xFDB, + 0x1000, + 0x10C6, + 0x10C7, + 0x10C8, + 0x10CD, + 0x10CE, + 0x10D0, + 0x1249, + 0x124A, + 0x124E, + 0x1250, + 0x1257, + 0x1258, + 0x1259, + 0x125A, + 0x125E, + 0x1260, + 0x1289, + 0x128A, + 0x128E, + 0x1290, + 0x12B1, + 0x12B2, + 0x12B6, + 0x12B8, + 0x12BF, + 0x12C0, + 0x12C1, + 0x12C2, + 0x12C6, + 0x12C8, + 0x12D7, + 0x12D8, + 0x1311, + 0x1312, + 0x1316, + 0x1318, + 0x135B, + 0x135D, + 0x137D, + 0x1380, + 0x139A, + 0x13A0, + 0x13F6, + 0x13F8, + 0x13FE, + 0x1400, + 0x169D, + 0x16A0, + 0x16F9, + 0x1700, + 0x170D, + 0x170E, + 0x1715, + 0x1720, + 0x1737, + 0x1740, + 0x1754, + 0x1760, + 0x176D, + 0x176E, + 0x1771, + 0x1772, + 0x1774, + 0x1780, + 0x17DE, + 0x17E0, + 0x17EA, + 0x17F0, + 0x17FA, + 0x1800, + 0x180F, + 0x1810, + 0x181A, + 0x1820, + 0x1878, + 0x1880, + 0x18AB, + 0x18B0, + 0x18F6, + 0x1900, + 0x191F, + 0x1920, + 0x192C, + 0x1930, + 0x193C, + 0x1940, + 0x1941, + 0x1944, + 0x196E, + 0x1970, + 0x1975, + 0x1980, + 0x19AC, + 0x19B0, + 0x19CA, + 0x19D0, + 0x19DB, + 0x19DE, + 0x1A1C, + 0x1A1E, + 0x1A5F, + 0x1A60, + 0x1A7D, + 0x1A7F, + 0x1A8A, + 0x1A90, + 0x1A9A, + 0x1AA0, + 0x1AAE, + 0x1AB0, + 0x1ABF, + 0x1B00, + 0x1B4C, + 0x1B50, + 0x1B7D, + 0x1B80, + 0x1BF4, + 0x1BFC, + 0x1C38, + 0x1C3B, + 0x1C4A, + 0x1C4D, + 0x1C89, + 0x1CC0, + 0x1CC8, + 0x1CD0, + 0x1CFA, + 0x1D00, + 0x1DFA, + 0x1DFB, + 0x1F16, + 0x1F18, + 0x1F1E, + 0x1F20, + 0x1F46, + 0x1F48, + 0x1F4E, + 0x1F50, + 0x1F58, + 0x1F59, + 0x1F5A, + 0x1F5B, + 0x1F5C, + 0x1F5D, + 0x1F5E, + 0x1F5F, + 0x1F7E, + 0x1F80, + 0x1FB5, + 0x1FB6, + 0x1FC5, + 0x1FC6, + 0x1FD4, + 0x1FD6, + 0x1FDC, + 0x1FDD, + 0x1FF0, + 0x1FF2, + 0x1FF5, + 0x1FF6, + 0x1FFF, + 0x2000, + 0x2065, + 0x2066, + 0x2072, + 0x2074, + 0x208F, + 0x2090, + 0x209D, + 0x20A0, + 0x20C0, + 0x20D0, + 0x20F1, + 0x2100, + 0x218C, + 0x2190, + 0x2427, + 0x2440, + 0x244B, + 0x2460, + 0x2B74, + 0x2B76, + 0x2B96, + 0x2B98, + 0x2BBA, + 0x2BBD, + 0x2BC9, + 0x2BCA, + 0x2BD3, + 0x2BEC, + 0x2BF0, + 0x2C00, + 0x2C2F, + 0x2C30, + 0x2C5F, + 0x2C60, + 0x2CF4, + 0x2CF9, + 0x2D26, + 0x2D27, + 0x2D28, + 0x2D2D, + 0x2D2E, + 0x2D30, + 0x2D68, + 0x2D6F, + 0x2D71, + 0x2D7F, + 0x2D97, + 0x2DA0, + 0x2DA7, + 0x2DA8, + 0x2DAF, + 0x2DB0, + 0x2DB7, + 0x2DB8, + 0x2DBF, + 0x2DC0, + 0x2DC7, + 0x2DC8, + 0x2DCF, + 0x2DD0, + 0x2DD7, + 0x2DD8, + 0x2DDF, + 0x2DE0, + 0x2E4A, + 0x2E80, + 0x2E9A, + 0x2E9B, + 0x2EF4, + 0x2F00, + 0x2FD6, + 0x2FF0, + 0x2FFC, + 0x3000, + 0x3040, + 0x3041, + 0x3097, + 0x3099, + 0x3100, + 0x3105, + 0x312F, + 0x3131, + 0x318F, + 0x3190, + 0x31BB, + 0x31C0, + 0x31E4, + 0x31F0, + 0x321F, + 0x3220, + 0x32FF, + 0x3300, + 0x4DB6, + 0x4DC0, + 0x9FEB, + 0xA000, + 0xA48D, + 0xA490, + 0xA4C7, + 0xA4D0, + 0xA62C, + 0xA640, + 0xA6F8, + 0xA700, + 0xA7AF, + 0xA7B0, + 0xA7B8, + 0xA7F7, + 0xA82C, + 0xA830, + 0xA83A, + 0xA840, + 0xA878, + 0xA880, + 0xA8C6, + 0xA8CE, + 0xA8DA, + 0xA8E0, + 0xA8FE, + 0xA900, + 0xA954, + 0xA95F, + 0xA97D, + 0xA980, + 0xA9CE, + 0xA9CF, + 0xA9DA, + 0xA9DE, + 0xA9FF, + 0xAA00, + 0xAA37, + 0xAA40, + 0xAA4E, + 0xAA50, + 0xAA5A, + 0xAA5C, + 0xAAC3, + 0xAADB, + 0xAAF7, + 0xAB01, + 0xAB07, + 0xAB09, + 0xAB0F, + 0xAB11, + 0xAB17, + 0xAB20, + 0xAB27, + 0xAB28, + 0xAB2F, + 0xAB30, + 0xAB66, + 0xAB70, + 0xABEE, + 0xABF0, + 0xABFA, + 0xAC00, + 0xD7A4, + 0xD7B0, + 0xD7C7, + 0xD7CB, + 0xD7FC, + 0xD800, + 0xFA6E, + 0xFA70, + 0xFADA, + 0xFB00, + 0xFB07, + 0xFB13, + 0xFB18, + 0xFB1D, + 0xFB37, + 0xFB38, + 0xFB3D, + 0xFB3E, + 0xFB3F, + 0xFB40, + 0xFB42, + 0xFB43, + 0xFB45, + 0xFB46, + 0xFBC2, + 0xFBD3, + 0xFD40, + 0xFD50, + 0xFD90, + 0xFD92, + 0xFDC8, + 0xFDD0, + 0xFDFE, + 0xFE00, + 0xFE1A, + 0xFE20, + 0xFE53, + 0xFE54, + 0xFE67, + 0xFE68, + 0xFE6C, + 0xFE70, + 0xFE75, + 0xFE76, + 0xFEFD, + 0xFEFF, + 0xFF00, + 0xFF01, + 0xFFBF, + 0xFFC2, + 0xFFC8, + 0xFFCA, + 0xFFD0, + 0xFFD2, + 0xFFD8, + 0xFFDA, + 0xFFDD, + 0xFFE0, + 0xFFE7, + 0xFFE8, + 0xFFEF, + 0xFFF9, + 0x1000C, + 0x1000D, + 0x10027, + 0x10028, + 0x1003B, + 0x1003C, + 0x1003E, + 0x1003F, + 0x1004E, + 0x10050, + 0x1005E, + 0x10080, + 0x100FB, + 0x10100, + 0x10103, + 0x10107, + 0x10134, + 0x10137, + 0x1018F, + 0x10190, + 0x1019C, + 0x101A0, + 0x101A1, + 0x101D0, + 0x101FE, + 0x10280, + 0x1029D, + 0x102A0, + 0x102D1, + 0x102E0, + 0x102FC, + 0x10300, + 0x10324, + 0x1032D, + 0x1034B, + 0x10350, + 0x1037B, + 0x10380, + 0x1039E, + 0x1039F, + 0x103C4, + 0x103C8, + 0x103D6, + 0x10400, + 0x1049E, + 0x104A0, + 0x104AA, + 0x104B0, + 0x104D4, + 0x104D8, + 0x104FC, + 0x10500, + 0x10528, + 0x10530, + 0x10564, + 0x1056F, + 0x10570, + 0x10600, + 0x10737, + 0x10740, + 0x10756, + 0x10760, + 0x10768, + 0x10800, + 0x10806, + 0x10808, + 0x10809, + 0x1080A, + 0x10836, + 0x10837, + 0x10839, + 0x1083C, + 0x1083D, + 0x1083F, + 0x10856, + 0x10857, + 0x1089F, + 0x108A7, + 0x108B0, + 0x108E0, + 0x108F3, + 0x108F4, + 0x108F6, + 0x108FB, + 0x1091C, + 0x1091F, + 0x1093A, + 0x1093F, + 0x10940, + 0x10980, + 0x109B8, + 0x109BC, + 0x109D0, + 0x109D2, + 0x10A04, + 0x10A05, + 0x10A07, + 0x10A0C, + 0x10A14, + 0x10A15, + 0x10A18, + 0x10A19, + 0x10A34, + 0x10A38, + 0x10A3B, + 0x10A3F, + 0x10A48, + 0x10A50, + 0x10A59, + 0x10A60, + 0x10AA0, + 0x10AC0, + 0x10AE7, + 0x10AEB, + 0x10AF7, + 0x10B00, + 0x10B36, + 0x10B39, + 0x10B56, + 0x10B58, + 0x10B73, + 0x10B78, + 0x10B92, + 0x10B99, + 0x10B9D, + 0x10BA9, + 0x10BB0, + 0x10C00, + 0x10C49, + 0x10C80, + 0x10CB3, + 0x10CC0, + 0x10CF3, + 0x10CFA, + 0x10D00, + 0x10E60, + 0x10E7F, + 0x11000, + 0x1104E, + 0x11052, + 0x11070, + 0x1107F, + 0x110C2, + 0x110D0, + 0x110E9, + 0x110F0, + 0x110FA, + 0x11100, + 0x11135, + 0x11136, + 0x11144, + 0x11150, + 0x11177, + 0x11180, + 0x111CE, + 0x111D0, + 0x111E0, + 0x111E1, + 0x111F5, + 0x11200, + 0x11212, + 0x11213, + 0x1123F, + 0x11280, + 0x11287, + 0x11288, + 0x11289, + 0x1128A, + 0x1128E, + 0x1128F, + 0x1129E, + 0x1129F, + 0x112AA, + 0x112B0, + 0x112EB, + 0x112F0, + 0x112FA, + 0x11300, + 0x11304, + 0x11305, + 0x1130D, + 0x1130F, + 0x11311, + 0x11313, + 0x11329, + 0x1132A, + 0x11331, + 0x11332, + 0x11334, + 0x11335, + 0x1133A, + 0x1133C, + 0x11345, + 0x11347, + 0x11349, + 0x1134B, + 0x1134E, + 0x11350, + 0x11351, + 0x11357, + 0x11358, + 0x1135D, + 0x11364, + 0x11366, + 0x1136D, + 0x11370, + 0x11375, + 0x11400, + 0x1145A, + 0x1145B, + 0x1145C, + 0x1145D, + 0x1145E, + 0x11480, + 0x114C8, + 0x114D0, + 0x114DA, + 0x11580, + 0x115B6, + 0x115B8, + 0x115DE, + 0x11600, + 0x11645, + 0x11650, + 0x1165A, + 0x11660, + 0x1166D, + 0x11680, + 0x116B8, + 0x116C0, + 0x116CA, + 0x11700, + 0x1171A, + 0x1171D, + 0x1172C, + 0x11730, + 0x11740, + 0x118A0, + 0x118F3, + 0x118FF, + 0x11900, + 0x11A00, + 0x11A48, + 0x11A50, + 0x11A84, + 0x11A86, + 0x11A9D, + 0x11A9E, + 0x11AA3, + 0x11AC0, + 0x11AF9, + 0x11C00, + 0x11C09, + 0x11C0A, + 0x11C37, + 0x11C38, + 0x11C46, + 0x11C50, + 0x11C6D, + 0x11C70, + 0x11C90, + 0x11C92, + 0x11CA8, + 0x11CA9, + 0x11CB7, + 0x11D00, + 0x11D07, + 0x11D08, + 0x11D0A, + 0x11D0B, + 0x11D37, + 0x11D3A, + 0x11D3B, + 0x11D3C, + 0x11D3E, + 0x11D3F, + 0x11D48, + 0x11D50, + 0x11D5A, + 0x12000, + 0x1239A, + 0x12400, + 0x1246F, + 0x12470, + 0x12475, + 0x12480, + 0x12544, + 0x13000, + 0x1342F, + 0x14400, + 0x14647, + 0x16800, + 0x16A39, + 0x16A40, + 0x16A5F, + 0x16A60, + 0x16A6A, + 0x16A6E, + 0x16A70, + 0x16AD0, + 0x16AEE, + 0x16AF0, + 0x16AF6, + 0x16B00, + 0x16B46, + 0x16B50, + 0x16B5A, + 0x16B5B, + 0x16B62, + 0x16B63, + 0x16B78, + 0x16B7D, + 0x16B90, + 0x16F00, + 0x16F45, + 0x16F50, + 0x16F7F, + 0x16F8F, + 0x16FA0, + 0x16FE0, + 0x16FE2, + 0x17000, + 0x187ED, + 0x18800, + 0x18AF3, + 0x1B000, + 0x1B11F, + 0x1B170, + 0x1B2FC, + 0x1BC00, + 0x1BC6B, + 0x1BC70, + 0x1BC7D, + 0x1BC80, + 0x1BC89, + 0x1BC90, + 0x1BC9A, + 0x1BC9C, + 0x1BCA4, + 0x1D000, + 0x1D0F6, + 0x1D100, + 0x1D127, + 0x1D129, + 0x1D1E9, + 0x1D200, + 0x1D246, + 0x1D300, + 0x1D357, + 0x1D360, + 0x1D372, + 0x1D400, + 0x1D455, + 0x1D456, + 0x1D49D, + 0x1D49E, + 0x1D4A0, + 0x1D4A2, + 0x1D4A3, + 0x1D4A5, + 0x1D4A7, + 0x1D4A9, + 0x1D4AD, + 0x1D4AE, + 0x1D4BA, + 0x1D4BB, + 0x1D4BC, + 0x1D4BD, + 0x1D4C4, + 0x1D4C5, + 0x1D506, + 0x1D507, + 0x1D50B, + 0x1D50D, + 0x1D515, + 0x1D516, + 0x1D51D, + 0x1D51E, + 0x1D53A, + 0x1D53B, + 0x1D53F, + 0x1D540, + 0x1D545, + 0x1D546, + 0x1D547, + 0x1D54A, + 0x1D551, + 0x1D552, + 0x1D6A6, + 0x1D6A8, + 0x1D7CC, + 0x1D7CE, + 0x1DA8C, + 0x1DA9B, + 0x1DAA0, + 0x1DAA1, + 0x1DAB0, + 0x1E000, + 0x1E007, + 0x1E008, + 0x1E019, + 0x1E01B, + 0x1E022, + 0x1E023, + 0x1E025, + 0x1E026, + 0x1E02B, + 0x1E800, + 0x1E8C5, + 0x1E8C7, + 0x1E8D7, + 0x1E900, + 0x1E94B, + 0x1E950, + 0x1E95A, + 0x1E95E, + 0x1E960, + 0x1EE00, + 0x1EE04, + 0x1EE05, + 0x1EE20, + 0x1EE21, + 0x1EE23, + 0x1EE24, + 0x1EE25, + 0x1EE27, + 0x1EE28, + 0x1EE29, + 0x1EE33, + 0x1EE34, + 0x1EE38, + 0x1EE39, + 0x1EE3A, + 0x1EE3B, + 0x1EE3C, + 0x1EE42, + 0x1EE43, + 0x1EE47, + 0x1EE48, + 0x1EE49, + 0x1EE4A, + 0x1EE4B, + 0x1EE4C, + 0x1EE4D, + 0x1EE50, + 0x1EE51, + 0x1EE53, + 0x1EE54, + 0x1EE55, + 0x1EE57, + 0x1EE58, + 0x1EE59, + 0x1EE5A, + 0x1EE5B, + 0x1EE5C, + 0x1EE5D, + 0x1EE5E, + 0x1EE5F, + 0x1EE60, + 0x1EE61, + 0x1EE63, + 0x1EE64, + 0x1EE65, + 0x1EE67, + 0x1EE6B, + 0x1EE6C, + 0x1EE73, + 0x1EE74, + 0x1EE78, + 0x1EE79, + 0x1EE7D, + 0x1EE7E, + 0x1EE7F, + 0x1EE80, + 0x1EE8A, + 0x1EE8B, + 0x1EE9C, + 0x1EEA1, + 0x1EEA4, + 0x1EEA5, + 0x1EEAA, + 0x1EEAB, + 0x1EEBC, + 0x1EEF0, + 0x1EEF2, + 0x1F000, + 0x1F02C, + 0x1F030, + 0x1F094, + 0x1F0A0, + 0x1F0AF, + 0x1F0B1, + 0x1F0C0, + 0x1F0C1, + 0x1F0D0, + 0x1F0D1, + 0x1F0F6, + 0x1F100, + 0x1F10D, + 0x1F110, + 0x1F12F, + 0x1F130, + 0x1F16C, + 0x1F170, + 0x1F1AD, + 0x1F1E6, + 0x1F203, + 0x1F210, + 0x1F23C, + 0x1F240, + 0x1F249, + 0x1F250, + 0x1F252, + 0x1F260, + 0x1F266, + 0x1F300, + 0x1F6D5, + 0x1F6E0, + 0x1F6ED, + 0x1F6F0, + 0x1F6F9, + 0x1F700, + 0x1F774, + 0x1F780, + 0x1F7D5, + 0x1F800, + 0x1F80C, + 0x1F810, + 0x1F848, + 0x1F850, + 0x1F85A, + 0x1F860, + 0x1F888, + 0x1F890, + 0x1F8AE, + 0x1F900, + 0x1F90C, + 0x1F910, + 0x1F93F, + 0x1F940, + 0x1F94D, + 0x1F950, + 0x1F96C, + 0x1F980, + 0x1F998, + 0x1F9C0, + 0x1F9C1, + 0x1F9D0, + 0x1F9E7, + 0x1FFFE, + 0x2A6D7, + 0x2A700, + 0x2B735, + 0x2B740, + 0x2B81E, + 0x2B820, + 0x2CEA2, + 0x2CEB0, + 0x2EBE1, + 0x2F800, + 0x2FA1E, + 0x2FFFE, + 0x30000, + 0x3FFFE, + 0x40000, + 0x4FFFE, + 0x50000, + 0x5FFFE, + 0x60000, + 0x6FFFE, + 0x70000, + 0x7FFFE, + 0x80000, + 0x8FFFE, + 0x90000, + 0x9FFFE, + 0xA0000, + 0xAFFFE, + 0xB0000, + 0xBFFFE, + 0xC0000, + 0xCFFFE, + 0xD0000, + 0xDFFFE, + 0xE0000, + 0xE0001, + 0xE0002, + 0xE0020, + 0xE0080, + 0xE0100, + 0xE01F0, + 0xEFFFE, + 0x110000 +}; + +static const UV UNI_IN__11_invlist[] = { /* for all charsets */ + 1336, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -297841,10 +329909,6 @@ static const UV UNI_IN__10_invlist[] = { 0x531, 0x557, 0x559, - 0x560, - 0x561, - 0x588, - 0x589, 0x58B, 0x58D, 0x590, @@ -297852,7 +329916,7 @@ static const UV UNI_IN__10_invlist[] = { 0x5C8, 0x5D0, 0x5EB, - 0x5F0, + 0x5EF, 0x5F5, 0x600, 0x61D, @@ -297864,7 +329928,7 @@ static const UV UNI_IN__10_invlist[] = { 0x7B2, 0x7C0, 0x7FB, - 0x800, + 0x7FD, 0x82E, 0x830, 0x83F, @@ -297878,7 +329942,7 @@ static const UV UNI_IN__10_invlist[] = { 0x8B5, 0x8B6, 0x8BE, - 0x8D4, + 0x8D3, 0x984, 0x985, 0x98D, @@ -297905,7 +329969,7 @@ static const UV UNI_IN__10_invlist[] = { 0x9DF, 0x9E4, 0x9E6, - 0x9FE, + 0x9FF, 0xA01, 0xA04, 0xA05, @@ -297937,7 +330001,7 @@ static const UV UNI_IN__10_invlist[] = { 0xA5E, 0xA5F, 0xA66, - 0xA76, + 0xA77, 0xA81, 0xA84, 0xA85, @@ -298027,8 +330091,6 @@ static const UV UNI_IN__10_invlist[] = { 0xBE6, 0xBFB, 0xC00, - 0xC04, - 0xC05, 0xC0D, 0xC0E, 0xC11, @@ -298051,8 +330113,6 @@ static const UV UNI_IN__10_invlist[] = { 0xC66, 0xC70, 0xC78, - 0xC84, - 0xC85, 0xC8D, 0xC8E, 0xC91, @@ -298245,7 +330305,7 @@ static const UV UNI_IN__10_invlist[] = { 0x1810, 0x181A, 0x1820, - 0x1878, + 0x1879, 0x1880, 0x18AB, 0x18B0, @@ -298294,7 +330354,9 @@ static const UV UNI_IN__10_invlist[] = { 0x1C4A, 0x1C4D, 0x1C89, - 0x1CC0, + 0x1C90, + 0x1CBB, + 0x1CBD, 0x1CC8, 0x1CD0, 0x1CFA, @@ -298355,13 +330417,9 @@ static const UV UNI_IN__10_invlist[] = { 0x2B76, 0x2B96, 0x2B98, - 0x2BBA, - 0x2BBD, 0x2BC9, 0x2BCA, - 0x2BD3, - 0x2BEC, - 0x2BF0, + 0x2BFF, 0x2C00, 0x2C2F, 0x2C30, @@ -298397,7 +330455,7 @@ static const UV UNI_IN__10_invlist[] = { 0x2DD8, 0x2DDF, 0x2DE0, - 0x2E4A, + 0x2E4F, 0x2E80, 0x2E9A, 0x2E9B, @@ -298413,7 +330471,7 @@ static const UV UNI_IN__10_invlist[] = { 0x3099, 0x3100, 0x3105, - 0x312F, + 0x3130, 0x3131, 0x318F, 0x3190, @@ -298427,7 +330485,7 @@ static const UV UNI_IN__10_invlist[] = { 0x3300, 0x4DB6, 0x4DC0, - 0x9FEB, + 0x9FF0, 0xA000, 0xA48D, 0xA490, @@ -298437,9 +330495,7 @@ static const UV UNI_IN__10_invlist[] = { 0xA640, 0xA6F8, 0xA700, - 0xA7AF, - 0xA7B0, - 0xA7B8, + 0xA7BA, 0xA7F7, 0xA82C, 0xA830, @@ -298451,8 +330507,6 @@ static const UV UNI_IN__10_invlist[] = { 0xA8CE, 0xA8DA, 0xA8E0, - 0xA8FE, - 0xA900, 0xA954, 0xA95F, 0xA97D, @@ -298653,11 +330707,11 @@ static const UV UNI_IN__10_invlist[] = { 0x10A15, 0x10A18, 0x10A19, - 0x10A34, + 0x10A36, 0x10A38, 0x10A3B, 0x10A3F, - 0x10A48, + 0x10A49, 0x10A50, 0x10A59, 0x10A60, @@ -298685,15 +330739,23 @@ static const UV UNI_IN__10_invlist[] = { 0x10CC0, 0x10CF3, 0x10CFA, - 0x10D00, + 0x10D28, + 0x10D30, + 0x10D3A, 0x10E60, 0x10E7F, + 0x10F00, + 0x10F28, + 0x10F30, + 0x10F5A, 0x11000, 0x1104E, 0x11052, 0x11070, 0x1107F, 0x110C2, + 0x110CD, + 0x110CE, 0x110D0, 0x110E9, 0x110F0, @@ -298701,7 +330763,7 @@ static const UV UNI_IN__10_invlist[] = { 0x11100, 0x11135, 0x11136, - 0x11144, + 0x11147, 0x11150, 0x11177, 0x11180, @@ -298742,7 +330804,7 @@ static const UV UNI_IN__10_invlist[] = { 0x11334, 0x11335, 0x1133A, - 0x1133C, + 0x1133B, 0x11345, 0x11347, 0x11349, @@ -298763,7 +330825,7 @@ static const UV UNI_IN__10_invlist[] = { 0x1145B, 0x1145C, 0x1145D, - 0x1145E, + 0x1145F, 0x11480, 0x114C8, 0x114D0, @@ -298783,11 +330845,13 @@ static const UV UNI_IN__10_invlist[] = { 0x116C0, 0x116CA, 0x11700, - 0x1171A, + 0x1171B, 0x1171D, 0x1172C, 0x11730, 0x11740, + 0x11800, + 0x1183C, 0x118A0, 0x118F3, 0x118FF, @@ -298797,8 +330861,6 @@ static const UV UNI_IN__10_invlist[] = { 0x11A50, 0x11A84, 0x11A86, - 0x11A9D, - 0x11A9E, 0x11AA3, 0x11AC0, 0x11AF9, @@ -298830,6 +330892,20 @@ static const UV UNI_IN__10_invlist[] = { 0x11D48, 0x11D50, 0x11D5A, + 0x11D60, + 0x11D66, + 0x11D67, + 0x11D69, + 0x11D6A, + 0x11D8F, + 0x11D90, + 0x11D92, + 0x11D93, + 0x11D99, + 0x11DA0, + 0x11DAA, + 0x11EE0, + 0x11EF9, 0x12000, 0x1239A, 0x12400, @@ -298864,6 +330940,8 @@ static const UV UNI_IN__10_invlist[] = { 0x16B78, 0x16B7D, 0x16B90, + 0x16E40, + 0x16E9B, 0x16F00, 0x16F45, 0x16F50, @@ -298873,7 +330951,7 @@ static const UV UNI_IN__10_invlist[] = { 0x16FE0, 0x16FE2, 0x17000, - 0x187ED, + 0x187F2, 0x18800, 0x18AF3, 0x1B000, @@ -298898,10 +330976,12 @@ static const UV UNI_IN__10_invlist[] = { 0x1D1E9, 0x1D200, 0x1D246, + 0x1D2E0, + 0x1D2F4, 0x1D300, 0x1D357, 0x1D360, - 0x1D372, + 0x1D379, 0x1D400, 0x1D455, 0x1D456, @@ -298968,6 +331048,8 @@ static const UV UNI_IN__10_invlist[] = { 0x1E95A, 0x1E95E, 0x1E960, + 0x1EC71, + 0x1ECB5, 0x1EE00, 0x1EE04, 0x1EE05, @@ -299051,8 +331133,6 @@ static const UV UNI_IN__10_invlist[] = { 0x1F100, 0x1F10D, 0x1F110, - 0x1F12F, - 0x1F130, 0x1F16C, 0x1F170, 0x1F1AD, @@ -299071,11 +331151,11 @@ static const UV UNI_IN__10_invlist[] = { 0x1F6E0, 0x1F6ED, 0x1F6F0, - 0x1F6F9, + 0x1F6FA, 0x1F700, 0x1F774, 0x1F780, - 0x1F7D5, + 0x1F7D9, 0x1F800, 0x1F80C, 0x1F810, @@ -299091,15 +331171,21 @@ static const UV UNI_IN__10_invlist[] = { 0x1F910, 0x1F93F, 0x1F940, - 0x1F94D, - 0x1F950, - 0x1F96C, - 0x1F980, - 0x1F998, + 0x1F971, + 0x1F973, + 0x1F977, + 0x1F97A, + 0x1F97B, + 0x1F97C, + 0x1F9A3, + 0x1F9B0, + 0x1F9BA, 0x1F9C0, - 0x1F9C1, + 0x1F9C3, 0x1F9D0, - 0x1F9E7, + 0x1FA00, + 0x1FA60, + 0x1FA6E, 0x1FFFE, 0x2A6D7, 0x2A700, @@ -299146,8 +331232,8 @@ static const UV UNI_IN__10_invlist[] = { 0x110000 }; -static const UV UNI_IN__11_invlist[] = { /* for all charsets */ - 1336, /* Number of elements */ +static const UV UNI_IN__12_invlist[] = { /* for all charsets */ + 1354, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -299369,7 +331455,7 @@ static const UV UNI_IN__11_invlist[] = { 0xC64, 0xC66, 0xC70, - 0xC78, + 0xC77, 0xC8D, 0xC8E, 0xC91, @@ -299443,27 +331529,13 @@ static const UV UNI_IN__11_invlist[] = { 0xE83, 0xE84, 0xE85, - 0xE87, - 0xE89, - 0xE8A, + 0xE86, 0xE8B, - 0xE8D, - 0xE8E, - 0xE94, - 0xE98, - 0xE99, - 0xEA0, - 0xEA1, + 0xE8C, 0xEA4, 0xEA5, 0xEA6, 0xEA7, - 0xEA8, - 0xEAA, - 0xEAC, - 0xEAD, - 0xEBA, - 0xEBB, 0xEBE, 0xEC0, 0xEC5, @@ -299616,7 +331688,7 @@ static const UV UNI_IN__11_invlist[] = { 0x1CBD, 0x1CC8, 0x1CD0, - 0x1CFA, + 0x1CFB, 0x1D00, 0x1DFA, 0x1DFB, @@ -299674,10 +331746,6 @@ static const UV UNI_IN__11_invlist[] = { 0x2B76, 0x2B96, 0x2B98, - 0x2BC9, - 0x2BCA, - 0x2BFF, - 0x2C00, 0x2C2F, 0x2C30, 0x2C5F, @@ -299712,7 +331780,7 @@ static const UV UNI_IN__11_invlist[] = { 0x2DD8, 0x2DDF, 0x2DE0, - 0x2E4F, + 0x2E50, 0x2E80, 0x2E9A, 0x2E9B, @@ -299752,7 +331820,9 @@ static const UV UNI_IN__11_invlist[] = { 0xA640, 0xA6F8, 0xA700, - 0xA7BA, + 0xA7C0, + 0xA7C2, + 0xA7C7, 0xA7F7, 0xA82C, 0xA830, @@ -299794,7 +331864,7 @@ static const UV UNI_IN__11_invlist[] = { 0xAB28, 0xAB2F, 0xAB30, - 0xAB66, + 0xAB68, 0xAB70, 0xABEE, 0xABF0, @@ -300005,6 +332075,8 @@ static const UV UNI_IN__11_invlist[] = { 0x10F28, 0x10F30, 0x10F5A, + 0x10FE0, + 0x10FF7, 0x11000, 0x1104E, 0x11052, @@ -300082,7 +332154,7 @@ static const UV UNI_IN__11_invlist[] = { 0x1145B, 0x1145C, 0x1145D, - 0x1145F, + 0x11460, 0x11480, 0x114C8, 0x114D0, @@ -300098,7 +332170,7 @@ static const UV UNI_IN__11_invlist[] = { 0x11660, 0x1166D, 0x11680, - 0x116B8, + 0x116B9, 0x116C0, 0x116CA, 0x11700, @@ -300113,11 +332185,15 @@ static const UV UNI_IN__11_invlist[] = { 0x118F3, 0x118FF, 0x11900, + 0x119A0, + 0x119A8, + 0x119AA, + 0x119D8, + 0x119DA, + 0x119E5, 0x11A00, 0x11A48, 0x11A50, - 0x11A84, - 0x11A86, 0x11AA3, 0x11AC0, 0x11AF9, @@ -300163,7 +332239,9 @@ static const UV UNI_IN__11_invlist[] = { 0x11DAA, 0x11EE0, 0x11EF9, - 0x12000, + 0x11FC0, + 0x11FF2, + 0x11FFF, 0x1239A, 0x12400, 0x1246F, @@ -300173,6 +332251,8 @@ static const UV UNI_IN__11_invlist[] = { 0x12544, 0x13000, 0x1342F, + 0x13430, + 0x13439, 0x14400, 0x14647, 0x16800, @@ -300200,19 +332280,23 @@ static const UV UNI_IN__11_invlist[] = { 0x16E40, 0x16E9B, 0x16F00, - 0x16F45, - 0x16F50, - 0x16F7F, + 0x16F4B, + 0x16F4F, + 0x16F88, 0x16F8F, 0x16FA0, 0x16FE0, - 0x16FE2, + 0x16FE4, 0x17000, - 0x187F2, + 0x187F8, 0x18800, 0x18AF3, 0x1B000, 0x1B11F, + 0x1B150, + 0x1B153, + 0x1B164, + 0x1B168, 0x1B170, 0x1B2FC, 0x1BC00, @@ -300295,18 +332379,32 @@ static const UV UNI_IN__11_invlist[] = { 0x1E025, 0x1E026, 0x1E02B, + 0x1E100, + 0x1E12D, + 0x1E130, + 0x1E13E, + 0x1E140, + 0x1E14A, + 0x1E14E, + 0x1E150, + 0x1E2C0, + 0x1E2FA, + 0x1E2FF, + 0x1E300, 0x1E800, 0x1E8C5, 0x1E8C7, 0x1E8D7, 0x1E900, - 0x1E94B, + 0x1E94C, 0x1E950, 0x1E95A, 0x1E95E, 0x1E960, 0x1EC71, 0x1ECB5, + 0x1ED01, + 0x1ED3E, 0x1EE00, 0x1EE04, 0x1EE05, @@ -300390,7 +332488,7 @@ static const UV UNI_IN__11_invlist[] = { 0x1F100, 0x1F10D, 0x1F110, - 0x1F16C, + 0x1F16D, 0x1F170, 0x1F1AD, 0x1F1E6, @@ -300404,15 +332502,17 @@ static const UV UNI_IN__11_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D5, + 0x1F6D6, 0x1F6E0, 0x1F6ED, 0x1F6F0, - 0x1F6FA, + 0x1F6FB, 0x1F700, 0x1F774, 0x1F780, 0x1F7D9, + 0x1F7E0, + 0x1F7EC, 0x1F800, 0x1F80C, 0x1F810, @@ -300425,24 +332525,28 @@ static const UV UNI_IN__11_invlist[] = { 0x1F8AE, 0x1F900, 0x1F90C, - 0x1F910, - 0x1F93F, - 0x1F940, - 0x1F971, + 0x1F90D, + 0x1F972, 0x1F973, 0x1F977, 0x1F97A, - 0x1F97B, - 0x1F97C, 0x1F9A3, - 0x1F9B0, - 0x1F9BA, - 0x1F9C0, - 0x1F9C3, - 0x1F9D0, - 0x1FA00, + 0x1F9A5, + 0x1F9AB, + 0x1F9AE, + 0x1F9CB, + 0x1F9CD, + 0x1FA54, 0x1FA60, 0x1FA6E, + 0x1FA70, + 0x1FA74, + 0x1FA78, + 0x1FA7B, + 0x1FA80, + 0x1FA83, + 0x1FA90, + 0x1FA96, 0x1FFFE, 0x2A6D7, 0x2A700, @@ -300489,8 +332593,8 @@ static const UV UNI_IN__11_invlist[] = { 0x110000 }; -static const UV UNI_IN__12_invlist[] = { /* for all charsets */ - 1354, /* Number of elements */ +static const UV UNI_IN__12_DOT_1_invlist[] = { /* for all charsets */ + 1352, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -301063,8 +333167,6 @@ static const UV UNI_IN__12_invlist[] = { 0x31F0, 0x321F, 0x3220, - 0x32FF, - 0x3300, 0x4DB6, 0x4DC0, 0x9FF0, @@ -301850,8 +333952,8 @@ static const UV UNI_IN__12_invlist[] = { 0x110000 }; -static const UV UNI_IN__12_DOT_1_invlist[] = { /* for all charsets */ - 1352, /* Number of elements */ +static const UV UNI_IN__13_invlist[] = { /* for all charsets */ + 1372, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -301902,7 +334004,7 @@ static const UV UNI_IN__12_DOT_1_invlist 0x8A0, 0x8B5, 0x8B6, - 0x8BE, + 0x8C8, 0x8D3, 0x984, 0x985, @@ -302011,7 +334113,7 @@ static const UV UNI_IN__12_DOT_1_invlist 0xB49, 0xB4B, 0xB4E, - 0xB56, + 0xB55, 0xB58, 0xB5C, 0xB5E, @@ -302100,8 +334202,6 @@ static const UV UNI_IN__12_DOT_1_invlist 0xCF1, 0xCF3, 0xD00, - 0xD04, - 0xD05, 0xD0D, 0xD0E, 0xD11, @@ -302115,7 +334215,7 @@ static const UV UNI_IN__12_DOT_1_invlist 0xD64, 0xD66, 0xD80, - 0xD82, + 0xD81, 0xD84, 0xD85, 0xD97, @@ -302288,7 +334388,7 @@ static const UV UNI_IN__12_DOT_1_invlist 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ABF, + 0x1AC1, 0x1B00, 0x1B4C, 0x1B50, @@ -302363,7 +334463,7 @@ static const UV UNI_IN__12_DOT_1_invlist 0x2B74, 0x2B76, 0x2B96, - 0x2B98, + 0x2B97, 0x2C2F, 0x2C30, 0x2C5F, @@ -302398,7 +334498,7 @@ static const UV UNI_IN__12_DOT_1_invlist 0x2DD8, 0x2DDF, 0x2DE0, - 0x2E50, + 0x2E53, 0x2E80, 0x2E9A, 0x2E9B, @@ -302418,15 +334518,11 @@ static const UV UNI_IN__12_DOT_1_invlist 0x3131, 0x318F, 0x3190, - 0x31BB, - 0x31C0, 0x31E4, 0x31F0, 0x321F, 0x3220, - 0x4DB6, - 0x4DC0, - 0x9FF0, + 0x9FFD, 0xA000, 0xA48D, 0xA490, @@ -302438,9 +334534,9 @@ static const UV UNI_IN__12_DOT_1_invlist 0xA700, 0xA7C0, 0xA7C2, - 0xA7C7, - 0xA7F7, - 0xA82C, + 0xA7CB, + 0xA7F5, + 0xA82D, 0xA830, 0xA83A, 0xA840, @@ -302480,7 +334576,7 @@ static const UV UNI_IN__12_DOT_1_invlist 0xAB28, 0xAB2F, 0xAB30, - 0xAB68, + 0xAB6C, 0xAB70, 0xABEE, 0xABF0, @@ -302568,7 +334664,7 @@ static const UV UNI_IN__12_DOT_1_invlist 0x10137, 0x1018F, 0x10190, - 0x1019C, + 0x1019D, 0x101A0, 0x101A1, 0x101D0, @@ -302687,10 +334783,18 @@ static const UV UNI_IN__12_DOT_1_invlist 0x10D3A, 0x10E60, 0x10E7F, + 0x10E80, + 0x10EAA, + 0x10EAB, + 0x10EAE, + 0x10EB0, + 0x10EB2, 0x10F00, 0x10F28, 0x10F30, 0x10F5A, + 0x10FB0, + 0x10FCC, 0x10FE0, 0x10FF7, 0x11000, @@ -302708,12 +334812,10 @@ static const UV UNI_IN__12_DOT_1_invlist 0x11100, 0x11135, 0x11136, - 0x11147, + 0x11148, 0x11150, 0x11177, 0x11180, - 0x111CE, - 0x111D0, 0x111E0, 0x111E1, 0x111F5, @@ -302766,11 +334868,9 @@ static const UV UNI_IN__12_DOT_1_invlist 0x11370, 0x11375, 0x11400, - 0x1145A, - 0x1145B, 0x1145C, 0x1145D, - 0x11460, + 0x11462, 0x11480, 0x114C8, 0x114D0, @@ -302800,7 +334900,21 @@ static const UV UNI_IN__12_DOT_1_invlist 0x118A0, 0x118F3, 0x118FF, - 0x11900, + 0x11907, + 0x11909, + 0x1190A, + 0x1190C, + 0x11914, + 0x11915, + 0x11917, + 0x11918, + 0x11936, + 0x11937, + 0x11939, + 0x1193B, + 0x11947, + 0x11950, + 0x1195A, 0x119A0, 0x119A8, 0x119AA, @@ -302855,6 +334969,8 @@ static const UV UNI_IN__12_DOT_1_invlist 0x11DAA, 0x11EE0, 0x11EF9, + 0x11FB0, + 0x11FB1, 0x11FC0, 0x11FF2, 0x11FFF, @@ -302902,11 +335018,15 @@ static const UV UNI_IN__12_DOT_1_invlist 0x16F8F, 0x16FA0, 0x16FE0, - 0x16FE4, + 0x16FE5, + 0x16FF0, + 0x16FF2, 0x17000, 0x187F8, 0x18800, - 0x18AF3, + 0x18CD6, + 0x18D00, + 0x18D09, 0x1B000, 0x1B11F, 0x1B150, @@ -303102,11 +335222,7 @@ static const UV UNI_IN__12_DOT_1_invlist 0x1F0D1, 0x1F0F6, 0x1F100, - 0x1F10D, - 0x1F110, - 0x1F16D, - 0x1F170, - 0x1F1AD, + 0x1F1AE, 0x1F1E6, 0x1F203, 0x1F210, @@ -303118,11 +335234,11 @@ static const UV UNI_IN__12_DOT_1_invlist 0x1F260, 0x1F266, 0x1F300, - 0x1F6D6, + 0x1F6D8, 0x1F6E0, 0x1F6ED, 0x1F6F0, - 0x1F6FB, + 0x1F6FD, 0x1F700, 0x1F774, 0x1F780, @@ -303139,32 +335255,38 @@ static const UV UNI_IN__12_DOT_1_invlist 0x1F888, 0x1F890, 0x1F8AE, + 0x1F8B0, + 0x1F8B2, 0x1F900, - 0x1F90C, - 0x1F90D, - 0x1F972, - 0x1F973, - 0x1F977, + 0x1F979, 0x1F97A, - 0x1F9A3, - 0x1F9A5, - 0x1F9AB, - 0x1F9AE, - 0x1F9CB, + 0x1F9CC, 0x1F9CD, 0x1FA54, 0x1FA60, 0x1FA6E, 0x1FA70, - 0x1FA74, + 0x1FA75, 0x1FA78, 0x1FA7B, 0x1FA80, - 0x1FA83, + 0x1FA87, 0x1FA90, - 0x1FA96, + 0x1FAA9, + 0x1FAB0, + 0x1FAB7, + 0x1FAC0, + 0x1FAC3, + 0x1FAD0, + 0x1FAD7, + 0x1FB00, + 0x1FB93, + 0x1FB94, + 0x1FBCB, + 0x1FBF0, + 0x1FBFA, 0x1FFFE, - 0x2A6D7, + 0x2A6DE, 0x2A700, 0x2B735, 0x2B740, @@ -303176,7 +335298,7 @@ static const UV UNI_IN__12_DOT_1_invlist 0x2F800, 0x2FA1E, 0x2FFFE, - 0x30000, + 0x3134B, 0x3FFFE, 0x40000, 0x4FFFE, @@ -303209,8 +335331,8 @@ static const UV UNI_IN__12_DOT_1_invlist 0x110000 }; -static const UV UNI_IN__13_invlist[] = { /* for all charsets */ - 1372, /* Number of elements */ +static const UV UNI_IN__14_invlist[] = { /* for all charsets */ + 1412, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -303239,8 +335361,6 @@ static const UV UNI_IN__13_invlist[] = { 0x5EF, 0x5F5, 0x600, - 0x61D, - 0x61E, 0x70E, 0x70F, 0x74B, @@ -303258,11 +335378,11 @@ static const UV UNI_IN__13_invlist[] = { 0x85F, 0x860, 0x86B, - 0x8A0, - 0x8B5, - 0x8B6, - 0x8C8, - 0x8D3, + 0x870, + 0x88F, + 0x890, + 0x892, + 0x898, 0x984, 0x985, 0x98D, @@ -303418,7 +335538,7 @@ static const UV UNI_IN__13_invlist[] = { 0xC29, 0xC2A, 0xC3A, - 0xC3D, + 0xC3C, 0xC45, 0xC46, 0xC49, @@ -303428,6 +335548,8 @@ static const UV UNI_IN__13_invlist[] = { 0xC57, 0xC58, 0xC5B, + 0xC5D, + 0xC5E, 0xC60, 0xC64, 0xC66, @@ -303450,7 +335572,7 @@ static const UV UNI_IN__13_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDE, + 0xCDD, 0xCDF, 0xCE0, 0xCE4, @@ -303585,10 +335707,8 @@ static const UV UNI_IN__13_invlist[] = { 0x16A0, 0x16F9, 0x1700, - 0x170D, - 0x170E, - 0x1715, - 0x1720, + 0x1716, + 0x171F, 0x1737, 0x1740, 0x1754, @@ -303605,8 +335725,6 @@ static const UV UNI_IN__13_invlist[] = { 0x17F0, 0x17FA, 0x1800, - 0x180F, - 0x1810, 0x181A, 0x1820, 0x1879, @@ -303645,11 +335763,11 @@ static const UV UNI_IN__13_invlist[] = { 0x1AA0, 0x1AAE, 0x1AB0, - 0x1AC1, + 0x1ACF, 0x1B00, - 0x1B4C, + 0x1B4D, 0x1B50, - 0x1B7D, + 0x1B7F, 0x1B80, 0x1BF4, 0x1BFC, @@ -303665,8 +335783,6 @@ static const UV UNI_IN__13_invlist[] = { 0x1CD0, 0x1CFB, 0x1D00, - 0x1DFA, - 0x1DFB, 0x1F16, 0x1F18, 0x1F1E, @@ -303707,7 +335823,7 @@ static const UV UNI_IN__13_invlist[] = { 0x2090, 0x209D, 0x20A0, - 0x20C0, + 0x20C1, 0x20D0, 0x20F1, 0x2100, @@ -303721,10 +335837,6 @@ static const UV UNI_IN__13_invlist[] = { 0x2B76, 0x2B96, 0x2B97, - 0x2C2F, - 0x2C30, - 0x2C5F, - 0x2C60, 0x2CF4, 0x2CF9, 0x2D26, @@ -303755,7 +335867,7 @@ static const UV UNI_IN__13_invlist[] = { 0x2DD8, 0x2DDF, 0x2DE0, - 0x2E53, + 0x2E5E, 0x2E80, 0x2E9A, 0x2E9B, @@ -303779,8 +335891,6 @@ static const UV UNI_IN__13_invlist[] = { 0x31F0, 0x321F, 0x3220, - 0x9FFD, - 0xA000, 0xA48D, 0xA490, 0xA4C7, @@ -303789,10 +335899,14 @@ static const UV UNI_IN__13_invlist[] = { 0xA640, 0xA6F8, 0xA700, - 0xA7C0, - 0xA7C2, 0xA7CB, - 0xA7F5, + 0xA7D0, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, + 0xA7DA, + 0xA7F2, 0xA82D, 0xA830, 0xA83A, @@ -303863,16 +335977,12 @@ static const UV UNI_IN__13_invlist[] = { 0xFB43, 0xFB45, 0xFB46, - 0xFBC2, + 0xFBC3, 0xFBD3, - 0xFD40, - 0xFD50, 0xFD90, 0xFD92, 0xFDC8, - 0xFDD0, - 0xFDFE, - 0xFE00, + 0xFDCF, 0xFE1A, 0xFE20, 0xFE53, @@ -303957,13 +336067,33 @@ static const UV UNI_IN__13_invlist[] = { 0x10530, 0x10564, 0x1056F, - 0x10570, + 0x1057B, + 0x1057C, + 0x1058B, + 0x1058C, + 0x10593, + 0x10594, + 0x10596, + 0x10597, + 0x105A2, + 0x105A3, + 0x105B2, + 0x105B3, + 0x105BA, + 0x105BB, + 0x105BD, 0x10600, 0x10737, 0x10740, 0x10756, 0x10760, 0x10768, + 0x10780, + 0x10786, + 0x10787, + 0x107B1, + 0x107B2, + 0x107BB, 0x10800, 0x10806, 0x10808, @@ -304050,6 +336180,8 @@ static const UV UNI_IN__13_invlist[] = { 0x10F28, 0x10F30, 0x10F5A, + 0x10F70, + 0x10F8A, 0x10FB0, 0x10FCC, 0x10FE0, @@ -304057,9 +336189,9 @@ static const UV UNI_IN__13_invlist[] = { 0x11000, 0x1104E, 0x11052, - 0x11070, + 0x11076, 0x1107F, - 0x110C2, + 0x110C3, 0x110CD, 0x110CE, 0x110D0, @@ -304143,7 +336275,7 @@ static const UV UNI_IN__13_invlist[] = { 0x11660, 0x1166D, 0x11680, - 0x116B9, + 0x116BA, 0x116C0, 0x116CA, 0x11700, @@ -304151,7 +336283,7 @@ static const UV UNI_IN__13_invlist[] = { 0x1171D, 0x1172C, 0x11730, - 0x11740, + 0x11747, 0x11800, 0x1183C, 0x118A0, @@ -304182,7 +336314,7 @@ static const UV UNI_IN__13_invlist[] = { 0x11A48, 0x11A50, 0x11AA3, - 0x11AC0, + 0x11AB0, 0x11AF9, 0x11C00, 0x11C09, @@ -304238,6 +336370,8 @@ static const UV UNI_IN__13_invlist[] = { 0x12475, 0x12480, 0x12544, + 0x12F90, + 0x12FF3, 0x13000, 0x1342F, 0x13430, @@ -304251,7 +336385,9 @@ static const UV UNI_IN__13_invlist[] = { 0x16A60, 0x16A6A, 0x16A6E, - 0x16A70, + 0x16ABF, + 0x16AC0, + 0x16ACA, 0x16AD0, 0x16AEE, 0x16AF0, @@ -304284,8 +336420,14 @@ static const UV UNI_IN__13_invlist[] = { 0x18CD6, 0x18D00, 0x18D09, + 0x1AFF0, + 0x1AFF4, + 0x1AFF5, + 0x1AFFC, + 0x1AFFD, + 0x1AFFF, 0x1B000, - 0x1B11F, + 0x1B123, 0x1B150, 0x1B153, 0x1B164, @@ -304302,12 +336444,18 @@ static const UV UNI_IN__13_invlist[] = { 0x1BC9A, 0x1BC9C, 0x1BCA4, + 0x1CF00, + 0x1CF2E, + 0x1CF30, + 0x1CF47, + 0x1CF50, + 0x1CFC4, 0x1D000, 0x1D0F6, 0x1D100, 0x1D127, 0x1D129, - 0x1D1E9, + 0x1D1EB, 0x1D200, 0x1D246, 0x1D2E0, @@ -304362,6 +336510,8 @@ static const UV UNI_IN__13_invlist[] = { 0x1DAA0, 0x1DAA1, 0x1DAB0, + 0x1DF00, + 0x1DF1F, 0x1E000, 0x1E007, 0x1E008, @@ -304380,10 +336530,20 @@ static const UV UNI_IN__13_invlist[] = { 0x1E14A, 0x1E14E, 0x1E150, + 0x1E290, + 0x1E2AF, 0x1E2C0, 0x1E2FA, 0x1E2FF, 0x1E300, + 0x1E7E0, + 0x1E7E7, + 0x1E7E8, + 0x1E7EC, + 0x1E7ED, + 0x1E7EF, + 0x1E7F0, + 0x1E7FF, 0x1E800, 0x1E8C5, 0x1E8C7, @@ -304492,7 +336652,7 @@ static const UV UNI_IN__13_invlist[] = { 0x1F266, 0x1F300, 0x1F6D8, - 0x1F6E0, + 0x1F6DD, 0x1F6ED, 0x1F6F0, 0x1F6FD, @@ -304502,6 +336662,8 @@ static const UV UNI_IN__13_invlist[] = { 0x1F7D9, 0x1F7E0, 0x1F7EC, + 0x1F7F0, + 0x1F7F1, 0x1F800, 0x1F80C, 0x1F810, @@ -304515,27 +336677,27 @@ static const UV UNI_IN__13_invlist[] = { 0x1F8B0, 0x1F8B2, 0x1F900, - 0x1F979, - 0x1F97A, - 0x1F9CC, - 0x1F9CD, 0x1FA54, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA75, 0x1FA78, - 0x1FA7B, + 0x1FA7D, 0x1FA80, 0x1FA87, 0x1FA90, - 0x1FAA9, + 0x1FAAD, 0x1FAB0, - 0x1FAB7, + 0x1FABB, 0x1FAC0, - 0x1FAC3, + 0x1FAC6, 0x1FAD0, - 0x1FAD7, + 0x1FADA, + 0x1FAE0, + 0x1FAE8, + 0x1FAF0, + 0x1FAF7, 0x1FB00, 0x1FB93, 0x1FB94, @@ -304543,9 +336705,9 @@ static const UV UNI_IN__13_invlist[] = { 0x1FBF0, 0x1FBFA, 0x1FFFE, - 0x2A6DE, + 0x2A6E0, 0x2A700, - 0x2B735, + 0x2B739, 0x2B740, 0x2B81E, 0x2B820, @@ -304588,8 +336750,8 @@ static const UV UNI_IN__13_invlist[] = { 0x110000 }; -static const UV UNI_IN__14_invlist[] = { /* for all charsets */ - 1412, /* Number of elements */ +static const UV UNI_IN__15_invlist[] = { /* for all charsets */ + 1430, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -304836,7 +336998,7 @@ static const UV UNI_IN__14_invlist[] = { 0xCE6, 0xCF0, 0xCF1, - 0xCF3, + 0xCF4, 0xD00, 0xD0D, 0xD0E, @@ -304896,7 +337058,7 @@ static const UV UNI_IN__14_invlist[] = { 0xEC6, 0xEC7, 0xEC8, - 0xECE, + 0xECF, 0xED0, 0xEDA, 0xEDC, @@ -305433,7 +337595,7 @@ static const UV UNI_IN__14_invlist[] = { 0x10EAE, 0x10EB0, 0x10EB2, - 0x10F00, + 0x10EFD, 0x10F28, 0x10F30, 0x10F5A, @@ -305468,7 +337630,7 @@ static const UV UNI_IN__14_invlist[] = { 0x11200, 0x11212, 0x11213, - 0x1123F, + 0x11242, 0x11280, 0x11287, 0x11288, @@ -305573,6 +337735,8 @@ static const UV UNI_IN__14_invlist[] = { 0x11AA3, 0x11AB0, 0x11AF9, + 0x11B00, + 0x11B0A, 0x11C00, 0x11C09, 0x11C0A, @@ -305615,6 +337779,12 @@ static const UV UNI_IN__14_invlist[] = { 0x11DAA, 0x11EE0, 0x11EF9, + 0x11F00, + 0x11F11, + 0x11F12, + 0x11F3B, + 0x11F3E, + 0x11F5A, 0x11FB0, 0x11FB1, 0x11FC0, @@ -305630,9 +337800,7 @@ static const UV UNI_IN__14_invlist[] = { 0x12F90, 0x12FF3, 0x13000, - 0x1342F, - 0x13430, - 0x13439, + 0x13456, 0x14400, 0x14647, 0x16800, @@ -305685,8 +337853,12 @@ static const UV UNI_IN__14_invlist[] = { 0x1AFFF, 0x1B000, 0x1B123, + 0x1B132, + 0x1B133, 0x1B150, 0x1B153, + 0x1B155, + 0x1B156, 0x1B164, 0x1B168, 0x1B170, @@ -305715,6 +337887,8 @@ static const UV UNI_IN__14_invlist[] = { 0x1D1EB, 0x1D200, 0x1D246, + 0x1D2C0, + 0x1D2D4, 0x1D2E0, 0x1D2F4, 0x1D300, @@ -305769,6 +337943,8 @@ static const UV UNI_IN__14_invlist[] = { 0x1DAB0, 0x1DF00, 0x1DF1F, + 0x1DF25, + 0x1DF2B, 0x1E000, 0x1E007, 0x1E008, @@ -305779,6 +337955,10 @@ static const UV UNI_IN__14_invlist[] = { 0x1E025, 0x1E026, 0x1E02B, + 0x1E030, + 0x1E06E, + 0x1E08F, + 0x1E090, 0x1E100, 0x1E12D, 0x1E130, @@ -305793,6 +337973,8 @@ static const UV UNI_IN__14_invlist[] = { 0x1E2FA, 0x1E2FF, 0x1E300, + 0x1E4D0, + 0x1E4FA, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -305909,14 +338091,14 @@ static const UV UNI_IN__14_invlist[] = { 0x1F266, 0x1F300, 0x1F6D8, - 0x1F6DD, + 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F774, - 0x1F780, - 0x1F7D9, + 0x1F777, + 0x1F77B, + 0x1F7DA, 0x1F7E0, 0x1F7EC, 0x1F7F0, @@ -305938,23 +338120,19 @@ static const UV UNI_IN__14_invlist[] = { 0x1FA60, 0x1FA6E, 0x1FA70, - 0x1FA75, - 0x1FA78, 0x1FA7D, 0x1FA80, - 0x1FA87, + 0x1FA89, 0x1FA90, - 0x1FAAD, - 0x1FAB0, - 0x1FABB, - 0x1FAC0, + 0x1FABE, + 0x1FABF, 0x1FAC6, - 0x1FAD0, - 0x1FADA, + 0x1FACE, + 0x1FADC, 0x1FAE0, - 0x1FAE8, + 0x1FAE9, 0x1FAF0, - 0x1FAF7, + 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, @@ -305964,7 +338142,7 @@ static const UV UNI_IN__14_invlist[] = { 0x1FFFE, 0x2A6E0, 0x2A700, - 0x2B739, + 0x2B73A, 0x2B740, 0x2B81E, 0x2B820, @@ -305975,6 +338153,8 @@ static const UV UNI_IN__14_invlist[] = { 0x2FA1E, 0x2FFFE, 0x3134B, + 0x31350, + 0x323B0, 0x3FFFE, 0x40000, 0x4FFFE, @@ -306007,7 +338187,7 @@ static const UV UNI_IN__14_invlist[] = { 0x110000 }; -static const UV UNI_IN__15_invlist[] = { /* for all charsets */ +static const UV UNI_IN__15_DOT_1_invlist[] = { /* for all charsets */ 1430, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; @@ -306551,8 +338731,6 @@ static const UV UNI_IN__15_invlist[] = { 0x2F00, 0x2FD6, 0x2FF0, - 0x2FFC, - 0x3000, 0x3040, 0x3041, 0x3097, @@ -306564,7 +338742,7 @@ static const UV UNI_IN__15_invlist[] = { 0x318F, 0x3190, 0x31E4, - 0x31F0, + 0x31EF, 0x321F, 0x3220, 0xA48D, @@ -307406,6 +339584,8 @@ static const UV UNI_IN__15_invlist[] = { 0x2CEA2, 0x2CEB0, 0x2EBE1, + 0x2EBF0, + 0x2EE5E, 0x2F800, 0x2FA1E, 0x2FFFE, @@ -307444,8 +339624,8 @@ static const UV UNI_IN__15_invlist[] = { 0x110000 }; -static const UV UNI_IN__15_DOT_1_invlist[] = { /* for all charsets */ - 1430, /* Number of elements */ +static const UV UNI_IN__16_invlist[] = { /* for all charsets */ + 1478, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -307495,7 +339675,7 @@ static const UV UNI_IN__15_DOT_1_invlist 0x88F, 0x890, 0x892, - 0x898, + 0x897, 0x984, 0x985, 0x98D, @@ -307879,16 +340059,14 @@ static const UV UNI_IN__15_DOT_1_invlist 0x1ACF, 0x1B00, 0x1B4D, - 0x1B50, - 0x1B7F, - 0x1B80, + 0x1B4E, 0x1BF4, 0x1BFC, 0x1C38, 0x1C3B, 0x1C4A, 0x1C4D, - 0x1C89, + 0x1C8B, 0x1C90, 0x1CBB, 0x1CBD, @@ -307942,7 +340120,7 @@ static const UV UNI_IN__15_DOT_1_invlist 0x2100, 0x218C, 0x2190, - 0x2427, + 0x242A, 0x2440, 0x244B, 0x2460, @@ -307998,7 +340176,7 @@ static const UV UNI_IN__15_DOT_1_invlist 0x3131, 0x318F, 0x3190, - 0x31E4, + 0x31E6, 0x31EF, 0x321F, 0x3220, @@ -308010,13 +340188,13 @@ static const UV UNI_IN__15_DOT_1_invlist 0xA640, 0xA6F8, 0xA700, - 0xA7CB, + 0xA7CE, 0xA7D0, 0xA7D2, 0xA7D3, 0xA7D4, 0xA7D5, - 0xA7DA, + 0xA7DD, 0xA7F2, 0xA82D, 0xA830, @@ -308193,6 +340371,8 @@ static const UV UNI_IN__15_DOT_1_invlist 0x105BA, 0x105BB, 0x105BD, + 0x105C0, + 0x105F4, 0x10600, 0x10737, 0x10740, @@ -308279,6 +340459,12 @@ static const UV UNI_IN__15_DOT_1_invlist 0x10D28, 0x10D30, 0x10D3A, + 0x10D40, + 0x10D66, + 0x10D69, + 0x10D86, + 0x10D8E, + 0x10D90, 0x10E60, 0x10E7F, 0x10E80, @@ -308287,7 +340473,9 @@ static const UV UNI_IN__15_DOT_1_invlist 0x10EAE, 0x10EB0, 0x10EB2, - 0x10EFD, + 0x10EC2, + 0x10EC5, + 0x10EFC, 0x10F28, 0x10F30, 0x10F5A, @@ -308367,6 +340555,28 @@ static const UV UNI_IN__15_DOT_1_invlist 0x1136D, 0x11370, 0x11375, + 0x11380, + 0x1138A, + 0x1138B, + 0x1138C, + 0x1138E, + 0x1138F, + 0x11390, + 0x113B6, + 0x113B7, + 0x113C1, + 0x113C2, + 0x113C3, + 0x113C5, + 0x113C6, + 0x113C7, + 0x113CB, + 0x113CC, + 0x113D6, + 0x113D7, + 0x113D9, + 0x113E1, + 0x113E3, 0x11400, 0x1145C, 0x1145D, @@ -308389,6 +340599,8 @@ static const UV UNI_IN__15_DOT_1_invlist 0x116BA, 0x116C0, 0x116CA, + 0x116D0, + 0x116E4, 0x11700, 0x1171B, 0x1171D, @@ -308429,6 +340641,10 @@ static const UV UNI_IN__15_DOT_1_invlist 0x11AF9, 0x11B00, 0x11B0A, + 0x11BC0, + 0x11BE2, + 0x11BF0, + 0x11BFA, 0x11C00, 0x11C09, 0x11C0A, @@ -308476,7 +340692,7 @@ static const UV UNI_IN__15_DOT_1_invlist 0x11F12, 0x11F3B, 0x11F3E, - 0x11F5A, + 0x11F5B, 0x11FB0, 0x11FB1, 0x11FC0, @@ -308493,8 +340709,12 @@ static const UV UNI_IN__15_DOT_1_invlist 0x12FF3, 0x13000, 0x13456, + 0x13460, + 0x143FB, 0x14400, 0x14647, + 0x16100, + 0x1613A, 0x16800, 0x16A39, 0x16A40, @@ -308519,6 +340739,8 @@ static const UV UNI_IN__15_DOT_1_invlist 0x16B78, 0x16B7D, 0x16B90, + 0x16D40, + 0x16D7A, 0x16E40, 0x16E9B, 0x16F00, @@ -308535,7 +340757,7 @@ static const UV UNI_IN__15_DOT_1_invlist 0x187F8, 0x18800, 0x18CD6, - 0x18D00, + 0x18CFF, 0x18D09, 0x1AFF0, 0x1AFF4, @@ -308565,6 +340787,10 @@ static const UV UNI_IN__15_DOT_1_invlist 0x1BC9A, 0x1BC9C, 0x1BCA4, + 0x1CC00, + 0x1CCFA, + 0x1CD00, + 0x1CEB4, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -308667,6 +340893,10 @@ static const UV UNI_IN__15_DOT_1_invlist 0x1E300, 0x1E4D0, 0x1E4FA, + 0x1E5D0, + 0x1E5FB, + 0x1E5FF, + 0x1E600, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -308806,7 +341036,9 @@ static const UV UNI_IN__15_DOT_1_invlist 0x1F890, 0x1F8AE, 0x1F8B0, - 0x1F8B2, + 0x1F8BC, + 0x1F8C0, + 0x1F8C2, 0x1F900, 0x1FA54, 0x1FA60, @@ -308814,22 +341046,18 @@ static const UV UNI_IN__15_DOT_1_invlist 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA89, - 0x1FA90, - 0x1FABE, - 0x1FABF, - 0x1FAC6, + 0x1FA8A, + 0x1FA8F, + 0x1FAC7, 0x1FACE, - 0x1FADC, - 0x1FAE0, - 0x1FAE9, + 0x1FADD, + 0x1FADF, + 0x1FAEA, 0x1FAF0, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBCB, - 0x1FBF0, 0x1FBFA, 0x1FFFE, 0x2A6E0, @@ -308881,8 +341109,8 @@ static const UV UNI_IN__15_DOT_1_invlist 0x110000 }; -static const UV UNI_IN__16_invlist[] = { /* for all charsets */ - 1478, /* Number of elements */ +static const UV UNI_IN__17_invlist[] = { /* for all charsets */ + 1486, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -308929,8 +341157,6 @@ static const UV UNI_IN__16_invlist[] = { 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -309098,7 +341324,7 @@ static const UV UNI_IN__16_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -309122,7 +341348,7 @@ static const UV UNI_IN__16_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -309313,7 +341539,9 @@ static const UV UNI_IN__16_invlist[] = { 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -309371,7 +341599,7 @@ static const UV UNI_IN__16_invlist[] = { 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -309383,8 +341611,6 @@ static const UV UNI_IN__16_invlist[] = { 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -309445,14 +341671,8 @@ static const UV UNI_IN__16_invlist[] = { 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -309523,12 +341743,6 @@ static const UV UNI_IN__16_invlist[] = { 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFE1A, 0xFE20, 0xFE53, @@ -309667,7 +341881,7 @@ static const UV UNI_IN__16_invlist[] = { 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -309731,8 +341945,10 @@ static const UV UNI_IN__16_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -309898,6 +342114,8 @@ static const UV UNI_IN__16_invlist[] = { 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -309942,6 +342160,10 @@ static const UV UNI_IN__16_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -310000,6 +342222,10 @@ static const UV UNI_IN__16_invlist[] = { 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -310009,13 +342235,13 @@ static const UV UNI_IN__16_invlist[] = { 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -310045,9 +342271,13 @@ static const UV UNI_IN__16_invlist[] = { 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -310154,6 +342384,12 @@ static const UV UNI_IN__16_invlist[] = { 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -310269,14 +342505,12 @@ static const UV UNI_IN__16_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -310296,34 +342530,36 @@ static const UV UNI_IN__16_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x1FFFE, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -310333,7 +342569,7 @@ static const UV UNI_IN__16_invlist[] = { 0x2FFFE, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0x3FFFE, 0x40000, 0x4FFFE, @@ -326612,7 +358848,7 @@ static const UV UNI_IN__9_invlist[] = { }; static const UV UNI_IN__NA_invlist[] = { /* for all charsets */ - 1478, /* Number of elements */ + 1486, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -326658,9 +358894,7 @@ static const UV UNI_IN__NA_invlist[] = { 0x85F, 0x860, 0x86B, - 0x870, - 0x88F, - 0x890, + 0x870, 0x892, 0x897, 0x984, @@ -326828,7 +359062,7 @@ static const UV UNI_IN__NA_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -326852,7 +359086,7 @@ static const UV UNI_IN__NA_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -327043,7 +359277,9 @@ static const UV UNI_IN__NA_invlist[] = { 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -327101,7 +359337,7 @@ static const UV UNI_IN__NA_invlist[] = { 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -327113,8 +359349,6 @@ static const UV UNI_IN__NA_invlist[] = { 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -327175,14 +359409,8 @@ static const UV UNI_IN__NA_invlist[] = { 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -327253,12 +359481,6 @@ static const UV UNI_IN__NA_invlist[] = { 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFE1A, 0xFE20, 0xFE53, @@ -327397,7 +359619,7 @@ static const UV UNI_IN__NA_invlist[] = { 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -327461,8 +359683,10 @@ static const UV UNI_IN__NA_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -327628,6 +359852,8 @@ static const UV UNI_IN__NA_invlist[] = { 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -327672,6 +359898,10 @@ static const UV UNI_IN__NA_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -327730,6 +359960,10 @@ static const UV UNI_IN__NA_invlist[] = { 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -327739,13 +359973,13 @@ static const UV UNI_IN__NA_invlist[] = { 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -327775,9 +360009,13 @@ static const UV UNI_IN__NA_invlist[] = { 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -327884,6 +360122,12 @@ static const UV UNI_IN__NA_invlist[] = { 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -327999,14 +360243,12 @@ static const UV UNI_IN__NA_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -328026,34 +360268,36 @@ static const UV UNI_IN__NA_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x1FFFE, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -328063,7 +360307,7 @@ static const UV UNI_IN__NA_invlist[] = { 0x2FFFE, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0x3FFFE, 0x40000, 0x4FFFE, @@ -328206,6 +360450,16 @@ static const UV UNI_INBENGALI_invlist[] 0xA00 }; +static const UV UNI_INBERIAERFE_invlist[] = { /* for all charsets */ + 3, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x16EA0, + 0x16EE0 +}; + static const UV UNI_INBHAIKSUKI_invlist[] = { /* for all charsets */ 3, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -328277,7 +360531,7 @@ static const UV UNI_INCAUCASIANALBANIAN_ }; static const UV UNI_INCB__CONSONANT_invlist[] = { /* for all charsets */ - 53, /* Number of elements */ + 153, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -328333,11 +360587,111 @@ static const UV UNI_INCB__CONSONANT_invl 0xC58, 0xC5B, 0xD15, - 0xD3B + 0xD3B, + 0x1000, + 0x102B, + 0x103F, + 0x1040, + 0x1050, + 0x1056, + 0x105A, + 0x105E, + 0x1061, + 0x1062, + 0x1065, + 0x1067, + 0x106E, + 0x1071, + 0x1075, + 0x1082, + 0x108E, + 0x108F, + 0x1780, + 0x17B4, + 0x1A20, + 0x1A55, + 0x1B0B, + 0x1B0D, + 0x1B13, + 0x1B34, + 0x1B45, + 0x1B4D, + 0x1B83, + 0x1BA1, + 0x1BAE, + 0x1BB0, + 0x1BBB, + 0x1BBE, + 0xA989, + 0xA98C, + 0xA98F, + 0xA9B3, + 0xA9E0, + 0xA9E5, + 0xA9E7, + 0xA9F0, + 0xA9FA, + 0xA9FF, + 0xAA60, + 0xAA70, + 0xAA71, + 0xAA74, + 0xAA7A, + 0xAA7B, + 0xAA7E, + 0xAA80, + 0xAAE0, + 0xAAEB, + 0xABC0, + 0xABDB, + 0x10A00, + 0x10A01, + 0x10A10, + 0x10A14, + 0x10A15, + 0x10A18, + 0x10A19, + 0x10A36, + 0x11103, + 0x11127, + 0x11144, + 0x11145, + 0x11147, + 0x11148, + 0x11380, + 0x1138A, + 0x1138B, + 0x1138C, + 0x1138E, + 0x1138F, + 0x11390, + 0x113B6, + 0x11900, + 0x11907, + 0x11909, + 0x1190A, + 0x1190C, + 0x11914, + 0x11915, + 0x11917, + 0x11918, + 0x11930, + 0x11A00, + 0x11A01, + 0x11A0B, + 0x11A33, + 0x11A50, + 0x11A51, + 0x11A5C, + 0x11A84, + 0x11F04, + 0x11F11, + 0x11F12, + 0x11F34 }; static const UV UNI_INCB__EXTEND_invlist[] = { /* for all charsets */ - 743, /* Number of elements */ + 755, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -328562,7 +360916,7 @@ static const UV UNI_INCB__EXTEND_invlist 0x1031, 0x1032, 0x1038, - 0x1039, + 0x103A, 0x103B, 0x103D, 0x103F, @@ -328597,6 +360951,8 @@ static const UV UNI_INCB__EXTEND_invlist 0x17C6, 0x17C7, 0x17C9, + 0x17D2, + 0x17D3, 0x17D4, 0x17DD, 0x17DE, @@ -328624,8 +360980,6 @@ static const UV UNI_INCB__EXTEND_invlist 0x1A57, 0x1A58, 0x1A5F, - 0x1A60, - 0x1A61, 0x1A62, 0x1A63, 0x1A65, @@ -328635,13 +360989,15 @@ static const UV UNI_INCB__EXTEND_invlist 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, 0x1B3E, 0x1B42, - 0x1B45, + 0x1B44, 0x1B6B, 0x1B74, 0x1B80, @@ -328649,6 +361005,8 @@ static const UV UNI_INCB__EXTEND_invlist 0x1BA2, 0x1BA6, 0x1BA8, + 0x1BAB, + 0x1BAC, 0x1BAE, 0x1BE6, 0x1BE7, @@ -328728,8 +361086,6 @@ static const UV UNI_INCB__EXTEND_invlist 0xA9BA, 0xA9BC, 0xA9BE, - 0xA9C0, - 0xA9C1, 0xA9E5, 0xA9E6, 0xAA29, @@ -328756,8 +361112,6 @@ static const UV UNI_INCB__EXTEND_invlist 0xAAC2, 0xAAEC, 0xAAEE, - 0xAAF6, - 0xAAF7, 0xABE5, 0xABE6, 0xABE8, @@ -328786,8 +361140,6 @@ static const UV UNI_INCB__EXTEND_invlist 0x10A10, 0x10A38, 0x10A3B, - 0x10A3F, - 0x10A40, 0x10AE5, 0x10AE7, 0x10D24, @@ -328796,7 +361148,7 @@ static const UV UNI_INCB__EXTEND_invlist 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -328823,6 +361175,8 @@ static const UV UNI_INCB__EXTEND_invlist 0x11127, 0x1112C, 0x1112D, + 0x11133, + 0x11134, 0x11135, 0x11173, 0x11174, @@ -328875,7 +361229,7 @@ static const UV UNI_INCB__EXTEND_invlist 0x113C7, 0x113CA, 0x113CE, - 0x113D1, + 0x113D0, 0x113D2, 0x113D3, 0x113E1, @@ -328937,7 +361291,7 @@ static const UV UNI_INCB__EXTEND_invlist 0x11930, 0x11931, 0x1193B, - 0x1193F, + 0x1193E, 0x11943, 0x11944, 0x119D4, @@ -328952,8 +361306,6 @@ static const UV UNI_INCB__EXTEND_invlist 0x11A39, 0x11A3B, 0x11A3F, - 0x11A47, - 0x11A48, 0x11A51, 0x11A57, 0x11A59, @@ -328961,7 +361313,13 @@ static const UV UNI_INCB__EXTEND_invlist 0x11A8A, 0x11A97, 0x11A98, - 0x11A9A, + 0x11A99, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -328999,7 +361357,7 @@ static const UV UNI_INCB__EXTEND_invlist 0x11F36, 0x11F3B, 0x11F40, - 0x11F43, + 0x11F42, 0x11F5A, 0x11F5B, 0x13440, @@ -329074,6 +361432,14 @@ static const UV UNI_INCB__EXTEND_invlist 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -329087,7 +361453,7 @@ static const UV UNI_INCB__EXTEND_invlist }; static const UV UNI_INCB__LINKER_invlist[] = { /* for all charsets */ - 13, /* Number of elements */ + 41, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -329103,11 +361469,39 @@ static const UV UNI_INCB__LINKER_invlist 0xC4D, 0xC4E, 0xD4D, - 0xD4E + 0xD4E, + 0x1039, + 0x103A, + 0x17D2, + 0x17D3, + 0x1A60, + 0x1A61, + 0x1B44, + 0x1B45, + 0x1BAB, + 0x1BAC, + 0xA9C0, + 0xA9C1, + 0xAAF6, + 0xAAF7, + 0x10A3F, + 0x10A40, + 0x11133, + 0x11134, + 0x113D0, + 0x113D1, + 0x1193E, + 0x1193F, + 0x11A47, + 0x11A48, + 0x11A99, + 0x11A9A, + 0x11F42, + 0x11F43 }; static const UV UNI_INCB__NONE_invlist[] = { /* for all charsets */ - 797, /* Number of elements */ + 865, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -329382,6 +361776,8 @@ static const UV UNI_INCB__NONE_invlist[] 0xFBD, 0xFC6, 0xFC7, + 0x1000, + 0x102B, 0x102D, 0x1031, 0x1032, @@ -329389,19 +361785,19 @@ static const UV UNI_INCB__NONE_invlist[] 0x1039, 0x103B, 0x103D, - 0x103F, + 0x1040, + 0x1050, + 0x1056, 0x1058, - 0x105A, - 0x105E, - 0x1061, - 0x1071, - 0x1075, - 0x1082, + 0x1062, + 0x1065, + 0x1067, + 0x106E, 0x1083, 0x1085, 0x1087, 0x108D, - 0x108E, + 0x108F, 0x109D, 0x109E, 0x135D, @@ -329414,7 +361810,7 @@ static const UV UNI_INCB__NONE_invlist[] 0x1754, 0x1772, 0x1774, - 0x17B4, + 0x1780, 0x17B6, 0x17B7, 0x17BE, @@ -329444,6 +361840,8 @@ static const UV UNI_INCB__NONE_invlist[] 0x1A19, 0x1A1B, 0x1A1C, + 0x1A20, + 0x1A55, 0x1A56, 0x1A57, 0x1A58, @@ -329459,21 +361857,29 @@ static const UV UNI_INCB__NONE_invlist[] 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, - 0x1B34, + 0x1B0B, + 0x1B0D, + 0x1B13, 0x1B3E, 0x1B42, - 0x1B45, + 0x1B4D, 0x1B6B, 0x1B74, 0x1B80, 0x1B82, + 0x1B83, + 0x1BA1, 0x1BA2, 0x1BA6, 0x1BA8, - 0x1BAE, + 0x1BB0, + 0x1BBB, + 0x1BBE, 0x1BE6, 0x1BE7, 0x1BE8, @@ -329546,7 +361952,9 @@ static const UV UNI_INCB__NONE_invlist[] 0xA954, 0xA980, 0xA983, - 0xA9B3, + 0xA989, + 0xA98C, + 0xA98F, 0xA9B4, 0xA9B6, 0xA9BA, @@ -329554,8 +361962,12 @@ static const UV UNI_INCB__NONE_invlist[] 0xA9BE, 0xA9C0, 0xA9C1, - 0xA9E5, + 0xA9E0, 0xA9E6, + 0xA9E7, + 0xA9F0, + 0xA9FA, + 0xA9FF, 0xAA29, 0xAA2F, 0xAA31, @@ -329566,8 +361978,16 @@ static const UV UNI_INCB__NONE_invlist[] 0xAA44, 0xAA4C, 0xAA4D, + 0xAA60, + 0xAA70, + 0xAA71, + 0xAA74, + 0xAA7A, + 0xAA7B, 0xAA7C, 0xAA7D, + 0xAA7E, + 0xAA80, 0xAAB0, 0xAAB1, 0xAAB2, @@ -329578,10 +361998,14 @@ static const UV UNI_INCB__NONE_invlist[] 0xAAC0, 0xAAC1, 0xAAC2, + 0xAAE0, + 0xAAEB, 0xAAEC, 0xAAEE, 0xAAF6, 0xAAF7, + 0xABC0, + 0xABDB, 0xABE5, 0xABE6, 0xABE8, @@ -329602,12 +362026,16 @@ static const UV UNI_INCB__NONE_invlist[] 0x102E1, 0x10376, 0x1037B, - 0x10A01, + 0x10A00, 0x10A04, 0x10A05, 0x10A07, 0x10A0C, - 0x10A10, + 0x10A14, + 0x10A15, + 0x10A18, + 0x10A19, + 0x10A36, 0x10A38, 0x10A3B, 0x10A3F, @@ -329620,7 +362048,7 @@ static const UV UNI_INCB__NONE_invlist[] 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -329643,11 +362071,13 @@ static const UV UNI_INCB__NONE_invlist[] 0x110C2, 0x110C3, 0x11100, - 0x11103, - 0x11127, 0x1112C, 0x1112D, 0x11135, + 0x11144, + 0x11145, + 0x11147, + 0x11148, 0x11173, 0x11174, 0x11180, @@ -329688,6 +362118,14 @@ static const UV UNI_INCB__NONE_invlist[] 0x1136D, 0x11370, 0x11375, + 0x11380, + 0x1138A, + 0x1138B, + 0x1138C, + 0x1138E, + 0x1138F, + 0x11390, + 0x113B6, 0x113B8, 0x113B9, 0x113BB, @@ -329758,7 +362196,15 @@ static const UV UNI_INCB__NONE_invlist[] 0x11838, 0x11839, 0x1183B, - 0x11930, + 0x11900, + 0x11907, + 0x11909, + 0x1190A, + 0x1190C, + 0x11914, + 0x11915, + 0x11917, + 0x11918, 0x11931, 0x1193B, 0x1193F, @@ -329770,22 +362216,26 @@ static const UV UNI_INCB__NONE_invlist[] 0x119DC, 0x119E0, 0x119E1, - 0x11A01, - 0x11A0B, - 0x11A33, + 0x11A00, 0x11A39, 0x11A3B, 0x11A3F, 0x11A47, 0x11A48, - 0x11A51, + 0x11A50, 0x11A57, 0x11A59, - 0x11A5C, + 0x11A84, 0x11A8A, 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -329820,6 +362270,10 @@ static const UV UNI_INCB__NONE_invlist[] 0x11EF5, 0x11F00, 0x11F02, + 0x11F04, + 0x11F11, + 0x11F12, + 0x11F34, 0x11F36, 0x11F3B, 0x11F40, @@ -329898,6 +362352,14 @@ static const UV UNI_INCB__NONE_invlist[] 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -330861,7 +363323,7 @@ static const UV UNI_INPAUCINHAU_invlist[ }; static const UV UNI_INPC__BOTTOM_invlist[] = { /* for all charsets */ - 303, /* Number of elements */ + 305, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -331144,6 +363606,8 @@ static const UV UNI_INPC__BOTTOM_invlist 0x11A5C, 0x11A8A, 0x11A96, + 0x11B62, + 0x11B64, 0x11C32, 0x11C37, 0x11C3F, @@ -331345,7 +363809,7 @@ static const UV UNI_INPC__LEFTANDRIGHT_i }; static const UV UNI_INPC__NA_invlist[] = { /* for all charsets */ - 463, /* Number of elements */ + 467, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -331767,11 +364231,15 @@ static const UV UNI_INPC__NA_invlist[] = 0x11A01, 0x11A0B, 0x11A33, + 0x11A3A, + 0x11A3B, 0x11A3F, 0x11A51, 0x11A5C, 0x11A84, 0x11A99, + 0x11B60, + 0x11B68, 0x11C2F, 0x11C37, 0x11C38, @@ -331831,7 +364299,7 @@ static const UV UNI_INPC__OVERSTRUCK_inv }; static const UV UNI_INPC__RIGHT_invlist[] = { /* for all charsets */ - 355, /* Number of elements */ + 361, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -332160,6 +364628,12 @@ static const UV UNI_INPC__RIGHT_invlist[ 0x11A59, 0x11A97, 0x11A98, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, + 0x11B68, 0x11C2F, 0x11C30, 0x11C3E, @@ -332193,7 +364667,7 @@ static const UV UNI_INPC__RIGHT_invlist[ }; static const UV UNI_INPC__TOP_invlist[] = { /* for all charsets */ - 411, /* Number of elements */ + 415, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -332560,8 +365034,6 @@ static const UV UNI_INPC__TOP_invlist[] 0x11A0A, 0x11A35, 0x11A39, - 0x11A3A, - 0x11A3B, 0x11A51, 0x11A52, 0x11A54, @@ -332572,6 +365044,12 @@ static const UV UNI_INPC__TOP_invlist[] 0x11A97, 0x11A98, 0x11A99, + 0x11B60, + 0x11B61, + 0x11B64, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C32, 0x11C38, @@ -333019,7 +365497,7 @@ static const UV UNI_INSC__CANTILLATIONMA }; static const UV UNI_INSC__CONSONANT_invlist[] = { /* for all charsets */ - 321, /* Number of elements */ + 325, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -333172,7 +365650,7 @@ static const UV UNI_INSC__CONSONANT_invl 0x1771, 0x1780, 0x17A3, - 0x1901, + 0x1900, 0x191F, 0x1950, 0x1963, @@ -333324,8 +365802,12 @@ static const UV UNI_INSC__CONSONANT_invl 0x11930, 0x119AE, 0x119D1, + 0x11A00, + 0x11A01, 0x11A0B, 0x11A33, + 0x11A50, + 0x11A51, 0x11A5C, 0x11A84, 0x11C0E, @@ -333477,7 +365959,7 @@ static const UV UNI_INSC__CONSONANTMEDIA # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for ASCII/Latin1 */ - 31, /* Number of elements */ + 29, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -333496,8 +365978,6 @@ static const UV UNI_INSC__CONSONANTPLACE 0x104C, 0x104E, 0x104F, - 0x1900, - 0x1901, 0x1CFA, 0x1CFB, 0x2010, @@ -333522,7 +366002,7 @@ static const UV UNI_INSC__CONSONANTPLACE && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for EBCDIC 1047 */ - 31, /* Number of elements */ + 29, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -333541,8 +366021,6 @@ static const UV UNI_INSC__CONSONANTPLACE 0x104C, 0x104E, 0x104F, - 0x1900, - 0x1901, 0x1CFA, 0x1CFB, 0x2010, @@ -333567,7 +366045,7 @@ static const UV UNI_INSC__CONSONANTPLACE && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_INSC__CONSONANTPLACEHOLDER_invlist[] = { /* for EBCDIC 037 */ - 31, /* Number of elements */ + 29, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -333586,8 +366064,6 @@ static const UV UNI_INSC__CONSONANTPLACE 0x104C, 0x104E, 0x104F, - 0x1900, - 0x1901, 0x1CFA, 0x1CFB, 0x2010, @@ -333607,7 +366083,7 @@ static const UV UNI_INSC__CONSONANTPLACE # endif /* EBCDIC 037 */ static const UV UNI_INSC__CONSONANTPRECEDINGREPHA_invlist[] = { /* for all charsets */ - 11, /* Number of elements */ + 13, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -333618,6 +366094,8 @@ static const UV UNI_INSC__CONSONANTPRECE 0x113D2, 0x11941, 0x11942, + 0x11A86, + 0x11A87, 0x11D46, 0x11D47, 0x11F02, @@ -333634,9 +366112,9 @@ static const UV UNI_INSC__CONSONANTPREFI 0x111C4, 0x1193F, 0x11940, - 0x11A3A, - 0x11A3B, 0x11A84, + 0x11A86, + 0x11A87, 0x11A8A }; @@ -333683,7 +366161,7 @@ static const UV UNI_INSC__CONSONANTSUCCE }; static const UV UNI_INSC__CONSONANTWITHSTACKER_invlist[] = { /* for all charsets */ - 9, /* Number of elements */ + 11, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -333695,7 +366173,9 @@ static const UV UNI_INSC__CONSONANTWITHS 0x11003, 0x11005, 0x11460, - 0x11462 + 0x11462, + 0x11A3A, + 0x11A3B }; static const UV UNI_INSC__GEMINATIONMARK_invlist[] = { /* for all charsets */ @@ -334185,7 +366665,7 @@ static const UV UNI_INSC__NUMBERJOINER_i # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_INSC__OTHER_invlist[] = { /* for ASCII/Latin1 */ - 683, /* Number of elements */ + 685, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -334816,6 +367296,8 @@ static const UV UNI_INSC__OTHER_invlist[ 0x11A9A, 0x11A9D, 0x11A9E, + 0x11B60, + 0x11B68, 0x11C00, 0x11C09, 0x11C0A, @@ -334882,7 +367364,7 @@ static const UV UNI_INSC__OTHER_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_INSC__OTHER_invlist[] = { /* for EBCDIC 1047 */ - 683, /* Number of elements */ + 685, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -335513,6 +367995,8 @@ static const UV UNI_INSC__OTHER_invlist[ 0x11A9A, 0x11A9D, 0x11A9E, + 0x11B60, + 0x11B68, 0x11C00, 0x11C09, 0x11C0A, @@ -335579,7 +368063,7 @@ static const UV UNI_INSC__OTHER_invlist[ && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_INSC__OTHER_invlist[] = { /* for EBCDIC 037 */ - 683, /* Number of elements */ + 685, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -336210,6 +368694,8 @@ static const UV UNI_INSC__OTHER_invlist[ 0x11A9A, 0x11A9D, 0x11A9E, + 0x11B60, + 0x11B68, 0x11C00, 0x11C09, 0x11C0A, @@ -336721,7 +369207,7 @@ static const UV UNI_INSC__VOWEL_invlist[ }; static const UV UNI_INSC__VOWELDEPENDENT_invlist[] = { /* for all charsets */ - 287, /* Number of elements */ + 289, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -336980,6 +369466,8 @@ static const UV UNI_INSC__VOWELDEPENDENT 0x11A0B, 0x11A51, 0x11A5C, + 0x11B60, + 0x11B68, 0x11C2F, 0x11C37, 0x11C38, @@ -337015,7 +369503,7 @@ static const UV UNI_INSC__VOWELDEPENDENT }; static const UV UNI_INSC__VOWELINDEPENDENT_invlist[] = { /* for all charsets */ - 191, /* Number of elements */ + 187, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -337186,10 +369674,6 @@ static const UV UNI_INSC__VOWELINDEPENDE 0x119A8, 0x119AA, 0x119AE, - 0x11A00, - 0x11A01, - 0x11A50, - 0x11A51, 0x11C00, 0x11C09, 0x11C0A, @@ -337212,6 +369696,16 @@ static const UV UNI_INSC__VOWELINDEPENDE 0x16101 }; +static const UV UNI_INSHARADA_invlist[] = { /* for all charsets */ + 3, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x11180, + 0x111E0 +}; + static const UV UNI_INSIDDHAM_invlist[] = { /* for all charsets */ 3, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -337222,6 +369716,16 @@ static const UV UNI_INSIDDHAM_invlist[] 0x11600 }; +static const UV UNI_INSIDETIC_invlist[] = { /* for all charsets */ + 3, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x10940, + 0x10960 +}; + static const UV UNI_INSINHALA_invlist[] = { /* for all charsets */ 3, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -337352,6 +369856,16 @@ static const UV UNI_INTAIVIET_invlist[] 0xAAE0 }; +static const UV UNI_INTAIYO_invlist[] = { /* for all charsets */ + 3, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x1E6C0, + 0x1E700 +}; + static const UV UNI_INTAKRI_invlist[] = { /* for all charsets */ 3, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -337462,6 +369976,16 @@ static const UV UNI_INTODHRI_invlist[] = 0x10600 }; +static const UV UNI_INTOLONGSIKI_invlist[] = { /* for all charsets */ + 3, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x11DB0, + 0x11DF0 +}; + static const UV UNI_INTOTO_invlist[] = { /* for all charsets */ 3, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -338495,7 +371019,7 @@ static const UV UNI_JG__MIM_invlist[] = }; static const UV UNI_JG__NOJOININGGROUP_invlist[] = { /* for all charsets */ - 67, /* Number of elements */ + 69, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -338533,7 +371057,7 @@ static const UV UNI_JG__NOJOININGGROUP_i 0x886, 0x887, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8AD, 0x8AE, @@ -338565,11 +371089,13 @@ static const UV UNI_JG__NOJOININGGROUP_i 0x10D23, 0x10D24, 0x10EC2, - 0x10EC5 + 0x10EC5, + 0x10EC6, + 0x10EC8 }; static const UV UNI_JG__NOON_invlist[] = { /* for all charsets */ - 9, /* Number of elements */ + 11, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -338581,7 +371107,9 @@ static const UV UNI_JG__NOON_invlist[] = 0x767, 0x76A, 0x889, - 0x88A + 0x88A, + 0x88F, + 0x890 }; static const UV UNI_JG__NUN_invlist[] = { /* for all charsets */ @@ -338838,6 +371366,16 @@ static const UV UNI_JG__TETH_invlist[] = 0x71D }; +static const UV UNI_JG__THINNOON_invlist[] = { /* for all charsets */ + 3, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x10EC6, + 0x10EC7 +}; + static const UV UNI_JG__THINYEH_invlist[] = { /* for all charsets */ 3, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -338881,7 +371419,7 @@ static const UV UNI_JG__WAW_invlist[] = }; static const UV UNI_JG__YEH_invlist[] = { /* for all charsets */ - 15, /* Number of elements */ + 17, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -338899,7 +371437,9 @@ static const UV UNI_JG__YEH_invlist[] = 0x8A8, 0x8AA, 0x8BA, - 0x8BB + 0x8BB, + 0x10EC7, + 0x10EC8 }; static const UV UNI_JG__YEHBARREE_invlist[] = { /* for all charsets */ @@ -338991,7 +371531,7 @@ static const UV UNI_JT__C_invlist[] = { }; static const UV UNI_JT__D_invlist[] = { /* for all charsets */ - 153, /* Number of elements */ + 157, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -339072,6 +371612,8 @@ static const UV UNI_JT__D_invlist[] = { 0x887, 0x889, 0x88E, + 0x88F, + 0x890, 0x8A0, 0x8AA, 0x8AF, @@ -339120,6 +371662,8 @@ static const UV UNI_JT__D_invlist[] = { 0x10D24, 0x10EC3, 0x10EC5, + 0x10EC6, + 0x10EC8, 0x10F30, 0x10F33, 0x10F34, @@ -339311,7 +371855,7 @@ static const UV UNI_JT__R_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_JT__T_invlist[] = { /* for ASCII/Latin1 */ - 735, /* Number of elements */ + 751, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -339605,7 +372149,9 @@ static const UV UNI_JT__T_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -339778,7 +372324,7 @@ static const UV UNI_JT__T_invlist[] = { 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -339928,6 +372474,12 @@ static const UV UNI_JT__T_invlist[] = { 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -340040,6 +372592,14 @@ static const UV UNI_JT__T_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -340060,7 +372620,7 @@ static const UV UNI_JT__T_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_JT__T_invlist[] = { /* for EBCDIC 1047 */ - 735, /* Number of elements */ + 751, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -340354,7 +372914,9 @@ static const UV UNI_JT__T_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -340527,7 +373089,7 @@ static const UV UNI_JT__T_invlist[] = { 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -340677,6 +373239,12 @@ static const UV UNI_JT__T_invlist[] = { 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -340789,6 +373357,14 @@ static const UV UNI_JT__T_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -340809,7 +373385,7 @@ static const UV UNI_JT__T_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_JT__T_invlist[] = { /* for EBCDIC 037 */ - 735, /* Number of elements */ + 751, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -341103,7 +373679,9 @@ static const UV UNI_JT__T_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -341276,7 +373854,7 @@ static const UV UNI_JT__T_invlist[] = { 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -341426,6 +374004,12 @@ static const UV UNI_JT__T_invlist[] = { 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -341538,6 +374122,14 @@ static const UV UNI_JT__T_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -341555,7 +374147,7 @@ static const UV UNI_JT__T_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_JT__U_invlist[] = { /* for ASCII/Latin1 */ - 787, /* Number of elements */ + 805, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -341631,7 +374223,7 @@ static const UV UNI_JT__U_invlist[] = { 0x870, 0x887, 0x889, - 0x88F, + 0x890, 0x897, 0x8AD, 0x8AE, @@ -341871,7 +374463,9 @@ static const UV UNI_JT__U_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -342062,7 +374656,9 @@ static const UV UNI_JT__U_invlist[] = { 0x10EAD, 0x10EC2, 0x10EC5, - 0x10EFC, + 0x10EC6, + 0x10EC8, + 0x10EFA, 0x10F00, 0x10F30, 0x10F45, @@ -342224,6 +374820,12 @@ static const UV UNI_JT__U_invlist[] = { 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -342336,6 +374938,14 @@ static const UV UNI_JT__U_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E900, @@ -342356,7 +374966,7 @@ static const UV UNI_JT__U_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_JT__U_invlist[] = { /* for EBCDIC 1047 */ - 787, /* Number of elements */ + 805, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -342432,7 +375042,7 @@ static const UV UNI_JT__U_invlist[] = { 0x870, 0x887, 0x889, - 0x88F, + 0x890, 0x897, 0x8AD, 0x8AE, @@ -342672,7 +375282,9 @@ static const UV UNI_JT__U_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -342863,7 +375475,9 @@ static const UV UNI_JT__U_invlist[] = { 0x10EAD, 0x10EC2, 0x10EC5, - 0x10EFC, + 0x10EC6, + 0x10EC8, + 0x10EFA, 0x10F00, 0x10F30, 0x10F45, @@ -343025,6 +375639,12 @@ static const UV UNI_JT__U_invlist[] = { 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -343137,6 +375757,14 @@ static const UV UNI_JT__U_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E900, @@ -343157,7 +375785,7 @@ static const UV UNI_JT__U_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_JT__U_invlist[] = { /* for EBCDIC 037 */ - 787, /* Number of elements */ + 805, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -343233,7 +375861,7 @@ static const UV UNI_JT__U_invlist[] = { 0x870, 0x887, 0x889, - 0x88F, + 0x890, 0x897, 0x8AD, 0x8AE, @@ -343473,7 +376101,9 @@ static const UV UNI_JT__U_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -343664,7 +376294,9 @@ static const UV UNI_JT__U_invlist[] = { 0x10EAD, 0x10EC2, 0x10EC5, - 0x10EFC, + 0x10EC6, + 0x10EC8, + 0x10EFA, 0x10F00, 0x10F30, 0x10F45, @@ -343826,6 +376458,12 @@ static const UV UNI_JT__U_invlist[] = { 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -343938,6 +376576,14 @@ static const UV UNI_JT__U_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E900, @@ -344098,6 +376744,2194 @@ static const UV UNI_KAWI_invlist[] = { 0x11F5B }; +static const UV UNI_KEHCORE__C_invlist[] = { /* for all charsets */ + 1083, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x13000, + 0x1305D, + 0x1305F, + 0x1306A, + 0x1306B, + 0x1306C, + 0x1306D, + 0x13092, + 0x13093, + 0x13097, + 0x13098, + 0x130B9, + 0x130BA, + 0x130C1, + 0x130C2, + 0x130FA, + 0x130FB, + 0x1310C, + 0x1310D, + 0x13118, + 0x13119, + 0x13133, + 0x13136, + 0x13137, + 0x13139, + 0x1313A, + 0x1313D, + 0x13141, + 0x13142, + 0x13152, + 0x13153, + 0x13155, + 0x13158, + 0x13169, + 0x1316A, + 0x1316B, + 0x1316C, + 0x13172, + 0x13173, + 0x13174, + 0x13177, + 0x13196, + 0x13197, + 0x131A5, + 0x131A6, + 0x131AA, + 0x131AB, + 0x131AE, + 0x131B0, + 0x131B2, + 0x131B3, + 0x131C6, + 0x131C7, + 0x131D8, + 0x131D9, + 0x131E1, + 0x131E3, + 0x13202, + 0x13203, + 0x1320A, + 0x1320B, + 0x13215, + 0x13216, + 0x13251, + 0x13253, + 0x13256, + 0x13257, + 0x1325E, + 0x13265, + 0x13266, + 0x13267, + 0x13270, + 0x13271, + 0x1327C, + 0x1327D, + 0x1327E, + 0x1327F, + 0x13298, + 0x13299, + 0x132A3, + 0x132A4, + 0x132A5, + 0x132A6, + 0x132DF, + 0x132E2, + 0x132F1, + 0x132F2, + 0x132F5, + 0x132F7, + 0x132FB, + 0x132FC, + 0x1330C, + 0x1330E, + 0x1332D, + 0x1332E, + 0x1332F, + 0x13330, + 0x13335, + 0x13338, + 0x13339, + 0x1333C, + 0x13353, + 0x13354, + 0x1335A, + 0x1335B, + 0x1339C, + 0x1339D, + 0x1339E, + 0x1339F, + 0x133A0, + 0x133A1, + 0x133A2, + 0x133A3, + 0x133B2, + 0x133B3, + 0x133B9, + 0x133BA, + 0x133C0, + 0x133C1, + 0x133CD, + 0x133CE, + 0x133D7, + 0x133D8, + 0x133DC, + 0x133DD, + 0x133DF, + 0x133E0, + 0x133E9, + 0x133EA, + 0x133EB, + 0x133ED, + 0x13403, + 0x13404, + 0x13414, + 0x13415, + 0x13424, + 0x13425, + 0x13430, + 0x13461, + 0x1346E, + 0x1346F, + 0x13475, + 0x13476, + 0x13488, + 0x13489, + 0x13495, + 0x13496, + 0x13497, + 0x13498, + 0x1349F, + 0x134A0, + 0x134A6, + 0x134A7, + 0x134A9, + 0x134AA, + 0x134AE, + 0x134AF, + 0x134B7, + 0x134B8, + 0x134BE, + 0x134BF, + 0x134C2, + 0x134C3, + 0x134CC, + 0x134CD, + 0x134F5, + 0x134F6, + 0x13503, + 0x13504, + 0x13506, + 0x13507, + 0x13515, + 0x13516, + 0x1351B, + 0x1351C, + 0x13521, + 0x13522, + 0x1352D, + 0x1352E, + 0x13532, + 0x13533, + 0x13544, + 0x13546, + 0x1354A, + 0x1354B, + 0x1355F, + 0x13560, + 0x1356A, + 0x1356B, + 0x1356D, + 0x1356E, + 0x1357D, + 0x1357E, + 0x13581, + 0x13582, + 0x135A0, + 0x135A1, + 0x135A3, + 0x135A4, + 0x135BD, + 0x135BE, + 0x135C0, + 0x135C1, + 0x135CE, + 0x135CF, + 0x135D1, + 0x135D3, + 0x135D6, + 0x135D7, + 0x135DB, + 0x135DC, + 0x135EA, + 0x135EB, + 0x135EC, + 0x135ED, + 0x1360E, + 0x1360F, + 0x1361C, + 0x1361D, + 0x13624, + 0x13625, + 0x1362B, + 0x1362C, + 0x13631, + 0x13632, + 0x13635, + 0x13636, + 0x1363A, + 0x1363B, + 0x13649, + 0x1364A, + 0x1364F, + 0x13650, + 0x13658, + 0x13659, + 0x1365A, + 0x1365B, + 0x1366A, + 0x1366C, + 0x136A3, + 0x136A4, + 0x136A8, + 0x136A9, + 0x136AB, + 0x136AC, + 0x136AE, + 0x136AF, + 0x136B0, + 0x136B1, + 0x136B3, + 0x136B5, + 0x136BA, + 0x136BB, + 0x136BC, + 0x136BD, + 0x136D8, + 0x136D9, + 0x136DD, + 0x136DE, + 0x136EC, + 0x136ED, + 0x136F1, + 0x136F2, + 0x136F5, + 0x136F6, + 0x136FD, + 0x136FE, + 0x13707, + 0x13708, + 0x1370B, + 0x1370C, + 0x13712, + 0x13713, + 0x1372A, + 0x1372B, + 0x1372D, + 0x1372F, + 0x1373E, + 0x1373F, + 0x13741, + 0x13742, + 0x13746, + 0x13747, + 0x1374C, + 0x1374D, + 0x13750, + 0x13751, + 0x13755, + 0x13758, + 0x1375E, + 0x1375F, + 0x1376A, + 0x1376C, + 0x1376F, + 0x13770, + 0x13775, + 0x13776, + 0x13781, + 0x13784, + 0x13787, + 0x13788, + 0x1378E, + 0x1378F, + 0x13792, + 0x13793, + 0x137BB, + 0x137BC, + 0x137BE, + 0x137BF, + 0x137C0, + 0x137C1, + 0x137CA, + 0x137CB, + 0x137CF, + 0x137D0, + 0x137D9, + 0x137DA, + 0x137DD, + 0x137DE, + 0x137E1, + 0x137E2, + 0x137F1, + 0x137F2, + 0x137F4, + 0x137F5, + 0x137FB, + 0x137FC, + 0x13804, + 0x13805, + 0x13806, + 0x13807, + 0x13814, + 0x13815, + 0x1381F, + 0x13820, + 0x13821, + 0x13824, + 0x13828, + 0x13829, + 0x1382C, + 0x1382D, + 0x13832, + 0x13833, + 0x13834, + 0x13835, + 0x13848, + 0x13849, + 0x1384C, + 0x1384E, + 0x13854, + 0x13855, + 0x13869, + 0x1386A, + 0x1386E, + 0x1386F, + 0x13870, + 0x13871, + 0x13879, + 0x1387A, + 0x13887, + 0x13888, + 0x13898, + 0x13899, + 0x1389A, + 0x1389B, + 0x138A2, + 0x138A4, + 0x138B1, + 0x138B2, + 0x138B3, + 0x138B4, + 0x138B5, + 0x138B6, + 0x138BC, + 0x138BE, + 0x138DB, + 0x138DC, + 0x13901, + 0x13902, + 0x13906, + 0x13907, + 0x13924, + 0x13925, + 0x1393B, + 0x1393D, + 0x13947, + 0x13948, + 0x1394C, + 0x1394D, + 0x1394E, + 0x1394F, + 0x13953, + 0x13954, + 0x1395C, + 0x1395D, + 0x13961, + 0x13962, + 0x13968, + 0x13969, + 0x1396C, + 0x1396D, + 0x13981, + 0x13982, + 0x13983, + 0x13984, + 0x13993, + 0x13994, + 0x139A8, + 0x139A9, + 0x139BB, + 0x139BC, + 0x139BD, + 0x139BE, + 0x139D2, + 0x139D3, + 0x139D4, + 0x139D5, + 0x139D8, + 0x139D9, + 0x139E3, + 0x139E6, + 0x13A25, + 0x13A26, + 0x13A2C, + 0x13A2D, + 0x13A2E, + 0x13A2F, + 0x13A30, + 0x13A32, + 0x13A3A, + 0x13A3B, + 0x13A46, + 0x13A47, + 0x13A48, + 0x13A49, + 0x13A4A, + 0x13A4C, + 0x13A4D, + 0x13A4E, + 0x13A51, + 0x13A54, + 0x13A61, + 0x13A62, + 0x13A6F, + 0x13A70, + 0x13A79, + 0x13A7A, + 0x13A90, + 0x13A91, + 0x13A96, + 0x13A97, + 0x13AA9, + 0x13AAA, + 0x13AAC, + 0x13AAE, + 0x13AB2, + 0x13AB3, + 0x13ABC, + 0x13ABD, + 0x13AC0, + 0x13AC1, + 0x13AC6, + 0x13AC7, + 0x13AC9, + 0x13ACA, + 0x13ADC, + 0x13ADD, + 0x13AF2, + 0x13AF4, + 0x13AF6, + 0x13AF7, + 0x13AFC, + 0x13AFE, + 0x13B04, + 0x13B05, + 0x13B06, + 0x13B07, + 0x13B09, + 0x13B0A, + 0x13B0B, + 0x13B0C, + 0x13B10, + 0x13B11, + 0x13B1F, + 0x13B20, + 0x13B24, + 0x13B25, + 0x13B29, + 0x13B2B, + 0x13B3A, + 0x13B3B, + 0x13B3D, + 0x13B3E, + 0x13B4B, + 0x13B4C, + 0x13B52, + 0x13B53, + 0x13B55, + 0x13B56, + 0x13B5E, + 0x13B5F, + 0x13B7A, + 0x13B7B, + 0x13B7E, + 0x13B7F, + 0x13B80, + 0x13B81, + 0x13B84, + 0x13B85, + 0x13B8D, + 0x13B8E, + 0x13B96, + 0x13B97, + 0x13B99, + 0x13B9A, + 0x13B9E, + 0x13B9F, + 0x13BA7, + 0x13BA9, + 0x13BAC, + 0x13BAE, + 0x13BAF, + 0x13BB2, + 0x13BBA, + 0x13BBC, + 0x13BC1, + 0x13BC2, + 0x13BD9, + 0x13BDA, + 0x13BE6, + 0x13BE7, + 0x13BEB, + 0x13BEC, + 0x13BED, + 0x13BEE, + 0x13C06, + 0x13C07, + 0x13C0C, + 0x13C0D, + 0x13C12, + 0x13C13, + 0x13C1E, + 0x13C1F, + 0x13C24, + 0x13C25, + 0x13C26, + 0x13C27, + 0x13C2C, + 0x13C2D, + 0x13C32, + 0x13C33, + 0x13C35, + 0x13C36, + 0x13C39, + 0x13C3A, + 0x13C3B, + 0x13C3C, + 0x13C3D, + 0x13C3F, + 0x13C41, + 0x13C43, + 0x13C44, + 0x13C45, + 0x13C53, + 0x13C54, + 0x13C61, + 0x13C62, + 0x13C6B, + 0x13C6C, + 0x13C7E, + 0x13C7F, + 0x13C89, + 0x13C8A, + 0x13C9A, + 0x13C9B, + 0x13CA8, + 0x13CAA, + 0x13CAE, + 0x13CAF, + 0x13CB1, + 0x13CB2, + 0x13CB9, + 0x13CBA, + 0x13CBB, + 0x13CBC, + 0x13CBD, + 0x13CBE, + 0x13CCB, + 0x13CCC, + 0x13CCD, + 0x13CCF, + 0x13CD2, + 0x13CD3, + 0x13CD7, + 0x13CD9, + 0x13CDB, + 0x13CDC, + 0x13CDF, + 0x13CE0, + 0x13CE4, + 0x13CE5, + 0x13CE8, + 0x13CE9, + 0x13CFD, + 0x13CFE, + 0x13CFF, + 0x13D00, + 0x13D01, + 0x13D02, + 0x13D0C, + 0x13D0E, + 0x13D20, + 0x13D23, + 0x13D27, + 0x13D28, + 0x13D4F, + 0x13D51, + 0x13D60, + 0x13D61, + 0x13D66, + 0x13D67, + 0x13D80, + 0x13D82, + 0x13D85, + 0x13D87, + 0x13D9C, + 0x13D9D, + 0x13D9E, + 0x13DA0, + 0x13DA6, + 0x13DA7, + 0x13DAC, + 0x13DAD, + 0x13DB0, + 0x13DB1, + 0x13DB5, + 0x13DB6, + 0x13DBA, + 0x13DBB, + 0x13DC2, + 0x13DC3, + 0x13DC5, + 0x13DCA, + 0x13DDB, + 0x13DDC, + 0x13DDE, + 0x13DDF, + 0x13DE0, + 0x13DE1, + 0x13DE8, + 0x13DE9, + 0x13DF3, + 0x13DF4, + 0x13DFC, + 0x13DFD, + 0x13E04, + 0x13E05, + 0x13E0C, + 0x13E0D, + 0x13E0E, + 0x13E0F, + 0x13E12, + 0x13E13, + 0x13E18, + 0x13E19, + 0x13E24, + 0x13E26, + 0x13E28, + 0x13E2A, + 0x13E2B, + 0x13E2D, + 0x13E37, + 0x13E38, + 0x13E3B, + 0x13E3C, + 0x13E3D, + 0x13E3F, + 0x13E42, + 0x13E43, + 0x13E46, + 0x13E47, + 0x13E49, + 0x13E4A, + 0x13E4D, + 0x13E4E, + 0x13E50, + 0x13E51, + 0x13E56, + 0x13E58, + 0x13E68, + 0x13E6A, + 0x13E71, + 0x13E73, + 0x13E7F, + 0x13E80, + 0x13E8D, + 0x13E8E, + 0x13E9C, + 0x13E9D, + 0x13EA4, + 0x13EA5, + 0x13EA7, + 0x13EA8, + 0x13EAD, + 0x13EAF, + 0x13EB6, + 0x13EB7, + 0x13EBD, + 0x13EBE, + 0x13EBF, + 0x13EC0, + 0x13EC1, + 0x13EC2, + 0x13ED2, + 0x13ED3, + 0x13EDC, + 0x13EDD, + 0x13EF4, + 0x13EF5, + 0x13EF7, + 0x13EF8, + 0x13F07, + 0x13F08, + 0x13F09, + 0x13F0A, + 0x13F0B, + 0x13F0C, + 0x13F22, + 0x13F23, + 0x13F27, + 0x13F28, + 0x13F2B, + 0x13F2C, + 0x13F35, + 0x13F36, + 0x13F3D, + 0x13F3E, + 0x13F49, + 0x13F4A, + 0x13F4B, + 0x13F4C, + 0x13F4E, + 0x13F4F, + 0x13F55, + 0x13F56, + 0x13F58, + 0x13F59, + 0x13F68, + 0x13F69, + 0x13F77, + 0x13F78, + 0x13F7D, + 0x13F7F, + 0x13F97, + 0x13F98, + 0x13F9B, + 0x13F9C, + 0x13FA0, + 0x13FA1, + 0x13FA4, + 0x13FA5, + 0x13FAA, + 0x13FAB, + 0x13FAF, + 0x13FB1, + 0x13FB2, + 0x13FB3, + 0x13FC2, + 0x13FC3, + 0x13FC7, + 0x13FC9, + 0x13FCC, + 0x13FCD, + 0x13FD1, + 0x13FD2, + 0x13FE3, + 0x13FE4, + 0x13FE6, + 0x13FE7, + 0x13FE8, + 0x13FEA, + 0x13FED, + 0x13FEE, + 0x13FF8, + 0x13FFA, + 0x13FFC, + 0x13FFD, + 0x14001, + 0x14002, + 0x14004, + 0x14005, + 0x14013, + 0x14014, + 0x14015, + 0x14017, + 0x1402A, + 0x1402B, + 0x1402C, + 0x1402D, + 0x1402E, + 0x1402F, + 0x1403B, + 0x1403F, + 0x14047, + 0x14048, + 0x1404A, + 0x1404B, + 0x14053, + 0x14054, + 0x14055, + 0x14056, + 0x1405B, + 0x1405C, + 0x14060, + 0x14061, + 0x14064, + 0x14065, + 0x14072, + 0x14073, + 0x1407B, + 0x1407C, + 0x1407F, + 0x14080, + 0x14083, + 0x14084, + 0x14087, + 0x14088, + 0x1408E, + 0x14090, + 0x14091, + 0x14093, + 0x14096, + 0x14097, + 0x14098, + 0x14099, + 0x1409D, + 0x1409E, + 0x140A2, + 0x140A3, + 0x140A7, + 0x140A8, + 0x140AE, + 0x140AF, + 0x140BE, + 0x140BF, + 0x140C0, + 0x140C1, + 0x140C9, + 0x140CA, + 0x140D1, + 0x140D6, + 0x140D7, + 0x140D8, + 0x140D9, + 0x140DA, + 0x140DF, + 0x140E1, + 0x140E8, + 0x140EA, + 0x140EB, + 0x140EC, + 0x140F2, + 0x140F3, + 0x140F5, + 0x140F6, + 0x140F7, + 0x140F9, + 0x140FA, + 0x140FC, + 0x14103, + 0x14104, + 0x14108, + 0x14109, + 0x1410F, + 0x14110, + 0x1411A, + 0x1411B, + 0x14123, + 0x14124, + 0x14125, + 0x14126, + 0x14127, + 0x14128, + 0x1412E, + 0x1412F, + 0x14130, + 0x14131, + 0x14133, + 0x14136, + 0x14139, + 0x1413A, + 0x1413D, + 0x1413E, + 0x14143, + 0x14144, + 0x14146, + 0x14147, + 0x14149, + 0x1414C, + 0x14163, + 0x14164, + 0x14167, + 0x14168, + 0x1416A, + 0x1416B, + 0x14171, + 0x14173, + 0x14188, + 0x14189, + 0x1418F, + 0x14190, + 0x14193, + 0x14194, + 0x14198, + 0x14199, + 0x1419B, + 0x1419C, + 0x141A0, + 0x141A1, + 0x141A3, + 0x141A4, + 0x141AE, + 0x141AF, + 0x141BB, + 0x141BD, + 0x141C4, + 0x141C5, + 0x141CA, + 0x141CB, + 0x141D1, + 0x141D2, + 0x141D3, + 0x141D4, + 0x141D9, + 0x141DA, + 0x141EF, + 0x141F0, + 0x141F8, + 0x141FB, + 0x14212, + 0x14213, + 0x1421A, + 0x1421B, + 0x1421E, + 0x1421F, + 0x1422C, + 0x1422D, + 0x14239, + 0x1423A, + 0x14244, + 0x14245, + 0x1424E, + 0x14250, + 0x14252, + 0x14253, + 0x14254, + 0x14256, + 0x14257, + 0x14259, + 0x14264, + 0x14265, + 0x14266, + 0x14268, + 0x14279, + 0x1427A, + 0x14281, + 0x14282, + 0x14284, + 0x14285, + 0x14286, + 0x14287, + 0x14288, + 0x14289, + 0x1428E, + 0x1428F, + 0x14295, + 0x14296, + 0x1429B, + 0x1429C, + 0x1429E, + 0x1429F, + 0x142A0, + 0x142A1, + 0x142A5, + 0x142A6, + 0x142AD, + 0x142AE, + 0x142B6, + 0x142B7, + 0x142C0, + 0x142C1, + 0x142C3, + 0x142C4, + 0x142CC, + 0x142CD, + 0x142CF, + 0x142D0, + 0x142D2, + 0x142D3, + 0x142E1, + 0x142E2, + 0x142E6, + 0x142E8, + 0x142ED, + 0x142EE, + 0x142F5, + 0x142F6, + 0x14301, + 0x14303, + 0x14305, + 0x14306, + 0x14309, + 0x1430B, + 0x1430C, + 0x1430D, + 0x1430E, + 0x1430F, + 0x14311, + 0x14312, + 0x14316, + 0x14317, + 0x1431E, + 0x1431F, + 0x14326, + 0x14327, + 0x14328, + 0x14329, + 0x14330, + 0x14331, + 0x14335, + 0x14336, + 0x1433A, + 0x1433B, + 0x14347, + 0x14348, + 0x14351, + 0x14352, + 0x14365, + 0x14366, + 0x14368, + 0x14369, + 0x1437E, + 0x1437F, + 0x14382, + 0x14384, + 0x1438A, + 0x1438B, + 0x1438D, + 0x1438F, + 0x14394, + 0x14395, + 0x14398, + 0x14399, + 0x143A6, + 0x143A7, + 0x143AA, + 0x143AB, + 0x143AC, + 0x143AE, + 0x143B1, + 0x143B3, + 0x143B6, + 0x143B7, + 0x143BF, + 0x143C0, + 0x143C3, + 0x143C4, + 0x143CA, + 0x143CB, + 0x143CD, + 0x143CE, + 0x143D6, + 0x143D7, + 0x143DE, + 0x143DF, + 0x143EB, + 0x143EE, + 0x143F1, + 0x143F3, + 0x143F9, + 0x143FA, + 0x143FB +}; + +static const UV UNI_KEHCORE__L_invlist[] = { /* for all charsets */ + 137, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x1305D, + 0x1305F, + 0x1306A, + 0x1306B, + 0x1306C, + 0x1306D, + 0x13092, + 0x13093, + 0x13097, + 0x13098, + 0x130B9, + 0x130BA, + 0x130C1, + 0x130C2, + 0x130FA, + 0x130FB, + 0x1310C, + 0x1310D, + 0x13118, + 0x13119, + 0x13133, + 0x13136, + 0x13137, + 0x13139, + 0x1313A, + 0x1313D, + 0x13141, + 0x13142, + 0x13152, + 0x13153, + 0x13155, + 0x13158, + 0x13169, + 0x1316A, + 0x1316B, + 0x1316C, + 0x13172, + 0x13173, + 0x13174, + 0x13177, + 0x13196, + 0x13197, + 0x131A5, + 0x131A6, + 0x131AA, + 0x131AB, + 0x131AE, + 0x131B0, + 0x131B2, + 0x131B3, + 0x131C6, + 0x131C7, + 0x131D8, + 0x131D9, + 0x131E1, + 0x131E3, + 0x13202, + 0x13203, + 0x1320A, + 0x1320B, + 0x13215, + 0x13216, + 0x13251, + 0x13253, + 0x13256, + 0x13257, + 0x1325E, + 0x13265, + 0x13266, + 0x13267, + 0x13270, + 0x13271, + 0x1327C, + 0x1327D, + 0x1327E, + 0x1327F, + 0x13298, + 0x13299, + 0x132A3, + 0x132A4, + 0x132A5, + 0x132A6, + 0x132DF, + 0x132E2, + 0x132F1, + 0x132F2, + 0x132F5, + 0x132F7, + 0x132FB, + 0x132FC, + 0x1330C, + 0x1330E, + 0x1332D, + 0x1332E, + 0x1332F, + 0x13330, + 0x13335, + 0x13338, + 0x13339, + 0x1333C, + 0x13353, + 0x13354, + 0x1335A, + 0x1335B, + 0x1339C, + 0x1339D, + 0x1339E, + 0x1339F, + 0x133A0, + 0x133A1, + 0x133A2, + 0x133A3, + 0x133B2, + 0x133B3, + 0x133B9, + 0x133BA, + 0x133C0, + 0x133C1, + 0x133CD, + 0x133CE, + 0x133D7, + 0x133D8, + 0x133DC, + 0x133DD, + 0x133DF, + 0x133E0, + 0x133E9, + 0x133EA, + 0x133EB, + 0x133ED, + 0x13403, + 0x13404, + 0x13414, + 0x13415, + 0x13424, + 0x13425 +}; + +static const UV UNI_KEHCORE__N_invlist[] = { /* for all charsets */ + 947, /* Number of elements */ + 148565664, /* Version and data structure type */ + 0, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x13000, + 0x13430, + 0x13461, + 0x1346E, + 0x1346F, + 0x13475, + 0x13476, + 0x13488, + 0x13489, + 0x13495, + 0x13496, + 0x13497, + 0x13498, + 0x1349F, + 0x134A0, + 0x134A6, + 0x134A7, + 0x134A9, + 0x134AA, + 0x134AE, + 0x134AF, + 0x134B7, + 0x134B8, + 0x134BE, + 0x134BF, + 0x134C2, + 0x134C3, + 0x134CC, + 0x134CD, + 0x134F5, + 0x134F6, + 0x13503, + 0x13504, + 0x13506, + 0x13507, + 0x13515, + 0x13516, + 0x1351B, + 0x1351C, + 0x13521, + 0x13522, + 0x1352D, + 0x1352E, + 0x13532, + 0x13533, + 0x13544, + 0x13546, + 0x1354A, + 0x1354B, + 0x1355F, + 0x13560, + 0x1356A, + 0x1356B, + 0x1356D, + 0x1356E, + 0x1357D, + 0x1357E, + 0x13581, + 0x13582, + 0x135A0, + 0x135A1, + 0x135A3, + 0x135A4, + 0x135BD, + 0x135BE, + 0x135C0, + 0x135C1, + 0x135CE, + 0x135CF, + 0x135D1, + 0x135D3, + 0x135D6, + 0x135D7, + 0x135DB, + 0x135DC, + 0x135EA, + 0x135EB, + 0x135EC, + 0x135ED, + 0x1360E, + 0x1360F, + 0x1361C, + 0x1361D, + 0x13624, + 0x13625, + 0x1362B, + 0x1362C, + 0x13631, + 0x13632, + 0x13635, + 0x13636, + 0x1363A, + 0x1363B, + 0x13649, + 0x1364A, + 0x1364F, + 0x13650, + 0x13658, + 0x13659, + 0x1365A, + 0x1365B, + 0x1366A, + 0x1366C, + 0x136A3, + 0x136A4, + 0x136A8, + 0x136A9, + 0x136AB, + 0x136AC, + 0x136AE, + 0x136AF, + 0x136B0, + 0x136B1, + 0x136B3, + 0x136B5, + 0x136BA, + 0x136BB, + 0x136BC, + 0x136BD, + 0x136D8, + 0x136D9, + 0x136DD, + 0x136DE, + 0x136EC, + 0x136ED, + 0x136F1, + 0x136F2, + 0x136F5, + 0x136F6, + 0x136FD, + 0x136FE, + 0x13707, + 0x13708, + 0x1370B, + 0x1370C, + 0x13712, + 0x13713, + 0x1372A, + 0x1372B, + 0x1372D, + 0x1372F, + 0x1373E, + 0x1373F, + 0x13741, + 0x13742, + 0x13746, + 0x13747, + 0x1374C, + 0x1374D, + 0x13750, + 0x13751, + 0x13755, + 0x13758, + 0x1375E, + 0x1375F, + 0x1376A, + 0x1376C, + 0x1376F, + 0x13770, + 0x13775, + 0x13776, + 0x13781, + 0x13784, + 0x13787, + 0x13788, + 0x1378E, + 0x1378F, + 0x13792, + 0x13793, + 0x137BB, + 0x137BC, + 0x137BE, + 0x137BF, + 0x137C0, + 0x137C1, + 0x137CA, + 0x137CB, + 0x137CF, + 0x137D0, + 0x137D9, + 0x137DA, + 0x137DD, + 0x137DE, + 0x137E1, + 0x137E2, + 0x137F1, + 0x137F2, + 0x137F4, + 0x137F5, + 0x137FB, + 0x137FC, + 0x13804, + 0x13805, + 0x13806, + 0x13807, + 0x13814, + 0x13815, + 0x1381F, + 0x13820, + 0x13821, + 0x13824, + 0x13828, + 0x13829, + 0x1382C, + 0x1382D, + 0x13832, + 0x13833, + 0x13834, + 0x13835, + 0x13848, + 0x13849, + 0x1384C, + 0x1384E, + 0x13854, + 0x13855, + 0x13869, + 0x1386A, + 0x1386E, + 0x1386F, + 0x13870, + 0x13871, + 0x13879, + 0x1387A, + 0x13887, + 0x13888, + 0x13898, + 0x13899, + 0x1389A, + 0x1389B, + 0x138A2, + 0x138A4, + 0x138B1, + 0x138B2, + 0x138B3, + 0x138B4, + 0x138B5, + 0x138B6, + 0x138BC, + 0x138BE, + 0x138DB, + 0x138DC, + 0x13901, + 0x13902, + 0x13906, + 0x13907, + 0x13924, + 0x13925, + 0x1393B, + 0x1393D, + 0x13947, + 0x13948, + 0x1394C, + 0x1394D, + 0x1394E, + 0x1394F, + 0x13953, + 0x13954, + 0x1395C, + 0x1395D, + 0x13961, + 0x13962, + 0x13968, + 0x13969, + 0x1396C, + 0x1396D, + 0x13981, + 0x13982, + 0x13983, + 0x13984, + 0x13993, + 0x13994, + 0x139A8, + 0x139A9, + 0x139BB, + 0x139BC, + 0x139BD, + 0x139BE, + 0x139D2, + 0x139D3, + 0x139D4, + 0x139D5, + 0x139D8, + 0x139D9, + 0x139E3, + 0x139E6, + 0x13A25, + 0x13A26, + 0x13A2C, + 0x13A2D, + 0x13A2E, + 0x13A2F, + 0x13A30, + 0x13A32, + 0x13A3A, + 0x13A3B, + 0x13A46, + 0x13A47, + 0x13A48, + 0x13A49, + 0x13A4A, + 0x13A4C, + 0x13A4D, + 0x13A4E, + 0x13A51, + 0x13A54, + 0x13A61, + 0x13A62, + 0x13A6F, + 0x13A70, + 0x13A79, + 0x13A7A, + 0x13A90, + 0x13A91, + 0x13A96, + 0x13A97, + 0x13AA9, + 0x13AAA, + 0x13AAC, + 0x13AAE, + 0x13AB2, + 0x13AB3, + 0x13ABC, + 0x13ABD, + 0x13AC0, + 0x13AC1, + 0x13AC6, + 0x13AC7, + 0x13AC9, + 0x13ACA, + 0x13ADC, + 0x13ADD, + 0x13AF2, + 0x13AF4, + 0x13AF6, + 0x13AF7, + 0x13AFC, + 0x13AFE, + 0x13B04, + 0x13B05, + 0x13B06, + 0x13B07, + 0x13B09, + 0x13B0A, + 0x13B0B, + 0x13B0C, + 0x13B10, + 0x13B11, + 0x13B1F, + 0x13B20, + 0x13B24, + 0x13B25, + 0x13B29, + 0x13B2B, + 0x13B3A, + 0x13B3B, + 0x13B3D, + 0x13B3E, + 0x13B4B, + 0x13B4C, + 0x13B52, + 0x13B53, + 0x13B55, + 0x13B56, + 0x13B5E, + 0x13B5F, + 0x13B7A, + 0x13B7B, + 0x13B7E, + 0x13B7F, + 0x13B80, + 0x13B81, + 0x13B84, + 0x13B85, + 0x13B8D, + 0x13B8E, + 0x13B96, + 0x13B97, + 0x13B99, + 0x13B9A, + 0x13B9E, + 0x13B9F, + 0x13BA7, + 0x13BA9, + 0x13BAC, + 0x13BAE, + 0x13BAF, + 0x13BB2, + 0x13BBA, + 0x13BBC, + 0x13BC1, + 0x13BC2, + 0x13BD9, + 0x13BDA, + 0x13BE6, + 0x13BE7, + 0x13BEB, + 0x13BEC, + 0x13BED, + 0x13BEE, + 0x13C06, + 0x13C07, + 0x13C0C, + 0x13C0D, + 0x13C12, + 0x13C13, + 0x13C1E, + 0x13C1F, + 0x13C24, + 0x13C25, + 0x13C26, + 0x13C27, + 0x13C2C, + 0x13C2D, + 0x13C32, + 0x13C33, + 0x13C35, + 0x13C36, + 0x13C39, + 0x13C3A, + 0x13C3B, + 0x13C3C, + 0x13C3D, + 0x13C3F, + 0x13C41, + 0x13C43, + 0x13C44, + 0x13C45, + 0x13C53, + 0x13C54, + 0x13C61, + 0x13C62, + 0x13C6B, + 0x13C6C, + 0x13C7E, + 0x13C7F, + 0x13C89, + 0x13C8A, + 0x13C9A, + 0x13C9B, + 0x13CA8, + 0x13CAA, + 0x13CAE, + 0x13CAF, + 0x13CB1, + 0x13CB2, + 0x13CB9, + 0x13CBA, + 0x13CBB, + 0x13CBC, + 0x13CBD, + 0x13CBE, + 0x13CCB, + 0x13CCC, + 0x13CCD, + 0x13CCF, + 0x13CD2, + 0x13CD3, + 0x13CD7, + 0x13CD9, + 0x13CDB, + 0x13CDC, + 0x13CDF, + 0x13CE0, + 0x13CE4, + 0x13CE5, + 0x13CE8, + 0x13CE9, + 0x13CFD, + 0x13CFE, + 0x13CFF, + 0x13D00, + 0x13D01, + 0x13D02, + 0x13D0C, + 0x13D0E, + 0x13D20, + 0x13D23, + 0x13D27, + 0x13D28, + 0x13D4F, + 0x13D51, + 0x13D60, + 0x13D61, + 0x13D66, + 0x13D67, + 0x13D80, + 0x13D82, + 0x13D85, + 0x13D87, + 0x13D9C, + 0x13D9D, + 0x13D9E, + 0x13DA0, + 0x13DA6, + 0x13DA7, + 0x13DAC, + 0x13DAD, + 0x13DB0, + 0x13DB1, + 0x13DB5, + 0x13DB6, + 0x13DBA, + 0x13DBB, + 0x13DC2, + 0x13DC3, + 0x13DC5, + 0x13DCA, + 0x13DDB, + 0x13DDC, + 0x13DDE, + 0x13DDF, + 0x13DE0, + 0x13DE1, + 0x13DE8, + 0x13DE9, + 0x13DF3, + 0x13DF4, + 0x13DFC, + 0x13DFD, + 0x13E04, + 0x13E05, + 0x13E0C, + 0x13E0D, + 0x13E0E, + 0x13E0F, + 0x13E12, + 0x13E13, + 0x13E18, + 0x13E19, + 0x13E24, + 0x13E26, + 0x13E28, + 0x13E2A, + 0x13E2B, + 0x13E2D, + 0x13E37, + 0x13E38, + 0x13E3B, + 0x13E3C, + 0x13E3D, + 0x13E3F, + 0x13E42, + 0x13E43, + 0x13E46, + 0x13E47, + 0x13E49, + 0x13E4A, + 0x13E4D, + 0x13E4E, + 0x13E50, + 0x13E51, + 0x13E56, + 0x13E58, + 0x13E68, + 0x13E6A, + 0x13E71, + 0x13E73, + 0x13E7F, + 0x13E80, + 0x13E8D, + 0x13E8E, + 0x13E9C, + 0x13E9D, + 0x13EA4, + 0x13EA5, + 0x13EA7, + 0x13EA8, + 0x13EAD, + 0x13EAF, + 0x13EB6, + 0x13EB7, + 0x13EBD, + 0x13EBE, + 0x13EBF, + 0x13EC0, + 0x13EC1, + 0x13EC2, + 0x13ED2, + 0x13ED3, + 0x13EDC, + 0x13EDD, + 0x13EF4, + 0x13EF5, + 0x13EF7, + 0x13EF8, + 0x13F07, + 0x13F08, + 0x13F09, + 0x13F0A, + 0x13F0B, + 0x13F0C, + 0x13F22, + 0x13F23, + 0x13F27, + 0x13F28, + 0x13F2B, + 0x13F2C, + 0x13F35, + 0x13F36, + 0x13F3D, + 0x13F3E, + 0x13F49, + 0x13F4A, + 0x13F4B, + 0x13F4C, + 0x13F4E, + 0x13F4F, + 0x13F55, + 0x13F56, + 0x13F58, + 0x13F59, + 0x13F68, + 0x13F69, + 0x13F77, + 0x13F78, + 0x13F7D, + 0x13F7F, + 0x13F97, + 0x13F98, + 0x13F9B, + 0x13F9C, + 0x13FA0, + 0x13FA1, + 0x13FA4, + 0x13FA5, + 0x13FAA, + 0x13FAB, + 0x13FAF, + 0x13FB1, + 0x13FB2, + 0x13FB3, + 0x13FC2, + 0x13FC3, + 0x13FC7, + 0x13FC9, + 0x13FCC, + 0x13FCD, + 0x13FD1, + 0x13FD2, + 0x13FE3, + 0x13FE4, + 0x13FE6, + 0x13FE7, + 0x13FE8, + 0x13FEA, + 0x13FED, + 0x13FEE, + 0x13FF8, + 0x13FFA, + 0x13FFC, + 0x13FFD, + 0x14001, + 0x14002, + 0x14004, + 0x14005, + 0x14013, + 0x14014, + 0x14015, + 0x14017, + 0x1402A, + 0x1402B, + 0x1402C, + 0x1402D, + 0x1402E, + 0x1402F, + 0x1403B, + 0x1403F, + 0x14047, + 0x14048, + 0x1404A, + 0x1404B, + 0x14053, + 0x14054, + 0x14055, + 0x14056, + 0x1405B, + 0x1405C, + 0x14060, + 0x14061, + 0x14064, + 0x14065, + 0x14072, + 0x14073, + 0x1407B, + 0x1407C, + 0x1407F, + 0x14080, + 0x14083, + 0x14084, + 0x14087, + 0x14088, + 0x1408E, + 0x14090, + 0x14091, + 0x14093, + 0x14096, + 0x14097, + 0x14098, + 0x14099, + 0x1409D, + 0x1409E, + 0x140A2, + 0x140A3, + 0x140A7, + 0x140A8, + 0x140AE, + 0x140AF, + 0x140BE, + 0x140BF, + 0x140C0, + 0x140C1, + 0x140C9, + 0x140CA, + 0x140D1, + 0x140D6, + 0x140D7, + 0x140D8, + 0x140D9, + 0x140DA, + 0x140DF, + 0x140E1, + 0x140E8, + 0x140EA, + 0x140EB, + 0x140EC, + 0x140F2, + 0x140F3, + 0x140F5, + 0x140F6, + 0x140F7, + 0x140F9, + 0x140FA, + 0x140FC, + 0x14103, + 0x14104, + 0x14108, + 0x14109, + 0x1410F, + 0x14110, + 0x1411A, + 0x1411B, + 0x14123, + 0x14124, + 0x14125, + 0x14126, + 0x14127, + 0x14128, + 0x1412E, + 0x1412F, + 0x14130, + 0x14131, + 0x14133, + 0x14136, + 0x14139, + 0x1413A, + 0x1413D, + 0x1413E, + 0x14143, + 0x14144, + 0x14146, + 0x14147, + 0x14149, + 0x1414C, + 0x14163, + 0x14164, + 0x14167, + 0x14168, + 0x1416A, + 0x1416B, + 0x14171, + 0x14173, + 0x14188, + 0x14189, + 0x1418F, + 0x14190, + 0x14193, + 0x14194, + 0x14198, + 0x14199, + 0x1419B, + 0x1419C, + 0x141A0, + 0x141A1, + 0x141A3, + 0x141A4, + 0x141AE, + 0x141AF, + 0x141BB, + 0x141BD, + 0x141C4, + 0x141C5, + 0x141CA, + 0x141CB, + 0x141D1, + 0x141D2, + 0x141D3, + 0x141D4, + 0x141D9, + 0x141DA, + 0x141EF, + 0x141F0, + 0x141F8, + 0x141FB, + 0x14212, + 0x14213, + 0x1421A, + 0x1421B, + 0x1421E, + 0x1421F, + 0x1422C, + 0x1422D, + 0x14239, + 0x1423A, + 0x14244, + 0x14245, + 0x1424E, + 0x14250, + 0x14252, + 0x14253, + 0x14254, + 0x14256, + 0x14257, + 0x14259, + 0x14264, + 0x14265, + 0x14266, + 0x14268, + 0x14279, + 0x1427A, + 0x14281, + 0x14282, + 0x14284, + 0x14285, + 0x14286, + 0x14287, + 0x14288, + 0x14289, + 0x1428E, + 0x1428F, + 0x14295, + 0x14296, + 0x1429B, + 0x1429C, + 0x1429E, + 0x1429F, + 0x142A0, + 0x142A1, + 0x142A5, + 0x142A6, + 0x142AD, + 0x142AE, + 0x142B6, + 0x142B7, + 0x142C0, + 0x142C1, + 0x142C3, + 0x142C4, + 0x142CC, + 0x142CD, + 0x142CF, + 0x142D0, + 0x142D2, + 0x142D3, + 0x142E1, + 0x142E2, + 0x142E6, + 0x142E8, + 0x142ED, + 0x142EE, + 0x142F5, + 0x142F6, + 0x14301, + 0x14303, + 0x14305, + 0x14306, + 0x14309, + 0x1430B, + 0x1430C, + 0x1430D, + 0x1430E, + 0x1430F, + 0x14311, + 0x14312, + 0x14316, + 0x14317, + 0x1431E, + 0x1431F, + 0x14326, + 0x14327, + 0x14328, + 0x14329, + 0x14330, + 0x14331, + 0x14335, + 0x14336, + 0x1433A, + 0x1433B, + 0x14347, + 0x14348, + 0x14351, + 0x14352, + 0x14365, + 0x14366, + 0x14368, + 0x14369, + 0x1437E, + 0x1437F, + 0x14382, + 0x14384, + 0x1438A, + 0x1438B, + 0x1438D, + 0x1438F, + 0x14394, + 0x14395, + 0x14398, + 0x14399, + 0x143A6, + 0x143A7, + 0x143AA, + 0x143AB, + 0x143AC, + 0x143AE, + 0x143B1, + 0x143B3, + 0x143B6, + 0x143B7, + 0x143BF, + 0x143C0, + 0x143C3, + 0x143C4, + 0x143CA, + 0x143CB, + 0x143CD, + 0x143CE, + 0x143D6, + 0x143D7, + 0x143DE, + 0x143DF, + 0x143EB, + 0x143EE, + 0x143F1, + 0x143F3, + 0x143F9, + 0x143FA, + 0x143FB +}; + static const UV UNI_KEHNOMIRROR_invlist[] = { /* for all charsets */ 9, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -344302,7 +379136,7 @@ static const UV UNI_KNDA_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -344355,7 +379189,7 @@ static const UV UNI_KTHI_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_L_invlist[] = { /* for ASCII/Latin1 */ - 1355, /* Number of elements */ + 1369, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -344461,7 +379295,7 @@ static const UV UNI_L_invlist[] = { /* 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -344592,7 +379426,7 @@ static const UV UNI_L_invlist[] = { /* 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -344610,7 +379444,7 @@ static const UV UNI_L_invlist[] = { /* 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -344979,14 +379813,8 @@ static const UV UNI_L_invlist[] = { /* 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -345216,6 +380044,8 @@ static const UV UNI_L_invlist[] = { /* 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -345261,7 +380091,7 @@ static const UV UNI_L_invlist[] = { /* 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -345446,6 +380276,8 @@ static const UV UNI_L_invlist[] = { /* 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -345492,6 +380324,10 @@ static const UV UNI_L_invlist[] = { /* 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -345502,12 +380338,14 @@ static const UV UNI_L_invlist[] = { /* 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF4, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -345616,6 +380454,18 @@ static const UV UNI_L_invlist[] = { /* 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -345699,11 +380549,9 @@ static const UV UNI_L_invlist[] = { /* 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -345713,7 +380561,7 @@ static const UV UNI_L_invlist[] = { /* 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* ASCII/Latin1 */ @@ -345724,7 +380572,7 @@ static const UV UNI_L_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_L_invlist[] = { /* for EBCDIC 1047 */ - 1381, /* Number of elements */ + 1395, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -345856,7 +380704,7 @@ static const UV UNI_L_invlist[] = { /* 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -345987,7 +380835,7 @@ static const UV UNI_L_invlist[] = { /* 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -346005,7 +380853,7 @@ static const UV UNI_L_invlist[] = { /* 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -346374,14 +381222,8 @@ static const UV UNI_L_invlist[] = { /* 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -346611,6 +381453,8 @@ static const UV UNI_L_invlist[] = { /* 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -346656,7 +381500,7 @@ static const UV UNI_L_invlist[] = { /* 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -346841,6 +381685,8 @@ static const UV UNI_L_invlist[] = { /* 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -346887,6 +381733,10 @@ static const UV UNI_L_invlist[] = { /* 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -346897,12 +381747,14 @@ static const UV UNI_L_invlist[] = { /* 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF4, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -347011,6 +381863,18 @@ static const UV UNI_L_invlist[] = { /* 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -347094,11 +381958,9 @@ static const UV UNI_L_invlist[] = { /* 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -347108,7 +381970,7 @@ static const UV UNI_L_invlist[] = { /* 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 1047 */ @@ -347119,7 +381981,7 @@ static const UV UNI_L_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_L_invlist[] = { /* for EBCDIC 037 */ - 1377, /* Number of elements */ + 1391, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -347247,7 +382109,7 @@ static const UV UNI_L_invlist[] = { /* 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -347378,7 +382240,7 @@ static const UV UNI_L_invlist[] = { /* 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -347396,7 +382258,7 @@ static const UV UNI_L_invlist[] = { /* 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -347765,14 +382627,8 @@ static const UV UNI_L_invlist[] = { /* 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -348002,6 +382858,8 @@ static const UV UNI_L_invlist[] = { /* 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -348047,7 +382905,7 @@ static const UV UNI_L_invlist[] = { /* 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -348232,6 +383090,8 @@ static const UV UNI_L_invlist[] = { /* 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -348278,6 +383138,10 @@ static const UV UNI_L_invlist[] = { /* 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -348288,12 +383152,14 @@ static const UV UNI_L_invlist[] = { /* 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF4, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -348402,6 +383268,18 @@ static const UV UNI_L_invlist[] = { /* 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -348485,11 +383363,9 @@ static const UV UNI_L_invlist[] = { /* 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -348499,7 +383375,7 @@ static const UV UNI_L_invlist[] = { /* 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 037 */ @@ -348789,7 +383665,7 @@ static const UV UNI_LATINEXTG_invlist[] # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_LATN_invlist[] = { /* for ASCII/Latin1 */ - 131, /* Number of elements */ + 123, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -348830,8 +383706,6 @@ static const UV UNI_LATN_invlist[] = { 0x312, 0x313, 0x314, - 0x320, - 0x321, 0x323, 0x326, 0x32D, @@ -348891,14 +383765,8 @@ static const UV UNI_LATN_invlist[] = { 0xA722, 0xA788, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA800, 0xA92E, 0xA92F, @@ -348934,7 +383802,7 @@ static const UV UNI_LATN_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_LATN_invlist[] = { /* for EBCDIC 1047 */ - 157, /* Number of elements */ + 149, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -349001,8 +383869,6 @@ static const UV UNI_LATN_invlist[] = { 0x312, 0x313, 0x314, - 0x320, - 0x321, 0x323, 0x326, 0x32D, @@ -349062,14 +383928,8 @@ static const UV UNI_LATN_invlist[] = { 0xA722, 0xA788, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA800, 0xA92E, 0xA92F, @@ -349105,7 +383965,7 @@ static const UV UNI_LATN_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_LATN_invlist[] = { /* for EBCDIC 037 */ - 153, /* Number of elements */ + 145, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -349168,8 +384028,6 @@ static const UV UNI_LATN_invlist[] = { 0x312, 0x313, 0x314, - 0x320, - 0x321, 0x323, 0x326, 0x32D, @@ -349229,14 +384087,8 @@ static const UV UNI_LATN_invlist[] = { 0xA722, 0xA788, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA800, 0xA92E, 0xA92F, @@ -350015,7 +384867,7 @@ static const UV UNI_LB__AK_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_LB__AL_invlist[] = { /* for ASCII/Latin1 */ - 1561, /* Number of elements */ + 1581, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -350141,7 +384993,7 @@ static const UV UNI_LB__AL_invlist[] = { 0x860, 0x86B, 0x870, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -350284,7 +385136,7 @@ static const UV UNI_LB__AL_invlist[] = { 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -350302,7 +385154,7 @@ static const UV UNI_LB__AL_invlist[] = { 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -350741,6 +385593,8 @@ static const UV UNI_LB__AL_invlist[] = { 0x27C7, 0x27E6, 0x27F0, + 0x2800, + 0x2801, 0x2983, 0x2999, 0x29D8, @@ -350751,8 +385605,6 @@ static const UV UNI_LB__AL_invlist[] = { 0x2B5A, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CEF, 0x2CF2, 0x2CF4, @@ -350827,14 +385679,8 @@ static const UV UNI_LB__AL_invlist[] = { 0xA6F2, 0xA6F3, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -350887,14 +385733,8 @@ static const UV UNI_LB__AL_invlist[] = { 0xFB29, 0xFB2A, 0xFB50, - 0xFBC3, - 0xFBD3, 0xFD3E, 0xFD40, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFDFC, @@ -351015,7 +385855,7 @@ static const UV UNI_LB__AL_invlist[] = { 0x10920, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -351071,7 +385911,9 @@ static const UV UNI_LB__AL_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, + 0x10ED1, + 0x10ED9, 0x10F00, 0x10F28, 0x10F30, @@ -351232,6 +386074,8 @@ static const UV UNI_LB__AL_invlist[] = { 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11FB0, 0x11FB1, 0x11FC0, @@ -351290,6 +386134,10 @@ static const UV UNI_LB__AL_invlist[] = { 0x16E97, 0x16E99, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -351318,8 +386166,14 @@ static const UV UNI_LB__AL_invlist[] = { 0x1BC9D, 0x1CC00, 0x1CCF0, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -351424,6 +386278,18 @@ static const UV UNI_LB__AL_invlist[] = { 0x1E5F1, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -351556,6 +386422,8 @@ static const UV UNI_LB__AL_invlist[] = { 0x1F680, 0x1F700, 0x1F774, + 0x1F777, + 0x1F77B, 0x1F780, 0x1F7D5, 0x1F800, @@ -351572,14 +386440,18 @@ static const UV UNI_LB__AL_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1FA00, - 0x1FA54, + 0x1FA58, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* ASCII/Latin1 */ @@ -351590,7 +386462,7 @@ static const UV UNI_LB__AL_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_LB__AL_invlist[] = { /* for EBCDIC 1047 */ - 1589, /* Number of elements */ + 1609, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -351744,7 +386616,7 @@ static const UV UNI_LB__AL_invlist[] = { 0x860, 0x86B, 0x870, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -351887,7 +386759,7 @@ static const UV UNI_LB__AL_invlist[] = { 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -351905,7 +386777,7 @@ static const UV UNI_LB__AL_invlist[] = { 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -352344,6 +387216,8 @@ static const UV UNI_LB__AL_invlist[] = { 0x27C7, 0x27E6, 0x27F0, + 0x2800, + 0x2801, 0x2983, 0x2999, 0x29D8, @@ -352354,8 +387228,6 @@ static const UV UNI_LB__AL_invlist[] = { 0x2B5A, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CEF, 0x2CF2, 0x2CF4, @@ -352430,14 +387302,8 @@ static const UV UNI_LB__AL_invlist[] = { 0xA6F2, 0xA6F3, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -352490,14 +387356,8 @@ static const UV UNI_LB__AL_invlist[] = { 0xFB29, 0xFB2A, 0xFB50, - 0xFBC3, - 0xFBD3, 0xFD3E, 0xFD40, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFDFC, @@ -352618,7 +387478,7 @@ static const UV UNI_LB__AL_invlist[] = { 0x10920, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -352674,7 +387534,9 @@ static const UV UNI_LB__AL_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, + 0x10ED1, + 0x10ED9, 0x10F00, 0x10F28, 0x10F30, @@ -352835,6 +387697,8 @@ static const UV UNI_LB__AL_invlist[] = { 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11FB0, 0x11FB1, 0x11FC0, @@ -352893,6 +387757,10 @@ static const UV UNI_LB__AL_invlist[] = { 0x16E97, 0x16E99, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -352921,8 +387789,14 @@ static const UV UNI_LB__AL_invlist[] = { 0x1BC9D, 0x1CC00, 0x1CCF0, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -353027,6 +387901,18 @@ static const UV UNI_LB__AL_invlist[] = { 0x1E5F1, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -353159,6 +388045,8 @@ static const UV UNI_LB__AL_invlist[] = { 0x1F680, 0x1F700, 0x1F774, + 0x1F777, + 0x1F77B, 0x1F780, 0x1F7D5, 0x1F800, @@ -353175,14 +388063,18 @@ static const UV UNI_LB__AL_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1FA00, - 0x1FA54, + 0x1FA58, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* EBCDIC 1047 */ @@ -353193,7 +388085,7 @@ static const UV UNI_LB__AL_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_LB__AL_invlist[] = { /* for EBCDIC 037 */ - 1585, /* Number of elements */ + 1605, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -353343,7 +388235,7 @@ static const UV UNI_LB__AL_invlist[] = { 0x860, 0x86B, 0x870, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -353486,7 +388378,7 @@ static const UV UNI_LB__AL_invlist[] = { 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -353504,7 +388396,7 @@ static const UV UNI_LB__AL_invlist[] = { 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -353943,6 +388835,8 @@ static const UV UNI_LB__AL_invlist[] = { 0x27C7, 0x27E6, 0x27F0, + 0x2800, + 0x2801, 0x2983, 0x2999, 0x29D8, @@ -353953,8 +388847,6 @@ static const UV UNI_LB__AL_invlist[] = { 0x2B5A, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CEF, 0x2CF2, 0x2CF4, @@ -354029,14 +388921,8 @@ static const UV UNI_LB__AL_invlist[] = { 0xA6F2, 0xA6F3, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -354089,14 +388975,8 @@ static const UV UNI_LB__AL_invlist[] = { 0xFB29, 0xFB2A, 0xFB50, - 0xFBC3, - 0xFBD3, 0xFD3E, 0xFD40, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFDFC, @@ -354217,7 +389097,7 @@ static const UV UNI_LB__AL_invlist[] = { 0x10920, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -354273,7 +389153,9 @@ static const UV UNI_LB__AL_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, + 0x10ED1, + 0x10ED9, 0x10F00, 0x10F28, 0x10F30, @@ -354434,6 +389316,8 @@ static const UV UNI_LB__AL_invlist[] = { 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11FB0, 0x11FB1, 0x11FC0, @@ -354492,6 +389376,10 @@ static const UV UNI_LB__AL_invlist[] = { 0x16E97, 0x16E99, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -354520,8 +389408,14 @@ static const UV UNI_LB__AL_invlist[] = { 0x1BC9D, 0x1CC00, 0x1CCF0, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -354626,6 +389520,18 @@ static const UV UNI_LB__AL_invlist[] = { 0x1E5F1, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -354758,6 +389664,8 @@ static const UV UNI_LB__AL_invlist[] = { 0x1F680, 0x1F700, 0x1F774, + 0x1F777, + 0x1F77B, 0x1F780, 0x1F7D5, 0x1F800, @@ -354774,14 +389682,18 @@ static const UV UNI_LB__AL_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1F90C, 0x1FA00, - 0x1FA54, + 0x1FA58, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* EBCDIC 037 */ @@ -354861,7 +389773,7 @@ static const UV UNI_LB__B2_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_LB__BA_invlist[] = { /* for ASCII/Latin1 */ - 223, /* Number of elements */ + 209, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -354872,10 +389784,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x7D, 0xAD, 0xAE, - 0x58A, - 0x58B, - 0x5BE, - 0x5BF, 0x964, 0x966, 0xE5A, @@ -354896,8 +389804,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x104C, 0x1361, 0x1362, - 0x1400, - 0x1401, 0x1680, 0x1681, 0x16EB, @@ -354928,10 +389834,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x2007, 0x2008, 0x200B, - 0x2010, - 0x2011, - 0x2012, - 0x2014, 0x2027, 0x2028, 0x2056, @@ -354940,6 +389842,8 @@ static const UV UNI_LB__BA_invlist[] = { 0x205C, 0x205D, 0x2060, + 0x2800, + 0x2801, 0x2CFA, 0x2CFD, 0x2CFF, @@ -354948,8 +389852,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x2D71, 0x2E0E, 0x2E16, - 0x2E17, - 0x2E18, 0x2E19, 0x2E1A, 0x2E2A, @@ -354960,7 +389862,7 @@ static const UV UNI_LB__BA_invlist[] = { 0x2E35, 0x2E3C, 0x2E3F, - 0x2E40, + 0x2E41, 0x2E42, 0x2E43, 0x2E4B, @@ -354968,8 +389870,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x2E4D, 0x2E4E, 0x2E50, - 0x2E5D, - 0x2E5E, 0x3000, 0x3001, 0xA4FE, @@ -355014,10 +389914,8 @@ static const UV UNI_LB__BA_invlist[] = { 0x10AF6, 0x10B39, 0x10B40, - 0x10D6E, - 0x10D6F, - 0x10EAD, - 0x10EAE, + 0x10ED0, + 0x10ED1, 0x11047, 0x11049, 0x110BE, @@ -355098,7 +389996,7 @@ static const UV UNI_LB__BA_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_LB__BA_invlist[] = { /* for EBCDIC 1047 */ - 223, /* Number of elements */ + 209, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -355109,10 +390007,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x50, 0xCA, 0xCB, - 0x58A, - 0x58B, - 0x5BE, - 0x5BF, 0x964, 0x966, 0xE5A, @@ -355133,8 +390027,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x104C, 0x1361, 0x1362, - 0x1400, - 0x1401, 0x1680, 0x1681, 0x16EB, @@ -355165,10 +390057,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x2007, 0x2008, 0x200B, - 0x2010, - 0x2011, - 0x2012, - 0x2014, 0x2027, 0x2028, 0x2056, @@ -355177,6 +390065,8 @@ static const UV UNI_LB__BA_invlist[] = { 0x205C, 0x205D, 0x2060, + 0x2800, + 0x2801, 0x2CFA, 0x2CFD, 0x2CFF, @@ -355185,8 +390075,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x2D71, 0x2E0E, 0x2E16, - 0x2E17, - 0x2E18, 0x2E19, 0x2E1A, 0x2E2A, @@ -355197,7 +390085,7 @@ static const UV UNI_LB__BA_invlist[] = { 0x2E35, 0x2E3C, 0x2E3F, - 0x2E40, + 0x2E41, 0x2E42, 0x2E43, 0x2E4B, @@ -355205,8 +390093,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x2E4D, 0x2E4E, 0x2E50, - 0x2E5D, - 0x2E5E, 0x3000, 0x3001, 0xA4FE, @@ -355251,10 +390137,8 @@ static const UV UNI_LB__BA_invlist[] = { 0x10AF6, 0x10B39, 0x10B40, - 0x10D6E, - 0x10D6F, - 0x10EAD, - 0x10EAE, + 0x10ED0, + 0x10ED1, 0x11047, 0x11049, 0x110BE, @@ -355335,7 +390219,7 @@ static const UV UNI_LB__BA_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_LB__BA_invlist[] = { /* for EBCDIC 037 */ - 223, /* Number of elements */ + 209, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -355346,10 +390230,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x50, 0xCA, 0xCB, - 0x58A, - 0x58B, - 0x5BE, - 0x5BF, 0x964, 0x966, 0xE5A, @@ -355370,8 +390250,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x104C, 0x1361, 0x1362, - 0x1400, - 0x1401, 0x1680, 0x1681, 0x16EB, @@ -355402,10 +390280,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x2007, 0x2008, 0x200B, - 0x2010, - 0x2011, - 0x2012, - 0x2014, 0x2027, 0x2028, 0x2056, @@ -355414,6 +390288,8 @@ static const UV UNI_LB__BA_invlist[] = { 0x205C, 0x205D, 0x2060, + 0x2800, + 0x2801, 0x2CFA, 0x2CFD, 0x2CFF, @@ -355422,8 +390298,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x2D71, 0x2E0E, 0x2E16, - 0x2E17, - 0x2E18, 0x2E19, 0x2E1A, 0x2E2A, @@ -355434,7 +390308,7 @@ static const UV UNI_LB__BA_invlist[] = { 0x2E35, 0x2E3C, 0x2E3F, - 0x2E40, + 0x2E41, 0x2E42, 0x2E43, 0x2E4B, @@ -355442,8 +390316,6 @@ static const UV UNI_LB__BA_invlist[] = { 0x2E4D, 0x2E4E, 0x2E50, - 0x2E5D, - 0x2E5E, 0x3000, 0x3001, 0xA4FE, @@ -355488,10 +390360,8 @@ static const UV UNI_LB__BA_invlist[] = { 0x10AF6, 0x10B39, 0x10B40, - 0x10D6E, - 0x10D6F, - 0x10EAD, - 0x10EAE, + 0x10ED0, + 0x10ED1, 0x11047, 0x11049, 0x110BE, @@ -356443,7 +391313,7 @@ static const UV UNI_LB__CL_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_LB__CM_invlist[] = { /* for ASCII/Latin1 */ - 634, /* Number of elements */ + 644, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -356456,8 +391326,6 @@ static const UV UNI_LB__CM_invlist[] = { 0x86, 0xA0, 0x300, - 0x34F, - 0x350, 0x35C, 0x363, 0x370, @@ -356698,7 +391566,9 @@ static const UV UNI_LB__CM_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEB, 0x1B00, 0x1B05, 0x1B34, @@ -356843,7 +391713,7 @@ static const UV UNI_LB__CM_invlist[] = { 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -356965,6 +391835,8 @@ static const UV UNI_LB__CM_invlist[] = { 0x11A5C, 0x11A8A, 0x11A9A, + 0x11B60, + 0x11B68, 0x11C2F, 0x11C37, 0x11C38, @@ -357071,6 +391943,14 @@ static const UV UNI_LB__CM_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -357091,7 +391971,7 @@ static const UV UNI_LB__CM_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_LB__CM_invlist[] = { /* for EBCDIC 1047 */ - 638, /* Number of elements */ + 648, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -357108,8 +391988,6 @@ static const UV UNI_LB__CM_invlist[] = { 0xFF, 0x100, 0x300, - 0x34F, - 0x350, 0x35C, 0x363, 0x370, @@ -357350,7 +392228,9 @@ static const UV UNI_LB__CM_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEB, 0x1B00, 0x1B05, 0x1B34, @@ -357495,7 +392375,7 @@ static const UV UNI_LB__CM_invlist[] = { 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -357617,6 +392497,8 @@ static const UV UNI_LB__CM_invlist[] = { 0x11A5C, 0x11A8A, 0x11A9A, + 0x11B60, + 0x11B68, 0x11C2F, 0x11C37, 0x11C38, @@ -357723,6 +392605,14 @@ static const UV UNI_LB__CM_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -357743,7 +392633,7 @@ static const UV UNI_LB__CM_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_LB__CM_invlist[] = { /* for EBCDIC 037 */ - 638, /* Number of elements */ + 648, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -357760,8 +392650,6 @@ static const UV UNI_LB__CM_invlist[] = { 0xFF, 0x100, 0x300, - 0x34F, - 0x350, 0x35C, 0x363, 0x370, @@ -358002,7 +392890,9 @@ static const UV UNI_LB__CM_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEB, 0x1B00, 0x1B05, 0x1B34, @@ -358147,7 +393037,7 @@ static const UV UNI_LB__CM_invlist[] = { 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -358269,6 +393159,8 @@ static const UV UNI_LB__CM_invlist[] = { 0x11A5C, 0x11A8A, 0x11A9A, + 0x11B60, + 0x11B68, 0x11C2F, 0x11C37, 0x11C38, @@ -358375,6 +393267,14 @@ static const UV UNI_LB__CM_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -358717,8 +393617,6 @@ static const UV UNI_LB__GL_invlist[] = { 0x0, 0xA0, 0xA1, - 0x34F, - 0x350, 0x35C, 0x363, 0xF08, @@ -358731,6 +393629,8 @@ static const UV UNI_LB__GL_invlist[] = { 0xFDB, 0x180E, 0x180F, + 0x1AEB, + 0x1AEC, 0x1DCD, 0x1DCE, 0x1DFC, @@ -358780,8 +393680,6 @@ static const UV UNI_LB__GL_invlist[] = { 0x0, 0x41, 0x42, - 0x34F, - 0x350, 0x35C, 0x363, 0xF08, @@ -358794,6 +393692,8 @@ static const UV UNI_LB__GL_invlist[] = { 0xFDB, 0x180E, 0x180F, + 0x1AEB, + 0x1AEC, 0x1DCD, 0x1DCE, 0x1DFC, @@ -358843,8 +393743,6 @@ static const UV UNI_LB__GL_invlist[] = { 0x0, 0x41, 0x42, - 0x34F, - 0x350, 0x35C, 0x363, 0xF08, @@ -358857,6 +393755,8 @@ static const UV UNI_LB__GL_invlist[] = { 0xFDB, 0x180E, 0x180F, + 0x1AEB, + 0x1AEC, 0x1DCD, 0x1DCE, 0x1DFC, @@ -360505,6 +395405,34 @@ static const UV UNI_LB__H3_invlist[] = { 0xD7A4 }; +static const UV UNI_LB__HH_invlist[] = { /* for all charsets */ + 21, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x58A, + 0x58B, + 0x5BE, + 0x5BF, + 0x1400, + 0x1401, + 0x2010, + 0x2011, + 0x2012, + 0x2014, + 0x2E17, + 0x2E18, + 0x2E40, + 0x2E41, + 0x2E5D, + 0x2E5E, + 0x10D6E, + 0x10D6F, + 0x10EAD, + 0x10EAE +}; + static const UV UNI_LB__HL_invlist[] = { /* for all charsets */ 21, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -360582,7 +395510,7 @@ static const UV UNI_LB__HY_invlist[] = { # endif /* EBCDIC 037 */ static const UV UNI_LB__ID_invlist[] = { /* for all charsets */ - 349, /* Number of elements */ + 353, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -360805,12 +395733,14 @@ static const UV UNI_LB__ID_invlist[] = { 0x113D9, 0x11F45, 0x11F50, + 0x16FF4, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18B00, 0x18D00, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1B000, 0x1B123, 0x1B170, @@ -360896,6 +395826,8 @@ static const UV UNI_LB__ID_invlist[] = { 0x1F6CD, 0x1F700, 0x1F774, + 0x1F777, + 0x1F77B, 0x1F780, 0x1F7D5, 0x1F800, @@ -360923,7 +395855,7 @@ static const UV UNI_LB__ID_invlist[] = { 0x1F9D1, 0x1F9DE, 0x1FA00, - 0x1FA54, + 0x1FA58, 0x1FAC3, 0x1FAC6, 0x1FAF0, @@ -361144,7 +396076,7 @@ static const UV UNI_LB__NL_invlist[] = { # endif /* EBCDIC 037 */ static const UV UNI_LB__NS_invlist[] = { /* for all charsets */ - 37, /* Number of elements */ + 39, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -361183,6 +396115,8 @@ static const UV UNI_LB__NS_invlist[] = { 0xFFA0, 0x16FE0, 0x16FE4, + 0x16FF2, + 0x16FF4, 0x1F679, 0x1F67C }; @@ -361190,7 +396124,7 @@ static const UV UNI_LB__NS_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_LB__NU_invlist[] = { /* for ASCII/Latin1 */ - 141, /* Number of elements */ + 143, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -361311,6 +396245,8 @@ static const UV UNI_LB__NU_invlist[] = { 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x16A60, 0x16A6A, 0x16AC0, @@ -361345,7 +396281,7 @@ static const UV UNI_LB__NU_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_LB__NU_invlist[] = { /* for EBCDIC 1047 */ - 141, /* Number of elements */ + 143, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -361466,6 +396402,8 @@ static const UV UNI_LB__NU_invlist[] = { 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x16A60, 0x16A6A, 0x16AC0, @@ -361500,7 +396438,7 @@ static const UV UNI_LB__NU_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_LB__NU_invlist[] = { /* for EBCDIC 037 */ - 141, /* Number of elements */ + 143, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -361621,6 +396559,8 @@ static const UV UNI_LB__NU_invlist[] = { 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x16A60, 0x16A6A, 0x16AC0, @@ -362970,7 +397910,7 @@ static const UV UNI_LB__WJ_invlist[] = { }; static const UV UNI_LB__XX_invlist[] = { /* for all charsets */ - 1388, /* Number of elements */ + 1398, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -363017,8 +397957,6 @@ static const UV UNI_LB__XX_invlist[] = { 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -363186,7 +398124,7 @@ static const UV UNI_LB__XX_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -363210,7 +398148,7 @@ static const UV UNI_LB__XX_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -363401,7 +398339,9 @@ static const UV UNI_LB__XX_invlist[] = { 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -363469,8 +398409,6 @@ static const UV UNI_LB__XX_invlist[] = { 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -363531,14 +398469,8 @@ static const UV UNI_LB__XX_invlist[] = { 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -363607,12 +398539,6 @@ static const UV UNI_LB__XX_invlist[] = { 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -363755,7 +398681,7 @@ static const UV UNI_LB__XX_invlist[] = { 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -363819,8 +398745,10 @@ static const UV UNI_LB__XX_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -363986,6 +398914,8 @@ static const UV UNI_LB__XX_invlist[] = { 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -364030,6 +398960,10 @@ static const UV UNI_LB__XX_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -364088,6 +399022,10 @@ static const UV UNI_LB__XX_invlist[] = { 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -364097,13 +399035,13 @@ static const UV UNI_LB__XX_invlist[] = { 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -364133,9 +399071,13 @@ static const UV UNI_LB__XX_invlist[] = { 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -364242,6 +399184,12 @@ static const UV UNI_LB__XX_invlist[] = { 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -364346,10 +399294,12 @@ static const UV UNI_LB__XX_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x1FC00, 0x1FFFE, 0x20000, @@ -364521,7 +399471,7 @@ static const UV UNI_LISUSUP_invlist[] = }; static const UV UNI_LM_invlist[] = { /* for all charsets */ - 151, /* Number of elements */ + 159, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -364618,7 +399568,7 @@ static const UV UNI_LM_invlist[] = { /* 0xA771, 0xA788, 0xA789, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -364650,6 +399600,10 @@ static const UV UNI_LM_invlist[] = { /* 0x10D4F, 0x10D6F, 0x10D70, + 0x10EC5, + 0x10EC6, + 0x11DD9, + 0x11DDA, 0x16B40, 0x16B44, 0x16D40, @@ -364662,6 +399616,8 @@ static const UV UNI_LM_invlist[] = { /* 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF4, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -364674,6 +399630,8 @@ static const UV UNI_LM_invlist[] = { /* 0x1E13E, 0x1E4EB, 0x1E4EC, + 0x1E6FF, + 0x1E700, 0x1E94B, 0x1E94C }; @@ -364681,7 +399639,7 @@ static const UV UNI_LM_invlist[] = { /* # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_LO_invlist[] = { /* for ASCII/Latin1 */ - 1057, /* Number of elements */ + 1075, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -364695,7 +399653,7 @@ static const UV UNI_LO_invlist[] = { /* 0x1C0, 0x1C4, 0x294, - 0x295, + 0x296, 0x5D0, 0x5EB, 0x5EF, @@ -364735,7 +399693,7 @@ static const UV UNI_LO_invlist[] = { /* 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8C9, 0x904, @@ -364866,7 +399824,7 @@ static const UV UNI_LO_invlist[] = { /* 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -364884,7 +399842,7 @@ static const UV UNI_LO_invlist[] = { /* 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -365336,6 +400294,8 @@ static const UV UNI_LO_invlist[] = { /* 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -365378,6 +400338,8 @@ static const UV UNI_LO_invlist[] = { /* 0x10EB2, 0x10EC2, 0x10EC5, + 0x10EC6, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -365560,6 +400522,10 @@ static const UV UNI_LO_invlist[] = { /* 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DD9, + 0x11DDA, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -365607,11 +400573,11 @@ static const UV UNI_LO_invlist[] = { /* 0x16F50, 0x16F51, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1B000, 0x1B123, 0x1B132, @@ -365648,6 +400614,18 @@ static const UV UNI_LO_invlist[] = { /* 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E6FF, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -365727,11 +400705,9 @@ static const UV UNI_LO_invlist[] = { /* 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -365741,7 +400717,7 @@ static const UV UNI_LO_invlist[] = { /* 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* ASCII/Latin1 */ @@ -365752,7 +400728,7 @@ static const UV UNI_LO_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_LO_invlist[] = { /* for EBCDIC 1047 */ - 1055, /* Number of elements */ + 1073, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -365764,7 +400740,7 @@ static const UV UNI_LO_invlist[] = { /* 0x1C0, 0x1C4, 0x294, - 0x295, + 0x296, 0x5D0, 0x5EB, 0x5EF, @@ -365804,7 +400780,7 @@ static const UV UNI_LO_invlist[] = { /* 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8C9, 0x904, @@ -365935,7 +400911,7 @@ static const UV UNI_LO_invlist[] = { /* 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -365953,7 +400929,7 @@ static const UV UNI_LO_invlist[] = { /* 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -366405,6 +401381,8 @@ static const UV UNI_LO_invlist[] = { /* 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -366447,6 +401425,8 @@ static const UV UNI_LO_invlist[] = { /* 0x10EB2, 0x10EC2, 0x10EC5, + 0x10EC6, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -366629,6 +401609,10 @@ static const UV UNI_LO_invlist[] = { /* 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DD9, + 0x11DDA, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -366676,11 +401660,11 @@ static const UV UNI_LO_invlist[] = { /* 0x16F50, 0x16F51, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1B000, 0x1B123, 0x1B132, @@ -366717,6 +401701,18 @@ static const UV UNI_LO_invlist[] = { /* 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E6FF, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -366796,11 +401792,9 @@ static const UV UNI_LO_invlist[] = { /* 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -366810,7 +401804,7 @@ static const UV UNI_LO_invlist[] = { /* 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 1047 */ @@ -366821,7 +401815,7 @@ static const UV UNI_LO_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_LO_invlist[] = { /* for EBCDIC 037 */ - 1055, /* Number of elements */ + 1073, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -366833,7 +401827,7 @@ static const UV UNI_LO_invlist[] = { /* 0x1C0, 0x1C4, 0x294, - 0x295, + 0x296, 0x5D0, 0x5EB, 0x5EF, @@ -366873,7 +401867,7 @@ static const UV UNI_LO_invlist[] = { /* 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8C9, 0x904, @@ -367004,7 +401998,7 @@ static const UV UNI_LO_invlist[] = { /* 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -367022,7 +402016,7 @@ static const UV UNI_LO_invlist[] = { /* 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -367474,6 +402468,8 @@ static const UV UNI_LO_invlist[] = { /* 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -367516,6 +402512,8 @@ static const UV UNI_LO_invlist[] = { /* 0x10EB2, 0x10EC2, 0x10EC5, + 0x10EC6, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -367698,6 +402696,10 @@ static const UV UNI_LO_invlist[] = { /* 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DD9, + 0x11DDA, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -367745,11 +402747,11 @@ static const UV UNI_LO_invlist[] = { /* 0x16F50, 0x16F51, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1B000, 0x1B123, 0x1B132, @@ -367786,6 +402788,18 @@ static const UV UNI_LO_invlist[] = { /* 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E6FF, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -367865,11 +402879,9 @@ static const UV UNI_LO_invlist[] = { /* 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -367879,7 +402891,7 @@ static const UV UNI_LO_invlist[] = { /* 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 037 */ @@ -367995,7 +403007,7 @@ static const UV UNI_LYDI_invlist[] = { # endif /* EBCDIC 037 */ static const UV UNI_M_invlist[] = { /* for all charsets */ - 643, /* Number of elements */ + 655, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -368273,7 +403285,9 @@ static const UV UNI_M_invlist[] = { /* 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -368404,7 +403418,7 @@ static const UV UNI_M_invlist[] = { /* 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -368528,6 +403542,8 @@ static const UV UNI_M_invlist[] = { /* 0x11A5C, 0x11A8A, 0x11A9A, + 0x11B60, + 0x11B68, 0x11C2F, 0x11C37, 0x11C38, @@ -368636,6 +403652,14 @@ static const UV UNI_M_invlist[] = { /* 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -368775,7 +403799,7 @@ static const UV UNI_MARC_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_MATH_invlist[] = { /* for ASCII/Latin1 */ - 279, /* Number of elements */ + 283, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -368948,6 +403972,8 @@ static const UV UNI_MATH_invlist[] = { 0xFFED, 0x10D8E, 0x10D90, + 0x1CEF0, + 0x1CEF1, 0x1D400, 0x1D455, 0x1D456, @@ -369057,7 +404083,9 @@ static const UV UNI_MATH_invlist[] = { 0x1EEAB, 0x1EEBC, 0x1EEF0, - 0x1EEF2 + 0x1EEF2, + 0x1F8D0, + 0x1F8D9 }; # endif /* ASCII/Latin1 */ @@ -369068,7 +404096,7 @@ static const UV UNI_MATH_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_MATH_invlist[] = { /* for EBCDIC 1047 */ - 281, /* Number of elements */ + 285, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -369243,6 +404271,8 @@ static const UV UNI_MATH_invlist[] = { 0xFFED, 0x10D8E, 0x10D90, + 0x1CEF0, + 0x1CEF1, 0x1D400, 0x1D455, 0x1D456, @@ -369352,7 +404382,9 @@ static const UV UNI_MATH_invlist[] = { 0x1EEAB, 0x1EEBC, 0x1EEF0, - 0x1EEF2 + 0x1EEF2, + 0x1F8D0, + 0x1F8D9 }; # endif /* EBCDIC 1047 */ @@ -369363,7 +404395,7 @@ static const UV UNI_MATH_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_MATH_invlist[] = { /* for EBCDIC 037 */ - 281, /* Number of elements */ + 285, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -369538,6 +404570,8 @@ static const UV UNI_MATH_invlist[] = { 0xFFED, 0x10D8E, 0x10D90, + 0x1CEF0, + 0x1CEF1, 0x1D400, 0x1D455, 0x1D456, @@ -369647,7 +404681,9 @@ static const UV UNI_MATH_invlist[] = { 0x1EEAB, 0x1EEBC, 0x1EEF0, - 0x1EEF2 + 0x1EEF2, + 0x1F8D0, + 0x1F8D9 }; # endif /* EBCDIC 037 */ @@ -369683,7 +404719,7 @@ static const UV UNI_MAYANNUMERALS_invlis }; static const UV UNI_MC_invlist[] = { /* for all charsets */ - 381, /* Number of elements */ + 387, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -370032,6 +405068,12 @@ static const UV UNI_MC_invlist[] = { /* 0x11A59, 0x11A97, 0x11A98, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, + 0x11B68, 0x11C2F, 0x11C30, 0x11C3E, @@ -370236,6 +405278,16 @@ static const UV UNI_MISCSYMBOLS_invlist[ 0x2700 }; +static const UV UNI_MISCSYMBOLSSUP_invlist[] = { /* for all charsets */ + 3, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x1CEC0, + 0x1CF00 +}; + static const UV UNI_MISCTECHNICAL_invlist[] = { /* for all charsets */ 3, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -370279,7 +405331,7 @@ static const UV UNI_MLYM_invlist[] = { }; static const UV UNI_MN_invlist[] = { /* for all charsets */ - 715, /* Number of elements */ + 731, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -370569,7 +405621,9 @@ static const UV UNI_MN_invlist[] = { /* 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B04, 0x1B34, @@ -370732,7 +405786,7 @@ static const UV UNI_MN_invlist[] = { /* 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -370882,6 +405936,12 @@ static const UV UNI_MN_invlist[] = { /* 0x11A97, 0x11A98, 0x11A9A, + 0x11B60, + 0x11B61, + 0x11B62, + 0x11B65, + 0x11B66, + 0x11B67, 0x11C30, 0x11C37, 0x11C38, @@ -370992,6 +406052,14 @@ static const UV UNI_MN_invlist[] = { /* 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -371175,7 +406243,7 @@ static const UV UNI_MYMR_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_N_invlist[] = { /* for ASCII/Latin1 */ - 289, /* Number of elements */ + 293, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -371412,6 +406480,8 @@ static const UV UNI_N_invlist[] = { /* 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x11FC0, @@ -371432,6 +406502,8 @@ static const UV UNI_N_invlist[] = { /* 0x16D7A, 0x16E80, 0x16E97, + 0x16FF4, + 0x16FF7, 0x1CCF0, 0x1CCFA, 0x1D2C0, @@ -371478,7 +406550,7 @@ static const UV UNI_N_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_N_invlist[] = { /* for EBCDIC 1047 */ - 289, /* Number of elements */ + 293, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -371715,6 +406787,8 @@ static const UV UNI_N_invlist[] = { /* 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x11FC0, @@ -371735,6 +406809,8 @@ static const UV UNI_N_invlist[] = { /* 0x16D7A, 0x16E80, 0x16E97, + 0x16FF4, + 0x16FF7, 0x1CCF0, 0x1CCFA, 0x1D2C0, @@ -371781,7 +406857,7 @@ static const UV UNI_N_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_N_invlist[] = { /* for EBCDIC 037 */ - 289, /* Number of elements */ + 293, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -372018,6 +407094,8 @@ static const UV UNI_N_invlist[] = { /* 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x11FC0, @@ -372038,6 +407116,8 @@ static const UV UNI_N_invlist[] = { /* 0x16D7A, 0x16E80, 0x16E97, + 0x16FF4, + 0x16FF7, 0x1CCF0, 0x1CCFA, 0x1D2C0, @@ -372089,11 +407169,13 @@ static const UV UNI_NAGM_invlist[] = { }; static const UV UNI_NAND_invlist[] = { /* for all charsets */ - 19, /* Number of elements */ + 21, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ 0x0, + 0x951, + 0x952, 0x964, 0x966, 0xCE6, @@ -372140,7 +407222,7 @@ static const UV UNI_NB_invlist[] = { /* 0x10800, 0x108B0, 0x108E0, - 0x10940, + 0x10960, 0x10980, 0x10AA0, 0x10AC0, @@ -372160,11 +407242,11 @@ static const UV UNI_NB_invlist[] = { /* 0x118A0, 0x11960, 0x119A0, - 0x11B60, + 0x11B80, 0x11BC0, 0x11CC0, 0x11D00, - 0x11DB0, + 0x11DF0, 0x11EE0, 0x11F60, 0x11FB0, @@ -372178,18 +407260,16 @@ static const UV UNI_NB_invlist[] = { /* 0x16D40, 0x16D80, 0x16E40, - 0x16EA0, + 0x16EE0, 0x16F00, 0x16FA0, 0x16FE0, - 0x18D80, + 0x18E00, 0x1AFF0, 0x1B300, 0x1BC00, 0x1BCB0, 0x1CC00, - 0x1CEC0, - 0x1CF00, 0x1CFD0, 0x1D000, 0x1D250, @@ -372207,6 +407287,8 @@ static const UV UNI_NB_invlist[] = { /* 0x1E500, 0x1E5D0, 0x1E600, + 0x1E6C0, + 0x1E700, 0x1E7E0, 0x1E8E0, 0x1E900, @@ -372226,7 +407308,7 @@ static const UV UNI_NB_invlist[] = { /* 0x2F800, 0x2FA20, 0x30000, - 0x323B0, + 0x33480, 0xE0000, 0xE0080, 0xE0100, @@ -372248,11 +407330,25 @@ static const UV UNI_NBAT_invlist[] = { }; static const UV UNI_NEWA_invlist[] = { /* for all charsets */ - 5, /* Number of elements */ + 19, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ 0x0, + 0x951, + 0x953, + 0x1CD5, + 0x1CD6, + 0x1CD7, + 0x1CD9, + 0x1CE2, + 0x1CE3, + 0x1CE9, + 0x1CEA, + 0x1CEB, + 0x1CEC, + 0x1CED, + 0x1CEE, 0x11400, 0x1145C, 0x1145D, @@ -374407,7 +409503,7 @@ static const UV UNI_NFKCQC__N_invlist[] 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -374940,7 +410036,7 @@ static const UV UNI_NFKCQC__N_invlist[] 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -375471,7 +410567,7 @@ static const UV UNI_NFKCQC__N_invlist[] 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -376053,7 +411149,7 @@ static const UV UNI_NFKCQC__Y_invlist[] 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -376676,7 +411772,7 @@ static const UV UNI_NFKCQC__Y_invlist[] 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -377297,7 +412393,7 @@ static const UV UNI_NFKCQC__Y_invlist[] 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -378117,7 +413213,7 @@ static const UV UNI_NFKDQC__N_invlist[] 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -378946,7 +414042,7 @@ static const UV UNI_NFKDQC__N_invlist[] 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -379777,7 +414873,7 @@ static const UV UNI_NFKDQC__N_invlist[] 0xA69E, 0xA770, 0xA771, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F8, 0xA7FA, @@ -380068,7 +415164,7 @@ static const UV UNI_NKO_invlist[] = { / }; static const UV UNI_NL_invlist[] = { /* for all charsets */ - 25, /* Number of elements */ + 27, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -380096,7 +415192,9 @@ static const UV UNI_NL_invlist[] = { /* 0x103D1, 0x103D6, 0x12400, - 0x1246F + 0x1246F, + 0x16FF4, + 0x16FF7 }; # if 'A' == 65 /* ASCII/Latin1 */ @@ -380758,7 +415856,7 @@ static const UV UNI_NT__DI_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_NT__NU_invlist[] = { /* for ASCII/Latin1 */ - 325, /* Number of elements */ + 341, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -381029,12 +416127,28 @@ static const UV UNI_NT__NU_invlist[] = { 0x11C6D, 0x11FC0, 0x11FD5, + 0x12038, + 0x1203A, + 0x12079, + 0x1207A, + 0x12226, + 0x12227, + 0x1222B, + 0x1222C, + 0x1230B, + 0x1230C, + 0x1230D, + 0x1230E, + 0x12399, + 0x1239A, 0x12400, 0x1246F, 0x16B5B, 0x16B62, 0x16E80, 0x16E97, + 0x16FF4, + 0x16FF7, 0x1D2C0, 0x1D2D4, 0x1D2E0, @@ -381097,7 +416211,7 @@ static const UV UNI_NT__NU_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_NT__NU_invlist[] = { /* for EBCDIC 1047 */ - 325, /* Number of elements */ + 341, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -381368,12 +416482,28 @@ static const UV UNI_NT__NU_invlist[] = { 0x11C6D, 0x11FC0, 0x11FD5, + 0x12038, + 0x1203A, + 0x12079, + 0x1207A, + 0x12226, + 0x12227, + 0x1222B, + 0x1222C, + 0x1230B, + 0x1230C, + 0x1230D, + 0x1230E, + 0x12399, + 0x1239A, 0x12400, 0x1246F, 0x16B5B, 0x16B62, 0x16E80, 0x16E97, + 0x16FF4, + 0x16FF7, 0x1D2C0, 0x1D2D4, 0x1D2E0, @@ -381436,7 +416566,7 @@ static const UV UNI_NT__NU_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_NT__NU_invlist[] = { /* for EBCDIC 037 */ - 325, /* Number of elements */ + 341, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -381707,12 +416837,28 @@ static const UV UNI_NT__NU_invlist[] = { 0x11C6D, 0x11FC0, 0x11FD5, + 0x12038, + 0x1203A, + 0x12079, + 0x1207A, + 0x12226, + 0x12227, + 0x1222B, + 0x1222C, + 0x1230B, + 0x1230C, + 0x1230D, + 0x1230E, + 0x12399, + 0x1239A, 0x12400, 0x1246F, 0x16B5B, 0x16B62, 0x16E80, 0x16E97, + 0x16FF4, + 0x16FF7, 0x1D2C0, 0x1D2D4, 0x1D2E0, @@ -381792,7 +416938,7 @@ static const UV UNI_NV___MINUS_1_SLASH_2 # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_NV__0_invlist[] = { /* for ASCII/Latin1 */ - 189, /* Number of elements */ + 191, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -381939,6 +417085,8 @@ static const UV UNI_NV__0_invlist[] = { 0x11D51, 0x11DA0, 0x11DA1, + 0x11DE0, + 0x11DE1, 0x11F50, 0x11F51, 0x16130, @@ -381995,7 +417143,7 @@ static const UV UNI_NV__0_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_NV__0_invlist[] = { /* for EBCDIC 1047 */ - 189, /* Number of elements */ + 191, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -382142,6 +417290,8 @@ static const UV UNI_NV__0_invlist[] = { 0x11D51, 0x11DA0, 0x11DA1, + 0x11DE0, + 0x11DE1, 0x11F50, 0x11F51, 0x16130, @@ -382198,7 +417348,7 @@ static const UV UNI_NV__0_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_NV__0_invlist[] = { /* for EBCDIC 037 */ - 189, /* Number of elements */ + 191, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -382345,6 +417495,8 @@ static const UV UNI_NV__0_invlist[] = { 0x11D51, 0x11DA0, 0x11DA1, + 0x11DE0, + 0x11DE1, 0x11F50, 0x11F51, 0x16130, @@ -382398,7 +417550,7 @@ static const UV UNI_NV__0_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_NV__1_invlist[] = { /* for ASCII/Latin1 */ - 299, /* Number of elements */ + 309, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -382625,8 +417777,16 @@ static const UV UNI_NV__1_invlist[] = { 0x11D52, 0x11DA1, 0x11DA2, + 0x11DE1, + 0x11DE2, 0x11F51, 0x11F52, + 0x12038, + 0x1203A, + 0x12079, + 0x1207A, + 0x1230B, + 0x1230C, 0x12415, 0x12416, 0x1241E, @@ -382653,6 +417813,8 @@ static const UV UNI_NV__1_invlist[] = { 0x16E82, 0x16E94, 0x16E95, + 0x16FF4, + 0x16FF5, 0x1CCF1, 0x1CCF2, 0x1D2C1, @@ -382711,7 +417873,7 @@ static const UV UNI_NV__1_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_NV__1_invlist[] = { /* for EBCDIC 1047 */ - 299, /* Number of elements */ + 309, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -382938,8 +418100,16 @@ static const UV UNI_NV__1_invlist[] = { 0x11D52, 0x11DA1, 0x11DA2, + 0x11DE1, + 0x11DE2, 0x11F51, 0x11F52, + 0x12038, + 0x1203A, + 0x12079, + 0x1207A, + 0x1230B, + 0x1230C, 0x12415, 0x12416, 0x1241E, @@ -382966,6 +418136,8 @@ static const UV UNI_NV__1_invlist[] = { 0x16E82, 0x16E94, 0x16E95, + 0x16FF4, + 0x16FF5, 0x1CCF1, 0x1CCF2, 0x1D2C1, @@ -383024,7 +418196,7 @@ static const UV UNI_NV__1_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_NV__1_invlist[] = { /* for EBCDIC 037 */ - 299, /* Number of elements */ + 309, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -383251,8 +418423,16 @@ static const UV UNI_NV__1_invlist[] = { 0x11D52, 0x11DA1, 0x11DA2, + 0x11DE1, + 0x11DE2, 0x11F51, 0x11F52, + 0x12038, + 0x1203A, + 0x12079, + 0x1207A, + 0x1230B, + 0x1230C, 0x12415, 0x12416, 0x1241E, @@ -383279,6 +418459,8 @@ static const UV UNI_NV__1_invlist[] = { 0x16E82, 0x16E94, 0x16E95, + 0x16FF4, + 0x16FF5, 0x1CCF1, 0x1CCF2, 0x1D2C1, @@ -383388,7 +418570,7 @@ static const UV UNI_NV__1_SLASH_160_invl # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_NV__1_SLASH_2_invlist[] = { /* for ASCII/Latin1 */ - 35, /* Number of elements */ + 37, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -383421,6 +418603,8 @@ static const UV UNI_NV__1_SLASH_2_invlis 0x10F27, 0x11FD1, 0x11FD3, + 0x12226, + 0x12227, 0x12464, 0x12465, 0x1ECAE, @@ -383437,7 +418621,7 @@ static const UV UNI_NV__1_SLASH_2_invlis && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_NV__1_SLASH_2_invlist[] = { /* for EBCDIC 1047 */ - 35, /* Number of elements */ + 37, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -383470,6 +418654,8 @@ static const UV UNI_NV__1_SLASH_2_invlis 0x10F27, 0x11FD1, 0x11FD3, + 0x12226, + 0x12227, 0x12464, 0x12465, 0x1ECAE, @@ -383486,7 +418672,7 @@ static const UV UNI_NV__1_SLASH_2_invlis && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_NV__1_SLASH_2_invlist[] = { /* for EBCDIC 037 */ - 35, /* Number of elements */ + 37, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -383519,6 +418705,8 @@ static const UV UNI_NV__1_SLASH_2_invlis 0x10F27, 0x11FD1, 0x11FD3, + 0x12226, + 0x12227, 0x12464, 0x12465, 0x1ECAE, @@ -384114,13 +419302,11 @@ static const UV UNI_NV__100000_invlist[] }; static const UV UNI_NV__1000000_invlist[] = { /* for all charsets */ - 5, /* Number of elements */ + 3, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ 0x0, - 0x5146, - 0x5147, 0x16B5E, 0x16B5F }; @@ -384170,11 +419356,13 @@ static const UV UNI_NV__10000000000_invl }; static const UV UNI_NV__1000000000000_invlist[] = { /* for all charsets */ - 3, /* Number of elements */ + 5, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ 0x0, + 0x5146, + 0x5147, 0x16B61, 0x16B62 }; @@ -384456,7 +419644,7 @@ static const UV UNI_NV__19_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_NV__2_invlist[] = { /* for ASCII/Latin1 */ - 303, /* Number of elements */ + 311, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -384679,8 +419867,14 @@ static const UV UNI_NV__2_invlist[] = { 0x11D53, 0x11DA2, 0x11DA3, + 0x11DE2, + 0x11DE3, 0x11F52, 0x11F53, + 0x1222B, + 0x1222C, + 0x12399, + 0x1239A, 0x12400, 0x12401, 0x12416, @@ -384715,6 +419909,8 @@ static const UV UNI_NV__2_invlist[] = { 0x16E83, 0x16E95, 0x16E96, + 0x16FF6, + 0x16FF7, 0x1CCF2, 0x1CCF3, 0x1D2C2, @@ -384773,7 +419969,7 @@ static const UV UNI_NV__2_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_NV__2_invlist[] = { /* for EBCDIC 1047 */ - 303, /* Number of elements */ + 311, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -384996,8 +420192,14 @@ static const UV UNI_NV__2_invlist[] = { 0x11D53, 0x11DA2, 0x11DA3, + 0x11DE2, + 0x11DE3, 0x11F52, 0x11F53, + 0x1222B, + 0x1222C, + 0x12399, + 0x1239A, 0x12400, 0x12401, 0x12416, @@ -385032,6 +420234,8 @@ static const UV UNI_NV__2_invlist[] = { 0x16E83, 0x16E95, 0x16E96, + 0x16FF6, + 0x16FF7, 0x1CCF2, 0x1CCF3, 0x1D2C2, @@ -385090,7 +420294,7 @@ static const UV UNI_NV__2_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_NV__2_invlist[] = { /* for EBCDIC 037 */ - 303, /* Number of elements */ + 311, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -385313,8 +420517,14 @@ static const UV UNI_NV__2_invlist[] = { 0x11D53, 0x11DA2, 0x11DA3, + 0x11DE2, + 0x11DE3, 0x11F52, 0x11F53, + 0x1222B, + 0x1222C, + 0x12399, + 0x1239A, 0x12400, 0x12401, 0x12416, @@ -385349,6 +420559,8 @@ static const UV UNI_NV__2_invlist[] = { 0x16E83, 0x16E95, 0x16E96, + 0x16FF6, + 0x16FF7, 0x1CCF2, 0x1CCF3, 0x1D2C2, @@ -385694,7 +420906,7 @@ static const UV UNI_NV__29_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_NV__3_invlist[] = { /* for ASCII/Latin1 */ - 291, /* Number of elements */ + 295, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -385899,8 +421111,12 @@ static const UV UNI_NV__3_invlist[] = { 0x11D54, 0x11DA3, 0x11DA4, + 0x11DE3, + 0x11DE4, 0x11F53, 0x11F54, + 0x1230D, + 0x1230E, 0x12401, 0x12402, 0x12408, @@ -385999,7 +421215,7 @@ static const UV UNI_NV__3_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_NV__3_invlist[] = { /* for EBCDIC 1047 */ - 291, /* Number of elements */ + 295, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -386204,8 +421420,12 @@ static const UV UNI_NV__3_invlist[] = { 0x11D54, 0x11DA3, 0x11DA4, + 0x11DE3, + 0x11DE4, 0x11F53, 0x11F54, + 0x1230D, + 0x1230E, 0x12401, 0x12402, 0x12408, @@ -386304,7 +421524,7 @@ static const UV UNI_NV__3_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_NV__3_invlist[] = { /* for EBCDIC 037 */ - 291, /* Number of elements */ + 295, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -386509,8 +421729,12 @@ static const UV UNI_NV__3_invlist[] = { 0x11D54, 0x11DA3, 0x11DA4, + 0x11DE3, + 0x11DE4, 0x11F53, 0x11F54, + 0x1230D, + 0x1230E, 0x12401, 0x12402, 0x12408, @@ -386622,13 +421846,15 @@ static const UV UNI_NV__3_SLASH_16_invli }; static const UV UNI_NV__3_SLASH_2_invlist[] = { /* for all charsets */ - 3, /* Number of elements */ + 5, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ 0x0, 0xF2B, - 0xF2C + 0xF2C, + 0x16FF5, + 0x16FF6 }; static const UV UNI_NV__3_SLASH_20_invlist[] = { /* for all charsets */ @@ -386984,7 +422210,7 @@ static const UV UNI_NV__39_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_NV__4_invlist[] = { /* for ASCII/Latin1 */ - 277, /* Number of elements */ + 279, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -387177,6 +422403,8 @@ static const UV UNI_NV__4_invlist[] = { 0x11D55, 0x11DA4, 0x11DA5, + 0x11DE4, + 0x11DE5, 0x11F54, 0x11F55, 0x12402, @@ -387275,7 +422503,7 @@ static const UV UNI_NV__4_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_NV__4_invlist[] = { /* for EBCDIC 1047 */ - 277, /* Number of elements */ + 279, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -387468,6 +422696,8 @@ static const UV UNI_NV__4_invlist[] = { 0x11D55, 0x11DA4, 0x11DA5, + 0x11DE4, + 0x11DE5, 0x11F54, 0x11F55, 0x12402, @@ -387566,7 +422796,7 @@ static const UV UNI_NV__4_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_NV__4_invlist[] = { /* for EBCDIC 037 */ - 277, /* Number of elements */ + 279, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -387759,6 +422989,8 @@ static const UV UNI_NV__4_invlist[] = { 0x11D55, 0x11DA4, 0x11DA5, + 0x11DE4, + 0x11DE5, 0x11F54, 0x11F55, 0x12402, @@ -388072,7 +423304,7 @@ static const UV UNI_NV__49_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_NV__5_invlist[] = { /* for ASCII/Latin1 */ - 281, /* Number of elements */ + 283, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -388273,6 +423505,8 @@ static const UV UNI_NV__5_invlist[] = { 0x11D56, 0x11DA5, 0x11DA6, + 0x11DE5, + 0x11DE6, 0x11F55, 0x11F56, 0x12403, @@ -388367,7 +423601,7 @@ static const UV UNI_NV__5_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_NV__5_invlist[] = { /* for EBCDIC 1047 */ - 281, /* Number of elements */ + 283, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -388568,6 +423802,8 @@ static const UV UNI_NV__5_invlist[] = { 0x11D56, 0x11DA5, 0x11DA6, + 0x11DE5, + 0x11DE6, 0x11F55, 0x11F56, 0x12403, @@ -388662,7 +423898,7 @@ static const UV UNI_NV__5_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_NV__5_invlist[] = { /* for EBCDIC 037 */ - 281, /* Number of elements */ + 283, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -388863,6 +424099,8 @@ static const UV UNI_NV__5_invlist[] = { 0x11D56, 0x11DA5, 0x11DA6, + 0x11DE5, + 0x11DE6, 0x11F55, 0x11F56, 0x12403, @@ -389146,7 +424384,7 @@ static const UV UNI_NV__500000_invlist[] # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_NV__6_invlist[] = { /* for ASCII/Latin1 */ - 251, /* Number of elements */ + 253, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -389327,6 +424565,8 @@ static const UV UNI_NV__6_invlist[] = { 0x11D57, 0x11DA6, 0x11DA7, + 0x11DE6, + 0x11DE7, 0x11F56, 0x11F57, 0x12404, @@ -389411,7 +424651,7 @@ static const UV UNI_NV__6_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_NV__6_invlist[] = { /* for EBCDIC 1047 */ - 251, /* Number of elements */ + 253, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -389592,6 +424832,8 @@ static const UV UNI_NV__6_invlist[] = { 0x11D57, 0x11DA6, 0x11DA7, + 0x11DE6, + 0x11DE7, 0x11F56, 0x11F57, 0x12404, @@ -389676,7 +424918,7 @@ static const UV UNI_NV__6_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_NV__6_invlist[] = { /* for EBCDIC 037 */ - 251, /* Number of elements */ + 253, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -389857,6 +425099,8 @@ static const UV UNI_NV__6_invlist[] = { 0x11D57, 0x11DA6, 0x11DA7, + 0x11DE6, + 0x11DE7, 0x11F56, 0x11F57, 0x12404, @@ -390036,7 +425280,7 @@ static const UV UNI_NV__600000_invlist[] # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_NV__7_invlist[] = { /* for ASCII/Latin1 */ - 247, /* Number of elements */ + 249, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -390215,6 +425459,8 @@ static const UV UNI_NV__7_invlist[] = { 0x11D58, 0x11DA7, 0x11DA8, + 0x11DE7, + 0x11DE8, 0x11F57, 0x11F58, 0x12405, @@ -390297,7 +425543,7 @@ static const UV UNI_NV__7_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_NV__7_invlist[] = { /* for EBCDIC 1047 */ - 247, /* Number of elements */ + 249, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -390476,6 +425722,8 @@ static const UV UNI_NV__7_invlist[] = { 0x11D58, 0x11DA7, 0x11DA8, + 0x11DE7, + 0x11DE8, 0x11F57, 0x11F58, 0x12405, @@ -390558,7 +425806,7 @@ static const UV UNI_NV__7_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_NV__7_invlist[] = { /* for EBCDIC 037 */ - 247, /* Number of elements */ + 249, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -390737,6 +425985,8 @@ static const UV UNI_NV__7_invlist[] = { 0x11D58, 0x11DA7, 0x11DA8, + 0x11DE7, + 0x11DE8, 0x11F57, 0x11F58, 0x12405, @@ -390942,7 +426192,7 @@ static const UV UNI_NV__700000_invlist[] # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_NV__8_invlist[] = { /* for ASCII/Latin1 */ - 239, /* Number of elements */ + 241, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -391115,6 +426365,8 @@ static const UV UNI_NV__8_invlist[] = { 0x11D59, 0x11DA8, 0x11DA9, + 0x11DE8, + 0x11DE9, 0x11F58, 0x11F59, 0x12406, @@ -391195,7 +426447,7 @@ static const UV UNI_NV__8_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_NV__8_invlist[] = { /* for EBCDIC 1047 */ - 239, /* Number of elements */ + 241, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -391368,6 +426620,8 @@ static const UV UNI_NV__8_invlist[] = { 0x11D59, 0x11DA8, 0x11DA9, + 0x11DE8, + 0x11DE9, 0x11F58, 0x11F59, 0x12406, @@ -391448,7 +426702,7 @@ static const UV UNI_NV__8_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_NV__8_invlist[] = { /* for EBCDIC 037 */ - 239, /* Number of elements */ + 241, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -391621,6 +426875,8 @@ static const UV UNI_NV__8_invlist[] = { 0x11D59, 0x11DA8, 0x11DA9, + 0x11DE8, + 0x11DE9, 0x11F58, 0x11F59, 0x12406, @@ -391792,7 +427048,7 @@ static const UV UNI_NV__800000_invlist[] # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_NV__9_invlist[] = { /* for ASCII/Latin1 */ - 247, /* Number of elements */ + 249, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -391971,6 +427227,8 @@ static const UV UNI_NV__9_invlist[] = { 0x11D5A, 0x11DA9, 0x11DAA, + 0x11DE9, + 0x11DEA, 0x11F59, 0x11F5A, 0x12407, @@ -392053,7 +427311,7 @@ static const UV UNI_NV__9_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_NV__9_invlist[] = { /* for EBCDIC 1047 */ - 247, /* Number of elements */ + 249, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -392232,6 +427490,8 @@ static const UV UNI_NV__9_invlist[] = { 0x11D5A, 0x11DA9, 0x11DAA, + 0x11DE9, + 0x11DEA, 0x11F59, 0x11F5A, 0x12407, @@ -392314,7 +427574,7 @@ static const UV UNI_NV__9_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_NV__9_invlist[] = { /* for EBCDIC 037 */ - 247, /* Number of elements */ + 249, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -392493,6 +427753,8 @@ static const UV UNI_NV__9_invlist[] = { 0x11D5A, 0x11DA9, 0x11DAA, + 0x11DE9, + 0x11DEA, 0x11F59, 0x11F5A, 0x12407, @@ -392678,7 +427940,7 @@ static const UV UNI_NV__900000_invlist[] # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_NV__NAN_invlist[] = { /* for ASCII/Latin1 */ - 453, /* Number of elements */ + 471, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -393047,10 +428309,26 @@ static const UV UNI_NV__NAN_invlist[] = 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x11FC0, 0x11FD5, + 0x12038, + 0x1203A, + 0x12079, + 0x1207A, + 0x12226, + 0x12227, + 0x1222B, + 0x1222C, + 0x1230B, + 0x1230C, + 0x1230D, + 0x1230E, + 0x12399, + 0x1239A, 0x12400, 0x1246F, 0x16130, @@ -393067,6 +428345,8 @@ static const UV UNI_NV__NAN_invlist[] = 0x16D7A, 0x16E80, 0x16E97, + 0x16FF4, + 0x16FF7, 0x1CCF0, 0x1CCFA, 0x1D2C0, @@ -393145,7 +428425,7 @@ static const UV UNI_NV__NAN_invlist[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_NV__NAN_invlist[] = { /* for EBCDIC 1047 */ - 453, /* Number of elements */ + 471, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -393514,10 +428794,26 @@ static const UV UNI_NV__NAN_invlist[] = 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x11FC0, 0x11FD5, + 0x12038, + 0x1203A, + 0x12079, + 0x1207A, + 0x12226, + 0x12227, + 0x1222B, + 0x1222C, + 0x1230B, + 0x1230C, + 0x1230D, + 0x1230E, + 0x12399, + 0x1239A, 0x12400, 0x1246F, 0x16130, @@ -393534,6 +428830,8 @@ static const UV UNI_NV__NAN_invlist[] = 0x16D7A, 0x16E80, 0x16E97, + 0x16FF4, + 0x16FF7, 0x1CCF0, 0x1CCFA, 0x1D2C0, @@ -393612,7 +428910,7 @@ static const UV UNI_NV__NAN_invlist[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_NV__NAN_invlist[] = { /* for EBCDIC 037 */ - 453, /* Number of elements */ + 471, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -393981,10 +429279,26 @@ static const UV UNI_NV__NAN_invlist[] = 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x11FC0, 0x11FD5, + 0x12038, + 0x1203A, + 0x12079, + 0x1207A, + 0x12226, + 0x12227, + 0x1222B, + 0x1222C, + 0x1230B, + 0x1230C, + 0x1230D, + 0x1230E, + 0x12399, + 0x1239A, 0x12400, 0x1246F, 0x16130, @@ -394001,6 +429315,8 @@ static const UV UNI_NV__NAN_invlist[] = 0x16D7A, 0x16E80, 0x16E97, + 0x16FF4, + 0x16FF7, 0x1CCF0, 0x1CCFA, 0x1D2C0, @@ -394244,7 +429560,7 @@ static const UV UNI_OUGR_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_P_invlist[] = { /* for ASCII/Latin1 */ - 397, /* Number of elements */ + 399, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -394545,6 +429861,8 @@ static const UV UNI_P_invlist[] = { /* 0x10D6F, 0x10EAD, 0x10EAE, + 0x10ED0, + 0x10ED1, 0x10F55, 0x10F5A, 0x10F86, @@ -394655,7 +429973,7 @@ static const UV UNI_P_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_P_invlist[] = { /* for EBCDIC 1047 */ - 405, /* Number of elements */ + 407, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -394964,6 +430282,8 @@ static const UV UNI_P_invlist[] = { /* 0x10D6F, 0x10EAD, 0x10EAE, + 0x10ED0, + 0x10ED1, 0x10F55, 0x10F5A, 0x10F86, @@ -395074,7 +430394,7 @@ static const UV UNI_P_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_P_invlist[] = { /* for EBCDIC 037 */ - 403, /* Number of elements */ + 405, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -395381,6 +430701,8 @@ static const UV UNI_P_invlist[] = { /* 0x10D6F, 0x10EAD, 0x10EAE, + 0x10ED0, + 0x10ED1, 0x10F55, 0x10F5A, 0x10F86, @@ -396870,7 +432192,7 @@ static const UV UNI_PLAYINGCARDS_invlist # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_PO_invlist[] = { /* for ASCII/Latin1 */ - 387, /* Number of elements */ + 389, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -397161,6 +432483,8 @@ static const UV UNI_PO_invlist[] = { /* 0x10B40, 0x10B99, 0x10B9D, + 0x10ED0, + 0x10ED1, 0x10F55, 0x10F5A, 0x10F86, @@ -397271,7 +432595,7 @@ static const UV UNI_PO_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_PO_invlist[] = { /* for EBCDIC 1047 */ - 391, /* Number of elements */ + 393, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -397566,6 +432890,8 @@ static const UV UNI_PO_invlist[] = { /* 0x10B40, 0x10B99, 0x10B9D, + 0x10ED0, + 0x10ED1, 0x10F55, 0x10F5A, 0x10F86, @@ -397676,7 +433002,7 @@ static const UV UNI_PO_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_PO_invlist[] = { /* for EBCDIC 037 */ - 391, /* Number of elements */ + 393, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -397971,6 +433297,8 @@ static const UV UNI_PO_invlist[] = { /* 0x10B40, 0x10B99, 0x10B9D, + 0x10ED0, + 0x10ED1, 0x10F55, 0x10F5A, 0x10F86, @@ -398624,8 +433952,6 @@ static const UV UNI_QAAI_invlist[] = { 0x312, 0x313, 0x314, - 0x320, - 0x321, 0x323, 0x326, 0x32D, @@ -398644,7 +433970,9 @@ static const UV UNI_QAAI_invlist[] = { 0x953, 0x955, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1DC2, 0x1DF8, 0x1DF9, @@ -398874,7 +434202,7 @@ static const UV UNI_RUNR_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_S_invlist[] = { /* for ASCII/Latin1 */ - 473, /* Number of elements */ + 485, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -399024,7 +434352,7 @@ static const UV UNI_S_invlist[] = { /* 0x208A, 0x208D, 0x20A0, - 0x20C1, + 0x20C2, 0x2100, 0x2102, 0x2103, @@ -399080,8 +434408,6 @@ static const UV UNI_S_invlist[] = { /* 0x29FE, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -399150,10 +434476,12 @@ static const UV UNI_S_invlist[] = { /* 0xFB29, 0xFB2A, 0xFBB2, - 0xFBC3, + 0xFBD3, 0xFD40, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDD0, 0xFDFC, 0xFE00, @@ -399201,6 +434529,8 @@ static const UV UNI_S_invlist[] = { /* 0x10AC9, 0x10D8E, 0x10D90, + 0x10ED1, + 0x10ED9, 0x1173F, 0x11740, 0x11FD5, @@ -399213,8 +434543,14 @@ static const UV UNI_S_invlist[] = { /* 0x1BC9D, 0x1CC00, 0x1CCF0, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -399304,14 +434640,12 @@ static const UV UNI_S_invlist[] = { /* 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -399331,26 +434665,32 @@ static const UV UNI_S_invlist[] = { /* 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* ASCII/Latin1 */ @@ -399361,7 +434701,7 @@ static const UV UNI_S_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_S_invlist[] = { /* for EBCDIC 1047 */ - 479, /* Number of elements */ + 491, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -399517,7 +434857,7 @@ static const UV UNI_S_invlist[] = { /* 0x208A, 0x208D, 0x20A0, - 0x20C1, + 0x20C2, 0x2100, 0x2102, 0x2103, @@ -399573,8 +434913,6 @@ static const UV UNI_S_invlist[] = { /* 0x29FE, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -399643,10 +434981,12 @@ static const UV UNI_S_invlist[] = { /* 0xFB29, 0xFB2A, 0xFBB2, - 0xFBC3, + 0xFBD3, 0xFD40, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDD0, 0xFDFC, 0xFE00, @@ -399694,6 +435034,8 @@ static const UV UNI_S_invlist[] = { /* 0x10AC9, 0x10D8E, 0x10D90, + 0x10ED1, + 0x10ED9, 0x1173F, 0x11740, 0x11FD5, @@ -399706,8 +435048,14 @@ static const UV UNI_S_invlist[] = { /* 0x1BC9D, 0x1CC00, 0x1CCF0, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -399797,14 +435145,12 @@ static const UV UNI_S_invlist[] = { /* 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -399824,26 +435170,32 @@ static const UV UNI_S_invlist[] = { /* 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* EBCDIC 1047 */ @@ -399854,7 +435206,7 @@ static const UV UNI_S_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_S_invlist[] = { /* for EBCDIC 037 */ - 477, /* Number of elements */ + 489, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -400008,7 +435360,7 @@ static const UV UNI_S_invlist[] = { /* 0x208A, 0x208D, 0x20A0, - 0x20C1, + 0x20C2, 0x2100, 0x2102, 0x2103, @@ -400064,8 +435416,6 @@ static const UV UNI_S_invlist[] = { /* 0x29FE, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -400134,10 +435484,12 @@ static const UV UNI_S_invlist[] = { /* 0xFB29, 0xFB2A, 0xFBB2, - 0xFBC3, + 0xFBD3, 0xFD40, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDD0, 0xFDFC, 0xFE00, @@ -400185,6 +435537,8 @@ static const UV UNI_S_invlist[] = { /* 0x10AC9, 0x10D8E, 0x10D90, + 0x10ED1, + 0x10ED9, 0x1173F, 0x11740, 0x11FD5, @@ -400197,8 +435551,14 @@ static const UV UNI_S_invlist[] = { /* 0x1BC9D, 0x1CC00, 0x1CCF0, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -400288,14 +435648,12 @@ static const UV UNI_S_invlist[] = { /* 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -400315,26 +435673,32 @@ static const UV UNI_S_invlist[] = { /* 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* EBCDIC 037 */ @@ -400756,7 +436120,7 @@ static const UV UNI_SB__CL_invlist[] = { # endif /* EBCDIC 037 */ static const UV UNI_SB__EX_invlist[] = { /* for all charsets */ - 649, /* Number of elements */ + 661, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -401034,7 +436398,9 @@ static const UV UNI_SB__EX_invlist[] = { 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -401169,7 +436535,7 @@ static const UV UNI_SB__EX_invlist[] = { 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -401293,6 +436659,8 @@ static const UV UNI_SB__EX_invlist[] = { 0x11A5C, 0x11A8A, 0x11A9A, + 0x11B60, + 0x11B68, 0x11C2F, 0x11C37, 0x11C38, @@ -401401,6 +436769,14 @@ static const UV UNI_SB__EX_invlist[] = { 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -401544,7 +436920,7 @@ static const UV UNI_SB__FO_invlist[] = { # endif /* EBCDIC 037 */ static const UV UNI_SB__LE_invlist[] = { /* for all charsets */ - 1123, /* Number of elements */ + 1139, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -401554,7 +436930,7 @@ static const UV UNI_SB__LE_invlist[] = { 0x1C0, 0x1C4, 0x294, - 0x295, + 0x296, 0x2B9, 0x2C0, 0x2C6, @@ -401616,7 +436992,7 @@ static const UV UNI_SB__LE_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -401747,7 +437123,7 @@ static const UV UNI_SB__LE_invlist[] = { 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -401765,7 +437141,7 @@ static const UV UNI_SB__LE_invlist[] = { 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -402245,6 +437621,8 @@ static const UV UNI_SB__LE_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -402286,7 +437664,7 @@ static const UV UNI_SB__LE_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -402469,6 +437847,8 @@ static const UV UNI_SB__LE_invlist[] = { 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -402525,12 +437905,14 @@ static const UV UNI_SB__LE_invlist[] = { 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -402575,6 +437957,18 @@ static const UV UNI_SB__LE_invlist[] = { 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -402656,11 +438050,9 @@ static const UV UNI_SB__LE_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -402670,13 +438062,13 @@ static const UV UNI_SB__LE_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_SB__LO_invlist[] = { /* for ASCII/Latin1 */ - 1347, /* Number of elements */ + 1351, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -402975,7 +438367,7 @@ static const UV UNI_SB__LO_invlist[] = { 0x24E, 0x24F, 0x294, - 0x295, + 0x296, 0x2B9, 0x2C0, 0x2C2, @@ -403903,6 +439295,8 @@ static const UV UNI_SB__LO_invlist[] = { 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, 0xA7D3, @@ -403915,7 +439309,7 @@ static const UV UNI_SB__LO_invlist[] = { 0xA7DA, 0xA7DB, 0xA7DC, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F6, 0xA7F7, @@ -403961,6 +439355,8 @@ static const UV UNI_SB__LO_invlist[] = { 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1D41A, 0x1D434, 0x1D44E, @@ -404037,7 +439433,7 @@ static const UV UNI_SB__LO_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_SB__LO_invlist[] = { /* for EBCDIC 1047 */ - 1355, /* Number of elements */ + 1359, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -404344,7 +439740,7 @@ static const UV UNI_SB__LO_invlist[] = { 0x24E, 0x24F, 0x294, - 0x295, + 0x296, 0x2B9, 0x2C0, 0x2C2, @@ -405272,6 +440668,8 @@ static const UV UNI_SB__LO_invlist[] = { 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, 0xA7D3, @@ -405284,7 +440682,7 @@ static const UV UNI_SB__LO_invlist[] = { 0xA7DA, 0xA7DB, 0xA7DC, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F6, 0xA7F7, @@ -405330,6 +440728,8 @@ static const UV UNI_SB__LO_invlist[] = { 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1D41A, 0x1D434, 0x1D44E, @@ -405406,7 +440806,7 @@ static const UV UNI_SB__LO_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_SB__LO_invlist[] = { /* for EBCDIC 037 */ - 1355, /* Number of elements */ + 1359, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -405713,7 +441113,7 @@ static const UV UNI_SB__LO_invlist[] = { 0x24E, 0x24F, 0x294, - 0x295, + 0x296, 0x2B9, 0x2C0, 0x2C2, @@ -406641,6 +442041,8 @@ static const UV UNI_SB__LO_invlist[] = { 0xA7CB, 0xA7CD, 0xA7CE, + 0xA7CF, + 0xA7D0, 0xA7D1, 0xA7D2, 0xA7D3, @@ -406653,7 +442055,7 @@ static const UV UNI_SB__LO_invlist[] = { 0xA7DA, 0xA7DB, 0xA7DC, - 0xA7F2, + 0xA7F1, 0xA7F5, 0xA7F6, 0xA7F7, @@ -406699,6 +442101,8 @@ static const UV UNI_SB__LO_invlist[] = { 0x118E0, 0x16E60, 0x16E80, + 0x16EBB, + 0x16ED4, 0x1D41A, 0x1D434, 0x1D44E, @@ -406772,7 +442176,7 @@ static const UV UNI_SB__LO_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_SB__NU_invlist[] = { /* for ASCII/Latin1 */ - 157, /* Number of elements */ + 159, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -406905,6 +442309,8 @@ static const UV UNI_SB__NU_invlist[] = { 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x16130, @@ -406943,7 +442349,7 @@ static const UV UNI_SB__NU_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_SB__NU_invlist[] = { /* for EBCDIC 1047 */ - 157, /* Number of elements */ + 159, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -407076,6 +442482,8 @@ static const UV UNI_SB__NU_invlist[] = { 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x16130, @@ -407114,7 +442522,7 @@ static const UV UNI_SB__NU_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_SB__NU_invlist[] = { /* for EBCDIC 037 */ - 157, /* Number of elements */ + 159, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -407247,6 +442655,8 @@ static const UV UNI_SB__NU_invlist[] = { 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x16130, @@ -408144,7 +443554,7 @@ static const UV UNI_SB__ST_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_SB__UP_invlist[] = { /* for ASCII/Latin1 */ - 1315, /* Number of elements */ + 1323, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -409359,8 +444769,14 @@ static const UV UNI_SB__UP_invlist[] = { 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -409393,6 +444809,8 @@ static const UV UNI_SB__UP_invlist[] = { 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1D400, 0x1D41A, 0x1D434, @@ -409473,7 +444891,7 @@ static const UV UNI_SB__UP_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_SB__UP_invlist[] = { /* for EBCDIC 1047 */ - 1333, /* Number of elements */ + 1341, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -410706,8 +446124,14 @@ static const UV UNI_SB__UP_invlist[] = { 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -410740,6 +446164,8 @@ static const UV UNI_SB__UP_invlist[] = { 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1D400, 0x1D41A, 0x1D434, @@ -410820,7 +446246,7 @@ static const UV UNI_SB__UP_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_SB__UP_invlist[] = { /* for EBCDIC 037 */ - 1329, /* Number of elements */ + 1337, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -412049,8 +447475,14 @@ static const UV UNI_SB__UP_invlist[] = { 0xA7CA, 0xA7CB, 0xA7CD, + 0xA7CE, + 0xA7CF, 0xA7D0, 0xA7D1, + 0xA7D2, + 0xA7D3, + 0xA7D4, + 0xA7D5, 0xA7D6, 0xA7D7, 0xA7D8, @@ -412083,6 +447515,8 @@ static const UV UNI_SB__UP_invlist[] = { 0x118C0, 0x16E40, 0x16E60, + 0x16EA0, + 0x16EB9, 0x1D400, 0x1D41A, 0x1D434, @@ -412160,7 +447594,7 @@ static const UV UNI_SB__UP_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_SB__XX_invlist[] = { /* for ASCII/Latin1 */ - 1725, /* Number of elements */ + 1735, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -412296,8 +447730,6 @@ static const UV UNI_SB__XX_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, - 0x890, 0x892, 0x897, 0x970, @@ -412473,7 +447905,7 @@ static const UV UNI_SB__XX_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -412499,7 +447931,7 @@ static const UV UNI_SB__XX_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -412724,7 +448156,9 @@ static const UV UNI_SB__XX_invlist[] = { 0x1AA7, 0x1AAC, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -412972,14 +448406,8 @@ static const UV UNI_SB__XX_invlist[] = { 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -413235,6 +448663,8 @@ static const UV UNI_SB__XX_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -413294,8 +448724,8 @@ static const UV UNI_SB__XX_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -413497,6 +448927,8 @@ static const UV UNI_SB__XX_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -413541,6 +448973,10 @@ static const UV UNI_SB__XX_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -413601,6 +449037,10 @@ static const UV UNI_SB__XX_invlist[] = { 0x16E80, 0x16E98, 0x16E99, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -413612,13 +449052,13 @@ static const UV UNI_SB__XX_invlist[] = { 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -413773,6 +449213,12 @@ static const UV UNI_SB__XX_invlist[] = { 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -413868,11 +449314,9 @@ static const UV UNI_SB__XX_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -413882,7 +449326,7 @@ static const UV UNI_SB__XX_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -413899,7 +449343,7 @@ static const UV UNI_SB__XX_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_SB__XX_invlist[] = { /* for EBCDIC 1047 */ - 1745, /* Number of elements */ + 1755, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -414055,8 +449499,6 @@ static const UV UNI_SB__XX_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, - 0x890, 0x892, 0x897, 0x970, @@ -414232,7 +449674,7 @@ static const UV UNI_SB__XX_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -414258,7 +449700,7 @@ static const UV UNI_SB__XX_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -414483,7 +449925,9 @@ static const UV UNI_SB__XX_invlist[] = { 0x1AA7, 0x1AAC, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -414731,14 +450175,8 @@ static const UV UNI_SB__XX_invlist[] = { 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -414994,6 +450432,8 @@ static const UV UNI_SB__XX_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -415053,8 +450493,8 @@ static const UV UNI_SB__XX_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -415256,6 +450696,8 @@ static const UV UNI_SB__XX_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -415300,6 +450742,10 @@ static const UV UNI_SB__XX_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -415360,6 +450806,10 @@ static const UV UNI_SB__XX_invlist[] = { 0x16E80, 0x16E98, 0x16E99, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -415371,13 +450821,13 @@ static const UV UNI_SB__XX_invlist[] = { 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -415532,6 +450982,12 @@ static const UV UNI_SB__XX_invlist[] = { 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -415627,11 +451083,9 @@ static const UV UNI_SB__XX_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -415641,7 +451095,7 @@ static const UV UNI_SB__XX_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -415658,7 +451112,7 @@ static const UV UNI_SB__XX_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_SB__XX_invlist[] = { /* for EBCDIC 037 */ - 1743, /* Number of elements */ + 1753, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -415812,8 +451266,6 @@ static const UV UNI_SB__XX_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, - 0x890, 0x892, 0x897, 0x970, @@ -415989,7 +451441,7 @@ static const UV UNI_SB__XX_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -416015,7 +451467,7 @@ static const UV UNI_SB__XX_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -416240,7 +451692,9 @@ static const UV UNI_SB__XX_invlist[] = { 0x1AA7, 0x1AAC, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -416488,14 +451942,8 @@ static const UV UNI_SB__XX_invlist[] = { 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -416751,6 +452199,8 @@ static const UV UNI_SB__XX_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -416810,8 +452260,8 @@ static const UV UNI_SB__XX_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -417013,6 +452463,8 @@ static const UV UNI_SB__XX_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -417057,6 +452509,10 @@ static const UV UNI_SB__XX_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -417117,6 +452573,10 @@ static const UV UNI_SB__XX_invlist[] = { 0x16E80, 0x16E98, 0x16E99, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -417128,13 +452588,13 @@ static const UV UNI_SB__XX_invlist[] = { 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -417289,6 +452749,12 @@ static const UV UNI_SB__XX_invlist[] = { 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -417384,11 +452850,9 @@ static const UV UNI_SB__XX_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -417398,7 +452862,7 @@ static const UV UNI_SB__XX_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -417440,7 +452904,7 @@ static const UV UNI_SC_invlist[] = { /* 0x17DB, 0x17DC, 0x20A0, - 0x20C1, + 0x20C2, 0xA838, 0xA839, 0xFDFC, @@ -417501,7 +452965,7 @@ static const UV UNI_SC_invlist[] = { /* 0x17DB, 0x17DC, 0x20A0, - 0x20C1, + 0x20C2, 0xA838, 0xA839, 0xFDFC, @@ -417562,7 +453026,7 @@ static const UV UNI_SC_invlist[] = { /* 0x17DB, 0x17DC, 0x20A0, - 0x20C1, + 0x20C2, 0xA838, 0xA839, 0xFDFC, @@ -417612,7 +453076,7 @@ static const UV UNI_SC__AGHB_invlist[] = }; static const UV UNI_SC__ARAB_invlist[] = { /* for all charsets */ - 119, /* Number of elements */ + 113, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -417638,22 +453102,14 @@ static const UV UNI_SC__ARAB_invlist[] = 0x750, 0x780, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x8E2, 0x8E3, 0x900, 0xFB50, - 0xFBC3, - 0xFBD3, 0xFD3E, 0xFD40, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE00, @@ -417664,8 +453120,10 @@ static const UV UNI_SC__ARAB_invlist[] = 0x10E60, 0x10E7F, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F00, 0x1EE00, 0x1EE04, @@ -418400,7 +453858,7 @@ static const UV UNI_SC__GURU_invlist[] = }; static const UV UNI_SC__HAN_invlist[] = { /* for all charsets */ - 45, /* Number of elements */ + 43, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -418430,15 +453888,13 @@ static const UV UNI_SC__HAN_invlist[] = 0x16FE2, 0x16FE4, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -418448,7 +453904,7 @@ static const UV UNI_SC__HAN_invlist[] = 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; static const UV UNI_SC__HANG_invlist[] = { /* for all charsets */ @@ -418655,7 +454111,7 @@ static const UV UNI_SC__KNDA_invlist[] = 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -418680,7 +454136,7 @@ static const UV UNI_SC__KTHI_invlist[] = # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_SC__LATN_invlist[] = { /* for ASCII/Latin1 */ - 79, /* Number of elements */ + 73, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -418732,14 +454188,8 @@ static const UV UNI_SC__LATN_invlist[] = 0xA722, 0xA788, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA800, 0xAB30, 0xAB5B, @@ -418773,7 +454223,7 @@ static const UV UNI_SC__LATN_invlist[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_SC__LATN_invlist[] = { /* for EBCDIC 1047 */ - 105, /* Number of elements */ + 99, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -418851,14 +454301,8 @@ static const UV UNI_SC__LATN_invlist[] = 0xA722, 0xA788, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA800, 0xAB30, 0xAB5B, @@ -418892,7 +454336,7 @@ static const UV UNI_SC__LATN_invlist[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_SC__LATN_invlist[] = { /* for EBCDIC 037 */ - 101, /* Number of elements */ + 95, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -418966,14 +454410,8 @@ static const UV UNI_SC__LATN_invlist[] = 0xA722, 0xA788, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA800, 0xAB30, 0xAB5B, @@ -419235,6 +454673,18 @@ static const UV UNI_SC__NAND_invlist[] = 0x119E5 }; +static const UV UNI_SC__NEWA_invlist[] = { /* for all charsets */ + 5, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x11400, + 0x1145C, + 0x1145D, + 0x11462 +}; + static const UV UNI_SC__NKO_invlist[] = { /* for all charsets */ 5, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -419362,7 +454812,7 @@ static const UV UNI_SC__PHLP_invlist[] = }; static const UV UNI_SC__QAAI_invlist[] = { /* for all charsets */ - 59, /* Number of elements */ + 61, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -419378,7 +454828,9 @@ static const UV UNI_SC__QAAI_invlist[] = 0x951, 0x955, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1CD0, 0x1CD3, 0x1CD4, @@ -419474,13 +454926,15 @@ static const UV UNI_SC__SHAW_invlist[] = }; static const UV UNI_SC__SHRD_invlist[] = { /* for all charsets */ - 3, /* Number of elements */ + 5, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ 0x0, 0x11180, - 0x111E0 + 0x111E0, + 0x11B60, + 0x11B68 }; static const UV UNI_SC__SIND_invlist[] = { /* for all charsets */ @@ -419668,11 +455122,11 @@ static const UV UNI_SC__TANG_invlist[] = 0x16FE0, 0x16FE1, 0x17000, - 0x187F8, - 0x18800, 0x18B00, 0x18D00, - 0x18D09 + 0x18D1F, + 0x18D80, + 0x18DF3 }; static const UV UNI_SC__TELU_invlist[] = { /* for all charsets */ @@ -419699,7 +455153,7 @@ static const UV UNI_SC__TELU_invlist[] = 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -419870,7 +455324,7 @@ static const UV UNI_SC__YI_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_SC__ZYYY_invlist[] = { /* for ASCII/Latin1 */ - 348, /* Number of elements */ + 352, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -419955,7 +455409,7 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x2080, 0x208F, 0x20A0, - 0x20C1, + 0x20C2, 0x2100, 0x2126, 0x2127, @@ -419977,8 +455431,6 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2E00, 0x2E5E, @@ -420071,9 +455523,13 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x1BCA0, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -420171,14 +455627,12 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -420198,26 +455652,30 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0xE0001, 0xE0002, 0xE0020, @@ -420232,7 +455690,7 @@ static const UV UNI_SC__ZYYY_invlist[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_SC__ZYYY_invlist[] = { /* for EBCDIC 1047 */ - 374, /* Number of elements */ + 378, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -420343,7 +455801,7 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x2080, 0x208F, 0x20A0, - 0x20C1, + 0x20C2, 0x2100, 0x2126, 0x2127, @@ -420365,8 +455823,6 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2E00, 0x2E5E, @@ -420459,9 +455915,13 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x1BCA0, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -420559,14 +456019,12 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -420586,26 +456044,30 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0xE0001, 0xE0002, 0xE0020, @@ -420620,7 +456082,7 @@ static const UV UNI_SC__ZYYY_invlist[] = && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_SC__ZYYY_invlist[] = { /* for EBCDIC 037 */ - 370, /* Number of elements */ + 374, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -420727,7 +456189,7 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x2080, 0x208F, 0x20A0, - 0x20C1, + 0x20C2, 0x2100, 0x2126, 0x2127, @@ -420749,8 +456211,6 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2E00, 0x2E5E, @@ -420843,9 +456303,13 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x1BCA0, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -420943,14 +456407,12 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -420970,26 +456432,30 @@ static const UV UNI_SC__ZYYY_invlist[] = 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0xE0001, 0xE0002, 0xE0020, @@ -421262,6 +456728,16 @@ static const UV UNI_SGNW_invlist[] = { 0x1DAB0 }; +static const UV UNI_SHARADASUP_invlist[] = { /* for all charsets */ + 3, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x11B60, + 0x11B80 +}; + # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_SHAW_invlist[] = { /* for ASCII/Latin1 */ @@ -421327,7 +456803,7 @@ static const UV UNI_SHORTHANDFORMATCONTR }; static const UV UNI_SHRD_invlist[] = { /* for all charsets */ - 17, /* Number of elements */ + 23, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -421342,12 +456818,18 @@ static const UV UNI_SHRD_invlist[] = { 0x1CDE, 0x1CE0, 0x1CE1, + 0x1CEA, + 0x1CEB, + 0x1CED, + 0x1CEE, 0xA830, 0xA836, 0xA838, 0xA839, 0x11180, - 0x111E0 + 0x111E0, + 0x11B60, + 0x11B68 }; static const UV UNI_SIDD_invlist[] = { /* for all charsets */ @@ -421362,6 +456844,16 @@ static const UV UNI_SIDD_invlist[] = { 0x115DE }; +static const UV UNI_SIDT_invlist[] = { /* for all charsets */ + 3, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x10940, + 0x1095A +}; + static const UV UNI_SIND_invlist[] = { /* for all charsets */ 9, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -421651,7 +457143,7 @@ static const UV UNI_SK_invlist[] = { /* # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_SM_invlist[] = { /* for ASCII/Latin1 */ - 131, /* Number of elements */ + 135, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -421764,6 +457256,8 @@ static const UV UNI_SM_invlist[] = { /* 0xFFED, 0x10D8E, 0x10D90, + 0x1CEF0, + 0x1CEF1, 0x1D6C1, 0x1D6C2, 0x1D6DB, @@ -421785,7 +457279,9 @@ static const UV UNI_SM_invlist[] = { /* 0x1D7C3, 0x1D7C4, 0x1EEF0, - 0x1EEF2 + 0x1EEF2, + 0x1F8D0, + 0x1F8D9 }; # endif /* ASCII/Latin1 */ @@ -421796,7 +457292,7 @@ static const UV UNI_SM_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_SM_invlist[] = { /* for EBCDIC 1047 */ - 133, /* Number of elements */ + 137, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -421911,6 +457407,8 @@ static const UV UNI_SM_invlist[] = { /* 0xFFED, 0x10D8E, 0x10D90, + 0x1CEF0, + 0x1CEF1, 0x1D6C1, 0x1D6C2, 0x1D6DB, @@ -421932,7 +457430,9 @@ static const UV UNI_SM_invlist[] = { /* 0x1D7C3, 0x1D7C4, 0x1EEF0, - 0x1EEF2 + 0x1EEF2, + 0x1F8D0, + 0x1F8D9 }; # endif /* EBCDIC 1047 */ @@ -421943,7 +457443,7 @@ static const UV UNI_SM_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_SM_invlist[] = { /* for EBCDIC 037 */ - 133, /* Number of elements */ + 137, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -422058,6 +457558,8 @@ static const UV UNI_SM_invlist[] = { /* 0xFFED, 0x10D8E, 0x10D90, + 0x1CEF0, + 0x1CEF1, 0x1D6C1, 0x1D6C2, 0x1D6DB, @@ -422079,7 +457581,9 @@ static const UV UNI_SM_invlist[] = { /* 0x1D7C3, 0x1D7C4, 0x1EEF0, - 0x1EEF2 + 0x1EEF2, + 0x1F8D0, + 0x1F8D9 }; # endif /* EBCDIC 037 */ @@ -422107,7 +457611,7 @@ static const UV UNI_SMALLKANAEXT_invlist # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_SO_invlist[] = { /* for ASCII/Latin1 */ - 375, /* Number of elements */ + 387, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -422271,8 +457775,6 @@ static const UV UNI_SO_invlist[] = { /* 0x2B4D, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -422328,9 +457830,13 @@ static const UV UNI_SO_invlist[] = { /* 0xA83A, 0xAA77, 0xAA7A, + 0xFBC3, + 0xFBD3, 0xFD40, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDD0, 0xFDFD, 0xFE00, @@ -422358,6 +457864,8 @@ static const UV UNI_SO_invlist[] = { /* 0x10879, 0x10AC8, 0x10AC9, + 0x10ED1, + 0x10ED9, 0x1173F, 0x11740, 0x11FD5, @@ -422372,8 +457880,14 @@ static const UV UNI_SO_invlist[] = { /* 0x1BC9D, 0x1CC00, 0x1CCF0, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF0, 0x1CF50, 0x1CFC4, 0x1D000, @@ -422439,14 +457953,12 @@ static const UV UNI_SO_invlist[] = { /* 0x1F300, 0x1F3FB, 0x1F400, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -422467,25 +457979,29 @@ static const UV UNI_SO_invlist[] = { /* 0x1F8C0, 0x1F8C2, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* ASCII/Latin1 */ @@ -422496,7 +458012,7 @@ static const UV UNI_SO_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_SO_invlist[] = { /* for EBCDIC 1047 */ - 375, /* Number of elements */ + 387, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -422660,8 +458176,6 @@ static const UV UNI_SO_invlist[] = { /* 0x2B4D, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -422717,9 +458231,13 @@ static const UV UNI_SO_invlist[] = { /* 0xA83A, 0xAA77, 0xAA7A, + 0xFBC3, + 0xFBD3, 0xFD40, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDD0, 0xFDFD, 0xFE00, @@ -422747,6 +458265,8 @@ static const UV UNI_SO_invlist[] = { /* 0x10879, 0x10AC8, 0x10AC9, + 0x10ED1, + 0x10ED9, 0x1173F, 0x11740, 0x11FD5, @@ -422761,8 +458281,14 @@ static const UV UNI_SO_invlist[] = { /* 0x1BC9D, 0x1CC00, 0x1CCF0, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF0, 0x1CF50, 0x1CFC4, 0x1D000, @@ -422828,14 +458354,12 @@ static const UV UNI_SO_invlist[] = { /* 0x1F300, 0x1F3FB, 0x1F400, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -422856,25 +458380,29 @@ static const UV UNI_SO_invlist[] = { /* 0x1F8C0, 0x1F8C2, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* EBCDIC 1047 */ @@ -422885,7 +458413,7 @@ static const UV UNI_SO_invlist[] = { /* && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_SO_invlist[] = { /* for EBCDIC 037 */ - 375, /* Number of elements */ + 387, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -423049,8 +458577,6 @@ static const UV UNI_SO_invlist[] = { /* 0x2B4D, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2CE5, 0x2CEB, @@ -423106,9 +458632,13 @@ static const UV UNI_SO_invlist[] = { /* 0xA83A, 0xAA77, 0xAA7A, + 0xFBC3, + 0xFBD3, 0xFD40, 0xFD50, - 0xFDCF, + 0xFD90, + 0xFD92, + 0xFDC8, 0xFDD0, 0xFDFD, 0xFE00, @@ -423136,6 +458666,8 @@ static const UV UNI_SO_invlist[] = { /* 0x10879, 0x10AC8, 0x10AC9, + 0x10ED1, + 0x10ED9, 0x1173F, 0x11740, 0x11FD5, @@ -423150,8 +458682,14 @@ static const UV UNI_SO_invlist[] = { /* 0x1BC9D, 0x1CC00, 0x1CCF0, + 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF0, 0x1CF50, 0x1CFC4, 0x1D000, @@ -423217,14 +458755,12 @@ static const UV UNI_SO_invlist[] = { /* 0x1F300, 0x1F3FB, 0x1F400, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -423245,25 +458781,29 @@ static const UV UNI_SO_invlist[] = { /* 0x1F8C0, 0x1F8C2, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBF0 + 0x1FBF0, + 0x1FBFA, + 0x1FBFB }; # endif /* EBCDIC 037 */ @@ -424083,7 +459623,7 @@ static const UV UNI_SYMBOLSFORLEGACYCOMP }; static const UV UNI_SYRC_invlist[] = { /* for all charsets */ - 39, /* Number of elements */ + 37, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -424094,14 +459634,12 @@ static const UV UNI_SYRC_invlist[] = { 0x309, 0x30A, 0x30B, - 0x320, - 0x321, 0x323, 0x326, 0x32D, 0x32F, 0x330, - 0x331, + 0x332, 0x60C, 0x60D, 0x61B, @@ -424307,11 +459845,11 @@ static const UV UNI_TANG_invlist[] = { 0x16FE0, 0x16FE1, 0x17000, - 0x187F8, - 0x18800, 0x18B00, 0x18D00, - 0x18D09 + 0x18D1F, + 0x18D80, + 0x18DF3 }; static const UV UNI_TANGUTCOMPONENTS_invlist[] = { /* for all charsets */ @@ -424324,6 +459862,16 @@ static const UV UNI_TANGUTCOMPONENTS_inv 0x18B00 }; +static const UV UNI_TANGUTCOMPONENTSSUP_invlist[] = { /* for all charsets */ + 3, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x18D80, + 0x18E00 +}; + static const UV UNI_TANGUTSUP_invlist[] = { /* for all charsets */ 3, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -424346,8 +459894,22 @@ static const UV UNI_TAVT_invlist[] = { 0xAAE0 }; +static const UV UNI_TAYO_invlist[] = { /* for all charsets */ + 7, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700 +}; + static const UV UNI_TELU_invlist[] = { /* for all charsets */ - 35, /* Number of elements */ + 39, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -424374,7 +459936,7 @@ static const UV UNI_TELU_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -424382,6 +459944,10 @@ static const UV UNI_TELU_invlist[] = { 0xC70, 0xC77, 0xC80, + 0x1CD5, + 0x1CD7, + 0x1CD8, + 0x1CD9, 0x1CDA, 0x1CDB, 0x1CF2, @@ -425140,10 +460706,10 @@ static const UV UNI_TFNG_invlist[] = { 0x303, 0x304, 0x305, - 0x307, - 0x308, - 0x309, + 0x306, 0x30A, + 0x323, + 0x324, 0x2D30, 0x2D68, 0x2D6F, @@ -425233,7 +460799,7 @@ static const UV UNI_TIBT_invlist[] = { }; static const UV UNI_TIRH_invlist[] = { /* for all charsets */ - 13, /* Number of elements */ + 17, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -425242,6 +460808,10 @@ static const UV UNI_TIRH_invlist[] = { 0x953, 0x964, 0x966, + 0x1CD5, + 0x1CD6, + 0x1CE2, + 0x1CE3, 0x1CF2, 0x1CF3, 0xA830, @@ -425286,6 +460856,18 @@ static const UV UNI_TODR_invlist[] = { 0x105F4 }; +static const UV UNI_TOLS_invlist[] = { /* for all charsets */ + 5, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA +}; + static const UV UNI_TOTO_invlist[] = { /* for all charsets */ 5, /* Number of elements */ 148565664, /* Version and data structure type */ @@ -425391,7 +460973,7 @@ static const UV UNI_UGAR_invlist[] = { }; static const UV UNI_UIDEO_invlist[] = { /* for all charsets */ - 35, /* Number of elements */ + 33, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -425417,11 +460999,9 @@ static const UV UNI_UIDEO_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -425429,7 +461009,7 @@ static const UV UNI_UIDEO_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; static const UV UNI_VAI_invlist[] = { /* for all charsets */ @@ -425489,7 +461069,7 @@ static const UV UNI_VITH_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_VO__R_invlist[] = { /* for ASCII/Latin1 */ - 177, /* Number of elements */ + 181, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -425518,6 +461098,10 @@ static const UV UNI_VO__R_invlist[] = { 0x1900, 0x2016, 0x2017, + 0x2018, + 0x201A, + 0x201C, + 0x201E, 0x2020, 0x2022, 0x2030, @@ -425647,10 +461231,10 @@ static const UV UNI_VO__R_invlist[] = { 0x13000, 0x14680, 0x16FE0, - 0x18D80, + 0x18E00, 0x1AFF0, 0x1B300, - 0x1CF00, + 0x1CEC0, 0x1CFD0, 0x1D000, 0x1D200, @@ -425680,7 +461264,7 @@ static const UV UNI_VO__R_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_VO__R_invlist[] = { /* for EBCDIC 1047 */ - 175, /* Number of elements */ + 179, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -425707,6 +461291,10 @@ static const UV UNI_VO__R_invlist[] = { 0x1900, 0x2016, 0x2017, + 0x2018, + 0x201A, + 0x201C, + 0x201E, 0x2020, 0x2022, 0x2030, @@ -425836,10 +461424,10 @@ static const UV UNI_VO__R_invlist[] = { 0x13000, 0x14680, 0x16FE0, - 0x18D80, + 0x18E00, 0x1AFF0, 0x1B300, - 0x1CF00, + 0x1CEC0, 0x1CFD0, 0x1D000, 0x1D200, @@ -425869,7 +461457,7 @@ static const UV UNI_VO__R_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_VO__R_invlist[] = { /* for EBCDIC 037 */ - 175, /* Number of elements */ + 179, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -425896,6 +461484,10 @@ static const UV UNI_VO__R_invlist[] = { 0x1900, 0x2016, 0x2017, + 0x2018, + 0x201A, + 0x201C, + 0x201E, 0x2020, 0x2022, 0x2030, @@ -426025,10 +461617,10 @@ static const UV UNI_VO__R_invlist[] = { 0x13000, 0x14680, 0x16FE0, - 0x18D80, + 0x18E00, 0x1AFF0, 0x1B300, - 0x1CF00, + 0x1CEC0, 0x1CFD0, 0x1D000, 0x1D200, @@ -426053,11 +461645,15 @@ static const UV UNI_VO__R_invlist[] = { # endif /* EBCDIC 037 */ static const UV UNI_VO__TR_invlist[] = { /* for all charsets */ - 29, /* Number of elements */ + 33, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ 0x0, + 0x2018, + 0x201A, + 0x201C, + 0x201E, 0x2329, 0x232B, 0x3008, @@ -426089,7 +461685,7 @@ static const UV UNI_VO__TR_invlist[] = { }; static const UV UNI_VO__TU_invlist[] = { /* for all charsets */ - 69, /* Number of elements */ + 81, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -426144,6 +461740,10 @@ static const UV UNI_VO__TU_invlist[] = { 0x30F7, 0x3127, 0x3128, + 0x31B4, + 0x31B8, + 0x31BB, + 0x31BC, 0x31F0, 0x3200, 0x32FF, @@ -426160,6 +461760,14 @@ static const UV UNI_VO__TU_invlist[] = { 0xFF0F, 0xFF1F, 0xFF20, + 0x1B132, + 0x1B133, + 0x1B150, + 0x1B153, + 0x1B155, + 0x1B156, + 0x1B164, + 0x1B168, 0x1F200, 0x1F202 }; @@ -426167,7 +461775,7 @@ static const UV UNI_VO__TU_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_VO__U_invlist[] = { /* for ASCII/Latin1 */ - 255, /* Number of elements */ + 267, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -426347,6 +461955,10 @@ static const UV UNI_VO__U_invlist[] = { 0x30FD, 0x3127, 0x3128, + 0x31B4, + 0x31B8, + 0x31BB, + 0x31BC, 0x31F0, 0x3200, 0x32FF, @@ -426401,10 +462013,18 @@ static const UV UNI_VO__U_invlist[] = { 0x13000, 0x14680, 0x16FE0, - 0x18D80, + 0x18E00, 0x1AFF0, + 0x1B132, + 0x1B133, + 0x1B150, + 0x1B153, + 0x1B155, + 0x1B156, + 0x1B164, + 0x1B168, 0x1B300, - 0x1CF00, + 0x1CEC0, 0x1CFD0, 0x1D000, 0x1D200, @@ -426436,7 +462056,7 @@ static const UV UNI_VO__U_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_VO__U_invlist[] = { /* for EBCDIC 1047 */ - 253, /* Number of elements */ + 265, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -426614,6 +462234,10 @@ static const UV UNI_VO__U_invlist[] = { 0x30FD, 0x3127, 0x3128, + 0x31B4, + 0x31B8, + 0x31BB, + 0x31BC, 0x31F0, 0x3200, 0x32FF, @@ -426668,10 +462292,18 @@ static const UV UNI_VO__U_invlist[] = { 0x13000, 0x14680, 0x16FE0, - 0x18D80, + 0x18E00, 0x1AFF0, + 0x1B132, + 0x1B133, + 0x1B150, + 0x1B153, + 0x1B155, + 0x1B156, + 0x1B164, + 0x1B168, 0x1B300, - 0x1CF00, + 0x1CEC0, 0x1CFD0, 0x1D000, 0x1D200, @@ -426703,7 +462335,7 @@ static const UV UNI_VO__U_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_VO__U_invlist[] = { /* for EBCDIC 037 */ - 253, /* Number of elements */ + 265, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -426881,6 +462513,10 @@ static const UV UNI_VO__U_invlist[] = { 0x30FD, 0x3127, 0x3128, + 0x31B4, + 0x31B8, + 0x31BB, + 0x31BC, 0x31F0, 0x3200, 0x32FF, @@ -426935,10 +462571,18 @@ static const UV UNI_VO__U_invlist[] = { 0x13000, 0x14680, 0x16FE0, - 0x18D80, + 0x18E00, 0x1AFF0, + 0x1B132, + 0x1B133, + 0x1B150, + 0x1B153, + 0x1B155, + 0x1B156, + 0x1B164, + 0x1B168, 0x1B300, - 0x1CF00, + 0x1CEC0, 0x1CFD0, 0x1D000, 0x1D200, @@ -427142,7 +462786,7 @@ static const UV UNI_WB__EX_invlist[] = { # endif /* EBCDIC 037 */ static const UV UNI_WB__EXTEND_invlist[] = { /* for all charsets */ - 651, /* Number of elements */ + 663, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -427420,7 +463064,9 @@ static const UV UNI_WB__EXTEND_invlist[] 0x1A7F, 0x1A80, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B05, 0x1B34, @@ -427555,7 +463201,7 @@ static const UV UNI_WB__EXTEND_invlist[] 0x10D6E, 0x10EAB, 0x10EAD, - 0x10EFC, + 0x10EFA, 0x10F00, 0x10F46, 0x10F51, @@ -427679,6 +463325,8 @@ static const UV UNI_WB__EXTEND_invlist[] 0x11A5C, 0x11A8A, 0x11A9A, + 0x11B60, + 0x11B68, 0x11C2F, 0x11C37, 0x11C38, @@ -427787,6 +463435,14 @@ static const UV UNI_WB__EXTEND_invlist[] 0x1E4F0, 0x1E5EE, 0x1E5F0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6F6, 0x1E8D0, 0x1E8D7, 0x1E944, @@ -427960,7 +463616,7 @@ static const UV UNI_WB__KA_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_WB__LE_invlist[] = { /* for ASCII/Latin1 */ - 1191, /* Number of elements */ + 1207, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -427973,6 +463629,8 @@ static const UV UNI_WB__LE_invlist[] = { 0xAB, 0xB5, 0xB6, + 0xB8, + 0xB9, 0xBA, 0xBB, 0xC0, @@ -428062,7 +463720,7 @@ static const UV UNI_WB__LE_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -428193,7 +463851,7 @@ static const UV UNI_WB__LE_invlist[] = { 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -428211,7 +463869,7 @@ static const UV UNI_WB__LE_invlist[] = { 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -428500,14 +464158,8 @@ static const UV UNI_WB__LE_invlist[] = { 0xA6A0, 0xA6F0, 0xA708, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -428695,6 +464347,8 @@ static const UV UNI_WB__LE_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -428740,7 +464394,7 @@ static const UV UNI_WB__LE_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -428921,6 +464575,8 @@ static const UV UNI_WB__LE_invlist[] = { 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -428969,6 +464625,10 @@ static const UV UNI_WB__LE_invlist[] = { 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -429069,6 +464729,18 @@ static const UV UNI_WB__LE_invlist[] = { 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -429165,7 +464837,7 @@ static const UV UNI_WB__LE_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_WB__LE_invlist[] = { /* for EBCDIC 1047 */ - 1217, /* Number of elements */ + 1229, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -429183,8 +464855,6 @@ static const UV UNI_WB__LE_invlist[] = { 0x8C, 0x8F, 0x91, - 0x9D, - 0x9E, 0x9F, 0xA0, 0xA1, @@ -429293,7 +464963,7 @@ static const UV UNI_WB__LE_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -429424,7 +465094,7 @@ static const UV UNI_WB__LE_invlist[] = { 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -429442,7 +465112,7 @@ static const UV UNI_WB__LE_invlist[] = { 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -429731,14 +465401,8 @@ static const UV UNI_WB__LE_invlist[] = { 0xA6A0, 0xA6F0, 0xA708, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -429926,6 +465590,8 @@ static const UV UNI_WB__LE_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -429971,7 +465637,7 @@ static const UV UNI_WB__LE_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -430152,6 +465818,8 @@ static const UV UNI_WB__LE_invlist[] = { 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -430200,6 +465868,10 @@ static const UV UNI_WB__LE_invlist[] = { 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -430300,6 +465972,18 @@ static const UV UNI_WB__LE_invlist[] = { 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -430396,7 +466080,7 @@ static const UV UNI_WB__LE_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_WB__LE_invlist[] = { /* for EBCDIC 037 */ - 1213, /* Number of elements */ + 1225, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -430414,8 +466098,6 @@ static const UV UNI_WB__LE_invlist[] = { 0x8C, 0x8F, 0x91, - 0x9D, - 0x9E, 0x9F, 0xA0, 0xA1, @@ -430520,7 +466202,7 @@ static const UV UNI_WB__LE_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -430651,7 +466333,7 @@ static const UV UNI_WB__LE_invlist[] = { 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -430669,7 +466351,7 @@ static const UV UNI_WB__LE_invlist[] = { 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -430958,14 +466640,8 @@ static const UV UNI_WB__LE_invlist[] = { 0xA6A0, 0xA6F0, 0xA708, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -431153,6 +466829,8 @@ static const UV UNI_WB__LE_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -431198,7 +466876,7 @@ static const UV UNI_WB__LE_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -431379,6 +467057,8 @@ static const UV UNI_WB__LE_invlist[] = { 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -431427,6 +467107,10 @@ static const UV UNI_WB__LE_invlist[] = { 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -431527,6 +467211,18 @@ static const UV UNI_WB__LE_invlist[] = { 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -431968,7 +467664,7 @@ static const UV UNI_WB__NL_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_WB__NU_invlist[] = { /* for ASCII/Latin1 */ - 157, /* Number of elements */ + 159, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -432101,6 +467797,8 @@ static const UV UNI_WB__NU_invlist[] = { 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x16130, @@ -432139,7 +467837,7 @@ static const UV UNI_WB__NU_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_WB__NU_invlist[] = { /* for EBCDIC 1047 */ - 157, /* Number of elements */ + 159, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -432272,6 +467970,8 @@ static const UV UNI_WB__NU_invlist[] = { 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x16130, @@ -432310,7 +468010,7 @@ static const UV UNI_WB__NU_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_WB__NU_invlist[] = { /* for EBCDIC 037 */ - 157, /* Number of elements */ + 159, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -432443,6 +468143,8 @@ static const UV UNI_WB__NU_invlist[] = { 0x11D5A, 0x11DA0, 0x11DAA, + 0x11DE0, + 0x11DEA, 0x11F50, 0x11F5A, 0x16130, @@ -432604,7 +468306,7 @@ static const UV UNI_WB__WSEGSPACE_invlis # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_WB__XX_invlist[] = { /* for ASCII/Latin1 */ - 1605, /* Number of elements */ + 1617, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -432638,7 +468340,7 @@ static const UV UNI_WB__XX_invlist[] = { 0xB5, 0xB6, 0xB7, - 0xB8, + 0xB9, 0xBA, 0xBB, 0xC0, @@ -432728,8 +468430,6 @@ static const UV UNI_WB__XX_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, - 0x890, 0x892, 0x897, 0x964, @@ -432907,7 +468607,7 @@ static const UV UNI_WB__XX_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -432933,7 +468633,7 @@ static const UV UNI_WB__XX_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -433144,7 +468844,9 @@ static const UV UNI_WB__XX_invlist[] = { 0x1A90, 0x1A9A, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -433346,14 +469048,8 @@ static const UV UNI_WB__XX_invlist[] = { 0xA67F, 0xA6F2, 0xA708, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -433603,6 +469299,8 @@ static const UV UNI_WB__XX_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -433660,8 +469358,8 @@ static const UV UNI_WB__XX_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -433849,6 +469547,8 @@ static const UV UNI_WB__XX_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -433893,6 +469593,10 @@ static const UV UNI_WB__XX_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -433951,6 +469655,10 @@ static const UV UNI_WB__XX_invlist[] = { 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -434113,6 +469821,12 @@ static const UV UNI_WB__XX_invlist[] = { 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -434223,7 +469937,7 @@ static const UV UNI_WB__XX_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_WB__XX_invlist[] = { /* for EBCDIC 1047 */ - 1629, /* Number of elements */ + 1639, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -434261,8 +469975,6 @@ static const UV UNI_WB__XX_invlist[] = { 0x8C, 0x8F, 0x91, - 0x9D, - 0x9E, 0x9F, 0xA0, 0xA1, @@ -434371,8 +470083,6 @@ static const UV UNI_WB__XX_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, - 0x890, 0x892, 0x897, 0x964, @@ -434550,7 +470260,7 @@ static const UV UNI_WB__XX_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -434576,7 +470286,7 @@ static const UV UNI_WB__XX_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -434787,7 +470497,9 @@ static const UV UNI_WB__XX_invlist[] = { 0x1A90, 0x1A9A, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -434989,14 +470701,8 @@ static const UV UNI_WB__XX_invlist[] = { 0xA67F, 0xA6F2, 0xA708, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -435246,6 +470952,8 @@ static const UV UNI_WB__XX_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -435303,8 +471011,8 @@ static const UV UNI_WB__XX_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -435492,6 +471200,8 @@ static const UV UNI_WB__XX_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -435536,6 +471246,10 @@ static const UV UNI_WB__XX_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -435594,6 +471308,10 @@ static const UV UNI_WB__XX_invlist[] = { 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -435756,6 +471474,12 @@ static const UV UNI_WB__XX_invlist[] = { 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -435866,7 +471590,7 @@ static const UV UNI_WB__XX_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_WB__XX_invlist[] = { /* for EBCDIC 037 */ - 1625, /* Number of elements */ + 1635, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -435904,8 +471628,6 @@ static const UV UNI_WB__XX_invlist[] = { 0x8C, 0x8F, 0x91, - 0x9D, - 0x9E, 0x9F, 0xA0, 0xA1, @@ -436010,8 +471732,6 @@ static const UV UNI_WB__XX_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, - 0x890, 0x892, 0x897, 0x964, @@ -436189,7 +471909,7 @@ static const UV UNI_WB__XX_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -436215,7 +471935,7 @@ static const UV UNI_WB__XX_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -436426,7 +472146,9 @@ static const UV UNI_WB__XX_invlist[] = { 0x1A90, 0x1A9A, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -436628,14 +472350,8 @@ static const UV UNI_WB__XX_invlist[] = { 0xA67F, 0xA6F2, 0xA708, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -436885,6 +472601,8 @@ static const UV UNI_WB__XX_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -436942,8 +472660,8 @@ static const UV UNI_WB__XX_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -437131,6 +472849,8 @@ static const UV UNI_WB__XX_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -437175,6 +472895,10 @@ static const UV UNI_WB__XX_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -437233,6 +472957,10 @@ static const UV UNI_WB__XX_invlist[] = { 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -437395,6 +473123,12 @@ static const UV UNI_WB__XX_invlist[] = { 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -437514,7 +473248,7 @@ static const UV UNI_WCHO_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_XIDC_invlist[] = { /* for ASCII/Latin1 */ - 1601, /* Number of elements */ + 1613, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -437624,7 +473358,7 @@ static const UV UNI_XIDC_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -437803,7 +473537,7 @@ static const UV UNI_XIDC_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -437829,7 +473563,7 @@ static const UV UNI_XIDC_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -438056,7 +473790,9 @@ static const UV UNI_XIDC_invlist[] = { 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -438242,14 +473978,8 @@ static const UV UNI_XIDC_invlist[] = { 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -438493,6 +474223,8 @@ static const UV UNI_XIDC_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -438550,8 +474282,8 @@ static const UV UNI_XIDC_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -438739,6 +474471,8 @@ static const UV UNI_XIDC_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -438783,6 +474517,10 @@ static const UV UNI_XIDC_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -438843,6 +474581,10 @@ static const UV UNI_XIDC_invlist[] = { 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -438854,13 +474596,13 @@ static const UV UNI_XIDC_invlist[] = { 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -439015,6 +474757,12 @@ static const UV UNI_XIDC_invlist[] = { 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -439102,11 +474850,9 @@ static const UV UNI_XIDC_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -439116,7 +474862,7 @@ static const UV UNI_XIDC_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -439129,7 +474875,7 @@ static const UV UNI_XIDC_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_XIDC_invlist[] = { /* for EBCDIC 1047 */ - 1625, /* Number of elements */ + 1637, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -439263,7 +475009,7 @@ static const UV UNI_XIDC_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -439442,7 +475188,7 @@ static const UV UNI_XIDC_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -439468,7 +475214,7 @@ static const UV UNI_XIDC_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -439695,7 +475441,9 @@ static const UV UNI_XIDC_invlist[] = { 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -439881,14 +475629,8 @@ static const UV UNI_XIDC_invlist[] = { 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -440132,6 +475874,8 @@ static const UV UNI_XIDC_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -440189,8 +475933,8 @@ static const UV UNI_XIDC_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -440378,6 +476122,8 @@ static const UV UNI_XIDC_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -440422,6 +476168,10 @@ static const UV UNI_XIDC_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -440482,6 +476232,10 @@ static const UV UNI_XIDC_invlist[] = { 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -440493,13 +476247,13 @@ static const UV UNI_XIDC_invlist[] = { 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -440654,6 +476408,12 @@ static const UV UNI_XIDC_invlist[] = { 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -440741,11 +476501,9 @@ static const UV UNI_XIDC_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -440755,7 +476513,7 @@ static const UV UNI_XIDC_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -440768,7 +476526,7 @@ static const UV UNI_XIDC_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_XIDC_invlist[] = { /* for EBCDIC 037 */ - 1621, /* Number of elements */ + 1633, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -440898,7 +476656,7 @@ static const UV UNI_XIDC_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x897, 0x8E2, 0x8E3, @@ -441077,7 +476835,7 @@ static const UV UNI_XIDC_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -441103,7 +476861,7 @@ static const UV UNI_XIDC_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -441330,7 +477088,9 @@ static const UV UNI_XIDC_invlist[] = { 0x1AB0, 0x1ABE, 0x1ABF, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B50, @@ -441516,14 +477276,8 @@ static const UV UNI_XIDC_invlist[] = { 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA828, 0xA82C, 0xA82D, @@ -441767,6 +477521,8 @@ static const UV UNI_XIDC_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -441824,8 +477580,8 @@ static const UV UNI_XIDC_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10EFA, 0x10F1D, 0x10F27, 0x10F28, @@ -442013,6 +477769,8 @@ static const UV UNI_XIDC_invlist[] = { 0x11A9E, 0x11AB0, 0x11AF9, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE1, 0x11BF0, @@ -442057,6 +477815,10 @@ static const UV UNI_XIDC_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF7, 0x11F00, @@ -442117,6 +477879,10 @@ static const UV UNI_XIDC_invlist[] = { 0x16D7A, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -442128,13 +477894,13 @@ static const UV UNI_XIDC_invlist[] = { 0x16FE3, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -442289,6 +478055,12 @@ static const UV UNI_XIDC_invlist[] = { 0x1E4FA, 0x1E5D0, 0x1E5FB, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -442376,11 +478148,9 @@ static const UV UNI_XIDC_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -442390,7 +478160,7 @@ static const UV UNI_XIDC_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0100, 0xE01F0 }; @@ -442400,7 +478170,7 @@ static const UV UNI_XIDC_invlist[] = { # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_XIDS_invlist[] = { /* for ASCII/Latin1 */ - 1369, /* Number of elements */ + 1383, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -442506,7 +478276,7 @@ static const UV UNI_XIDS_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -442637,7 +478407,7 @@ static const UV UNI_XIDS_invlist[] = { 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -442655,7 +478425,7 @@ static const UV UNI_XIDS_invlist[] = { 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -443020,14 +478790,8 @@ static const UV UNI_XIDS_invlist[] = { 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -443273,6 +479037,8 @@ static const UV UNI_XIDS_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -443318,7 +479084,7 @@ static const UV UNI_XIDS_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -443503,6 +479269,8 @@ static const UV UNI_XIDS_invlist[] = { 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -443551,6 +479319,10 @@ static const UV UNI_XIDS_invlist[] = { 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -443561,12 +479333,14 @@ static const UV UNI_XIDS_invlist[] = { 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -443675,6 +479449,18 @@ static const UV UNI_XIDS_invlist[] = { 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -443758,11 +479544,9 @@ static const UV UNI_XIDS_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -443772,7 +479556,7 @@ static const UV UNI_XIDS_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* ASCII/Latin1 */ @@ -443783,7 +479567,7 @@ static const UV UNI_XIDS_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_XIDS_invlist[] = { /* for EBCDIC 1047 */ - 1395, /* Number of elements */ + 1409, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -443915,7 +479699,7 @@ static const UV UNI_XIDS_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -444046,7 +479830,7 @@ static const UV UNI_XIDS_invlist[] = { 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -444064,7 +479848,7 @@ static const UV UNI_XIDS_invlist[] = { 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -444429,14 +480213,8 @@ static const UV UNI_XIDS_invlist[] = { 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -444682,6 +480460,8 @@ static const UV UNI_XIDS_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -444727,7 +480507,7 @@ static const UV UNI_XIDS_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -444912,6 +480692,8 @@ static const UV UNI_XIDS_invlist[] = { 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -444960,6 +480742,10 @@ static const UV UNI_XIDS_invlist[] = { 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -444970,12 +480756,14 @@ static const UV UNI_XIDS_invlist[] = { 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -445084,6 +480872,18 @@ static const UV UNI_XIDS_invlist[] = { 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -445167,11 +480967,9 @@ static const UV UNI_XIDS_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -445181,7 +480979,7 @@ static const UV UNI_XIDS_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 1047 */ @@ -445192,7 +480990,7 @@ static const UV UNI_XIDS_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_XIDS_invlist[] = { /* for EBCDIC 037 */ - 1391, /* Number of elements */ + 1405, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -445320,7 +481118,7 @@ static const UV UNI_XIDS_invlist[] = { 0x870, 0x888, 0x889, - 0x88F, + 0x890, 0x8A0, 0x8CA, 0x904, @@ -445451,7 +481249,7 @@ static const UV UNI_XIDS_invlist[] = { 0xC3E, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC62, @@ -445469,7 +481267,7 @@ static const UV UNI_XIDS_invlist[] = { 0xCBA, 0xCBD, 0xCBE, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE2, @@ -445834,14 +481632,8 @@ static const UV UNI_XIDS_invlist[] = { 0xA722, 0xA789, 0xA78B, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA802, 0xA803, 0xA806, @@ -446087,6 +481879,8 @@ static const UV UNI_XIDS_invlist[] = { 0x10916, 0x10920, 0x1093A, + 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BE, @@ -446132,7 +481926,7 @@ static const UV UNI_XIDS_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, + 0x10EC8, 0x10F00, 0x10F1D, 0x10F27, @@ -446317,6 +482111,8 @@ static const UV UNI_XIDS_invlist[] = { 0x11D8A, 0x11D98, 0x11D99, + 0x11DB0, + 0x11DDC, 0x11EE0, 0x11EF3, 0x11F02, @@ -446365,6 +482161,10 @@ static const UV UNI_XIDS_invlist[] = { 0x16D6D, 0x16E40, 0x16E80, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F50, @@ -446375,12 +482175,14 @@ static const UV UNI_XIDS_invlist[] = { 0x16FE2, 0x16FE3, 0x16FE4, + 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -446489,6 +482291,18 @@ static const UV UNI_XIDS_invlist[] = { 0x1E5EE, 0x1E5F0, 0x1E5F1, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6E3, + 0x1E6E4, + 0x1E6E6, + 0x1E6E7, + 0x1E6EE, + 0x1E6F0, + 0x1E6F5, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -446572,11 +482386,9 @@ static const UV UNI_XIDS_invlist[] = { 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -446586,7 +482398,7 @@ static const UV UNI_XIDS_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0 + 0x3347A }; # endif /* EBCDIC 037 */ @@ -446902,7 +482714,7 @@ static const UV UNI_ZS_invlist[] = { /* # if 'A' == 65 /* ASCII/Latin1 */ static const UV UNI_ZYYY_invlist[] = { /* for ASCII/Latin1 */ - 318, /* Number of elements */ + 322, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -446975,7 +482787,7 @@ static const UV UNI_ZYYY_invlist[] = { 0x2080, 0x208F, 0x20A0, - 0x20C1, + 0x20C2, 0x2100, 0x2126, 0x2127, @@ -446997,8 +482809,6 @@ static const UV UNI_ZYYY_invlist[] = { 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2E00, 0x2E17, @@ -447075,9 +482885,13 @@ static const UV UNI_ZYYY_invlist[] = { 0x101D0, 0x101FD, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -447173,14 +482987,12 @@ static const UV UNI_ZYYY_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -447200,26 +483012,30 @@ static const UV UNI_ZYYY_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0xE0001, 0xE0002, 0xE0020, @@ -447234,7 +483050,7 @@ static const UV UNI_ZYYY_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 static const UV UNI_ZYYY_invlist[] = { /* for EBCDIC 1047 */ - 344, /* Number of elements */ + 348, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -447333,7 +483149,7 @@ static const UV UNI_ZYYY_invlist[] = { 0x2080, 0x208F, 0x20A0, - 0x20C1, + 0x20C2, 0x2100, 0x2126, 0x2127, @@ -447355,8 +483171,6 @@ static const UV UNI_ZYYY_invlist[] = { 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2E00, 0x2E17, @@ -447433,9 +483247,13 @@ static const UV UNI_ZYYY_invlist[] = { 0x101D0, 0x101FD, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -447531,14 +483349,12 @@ static const UV UNI_ZYYY_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -447558,26 +483374,30 @@ static const UV UNI_ZYYY_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0xE0001, 0xE0002, 0xE0020, @@ -447592,7 +483412,7 @@ static const UV UNI_ZYYY_invlist[] = { && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 static const UV UNI_ZYYY_invlist[] = { /* for EBCDIC 037 */ - 340, /* Number of elements */ + 344, /* Number of elements */ 148565664, /* Version and data structure type */ 0, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -447687,7 +483507,7 @@ static const UV UNI_ZYYY_invlist[] = { 0x2080, 0x208F, 0x20A0, - 0x20C1, + 0x20C2, 0x2100, 0x2126, 0x2127, @@ -447709,8 +483529,6 @@ static const UV UNI_ZYYY_invlist[] = { 0x2900, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2C00, 0x2E00, 0x2E17, @@ -447787,9 +483605,13 @@ static const UV UNI_ZYYY_invlist[] = { 0x101D0, 0x101FD, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF50, 0x1CFC4, 0x1D000, @@ -447885,14 +483707,12 @@ static const UV UNI_ZYYY_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -447912,26 +483732,30 @@ static const UV UNI_ZYYY_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0xE0001, 0xE0002, 0xE0020, @@ -447941,7 +483765,7 @@ static const UV UNI_ZYYY_invlist[] = { # endif /* EBCDIC 037 */ static const UV UNI_ZZZZ_invlist[] = { /* for all charsets */ - 1458, /* Number of elements */ + 1466, /* Number of elements */ 148565664, /* Version and data structure type */ 1, /* 0 if the list starts at 0; 1 if it starts at the element beyond 0 */ @@ -447988,8 +483812,6 @@ static const UV UNI_ZZZZ_invlist[] = { 0x860, 0x86B, 0x870, - 0x88F, - 0x890, 0x892, 0x897, 0x984, @@ -448157,7 +483979,7 @@ static const UV UNI_ZZZZ_invlist[] = { 0xC57, 0xC58, 0xC5B, - 0xC5D, + 0xC5C, 0xC5E, 0xC60, 0xC64, @@ -448181,7 +484003,7 @@ static const UV UNI_ZZZZ_invlist[] = { 0xCCE, 0xCD5, 0xCD7, - 0xCDD, + 0xCDC, 0xCDF, 0xCE0, 0xCE4, @@ -448372,7 +484194,9 @@ static const UV UNI_ZZZZ_invlist[] = { 0x1AA0, 0x1AAE, 0x1AB0, - 0x1ACF, + 0x1ADE, + 0x1AE0, + 0x1AEC, 0x1B00, 0x1B4D, 0x1B4E, @@ -448430,7 +484254,7 @@ static const UV UNI_ZZZZ_invlist[] = { 0x2090, 0x209D, 0x20A0, - 0x20C1, + 0x20C2, 0x20D0, 0x20F1, 0x2100, @@ -448442,8 +484266,6 @@ static const UV UNI_ZZZZ_invlist[] = { 0x2460, 0x2B74, 0x2B76, - 0x2B96, - 0x2B97, 0x2CF4, 0x2CF9, 0x2D26, @@ -448504,14 +484326,8 @@ static const UV UNI_ZZZZ_invlist[] = { 0xA640, 0xA6F8, 0xA700, - 0xA7CE, - 0xA7D0, - 0xA7D2, - 0xA7D3, - 0xA7D4, - 0xA7D5, 0xA7DD, - 0xA7F2, + 0xA7F1, 0xA82D, 0xA830, 0xA83A, @@ -448582,12 +484398,6 @@ static const UV UNI_ZZZZ_invlist[] = { 0xFB43, 0xFB45, 0xFB46, - 0xFBC3, - 0xFBD3, - 0xFD90, - 0xFD92, - 0xFDC8, - 0xFDCF, 0xFDD0, 0xFDF0, 0xFE1A, @@ -448730,7 +484540,7 @@ static const UV UNI_ZZZZ_invlist[] = { 0x1091F, 0x1093A, 0x1093F, - 0x10940, + 0x1095A, 0x10980, 0x109B8, 0x109BC, @@ -448794,8 +484604,10 @@ static const UV UNI_ZZZZ_invlist[] = { 0x10EB0, 0x10EB2, 0x10EC2, - 0x10EC5, - 0x10EFC, + 0x10EC8, + 0x10ED0, + 0x10ED9, + 0x10EFA, 0x10F28, 0x10F30, 0x10F5A, @@ -448961,6 +484773,8 @@ static const UV UNI_ZZZZ_invlist[] = { 0x11AF9, 0x11B00, 0x11B0A, + 0x11B60, + 0x11B68, 0x11BC0, 0x11BE2, 0x11BF0, @@ -449005,6 +484819,10 @@ static const UV UNI_ZZZZ_invlist[] = { 0x11D99, 0x11DA0, 0x11DAA, + 0x11DB0, + 0x11DDC, + 0x11DE0, + 0x11DEA, 0x11EE0, 0x11EF9, 0x11F00, @@ -449063,6 +484881,10 @@ static const UV UNI_ZZZZ_invlist[] = { 0x16D7A, 0x16E40, 0x16E9B, + 0x16EA0, + 0x16EB9, + 0x16EBB, + 0x16ED4, 0x16F00, 0x16F4B, 0x16F4F, @@ -449072,13 +484894,13 @@ static const UV UNI_ZZZZ_invlist[] = { 0x16FE0, 0x16FE5, 0x16FF0, - 0x16FF2, + 0x16FF7, 0x17000, - 0x187F8, - 0x18800, 0x18CD6, 0x18CFF, - 0x18D09, + 0x18D1F, + 0x18D80, + 0x18DF3, 0x1AFF0, 0x1AFF4, 0x1AFF5, @@ -449108,9 +484930,13 @@ static const UV UNI_ZZZZ_invlist[] = { 0x1BC9C, 0x1BCA4, 0x1CC00, - 0x1CCFA, + 0x1CCFD, 0x1CD00, 0x1CEB4, + 0x1CEBA, + 0x1CED1, + 0x1CEE0, + 0x1CEF1, 0x1CF00, 0x1CF2E, 0x1CF30, @@ -449217,6 +485043,12 @@ static const UV UNI_ZZZZ_invlist[] = { 0x1E5FB, 0x1E5FF, 0x1E600, + 0x1E6C0, + 0x1E6DF, + 0x1E6E0, + 0x1E6F6, + 0x1E6FE, + 0x1E700, 0x1E7E0, 0x1E7E7, 0x1E7E8, @@ -449332,14 +485164,12 @@ static const UV UNI_ZZZZ_invlist[] = { 0x1F260, 0x1F266, 0x1F300, - 0x1F6D8, + 0x1F6D9, 0x1F6DC, 0x1F6ED, 0x1F6F0, 0x1F6FD, 0x1F700, - 0x1F777, - 0x1F77B, 0x1F7DA, 0x1F7E0, 0x1F7EC, @@ -449359,34 +485189,36 @@ static const UV UNI_ZZZZ_invlist[] = { 0x1F8BC, 0x1F8C0, 0x1F8C2, + 0x1F8D0, + 0x1F8D9, 0x1F900, - 0x1FA54, + 0x1FA58, 0x1FA60, 0x1FA6E, 0x1FA70, 0x1FA7D, 0x1FA80, - 0x1FA8A, - 0x1FA8F, + 0x1FA8B, + 0x1FA8E, 0x1FAC7, - 0x1FACE, + 0x1FAC8, + 0x1FAC9, + 0x1FACD, 0x1FADD, 0x1FADF, - 0x1FAEA, - 0x1FAF0, + 0x1FAEB, + 0x1FAEF, 0x1FAF9, 0x1FB00, 0x1FB93, 0x1FB94, - 0x1FBFA, + 0x1FBFB, 0x20000, 0x2A6E0, 0x2A700, - 0x2B73A, - 0x2B740, 0x2B81E, 0x2B820, - 0x2CEA2, + 0x2CEAE, 0x2CEB0, 0x2EBE1, 0x2EBF0, @@ -449396,7 +485228,7 @@ static const UV UNI_ZZZZ_invlist[] = { 0x30000, 0x3134B, 0x31350, - 0x323B0, + 0x3347A, 0xE0001, 0xE0002, 0xE0020, @@ -449539,6 +485371,56 @@ static const UV UNI__PERL_SURROGATE_invl 0xE000 }; +static const UV UNI__PERL_WORD_BUT_NONCONT_invlist[] = { /* for all charsets */ + 43, /* Number of elements */ + 148565664, /* Version and data structure type */ + 1, /* 0 if the list starts at 0; + 1 if it starts at the element beyond 0 */ + 0x0, + 0x37A, + 0x37B, + 0x488, + 0x48A, + 0x1ABE, + 0x1ABF, + 0x20DD, + 0x20E1, + 0x20E2, + 0x20E5, + 0x24B6, + 0x24EA, + 0x2E2F, + 0x2E30, + 0xA670, + 0xA673, + 0xFC5E, + 0xFC64, + 0xFDFA, + 0xFDFC, + 0xFE70, + 0xFE71, + 0xFE72, + 0xFE73, + 0xFE74, + 0xFE75, + 0xFE76, + 0xFE77, + 0xFE78, + 0xFE79, + 0xFE7A, + 0xFE7B, + 0xFE7C, + 0xFE7D, + 0xFE7E, + 0xFE7F, + 0x1F130, + 0x1F14A, + 0x1F150, + 0x1F16A, + 0x1F170, + 0x1F18A +}; + const char * const deprecated_property_msgs[] = { "", "Surrogates should never appear in well-formed text, and therefore shouldn't be the basis for line breaking", @@ -449565,6 +485447,7 @@ typedef enum { UNI_AGE__15, UNI_AGE__15_DOT_1, UNI_AGE__16, + UNI_AGE__17, UNI_AGE__2, UNI_AGE__2_DOT_1, UNI_AGE__3, @@ -449634,6 +485517,7 @@ typedef enum { UNI_BC__S, UNI_BC__WS, UNI_BENG, + UNI_BERF, UNI_BHKS, UNI_BIDIC, UNI_BIDIM, @@ -449733,6 +485617,7 @@ typedef enum { UNI_CJKEXTG, UNI_CJKEXTH, UNI_CJKEXTI, + UNI_CJKEXTJ, UNI_CJKRADICALSSUP, UNI_CJKSTROKES, UNI_CJKSYMBOLS, @@ -449902,6 +485787,7 @@ typedef enum { UNI_INBASSAVAH, UNI_INBATAK, UNI_INBENGALI, + UNI_INBERIAERFE, UNI_INBHAIKSUKI, UNI_INBOPOMOFO, UNI_INBRAHMI, @@ -450066,7 +485952,9 @@ typedef enum { UNI_INSC__VOWEL, UNI_INSC__VOWELDEPENDENT, UNI_INSC__VOWELINDEPENDENT, + UNI_INSHARADA, UNI_INSIDDHAM, + UNI_INSIDETIC, UNI_INSINHALA, UNI_INSOGDIAN, UNI_INSORASOMPENG, @@ -450080,6 +485968,7 @@ typedef enum { UNI_INTAILE, UNI_INTAITHAM, UNI_INTAIVIET, + UNI_INTAIYO, UNI_INTAKRI, UNI_INTAMIL, UNI_INTANGSA, @@ -450091,6 +485980,7 @@ typedef enum { UNI_INTIFINAGH, UNI_INTIRHUTA, UNI_INTODHRI, + UNI_INTOLONGSIKI, UNI_INTOTO, UNI_INTULUTIGALARI, UNI_INUGARITIC, @@ -450110,6 +486000,7 @@ typedef enum { UNI_IN__15, UNI_IN__15_DOT_1, UNI_IN__16, + UNI_IN__17, UNI_IN__1_DOT_1, UNI_IN__2, UNI_IN__2_DOT_1, @@ -450230,6 +486121,7 @@ typedef enum { UNI_JG__TAW, UNI_JG__TEHMARBUTA, UNI_JG__TETH, + UNI_JG__THINNOON, UNI_JG__THINYEH, UNI_JG__VERTICALTAIL, UNI_JG__WAW, @@ -450257,6 +486149,9 @@ typedef enum { UNI_KANGXI, UNI_KATAKANAEXT, UNI_KAWI, + UNI_KEHCORE__C, + UNI_KEHCORE__L, + UNI_KEHCORE__N, UNI_KEHNOMIRROR, UNI_KEHNOROTATE, UNI_KHAR, @@ -450299,6 +486194,7 @@ typedef enum { UNI_LB__GL, UNI_LB__H2, UNI_LB__H3, + UNI_LB__HH, UNI_LB__HL, UNI_LB__HY, UNI_LB__ID, @@ -450363,6 +486259,7 @@ typedef enum { UNI_MISCMATHSYMBOLSB, UNI_MISCPICTOGRAPHS, UNI_MISCSYMBOLS, + UNI_MISCSYMBOLSSUP, UNI_MISCTECHNICAL, UNI_MLYM, UNI_MN, @@ -450678,6 +486575,7 @@ typedef enum { UNI_SC__MULT, UNI_SC__MYMR, UNI_SC__NAND, + UNI_SC__NEWA, UNI_SC__NKO, UNI_SC__ONAO, UNI_SC__ORKH, @@ -450719,10 +486617,12 @@ typedef enum { UNI_SC__ZYYY, UNI_SD, UNI_SGNW, + UNI_SHARADASUP, UNI_SHAW, UNI_SHORTHANDFORMATCONTROLS, UNI_SHRD, UNI_SIDD, + UNI_SIDT, UNI_SIND, UNI_SINH, UNI_SINHALAARCHAICNUMBERS, @@ -450766,8 +486666,10 @@ typedef enum { UNI_TAML, UNI_TANG, UNI_TANGUTCOMPONENTS, + UNI_TANGUTCOMPONENTSSUP, UNI_TANGUTSUP, UNI_TAVT, + UNI_TAYO, UNI_TELU, UNI_TERM, UNI_TFNG, @@ -450779,6 +486681,7 @@ typedef enum { UNI_TITLE, UNI_TNSA, UNI_TODR, + UNI_TOLS, UNI_TOTO, UNI_TRANSPORTANDMAP, UNI_TUTG, @@ -450858,10 +486761,11 @@ typedef enum { UNI__PERL_PROBLEMATIC_LOCALE_FOLDEDS_START, UNI__PERL_PROBLEMATIC_LOCALE_FOLDS, UNI__PERL_QUOTEMETA, - UNI__PERL_SURROGATE + UNI__PERL_SURROGATE, + UNI__PERL_WORD_BUT_NONCONT } binary_invlist_enum; -#define MAX_UNI_KEYWORD_INDEX UNI__PERL_SURROGATE +#define MAX_UNI_KEYWORD_INDEX UNI__PERL_WORD_BUT_NONCONT #endif /* defined(PERL_IN_REGCOMP_C) */ @@ -450880,6 +486784,7 @@ static const UV * const uni_prop_ptrs[] UNI_AGE__15_invlist, UNI_AGE__15_DOT_1_invlist, UNI_AGE__16_invlist, + UNI_AGE__17_invlist, UNI_AGE__2_invlist, UNI_AGE__2_DOT_1_invlist, UNI_AGE__3_invlist, @@ -450949,6 +486854,7 @@ static const UV * const uni_prop_ptrs[] UNI_BC__S_invlist, UNI_BC__WS_invlist, UNI_BENG_invlist, + UNI_BERF_invlist, UNI_BHKS_invlist, UNI_BIDIC_invlist, UNI_BIDIM_invlist, @@ -451048,6 +486954,7 @@ static const UV * const uni_prop_ptrs[] UNI_CJKEXTG_invlist, UNI_CJKEXTH_invlist, UNI_CJKEXTI_invlist, + UNI_CJKEXTJ_invlist, UNI_CJKRADICALSSUP_invlist, UNI_CJKSTROKES_invlist, UNI_CJKSYMBOLS_invlist, @@ -451217,6 +487124,7 @@ static const UV * const uni_prop_ptrs[] UNI_INBASSAVAH_invlist, UNI_INBATAK_invlist, UNI_INBENGALI_invlist, + UNI_INBERIAERFE_invlist, UNI_INBHAIKSUKI_invlist, UNI_INBOPOMOFO_invlist, UNI_INBRAHMI_invlist, @@ -451381,7 +487289,9 @@ static const UV * const uni_prop_ptrs[] UNI_INSC__VOWEL_invlist, UNI_INSC__VOWELDEPENDENT_invlist, UNI_INSC__VOWELINDEPENDENT_invlist, + UNI_INSHARADA_invlist, UNI_INSIDDHAM_invlist, + UNI_INSIDETIC_invlist, UNI_INSINHALA_invlist, UNI_INSOGDIAN_invlist, UNI_INSORASOMPENG_invlist, @@ -451395,6 +487305,7 @@ static const UV * const uni_prop_ptrs[] UNI_INTAILE_invlist, UNI_INTAITHAM_invlist, UNI_INTAIVIET_invlist, + UNI_INTAIYO_invlist, UNI_INTAKRI_invlist, UNI_INTAMIL_invlist, UNI_INTANGSA_invlist, @@ -451406,6 +487317,7 @@ static const UV * const uni_prop_ptrs[] UNI_INTIFINAGH_invlist, UNI_INTIRHUTA_invlist, UNI_INTODHRI_invlist, + UNI_INTOLONGSIKI_invlist, UNI_INTOTO_invlist, UNI_INTULUTIGALARI_invlist, UNI_INUGARITIC_invlist, @@ -451425,6 +487337,7 @@ static const UV * const uni_prop_ptrs[] UNI_IN__15_invlist, UNI_IN__15_DOT_1_invlist, UNI_IN__16_invlist, + UNI_IN__17_invlist, UNI_IN__1_DOT_1_invlist, UNI_IN__2_invlist, UNI_IN__2_DOT_1_invlist, @@ -451545,6 +487458,7 @@ static const UV * const uni_prop_ptrs[] UNI_JG__TAW_invlist, UNI_JG__TEHMARBUTA_invlist, UNI_JG__TETH_invlist, + UNI_JG__THINNOON_invlist, UNI_JG__THINYEH_invlist, UNI_JG__VERTICALTAIL_invlist, UNI_JG__WAW_invlist, @@ -451572,6 +487486,9 @@ static const UV * const uni_prop_ptrs[] UNI_KANGXI_invlist, UNI_KATAKANAEXT_invlist, UNI_KAWI_invlist, + UNI_KEHCORE__C_invlist, + UNI_KEHCORE__L_invlist, + UNI_KEHCORE__N_invlist, UNI_KEHNOMIRROR_invlist, UNI_KEHNOROTATE_invlist, UNI_KHAR_invlist, @@ -451614,6 +487531,7 @@ static const UV * const uni_prop_ptrs[] UNI_LB__GL_invlist, UNI_LB__H2_invlist, UNI_LB__H3_invlist, + UNI_LB__HH_invlist, UNI_LB__HL_invlist, UNI_LB__HY_invlist, UNI_LB__ID_invlist, @@ -451678,6 +487596,7 @@ static const UV * const uni_prop_ptrs[] UNI_MISCMATHSYMBOLSB_invlist, UNI_MISCPICTOGRAPHS_invlist, UNI_MISCSYMBOLS_invlist, + UNI_MISCSYMBOLSSUP_invlist, UNI_MISCTECHNICAL_invlist, UNI_MLYM_invlist, UNI_MN_invlist, @@ -451993,6 +487912,7 @@ static const UV * const uni_prop_ptrs[] UNI_SC__MULT_invlist, UNI_SC__MYMR_invlist, UNI_SC__NAND_invlist, + UNI_SC__NEWA_invlist, UNI_SC__NKO_invlist, UNI_SC__ONAO_invlist, UNI_SC__ORKH_invlist, @@ -452034,10 +487954,12 @@ static const UV * const uni_prop_ptrs[] UNI_SC__ZYYY_invlist, UNI_SD_invlist, UNI_SGNW_invlist, + UNI_SHARADASUP_invlist, UNI_SHAW_invlist, UNI_SHORTHANDFORMATCONTROLS_invlist, UNI_SHRD_invlist, UNI_SIDD_invlist, + UNI_SIDT_invlist, UNI_SIND_invlist, UNI_SINH_invlist, UNI_SINHALAARCHAICNUMBERS_invlist, @@ -452081,8 +488003,10 @@ static const UV * const uni_prop_ptrs[] UNI_TAML_invlist, UNI_TANG_invlist, UNI_TANGUTCOMPONENTS_invlist, + UNI_TANGUTCOMPONENTSSUP_invlist, UNI_TANGUTSUP_invlist, UNI_TAVT_invlist, + UNI_TAYO_invlist, UNI_TELU_invlist, UNI_TERM_invlist, UNI_TFNG_invlist, @@ -452094,6 +488018,7 @@ static const UV * const uni_prop_ptrs[] UNI_TITLE_invlist, UNI_TNSA_invlist, UNI_TODR_invlist, + UNI_TOLS_invlist, UNI_TOTO_invlist, UNI_TRANSPORTANDMAP_invlist, UNI_TUTG_invlist, @@ -452173,7 +488098,8 @@ static const UV * const uni_prop_ptrs[] UNI__PERL_PROBLEMATIC_LOCALE_FOLDEDS_START_invlist, UNI__PERL_PROBLEMATIC_LOCALE_FOLDS_invlist, UNI__PERL_QUOTEMETA_invlist, - UNI__PERL_SURROGATE_invlist + UNI__PERL_SURROGATE_invlist, + UNI__PERL_WORD_BUT_NONCONT_invlist }; #endif /* (defined(PERL_IN_REGCOMP_C) && ! defined(PERL_IN_XSUB_RE)) */ @@ -452255,6 +488181,7 @@ static const char * const UNI_age_values "15.0", "15.1", "16.0", + "17.0", "NA", "na", "Unassigned", @@ -452268,6 +488195,7 @@ static const char * const UNI_age_values "V15_0", "V15_1", "V16_0", + "V17_0", "V1_1", "V2_0", "V2_1", @@ -452296,6 +488224,7 @@ static const char * const UNI_age_values "v150", "v151", "v160", + "v170", "v20", "v21", "v30", @@ -452528,6 +488457,9 @@ static const char * const UNI_blk_values "batak", "Bengali", "bengali", + "Beria Erfe", + "Beria_Erfe", + "beriaerfe", "Bhaiksuki", "bhaiksuki", "Block Elements", @@ -452622,6 +488554,8 @@ static const char * const UNI_blk_values "cjkexth", "CJK_Ext_I", "cjkexti", + "CJK_Ext_J", + "cjkextj", "CJK_Radicals_Sup", "cjkradicalssup", "CJK Radicals Supplement", @@ -452665,6 +488599,9 @@ static const char * const UNI_blk_values "CJK Unified Ideographs Extension I", "CJK_Unified_Ideographs_Extension_I", "cjkunifiedideographsextensioni", + "CJK Unified Ideographs Extension J", + "CJK_Unified_Ideographs_Extension_J", + "cjkunifiedideographsextensionj", "Combining Diacritical Marks", "Combining_Diacritical_Marks", "combiningdiacriticalmarks", @@ -453187,6 +489124,9 @@ static const char * const UNI_blk_values "Miscellaneous Symbols and Pictographs", "Miscellaneous_Symbols_And_Pictographs", "miscellaneoussymbolsandpictographs", + "Miscellaneous Symbols Supplement", + "Miscellaneous_Symbols_Supplement", + "miscellaneoussymbolssupplement", "Miscellaneous Technical", "Miscellaneous_Technical", "miscellaneoustechnical", @@ -453198,6 +489138,8 @@ static const char * const UNI_blk_values "miscpictographs", "Misc_Symbols", "miscsymbols", + "Misc_Symbols_Sup", + "miscsymbolssup", "Misc_Technical", "misctechnical", "Modi", @@ -453376,6 +489318,11 @@ static const char * const UNI_blk_values "saurashtra", "Sharada", "sharada", + "Sharada_Sup", + "sharadasup", + "Sharada Supplement", + "Sharada_Supplement", + "sharadasupplement", "Shavian", "shavian", "Shorthand Format Controls", @@ -453383,6 +489330,8 @@ static const char * const UNI_blk_values "shorthandformatcontrols", "Siddham", "siddham", + "Sidetic", + "sidetic", "Sinhala", "sinhala", "Sinhala Archaic Numbers", @@ -453510,6 +489459,9 @@ static const char * const UNI_blk_values "Tai Xuan Jing Symbols", "Tai_Xuan_Jing_Symbols", "taixuanjingsymbols", + "Tai Yo", + "Tai_Yo", + "taiyo", "Takri", "takri", "Tamil", @@ -453526,6 +489478,11 @@ static const char * const UNI_blk_values "Tangut Components", "Tangut_Components", "tangutcomponents", + "Tangut_Components_Sup", + "tangutcomponentssup", + "Tangut Components Supplement", + "Tangut_Components_Supplement", + "tangutcomponentssupplement", "Tangut_Sup", "tangutsup", "Tangut Supplement", @@ -453545,6 +489502,9 @@ static const char * const UNI_blk_values "tirhuta", "Todhri", "todhri", + "Tolong Siki", + "Tolong_Siki", + "tolongsiki", "Toto", "toto", "Transport_And_Map", @@ -454269,6 +490229,8 @@ static const char * const UNI_inpc_value "leftandright", "NA", "na", + "Not_Applicable", + "notapplicable", "Overstruck", "overstruck", "Right", @@ -454563,6 +490525,8 @@ static const char * const UNI_jg_values[ "tehmarbutagoal", "Teth", "teth", + "Thin_Noon", + "thinnoon", "Thin_Yeh", "thinyeh", "Vertical_Tail", @@ -454614,6 +490578,16 @@ static const char * const UNI_jt_values[ NULL }; +static const char * const UNI_kehcore_values[] = { + "C", + "c", + "L", + "l", + "N", + "n", + NULL +}; + static const char * const UNI_lb_values[] = { "AI", "ai", @@ -454699,6 +490673,8 @@ static const char * const UNI_lb_values[ "h3", "Hebrew_Letter", "hebrewletter", + "HH", + "hh", "HL", "hl", "HY", @@ -454775,6 +490751,8 @@ static const char * const UNI_lb_values[ "surrogate", "SY", "sy", + "Unambiguous_Hyphen", + "unambiguoushyphen", "Unknown", "unknown", "VF", @@ -455100,6 +491078,10 @@ static const char * const UNI_sc_values[ "beng", "Bengali", "bengali", + "Berf", + "berf", + "Beria_Erfe", + "beriaerfe", "Bhaiksuki", "bhaiksuki", "Bhks", @@ -455578,6 +491560,10 @@ static const char * const UNI_sc_values[ "sidd", "Siddham", "siddham", + "Sidetic", + "sidetic", + "Sidt", + "sidt", "SignWriting", "signwriting", "Sind", @@ -455628,6 +491614,8 @@ static const char * const UNI_sc_values[ "taitham", "Tai_Viet", "taiviet", + "Tai_Yo", + "taiyo", "Takr", "takr", "Takri", @@ -455648,6 +491636,8 @@ static const char * const UNI_sc_values[ "tangut", "Tavt", "tavt", + "Tayo", + "tayo", "Telu", "telu", "Telugu", @@ -455678,6 +491668,10 @@ static const char * const UNI_sc_values[ "todhri", "Todr", "todr", + "Tolong_Siki", + "tolongsiki", + "Tols", + "tols", "Toto", "toto", "Tulu_Tigalari", @@ -455857,6 +491851,7 @@ UNI_inpc_values, UNI_insc_values, UNI_jg_values, UNI_jt_values, +UNI_kehcore_values, UNI_lb_values, UNI_nfcqc_values, UNI_nfdqc_values, @@ -455925,37 +491920,38 @@ UNI_wb_values #define UNI_jg_values_index 17 #define UNI_joinc_values_index UNI_ahex_values_index #define UNI_jt_values_index 18 +#define UNI_kehcore_values_index 19 #define UNI_kehnomirror_values_index UNI_ahex_values_index #define UNI_kehnorotate_values_index UNI_ahex_values_index -#define UNI_lb_values_index 19 +#define UNI_lb_values_index 20 #define UNI_loe_values_index UNI_ahex_values_index #define UNI_lower_values_index UNI_ahex_values_index #define UNI_math_values_index UNI_ahex_values_index #define UNI_mcm_values_index UNI_ahex_values_index #define UNI_nchar_values_index UNI_ahex_values_index -#define UNI_nfcqc_values_index 20 -#define UNI_nfdqc_values_index 21 +#define UNI_nfcqc_values_index 21 +#define UNI_nfdqc_values_index 22 #define UNI_nfkcqc_values_index UNI_nfcqc_values_index #define UNI_nfkdqc_values_index UNI_nfdqc_values_index -#define UNI_nt_values_index 22 -#define UNI_nv_values_index 23 +#define UNI_nt_values_index 23 +#define UNI_nv_values_index 24 #define UNI_patsyn_values_index UNI_ahex_values_index #define UNI_patws_values_index UNI_ahex_values_index #define UNI_pcm_values_index UNI_ahex_values_index #define UNI_qmark_values_index UNI_ahex_values_index #define UNI_radical_values_index UNI_ahex_values_index #define UNI_ri_values_index UNI_ahex_values_index -#define UNI_sb_values_index 24 -#define UNI_sc_values_index 25 +#define UNI_sb_values_index 25 +#define UNI_sc_values_index 26 #define UNI_scx_values_index UNI_sc_values_index #define UNI_sd_values_index UNI_ahex_values_index #define UNI_sterm_values_index UNI_ahex_values_index #define UNI_term_values_index UNI_ahex_values_index #define UNI_uideo_values_index UNI_ahex_values_index #define UNI_upper_values_index UNI_ahex_values_index -#define UNI_vo_values_index 26 +#define UNI_vo_values_index 27 #define UNI_vs_values_index UNI_ahex_values_index -#define UNI_wb_values_index 27 +#define UNI_wb_values_index 28 #define UNI_wspace_values_index UNI_ahex_values_index #define UNI_xidc_values_index UNI_ahex_values_index #define UNI_xids_values_index UNI_ahex_values_index @@ -456094,13 +492090,13 @@ static const U8 GCB_dfa_table[] = { #define isLB_Aksara_Start(x) (x == 3) #define isLB_Alphabetic(x) (isLB_scratch = (x), isLB_scratch == 0 || isLB_scratch == 15 || isLB_scratch == 16 || isLB_scratch == 33) #define isLB_B2(x) (x == 4) -#define isLB_BA(x) (isLB_scratch = (x), isLB_scratch == 5 || isLB_scratch == 17 || isLB_scratch == 62) +#define isLB_BA(x) (isLB_scratch = (x), isLB_scratch == 5 || isLB_scratch == 17) #define isLB_BB(x) (x == 6) #define isLB_BK(x) (x == 7) -#define isLB_Break_After(x) (isLB_scratch = (x), isLB_scratch == 5 || isLB_scratch == 17 || isLB_scratch == 62) +#define isLB_Break_After(x) (isLB_scratch = (x), isLB_scratch == 5 || isLB_scratch == 17) #define isLB_Break_Before(x) (x == 6) #define isLB_Break_Both(x) (x == 4) -#define isLB_Break_Symbols(x) (x == 61) +#define isLB_Break_Symbols(x) (x == 62) #define isLB_CB(x) (x == 8) #define isLB_CEE(x) (x == 9) #define isLB_CEF(x) (x == 10) @@ -456119,7 +492115,7 @@ static const U8 GCB_dfa_table[] = { #define isLB_DCA(x) (x == 15) #define isLB_Dotted_Circle(x) (x == 15) #define isLB_Dotted_Circle_AL(x) (x == 15) -#define isLB_EA(x) (isLB_scratch = (x), isLB_scratch == 16 || isLB_scratch == 17 || isLB_scratch == 18 || isLB_scratch == 19 || isLB_scratch == 20 || isLB_scratch == 21 || isLB_scratch == 22 || isLB_scratch == 23 || isLB_scratch == 24 || isLB_scratch == 25 || isLB_scratch == 26 || isLB_scratch == 27 || isLB_scratch == 28 || isLB_scratch == 30 || isLB_scratch == 31 || isLB_scratch == 32 || isLB_scratch == 39 || isLB_scratch == 40 || isLB_scratch == 46) +#define isLB_EA(x) (isLB_scratch = (x), isLB_scratch == 16 || isLB_scratch == 17 || isLB_scratch == 18 || isLB_scratch == 19 || isLB_scratch == 20 || isLB_scratch == 21 || isLB_scratch == 22 || isLB_scratch == 23 || isLB_scratch == 24 || isLB_scratch == 25 || isLB_scratch == 26 || isLB_scratch == 27 || isLB_scratch == 28 || isLB_scratch == 30 || isLB_scratch == 31 || isLB_scratch == 32 || isLB_scratch == 39 || isLB_scratch == 40 || isLB_scratch == 47) #define isLB_EAA(x) (x == 16) #define isLB_EAB(x) (x == 17) #define isLB_EAC(x) (x == 18) @@ -456173,50 +492169,49 @@ static const U8 GCB_dfa_table[] = { #define isLB_Glue(x) (isLB_scratch = (x), isLB_scratch == 20 || isLB_scratch == 38) #define isLB_H2(x) (x == 39) #define isLB_H3(x) (x == 40) -#define isLB_HL(x) (x == 41) -#define isLB_HY(x) (x == 42) -#define isLB_Hebrew_Letter(x) (x == 41) -#define isLB_Hyphen(x) (x == 42) -#define isLB_ID(x) (isLB_scratch = (x), isLB_scratch == 21 || isLB_scratch == 35 || isLB_scratch == 43) -#define isLB_IN(x) (isLB_scratch = (x), isLB_scratch == 23 || isLB_scratch == 44) -#define isLB_IS(x) (x == 45) -#define isLB_Ideographic(x) (isLB_scratch = (x), isLB_scratch == 21 || isLB_scratch == 35 || isLB_scratch == 43) -#define isLB_Infix_Numeric(x) (x == 45) -#define isLB_Inseparable(x) (isLB_scratch = (x), isLB_scratch == 23 || isLB_scratch == 44) -#define isLB_JL(x) (x == 46) -#define isLB_JT(x) (x == 47) -#define isLB_JV(x) (x == 48) -#define isLB_LF(x) (x == 49) -#define isLB_Line_Feed(x) (x == 49) +#define isLB_HH(x) (x == 41) +#define isLB_HL(x) (x == 42) +#define isLB_HY(x) (x == 43) +#define isLB_Hebrew_Letter(x) (x == 42) +#define isLB_Hyphen(x) (x == 43) +#define isLB_ID(x) (isLB_scratch = (x), isLB_scratch == 21 || isLB_scratch == 35 || isLB_scratch == 44) +#define isLB_IN(x) (isLB_scratch = (x), isLB_scratch == 23 || isLB_scratch == 45) +#define isLB_IS(x) (x == 46) +#define isLB_Ideographic(x) (isLB_scratch = (x), isLB_scratch == 21 || isLB_scratch == 35 || isLB_scratch == 44) +#define isLB_Infix_Numeric(x) (x == 46) +#define isLB_Inseparable(x) (isLB_scratch = (x), isLB_scratch == 23 || isLB_scratch == 45) +#define isLB_JL(x) (x == 47) +#define isLB_JT(x) (x == 48) +#define isLB_JV(x) (x == 49) +#define isLB_LF(x) (x == 50) +#define isLB_Line_Feed(x) (x == 50) #define isLB_Mandatory_Break(x) (x == 7) -#define isLB_NL(x) (x == 50) -#define isLB_NS(x) (isLB_scratch = (x), isLB_scratch == 27 || isLB_scratch == 36 || isLB_scratch == 51) -#define isLB_NU(x) (x == 52) -#define isLB_Next_Line(x) (x == 50) -#define isLB_Nonstarter(x) (isLB_scratch = (x), isLB_scratch == 27 || isLB_scratch == 36 || isLB_scratch == 51) -#define isLB_Numeric(x) (x == 52) -#define isLB_OP(x) (isLB_scratch = (x), isLB_scratch == 24 || isLB_scratch == 53) -#define isLB_Open_Punctuation(x) (isLB_scratch = (x), isLB_scratch == 24 || isLB_scratch == 53) -#define isLB_PO(x) (isLB_scratch = (x), isLB_scratch == 25 || isLB_scratch == 56) -#define isLB_PR(x) (isLB_scratch = (x), isLB_scratch == 26 || isLB_scratch == 57) -#define isLB_Pf(x) (x == 54) -#define isLB_PfQ(x) (x == 54) -#define isLB_Pf_QU(x) (x == 54) -#define isLB_Pi(x) (x == 55) -#define isLB_PiQ(x) (x == 55) -#define isLB_Pi_QU(x) (x == 55) -#define isLB_Postfix_Numeric(x) (isLB_scratch = (x), isLB_scratch == 25 || isLB_scratch == 56) -#define isLB_Prefix_Numeric(x) (isLB_scratch = (x), isLB_scratch == 26 || isLB_scratch == 57) -#define isLB_QU(x) (isLB_scratch = (x), isLB_scratch == 54 || isLB_scratch == 55 || isLB_scratch == 58) -#define isLB_Quotation(x) (isLB_scratch = (x), isLB_scratch == 54 || isLB_scratch == 55 || isLB_scratch == 58) -#define isLB_RI(x) (x == 59) -#define isLB_Regional_Indicator(x) (x == 59) -#define isLB_SP(x) (x == 60) -#define isLB_SY(x) (x == 61) -#define isLB_Space(x) (x == 60) -#define isLB_U2010(x) (x == 62) -#define isLB_U2010_BA(x) (x == 62) -#define isLB_UBA(x) (x == 62) +#define isLB_NL(x) (x == 51) +#define isLB_NS(x) (isLB_scratch = (x), isLB_scratch == 27 || isLB_scratch == 36 || isLB_scratch == 52) +#define isLB_NU(x) (x == 53) +#define isLB_Next_Line(x) (x == 51) +#define isLB_Nonstarter(x) (isLB_scratch = (x), isLB_scratch == 27 || isLB_scratch == 36 || isLB_scratch == 52) +#define isLB_Numeric(x) (x == 53) +#define isLB_OP(x) (isLB_scratch = (x), isLB_scratch == 24 || isLB_scratch == 54) +#define isLB_Open_Punctuation(x) (isLB_scratch = (x), isLB_scratch == 24 || isLB_scratch == 54) +#define isLB_PO(x) (isLB_scratch = (x), isLB_scratch == 25 || isLB_scratch == 57) +#define isLB_PR(x) (isLB_scratch = (x), isLB_scratch == 26 || isLB_scratch == 58) +#define isLB_Pf(x) (x == 55) +#define isLB_PfQ(x) (x == 55) +#define isLB_Pf_QU(x) (x == 55) +#define isLB_Pi(x) (x == 56) +#define isLB_PiQ(x) (x == 56) +#define isLB_Pi_QU(x) (x == 56) +#define isLB_Postfix_Numeric(x) (isLB_scratch = (x), isLB_scratch == 25 || isLB_scratch == 57) +#define isLB_Prefix_Numeric(x) (isLB_scratch = (x), isLB_scratch == 26 || isLB_scratch == 58) +#define isLB_QU(x) (isLB_scratch = (x), isLB_scratch == 55 || isLB_scratch == 56 || isLB_scratch == 59) +#define isLB_Quotation(x) (isLB_scratch = (x), isLB_scratch == 55 || isLB_scratch == 56 || isLB_scratch == 59) +#define isLB_RI(x) (x == 60) +#define isLB_Regional_Indicator(x) (x == 60) +#define isLB_SP(x) (x == 61) +#define isLB_SY(x) (x == 62) +#define isLB_Space(x) (x == 61) +#define isLB_Unambiguous_Hyphen(x) (x == 41) #define isLB_VF(x) (x == 63) #define isLB_VI(x) (x == 64) #define isLB_Virama(x) (x == 64) @@ -456246,8 +492241,8 @@ static const U8 GCB_dfa_table[] = { #define LB_B2_then_SP_v_B2 10 #define LB_any_v_QU_then_nonEA_or_eot 11 #define LB_nonEA_or_sot_then_QU_v_any 12 -#define LB_various_then_HY_or_U2010_v_AL 13 -#define LB_HL_then_HY_or_BA_sans_EA_v_nonHL 14 +#define LB_various_then_HY_or_HH_v_AL_or_HL 13 +#define LB_HL_then_HY_or_HH_v_nonHL 14 #define LB_NU_then_SY_or_IS_then_CL_or_CP_v_PO_or_PR 15 #define LB_PO_or_PR_v_OP_then_IS_then_NU 16 #define LB_NU_then_SY_or_IS_v_NU 17 @@ -456258,150 +492253,150 @@ static const U8 GCB_dfa_table[] = { static const U8 LB_table[70][70] = { /* The comment rows give Unicode's rule number that applies to the cell immediately above it, except it is left blank for cells populated by the table's default rule. ^ and $ stand for their respective edges; 'CEE' stands for - * 'Cn_ExtPict_ExtPict_AL'; 'CEF' stands for 'Cn_ExtPict_ExtPict_ID'; 'DCA' stands for 'Dotted_Circle_AL'; 'EAA' stands for 'EA_AL'; 'EAB' stands for 'EA_BA'; 'EAC' stands for 'EA_CL'; 'EAE' stands for 'EA_EB'; 'EAG' stands for 'EA_GL'; 'EAI' - * stands for 'EA_ID'; 'EAM' stands for 'EA_CM'; 'EAN' stands for 'EA_IN'; 'EAO' stands for 'EA_OP'; 'EAP' stands for 'EA_PO'; 'EAR' stands for 'EA_PR'; 'EAS' stands for 'EA_NS'; 'EAX' stands for 'EA_EX'; 'EEA' stands for 'EA_ExtPict_AL'; - * 'EEI' stands for 'EA_ExtPict_ID'; 'EPA' stands for 'ExtPict_AL'; 'EPE' stands for 'ExtPict_EX'; 'EPI' stands for 'ExtPict_ID'; 'EPN' stands for 'ExtPict_NS'; 'PfQ' stands for 'Pf_QU'; 'PiQ' stands for 'Pi_QU'; 'UBA' stands for 'U2010_BA'; - * u stands for "unused in this Unicode release" (and the data in its row and column are garbage). See perluniprops for the rest */ -/* AL AK AP AS B2 BA BB BK CB CEE CEF CL CM CP CR DCA EAA EAB EAC EAE EAG EAI EAM EAN EAO EAP EAR EAS EAX EB EEA EEI EM EPA EPE EPI EPN EX GL H2 H3 HL HY ID IN IS JL JT JV LF NL NS NU OP PfQ PiQ PO PR QU RI SP SY UBA VF VI WJ ZW ZWJ $ u */ -/* AL*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 28 13 21 13 12 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 21 11 7 9 3 -/* AK*/ { 1, 5, 1, 5, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 5, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, -// 28 28 21 6 20 13 9 13 6 28a 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 28 28 11 7 9 3 -/* AP*/ { 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 28 28 21 6 20 13 9 13 6 28a 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 11 7 9 3 -/* AS*/ { 1, 5, 1, 5, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 5, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, -// 28 28 21 6 20 13 9 13 6 28a 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 28 28 11 7 9 3 -/* B2*/ { 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 17 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 11 7 9 3 -/* BA*/ {14,14,14,14,14, 0,14, 0, 1, 14, 14, 0, 0, 0, 0, 14, 14, 0, 0, 14, 14, 14, 0, 0, 14, 14, 14, 0, 0,14, 14, 14,14, 14, 0, 14, 0, 0,14,14,14, 1, 0,14, 0, 0,14,14,14, 0, 0, 0,14,14, 0, 0,14,14, 0,14, 0, 0, 0,14,14, 0, 0, 0,1,0 }, -// 21 21 21 21 21 21 21 6 20 21a 21a 13 9 13 6 21a 21a 21 13 21a 21a 21a 9 22 21a 21a 21a 21 13 21 21a 21a 21 21a 13 21a 21 13 21 21 21 21 21 22 15 21 21 21 6 6 21 21 21 19 19a 21 21 19 21 7 13 21 21 21 11 7 9 3 -/* BB*/ { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, -// 21 21 21 21 21 21 21 6 20 21 21 13 9 13 6 21 21 21 13 21 12a 21 9 21 21 21 21 21 13 21 21 21 21 21 13 21 21 13 12 21 21 21 21 21 21 15 21 21 21 6 6 21 21 21 19 19a 21 21 19 21 7 13 21 21 21 11 7 9 3 -/* BK*/ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,1,0 }, -// 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 -/* CB*/ { 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0,1,0 }, -// 20 20 20 20 20 20 20 6 20 20 20 13 9 13 6 20 20 20 13 20 12a 20 9 20 20 20 20 20 13 20 20 20 20 20 13 20 20 13 12 20 20 20 20 20 20 15 20 20 20 6 6 20 20 20 19 19a 20 20 19 20 7 13 20 20 20 11 7 9 3 -/*CEE*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 30 28 13 21 13 12 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 21 11 7 9 3 -/*CEF*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 30 13 21 13 12 21 22 15 6 6 21 19 19a 23 19 7 13 21 11 7 9 3 -/* CL*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 17, 17, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0,17,17, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 25 25 16 13 13 16 13 12 21 22 15 6 6 16 19 19a 25 25 19 7 13 21 11 7 9 3 -/* CM*/ {11,11,11,11,11, 8,11, 0,11, 11, 11, 8, 8, 8, 0, 11, 11, 8, 8, 11, 8, 11, 8, 8, 11, 11, 11, 8, 8,11, 11, 11,11, 11, 8, 11, 8, 8, 8,11,11,11, 8,11, 8, 8,11,11,11, 0, 0, 8,11,11, 8, 8,11,11, 8,11, 0, 8, 8,11,11, 8, 0, 8,1,0 }, -// 9 9 9 9 9 9 9 6 9 9 9 9 9 9 6 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 6 6 9 9 9 9 9 9 9 9 9 7 9 9 9 9 9 7 9 3 -/* CP*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 17, 17, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0,17,17, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 30 21 6 20 30 13 9 13 6 30 30 21 13 12a 9 22 25 25 16 13 30 30 13 16 13 12 30 21 22 15 6 6 16 30 19 19a 25 25 19 7 13 21 11 7 9 3 -/* CR*/ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,1,0 }, -// 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 3 -/*DCA*/ { 0, 5, 1, 5, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, -// 28 28 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 28 13 21 13 12 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 21 28 28 11 7 9 3 -/*EAA*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 28 13 21 13 12 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 21 11 7 9 3 -/*EAB*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 9 22 21 13 13 21 13 21 22 15 6 6 21 19 19a 19 7 13 21 11 7 9 3 -/*EAC*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 17, 17, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29,17,17, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 25 25 16 13 13 16 13 12 21 22 15 6 6 16 19 19a 25 25 19 7 13 21 11 7 9 3 -/*EAE*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 30 13 21 13 12 21 22 15 6 6 21 19 19a 23 19 7 13 21 11 7 9 3 -/*EAG*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, -// 12 12 12 12 12 12 12 6 12 12 12 12 9 12 6 12 12 12 12 12 12 12 9 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 6 6 12 12 12 12 12 12 12 12 12 7 12 12 12 12 11 7 9 3 -/*EAI*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 23 19 7 13 21 11 7 9 3 -/*EAM*/ {11,11,11,11,11, 8,11, 0,11, 11, 11, 8, 8, 8, 0, 11, 11, 8, 8, 11, 8, 11, 8, 8, 11, 11, 11, 8, 8,11, 11, 11,11, 11, 8, 11, 8, 8, 8,11,11,11, 8,11, 8, 8,11,11,11, 0, 0, 8,11,11, 8, 38,11,11, 8,11, 0, 8, 8,11,11, 8, 0, 8,1,0 }, -// 9 9 9 9 9 9 9 6 9 9 9 9 9 9 6 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 6 6 9 9 9 9 9 9 9 9 9 7 9 9 9 9 9 7 9 3 -/*EAN*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 11 7 9 3 -/*EAO*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, -// 14 14 14 14 14 14 14 6 14 14 14 13 9 13 6 14 14 14 13 14 12a 14 9 14 14 14 14 14 13 14 14 14 14 14 13 14 14 13 12 14 14 14 14 14 14 14 14 14 14 6 6 14 14 14 14 14 14 14 14 14 7 13 14 14 14 11 7 9 3 -/*EAP*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 23, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0,23, 0, 29, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 24 21 6 20 24 13 9 13 6 24 24 21 13 12a 9 22 25 21 13 24 24 13 21 13 12 24 21 22 15 6 6 21 24 25 19 19a 19 7 13 21 11 7 9 3 -/*EAR*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,23, 0, 29, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 24 21 6 20 24 23a 13 9 13 6 24 24 21 13 23a 12a 23a 9 22 25 21 13 23 24 23a 23 24 13 23a 21 13 12 27 27 24 21 23 22 15 27 27 27 6 6 21 24 25 19 19a 19 7 13 21 11 7 9 3 -/*EAS*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 11 7 9 3 -/*EAX*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 11 7 9 3 -/* EB*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 30 13 21 13 12 21 22 15 6 6 21 19 19a 23 19 7 13 21 11 7 9 3 -/*EEA*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 28 13 21 13 12 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 21 11 7 9 3 -/*EEI*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 23 19 7 13 21 11 7 9 3 -/* EM*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 23 19 7 13 21 11 7 9 3 -/*EPA*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 28 13 21 13 12 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 21 11 7 9 3 -/*EPE*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 11 7 9 3 -/*EPI*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 23 19 7 13 21 11 7 9 3 -/*EPN*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 11 7 9 3 -/* EX*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 11 7 9 3 -/* GL*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, -// 12 12 12 12 12 12 12 6 12 12 12 12 9 12 6 12 12 12 12 12 12 12 9 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 6 6 12 12 12 12 12 12 12 12 12 7 12 12 12 12 11 7 9 3 -/* H2*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 27 21 13 13 21 13 12 21 22 15 26 26 6 6 21 19 19a 27 19 7 13 21 11 7 9 3 -/* H3*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 27 21 13 13 21 13 12 21 22 15 26 6 6 21 19 19a 27 19 7 13 21 11 7 9 3 -/* HL*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 28 13 21 13 12 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 21 11 7 9 3 -/* HY*/ {43,14,14,14,14, 0,14, 0, 1, 43, 14, 0, 0, 0, 0, 43, 43, 0, 0, 14, 14, 14, 0, 0, 14, 14, 14, 0, 0,14, 43, 14,14, 43, 0, 14, 0, 0,14,14,14, 1, 0,14, 0, 0,14,14,14, 0, 0, 0, 0,14, 0, 0,14,14, 0,14, 0, 0, 0,14,14, 0, 0, 0,1,0 }, -// 20 21 21 21 21 21 21 6 20 20a 21a 13 9 13 6 20a 20a 21 13 21a 21a 21a 9 22 21a 21a 21a 21 13 21 20a 21a 21 20a 13 21a 21 13 21 21 21 21 21 22 15 21 21 21 6 6 21 24 21 19 19a 21 21 19 21 7 13 21 21 21 11 7 9 3 -/* ID*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 23 19 7 13 21 11 7 9 3 -/* IN*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 11 7 9 3 -/* IS*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 17, 17, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0,17,17, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 29 21 6 20 29 13 9 13 6 29 29 21 13 12a 9 22 25 25 21 13 29 29 13 21 13 12 29 21 22 15 6 6 21 24 19 19a 25 25 19 7 13 21 11 7 9 3 -/* JL*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 27 21 13 13 21 13 12 26 26 21 22 15 26 26 6 6 21 19 19a 27 19 7 13 21 11 7 9 3 -/* JT*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 27 21 13 13 21 13 12 21 22 15 26 6 6 21 19 19a 27 19 7 13 21 11 7 9 3 -/* JV*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 27 21 13 13 21 13 12 21 22 15 26 26 6 6 21 19 19a 27 19 7 13 21 11 7 9 3 -/* LF*/ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,1,0 }, -// 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 3 -/* NL*/ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,1,0 }, -// 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 3 -/* NS*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 11 7 9 3 -/* NU*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 23 21 6 20 23 13 9 13 6 23 23 21 13 12a 9 22 24 24 21 13 23 23 13 21 13 12 23 21 22 15 6 6 21 24 30 19 19a 24 24 19 7 13 21 11 7 9 3 -/* OP*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, -// 14 14 14 14 14 14 14 6 14 14 14 13 9 13 6 14 14 14 13 14 12a 14 9 14 14 14 14 14 13 14 14 14 14 14 13 14 14 13 12 14 14 14 14 14 14 14 14 14 14 6 6 14 14 14 14 14 14 14 14 14 7 13 14 14 14 11 7 9 3 -/*PfQ*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 32, 0, 32, 0, 0, 32, 32, 32, 0, 0, 0, 32, 32,32, 0, 0, 0, 0, 0, 0,32,32, 0, 0, 0, 0, 0,32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, -// 19 19 19 19 19 19 19 6 19 19a 19a 13 9 13 6 19a 19a 21 13 19a 12a 19a 9 22 19a 19a 19a 21 13 19 19a 19a 19 19a 13 19a 19a 13 12 19 19 19 19 19 19 15 19 19 19 6 6 19 19 19 19 19a 19 19 19 19 7 13 19a 19 19 11 7 9 3 -/*PiQ*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, -// 19 19 19 19 19 19 19 6 19 19 19 13 9 13 6 19 19 19 13 19 12a 19 9 19 19 19 19 19 13 19 19 19 19 19 13 19 19 13 12 19 19 19 19 19 19 15 19 19 19 6 6 19 19 19 19 19 19 19 19 19 7 13 19 19 19 11 7 9 3 -/* PO*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 23, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0,23, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 24 21 6 20 24 13 9 13 6 24 24 21 13 12a 9 22 25 21 13 24 24 13 21 13 12 24 21 22 15 6 6 21 24 25 19 19a 19 7 13 21 11 7 9 3 -/* PR*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,23, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 24 21 6 20 24 23a 13 9 13 6 24 24 21 13 23a 12a 23a 9 22 25 21 13 23 24 23a 23 24 13 23a 21 13 12 27 27 24 21 23 22 15 27 27 27 6 6 21 24 25 19 19a 19 7 13 21 11 7 9 3 -/* QU*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, -// 19 19 19 19 19 19 19 6 19 19 19 13 9 13 6 19 19 19 13 19 12a 19 9 19 19 19 19 19 13 19 19 19 19 19 13 19 19 13 12 19 19 19 19 19 19 15 19 19 19 6 6 19 19 19 19 19 19 19 19 19 7 13 19 19 19 11 7 9 3 -/* RI*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0,35, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 30 7 13 21 11 7 9 3 -/* SP*/ {48,48,48,48,55,48,48, 0,48, 48, 48,26,48,26, 0, 48, 48, 48, 26, 48, 48, 48, 48, 48, 48, 48, 48, 64, 26,48, 48, 48,48, 48, 26, 48, 64,26,48,48,48,48,48,48,48,73,48,48,48, 0, 0,64,48,48, 82, 48,48,48,48,48, 0,26, 48,48,48,26, 0, 48,1,0 }, -// 8 8 8 8 8 8 8 6 8 8 8 8 8 8 6 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 6 6 8 8 8 8 8 8 8 8 8 7 8 8 8 8 8 7 8 3 -/* SY*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 17, 17, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0,20, 1, 0, 0,17,17, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 25 25 21 13 13 21 13 12 21 21 22 15 6 6 21 25 19 19a 25 25 19 7 13 21 11 7 9 3 -/*UBA*/ {43,14,14,14,14, 0,14, 0, 1, 43, 14, 0, 0, 0, 0, 43, 43, 0, 0, 14, 14, 14, 0, 0, 14, 14, 14, 0, 0,14, 43, 14,14, 43, 0, 14, 0, 0,14,14,14, 1, 0,14, 0, 0,14,14,14, 0, 0, 0,14,14, 0, 0,14,14, 0,14, 0, 0, 0,14,14, 0, 0, 0,1,0 }, -// 20 21 21 21 21 21 21 6 20 20a 21a 13 9 13 6 20a 20a 21 13 21a 21a 21a 9 22 21a 21a 21a 21 13 21 20a 21a 21 20a 13 21a 21 13 21 21 21 21 21 22 15 21 21 21 6 6 21 21 21 19 19a 21 21 19 21 7 13 21 21 21 11 7 9 3 -/* VF*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 11 7 9 3 -/* VI*/ { 1, 2, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 2, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0,1,0 }, -// 28 21 6 20 13 9 13 6 28a 21 13 12a 9 22 21 13 13 21 13 12 21 22 15 6 6 21 19 19a 19 7 13 21 11 7 9 3 -/* WJ*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, -// 11 11 11 11 11 11 11 6 11 11 11 11 9 11 6 11 11 11 11 11 11 11 9 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 6 6 11 11 11 11 11 11 11 11 11 7 11 11 11 11 11 7 9 3 -/* ZW*/ { 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1,1,0 }, -// 8 8 8 8 8 8 8 6 8 8 8 8 8 8 6 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 6 6 8 8 8 8 8 8 8 8 8 7 8 8 8 8 8 7 8 3 -/*ZWJ*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, -// 8a 8a 8a 8a 8a 8a 8a 6 8a 8a 8a 8a 8a 8a 6 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 6 6 8a 8a 8a 8a 8a 8a 8a 8a 8a 7 8a 8a 8a 8a 8a 7 8a 3 -/* ^ */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0 }, -// 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 -/* u */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0 } + * 'Cn_ExtPict_ExtPict_AL'; 'CEF' stands for 'Cn_ExtPict_ExtPict_ID'; 'DCA' stands for 'Dotted_Circle_AL'; 'EAA' stands for 'EA_AL'; 'EAB' stands for 'EA_BA'; 'EAC' stands for 'EA_CL'; 'EAE' stands for 'EA_EB'; 'EAG' stands for 'EA_GL'; + * 'EAI' stands for 'EA_ID'; 'EAM' stands for 'EA_CM'; 'EAN' stands for 'EA_IN'; 'EAO' stands for 'EA_OP'; 'EAP' stands for 'EA_PO'; 'EAR' stands for 'EA_PR'; 'EAS' stands for 'EA_NS'; 'EAX' stands for 'EA_EX'; 'EEA' stands for + * 'EA_ExtPict_AL'; 'EEI' stands for 'EA_ExtPict_ID'; 'EPA' stands for 'ExtPict_AL'; 'EPE' stands for 'ExtPict_EX'; 'EPI' stands for 'ExtPict_ID'; 'EPN' stands for 'ExtPict_NS'; 'PfQ' stands for 'Pf_QU'; 'PiQ' stands for 'Pi_QU'; u stands + * for "unused in this Unicode release" (and the data in its row and column are garbage). See perluniprops for the rest */ +/* AL AK AP AS B2 BA BB BK CB CEE CEF CL CM CP CR DCA EAA EAB EAC EAE EAG EAI EAM EAN EAO EAP EAR EAS EAX EB EEA EEI EM EPA EPE EPI EPN EX GL H2 H3 HH HL HY ID IN IS JL JT JV LF NL NS NU OP PfQ PiQ PO PR QU RI SP SY VF VI WJ ZW ZWJ $ u */ +/* AL*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 28 13 21 13 12 21 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 11 7 9 3 +/* AK*/ { 1, 5, 1, 5, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 5, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0,1,0 }, +// 28 28 21 6 20 13 9 13 6 28a 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 28 28 11 7 9 3 +/* AP*/ { 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 28 28 21 6 20 13 9 13 6 28a 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/* AS*/ { 1, 5, 1, 5, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 5, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0,1,0 }, +// 28 28 21 6 20 13 9 13 6 28a 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 28 28 11 7 9 3 +/* B2*/ { 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 17 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/* BA*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 9 22 21 13 13 21 13 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/* BB*/ { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, +// 21 21 21 21 21 21 21 6 20 21 21 13 9 13 6 21 21 21 13 21 12a 21 9 21 21 21 21 21 13 21 21 21 21 21 13 21 21 13 12 21 21 21 21 21 21 21 15 21 21 21 6 6 21 21 21 19 19a 21 21 19 21 7 13 21 21 11 7 9 3 +/* BK*/ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,1,0 }, +// 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 +/* CB*/ { 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 20 20 20 20 20 20 20 6 20 20 20 13 9 13 6 20 20 20 13 20 12a 20 9 20 20 20 20 20 13 20 20 20 20 20 13 20 20 13 12 20 20 20 20 20 20 20 15 20 20 20 6 6 20 20 20 19 19a 20 20 19 20 7 13 20 20 11 7 9 3 +/*CEE*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 30 28 13 21 13 12 21 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 11 7 9 3 +/*CEF*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 30 13 21 13 12 21 21 22 15 6 6 21 19 19a 23 19 7 13 11 7 9 3 +/* CL*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 17, 17, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0,17,17, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 25 25 16 13 13 16 13 12 21 21 22 15 6 6 16 19 19a 25 25 19 7 13 11 7 9 3 +/* CM*/ {11,11,11,11,11, 8,11, 0,11, 11, 11, 8, 8, 8, 0, 11, 11, 8, 8, 11, 8, 11, 8, 8, 11, 11, 11, 8, 8,11, 11, 11,11, 11, 8, 11, 8, 8, 8,11,11, 8,11, 8,11, 8, 8,11,11,11, 0, 0, 8,11,11, 8, 8,11,11, 8,11, 0, 8,11,11, 8, 0, 8,1,0 }, +// 9 9 9 9 9 9 9 6 9 9 9 9 9 9 6 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 6 6 9 9 9 9 9 9 9 9 9 7 9 9 9 9 7 9 3 +/* CP*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 17, 17, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0,17,17, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 30 21 6 20 30 13 9 13 6 30 30 21 13 12a 9 22 25 25 16 13 30 30 13 16 13 12 21 30 21 22 15 6 6 16 30 19 19a 25 25 19 7 13 11 7 9 3 +/* CR*/ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,1,0 }, +// 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 3 +/*DCA*/ { 0, 5, 1, 5, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,1,0 }, +// 28 28 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 28 13 21 13 12 21 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 28 28 11 7 9 3 +/*EAA*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 28 13 21 13 12 21 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 11 7 9 3 +/*EAB*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 9 22 21 13 13 21 13 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/*EAC*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 17, 17, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29,17,17, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 25 25 16 13 13 16 13 12 21 21 22 15 6 6 16 19 19a 25 25 19 7 13 11 7 9 3 +/*EAE*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 30 13 21 13 12 21 21 22 15 6 6 21 19 19a 23 19 7 13 11 7 9 3 +/*EAG*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, +// 12 12 12 12 12 12 12 6 12 12 12 12 9 12 6 12 12 12 12 12 12 12 9 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 6 6 12 12 12 12 12 12 12 12 12 7 12 12 12 11 7 9 3 +/*EAI*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 23 19 7 13 11 7 9 3 +/*EAM*/ {11,11,11,11,11, 8,11, 0,11, 11, 11, 8, 8, 8, 0, 11, 11, 8, 8, 11, 8, 11, 8, 8, 11, 11, 11, 8, 8,11, 11, 11,11, 11, 8, 11, 8, 8, 8,11,11, 8,11, 8,11, 8, 8,11,11,11, 0, 0, 8,11,11, 8, 41,11,11, 8,11, 0, 8,11,11, 8, 0, 8,1,0 }, +// 9 9 9 9 9 9 9 6 9 9 9 9 9 9 6 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 6 6 9 9 9 9 9 9 9 9 9 7 9 9 9 9 7 9 3 +/*EAN*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/*EAO*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, +// 14 14 14 14 14 14 14 6 14 14 14 13 9 13 6 14 14 14 13 14 12a 14 9 14 14 14 14 14 13 14 14 14 14 14 13 14 14 13 12 14 14 14 14 14 14 14 14 14 14 14 6 6 14 14 14 14 14 14 14 14 14 7 13 14 14 11 7 9 3 +/*EAP*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 23, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0,23, 0, 29, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 24 21 6 20 24 13 9 13 6 24 24 21 13 12a 9 22 25 21 13 24 24 13 21 13 12 21 24 21 22 15 6 6 21 24 25 19 19a 19 7 13 11 7 9 3 +/*EAR*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,23, 0, 29, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 24 21 6 20 24 23a 13 9 13 6 24 24 21 13 23a 12a 23a 9 22 25 21 13 23 24 23a 23 24 13 23a 21 13 12 27 27 21 24 21 23 22 15 27 27 27 6 6 21 24 25 19 19a 19 7 13 11 7 9 3 +/*EAS*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/*EAX*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/* EB*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 30 13 21 13 12 21 21 22 15 6 6 21 19 19a 23 19 7 13 11 7 9 3 +/*EEA*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 28 13 21 13 12 21 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 11 7 9 3 +/*EEI*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 23 19 7 13 11 7 9 3 +/* EM*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 23 19 7 13 11 7 9 3 +/*EPA*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 28 13 21 13 12 21 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 11 7 9 3 +/*EPE*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/*EPI*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 23 19 7 13 11 7 9 3 +/*EPN*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/* EX*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/* GL*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, +// 12 12 12 12 12 12 12 6 12 12 12 12 9 12 6 12 12 12 12 12 12 12 9 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 12 6 6 12 12 12 12 12 12 12 12 12 7 12 12 12 11 7 9 3 +/* H2*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 27 21 13 13 21 13 12 21 21 22 15 26 26 6 6 21 19 19a 27 19 7 13 11 7 9 3 +/* H3*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 27 21 13 13 21 13 12 21 21 22 15 26 6 6 21 19 19a 27 19 7 13 11 7 9 3 +/* HH*/ {46,14,14,14,14, 0,14, 0, 1, 46, 14, 0, 0, 0, 0, 46, 46, 0, 0, 14, 14, 14, 0, 0, 14, 14, 14, 0, 0,14, 46, 14,14, 46, 0, 14, 0, 0,14,14,14, 0,35, 0,14, 0, 0,14,14,14, 0, 0, 0,14,14, 0, 0,14,14, 0,14, 0, 0,14,14, 0, 0, 0,1,0 }, +// 20 21 21 21 21 21 21 6 20 20a 21a 13 9 13 6 20a 20a 21 13 21a 21a 21a 9 22 21a 21a 21a 21 13 21 20a 21a 21 20a 13 21a 21 13 21 21 21 21 20 21 21 22 15 21 21 21 6 6 21 21 21 19 19a 21 21 19 21 7 13 21 21 11 7 9 3 +/* HL*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 28 21 6 20 28 13 9 13 6 28 28 21 13 12a 9 22 24 24 21 13 28 28 13 21 13 12 21 28 21 22 15 6 6 21 23 30 19 19a 24 24 19 7 13 11 7 9 3 +/* HY*/ {46,14,14,14,14, 0,14, 0, 1, 46, 14, 0, 0, 0, 0, 46, 46, 0, 0, 14, 14, 14, 0, 0, 14, 14, 14, 0, 0,14, 46, 14,14, 46, 0, 14, 0, 0,14,14,14, 0,35, 0,14, 0, 0,14,14,14, 0, 0, 0, 0,14, 0, 0,14,14, 0,14, 0, 0,14,14, 0, 0, 0,1,0 }, +// 20 21 21 21 21 21 21 6 20 20a 21a 13 9 13 6 20a 20a 21 13 21a 21a 21a 9 22 21a 21a 21a 21 13 21 20a 21a 21 20a 13 21a 21 13 21 21 21 21 20 21 21 22 15 21 21 21 6 6 21 24 21 19 19a 21 21 19 21 7 13 21 21 11 7 9 3 +/* ID*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 23a 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 23 19 7 13 11 7 9 3 +/* IN*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/* IS*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 17, 17, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0,17,17, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 29 21 6 20 29 13 9 13 6 29 29 21 13 12a 9 22 25 25 21 13 29 29 13 21 13 12 21 29 21 22 15 6 6 21 24 19 19a 25 25 19 7 13 11 7 9 3 +/* JL*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 29, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 27 21 13 13 21 13 12 26 26 21 21 22 15 26 26 6 6 21 19 19a 27 19 7 13 11 7 9 3 +/* JT*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 27 21 13 13 21 13 12 21 21 22 15 26 6 6 21 19 19a 27 19 7 13 11 7 9 3 +/* JV*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 27 21 13 13 21 13 12 21 21 22 15 26 26 6 6 21 19 19a 27 19 7 13 11 7 9 3 +/* LF*/ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,1,0 }, +// 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 3 +/* NL*/ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,1,0 }, +// 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 3 +/* NS*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/* NU*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 23 21 6 20 23 13 9 13 6 23 23 21 13 12a 9 22 24 24 21 13 23 23 13 21 13 12 21 23 21 22 15 6 6 21 24 30 19 19a 24 24 19 7 13 11 7 9 3 +/* OP*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, +// 14 14 14 14 14 14 14 6 14 14 14 13 9 13 6 14 14 14 13 14 12a 14 9 14 14 14 14 14 13 14 14 14 14 14 13 14 14 13 12 14 14 14 14 14 14 14 14 14 14 14 6 6 14 14 14 14 14 14 14 14 14 7 13 14 14 11 7 9 3 +/*PfQ*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 32, 0, 32, 0, 0, 32, 32, 32, 0, 0, 0, 32, 32,32, 0, 0, 0, 0, 0, 0,32,32, 0, 0, 0, 0, 0, 0,32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, +// 19 19 19 19 19 19 19 6 19 19a 19a 13 9 13 6 19a 19a 21 13 19a 12a 19a 9 22 19a 19a 19a 21 13 19 19a 19a 19 19a 13 19a 19a 13 12 19 19 19 19 19 19 19 15 19 19 19 6 6 19 19 19 19 19a 19 19 19 19 7 13 19 19 11 7 9 3 +/*PiQ*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, +// 19 19 19 19 19 19 19 6 19 19 19 13 9 13 6 19 19 19 13 19 12a 19 9 19 19 19 19 19 13 19 19 19 19 19 13 19 19 13 12 19 19 19 19 19 19 19 15 19 19 19 6 6 19 19 19 19 19 19 19 19 19 7 13 19 19 11 7 9 3 +/* PO*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 23, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0,23, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 24 21 6 20 24 13 9 13 6 24 24 21 13 12a 9 22 25 21 13 24 24 13 21 13 12 21 24 21 22 15 6 6 21 24 25 19 19a 19 7 13 11 7 9 3 +/* PR*/ { 0, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,23, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 24 21 6 20 24 23a 13 9 13 6 24 24 21 13 23a 12a 23a 9 22 25 21 13 23 24 23a 23 24 13 23a 21 13 12 27 27 21 24 21 23 22 15 27 27 27 6 6 21 24 25 19 19a 19 7 13 11 7 9 3 +/* QU*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, +// 19 19 19 19 19 19 19 6 19 19 19 13 9 13 6 19 19 19 13 19 12a 19 9 19 19 19 19 19 13 19 19 19 19 19 13 19 19 13 12 19 19 19 19 19 19 19 15 19 19 19 6 6 19 19 19 19 19 19 19 19 19 7 13 19 19 11 7 9 3 +/* RI*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0,38, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 30 7 13 11 7 9 3 +/* SP*/ {51,51,51,51,58,51,51, 0,51, 51, 51,26,51,26, 0, 51, 51, 51, 26, 51, 51, 51, 51, 51, 51, 51, 51, 67, 26,51, 51, 51,51, 51, 26, 51, 67,26,51,51,51,51,51,51,51,51,76,51,51,51, 0, 0,67,51,51, 85, 51,51,51,51,51, 0,26,51,51,26, 0, 51,1,0 }, +// 8 8 8 8 8 8 8 6 8 8 8 8 8 8 6 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 6 6 8 8 8 8 8 8 8 8 8 7 8 8 8 8 7 8 3 +/* SY*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 17, 17, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0,20, 1, 0, 0,17,17, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 25 25 21 13 13 21 13 12 21 21 21 22 15 6 6 21 25 19 19a 25 25 19 7 13 11 7 9 3 +/* VF*/ { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 21 6 20 13 9 13 6 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/* VI*/ { 1, 2, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 2, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0,1,0 }, +// 28 21 6 20 13 9 13 6 28a 21 13 12a 9 22 21 13 13 21 13 12 21 21 22 15 6 6 21 19 19a 19 7 13 11 7 9 3 +/* WJ*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, +// 11 11 11 11 11 11 11 6 11 11 11 11 9 11 6 11 11 11 11 11 11 11 9 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 6 6 11 11 11 11 11 11 11 11 11 7 11 11 11 11 7 9 3 +/* ZW*/ { 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1,1,0 }, +// 8 8 8 8 8 8 8 6 8 8 8 8 8 8 6 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 6 6 8 8 8 8 8 8 8 8 8 7 8 8 8 8 7 8 3 +/*ZWJ*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,1,0 }, +// 8a 8a 8a 8a 8a 8a 8a 6 8a 8a 8a 8a 8a 8a 6 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 8a 6 6 8a 8a 8a 8a 8a 8a 8a 8a 8a 7 8a 8a 8a 8a 7 8a 3 +/* ^ */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0 }, +// 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 +/* u */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0 } }; @@ -456421,7 +492416,7 @@ static const U8 LB_dfa_table[] = { 3, /* [11] LB_CM_ZWJ_v_any (Rule LB9) */ 0, /* if matches, return 0 */ 1, /* else return 1 (Rules LB20,31) */ - 14, /* [14] LB_HL_then_HY_or_BA_sans_EA_v_nonHL (Rule LB21a) */ + 14, /* [14] LB_HL_then_HY_or_HH_v_nonHL (Rule LB21a) */ 0, /* if matches, return 0 */ 1, /* else return 1 (Rule LB31) */ 15, /* [17] LB_NU_then_SY_or_IS_then_CL_or_CP_v_PO_or_PR (Rule LB25) */ @@ -456442,27 +492437,30 @@ static const U8 LB_dfa_table[] = { 12, /* [32] LB_nonEA_or_sot_then_QU_v_any (Rule LB19a) */ 0, /* if matches, return 0 */ 1, /* else return 1 (Rule LB31) */ - 20, /* [35] LB_various_then_RI_v_RI (Rule LB30a) */ + 13, /* [35] LB_various_then_HY_or_HH_v_AL_or_HL (Rule LB20a) */ + 0, /* if matches, return 0 */ + 1, /* else return 1 (Rule LB31) */ + 20, /* [38] LB_various_then_RI_v_RI (Rule LB30a) */ 0, /* if matches, return 0 */ 1, /* else return 1 (Rule LB31) */ - 3, /* [38] LB_CM_ZWJ_v_any (Rule LB9) */ + 3, /* [41] LB_CM_ZWJ_v_any (Rule LB9) */ 0, /* if matches, return 0 */ 11, /* else try LB_any_v_QU_then_nonEA_or_eot (Rule LB19a) */ 0, /* if matches, return 0 */ 1, /* else return 1 (Rule LB31) */ - 13, /* [43] LB_various_then_HY_or_U2010_v_AL (Rule LB20a) */ + 13, /* [46] LB_various_then_HY_or_HH_v_AL_or_HL (Rule LB20a) */ 0, /* if matches, return 0 */ - 14, /* else try LB_HL_then_HY_or_BA_sans_EA_v_nonHL (Rule LB21a) */ + 14, /* else try LB_HL_then_HY_or_HH_v_nonHL (Rule LB21a) */ 0, /* if matches, return 0 */ 1, /* else return 1 (Rule LB31) */ - 2, /* [48] LB_ZW_then_SP_v_any (Rule LB8) */ + 2, /* [51] LB_ZW_then_SP_v_any (Rule LB8) */ 1, /* if matches, return 1 */ 4, /* else try LB_OP_then_SP_v_any (Rule LB14) */ 0, /* if matches, return 0 */ 6, /* else try LB_various_then_PiQ_then_SP_v_any (Rule LB15a) */ 0, /* if matches, return 0 */ 1, /* else return 1 (Rule LB18) */ - 2, /* [55] LB_ZW_then_SP_v_any (Rule LB8) */ + 2, /* [58] LB_ZW_then_SP_v_any (Rule LB8) */ 1, /* if matches, return 1 */ 4, /* else try LB_OP_then_SP_v_any (Rule LB14) */ 0, /* if matches, return 0 */ @@ -456471,7 +492469,7 @@ static const U8 LB_dfa_table[] = { 10, /* else try LB_B2_then_SP_v_B2 (Rule LB17) */ 0, /* if matches, return 0 */ 1, /* else return 1 (Rule LB18) */ - 2, /* [64] LB_ZW_then_SP_v_any (Rule LB8) */ + 2, /* [67] LB_ZW_then_SP_v_any (Rule LB8) */ 1, /* if matches, return 1 */ 4, /* else try LB_OP_then_SP_v_any (Rule LB14) */ 0, /* if matches, return 0 */ @@ -456480,7 +492478,7 @@ static const U8 LB_dfa_table[] = { 9, /* else try LB_CL_or_CP_then_SP_v_NS (Rule LB16) */ 0, /* if matches, return 0 */ 1, /* else return 1 (Rule LB18) */ - 2, /* [73] LB_ZW_then_SP_v_any (Rule LB8) */ + 2, /* [76] LB_ZW_then_SP_v_any (Rule LB8) */ 1, /* if matches, return 1 */ 4, /* else try LB_OP_then_SP_v_any (Rule LB14) */ 0, /* if matches, return 0 */ @@ -456489,7 +492487,7 @@ static const U8 LB_dfa_table[] = { 8, /* else try LB_SP_v_IS_then_NU (Rule LB15c) */ 1, /* if matches, return 1 */ 0, /* else return 0 (Rule LB15) */ - 2, /* [82] LB_ZW_then_SP_v_any (Rule LB8) */ + 2, /* [85] LB_ZW_then_SP_v_any (Rule LB8) */ 1, /* if matches, return 1 */ 4, /* else try LB_OP_then_SP_v_any (Rule LB14) */ 0, /* if matches, return 0 */ @@ -456662,59 +492660,59 @@ static const U8 WB_dfa_table[] = { #endif /* defined(PERL_IN_REGEXEC_C) */ /* Generated from: - * b7f46fc1010fd83f5a678b268a23fef0142a18d0ab2a142edd0bb03328e667c3 lib/Unicode/UCD.pm - * 764f420cedfc8b43d9fec251c957a5d55fc45d40f6573f162990ed1dce7e36e0 lib/unicore/ArabicShaping.txt - * b8f32554c6f658821fb0ee742d21c5b1f2086b9bf13071fed04894b022f93d67 lib/unicore/BidiBrackets.txt - * d7afdadd1bbd66f5a663ac0e8f7958f18fd9491fc0bc59ec5877cb82db71db7d lib/unicore/BidiMirroring.txt - * f3907b395d410f1b97342292ca6bc83dd12eb4b205f2a0c48efdef99e517d7b0 lib/unicore/Blocks.txt - * 6f1f9c588eb4a5c718d9e8f93b782685e5c7fec872cf05e8e6878053599e09bb lib/unicore/CaseFolding.txt - * 89e83cf9cc8bef6c1f8bf77e42cf6f0341dfa42e66261f4dbe9b492e7a23c8ee lib/unicore/CompositionExclusions.txt - * 60caa81b99a4dfb0bc5d38440d323073e3f356f46f9ca7869da848cd0715408b lib/unicore/DAge.txt - * 39d35161f2954497f69e08bdb9e701493f476a3d30222de20028feda36c1dabd lib/unicore/DCoreProperties.txt - * 4d4c03892dea9146d674b686e495df2d55a28d071ac474041d73518f887abddc lib/unicore/DNormalizationProps.txt - * 43adc76c0686a42cb370764eb8cfe2b2a45b10b855e5572a2db4a0eecce15d5b lib/unicore/EastAsianWidth.txt - * 628929adae97427348337003e39d29da7b55acdddfac21e06d3dacad92237834 lib/unicore/EquivalentUnifiedIdeograph.txt - * 329612f2aea8672379d93202ca6fcd948b4f08062d4fc43ee31c7061c66ed279 lib/unicore/HangulSyllableType.txt - * c6108ca140e054b55a5b0378e7ebed8b1ef0e846251f6195361bc9af8ffc61b1 lib/unicore/IdStatus.txt - * c7e57f71176fb3035e0c85e4d9f30b08374588b2bd16e729efbc7e49c7c9438f lib/unicore/IdType.txt - * cbb9e2193e26c9b3d595a8f0ff4fd2ad956482309143ceb4ce5469c19f14feba lib/unicore/IndicPositionalCategory.txt - * 615f1b92ba7ec76e18c5b5c05d2e1836e4b98bc791eb9e27946c7621fc047ae7 lib/unicore/IndicSyllabicCategory.txt - * e0f42a73ec3bf9fa4bc404ea0a2921675c73742905dacbe439675fe8c9b2359f lib/unicore/Jamo.txt - * e97e4259d0d20fab150b9c7b4b28abfae5cd78ca97e7f4ac6ed20d685d5f4a7c lib/unicore/LineBreak.txt - * 9953f0fcebf5ea8091c5c581e4df0e43f20d2533c84ccca7987a9bb819a896a8 lib/unicore/NameAliases.txt - * 4ff660cb922480cd5aab9a689b1a6905d0a54575baf9967d0f1e00ac866f04dd lib/unicore/NamedSequences.txt - * d811971453e7075e1ad56fb1b301eece5aa80757b81f6156e74a1bfb3ae5ceb1 lib/unicore/NormTest.txt - * 53d614508e2a0b2305a8aa21cd60d993de9326cdf65993660dfcce4503548583 lib/unicore/PropList.txt - * 440fd3e5460b9bfe31da67b6f923992e1989d31fe2ed91e091c4b8f8e2620bf9 lib/unicore/PropValueAliases.txt - * 33a9f2266ad6b8e8de05c0ea3dfac411ac62cf8839ff1c94057471e4c5f6a2b3 lib/unicore/PropertyAliases.txt - * 049117ce26b9769fe2749b06eef51a50a89faef4a97764dd2d81daa715980700 lib/unicore/ScriptExtensions.txt - * 9e88f0a677df47311106340be8ede2ecdacd9c1c931831218d2be6d5508e0039 lib/unicore/Scripts.txt - * 8d5de354eef79f2395a54c9c7dcebbaf3d30fc962d0f85611ea97aa973a0c451 lib/unicore/SpecialCasing.txt - * ff58e5823bd095166564a006e47d111130813dcf8bf234ef79fa51a870edb48f lib/unicore/UnicodeData.txt - * b71d2d4b57b4f751a40658e9ddb1ddc8aa0a9220bf37890d9a825e30e0612ddc lib/unicore/Unikemet.txt - * 24ac1474554eb55c85ace5c16d551535a8c52cdc2f4c13cf68c3839214339bbe lib/unicore/VerticalOrientation.txt - * ee2b9354d270ac061b29f09662cafea06341d77e704b8cc6bd72aaeeda363cb5 lib/unicore/auxiliary/GCBTest.txt - * c29360bd6f7132811d701d29069541e827eb44bfc4c8fbde8c370d6982689dc1 lib/unicore/auxiliary/GraphemeBreakProperty.txt - * 910759a611a479f37df4f535d2e64d7589be3c5ac5f7491cf1fb4fa4cdb211e9 lib/unicore/auxiliary/LBTest.txt - * 0aef84034ee1789eb71021454fac384e83080b05922272d63cf297f4bf08150e lib/unicore/auxiliary/SBTest.txt - * 20aab5eca3842c7a27cc6756d74488a4a5f744c8dca2948ec1128f26a60d1f79 lib/unicore/auxiliary/SentenceBreakProperty.txt - * ad985d5721f3fa6b45495663dfe44180f2f68976100dee0ea7451ef1a8f838e8 lib/unicore/auxiliary/WBTest.txt - * 476464e71a4b7b779b8ba7c5671f4338fea77da8e6b6b05fb82b3fdd14603779 lib/unicore/auxiliary/WordBreakProperty.txt - * f1365a5173eee18e1f98b240cdc492e84a25f1ce7e0c9d1094eb29c41a22696a lib/unicore/emoji/emoji.txt - * 71ed943a49c58568d8d92e80ecc2ba2f06e62aee9c8ebb0e6e8bd2c3ed8b180e lib/unicore/extracted/DBidiClass.txt - * 1ed4d4791c0e34fcad4dfcb5dd4c4122e16428241b75452f05d780ffa661f89d lib/unicore/extracted/DBinaryProperties.txt - * 52064d588c98c623b2373905e6a449eb520f900113954bcd212e94ef0810b471 lib/unicore/extracted/DCombiningClass.txt - * 29f8bff31296bab424e8d728e2a3c0a3240c5a67dadf47fa7092ec0585ad91b6 lib/unicore/extracted/DDecompositionType.txt - * 372e34de237e5a644ce8379a0d02b91a1f584f04d4fb240ea6ccc87c5767f926 lib/unicore/extracted/DEastAsianWidth.txt - * 7676ab755a41ef82108460238569e60ad65c191ddafe61b36c6765ec1353f293 lib/unicore/extracted/DGeneralCategory.txt - * ab2c98db3f945f14f7fe8ab1c80e5c77734cecfd1f34a443ffa283c51fd4c9d7 lib/unicore/extracted/DJoinGroup.txt - * 6bd08b97da66b70ccfdab105a352de2984e02625239ec5695422c99b33d854f0 lib/unicore/extracted/DJoinType.txt - * 4be1c18e7b121d951018065b453bb05083f624c8f905ce8be7c0f354c9097c95 lib/unicore/extracted/DLineBreak.txt - * 786833e0a3f5ec0c0cd0940e4c15f730f3a92163f354ecd7dede28a70c0fa892 lib/unicore/extracted/DNumType.txt - * 00b43cc5c9b86a834f82389c4537f103e652821387daa556f0bd220f6c23007e lib/unicore/extracted/DNumValues.txt - * 308c29a8d4df1761b0ea5a6a93fbe8649a80b7863d2848be6dc2d65238348e13 lib/unicore/mktables - * 63f771c327e92574fbd77919586079c38f669058a5e6b67ccec385ef8fcde882 lib/unicore/version + * 198105a1b3637a4bc7240628bae2f65f6d0c31df2cee4f0242c2561421ea2e75 lib/Unicode/UCD.pm + * 39afa01e680e27d0fd10b67a9b27be13fbaa3d0efecfb5be45991de9a0d267d0 lib/unicore/ArabicShaping.txt + * dadbaf38a0d0246e5b805bf8725cb81b7c621f93d030595635f5ba2c2f179428 lib/unicore/BidiBrackets.txt + * a2f16fb873ab4fcdf3221cb1a8a85a134ddd6ed03603181823ff5206af3741ce lib/unicore/BidiMirroring.txt + * c0edefaf1a19771e830a82735472716af6bf3c3975f6c2a23ffbe2580fbbcb15 lib/unicore/Blocks.txt + * ff8d8fefbf123574205085d6714c36149eb946d717a0c585c27f0f4ef58c4183 lib/unicore/CaseFolding.txt + * 5e6e9c8f8e76561da04cb1703a9306c63707be2ed8ff2eb12cd3a942368a6f72 lib/unicore/CompositionExclusions.txt + * f8ecdf768bdc210f201abd271d9bc587825618a86a7046a8146cc816393f1998 lib/unicore/DAge.txt + * 24c7fed1195c482faaefd5c1e7eb821c5ee1fb6de07ecdbaa64b56a99da22c08 lib/unicore/DCoreProperties.txt + * 71fd6a206a2c0cdd41feb6b7f656aa31091db45e9cedc926985d718397f9e488 lib/unicore/DNormalizationProps.txt + * ea7ce50f3444a050333448dffef1cadd9325af55cbb764b4a2280faf52170a33 lib/unicore/EastAsianWidth.txt + * 38619c05a17e771554000fe604afee92e10eb49e0616ecf0c87af3c1eb0f4320 lib/unicore/EquivalentUnifiedIdeograph.txt + * 5a57450afde0d082bc5026f7458649eac3b615490cc7e3d916b0367f1593c0e3 lib/unicore/HangulSyllableType.txt + * 617228a16da13850bf8af28b6cd08f5e9b6595d2eb60404fe6eee2c85b4e4a35 lib/unicore/IdStatus.txt + * 924ac63faa97ed73420d6ac48d08279d90968c7da0502ab701e08bfbb9683c22 lib/unicore/IdType.txt + * 68cedc29a7e57f984d90fe2c7712f2e6d0c717e253db219607daea8997d6c480 lib/unicore/IndicPositionalCategory.txt + * 3fc122f4cf58b0c19268d5f810263b04ab4e1e67743386ec0e0ada9c76aec5be lib/unicore/IndicSyllabicCategory.txt + * 17bb07f5e37f995351ddcef393c04464a9e3891ed0c0bd56a03a5c5e400a6326 lib/unicore/Jamo.txt + * e6a18fa91f8f6a6f8e534b1d3f128c21ada45bfe152eb6b1bcc5e15fd8ac92e6 lib/unicore/LineBreak.txt + * 793f6f1e4d15fd90f05ae66460191dc4d75d1fea90136a25f30dd6a4cb950eac lib/unicore/NameAliases.txt + * 360dac27d5abafdcd8c03a8597f47acf92e8ebf7f6ee28020c173ed8b2ed0cc5 lib/unicore/NamedSequences.txt + * 5019ffd530751a741900c849c0e010332f142a3612234639bd200b82138a87db lib/unicore/NormTest.txt + * 130dcddcaadaf071008bdfce1e7743e04fdfbc910886f017d9f9ac931d8c64dd lib/unicore/PropList.txt + * 670d2bebb48649c04fabfbf033308073dcff47946324a8033237254c048b3b01 lib/unicore/PropValueAliases.txt + * 4441f573caf952ffece1d7c892e7715bd7136dfc26f96eb6f268bf1e474715fb lib/unicore/PropertyAliases.txt + * ec2107e58825a1586acee8e0911ce18260394ac8b87e535ca325f1ccbeb06bc6 lib/unicore/ScriptExtensions.txt + * 9f5e50d3abaee7d6ce09480f325c706f485ae3240912527e651954d2d6b035bf lib/unicore/Scripts.txt + * efc25faf19de21b92c1194c111c932e03d2a5eaf18194e33f1156e96de4c9588 lib/unicore/SpecialCasing.txt + * 2e1efc1dcb59c575eedf5ccae60f95229f706ee6d031835247d843c11d96470c lib/unicore/UnicodeData.txt + * 76a3081265e6eb673873f9c93d6f36062e82c7ed027c5c1a592accfbe48c20a5 lib/unicore/Unikemet.txt + * dcef09c3fb24d356b042569c328ec341efc5b53447700d799f2fb4834c3cd3cd lib/unicore/VerticalOrientation.txt + * e2d134d2c52919bace503ebb6a551c1855fe1a1faec18478c78fff254a1793ec lib/unicore/auxiliary/GCBTest.txt + * d6b51d1d2ae5c33b451b7ed994b48f1f4dc62b2272a5831e7fd418514a6bae89 lib/unicore/auxiliary/GraphemeBreakProperty.txt + * e69884e0dde6a8724873f885d68c52dc14518abf9ae4ca9e2283b8773db3b752 lib/unicore/auxiliary/LBTest.txt + * 12cb47d028ded0c1cb8a28558f95479cbcd24559c46977015c82f3b50a1cc6e4 lib/unicore/auxiliary/SBTest.txt + * 871c0c985ad95125e25b302414065a10839d068970bceb383ecec138f22a0a18 lib/unicore/auxiliary/SentenceBreakProperty.txt + * 1de23a75f37904abc7d206239ee8d34f8fdf0fb4ab32a7174dfbabbde25419b2 lib/unicore/auxiliary/WBTest.txt + * 72274cac1e6b919507db35655c3e175aa27274668a1ece95c28d2069f2ad9852 lib/unicore/auxiliary/WordBreakProperty.txt + * 2cb2bb9455cda83e8481541ecf5b6dfda66a3bb89efa3fa7c5297eccf607b72b lib/unicore/emoji/emoji.txt + * 4867b4b7f0731ed1bfcd34cc6251211ff1542541fce0734b6fbda139ee80b3a4 lib/unicore/extracted/DBidiClass.txt + * 13dd09d35a9377e33eb388a01e6581d4bfec6b2685316078c341982fa444071a lib/unicore/extracted/DBinaryProperties.txt + * 191463abfbd202703c6fd6776a92a23ac44ec65e0476a7f95aa91ca492cef29b lib/unicore/extracted/DCombiningClass.txt + * f44e5ceaf40edc1fe06ea0404e8bebc7d356dcc38aac076543b6874008a06e3e lib/unicore/extracted/DDecompositionType.txt + * 0b5523a2217cb318d20b329a05d31eec5af5686ba09d263b85bb75a28989a3a8 lib/unicore/extracted/DEastAsianWidth.txt + * d62e5bab70ca74f099343f71224fa051cb1fdd61a1ab45c0488c44cfc0b6102e lib/unicore/extracted/DGeneralCategory.txt + * bb67e0c00b88acfa5be633967b66b23326844a86e49c6fde7b57960d3af66cae lib/unicore/extracted/DJoinGroup.txt + * f39ebe974825d6736aee15582250307aa532b2cfab3caf3f86bd23fddc9c5c4d lib/unicore/extracted/DJoinType.txt + * dad3ef492d198d6f1dde4922b175f7371a27dfe62fce489f3e04807015a4c682 lib/unicore/extracted/DLineBreak.txt + * 7c83684d3336b698381745b78a971c3e1242cb3fcac58604469086c19b6edcee lib/unicore/extracted/DNumType.txt + * 139b976bdc288be01c80f018523da769cf2845109b5a7f0f8a432db64bfedcfa lib/unicore/extracted/DNumValues.txt + * e3ac360c03d18779fea6d6497fbbe53798135da55e3764d3c9f90a79bbf7e8b5 lib/unicore/mktables + * 8c30575264b2772c7a69c5bb6069a28f0e0a7a0df735871bde2d99ee674316ac lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl - * c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl - * 6f140fe16685fe5d0e81e2984af81342aff5eaba309991002eaca94d032b2ecc regen/mk_invlists.pl + * c4f76f4ba54f533e6b3c6197d2733a4f83f7bbf3c01e6d83b8950e291a3fe36a regen/mk_PL_charclass.pl + * 20a6e3d507a66f4594586485568134873485b08e23383f3dc4e6b3047569267b regen/mk_invlists.pl * ex: set ro ft=c: */ Index: gnu/usr.bin/perl/class.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/class.c,v diff -u -p -a -u -p -r1.2 class.c --- gnu/usr.bin/perl/class.c 1 Apr 2026 23:20:53 -0000 1.2 +++ gnu/usr.bin/perl/class.c 16 Nov 2026 00:57:36 -0000 @@ -38,14 +38,16 @@ Perl_newSVobject(pTHX_ Size_t fieldcount SV *sv = newSV_type(SVt_PVOBJ); if (fieldcount) { + ObjectMAXFIELD(sv) = fieldcount - 1; Newx(ObjectFIELDS(sv), fieldcount, SV *); Zero(ObjectFIELDS(sv), fieldcount, SV *); } +#ifdef DEBUGGING else { - ObjectFIELDS(sv) = NULL; + assert(!ObjectFIELDS(sv)); + assert(ObjectMAXFIELD(sv) == -1); } - ObjectMAXFIELD(sv) = fieldcount - 1; - +#endif return sv; } @@ -80,13 +82,17 @@ PP(pp_initfield) SV **svp = PL_stack_base + POPMARK + 1; STRLEN count = PL_stack_sp - svp + 1; - av = newAV_alloc_x(count); + if (count != 0) { + av = newAV_alloc_x(count); - while(svp <= PL_stack_sp) { - av_push_simple(av, newSVsv(*svp)); - svp++; + while(svp <= PL_stack_sp) { + av_push_simple(av, newSVsv(*svp)); + svp++; + } + rpp_popfree_to(PL_stack_sp - count); } - rpp_popfree_to(PL_stack_sp - count); + else + av = newAV(); } else av = newAV(); @@ -236,7 +242,7 @@ XS(injected_constructor) while((he = hv_iternext(params))) sv_catpvf(paramnames, ", %" SVf, SVfARG(HeSVKEY_force(he))); - croak("Unrecognised parameters for %" HvNAMEf_QUOTEDPREFIX " constructor: %" SVf, + croak("Unrecognized parameters for %" HvNAMEf_QUOTEDPREFIX " constructor: %" SVf, HvNAMEfARG(stash), SVfARG(paramnames)); } @@ -254,9 +260,14 @@ XS(injected_constructor) /* TODO: People would probably expect to find this in pp.c ;) */ PP(pp_methstart) { - /* note that if AvREAL(@_), be careful not to leak self: - * so keep it in @_ for now, and only shift it later */ - SV *self = *(av_fetch(GvAV(PL_defgv), 0, 1)); + bool self_in_pad = PL_op->op_private & OPpSELF_IN_PAD; + SV *self; + if (self_in_pad) + self = PAD_SVl(PADIX_SELF); + else + /* note that if AvREAL(@_), be careful not to leak self: + * so keep it in @_ for now, and only shift it later */ + self = *(av_fetch(GvAV(PL_defgv), 0, 1)); SV *rv = NULL; /* pp_methstart happens before the first OP_NEXTSTATE of the method body, @@ -285,8 +296,10 @@ PP(pp_methstart) croak("Cannot invoke a method of %" HvNAMEf_QUOTEDPREFIX " on an instance of %" HvNAMEf_QUOTEDPREFIX, HvNAMEfARG(CvSTASH(curcv)), HvNAMEfARG(SvSTASH(rv))); - save_clearsv(&PAD_SVl(PADIX_SELF)); - sv_setsv(PAD_SVl(PADIX_SELF), self); + if (!self_in_pad) { + save_clearsv(&PAD_SVl(PADIX_SELF)); + sv_setsv(PAD_SVl(PADIX_SELF), self); + } UNOP_AUX_item *aux = cUNOP_AUX->op_aux; if(aux) { @@ -309,26 +322,24 @@ PP(pp_methstart) * See also https://github.com/Perl/perl5/issues/22278 */ if(fieldp[fieldix]) { - /* TODO: There isn't a convenient SAVE macro for doing both these - * steps in one go. Add one. */ - SAVESPTR(PAD_SVl(padix)); - SV *sv = PAD_SVl(padix) = SvREFCNT_inc(fieldp[fieldix]); - save_freesv(sv); + save_padsv(padix); + PAD_SVl(padix) = SvREFCNT_inc(fieldp[fieldix]); } } } - /* safe to shift and free self now */ - self = av_shift(GvAV(PL_defgv)); - if (AvREAL(GvAV(PL_defgv))) - SvREFCNT_dec_NN(self); + if (!self_in_pad) { + /* safe to shift and free self now */ + self = av_shift(GvAV(PL_defgv)); + if (AvREAL(GvAV(PL_defgv))) + SvREFCNT_dec_NN(self); + } if(PL_op->op_private & OPpINITFIELDS) { SV *params = *av_fetch(GvAV(PL_defgv), 0, 0); if(params && SvTYPE(params) == SVt_PVHV) { - SAVESPTR(PAD_SVl(PADIX_PARAMS)); + save_padsv(PADIX_PARAMS); PAD_SVl(PADIX_PARAMS) = SvREFCNT_inc(params); - save_freesv(params); } } @@ -336,9 +347,9 @@ PP(pp_methstart) } static void -invoke_class_seal(pTHX_ void *_arg) +invoke_class_seal(pTHX_ void *arg_) { - class_seal_stash((HV *)_arg); + class_seal_stash((HV *)arg_); } void @@ -375,7 +386,7 @@ Perl_class_setup_stash(pTHX_ HV *stash) /* Inject the constructor */ { - SV *newname = Perl_newSVpvf(aTHX_ "%s::new", classname); + SV *newname = newSVpvf("%s::new", classname); SAVEFREESV(newname); CV *newcv = newXS_flags(SvPV_nolen(newname), injected_constructor, __FILE__, NULL, nameflags); @@ -387,12 +398,14 @@ Perl_class_setup_stash(pTHX_ HV *stash) */ struct xpvhv_aux *aux = HvAUX(stash); + aux->xhv_class_flags = 0; aux->xhv_class_superclass = NULL; aux->xhv_class_initfields_cv = NULL; aux->xhv_class_adjust_blocks = NULL; aux->xhv_class_fields = NULL; aux->xhv_class_next_fieldix = 0; aux->xhv_class_param_map = NULL; + aux->xhv_class_subclasses_pending_seal = NULL; aux->xhv_aux_flags |= HvAUXf_IS_CLASS; @@ -436,8 +449,9 @@ static const char *S_split_package_ver(p if(SvUTF8(value)) SvUTF8_on(pkgname); - while(*p && isSPACE_utf8_safe(p, end)) - p += UTF8SKIP(p); + Size_t advance; + while(*p && (advance = isSPACE_utf8_safe(p, end))) + p += advance; if(*p) { /* scan_version() gets upset about trailing content. We need to extract @@ -454,8 +468,8 @@ static const char *S_split_package_ver(p scan_version(SvPVX(tmpsv), pkgversion, FALSE); } - while(*p && isSPACE_utf8_safe(p, end)) - p += UTF8SKIP(p); + while(*p && (advance = isSPACE_utf8_safe(p, end))) + p += advance; return p; } @@ -654,7 +668,10 @@ been defined so a new attempt can be mad */ static void -S_class_cleanup_definition(pTHX_ HV *stash) { +S_class_cleanup_definition(pTHX_ HV *stash) +{ + PERL_ARGS_ASSERT_CLASS_CLEANUP_DEFINITION; + struct xpvhv_aux *aux = HvAUX(stash); SvREFCNT_dec(aux->xhv_class_superclass); @@ -668,6 +685,9 @@ S_class_cleanup_definition(pTHX_ HV *sta SvREFCNT_dec(aux->xhv_class_param_map); aux->xhv_class_param_map = NULL; + SvREFCNT_dec(aux->xhv_class_subclasses_pending_seal); + aux->xhv_class_subclasses_pending_seal = NULL; + /* clean up the ops for defaults for fields, if any, since padname_free() doesn't. */ @@ -742,7 +762,29 @@ Perl_class_seal_stash(pTHX_ HV *stash) return; } + if(HvCLASS_IS_SEALED(stash)) + /* idempotent */ + return; + struct xpvhv_aux *aux = HvAUX(stash); + struct xpvhv_aux *superaux = NULL; + + if(aux->xhv_class_superclass) { + HV *superstash = aux->xhv_class_superclass; + assert(HvSTASH_IS_CLASS(superstash)); + superaux = HvAUX(superstash); + + if(!HvCLASS_IS_SEALED(superstash)) { + if(!superaux->xhv_class_subclasses_pending_seal) + superaux->xhv_class_subclasses_pending_seal = newAV(); + /* tut tut this will be an AV whose elements are HV *s directly. + * That's fine. perl code won't ever see this array so there's no + * point us wrapping them in newRV_inc()s + */ + av_push(superaux->xhv_class_subclasses_pending_seal, SvREFCNT_inc((SV *)stash)); + return; + } + } /* generate initfields CV */ I32 floor_ix = PL_savestack_ix; @@ -775,11 +817,8 @@ Perl_class_seal_stash(pTHX_ HV *stash) ops = op_append_list(OP_LINESEQ, ops, newUNOP_AUX(OP_METHSTART, OPpINITFIELDS << 8, NULL, NULL)); - if(aux->xhv_class_superclass) { - HV *superstash = aux->xhv_class_superclass; - assert(HvSTASH_IS_CLASS(superstash)); - struct xpvhv_aux *superaux = HvAUX(superstash); - + if(superaux) { + assert(superaux->xhv_class_initfields_cv); /* Build an OP_ENTERSUB */ OP *o = newLISTOPn(OP_ENTERSUB, OPf_WANT_VOID|OPf_STACKED, newPADxVOP(OP_PADSV, 0, PADIX_SELF), @@ -902,6 +941,17 @@ Perl_class_seal_stash(pTHX_ HV *stash) CvIsMETHOD_on(initfields); aux->xhv_class_initfields_cv = initfields; + + aux->xhv_class_flags |= HvCLASSf_SEALED; + + if(aux->xhv_class_subclasses_pending_seal) { + AV *subclasses = aux->xhv_class_subclasses_pending_seal; + for (UV idx = 0; idx < av_count(subclasses); idx++) + class_seal_stash((HV *)AvARRAY(subclasses)[idx]); + + SvREFCNT_dec(subclasses); + aux->xhv_class_subclasses_pending_seal = NULL; + } } void @@ -941,6 +991,25 @@ Perl_class_prepare_method_parse(pTHX_ CV CvIsMETHOD_on(cv); } +#define find_op_methstart(o) S_find_op_methstart(aTHX_ o) +static OP * +S_find_op_methstart(pTHX_ OP *o) +{ + if(o->op_type == OP_METHSTART) + return o; + + if(!(o->op_flags & OPf_KIDS)) + return NULL; + + for(OP *kid = cUNOPo->op_first; kid; kid = OpSIBLING(kid)) { + OP *methstart = find_op_methstart(kid); + if(methstart) + return methstart; + } + + return NULL; +} + OP * Perl_class_wrap_method_body(pTHX_ OP *o) { @@ -998,7 +1067,18 @@ Perl_class_wrap_method_body(pTHX_ OP *o) if(o->op_type != OP_LINESEQ) o = newLISTOP(OP_LINESEQ, 0, o, NULL); - op_sibling_splice(o, NULL, 0, newUNOP_AUX(OP_METHSTART, 0, NULL, aux)); + if(CvSIGNATURE(PL_compcv)) { + /* A signatured method has already injected the OP_METHSTART; we just + * have to find it and attach the aux structure to it + */ + OP *methstartop = find_op_methstart(o); + assert(methstartop); + assert(!cUNOP_AUXx(methstartop)->op_aux); + + cUNOP_AUXx(methstartop)->op_aux = aux; + } + else + op_sibling_splice(o, NULL, 0, newUNOP_AUX(OP_METHSTART, 0, NULL, aux)); return o; } @@ -1014,12 +1094,15 @@ Perl_class_add_field(pTHX_ HV *stash, PA PADOFFSET fieldix = aux->xhv_class_next_fieldix; aux->xhv_class_next_fieldix++; - Newxz(PadnameFIELDINFO(pn), 1, struct padname_fieldinfo); - PadnameFLAGS(pn) |= PADNAMEf_FIELD; + struct padname_fieldinfo *fieldinfo; + Newxz(fieldinfo, 1, struct padname_fieldinfo); - PadnameFIELDINFO(pn)->refcount = 1; - PadnameFIELDINFO(pn)->fieldix = fieldix; - PadnameFIELDINFO(pn)->fieldstash = (HV *)SvREFCNT_inc(stash); + fieldinfo->refcount = 1; + fieldinfo->fieldix = fieldix; + fieldinfo->fieldstash = HvREFCNT_inc(stash); + + PadnameFIELDINFO(pn) = fieldinfo; + PadnameFLAGS(pn) |= PADNAMEf_FIELD; if(!aux->xhv_class_fields) aux->xhv_class_fields = newPADNAMELIST(0); @@ -1028,6 +1111,26 @@ Perl_class_add_field(pTHX_ HV *stash, PA PadnameREFCNT_inc(pn); } +/* Adds a pad entry to PL_compcv to make the given field visible. This works + * even before the field has been properly `intro_my()`'ed and is thus usable + * during attributes declared on the same newly-field. + */ + +#define pad_import_field(fieldpn) S_pad_import_field(aTHX_ fieldpn) +static PADOFFSET +S_pad_import_field(pTHX_ PADNAME *fieldpn) +{ + assert(PadnameIsFIELD(fieldpn)); + + /* We can't just pad_findmy_pvn() because the actual field may not have been + * intro_my()'ed yet */ + PADNAME *name = newPADNAMEouter(fieldpn); + PADOFFSET padix = pad_alloc(OP_PADSV, SVs_PADMY|padalloc_NO_SV); + padnamelist_store(PL_comppad_name, padix, name); + + return padix; +} + static void apply_field_attribute_param(pTHX_ PADNAME *pn, SV *value) { @@ -1070,10 +1173,9 @@ apply_field_attribute_reader(pTHX_ PADNA if(!valid_identifier_sv(value)) croak("%" SVf_QUOTEDPREFIX " is not a valid name for a generated method", value); - PADOFFSET fieldix = PadnameFIELDINFO(pn)->fieldix; - I32 floor_ix = start_subparse(FALSE, 0); SAVEFREESV(PL_compcv); + CvIsMETHOD_on(PL_compcv); I32 save_ix = block_start(TRUE); @@ -1082,36 +1184,13 @@ apply_field_attribute_reader(pTHX_ PADNA padix = pad_add_name_pvs("$self", 0, NULL, NULL); assert(padix == PADIX_SELF); - padix = pad_add_name_pvn(PadnamePV(pn), PadnameLEN(pn), 0, NULL, NULL); - intro_my(); + subsignature_start(); + CvSIGNATURE_on(PL_compcv); - OP *methstartop; - { - UNOP_AUX_item *aux; - aux = (UNOP_AUX_item *)PerlMemShared_malloc( - sizeof(UNOP_AUX_item) * (2 + 2)); - - UNOP_AUX_item *ap = aux; - (ap++)->uv = 1; /* fieldcount */ - (ap++)->uv = fieldix; /* max_fieldix */ - - (ap++)->uv = padix; - (ap++)->uv = fieldix; - - methstartop = newUNOP_AUX(OP_METHSTART, 0, NULL, aux); - } - - OP *argcheckop; - { - struct op_argcheck_aux *aux = (struct op_argcheck_aux *) - PerlMemShared_malloc(sizeof(*aux)); + OP *sigop = subsignature_finish(); - aux->params = 0; - aux->opt_params = 0; - aux->slurpy = 0; - - argcheckop = newUNOP_AUX(OP_ARGCHECK, 0, NULL, (UNOP_AUX_item *)aux); - } + padix = pad_import_field(pn); + intro_my(); OP *retop; { @@ -1129,8 +1208,7 @@ apply_field_attribute_reader(pTHX_ PADNA } OP *ops = newLISTOPn(OP_LINESEQ, 0, - methstartop, - argcheckop, + sigop, retop, NULL); @@ -1144,18 +1222,6 @@ apply_field_attribute_reader(pTHX_ PADNA CvIsMETHOD_on(cv); } -/* If '@_' is called "snail", then elements of it can be called "slugs"; i.e. - * snails out of their container. */ -#define newSLUGOP(idx) S_newSLUGOP(aTHX_ idx) -static OP * -S_newSLUGOP(pTHX_ IV idx) -{ - assert(idx >= 0 && idx <= 255); - OP *op = newGVOP(OP_AELEMFAST, 0, PL_defgv); - op->op_private = idx; - return op; -} - static void apply_field_attribute_writer(pTHX_ PADNAME *pn, SV *value) { @@ -1175,10 +1241,9 @@ apply_field_attribute_writer(pTHX_ PADNA if(!valid_identifier_sv(value)) croak("%" SVf_QUOTEDPREFIX " is not a valid name for a generated method", value); - PADOFFSET fieldix = PadnameFIELDINFO(pn)->fieldix; - I32 floor_ix = start_subparse(FALSE, 0); SAVEFREESV(PL_compcv); + CvIsMETHOD_on(PL_compcv); I32 save_ix = block_start(TRUE); @@ -1187,39 +1252,23 @@ apply_field_attribute_writer(pTHX_ PADNA padix = pad_add_name_pvs("$self", 0, NULL, NULL); assert(padix == PADIX_SELF); - padix = pad_add_name_pvn(PadnamePV(pn), PadnameLEN(pn), 0, NULL, NULL); - intro_my(); - - OP *methstartop; - { - UNOP_AUX_item *aux; - aux = (UNOP_AUX_item *)PerlMemShared_malloc( - sizeof(UNOP_AUX_item) * (2 + 2)); - - UNOP_AUX_item *ap = aux; - (ap++)->uv = 1; /* fieldcount */ - (ap++)->uv = fieldix; /* max_fieldix */ + subsignature_start(); + CvSIGNATURE_on(PL_compcv); - (ap++)->uv = padix; - (ap++)->uv = fieldix; - - methstartop = newUNOP_AUX(OP_METHSTART, 0, NULL, aux); - } + /* param pad variable doesn't technically need a name, so don't bother as + * reusing the field name will provoke a warning */ + PADOFFSET param_padix = padix = pad_add_name_pvn("$", 1, 0, NULL, NULL); + intro_my(); - OP *argcheckop; - { - struct op_argcheck_aux *aux = (struct op_argcheck_aux *) - PerlMemShared_malloc(sizeof(*aux)); + subsignature_append_positional(param_padix, 0, NULL); - aux->params = 1; - aux->opt_params = 0; - aux->slurpy = 0; + OP *sigop = subsignature_finish(); - argcheckop = newUNOP_AUX(OP_ARGCHECK, 0, NULL, (UNOP_AUX_item *)aux); - } + padix = pad_import_field(pn); + intro_my(); OP *assignop = newBINOP(OP_SASSIGN, 0, - newSLUGOP(0), + newPADxVOP(OP_PADSV, 0, param_padix), newPADxVOP(OP_PADSV, OPf_MOD|OPf_REF, padix)); OP *retop = newLISTOP(OP_RETURN, 0, @@ -1227,8 +1276,7 @@ apply_field_attribute_writer(pTHX_ PADNA newPADxVOP(OP_PADSV, 0, PADIX_SELF)); OP *ops = newLISTOPn(OP_LINESEQ, 0, - methstartop, - argcheckop, + sigop, assignop, retop, NULL); @@ -1369,6 +1417,8 @@ Perl_class_add_ADJUST(pTHX_ HV *stash, C OP * Perl_ck_classname(pTHX_ OP *o) { + PERL_ARGS_ASSERT_CK_CLASSNAME; + if(!CvIsMETHOD(PL_compcv)) croak("Cannot use __CLASS__ outside of a method or field initializer expression"); Index: gnu/usr.bin/perl/config_h.SH =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/config_h.SH,v diff -u -p -a -u -p -r1.28 config_h.SH --- gnu/usr.bin/perl/config_h.SH 21 Sep 2026 18:20:27 -0000 1.28 +++ gnu/usr.bin/perl/config_h.SH 16 Nov 2026 00:57:36 -0000 @@ -142,12 +142,6 @@ sed <$CONFIG_H -e 's!^#und */ #$d_fcntl HAS_FCNTL /**/ -/* HAS_FDOPENDIR: - * This symbol, if defined, indicates that the fdopendir routine is - * available to open a directory descriptor. - */ -#$d_fdopendir HAS_FDOPENDIR /**/ - /* HAS_FGETPOS: * This symbol, if defined, indicates that the fgetpos routine is * available to get the file position indicator, similar to ftell(). @@ -799,9 +793,14 @@ sed <$CONFIG_H -e 's!^#und * This symbol contains the value of sizeof(short) so that the C * preprocessor can make decisions based on it. */ +/* INTMAXSIZE: + * This symbol contains the value of sizeof(intmax_t) so that the C + * preprocessor can make decisions based on it. + */ #define INTSIZE $intsize /**/ #define LONGSIZE $longsize /**/ #define SHORTSIZE $shortsize /**/ +#define INTMAXSIZE $intmaxsize /**/ /* MULTIARCH: * This symbol, if defined, signifies that the build @@ -2526,6 +2525,13 @@ sed <$CONFIG_H -e 's!^#und */ #$d_fdim HAS_FDIM /**/ +/* HAS_FDOPENDIR: + * This symbol, if defined, indicates that the fdopendir() routine is + * available to open directories using an opened file descriptor already + * referring to that directory. + */ +#$d_fdopendir HAS_FDOPENDIR /**/ + /* HAS_FEGETROUND: * This symbol, if defined, indicates that the fegetround routine is * available to return the macro corresponding to the current rounding @@ -2767,6 +2773,12 @@ sed <$CONFIG_H -e 's!^#und */ #$d_getcwd HAS_GETCWD /**/ +/* HAS_GETENTROPY: + * This symbol, if defined, indicates that the getentropy system call + * is available to retrieve fill a buffer with random bytes. + */ +#$d_getentropy HAS_GETENTROPY /**/ + /* HAS_GETESPWNAM: * This symbol, if defined, indicates that the getespwnam system call is * available to retrieve enhanced (shadow) password entries by name. @@ -3842,6 +3854,12 @@ sed <$CONFIG_H -e 's!^#und */ #$i_stdbool I_STDBOOL /**/ +/* I_STDCKDINT: + * This symbol, if defined, indicates that exists and + * can be included. + */ +#$i_stdckdint I_STDCKDINT /**/ + /* I_STDINT: * This symbol, if defined, indicates that exists and * should be included. @@ -3872,6 +3890,12 @@ sed <$CONFIG_H -e 's!^#und */ #$i_sysmount I_SYS_MOUNT /**/ +/* I_SYS_RANDOM: + * This symbol, if defined, indicates that exists and + * should be included. + */ +#$i_sysrandom I_SYS_RANDOM /**/ + /* I_SYS_STATFS: * This symbol, if defined, indicates that exists. */ @@ -4389,13 +4413,6 @@ sed <$CONFIG_H -e 's!^#und #ifndef USE_FAST_STDIO #$usefaststdio USE_FAST_STDIO /**/ #endif - -/* USE_GETEXECPATH: - * This symbol, if defined, indicates that we can use getexecpath - * to get a full path for the executable, and hence convert $^X to - * an absolute path. - */ -#$usegetexecpath USE_GETEXECPATH /**/ /* USE_KERN_PROC_PATHNAME: * This symbol, if defined, indicates that we can use sysctl with Index: gnu/usr.bin/perl/configure.com =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/configure.com,v diff -u -p -a -u -p -r1.15 configure.com --- gnu/usr.bin/perl/configure.com 21 Sep 2026 18:20:27 -0000 1.15 +++ gnu/usr.bin/perl/configure.com 16 Nov 2026 00:57:36 -0000 @@ -1294,9 +1294,7 @@ $ vms_cc_dflt = "" $ vms_cc_available = "" $! $ OPEN/WRITE CONFIG ccvms.c -$ WRITE CONFIG "#ifdef __DECC" -$ WRITE CONFIG "#include " !DECC is sooo picky -$ WRITE CONFIG "#endif" +$ WRITE CONFIG "#include " $ WRITE CONFIG "#include " $ WRITE CONFIG "int main() {" $ WRITE CONFIG "#ifdef __DECC" @@ -1478,7 +1476,7 @@ $ THEN $ echo "" $ echo4 "Checking for the Dec C version number..." $ OPEN/WRITE CONFIG deccvers.c -$ WRITE CONFIG "#include " !DECC is sooo picky +$ WRITE CONFIG "#include " $ WRITE CONFIG "#include " $ WRITE CONFIG "int main() {" $ WRITE CONFIG "#ifdef __DECC" @@ -3260,9 +3258,8 @@ $! $type_size_check: $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" +$ WS "#include " $ WS "#include " $ WS "int main()" $ WS "{" @@ -3277,9 +3274,7 @@ $!: locate header file $findhdr: $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include <''tmp'>" $ WS "int main()" @@ -3366,9 +3361,7 @@ $! $! Check for __STDC__ $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -3401,10 +3394,7 @@ $! $! Check for long double size $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" -$ WS "#pragma message disable ALL" ! VAX compilers may have distracting informationals $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -3469,9 +3459,7 @@ $ sSCNfldbl = sPRIfldbl ! expect consist $! $!: check for long long $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -3499,9 +3487,7 @@ $! Check the prototype for getgid $! $ echo "Looking for the type for group ids returned by getgid()." $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ WS "int main()" @@ -3525,9 +3511,7 @@ $! Check to see if we've got dev_t $! $ echo "Looking for the type for dev." $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ WS "int main()" @@ -3603,9 +3587,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ IF i_unistd .EQS. "define" THEN WS "#include " @@ -3639,9 +3621,7 @@ $! Check to see if fd_set exists $! $ echo "Checking to see how well your C compiler handles fd_set and friends ..." $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ IF Has_Dec_C_Sockets @@ -3667,6 +3647,12 @@ $ d_fd_set="define" $ echo4 "Well, your system knows about the normal fd_set typedef..." $ ENDIF $! +$! Check for stdckdint.h +$! +$ tmp = "stdckdint.h" +$ GOSUB inhdr +$ i_stdckdint = tmp +$! $! Check for stdint.h $! $ tmp = "stdint.h" @@ -3683,9 +3669,7 @@ $! Check to see if off64_t exists $! $ echo4 "Checking to see if you have off64_t..." $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ WS "#''i_inttypes' IIH" @@ -3711,9 +3695,7 @@ $! $! Check to see if fpclassify exists $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -3729,9 +3711,7 @@ $! Check to see if fpos64_t exists $! $ echo4 "Checking to see if you have fpos64_t..." $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ WS "#''i_inttypes' IIH" @@ -3758,9 +3738,7 @@ $! Check to see if int64_t exists $! $ echo4 "Checking to see if you have int64_t..." $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ WS "#''i_inttypes' IIH" @@ -3825,9 +3803,7 @@ $! Check for h_errno $! $ echo4 "Checking to see if you have h_errno..." $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_unistd .EQS. "define" THEN WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " @@ -3852,9 +3828,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ WS "#include " @@ -3951,9 +3925,7 @@ $! $! Check for fcntl $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ WS "int main()" @@ -3974,9 +3946,7 @@ $ IF d_fcntl .EQS. "define" $ THEN $ OS $ WS "#include " -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ WS "int main() {" @@ -4181,9 +4151,7 @@ $! $! Check for memrchr $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4199,9 +4167,7 @@ $! $! Check for strnlen $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4217,9 +4183,7 @@ $! $! Check for strtoull $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4235,9 +4199,7 @@ $! $! Check for strtouq $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4253,9 +4215,7 @@ $! $! Check for strtoll $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4271,9 +4231,7 @@ $! $! Check for strtoq $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4289,9 +4247,7 @@ $! $! Check for strtold $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4307,9 +4263,7 @@ $! $! Check for atoll $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4325,9 +4279,7 @@ $! $! Check for atolf $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4343,9 +4295,7 @@ $! $! Check for access $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4360,9 +4310,7 @@ $! $! Check for mkostemp $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4377,9 +4325,7 @@ $! $! Check for mkstemp $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4394,9 +4340,7 @@ $! $! Check for mkstemps $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4411,9 +4355,7 @@ $! $! Check for mkdtemp $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4430,9 +4372,7 @@ $! $ if i_poll .eqs. "define" $ then $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4451,9 +4391,7 @@ $! $! Check for setvbuf $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4471,9 +4409,7 @@ $! $! Check for the shm* routines. $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ WS "#include " @@ -4509,9 +4445,7 @@ $! $! Check for setenv $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4526,9 +4460,7 @@ $! $! Check for setproctitle $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4590,9 +4522,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " $ WS "int main()" @@ -4613,9 +4543,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " $ WS "int main()" @@ -4636,9 +4564,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " $ WS "int main()" @@ -4659,9 +4585,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " $ WS "int main()" @@ -4682,9 +4606,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " $ WS "int main()" @@ -4705,9 +4627,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " $ WS "int main()" @@ -4728,9 +4648,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " $ WS "int main()" @@ -4751,9 +4669,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " $ WS "int main()" @@ -4774,9 +4690,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " $ WS "int main()" @@ -4797,9 +4711,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " $ WS "int main()" @@ -4820,9 +4732,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " $ WS "int main()" @@ -4843,9 +4753,7 @@ $! $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " $ WS "int main()" @@ -4868,9 +4776,7 @@ $ echo4 "Checking the availability of sa $ IF Has_Dec_C_Sockets $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#define _SOCKADDR_LEN" $ WS "#include " $ WS "#include " @@ -4928,9 +4834,7 @@ $! $! Check for nanosleep $! $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -4948,9 +4852,7 @@ $ IF Has_Dec_C_Sockets $ THEN $ echo4 "Checking to see if you have socklen_t..." $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ IF i_netdb .EQS. "define" THEN WS "#include " $ WS "int main()" @@ -4977,9 +4879,7 @@ $! $ IF use_threads $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ WS "int main()" @@ -5000,9 +4900,7 @@ $! $ IF use_threads $ THEN $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ WS "int main()" @@ -5032,9 +4930,7 @@ $! Check for generic pointer size $! $ echo4 "Checking to see how big your pointers are..." $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main()" $ WS "{" @@ -5090,9 +4986,7 @@ $ st_ino_size = 4 $ OS $ WS "#include " $ WS "#include " -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "int main() {" $ WS "#''uselargefiles' _LARGEFILE" $ WS "#ifdef _LARGEFILE" @@ -5568,6 +5462,10 @@ $ gosub type_size_check $ intsize = tmp $ ENDIF $! +$ tmp = "''intmax_t'" +$ gosub type_size_check +$ intmaxsize = tmp +$! $ tmp = "''u32type'" $ gosub type_size_check $ u32size = tmp @@ -5583,9 +5481,7 @@ $! $ d_nv_preserves_uv = "undef" $ echo4 "Checking how many bits of your UVs your NVs can preserve..." $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "int main() {" $ WS " ''uvtype' u = 0;" @@ -5682,9 +5578,7 @@ $! Check for signbit (must already know $! $ echo4 "Checking to see if you have signbit() available to work on ''nvtype'..." $ OS -$ WS "#if defined(__DECC) || defined(__DECCXX)" $ WS "#include " -$ WS "#endif" $ WS "#include " $ WS "#include " $ WS "int main()" @@ -6204,6 +6098,7 @@ $ WC "d_nice='define'" $ WC "d_nl_langinfo='" + d_nl_langinfo + "'" $ WC "d_nl_langinfo_l='undef'" $ WC "d_non_int_bitfields='define'" +$ WC "d_getentropy='undef'" $ WC "d_getenv_preserves_other_thread='" + d_getenv_preserves_other_thread + "'" $ WC "d_nv_preserves_uv='" + d_nv_preserves_uv + "'" $ WC "nv_overflows_integers_at='" + nv_overflows_integers_at + "'" @@ -6550,6 +6445,7 @@ $ WC "i_stdbool='define'" $ ELSE $ WC "i_stdbool='undef'" $ ENDIF +$ WC "i_stdckdint='" + i_stdckdint + "'" $ WC "i_stdint='" + i_stdint + "'" $ WC "i_stdlib='define'" $ WC "i_sunmath='undef'" @@ -6566,6 +6462,7 @@ $ WC "i_sysmount='undef'" $ WC "i_sysndir='undef'" $ WC "i_sysparam='undef'" $ WC "i_syspoll='" + i_syspoll + "'" +$ WC "i_sysrandom='undef'" $ WC "i_sysresrc='undef'" $ WC "i_syssecrt='" + i_syssecrt + "'" $ WC "i_sysselct='undef'" @@ -6608,6 +6505,7 @@ $ WC "installsitearch='" + installsitear $ WC "installsitebin='" + sitebin + "'" $ WC "installsitelib='" + installsitelib + "'" $ WC "installusrbinperl='undef'" +$ WC "intmaxsize='" + intmaxsize + "'" $ WC "intsize='" + intsize + "'" $ WC "ivdformat='" + ivdformat + "'" $ WC "ivsize='" + ivsize + "'" @@ -6823,7 +6721,6 @@ $ WC "usefaststdio='" + usefaststdio + " $ WC "useieee='" + useieee + "'" ! VMS-specific $ WC "useithreads='" + useithreads + "'" $ WC "usekernelthreads='" + usekernelthreads + "'" ! VMS-specific -$ WC "usegetexecpath='undef'" $ WC "usekernprocpathname='undef'" $ WC "usensgetexecutablepath='undef'" $ WC "uselargefiles='" + uselargefiles + "'" Index: gnu/usr.bin/perl/cop.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cop.h,v diff -u -p -a -u -p -r1.25 cop.h --- gnu/usr.bin/perl/cop.h 26 Dec 2025 22:14:12 -0000 1.25 +++ gnu/usr.bin/perl/cop.h 16 Nov 2026 00:57:36 -0000 @@ -120,8 +120,8 @@ typedef struct jmpenv JMPENV; int i = 0; \ JMPENV *p = PL_top_env; \ while (p) { i++; p = p->je_prev; } \ - Perl_deb(aTHX_ "JMPENV_PUSH pre level=%d in %s at %s:%d\n", \ - i, SAFE_FUNCTION__, __FILE__, __LINE__); \ + deb("JMPENV_PUSH pre level=%d in %s at %s:%d\n", \ + i, SAFE_FUNCTION__, __FILE__, __LINE__); \ }); \ cur_env.je_prev = PL_top_env; \ JE_OLD_STACK_HWM_save(cur_env); \ @@ -142,8 +142,8 @@ typedef struct jmpenv JMPENV; int i = 0; \ JMPENV *p = PL_top_env; \ while (p) { i++; p = p->je_prev; } \ - Perl_deb(aTHX_ "JMPENV_PUSH level=%d ret=%d in %s at %s:%d\n", \ - i, cur_env.je_ret, SAFE_FUNCTION__, __FILE__, __LINE__); \ + deb("JMPENV_PUSH level=%d ret=%d in %s at %s:%d\n", \ + i, cur_env.je_ret, SAFE_FUNCTION__, __FILE__, __LINE__); \ }); \ (v) = cur_env.je_ret; \ } STMT_END @@ -153,8 +153,8 @@ typedef struct jmpenv JMPENV; DEBUG_l({ \ int i = -1; JMPENV *p = PL_top_env; \ while (p) { i++; p = p->je_prev; } \ - Perl_deb(aTHX_ "JMPENV_POP level=%d in %s at %s:%d\n", \ - i, SAFE_FUNCTION__, __FILE__, __LINE__);}) \ + deb("JMPENV_POP level=%d in %s at %s:%d\n", \ + i, SAFE_FUNCTION__, __FILE__, __LINE__);}) \ assert(PL_top_env == &cur_env); \ PL_delaymagic = cur_env.je_old_delaymagic; \ PL_top_env = cur_env.je_prev; \ @@ -165,8 +165,8 @@ typedef struct jmpenv JMPENV; DEBUG_l({ \ int i = -1; JMPENV *p = PL_top_env; \ while (p) { i++; p = p->je_prev; } \ - Perl_deb(aTHX_ "JMPENV_JUMP(%d) level=%d in %s at %s:%d\n", \ - (int)(v), i, SAFE_FUNCTION__, __FILE__, __LINE__);}) \ + deb("JMPENV_JUMP(%d) level=%d in %s at %s:%d\n", \ + (int)(v), i, SAFE_FUNCTION__, __FILE__, __LINE__);}) \ if (PL_top_env->je_prev) { \ assert((v) >= 0 && (v) <= 3); \ PerlProc_longjmp(PL_top_env->je_buf, (v)); \ @@ -181,8 +181,7 @@ typedef struct jmpenv JMPENV; #define CATCH_SET(v) \ STMT_START { \ DEBUG_l( \ - Perl_deb(aTHX_ \ - "JUMPLEVEL set catch %d => %d (for %p) in %s at %s:%d\n", \ + deb("JUMPLEVEL set catch %d => %d (for %p) in %s at %s:%d\n", \ PL_top_env->je_mustcatch, (v), (void*)PL_top_env, \ SAFE_FUNCTION__, __FILE__, __LINE__);) \ PL_top_env->je_mustcatch = (v); \ @@ -202,31 +201,38 @@ typedef struct refcounted_he COPHH; =for apidoc_item|SV *|cophh_fetch_pvn|const COPHH *cophh|const char *key|STRLEN keylen|U32 hash|U32 flags =for apidoc_item|SV *|cophh_fetch_pvs|const COPHH *cophh| "key" |U32 flags =for apidoc_item|SV *|cophh_fetch_sv |const COPHH *cophh| SV *key |U32 hash|U32 flags +=for apidoc_flag COPHH_KEY_UTF8 -These look up the entry in the cop hints hash C with the key specified by -C (and C in the C form), returning that value as a mortal -scalar copy, or C<&PL_sv_placeholder> if there is no value associated with the -key. +These each look up the entry in the cop hints hash C with the specified +key, returning that value as a mortal scalar copy, or C<&PL_sv_placeholder> if +there is no value associated with the key. -The forms differ in how the key is specified. -In the plain C form, the key is a C language NUL-terminated string. -In the C form, the key is a C language string literal. -In the C form, an additional parameter, C, specifies the length of -the string, which hence, may contain embedded-NUL characters. -In the C form, C<*key> is an SV, and the key is the PV extracted from that. -using C>. +You should probably be instead using the wrappers for these functions that take +a C, see L. + +The forms here differ only in how the key is specified. + +In C, C is a C language NUL-terminated string. + +In C, C is a C language string literal, enclosed in +double quotes. + +In C, C points to the first byte of the string +specifying the key, and an additional parameter, C, specifies its +length in bytes. Hence, C may contain embedded-NUL characters. + +In C, C<*key> is an SV, and the key is the PV extracted from +that. using C>. C is a precomputed hash of the key string, or zero if it has not been -precomputed. This parameter is omitted from the C form, as it is computed -automatically at compile time. +precomputed. This parameter is omitted from C, which behaves +as if zero had been specified. The only flag currently used from the C parameter is C. -It is illegal to set this in the C form. In the C forms, it specifies -whether the key octets are interpreted as UTF-8 (if set) or as Latin-1 (if -cleared). The C form uses the underlying SV to determine the UTF-8ness of -the octets. - -=for apidoc Amnh||COPHH_KEY_UTF8 +It is illegal to set this in C. In the C forms, it +specifies whether the key octets are interpreted as UTF-8 (if set) or as +Latin-1 (if cleared). The C form uses the underlying SV to determine the +UTF-8ness of the octets. =cut @@ -249,29 +255,40 @@ the octets. (flags & COPHH_KEY_UTF8)) /* -=for apidoc Amx|bool|cophh_exists_pvn|const COPHH *cophh|const char *key|STRLEN keylen|U32 hash|U32 flags +=for apidoc Amx|bool|cophh_exists_pv |const COPHH *cophh|const char *key |U32 hash|U32 flags +=for apidoc_item|bool|cophh_exists_pvn|const COPHH *cophh|const char *key|STRLEN keylen|U32 hash|U32 flags +=for apidoc_item|bool|cophh_exists_pvs|const COPHH *cophh| "key" |U32 flags +=for apidoc_item|bool|cophh_exists_sv |const COPHH *cophh| SV *key |U32 hash|U32 flags -These look up the hint entry in the cop C with the key specified by -C (and C in the C form), returning true if a value exists, -and false otherwise. +These each look up the entry in the cop hints hash C with the specified +key, returning true if a value exists, and false otherwise. -The forms differ in how the key is specified. -In the plain C form, the key is a C language NUL-terminated string. -In the C form, the key is a C language string literal. -In the C form, an additional parameter, C, specifies the length of -the string, which hence, may contain embedded-NUL characters. -In the C form, C<*key> is an SV, and the key is the PV extracted from that. -using C>. +You should probably be instead using the wrappers for these functions that take +a C, see L. + +The forms here differ only in how the key is specified. + +In C, C is a C language NUL-terminated string. + +In C, C is a C language string literal, enclosed in +double quotes. + +In C, C points to the first byte of the string +specifying the key, and an additional parameter, C, specifies its +length in bytes. Hence, C may contain embedded-NUL characters. + +In C, C<*key> is an SV, and the key is the PV extracted from +that. using C>. C is a precomputed hash of the key string, or zero if it has not been -precomputed. This parameter is omitted from the C form, as it is computed -automatically at compile time. +precomputed. This parameter is omitted from C, which behaves +as if zero had been specified. The only flag currently used from the C parameter is C. -It is illegal to set this in the C form. In the C forms, it specifies -whether the key octets are interpreted as UTF-8 (if set) or as Latin-1 (if -cleared). The C form uses the underlying SV to determine the UTF-8ness of -the octets. +It is illegal to set this in C. In the C forms, it +specifies whether the key octets are interpreted as UTF-8 (if set) or as +Latin-1 (if cleared). The C form uses the underlying SV to determine the +UTF-8ness of the octets. =cut */ @@ -338,30 +355,36 @@ Generate and return a fresh cop hints ha =for apidoc_item|COPHH *|cophh_store_pvs|COPHH *cophh| "key" |SV *value|U32 flags =for apidoc_item|COPHH *|cophh_store_sv |COPHH *cophh| SV *key |U32 hash|SV *value|U32 flags -These store a value, associated with a key, in the cop hints hash C, -and return the modified hash. The returned hash pointer is in general -not the same as the hash pointer that was passed in. The input hash is -consumed by the function, and the pointer to it must not be subsequently -used. Use L if you need both hashes. +These each store a value associated with the specified key. The value is +stored into the cop hints hash C, and a pointer to the modified +structure returned. The returned pointer is in general not the same as the +pointer that was passed in. The input C is consumed by the function, +and the pointer to it must not be subsequently used. Use L first +if you need both structures. C is the scalar value to store for this key. C is copied by these functions, which thus do not take ownership of any reference to it, and hence later changes to the scalar will not be reflected in the value -visible in the cop hints hash. Complex types of scalar will not be stored with +visible in C. Complex types of scalar will not be stored with referential integrity, but will be coerced to strings. -The forms differ in how the key is specified. In all forms, the key is pointed -to by C. -In the plain C form, the key is a C language NUL-terminated string. -In the C form, the key is a C language string literal. -In the C form, an additional parameter, C, specifies the length of -the string, which hence, may contain embedded-NUL characters. -In the C form, C<*key> is an SV, and the key is the PV extracted from that. -using C>. +The forms differ only in how the key is specified. + +In C, C is a C language NUL-terminated string. + +In C, C is a C language string literal, enclosed in +double quotes. + +In C, C points to the first byte of the string +specifying the key, and an additional parameter, C, specifies its +length in bytes. Hence, C may contain embedded-NUL characters. + +In C, C<*key> is an SV, and the key is the PV extracted from +that, using C>. C is a precomputed hash of the key string, or zero if it has not been -precomputed. This parameter is omitted from the C form, as it is computed -automatically at compile time. +precomputed. This parameter is omitted from C, which behaves +as if zero had been specified. The only flag currently used from the C parameter is C. It is illegal to set this in the C form. In the C forms, it specifies @@ -390,24 +413,31 @@ the octets. =for apidoc_item|COPHH *|cophh_delete_pvs|COPHH *cophh| "key" |U32 flags =for apidoc_item|COPHH *|cophh_delete_sv |COPHH *cophh| SV *key |U32 hash|U32 flags -These delete a key and its associated value from the cop hints hash C, -and return the modified hash. The returned hash pointer is in general -not the same as the hash pointer that was passed in. The input hash is -consumed by the function, and the pointer to it must not be subsequently -used. Use L if you need both hashes. +These each delete a key and its associated value from the cop hints hash +C, and return a pointer to the modified structure. The returned pointer +is in general not the same as the pointer that was passed in. The input +C is consumed by the function, and the pointer to it must not be +subsequently used. -The forms differ in how the key is specified. In all forms, the key is pointed -to by C. -In the plain C form, the key is a C language NUL-terminated string. -In the C form, the key is a C language string literal. -In the C form, an additional parameter, C, specifies the length of -the string, which hence, may contain embedded-NUL characters. -In the C form, C<*key> is an SV, and the key is the PV extracted from that. -using C>. +Use L first if you need both structures. + +The forms differ only in how the key is specified. + +In C, C is a C language NUL-terminated string. + +In C, C is a C language string literal, enclosed in +double quotes. + +In C, C points to the first byte of the string +specifying the key, and an additional parameter, C, specifies its +length in bytes. Hence, C may contain embedded-NUL characters. + +In C, C<*key> is an SV, and the key is the PV extracted from +that. using C>. C is a precomputed hash of the key string, or zero if it has not been -precomputed. This parameter is omitted from the C form, as it is computed -automatically at compile time. +precomputed. This parameter is omitted from C, which behaves +as if zero had been specified. The only flag currently used from the C parameter is C. It is illegal to set this in the C form. In the C forms, it specifies @@ -1036,15 +1066,15 @@ struct block { #define CX_DEBUG(cx, action) \ DEBUG_l( \ - Perl_deb(aTHX_ "CX %ld %s %s (scope %ld,%ld) (save %ld,%ld) in %s at %s:%d\n",\ - (long)cxstack_ix, \ - action, \ - PL_block_type[CxTYPE(cx)], \ - (long)PL_scopestack_ix, \ - (long)(cx->blk_oldscopesp), \ - (long)PL_savestack_ix, \ - (long)(cx->blk_oldsaveix), \ - SAFE_FUNCTION__, __FILE__, __LINE__)); + deb("CX %ld %s %s (scope %ld,%ld) (save %ld,%ld) in %s at %s:%d\n",\ + (long)cxstack_ix, \ + action, \ + PL_block_type[CxTYPE(cx)], \ + (long)PL_scopestack_ix, \ + (long)(cx->blk_oldscopesp), \ + (long)PL_savestack_ix, \ + (long)(cx->blk_oldsaveix), \ + SAFE_FUNCTION__, __FILE__, __LINE__)); @@ -1167,7 +1197,7 @@ struct context { /* this is only set in conjunction with CXp_FOR_GV */ #define CXp_FOR_DEF 0x10 /* foreach using $_ */ /* these 3 are mutually exclusive */ -#define CXp_FOR_LVREF 0x20 /* foreach using \$var */ +#define CXp_FOR_LVREF 0x20 /* foreach using \our $var */ #define CXp_FOR_GV 0x40 /* foreach using package var */ #define CXp_FOR_PAD 0x80 /* foreach using lexical var */ @@ -1398,8 +1428,8 @@ See L. #define PUSH_MULTICALL_FLAGS(the_cv, flags) \ STMT_START { \ PERL_CONTEXT *cx; \ - CV * const _nOnclAshIngNamE_ = the_cv; \ - CV * const cv = _nOnclAshIngNamE_; \ + CV * const nOnclAshIngNamE_ = the_cv; \ + CV * const cv = nOnclAshIngNamE_; \ PADLIST * const padlist = CvPADLIST(cv); \ multicall_oldcatch = CATCH_GET; \ CATCH_SET(TRUE); \ @@ -1442,8 +1472,8 @@ See L. #define CHANGE_MULTICALL_FLAGS(the_cv, flags) \ STMT_START { \ - CV * const _nOnclAshIngNamE_ = the_cv; \ - CV * const cv = _nOnclAshIngNamE_; \ + CV * const nOnclAshIngNamE_ = the_cv; \ + CV * const cv = nOnclAshIngNamE_; \ PADLIST * const padlist = CvPADLIST(cv); \ PERL_CONTEXT *cx = CX_CUR(); \ assert(CxMULTICALL(cx)); \ Index: gnu/usr.bin/perl/cv.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cv.h,v diff -u -p -a -u -p -r1.23 cv.h --- gnu/usr.bin/perl/cv.h 26 Dec 2025 22:14:12 -0000 1.23 +++ gnu/usr.bin/perl/cv.h 16 Nov 2026 00:57:38 -0000 @@ -11,8 +11,8 @@ /* This structure must match the beginning of XPVFM in sv.h */ struct xpvcv { - _XPV_HEAD; - _XPVCV_COMMON; + XPV_HEAD_; + XPVCV_COMMON_; }; /* Index: gnu/usr.bin/perl/deb.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/deb.c,v diff -u -p -a -u -p -r1.28 deb.c --- gnu/usr.bin/perl/deb.c 26 Dec 2025 22:14:12 -0000 1.28 +++ gnu/usr.bin/perl/deb.c 16 Nov 2026 00:57:38 -0000 @@ -28,10 +28,11 @@ void Perl_deb_nocontext(const char *pat, ...) { + PERL_ARGS_ASSERT_DEB_NOCONTEXT; + #ifdef DEBUGGING dTHX; va_list args; - PERL_ARGS_ASSERT_DEB_NOCONTEXT; va_start(args, pat); vdeb(pat, &args); va_end(args); @@ -48,16 +49,14 @@ Perl_deb_nocontext(const char *pat, ...) When perl is compiled with C<-DDEBUGGING>, these each print to STDERR the information given by the arguments, prefaced by the name of the file containing -the script causing the call, and the line number within that file. +the Perl script causing the call, and the line number within that file. If the C (verbose) debugging option is in effect, the process id is also printed. -C and C differ only in that C does not take -a thread context (C) parameter, so is used in situations where the caller -doesn't already have the thread context. +__PLAIN_vs_NOCONTEXT_wording__(deb) -C is the same as C except C are an encapsulated argument list. +C is the same as C except C is a pointer to a C. =cut */ @@ -65,8 +64,9 @@ C is the same as C except C"; const char* const display_file = file ? file : ""; @@ -86,8 +88,6 @@ Perl_vdeb(pTHX_ const char *pat, va_list if (line == NOLINE) line = 0; - PERL_ARGS_ASSERT_VDEB; - if (DEBUG_v_TEST) PerlIO_printf(Perl_debug_log, "(%ld:%s:%" LINE_Tf ")\t", (long)PerlProc_getpid(), display_file, line); @@ -105,6 +105,8 @@ Perl_vdeb(pTHX_ const char *pat, va_list I32 Perl_debstackptrs(pTHX) /* Currently unused in cpan and core */ { + PERL_ARGS_ASSERT_DEBSTACKPTRS; + #ifdef DEBUGGING PerlIO_printf(Perl_debug_log, "%8" UVxf " %8" UVxf " %8" IVdf " %8" IVdf " %8" IVdf "\n", @@ -135,16 +137,16 @@ Perl_debstackptrs(pTHX) /* Currently * Only displays top 30 max */ -STATIC void +static void S_deb_stack_n(pTHX_ SV** stack_base, SSize_t stack_min, SSize_t stack_max, SSize_t mark_min, SSize_t mark_max, SSize_t nonrc_base) { + PERL_ARGS_ASSERT_DEB_STACK_N; + #ifdef DEBUGGING SSize_t i = stack_max - 30; const Stack_off_t *markscan = PL_markstack + mark_min; - PERL_ARGS_ASSERT_DEB_STACK_N; - if (i < stack_min) i = stack_min; @@ -200,6 +202,8 @@ Dump the current stack I32 Perl_debstack(pTHX) { + PERL_ARGS_ASSERT_DEBSTACK; + #ifndef SKIP_DEBUGGING if (CopSTASH_eq(PL_curcop, PL_debstash) && !DEBUG_J_TEST_) return 0; @@ -249,6 +253,8 @@ static const char * const si_names[] = { void Perl_deb_stack_all(pTHX) { + PERL_ARGS_ASSERT_DEB_STACK_ALL; + #ifdef DEBUGGING I32 si_ix; const PERL_SI *si; Index: gnu/usr.bin/perl/doio.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/doio.c,v diff -u -p -a -u -p -r1.28 doio.c --- gnu/usr.bin/perl/doio.c 26 Dec 2025 22:14:12 -0000 1.28 +++ gnu/usr.bin/perl/doio.c 16 Nov 2026 00:57:38 -0000 @@ -63,7 +63,9 @@ void Perl_setfd_cloexec(int fd) { + PERL_ARGS_ASSERT_SETFD_CLOEXEC; assert(fd >= 0); + #if defined(HAS_FCNTL) && defined(F_SETFD) && defined(FD_CLOEXEC) (void) fcntl(fd, F_SETFD, FD_CLOEXEC); #elif !defined(DEBUGGING) @@ -74,7 +76,9 @@ Perl_setfd_cloexec(int fd) void Perl_setfd_inhexec(int fd) { + PERL_ARGS_ASSERT_SETFD_INHEXEC; assert(fd >= 0); + #if defined(HAS_FCNTL) && defined(F_SETFD) && defined(FD_CLOEXEC) (void) fcntl(fd, F_SETFD, 0); #elif !defined(DEBUGGING) @@ -85,7 +89,9 @@ Perl_setfd_inhexec(int fd) void Perl_setfd_cloexec_for_nonsysfd(pTHX_ int fd) { + PERL_ARGS_ASSERT_SETFD_CLOEXEC_FOR_NONSYSFD; assert(fd >= 0); + if(fd > PL_maxsysfd) setfd_cloexec(fd); } @@ -93,14 +99,18 @@ Perl_setfd_cloexec_for_nonsysfd(pTHX_ in void Perl_setfd_inhexec_for_sysfd(pTHX_ int fd) { + PERL_ARGS_ASSERT_SETFD_INHEXEC_FOR_SYSFD; assert(fd >= 0); + if(fd <= PL_maxsysfd) setfd_inhexec(fd); } void Perl_setfd_cloexec_or_inhexec_by_sysfdness(pTHX_ int fd) { + PERL_ARGS_ASSERT_SETFD_CLOEXEC_OR_INHEXEC_BY_SYSFDNESS; assert(fd >= 0); + if(fd <= PL_maxsysfd) setfd_inhexec(fd); else @@ -189,6 +199,8 @@ enum { CLOEXEC_EXPERIMENT = 0, CLOEXEC_A int Perl_PerlLIO_dup_cloexec(pTHX_ int oldfd) { + PERL_ARGS_ASSERT_PERLLIO_DUP_CLOEXEC; + #if !defined(PERL_IMPLICIT_SYS) && defined(F_DUPFD_CLOEXEC) /* * struct IPerlLIO doesn't cover fcntl(), and there's no clear way @@ -207,6 +219,8 @@ Perl_PerlLIO_dup_cloexec(pTHX_ int oldfd int Perl_PerlLIO_dup2_cloexec(pTHX_ int oldfd, int newfd) { + PERL_ARGS_ASSERT_PERLLIO_DUP2_CLOEXEC; + #if !defined(PERL_IMPLICIT_SYS) && defined(HAS_DUP3) && defined(O_CLOEXEC) /* * struct IPerlLIO doesn't cover dup3(), and there's no clear way @@ -222,57 +236,6 @@ Perl_PerlLIO_dup2_cloexec(pTHX_ int oldf #endif } -#if defined(OEMVS) - #if (__CHARSET_LIB == 1) -# include -# include - - static int setccsid(int fd, int ccsid) - { - attrib_t attr; - int rc; - - memset(&attr, 0, sizeof(attr)); - attr.att_filetagchg = 1; - attr.att_filetag.ft_ccsid = ccsid; - attr.att_filetag.ft_txtflag = 1; - - rc = __fchattr(fd, &attr, sizeof(attr)); - return rc; - } - - static void updateccsid(int fd, const char* path, int oflag, int perm) - { - int rc; - if (oflag & O_CREAT) { - rc = setccsid(fd, 819); - } - } - - int asciiopen(const char* path, int oflag) - { - int rc; - int fd = open(path, oflag); - if (fd == -1) { - return fd; - } - updateccsid(fd, path, oflag, -1); - return fd; - } - - int asciiopen3(const char* path, int oflag, int perm) - { - int rc; - int fd = open(path, oflag, perm); - if (fd == -1) { - return fd; - } - updateccsid(fd, path, oflag, perm); - return fd; - } - #endif -#endif - int Perl_PerlLIO_open_cloexec(pTHX_ const char *file, int flag) { @@ -302,9 +265,6 @@ Perl_PerlLIO_open3_cloexec(pTHX_ const c } #if defined(OEMVS) - #if (__CHARSET_LIB == 1) - #define TEMP_CCSID 819 - #endif static int Internal_Perl_my_mkstemp_cloexec(char *templte) { PERL_ARGS_ASSERT_MY_MKSTEMP_CLOEXEC; @@ -321,9 +281,6 @@ int Perl_my_mkstemp_cloexec(char *templte) { int tempfd = Internal_Perl_my_mkstemp_cloexec(templte); -# if defined(TEMP_CCSID) - setccsid(tempfd, TEMP_CCSID); -# endif return tempfd; } @@ -382,6 +339,8 @@ Perl_PerlProc_pipe_cloexec(pTHX_ int *pi int Perl_PerlSock_socket_cloexec(pTHX_ int domain, int type, int protocol) { + PERL_ARGS_ASSERT_PERLSOCK_SOCKET_CLOEXEC; + # if defined(SOCK_CLOEXEC) DO_ONEOPEN_EXPERIMENTING_CLOEXEC( PL_strategy_socket, @@ -396,6 +355,8 @@ int Perl_PerlSock_accept_cloexec(pTHX_ int listenfd, struct sockaddr *addr, Sock_size_t *addrlen) { + PERL_ARGS_ASSERT_PERLSOCK_ACCEPT_CLOEXEC; + # if !defined(PERL_IMPLICIT_SYS) && \ defined(HAS_ACCEPT4) && defined(SOCK_CLOEXEC) /* @@ -437,10 +398,10 @@ static IO * S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp, int *savefd, char *savetype) { - IO * const io = GvIOn(gv); - PERL_ARGS_ASSERT_OPENN_SETUP; + IO * const io = GvIOn(gv); + *saveifp = NULL; *saveofp = NULL; *savefd = -1; @@ -518,6 +479,8 @@ bool Perl_do_open_raw(pTHX_ GV *gv, const char *oname, STRLEN len, int rawmode, int rawperm, Stat_t *statbufp) { + PERL_ARGS_ASSERT_DO_OPEN_RAW; + PerlIO *saveifp; PerlIO *saveofp; int savefd; @@ -527,8 +490,6 @@ Perl_do_open_raw(pTHX_ GV *gv, const cha int writing = 0; PerlIO *fp; - PERL_ARGS_ASSERT_DO_OPEN_RAW; - /* For ease of blame back to 5.000, keep the existing indenting. */ { /* sysopen style args, i.e. integer mode and permissions */ @@ -587,6 +548,8 @@ bool Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len, PerlIO *supplied_fp, SV **svp, U32 num_svs) { + PERL_ARGS_ASSERT_DO_OPEN6; + PerlIO *saveifp; PerlIO *saveofp; int savefd; @@ -598,8 +561,6 @@ Perl_do_open6(pTHX_ GV *gv, const char * bool was_fdopen = FALSE; char *type = NULL; - PERL_ARGS_ASSERT_DO_OPEN6; - /* For ease of blame back to 5.000, keep the existing indenting. */ { /* Regular (non-sys) open */ @@ -979,11 +940,11 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, Pe PerlIO *saveifp, PerlIO *saveofp, int savefd, char savetype, int writing, bool was_fdopen, const char *type, Stat_t *statbufp) { + PERL_ARGS_ASSERT_OPENN_CLEANUP; + int fd; Stat_t statbuf; - PERL_ARGS_ASSERT_OPENN_CLEANUP; - Zero(&statbuf, 1, Stat_t); if (!fp) { @@ -1083,9 +1044,6 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, Pe } #endif -#if !defined(WIN32) - /* PL_fdpid isn't used on Windows, so avoid this useless work. - * XXX Probably the same for a lot of other places. */ { Pid_t pid; SV *sv; @@ -1098,7 +1056,6 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, Pe SvUPGRADE(sv, SVt_IV); SvIV_set(sv, pid); } -#endif if (was_fdopen) { /* need to close fp without closing underlying fd */ @@ -1155,7 +1112,8 @@ S_openn_cleanup(pTHX_ GV *gv, IO *io, Pe */ static bool -S_openindirtemp(pTHX_ GV *gv, SV *orig_name, SV *temp_out_name) { +S_openindirtemp(pTHX_ GV *gv, SV *orig_name, SV *temp_out_name) +{ int fd; PerlIO *fp; const char *p = SvPV_nolen(orig_name); @@ -1248,7 +1206,8 @@ S_openindirtemp(pTHX_ GV *gv, SV *orig_n #endif static int -S_argvout_free(pTHX_ SV *io, MAGIC *mg) { +S_argvout_free(pTHX_ SV *io, MAGIC *mg) +{ PERL_UNUSED_ARG(io); /* note this can be entered once the file has been @@ -1312,7 +1271,8 @@ S_argvout_free(pTHX_ SV *io, MAGIC *mg) } static int -S_argvout_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param) { +S_argvout_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *param) +{ PERL_UNUSED_ARG(param); /* ideally we could just remove the magic from the SV but we don't get the SV here */ @@ -1350,7 +1310,10 @@ static const MGVTBL argvout_vtbl = }; static bool -S_is_fork_open(const char *name) { +S_is_fork_open(const char *name) +{ + PERL_ARGS_ASSERT_IS_FORK_OPEN; + /* return true if name matches /^\A\s*(\|\s+-|\-\s+|)\s*\z/ */ while (isSPACE(*name)) name++; @@ -1382,11 +1345,11 @@ S_is_fork_open(const char *name) { PerlIO * Perl_nextargv(pTHX_ GV *gv, bool nomagicopen) { + PERL_ARGS_ASSERT_NEXTARGV; + IO * const io = GvIOp(gv); SV *const old_out_name = PL_inplace ? newSVsv(GvSV(gv)) : NULL; - PERL_ARGS_ASSERT_NEXTARGV; - if (old_out_name) SAVEFREESV(old_out_name); @@ -1471,6 +1434,10 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagic #endif PL_filemode = statbuf.st_mode; fileuid = statbuf.st_uid; +#ifdef __MVS__ + int txtflag = statbuf.st_tag.ft_txtflag; + int ccsid = statbuf.st_tag.ft_ccsid; +#endif filegid = statbuf.st_gid; if (!S_ISREG(PL_filemode)) { ck_warner_d(packWARN(WARN_INPLACE), @@ -1548,6 +1515,9 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagic PL_lastfd = PerlIO_fileno(IoIFP(GvIOp(PL_argvoutgv))); if (PL_lastfd >= 0) { (void)PerlLIO_fstat(PL_lastfd,&statbuf); +#ifdef __MVS__ + __setfdccsid(PL_lastfd, (txtflag << 16) | ccsid); +#endif #ifdef HAS_FCHMOD (void)fchmod(PL_lastfd,PL_filemode); #else @@ -1604,7 +1574,8 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagic * equivalent rename() succeeds */ static int -S_my_renameat(int olddfd, const char *oldpath, int newdfd, const char *newpath) { +S_my_renameat(int olddfd, const char *oldpath, int newdfd, const char *newpath) +{ /* this is intended only for use in Perl_do_close() */ assert(olddfd == newdfd); assert(PERL_FILE_IS_ABSOLUTE(oldpath) == PERL_FILE_IS_ABSOLUTE(newpath)); @@ -1622,7 +1593,8 @@ S_my_renameat(int olddfd, const char *ol #endif static bool -S_dir_unchanged(pTHX_ const char *orig_pv, MAGIC *mg) { +S_dir_unchanged(pTHX_ const char *orig_pv, MAGIC *mg) +{ Stat_t statbuf; #ifdef ARGV_USE_STAT_INO @@ -1663,12 +1635,14 @@ S_dir_unchanged(pTHX_ const char *orig_p #define dir_unchanged(orig_psv, mg) \ S_dir_unchanged(aTHX_ (orig_psv), (mg)) -STATIC bool -S_argvout_final(pTHX_ MAGIC *mg, IO *io, bool is_explict) { +static bool +S_argvout_final(pTHX_ MAGIC *mg, IO *io, bool is_explict) +{ + PERL_ARGS_ASSERT_ARGVOUT_FINAL; + bool retval; /* ensure args are checked before we start using them */ - PERL_ARGS_ASSERT_ARGVOUT_FINAL; { /* handle to an in-place edit work file */ @@ -1863,6 +1837,8 @@ indicate the cause. bool Perl_do_close(pTHX_ GV *gv, bool is_explict) { + PERL_ARGS_ASSERT_DO_CLOSE; + bool retval; IO *io; MAGIC *mg; @@ -1902,10 +1878,10 @@ Perl_do_close(pTHX_ GV *gv, bool is_expl bool Perl_io_close(pTHX_ IO *io, GV *gv, bool is_explict, bool warn_on_fail) { - bool retval = FALSE; - PERL_ARGS_ASSERT_IO_CLOSE; + bool retval = FALSE; + if (IoIFP(io)) { if (IoTYPE(io) == IoTYPE_PIPE) { PerlIO *fh = IoIFP(io); @@ -1974,10 +1950,10 @@ Perl_io_close(pTHX_ IO *io, GV *gv, bool bool Perl_do_eof(pTHX_ GV *gv) { - IO * const io = GvIO(gv); - PERL_ARGS_ASSERT_DO_EOF; + IO * const io = GvIO(gv); + if (!io) return TRUE; else if (IoTYPE(io) == IoTYPE_WRONLY) @@ -2018,11 +1994,11 @@ Perl_do_eof(pTHX_ GV *gv) Off_t Perl_do_tell(pTHX_ GV *gv) { + PERL_ARGS_ASSERT_DO_TELL; + IO *const io = GvIO(gv); PerlIO *fp; - PERL_ARGS_ASSERT_DO_TELL; - if (io && (fp = IoIFP(io))) { return PerlIO_tell(fp); } @@ -2034,6 +2010,8 @@ Perl_do_tell(pTHX_ GV *gv) bool Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence) { + PERL_ARGS_ASSERT_DO_SEEK; + IO *const io = GvIO(gv); PerlIO *fp; @@ -2048,11 +2026,11 @@ Perl_do_seek(pTHX_ GV *gv, Off_t pos, in Off_t Perl_do_sysseek(pTHX_ GV *gv, Off_t pos, int whence) { + PERL_ARGS_ASSERT_DO_SYSSEEK; + IO *const io = GvIO(gv); PerlIO *fp; - PERL_ARGS_ASSERT_DO_SYSSEEK; - if (io && (fp = IoIFP(io))) { int fd = PerlIO_fileno(fp); if (fd < 0 || (whence == SEEK_SET && pos < 0)) { @@ -2070,6 +2048,8 @@ Perl_do_sysseek(pTHX_ GV *gv, Off_t pos, int Perl_mode_from_discipline(pTHX_ const char *s, STRLEN len) { + PERL_ARGS_ASSERT_MODE_FROM_DISCIPLINE; + int mode = O_BINARY; PERL_UNUSED_CONTEXT; if (s) { @@ -2134,6 +2114,8 @@ The C library L if available, I32 my_chsize(int fd, Off_t length) { + PERL_ARGS_ASSERT_MY_CHSIZE; + # ifdef F_FREESP /* code courtesy of William Kucharski */ # define HAS_CHSIZE @@ -2260,6 +2242,8 @@ Perl_do_print(pTHX_ SV *sv, PerlIO *fp) I32 Perl_my_stat_flags(pTHX_ const U32 flags) { + PERL_ARGS_ASSERT_MY_STAT_FLAGS; + IO *io; GV* gv; @@ -2335,6 +2319,8 @@ Perl_my_stat_flags(pTHX_ const U32 flags I32 Perl_my_lstat_flags(pTHX_ const U32 flags) { + PERL_ARGS_ASSERT_MY_LSTAT_FLAGS; + static const char* const no_prev_lstat = "The stat preceding -l _ wasn't an lstat"; const char *file; STRLEN len; @@ -2401,9 +2387,10 @@ Perl_my_lstat_flags(pTHX_ const U32 flag static void S_exec_failed(pTHX_ const char *cmd, int fd, int do_report) { - const int e = errno; PERL_ARGS_ASSERT_EXEC_FAILED; + const int e = errno; + ck_warner(packWARN(WARN_EXEC), "Can't exec \"%s\": %s", cmd, Strerror(e)); if (do_report) { @@ -2467,6 +2454,8 @@ Perl_do_aexec5(pTHX_ SV *really, SV **ma bool Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report) { + PERL_ARGS_ASSERT_DO_EXEC3; + const char **argv, **a; char *s; char *buf; @@ -2474,8 +2463,6 @@ Perl_do_exec3(pTHX_ const char *incmd, i /* Make a copy so we can change it */ const Size_t cmdlen = strlen(incmd) + 1; - PERL_ARGS_ASSERT_DO_EXEC3; - ENTER; Newx(buf, cmdlen, char); SAVEFREEPV(buf); @@ -2558,6 +2545,11 @@ Perl_do_exec3(pTHX_ const char *incmd, i } doshell: PERL_FPU_PRE_EXEC +#if defined(OEMVS) + #if (__CHARSET_LIB == 1) + unsetenv("_TAG_REDIR_ERR"); + #endif +#endif PerlProc_execl(PL_sh_path, "sh", "-c", cmd, (char *)NULL); PERL_FPU_POST_EXEC S_exec_failed(aTHX_ PL_sh_path, fd, do_report); @@ -2599,6 +2591,8 @@ leave: SSize_t Perl_apply(pTHX_ I32 type, SV **mark, SV **sp) { + PERL_ARGS_ASSERT_APPLY; + I32 val; SSize_t tot = 0; const char *const what = PL_op_name[type]; @@ -2607,8 +2601,6 @@ Perl_apply(pTHX_ I32 type, SV **mark, SV SV ** const oldmark = mark; bool killgp = FALSE; - PERL_ARGS_ASSERT_APPLY; - PERL_UNUSED_VAR(what); /* may not be used depending on compile options */ /* Doing this ahead of the switch statement preserves the old behaviour, @@ -2996,6 +2988,8 @@ Perl_cando(pTHX_ Mode_t mode, bool effec static bool S_ingroup(pTHX_ Gid_t testgid, bool effective) { + PERL_ARGS_ASSERT_INGROUP; + # ifndef PERL_IMPLICIT_SYS /* PERL_IMPLICIT_SYS like Win32: getegid() etc. require the context. */ PERL_UNUSED_CONTEXT; @@ -3033,11 +3027,12 @@ S_ingroup(pTHX_ Gid_t testgid, bool effe I32 Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp) { + PERL_ARGS_ASSERT_DO_IPCGET; + const key_t key = (key_t)SvNVx(*++mark); SV *nsv = optype == OP_MSGGET ? NULL : *++mark; const I32 flags = SvIVx(*++mark); - PERL_ARGS_ASSERT_DO_IPCGET; PERL_UNUSED_ARG(sp); SETERRNO(0,0); @@ -3067,6 +3062,8 @@ Perl_do_ipcget(pTHX_ I32 optype, SV **ma I32 Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp) { + PERL_ARGS_ASSERT_DO_IPCCTL; + char *a; I32 ret = -1; const I32 id = SvIVx(*++mark); @@ -3078,7 +3075,6 @@ Perl_do_ipcctl(pTHX_ I32 optype, SV **ma STRLEN infosize = 0; I32 getinfo = (cmd == IPC_STAT); - PERL_ARGS_ASSERT_DO_IPCCTL; PERL_UNUSED_ARG(sp); switch (optype) @@ -3215,8 +3211,8 @@ Perl_do_ipcctl(pTHX_ I32 optype, SV **ma I32 Perl_do_msgsnd(pTHX_ SV **mark, SV **sp) { -#ifdef HAS_MSG PERL_ARGS_ASSERT_DO_MSGSND; +#ifdef HAS_MSG PERL_UNUSED_ARG(sp); STRLEN len; @@ -3249,6 +3245,8 @@ Perl_do_msgsnd(pTHX_ SV **mark, SV **sp) SSize_t Perl_do_msgrcv(pTHX_ SV **mark, SV **sp) { + PERL_ARGS_ASSERT_DO_MSGRCV; + #ifdef HAS_MSG char *mbuf; long mtype; @@ -3256,7 +3254,6 @@ Perl_do_msgrcv(pTHX_ SV **mark, SV **sp) const I32 id = SvIVx(*++mark); SV * const mstr = *++mark; - PERL_ARGS_ASSERT_DO_MSGRCV; PERL_UNUSED_ARG(sp); /* suppress warning when reading into undef var --jhi */ @@ -3298,13 +3295,14 @@ Perl_do_msgrcv(pTHX_ SV **mark, SV **sp) I32 Perl_do_semop(pTHX_ SV **mark, SV **sp) { + PERL_ARGS_ASSERT_DO_SEMOP; + #ifdef HAS_SEM STRLEN opsize; const I32 id = SvIVx(*++mark); SV * const opstr = *++mark; const char * const opbuf = SvPVbyte(opstr, opsize); - PERL_ARGS_ASSERT_DO_SEMOP; PERL_UNUSED_ARG(sp); if (opsize < 3 * SHORTSIZE @@ -3450,12 +3448,12 @@ Moving it away shrinks F; shri PerlIO * Perl_start_glob (pTHX_ SV *tmpglob, IO *io) { + PERL_ARGS_ASSERT_START_GLOB; + SV * const tmpcmd = newSV(0); PerlIO *fp; STRLEN len; const char *s = SvPV(tmpglob, len); - - PERL_ARGS_ASSERT_START_GLOB; if (!IS_SAFE_SYSCALL(s, len, "pattern", "glob")) return NULL; Index: gnu/usr.bin/perl/doop.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/doop.c,v diff -u -p -a -u -p -r1.24 doop.c --- gnu/usr.bin/perl/doop.c 26 Dec 2025 22:14:12 -0000 1.24 +++ gnu/usr.bin/perl/doop.c 16 Nov 2026 00:57:38 -0000 @@ -35,15 +35,16 @@ * be in the to-translate set */ -STATIC Size_t +static Size_t S_do_trans_simple(pTHX_ SV * const sv, const OPtrans_map * const tbl) { + PERL_ARGS_ASSERT_DO_TRANS_SIMPLE; + Size_t matches = 0; STRLEN len; U8 *s = (U8*)SvPV_nomg(sv,len); U8 * const send = s+len; - PERL_ARGS_ASSERT_DO_TRANS_SIMPLE; DEBUG_y(PerlIO_printf(Perl_debug_log, "%s: %d: entering do_trans_simple:" " input sv:\n", __FILE__, __LINE__)); @@ -86,13 +87,13 @@ S_do_trans_simple(pTHX_ SV * const sv, c if (c < 0x100 && (ch = tbl->map[c]) >= 0) { matches++; d = uv_to_utf8(d, (UV)ch); - s += ulen; } else { /* No match -> copy */ Move(s, d, ulen, U8); d += ulen; - s += ulen; } + + s += ulen; } if (grows) { sv_setpvn(sv, (char*)dstart, d - dstart); @@ -124,16 +125,16 @@ S_do_trans_simple(pTHX_ SV * const sv, c * be in the to-translate set */ -STATIC Size_t +static Size_t S_do_trans_count(pTHX_ SV * const sv, const OPtrans_map * const tbl) { + PERL_ARGS_ASSERT_DO_TRANS_COUNT; + STRLEN len; const U8 *s = (const U8*)SvPV_nomg_const(sv, len); const U8 * const send = s + len; Size_t matches = 0; - PERL_ARGS_ASSERT_DO_TRANS_COUNT; - DEBUG_y(PerlIO_printf(Perl_debug_log, "%s: %d: entering do_trans_count:" " input sv:\n", __FILE__, __LINE__)); @@ -173,17 +174,17 @@ S_do_trans_count(pTHX_ SV * const sv, co * be in the to-translate set */ -STATIC Size_t +static Size_t S_do_trans_complex(pTHX_ SV * const sv, const OPtrans_map * const tbl) { + PERL_ARGS_ASSERT_DO_TRANS_COMPLEX; + STRLEN len; U8 *s = (U8*)SvPV_nomg(sv, len); U8 * const send = s+len; Size_t matches = 0; const bool complement = cBOOL(PL_op->op_private & OPpTRANS_COMPLEMENT); - PERL_ARGS_ASSERT_DO_TRANS_COMPLEX; - DEBUG_y(PerlIO_printf(Perl_debug_log, "%s: %d: entering do_trans_complex:" " input sv:\n", __FILE__, __LINE__)); @@ -332,9 +333,11 @@ S_do_trans_complex(pTHX_ SV * const sv, * sv may or may not be utf8. */ -STATIC Size_t +static Size_t S_do_trans_count_invmap(pTHX_ SV * const sv, AV * const invmap) { + PERL_ARGS_ASSERT_DO_TRANS_COUNT_INVMAP; + U8 *s; U8 *send; Size_t matches = 0; @@ -345,8 +348,6 @@ S_do_trans_count_invmap(pTHX_ SV * const SV* to_invmap_sv = *to_invmap_ptr; UV* map = (UV *) SvPVX(to_invmap_sv); - PERL_ARGS_ASSERT_DO_TRANS_COUNT_INVMAP; - DEBUG_y(PerlIO_printf(Perl_debug_log, "%s: %d:" "entering do_trans_count_invmap:" " input sv:\n", @@ -375,7 +376,7 @@ S_do_trans_count_invmap(pTHX_ SV * const /* Look the code point up in the data structure for this tr/// to get * what it maps to */ - i = _invlist_search(from_invlist, from); + i = invlist_search_(from_invlist, from); assert(i >= 0); if (map[i] != (UV) TR_UNLISTED) { @@ -398,9 +399,11 @@ S_do_trans_count_invmap(pTHX_ SV * const * sv may or may not be utf8. */ -STATIC Size_t +static Size_t S_do_trans_invmap(pTHX_ SV * const sv, AV * const invmap) { + PERL_ARGS_ASSERT_DO_TRANS_INVMAP; + U8 *s; U8 *send; U8 *d; @@ -424,8 +427,6 @@ S_do_trans_invmap(pTHX_ SV * const sv, A bool out_is_utf8 = cBOOL(SvUTF8(sv)); STRLEN s_len; - PERL_ARGS_ASSERT_DO_TRANS_INVMAP; - /* A third element in the array indicates that the replacement list was * shorter than the search list, and this element contains the value to use * for the items that don't correspond */ @@ -491,7 +492,7 @@ S_do_trans_invmap(pTHX_ SV * const sv, A /* Look the code point up in the data structure for this tr/// to get * what it maps to */ - i = _invlist_search(from_invlist, from); + i = invlist_search_(from_invlist, from); assert(i >= 0); to = map[i]; @@ -584,13 +585,13 @@ S_do_trans_invmap(pTHX_ SV * const sv, A Size_t Perl_do_trans(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_DO_TRANS; + STRLEN len; const U8 flags = PL_op->op_private; bool use_utf8_fcns = cBOOL(flags & OPpTRANS_USE_SVOP); bool identical = cBOOL(flags & OPpTRANS_IDENTICAL); - PERL_ARGS_ASSERT_DO_TRANS; - if (SvREADONLY(sv) && ! identical) { croak_no_modify(); } @@ -763,11 +764,12 @@ Magic and tainting are handled. void Perl_do_sprintf(pTHX_ SV *sv, SSize_t len, SV **sarg) { + PERL_ARGS_ASSERT_DO_SPRINTF; + STRLEN patlen; const char * const pat = SvPV_const(*sarg, patlen); bool do_taint = FALSE; - PERL_ARGS_ASSERT_DO_SPRINTF; assert(len >= 1); if (SvTAINTED(*sarg)) @@ -790,6 +792,8 @@ Perl_do_sprintf(pTHX_ SV *sv, SSize_t le UV Perl_do_vecget(pTHX_ SV *sv, STRLEN offset, int size) { + PERL_ARGS_ASSERT_DO_VECGET; + STRLEN srclen; const I32 svpv_flags = ((PL_op->op_flags & OPf_MOD || LVRET) ? SV_UNDEF_RETURNS_NULL : 0); @@ -801,13 +805,11 @@ Perl_do_vecget(pTHX_ SV *sv, STRLEN offs s = (unsigned char *)""; } - PERL_ARGS_ASSERT_DO_VECGET; - if (size < 1 || ! isPOWER_OF_2(size)) croak("Illegal number of bits in vec"); if (SvUTF8(sv)) { - if (Perl_sv_utf8_downgrade_flags(aTHX_ sv, TRUE, 0)) { + if (sv_utf8_downgrade_flags(sv, TRUE, 0)) { /* PVX may have changed */ s = (unsigned char *) SvPV_flags(sv, srclen, svpv_flags); } @@ -889,6 +891,8 @@ Perl_do_vecget(pTHX_ SV *sv, STRLEN offs void Perl_do_vecset(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_DO_VECSET; + STRLEN offset, bitoffs = 0; int size; unsigned char *s; @@ -899,8 +903,6 @@ Perl_do_vecset(pTHX_ SV *sv) SV * const targ = LvTARG(sv); char errflags = LvFLAGS(sv); - PERL_ARGS_ASSERT_DO_VECSET; - /* some out-of-range errors have been deferred if/until the LV is * actually written to: f(vec($s,-1,8)) is not always fatal */ if (errflags) { @@ -916,10 +918,10 @@ Perl_do_vecset(pTHX_ SV *sv) SV_GMAGIC | SV_UNDEF_RETURNS_NULL); if (SvUTF8(targ)) { /* This is handled by the SvPOK_only below... - if (!Perl_sv_utf8_downgrade_flags(aTHX_ targ, TRUE, 0)) + if (!sv_utf8_downgrade_flags(targ, TRUE, 0)) SvUTF8_off(targ); */ - (void) Perl_sv_utf8_downgrade_flags(aTHX_ targ, TRUE, 0); + (void) sv_utf8_downgrade_flags(targ, TRUE, 0); } (void)SvPOK_only(targ); @@ -985,6 +987,8 @@ Perl_do_vecset(pTHX_ SV *sv) void Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) { + PERL_ARGS_ASSERT_DO_VOP; + long *dl; long *ll; long *rl; @@ -1001,8 +1005,6 @@ Perl_do_vop(pTHX_ I32 optype, SV *sv, SV bool result_needs_to_be_utf8 = FALSE; bool left_utf8 = FALSE; bool right_utf8 = FALSE; - - PERL_ARGS_ASSERT_DO_VOP; if (sv != left || (optype != OP_BIT_AND && !SvOK(sv))) SvPVCLEAR(sv); /* avoid undef warning on |= and ^= */ Index: gnu/usr.bin/perl/dquote.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/dquote.c,v diff -u -p -a -u -p -r1.7 dquote.c --- gnu/usr.bin/perl/dquote.c 26 Dec 2025 22:14:12 -0000 1.7 +++ gnu/usr.bin/perl/dquote.c 16 Nov 2026 00:57:38 -0000 @@ -87,6 +87,8 @@ Perl_form_alien_digit_msg(pTHX_ const bool UTF, /* Is it in UTF-8? */ const bool braced) /* Is it enclosed in {} */ { + PERL_ARGS_ASSERT_FORM_ALIEN_DIGIT_MSG; + /* Generate a mortal SV containing an appropriate warning message about * alien characters found in an octal or hex constant given by the inputs, * and return a pointer to that SV's string. The message looks like: @@ -103,7 +105,6 @@ Perl_form_alien_digit_msg(pTHX_ SV * message_sv = sv_newmortal(); char symbol; - PERL_ARGS_ASSERT_FORM_ALIEN_DIGIT_MSG; assert(which == 8 || which == 16); /* Calculate the display form of the character */ @@ -184,6 +185,8 @@ Perl_form_cp_too_large_msg(pTHX_ const UV cp) /* 0 if 'string' not NULL; else the too-large code point */ { + PERL_ARGS_ASSERT_FORM_CP_TOO_LARGE_MSG; + /* Generate a mortal SV containing an appropriate warning message about * code points that are too large for this system, given by the inputs, * and return a pointer to that SV's string. Either the text of the string @@ -200,7 +203,6 @@ Perl_form_cp_too_large_msg(pTHX_ const char * format; const char * prefix; - PERL_ARGS_ASSERT_FORM_CP_TOO_LARGE_MSG; assert(which == 8 || which == 16); /* One but not both must be non-zero */ @@ -237,6 +239,7 @@ Perl_grok_bslash_o(pTHX_ char **s, const const bool allow_UV_MAX, const bool UTF) { + PERL_ARGS_ASSERT_GROK_BSLASH_O; /* Documentation to be supplied when interface nailed down finally * This returns FALSE if there is an error the caller should probably die @@ -277,8 +280,6 @@ Perl_grok_bslash_o(pTHX_ char **s, const | PERL_SCAN_SILENT_ILLDIGIT | PERL_SCAN_SILENT_OVERFLOW; - PERL_ARGS_ASSERT_GROK_BSLASH_O; - assert(*(*s - 1) == '\\'); assert(* *s == 'o'); @@ -379,6 +380,7 @@ Perl_grok_bslash_x(pTHX_ char ** s, cons const bool allow_UV_MAX, const bool UTF) { + PERL_ARGS_ASSERT_GROK_BSLASH_X; /* Documentation to be supplied when interface nailed down finally * This returns FALSE if there is an error the caller should probably die @@ -423,8 +425,6 @@ Perl_grok_bslash_x(pTHX_ char ** s, cons | PERL_SCAN_NOTIFY_ILLDIGIT | PERL_SCAN_SILENT_NON_PORTABLE | PERL_SCAN_SILENT_OVERFLOW; - - PERL_ARGS_ASSERT_GROK_BSLASH_X; assert(*(*s - 1) == '\\'); assert(* *s == 'x'); Index: gnu/usr.bin/perl/dump.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/dump.c,v diff -u -p -a -u -p -r1.24 dump.c --- gnu/usr.bin/perl/dump.c 26 Dec 2025 22:14:12 -0000 1.24 +++ gnu/usr.bin/perl/dump.c 16 Nov 2026 00:57:38 -0000 @@ -94,11 +94,24 @@ S_append_flags(pTHX_ SV *sv, U32 flags, PERL_PV_ESCAPE_NONASCII | PERL_PV_ESCAPE_DWIM \ | ((utf8) ? PERL_PV_ESCAPE_UNI : 0) ) -#define _pv_display_for_dump(dsv, pv, cur, len, pvlim) \ - _pv_display_flags(aTHX_ dsv, pv, cur, len, pvlim, PERL_PV_ESCAPE_DWIM_ALL_HEX) +#define pv_display_for_dump(dsv, pv, cur, len, pvlim) \ + pv_display_flags(dsv, pv, cur, len, pvlim, PERL_PV_ESCAPE_DWIM_ALL_HEX) /* =for apidoc pv_escape +=for apidoc_flag PERL_PV_ESCAPE_ALL +=for apidoc_flag PERL_PV_ESCAPE_FIRSTCHAR +=for apidoc_flag PERL_PV_ESCAPE_NOBACKSLASH +=for apidoc_flag PERL_PV_ESCAPE_NOCLEAR +=for apidoc_flag PERL_PV_ESCAPE_NONASCII +=for apidoc_flag PERL_PV_ESCAPE_QUOTE +=for apidoc_flag PERL_PV_ESCAPE_RE +=for apidoc_flag PERL_PV_ESCAPE_UNI +=for apidoc_flag PERL_PV_ESCAPE_UNI_DETECT +=for apidoc_flag PERL_PV_ESCAPE_NON_WC +=for apidoc_flag C|PERL_PV_PRETTY_REGPROP +=for apidoc_flag C|PERL_PV_PRETTY_DUMP +=for apidoc_flag C|PERL_PV_PRETTY_NOCLEAR Escapes at most the first C chars of C and puts the results into C such that the size of the escaped string will not exceed C chars @@ -141,24 +154,6 @@ character in patterns. Returns a pointer to the escaped text as held by C. -=for apidoc Amnh||PERL_PV_ESCAPE_ALL -=for apidoc Amnh||PERL_PV_ESCAPE_FIRSTCHAR -=for apidoc Amnh||PERL_PV_ESCAPE_NOBACKSLASH -=for apidoc Amnh||PERL_PV_ESCAPE_NOCLEAR -=for apidoc Amnh||PERL_PV_ESCAPE_NONASCII -=for apidoc Amnh||PERL_PV_ESCAPE_QUOTE -=for apidoc Amnh||PERL_PV_ESCAPE_RE -=for apidoc Amnh||PERL_PV_ESCAPE_UNI -=for apidoc Amnh||PERL_PV_ESCAPE_UNI_DETECT -=for apidoc Amnh||PERL_PV_ESCAPE_NON_WC - -=cut - -Unused or not for public use -=for apidoc Cmnh||PERL_PV_PRETTY_REGPROP -=for apidoc Cmnh||PERL_PV_PRETTY_DUMP -=for apidoc Cmnh||PERL_PV_PRETTY_NOCLEAR - =cut */ #define PV_ESCAPE_OCTBUFSIZE 32 @@ -171,6 +166,7 @@ Perl_pv_escape( pTHX_ SV *dsv, char cons const STRLEN count, STRLEN max, STRLEN * const escaped, U32 flags ) { + PERL_ARGS_ASSERT_PV_ESCAPE; bool use_uc_hex = false; if (flags & PERL_PV_ESCAPE_DWIM_ALL_HEX) { @@ -221,8 +217,6 @@ Perl_pv_escape( pTHX_ SV *dsv, char cons octbuf[0] = esc; - PERL_ARGS_ASSERT_PV_ESCAPE; - if (dsv && !(flags & PERL_PV_ESCAPE_NOCLEAR)) { /* This won't alter the UTF-8 flag */ SvPVCLEAR(dsv); @@ -233,7 +227,7 @@ Perl_pv_escape( pTHX_ SV *dsv, char cons for ( ; pv < end ; pv += readsize ) { const UV u = (isuni) /* Here known to be valid; checked just above */ - ? utf8_to_uv_or_die((U8*)pv, (U8*) end, &readsize) + ? valid_utf8_to_uv( (U8*) pv, &readsize) : (U8) *pv; const U8 c = (U8)u; const char *source_buf = octbuf; @@ -334,7 +328,10 @@ Perl_pv_escape( pTHX_ SV *dsv, char cons return dsv ? SvPVX(dsv) : NULL; } /* -=for apidoc pv_pretty +=for apidoc pv_pretty +=for apidoc_flag PERL_PV_PRETTY_QUOTE +=for apidoc_flag PERL_PV_PRETTY_LTGT +=for apidoc_flag PERL_PV_PRETTY_ELLIPSES Converts a string into something presentable, handling escaping via C and supporting quoting and ellipses. @@ -355,10 +352,6 @@ any quotes or ellipses. Returns a pointer to the prettified text as held by C. -=for apidoc Amnh||PERL_PV_PRETTY_QUOTE -=for apidoc Amnh||PERL_PV_PRETTY_LTGT -=for apidoc Amnh||PERL_PV_PRETTY_ELLIPSES - =cut */ @@ -367,14 +360,14 @@ Perl_pv_pretty( pTHX_ SV *dsv, char cons const STRLEN max, char const * const start_color, char const * const end_color, const U32 flags ) { + PERL_ARGS_ASSERT_PV_PRETTY; + const U8 *quotes = (U8*)((flags & PERL_PV_PRETTY_QUOTE) ? "\"\"" : (flags & PERL_PV_PRETTY_LTGT) ? "<>" : NULL); STRLEN escaped; STRLEN max_adjust= 0; STRLEN orig_cur; - PERL_ARGS_ASSERT_PV_PRETTY; - if (!(flags & PERL_PV_PRETTY_NOCLEAR)) { /* This won't alter the UTF-8 flag */ SvPVCLEAR(dsv); @@ -416,10 +409,10 @@ Perl_pv_pretty( pTHX_ SV *dsv, char cons return SvPVX(dsv); } -STATIC char * -_pv_display_flags(pTHX_ SV *dsv, const char *pv, STRLEN cur, STRLEN len, STRLEN pvlim, I32 pretty_flags) +static char * +S_pv_display_flags(pTHX_ SV *dsv, const char *pv, STRLEN cur, STRLEN len, STRLEN pvlim, I32 pretty_flags) { - PERL_ARGS_ASSERT_PV_DISPLAY; + PERL_ARGS_ASSERT_PV_DISPLAY_FLAGS; pv_pretty( dsv, pv, cur, pvlim, NULL, NULL, PERL_PV_PRETTY_DUMP | pretty_flags ); if (len > cur && pv[cur] == '\0') @@ -445,7 +438,9 @@ Note that the final string may be up to char * Perl_pv_display(pTHX_ SV *dsv, const char *pv, STRLEN cur, STRLEN len, STRLEN pvlim) { - return _pv_display_flags(aTHX_ dsv, pv, cur, len, pvlim, 0); + PERL_ARGS_ASSERT_PV_DISPLAY; + + return pv_display_flags(dsv, pv, cur, len, pvlim, 0); } /* @@ -459,6 +454,8 @@ Implements C char * Perl_sv_peek(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_PEEK; + SV * const t = sv_newmortal(); int unref = 0; U32 type; @@ -625,8 +622,9 @@ Perl_sv_peek(pTHX_ SV *sv) void Perl_dump_indent(pTHX_ I32 level, PerlIO *file, const char* pat, ...) { - va_list args; PERL_ARGS_ASSERT_DUMP_INDENT; + + va_list args; va_start(args, pat); dump_vindent(level, file, pat, &args); va_end(args); @@ -707,9 +705,9 @@ S_opdump_indent(pTHX_ const OP *o, I32 l } struct Perl_OpDumpContext { - I32 level; - UV bar; PerlIO *file; + UV bar; + I32 level; bool indent_needed; }; @@ -766,10 +764,10 @@ function at once, or a single line may b void Perl_opdump_printf(pTHX_ struct Perl_OpDumpContext *ctx, const char *pat, ...) { - va_list args; - PERL_ARGS_ASSERT_OPDUMP_PRINTF; + va_list args; + va_start(args, pat); SV *msg_sv = sv_2mortal(vnewSVpvf(pat, &args)); S_opdump_print(aTHX_ ctx, msg_sv); @@ -808,12 +806,16 @@ C. void Perl_dump_all(pTHX) { + PERL_ARGS_ASSERT_DUMP_ALL; + dump_all_perl(FALSE); } void Perl_dump_all_perl(pTHX_ bool justperl) { + PERL_ARGS_ASSERT_DUMP_ALL_PERL; + PerlIO_setlinebuf(Perl_debug_log); if (PL_main_root) op_dump(PL_main_root); @@ -838,10 +840,10 @@ Perl_dump_packsubs(pTHX_ const HV *stash void Perl_dump_packsubs_perl(pTHX_ const HV *stash, bool justperl) { - I32 i; - PERL_ARGS_ASSERT_DUMP_PACKSUBS_PERL; + I32 i; + if (!HvTOTALKEYS(stash)) return; for (i = 0; i <= (I32) HvMAX(stash); i++) { @@ -873,13 +875,20 @@ Perl_dump_sub(pTHX_ const GV *gv) dump_sub_perl(gv, FALSE); } + +/* forward decl */ +static void +S_do_op_dump_bar(pTHX_ I32 level, UV bar, PerlIO *file, const OP *o, + CV* rootcv); + + void Perl_dump_sub_perl(pTHX_ const GV *gv, bool justperl) { - CV *cv; - PERL_ARGS_ASSERT_DUMP_SUB_PERL; + CV *cv; + cv = isGV_with_GP(gv) ? GvCV(gv) : CV_FROM_REF((SV*)gv); if (justperl && (CvISXSUB(cv) || !CvROOT(cv))) return; @@ -891,19 +900,19 @@ Perl_dump_sub_perl(pTHX_ const GV *gv, b STRLEN namelen; gv_fullname3(namesv, gv, NULL); namepv = SvPV_const(namesv, namelen); - Perl_dump_indent(aTHX_ 0, Perl_debug_log, "\nSUB %s = ", + dump_indent(0, Perl_debug_log, "\nSUB %s = ", generic_pv_escape(escsv, namepv, namelen, SvUTF8(namesv))); } else { - Perl_dump_indent(aTHX_ 0, Perl_debug_log, "\nSUB = "); + dump_indent(0, Perl_debug_log, "\nSUB = "); } if (CvISXSUB(cv)) - Perl_dump_indent(aTHX_ 0, Perl_debug_log, "(xsub 0x%" UVxf " %d)\n", - PTR2UV(CvXSUB(cv)), - (int)CvXSUBANY(cv).any_i32); + dump_indent(0, Perl_debug_log, "(xsub 0x%" UVxf " %d)\n", + PTR2UV(CvXSUB(cv)), + (int)CvXSUBANY(cv).any_i32); else if (CvROOT(cv)) - op_dump(CvROOT(cv)); + S_do_op_dump_bar(aTHX_ 0, 0, Perl_debug_log, CvROOT(cv), cv); else - Perl_dump_indent(aTHX_ 0, Perl_debug_log, "\n"); + dump_indent(0, Perl_debug_log, "\n"); } /* @@ -918,21 +927,23 @@ message that one doesn't exist. void Perl_dump_form(pTHX_ const GV *gv) { - SV * const sv = sv_newmortal(); - PERL_ARGS_ASSERT_DUMP_FORM; + SV * const sv = sv_newmortal(); + gv_fullname3(sv, gv, NULL); - Perl_dump_indent(aTHX_ 0, Perl_debug_log, "\nFORMAT %s = ", SvPVX_const(sv)); + dump_indent(0, Perl_debug_log, "\nFORMAT %s = ", SvPVX_const(sv)); if (CvROOT(GvFORM(gv))) op_dump(CvROOT(GvFORM(gv))); else - Perl_dump_indent(aTHX_ 0, Perl_debug_log, "\n"); + dump_indent(0, Perl_debug_log, "\n"); } void Perl_dump_eval(pTHX) { + PERL_ARGS_ASSERT_DUMP_EVAL; + op_dump(PL_eval_root); } @@ -966,13 +977,9 @@ S_gv_display(pTHX_ GV *gv) -/* forward decl */ -static void -S_do_op_dump_bar(pTHX_ I32 level, UV bar, PerlIO *file, const OP *o); - - static void -S_do_pmop_dump_bar(pTHX_ I32 level, UV bar, PerlIO *file, const PMOP *pm) +S_do_pmop_dump_bar(pTHX_ I32 level, UV bar, PerlIO *file, const PMOP *pm, + CV* rootcv) { UV kidbar; @@ -985,18 +992,19 @@ S_do_pmop_dump_bar(pTHX_ I32 level, UV b S_opdump_indent(aTHX_ (OP*)pm, level, bar, file, "PMOFFSET = %" IVdf "\n", (IV)pm->op_pmoffset); #endif + REGEXP * re = PM_GETRE(pm); S_opdump_indent(aTHX_ (OP*)pm, level, bar, file, - "REGEX = 0x%" UVxf "\n", PTR2UV(PM_GETRE(pm))); + "REGEX = 0x%" UVxf "\n", PTR2UV(re)); - if (PM_GETRE(pm)) { + if (re) { char ch = (pm->op_pmflags & PMf_ONCE) ? '?' : '/'; S_opdump_indent(aTHX_ (OP*)pm, level, bar, file, "PMf_PRE %c%.*s%c\n", - ch,(int)RX_PRELEN(PM_GETRE(pm)), RX_PRECOMP(PM_GETRE(pm)), ch); + ch,(int)RX_PRELEN(re), RX_PRECOMP(re), ch); } else S_opdump_indent(aTHX_ (OP*)pm, level, bar, file, "PMf_PRE (RUNTIME)\n"); - if (pm->op_pmflags || PM_GETRE(pm)) { + if (pm->op_pmflags || re) { SV * const tmpsv = pm_description(pm); S_opdump_indent(aTHX_ (OP*)pm, level, bar, file, "PMFLAGS = (%s)\n", SvCUR(tmpsv) ? SvPVX_const(tmpsv) + 1 : ""); @@ -1012,7 +1020,7 @@ S_do_pmop_dump_bar(pTHX_ I32 level, UV b S_opdump_indent(aTHX_ (OP*)pm, level, bar, file, "PMf_REPL =\n"); S_do_op_dump_bar(aTHX_ level + 2, (kidbar|cBOOL(OpHAS_SIBLING(pm->op_pmreplrootu.op_pmreplroot))), - file, pm->op_pmreplrootu.op_pmreplroot); + file, pm->op_pmreplrootu.op_pmreplroot, rootcv); } } @@ -1021,7 +1029,7 @@ S_do_pmop_dump_bar(pTHX_ I32 level, UV b S_opdump_indent(aTHX_ (OP*)pm, level, bar, file, "CODE_LIST =\n"); S_do_op_dump_bar(aTHX_ level + 2, (kidbar | cBOOL(OpHAS_SIBLING(pm->op_code_list))), - file, pm->op_code_list); + file, pm->op_code_list, rootcv); } else S_opdump_indent(aTHX_ (OP*)pm, level, bar, file, @@ -1034,7 +1042,7 @@ void Perl_do_pmop_dump(pTHX_ I32 level, PerlIO *file, const PMOP *pm) { PERL_ARGS_ASSERT_DO_PMOP_DUMP; - S_do_pmop_dump_bar(aTHX_ level, 0, file, pm); + S_do_pmop_dump_bar(aTHX_ level, 0, file, pm, NULL); } @@ -1054,12 +1062,12 @@ const struct flag_to_name pmflags_flags_ static SV * S_pm_description(pTHX_ const PMOP *pm) { + PERL_ARGS_ASSERT_PM_DESCRIPTION; + SV * const desc = newSVpvs(""); const REGEXP * const regex = PM_GETRE(pm); const U32 pmflags = pm->op_pmflags; - PERL_ARGS_ASSERT_PM_DESCRIPTION; - if (pmflags & PMf_ONCE) sv_catpvs(desc, ",ONCE"); #ifdef USE_ITHREADS @@ -1093,6 +1101,151 @@ S_pm_description(pTHX_ const PMOP *pm) return desc; } + +/* S_get_cv_from_op(): a helper function for op_dump(). + * + * Find the CV which the OP o is contained within. + * + * Since an op can be dumped at any time, there is no guarantee that the + * OP is associated with the current PL_curpad. So try to find the + * currently running CV or eval, and see if it contains the OP. Or if it's + * compile-time, see if the op is contained within one of the op subtrees + * on the parser stack. + * + * Return NULL if it can't be found. + * + * Sometimes the caller *does* know what CV is being dumped; if so, it + * is passed as rootcv. + * + * Since this may be called during debugging and things may not be in a + * sane state, be conservative, and if in doubt, return NULL. + */ + +static CV * +S_get_cv_from_op(pTHX_ const OP *o, CV *rootcv) +{ + if (rootcv) + return rootcv; + + /* Find the root of the optree this op is embedded in. For a compiled + * sub, this root will typically be a leavesub or similar attached to + * a CV. If compiling, this may be a small subtree on the parser + * stack. Limit the number of hops, in case there is some sort of + * loop or other weirdness. + */ + int n = 100; + OP *oproot = (OP*)o; + while (1) { + if (--n <= 0) + return NULL; + OP *p = op_parent(oproot); + if (!p) + break; + oproot = p; + } + + /* We may be compiling; so first look for the op within the subtrees + * on the parse stack, if any */ + if (PL_parser && PL_parser->stack) { + yy_stack_frame *ps; + + for (ps = PL_parser->ps; ps > PL_parser->stack; ps--) { + if (ps->val.opval == oproot) + return ps->compcv; + } + } + + /* Find the currently running CV or eval, if any, and see if our op + * is part of that CV's optree. If no contexts are found, we're + * probably running the main program. + */ + I32 i; + for (i = cxstack_ix; i >= 0; i--) { + CV *cv; + const PERL_CONTEXT * const cx = &cxstack[i]; + switch (CxTYPE(cx)) { + default: + continue; + case CXt_EVAL: + if (CxTRY(cx)) /* eval { } doesn't have a separate optree */ + continue; + cv = cxstack[i].blk_eval.cv; + /* XXX note that an EVAL's CV doesn't actually hold a pointer + * to the optree's root; we have to hope that PL_eval_root + * does instead */ + if (!cv || !CvEVAL(cv) || oproot != PL_eval_root) + continue; + return cv; + case CXt_SUB: + if (cx->cx_type & CXp_SUB_RE_FAKE) + continue; + /* FALLTHROUGH */ + case CXt_FORMAT: + cv = cxstack[i].blk_sub.cv; + if (!cv || CvISXSUB(cv) || oproot != CvROOT(cv)) + continue; + return cv; + } + } + + if (PL_main_cv && PL_main_root == oproot) + return PL_main_cv; + + return NULL; +} + + +/* S_get_sv_from_pad(): a helper function for op_dump(). + * + * On threaded builds, try to find the SV indexed by the OP o (e.g. via + * op_targ or op_padix) at pad offset po. + * Since an op can be dumped at any time, there is no guarantee that the + * OP is associated with the current PL_curpad. So try to find the currently + * running CV or eval, and see if it contains the OP. Or if it's + * compile-time, see if the op is contained within one of the op subtrees + * on the parser stack. + * + * Return NULL if it can't be found. + * + * Sometimes the caller *does* know what CV is being dumped; if so, it + * is passed as rootcv. + * + * Since this may be called during debugging and things may not be in a + * sane state, be conservative, and if in doubt, return NULL. + */ + +#ifdef USE_ITHREADS +static SV * +S_get_sv_from_pad(pTHX_ const OP *o, PADOFFSET po, CV *rootcv) +{ + PADLIST *padlist; /* declare early to work round compiler quirks */ + + if (!po) + return NULL; + + CV *cv = S_get_cv_from_op(aTHX_ o, rootcv); + if (!cv) + return NULL; + + /* Lookup the entry in the pad associated with this CV. + * Note that for SVs moved into the pad, they are shared at all pad + * depths, so we only have to look at depth 1 and not worry about + * CvDEPTH(). */ + + padlist = CvPADLIST(cv); + if (!padlist) + return NULL; + PAD *comppad = PadlistARRAY(padlist)[1]; + if (!comppad) + return NULL; + SV **curpad = AvARRAY(comppad); + if (!curpad) + return NULL; + return curpad[po]; +} +#endif + + /* =for apidoc pmop_dump @@ -1105,6 +1258,8 @@ special handling. void Perl_pmop_dump(pTHX_ PMOP *pm) { + PERL_ARGS_ASSERT_PMOP_DUMP; + do_pmop_dump(0, Perl_debug_log, pm); } @@ -1113,9 +1268,11 @@ Perl_pmop_dump(pTHX_ PMOP *pm) * otherwise add it. * *** Note that this isn't thread-safe */ -STATIC UV +static UV S_sequence_num(pTHX_ const OP *o) { + PERL_ARGS_ASSERT_SEQUENCE_NUM; + SV *op, **seq; const char *key; @@ -1135,7 +1292,9 @@ S_sequence_num(pTHX_ const OP *o) } - +/* forward declaration */ +static void +S_deb_padvar_cv(pTHX_ CV *cv, PADOFFSET off, int n, bool paren); const struct flag_to_name op_flags_names[] = { @@ -1178,15 +1337,19 @@ const char * const op_class_names[] = { * For heavily nested output, the level may exceed the number of bits * in bar; in this case the first few columns in the output will simply * not have a bar, which is harmless. + * + * rootcv is the CV (if any) whose CvROOT() is the root of the optree + * currently being dumped. */ static void -S_do_op_dump_bar(pTHX_ I32 level, UV bar, PerlIO *file, const OP *o) +S_do_op_dump_bar(pTHX_ I32 level, UV bar, PerlIO *file, const OP *o, + CV* rootcv) { - const OPCODE optype = o->op_type; - PERL_ARGS_ASSERT_DO_OP_DUMP; + const OPCODE optype = o->op_type; + /* print op header line */ S_opdump_indent(aTHX_ o, -level-1, bar, file, "%s", OP_NAME(o)); @@ -1225,9 +1388,39 @@ S_do_op_dump_bar(pTHX_ I32 level, UV bar } } - if (o->op_targ && optype != OP_NULL) - S_opdump_indent(aTHX_ o, level, bar, file, "TARG = %ld\n", - (long)o->op_targ); + if (o->op_targ && optype != OP_NULL) { + S_opdump_indent(aTHX_ o, level, bar, file, "TARG = %ld", + (long)o->op_targ); + + /* Display the names of the lexical variables (if any) + * associated with op_targ */ + int n = 1; + + switch (o->op_type) { + case OP_PADRANGE: + n = o->op_private & OPpPADRANGE_COUNTMASK; + /* FALLTHROUGH */ + case OP_PADSV: + case OP_PADAV: + case OP_PADHV: + case OP_ARGELEM: + case OP_PADSV_STORE: + case OP_AELEMFAST_LEX: + do_lex: + PerlIO_puts(file, " "); + S_deb_padvar_cv(aTHX_ S_get_cv_from_op(aTHX_ o, rootcv), + o->op_targ, + n, 1); + break; + + default: + if ( (PL_opargs[o->op_type] & OA_TARGLEX) + && (o->op_private & OPpTARGET_MY)) + goto do_lex; + } + + PerlIO_puts(file, "\n"); + } if (o->op_flags || o->op_slabbed || o->op_savefree || o->op_static) { SV * const tmpsv = newSVpvs(""); @@ -1346,15 +1539,22 @@ S_do_op_dump_bar(pTHX_ I32 level, UV bar case OP_AELEMFAST: case OP_GVSV: case OP_GV: + case OP_RCATLINE: + { + GV *gv; #ifdef USE_ITHREADS S_opdump_indent(aTHX_ o, level, bar, file, "PADIX = %" IVdf "\n", (IV)cPADOPo->op_padix); + gv = (GV*)S_get_sv_from_pad(aTHX_ o, cPADOPx(o)->op_padix, rootcv); #else - S_opdump_indent(aTHX_ o, level, bar, file, - "GV = %" SVf " (0x%" UVxf ")\n", - SVfARG(S_gv_display(aTHX_ cGVOPo_gv)), PTR2UV(cGVOPo_gv)); + gv = (GV*)cSVOPx(o)->op_sv; #endif + if (gv) + S_opdump_indent(aTHX_ o, level, bar, file, + "GV = %" SVf " (0x%" UVxf ")\n", + SVfARG(S_gv_display(aTHX_ gv)), PTR2UV(gv)); break; + } case OP_MULTIDEREF: { @@ -1380,17 +1580,78 @@ S_do_op_dump_bar(pTHX_ I32 level, UV bar case OP_CONST: case OP_HINTSEVAL: - case OP_METHOD_NAMED: - case OP_METHOD_SUPER: - case OP_METHOD_REDIR: - case OP_METHOD_REDIR_SUPER: -#ifndef USE_ITHREADS - /* with ITHREADS, consts are stored in the pad, and the right pad - * may not be active here, so skip */ - S_opdump_indent(aTHX_ o, level, bar, file, "SV = %s\n", - SvPEEK(cMETHOPo_meth)); + case OP_COREARGS: + case OP_ANONCODE: + /* an SVOP. On non-threaded builds, these OPs use op_sv to hold + * the SV associated with the const / hints hash / op num. + * On threaded builds, op_sv initially holds the SV, then at the + * end of compiling the sub, the SV is moved into the pad by + * op_relocate_sv() and indexed by op_targ. + * XXX Currently the SV isn't relocated for OP_COREARGS. + */ + { + SV *sv = cSVOPo->op_sv; + if (!sv) { + S_opdump_indent(aTHX_ o, level, bar, file, + "OP_SV = 0x0\n"); +#ifdef USE_ITHREADS + sv = S_get_sv_from_pad(aTHX_ o, o->op_targ, rootcv); #endif + } + + if (sv) + S_opdump_indent(aTHX_ o, level, bar, file, + "%s = %s (0x%" UVxf ")\n", + cSVOPo->op_sv ? "OP_SV" : "SV", + SvPEEK(sv), + PTR2UV(sv)); + } + break; + + case OP_METHOD: /* $obj->$foo */ break; + + case OP_METHOD_NAMED: /* $obj->foo */ + case OP_METHOD_SUPER: /* $obj->SUPER::foo */ + case OP_METHOD_REDIR: /* $obj->BAR::foo */ + case OP_METHOD_REDIR_SUPER: /* $obj->BAR::SUPER::foo */ + { + /* display method name (e.g. 'foo') */ + SV *sv = cMETHOPo->op_u.op_meth_sv; + if (!sv) { + S_opdump_indent(aTHX_ o, level, bar, file, + "OP_METH_SV = 0x0\n"); +#ifdef USE_ITHREADS + sv = S_get_sv_from_pad(aTHX_ o, o->op_targ, rootcv); +#endif + } + + if (sv) + S_opdump_indent(aTHX_ o, level, bar, file, + "%s = %s (0x%" UVxf ")\n", + cMETHOPo->op_u.op_meth_sv ? "OP_METH_SV" : "METH", + SvPEEK(sv), + PTR2UV(sv)); + + if (optype == OP_METHOD_REDIR || optype == OP_METHOD_REDIR_SUPER) { + /* display redirect class (e.g. 'BAR') */ +#ifdef USE_ITHREADS + S_opdump_indent(aTHX_ o, level, bar, file, + "RCLASS_TARG = %" IVdf "\n", (IV)cMETHOPo->op_rclass_targ); + sv = S_get_sv_from_pad(aTHX_ o, cMETHOPo->op_rclass_targ, + rootcv); +#else + sv = cMETHOPo->op_rclass_sv; +#endif + if (sv) + S_opdump_indent(aTHX_ o, level, bar, file, + "RCLASS = %s (0x%" UVxf ")\n", + SvPEEK(sv), + PTR2UV(sv)); + } + } + break; + case OP_NULL: if (o->op_targ != OP_NEXTSTATE && o->op_targ != OP_DBSTATE) break; @@ -1461,14 +1722,22 @@ S_do_op_dump_bar(pTHX_ I32 level, UV bar case OP_ENTERWHEN: case OP_ENTERTRY: case OP_ONCE: + case OP_PARAMTEST: + case OP_CMPCHAIN_AND: + case OP_PUSHDEFER: + case OP_ENTERTRYCATCH: + case OP_HELEMEXISTSOR: + case OP_ANYWHILE: + case OP_CATCH: S_opdump_indent(aTHX_ o, level, bar, file, "OTHER"); S_opdump_link(aTHX_ o, cLOGOPo->op_other, file); break; + case OP_SPLIT: case OP_MATCH: case OP_QR: case OP_SUBST: - S_do_pmop_dump_bar(aTHX_ level, bar, file, cPMOPo); + S_do_pmop_dump_bar(aTHX_ level, bar, file, cPMOPo, rootcv); break; case OP_LEAVE: case OP_LEAVEEVAL: @@ -1578,6 +1847,40 @@ S_do_op_dump_bar(pTHX_ I32 level, UV bar break; } + case OP_MULTIPARAM: + { + struct op_multiparam_aux *aux = (struct op_multiparam_aux *)cUNOP_AUXo->op_aux; + size_t min_args = aux->min_args; + size_t n_positional = aux->n_positional; + if(n_positional > min_args) + S_opdump_indent(aTHX_ o, level, bar, file, "ARGS = %zu .. %zu\n", + min_args, n_positional); + else + S_opdump_indent(aTHX_ o, level, bar, file, "ARGS = %zu\n", + min_args); + + for(Size_t i = 0; i < n_positional; i++) { + PADOFFSET padix = aux->param_padix[i]; + if(padix) + S_opdump_indent(aTHX_ o, level, bar, file, " PARAM [%zd] PADIX = %" UVuf "%s\n", + i, aux->param_padix[i], i >= min_args ? " OPT" : ""); + else + S_opdump_indent(aTHX_ o, level, bar, file, " PARAM [%zd] ANON\n", + i); + } + for(size_t i = 0; i < aux->n_named; i++) { + struct op_multiparam_named_aux *named = aux->named + i; + S_opdump_indent(aTHX_ o, level, bar, file, " NAMEDPARAM <%.*s> PADIX = %" UVuf "%s\n", + named->namelen, named->namepv, named->padix, named->is_required ? "" : " OPT"); + } + + if(aux->slurpy) + S_opdump_indent(aTHX_ o, level, bar, file, "SLURPY = '%c' PADIX = %" UVuf "\n", + aux->slurpy, aux->slurpy_padix); + + break; + } + case OP_CUSTOM: { void (*custom_dumper)(pTHX_ const OP *o, struct Perl_OpDumpContext *ctx) = @@ -1585,9 +1888,9 @@ S_do_op_dump_bar(pTHX_ I32 level, UV bar if(custom_dumper) { struct Perl_OpDumpContext ctx = { - .level = level, - .bar = bar, .file = file, + .bar = bar, + .level = level, .indent_needed = true, }; (*custom_dumper)(aTHX_ o, &ctx); @@ -1605,7 +1908,7 @@ S_do_op_dump_bar(pTHX_ I32 level, UV bar for (kid = cUNOPo->op_first; kid; kid = OpSIBLING(kid)) S_do_op_dump_bar(aTHX_ level, (bar | cBOOL(OpHAS_SIBLING(kid))), - file, kid); + file, kid, rootcv); } } @@ -1613,7 +1916,7 @@ S_do_op_dump_bar(pTHX_ I32 level, UV bar void Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) { - S_do_op_dump_bar(aTHX_ level, 0, file, o); + S_do_op_dump_bar(aTHX_ level, 0, file, o, NULL); } @@ -1644,6 +1947,8 @@ C. void Perl_gv_dump(pTHX_ GV *gv) { + PERL_ARGS_ASSERT_GV_DUMP; + STRLEN len; const char* name; SV *sv, *tmp = newSVpvs_flags("", SVs_TEMP); @@ -1656,16 +1961,16 @@ Perl_gv_dump(pTHX_ GV *gv) PerlIO_printf(Perl_debug_log, "{\n"); gv_fullname3(sv, gv, NULL); name = SvPV_const(sv, len); - Perl_dump_indent(aTHX_ 1, Perl_debug_log, "GV_NAME = %s", + dump_indent(1, Perl_debug_log, "GV_NAME = %s", generic_pv_escape( tmp, name, len, SvUTF8(sv) )); if (gv != GvEGV(gv)) { gv_efullname3(sv, GvEGV(gv), NULL); name = SvPV_const(sv, len); - Perl_dump_indent(aTHX_ 1, Perl_debug_log, "-> %s", + dump_indent(1, Perl_debug_log, "-> %s", generic_pv_escape( tmp, name, len, SvUTF8(sv) )); } (void)PerlIO_putc(Perl_debug_log, '\n'); - Perl_dump_indent(aTHX_ 0, Perl_debug_log, "}\n"); + dump_indent(0, Perl_debug_log, "}\n"); } @@ -1685,24 +1990,24 @@ Perl_do_magic_dump(pTHX_ I32 level, Perl PERL_ARGS_ASSERT_DO_MAGIC_DUMP; for (; mg; mg = mg->mg_moremagic) { - Perl_dump_indent(aTHX_ level, file, - " MAGIC = 0x%" UVxf "\n", PTR2UV(mg)); + dump_indent(level, file, " MAGIC = 0x%" UVxf "\n", PTR2UV(mg)); if (mg->mg_virtual) { const MGVTBL * const v = mg->mg_virtual; if (v >= PL_magic_vtables && v < PL_magic_vtables + magic_vtable_max) { const U32 i = v - PL_magic_vtables; - Perl_dump_indent(aTHX_ level, file, " MG_VIRTUAL = &PL_vtbl_%s\n", PL_magic_vtable_names[i]); + dump_indent(level, file, " MG_VIRTUAL = &PL_vtbl_%s\n", + PL_magic_vtable_names[i]); } else - Perl_dump_indent(aTHX_ level, file, " MG_VIRTUAL = 0x%" - UVxf "\n", PTR2UV(v)); + dump_indent(level, file, " MG_VIRTUAL = 0x%" + UVxf "\n", PTR2UV(v)); } else - Perl_dump_indent(aTHX_ level, file, " MG_VIRTUAL = 0\n"); + dump_indent(level, file, " MG_VIRTUAL = 0\n"); if (mg->mg_private) - Perl_dump_indent(aTHX_ level, file, " MG_PRIVATE = %d\n", mg->mg_private); + dump_indent(level, file, " MG_PRIVATE = %d\n", mg->mg_private); { int n; @@ -1714,38 +2019,38 @@ Perl_do_magic_dump(pTHX_ I32 level, Perl } } if (name) - Perl_dump_indent(aTHX_ level, file, + dump_indent(level, file, " MG_TYPE = PERL_MAGIC_%s\n", name); else - Perl_dump_indent(aTHX_ level, file, + dump_indent(level, file, " MG_TYPE = UNKNOWN(\\%o)\n", mg->mg_type); } if (mg->mg_flags) { - Perl_dump_indent(aTHX_ level, file, " MG_FLAGS = 0x%02X\n", mg->mg_flags); + dump_indent(level, file, " MG_FLAGS = 0x%02X\n", mg->mg_flags); if (mg->mg_type == PERL_MAGIC_envelem && mg->mg_flags & MGf_TAINTEDDIR) - Perl_dump_indent(aTHX_ level, file, " TAINTEDDIR\n"); + dump_indent(level, file, " TAINTEDDIR\n"); if (mg->mg_type == PERL_MAGIC_regex_global && mg->mg_flags & MGf_MINMATCH) - Perl_dump_indent(aTHX_ level, file, " MINMATCH\n"); + dump_indent(level, file, " MINMATCH\n"); if (mg->mg_flags & MGf_REFCOUNTED) - Perl_dump_indent(aTHX_ level, file, " REFCOUNTED\n"); + dump_indent(level, file, " REFCOUNTED\n"); if (mg->mg_flags & MGf_GSKIP) - Perl_dump_indent(aTHX_ level, file, " GSKIP\n"); + dump_indent(level, file, " GSKIP\n"); if (mg->mg_flags & MGf_COPY) - Perl_dump_indent(aTHX_ level, file, " COPY\n"); + dump_indent(level, file, " COPY\n"); if (mg->mg_flags & MGf_DUP) - Perl_dump_indent(aTHX_ level, file, " DUP\n"); + dump_indent(level, file, " DUP\n"); if (mg->mg_flags & MGf_LOCAL) - Perl_dump_indent(aTHX_ level, file, " LOCAL\n"); + dump_indent(level, file, " LOCAL\n"); if (mg->mg_type == PERL_MAGIC_regex_global && mg->mg_flags & MGf_BYTES) - Perl_dump_indent(aTHX_ level, file, " BYTES\n"); + dump_indent(level, file, " BYTES\n"); } if (mg->mg_obj) { - Perl_dump_indent(aTHX_ level, file, " MG_OBJ = 0x%" UVxf "\n", - PTR2UV(mg->mg_obj)); + dump_indent(level, file, " MG_OBJ = 0x%" UVxf "\n", + PTR2UV(mg->mg_obj)); if (mg->mg_type == PERL_MAGIC_qr) { REGEXP* const re = (REGEXP *)mg->mg_obj; SV * const dsv = sv_newmortal(); @@ -1755,17 +2060,18 @@ Perl_do_magic_dump(pTHX_ I32 level, Perl ( PERL_PV_PRETTY_QUOTE | PERL_PV_ESCAPE_RE | PERL_PV_PRETTY_ELLIPSES | (RX_UTF8(re) ? PERL_PV_ESCAPE_UNI : 0)) ); - Perl_dump_indent(aTHX_ level+1, file, " PAT = %s\n", s); - Perl_dump_indent(aTHX_ level+1, file, " REFCNT = %" IVdf "\n", + dump_indent(level+1, file, " PAT = %s\n", s); + dump_indent(level+1, file, " REFCNT = %" IVdf "\n", (IV)RX_REFCNT(re)); } if (mg->mg_flags & MGf_REFCOUNTED) do_sv_dump(level+2, file, mg->mg_obj, nest+1, maxnest, dumpops, pvlim); /* MG is already +1 */ } if (mg->mg_len) - Perl_dump_indent(aTHX_ level, file, " MG_LEN = %ld\n", (long)mg->mg_len); + dump_indent(level, file, " MG_LEN = %ld\n", (long)mg->mg_len); if (mg->mg_ptr) { - Perl_dump_indent(aTHX_ level, file, " MG_PTR = 0x%" UVxf, PTR2UV(mg->mg_ptr)); + dump_indent(level, file, " MG_PTR = 0x%" UVxf, + PTR2UV(mg->mg_ptr)); if (mg->mg_len >= 0) { if (mg->mg_type != PERL_MAGIC_utf8) { SV * const sv = newSVpvs(""); @@ -1793,11 +2099,11 @@ Perl_do_magic_dump(pTHX_ I32 level, Perl if (cache) { IV i; for (i = 0; i < PERL_MAGIC_UTF8_CACHESIZE; i++) - Perl_dump_indent(aTHX_ level, file, - " %2" IVdf ": %" UVuf " -> %" UVuf "\n", - i, - (UV)cache[i * 2], - (UV)cache[i * 2 + 1]); + dump_indent(level, file, + " %2" IVdf ": %" UVuf " -> %" UVuf "\n", + i, + (UV)cache[i * 2], + (UV)cache[i * 2 + 1]); } } } @@ -1814,17 +2120,19 @@ Dumps the contents of the MAGIC C to void Perl_magic_dump(pTHX_ const MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_DUMP; + do_magic_dump(0, Perl_debug_log, mg, 0, 0, FALSE, 0); } void Perl_do_hv_dump(pTHX_ I32 level, PerlIO *file, const char *name, HV *sv) { - const char *hvname; - PERL_ARGS_ASSERT_DO_HV_DUMP; - Perl_dump_indent(aTHX_ level, file, "%s = 0x%" UVxf, name, PTR2UV(sv)); + const char *hvname; + + dump_indent(level, file, "%s = 0x%" UVxf, name, PTR2UV(sv)); if (sv && (hvname = HvNAME_get(sv))) { /* we have to use pv_display and HvNAMELEN_get() so that we display the real package @@ -1845,7 +2153,7 @@ Perl_do_gv_dump(pTHX_ I32 level, PerlIO { PERL_ARGS_ASSERT_DO_GV_DUMP; - Perl_dump_indent(aTHX_ level, file, "%s = 0x%" UVxf, name, PTR2UV(sv)); + dump_indent(level, file, "%s = 0x%" UVxf, name, PTR2UV(sv)); if (sv) { SV * const tmpsv = newSVpvs(""); PerlIO_printf(file, "\t\"%s\"\n", @@ -1860,7 +2168,7 @@ Perl_do_gvgv_dump(pTHX_ I32 level, PerlI { PERL_ARGS_ASSERT_DO_GVGV_DUMP; - Perl_dump_indent(aTHX_ level, file, "%s = 0x%" UVxf, name, PTR2UV(sv)); + dump_indent(level, file, "%s = 0x%" UVxf, name, PTR2UV(sv)); if (sv) { SV *tmp = newSVpvs_flags("", SVs_TEMP); const char *hvname; @@ -2035,15 +2343,15 @@ const struct flag_to_name regexp_core_in void Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim) { + PERL_ARGS_ASSERT_DO_SV_DUMP; + SV *d; const char *s; U32 flags; U32 type; - PERL_ARGS_ASSERT_DO_SV_DUMP; - if (!sv) { - Perl_dump_indent(aTHX_ level, file, "SV = 0\n"); + dump_indent(level, file, "SV = 0\n"); return; } @@ -2052,11 +2360,11 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO /* process general SV flags */ - d = Perl_newSVpvf(aTHX_ - "(0x%" UVxf ") at 0x%" UVxf "\n%*s REFCNT = %" IVdf "\n%*s FLAGS = (", - PTR2UV(SvANY(sv)), PTR2UV(sv), - (int)(PL_dumpindent*level), "", (IV)SvREFCNT(sv), - (int)(PL_dumpindent*level), ""); + d = newSVpvf("(0x%" UVxf ") at 0x%" UVxf "\n%*s REFCNT = %" IVdf "\n%*s" + " FLAGS = (", + PTR2UV(SvANY(sv)), PTR2UV(sv), + (int)(PL_dumpindent*level), "", (IV)SvREFCNT(sv), + (int)(PL_dumpindent*level), ""); if ((flags & SVs_PADSTALE)) sv_catpvs(d, "PADSTALE,"); @@ -2125,7 +2433,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO /* dump initial SV details */ #ifdef DEBUG_LEAKING_SCALARS - Perl_dump_indent(aTHX_ level, file, + dump_indent(level, file, "ALLOCATED at %s:%d %s %s (parent 0x%" UVxf "); serial %" UVuf "\n", sv->sv_debug_file ? sv->sv_debug_file : "(unknown)", sv->sv_debug_line, @@ -2135,7 +2443,7 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO sv->sv_debug_serial ); #endif - Perl_dump_indent(aTHX_ level, file, "SV = "); + dump_indent(level, file, "SV = "); /* Dump SV type */ @@ -2159,9 +2467,9 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO || (type == SVt_IV && !SvROK(sv))) { if (SvIsUV(sv) ) - Perl_dump_indent(aTHX_ level, file, " UV = %" UVuf, (UV)SvUVX(sv)); + dump_indent(level, file, " UV = %" UVuf, (UV)SvUVX(sv)); else - Perl_dump_indent(aTHX_ level, file, " IV = %" IVdf, (IV)SvIVX(sv)); + dump_indent(level, file, " IV = %" IVdf, (IV)SvIVX(sv)); (void)PerlIO_putc(file, '\n'); } @@ -2170,13 +2478,13 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO || type == SVt_NV) { DECLARATION_FOR_LC_NUMERIC_MANIPULATION; STORE_LC_NUMERIC_SET_STANDARD(); - Perl_dump_indent(aTHX_ level, file, " NV = %.*" NVgf "\n", NV_DECIMAL_DIG, SvNVX(sv)); + dump_indent(level, file, " NV = %.*" NVgf "\n", + NV_DECIMAL_DIG, SvNVX(sv)); RESTORE_LC_NUMERIC(); } if (SvROK(sv)) { - Perl_dump_indent(aTHX_ level, file, " RV = 0x%" UVxf "\n", - PTR2UV(SvRV(sv))); + dump_indent(level, file, " RV = 0x%" UVxf "\n", PTR2UV(SvRV(sv))); if (nest < maxnest) do_sv_dump(level+1, file, SvRV(sv), nest+1, maxnest, dumpops, pvlim); } @@ -2195,25 +2503,23 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO STRLEN delta; if (SvOOK(sv)) { SvOOK_offset(sv, delta); - Perl_dump_indent(aTHX_ level, file," OFFSET = %" UVuf "\n", - (UV) delta); + dump_indent(level, file," OFFSET = %" UVuf "\n", (UV) delta); } else { delta = 0; } - Perl_dump_indent(aTHX_ level, file," PV = 0x%" UVxf " ", - PTR2UV(ptr)); + dump_indent(level, file," PV = 0x%" UVxf " ", PTR2UV(ptr)); if (SvOOK(sv)) { PerlIO_printf(file, "( %s . ) ", - _pv_display_for_dump(d, ptr - delta, delta, 0, + pv_display_for_dump(d, ptr - delta, delta, 0, pvlim)); } if (type == SVt_INVLIST) { PerlIO_printf(file, "\n"); /* 4 blanks indents 2 beyond the PV, etc */ - _invlist_dump(file, level, " ", sv); + invlist_dump_(file, level, " ", sv); } else { - PerlIO_printf(file, "%s", _pv_display_for_dump(d, ptr, SvCUR(sv), + PerlIO_printf(file, "%s", pv_display_for_dump(d, ptr, SvCUR(sv), re ? 0 : SvLEN(sv), pvlim)); if (SvUTF8(sv)) /* the 6? \x{....} */ @@ -2224,23 +2530,23 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO PerlIO_printf(file, " [BOOL %s]", ptr == PL_Yes ? "PL_Yes" : "PL_No"); PerlIO_printf(file, "\n"); } - Perl_dump_indent(aTHX_ level, file, " CUR = %" IVdf "\n", (IV)SvCUR(sv)); + dump_indent(level, file, " CUR = %" IVdf "\n", (IV)SvCUR(sv)); if (re && type == SVt_PVLV) /* LV-as-REGEXP usurps len field to store pointer to * regexp struct */ - Perl_dump_indent(aTHX_ level, file, " REGEXP = 0x%" UVxf "\n", - PTR2UV(((XPV*)SvANY(sv))->xpv_len_u.xpvlenu_rx)); + dump_indent(level, file, " REGEXP = 0x%" UVxf "\n", + PTR2UV(((XPV*)SvANY(sv))->xpv_len_u.xpvlenu_rx)); else - Perl_dump_indent(aTHX_ level, file, " LEN = %" IVdf "\n", + dump_indent(level, file, " LEN = %" IVdf "\n", (IV)SvLEN(sv)); #ifdef PERL_COPY_ON_WRITE if (SvIsCOW(sv) && SvLEN(sv)) - Perl_dump_indent(aTHX_ level, file, " COW_REFCNT = %d\n", - CowREFCNT(sv)); + dump_indent(level, file, " COW_REFCNT = %d\n", + CowREFCNT(sv)); #endif } else - Perl_dump_indent(aTHX_ level, file, " PV = 0\n"); + dump_indent(level, file, " PV = 0\n"); } if (type >= SVt_PVMG) { @@ -2250,8 +2556,8 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO do_hv_dump(level, file, " STASH", SvSTASH(sv)); if ((type == SVt_PVMG || type == SVt_PVLV) && SvVALID(sv)) { - Perl_dump_indent(aTHX_ level, file, " USEFUL = %" IVdf "\n", - (IV)BmUSEFUL(sv)); + dump_indent(level, file, " USEFUL = %" IVdf "\n", + (IV)BmUSEFUL(sv)); } } @@ -2259,25 +2565,22 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO switch (type) { case SVt_PVAV: - Perl_dump_indent(aTHX_ level, file, " ARRAY = 0x%" UVxf, - PTR2UV(AvARRAY(sv))); + dump_indent(level, file, " ARRAY = 0x%" UVxf, PTR2UV(AvARRAY(sv))); if (AvARRAY(sv) != AvALLOC(sv)) { PerlIO_printf(file, " (offset=%" IVdf ")\n", (IV)(AvARRAY(sv) - AvALLOC(sv))); - Perl_dump_indent(aTHX_ level, file, " ALLOC = 0x%" UVxf "\n", - PTR2UV(AvALLOC(sv))); + dump_indent(level, file, " ALLOC = 0x%" UVxf "\n", + PTR2UV(AvALLOC(sv))); } else (void)PerlIO_putc(file, '\n'); - Perl_dump_indent(aTHX_ level, file, " FILL = %" IVdf "\n", - (IV)AvFILLp(sv)); - Perl_dump_indent(aTHX_ level, file, " MAX = %" IVdf "\n", - (IV)AvMAX(sv)); + dump_indent(level, file, " FILL = %" IVdf "\n", (IV)AvFILLp(sv)); + dump_indent(level, file, " MAX = %" IVdf "\n", (IV)AvMAX(sv)); SvPVCLEAR(d); if (AvREAL(sv)) sv_catpvs(d, ",REAL"); if (AvREIFY(sv)) sv_catpvs(d, ",REIFY"); - Perl_dump_indent(aTHX_ level, file, " FLAGS = (%s)\n", - SvCUR(d) ? SvPVX_const(d) + 1 : ""); + dump_indent(level, file, " FLAGS = (%s)\n", + SvCUR(d) ? SvPVX_const(d) + 1 : ""); if (nest < maxnest && AvARRAY(MUTABLE_AV(sv))) { SSize_t count; SV **svp = AvARRAY(MUTABLE_AV(sv)); @@ -2286,8 +2589,8 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO count++, svp++) { SV* const elt = *svp; - Perl_dump_indent(aTHX_ level + 1, file, "Elt No. %" IVdf "\n", - (IV)count); + dump_indent(level + 1, file, "Elt No. %" IVdf "\n", + (IV)count); do_sv_dump(level+1, file, elt, nest+1, maxnest, dumpops, pvlim); } } @@ -2296,10 +2599,10 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO U32 totalkeys; if (HvHasAUX(sv)) { struct xpvhv_aux *const aux = HvAUX(sv); - Perl_dump_indent(aTHX_ level, file, " AUX_FLAGS = %" UVuf "\n", - (UV)aux->xhv_aux_flags); + dump_indent(level, file, " AUX_FLAGS = %" UVuf "\n", + (UV)aux->xhv_aux_flags); } - Perl_dump_indent(aTHX_ level, file, " ARRAY = 0x%" UVxf, PTR2UV(HvARRAY(sv))); + dump_indent(level, file, " ARRAY = 0x%" UVxf, PTR2UV(HvARRAY(sv))); totalkeys = HvTOTALKEYS(MUTABLE_HV(sv)); if (totalkeys) { /* Show distribution of HEs in the ARRAY */ @@ -2353,12 +2656,11 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO theoret = totalkeys; theoret += theoret * (theoret-1)/pow2; (void)PerlIO_putc(file, '\n'); - Perl_dump_indent(aTHX_ level, file, " hash quality = %.1" - NVff "%%", theoret/sum*100); + dump_indent(level, file, " hash quality = %.1" + NVff "%%", theoret/sum*100); } (void)PerlIO_putc(file, '\n'); - Perl_dump_indent(aTHX_ level, file, " KEYS = %" IVdf "\n", - (IV)totalkeys); + dump_indent(level, file, " KEYS = %" IVdf "\n", (IV)totalkeys); { STRLEN count = 0; HE **ents = HvARRAY(sv); @@ -2373,19 +2675,18 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO } while (++ents <= last); } - Perl_dump_indent(aTHX_ level, file, " FILL = %" UVuf "\n", - (UV)count); + dump_indent(level, file, " FILL = %" UVuf "\n", (UV)count); } - Perl_dump_indent(aTHX_ level, file, " MAX = %" IVdf "\n", + dump_indent(level, file, " MAX = %" IVdf "\n", (IV)HvMAX(sv)); if (HvHasAUX(sv)) { - Perl_dump_indent(aTHX_ level, file, " RITER = %" IVdf "\n", - (IV)HvRITER_get(sv)); - Perl_dump_indent(aTHX_ level, file, " EITER = 0x%" UVxf "\n", - PTR2UV(HvEITER_get(sv))); + dump_indent(level, file, " RITER = %" IVdf "\n", + (IV)HvRITER_get(sv)); + dump_indent(level, file, " EITER = 0x%" UVxf "\n", + PTR2UV(HvEITER_get(sv))); #ifdef PERL_HASH_RANDOMIZE_KEYS - Perl_dump_indent(aTHX_ level, file, " RAND = 0x%" UVxf, - (UV)HvRAND_get(sv)); + dump_indent(level, file, " RAND = 0x%" UVxf, + (UV)HvRAND_get(sv)); if (HvRAND_get(sv) != HvLASTRAND_get(sv) && HvRITER_get(sv) != -1 ) { PerlIO_printf(file, " (LAST = 0x%" UVxf ")", (UV)HvLASTRAND_get(sv)); @@ -2397,9 +2698,9 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO const char * const hvname = HvNAME_get(sv); if (hvname) { SV* tmpsv = newSVpvs_flags("", SVs_TEMP); - Perl_dump_indent(aTHX_ level, file, " NAME = \"%s\"\n", - generic_pv_escape( tmpsv, hvname, - HvNAMELEN(sv), HvNAMEUTF8(sv))); + dump_indent(level, file, " NAME = \"%s\"\n", + generic_pv_escape( tmpsv, hvname, + HvNAMELEN(sv), HvNAMEUTF8(sv))); } } if (HvHasAUX(sv)) { @@ -2407,10 +2708,8 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO = *Perl_hv_backreferences_p(aTHX_ MUTABLE_HV(sv)); struct mro_meta * const meta = HvAUX(sv)->xhv_mro_meta; if (HvAUX(sv)->xhv_name_count) - Perl_dump_indent(aTHX_ - level, file, " NAMECOUNT = %" IVdf "\n", - (IV)HvAUX(sv)->xhv_name_count - ); + dump_indent(level, file, " NAMECOUNT = %" IVdf "\n", + (IV)HvAUX(sv)->xhv_name_count); if (HvAUX(sv)->xhv_name_u.xhvnameu_name && HvENAME_HEK_NN(sv)) { const I32 count = HvAUX(sv)->xhv_name_count; if (count) { @@ -2432,62 +2731,61 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO } ++hekp; } - Perl_dump_indent(aTHX_ - level, file, " ENAME = %s\n", SvPV_nolen(names)+2 + dump_indent( level, file, " ENAME = %s\n", + SvPV_nolen(names)+2 ); } else { SV * const tmp = newSVpvs_flags("", SVs_TEMP); const char *const hvename = HvENAME_get(sv); - Perl_dump_indent(aTHX_ - level, file, " ENAME = \"%s\"\n", - generic_pv_escape(tmp, hvename, - HvENAMELEN_get(sv), HvENAMEUTF8(sv))); + dump_indent(level, file, " ENAME = \"%s\"\n", + generic_pv_escape(tmp, hvename, + HvENAMELEN_get(sv), HvENAMEUTF8(sv))); } } if (backrefs) { - Perl_dump_indent(aTHX_ level, file, " BACKREFS = 0x%" UVxf "\n", - PTR2UV(backrefs)); + dump_indent(level, file, " BACKREFS = 0x%" UVxf "\n", + PTR2UV(backrefs)); do_sv_dump(level+1, file, MUTABLE_SV(backrefs), nest+1, maxnest, dumpops, pvlim); } if (meta) { SV* tmpsv = newSVpvs_flags("", SVs_TEMP); - Perl_dump_indent(aTHX_ level, file, " MRO_WHICH = \"%s\" (0x%" - UVxf ")\n", - generic_pv_escape( tmpsv, meta->mro_which->name, - meta->mro_which->length, - (meta->mro_which->kflags & HVhek_UTF8)), + dump_indent(level, file, " MRO_WHICH = \"%s\" (0x%" + UVxf ")\n", + generic_pv_escape( tmpsv, meta->mro_which->name, + meta->mro_which->length, + (meta->mro_which->kflags & HVhek_UTF8)), PTR2UV(meta->mro_which)); - Perl_dump_indent(aTHX_ level, file, " CACHE_GEN = 0x%" - UVxf "\n", - (UV)meta->cache_gen); - Perl_dump_indent(aTHX_ level, file, " PKG_GEN = 0x%" UVxf "\n", - (UV)meta->pkg_gen); + dump_indent(level, file, " CACHE_GEN = 0x%" + UVxf "\n", + (UV)meta->cache_gen); + dump_indent(level, file, " PKG_GEN = 0x%" UVxf "\n", + (UV)meta->pkg_gen); if (meta->mro_linear_all) { - Perl_dump_indent(aTHX_ level, file, " MRO_LINEAR_ALL = 0x%" - UVxf "\n", - PTR2UV(meta->mro_linear_all)); + dump_indent(level, file, " MRO_LINEAR_ALL = 0x%" + UVxf "\n", + PTR2UV(meta->mro_linear_all)); do_sv_dump(level+1, file, MUTABLE_SV(meta->mro_linear_all), nest+1, maxnest, dumpops, pvlim); } if (meta->mro_linear_current) { - Perl_dump_indent(aTHX_ level, file, - " MRO_LINEAR_CURRENT = 0x%" UVxf "\n", - PTR2UV(meta->mro_linear_current)); + dump_indent(level, file, + " MRO_LINEAR_CURRENT = 0x%" UVxf "\n", + PTR2UV(meta->mro_linear_current)); do_sv_dump(level+1, file, MUTABLE_SV(meta->mro_linear_current), nest+1, maxnest, dumpops, pvlim); } if (meta->mro_nextmethod) { - Perl_dump_indent(aTHX_ level, file, - " MRO_NEXTMETHOD = 0x%" UVxf "\n", - PTR2UV(meta->mro_nextmethod)); + dump_indent(level, file, + " MRO_NEXTMETHOD = 0x%" UVxf "\n", + PTR2UV(meta->mro_nextmethod)); do_sv_dump(level+1, file, MUTABLE_SV(meta->mro_nextmethod), nest+1, maxnest, dumpops, pvlim); } if (meta->isa) { - Perl_dump_indent(aTHX_ level, file, " ISA = 0x%" UVxf "\n", - PTR2UV(meta->isa)); + dump_indent(level, file, " ISA = 0x%" UVxf "\n", + PTR2UV(meta->isa)); do_sv_dump(level+1, file, MUTABLE_SV(meta->isa), nest+1, maxnest, dumpops, pvlim); } @@ -2515,7 +2813,8 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO keypv = SvPV_const(keysv, len); elt = HeVAL(he); - Perl_dump_indent(aTHX_ level+1, file, "Elt %s ", _pv_display_for_dump(d, keypv, len, 0, pvlim)); + dump_indent(level+1, file, "Elt %s ", + pv_display_for_dump(d, keypv, len, 0, pvlim)); if (SvUTF8(keysv)) PerlIO_printf(file, "[UTF8 \"%s\"] ", sv_uni_display(d, keysv, 6 * SvCUR(keysv), UNI_DISPLAY_QQ)); if (HvEITER_get(hv) == he) @@ -2542,15 +2841,15 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO SV* tmpsv = newSVpvs_flags("", SVs_TEMP); STRLEN len; const char *const name = SvPV_const(sv, len); - Perl_dump_indent(aTHX_ level, file, " AUTOLOAD = \"%s\"\n", + dump_indent(level, file, " AUTOLOAD = \"%s\"\n", generic_pv_escape(tmpsv, name, len, SvUTF8(sv))); } if (SvPOK(sv)) { SV* tmpsv = newSVpvs_flags("", SVs_TEMP); const char *const proto = CvPROTO(sv); - Perl_dump_indent(aTHX_ level, file, " PROTOTYPE = \"%s\"\n", - generic_pv_escape(tmpsv, proto, CvPROTOLEN(sv), - SvUTF8(sv))); + dump_indent(level, file, " PROTOTYPE = \"%s\"\n", + generic_pv_escape(tmpsv, proto, CvPROTOLEN(sv), + SvUTF8(sv))); } /* FALLTHROUGH */ case SVt_PVFM: @@ -2558,57 +2857,57 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO if (!CvISXSUB(sv)) { if (CvSTART(sv)) { if (CvSLABBED(sv)) - Perl_dump_indent(aTHX_ level, file, - " SLAB = 0x%" UVxf "\n", - PTR2UV(CvSTART(sv))); + dump_indent(level, file, " SLAB = 0x%" UVxf "\n", + PTR2UV(CvSTART(sv))); else - Perl_dump_indent(aTHX_ level, file, - " START = 0x%" UVxf " ===> %" IVdf "\n", - PTR2UV(CvSTART(sv)), - (IV)sequence_num(CvSTART(sv))); + dump_indent(level, file, + " START = 0x%" UVxf " ===> %" UVuf "\n", + PTR2UV(CvSTART(sv)), + sequence_num(CvSTART(sv))); } - Perl_dump_indent(aTHX_ level, file, " ROOT = 0x%" UVxf "\n", - PTR2UV(CvROOT(sv))); + dump_indent(level, file, " ROOT = 0x%" UVxf "\n", + PTR2UV(CvROOT(sv))); if (CvROOT(sv) && dumpops) { do_op_dump(level+1, file, CvROOT(sv)); } } else { SV * const constant = cv_const_sv((const CV *)sv); - Perl_dump_indent(aTHX_ level, file, " XSUB = 0x%" UVxf "\n", PTR2UV(CvXSUB(sv))); + dump_indent(level, file, " XSUB = 0x%" UVxf "\n", + PTR2UV(CvXSUB(sv))); if (constant) { - Perl_dump_indent(aTHX_ level, file, " XSUBANY = 0x%" UVxf - " (CONST SV)\n", - PTR2UV(CvXSUBANY(sv).any_ptr)); + dump_indent(level, file, " XSUBANY = 0x%" UVxf + " (CONST SV)\n", + PTR2UV(CvXSUBANY(sv).any_ptr)); do_sv_dump(level+1, file, constant, nest+1, maxnest, dumpops, pvlim); } else { - Perl_dump_indent(aTHX_ level, file, " XSUBANY = %" IVdf "\n", - (IV)CvXSUBANY(sv).any_i32); + dump_indent(level, file, " XSUBANY = %" IVdf "\n", + (IV)CvXSUBANY(sv).any_i32); } } if (CvNAMED(sv)) - Perl_dump_indent(aTHX_ level, file, " NAME = \"%s\"\n", - HEK_KEY(CvNAME_HEK((CV *)sv))); + dump_indent(level, file, " NAME = \"%s\"\n", + HEK_KEY(CvNAME_HEK((CV *)sv))); else do_gvgv_dump(level, file, " GVGV::GV", CvGV(sv)); - Perl_dump_indent(aTHX_ level, file, " FILE = \"%s\"\n", CvFILE(sv)); - Perl_dump_indent(aTHX_ level, file, " DEPTH = %" - IVdf "\n", (IV)CvDEPTH(sv)); - Perl_dump_indent(aTHX_ level, file, " FLAGS = 0x%" UVxf "\n", - (UV)CvFLAGS(sv)); - Perl_dump_indent(aTHX_ level, file, " OUTSIDE_SEQ = %" UVuf "\n", (UV)CvOUTSIDE_SEQ(sv)); + dump_indent(level, file, " FILE = \"%s\"\n", CvFILE(sv)); + dump_indent(level, file, " DEPTH = %" IVdf "\n", (IV)CvDEPTH(sv)); + dump_indent(level, file, " FLAGS = 0x%" UVxf "\n", (UV)CvFLAGS(sv)); + dump_indent(level, file, " OUTSIDE_SEQ = %" UVuf "\n", + (UV)CvOUTSIDE_SEQ(sv)); if (!CvISXSUB(sv)) { - Perl_dump_indent(aTHX_ level, file, " PADLIST = 0x%" UVxf "\n", PTR2UV(CvPADLIST(sv))); + dump_indent(level, file, " PADLIST = 0x%" UVxf "\n", + PTR2UV(CvPADLIST(sv))); if (nest < maxnest) { do_dump_pad(level+1, file, CvPADLIST(sv), 0); } } else - Perl_dump_indent(aTHX_ level, file, " HSCXT = 0x%p\n", CvHSCXT(sv)); + dump_indent(level, file, " HSCXT = 0x%p\n", CvHSCXT(sv)); { const CV * const outside = CvOUTSIDE(sv); - Perl_dump_indent(aTHX_ level, file, " OUTSIDE = 0x%" UVxf " (%s)\n", + dump_indent(level, file, " OUTSIDE = 0x%" UVxf " (%s)\n", PTR2UV(outside), (!outside ? "null" : CvANON(outside) ? "ANON" @@ -2630,11 +2929,15 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO case SVt_PVGV: case SVt_PVLV: if (type == SVt_PVLV) { - Perl_dump_indent(aTHX_ level, file, " TYPE = %c\n", LvTYPE(sv)); - Perl_dump_indent(aTHX_ level, file, " TARGOFF = %" IVdf "\n", (IV)LvTARGOFF(sv)); - Perl_dump_indent(aTHX_ level, file, " TARGLEN = %" IVdf "\n", (IV)LvTARGLEN(sv)); - Perl_dump_indent(aTHX_ level, file, " TARG = 0x%" UVxf "\n", PTR2UV(LvTARG(sv))); - Perl_dump_indent(aTHX_ level, file, " FLAGS = %" IVdf "\n", (IV)LvFLAGS(sv)); + dump_indent(level, file, " TYPE = %c\n", LvTYPE(sv)); + dump_indent(level, file, " TARGOFF = %" IVdf "\n", + (IV)LvTARGOFF(sv)); + dump_indent(level, file, " TARGLEN = %" IVdf "\n", + (IV)LvTARGLEN(sv)); + dump_indent(level, file, " TARG = 0x%" UVxf "\n", + PTR2UV(LvTARG(sv))); + dump_indent(level, file, " FLAGS = %" IVdf "\n", + (IV)LvFLAGS(sv)); if (isALPHA_FOLD_NE(LvTYPE(sv), 't')) do_sv_dump(level+1, file, LvTARG(sv), nest+1, maxnest, dumpops, pvlim); @@ -2644,78 +2947,84 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO break; { SV* tmpsv = newSVpvs_flags("", SVs_TEMP); - Perl_dump_indent(aTHX_ level, file, " NAME = \"%s\"\n", - generic_pv_escape(tmpsv, GvNAME(sv), - GvNAMELEN(sv), - GvNAMEUTF8(sv))); + dump_indent(level, file, " NAME = \"%s\"\n", + generic_pv_escape(tmpsv, GvNAME(sv), + GvNAMELEN(sv), + GvNAMEUTF8(sv))); } - Perl_dump_indent(aTHX_ level, file, " NAMELEN = %" IVdf "\n", (IV)GvNAMELEN(sv)); + dump_indent(level, file, " NAMELEN = %" IVdf "\n", (IV)GvNAMELEN(sv)); do_hv_dump (level, file, " GvSTASH", GvSTASH(sv)); - Perl_dump_indent(aTHX_ level, file, " FLAGS = 0x%" UVxf "\n", (UV)GvFLAGS(sv)); - Perl_dump_indent(aTHX_ level, file, " GP = 0x%" UVxf "\n", PTR2UV(GvGP(sv))); + dump_indent(level, file, " FLAGS = 0x%" UVxf "\n", (UV)GvFLAGS(sv)); + dump_indent(level, file, " GP = 0x%" UVxf "\n", PTR2UV(GvGP(sv))); if (!GvGP(sv)) break; - Perl_dump_indent(aTHX_ level, file, " SV = 0x%" UVxf "\n", PTR2UV(GvSV(sv))); - Perl_dump_indent(aTHX_ level, file, " REFCNT = %" IVdf "\n", (IV)GvREFCNT(sv)); - Perl_dump_indent(aTHX_ level, file, " IO = 0x%" UVxf "\n", PTR2UV(GvIOp(sv))); - Perl_dump_indent(aTHX_ level, file, " FORM = 0x%" UVxf " \n", PTR2UV(GvFORM(sv))); - Perl_dump_indent(aTHX_ level, file, " AV = 0x%" UVxf "\n", PTR2UV(GvAV(sv))); - Perl_dump_indent(aTHX_ level, file, " HV = 0x%" UVxf "\n", PTR2UV(GvHV(sv))); - Perl_dump_indent(aTHX_ level, file, " CV = 0x%" UVxf "\n", PTR2UV(GvCV(sv))); - Perl_dump_indent(aTHX_ level, file, " CVGEN = 0x%" UVxf "\n", (UV)GvCVGEN(sv)); - Perl_dump_indent(aTHX_ level, file, " GPFLAGS = 0x%" UVxf - " (%s)\n", - (UV)GvGPFLAGS(sv), - ""); - Perl_dump_indent(aTHX_ level, file, " LINE = %" LINE_Tf "\n", (line_t)GvLINE(sv)); - Perl_dump_indent(aTHX_ level, file, " FILE = \"%s\"\n", GvFILE(sv)); + dump_indent(level, file, " SV = 0x%" UVxf "\n", PTR2UV(GvSV(sv))); + dump_indent(level, file, " REFCNT = %" IVdf "\n", + (IV)GvREFCNT(sv)); + dump_indent(level, file, " IO = 0x%" UVxf "\n", PTR2UV(GvIOp(sv))); + dump_indent(level, file, " FORM = 0x%" UVxf " \n", + PTR2UV(GvFORM(sv))); + dump_indent(level, file, " AV = 0x%" UVxf "\n", PTR2UV(GvAV(sv))); + dump_indent(level, file, " HV = 0x%" UVxf "\n", PTR2UV(GvHV(sv))); + dump_indent(level, file, " CV = 0x%" UVxf "\n", PTR2UV(GvCV(sv))); + dump_indent(level, file, " CVGEN = 0x%" UVxf "\n", + (UV)GvCVGEN(sv)); + dump_indent(level, file, " GPFLAGS = 0x%" UVxf " (%s)\n", + (UV)GvGPFLAGS(sv), ""); + dump_indent(level, file, " LINE = %" LINE_Tf "\n", + (line_t)GvLINE(sv)); + dump_indent(level, file, " FILE = \"%s\"\n", GvFILE(sv)); do_gv_dump (level, file, " EGV", GvEGV(sv)); break; case SVt_PVIO: - Perl_dump_indent(aTHX_ level, file, " IFP = 0x%" UVxf "\n", PTR2UV(IoIFP(sv))); - Perl_dump_indent(aTHX_ level, file, " OFP = 0x%" UVxf "\n", PTR2UV(IoOFP(sv))); - Perl_dump_indent(aTHX_ level, file, " DIRP = 0x%" UVxf "\n", PTR2UV(IoDIRP(sv))); - Perl_dump_indent(aTHX_ level, file, " LINES = %" IVdf "\n", (IV)IoLINES(sv)); - Perl_dump_indent(aTHX_ level, file, " PAGE = %" IVdf "\n", (IV)IoPAGE(sv)); - Perl_dump_indent(aTHX_ level, file, " PAGE_LEN = %" IVdf "\n", (IV)IoPAGE_LEN(sv)); - Perl_dump_indent(aTHX_ level, file, " LINES_LEFT = %" IVdf "\n", (IV)IoLINES_LEFT(sv)); + dump_indent(level, file, " IFP = 0x%" UVxf "\n", PTR2UV(IoIFP(sv))); + dump_indent(level, file, " OFP = 0x%" UVxf "\n", PTR2UV(IoOFP(sv))); + dump_indent(level, file, " DIRP = 0x%" UVxf "\n", + PTR2UV(IoDIRP(sv))); + dump_indent(level, file, " LINES = %" IVdf "\n", (IV)IoLINES(sv)); + dump_indent(level, file, " PAGE = %" IVdf "\n", (IV)IoPAGE(sv)); + dump_indent(level, file, " PAGE_LEN = %" IVdf "\n", + (IV)IoPAGE_LEN(sv)); + dump_indent(level, file, " LINES_LEFT = %" IVdf "\n", + (IV)IoLINES_LEFT(sv)); if (IoTOP_NAME(sv)) - Perl_dump_indent(aTHX_ level, file, " TOP_NAME = \"%s\"\n", IoTOP_NAME(sv)); + dump_indent(level, file, " TOP_NAME = \"%s\"\n", IoTOP_NAME(sv)); if (!IoTOP_GV(sv) || SvTYPE(IoTOP_GV(sv)) == SVt_PVGV) do_gv_dump (level, file, " TOP_GV", IoTOP_GV(sv)); else { - Perl_dump_indent(aTHX_ level, file, " TOP_GV = 0x%" UVxf "\n", - PTR2UV(IoTOP_GV(sv))); + dump_indent(level, file, " TOP_GV = 0x%" UVxf "\n", + PTR2UV(IoTOP_GV(sv))); do_sv_dump (level+1, file, MUTABLE_SV(IoTOP_GV(sv)), nest+1, maxnest, dumpops, pvlim); } /* Source filters hide things that are not GVs in these three, so let's be careful out there. */ if (IoFMT_NAME(sv)) - Perl_dump_indent(aTHX_ level, file, " FMT_NAME = \"%s\"\n", IoFMT_NAME(sv)); + dump_indent(level, file, " FMT_NAME = \"%s\"\n", IoFMT_NAME(sv)); if (!IoFMT_GV(sv) || SvTYPE(IoFMT_GV(sv)) == SVt_PVGV) do_gv_dump (level, file, " FMT_GV", IoFMT_GV(sv)); else { - Perl_dump_indent(aTHX_ level, file, " FMT_GV = 0x%" UVxf "\n", - PTR2UV(IoFMT_GV(sv))); + dump_indent(level, file, " FMT_GV = 0x%" UVxf "\n", + PTR2UV(IoFMT_GV(sv))); do_sv_dump (level+1, file, MUTABLE_SV(IoFMT_GV(sv)), nest+1, maxnest, dumpops, pvlim); } if (IoBOTTOM_NAME(sv)) - Perl_dump_indent(aTHX_ level, file, " BOTTOM_NAME = \"%s\"\n", IoBOTTOM_NAME(sv)); + dump_indent(level, file, " BOTTOM_NAME = \"%s\"\n", + IoBOTTOM_NAME(sv)); if (!IoBOTTOM_GV(sv) || SvTYPE(IoBOTTOM_GV(sv)) == SVt_PVGV) do_gv_dump (level, file, " BOTTOM_GV", IoBOTTOM_GV(sv)); else { - Perl_dump_indent(aTHX_ level, file, " BOTTOM_GV = 0x%" UVxf "\n", - PTR2UV(IoBOTTOM_GV(sv))); + dump_indent(level, file, " BOTTOM_GV = 0x%" UVxf "\n", + PTR2UV(IoBOTTOM_GV(sv))); do_sv_dump (level+1, file, MUTABLE_SV(IoBOTTOM_GV(sv)), nest+1, maxnest, dumpops, pvlim); } if (isPRINT(IoTYPE(sv))) - Perl_dump_indent(aTHX_ level, file, " TYPE = '%c'\n", IoTYPE(sv)); + dump_indent(level, file, " TYPE = '%c'\n", IoTYPE(sv)); else - Perl_dump_indent(aTHX_ level, file, " TYPE = '\\%o'\n", IoTYPE(sv)); - Perl_dump_indent(aTHX_ level, file, " FLAGS = 0x%" UVxf "\n", (UV)IoFLAGS(sv)); + dump_indent(level, file, " TYPE = '\\%o'\n", IoTYPE(sv)); + dump_indent(level, file, " FLAGS = 0x%" UVxf "\n", (UV)IoFLAGS(sv)); break; case SVt_REGEXP: dumpregexp: @@ -2731,28 +3040,31 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO } \ } STMT_END SV_SET_STRINGIFY_REGEXP_FLAGS(d,r->compflags,regexp_extflags_names); - Perl_dump_indent(aTHX_ level, file, " COMPFLAGS = 0x%" UVxf " (%s)\n", - (UV)(r->compflags), SvPVX_const(d)); + dump_indent(level, file, " COMPFLAGS = 0x%" UVxf " (%s)\n", + (UV)(r->compflags), SvPVX_const(d)); SV_SET_STRINGIFY_REGEXP_FLAGS(d,r->extflags,regexp_extflags_names); - Perl_dump_indent(aTHX_ level, file, " EXTFLAGS = 0x%" UVxf " (%s)\n", - (UV)(r->extflags), SvPVX_const(d)); + dump_indent(level, file, " EXTFLAGS = 0x%" UVxf " (%s)\n", + (UV)(r->extflags), SvPVX_const(d)); - Perl_dump_indent(aTHX_ level, file, " ENGINE = 0x%" UVxf " (%s)\n", - PTR2UV(r->engine), (r->engine == &PL_core_reg_engine) ? "STANDARD" : "PLUG-IN" ); + dump_indent(level, file, " ENGINE = 0x%" UVxf " (%s)\n", + PTR2UV(r->engine), + (r->engine == &PL_core_reg_engine) + ? "STANDARD" : "PLUG-IN" ); if (r->engine == &PL_core_reg_engine) { SV_SET_STRINGIFY_REGEXP_FLAGS(d,r->intflags,regexp_core_intflags_names); - Perl_dump_indent(aTHX_ level, file, " INTFLAGS = 0x%" UVxf " (%s)\n", - (UV)(r->intflags), SvPVX_const(d)); + dump_indent(level, file, " INTFLAGS = 0x%" UVxf " (%s)\n", + (UV)(r->intflags), SvPVX_const(d)); } else { - Perl_dump_indent(aTHX_ level, file, " INTFLAGS = 0x%" UVxf "(Plug in)\n", - (UV)(r->intflags)); + dump_indent(level, file, + " INTFLAGS = 0x%" UVxf "(Plug in)\n", + (UV)(r->intflags)); } #undef SV_SET_STRINGIFY_REGEXP_FLAGS - Perl_dump_indent(aTHX_ level, file, " NPARENS = %" UVuf "\n", - (UV)(r->nparens)); - Perl_dump_indent(aTHX_ level, file, " LOGICAL_NPARENS = %" UVuf "\n", - (UV)(r->logical_nparens)); + dump_indent(level, file, " NPARENS = %" UVuf "\n", + (UV)(r->nparens)); + dump_indent(level, file, " LOGICAL_NPARENS = %" UVuf "\n", + (UV)(r->logical_nparens)); #define SV_SET_STRINGIFY_I32_PAREN_ARRAY(d,count,ary) \ STMT_START { \ @@ -2766,59 +3078,60 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO sv_catpvs(d," }\n"); \ } STMT_END - Perl_dump_indent(aTHX_ level, file, " LOGICAL_TO_PARNO = 0x%" UVxf "\n", - PTR2UV(r->logical_to_parno)); + dump_indent(level, file, " LOGICAL_TO_PARNO = 0x%" UVxf "\n", + PTR2UV(r->logical_to_parno)); if (r->logical_to_parno) { SV_SET_STRINGIFY_I32_PAREN_ARRAY(d, r->logical_nparens, r->logical_to_parno); - Perl_dump_indent(aTHX_ level, file, " %" SVf, d); + dump_indent(level, file, " %" SVf, d); } - Perl_dump_indent(aTHX_ level, file, " PARNO_TO_LOGICAL = 0x%" UVxf "\n", - PTR2UV(r->parno_to_logical)); + dump_indent(level, file, " PARNO_TO_LOGICAL = 0x%" UVxf "\n", + PTR2UV(r->parno_to_logical)); if (r->parno_to_logical) { SV_SET_STRINGIFY_I32_PAREN_ARRAY(d, r->nparens, r->parno_to_logical); - Perl_dump_indent(aTHX_ level, file, " %" SVf, d); + dump_indent(level, file, " %" SVf, d); } - Perl_dump_indent(aTHX_ level, file, " PARNO_TO_LOGICAL_NEXT = 0x%" UVxf "\n", - PTR2UV(r->parno_to_logical_next)); + dump_indent(level, file, + " PARNO_TO_LOGICAL_NEXT = 0x%" UVxf "\n", + PTR2UV(r->parno_to_logical_next)); if (r->parno_to_logical_next) { SV_SET_STRINGIFY_I32_PAREN_ARRAY(d, r->nparens, r->parno_to_logical_next); - Perl_dump_indent(aTHX_ level, file, " %" SVf, d); + dump_indent(level, file, " %" SVf, d); } #undef SV_SET_STRINGIFY_I32_ARRAY - Perl_dump_indent(aTHX_ level, file, " LASTPAREN = %" UVuf "\n", - (UV)(RXp_LASTPAREN(r))); - Perl_dump_indent(aTHX_ level, file, " LASTCLOSEPAREN = %" UVuf "\n", - (UV)(RXp_LASTCLOSEPAREN(r))); - Perl_dump_indent(aTHX_ level, file, " MINLEN = %" IVdf "\n", - (IV)(RXp_MINLEN(r))); - Perl_dump_indent(aTHX_ level, file, " MINLENRET = %" IVdf "\n", - (IV)(RXp_MINLENRET(r))); - Perl_dump_indent(aTHX_ level, file, " GOFS = %" UVuf "\n", - (UV)(RXp_GOFS(r))); - Perl_dump_indent(aTHX_ level, file, " PRE_PREFIX = %" UVuf "\n", - (UV)(RXp_PRE_PREFIX(r))); - Perl_dump_indent(aTHX_ level, file, " SUBLEN = %" IVdf "\n", - (IV)(RXp_SUBLEN(r))); - Perl_dump_indent(aTHX_ level, file, " SUBOFFSET = %" IVdf "\n", - (IV)(RXp_SUBOFFSET(r))); - Perl_dump_indent(aTHX_ level, file, " SUBCOFFSET = %" IVdf "\n", - (IV)(RXp_SUBCOFFSET(r))); + dump_indent(level, file, " LASTPAREN = %" UVuf "\n", + (UV)(RXp_LASTPAREN(r))); + dump_indent(level, file, " LASTCLOSEPAREN = %" UVuf "\n", + (UV)(RXp_LASTCLOSEPAREN(r))); + dump_indent(level, file, " MINLEN = %" IVdf "\n", + (IV)(RXp_MINLEN(r))); + dump_indent(level, file, " MINLENRET = %" IVdf "\n", + (IV)(RXp_MINLENRET(r))); + dump_indent(level, file, " GOFS = %" UVuf "\n", + (UV)(RXp_GOFS(r))); + dump_indent(level, file, " PRE_PREFIX = %" UVuf "\n", + (UV)(RXp_PRE_PREFIX(r))); + dump_indent(level, file, " SUBLEN = %" IVdf "\n", + (IV)(RXp_SUBLEN(r))); + dump_indent(level, file, " SUBOFFSET = %" IVdf "\n", + (IV)(RXp_SUBOFFSET(r))); + dump_indent(level, file, " SUBCOFFSET = %" IVdf "\n", + (IV)(RXp_SUBCOFFSET(r))); if (RXp_SUBBEG(r)) - Perl_dump_indent(aTHX_ level, file, " SUBBEG = 0x%" UVxf " %s\n", - PTR2UV(RXp_SUBBEG(r)), + dump_indent(level, file, " SUBBEG = 0x%" UVxf " %s\n", + PTR2UV(RXp_SUBBEG(r)), pv_display(d, RXp_SUBBEG(r), RXp_SUBLEN(r), 50, pvlim)); else - Perl_dump_indent(aTHX_ level, file, " SUBBEG = 0x0\n"); - Perl_dump_indent(aTHX_ level, file, " PAREN_NAMES = 0x%" UVxf "\n", - PTR2UV(RXp_PAREN_NAMES(r))); - Perl_dump_indent(aTHX_ level, file, " SUBSTRS = 0x%" UVxf "\n", - PTR2UV(RXp_SUBSTRS(r))); - Perl_dump_indent(aTHX_ level, file, " PPRIVATE = 0x%" UVxf "\n", - PTR2UV(RXp_PPRIVATE(r))); - Perl_dump_indent(aTHX_ level, file, " OFFS = 0x%" UVxf "\n", - PTR2UV(RXp_OFFSp(r))); + dump_indent(level, file, " SUBBEG = 0x0\n"); + dump_indent(level, file, " PAREN_NAMES = 0x%" UVxf "\n", + PTR2UV(RXp_PAREN_NAMES(r))); + dump_indent(level, file, " SUBSTRS = 0x%" UVxf "\n", + PTR2UV(RXp_SUBSTRS(r))); + dump_indent(level, file, " PPRIVATE = 0x%" UVxf "\n", + PTR2UV(RXp_PPRIVATE(r))); + dump_indent(level, file, " OFFS = 0x%" UVxf "\n", + PTR2UV(RXp_OFFSp(r))); if (RXp_OFFSp(r)) { U32 n; sv_setpvs(d,"[ "); @@ -2830,27 +3143,27 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO (IV)RXp_OFFSp(r)[n].start, (IV)RXp_OFFSp(r)[n].end, n+1 > r->nparens ? " ]\n" : ", "); } - Perl_dump_indent(aTHX_ level, file, " %" SVf, d); + dump_indent(level, file, " %" SVf, d); } - Perl_dump_indent(aTHX_ level, file, " QR_ANONCV = 0x%" UVxf "\n", - PTR2UV(RXp_QR_ANONCV(r))); + dump_indent(level, file, " QR_ANONCV = 0x%" UVxf "\n", + PTR2UV(RXp_QR_ANONCV(r))); #ifdef PERL_ANY_COW - Perl_dump_indent(aTHX_ level, file, " SAVED_COPY = 0x%" UVxf "\n", - PTR2UV(RXp_SAVED_COPY(r))); + dump_indent(level, file, " SAVED_COPY = 0x%" UVxf "\n", + PTR2UV(RXp_SAVED_COPY(r))); #endif /* this should go LAST or the output gets really confusing */ - Perl_dump_indent(aTHX_ level, file, " MOTHER_RE = 0x%" UVxf "\n", - PTR2UV(RXp_MOTHER_RE(r))); + dump_indent(level, file, " MOTHER_RE = 0x%" UVxf "\n", + PTR2UV(RXp_MOTHER_RE(r))); if (nest < maxnest && RXp_MOTHER_RE(r)) do_sv_dump(level+1, file, (SV *)RXp_MOTHER_RE(r), nest+1, maxnest, dumpops, pvlim); } break; case SVt_PVOBJ: - Perl_dump_indent(aTHX_ level, file, " MAXFIELD = %" IVdf "\n", - (IV)ObjectMAXFIELD(sv)); - Perl_dump_indent(aTHX_ level, file, " FIELDS = 0x%" UVxf "\n", - PTR2UV(ObjectFIELDS(sv))); + dump_indent(level, file, " MAXFIELD = %" IVdf "\n", + (IV)ObjectMAXFIELD(sv)); + dump_indent(level, file, " FIELDS = 0x%" UVxf "\n", + PTR2UV(ObjectFIELDS(sv))); if (nest < maxnest && ObjectFIELDS(sv)) { SSize_t count; SV **svp = ObjectFIELDS(sv); @@ -2862,8 +3175,8 @@ Perl_do_sv_dump(pTHX_ I32 level, PerlIO SV *const field = *svp; PADNAME *pn = pname[count]; - Perl_dump_indent(aTHX_ level + 1, file, "Field No. %" IVdf " (%s)\n", - (IV)count, PadnamePV(pn)); + dump_indent(level + 1, file, "Field No. %" IVdf " (%s)\n", + (IV)count, PadnamePV(pn)); do_sv_dump(level+1, file, field, nest+1, maxnest, dumpops, pvlim); } @@ -2918,6 +3231,8 @@ deep. void Perl_sv_dump(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_DUMP; + if (sv && SvROK(sv)) sv_dump_depth(sv, 4); else @@ -2927,24 +3242,30 @@ Perl_sv_dump(pTHX_ SV *sv) void Perl_sv_dump_depth(pTHX_ SV *sv, I32 depth) { + PERL_ARGS_ASSERT_SV_DUMP_DEPTH; + do_sv_dump(0, Perl_debug_log, sv, 0, depth, 0, 0); } void Perl_av_dump(pTHX_ AV *av) { + PERL_ARGS_ASSERT_AV_DUMP; sv_dump_depth((SV*)av, 3); } void Perl_hv_dump(pTHX_ HV *hv) { + PERL_ARGS_ASSERT_HV_DUMP; sv_dump_depth((SV*)hv, 3); } int Perl_runops_debug(pTHX) { + PERL_ARGS_ASSERT_RUNOPS_DEBUG; + #ifdef PERL_USE_HWM SSize_t orig_stack_hwm = PL_curstackinfo->si_stack_hwm; @@ -2961,7 +3282,7 @@ Perl_runops_debug(pTHX) ck_warner_d(packWARN(WARN_DEBUGGING), "NULL OP IN RUN"); return 0; } - DEBUG_l(Perl_deb(aTHX_ "Entering new RUNOPS level\n")); + DEBUG_l(deb("Entering new RUNOPS level\n")); do { #ifdef PERL_TRACE_OPS ++PL_op_exec_cnt[PL_op->op_type]; @@ -3001,7 +3322,7 @@ Perl_runops_debug(pTHX) PERL_DTRACE_PROBE_OP(PL_op); } while ((PL_op = PL_op->op_ppaddr(aTHX))); - DEBUG_l(Perl_deb(aTHX_ "leaving RUNOPS level\n")); + DEBUG_l(deb("leaving RUNOPS level\n")); PERL_ASYNC_CHECK(); #ifdef PERL_USE_HWM @@ -3013,13 +3334,13 @@ Perl_runops_debug(pTHX) } -/* print the names of the n lexical vars starting at pad offset off */ +/* Print the names of the n lexical vars starting at pad offset off + * in the specified CV */ -STATIC void -S_deb_padvar(pTHX_ PADOFFSET off, int n, bool paren) +static void +S_deb_padvar_cv(pTHX_ CV *cv, PADOFFSET off, int n, bool paren) { PADNAME *sv; - CV * const cv = deb_curcv(cxstack_ix); PADNAMELIST *comppad = NULL; int i; @@ -3043,6 +3364,16 @@ S_deb_padvar(pTHX_ PADOFFSET off, int n, } +/* Print the names of the n lexical vars starting at pad offset off n the + * currently executing CV */ + +static void +S_deb_padvar(pTHX_ PADOFFSET off, int n, bool paren) +{ + S_deb_padvar_cv(aTHX_ deb_curcv(cxstack_ix), off, n, paren); +} + + /* append to the out SV, the name of the lexical at offset off in the CV * cv */ @@ -3110,6 +3441,8 @@ S_append_gv_name(pTHX_ GV *gv, SV *out) SV* Perl_multideref_stringify(pTHX_ const OP *o, CV *cv) { + PERL_ARGS_ASSERT_MULTIDEREF_STRINGIFY; + UNOP_AUX_item *items = cUNOP_AUXo->op_aux; UV actions = items->uv; SV *sv; @@ -3128,8 +3461,6 @@ Perl_multideref_stringify(pTHX_ const OP comppad = NULL; #endif - PERL_ARGS_ASSERT_MULTIDEREF_STRINGIFY; - while (!last) { switch (actions & MDEREF_ACTION_MASK) { @@ -3254,6 +3585,8 @@ Perl_multideref_stringify(pTHX_ const OP SV* Perl_multiconcat_stringify(pTHX_ const OP *o) { + PERL_ARGS_ASSERT_MULTICONCAT_STRINGIFY; + UNOP_AUX_item *aux = cUNOP_AUXo->op_aux; UNOP_AUX_item *lens; STRLEN len; @@ -3261,8 +3594,6 @@ Perl_multiconcat_stringify(pTHX_ const O char *s; SV *out = newSVpvn_flags("", 0, SVs_TEMP); - PERL_ARGS_ASSERT_MULTICONCAT_STRINGIFY; - nargs = aux[PERL_MULTICONCAT_IX_NARGS].ssize; s = aux[PERL_MULTICONCAT_IX_PLAIN_PV].pv; len = aux[PERL_MULTICONCAT_IX_PLAIN_LEN].ssize; @@ -3302,7 +3633,7 @@ Perl_debop(pTHX_ const OP *o) if (CopSTASH_eq(PL_curcop, PL_debstash) && !DEBUG_J_TEST_) return 0; - Perl_deb(aTHX_ "%s", OP_NAME(o)); + deb("%s", OP_NAME(o)); switch (o->op_type) { case OP_CONST: case OP_HINTSEVAL: @@ -3317,15 +3648,40 @@ Perl_debop(pTHX_ const OP *o) break; case OP_GVSV: case OP_GV: + case OP_AELEMFAST: + case OP_RCATLINE: PerlIO_printf(Perl_debug_log, "(%" SVf ")", SVfARG(S_gv_display(aTHX_ cGVOPo_gv))); + if (o->op_type == OP_AELEMFAST) + do_fast_ix: + PerlIO_printf(Perl_debug_log, "[%" IVdf "]", + (IV)(I8)o->op_private); + break; + + case OP_METHOD_NAMED: /* $obj->foo */ + case OP_METHOD_SUPER: /* $obj->SUPER::foo */ + case OP_METHOD_REDIR: /* $obj->BAR::foo */ + case OP_METHOD_REDIR_SUPER: /* $obj->BAR::SUPER::foo */ + PerlIO_printf(Perl_debug_log, "(%s)", + SvPEEK(cMETHOPo_meth)); + if ( o->op_type == OP_METHOD_REDIR + || o->op_type == OP_METHOD_REDIR_SUPER) + { + PerlIO_printf(Perl_debug_log, "(%s)", + SvPEEK(cMETHOPo_rclass)); + } break; case OP_PADSV: case OP_PADAV: case OP_PADHV: case OP_ARGELEM: + case OP_PADSV_STORE: + case OP_AELEMFAST_LEX: + do_lex: S_deb_padvar(aTHX_ o->op_targ, 1, 1); + if (o->op_type == OP_AELEMFAST_LEX) + goto do_fast_ix; break; case OP_PADRANGE: @@ -3344,6 +3700,10 @@ Perl_debop(pTHX_ const OP *o) break; default: + if ( (PL_opargs[o->op_type] & OA_TARGLEX) + && (o->op_private & OPpTARGET_MY)) + goto do_lex; + break; } PerlIO_printf(Perl_debug_log, "\n"); @@ -3364,6 +3724,8 @@ Returns one of the OPclass enums, such a OPclass Perl_op_class(pTHX_ const OP *o) { + PERL_ARGS_ASSERT_OP_CLASS; + bool custom = 0; if (!o) @@ -3497,9 +3859,11 @@ Perl_op_class(pTHX_ const OP *o) -STATIC CV* +static CV* S_deb_curcv(pTHX_ I32 ix) { + PERL_ARGS_ASSERT_DEB_CURCV; + PERL_SI *si = PL_curstackinfo; for (; ix >=0; ix--) { const PERL_CONTEXT * const cx = &(si->si_cxstack)[ix]; @@ -3541,7 +3905,7 @@ C<-DP> command line option. =cut */ -STATIC void +static void S_debprof(pTHX_ const OP *o) { PERL_ARGS_ASSERT_DEBPROF; @@ -3565,6 +3929,8 @@ option. void Perl_debprofdump(pTHX) { + PERL_ARGS_ASSERT_DEBPROFDUMP; + unsigned i; if (!PL_profiledata) return; Index: gnu/usr.bin/perl/ebcdic_tables.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/ebcdic_tables.h,v diff -u -p -a -u -p -r1.6 ebcdic_tables.h --- gnu/usr.bin/perl/ebcdic_tables.h 14 May 2024 19:38:53 -0000 1.6 +++ gnu/usr.bin/perl/ebcdic_tables.h 16 Nov 2026 00:57:38 -0000 @@ -43,10 +43,7 @@ SOFTWARE. && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 21 /* Index is ASCII platform code point; value is EBCDIC 1047 equivalent */ -# ifndef DOINIT - EXTCONST U8 PL_a2e[256]; -# else - EXTCONST U8 PL_a2e[256] = { +EXTCONST U8 PL_a2e[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x37,0x2D,0x2E,0x2F,0x16,0x05,0x15,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x3C,0x3D,0x32,0x26,0x18,0x19,0x3F,0x27,0x1C,0x1D,0x1E,0x1F, @@ -65,14 +62,10 @@ SOFTWARE. /*E_*/0x44,0x45,0x42,0x46,0x43,0x47,0x9C,0x48,0x54,0x51,0x52,0x53,0x58,0x55,0x56,0x57, /*F_*/0x8C,0x49,0xCD,0xCE,0xCB,0xCF,0xCC,0xE1,0x70,0xDD,0xDE,0xDB,0xDC,0x8D,0x8E,0xDF /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* Index is EBCDIC 1047 code point; value is ASCII platform equivalent */ -# ifndef DOINIT - EXTCONST U8 PL_e2a[256]; -# else - EXTCONST U8 PL_e2a[256] = { +EXTCONST U8 PL_e2a[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x9C,0x09,0x86,0x7F,0x97,0x8D,0x8E,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x9D,0x0A,0x08,0x87,0x18,0x19,0x92,0x8F,0x1C,0x1D,0x1E,0x1F, @@ -91,15 +84,11 @@ SOFTWARE. /*E_*/0x5C,0xF7,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0xB2,0xD4,0xD6,0xD2,0xD3,0xD5, /*F_*/0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0xB3,0xDB,0xDC,0xD9,0xDA,0x9F /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* (Confusingly named) Index is EBCDIC 1047 I8 byte; value is * EBCDIC 1047 UTF-EBCDIC equivalent */ -# ifndef DOINIT - EXTCONST U8 PL_utf2e[256]; -# else - EXTCONST U8 PL_utf2e[256] = { +EXTCONST U8 PL_utf2e[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x37,0x2D,0x2E,0x2F,0x16,0x05,0x15,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x3C,0x3D,0x32,0x26,0x18,0x19,0x3F,0x27,0x1C,0x1D,0x1E,0x1F, @@ -118,15 +107,11 @@ SOFTWARE. /*E_*/0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBE,0xBF,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xDA,0xDB, /*F_*/0xDC,0xDD,0xDE,0xDF,0xE1,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xFA,0xFB,0xFC,0xFD,0xFE /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* (Confusingly named) Index is EBCDIC 1047 UTF-EBCDIC byte; value is * EBCDIC 1047 I8 equivalent */ -# ifndef DOINIT - EXTCONST U8 PL_e2utf[256]; -# else - EXTCONST U8 PL_e2utf[256] = { +EXTCONST U8 PL_e2utf[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x9C,0x09,0x86,0x7F,0x97,0x8D,0x8E,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x9D,0x0A,0x08,0x87,0x18,0x19,0x92,0x8F,0x1C,0x1D,0x1E,0x1F, @@ -145,17 +130,13 @@ SOFTWARE. /*E_*/0x5C,0xF4,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA, /*F_*/0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0xFB,0xFC,0xFD,0xFE,0xFF,0x9F /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* Index is EBCDIC 1047 UTF-EBCDIC byte; value is UTF8SKIP for start bytes * (including for overlongs); 1 for continuation. Adapted from the shadow * flags table in tr16. The entries marked 9 in tr16 are continuation bytes * and are marked as length 1 here so that we can recover. */ -# ifndef DOINIT - EXTCONST U8 PL_utf8skip[256]; -# else - EXTCONST U8 PL_utf8skip[256] = { +EXTCONST U8 PL_utf8skip[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /*1_*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -174,14 +155,10 @@ SOFTWARE. /*E_*/ 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 5, 5, 5, /*F_*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 6, 7, 14, 1 /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* Index is EBCDIC 1047 code point; value is its lowercase equivalent */ -# ifndef DOINIT - EXTCONST U8 PL_latin1_lc[256]; -# else - EXTCONST U8 PL_latin1_lc[256] = { +EXTCONST U8 PL_latin1_lc[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, @@ -200,16 +177,12 @@ SOFTWARE. /*E_*/0xE0,0xE1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xEA,0xCB,0xCC,0xCD,0xCE,0xCF, /*F_*/0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xDB,0xDC,0xDD,0xDE,0xFF /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* Index is EBCDIC 1047 code point; value is its uppercase equivalent. * The 'mod' in the name means that codepoints whose uppercase is above 255 or * longer than 1 character map to LATIN SMALL LETTER Y WITH DIARESIS */ -# ifndef DOINIT - EXTCONST U8 PL_mod_latin1_uc[256]; -# else - EXTCONST U8 PL_mod_latin1_uc[256] = { +EXTCONST U8 PL_mod_latin1_uc[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, @@ -228,15 +201,11 @@ SOFTWARE. /*E_*/0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, /*F_*/0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* Index is EBCDIC 1047 code point; For A-Z, value is a-z; for a-z, value * is A-Z; all other code points map to themselves */ -# ifndef DOINIT - EXTCONST U8 PL_fold[256]; -# else - EXTCONST U8 PL_fold[256] = { +EXTCONST U8 PL_fold[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, @@ -255,16 +224,12 @@ SOFTWARE. /*E_*/0xE0,0xE1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, /*F_*/0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* Index is EBCDIC 1047 code point; value is its other fold-pair equivalent * (A => a; a => A, etc) in the 0-255 range. If no such equivalent, value is * the code point itself */ -# ifndef DOINIT - EXTCONST U8 PL_fold_latin1[256]; -# else - EXTCONST U8 PL_fold_latin1[256] = { +EXTCONST U8 PL_fold_latin1[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, @@ -283,8 +248,7 @@ SOFTWARE. /*E_*/0xE0,0xE1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xEA,0xCB,0xCC,0xCD,0xCE,0xCF, /*F_*/0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xDB,0xDC,0xDD,0xDE,0xFF /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* The table below is adapted from @@ -292,10 +256,7 @@ SOFTWARE. * See copyright notice at the beginning of this file. */ -# ifndef DOINIT - EXTCONST U8 PL_extended_utf8_dfa_tab[416]; -# else - EXTCONST U8 PL_extended_utf8_dfa_tab[416] = { +EXTCONST U8 PL_extended_utf8_dfa_tab[416] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_ */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*1_ */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -324,8 +285,7 @@ SOFTWARE. /*N8=128*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 64, 64, 64, 1, 1, 1, 1, /*N9=144*/ 1, 1, 1, 1, 1, 1, 1, 1, 80, 80, 80, 80, 1, 1, 1, 1 /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15*/ -}; -# endif +}); /* The table below is adapted from @@ -333,10 +293,7 @@ SOFTWARE. * See copyright notice at the beginning of this file. */ -# ifndef DOINIT - EXTCONST U16 PL_strict_utf8_dfa_tab[624]; -# else - EXTCONST U16 PL_strict_utf8_dfa_tab[624] = { +EXTCONST U16 PL_strict_utf8_dfa_tab[624] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_ */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*1_ */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -371,8 +328,7 @@ SOFTWARE. /*N14=322*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,345, /*N15=345*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,299 /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22*/ -}; -# endif +}); /* The table below is adapted from @@ -380,10 +336,7 @@ SOFTWARE. * See copyright notice at the beginning of this file. */ -# ifndef DOINIT - EXTCONST U8 PL_c9_utf8_dfa_tab[368]; -# else - EXTCONST U8 PL_c9_utf8_dfa_tab[368] = { +EXTCONST U8 PL_c9_utf8_dfa_tab[368] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_ */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*1_ */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -410,8 +363,7 @@ SOFTWARE. /*N6=84*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 42, 42, 42, /*N7=98*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 42, 1, 1, 1, 1 /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13*/ -}; -# endif +}); #endif /* EBCDIC 1047 */ @@ -421,10 +373,7 @@ SOFTWARE. && '$' == 91 && '@' == 124 && '`' == 121 && '\n' == 37 /* Index is ASCII platform code point; value is EBCDIC 037 equivalent */ -# ifndef DOINIT - EXTCONST U8 PL_a2e[256]; -# else - EXTCONST U8 PL_a2e[256] = { +EXTCONST U8 PL_a2e[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x37,0x2D,0x2E,0x2F,0x16,0x05,0x25,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x3C,0x3D,0x32,0x26,0x18,0x19,0x3F,0x27,0x1C,0x1D,0x1E,0x1F, @@ -443,14 +392,10 @@ SOFTWARE. /*E_*/0x44,0x45,0x42,0x46,0x43,0x47,0x9C,0x48,0x54,0x51,0x52,0x53,0x58,0x55,0x56,0x57, /*F_*/0x8C,0x49,0xCD,0xCE,0xCB,0xCF,0xCC,0xE1,0x70,0xDD,0xDE,0xDB,0xDC,0x8D,0x8E,0xDF /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* Index is EBCDIC 037 code point; value is ASCII platform equivalent */ -# ifndef DOINIT - EXTCONST U8 PL_e2a[256]; -# else - EXTCONST U8 PL_e2a[256] = { +EXTCONST U8 PL_e2a[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x9C,0x09,0x86,0x7F,0x97,0x8D,0x8E,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x9D,0x85,0x08,0x87,0x18,0x19,0x92,0x8F,0x1C,0x1D,0x1E,0x1F, @@ -469,15 +414,11 @@ SOFTWARE. /*E_*/0x5C,0xF7,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0xB2,0xD4,0xD6,0xD2,0xD3,0xD5, /*F_*/0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0xB3,0xDB,0xDC,0xD9,0xDA,0x9F /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* (Confusingly named) Index is EBCDIC 037 I8 byte; value is * EBCDIC 037 UTF-EBCDIC equivalent */ -# ifndef DOINIT - EXTCONST U8 PL_utf2e[256]; -# else - EXTCONST U8 PL_utf2e[256] = { +EXTCONST U8 PL_utf2e[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x37,0x2D,0x2E,0x2F,0x16,0x05,0x25,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x3C,0x3D,0x32,0x26,0x18,0x19,0x3F,0x27,0x1C,0x1D,0x1E,0x1F, @@ -496,15 +437,11 @@ SOFTWARE. /*E_*/0xB6,0xB7,0xB8,0xB9,0xBC,0xBD,0xBE,0xBF,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xDA,0xDB, /*F_*/0xDC,0xDD,0xDE,0xDF,0xE1,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xFA,0xFB,0xFC,0xFD,0xFE /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* (Confusingly named) Index is EBCDIC 037 UTF-EBCDIC byte; value is * EBCDIC 037 I8 equivalent */ -# ifndef DOINIT - EXTCONST U8 PL_e2utf[256]; -# else - EXTCONST U8 PL_e2utf[256] = { +EXTCONST U8 PL_e2utf[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x9C,0x09,0x86,0x7F,0x97,0x8D,0x8E,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x9D,0x85,0x08,0x87,0x18,0x19,0x92,0x8F,0x1C,0x1D,0x1E,0x1F, @@ -523,17 +460,13 @@ SOFTWARE. /*E_*/0x5C,0xF4,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA, /*F_*/0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0xFB,0xFC,0xFD,0xFE,0xFF,0x9F /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* Index is EBCDIC 037 UTF-EBCDIC byte; value is UTF8SKIP for start bytes * (including for overlongs); 1 for continuation. Adapted from the shadow * flags table in tr16. The entries marked 9 in tr16 are continuation bytes * and are marked as length 1 here so that we can recover. */ -# ifndef DOINIT - EXTCONST U8 PL_utf8skip[256]; -# else - EXTCONST U8 PL_utf8skip[256] = { +EXTCONST U8 PL_utf8skip[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /*1_*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -552,14 +485,10 @@ SOFTWARE. /*E_*/ 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 5, 5, 5, /*F_*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 6, 7, 14, 1 /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* Index is EBCDIC 037 code point; value is its lowercase equivalent */ -# ifndef DOINIT - EXTCONST U8 PL_latin1_lc[256]; -# else - EXTCONST U8 PL_latin1_lc[256] = { +EXTCONST U8 PL_latin1_lc[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, @@ -578,16 +507,12 @@ SOFTWARE. /*E_*/0xE0,0xE1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xEA,0xCB,0xCC,0xCD,0xCE,0xCF, /*F_*/0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xDB,0xDC,0xDD,0xDE,0xFF /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* Index is EBCDIC 037 code point; value is its uppercase equivalent. * The 'mod' in the name means that codepoints whose uppercase is above 255 or * longer than 1 character map to LATIN SMALL LETTER Y WITH DIARESIS */ -# ifndef DOINIT - EXTCONST U8 PL_mod_latin1_uc[256]; -# else - EXTCONST U8 PL_mod_latin1_uc[256] = { +EXTCONST U8 PL_mod_latin1_uc[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, @@ -606,15 +531,11 @@ SOFTWARE. /*E_*/0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, /*F_*/0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* Index is EBCDIC 037 code point; For A-Z, value is a-z; for a-z, value * is A-Z; all other code points map to themselves */ -# ifndef DOINIT - EXTCONST U8 PL_fold[256]; -# else - EXTCONST U8 PL_fold[256] = { +EXTCONST U8 PL_fold[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, @@ -633,16 +554,12 @@ SOFTWARE. /*E_*/0xE0,0xE1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, /*F_*/0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* Index is EBCDIC 037 code point; value is its other fold-pair equivalent * (A => a; a => A, etc) in the 0-255 range. If no such equivalent, value is * the code point itself */ -# ifndef DOINIT - EXTCONST U8 PL_fold_latin1[256]; -# else - EXTCONST U8 PL_fold_latin1[256] = { +EXTCONST U8 PL_fold_latin1[256] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_*/0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, /*1_*/0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, @@ -661,8 +578,7 @@ SOFTWARE. /*E_*/0xE0,0xE1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xEA,0xCB,0xCC,0xCD,0xCE,0xCF, /*F_*/0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xDB,0xDC,0xDD,0xDE,0xFF /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ -}; -# endif +}); /* The table below is adapted from @@ -670,10 +586,7 @@ SOFTWARE. * See copyright notice at the beginning of this file. */ -# ifndef DOINIT - EXTCONST U8 PL_extended_utf8_dfa_tab[416]; -# else - EXTCONST U8 PL_extended_utf8_dfa_tab[416] = { +EXTCONST U8 PL_extended_utf8_dfa_tab[416] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_ */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*1_ */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -702,8 +615,7 @@ SOFTWARE. /*N8=128*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 64, 64, 64, 1, 1, 1, 1, /*N9=144*/ 1, 1, 1, 1, 1, 1, 1, 1, 80, 80, 80, 80, 1, 1, 1, 1 /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15*/ -}; -# endif +}); /* The table below is adapted from @@ -711,10 +623,7 @@ SOFTWARE. * See copyright notice at the beginning of this file. */ -# ifndef DOINIT - EXTCONST U16 PL_strict_utf8_dfa_tab[624]; -# else - EXTCONST U16 PL_strict_utf8_dfa_tab[624] = { +EXTCONST U16 PL_strict_utf8_dfa_tab[624] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_ */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*1_ */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -749,8 +658,7 @@ SOFTWARE. /*N14=322*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,345, /*N15=345*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,299 /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22*/ -}; -# endif +}); /* The table below is adapted from @@ -758,10 +666,7 @@ SOFTWARE. * See copyright notice at the beginning of this file. */ -# ifndef DOINIT - EXTCONST U8 PL_c9_utf8_dfa_tab[368]; -# else - EXTCONST U8 PL_c9_utf8_dfa_tab[368] = { +EXTCONST U8 PL_c9_utf8_dfa_tab[368] INIT({ /* _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F*/ /*0_ */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*1_ */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -788,8 +693,7 @@ SOFTWARE. /*N6=84*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 42, 42, 42, /*N7=98*/ 1, 1, 1, 1, 1, 1, 1, 1, 1, 42, 1, 1, 1, 1 /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13*/ -}; -# endif +}); #endif /* EBCDIC 037 */ Index: gnu/usr.bin/perl/embed.fnc =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/embed.fnc,v diff -u -p -a -u -p -r1.17 embed.fnc --- gnu/usr.bin/perl/embed.fnc 26 Dec 2025 22:14:12 -0000 1.17 +++ gnu/usr.bin/perl/embed.fnc 16 Nov 2026 00:57:38 -0000 @@ -1,76 +1,120 @@ : BEGIN{die "You meant to run regen/embed.pl"} # Stop early if fed to perl. : -: WARNING: The meanings of some flags have been changed as of v5.31.0 +: ALL NON-STATIC FUNCTIONS DEFINED BY PERL NEED TO BE LISTED IN THIS FILE. : : This file is known to be processed by regen/embed.pl, autodoc.pl, : makedef.pl, Devel::PPPort, and porting/diag.t. : -: This file contains entries for various functions and macros defined by perl. -: Each entry includes the name, parameters, and various attributes about it. -: In most functions listed here, the name is a short name, and the function's -: real name is the short one, prefixed by either 'Perl_' (for publicly visible -: functions) or 'S_' (for internal-to-a-file static ones). In many instances a -: macro is defined that is the name in this file, and which expands to call the -: real (full) name, with any appropriate thread context paramaters, thus hiding -: that detail from the typical code. +: This file contains entries for various functions, macros, typedefs, and +: other values defined by perl. Each entry includes the name, any parameters, +: and various attributes about it. +: +: In almost all functions listed here, the specified name is a shortened +: version of the function's real name. The actual name for publicly visible +: functions needs to be different from any other name that the loader could +: need to combine with it. We accomplish this by reserving for our use any +: name begininng with /^[pP]erl_/, and add those prefixes to the actual names +: of the publicly visible functions. +: +: Using the long names is unwieldly and harder to read; so most code will call +: the function using the short name, never needing to even know that a long +: name exists. embed.h contains macros that map the short name to the actual +: name. But the long name may be needed in special circumstances. See +: perlembed for one such; another is when the short name collides with a name +: that XS code uses. Our short name can be #undef'ed, and the function will +: still be accessible via its long name. Using intermediary macros to access +: functions also allows flexibility. For example, parameters may be added, +: subtracted, or rearranged. +: +: In contrast, macros do not usually have long versus short names, and, until +: v5.44, there was not much effort to avoid polluting the XS namespace. But, +: symbols newly created in that release and going forward, are by default not +: visible to XS code, so that new pollutants will not be inadvertently added. +: +: WARNING: The default hiding of symbols from XS code applies only to functions +: and macros. Other types of values that are created in a header file, such as +: typedefs and enum names, will be visible to XS code, unless care is taken to +: wrap them within C preprocessor guards like the following : -: Many macros (as opposed to functions) listed here are the complete full name, -: though we may want to start converting those to have full names. +: #if defined(PERL_CORE) +: ... +: #endif : -: All non-static functions defined by perl need to be listed in this file. : embed.pl uses the entries here to construct: : 1) proto.h to declare to the compiler the function interfaces; and -: 2) embed.h to create short name macros +: 2) embed.h to create the short name macros, and to control the visibility +: of other macros +: 3) long_names.c holds long-named function definitions that implement +: short-named macros listed here, when a function is necessary. : : Static functions internal to a file need not appear here, but there is -: benefit to declaring them here: -: 1) It generally handles the thread context parameter invisibly making it -: trivial to add or remove needing thread context passed; -: 2) It defines a PERL_ARGS_ASSERT_foo macro, which can save you debugging -: time; -: 3) It is is automatically known to Devel::PPPort, making it quicker to -: later find out when it came into existence. For example -: perl ppport.h --api-info=/edit_distance/ -: yields -: Supported at least since perl-5.23.8, with or without ppport.h. +: significant benefit to declaring them here: +: 1) It generally handles the thread context parameter invisibly making it +: trivial to add or remove needing thread context passed; +: 2) The function may appear anywhere in the file; otherwise it has to be +: placed before the first call to it; +: 3) It defines a PERL_ARGS_ASSERT_foo macro, which can save you debugging +: time. These ASSERT macros have been enhanced over time; your code will +: get the benefits of future enhancements without any changes to the +: source needed. +: 4) It is is automatically known to Devel::PPPort, making it quicker to +: later find out when it came into existence. For example +: perl ppport.h --api-info=/edit_distance/ +: yields +: Supported at least since perl-5.23.8, with or without ppport.h. : : Lines in this file are of the form: -: flags|return_type|name|arg1|arg2|...|argN -: -: 'flags' is a string of single letters. Most of the flags are meaningful only -: to embed.pl; some only to autodoc.pl, and others only to makedef.pl. The -: comments here mostly don't include how Devel::PPPort or diag.t use them: -: All the possible flags and their meanings are given below. +: flags|return_type|name|arg1|arg2|...|argN ( assert(...) )* : -: A function taking no parameters will have no 'arg' elements. : A line may be continued onto the next by ending it with a backslash. : Leading and trailing whitespace will be ignored in each component. : -: Most entries here have a macro created with the entry name. This presents -: name space collision potentials which haven't been well thought out, but are -: now documented here. In practice this has rarely been an issue. At least, -: with a macro, the XS author can #undef it, unlike a function. -: -: The default without flags is to declare a function for internal perl-core use -: only. The short name is visible only when the PERL_CORE symbol is defined. -: On some platforms all non-static functions are currently externally visible. -: Because of this, and also for programs that embed perl, most non-static -: functions should have the 'p' flag to avoid namespace clashes. -: -: There are several advantages to using a macro instead of the full Perl_foo or -: S_foo form: it hides the need to know if the called function requires a -: thread context parameter or not, and the code using it is more readable -: because of fewer parameters being visible. And if there is some bug in it -: that gets fixed in a later release, ppport.h can be changed to automatically -: backport the fixed version to modules. The only disadvantage khw can think -: of is the namespace pollution one. +: 'name' is the name of the function, macro, typedef, etc. It returns values +: of type 'return_type'. Use 'void' if there is no return value. : -: WARNING: Any macro created in a header file is visible to XS code, unless -: care is taken to wrap it within C preprocessor guards like the following +: 'flags' is a string of single letters. Most of the flags are meaningful only +: to embed.pl; some only to autodoc.pl, and others only to makedef.pl. The +: comments here mostly don't include how Devel::PPPort or diag.t use them: +: All the possible flags and their meanings are given in comments below. : -: #if defined(PERL_CORE) -: ... -: #endif +: The 'argN' components denote the arguments, in order, that the macro or +: function requires to be passed to it when calling it. These do not appear on +: entries for other types of elements, such as typedefs, nor when the function +: or macro doesn't have any arguments. Each is usually of the form +: +: arg-type arg-name +: +: but with lots of possible added attributes and special cases, as described +: below. The attributes may come anywhere in the component. But they function +: as reserved keywords. For example 'NZ' is an attribute, and hence no +: argument may be named 'NZ. +: +: In threaded and embedded uses of perl, operations need to know which thread +: or which embedded instance to operate on. This is often invisible to the +: operation, made possible by passing the context information to it in a +: parameter named 'aTHX', which transparently is passed on through potentially +: multiple layers to lower level code that does know about it. When the perl +: interpreter is built to not need context, it would be wasteful to have to +: call functions with an extra meaningless parameter, so it is omitted for +: those builds. The entries in this file do not show it; it is automagically +: added when needed. +: +: An element taking no parameters or just an implicit 'aTHX' parameter will +: contain no 'arg' components. Currently arguments that are function pointers +: are unlikely to be parsed properly here (patches welcome!); you can work +: around this by creating a typedef for the function pointer in an appropriate +: header file and use that here. +: +: The final component in an entry is an optional list of asserts. It is used +: to customize the generated PERL_ARGS_ASSERT macro. See AUTOMATIC PARAMETER +: SANITY CHECKING below +: +: In practice, every element here will have at least one flag. But without any +: flags, the default would be to create an entry in proto.h declaring 'name' as +: a function returning 'return_type' with arguments aTHX, 'arg1', ..., 'argN', +: with 'aTHX' omitted on builds that don't need it. When present, it is +: asserted to be non-NULL. The function would be visible to only other files +: in the perl core, unless the system doesn't allow visibility restrictions. : : A common pattern is to use defines like 'PERL_IN_FILE_C' (with FILE_C being : appropriately replaced with the real filename). Most, if not all, of the @@ -85,82 +129,217 @@ : file they are intended for, and the generated PERL_ARGS_ macros will only : be available to inline functions in the appropriate context. : -: From time to time it may be necessary to change or expand which files can -: see a function, therefore we prefer the '#if defined()' form of condition -: instead of the '#ifdef' form as the latter only works with one symbol and -: the former can be combined with more than one. It is also why you may see -: functions with an 's' or 'i' export type grouped together into a single -: conditional block separate from most of the other functions from the same -: file with 'p' in them. -: -: The 'A' flag is used to make a function and its short name visible everywhere -: on all platforms. This should be used to make it part of Perl's API -: contract with XS developers. The documentation for these is usually -: placed in perlapi. If no documentation exists, that fact is also -: noted in perlapi. -: -: The 'C' flag is used instead for functions and their short names that need to -: be accessible everywhere, typically because they are called from a -: publicly available macro or inline function, but they are not for -: public use by themselves. The documentation for these is placed in -: perlintern. If no documentation exists, that fact is also noted in -: perlintern. +: The 'A' flag is used to make an element visible everywhere on all platforms. +: This flag should be used to make it part of Perl's API contract with +: XS developers. The documentation for these is usually placed in +: perlapi. If no documentation exists, that fact is also noted in +: perlapi. +: +: Functions require one of the /[iIpS]/ flags to give callers a name to +: use that won't possibly collide with their own +: +: The 'C' flag is used instead for elements that need to be accessible +: everywhere, typically because they are called from a publicly +: available macro or inline function, but they are not for public use +: by themselves. The documentation for these is placed in perlintern. +: If no documentation exists, that fact is also noted in perlintern. : -: These really need the 'p' flag to avoid name space collisions. +: Use the 'X' flag instead to suppress the short name for functions +: outside the core +: +: Functions require one of the /[iIpS]/ flags to give callers a name to +: use that won't possibly collide with their own : : Some of these have been constructed so that the wrapper macro names : begin with an underscore to lessen the chances of a name collision. -: However, this is contrary to the C standard, and those should be -: changed. +: However, this is contrary to the C standard, many of those have been +: changed, and the remainder should be. +: +: The 'X' flag is like the 'C' flag in that the elements it marks need to be +: accessible everywhere. But they must be used with their full +: 'Perl_' forms by code that isn't part of core. (That means the 'p' +: flag must necessarily also be present.) Adding the 'E' flag allows +: the short name to also be used by code that is part of a PERL_EXT +: extension. Necessarily, this flag is only applicable to functions +: +: This flag can be used for functions that are called from a +: public macro, the name of which isn't derived from the function name. +: You'll have to write the macro yourself, and from within it, refer to +: the function in its full 'Perl_' form with any necessary thread +: context parameter. +: +: The 'E' flag is used instead for elements that are supposed to be used only +: in the core, plus extensions compiled with the PERL_EXT symbol +: defined. Again, on some platforms, functions marked with this will +: be visible everywhere, so one of the /[iIpS]/ flags is generally +: needed. Also note that an XS writer can always cheat and pretend to +: be an extension by #defining PERL_EXT. +: +: AUTOMATIC SORTING and FORMATTING of this file +: +: Don't spend any time trying to get your changes to this file to look nice, +: or, for example, for the conditionals to be in order of importance. Any +: changes you make here will be resorted and reformatted (by +: regen/tidy_embed.pl) according to its current rules. Each entry's flags +: will be sorted asciibetically. (This all can cause hassles if the rules +: change between when you make changes here and when you rebase.) +: +: AUTOMATIC PARAMETER SANITY CHECKING +: +: For each function entry in this file, regen/embed.pl, generates a macro +: that performs parameter sanity validation. If the function is named +: 'foo()', the generated macro will be named 'PERL_ARGS_ASSERT_FOO'. You +: should place a call to that macro in foo() before any other code. It will +: automatically expand to whatever checking is currently generated for 'foo' +: (often none). These are mostly in the form of assert() calls, so they +: are only activated for DEBUGGING builds. But for non-DEBUGGING builds, +: pointer parameters that must not point to NULL have a compiler directive +: that means the same as GCC and Clang's '__attribute__nonnull__' generated +: for them for compilers that we know understand it. +: +: A porting test enforces that an ARGS_ASSERT macro has been included in all +: new functions added to this file. Each call should be at the top of your +: function so that the sanity checks have passed before anything tries to use +: an argument. +: +: The contents of ARGS_ASSERT are determined by +: 1) constraints you give in this file for an argument. Historically, +: each such constraint has been positioned between the '|' that marks +: the beginning of a parameter definition, and the the definition +: itself, like +: |NN const char * const name +: But it can come anywhere in the definition, and some prefer it to +: come at the end, as it modifies the argument. +: |const char * const name NN +: 2) the internal logic used by code that reads this file. +: 3) explicit asserts that you add in this file. +: +: Sections below give more details of each item. For readability, +: constraints are split into two sections, one for pointer parameters, and +: one for the rest. +: +: *** Pointer Parameter Constraints +: +: Every pointer parameter must have a constraint; one of the following: +: +: NN means the called function is expecting this pointer parameter to be +: non-NULL, and likely is not equipped to handle it being NULL. +: NULLOK means the called function definitely can handle this parameter +: being NULL. The reason you need to specify this at all is to tell +: future maintainers that you have considered the question about the +: parameter, and you have determined that this is the answer. +: SPTR means that not only must this pointer parameter be non-NULL, it +: points to a position in a character string, which the called +: function is not to look behind. If a parameter is marked with this +: constraint, another parameter to the function must be marked with +: one of the constraints below in this list. +: MPTR means that not only must this pointer parameter be non-NULL, it +: points to a position somewhere in the middle of a character string. +: If a parameter is marked with this constraint, another parameter to +: the function must be marked with SPTR and/or one of the EPTR +: constraints (described just below). +: EPTRge means that not only must this pointer parameter be non-NULL, it +: points to the position exactly one byte beyond the final byte of +: the string that a corresponding SPTR began and/or MPTR points to +: the middle of. There must be a SPTR and/or MPTR constraint on +: another parameter to the called function. That function is not to +: look at the byte in this position or any higher ones. 'ge' means +: that this value may be equal to the corresponding SPTR or MPTR. +: When this is true, it indicates the string is empty past the SPTR +: or MPTR, and the called function must be prepared to handle this +: case by not dereferencing this parameter without first checking it +: is valid. +: EPTRgt is like EPTRge, but the called function need not be prepared to +: handle the case of an empty string; the value of this pointer must +: be strictly greater than the corresponding MPTR or SPTR. +: EPTRtermNUL means that the string delimitted by it and its corresponding +: SPTR must be NUL-terminated. This parameter points to that +: terminating NUL character. That means that when the string looks +: empty, it really contains a single NUL. +: +: To summarize, one of: +: SPTR <= MPTR < EPTRgt +: SPTR <= MPTR <= EPTRge +: SPTR <= MPTR <= EPTR && *EPTR == '\0' +: In each equation all three or any two of the constraints must be present. +: +: When only two constraints are present and one of them is an EPTR form, the +: difference between your choosing to use SPTR or MPTR for the other one +: becomes somewhat fuzzy; the generated assertion will be the same whichever +: constraint is used. You should choose the one that makes the most sense +: for the semantics of the parameter. For example, there are currently some +: functions with parameters named 'curpos', and no SPTR parameter exists. +: The name of the parameter clearly indicates it isn't necessarily the +: starting position of the string, so using MPTR as the constraint makes the +: most sense. +: +: The parameters for the function can be in any order, except if a function +: has multiple different character strings, all the parameters for the first +: string must be positioned in the function call before any of the parameters +: for the second, and so forth. (This accommodates the very few existing +: functions that have multiple strings passed to them, without needing to +: create a more general mechanism, like possibly SPTR1..EPTR1, SPTR2..EPTR2.) +: +: *** Non-pointer Parameter Constraints +: +: Only a single constraint is currently available to you to use; it is for +: parameters that are some sort of integer +: +: NZ means the called function is expecting this parameter to be +: non-zero, and is not equipped to handle it being 0. +: +: *** Automatically generated checks +: +: regen/embed.pl may automatically add further checking for any argument as +: it deems desirable. You can disable this by specifying 'NOCHECK' for the +: parameter +: +: Currently this further checking is just for pointer parameters that point +: to AVs, CVs or HVs. The check is that the SV being pointed to is of the +: intended type, by inspecting its SvTYPE(). For some functions this check +: may be inappropriate, as in rare cases the arguments passed may not be of +: the correct type. As already mentioned, NOCHECK suppresses this check. +: +: *** Your custom checks +: +: You can specify your own checking beyond these by adding any number of +: assert() calls to any given entry after its final argument. Whatever you +: specify will be added to the ARGS_ASSERT macro for the entry in the order +: you've specified, and after all the assertions that already have been +: described in this section. When adding yours, weigh that doing it here +: will make it less visible to a maintainer than keeping it in the function +: it applies to : -: The 'E' flag is used instead for a function and its short name that is -: supposed to be used only in the core plus extensions compiled with -: the PERL_EXT symbol defined. Again, on some platforms, the function -: will be visible everywhere, so one of the 'p' or 'S' flags is -: generally needed. Also note that an XS writer can always cheat and -: pretend to be an extension by #defining PERL_EXT. -: -: The 'X' flag is similar to the 'C' flag in that the function (whose entry -: better have the 'p' flag) is accessible everywhere on all platforms. -: However the short name macro that normally gets generated is -: suppressed outside the core. (Except it is also visible in PERL_EXT -: extensions if the 'E' flag is also specified.) This flag is used for -: functions that are called from a public macro, the name of which -: isn't derived from the function name. You'll have to write the macro -: yourself, and from within it, refer to the function in its full -: 'Perl_' form with any necessary thread context parameter. -: -: Just below is a description of the relevant parts of the automatic -: documentation generation system which heavily involves this file. Below that -: is a description of all the flags used in this file. +: AUTOMATIC DOCUMENTATION GENERATION : : Scattered around the perl source are lines of the form: : : =for apidoc name ... +: =for apidoc_flag name ... : =for apidoc_item name ... : =for apidoc_defn name ... : -: The purpose of these lines is to furnish documentation for functions and -: macros. The lines tend to be placed near the source for the item they +: The purpose of these lines is to furnish documentation for functions, +: macros, etc. The lines tend to be placed near the source for the item they : describe. autodoc.pl is run as part of the standard build process to : extract this documentation and build either perlapi.pod (from the elements : that are flagged as A in this file), or perlintern.pod (from the other : elements. : -: Functions need to be specified in this file, but macros may not necessarily -: be. The information in this file is sufficient to generate a usage line for -: the element to be documented; otherwise that information needs to be -: specified in the apidoc-ish lines. -: -: 'apidoc_defn' was added to supplement, for macros, the information in this -: file. It is designed to be placed at the point of definition of the macro -: it is for, so that the information can easily be checked for correctness, -: and you know at a glance that the macro actually has documentation. It -: doesn't by itself create any documentation; instead the other apidoc lines -: pull in information specified by these lines. Many of the lines in this -: file for macros that don't also have the 'p' flag (described below) could be -: pulled out of here and replaced by these lines throughout the source. It is -: a goal to do that as convenience dictates. +: Functions need to be specified in this file, but macros and other types of +: elements may not necessarily be. The information in this file is sufficient +: to generate a usage line for the element to be documented; otherwise that +: information needs to be specified in the apidoc-ish lines. +: +: 'apidoc_defn' was added to supplement, for non-functions, the information in +: this file. It is designed to be placed at the point of definition of the +: element it is for, so that the information can easily be checked for +: correctness, and you know at a glance that the element actually has +: documentation. It doesn't by itself create any documentation; instead the +: other apidoc lines pull in information specified by these lines. Many of the +: lines in this file for macros that don't also have the 'p' flag (described +: below) could be pulled out of here and replaced by these lines throughout the +: source. It is a goal to do that as convenience dictates. : : The other apidoc lines either have the usage data as part of the line, or : pull in the data from this file or apidoc_defn lines. @@ -173,6 +352,25 @@ : listed as 'name' on each is part of the group whose head entry is the one : specified by 'name' on the apidoc line. : +: Many functions and macros take a flags parameter in which 1 bits in various +: positions are OR'ed together. Each position has a name. You should give +: the names of each bit that the function understands by using +: +: =for apidoc_flag-name1 +: =for apidoc_flag-name2 +: ... +: +: These are to be placed, intermixed in any order, with any 'apidoc_item' +: statements just after the plain head '=for apidoc' line. If the function is +: public, but some of the flags are not, you can say, for example, +: +: =for apidoc_flag e|PERL_SCAN_SILENT_NON_PORTABLE +: +: where the 'e' could be any of the visibility flags listed at the top of this +: file. (Note that the term 'flag' is overloaded here. The function has a +: flags parameter, and the entry describing it here has a flags field to aid in +: that description.) +: : After the block of apidoc-like statements, is the text that is the : documentation, ending with the next =cut or '=for apidoc foo' lines. : @@ -219,11 +417,13 @@ : : =for apidoc flags|return_type|name|arg1|arg2|...|argN : =for apidoc_item flags|return_type|name|arg1|arg2|...|argN +: =for apidoc_flag name +: =for apidoc_flag flags|name : =for apidoc_defn flags|return_type|name|arg1|arg2|...|argN : : The 'name' in any such line must not be the same as any in this file (i.e., : no redundant definitions), and one of the flags on the apidoc lines must be -: 'm' or 'y', indicating it is not a function. +: 'm', 'v', 'y', or '@', indicating it is not a function. : : All but the name field of an apidoc_item line are optional, and if empty, : inherits from a corresponding apidoc_defn line, if one exists, or the @@ -247,18 +447,20 @@ : like 'int' or 'char', and 'cast' by perhaps 'struct foo'. : : The complete list of conventions is: -: type the argument names a type -: cast the argument names a type which the macro casts to -: SP the argument is the stack pointer, SP -: block the argument is a C brace-enclosed block -: number the argument is a C numeric constant, like 3 -: token the argument is a generic C preprocessor token, like abc -: "string" the argument is a literal C double-quoted string; what's important -: here are the quotes; for clarity, you can say whatever you want -: inside them +: block the argument is a C brace-enclosed block +: cast the argument names a type which the macro casts to +: const_expr the argument is an expression whose result is known at compile +: time +: number the argument is a C numeric constant, like 3 +: SP the argument is the stack pointer, SP +: "string" the argument is a literal C double-quoted string; what's important +: here are the quotes; for clarity, you can say whatever you want +: inside them +: token the argument is a generic C preprocessor token, like abc +: type the argument names a type : : Unlike other arguments, none of these is of the form 'int name'. There is no -: name. +: 'name'. : : If any argument or return value is not one of the above, and isn't legal C : language, the entry still can be specified, using the 'u' flag. @@ -275,18 +477,20 @@ : : porting/diag.t checks some things for consistency based on this file. : +: FLAGS REFERENCE +: : The remainder of these introductory comments detail all the possible flags: : : 'A' Both long and short names are accessible fully everywhere (usually -: part of the public API). If the function is not part of the public -: API, instead use 'C', 'E', or 'X'. +: part of the public API). If this element is a function, this requires +: one of /[iIpS]/ flags. If the element is not part of the public API, +: instead use 'C', 'E', or 'X'. : : * adds entry to the list of symbols available on all platforms unless : 'e' or 'm' are also specified; : * any doc entry goes in perlapi.pod rather than perlintern.pod. If : there isn't a doc entry, autodoc.pl lists this in perlapi as -: existing and being undocumented; unless 'x' is also specified, in -: which case it simply isn't listed. +: existing and being undocumented. : * makes the short name defined for everywhere, not just for PERL_CORE : or PERL_EXT : @@ -330,26 +534,33 @@ : * create PERL_ARGS_ASSERT_foo; : * add embed.h entry (unless overridden by the 'M' or 'o' flags) : -: 'C' Intended for core use only. This indicates to XS writers that they -: shouldn't be using this function. Devel::PPPort informs them of this, -: for example. Some functions have to be accessible everywhere even if -: they are not intended for public use. An example is helper functions -: that are called from inline ones that are publicly available. +: 'C' Intended for core use only. XS writers may not even know they exist, +: since they don't get documented in perlapi. But should they try +: to use them anyway, Devel::PPPort informs them that this is a mistake. +: Some functions have to be accessible everywhere even if they are not +: intended for public use. An example is helper functions that are +: called from inline ones that are publicly available. Requires one of +: the /[iIpS]/ flags if the element is a function. : : * add entry to the list of symbols available on all platforms unless e : or m are also specified; : * any doc entry goes in perlintern.pod rather than perlapi.pod. If : there isn't a doc entry, autodoc.pl lists this in perlintern as : existing and being undocumented -: * makes the short name defined for everywhere, not just for PERL_CORE -: or PERL_EXT +: * makes the function's short name defined for everywhere, not just for +: PERL_CORE or PERL_EXT +: +: 'D' The element is deprecated. : -: 'D' Function is deprecated: +: (You should add a comment to the source when adding this flag +: indicating what release it is first being deprecated in. This will +: prevent having to dig up this information when deciding if enough +: releases have passed to actually remove it.) : : proto.h: add __attribute__deprecated__ : autodoc.pl adds a note to this effect in the doc entry : -: 'd' Function has documentation (somewhere) in the source: +: 'd' Element has documentation (somewhere) in the source: : : Enables 'no docs for foo" warning in autodoc.pl if the documentation : isn't found. @@ -360,7 +571,7 @@ : into "#if defined(PERL_CORE) || defined(PERL_EXT)" : : To be usable from dynamically loaded extensions, either: -: 1) it must be static to its containing file ('i' or 'S' flag); or +: 1) it must be static to its containing file (/[iIS]/ flags); or : 2) be combined with the 'X' flag. : : 'e' Not exported @@ -383,22 +594,6 @@ : flag even on a format function is if the format would generate error: : format string argument is not a string type : -: 'G' Suppress empty PERL_ARGS_ASSERT_foo macro. Normally such a macro is -: generated for all entries for functions 'foo' in this file. If there -: is a pointer argument to 'foo', it needs to be declared in this file -: as either NN or NULLOK, and the function definition must call its -: corresponding PERL_ARGS_ASSERT_foo macro (a porting test ensures this) -: which asserts at runtime (under DEBUGGING builds) that NN arguments -: are not NULL. If there aren't NN arguments, use of this macro is -: optional. Rarely, a function will define its own PERL_ARGS_ASSERT_foo -: macro, and in those cases, adding this flag to its entry in this file -: will suppress the normal one. It is not possible to suppress the -: generated macro if it isn't optional, that is, if there is at least -: one NN argument. -: -: proto.h: PERL_ARGS_ASSERT macro is not defined unless the function -: has NN arguments -: : 'h' Hide any documentation that would normally go into perlapi or : perlintern. This is typically used when the documentation is actually : in another pod. If you don't use the 'h', that documentation is @@ -439,22 +634,41 @@ : proto.h: function is declared as PERL_STATIC_FORCE_INLINE and : __attribute__always_inline__ is added : -: 'm' Implemented as a macro; there is no function associated with this -: name. There is no long S_ name. -: -: However, you may #define the macro with a long name like 'Perl_foo', -: and specify the 'p' flag. This will cause an embed.h entry to be -: created that #defines 'foo' as 'Perl_foo'. This can be used to make -: any macro have a long name, perhaps to avoid name collisions. If -: instead you define the macro as 'PERL_FOO' (all uppercase), the -: embed.h entry will use all uppercase. Without the T flag the behavior -: is subject to change when both 'm' and 'p are specified. +: 'm' The implementation is a macro. There is no long "S_" name form +: created for it. However, if you also specify the 'p' flag, a long +: name Perl_" form is automatically created. Except when the macro +: is visible only to core and extensions, the 'Perl_' form will be an +: actual function. This allows the XS writer to simply #undef the short +: name and use the long form if there is a namespace clash. +: +: The implication of this is that we can swap implementations at will, +: macro-to-function or function-to-macro, without any source code +: changes needed. That isn't advisable for changing an externally +: visible function into a macro because someone might be taking a +: function pointer of it, that will suddenly break. It also doesn't +: work for fancy macros that use the C preprocessor language for things, +: like the '#' and '##' commands to it, or expanding a single argument +: to a list, such as 'STR_WITH_LEN' does. And the behavior isn't +: precisely synonymous if the macro evaluates an argument more than +: once, and is called with that argument being an expression with side +: effects. +: +: The default visibility of macros created before 5.43 is visible +: everywhere, so the visibility flags are ignored. Starting in that +: release, the default visibility of newly created macros is core-only, +: so the visibility flags do have effect. To cause a pre-5.43 symbol +: to be affected by a visibility flag, remove the symbol from its +: override list in regen/embed.pl. : : suppress proto.h entry (actually, not suppressed, but commented out) : suppress entry in the list of exported symbols available on all : platforms : suppress embed.h entry (when no 'p' flag), as the implementation : should furnish the macro +: add long name Perl_ entry (when 'p' flag). This may be a function in +: long_names.c, and/or an entry in embed.h +: #undef this symbol in embed.h as needed to match the specified +: visibility. : : 'M' The implementation is furnishing its own macro instead of relying on : the automatically generated short name macro (which simply expands to @@ -487,9 +701,11 @@ : : 'O' Has a perl_ compatibility macro. : -: The really OLD name for API funcs. +: The really OLD name for API funcs. These now also require the 'p' +: flag so as to generate a modern name. Obviously no new entries +: should get this flag. : -: autodoc.pl adds a note that the perl_ form of this function is +: autodoc.pl adds a note that the 'perl_' form of this function is : deprecated. : : 'o' Has no Perl_foo or S_foo compatibility macro: @@ -544,7 +760,7 @@ : 'S' Static function: function in source code has a S_ prefix: : : proto.h: function is declared as S_foo rather than foo, -: STATIC is added to declaration; +: static is added to declaration; : embed.h: "#define foo S_foo" entries added : : 's' Static function, but function in source code has a Perl_ prefix: @@ -553,7 +769,7 @@ : have been moved to a header file and declared static. : : proto.h: function is declared as Perl_foo rather than foo -: STATIC is added to declaration; +: static is added to declaration; : embed.h: "#define foo Perl_foo" entries added : : 'T' Has no implicit interpreter/thread context argument: @@ -578,11 +794,12 @@ : : 'U' autodoc.pl will not output a usage example : -: 'v' Guard the macro by !MULTIPLICITY || PERL_CORE if it uses __VA_ARGS__. -: This flag exists for backward-compatibility to ensure that code does -: not break when calling older functions without an aTHX in scope. It -: should not be added to newly-added functions as they will have no such -: compatibility issues. +: 'v' The element is some sort of value that isn't any of the other types in +: this file. For example, it could be an enumeration constant; that is, +: it is one of the members of the list of constants a variable declared +: to be a particular enum can have. These are always visible to XS code +: unless guarded by preprocessor directives, Also implies 'n'. + : : 'W' Add a comma_pDEPTH argument to function prototypes, and a comma_aDEPTH : argument to the function calls. This means that under DEBUGGING a @@ -602,11 +819,17 @@ : : 'x' Experimental, may change: : -: Any doc entry is marked that it may change. An undocumented -: experimental function is listed in perlintern rather than perlapi, -: even if it is allegedly API. +: Any doc entry is marked that this element may change. +: +: 'y' Typedef. The element names a type rather than being a function or +: macro. These are always visible to XS code unless guarded by +: preprocessor directives, +: +: '@' The element names an array rather than being a macro or function. +: These are always visible to XS code unless guarded by preprocessor +: directives, : -: 'y' Typedef. The element names a type rather than being a macro +: autodoc.pl automatically suppresses any usage information. : : ';' autodoc.pl adds a terminating semi-colon to the usage example in the : documentation. @@ -619,26 +842,6 @@ : indicate that it does not have enough information to generate a : proper test case. : -: In this file, pointer parameters that must not be passed NULLs should be -: prefixed with NN. -: -: And, pointer parameters that may be NULL should be prefixed with NULLOK. -: This has no effect on output yet. It's a notation for the maintainers to -: know "I have defined whether NULL is OK or not" rather than having neither -: NULL or NULLOK, which is ambiguous. -: -: Pointer parameters that point to AVs, CVs or HVs will generate additional -: checks in the arguments assertion macro, that check on entry to the -: function that the SV being pointed to is of the intended type, by -: inspecting its SvTYPE(). For some functions this check may be inappropriate -: as in rare cases the arguments passed may not be of the correct type. To -: skip checking on an argument type, prefix its type with NOCHECK. -: -: Numeric arguments may also be prefixed with NZ, which will cause the -: appropriate asserts to be generated to validate that this is the case. -: -: Flags should be sorted asciibetically. -: : Please keep the next line *BLANK* pr |void |abort_execution|NULLOK SV *msg_sv \ @@ -663,6 +866,10 @@ Adp |SV * |amagic_deref_call \ p |bool |amagic_is_enabled \ |int method +CTdp |void |api_version_assert \ + |size_t interp_size \ + |NULLOK void *v_my_perl \ + |NN const char *api_version ETXip |void |append_utf8_from_native_byte \ |const U8 byte \ |NN U8 **dest @@ -678,6 +885,7 @@ Apx |void |apply_attrs_string \ Adp |OP * |apply_builtin_cv_attributes \ |NN CV *cv \ |NULLOK OP *attrlist +CTp |void |atfork_child CTp |void |atfork_lock CTp |void |atfork_unlock Cop |SV ** |av_arylen_p |NN AV *av @@ -708,6 +916,7 @@ ARdp |SV ** |av_fetch |NN AV *av \ CRdip |SV ** |av_fetch_simple|NN AV *av \ |SSize_t key \ |I32 lval +CRip |SSize_t|AvFILL_ |NN AV *av Adp |void |av_fill |NN AV *av \ |SSize_t fill Cop |IV * |av_iter_p |NN AV *av @@ -715,7 +924,8 @@ ARdp |SSize_t|av_len |NN AV *av ARdp |AV * |av_make |SSize_t size \ |NN SV **strp CRdip |AV * |av_new_alloc |SSize_t size \ - |bool zeroflag + |bool zeroflag \ + assert(size > 0) p |SV * |av_nonelem |NN AV *av \ |SSize_t ix Adp |SV * |av_pop |NN AV *av @@ -760,7 +970,7 @@ p |OP * |build_infix_plugin \ |NN OP *lhs \ |NN OP *rhs \ |NN void *tokendata -EXp |const char *|_byte_dump_string \ +EXp |const char *|byte_dump_string_ \ |NULLOK const U8 * const start \ |const STRLEN len \ |const bool format @@ -829,10 +1039,10 @@ Adp |OP * |ck_entersub_args_proto_or_lis CPop |bool |ckwarn |U32 w CPop |bool |ckwarn_d |U32 w -Adfpv |void |ck_warner |U32 err \ +Adfp |void |ck_warner |U32 err \ |NN const char *pat \ |... -Adfpv |void |ck_warner_d |U32 err \ +Adfp |void |ck_warner_d |U32 err \ |NN const char *pat \ |... @@ -856,10 +1066,18 @@ Rp |OP * |cmpchain_start |I32 type \ |NULLOK OP *right ERTXp |const char *|cntrl_to_mnemonic \ |const U8 c +Adp |void |cop_disable_warning \ + |NN COP *cop \ + |int warn_bit +Adp |void |cop_enable_warning \ + |NN COP *cop \ + |int warn_bit Adpx |const char *|cop_fetch_label \ |NN COP * const cop \ |NULLOK STRLEN *len \ |NULLOK U32 *flags +Adp |bool |cop_has_warning|NN const COP *cop \ + |int warn_bit : Only used in op.c and the perl compiler Adpx |void |cop_store_label|NN COP * const cop \ |NN const char *label \ @@ -880,9 +1098,9 @@ px |void |create_eval_scope \ |NN SV **sp \ |U32 flags : croak()'s first parm can be NULL. Otherwise, mod_perl breaks. -Adfprv |void |croak |NULLOK const char *pat \ +AMdfpr |void |croak |NULLOK const char *pat \ |... -Tfprv |void |croak_caller |NULLOK const char *pat \ +Tfpr |void |croak_caller |NULLOK const char *pat \ |... CTrs |void |croak_memory_wrap Tpr |void |croak_no_mem @@ -899,8 +1117,8 @@ CTp |Signal_t|csighandler3 |int sig \ |NULLOK Siginfo_t *info \ |NULLOK void *uap ATdmp |bool |c9strict_utf8_to_uv \ - |NN const U8 * const s \ - |NN const U8 * const e \ + |SPTR const U8 * const s \ + |EPTRge const U8 * const e \ |NN UV *cp_p \ |NULLOK Size_t *advance_p EXp |regexp_engine const *|current_re_engine @@ -959,7 +1177,7 @@ p |void |cv_undef_flags |NN CV *cv \ Cp |void |cx_dump |NN PERL_CONTEXT *cx : Used by CXINC, which appears to be in widespread use CRp |I32 |cxinc -Adfpv |void |deb |NN const char *pat \ +Adfp |void |deb |NN const char *pat \ |... Cdp |I32 |debop |NN const OP *o Cdp |void |debprofdump @@ -971,29 +1189,30 @@ Cp |I32 |debstackptrs p |void |debug_hash_seed|bool via_debug_h Rp |SV * |defelem_target |NN SV *sv \ |NULLOK MAGIC *mg +Adp |void |defer_error |NULLOK SV *err : Used in op.c, perl.c px |void |delete_eval_scope -ATdp |char * |delimcpy |NN char *to \ - |NN const char *to_end \ - |NN const char *from \ - |NN const char *from_end \ +ATdp |char * |delimcpy |SPTR char *to \ + |EPTRge const char *to_end \ + |SPTR const char *from \ + |EPTRge const char *from_end \ |const int delim \ |NN I32 *retlen ETXdp |char * |delimcpy_no_escape \ - |NN char *to \ - |NN const char *to_end \ - |NN const char *from \ - |NN const char *from_end \ + |SPTR char *to \ + |EPTRge const char *to_end \ + |SPTR const char *from \ + |EPTRge const char *from_end \ |const int delim \ |NN I32 *retlen Cp |void |despatch_signals -Adfprv |OP * |die |NULLOK const char *pat \ +AMdfpr |OP * |die |NULLOK const char *pat \ |... Adpr |OP * |die_sv |NN SV *baseex : Used in util.c pr |void |die_unwind |NN SV *msv : FIXME -Mbp |bool |do_aexec |NULLOK SV *really \ +m |bool |do_aexec |NULLOK SV *really \ |NN SV **mark \ |NN SV **sp : Used in pp_sys.c @@ -1049,7 +1268,7 @@ Rp |I32 |do_ncmp |NN SV * const left \ Cp |void |do_op_dump |I32 level \ |NN PerlIO *file \ |NULLOK const OP *o -AMbp |bool |do_open |NN GV *gv \ +Amp |bool |do_open |NN GV *gv \ |NN const char *name \ |I32 len \ |int as_raw \ @@ -1133,7 +1352,7 @@ Adp |void |dump_all p |void |dump_all_perl |bool justperl Adhp |void |dump_eval Adp |void |dump_form |NN const GV *gv -Cfpv |void |dump_indent |I32 level \ +Cfp |void |dump_indent |I32 level \ |NN PerlIO *file \ |NN const char *pat \ |... @@ -1158,18 +1377,19 @@ AOdp |SV * |eval_pv |NN const char *p |I32 croak_on_error AOdp |SSize_t|eval_sv |NN SV *sv \ |I32 flags +CTmpx |Size_t |expected_size |UV size ATdmp |bool |extended_utf8_to_uv \ - |NN const U8 * const s \ - |NN const U8 * const e \ + |SPTR const U8 * const s \ + |EPTRge const U8 * const e \ |NN UV *cp_p \ |NULLOK Size_t *advance_p -Adfpv |void |fatal_warner |U32 err \ +Adfp |void |fatal_warner |U32 err \ |NN const char *pat \ |... Adp |void |fbm_compile |NN SV *sv \ |U32 flags -ARdp |char * |fbm_instr |NN unsigned char *big \ - |NN unsigned char *bigend \ +ARdp |char * |fbm_instr |SPTR unsigned char *big \ + |EPTRge unsigned char *bigend \ |NN SV *littlestr \ |U32 flags Adhp |SV * |filter_add |NULLOK filter_t funcp \ @@ -1191,16 +1411,16 @@ p |char * |find_script |NN const char *s |bool dosearch \ |NULLOK const char * const * const search_ext \ |I32 flags -Adip |I32 |foldEQ |NN const char *a \ - |NN const char *b \ +Adip |I32 |foldEQ |NN const char *s1 \ + |NN const char *s2 \ |I32 len -Cip |I32 |foldEQ_latin1 |NN const char *a \ - |NN const char *b \ +Cip |I32 |foldEQ_latin1 |NN const char *s1 \ + |NN const char *s2 \ |I32 len -Adip |I32 |foldEQ_locale |NN const char *a \ - |NN const char *b \ +Adip |I32 |foldEQ_locale |NN const char *s1 \ + |NN const char *s2 \ |I32 len -Adm |I32 |foldEQ_utf8 |NN const char *s1 \ +Admp |I32 |foldEQ_utf8 |NN const char *s1 \ |NULLOK char **pe1 \ |UV l1 \ |bool u1 \ @@ -1223,18 +1443,18 @@ Adpx |void |forbid_outofblock_ops \ |NN const char *blockname p |void |force_locale_unlock Cp |void |force_out_malformed_utf8_message_ \ - |NN const U8 * const p \ - |NN const U8 * const e \ + |SPTR const U8 * const p \ + |EPTRgt const U8 * const e \ |U32 flags \ |const bool die_here -Adfpv |char * |form |NN const char *pat \ +Adfp |char * |form |NN const char *pat \ |... : Only used in perl.c p |void |free_tied_hv_pool Cp |void |free_tmps ERXp |SV * |get_and_check_backslash_N_name \ - |NN const char *s \ - |NN const char *e \ + |SPTR const char *s \ + |EPTRge const char *e \ |const bool is_utf8 \ |NN const char **error_msg AOdp |AV * |get_av |NN const char *name \ @@ -1265,7 +1485,7 @@ ERXp |SV * |get_prop_definition \ ERTXp |const char * const *|get_prop_values \ |const int table_index : Used by SvRX and SvRXOK -EXopx |REGEXP *|get_re_arg |NULLOK SV *sv +Xopx |REGEXP *|get_re_arg |NULLOK SV *sv AOdp |SV * |get_sv |NN const char *name \ |I32 flags CRipx |MGVTBL *|get_vtbl |int vtbl_id @@ -1274,24 +1494,23 @@ Cp |GP * |gp_ref |NULLOK GP *gp ATdp |bool |grok_atoUV |NN const char *pv \ |NN UV *valptr \ |NULLOK const char **endptr -AMdp |UV |grok_bin |NN const char *start \ +Adip |UV |grok_bin |NN const char *start \ |NN STRLEN *len_p \ |NN I32 *flags \ - |NULLOK NV *result -Cp |UV |grok_bin_oct_hex \ - |NN const char *start \ + |NULLOK NV *approximation +Cp |UV |grok_bin_hex |NN const char * const start \ |NN STRLEN *len_p \ |NN I32 *flags \ - |NULLOK NV *result \ - |const unsigned shift \ - |const U8 lookup_bit \ + |NULLOK NV *approximation \ + |uint_fast8_t base \ + |const U32 lookup_bit \ |const char prefix -AMdp |UV |grok_hex |NN const char *start \ +Adip |UV |grok_hex |NN const char *start \ |NN STRLEN *len_p \ |NN I32 *flags \ - |NULLOK NV *result -Adp |int |grok_infnan |NN const char **sp \ - |NN const char *send + |NULLOK NV *approximation +Adp |int |grok_infnan |SPTR const char **sp \ + |EPTRge const char *send Adp |int |grok_number |NN const char *pv \ |STRLEN len \ |NULLOK UV *valuep @@ -1301,12 +1520,20 @@ Adp |int |grok_number_flags \ |NULLOK UV *valuep \ |U32 flags ARdp |bool |grok_numeric_radix \ - |NN const char **sp \ - |NN const char *send -AMdp |UV |grok_oct |NN const char *start \ + |SPTR const char **sp \ + |EPTRge const char *send +Adip |UV |grok_oct |NN const char *start \ |NN STRLEN *len_p \ |NN I32 *flags \ - |NULLOK NV *result + |NULLOK NV *approximation +Cdp |UV |grok_uint_by_base \ + |NN const char * const start \ + |NN STRLEN *len_p \ + |NN I32 *flags \ + |NULLOK NV *approximation \ + |uint_fast8_t base \ + |const U32 lookup_bit \ + |uint_fast8_t offset Adp |GV * |gv_add_by_type |NULLOK GV *gv \ |svtype type Adp |int |Gv_AMupdate |NN HV *stash \ @@ -1321,12 +1548,12 @@ ARdp |GV * |gv_autoload_pvn|NULLOK NOCHE ARdp |GV * |gv_autoload_sv |NULLOK NOCHECK HV *stash \ |NN SV *namesv \ |U32 flags -AMbdp |GV * |gv_AVadd |NULLOK GV *gv +Admp |GV * |gv_AVadd |NULLOK GV *gv Cp |void |gv_check |NN HV *stash : Used in pp.c and pp_sys.c ARdp |SV * |gv_const_sv |NN GV *gv Adp |void |gv_dump |NULLOK GV *gv -AMbdp |void |gv_efullname3 |NN SV *sv \ +Admp |void |gv_efullname3 |NN SV *sv \ |NN const GV *gv \ |NULLOK const char *prefix Adp |void |gv_efullname4 |NN SV *sv \ @@ -1338,16 +1565,16 @@ Adp |GV * |gv_fetchfile_flags \ |NN const char * const name \ |const STRLEN len \ |const U32 flags -Adm |GV * |gv_fetchmeth |NULLOK NOCHECK HV *stash \ +Admp |GV * |gv_fetchmeth |NULLOK NOCHECK HV *stash \ |NN const char *name \ |STRLEN len \ |I32 level -Adm |GV * |gv_fetchmeth_autoload \ +Admp |GV * |gv_fetchmeth_autoload \ |NULLOK NOCHECK HV *stash \ |NN const char *name \ |STRLEN len \ |I32 level -AMbdp |GV * |gv_fetchmethod |NN NOCHECK HV *stash \ +Admp |GV * |gv_fetchmethod |NN NOCHECK HV *stash \ |NN const char *name Adp |GV * |gv_fetchmethod_autoload \ |NN NOCHECK HV *stash \ @@ -1401,14 +1628,14 @@ Adp |GV * |gv_fetchpv |NN const char *na |const svtype sv_type Adp |GV * |gv_fetchpvn_flags \ - |NN const char *name \ + |NN const char *nambeg \ |STRLEN len \ |I32 flags \ |const svtype sv_type Adp |GV * |gv_fetchsv |NN SV *name \ |I32 flags \ |const svtype sv_type -AMbdp |void |gv_fullname3 |NN SV *sv \ +Admp |void |gv_fullname3 |NN SV *sv \ |NN const GV *gv \ |NULLOK const char *prefix Adp |void |gv_fullname4 |NN SV *sv \ @@ -1417,8 +1644,8 @@ Adp |void |gv_fullname4 |NN SV *sv \ |bool keepmain CRdp |CV * |gv_handler |NULLOK HV *stash \ |I32 id -AMbdp |GV * |gv_HVadd |NULLOK GV *gv -Adm |void |gv_init |NN GV *gv \ +Admp |GV * |gv_HVadd |NULLOK GV *gv +Admp |void |gv_init |NN GV *gv \ |NULLOK HV *stash \ |NN const char *name \ |STRLEN len \ @@ -1436,7 +1663,7 @@ Adp |void |gv_init_sv |NN GV *gv \ |NULLOK HV *stash \ |NN SV *namesv \ |U32 flags -AMbdp |GV * |gv_IOadd |NULLOK GV *gv +Admp |GV * |gv_IOadd |NULLOK GV *gv Adp |void |gv_name_set |NN GV *gv \ |NN const char *name \ |U32 len \ @@ -1452,6 +1679,7 @@ Adp |HV * |gv_stashpvn |NN const char *n |I32 flags Adp |HV * |gv_stashsv |NN SV *sv \ |I32 flags +Admp |GV * |gv_SVadd |NULLOK GV *gv Xdpx |void |gv_try_downgrade \ |NN GV *gv op |struct xpvhv_aux *|hv_auxalloc \ @@ -1463,7 +1691,7 @@ ARdpx |SV * |hv_bucket_ratio|NN HV *hv Adp |void |hv_clear |NULLOK HV *hv Adp |void |hv_clear_placeholders \ |NN HV *hv -Cp |void * |hv_common |NULLOK HV *hv \ +Cp |void * |hv_common |NULLOK NOCHECK HV *hv \ |NULLOK SV *keysv \ |NULLOK const char *key \ |STRLEN klen \ @@ -1471,7 +1699,7 @@ Cp |void * |hv_common |NULLOK HV *hv |int action \ |NULLOK SV *val \ |U32 hash -Cp |void * |hv_common_key_len \ +Cip |void * |hv_common_key_len \ |NULLOK HV *hv \ |NN const char *key \ |I32 klen_i32 \ @@ -1484,11 +1712,11 @@ ARdp |HV * |hv_copy_hints_hv \ Cp |void |hv_delayfree_ent \ |NULLOK HV *notused \ |NULLOK HE *entry -AMbdp |SV * |hv_delete |NULLOK HV *hv \ +Admp |SV * |hv_delete |NULLOK HV *hv \ |NN const char *key \ |I32 klen \ |I32 flags -AMbdp |SV * |hv_delete_ent |NULLOK HV *hv \ +Admp |SV * |hv_delete_ent |NULLOK HV *hv \ |NN SV *keysv \ |I32 flags \ |U32 hash @@ -1504,17 +1732,17 @@ dp |void |hv_ename_delete|NN HV *hv \ |NN const char *name \ |U32 len \ |U32 flags -AMRbdp |bool |hv_exists |NULLOK HV *hv \ +ARdmp |bool |hv_exists |NULLOK HV *hv \ |NN const char *key \ |I32 klen -AMRbdp |bool |hv_exists_ent |NULLOK HV *hv \ +ARdmp |bool |hv_exists_ent |NULLOK HV *hv \ |NN SV *keysv \ |U32 hash -AMbdp |SV ** |hv_fetch |NULLOK HV *hv \ +Admp |SV ** |hv_fetch |NULLOK HV *hv \ |NN const char *key \ |I32 klen \ |I32 lval -AMbdp |HE * |hv_fetch_ent |NULLOK HV *hv \ +Admp |HE * |hv_fetch_ent |NULLOK HV *hv \ |NN SV *keysv \ |I32 lval \ |U32 hash @@ -1525,7 +1753,7 @@ Adp |I32 |hv_iterinit |NN HV *hv ARdp |char * |hv_iterkey |NN HE *entry \ |NN I32 *retlen ARdp |SV * |hv_iterkeysv |NN HE *entry -AMRbdp |HE * |hv_iternext |NN HV *hv +ARdmp |HE * |hv_iternext |NN HV *hv ARdpx |HE * |hv_iternext_flags \ |NN HV *hv \ |I32 flags @@ -1536,7 +1764,7 @@ ARdp |SV * |hv_iterval |NN HV *hv \ |NN HE *entry Adp |void |hv_ksplit |NN HV *hv \ |IV newmax -AMbdp |void |hv_magic |NN HV *hv \ +Admp |void |hv_magic |NN HV *hv \ |NULLOK GV *gv \ |int how Adp |void |hv_name_set |NN HV *hv \ @@ -1559,34 +1787,31 @@ Cdop |void |hv_riter_set |NN HV *hv \ |I32 riter ARdp |SV * |hv_scalar |NN HV *hv -AMbdp |SV ** |hv_store |NULLOK HV *hv \ +Admp |SV ** |hv_store |NULLOK HV *hv \ |NULLOK const char *key \ |I32 klen \ |NULLOK SV *val \ |U32 hash -AMbdp |HE * |hv_store_ent |NULLOK HV *hv \ +Admp |HE * |hv_store_ent |NULLOK HV *hv \ |NULLOK SV *key \ |NULLOK SV *val \ |U32 hash -AMbpx |SV ** |hv_store_flags |NULLOK HV *hv \ +Ampx |SV ** |hv_store_flags |NULLOK HV *hv \ |NULLOK const char *key \ |I32 klen \ |NULLOK SV *val \ |U32 hash \ |int flags -Adm |SV ** |hv_stores |NULLOK HV *hv \ - |"key" \ - |NULLOK SV *val -Adm |void |hv_undef |NULLOK HV *hv +Admp |void |hv_undef |NULLOK HV *hv Xop |void |hv_undef_flags |NULLOK HV *hv \ |U32 flags -APdm |I32 |ibcmp |NN const char *a \ +APdmp |I32 |ibcmp |NN const char *a \ |NN const char *b \ |I32 len -APdm |I32 |ibcmp_locale |NN const char *a \ +APdmp |I32 |ibcmp_locale |NN const char *a \ |NN const char *b \ |I32 len -Adm |I32 |ibcmp_utf8 |NN const char *s1 \ +Admp |I32 |ibcmp_utf8 |NN const char *s1 \ |NULLOK char **pe1 \ |UV l1 \ |bool u1 \ @@ -1618,7 +1843,7 @@ p |void |init_uniprops APRTdmp |char * |instr |NN const char *big \ |NN const char *little Adp |U32 |intro_my -ERXp |Size_t |_inverse_folds |const UV cp \ +ERXp |Size_t |inverse_folds_ |const UV cp \ |NN U32 *first_folds_to \ |NN const U32 **remaining_folds_to : Used in perly.y @@ -1631,12 +1856,12 @@ p |bool |io_close |NN IO *io \ |bool is_explicit \ |bool warn_on_fail ARTdip |Size_t |isC9_STRICT_UTF8_CHAR \ - |NN const U8 * const s0 \ - |NN const U8 * const e -ARTdm |bool |is_c9strict_utf8_string \ + |SPTR const U8 * const s0 \ + |EPTRge const U8 * const e +ARTdmp |bool |is_c9strict_utf8_string \ |NN const U8 *s \ |STRLEN len -ATdm |bool |is_c9strict_utf8_string_loc \ +ATdmp |bool |is_c9strict_utf8_string_loc \ |NN const U8 *s \ |STRLEN len \ |NN const U8 **ep @@ -1658,12 +1883,12 @@ ARdip |bool |is_safe_syscall|NN const ch |NN const char *what \ |NN const char *op_name ARTdip |Size_t |isSTRICT_UTF8_CHAR \ - |NN const U8 * const s0 \ - |NN const U8 * const e -ARTdm |bool |is_strict_utf8_string \ + |SPTR const U8 * const s0 \ + |EPTRge const U8 * const e +ARTdmp |bool |is_strict_utf8_string \ |NN const U8 *s \ |STRLEN len -ATdm |bool |is_strict_utf8_string_loc \ +ATdmp |bool |is_strict_utf8_string_loc \ |NN const U8 *s \ |STRLEN len \ |NN const U8 **ep @@ -1672,34 +1897,34 @@ ATdip |bool |is_strict_utf8_string_locle |STRLEN len \ |NULLOK const U8 **ep \ |NULLOK STRLEN *el -CRp |bool |_is_uni_FOO |const U8 classnum \ +CRp |bool |is_uni_FOO_ |const U8 classnum \ |const UV c -CRp |bool |_is_uni_perl_idcont \ +CRp |bool |is_uni_perl_idcont_ \ |UV c -CRp |bool |_is_uni_perl_idstart \ +CRp |bool |is_uni_perl_idstart_ \ |UV c -ARTdip |Size_t |isUTF8_CHAR |NN const U8 * const s0 \ - |NN const U8 * const e -AMTbdp |STRLEN |is_utf8_char_buf \ - |NN const U8 *buf \ - |NN const U8 *buf_end +ARTdip |Size_t |isUTF8_CHAR |SPTR const U8 * const s0 \ + |EPTRge const U8 * const e +ATdmp |STRLEN |is_utf8_char_buf \ + |SPTR const U8 *buf \ + |EPTRge const U8 *buf_end ARTdip |Size_t |isUTF8_CHAR_flags \ - |NN const U8 * const s0 \ - |NN const U8 * const e \ + |SPTR const U8 * const s0 \ + |EPTRge const U8 * const e \ |const U32 flags CPRTp |STRLEN |is_utf8_char_helper_ \ - |NN const U8 * const s \ - |NN const U8 *e \ + |SPTR const U8 * const s \ + |EPTRgt const U8 *e \ |const U32 flags CPRTp |Size_t |is_utf8_FF_helper_ \ - |NN const U8 * const s0 \ - |NN const U8 * const e \ + |SPTR const U8 * const s0 \ + |EPTRgt const U8 * const e \ |const bool require_partial -ATdm |bool |is_utf8_fixed_width_buf_flags \ +ATdmp |bool |is_utf8_fixed_width_buf_flags \ |NN const U8 * const s \ |STRLEN len \ |const U32 flags -ATdm |bool |is_utf8_fixed_width_buf_loc_flags \ +ATdmp |bool |is_utf8_fixed_width_buf_loc_flags \ |NN const U8 * const s \ |STRLEN len \ |NULLOK const U8 **ep \ @@ -1710,20 +1935,20 @@ ATdip |bool |is_utf8_fixed_width_buf_loc |NULLOK const U8 **ep \ |NULLOK STRLEN *el \ |const U32 flags -CRp |bool |_is_utf8_FOO |const U8 classnum \ - |NN const U8 *p \ - |NN const U8 * const e +CRp |Size_t |is_utf8_FOO_ |const U8 classnum \ + |SPTR const U8 *p \ + |EPTRgt const U8 * const e ARTdip |bool |is_utf8_invariant_string_loc \ |NN const U8 * const s \ |STRLEN len \ |NULLOK const U8 **ep -CRp |bool |_is_utf8_perl_idcont \ - |NN const U8 *p \ - |NN const U8 * const e -CRp |bool |_is_utf8_perl_idstart \ - |NN const U8 *p \ - |NN const U8 * const e -ARTdm |bool |is_utf8_string |NN const U8 *s \ +CRp |Size_t |is_utf8_perl_idcont_ \ + |SPTR const U8 *p \ + |EPTRgt const U8 * const e +CRp |Size_t |is_utf8_perl_idstart_ \ + |SPTR const U8 *p \ + |EPTRgt const U8 * const e +ARTdmp |bool |is_utf8_string |NN const U8 *s \ |STRLEN len ARTdip |bool |is_utf8_string_flags \ |NN const U8 *s \ @@ -1733,7 +1958,7 @@ ATdmp |bool |is_utf8_string_loc \ |NN const U8 *s \ |const STRLEN len \ |NN const U8 **ep -ATdm |bool |is_utf8_string_loc_flags \ +ATdmp |bool |is_utf8_string_loc_flags \ |NN const U8 *s \ |STRLEN len \ |NN const U8 **ep \ @@ -1749,12 +1974,12 @@ ATdip |bool |is_utf8_string_loclen_flags |NULLOK const U8 **ep \ |NULLOK STRLEN *el \ |const U32 flags -APTdm |bool |is_utf8_valid_partial_char \ - |NN const U8 * const s0 \ - |NN const U8 * const e +APTdmp |bool |is_utf8_valid_partial_char \ + |SPTR const U8 * const s0 \ + |EPTRgt const U8 * const e ARTdip |bool |is_utf8_valid_partial_char_flags \ - |NN const U8 * const s0 \ - |NN const U8 * const e \ + |SPTR const U8 * const s0 \ + |EPTRgt const U8 * const e \ |const U32 flags : Used in perly.y @@ -1803,7 +2028,8 @@ ERXp |HV * |load_charnames |NN SV *char_ |NN const char *context \ |const STRLEN context_len \ |NN const char **error_msg -AFdpv |void |load_module |U32 flags \ +MTbp |void |load_mathoms +AFdp |void |load_module |U32 flags \ |NN SV *name \ |NULLOK SV *ver \ |... @@ -1814,6 +2040,9 @@ CTopr |void |locale_panic |NN const char : Used in perly.y p |OP * |localize |NN OP *o \ |I32 lex +CTp |UV |long_valid_utf8_to_uv \ + |SPTR const U8 * const s \ + |EPTRgt const U8 * const e ARdp |I32 |looks_like_number \ |NN SV * const sv CRTip |unsigned|lsbit_pos32 |U32 word @@ -1867,7 +2096,7 @@ p |int |magic_freeutf8 |NN SV *sv \ p |int |magic_get |NN SV *sv \ |NN MAGIC *mg p |int |magic_getarylen|NN SV *sv \ - |NN const MAGIC *mg + |NN MAGIC *mg p |int |magic_getdebugvar \ |NN SV *sv \ |NN MAGIC *mg @@ -1894,7 +2123,7 @@ p |int |magic_getvec |NN SV *sv \ p |int |magic_killbackrefs \ |NN SV *sv \ |NN MAGIC *mg -Fdopv |SV * |magic_methcall |NN SV *sv \ +Fdp |SV * |magic_methcall |NN SV *sv \ |NN const MAGIC *mg \ |NN SV *meth \ |U32 flags \ @@ -1909,6 +2138,9 @@ p |U32 |magic_regdata_cnt \ p |int |magic_regdatum_get \ |NN SV *sv \ |NN MAGIC *mg +pr |int |magic_regdatum_set \ + |NN SV *sv \ + |NN MAGIC *mg : This is indirectly referenced by globals.c. This is somewhat annoying. p |SV * |magic_scalarpack \ @@ -1982,7 +2214,7 @@ Cp |Stack_off_t *|markstack_grow EXp |int |mbtowc_ |NULLOK const wchar_t *pwc \ |NULLOK const char *s \ |const Size_t len -Adfpv |SV * |mess |NN const char *pat \ +Adfp |SV * |mess |NN const char *pat \ |... Adp |SV * |mess_sv |NN SV *basemsg \ |bool consume @@ -2020,15 +2252,14 @@ p |int |mode_from_discipline \ |STRLEN len : Used in sv.c and hv.c -Cop |void * |more_bodies |const svtype sv_type \ - |const size_t body_size \ - |const size_t arena_size +Cop |void * |more_bodies |const svtype sv_type +Cp |SV * |more_sv Cp |const char *|moreswitches \ |NN const char *s Adp |void |mortal_destructor_sv \ |NN SV *coderef \ |NULLOK SV *args -CRTXip |char * |mortal_getenv |NN const char *str +CRTip |char * |mortal_getenv |NN const char *str Cdp |void |mortal_svfunc_x|SVFUNC_t f \ |NULLOK SV *p Adop |const struct mro_alg *|mro_get_from_name \ @@ -2095,7 +2326,7 @@ Cdp |PerlIO *|my_popen_list |NN const ch Adp |void |my_setenv |NULLOK const char *nam \ |NULLOK const char *val -AMTdfpv |int |my_snprintf |NN char *buffer \ +AMTdfp |int |my_snprintf |NN char *buffer \ |const Size_t len \ |NN const char *format \ |... @@ -2142,7 +2373,7 @@ ARdp |OP * |newASSIGNOP |I32 flags \ |NULLOK OP *left \ |I32 optype \ |NULLOK OP *right -Adm |CV * |newATTRSUB |I32 floor \ +Admp |CV * |newATTRSUB |I32 floor \ |NULLOK OP *o \ |NULLOK OP *proto \ |NULLOK OP *attrs \ @@ -2153,17 +2384,20 @@ Xdp |CV * |newATTRSUB_x |I32 floor \ |NULLOK OP *attrs \ |NULLOK OP *block \ |bool o_is_gv -AMRbdp |AV * |newAV -ARdm |AV * |newAV_alloc_x |SSize_t size -ARdm |AV * |newAV_alloc_xz |SSize_t size +ARdmp |AV * |newAV +ARdmp |AV * |newAV_alloc_x |SSize_t size +ARdmp |AV * |newAV_alloc_xz |SSize_t size ARdp |AV * |newAVav |NULLOK AV *oav ARdp |AV * |newAVhv |NULLOK HV *ohv -ARdm |AV * |newAV_mortal +ARdmp |AV * |newAV_mortal ARdp |OP * |newAVREF |NN OP *o ARdp |OP * |newBINOP |I32 type \ |I32 flags \ |NULLOK OP *first \ |NULLOK OP *last +dp |OP * |new_block_statement \ + |NN OP *block \ + |NULLOK OP *cont ARdp |OP * |newCONDOP |I32 flags \ |NN OP *first \ |NULLOK OP *trueop \ @@ -2182,7 +2416,7 @@ ARdp |OP * |newCVREF |I32 flags \ ARdpx |OP * |newDEFEROP |I32 flags \ |NN OP *block ARdp |OP * |newDEFSVOP -Cp |void |newFORM |I32 floor \ +Cdp |void |newFORM |I32 floor \ |NULLOK OP *o \ |NULLOK OP *block ARdp |OP * |newFOROP |I32 flags \ @@ -2195,7 +2429,7 @@ ARdp |OP * |newGIVENOP |NN OP *cond \ |PADOFFSET defsv_off : Used in scope.c eopx |GP * |newGP |NN GV * const gv -Adm |GV * |newGVgen |NN const char *pack +Admp |GV * |newGVgen |NN const char *pack ARdp |GV * |newGVgen_flags |NN const char *pack \ |U32 flags ARdp |OP * |newGVOP |I32 type \ @@ -2203,10 +2437,10 @@ ARdp |OP * |newGVOP |I32 type \ |NN GV *gv ARdp |OP * |newGVREF |I32 type \ |NULLOK OP *o -AMRbdp |HV * |newHV -ARdp |HV * |newHVhv |NULLOK HV *hv +ARdmp |HV * |newHV +ARdp |HV * |newHVhv |NULLOK HV *ohv ARdp |OP * |newHVREF |NN OP *o -AMRbdp |IO * |newIO +ARdmp |IO * |newIO ARdp |OP * |newLISTOP |I32 type \ |I32 flags \ |NULLOK OP *first \ @@ -2272,7 +2506,7 @@ ARdp |OP * |newSTATEOP |I32 flags \ |NULLOK OP *o p |CV * |newSTUB |NN GV *gv \ |bool fake -AMbdp |CV * |newSUB |I32 floor \ +Admp |CV * |newSUB |I32 floor \ |NULLOK OP *o \ |NULLOK OP *proto \ |NULLOK OP *block @@ -2295,7 +2529,7 @@ ARdp |OP * |newSVOP |I32 type \ |NN SV *sv ARdp |SV * |newSVpv |NULLOK const char * const s \ |const STRLEN len -ARdfpv |SV * |newSVpvf |NN const char * const pat \ +ARdfp |SV * |newSVpvf |NN const char * const pat \ |... ARdp |SV * |newSVpvn |NULLOK const char * const s \ |const STRLEN len @@ -2311,10 +2545,13 @@ ARdp |SV * |newSVpvz |const STRLEN len ARdp |OP * |newSVREF |NN OP *o Adp |SV * |newSVrv |NN SV * const rv \ |NULLOK const char * const classname -AMRbdp |SV * |newSVsv |NULLOK SV * const old -ARdp |SV * |newSVsv_flags |NULLOK SV * const old \ +ARdmp |SV * |newSVsv |NULLOK SV * const old +ARdip |SV * |newSVsv_flags |NULLOK SV * const old \ |I32 flags -ARdm |SV * |newSVsv_nomg |NULLOK SV * const old +ARdp |SV * |newSVsv_flags_NN \ + |NN SV * const old \ + |I32 flags +ARdmp |SV * |newSVsv_nomg |NULLOK SV * const old ARdp |SV * |newSV_true ARdip |SV * |newSV_type |const svtype type AIRdp |SV * |newSV_type_mortal \ @@ -2366,16 +2603,15 @@ dp |CV * |newXS_len_flags|NULLOK const c : Used in pp_hot.c and pp_sys.c p |PerlIO *|nextargv |NN GV *gv \ |bool nomagicopen -AMPTdp |char * |ninstr |NN const char *big \ - |NN const char *bigend \ - |NN const char *little \ - |NN const char *lend - +AMPTdp |char * |ninstr |SPTR const char *big \ + |EPTRge const char *bigend \ + |SPTR const char *little \ + |EPTRge const char *lend p |void |no_bareword_filehandle \ |NN const char *fhname -Tefprv |void |noperl_die |NN const char *pat \ +Tefpr |void |noperl_die |NN const char *pat \ |... -CGTdp |void |noshutdownhook +CTdp |void |noshutdownhook Adp |int |nothreadhook p |void |notify_parser_that_encoding_changed : Used in perly.y @@ -2389,8 +2625,7 @@ Adp |OP * |op_append_list |I32 optype |NULLOK OP *first \ |NULLOK OP *last Adp |OPclass|op_class |NULLOK const OP *o -: FIXME. Used by Data::Alias -EXp |void |op_clear |NN OP *o +Adp |void |op_clear |NN OP *o Adp |OP * |op_contextualize \ |NN OP *o \ |I32 context @@ -2406,9 +2641,9 @@ Adfp |void |opdump_printf |NN struct Per Adp |OP * |op_force_list |NULLOK OP *o Adp |void |op_free |NULLOK OP *arg Adp |OP * |op_linklist |NN OP *o -Admx |OP * |op_lvalue |NULLOK OP *o \ +Admpx |OP * |op_lvalue |NULLOK OP *o \ |I32 type -Xop |OP * |op_lvalue_flags|NULLOK OP *o \ +Xdop |OP * |op_lvalue_flags|NULLOK OP *o \ |I32 type \ |U32 flags : Used in various files @@ -2428,13 +2663,14 @@ Adp |OP * |op_sibling_splice \ px |OP * |op_unscope |NULLOK OP *o ARdpx |OP * |op_wrap_finally|NN OP *block \ |NN OP *finally +p |void |output_non_portable \ + |const U8 shift : Used in perly.y -p |void |package |NN OP *o -: Used in perly.y -p |void |package_version|NN OP *v +dp |void |package |NN OP *name \ + |NULLOK OP *version Adp |void |packlist |NN SV *cat \ - |NN const char *pat \ - |NN const char *patend \ + |SPTR const char *pat \ + |EPTRtermNUL const char *patend \ |NN SV **beglist \ |NN SV **endlist Adp |PADOFFSET|pad_add_anon |NN CV *func \ @@ -2500,6 +2736,11 @@ Adpx |OP * |parse_barestmt |U32 flags Adpx |OP * |parse_block |U32 flags Adpx |OP * |parse_fullexpr |U32 flags Adpx |OP * |parse_fullstmt |U32 flags +EXdp |char * |parse_ident_msg|SPTR const char *s \ + |EPTRgt const char *end \ + |bool is_utf8 \ + |NULLOK HV **failure_details \ + |U32 flags Adpx |SV * |parse_label |U32 flags Adpx |OP * |parse_listexpr |U32 flags : Only used in scope.c @@ -2560,8 +2801,7 @@ CTp |Signal_t|perly_sighandler \ |NULLOK void *uap \ |bool safe -Adm |const char * const|phase_name \ - |enum perl_phase +Admp |const char *|phase_name|enum perl_phase phase Adp |void |pmop_dump |NULLOK PMOP *pm : Used in perly.y p |OP * |pmruntime |NN OP *o \ @@ -2574,15 +2814,15 @@ Cdp |void |pop_scope Cipx |void |pop_stackinfo : Used in perl.c and toke.c -Fopv |void |populate_isa |NN const char *name \ +Fop |void |populate_isa |NN const char *name \ |STRLEN len \ |... Adhp |REGEXP *|pregcomp |NN SV * const pattern \ |const U32 flags Adhp |I32 |pregexec |NN REGEXP * const prog \ - |NN char *stringarg \ - |NN char *strend \ - |NN char *strbeg \ + |MPTR char *stringarg \ + |EPTRge char *strend \ + |SPTR char *strbeg \ |SSize_t minend \ |NN SV *screamer \ |U32 nosave @@ -2630,9 +2870,7 @@ Adp |char * |pv_uni_display |NN SV *dsv |STRLEN len \ |STRLEN pvlim \ |UV flags -: FIXME - either make it public, or stop exporting it. (Data::Alias uses this) -: Used in gv.c, op.c, toke.c -EXp |void |qerror |NULLOK SV *err +ADdmp |void |qerror |NULLOK SV *err Adp |char * |rcpv_copy |NULLOK char * const pv Adp |char * |rcpv_free |NULLOK char * const pv Aadp |char * |rcpv_new |NULLOK const char * const pv \ @@ -2645,7 +2883,7 @@ Adp |REGEXP *|re_compile |NN SV * const |U32 orig_rx_flags Cp |void |reentrant_free Cp |void |reentrant_init -CFTpv |void * |reentrant_retry|NN const char *f \ +CFTp |void * |reentrant_retry|NN const char *f \ |... Cp |void |reentrant_size @@ -2693,9 +2931,9 @@ Xdp |struct refcounted_he *|refcounted_h |U32 flags Cp |void |regdump |NN const regexp *r Cp |I32 |regexec_flags |NN REGEXP * const rx \ - |NN char *stringarg \ - |NN char *strend \ - |NN char *strbeg \ + |MPTR char *stringarg \ + |EPTRge char *strend \ + |SPTR char *strbeg \ |SSize_t minend \ |NN SV *sv \ |NULLOK void *data \ @@ -2708,28 +2946,28 @@ EXp |SV * |reg_named_buff |NN REGEXP * c |NULLOK SV * const value \ |const U32 flags Cp |SV * |reg_named_buff_all \ - |NN REGEXP * const rx \ + |NN REGEXP * const r \ |const U32 flags Cp |bool |reg_named_buff_exists \ - |NN REGEXP * const rx \ + |NN REGEXP * const r \ |NN SV * const key \ |const U32 flags Cp |SV * |reg_named_buff_fetch \ - |NN REGEXP * const rx \ + |NN REGEXP * const r \ |NN SV * const namesv \ |const U32 flags Cp |SV * |reg_named_buff_firstkey \ - |NN REGEXP * const rx \ + |NN REGEXP * const r \ |const U32 flags EXp |SV * |reg_named_buff_iter \ |NN REGEXP * const rx \ |NULLOK const SV * const lastkey \ |const U32 flags Cp |SV * |reg_named_buff_nextkey \ - |NN REGEXP * const rx \ + |NN REGEXP * const r \ |const U32 flags Cp |SV * |reg_named_buff_scalar \ - |NN REGEXP * const rx \ + |NN REGEXP * const r \ |const U32 flags : FIXME - is anything in re using this now? EXp |void |reg_numbered_buff_fetch \ @@ -2745,7 +2983,7 @@ EXp |void |reg_numbered_buff_fetch_flags |U32 flags : FIXME - is anything in re using this now? EXp |I32 |reg_numbered_buff_length \ - |NN REGEXP * const rx \ + |NN REGEXP * const r \ |NN const SV * const sv \ |const I32 paren : FIXME - is anything in re using this now? @@ -2761,9 +2999,9 @@ EXp |REGEXP *|reg_temp_copy |NULLOK REGE |NN REGEXP *ssv Cp |char * |re_intuit_start|NN REGEXP * const rx \ |NULLOK SV *sv \ - |NN const char * const strbeg \ - |NN char *strpos \ - |NN char *strend \ + |SPTR const char * const strbeg \ + |MPTR char *strpos \ + |EPTRge char *strend \ |const U32 flags \ |NULLOK re_scream_pos_data *data Cp |SV * |re_intuit_string \ @@ -2794,14 +3032,14 @@ p |void |report_wrongway_fh \ AOdp |void |require_pv |NN const char *pv Cop |void |resume_compcv |NN struct suspended_compcv *buffer \ |bool save -Adm |void |resume_compcv_and_save \ +Admp |void |resume_compcv_and_save \ |NN struct suspended_compcv *buffer -Adm |void |resume_compcv_final \ +Admp |void |resume_compcv_final \ |NN struct suspended_compcv *buffer -APTdp |char * |rninstr |NN const char *big \ - |NN const char *bigend \ - |NN const char *little \ - |NN const char *lend +APTdp |char * |rninstr |SPTR const char *big \ + |EPTRge const char *bigend \ + |SPTR const char *little \ + |EPTRge const char *lend p |void |rpeep |NULLOK OP *o Adipx |void |rpp_context |NN SV **mark \ |U8 gimme \ @@ -2888,7 +3126,7 @@ ARTdp |Malloc_t|safesysrealloc|Malloc_t |MEM_SIZE nbytes Cdp |void |save_adelete |NN AV *av \ |SSize_t key -Adm |void |save_aelem |NN AV *av \ +Admp |void |save_aelem |NN AV *av \ |SSize_t idx \ |NN SV **sptr Adp |void |save_aelem_flags \ @@ -2911,10 +3149,10 @@ Cp |void |save_destructor_x \ |DESTRUCTORFUNC_t f \ |NULLOK void *p : Used in SAVEFREOP(), used in op.c, pp_ctl.c -CMbp |void |save_freeop |NULLOK OP *o -CMbp |void |save_freepv |NULLOK char *pv +Cmp |void |save_freeop |NULLOK OP *o +Cmp |void |save_freepv |NULLOK char *pv Cdp |void |save_freercpv |NN char *rcpv -CMbp |void |save_freesv |NULLOK SV *sv +Cmp |void |save_freesv |NULLOK SV *sv Cdp |void |save_generic_pvref \ |NN char **str Cdp |void |save_generic_svref \ @@ -2924,7 +3162,7 @@ Adp |void |save_gp |NN GV *gv \ Adhp |HV * |save_hash |NN GV *gv Cdp |void |save_hdelete |NN HV *hv \ |NN SV *keysv -Adm |void |save_helem |NN HV *hv \ +Admp |void |save_helem |NN HV *hv \ |NN SV *key \ |NN SV **sptr Adp |void |save_helem_flags \ @@ -2940,10 +3178,11 @@ Cp |void |save_I8 |NN I8 *bytep Cp |void |save_int |NN int *intp Adhp |void |save_item |NN SV *item Cp |void |save_iv |NN IV *ivp -CMbp |void |save_mortalizesv \ +Cmp |void |save_mortalizesv \ |NN SV *sv : Used in SAVEFREOP(), used in gv.c, op.c, perl.c, pp_ctl.c, pp_sort.c -CMbdp |void |save_op +Cdmp |void |save_op +Cdp |void |save_padsv |PADOFFSET padix Cdp |void |save_padsv_and_mortalize \ |PADOFFSET off Cp |void |save_pptr |NN char **pptr @@ -2969,7 +3208,7 @@ Cdp |void |save_set_svflags \ Aadp |char * |savesharedpv |NULLOK const char *pv : NULLOK only to suppress a compiler warning -Aadp |char * |savesharedpvn |NULLOK const char * const pv \ +Aadp |char * |savesharedpvn |NN const char * const pv \ |const STRLEN len Cdp |void |save_shared_pvref \ |NN char **str @@ -2988,14 +3227,14 @@ p |OP * |sawparens |NULLOK OP *o : Used in perly.y p |OP * |scalar |NULLOK OP *o : Used in pp_ctl.c -p |OP * |scalarvoid |NN OP *o +p |OP * |scalarvoid |NN OP *arg Adp |NV |scan_bin |NN const char *start \ |STRLEN len \ |NN STRLEN *retlen Adp |NV |scan_hex |NN const char *start \ |STRLEN len \ |NN STRLEN *retlen -Cp |char * |scan_num |NN const char *s \ +Cp |char * |scan_num |NN const char *start \ |NN YYSTYPE *lvalp Adp |NV |scan_oct |NN const char *start \ |STRLEN len \ @@ -3011,15 +3250,15 @@ Adp |const char *|scan_version \ |NN const char *s \ |NN SV *rv \ |bool qv -Adp |char * |scan_vstring |NN const char *s \ - |NN const char * const e \ +Adp |char * |scan_vstring |SPTR const char *s \ + |EPTRgt const char * const e \ |NN SV *sv EXpx |char * |scan_word |NN char *s \ |NN char *dest \ |STRLEN destlen \ |int allow_package \ |NN STRLEN *slp -Cp |U32 |seed +Cp |U64 |seed : Only used by perl.c/miniperl.c, but defined in caretx.c ep |void |set_caret_X CTdp |void |set_context |NN void *t @@ -3067,21 +3306,28 @@ dopx |PerlIO *|start_glob |NN SV *tmpglo Adp |I32 |start_subparse |I32 is_format \ |U32 flags ATdmp |bool |strict_utf8_to_uv \ - |NN const U8 * const s \ - |NN const U8 * const e \ + |SPTR const U8 * const s \ + |EPTRge const U8 * const e \ |NN UV *cp_p \ |NULLOK Size_t *advance_p CRp |NV |str_to_version |NN SV *sv : Used in pp_ctl.c p |void |sub_crush_depth|NN CV *cv : Used in perly.y +p |void |subsignature_append_fence_op \ + |NN OP *o +p |void |subsignature_append_named \ + |NN const char *paramname \ + |PADOFFSET padix \ + |OPCODE defmode \ + |NULLOK OP *defexpr p |void |subsignature_append_positional \ - |NULLOK OP *varop \ + |PADOFFSET padix \ |OPCODE defmode \ |NULLOK OP *defexpr p |void |subsignature_append_slurpy \ |I32 sigil \ - |NULLOK OP *varop + |PADOFFSET padix p |OP * |subsignature_finish p |void |subsignature_start Adp |void |suspend_compcv |NN struct suspended_compcv *buffer @@ -3090,7 +3336,7 @@ ATdip |void |SvAMAGIC_on |NN SV *sv ATdp |void |sv_backoff |NN SV * const sv Adp |SV * |sv_bless |NN SV * const sv \ |NN NOCHECK HV * const stash -CMbdp |bool |sv_2bool |NN SV * const sv +Cdmp |bool |sv_2bool |NN SV * const sv Cdp |bool |sv_2bool_flags |NN SV *sv \ |I32 flags Cp |bool |sv_can_swipe_pv_buf \ @@ -3103,33 +3349,33 @@ Adp |bool |sv_cat_decode |NN SV *dsv |int tlen Adp |void |sv_catpv |NN SV * const dsv \ |NULLOK const char *sstr -Adfpv |void |sv_catpvf |NN SV * const sv \ +Adfp |void |sv_catpvf |NN SV * const sv \ |NN const char * const pat \ |... Adp |void |sv_catpv_flags |NN SV * const dsv \ |NN const char *sstr \ |const I32 flags -Adfpv |void |sv_catpvf_mg |NN SV * const sv \ +Adfp |void |sv_catpvf_mg |NN SV * const sv \ |NN const char * const pat \ |... Adp |void |sv_catpv_mg |NN SV * const dsv \ |NULLOK const char * const sstr -AMbdp |void |sv_catpvn |NN SV * const dsv \ +Admp |void |sv_catpvn |NN SV * const dsv \ |NN const char *sstr \ |STRLEN len Adp |void |sv_catpvn_flags|NN SV * const dsv \ |NN const char *sstr \ |const STRLEN len \ |const I32 flags -AMbdp |void |sv_catpvn_mg |NN SV * const dsv \ +Admp |void |sv_catpvn_mg |NN SV * const dsv \ |NN const char *sstr \ |STRLEN len -AMbdp |void |sv_catsv |NN SV * const dsv \ +Admp |void |sv_catsv |NN SV * const dsv \ |NULLOK SV * const sstr Adp |void |sv_catsv_flags |NN SV * const dsv \ |NULLOK SV * const sstr \ |const I32 flags -AMbdp |void |sv_catsv_mg |NN SV * const dsv \ +Admp |void |sv_catsv_mg |NN SV * const dsv \ |NULLOK SV * const sstr Adp |void |sv_chop |NN SV * const sv \ |NULLOK const char * const ptr @@ -3149,12 +3395,12 @@ Adp |I32 |sv_cmp_locale_flags \ |NULLOK SV * const sv1 \ |NULLOK SV * const sv2 \ |const U32 flags -AMbdp |void |sv_copypv |NN SV * const dsv \ +Admp |void |sv_copypv |NN SV * const dsv \ |NN SV * const ssv Adp |void |sv_copypv_flags|NN SV * const dsv \ |NN SV * const ssv \ |const I32 flags -Adm |void |sv_copypv_nomg |NN SV * const dsv \ +Admp |void |sv_copypv_nomg |NN SV * const dsv \ |NN SV * const ssv Adp |CV * |sv_2cv |NULLOK SV *sv \ |NN HV ** const st \ @@ -3199,12 +3445,12 @@ ARdp |bool |sv_does_sv |NN SV *sv \ Adp |void |sv_dump |NULLOK SV *sv Adp |void |sv_dump_depth |NULLOK SV *sv \ |I32 depth -AMbdp |I32 |sv_eq |NULLOK SV *sv1 \ +Admp |I32 |sv_eq |NULLOK SV *sv1 \ |NULLOK SV *sv2 Adp |I32 |sv_eq_flags |NULLOK SV *sv1 \ |NULLOK SV *sv2 \ |const U32 flags -AMbdp |void |sv_force_normal|NN SV *sv +Admp |void |sv_force_normal|NN SV *sv Adp |void |sv_force_normal_flags \ |NN SV * const sv \ |const U32 flags @@ -3224,7 +3470,7 @@ Cdp |char * |sv_grow_fresh |NN SV * cons |STRLEN newlen Adp |void |sv_inc |NULLOK SV * const sv Adp |void |sv_inc_nomg |NULLOK SV * const sv -AMbdp |void |sv_insert |NN SV * const bigstr \ +Admp |void |sv_insert |NN SV * const bigstr \ |const STRLEN offset \ |const STRLEN len \ |NN const char * const little \ @@ -3242,7 +3488,7 @@ ARdp |bool |sv_isa_sv |NN SV *sv \ |NN SV *namesv Adp |int |sv_isobject |NULLOK SV *sv Adip |IV |SvIV |NN SV *sv -CMbp |IV |sv_2iv |NN SV *sv +Cmp |IV |sv_2iv |NN SV *sv Adp |IV |sv_2iv_flags |NN SV * const sv \ |const I32 flags Adip |IV |SvIV_nomg |NN SV *sv @@ -3266,23 +3512,52 @@ Adp |MAGIC *|sv_magicext |NN SV * const EXp |MAGIC *|sv_magicext_mglob \ |NN SV *sv Adp |SV * |sv_2mortal |NULLOK SV * const sv -AMRbdp |SV * |sv_mortalcopy |NULLOK SV * const oldsv +ARdmp |SV * |sv_mortalcopy |NULLOK SV * const oldsv ARdp |SV * |sv_mortalcopy_flags \ |NULLOK SV * const oldsv \ |U32 flags ARdp |SV * |sv_newmortal Cdp |SV * |sv_newref |NULLOK SV * const sv -ADbdp |void |sv_nolocking |NULLOK SV *sv - Adp |void |sv_nosharing |NULLOK SV *sv -ADbdp |void |sv_nounlocking |NULLOK SV *sv : Used in pp.c, pp_hot.c, sv.c -dpx |SV * |sv_2num |NN SV * const sv -Adm |bool |sv_numeq |NULLOK SV *sv1 \ +dmp |SV * |sv_2num |NN SV * const sv +Admp |I32 |sv_numcmp |NULLOK SV *sv1 \ + |NULLOK SV *sv2 +Adp |I32 |sv_numcmp_flags|NULLOK SV *sv1 \ + |NULLOK SV *sv2 \ + |const U32 flags +Admp |bool |sv_numeq |NULLOK SV *sv1 \ |NULLOK SV *sv2 Adp |bool |sv_numeq_flags |NULLOK SV *sv1 \ |NULLOK SV *sv2 \ |const U32 flags +dpx |SV * |sv_2num_flags |NN SV * const sv \ + |int flags +Admp |bool |sv_numge |NULLOK SV *sv1 \ + |NULLOK SV *sv2 +Adp |bool |sv_numge_flags |NULLOK SV *sv1 \ + |NULLOK SV *sv2 \ + |const U32 flags +Admp |bool |sv_numgt |NULLOK SV *sv1 \ + |NULLOK SV *sv2 +Adp |bool |sv_numgt_flags |NULLOK SV *sv1 \ + |NULLOK SV *sv2 \ + |const U32 flags +Admp |bool |sv_numle |NULLOK SV *sv1 \ + |NULLOK SV *sv2 +Adp |bool |sv_numle_flags |NULLOK SV *sv1 \ + |NULLOK SV *sv2 \ + |const U32 flags +Admp |bool |sv_numlt |NULLOK SV *sv1 \ + |NULLOK SV *sv2 +Adp |bool |sv_numlt_flags |NULLOK SV *sv1 \ + |NULLOK SV *sv2 \ + |const U32 flags +Admp |bool |sv_numne |NULLOK SV *sv1 \ + |NULLOK SV *sv2 +Adp |bool |sv_numne_flags |NULLOK SV *sv1 \ + |NULLOK SV *sv2 \ + |const U32 flags Adip |NV |SvNV |NN SV *sv Adp |NV |sv_2nv_flags |NN SV * const sv \ |const I32 flags @@ -3304,12 +3579,12 @@ Adp |STRLEN |sv_pos_u2b_flags \ |STRLEN uoffset \ |NULLOK STRLEN * const lenp \ |U32 flags -AMbdp |char * |sv_2pv |NN SV *sv \ +Admp |char * |sv_2pv |NN SV *sv \ |NULLOK STRLEN *lp -CMRbdp |char * |sv_pv |NN SV *sv -AMbdp |char * |sv_2pvbyte |NN SV *sv \ +CRdmp |char * |sv_pv |NN SV *sv +Admp |char * |sv_2pvbyte |NN SV *sv \ |NULLOK STRLEN * const lp -CMRbdp |char * |sv_pvbyte |NN SV *sv +CRdmp |char * |sv_pvbyte |NN SV *sv Adp |char * |sv_2pvbyte_flags \ |NN SV *sv \ |NULLOK STRLEN * const lp \ @@ -3321,21 +3596,28 @@ ip |char * |sv_pvbyten_force_wrapper |NN SV * const sv \ |NULLOK STRLEN * const lp \ |const U32 dummy -CMRbdp |char * |sv_2pvbyte_nolen \ +CRdmp |char * |sv_2pvbyte_nolen \ |NN SV *sv Adp |char * |sv_2pv_flags |NN SV * const sv \ |NULLOK STRLEN * const lp \ |const U32 flags -CMbdp |char * |sv_pvn_force |NN SV *sv \ +CIp |char * |SvPV_helper |NN SV * const sv \ + |NULLOK STRLEN * const lp \ + |const U32 flags \ + |const PL_SvPVtype type \ + |NN Perl_SvPV_helper_non_trivial_t non_trivial \ + |const bool or_null \ + |const U32 return_flags +Cdmp |char * |sv_pvn_force |NN SV *sv \ |NULLOK STRLEN *lp Adp |char * |sv_pvn_force_flags \ |NN SV * const sv \ |NULLOK STRLEN * const lp \ |const U32 flags -CMRbdp |char * |sv_2pv_nolen |NN SV *sv -AMbdp |char * |sv_2pvutf8 |NN SV *sv \ +CRdmp |char * |sv_2pv_nolen |NN SV *sv +Admp |char * |sv_2pvutf8 |NN SV *sv \ |NULLOK STRLEN * const lp -CMRbdp |char * |sv_pvutf8 |NN SV *sv +CRdmp |char * |sv_pvutf8 |NN SV *sv Adp |char * |sv_2pvutf8_flags \ |NN SV *sv \ |NULLOK STRLEN * const lp \ @@ -3347,7 +3629,7 @@ ip |char * |sv_pvutf8n_force_wrapper |NN SV * const sv \ |NULLOK STRLEN * const lp \ |const U32 dummy -CMRbdp |char * |sv_2pvutf8_nolen \ +CRdmp |char * |sv_2pvutf8_nolen \ |NN SV *sv AIdp |bool |SvPVXtrue |NN SV *sv Adp |char * |sv_recode_to_utf8 \ @@ -3360,7 +3642,7 @@ AMdip |void |SvREFCNT_dec |NULLOK SV *sv AMdip |void |SvREFCNT_dec_NN|NN SV *sv Adip |SV * |SvREFCNT_dec_ret_NULL \ |NULLOK SV *sv -Adm |void |SvREFCNT_dec_set_NULL \ +Admp |void |SvREFCNT_dec_set_NULL \ |NULLOK SV *sv AMTdip |SV * |SvREFCNT_inc |NULLOK SV *sv AMTdip |SV * |SvREFCNT_inc_NN|NN SV *sv @@ -3386,7 +3668,7 @@ Adp |void |sv_reset |NN const char *s |NULLOK HV * const stash p |void |sv_resetpvn |NULLOK const char *s \ |STRLEN len \ - |NULLOK HV * const stash + |NULLOK NOCHECK HV * const stash Adp |SV * |sv_rvunweaken |NN SV * const sv Adp |SV * |sv_rvweaken |NN SV * const sv Adp |void |sv_set_bool |NN SV *sv \ @@ -3408,10 +3690,10 @@ Adp |char *|sv_setpv_bufsize \ |NN SV * const sv \ |const STRLEN cur \ |const STRLEN len -Adfpv |void |sv_setpvf |NN SV * const sv \ +Adfp |void |sv_setpvf |NN SV * const sv \ |NN const char * const pat \ |... -Adfpv |void |sv_setpvf_mg |NN SV * const sv \ +Adfp |void |sv_setpvf_mg |NN SV * const sv \ |NN const char * const pat \ |... Cipx |char *|sv_setpv_freshbuf \ @@ -3452,7 +3734,7 @@ Adp |void |sv_setrv_noinc |NN SV * const Adp |void |sv_setrv_noinc_mg \ |NN SV * const sv \ |NN SV * const ref -AMbdp |void |sv_setsv |NN SV *dsv \ +Admp |void |sv_setsv |NN SV *dsv \ |NULLOK SV *ssv Adp |void |sv_setsv_flags |NN SV *dsv \ |NULLOK SV *ssv \ @@ -3466,7 +3748,7 @@ Adp |void |sv_setuv |NN SV * const sv |const UV num Adp |void |sv_setuv_mg |NN SV * const sv \ |const UV u -Adm |bool |sv_streq |NULLOK SV *sv1 \ +Admp |bool |sv_streq |NULLOK SV *sv1 \ |NULLOK SV *sv2 Adp |bool |sv_streq_flags |NULLOK SV *sv1 \ |NULLOK SV *sv2 \ @@ -3485,7 +3767,7 @@ Adp |SV * |sv_strftime_tm |NN SV *fmt Adp |SV * |sv_string_from_errnum \ |int errnum \ |NULLOK SV *tgtsv -CMbdp |void |sv_taint |NN SV *sv +Cdmp |void |sv_taint |NN SV *sv CRdp |bool |sv_tainted |NN SV * const sv Adip |bool |SvTRUE |NULLOK SV *sv Cdp |I32 |sv_true |NULLOK SV * const sv @@ -3502,46 +3784,46 @@ Adp |int |sv_unmagic |NN SV * const sv Adp |int |sv_unmagicext |NN SV * const sv \ |const int type \ |NULLOK const MGVTBL *vtbl -AMbdp |void |sv_unref |NN SV *sv +Admp |void |sv_unref |NN SV *sv Adp |void |sv_unref_flags |NN SV * const ref \ |const U32 flags Cdp |void |sv_untaint |NN SV * const sv Adp |void |sv_upgrade |NN SV * const sv \ |svtype new_type -AMbdp |void |sv_usepvn |NN SV *sv \ +Admp |void |sv_usepvn |NN SV *sv \ |NULLOK char *ptr \ |STRLEN len Adp |void |sv_usepvn_flags|NN SV * const sv \ |NULLOK char *ptr \ |const STRLEN len \ |const U32 flags -AMbdp |void |sv_usepvn_mg |NN SV *sv \ +Admp |void |sv_usepvn_mg |NN SV *sv \ |NULLOK char *ptr \ |STRLEN len Adp |bool |sv_utf8_decode |NN SV * const sv -AMbdp |bool |sv_utf8_downgrade \ +Admp |bool |sv_utf8_downgrade \ |NN SV * const sv \ |const bool fail_ok Adp |bool |sv_utf8_downgrade_flags \ |NN SV * const sv \ |const bool fail_ok \ |const U32 flags -Adm |bool |sv_utf8_downgrade_nomg \ +Admp |bool |sv_utf8_downgrade_nomg \ |NN SV * const sv \ |const bool fail_ok Adp |void |sv_utf8_encode |NN SV * const sv -AMbdp |STRLEN |sv_utf8_upgrade|NN SV *sv -Adm |STRLEN |sv_utf8_upgrade_flags \ +Admp |STRLEN |sv_utf8_upgrade|NN SV *sv +Admp |STRLEN |sv_utf8_upgrade_flags \ |NN SV * const sv \ |const I32 flags Adp |STRLEN |sv_utf8_upgrade_flags_grow \ |NN SV * const sv \ |const I32 flags \ |STRLEN extra -Adm |STRLEN |sv_utf8_upgrade_nomg \ +Admp |STRLEN |sv_utf8_upgrade_nomg \ |NN SV *sv Adip |UV |SvUV |NN SV *sv -CMbp |UV |sv_2uv |NN SV *sv +Cmp |UV |sv_2uv |NN SV *sv Adp |UV |sv_2uv_flags |NN SV * const sv \ |const I32 flags Adip |UV |SvUV_nomg |NN SV *sv @@ -3597,7 +3879,7 @@ Cdp |void |taint_env Cdp |void |taint_proper |NULLOK const char *f \ |NN const char * const s -Fpv |OP * |tied_method |NN SV *methname \ +Fp |OP * |tied_method |NN SV *methname \ |NN SV **mark \ |NN SV * const sv \ |NN const MAGIC * const mg \ @@ -3606,10 +3888,10 @@ Fpv |OP * |tied_method |NN SV *methname |... Xp |SSize_t|tmps_grow_p |SSize_t ix Xiop |Stack_off_t|TOPMARK -Cm |UV |to_uni_fold |UV c \ +Cmp |UV |to_uni_fold |UV c \ |NN U8 *p \ |NN STRLEN *lenp -Cp |UV |_to_uni_fold_flags \ +Cp |UV |to_uni_fold_flags_ \ |UV c \ |NN U8 *p \ |NN STRLEN *lenp \ @@ -3623,45 +3905,45 @@ Cp |UV |to_uni_title |UV c \ Cp |UV |to_uni_upper |UV c \ |NN U8 *p \ |NN STRLEN *lenp -Cp |UV |_to_utf8_fold_flags \ - |NN const U8 *p \ - |NULLOK const U8 *e \ +Cp |UV |to_utf8_fold_flags_ \ + |SPTR const U8 *p \ + |EPTRgt const U8 *e \ |NN U8 *ustrp \ |NULLOK STRLEN *lenp \ |U8 flags -Cp |UV |_to_utf8_lower_flags \ - |NN const U8 *p \ - |NULLOK const U8 *e \ +Cp |UV |to_utf8_lower_flags_ \ + |SPTR const U8 *p \ + |EPTRgt const U8 *e \ |NN U8 *ustrp \ |NULLOK STRLEN *lenp \ |bool flags -Cp |UV |_to_utf8_title_flags \ - |NN const U8 *p \ - |NULLOK const U8 *e \ +Cp |UV |to_utf8_title_flags_ \ + |SPTR const U8 *p \ + |EPTRgt const U8 *e \ |NN U8 *ustrp \ |NULLOK STRLEN *lenp \ |bool flags -Cp |UV |_to_utf8_upper_flags \ - |NN const U8 *p \ - |NULLOK const U8 *e \ +Cp |UV |to_utf8_upper_flags_ \ + |SPTR const U8 *p \ + |EPTRgt const U8 *e \ |NN U8 *ustrp \ |NULLOK STRLEN *lenp \ |bool flags -EXop |bool |try_amagic_bin |int method \ +Xop |bool |try_amagic_bin |int method \ |int flags -EXop |bool |try_amagic_un |int method \ +Xop |bool |try_amagic_un |int method \ |int flags ARTdp |char * |uiv_2buf |NN char * const buf \ |const IV iv \ |UV uv \ |const int is_uv \ |NN char ** const peob -Adp |SSize_t|unpackstring |NN const char *pat \ - |NN const char *patend \ - |NN const char *s \ - |NN const char *strend \ +Adp |SSize_t|unpackstring |SPTR const char *pat \ + |EPTRge const char *patend \ + |SPTR const char *s \ + |EPTRge const char *strend \ |U32 flags : Used in gv.c, hv.c Cp |void |unshare_hek |NULLOK HEK *hek @@ -3674,35 +3956,35 @@ ARdip |IV |utf8_distance |NN const U8 *a |NN const U8 *b ARTdip |U8 * |utf8_hop |NN const U8 *s \ |SSize_t off -ARTdmp |U8 * |utf8_hop_back |NN const U8 *s \ +ARTdmp |U8 * |utf8_hop_back |MPTR const U8 *s \ |SSize_t off \ - |NN const U8 * const start + |SPTR const U8 * const start ARTdip |U8 * |utf8_hop_back_overshoot \ - |NN const U8 *s \ + |MPTR const U8 *s \ |SSize_t off \ - |NN const U8 * const start \ + |SPTR const U8 * const start \ |NULLOK SSize_t *remaining ARTdmp |U8 * |utf8_hop_forward \ - |NN const U8 *s \ + |SPTR const U8 *s \ |SSize_t off \ - |NN const U8 * const end + |EPTRge const U8 * const end ARTdip |U8 * |utf8_hop_forward_overshoot \ - |NN const U8 *s \ + |SPTR const U8 *s \ |SSize_t off \ - |NN const U8 * const end \ + |EPTRge const U8 * const end \ |NULLOK SSize_t *remaining ARTdip |U8 * |utf8_hop_overshoot \ - |NN const U8 *s \ + |MPTR const U8 *s \ |SSize_t off \ - |NN const U8 * const start \ - |NN const U8 * const end \ + |SPTR const U8 * const start \ + |EPTRge const U8 * const end \ |NULLOK SSize_t *remaining -ARTdmp |U8 * |utf8_hop_safe |NN const U8 *s \ +ARTdmp |U8 * |utf8_hop_safe |MPTR const U8 *s \ |SSize_t off \ - |NN const U8 * const start \ - |NN const U8 * const end -ARdp |STRLEN |utf8_length |NN const U8 *s0 \ - |NN const U8 *e + |SPTR const U8 * const start \ + |EPTRge const U8 * const end +ARdp |STRLEN |utf8_length |SPTR const U8 *s0 \ + |EPTRge const U8 *e ATdmp |UV |utf8n_to_uvchr |NN const U8 *s \ |STRLEN curlen \ |NULLOK STRLEN *retlen \ @@ -3740,7 +4022,7 @@ Adip |bool |utf8_to_bytes_overwrite \ Adip |bool |utf8_to_bytes_temp_pv \ |NN U8 const **s_ptr \ |NN STRLEN *lenp -EMXp |U8 * |utf16_to_utf8 |NN U8 *p \ +Emp |U8 * |utf16_to_utf8 |NN U8 *p \ |NN U8 *d \ |Size_t bytelen \ |NN Size_t *newlen @@ -3758,52 +4040,52 @@ EXpx |U8 * |utf8_to_utf16_base \ |NN Size_t *newlen \ |const bool high \ |const bool low -EMXp |U8 * |utf16_to_utf8_reversed \ +Emp |U8 * |utf16_to_utf8_reversed \ |NN U8 *p \ |NN U8 *d \ |Size_t bytelen \ |NN Size_t *newlen -ATdmp |bool |utf8_to_uv |NN const U8 * const s \ - |NN const U8 * const e \ +ATdmp |bool |utf8_to_uv |SPTR const U8 * const s \ + |EPTRge const U8 * const e \ |NN UV *cp_p \ |NULLOK Size_t *advance_p ADbdp |UV |utf8_to_uvchr |NN const U8 *s \ |NULLOK STRLEN *retlen AMdip |UV |utf8_to_uvchr_buf \ - |NN const U8 *s \ - |NN const U8 *send \ + |SPTR const U8 *s \ + |EPTRge const U8 *send \ |NULLOK STRLEN *retlen ATdmp |bool |utf8_to_uv_errors \ - |NN const U8 * const s \ - |NN const U8 * const e \ + |SPTR const U8 * const s \ + |EPTRge const U8 * const e \ |NN UV *cp_p \ |NULLOK Size_t *advance_p \ |U32 flags \ |NULLOK U32 *errors ATdmp |bool |utf8_to_uv_flags \ - |NN const U8 * const s \ - |NN const U8 * const e \ + |SPTR const U8 * const s \ + |EPTRge const U8 * const e \ |NN UV *cp_p \ |NULLOK Size_t *advance_p \ |U32 flags -ATdip |bool |utf8_to_uv_msgs|NN const U8 * const s0 \ - |NN const U8 *e \ +ATdip |bool |utf8_to_uv_msgs|SPTR const U8 * const s0 \ + |EPTRge const U8 *e \ |NN UV *cp_p \ |NULLOK Size_t *advance_p \ |U32 flags \ |NULLOK U32 *errors \ |NULLOK AV **msgs CTp |bool |utf8_to_uv_msgs_helper_ \ - |NN const U8 * const s0 \ - |NN const U8 * const e \ + |SPTR const U8 * const s0 \ + |EPTRge const U8 * const e \ |NN UV *cp_p \ |NULLOK Size_t *advance_p \ |U32 flags \ |NULLOK U32 *errors \ |NULLOK AV **msgs ATdip |UV |utf8_to_uv_or_die \ - |NN const U8 * const s \ - |NN const U8 *e \ + |SPTR const U8 * const s \ + |EPTRge const U8 *e \ |NULLOK Size_t *advance_p CDbdp |UV |utf8_to_uvuni |NN const U8 *s \ |NULLOK STRLEN *retlen @@ -3814,18 +4096,18 @@ p |void |utilize |int aver \ |NN OP *idop \ |NULLOK OP *arg -Adm |U8 * |uvchr_to_utf8 |NN U8 *d \ +Admp |U8 * |uvchr_to_utf8 |NN U8 *d \ |UV uv -Adm |U8 * |uvchr_to_utf8_flags \ +Admp |U8 * |uvchr_to_utf8_flags \ |NN U8 *d \ |UV uv \ |UV flags -Adm |U8 * |uvchr_to_utf8_flags_msgs \ +Admp |U8 * |uvchr_to_utf8_flags_msgs \ |NN U8 *d \ |UV uv \ |UV flags \ |NULLOK HV **msgs -CMdp |U8 * |uvoffuni_to_utf8_flags \ +Cdmp |U8 * |uvoffuni_to_utf8_flags \ |NN U8 *d \ |UV uv \ |UV flags @@ -3841,7 +4123,7 @@ Adip |U8 * |uv_to_utf8_flags \ |NN U8 *d \ |UV uv \ |UV flags -Adip |U8 * |uv_to_utf8_msgs|NN U8 *d \ +Admp |U8 * |uv_to_utf8_msgs|NN U8 *d \ |UV uv \ |UV flags \ |NULLOK HV **msgs @@ -3852,8 +4134,8 @@ EXdpx |bool |validate_proto |NN SV *name |bool warn \ |bool curstash Adp |bool |valid_identifier_pve \ - |NN const char *s \ - |NN const char *end \ + |SPTR const char *s \ + |EPTRge const char *end \ |U32 flags Adp |bool |valid_identifier_pvn \ |NN const char *s \ @@ -3861,9 +4143,14 @@ Adp |bool |valid_identifier_pvn \ |U32 flags Adp |bool |valid_identifier_sv \ |NULLOK SV *sv -CRTdip |UV |valid_utf8_to_uvchr \ +CRTdip |UV |valid_utf8_to_uv \ + |NN const U8 *s \ + |NULLOK STRLEN *retlen +CRTdmp |UV |valid_utf8_to_uvchr \ |NN const U8 *s \ |NULLOK STRLEN *retlen +CRTip |unsigned int|variant_byte_number \ + |PERL_UINTMAX_T word Adp |int |vcmp |NN SV *lhv \ |NN SV *rhv Adpr |void |vcroak |NULLOK const char *pat \ @@ -3901,9 +4188,9 @@ Adp |void |vwarner |U32 err \ p |I32 |wait4pid |Pid_t pid \ |NN int *statusp \ |int flags -Adfpv |void |warn |NN const char *pat \ +Adfp |void |warn |NN const char *pat \ |... -Adfpv |void |warner |U32 err \ +Adfp |void |warner |U32 err \ |NN const char *pat \ |... Adp |void |warn_sv |NN SV *baseex @@ -3911,7 +4198,7 @@ Adp |void |warn_sv |NN SV *baseex RXop |I32 |was_lvalue_sub : FIXME p |void |watch |NN char **addr -Adm |I32 |whichsig |NN const char *sig +Admp |I32 |whichsig |NN const char *sig Adp |I32 |whichsig_pv |NN const char *sig Adp |I32 |whichsig_pvn |NN const char *sig \ |STRLEN len @@ -3929,7 +4216,7 @@ Adp |void |wrap_op_checker|Optype opcode p |void |write_to_stderr|NN SV *msv Xp |void |xs_boot_epilog |const SSize_t ax -FTXopv |Stack_off_t|xs_handshake \ +FTXop |Stack_off_t|xs_handshake \ |const U32 key \ |NN void *v_my_perl \ |NN const char *file \ @@ -3962,10 +4249,6 @@ TXp |void |set_padlist |NN CV *cv \ : Used in sv.c p |void |dump_sv_child |NN SV *sv #endif -#if !defined(EBCDIC) -CRTip |unsigned int|variant_byte_number \ - |PERL_UINTMAX_T word -#endif #if defined(F_FREESP) && !defined(HAS_CHSIZE) && !defined(HAS_TRUNCATE) ARdp |I32 |my_chsize |int fd \ |Off_t length @@ -4058,57 +4341,48 @@ Cp |void |sys_intern_dup |NN struct inte |NN struct interp_intern *dst # endif #endif -#if defined(_MSC_VER) -p |int |magic_regdatum_set \ - |NN SV *sv \ - |NN MAGIC *mg -#else -pr |int |magic_regdatum_set \ - |NN SV *sv \ - |NN MAGIC *mg -#endif #if defined(MULTIPLICITY) -ATdfprv |void |croak_nocontext|NULLOK const char *pat \ +ATdfpr |void |croak_nocontext|NULLOK const char *pat \ |... -ATdfpv |void |deb_nocontext |NN const char *pat \ +ATdfp |void |deb_nocontext |NN const char *pat \ |... -ATdfprv |OP * |die_nocontext |NULLOK const char *pat \ +ATdfpr |OP * |die_nocontext |NULLOK const char *pat \ |... -ATdfpv |char * |form_nocontext |NN const char *pat \ +ATdfp |char * |form_nocontext |NN const char *pat \ |... -AFTdpv |void |load_module_nocontext \ +AFTdp |void |load_module_nocontext \ |U32 flags \ |NN SV *name \ |NULLOK SV *ver \ |... -ATdfpv |SV * |mess_nocontext |NN const char *pat \ +ATdfp |SV * |mess_nocontext |NN const char *pat \ |... Cdop |void * |my_cxt_init |NN int *indexp \ |size_t size -ATdfpv |SV * |newSVpvf_nocontext \ +ATdfp |SV * |newSVpvf_nocontext \ |NN const char * const pat \ |... -ATdfpv |void |sv_catpvf_mg_nocontext \ +ATdfp |void |sv_catpvf_mg_nocontext \ |NN SV * const sv \ |NN const char * const pat \ |... -ATdfpv |void |sv_catpvf_nocontext \ +ATdfp |void |sv_catpvf_nocontext \ |NN SV * const sv \ |NN const char * const pat \ |... -ATdfpv |void |sv_setpvf_mg_nocontext \ +ATdfp |void |sv_setpvf_mg_nocontext \ |NN SV * const sv \ |NN const char * const pat \ |... -ATdfpv |void |sv_setpvf_nocontext \ +ATdfp |void |sv_setpvf_nocontext \ |NN SV * const sv \ |NN const char * const pat \ |... -ATdfpv |void |warner_nocontext \ +ATdfp |void |warner_nocontext \ |U32 err \ |NN const char *pat \ |... -ATdfpv |void |warn_nocontext |NN const char *pat \ +ATdfp |void |warn_nocontext |NN const char *pat \ |... #endif /* defined(MULTIPLICITY) */ #if defined(MYMALLOC) @@ -4121,8 +4395,8 @@ RTp |MEM_SIZE|malloc_good_size \ |size_t nbytes #endif #if defined(PERL_ANY_COW) -: Used in regexec.c -EXpx |SV * |sv_setsv_cow |NULLOK SV *dsv \ +: Used in regexec.c, and unfortunately in cpan GH #23660 +Cpx |SV * |sv_setsv_cow |NULLOK SV *dsv \ |NN SV *ssv #endif #if defined(PERL_CORE) @@ -4141,8 +4415,8 @@ ep |void |Slab_to_rw |NN OPSLAB * const # endif #endif /* defined(PERL_CORE) */ #if defined(PERL_CORE) || defined(PERL_EXT) -ERXdp |bool |isSCRIPT_RUN |NN const U8 *s \ - |NN const U8 *send \ +ERXdp |bool |isSCRIPT_RUN |SPTR const U8 *s \ + |EPTRge const U8 *send \ |const bool utf8_target ERTXdip |bool |is_utf8_non_invariant_string \ |NN const U8 * const s \ @@ -4153,8 +4427,8 @@ Ei |STRLEN |sv_or_pv_pos_u2b \ |STRLEN pos \ |NULLOK STRLEN *lenp ERTdi |Size_t |variant_under_utf8_count \ - |NN const U8 * const s \ - |NN const U8 * const e + |SPTR const U8 * const s \ + |EPTRge const U8 * const e # if !defined(HAS_MEMRCHR) ETei |void * |my_memrchr |NN const char *s \ |const char c \ @@ -4179,9 +4453,6 @@ Mp |bool |do_exec |NN const char *cmd #else p |bool |do_exec |NN const char *cmd #endif -#if defined(PERL_DONT_CREATE_GVSV) -AMbdp |GV * |gv_SVadd |NULLOK GV *gv -#endif #if defined(PERL_IMPLICIT_SYS) CTo |PerlInterpreter *|perl_alloc_using \ |NN const struct IPerlMem **ipM \ @@ -4324,11 +4595,11 @@ RS |Size_t |do_trans_simple|NN SV * cons ERTi |bool * |get_invlist_offset_addr \ |NN SV *invlist ERTi |UV * |invlist_array |NN SV * const invlist -ERTi |bool |_invlist_contains_cp \ +ERTi |bool |invlist_contains_cp_ \ |NN SV * const invlist \ |const UV cp -ERTi |UV |_invlist_len |NN SV * const invlist -ERTXp |SSize_t|_invlist_search|NN SV * const invlist \ +ERTi |UV |invlist_len_ |NN SV * const invlist +ERTXp |SSize_t|invlist_search_|NN SV * const invlist \ |const UV cp ERTi |bool |is_invlist |NULLOK const SV * const invlist #endif @@ -4346,34 +4617,34 @@ Ei |void |invlist_set_len|NN SV * const #endif #if defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || \ defined(PERL_IN_REGCOMP_ANY) || defined(PERL_IN_UTF8_C) -ERXp |SV * |_add_range_to_invlist \ +ERXp |SV * |add_range_to_invlist_ \ |NULLOK SV *invlist \ |UV start \ |UV end -m |void |_invlist_intersection \ +Em |void |invlist_intersection_ \ |NN SV * const a \ |NN SV * const b \ |NN SV **i -EXp |void |_invlist_intersection_maybe_complement_2nd \ +EXp |void |invlist_intersection_maybe_complement_2nd_ \ |NULLOK SV * const a \ |NN SV * const b \ |const bool complement_b \ |NN SV **i -EXp |void |_invlist_invert|NN SV * const invlist -m |void |_invlist_subtract \ +EXp |void |invlist_invert_|NN SV * const invlist +Em |void |invlist_subtract_ \ |NN SV * const a \ |NN SV * const b \ |NN SV **result -Cm |void |_invlist_union |NULLOK SV * const a \ +Em |void |invlist_union_ |NULLOK SV * const a \ |NN SV * const b \ |NN SV **output -EXp |void |_invlist_union_maybe_complement_2nd \ +EXp |void |invlist_union_maybe_complement_2nd_ \ |NULLOK SV * const a \ |NN SV * const b \ |const bool complement_b \ |NN SV **output -ERXp |SV * |_new_invlist |IV initial_size -ERXp |SV * |_setup_canned_invlist \ +ERXp |SV * |new_invlist_ |IV initial_size +ERXp |SV * |setup_canned_invlist_ \ |const STRLEN size \ |const UV element0 \ |NN UV **other_elements_ptr @@ -4384,24 +4655,24 @@ ERXp |SV * |_setup_canned_invlist \ ERXp |const char *|form_alien_digit_msg \ |const U8 which \ |const STRLEN valids_len \ - |NN const char * const first_bad \ - |NN const char * const send \ + |SPTR const char * const first_bad \ + |EPTRgt const char * const send \ |const bool UTF \ |const bool braced ERXp |bool |grok_bslash_c |const char source \ |NN U8 *result \ |NN const char **message \ |NULLOK U32 *packed_warn -ERXp |bool |grok_bslash_o |NN char **s \ - |NN const char * const send \ +ERXp |bool |grok_bslash_o |SPTR char **s \ + |EPTRgt const char * const send \ |NN UV *uv \ |NN const char **message \ |NULLOK U32 *packed_warn \ |const bool strict \ |const bool allow_UV_MAX \ |const bool utf8 -ERXp |bool |grok_bslash_x |NN char **s \ - |NN const char * const send \ +ERXp |bool |grok_bslash_x |SPTR char **s \ + |EPTRgt const char * const send \ |NN UV *uv \ |NN const char **message \ |NULLOK U32 *packed_warn \ @@ -4421,6 +4692,13 @@ ERXp |const char *|form_cp_too_large_msg S |CV * |deb_curcv |I32 ix Sd |void |debprof |NN const OP *o S |SV * |pm_description |NN const PMOP *pm +S |char * |pv_display_flags \ + |NN SV *dsv \ + |NN const char *pv \ + |STRLEN cur \ + |STRLEN len \ + |STRLEN pvlim \ + |I32 pretty_flags S |UV |sequence_num |NULLOK const OP *o #endif #if defined(PERL_IN_DUMP_C) || defined(PERL_IN_HV_C) || \ @@ -4430,7 +4708,7 @@ opx |void |hv_kill_backrefs \ #endif #if defined(PERL_IN_DUMP_C) || defined(PERL_IN_OP_C) || \ defined(PERL_IN_REGCOMP_ANY) -EXp |void |_invlist_dump |NN PerlIO *file \ +EXp |void |invlist_dump_ |NN PerlIO *file \ |I32 level \ |NN const char * const indent \ |NN SV * const invlist @@ -4473,14 +4751,14 @@ S |void |maybe_multimagic_gv \ S |bool |parse_gv_stash_name \ |NN HV **stash \ |NN GV **gv \ - |NN const char **name \ + |MPTR const char **name \ |NN STRLEN *len \ - |NN const char *nambeg \ + |SPTR const char *nambeg \ |STRLEN full_len \ |const U32 is_utf8 \ |const I32 add S |void |require_tie_mod|NN GV *gv \ - |NN const char varname \ + |const char varname \ |NN const char *name \ |STRLEN len \ |const U32 flags @@ -4492,11 +4770,12 @@ op |void |sv_add_backref |NN SV * const |NN SV * const sv #endif #if defined(PERL_IN_GV_C) || defined(PERL_IN_UNIVERSAL_C) -EGdp |HV * |gv_stashsvpvn_cached \ - |SV *namesv \ - |const char *name \ +Edp |HV * |gv_stashsvpvn_cached \ + |NULLOK SV *namesv \ + |NULLOK const char *name \ |U32 namelen \ - |I32 flags + |I32 flags \ + assert(namesv || name) #endif #if defined(PERL_IN_HV_C) Sx |void |clear_placeholders \ @@ -4560,7 +4839,7 @@ S |utf8ness_t|get_locale_string_utf8ness |const locale_utf8ness_t known_utf8 \ |NULLOK const char *locale \ |const locale_category_index cat_index -S |void |ints_to_tm |NN struct tm *my_tm \ +S |void |ints_to_tm |NN struct tm *mytm \ |NN const char *locale \ |int sec \ |int min \ @@ -4692,8 +4971,8 @@ S |void |new_collate |NN const char *new |bool force # if defined(DEBUGGING) S |void |print_collxfrm_input_and_return \ - |NN const char *s \ - |NN const char *e \ + |SPTR const char *s \ + |EPTRge const char *e \ |NULLOK const char *xbuf \ |const STRLEN xlen \ |const bool is_utf8 @@ -4758,8 +5037,8 @@ S |const char *|find_locale_from_environ # endif /* defined(USE_LOCALE) */ # if defined(USE_LOCALE) || defined(DEBUGGING) S |const char *|get_displayable_string \ - |NN const char * const s \ - |NN const char * const e \ + |SPTR const char * const s \ + |EPTRge const char * const e \ |const bool is_utf8 # endif #endif /* defined(PERL_IN_LOCALE_C) */ @@ -4785,13 +5064,13 @@ S |SV * |magic_methcall1|NN SV *sv \ S |int |magic_methpack |NN SV *sv \ |NN const MAGIC *mg \ |NN SV *meth -S |void |restore_magic |NULLOK const void *p +S |void |restore_magic |NULLOK void *p S |void |save_magic_flags \ |SSize_t mgs_ix \ |NN SV *sv \ |U32 flags S |void |unwind_handler_stack \ - |NULLOK const void *p + |NULLOK void *p #endif #if defined(PERL_IN_MG_C) || defined(PERL_IN_PP_C) Tp |bool |translate_substr_offsets \ @@ -4803,6 +5082,10 @@ Tp |bool |translate_substr_offsets \ |NN STRLEN *posp \ |NN STRLEN *lenp #endif +#if defined(PERL_IN_MG_C) || defined(PERL_IN_SV_C) +p |void |mg_free_struct |NN SV *sv \ + |NN MAGIC *mg +#endif #if defined(PERL_IN_MRO_C) S |void |mro_clean_isarev \ |NN HV * const isa \ @@ -4821,10 +5104,6 @@ Sd |AV * |mro_get_linear_isa_dfs \ |NN HV *stash \ |U32 level #endif -#if defined(PERL_IN_NUMERIC_C) -S |void |output_non_portable \ - |const U8 shift -#endif #if defined(PERL_IN_OP_C) S |void |apply_attrs |NN HV *stash \ |NN SV *target \ @@ -4842,7 +5121,9 @@ S |void |bad_type_pv |I32 n \ |NN const char *t \ |NN const OP *o \ |NN const OP *kid -S |void |clear_special_blocks \ +S |void |check_alt_hash_fields_hekify \ + |NN OP *o +S |CV * |clear_special_blocks \ |NN const char * const fullname \ |NN GV * const gv \ |NN CV * const cv @@ -4858,6 +5139,7 @@ S |void |forget_pmop |NN PMOP * const o S |void |gen_constant_list \ |NULLOK OP *o S |void |inplace_aassign|NN OP *o +ST |bool |is_dup_mode |NN const OP *o RST |bool |is_handle_constructor \ |NN const OP *o \ |I32 numargs @@ -4922,6 +5204,12 @@ S |OP * |too_many_arguments_pv \ |NN const char *name \ |U32 flags S |OP * |voidnonfinal |NULLOK OP *o +# if defined(DEBUGGING) +S |const char *|get_displayable_tr_operand \ + |NN const U8 *s \ + |STRLEN len \ + |bool is_utf8 +# endif #endif /* defined(PERL_IN_OP_C) */ #if defined(PERL_IN_OP_C) || defined(PERL_IN_PAD_C) Ti |bool |PadnameIN_SCOPE|NN const PADNAME * const pn \ @@ -5044,10 +5332,10 @@ So |void |validate_suid |NN PerlIO *rsfp #endif /* defined(PERL_IN_PERL_C) */ #if defined(PERL_IN_PERL_C) || defined(PERL_IN_REGCOMP_ANY) || \ defined(PERL_IN_UTF8_C) -EXp |bool |_invlistEQ |NN SV * const a \ +EXp |bool |invlistEQ_ |NN SV * const a \ |NN SV * const b \ |const bool complement_b -ERXp |SV * |_new_invlist_C_array \ +ERXp |SV * |new_invlist_C_array_ \ |NN const UV * const list #endif #if defined(PERL_IN_PP_C) @@ -5073,7 +5361,7 @@ ETi |const char *|get_regex_charset_name |NN STRLEN * const lenp #endif #if defined(PERL_IN_PP_C) || defined(PERL_IN_UTF8_C) -p |UV |_to_upper_title_latin1 \ +p |UV |to_upper_title_latin1_ \ |const U8 c \ |NN U8 *p \ |NN STRLEN *lenp \ @@ -5143,12 +5431,12 @@ IR |bool |should_we_output_Debug_r \ #if defined(PERL_IN_PP_PACK_C) S |int |div128 |NN SV *pnum \ |NN bool *done -ST |char |first_symbol |NN const char *pat \ - |NN const char *patend +ST |char |first_symbol |SPTR const char *pat \ + |EPTRge const char *patend RS |const char *|get_num |NN const char *patptr \ |NN SSize_t *lenptr -S |const char *|group_end |NN const char *patptr \ - |NN const char *patend \ +S |const char *|group_end |SPTR const char *patptr \ + |EPTRge const char *patend \ |char ender RS |SV * |is_an_int |NN const char *s \ |STRLEN l @@ -5160,8 +5448,8 @@ RST |char * |my_bytes_to_utf8 \ |STRLEN len \ |NN char *dest \ |const bool needs_swap -ST |bool |need_utf8 |NN const char *pat \ - |NN const char *patend +ST |bool |need_utf8 |SPTR const char *pat \ + |EPTRge const char *patend S |bool |next_symbol |NN struct tempsym *symptr S |SV ** |pack_rec |NN SV *cat \ |NN struct tempsym *symptr \ @@ -5170,9 +5458,9 @@ S |SV ** |pack_rec |NN SV *cat \ RS |char * |sv_exp_grow |NN SV *sv \ |STRLEN needed S |SSize_t|unpack_rec |NN struct tempsym *symptr \ - |NN const char *s \ - |NN const char *strbeg \ - |NN const char *strend \ + |MPTR const char *s \ + |SPTR const char *strbeg \ + |EPTRge const char *strend \ |NULLOK const char **new_s #endif /* defined(PERL_IN_PP_PACK_C) */ #if defined(PERL_IN_PP_SORT_C) @@ -5207,8 +5495,8 @@ i |I32 |sv_i_ncmp |NN SV * const a \ |NN SV * const b i |I32 |sv_i_ncmp_desc |NN SV * const a \ |NN SV * const b -i |I32 |sv_ncmp |NN SV * const a \ - |NN SV * const b +i |I32 |sv_ncmp |NN SV *a \ + |NN SV *b i |I32 |sv_ncmp_desc |NN SV * const a \ |NN SV * const b # if defined(USE_LOCALE_COLLATE) @@ -5251,11 +5539,11 @@ ERp |SV * |get_ANYOFM_contents \ ERi |SV * |invlist_contents \ |NN SV * const invlist \ |const bool traditional_style -ERTix |UV |invlist_highest_range_start \ +ERTdi |UV |invlist_highest_range_start \ |NN SV * const invlist ERTi |bool |invlist_is_iterating \ |NN const SV * const invlist -ERTix |UV |invlist_lowest |NN SV * const invlist +ERTdi |UV |invlist_lowest |NN SV * const invlist Ep |U32 |join_exact |NN RExC_state_t *pRExC_state \ |NN regnode *scan \ |NN UV *min_subtract \ @@ -5301,18 +5589,18 @@ Ep |SSize_t|study_chunk |NN RExC_state_t |U32 depth \ |bool was_mutate_ok # if defined(PERL_IN_REGCOMP_TRIE_C) && defined(DEBUGGING) -ES |void |dump_trie |NN const struct _reg_trie_data *trie \ +ES |void |dump_trie |NN const struct reg_trie_data_ *trie \ |NULLOK HV *widecharmap \ |NN AV *revcharmap \ |U32 depth ES |void |dump_trie_interim_list \ - |NN const struct _reg_trie_data *trie \ + |NN const struct reg_trie_data_ *trie \ |NULLOK HV *widecharmap \ |NN AV *revcharmap \ |U32 next_alloc \ |U32 depth ES |void |dump_trie_interim_table \ - |NN const struct _reg_trie_data *trie \ + |NN const struct reg_trie_data_ *trie \ |NULLOK HV *widecharmap \ |NN AV *revcharmap \ |U32 next_alloc \ @@ -5343,9 +5631,9 @@ ERST |int |edit_distance |NN const UV *s |const SSize_t maxDistance ES |I32 |execute_wildcard \ |NN REGEXP * const prog \ - |NN char *stringarg \ - |NN char *strend \ - |NN char *strbeg \ + |MPTR char *stringarg \ + |EPTRtermNUL char *strend \ + |SPTR char *strbeg \ |SSize_t minend \ |NN SV *screamer \ |U32 nosave @@ -5355,8 +5643,8 @@ ETi |Size_t |find_first_differing_byte_p |const Size_t max ES |U32 |get_quantifier_value \ |NN RExC_state_t *pRExC_state \ - |NN const char *start \ - |NN const char *end + |SPTR const char *start \ + |EPTRgt const char *end ES |bool |grok_bslash_N |NN RExC_state_t *pRExC_state \ |NULLOK regnode_offset *nodep \ |NULLOK UV *code_point_p \ @@ -5426,7 +5714,7 @@ ES |SV * |parse_uniprop_string \ |NN bool *user_defined_ptr \ |NN SV *msg \ |const STRLEN level -Sfrv |void |re_croak |bool utf8 \ +Sfr |void |re_croak |bool utf8 \ |NN const char *pat \ |... ES |regnode_offset|reg |NN RExC_state_t *pRExC_state \ @@ -5484,14 +5772,23 @@ ES |regnode_offset|regpnode|NN RExC_stat |NN SV *arg ES |SV * |reg_scan_name |NN RExC_state_t *pRExC_state \ |U32 flags -ETi |char * |reg_skipcomment|NN RExC_state_t *pRExC_state \ - |NN char *p +Ei |void |reg_skipcomment|NN RExC_state_t *pRExC_state \ + |SPTR const char *p_start \ + |MPTR char **p \ + |EPTRge char *p_end \ + |bool check_for_R_bracket ERS |bool |regtail |NN RExC_state_t *pRExC_state \ - |NN const regnode_offset p \ - |NN const regnode_offset val \ + |const regnode_offset p \ + |const regnode_offset val \ |const U32 depth ES |void |set_regex_pv |NN RExC_state_t *pRExC_state \ |NN REGEXP *Rx +ES |void |skip_bracketed_white_space \ + |NN RExC_state_t *pRExC_state \ + |U8 do_skip \ + |SPTR const char *p_start \ + |MPTR char **p \ + |EPTRge char *stop_p ES |void |skip_to_be_ignored_text \ |NN RExC_state_t *pRExC_state \ |NN char **p \ @@ -5530,21 +5827,21 @@ Ep |void |populate_invlist_from_bitmap #endif #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) || \ defined(PERL_IN_TOKE_C) -ERp |bool |is_grapheme |NN const U8 *strbeg \ - |NN const U8 *s \ - |NN const U8 *strend \ +ERp |bool |is_grapheme |SPTR const U8 *strbeg \ + |MPTR const U8 *s \ + |EPTRgt const U8 *strend \ |const UV cp #endif #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) || \ defined(PERL_IN_UTF8_C) -ETXp |UV |_to_fold_latin1|const U8 c \ +ETXp |UV |to_fold_latin1_|const U8 c \ |NN U8 *p \ |NN STRLEN *lenp \ |const unsigned int flags #endif #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_TOKE_C) -ERTXp |bool |regcurly |NN const char *s \ - |NN const char *e \ +ERTXp |bool |regcurly |SPTR const char *s \ + |EPTRgt const char *e \ |NULLOK const char *result[5] #endif #if defined(PERL_IN_REGCOMP_DEBUG_C) && defined(DEBUGGING) @@ -5580,7 +5877,7 @@ ES |void |regdump_intflags \ |const U32 flags #endif #if defined(PERL_IN_REGCOMP_INVLIST_C) && !defined(PERL_EXT_RE_BUILD) -ES |void |_append_range_to_invlist \ +ES |void |append_range_to_invlist_ \ |NN SV * const invlist \ |const UV start \ |const UV end @@ -5589,7 +5886,7 @@ ERTi |IV * |get_invlist_previous_index_a S |void |initialize_invlist_guts \ |NN SV *invlist \ |const Size_t initial_size -ERTi |UV * |_invlist_array_init \ +ERTi |UV * |invlist_array_init_ \ |NN SV * const invlist \ |const bool will_have_0 Ei |void |invlist_clear |NN SV *invlist @@ -5639,33 +5936,33 @@ ES |void |ssc_union |NN regnode_ssc *ssc |NN SV * const invlist \ |const bool invert_2nd ES |void |unwind_scan_frames \ - |NN const void *p + |NN void *p #endif /* defined(PERL_IN_REGCOMP_STUDY_C) */ #if defined(PERL_IN_REGEXEC_C) -ERS |LB_enum|advance_one_LB |NN U8 **curpos \ - |NN const U8 * const strend \ +ERS |LB_enum|advance_one_LB |MPTR U8 **curpos \ + |EPTRgt const U8 * const strend \ |const bool utf8_target -ERS |SB_enum|advance_one_SB |NN U8 **curpos \ - |NN const U8 * const strend \ +ERS |SB_enum|advance_one_SB |MPTR U8 **curpos \ + |EPTRgt const U8 * const strend \ |const bool utf8_target -ERS |WB_enum|advance_one_WB_|NN U8 **curpos \ - |NN const U8 * const strend \ +ERS |WB_enum|advance_one_WB_|MPTR U8 **curpos \ + |EPTRgt const U8 * const strend \ |const bool utf8_target \ |const bool skip_Extend_Format -ERS |GCB_enum|backup_one_GCB|NN const U8 * const strbeg \ - |NN U8 **curpos \ +ERS |GCB_enum|backup_one_GCB|SPTR const U8 * const strbeg \ + |MPTR U8 **curpos \ |const bool utf8_target -ERS |LB_enum|backup_one_LB_ |NN const U8 * const strbeg \ - |NN U8 **curpos \ +ERS |LB_enum|backup_one_LB_ |SPTR const U8 * const strbeg \ + |MPTR U8 **curpos \ |const bool utf8_target \ |bool skip_CM_ZWJ -ERS |SB_enum|backup_one_SB |NN const U8 * const strbeg \ - |NN U8 **curpos \ +ERS |SB_enum|backup_one_SB |SPTR const U8 * const strbeg \ + |MPTR U8 **curpos \ |const bool utf8_target ERS |WB_enum|backup_one_WB_but_over_Extend_FO \ |NN WB_enum *previous \ - |NN const U8 * const strbeg \ - |NN U8 **curpos \ + |SPTR const U8 * const strbeg \ + |MPTR U8 **curpos \ |const bool utf8_target EWi |void |capture_clear |NN regexp *rex \ |U16 from_ix \ @@ -5673,54 +5970,54 @@ EWi |void |capture_clear |NN regexp *rex |NN const char *str ERS |char * |find_byclass |NN regexp *prog \ |NN const regnode *c \ - |NN char *s \ - |NN const char *strend \ + |SPTR char *s \ + |EPTRge const char *strend \ |NULLOK regmatch_info *reginfo ERST |U8 * |find_next_masked \ - |NN U8 *s \ - |NN const U8 *send \ + |SPTR U8 *s \ + |EPTRge const U8 *send \ |const U8 byte \ |const U8 mask -ERST |U8 * |find_span_end |NN U8 *s \ - |NN const U8 *send \ +ERST |U8 * |find_span_end |SPTR U8 *s \ + |EPTRge const U8 *send \ |const U8 span_byte ERST |U8 * |find_span_end_mask \ - |NN U8 *s \ - |NN const U8 *send \ + |SPTR U8 *s \ + |EPTRge const U8 *send \ |const U8 span_byte \ |const U8 mask Ei |I32 |foldEQ_latin1_s2_folded \ - |NN const char *a \ - |NN const char *b \ + |NN const char *s1 \ + |NN const char *s2 \ |I32 len ERS |bool |isFOO_lc |const U8 classnum \ |const U8 character ERS |bool |isFOO_utf8_lc |const U8 classnum \ - |NN const U8 *character \ - |NN const U8 *e + |SPTR const U8 *character \ + |EPTRgt const U8 *e ERS |bool |isGCB |const GCB_enum before \ |const GCB_enum after \ - |NN const U8 * const strbeg \ - |NN const U8 * const curpos \ + |SPTR const U8 * const strbeg \ + |MPTR const U8 * const curpos \ |const bool utf8_target ERS |bool |isLB |LB_enum before \ |LB_enum after \ - |NN const U8 * const strbeg \ - |NN const U8 * const curpos \ - |NN const U8 * const strend \ + |SPTR const U8 * const strbeg \ + |MPTR const U8 * const curpos \ + |EPTRgt const U8 * const strend \ |const bool utf8_target ERS |bool |isSB |SB_enum before \ |SB_enum after \ - |NN const U8 * const strbeg \ - |NN const U8 * const curpos \ - |NN const U8 * const strend \ + |SPTR const U8 * const strbeg \ + |MPTR const U8 * const curpos \ + |EPTRgt const U8 * const strend \ |const bool utf8_target ERS |bool |isWB |WB_enum previous \ |WB_enum before \ |WB_enum after \ - |NN const U8 * const strbeg \ - |NN const U8 * const curpos \ - |NN const U8 * const strend \ + |SPTR const U8 * const strbeg \ + |MPTR const U8 * const curpos \ + |EPTRgt const U8 * const strend \ |const bool utf8_target ERST |I32 |reg_check_named_buff_matched \ |NN const regexp *rex \ @@ -5741,8 +6038,8 @@ ERST |U8 * |reghopmaybe3 |NN U8 *s \ |NN const U8 * const lim ERS |bool |reginclass |NULLOK regexp * const prog \ |NN const regnode * const n \ - |NN const U8 * const p \ - |NN const U8 * const p_end \ + |SPTR const U8 * const p \ + |EPTRgt const U8 * const p_end \ |bool const utf8_target ERS |SSize_t|regmatch |NN regmatch_info *reginfo \ |NN char *startpos \ @@ -5764,18 +6061,18 @@ EWi |void |unwind_paren |NN regexp *rex ES |void |debug_start_match \ |NN const REGEXP *prog \ |const bool do_utf8 \ - |NN const char *start \ - |NN const char *end \ + |SPTR const char *start \ + |EPTRge const char *end \ |NN const char *blurb -ES |void |dump_exec_pos |NN const char *locinput \ +ES |void |dump_exec_pos |SPTR const char *locinput \ |NN const regnode *scan \ - |NN const char *loc_regeol \ + |EPTRge const char *loc_regeol \ |NN const char *loc_bostr \ |NN const char *loc_reg_starttry \ |const bool do_utf8 \ |const U32 depth -EFpv |int |re_exec_indentf|NN const char *fmt \ +EFp |int |re_exec_indentf|NN const char *fmt \ |U32 depth \ |... # endif @@ -5787,6 +6084,11 @@ CRip |bool |check_regnode_after \ CRip |regnode *|regnext |NULLOK const regnode *p CRip |regnode *|regnode_after|NULLOK const regnode *p \ |bool varies +Ep |void |regprop |NULLOK const regexp *prog \ + |NN SV *sv \ + |NN const regnode *o \ + |NULLOK const regmatch_info *reginfo \ + |NULLOK const RExC_state_t *pRExC_state # if defined(DEBUGGING) Ep |void |debug_peep |NN const char *str \ |NN const RExC_state_t *pRExC_state \ @@ -5813,15 +6115,10 @@ Ep |const regnode *|dumpuntil \ |NN SV *sv \ |I32 indent \ |U32 depth -Ep |void |regprop |NULLOK const regexp *prog \ - |NN SV *sv \ - |NN const regnode *o \ - |NULLOK const regmatch_info *reginfo \ - |NULLOK const RExC_state_t *pRExC_state -EFpv |int |re_indentf |NN const char *fmt \ +EFp |int |re_indentf |NN const char *fmt \ |U32 depth \ |... -Efpv |int |re_printf |NN const char *fmt \ +Efp |int |re_printf |NN const char *fmt \ |... # endif # if defined(PERL_EXT_RE_BUILD) @@ -5884,7 +6181,6 @@ S |void |glob_assign_glob \ |NN SV * const ssv \ |const int dtype S |bool |glob_2number |NN GV * const gv -Cp |SV * |more_sv S |void |not_a_number |NN SV * const sv S |void |not_incrementable \ |NN SV * const sv @@ -5898,28 +6194,34 @@ S |const char *|sv_display|NN SV * const |NN char *tmpbuf \ |STRLEN tmpbuf_size S |bool |sv_2iuv_common |NN SV * const sv +Sd |bool |sv_numcmp_common \ + |NULLOK SV **sv1 \ + |NULLOK SV **sv2 \ + |const U32 flags \ + |int method \ + |NN SV **result S |STRLEN |sv_pos_b2u_midway \ - |NN const U8 * const s \ - |NN const U8 * const target \ - |NN const U8 *end \ + |SPTR const U8 * const s \ + |MPTR const U8 * const target \ + |EPTRge const U8 *end \ |STRLEN endu S |STRLEN |sv_pos_u2b_cached \ |NN SV * const sv \ |NN MAGIC ** const mgp \ - |NN const U8 * const start \ - |NN const U8 * const send \ + |SPTR const U8 * const start \ + |EPTRgt const U8 * const send \ |STRLEN uoffset \ |STRLEN uoffset0 \ |STRLEN boffset0 ST |STRLEN |sv_pos_u2b_forwards \ - |NN const U8 * const start \ - |NN const U8 * const send \ - |NN STRLEN * const uoffset \ + |SPTR const U8 * const start \ + |EPTRgt const U8 * const send \ + |NN STRLEN * const uoffset_p \ |NN bool * const at_end \ |NN bool *canonical_position ST |STRLEN |sv_pos_u2b_midway \ - |NN const U8 * const start \ - |NN const U8 *send \ + |SPTR const U8 * const start \ + |EPTRgt const U8 *send \ |STRLEN uoffset \ |const STRLEN uend i |void |sv_unglob |NN SV * const sv \ @@ -5975,7 +6277,7 @@ S |int |ao |int toketype S |void |checkcomma |NN const char *s \ |NN const char *name \ |NN const char *what -S |void |check_uni +S |void |check_unary RS |char * |filter_gets |NN SV *sv \ |STRLEN append RS |HV * |find_in_my_stash \ @@ -5992,18 +6294,25 @@ S |char * |force_version |NN char *s |int guessing S |char * |force_word |NN char *start \ |int token \ - |int check_keyword \ - |int allow_pack + |U32 flags RS |SV * |get_and_check_backslash_N_name_wrapper \ - |NN const char *s \ - |NN const char * const e -S |void |incline |NN const char *s \ - |NN const char *end -S |int |intuit_method |NN char *s \ + |SPTR const char *s \ + |EPTRge const char * const e +S |void |incline |SPTR const char *s \ + |EPTRtermNUL const char *end +S |int |intuit_method |NN char *start \ |NULLOK SV *ioname \ |NULLOK NOCHECK CV *cv -S |int |intuit_more |NN char *s \ - |NN char *e +S |int |intuit_more |SPTR char *s \ + |EPTRtermNUL char *e \ + |U8 caller_context \ + |NULLOK char *caller_s \ + |Size_t caller_length +S |bool |is_existing_identifier \ + |NN char *s \ + |Size_t len \ + |char sigil \ + |bool is_utf8 S |I32 |lop |enum yytokentype t \ |I32 f \ |U8 x \ @@ -6019,20 +6328,27 @@ So |SV * |new_constant |NULLOK const cha |NULLOK const char *type \ |STRLEN typelen \ |NULLOK const char **error_msg -S |void |parse_ident |NN char **s \ - |NN char **d \ - |NN char * const e \ - |int allow_package \ +S |char * |parse_ident |SPTR const char *s \ + |EPTRge const char * const s_end \ + |SPTR char **d \ + |EPTRgt char * const e \ |bool is_utf8 \ - |bool check_dollar + |NULLOK HV **failure_details \ + |U32 flags +S |char * |parse_ident_no_copy \ + |SPTR const char *s \ + |EPTRgt const char * const s_end \ + |bool is_utf8 \ + |NULLOK HV **failure_details \ + |U32 flags S |int |pending_ident RS |char * |scan_const |NN char *start RS |char * |scan_formline |NN char *s RS |char * |scan_heredoc |NN char *s S |char * |scan_ident |NN char *s \ - |NN char *dest \ - |STRLEN destlen \ - |I32 ck_uni + |SPTR char *dest \ + |EPTRgt char *dest_end \ + |U32 flags RS |char * |scan_inputsymbol \ |NN char *start RS |char * |scan_pat |NN char *start \ @@ -6075,17 +6391,19 @@ S |I32 |utf16_textfilter \ # endif #endif /* defined(PERL_IN_TOKE_C) */ #if defined(PERL_IN_UNIVERSAL_C) -GS |bool |isa_lookup |NULLOK HV *stash \ +S |bool |isa_lookup |NN HV *stash \ |NULLOK SV *namesv \ |NULLOK const char *name \ |STRLEN len \ - |U32 flags -GS |bool |sv_derived_from_svpvn \ - |NULLOK SV *sv \ + |U32 flags \ + assert(namesv || name) +S |bool |sv_derived_from_svpvn \ + |NN SV *sv \ |NULLOK SV *namesv \ |NULLOK const char *name \ |const STRLEN len \ - |U32 flags + |U32 flags \ + assert(namesv || name) #endif #if defined(PERL_IN_UTF8_C) RS |UV |check_locale_boundary_crossing \ @@ -6094,11 +6412,11 @@ RS |UV |check_locale_boundary_crossing |NN U8 * const ustrp \ |NN STRLEN *lenp RTi |int |does_utf8_overflow \ - |NN const U8 * const s \ - |NN const U8 *e + |SPTR const U8 * const s \ + |EPTRgt const U8 *e RTi |int |isFF_overlong |NN const U8 * const s \ |const STRLEN len -RTi |int |is_utf8_overlong \ +RTi |SSize_t|is_utf8_overlong \ |NN const U8 * const s \ |const STRLEN len RS |HV * |new_msg_hv |NN const char * const message \ @@ -6116,7 +6434,7 @@ RST |U8 |to_lower_latin1|const U8 c \ |NULLOK U8 *p \ |NULLOK STRLEN *lenp \ |const char dummy -S |UV |_to_utf8_case |const UV original \ +S |UV |to_utf8_case_ |const UV original \ |NULLOK const U8 *p \ |NN U8 *ustrp \ |NN STRLEN *lenp \ @@ -6125,16 +6443,16 @@ S |UV |_to_utf8_case |const UV original |NULLOK const U32 * const * const aux_tables \ |NULLOK const U8 * const aux_table_lengths \ |NN const char * const normal -S |UV |turkic_fc |NN const U8 * const p \ - |NN const U8 * const e \ +S |UV |turkic_fc |SPTR const U8 * const p \ + |EPTRgt const U8 * const e \ |NN U8 *ustrp \ |NN STRLEN *lenp -S |UV |turkic_lc |NN const U8 * const p0 \ - |NN const U8 * const e \ +S |UV |turkic_lc |SPTR const U8 * const p0 \ + |EPTRgt const U8 * const e \ |NN U8 *ustrp \ |NN STRLEN *lenp -S |UV |turkic_uc |NN const U8 * const p \ - |NN const U8 * const e \ +S |UV |turkic_uc |SPTR const U8 * const p \ + |EPTRgt const U8 * const e \ |NN U8 *ustrp \ |NN STRLEN *lenp RS |char * |unexpected_non_continuation_text \ @@ -6155,7 +6473,6 @@ S |void |warn_on_first_deprecated_use #if defined(PERL_IN_UTIL_C) S |bool |ckwarn_common |U32 w S |SV * |mess_alloc -Ti |U32 |ptr_hash |PTRV u S |SV * |with_queued_errors \ |NN SV *ex So |void |xs_version_bootcheck \ @@ -6248,14 +6565,14 @@ Cipx |void |cx_pushtry |NN PERL_CONTEXT |NULLOK OP *retop Cipx |void |cx_pushwhen |NN PERL_CONTEXT *cx Cipx |void |cx_topblock |NN PERL_CONTEXT *cx -Cipx |U8 |gimme_V +Cip |U8 |gimme_V #endif /* !defined(PERL_NO_INLINE_FUNCTIONS) */ #if defined(PERL_RC_STACK) EXopx |OP * |pp_wrap |NN Perl_ppaddr_t real_pp_fn \ |I32 nargs \ |int nlists Cpx |int |runops_wrap -EXopx |void |xs_wrap |NN XSUBADDR_t xsub \ +Copx |void |xs_wrap |NN XSUBADDR_t xsub \ |NN CV *cv #endif #if defined(PERL_USE_3ARG_SIGHANDLER) @@ -6284,7 +6601,7 @@ Adp |bool |dump_c_backtrace \ |NN PerlIO *fp \ |int max_depth \ |int skip -dm |void |free_c_backtrace \ +dmo |void |free_c_backtrace \ |NN Perl_c_backtrace *bt dp |Perl_c_backtrace *|get_c_backtrace \ |int max_depth \ @@ -6344,7 +6661,7 @@ Rdp |PADLIST *|padlist_dup |NN PADLIST * Rdp |PADNAME *|padname_dup |NN PADNAME *src \ |NN CLONE_PARAMS *param Rdp |PADNAMELIST *|padnamelist_dup \ - |NN PADNAMELIST *srcpad \ + |NULLOK PADNAMELIST *srcpad \ |NN CLONE_PARAMS *param Cp |yy_parser *|parser_dup |NULLOK const yy_parser * const proto \ |NN CLONE_PARAMS * const param @@ -6355,7 +6672,7 @@ Adp |void |re_dup_guts |NN const REGEXP |NN REGEXP *dstr \ |NN CLONE_PARAMS *param Cp |void * |regdupe_internal \ - |NN REGEXP * const r \ + |NN REGEXP * const rx \ |NN CLONE_PARAMS *param Cp |void |rvpv_dup |NN SV * const dsv \ |NN const SV * const ssv \ @@ -6364,16 +6681,16 @@ CRdp |PERL_SI *|si_dup |NULLOK PERL_SI * |NN CLONE_PARAMS *param CRdp |ANY * |ss_dup |NN PerlInterpreter *proto_perl \ |NN CLONE_PARAMS *param -ARp |SV * |sv_dup |NULLOK const SV * const ssv \ +ARdp |SV * |sv_dup |NULLOK const SV * const ssv \ |NN CLONE_PARAMS * const param -ARp |SV * |sv_dup_inc |NULLOK const SV * const ssv \ +ARdp |SV * |sv_dup_inc |NULLOK const SV * const ssv \ |NN CLONE_PARAMS * const param # if defined(PERL_IN_OP_C) || defined(PERL_IN_PEEP_C) p |void |op_relocate_sv |NN SV **svp \ |NN PADOFFSET *targp # endif #else /* if !defined(USE_ITHREADS) */ -Adm |void |CopFILEGV_set |NN COP *c \ +Admp |void |CopFILEGV_set |NN COP *c \ |NN GV *gv #endif #if defined(USE_LOCALE_COLLATE) @@ -6385,7 +6702,7 @@ p |int |magic_setcollxfrm \ |NN MAGIC *mg EXop |SV * |strxfrm |NN SV *src : Defined in locale.c, used only in sv.c -AMbdp |char * |sv_collxfrm |NN SV * const sv \ +Admp |char * |sv_collxfrm |NN SV * const sv \ |NN STRLEN * const nxp Adp |char * |sv_collxfrm_flags \ |NN SV * const sv \ Index: gnu/usr.bin/perl/embed.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/embed.h,v diff -u -p -a -u -p -r1.32 embed.h --- gnu/usr.bin/perl/embed.h 26 Dec 2025 22:14:12 -0000 1.32 +++ gnu/usr.bin/perl/embed.h 16 Nov 2026 00:57:38 -0000 @@ -4,8 +4,8 @@ * * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, * 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, - * 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 - * by Larry Wall and others + * 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, + * 2026 by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -21,84 +21,53 @@ /* (Doing namespace management portably in C is really gross.) */ -/* By defining PERL_NO_SHORT_NAMES (not done by default) the short forms - * (like warn instead of Perl_warn) for the API are not defined. - * Not defining the short forms is a good thing for cleaner embedding. - * BEWARE that a bunch of macros don't have long names, so either must be - * added or don't use them if you define this symbol */ - -#if !defined(MULTIPLICITY) -/* undefined symbols, point them back at the usual ones */ -# define Perl_croak_nocontext Perl_croak -# define Perl_deb_nocontext Perl_deb -# define Perl_die_nocontext Perl_die -# define Perl_form_nocontext Perl_form -# define Perl_load_module_nocontext Perl_load_module -# define Perl_mess_nocontext Perl_mess -# define Perl_newSVpvf_nocontext Perl_newSVpvf -# define Perl_sv_catpvf_nocontext Perl_sv_catpvf -# define Perl_sv_catpvf_mg_nocontext Perl_sv_catpvf_mg -# define Perl_sv_setpvf_nocontext Perl_sv_setpvf -# define Perl_sv_setpvf_mg_nocontext Perl_sv_setpvf_mg -# define Perl_warn_nocontext Perl_warn -# define Perl_warner_nocontext Perl_warner -#endif /* !defined(MULTIPLICITY) */ -#if !defined(PERL_CORE) -/* Compatibility stubs. Compile extensions with -DPERL_NOCOMPAT to - * disable them. - */ -# define sv_setptrobj(rv,ptr,name) sv_setref_iv(rv,name,PTR2IV(ptr)) -# define sv_setptrref(rv,ptr) sv_setref_iv(rv,NULL,PTR2IV(ptr)) -# if !defined(PERL_NOCOMPAT) - -/* Compatibility for various misnamed functions. All functions - in the API that begin with "perl_" (not "Perl_") take an explicit - interpreter context pointer. - The following are not like that, but since they had a "perl_" - prefix in previous versions, we provide compatibility macros. - */ -# define perl_atexit(a,b) call_atexit(a,b) -# define perl_call_argv(a,b,c) call_argv(a,b,c) -# define perl_call_method(a,b) call_method(a,b) -# define perl_call_pv(a,b) call_pv(a,b) -# define perl_call_sv(a,b) call_sv(a,b) -# define perl_eval_pv(a,b) eval_pv(a,b) -# define perl_eval_sv(a,b) eval_sv(a,b) -# define perl_get_av(a,b) get_av(a,b) -# define perl_get_cv(a,b) get_cv(a,b) -# define perl_get_hv(a,b) get_hv(a,b) -# define perl_get_sv(a,b) get_sv(a,b) -# define perl_init_i18nl10n(a) init_i18nl10n(a) -# define perl_require_pv(a) require_pv(a) - -/* Before C99, macros could not wrap varargs functions. This - provides a set of compatibility functions that don't take an - extra argument but grab the context pointer using the macro dTHX. - */ - -# if defined(MULTIPLICITY) && !defined(PERL_NO_SHORT_NAMES) && \ - !defined(PERL_WANT_VARARGS) -# define croak Perl_croak_nocontext -# define deb Perl_deb_nocontext -# define die Perl_die_nocontext -# define form Perl_form_nocontext -# define load_module Perl_load_module_nocontext -# define mess Perl_mess_nocontext -# define newSVpvf Perl_newSVpvf_nocontext -# define sv_catpvf Perl_sv_catpvf_nocontext -# define sv_catpvf_mg Perl_sv_catpvf_mg_nocontext -# define sv_setpvf Perl_sv_setpvf_nocontext -# define sv_setpvf_mg Perl_sv_setpvf_mg_nocontext -# define warn Perl_warn_nocontext -# define warner Perl_warner_nocontext -# endif /* defined(MULTIPLICITY) && !defined(PERL_NO_SHORT_NAMES) && - !defined(PERL_WANT_VARARGS) */ -# endif /* !defined(PERL_NOCOMPAT) */ -#endif /* !defined(PERL_CORE) */ -#if !defined(PERL_NO_SHORT_NAMES) +/* When this symbol is defined, we undef various symbols we have defined + * earlier when this file was #included with this symbol undefined */ +#if defined(PERL_DO_UNDEFS) +# if !defined(PERL_CORE) +# undef CC_MAGICAL_ +# undef CC_UNDERSCORE_ +# undef do_aexec +# undef HASATTRIBUTE_UNINITIALIZED +# undef is_WORD_BUT_NONCONT_safe +# undef isFOO_or_UNDERSCORE_ +# undef isIDCONT_lazy_if_safe +# undef new_XPV +# undef new_XPVIV +# undef pTHX_10 +# undef pTHX_11 +# undef SHY_NATIVE +# undef sv_2num +# undef SvRVx +# undef UNI_DISPLAY_TR_ +# if !defined(PERL_EXT) +# undef GV_CACHE_ONLY +# undef invlist_intersection_ +# undef invlist_subtract_ +# undef invlist_union_ +# undef OPpPARAM_IF_FALSE +# undef OPpPARAM_IF_UNDEF +# undef OPpSELF_IN_PAD +# undef PREVENT_LVALUE +# undef utf16_to_utf8 +# undef utf16_to_utf8_reversed +# endif /* !defined(PERL_EXT) */ +# if !defined(PERL_EXT_RE_BUILD) +# undef FAIL_ +# undef first_upper_bit_set_byte_number +# undef invlist_intersection_complement_2nd_ +# undef invlist_union_complement_2nd_ +# undef PARSE_IDENT_ERROR_POSITION +# undef PARSE_IDENT_ERROR_TEXT +# undef RExC_parse_advance +# undef WARN_HELPER_ +# endif +# endif /* !defined(PERL_CORE) */ +#else /* if !defined(PERL_DO_UNDEFS) */ -/* Hide global symbols */ +/* Create short name macros that hide any need for thread context */ +# define AvFILL_(a) Perl_AvFILL_(aTHX_ a) # define Gv_AMupdate(a,b) Perl_Gv_AMupdate(aTHX_ a,b) # define SvAMAGIC_off Perl_SvAMAGIC_off # define SvAMAGIC_on Perl_SvAMAGIC_on @@ -108,6 +77,7 @@ # define SvNV(a) Perl_SvNV(aTHX_ a) # define SvNV_nomg(a) Perl_SvNV_nomg(aTHX_ a) # define SvPVXtrue(a) Perl_SvPVXtrue(aTHX_ a) +# define SvPV_helper(a,b,c,d,e,f,g) Perl_SvPV_helper(aTHX_ a,b,c,d,e,f,g) # define SvREFCNT_dec_ret_NULL(a) Perl_SvREFCNT_dec_ret_NULL(aTHX_ a) # define SvTRUE(a) Perl_SvTRUE(aTHX_ a) # define SvTRUE_NN(a) Perl_SvTRUE_NN(aTHX_ a) @@ -115,21 +85,12 @@ # define SvTRUE_nomg(a) Perl_SvTRUE_nomg(aTHX_ a) # define SvUV(a) Perl_SvUV(aTHX_ a) # define SvUV_nomg(a) Perl_SvUV_nomg(aTHX_ a) -# define _is_uni_FOO(a,b) Perl__is_uni_FOO(aTHX_ a,b) -# define _is_uni_perl_idcont(a) Perl__is_uni_perl_idcont(aTHX_ a) -# define _is_uni_perl_idstart(a) Perl__is_uni_perl_idstart(aTHX_ a) -# define _is_utf8_FOO(a,b,c) Perl__is_utf8_FOO(aTHX_ a,b,c) -# define _is_utf8_perl_idcont(a,b) Perl__is_utf8_perl_idcont(aTHX_ a,b) -# define _is_utf8_perl_idstart(a,b) Perl__is_utf8_perl_idstart(aTHX_ a,b) -# define _to_uni_fold_flags(a,b,c,d) Perl__to_uni_fold_flags(aTHX_ a,b,c,d) -# define _to_utf8_fold_flags(a,b,c,d,e) Perl__to_utf8_fold_flags(aTHX_ a,b,c,d,e) -# define _to_utf8_lower_flags(a,b,c,d,e) Perl__to_utf8_lower_flags(aTHX_ a,b,c,d,e) -# define _to_utf8_title_flags(a,b,c,d,e) Perl__to_utf8_title_flags(aTHX_ a,b,c,d,e) -# define _to_utf8_upper_flags(a,b,c,d,e) Perl__to_utf8_upper_flags(aTHX_ a,b,c,d,e) # define amagic_call(a,b,c,d) Perl_amagic_call(aTHX_ a,b,c,d) # define amagic_deref_call(a,b) Perl_amagic_deref_call(aTHX_ a,b) +# define api_version_assert Perl_api_version_assert # define apply_attrs_string(a,b,c,d) Perl_apply_attrs_string(aTHX_ a,b,c,d) # define apply_builtin_cv_attributes(a,b) Perl_apply_builtin_cv_attributes(aTHX_ a,b) +# define atfork_child Perl_atfork_child # define atfork_lock Perl_atfork_lock # define atfork_unlock Perl_atfork_unlock # define av_clear(a) Perl_av_clear(aTHX_ a) @@ -160,7 +121,6 @@ # define bytes_to_utf8(a,b) Perl_bytes_to_utf8(aTHX_ a,b) # define bytes_to_utf8_free_me(a,b,c) Perl_bytes_to_utf8_free_me(aTHX_ a,b,c) # define bytes_to_utf8_temp_pv(a,b) Perl_bytes_to_utf8_temp_pv(aTHX_ a,b) -# define c9strict_utf8_to_uv Perl_c9strict_utf8_to_uv # define call_argv(a,b,c) Perl_call_argv(aTHX_ a,b,c) # define call_atexit(a,b) Perl_call_atexit(aTHX_ a,b) # define call_list(a,b) Perl_call_list(aTHX_ a,b) @@ -175,9 +135,14 @@ # define ck_entersub_args_list(a) Perl_ck_entersub_args_list(aTHX_ a) # define ck_entersub_args_proto(a,b,c) Perl_ck_entersub_args_proto(aTHX_ a,b,c) # define ck_entersub_args_proto_or_list(a,b,c) Perl_ck_entersub_args_proto_or_list(aTHX_ a,b,c) +# define ck_warner(a,...) Perl_ck_warner(aTHX_ a,__VA_ARGS__) +# define ck_warner_d(a,...) Perl_ck_warner_d(aTHX_ a,__VA_ARGS__) # define clear_defarray(a,b) Perl_clear_defarray(aTHX_ a,b) # define clear_defarray_simple(a) Perl_clear_defarray_simple(aTHX_ a) +# define cop_disable_warning(a,b) Perl_cop_disable_warning(aTHX_ a,b) +# define cop_enable_warning(a,b) Perl_cop_enable_warning(aTHX_ a,b) # define cop_fetch_label(a,b,c) Perl_cop_fetch_label(aTHX_ a,b,c) +# define cop_has_warning(a,b) Perl_cop_has_warning(aTHX_ a,b) # define cop_store_label(a,b,c,d) Perl_cop_store_label(aTHX_ a,b,c,d) # define croak_memory_wrap Perl_croak_memory_wrap # define croak_no_modify Perl_croak_no_modify @@ -199,6 +164,7 @@ # define debprofdump() Perl_debprofdump(aTHX) # define debstack() Perl_debstack(aTHX) # define debstackptrs() Perl_debstackptrs(aTHX) +# define defer_error(a) Perl_defer_error(aTHX_ a) # define delimcpy Perl_delimcpy # define despatch_signals() Perl_despatch_signals(aTHX) # define die_sv(a) Perl_die_sv(aTHX_ a) @@ -220,12 +186,13 @@ # define dump_all() Perl_dump_all(aTHX) # define dump_eval() Perl_dump_eval(aTHX) # define dump_form(a) Perl_dump_form(aTHX_ a) +# define dump_indent(a,b,...) Perl_dump_indent(aTHX_ a,b,__VA_ARGS__) # define dump_packsubs(a) Perl_dump_packsubs(aTHX_ a) # define dump_sub(a) Perl_dump_sub(aTHX_ a) # define dump_vindent(a,b,c,d) Perl_dump_vindent(aTHX_ a,b,c,d) # define eval_pv(a,b) Perl_eval_pv(aTHX_ a,b) # define eval_sv(a,b) Perl_eval_sv(aTHX_ a,b) -# define extended_utf8_to_uv Perl_extended_utf8_to_uv +# define fatal_warner(a,...) Perl_fatal_warner(aTHX_ a,__VA_ARGS__) # define fbm_compile(a,b) Perl_fbm_compile(aTHX_ a,b) # define fbm_instr(a,b,c,d) Perl_fbm_instr(aTHX_ a,b,c,d) # define filter_add(a,b) Perl_filter_add(aTHX_ a,b) @@ -253,11 +220,15 @@ # define gp_free(a) Perl_gp_free(aTHX_ a) # define gp_ref(a) Perl_gp_ref(aTHX_ a) # define grok_atoUV Perl_grok_atoUV -# define grok_bin_oct_hex(a,b,c,d,e,f,g) Perl_grok_bin_oct_hex(aTHX_ a,b,c,d,e,f,g) +# define grok_bin(a,b,c,d) Perl_grok_bin(aTHX_ a,b,c,d) +# define grok_bin_hex(a,b,c,d,e,f,g) Perl_grok_bin_hex(aTHX_ a,b,c,d,e,f,g) +# define grok_hex(a,b,c,d) Perl_grok_hex(aTHX_ a,b,c,d) # define grok_infnan(a,b) Perl_grok_infnan(aTHX_ a,b) # define grok_number(a,b,c) Perl_grok_number(aTHX_ a,b,c) # define grok_number_flags(a,b,c,d) Perl_grok_number_flags(aTHX_ a,b,c,d) # define grok_numeric_radix(a,b) Perl_grok_numeric_radix(aTHX_ a,b) +# define grok_oct(a,b,c,d) Perl_grok_oct(aTHX_ a,b,c,d) +# define grok_uint_by_base(a,b,c,d,e,f,g) Perl_grok_uint_by_base(aTHX_ a,b,c,d,e,f,g) # define gv_add_by_type(a,b) Perl_gv_add_by_type(aTHX_ a,b) # define gv_autoload_pv(a,b,c) Perl_gv_autoload_pv(aTHX_ a,b,c) # define gv_autoload_pvn(a,b,c,d) Perl_gv_autoload_pvn(aTHX_ a,b,c,d) @@ -312,7 +283,6 @@ # define init_i18nl10n(a) Perl_init_i18nl10n(aTHX_ a) # define init_stacks() Perl_init_stacks(aTHX) # define init_tm(a) Perl_init_tm(aTHX_ a) -# define instr Perl_instr # define intro_my() Perl_intro_my(aTHX) # define isC9_STRICT_UTF8_CHAR Perl_isC9_STRICT_UTF8_CHAR # define isSTRICT_UTF8_CHAR Perl_isSTRICT_UTF8_CHAR @@ -323,12 +293,17 @@ # define is_lvalue_sub() Perl_is_lvalue_sub(aTHX) # define is_safe_syscall(a,b,c,d) Perl_is_safe_syscall(aTHX_ a,b,c,d) # define is_strict_utf8_string_loclen Perl_is_strict_utf8_string_loclen +# define is_uni_FOO_(a,b) Perl_is_uni_FOO_(aTHX_ a,b) +# define is_uni_perl_idcont_(a) Perl_is_uni_perl_idcont_(aTHX_ a) +# define is_uni_perl_idstart_(a) Perl_is_uni_perl_idstart_(aTHX_ a) # define is_utf8_FF_helper_ Perl_is_utf8_FF_helper_ +# define is_utf8_FOO_(a,b,c) Perl_is_utf8_FOO_(aTHX_ a,b,c) # define is_utf8_char_helper_ Perl_is_utf8_char_helper_ # define is_utf8_fixed_width_buf_loclen_flags Perl_is_utf8_fixed_width_buf_loclen_flags # define is_utf8_invariant_string_loc Perl_is_utf8_invariant_string_loc +# define is_utf8_perl_idcont_(a,b) Perl_is_utf8_perl_idcont_(aTHX_ a,b) +# define is_utf8_perl_idstart_(a,b) Perl_is_utf8_perl_idstart_(aTHX_ a,b) # define is_utf8_string_flags Perl_is_utf8_string_flags -# define is_utf8_string_loc Perl_is_utf8_string_loc # define is_utf8_string_loclen Perl_is_utf8_string_loclen # define is_utf8_string_loclen_flags Perl_is_utf8_string_loclen_flags # define is_utf8_valid_partial_char_flags Perl_is_utf8_valid_partial_char_flags @@ -348,6 +323,7 @@ # define lex_stuff_pvn(a,b,c) Perl_lex_stuff_pvn(aTHX_ a,b,c) # define lex_stuff_sv(a,b) Perl_lex_stuff_sv(aTHX_ a,b) # define lex_unstuff(a) Perl_lex_unstuff(aTHX_ a) +# define long_valid_utf8_to_uv Perl_long_valid_utf8_to_uv # define looks_like_number(a) Perl_looks_like_number(aTHX_ a) # define lsbit_pos32 Perl_lsbit_pos32 # define magic_dump(a) Perl_magic_dump(aTHX_ a) @@ -365,6 +341,7 @@ # define mg_set(a) Perl_mg_set(aTHX_ a) # define mg_size(a) Perl_mg_size(aTHX_ a) # define mini_mktime Perl_mini_mktime +# define more_sv() Perl_more_sv(aTHX) # define moreswitches(a) Perl_moreswitches(aTHX_ a) # define mortal_destructor_sv(a,b) Perl_mortal_destructor_sv(aTHX_ a,b) # define mortal_getenv Perl_mortal_getenv @@ -450,6 +427,7 @@ # define newSVpvz(a) Perl_newSVpvz(aTHX_ a) # define newSVrv(a,b) Perl_newSVrv(aTHX_ a,b) # define newSVsv_flags(a,b) Perl_newSVsv_flags(aTHX_ a,b) +# define newSVsv_flags_NN(a,b) Perl_newSVsv_flags_NN(aTHX_ a,b) # define newSVuv(a) Perl_newSVuv(aTHX_ a) # define newTRYCATCHOP(a,b,c,d) Perl_newTRYCATCHOP(aTHX_ a,b,c,d) # define newUNOP(a,b,c) Perl_newUNOP(aTHX_ a,b,c) @@ -466,6 +444,7 @@ # define op_append_elem(a,b,c) Perl_op_append_elem(aTHX_ a,b,c) # define op_append_list(a,b,c) Perl_op_append_list(aTHX_ a,b,c) # define op_class(a) Perl_op_class(aTHX_ a) +# define op_clear(a) Perl_op_clear(aTHX_ a) # define op_contextualize(a,b) Perl_op_contextualize(aTHX_ a,b) # define op_convert_list(a,b,c) Perl_op_convert_list(aTHX_ a,b,c) # define op_dump(a) Perl_op_dump(aTHX_ a) @@ -614,6 +593,7 @@ # define save_int(a) Perl_save_int(aTHX_ a) # define save_item(a) Perl_save_item(aTHX_ a) # define save_iv(a) Perl_save_iv(aTHX_ a) +# define save_padsv(a) Perl_save_padsv(aTHX_ a) # define save_padsv_and_mortalize(a) Perl_save_padsv_and_mortalize(aTHX_ a) # define save_pptr(a) Perl_save_pptr(aTHX_ a) # define save_pushi32ptr(a,b,c) Perl_save_pushi32ptr(aTHX_ a,b,c) @@ -651,7 +631,6 @@ # define stack_grow(a,b,c) Perl_stack_grow(aTHX_ a,b,c) # define start_subparse(a,b) Perl_start_subparse(aTHX_ a,b) # define str_to_version(a) Perl_str_to_version(aTHX_ a) -# define strict_utf8_to_uv Perl_strict_utf8_to_uv # define suspend_compcv(a) Perl_suspend_compcv(aTHX_ a) # define sv_2bool_flags(a,b) Perl_sv_2bool_flags(aTHX_ a,b) # define sv_2cv(a,b,c,d) Perl_sv_2cv(aTHX_ a,b,c,d) @@ -714,7 +693,13 @@ # define sv_newmortal() Perl_sv_newmortal(aTHX) # define sv_newref(a) Perl_sv_newref(aTHX_ a) # define sv_nosharing(a) Perl_sv_nosharing(aTHX_ a) +# define sv_numcmp_flags(a,b,c) Perl_sv_numcmp_flags(aTHX_ a,b,c) # define sv_numeq_flags(a,b,c) Perl_sv_numeq_flags(aTHX_ a,b,c) +# define sv_numge_flags(a,b,c) Perl_sv_numge_flags(aTHX_ a,b,c) +# define sv_numgt_flags(a,b,c) Perl_sv_numgt_flags(aTHX_ a,b,c) +# define sv_numle_flags(a,b,c) Perl_sv_numle_flags(aTHX_ a,b,c) +# define sv_numlt_flags(a,b,c) Perl_sv_numlt_flags(aTHX_ a,b,c) +# define sv_numne_flags(a,b,c) Perl_sv_numne_flags(aTHX_ a,b,c) # define sv_peek(a) Perl_sv_peek(aTHX_ a) # define sv_pos_b2u(a,b) Perl_sv_pos_b2u(aTHX_ a,b) # define sv_pos_b2u_flags(a,b,c) Perl_sv_pos_b2u_flags(aTHX_ a,b,c) @@ -792,9 +777,14 @@ # define sync_locale() Perl_sync_locale(aTHX) # define taint_env() Perl_taint_env(aTHX) # define taint_proper(a,b) Perl_taint_proper(aTHX_ a,b) +# define to_uni_fold_flags_(a,b,c,d) Perl_to_uni_fold_flags_(aTHX_ a,b,c,d) # define to_uni_lower(a,b,c) Perl_to_uni_lower(aTHX_ a,b,c) # define to_uni_title(a,b,c) Perl_to_uni_title(aTHX_ a,b,c) # define to_uni_upper(a,b,c) Perl_to_uni_upper(aTHX_ a,b,c) +# define to_utf8_fold_flags_(a,b,c,d,e) Perl_to_utf8_fold_flags_(aTHX_ a,b,c,d,e) +# define to_utf8_lower_flags_(a,b,c,d,e) Perl_to_utf8_lower_flags_(aTHX_ a,b,c,d,e) +# define to_utf8_title_flags_(a,b,c,d,e) Perl_to_utf8_title_flags_(aTHX_ a,b,c,d,e) +# define to_utf8_upper_flags_(a,b,c,d,e) Perl_to_utf8_upper_flags_(aTHX_ a,b,c,d,e) # define uiv_2buf Perl_uiv_2buf # define unpackstring(a,b,c,d,e) Perl_unpackstring(aTHX_ a,b,c,d,e) # define unshare_hek(a) Perl_unshare_hek(aTHX_ a) @@ -802,35 +792,27 @@ # define upg_version(a,b) Perl_upg_version(aTHX_ a,b) # define utf8_distance(a,b) Perl_utf8_distance(aTHX_ a,b) # define utf8_hop Perl_utf8_hop -# define utf8_hop_back Perl_utf8_hop_back # define utf8_hop_back_overshoot Perl_utf8_hop_back_overshoot -# define utf8_hop_forward Perl_utf8_hop_forward # define utf8_hop_forward_overshoot Perl_utf8_hop_forward_overshoot # define utf8_hop_overshoot Perl_utf8_hop_overshoot -# define utf8_hop_safe Perl_utf8_hop_safe # define utf8_length(a,b) Perl_utf8_length(aTHX_ a,b) # define utf8_to_bytes(a,b) Perl_utf8_to_bytes(aTHX_ a,b) # define utf8_to_bytes_(a,b,c,d) Perl_utf8_to_bytes_(aTHX_ a,b,c,d) # define utf8_to_bytes_new_pv(a,b,c) Perl_utf8_to_bytes_new_pv(aTHX_ a,b,c) # define utf8_to_bytes_overwrite(a,b) Perl_utf8_to_bytes_overwrite(aTHX_ a,b) # define utf8_to_bytes_temp_pv(a,b) Perl_utf8_to_bytes_temp_pv(aTHX_ a,b) -# define utf8_to_uv Perl_utf8_to_uv -# define utf8_to_uv_errors Perl_utf8_to_uv_errors -# define utf8_to_uv_flags Perl_utf8_to_uv_flags # define utf8_to_uv_msgs Perl_utf8_to_uv_msgs # define utf8_to_uv_msgs_helper_ Perl_utf8_to_uv_msgs_helper_ # define utf8_to_uv_or_die Perl_utf8_to_uv_or_die -# define utf8n_to_uvchr Perl_utf8n_to_uvchr -# define utf8n_to_uvchr_error Perl_utf8n_to_uvchr_error # define utf8n_to_uvchr_msgs Perl_utf8n_to_uvchr_msgs # define uv_to_utf8(a,b) Perl_uv_to_utf8(aTHX_ a,b) # define uv_to_utf8_flags(a,b,c) Perl_uv_to_utf8_flags(aTHX_ a,b,c) -# define uv_to_utf8_msgs(a,b,c,d) Perl_uv_to_utf8_msgs(aTHX_ a,b,c,d) # define uvoffuni_to_utf8_flags_msgs(a,b,c,d) Perl_uvoffuni_to_utf8_flags_msgs(aTHX_ a,b,c,d) # define valid_identifier_pve(a,b,c) Perl_valid_identifier_pve(aTHX_ a,b,c) # define valid_identifier_pvn(a,b,c) Perl_valid_identifier_pvn(aTHX_ a,b,c) # define valid_identifier_sv(a) Perl_valid_identifier_sv(aTHX_ a) -# define valid_utf8_to_uvchr Perl_valid_utf8_to_uvchr +# define valid_utf8_to_uv Perl_valid_utf8_to_uv +# define variant_byte_number Perl_variant_byte_number # define vcmp(a,b) Perl_vcmp(aTHX_ a,b) # define vcroak(a,b) Perl_vcroak(aTHX_ a,b) # define vdeb(a,b) Perl_vdeb(aTHX_ a,b) @@ -857,9 +839,6 @@ # define pad_setsv(a,b) Perl_pad_setsv(aTHX_ a,b) # define pad_sv(a) Perl_pad_sv(aTHX_ a) # endif -# if !defined(EBCDIC) -# define variant_byte_number Perl_variant_byte_number -# endif # if defined(F_FREESP) && !defined(HAS_CHSIZE) && !defined(HAS_TRUNCATE) # define my_chsize(a,b) Perl_my_chsize(aTHX_ a,b) # endif @@ -893,16 +872,23 @@ # define sv_setpvf_nocontext Perl_sv_setpvf_nocontext # define warn_nocontext Perl_warn_nocontext # define warner_nocontext Perl_warner_nocontext -# endif /* defined(MULTIPLICITY) */ +# else /* if !defined(MULTIPLICITY) */ +/* undefined symbols, point them back at the usual ones */ +# define Perl_deb_nocontext Perl_deb +# define Perl_form_nocontext Perl_form +# define Perl_load_module_nocontext Perl_load_module +# define Perl_mess_nocontext Perl_mess +# define Perl_newSVpvf_nocontext Perl_newSVpvf +# define Perl_sv_catpvf_nocontext Perl_sv_catpvf +# define Perl_sv_catpvf_mg_nocontext Perl_sv_catpvf_mg +# define Perl_sv_setpvf_nocontext Perl_sv_setpvf +# define Perl_sv_setpvf_mg_nocontext Perl_sv_setpvf_mg +# define Perl_warn_nocontext Perl_warn +# define Perl_warner_nocontext Perl_warner +# endif /* !defined(MULTIPLICITY) */ # if !defined(MULTIPLICITY) || defined(PERL_CORE) || \ defined(PERL_WANT_VARARGS) -# define ck_warner(a,...) Perl_ck_warner(aTHX_ a,__VA_ARGS__) -# define ck_warner_d(a,...) Perl_ck_warner_d(aTHX_ a,__VA_ARGS__) -# define croak(...) Perl_croak(aTHX_ __VA_ARGS__) # define deb(...) Perl_deb(aTHX_ __VA_ARGS__) -# define die(...) Perl_die(aTHX_ __VA_ARGS__) -# define dump_indent(a,b,...) Perl_dump_indent(aTHX_ a,b,__VA_ARGS__) -# define fatal_warner(a,...) Perl_fatal_warner(aTHX_ a,__VA_ARGS__) # define form(...) Perl_form(aTHX_ __VA_ARGS__) # define load_module(a,b,...) Perl_load_module(aTHX_ a,b,__VA_ARGS__) # define mess(...) Perl_mess(aTHX_ __VA_ARGS__) @@ -924,13 +910,14 @@ # endif # endif # if !defined(NO_MATHOMS) -# define sv_nolocking(a) Perl_sv_nolocking(aTHX_ a) -# define sv_nounlocking(a) Perl_sv_nounlocking(aTHX_ a) # define utf8_to_uvchr(a,b) Perl_utf8_to_uvchr(aTHX_ a,b) # define utf8_to_uvuni(a,b) Perl_utf8_to_uvuni(aTHX_ a,b) # define utf8n_to_uvuni(a,b,c,d) Perl_utf8n_to_uvuni(aTHX_ a,b,c,d) # define uvuni_to_utf8(a,b) Perl_uvuni_to_utf8(aTHX_ a,b) # endif +# if defined(PERL_ANY_COW) +# define sv_setsv_cow(a,b) Perl_sv_setsv_cow(aTHX_ a,b) +# endif # if defined(PERL_CORE) # define PerlLIO_dup2_cloexec(a,b) Perl_PerlLIO_dup2_cloexec(aTHX_ a,b) # define PerlLIO_dup_cloexec(a) Perl_PerlLIO_dup_cloexec(aTHX_ a) @@ -1054,9 +1041,11 @@ # define magic_getuvar(a,b) Perl_magic_getuvar(aTHX_ a,b) # define magic_getvec(a,b) Perl_magic_getvec(aTHX_ a,b) # define magic_killbackrefs(a,b) Perl_magic_killbackrefs(aTHX_ a,b) +# define magic_methcall(a,b,c,d,...) Perl_magic_methcall(aTHX_ a,b,c,d,__VA_ARGS__) # define magic_nextpack(a,b,c) Perl_magic_nextpack(aTHX_ a,b,c) # define magic_regdata_cnt(a,b) Perl_magic_regdata_cnt(aTHX_ a,b) # define magic_regdatum_get(a,b) Perl_magic_regdatum_get(aTHX_ a,b) +# define magic_regdatum_set(a,b) Perl_magic_regdatum_set(aTHX_ a,b) # define magic_scalarpack(a,b) Perl_magic_scalarpack(aTHX_ a,b) # define magic_set(a,b) Perl_magic_set(aTHX_ a,b) # define magic_set_all_env(a,b) Perl_magic_set_all_env(aTHX_ a,b) @@ -1100,6 +1089,7 @@ # define newSVavdefelem(a,b,c) Perl_newSVavdefelem(aTHX_ a,b,c) # define newXS_deffile(a,b) Perl_newXS_deffile(aTHX_ a,b) # define newXS_len_flags(a,b,c,d,e,f,g) Perl_newXS_len_flags(aTHX_ a,b,c,d,e,f,g) +# define new_block_statement(a,b) Perl_new_block_statement(aTHX_ a,b) # define nextargv(a,b) Perl_nextargv(aTHX_ a,b) # define no_bareword_filehandle(a) Perl_no_bareword_filehandle(aTHX_ a) # define noperl_die Perl_noperl_die @@ -1107,8 +1097,8 @@ # define oopsAV(a) Perl_oopsAV(aTHX_ a) # define oopsHV(a) Perl_oopsHV(aTHX_ a) # define op_unscope(a) Perl_op_unscope(aTHX_ a) -# define package(a) Perl_package(aTHX_ a) -# define package_version(a) Perl_package_version(aTHX_ a) +# define output_non_portable(a) Perl_output_non_portable(aTHX_ a) +# define package(a,b) Perl_package(aTHX_ a,b) # define pad_add_weakref(a) Perl_pad_add_weakref(aTHX_ a) # define pad_block_start(a) Perl_pad_block_start(aTHX_ a) # define pad_fixup_inner_anons(a,b,c) Perl_pad_fixup_inner_anons(aTHX_ a,b,c) @@ -1153,11 +1143,13 @@ # define sighandler1 Perl_sighandler1 # define sighandler3 Perl_sighandler3 # define sub_crush_depth(a) Perl_sub_crush_depth(aTHX_ a) +# define subsignature_append_fence_op(a) Perl_subsignature_append_fence_op(aTHX_ a) +# define subsignature_append_named(a,b,c,d) Perl_subsignature_append_named(aTHX_ a,b,c,d) # define subsignature_append_positional(a,b,c) Perl_subsignature_append_positional(aTHX_ a,b,c) # define subsignature_append_slurpy(a,b) Perl_subsignature_append_slurpy(aTHX_ a,b) # define subsignature_finish() Perl_subsignature_finish(aTHX) # define subsignature_start() Perl_subsignature_start(aTHX) -# define sv_2num(a) Perl_sv_2num(aTHX_ a) +# define sv_2num_flags(a,b) Perl_sv_2num_flags(aTHX_ a,b) # define sv_clean_all() Perl_sv_clean_all(aTHX) # define sv_clean_objs() Perl_sv_clean_objs(aTHX) # define sv_del_backref(a,b) Perl_sv_del_backref(aTHX_ a,b) @@ -1166,6 +1158,7 @@ # define sv_pvutf8n_force_wrapper(a,b,c) Perl_sv_pvutf8n_force_wrapper(aTHX_ a,b,c) # define sv_resetpvn(a,b,c) Perl_sv_resetpvn(aTHX_ a,b,c) # define sv_sethek(a,b) Perl_sv_sethek(aTHX_ a,b) +# define tied_method(a,b,c,d,e,...) Perl_tied_method(aTHX_ a,b,c,d,e,__VA_ARGS__) # define tmps_grow_p(a) Perl_tmps_grow_p(aTHX_ a) # define utilize(a,b,c,d,e) Perl_utilize(aTHX_ a,b,c,d,e) # define vivify_ref(a,b) Perl_vivify_ref(aTHX_ a,b) @@ -1217,18 +1210,6 @@ defined(SOCK_DGRAM) ) # define PerlSock_socketpair_cloexec(a,b,c,d) Perl_PerlSock_socketpair_cloexec(aTHX_ a,b,c,d) # endif -# if defined(_MSC_VER) -# define magic_regdatum_set(a,b) Perl_magic_regdatum_set(aTHX_ a,b) -# else -# define magic_regdatum_set(a,b) Perl_magic_regdatum_set(aTHX_ a,b) -# endif -# if !defined(MULTIPLICITY) || defined(PERL_CORE) || \ - defined(PERL_WANT_VARARGS) -# define tied_method(a,b,c,d,e,...) Perl_tied_method(aTHX_ a,b,c,d,e,__VA_ARGS__) -# if defined(PERL_IN_REGCOMP_C) -# define re_croak(a,...) S_re_croak(aTHX_ a,__VA_ARGS__) -# endif -# endif # if defined(PERL_DEBUG_READONLY_COW) # define sv_buf_to_ro(a) Perl_sv_buf_to_ro(aTHX_ a) # endif @@ -1253,7 +1234,9 @@ # endif # if defined(PERL_IN_CLASS_C) || defined(PERL_IN_GLOBALS_C) || \ defined(PERL_IN_OP_C) || defined(PERL_IN_PEEP_C) +# define ck_aassign(a) Perl_ck_aassign(aTHX_ a) # define ck_anoncode(a) Perl_ck_anoncode(aTHX_ a) +# define ck_anonhash(a) Perl_ck_anonhash(aTHX_ a) # define ck_backtick(a) Perl_ck_backtick(aTHX_ a) # define ck_bitop(a) Perl_ck_bitop(aTHX_ a) # define ck_classname(a) Perl_ck_classname(aTHX_ a) @@ -1330,6 +1313,7 @@ # define deb_curcv(a) S_deb_curcv(aTHX_ a) # define debprof(a) S_debprof(aTHX_ a) # define pm_description(a) S_pm_description(aTHX_ a) +# define pv_display_flags(a,b,c,d,e,f) S_pv_display_flags(aTHX_ a,b,c,d,e,f) # define sequence_num(a) S_sequence_num(aTHX_ a) # endif # if defined(PERL_IN_GV_C) @@ -1458,20 +1442,21 @@ # if defined(PERL_IN_MG_C) || defined(PERL_IN_PP_C) # define translate_substr_offsets Perl_translate_substr_offsets # endif +# if defined(PERL_IN_MG_C) || defined(PERL_IN_SV_C) +# define mg_free_struct(a,b) Perl_mg_free_struct(aTHX_ a,b) +# endif # if defined(PERL_IN_MRO_C) # define mro_clean_isarev(a,b,c,d,e,f) S_mro_clean_isarev(aTHX_ a,b,c,d,e,f) # define mro_gather_and_rename(a,b,c,d,e) S_mro_gather_and_rename(aTHX_ a,b,c,d,e) # define mro_get_linear_isa_dfs(a,b) S_mro_get_linear_isa_dfs(aTHX_ a,b) # endif -# if defined(PERL_IN_NUMERIC_C) -# define output_non_portable(a) S_output_non_portable(aTHX_ a) -# endif # if defined(PERL_IN_OP_C) # define apply_attrs(a,b,c) S_apply_attrs(aTHX_ a,b,c) # define apply_attrs_my(a,b,c,d) S_apply_attrs_my(aTHX_ a,b,c,d) # define assignment_type(a) S_assignment_type(aTHX_ a) # define bad_type_gv(a,b,c,d) S_bad_type_gv(aTHX_ a,b,c,d) # define bad_type_pv(a,b,c,d) S_bad_type_pv(aTHX_ a,b,c,d) +# define check_alt_hash_fields_hekify(a) S_check_alt_hash_fields_hekify(aTHX_ a) # define clear_special_blocks(a,b,c) S_clear_special_blocks(aTHX_ a,b,c) # define cop_free(a) S_cop_free(aTHX_ a) # define dup_attrlist(a) S_dup_attrlist(aTHX_ a) @@ -1481,6 +1466,7 @@ # define forget_pmop(a) S_forget_pmop(aTHX_ a) # define gen_constant_list(a) S_gen_constant_list(aTHX_ a) # define inplace_aassign(a) S_inplace_aassign(aTHX_ a) +# define is_dup_mode S_is_dup_mode # define is_handle_constructor S_is_handle_constructor # define is_standard_filehandle_name S_is_standard_filehandle_name # define listkids(a) S_listkids(aTHX_ a) @@ -1508,6 +1494,9 @@ # define too_few_arguments_pv(a,b,c) S_too_few_arguments_pv(aTHX_ a,b,c) # define too_many_arguments_pv(a,b,c) S_too_many_arguments_pv(aTHX_ a,b,c) # define voidnonfinal(a) S_voidnonfinal(aTHX_ a) +# if defined(DEBUGGING) +# define get_displayable_tr_operand(a,b,c) S_get_displayable_tr_operand(aTHX_ a,b,c) +# endif # endif /* defined(PERL_IN_OP_C) */ # if defined(PERL_IN_OP_C) || defined(PERL_IN_PAD_C) # define PadnameIN_SCOPE S_PadnameIN_SCOPE @@ -1569,7 +1558,7 @@ # define lossless_NV_to_IV S_lossless_NV_to_IV # endif # if defined(PERL_IN_PP_C) || defined(PERL_IN_UTF8_C) -# define _to_upper_title_latin1(a,b,c,d) Perl__to_upper_title_latin1(aTHX_ a,b,c,d) +# define to_upper_title_latin1_(a,b,c,d) Perl_to_upper_title_latin1_(aTHX_ a,b,c,d) # endif # if defined(PERL_IN_PP_CTL_C) # define check_type_and_open(a) S_check_type_and_open(aTHX_ a) @@ -1650,6 +1639,9 @@ # define dooneliner(a,b) S_dooneliner(aTHX_ a,b) # endif # endif +# if defined(PERL_IN_REGCOMP_C) +# define re_croak(a,...) S_re_croak(aTHX_ a,__VA_ARGS__) +# endif # if defined(PERL_IN_REGCOMP_INVLIST_C) && !defined(PERL_EXT_RE_BUILD) # define initialize_invlist_guts(a,b) S_initialize_invlist_guts(aTHX_ a,b) # endif @@ -1657,9 +1649,58 @@ # define save_pushptri32ptr(a,b,c,d) S_save_pushptri32ptr(aTHX_ a,b,c,d) # define save_scalar_at(a,b) S_save_scalar_at(aTHX_ a,b) # endif +# if defined(PERL_IN_SV_C) +# define F0convert S_F0convert +# define anonymise_cv_maybe(a,b) S_anonymise_cv_maybe(aTHX_ a,b) +# define assert_uft8_cache_coherent(a,b,c,d) S_assert_uft8_cache_coherent(aTHX_ a,b,c,d) +# define croak_sv_setsv_flags(a,b) S_croak_sv_setsv_flags(aTHX_ a,b) +# define curse(a,b) S_curse(aTHX_ a,b) +# define expect_number(a) S_expect_number(aTHX_ a) +# define find_array_subscript(a,b) S_find_array_subscript(aTHX_ a,b) +# define find_hash_subscript(a,b) S_find_hash_subscript(aTHX_ a,b) +# define find_uninit_var(a,b,c,d) S_find_uninit_var(aTHX_ a,b,c,d) +# define glob_2number(a) S_glob_2number(aTHX_ a) +# define glob_assign_glob(a,b,c) S_glob_assign_glob(aTHX_ a,b,c) +# define not_a_number(a) S_not_a_number(aTHX_ a) +# define not_incrementable(a) S_not_incrementable(aTHX_ a) +# define ptr_table_find S_ptr_table_find +# define sv_2iuv_common(a) S_sv_2iuv_common(aTHX_ a) +# define sv_add_arena(a,b,c) S_sv_add_arena(aTHX_ a,b,c) +# define sv_display(a,b,c) S_sv_display(aTHX_ a,b,c) +# define sv_numcmp_common(a,b,c,d,e) S_sv_numcmp_common(aTHX_ a,b,c,d,e) +# define sv_pos_b2u_midway(a,b,c,d) S_sv_pos_b2u_midway(aTHX_ a,b,c,d) +# define sv_pos_u2b_cached(a,b,c,d,e,f,g) S_sv_pos_u2b_cached(aTHX_ a,b,c,d,e,f,g) +# define sv_pos_u2b_forwards S_sv_pos_u2b_forwards +# define sv_pos_u2b_midway S_sv_pos_u2b_midway +# define sv_unglob(a,b) S_sv_unglob(aTHX_ a,b) +# define utf8_mg_len_cache_update(a,b,c) S_utf8_mg_len_cache_update(aTHX_ a,b,c) +# define utf8_mg_pos_cache_update(a,b,c,d,e) S_utf8_mg_pos_cache_update(aTHX_ a,b,c,d,e) +# define visit(a,b,c) S_visit(aTHX_ a,b,c) +# if defined(DEBUGGING) +# define del_sv(a) S_del_sv(aTHX_ a) +# define sv_mark_arenas() Perl_sv_mark_arenas(aTHX) +# define sv_sweep_arenas() Perl_sv_sweep_arenas(aTHX) +# endif +# if !defined(NV_PRESERVES_UV) +# if defined(DEBUGGING) +# define sv_2iuv_non_preserve(a,b) S_sv_2iuv_non_preserve(aTHX_ a,b) +# else +# define sv_2iuv_non_preserve(a) S_sv_2iuv_non_preserve(aTHX_ a) +# endif +# endif +# if defined(PERL_DEBUG_READONLY_COW) +# define sv_buf_to_rw(a) S_sv_buf_to_rw(aTHX_ a) +# endif +# if defined(USE_ITHREADS) +# define sv_dup_common(a,b) S_sv_dup_common(aTHX_ a,b) +# define sv_dup_hvaux(a,b,c) S_sv_dup_hvaux(aTHX_ a,b,c) +# define sv_dup_inc_multiple(a,b,c,d) S_sv_dup_inc_multiple(aTHX_ a,b,c,d) +# define unreferenced_to_tmp_stack(a) S_unreferenced_to_tmp_stack(aTHX_ a) +# endif +# endif /* defined(PERL_IN_SV_C) */ # if defined(PERL_IN_TOKE_C) # define ao(a) S_ao(aTHX_ a) -# define check_uni() S_check_uni(aTHX) +# define check_unary() S_check_unary(aTHX) # define checkcomma(a,b,c) S_checkcomma(aTHX_ a,b,c) # define filter_gets(a,b) S_filter_gets(aTHX_ a,b) # define find_in_my_stash(a,b) S_find_in_my_stash(aTHX_ a,b) @@ -1668,14 +1709,16 @@ # define force_next(a) S_force_next(aTHX_ a) # define force_strict_version(a) S_force_strict_version(aTHX_ a) # define force_version(a,b) S_force_version(aTHX_ a,b) -# define force_word(a,b,c,d) S_force_word(aTHX_ a,b,c,d) +# define force_word(a,b,c) S_force_word(aTHX_ a,b,c) # define get_and_check_backslash_N_name_wrapper(a,b) S_get_and_check_backslash_N_name_wrapper(aTHX_ a,b) # define incline(a,b) S_incline(aTHX_ a,b) # define intuit_method(a,b,c) S_intuit_method(aTHX_ a,b,c) -# define intuit_more(a,b) S_intuit_more(aTHX_ a,b) +# define intuit_more(a,b,c,d,e) S_intuit_more(aTHX_ a,b,c,d,e) +# define is_existing_identifier(a,b,c,d) S_is_existing_identifier(aTHX_ a,b,c,d) # define lop(a,b,c,d) S_lop(aTHX_ a,b,c,d) # define missingterm(a,b) S_missingterm(aTHX_ a,b) -# define parse_ident(a,b,c,d,e,f) S_parse_ident(aTHX_ a,b,c,d,e,f) +# define parse_ident(a,b,c,d,e,f,g) S_parse_ident(aTHX_ a,b,c,d,e,f,g) +# define parse_ident_no_copy(a,b,c,d,e) S_parse_ident_no_copy(aTHX_ a,b,c,d,e) # define pending_ident() S_pending_ident(aTHX) # define scan_const(a) S_scan_const(aTHX_ a) # define scan_formline(a) S_scan_formline(aTHX_ a) @@ -1709,7 +1752,6 @@ # define sv_derived_from_svpvn(a,b,c,d,e) S_sv_derived_from_svpvn(aTHX_ a,b,c,d,e) # endif # if defined(PERL_IN_UTF8_C) -# define _to_utf8_case(a,b,c,d,e,f,g,h,i) S__to_utf8_case(aTHX_ a,b,c,d,e,f,g,h,i) # define check_locale_boundary_crossing(a,b,c,d) S_check_locale_boundary_crossing(aTHX_ a,b,c,d) # define does_utf8_overflow S_does_utf8_overflow # define isFF_overlong S_isFF_overlong @@ -1717,6 +1759,7 @@ # define new_msg_hv(a,b,c) S_new_msg_hv(aTHX_ a,b,c) # define to_case_cp_list(a,b,c,d,e,f,g,h) S_to_case_cp_list(aTHX_ a,b,c,d,e,f,g,h) # define to_lower_latin1 S_to_lower_latin1 +# define to_utf8_case_(a,b,c,d,e,f,g,h,i) S_to_utf8_case_(aTHX_ a,b,c,d,e,f,g,h,i) # define turkic_fc(a,b,c,d) S_turkic_fc(aTHX_ a,b,c,d) # define turkic_lc(a,b,c,d) S_turkic_lc(aTHX_ a,b,c,d) # define turkic_uc(a,b,c,d) S_turkic_uc(aTHX_ a,b,c,d) @@ -1728,7 +1771,6 @@ # if defined(PERL_IN_UTIL_C) # define ckwarn_common(a) S_ckwarn_common(aTHX_ a) # define mess_alloc() S_mess_alloc(aTHX) -# define ptr_hash S_ptr_hash # define with_queued_errors(a) S_with_queued_errors(aTHX_ a) # if defined(PERL_MEM_LOG) && !defined(PERL_MEM_LOG_NOIMPL) # define mem_log_common S_mem_log_common @@ -1769,17 +1811,66 @@ # define quadmath_format_needed Perl_quadmath_format_needed # define quadmath_format_valid Perl_quadmath_format_valid # endif +# if defined(USE_THREADS) +# define Perl_sv_2num(mTHX,a) sv_2num(a) +# else +# define Perl_sv_2num(a) sv_2num(a) +# endif # if defined(WIN32) # define get_win32_message_utf8ness(a) Perl_get_win32_message_utf8ness(aTHX_ a) # else # define do_exec3(a,b,c) Perl_do_exec3(aTHX_ a,b,c) # endif -# endif /* defined(PERL_CORE) */ +# else /* if !defined(PERL_CORE) */ +/* Compatibility stubs. Compile extensions with -DPERL_NOCOMPAT to + * disable them. + */ +# define sv_setptrobj(rv,ptr,name) sv_setref_iv(rv,name,PTR2IV(ptr)) +# define sv_setptrref(rv,ptr) sv_setref_iv(rv,NULL,PTR2IV(ptr)) +# if !defined(PERL_NOCOMPAT) + +/* Compatibility for this renamed function. */ +# define perl_atexit(a,b) Perl_call_atexit(aTHX_ a,b) + +/* Compatibility for these functions that had a 'perl_' prefix before + * 'Perl_' became the standard */ +# define perl_call_argv(a,b,c) Perl_call_argv(aTHX_ a,b,c) +# define perl_call_method(a,b) Perl_call_method(aTHX_ a,b) +# define perl_call_pv(a,b) Perl_call_pv(aTHX_ a,b) +# define perl_call_sv(a,b) Perl_call_sv(aTHX_ a,b) +# define perl_eval_pv(a,b) Perl_eval_pv(aTHX_ a,b) +# define perl_eval_sv(a,b) Perl_eval_sv(aTHX_ a,b) +# define perl_get_av(a,b) Perl_get_av(aTHX_ a,b) +# define perl_get_cv(a,b) Perl_get_cv(aTHX_ a,b) +# define perl_get_hv(a,b) Perl_get_hv(aTHX_ a,b) +# define perl_get_sv(a,b) Perl_get_sv(aTHX_ a,b) +# define perl_init_i18nl10n(a) Perl_init_i18nl10n(aTHX_ a) +# define perl_require_pv(a) Perl_require_pv(aTHX_ a) + +/* Before C99, macros could not wrap varargs functions. This + provides a set of compatibility functions that don't take an + extra argument but grab the context pointer using the macro dTHX. + */ + +# if defined(MULTIPLICITY) && !defined(PERL_WANT_VARARGS) +# define deb Perl_deb_nocontext +# define form Perl_form_nocontext +# define load_module Perl_load_module_nocontext +# define mess Perl_mess_nocontext +# define newSVpvf Perl_newSVpvf_nocontext +# define sv_catpvf Perl_sv_catpvf_nocontext +# define sv_catpvf_mg Perl_sv_catpvf_mg_nocontext +# define sv_setpvf Perl_sv_setpvf_nocontext +# define sv_setpvf_mg Perl_sv_setpvf_mg_nocontext +# define warn Perl_warn_nocontext +# define warner Perl_warner_nocontext +# endif /* defined(MULTIPLICITY) && !defined(PERL_WANT_VARARGS) */ +# endif /* !defined(PERL_NOCOMPAT) */ +# endif /* !defined(PERL_CORE) */ # if defined(PERL_CORE) || defined(PERL_EXT) -# define _byte_dump_string(a,b,c) Perl__byte_dump_string(aTHX_ a,b,c) -# define _inverse_folds(a,b,c) Perl__inverse_folds(aTHX_ a,b,c) # define append_utf8_from_native_byte Perl_append_utf8_from_native_byte # define av_reify(a) Perl_av_reify(aTHX_ a) +# define byte_dump_string_(a,b,c) Perl_byte_dump_string_(aTHX_ a,b,c) # define cntrl_to_mnemonic Perl_cntrl_to_mnemonic # define current_re_engine() Perl_current_re_engine(aTHX) # define cv_ckproto_len_flags(a,b,c,d,e) Perl_cv_ckproto_len_flags(aTHX_ a,b,c,d,e) @@ -1789,13 +1880,13 @@ # define get_deprecated_property_msg Perl_get_deprecated_property_msg # define get_prop_definition(a) Perl_get_prop_definition(aTHX_ a) # define get_prop_values Perl_get_prop_values +# define inverse_folds_(a,b,c) Perl_inverse_folds_(aTHX_ a,b,c) # define load_charnames(a,b,c,d) Perl_load_charnames(aTHX_ a,b,c,d) # define mbtowc_(a,b,c) Perl_mbtowc_(aTHX_ a,b,c) # define mg_find_mglob(a) Perl_mg_find_mglob(aTHX_ a) # define multiconcat_stringify(a) Perl_multiconcat_stringify(aTHX_ a) # define multideref_stringify(a,b) Perl_multideref_stringify(aTHX_ a,b) -# define op_clear(a) Perl_op_clear(aTHX_ a) -# define qerror(a) Perl_qerror(aTHX_ a) +# define parse_ident_msg(a,b,c,d,e) Perl_parse_ident_msg(aTHX_ a,b,c,d,e) # define reg_named_buff(a,b,c,d) Perl_reg_named_buff(aTHX_ a,b,c,d) # define reg_named_buff_iter(a,b,c) Perl_reg_named_buff_iter(aTHX_ a,b,c) # define reg_numbered_buff_fetch(a,b,c) Perl_reg_numbered_buff_fetch(aTHX_ a,b,c) @@ -1822,18 +1913,15 @@ # if !defined(HAS_MEMRCHR) # define my_memrchr S_my_memrchr # endif -# if defined(PERL_ANY_COW) -# define sv_setsv_cow(a,b) Perl_sv_setsv_cow(aTHX_ a,b) -# endif # if defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || \ defined(PERL_IN_PP_C) || defined(PERL_IN_REGCOMP_ANY) || \ defined(PERL_IN_REGEXEC_C) || defined(PERL_IN_TOKE_C) || \ defined(PERL_IN_UTF8_C) -# define _invlist_contains_cp S__invlist_contains_cp -# define _invlist_len S__invlist_len -# define _invlist_search Perl__invlist_search # define get_invlist_offset_addr S_get_invlist_offset_addr # define invlist_array S_invlist_array +# define invlist_contains_cp_ S_invlist_contains_cp_ +# define invlist_len_ S_invlist_len_ +# define invlist_search_ Perl_invlist_search_ # define is_invlist S_is_invlist # endif # if defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || \ @@ -1845,12 +1933,12 @@ # endif # if defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || \ defined(PERL_IN_REGCOMP_ANY) || defined(PERL_IN_UTF8_C) -# define _add_range_to_invlist(a,b,c) Perl__add_range_to_invlist(aTHX_ a,b,c) -# define _invlist_intersection_maybe_complement_2nd(a,b,c,d) Perl__invlist_intersection_maybe_complement_2nd(aTHX_ a,b,c,d) -# define _invlist_invert(a) Perl__invlist_invert(aTHX_ a) -# define _invlist_union_maybe_complement_2nd(a,b,c,d) Perl__invlist_union_maybe_complement_2nd(aTHX_ a,b,c,d) -# define _new_invlist(a) Perl__new_invlist(aTHX_ a) -# define _setup_canned_invlist(a,b,c) Perl__setup_canned_invlist(aTHX_ a,b,c) +# define add_range_to_invlist_(a,b,c) Perl_add_range_to_invlist_(aTHX_ a,b,c) +# define invlist_intersection_maybe_complement_2nd_(a,b,c,d) Perl_invlist_intersection_maybe_complement_2nd_(aTHX_ a,b,c,d) +# define invlist_invert_(a) Perl_invlist_invert_(aTHX_ a) +# define invlist_union_maybe_complement_2nd_(a,b,c,d) Perl_invlist_union_maybe_complement_2nd_(aTHX_ a,b,c,d) +# define new_invlist_(a) Perl_new_invlist_(aTHX_ a) +# define setup_canned_invlist_(a,b,c) Perl_setup_canned_invlist_(aTHX_ a,b,c) # endif # if defined(PERL_IN_DQUOTE_C) || defined(PERL_IN_REGCOMP_C) || \ defined(PERL_IN_TOKE_C) @@ -1865,7 +1953,7 @@ # endif # if defined(PERL_IN_DUMP_C) || defined(PERL_IN_OP_C) || \ defined(PERL_IN_REGCOMP_ANY) -# define _invlist_dump(a,b,c,d) Perl__invlist_dump(aTHX_ a,b,c,d) +# define invlist_dump_(a,b,c,d) Perl_invlist_dump_(aTHX_ a,b,c,d) # endif # if defined(PERL_IN_GV_C) || defined(PERL_IN_UNIVERSAL_C) # define gv_stashsvpvn_cached(a,b,c,d) Perl_gv_stashsvpvn_cached(aTHX_ a,b,c,d) @@ -1878,8 +1966,8 @@ # endif # if defined(PERL_IN_PERL_C) || defined(PERL_IN_REGCOMP_ANY) || \ defined(PERL_IN_UTF8_C) -# define _invlistEQ(a,b,c) Perl__invlistEQ(aTHX_ a,b,c) -# define _new_invlist_C_array(a) Perl__new_invlist_C_array(aTHX_ a) +# define invlistEQ_(a,b,c) Perl_invlistEQ_(aTHX_ a,b,c) +# define new_invlist_C_array_(a) Perl_new_invlist_C_array_(aTHX_ a) # endif # if defined(PERL_IN_PP_C) || defined(PERL_IN_REGCOMP_ANY) || \ defined(PERL_IN_TOKE_C) || defined(PERL_IN_UNIVERSAL_C) @@ -1939,7 +2027,7 @@ # define reg_la_OPFAIL(a,b,c) S_reg_la_OPFAIL(aTHX_ a,b,c) # define reg_node(a,b) S_reg_node(aTHX_ a,b) # define reg_scan_name(a,b) S_reg_scan_name(aTHX_ a,b) -# define reg_skipcomment S_reg_skipcomment +# define reg_skipcomment(a,b,c,d,e) S_reg_skipcomment(aTHX_ a,b,c,d,e) # define regatom(a,b,c) S_regatom(aTHX_ a,b,c) # define regbranch(a,b,c,d) S_regbranch(aTHX_ a,b,c,d) # define regclass(a,b,c,d,e,f,g,h,i) S_regclass(aTHX_ a,b,c,d,e,f,g,h,i) @@ -1950,6 +2038,7 @@ # define regpnode(a,b,c) S_regpnode(aTHX_ a,b,c) # define regtail(a,b,c,d) S_regtail(aTHX_ a,b,c,d) # define set_regex_pv(a,b) S_set_regex_pv(aTHX_ a,b) +# define skip_bracketed_white_space(a,b,c,d,e) S_skip_bracketed_white_space(aTHX_ a,b,c,d,e) # define skip_to_be_ignored_text(a,b,c) S_skip_to_be_ignored_text(aTHX_ a,b,c) # define ssc_finalize(a,b) S_ssc_finalize(aTHX_ a,b) # if defined(DEBUGGING) @@ -1970,7 +2059,7 @@ # endif # if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) || \ defined(PERL_IN_UTF8_C) -# define _to_fold_latin1 Perl__to_fold_latin1 +# define to_fold_latin1_ Perl_to_fold_latin1_ # endif # if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_TOKE_C) # define regcurly Perl_regcurly @@ -1985,9 +2074,9 @@ # define regdump_intflags(a,b) S_regdump_intflags(aTHX_ a,b) # endif # if defined(PERL_IN_REGCOMP_INVLIST_C) && !defined(PERL_EXT_RE_BUILD) -# define _append_range_to_invlist(a,b,c) S__append_range_to_invlist(aTHX_ a,b,c) -# define _invlist_array_init S__invlist_array_init +# define append_range_to_invlist_(a,b,c) S_append_range_to_invlist_(aTHX_ a,b,c) # define get_invlist_previous_index_addr S_get_invlist_previous_index_addr +# define invlist_array_init_ S_invlist_array_init_ # define invlist_clear(a) S_invlist_clear(aTHX_ a) # define invlist_max S_invlist_max # define invlist_previous_index S_invlist_previous_index @@ -2048,12 +2137,13 @@ # if defined(DEBUGGING) # define debug_start_match(a,b,c,d,e) S_debug_start_match(aTHX_ a,b,c,d,e) # define dump_exec_pos(a,b,c,d,e,f,g) S_dump_exec_pos(aTHX_ a,b,c,d,e,f,g) -# if !defined(MULTIPLICITY) || defined(PERL_CORE) || \ - defined(PERL_WANT_VARARGS) -# define re_exec_indentf(a,...) Perl_re_exec_indentf(aTHX_ a,__VA_ARGS__) -# endif +# define re_exec_indentf(a,...) Perl_re_exec_indentf(aTHX_ a,__VA_ARGS__) # endif # endif /* defined(PERL_IN_REGEXEC_C) */ +# if !defined(USE_THREADS) +# define Perl_utf16_to_utf8(a,b,c,d) utf16_to_utf8(a,b,c,d) +# define Perl_utf16_to_utf8_reversed(a,b,c,d) utf16_to_utf8_reversed(a,b,c,d) +# endif # endif /* defined(PERL_CORE) || defined(PERL_EXT) */ # if defined(PERL_CORE) || defined(PERL_USE_VOLATILE_API) # define finalize_optree(a) Perl_finalize_optree(aTHX_ a) @@ -2084,78 +2174,23 @@ # define check_regnode_after(a,b) Perl_check_regnode_after(aTHX_ a,b) # define regnext(a) Perl_regnext(aTHX_ a) # define regnode_after(a,b) Perl_regnode_after(aTHX_ a,b) -# if defined(DEBUGGING) && ( defined(PERL_CORE) || defined(PERL_EXT) ) -# define debug_peep(a,b,c,d,e) Perl_debug_peep(aTHX_ a,b,c,d,e) -# define debug_show_study_flags(a,b,c) Perl_debug_show_study_flags(aTHX_ a,b,c) -# define debug_studydata(a,b,c,d,e,f,g) Perl_debug_studydata(aTHX_ a,b,c,d,e,f,g) -# define dumpuntil(a,b,c,d,e,f,g,h) Perl_dumpuntil(aTHX_ a,b,c,d,e,f,g,h) +# if defined(PERL_CORE) || defined(PERL_EXT) # define regprop(a,b,c,d,e) Perl_regprop(aTHX_ a,b,c,d,e) -# if !defined(MULTIPLICITY) || defined(PERL_CORE) || \ - defined(PERL_WANT_VARARGS) +# if defined(DEBUGGING) +# define debug_peep(a,b,c,d,e) Perl_debug_peep(aTHX_ a,b,c,d,e) +# define debug_show_study_flags(a,b,c) Perl_debug_show_study_flags(aTHX_ a,b,c) +# define debug_studydata(a,b,c,d,e,f,g) Perl_debug_studydata(aTHX_ a,b,c,d,e,f,g) +# define dumpuntil(a,b,c,d,e,f,g,h) Perl_dumpuntil(aTHX_ a,b,c,d,e,f,g,h) # define re_indentf(a,...) Perl_re_indentf(aTHX_ a,__VA_ARGS__) # define re_printf(...) Perl_re_printf(aTHX_ __VA_ARGS__) # endif -# endif /* defined(DEBUGGING) && - ( defined(PERL_CORE) || defined(PERL_EXT) ) */ -# if defined(PERL_EXT_RE_BUILD) -# if defined(PERL_CORE) || defined(PERL_EXT) +# if defined(PERL_EXT_RE_BUILD) # define get_re_gclass_aux_data(a,b,c,d,e,f) Perl_get_re_gclass_aux_data(aTHX_ a,b,c,d,e,f) +# else +# define get_regclass_aux_data(a,b,c,d,e,f) Perl_get_regclass_aux_data(aTHX_ a,b,c,d,e,f) # endif -# elif defined(PERL_CORE) || defined(PERL_EXT) -# define get_regclass_aux_data(a,b,c,d,e,f) Perl_get_regclass_aux_data(aTHX_ a,b,c,d,e,f) -# endif +# endif /* defined(PERL_CORE) || defined(PERL_EXT) */ # endif /* defined(PERL_IN_REGEX_ENGINE) */ -# if defined(PERL_IN_SV_C) -# define more_sv() Perl_more_sv(aTHX) -# if defined(PERL_CORE) -# define F0convert S_F0convert -# define anonymise_cv_maybe(a,b) S_anonymise_cv_maybe(aTHX_ a,b) -# define assert_uft8_cache_coherent(a,b,c,d) S_assert_uft8_cache_coherent(aTHX_ a,b,c,d) -# define croak_sv_setsv_flags(a,b) S_croak_sv_setsv_flags(aTHX_ a,b) -# define curse(a,b) S_curse(aTHX_ a,b) -# define expect_number(a) S_expect_number(aTHX_ a) -# define find_array_subscript(a,b) S_find_array_subscript(aTHX_ a,b) -# define find_hash_subscript(a,b) S_find_hash_subscript(aTHX_ a,b) -# define find_uninit_var(a,b,c,d) S_find_uninit_var(aTHX_ a,b,c,d) -# define glob_2number(a) S_glob_2number(aTHX_ a) -# define glob_assign_glob(a,b,c) S_glob_assign_glob(aTHX_ a,b,c) -# define not_a_number(a) S_not_a_number(aTHX_ a) -# define not_incrementable(a) S_not_incrementable(aTHX_ a) -# define ptr_table_find S_ptr_table_find -# define sv_2iuv_common(a) S_sv_2iuv_common(aTHX_ a) -# define sv_add_arena(a,b,c) S_sv_add_arena(aTHX_ a,b,c) -# define sv_display(a,b,c) S_sv_display(aTHX_ a,b,c) -# define sv_pos_b2u_midway(a,b,c,d) S_sv_pos_b2u_midway(aTHX_ a,b,c,d) -# define sv_pos_u2b_cached(a,b,c,d,e,f,g) S_sv_pos_u2b_cached(aTHX_ a,b,c,d,e,f,g) -# define sv_pos_u2b_forwards S_sv_pos_u2b_forwards -# define sv_pos_u2b_midway S_sv_pos_u2b_midway -# define sv_unglob(a,b) S_sv_unglob(aTHX_ a,b) -# define utf8_mg_len_cache_update(a,b,c) S_utf8_mg_len_cache_update(aTHX_ a,b,c) -# define utf8_mg_pos_cache_update(a,b,c,d,e) S_utf8_mg_pos_cache_update(aTHX_ a,b,c,d,e) -# define visit(a,b,c) S_visit(aTHX_ a,b,c) -# if defined(DEBUGGING) -# define del_sv(a) S_del_sv(aTHX_ a) -# define sv_mark_arenas() Perl_sv_mark_arenas(aTHX) -# define sv_sweep_arenas() Perl_sv_sweep_arenas(aTHX) -# endif -# if !defined(NV_PRESERVES_UV) -# if defined(DEBUGGING) -# define sv_2iuv_non_preserve(a,b) S_sv_2iuv_non_preserve(aTHX_ a,b) -# else -# define sv_2iuv_non_preserve(a) S_sv_2iuv_non_preserve(aTHX_ a) -# endif -# endif -# if defined(PERL_DEBUG_READONLY_COW) -# define sv_buf_to_rw(a) S_sv_buf_to_rw(aTHX_ a) -# endif -# if defined(USE_ITHREADS) -# define sv_dup_common(a,b) S_sv_dup_common(aTHX_ a,b) -# define sv_dup_hvaux(a,b,c) S_sv_dup_hvaux(aTHX_ a,b,c) -# define sv_dup_inc_multiple(a,b,c,d) S_sv_dup_inc_multiple(aTHX_ a,b,c,d) -# define unreferenced_to_tmp_stack(a) S_unreferenced_to_tmp_stack(aTHX_ a) -# endif -# endif /* defined(PERL_CORE) */ -# endif /* defined(PERL_IN_SV_C) */ # if defined(PERL_MEM_LOG) # define mem_log_alloc Perl_mem_log_alloc # define mem_log_del_sv Perl_mem_log_del_sv @@ -2261,6 +2296,10 @@ # if defined(USE_THREADS) # define thread_locale_init() Perl_thread_locale_init(aTHX) # define thread_locale_term() Perl_thread_locale_term(aTHX) +# if defined(PERL_CORE) || defined(PERL_EXT) +# define Perl_utf16_to_utf8(mTHX,a,b,c,d) utf16_to_utf8(a,b,c,d) +# define Perl_utf16_to_utf8_reversed(mTHX,a,b,c,d) utf16_to_utf8_reversed(a,b,c,d) +# endif # endif # if defined(VMS) || defined(WIN32) # define do_aspawn(a,b,c) Perl_do_aspawn(aTHX_ a,b,c) @@ -2272,6 +2311,6 @@ # else # define get_context Perl_get_context # endif -#endif /* !defined(PERL_NO_SHORT_NAMES) */ +#endif /* !defined(PERL_DO_UNDEFS) */ /* ex: set ro ft=c: */ Index: gnu/usr.bin/perl/embedvar.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/embedvar.h,v diff -u -p -a -u -p -r1.10 embedvar.h --- gnu/usr.bin/perl/embedvar.h 26 Dec 2025 22:14:12 -0000 1.10 +++ gnu/usr.bin/perl/embedvar.h 16 Nov 2026 00:57:38 -0000 @@ -4,8 +4,8 @@ * * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, * 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, - * 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 - * by Larry Wall and others + * 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, + * 2026 by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -164,6 +164,7 @@ # define PL_less_dicey_locale_buf (vTHX->Iless_dicey_locale_buf) # define PL_less_dicey_locale_bufsize (vTHX->Iless_dicey_locale_bufsize) # define PL_LIO (vTHX->ILIO) +# define PL_load_mathoms (vTHX->Iload_mathoms) # define PL_locale_mutex_depth (vTHX->Ilocale_mutex_depth) # define PL_localizing (vTHX->Ilocalizing) # define PL_localpatches (vTHX->Ilocalpatches) Index: gnu/usr.bin/perl/fakesdio.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/fakesdio.h,v diff -u -p -a -u -p -r1.3 fakesdio.h --- gnu/usr.bin/perl/fakesdio.h 13 Feb 2019 21:15:02 -0000 1.3 +++ gnu/usr.bin/perl/fakesdio.h 16 Nov 2026 00:57:38 -0000 @@ -11,7 +11,7 @@ * This is "source level" stdio compatibility mode. * We try and #define stdio functions in terms of PerlIO. */ -#define _CANNOT "CANNOT" +#define CANNOT_ "CANNOT" #undef FILE #define FILE PerlIO #undef clearerr @@ -88,8 +88,8 @@ #define fread(b,s,c,f) PerlIO_read(f,b,(s*c)) #define fwrite(b,s,c,f) PerlIO_write(f,b,(s*c)) #else -#define fread(b,s,c,f) _CANNOT fread -#define fwrite(b,s,c,f) _CANNOT fwrite +#define fread(b,s,c,f) CANNOT_ fread +#define fwrite(b,s,c,f) CANNOT_ fwrite #endif #define fseek(f,o,w) PerlIO_seek(f,o,w) #define ftell(f) PerlIO_tell(f) @@ -102,25 +102,25 @@ #define popen(c,m) my_popen(c,m) #define pclose(f) my_pclose(f) -#define fsetpos(f,p) _CANNOT _fsetpos_ -#define fgetpos(f,p) _CANNOT _fgetpos_ +#define fsetpos(f,p) CANNOT_ _fsetpos_ +#define fgetpos(f,p) CANNOT_ _fgetpos_ -#define __filbuf(f) _CANNOT __filbuf_ -#define _filbuf(f) _CANNOT _filbuf_ -#define __flsbuf(c,f) _CANNOT __flsbuf_ -#define _flsbuf(c,f) _CANNOT _flsbuf_ -#define getw(f) _CANNOT _getw_ -#define putw(v,f) _CANNOT _putw_ +#define __filbuf(f) CANNOT_ __filbuf_ +#define _filbuf(f) CANNOT_ _filbuf_ +#define __flsbuf(c,f) CANNOT_ __flsbuf_ +#define _flsbuf(c,f) CANNOT_ _flsbuf_ +#define getw(f) CANNOT_ _getw_ +#define putw(v,f) CANNOT_ _putw_ #if SFIO_VERSION < 20000101L -#define flockfile(f) _CANNOT _flockfile_ -#define ftrylockfile(f) _CANNOT _ftrylockfile_ -#define funlockfile(f) _CANNOT _funlockfile_ +#define flockfile(f) CANNOT_ _flockfile_ +#define ftrylockfile(f) CANNOT_ _ftrylockfile_ +#define funlockfile(f) CANNOT_ _funlockfile_ #endif -#define freopen(p,m,f) _CANNOT _freopen_ -#define setbuf(f,b) _CANNOT _setbuf_ -#define setvbuf(f,b,x,s) _CANNOT _setvbuf_ -#define fscanf _CANNOT _fscanf_ -#define fgets(s,n,f) _CANNOT _fgets_ +#define freopen(p,m,f) CANNOT_ _freopen_ +#define setbuf(f,b) CANNOT_ _setbuf_ +#define setvbuf(f,b,x,s) CANNOT_ _setvbuf_ +#define fscanf CANNOT_ _fscanf_ +#define fgets(s,n,f) CANNOT_ _fgets_ /* * ex: set ts=8 sts=4 sw=4 et: Index: gnu/usr.bin/perl/feature.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/feature.h,v diff -u -p -a -u -p -r1.9 feature.h --- gnu/usr.bin/perl/feature.h 26 Dec 2025 22:14:12 -0000 1.9 +++ gnu/usr.bin/perl/feature.h 16 Nov 2026 00:57:38 -0000 @@ -20,25 +20,26 @@ #define FEATURE___SUB___BIT 0x00000010 #define FEATURE_MYREF_BIT 0x00000020 #define FEATURE_DEFER_BIT 0x00000040 -#define FEATURE_EVALBYTES_BIT 0x00000080 -#define FEATURE_MORE_DELIMS_BIT 0x00000100 -#define FEATURE_FC_BIT 0x00000200 -#define FEATURE_INDIRECT_BIT 0x00000400 -#define FEATURE_ISA_BIT 0x00000800 -#define FEATURE_KEYWORD_ALL_BIT 0x00001000 -#define FEATURE_KEYWORD_ANY_BIT 0x00002000 -#define FEATURE_MODULE_TRUE_BIT 0x00004000 -#define FEATURE_MULTIDIMENSIONAL_BIT 0x00008000 -#define FEATURE_POSTDEREF_QQ_BIT 0x00010000 -#define FEATURE_REFALIASING_BIT 0x00020000 -#define FEATURE_SAY_BIT 0x00040000 -#define FEATURE_SIGNATURES_BIT 0x00080000 -#define FEATURE_SMARTMATCH_BIT 0x00100000 -#define FEATURE_STATE_BIT 0x00200000 -#define FEATURE_SWITCH_BIT 0x00400000 -#define FEATURE_TRY_BIT 0x00800000 -#define FEATURE_UNIEVAL_BIT 0x01000000 -#define FEATURE_UNICODE_BIT 0x02000000 +#define FEATURE_ENHANCED_XX_BIT 0x00000080 +#define FEATURE_EVALBYTES_BIT 0x00000100 +#define FEATURE_MORE_DELIMS_BIT 0x00000200 +#define FEATURE_FC_BIT 0x00000400 +#define FEATURE_INDIRECT_BIT 0x00000800 +#define FEATURE_ISA_BIT 0x00001000 +#define FEATURE_KEYWORD_ALL_BIT 0x00002000 +#define FEATURE_KEYWORD_ANY_BIT 0x00004000 +#define FEATURE_MODULE_TRUE_BIT 0x00008000 +#define FEATURE_MULTIDIMENSIONAL_BIT 0x00010000 +#define FEATURE_POSTDEREF_QQ_BIT 0x00020000 +#define FEATURE_REFALIASING_BIT 0x00040000 +#define FEATURE_SAY_BIT 0x00080000 +#define FEATURE_SIGNATURES_BIT 0x00100000 +#define FEATURE_SMARTMATCH_BIT 0x00200000 +#define FEATURE_STATE_BIT 0x00400000 +#define FEATURE_SWITCH_BIT 0x00800000 +#define FEATURE_TRY_BIT 0x01000000 +#define FEATURE_UNIEVAL_BIT 0x02000000 +#define FEATURE_UNICODE_BIT 0x04000000 #define FEATURE_APOS_AS_NAME_SEP_INDEX 0 #define FEATURE_BAREWORD_FILEHANDLES_INDEX 0 @@ -47,6 +48,7 @@ #define FEATURE___SUB___INDEX 0 #define FEATURE_MYREF_INDEX 0 #define FEATURE_DEFER_INDEX 0 +#define FEATURE_ENHANCED_XX_INDEX 0 #define FEATURE_EVALBYTES_INDEX 0 #define FEATURE_MORE_DELIMS_INDEX 0 #define FEATURE_FC_INDEX 0 @@ -209,6 +211,12 @@ FEATURE_IS_ENABLED_MASK(FEATURE___SUB___INDEX, FEATURE___SUB___BIT)) \ ) +#define FEATURE_ENHANCED_XX_IS_ENABLED \ + ( \ + CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \ + FEATURE_IS_ENABLED_MASK(FEATURE_ENHANCED_XX_INDEX, FEATURE_ENHANCED_XX_BIT) \ + ) + #define FEATURE_KEYWORD_ALL_IS_ENABLED \ ( \ CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \ @@ -415,7 +423,13 @@ S_magic_sethint_feature(pTHX_ SV *keysv, return; case 'e': - if (keylen == sizeof("feature_evalbytes")-1 + if (keylen == sizeof("feature_enhanced_xx")-1 + && memcmp(subf+1, "nhanced_xx", keylen - sizeof("feature_")) == 0) { + mask = FEATURE_ENHANCED_XX_BIT; + index = FEATURE_ENHANCED_XX_INDEX; + break; + } + else if (keylen == sizeof("feature_evalbytes")-1 && memcmp(subf+1, "valbytes", keylen - sizeof("feature_")) == 0) { mask = FEATURE_EVALBYTES_BIT; index = FEATURE_EVALBYTES_INDEX; @@ -635,6 +649,13 @@ PL_feature_bits[] = { STRLENs("feature_defer"), FEATURE_DEFER_BIT, FEATURE_DEFER_INDEX + }, + { + /* feature enhanced_xx */ + "feature_enhanced_xx", + STRLENs("feature_enhanced_xx"), + FEATURE_ENHANCED_XX_BIT, + FEATURE_ENHANCED_XX_INDEX }, { /* feature evalbytes */ Index: gnu/usr.bin/perl/generate_uudmap.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/generate_uudmap.c,v diff -u -p -a -u -p -r1.3 generate_uudmap.c --- gnu/usr.bin/perl/generate_uudmap.c 15 Feb 2023 01:36:13 -0000 1.3 +++ gnu/usr.bin/perl/generate_uudmap.c 16 Nov 2026 00:57:38 -0000 @@ -66,7 +66,8 @@ struct mg_data_t { static struct mg_data_t mg_data[256]; static void -format_mg_data(FILE *out, const void *thing, size_t count) { +format_mg_data(FILE *out, const void *thing, size_t count) +{ const struct mg_data_t *p = (const struct mg_data_t *)thing; while (1) { @@ -84,7 +85,8 @@ format_mg_data(FILE *out, const void *th } static void -format_char_block(FILE *out, const void *thing, size_t count) { +format_char_block(FILE *out, const void *thing, size_t count) +{ const char *block = (const char *)thing; fputs(" ", out); @@ -139,7 +141,8 @@ typedef unsigned char U8; static char PL_uudmap[256]; static char PL_bitcount[256]; -int main(int argc, char **argv) { +int main(int argc, char **argv) +{ size_t i; int bits; struct mg_data_raw_t *p = mg_data_raw; Index: gnu/usr.bin/perl/gv.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/gv.c,v diff -u -p -a -u -p -r1.27 gv.c --- gnu/usr.bin/perl/gv.c 26 Dec 2025 22:14:12 -0000 1.27 +++ gnu/usr.bin/perl/gv.c 16 Nov 2026 00:57:38 -0000 @@ -57,6 +57,8 @@ Make sure there is a slot of type Cgp_egv = gv; /* allow compiler to reuse gv after this */ -#ifndef PERL_DONT_CREATE_GVSV - gp->gp_sv = newSV_type(SVt_NULL); -#endif /* PL_curcop may be null here. E.g., INIT { bless {} and exit } @@ -247,9 +244,10 @@ Perl_newGP(pTHX_ GV *const gv) void Perl_cvgv_set(pTHX_ CV* cv, GV* gv) { + PERL_ARGS_ASSERT_CVGV_SET; + GV * const oldgv = CvNAMED(cv) ? NULL : SvANY(cv)->xcv_gv_u.xcv_gv; HEK *hek; - PERL_ARGS_ASSERT_CVGV_SET; if (oldgv == gv) return; @@ -285,14 +283,22 @@ Perl_cvgv_set(pTHX_ CV* cv, GV* gv) /* Convert CvSTASH + CvNAME_HEK into a GV. Conceptually, all subs have a GV, but for efficiency that GV may not in fact exist. This function, - called by CvGV, reifies it. */ + called by CvGV, reifies it. + + Note that the reified GV will have its gp_line/gp_file set to the value + in the current PL_curcop, i.e. to the place where the GV is first + accessed rather than to where the CV was defined. In practice this + implementation leakage doesn't seem to cause any problems part from + edge cases in Deparse. + */ GV * Perl_cvgv_from_hek(pTHX_ CV *cv) { + PERL_ARGS_ASSERT_CVGV_FROM_HEK; + GV *gv; SV **svp; - PERL_ARGS_ASSERT_CVGV_FROM_HEK; assert(SvTYPE(cv) == SVt_PVCV); if (!CvSTASH(cv)) return NULL; ASSUME(CvNAME_HEK(cv)); @@ -319,8 +325,9 @@ Perl_cvgv_from_hek(pTHX_ CV *cv) void Perl_cvstash_set(pTHX_ CV *cv, HV *stash) { - HV *oldstash = CvSTASH(cv); PERL_ARGS_ASSERT_CVSTASH_SET; + + HV *oldstash = CvSTASH(cv); if (oldstash == stash) return; if (oldstash) @@ -331,11 +338,11 @@ Perl_cvstash_set(pTHX_ CV *cv, HV *stash } /* - =for apidoc gv_init =for apidoc_item gv_init_pv =for apidoc_item gv_init_pvn =for apidoc_item gv_init_sv +=for apidoc_flag GV_ADDMULTI These each convert a scalar into a typeglob. This is an incoercible typeglob; assigning a reference to it will assign to one of its slots, instead of @@ -343,21 +350,27 @@ overwriting it as happens with typeglobs any scalar that is C may produce unpredictable results and is reserved for perl's internal use. +They differ only in how the name is specified, and C lacks a C +parameter, but has a boolean C parameter instead. + C is the scalar to be converted. -C is the parent stash/package, if any. +C is the parent stash/package, if any; or NULL if none. -In C and C, C and C give the name. The name -must be unqualified; that is, it must not include the package name. If C -is a stash element, it is the caller's responsibility to ensure that the name -passed to this function matches the name of the element. If it does not match, -perl's internal bookkeeping will get out of sync. C may contain embedded -NUL characters. +In C and C, C points to the first byte of the +string specifying the name, and an additional parameter, C, specifies its +length in bytes. Hence, C may contain embedded-NUL characters. + +The name must be unqualified; that is, it must not include the package name. +If C is a stash element, it is the caller's responsibility to ensure that +the name passed to this function matches the name of the element. If it does +not match, perl's internal bookkeeping will get out of sync. C is identical to C, but takes a NUL-terminated string for the name instead of separate char * and length parameters. -In C, the name is given by C. +In C, C<*name> is an SV, and the name is the PV extracted from +that using C>. All but C take a C parameter. Set C to include C if C is a UTF-8 string. In C, if C @@ -373,17 +386,16 @@ strings, as it has no flags parameter. non-zero has the same effect as setting the C flag in the other forms. -=for apidoc Amnh||GV_ADDMULTI - =cut */ void Perl_gv_init_sv(pTHX_ GV *gv, HV *stash, SV* namesv, U32 flags) { + PERL_ARGS_ASSERT_GV_INIT_SV; + char *namepv; STRLEN namelen; - PERL_ARGS_ASSERT_GV_INIT_SV; namepv = SvPV(namesv, namelen); if (SvUTF8(namesv)) flags |= SVf_UTF8; @@ -446,6 +458,8 @@ Perl_gv_init_pv(pTHX_ GV *gv, HV *stash, void Perl_gv_init_pvn(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, U32 flags) { + PERL_ARGS_ASSERT_GV_INIT_PVN; + const U32 old_type = SvTYPE(gv); const bool doproto = old_type > SVt_NULL; char * const proto = (doproto && SvPOK(gv)) @@ -459,7 +473,6 @@ Perl_gv_init_pvn(pTHX_ GV *gv, HV *stash has_constant && SvTYPE(has_constant) == SVt_PVCV; COP * const old = PL_curcop; - PERL_ARGS_ASSERT_GV_INIT_PVN; assert (!(proto && has_constant)); if (has_constant) { @@ -554,7 +567,7 @@ Perl_gv_init_pvn(pTHX_ GV *gv, HV *stash } } -STATIC void +static void S_gv_init_svtype(pTHX_ GV *gv, const svtype sv_type) { PERL_ARGS_ASSERT_GV_INIT_SVTYPE; @@ -569,7 +582,6 @@ S_gv_init_svtype(pTHX_ GV *gv, const svt case SVt_PVHV: (void)GvHVn(gv); break; -#ifdef PERL_DONT_CREATE_GVSV case SVt_NULL: case SVt_PVCV: case SVt_PVFM: @@ -581,7 +593,6 @@ S_gv_init_svtype(pTHX_ GV *gv, const svt If we just cast GvSVn(gv) to void, it ignores evaluating it for its side effect */ } -#endif } } @@ -618,7 +629,7 @@ S_maybe_add_coresub(pTHX_ HV * const sta case KEY_finally: case KEY_for : case KEY_foreach: case KEY_format: case KEY_ge : case KEY_given : case KEY_goto : case KEY_grep : case KEY_gt : - case KEY_if : case KEY_isa : + case KEY_if : case KEY_isa : case KEY_last : case KEY_le : case KEY_local : case KEY_lt : case KEY_m : case KEY_map : case KEY_method : case KEY_my : @@ -633,6 +644,7 @@ S_maybe_add_coresub(pTHX_ HV * const sta case KEY_until: case KEY_use : case KEY_when : case KEY_while : case KEY_x : case KEY_xor : case KEY_y : return NULL; + case KEY___CLASS__: case KEY_chomp: case KEY_chop: case KEY_defined: case KEY_delete: case KEY_eof : case KEY_exec: case KEY_exists : case KEY_lstat: @@ -730,6 +742,8 @@ S_maybe_add_coresub(pTHX_ HV * const sta =for apidoc_item gv_fetchmeth_pvn_autoload =for apidoc_item gv_fetchmeth_sv =for apidoc_item gv_fetchmeth_sv_autoload +=for apidoc_flag GV_SUPER +=for apidoc_flag GV_NOUNIVERSAL These each look for a glob with name C, containing a defined subroutine, returning the GV of that glob if found, or C if not. @@ -816,18 +830,16 @@ as being in UTF-8, the extracted PV will C will force the name to be considered to be UTF-8 even if the SV is not so marked. -=for apidoc Amnh||GV_SUPER -=for apidoc Amnh||GV_NOUNIVERSAL - =cut */ GV * Perl_gv_fetchmeth_sv(pTHX_ HV *stash, SV *namesv, I32 level, U32 flags) { + PERL_ARGS_ASSERT_GV_FETCHMETH_SV; + char *namepv; STRLEN namelen; - PERL_ARGS_ASSERT_GV_FETCHMETH_SV; if (LIKELY(SvPOK_nog(namesv))) /* common case */ return gv_fetchmeth_internal(stash, namesv, NULL, 0, level, flags | SvUTF8(namesv)); @@ -849,6 +861,8 @@ Perl_gv_fetchmeth_pv(pTHX_ HV *stash, co PERL_STATIC_INLINE GV* S_gv_fetchmeth_internal(pTHX_ HV* stash, SV* meth, const char* name, STRLEN len, I32 level, U32 flags) { + PERL_ARGS_ASSERT_GV_FETCHMETH_INTERNAL; + GV** gvp; HE* he; AV* linear_av; @@ -882,9 +896,9 @@ S_gv_fetchmeth_internal(pTHX_ HV* stash, assert(hvname); assert(name || meth); - DEBUG_o( Perl_deb(aTHX_ "Looking for %smethod %s in package %s\n", - flags & GV_SUPER ? "SUPER " : "", - name ? name : SvPV_nolen(meth), hvname) ); + DEBUG_o( deb("Looking for %smethod %s in package %s\n", + flags & GV_SUPER ? "SUPER " : "", + name ? name : SvPV_nolen(meth), hvname) ); topgen_cmp = HvMROMETA(stash)->cache_gen + PL_sub_generation; @@ -1045,9 +1059,10 @@ Perl_gv_fetchmeth_pvn(pTHX_ HV *stash, c GV * Perl_gv_fetchmeth_sv_autoload(pTHX_ HV *stash, SV *namesv, I32 level, U32 flags) { + PERL_ARGS_ASSERT_GV_FETCHMETH_SV_AUTOLOAD; + char *namepv; STRLEN namelen; - PERL_ARGS_ASSERT_GV_FETCHMETH_SV_AUTOLOAD; namepv = SvPV(namesv, namelen); if (SvUTF8(namesv)) flags |= SVf_UTF8; @@ -1064,10 +1079,10 @@ Perl_gv_fetchmeth_pv_autoload(pTHX_ HV * GV * Perl_gv_fetchmeth_pvn_autoload(pTHX_ HV *stash, const char *name, STRLEN len, I32 level, U32 flags) { - GV *gv = gv_fetchmeth_pvn(stash, name, len, level, flags); - PERL_ARGS_ASSERT_GV_FETCHMETH_PVN_AUTOLOAD; + GV *gv = gv_fetchmeth_pvn(stash, name, len, level, flags); + if (!gv) { CV *cv; GV **gvp; @@ -1134,9 +1149,10 @@ Perl_gv_fetchmethod_autoload(pTHX_ HV *s GV * Perl_gv_fetchmethod_sv_flags(pTHX_ HV *stash, SV *namesv, U32 flags) { + PERL_ARGS_ASSERT_GV_FETCHMETHOD_SV_FLAGS; + char *namepv; STRLEN namelen; - PERL_ARGS_ASSERT_GV_FETCHMETHOD_SV_FLAGS; namepv = SvPV(namesv, namelen); if (SvUTF8(namesv)) flags |= SVf_UTF8; @@ -1153,6 +1169,8 @@ Perl_gv_fetchmethod_pv_flags(pTHX_ HV *s GV * Perl_gv_fetchmethod_pvn_flags(pTHX_ HV *stash, const char *name, const STRLEN len, U32 flags) { + PERL_ARGS_ASSERT_GV_FETCHMETHOD_PVN_FLAGS; + const char * const origname = name; const char * const name_end = name + len; const char *last_separator = NULL; @@ -1163,8 +1181,6 @@ Perl_gv_fetchmethod_pvn_flags(pTHX_ HV * const U32 do_croak = flags & GV_CROAK; const U32 is_utf8 = flags & SVf_UTF8; - PERL_ARGS_ASSERT_GV_FETCHMETHOD_PVN_FLAGS; - if (SvTYPE(stash) < SVt_PVHV) stash = NULL; else { @@ -1206,7 +1222,7 @@ Perl_gv_fetchmethod_pvn_flags(pTHX_ HV * /* ->SUPER::method should really be looked up in original stash */ stash = CopSTASH(PL_curcop); flags |= GV_SUPER; - DEBUG_o( Perl_deb(aTHX_ "Treating %s as %s::%s\n", + DEBUG_o( deb("Treating %s as %s::%s\n", origname, HvENAME_get(stash), name) ); } else if ( sep_len >= 7 && @@ -1301,6 +1317,9 @@ Perl_gv_fetchmethod_pvn_flags(pTHX_ HV * =for apidoc_item gv_autoload_pvn =for apidoc_item gv_autoload_sv =for apidoc_item gv_autoload4 +=for apidoc_flag GV_AUTOLOAD_ISMETHOD +=for apidoc_flag SVf_UTF8 +=for apidoc_flag GV_SUPER These each search for an C method, returning NULL if not found, or else returning a pointer to its GV, while setting the package @@ -1325,8 +1344,8 @@ In C, C<*namesv> is an S from that using L>. If the SV is marked as being in UTF-8, the extracted PV will also be. -The other way to indicate that the name is encoded as UTF-8 is to set the -C bit in C for the forms that have that parameter. +The other way to indicate that the name is encoded as UTF-8 is to set the +C bit in C for the forms that have that parameter. The name is never considered to be UTF-8 in C. The C parameter in C is used only to indicate that the @@ -1338,17 +1357,15 @@ to indicate, if set, to skip searching f =cut -=for apidoc Amnh||GV_AUTOLOAD_ISMETHOD -=for apidoc Amnh||SVf_UTF8 -=for apidoc Amnh||GV_SUPER */ GV* Perl_gv_autoload_sv(pTHX_ HV *stash, SV* namesv, U32 flags) { + PERL_ARGS_ASSERT_GV_AUTOLOAD_SV; + char *namepv; STRLEN namelen; - PERL_ARGS_ASSERT_GV_AUTOLOAD_SV; namepv = SvPV(namesv, namelen); if (SvUTF8(namesv)) flags |= SVf_UTF8; @@ -1365,6 +1382,8 @@ Perl_gv_autoload_pv(pTHX_ HV *stash, con GV* Perl_gv_autoload_pvn(pTHX_ HV *stash, const char *name, STRLEN len, U32 flags) { + PERL_ARGS_ASSERT_GV_AUTOLOAD_PVN; + GV* gv; CV* cv; HV* varstash; @@ -1373,8 +1392,6 @@ Perl_gv_autoload_pvn(pTHX_ HV *stash, co SV *packname = NULL; U32 is_utf8 = flags & SVf_UTF8 ? SVf_UTF8 : 0; - PERL_ARGS_ASSERT_GV_AUTOLOAD_PVN; - if (len == S_autolen && memEQ(name, S_autoload, S_autolen)) return NULL; if (stash) { @@ -1474,9 +1491,7 @@ Perl_gv_autoload_pvn(pTHX_ HV *stash, co if (!isGV(vargv)) { gv_init_pvn(vargv, varstash, S_autoload, S_autolen, 0); -#ifdef PERL_DONT_CREATE_GVSV GvSV(vargv) = newSV_type(SVt_NULL); -#endif } LEAVE; varsv = GvSVn(vargv); @@ -1508,14 +1523,14 @@ Perl_gv_autoload_pvn(pTHX_ HV *stash, co * For the protection of $! to work (it is set by this routine) * the sv slot must already be magicalized. */ -STATIC void +static void S_require_tie_mod(pTHX_ GV *gv, const char varname, const char * name, STRLEN len, const U32 flags) { - const SV * const target = varname == '[' ? GvSV(gv) : (SV *)GvHV(gv); - PERL_ARGS_ASSERT_REQUIRE_TIE_MOD; + const SV * const target = varname == '[' ? GvSV(gv) : (SV *)GvHV(gv); + /* If it is not tied */ if (!target || !SvRMAGICAL(target) || !mg_find(target, @@ -1543,7 +1558,7 @@ S_require_tie_mod(pTHX_ GV *gv, const ch const char type = varname == '[' ? '$' : '%'; if ( flags & 1 ) save_scalar(gv); - Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT, module, NULL); + load_module(PERL_LOADMOD_NOIMPORT, module, NULL); assert(sp == PL_stack_sp); stash = gv_stashpvn(name, len, 0); if (!stash) @@ -1576,6 +1591,12 @@ S_require_tie_mod(pTHX_ GV *gv, const ch =for apidoc_item gv_stashpvn =for apidoc_item gv_stashpvs =for apidoc_item gv_stashsv +=for apidoc_flag GV_ADD +=for apidoc_flag GV_NOADD_NOINIT +=for apidoc_flag GV_NOINIT +=for apidoc_flag GV_NOEXPAND +=for apidoc_flag GV_ADDMG +=for apidoc_flag SVf_UTF8 Note C is strongly preferred for performance reasons. @@ -1607,13 +1628,6 @@ Flags may be one of: The most important of which are probably C and C. -=for apidoc Amnh||GV_ADD -=for apidoc Amnh||GV_NOADD_NOINIT -=for apidoc Amnh||GV_NOINIT -=for apidoc Amnh||GV_NOEXPAND -=for apidoc Amnh||GV_ADDMG -=for apidoc Amnh||SVf_UTF8 - =cut */ @@ -1636,14 +1650,14 @@ gv_stashsvpvn_cached(). PERL_STATIC_INLINE HV* S_gv_stashpvn_internal(pTHX_ const char *name, U32 namelen, I32 flags) { + PERL_ARGS_ASSERT_GV_STASHPVN_INTERNAL; + char smallbuf[128]; char *tmpbuf; HV *stash; GV *tmpgv; U32 tmplen = namelen + 2; - PERL_ARGS_ASSERT_GV_STASHPVN_INTERNAL; - if (tmplen <= sizeof smallbuf) tmpbuf = smallbuf; else @@ -1672,7 +1686,8 @@ S_gv_stashpvn_internal(pTHX_ const char } /* -=for apidoc gv_stashsvpvn_cached +=for apidoc gv_stashsvpvn_cached +=for apidoc_flag E|GV_CACHE_ONLY Returns a pointer to the stash for a specified package, possibly cached. Implements both L> and @@ -1686,22 +1701,17 @@ cache; see L> for Note it is strongly preferred for C to be non-null, for performance reasons. -=for apidoc Emnh||GV_CACHE_ONLY - =cut */ -#define PERL_ARGS_ASSERT_GV_STASHSVPVN_CACHED \ - assert(namesv || name) - HV* Perl_gv_stashsvpvn_cached(pTHX_ SV *namesv, const char *name, U32 namelen, I32 flags) { + PERL_ARGS_ASSERT_GV_STASHSVPVN_CACHED; + HV* stash; HE* he; - PERL_ARGS_ASSERT_GV_STASHSVPVN_CACHED; - he = (HE *)hv_common( PL_stashcache, namesv, name, namelen, (flags & SVf_UTF8) ? HVhek_UTF8 : 0, 0, NULL, 0 @@ -1752,27 +1762,30 @@ Perl_gv_stashsv(pTHX_ SV *sv, I32 flags) return gv_stashsvpvn_cached(sv, NULL, 0, flags); } GV * -Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 flags, const svtype sv_type) { +Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 flags, const svtype sv_type) +{ PERL_ARGS_ASSERT_GV_FETCHPV; return gv_fetchpvn_flags(nambeg, strlen(nambeg), flags, sv_type); } GV * -Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, const svtype sv_type) { +Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, const svtype sv_type) +{ + PERL_ARGS_ASSERT_GV_FETCHSV; + STRLEN len; const char * const nambeg = SvPV_flags_const(name, len, flags & GV_NO_SVGMAGIC ? 0 : SV_GMAGIC); - PERL_ARGS_ASSERT_GV_FETCHSV; return gv_fetchpvn_flags(nambeg, len, flags | SvUTF8(name), sv_type); } PERL_STATIC_INLINE void S_gv_magicalize_isa(pTHX_ GV *gv) { - AV* av; - PERL_ARGS_ASSERT_GV_MAGICALIZE_ISA; + AV* av; + av = GvAVn(gv); GvMULTI_on(gv); sv_magic(MUTABLE_SV(av), MUTABLE_SV(gv), PERL_MAGIC_isa, @@ -1798,14 +1811,14 @@ S_parse_gv_stash_name(pTHX_ HV **stash, STRLEN *len, const char *nambeg, STRLEN full_len, const U32 is_utf8, const I32 add) { + PERL_ARGS_ASSERT_PARSE_GV_STASH_NAME; + char *tmpfullbuf = NULL; /* only malloc one big chunk of memory when the smallbuff is not large enough */ const char *name_cursor; const char *const name_end = nambeg + full_len; const char *const name_em1 = name_end - 1; char smallbuf[64]; /* small buffer to avoid a malloc when possible */ - PERL_ARGS_ASSERT_PARSE_GV_STASH_NAME; - if ( full_len > 2 && **name == '*' && isIDFIRST_lazy_if_safe(*name + 1, name_end, is_utf8)) @@ -2000,15 +2013,15 @@ S_find_default_stash(pTHX_ HV **stash, c (sv_type == SVt_PVHV && !GvIMPORTED_HV(*gvp)) ) { /* diag_listed_as: Variable "%s" is not imported%s */ - Perl_ck_warner_d( - aTHX_ packWARN(WARN_MISC), + ck_warner_d( + packWARN(WARN_MISC), "Variable \"%c%" UTF8f "\" is not imported", sv_type == SVt_PVAV ? '@' : sv_type == SVt_PVHV ? '%' : '$', UTF8fARG(is_utf8, len, name)); if (GvCVu(*gvp)) - Perl_ck_warner_d( - aTHX_ packWARN(WARN_MISC), + ck_warner_d( + packWARN(WARN_MISC), "\t(Did you mean &%" UTF8f " instead?)\n", UTF8fARG(is_utf8, len, name) ); @@ -2025,7 +2038,7 @@ S_find_default_stash(pTHX_ HV **stash, c if (!*stash) { if (add && !PL_in_clean_all) { GV *gv; - qerror(Perl_mess(aTHX_ + defer_error(mess( "Global symbol \"%s%" UTF8f "\" requires explicit package name (did you forget to " "declare \"my %s%" UTF8f "\"?)", @@ -2060,10 +2073,8 @@ S_find_default_stash(pTHX_ HV **stash, c } /* gv_magicalize only turns on the SVf_READONLY flag, not SVf_PROTECT. So - redefine SvREADONLY_on for that purpose. We don’t use it later on in - this file. */ -#undef SvREADONLY_on -#define SvREADONLY_on(sv) (SvFLAGS(sv) |= SVf_READONLY) + make a special-purpose macro just for that. */ +#define SvREADONLY_NOPROTECT_on(sv) (SvFLAGS(sv) |= SVf_READONLY) /* gv_magicalize() is called by gv_fetchpvn_flags when creating * a new GV. @@ -2079,49 +2090,17 @@ PERL_STATIC_INLINE bool S_gv_magicalize(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, const svtype sv_type) { + PERL_ARGS_ASSERT_GV_MAGICALIZE; + SSize_t paren; - PERL_ARGS_ASSERT_GV_MAGICALIZE; + if (len == 0) { + return false; + } - if (stash != PL_defstash) { /* not the main stash */ - /* We only have to check for a few names here: a, b, EXPORT, ISA - and VERSION. All the others apply only to the main stash or to - CORE (which is checked right after this). */ - if (len) { - switch (*name) { - case 'E': - if ( - len >= 6 && name[1] == 'X' && - (memEQs(name, len, "EXPORT") - ||memEQs(name, len, "EXPORT_OK") - ||memEQs(name, len, "EXPORT_FAIL") - ||memEQs(name, len, "EXPORT_TAGS")) - ) - GvMULTI_on(gv); - break; - case 'I': - if (memEQs(name, len, "ISA")) - gv_magicalize_isa(gv); - break; - case 'V': - if (memEQs(name, len, "VERSION")) - GvMULTI_on(gv); - break; - case 'a': - if (stash == PL_debstash && memEQs(name, len, "args")) { - GvMULTI_on(gv_AVadd(gv)); - break; - } - /* FALLTHROUGH */ - case 'b': - if (len == 1 && sv_type == SVt_PV) - GvMULTI_on(gv); - /* FALLTHROUGH */ - default: - goto try_core; - } - goto ret; - } + if (! generic_isCC_(*name, CC_MAGICAL_)) { + + /* If not a magical variable, it could be for CORE */ try_core: if (len > 1 /* shortest is uc */ && HvNAMELEN_get(stash) == 4) { /* Avoid null warning: */ @@ -2131,24 +2110,44 @@ S_gv_magicalize(pTHX_ GV *gv, HV *stash, } } else if (len > 1) { -#ifndef EBCDIC - if (*name > 'V' ) { - NOOP; - /* Nothing else to do. - The compiler will probably turn the switch statement into a - branch table. Make sure we avoid even that small overhead for - the common case of lower case variable names. (On EBCDIC - platforms, we can't just do: - if (NATIVE_TO_ASCII(*name) > NATIVE_TO_ASCII('V') ) { - because cases like '\027' in the switch statement below are - C1 (non-ASCII) controls on those platforms, so the remapping - would make them larger than 'V') - */ - } else -#endif - { + switch (*name) { + + /* Each in first set doesn't require this to be the main stash */ + + case 'E': + if ( (len >= 6 && name[1] == 'X') + && ( memEQs(name, len, "EXPORT") + ||memEQs(name, len, "EXPORT_OK") + ||memEQs(name, len, "EXPORT_FAIL") + ||memEQs(name, len, "EXPORT_TAGS"))) + { + GvMULTI_on(gv); + } + break; + case 'I': + if (memEQs(name, len, "ISA")) + gv_magicalize_isa(gv); + break; + case 'V': + if (memEQs(name, len, "VERSION")) + GvMULTI_on(gv); + break; + case 'a': + if (stash == PL_debstash && memEQs(name, len, "args")) { + GvMULTI_on(gv_AVadd(gv)); + break; + } + goto try_core; + + default: + + /* The remainder apply only to the main stash */ + if (stash != PL_defstash) { + goto try_core; + } + switch (*name) { - case 'A': + case 'A': if (memEQs(name, len, "ARGV")) { IoFLAGS(GvIOn(gv)) |= IOf_ARGV|IOf_START; } @@ -2156,22 +2155,7 @@ S_gv_magicalize(pTHX_ GV *gv, HV *stash, GvMULTI_on(gv); } break; - case 'E': - if ( - len >= 6 && name[1] == 'X' && - (memEQs(name, len, "EXPORT") - ||memEQs(name, len, "EXPORT_OK") - ||memEQs(name, len, "EXPORT_FAIL") - ||memEQs(name, len, "EXPORT_TAGS")) - ) - GvMULTI_on(gv); - break; - case 'I': - if (memEQs(name, len, "ISA")) { - gv_magicalize_isa(gv); - } - break; - case 'S': + case 'S': if (memEQs(name, len, "SIG")) { HV *hv; I32 i; @@ -2202,11 +2186,7 @@ S_gv_magicalize(pTHX_ GV *gv, HV *stash, } } break; - case 'V': - if (memEQs(name, len, "VERSION")) - GvMULTI_on(gv); - break; - case '\003': /* $^CHILD_ERROR_NATIVE */ + case '\003': /* $^CHILD_ERROR_NATIVE */ if (memEQs(name, len, "\003HILD_ERROR_NATIVE")) goto magicalize; /* @{^CAPTURE} %{^CAPTURE} */ @@ -2215,46 +2195,47 @@ S_gv_magicalize(pTHX_ GV *gv, HV *stash, const Size_t n = *name; sv_magic(MUTABLE_SV(av), (SV*)n, PERL_MAGIC_regdata, NULL, 0); - SvREADONLY_on(av); + SvREADONLY_NOPROTECT_on(av); require_tie_mod_s(gv, '+', "Tie::Hash::NamedCapture",0); } else /* %{^CAPTURE_ALL} */ - if (memEQs(name, len, "\003APTURE_ALL")) { + if (memEQs(name, len, "\003APTURE_ALL")) { require_tie_mod_s(gv, '-', "Tie::Hash::NamedCapture",0); } break; - case '\005': /* ${^ENCODING} */ + case '\005': /* ${^ENCODING} */ if (memEQs(name, len, "\005NCODING")) goto magicalize; break; - case '\007': /* ${^GLOBAL_PHASE} */ + case '\007': /* ${^GLOBAL_PHASE} */ if (memEQs(name, len, "\007LOBAL_PHASE")) goto ro_magicalize; break; - case '\010': /* %{^HOOK} */ + case '\010': /* %{^HOOK} */ if (memEQs(name, len, "\010OOK")) { GvMULTI_on(gv); HV *hv = GvHVn(gv); hv_magic(hv, NULL, PERL_MAGIC_hook); } break; - case '\014': - if ( memEQs(name, len, "\014AST_FH") || /* ${^LAST_FH} */ - memEQs(name, len, "\014AST_SUCCESSFUL_PATTERN")) /* ${^LAST_SUCCESSFUL_PATTERN} */ + case '\014': + if ( memEQs(name, len, "\014AST_FH") /* ${^LAST_FH} */ + || memEQs(name, len, "\014AST_SUCCESSFUL_PATTERN")) + /* ${^LAST_SUCCESSFUL_PATTERN} */ goto ro_magicalize; break; - case '\015': /* ${^MATCH} */ + case '\015': /* ${^MATCH} */ if (memEQs(name, len, "\015ATCH")) { paren = RX_BUFF_IDX_CARET_FULLMATCH; goto storeparen; } break; - case '\017': /* ${^OPEN} */ + case '\017': /* ${^OPEN} */ if (memEQs(name, len, "\017PEN")) goto magicalize; break; - case '\020': /* ${^PREMATCH} ${^POSTMATCH} */ + case '\020': /* ${^PREMATCH} ${^POSTMATCH} */ if (memEQs(name, len, "\020REMATCH")) { paren = RX_BUFF_IDX_CARET_PREMATCH; goto storeparen; @@ -2264,15 +2245,15 @@ S_gv_magicalize(pTHX_ GV *gv, HV *stash, goto storeparen; } break; - case '\023': + case '\023': if (memEQs(name, len, "\023AFE_LOCALES")) goto ro_magicalize; break; - case '\024': /* ${^TAINT} */ + case '\024': /* ${^TAINT} */ if (memEQs(name, len, "\024AINT")) goto ro_magicalize; break; - case '\025': /* ${^UNICODE}, ${^UTF8LOCALE} */ + case '\025': /* ${^UNICODE}, ${^UTF8LOCALE} */ if (memEQs(name, len, "\025NICODE")) goto ro_magicalize; if (memEQs(name, len, "\025TF8LOCALE")) @@ -2280,7 +2261,7 @@ S_gv_magicalize(pTHX_ GV *gv, HV *stash, if (memEQs(name, len, "\025TF8CACHE")) goto magicalize; break; - case '\027': /* $^WARNING_BITS */ + case '\027': /* $^WARNING_BITS */ if (memEQs(name, len, "\027ARNING_BITS")) goto magicalize; #ifdef WIN32 @@ -2288,84 +2269,88 @@ S_gv_magicalize(pTHX_ GV *gv, HV *stash, goto magicalize; #endif break; - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - { + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + { /* Ensures that we have an all-digit variable, ${"1foo"} fails this test */ UV uv; if (!grok_atoUV(name, &uv, NULL) || uv > I32_MAX) - goto ret; + break; /* XXX why are we using a SSize_t? */ paren = (SSize_t)(I32)uv; goto storeparen; - } + } } } - } else { - /* Names of length 1. (Or 0. But name is NUL terminated, so that will - be case '\0' in this switch statement (ie a default case) */ + } + else if ( stash == PL_defstash /* Names of length 1. */ + || *name == 'a' || *name == 'b') + { + /* All but the above two length 1 names have to be in the main stash. + * + * Note that nothing failing here can apply to CORE, because the + * minimum length (for things like 'uc') is 2. */ + switch (*name) { - case '&': /* $& */ + case '&': /* $& */ paren = RX_BUFF_IDX_FULLMATCH; goto sawampersand; - case '`': /* $` */ + case '`': /* $` */ paren = RX_BUFF_IDX_PREMATCH; goto sawampersand; - case '\'': /* $' */ + case '\'': /* $' */ paren = RX_BUFF_IDX_POSTMATCH; - sawampersand: + sawampersand: #ifdef PERL_SAWAMPERSAND - if (!( - sv_type == SVt_PVAV || - sv_type == SVt_PVHV || - sv_type == SVt_PVCV || - sv_type == SVt_PVFM || - sv_type == SVt_PVIO - )) { PL_sawampersand |= - (*name == '`') - ? SAWAMPERSAND_LEFT - : (*name == '&') - ? SAWAMPERSAND_MIDDLE - : SAWAMPERSAND_RIGHT; - } + if (! ( sv_type == SVt_PVAV + || sv_type == SVt_PVHV + || sv_type == SVt_PVCV + || sv_type == SVt_PVFM + || sv_type == SVt_PVIO)) + { + PL_sawampersand |= (*name == '`') ? SAWAMPERSAND_LEFT + : (*name == '&') ? SAWAMPERSAND_MIDDLE + : SAWAMPERSAND_RIGHT; + } #endif goto storeparen; - case '1': /* $1 */ - case '2': /* $2 */ - case '3': /* $3 */ - case '4': /* $4 */ - case '5': /* $5 */ - case '6': /* $6 */ - case '7': /* $7 */ - case '8': /* $8 */ - case '9': /* $9 */ + + case '1': /* $1 */ + case '2': /* $2 */ + case '3': /* $3 */ + case '4': /* $4 */ + case '5': /* $5 */ + case '6': /* $6 */ + case '7': /* $7 */ + case '8': /* $8 */ + case '9': /* $9 */ paren = *name - '0'; - storeparen: + storeparen: /* Flag the capture variables with a NULL mg_ptr Use mg_len for the array index to lookup. */ sv_magic(GvSVn(gv), MUTABLE_SV(gv), PERL_MAGIC_sv, NULL, paren); break; - case ':': /* $: */ + case ':': /* $: */ sv_setpv(GvSVn(gv),PL_chopset); goto magicalize; - case '?': /* $? */ + case '?': /* $? */ #ifdef COMPLEX_STATUS SvUPGRADE(GvSVn(gv), SVt_PVLV); #endif goto magicalize; - case '!': /* $! */ + case '!': /* $! */ GvMULTI_on(gv); /* If %! has been used, automatically load Errno.pm. */ @@ -2376,13 +2361,13 @@ S_gv_magicalize(pTHX_ GV *gv, HV *stash, require_tie_mod_s(gv, '!', "Errno", 1); break; - case '-': /* $-, %-, @- */ - case '+': /* $+, %+, @+ */ + case '-': /* $-, %-, @- */ + case '+': /* $+, %+, @+ */ GvMULTI_on(gv); /* no used once warnings here */ { /* $- $+ */ sv_magic(GvSVn(gv), MUTABLE_SV(gv), PERL_MAGIC_sv, name, len); if (*name == '+') - SvREADONLY_on(GvSVn(gv)); + SvREADONLY_NOPROTECT_on(GvSVn(gv)); } { /* %- %+ */ if (sv_type == SVt_PVHV || sv_type == SVt_PVGV) @@ -2393,99 +2378,94 @@ S_gv_magicalize(pTHX_ GV *gv, HV *stash, const Size_t n = *name; sv_magic(MUTABLE_SV(av), (SV*)n, PERL_MAGIC_regdata, NULL, 0); - SvREADONLY_on(av); + SvREADONLY_NOPROTECT_on(av); } break; - case '*': /* $* */ - case '#': /* $# */ - if (sv_type == SVt_PV) - /* diag_listed_as: $* is no longer supported as of Perl 5.30 */ - croak("$%c is no longer supported as of Perl 5.30", *name); - break; - case '\010': /* $^H */ + case '*': /* $* */ + case '#': /* $# */ + if (sv_type == SVt_PV) + /* diag_listed_as: $* is no longer supported as of Perl 5.30 */ + croak("$%c is no longer supported as of Perl 5.30", *name); + break; + case '\010': /* $^H */ { HV *const hv = GvHVn(gv); hv_magic(hv, NULL, PERL_MAGIC_hints); } goto magicalize; - case '\023': /* $^S */ - ro_magicalize: - SvREADONLY_on(GvSVn(gv)); + case '\023': /* $^S */ + ro_magicalize: + SvREADONLY_NOPROTECT_on(GvSVn(gv)); /* FALLTHROUGH */ - case '0': /* $0 */ - case '^': /* $^ */ - case '~': /* $~ */ - case '=': /* $= */ - case '%': /* $% */ - case '.': /* $. */ - case '(': /* $( */ - case ')': /* $) */ - case '<': /* $< */ - case '>': /* $> */ - case '\\': /* $\ */ - case '/': /* $/ */ - case '|': /* $| */ - case '$': /* $$ */ - case '[': /* $[ */ - case '\001': /* $^A */ - case '\003': /* $^C */ - case '\004': /* $^D */ - case '\005': /* $^E */ - case '\006': /* $^F */ - case '\011': /* $^I, NOT \t in EBCDIC */ - case '\016': /* $^N */ - case '\017': /* $^O */ - case '\020': /* $^P */ - case '\024': /* $^T */ - case '\027': /* $^W */ - magicalize: + case '0': /* $0 */ + case '^': /* $^ */ + case '~': /* $~ */ + case '=': /* $= */ + case '%': /* $% */ + case '.': /* $. */ + case '(': /* $( */ + case ')': /* $) */ + case '<': /* $< */ + case '>': /* $> */ + case '\\': /* $\ */ + case '/': /* $/ */ + case '|': /* $| */ + case '$': /* $$ */ + case '[': /* $[ */ + case '\001': /* $^A */ + case '\003': /* $^C */ + case '\004': /* $^D */ + case '\005': /* $^E */ + case '\006': /* $^F */ + case '\011': /* $^I, NOT \t in EBCDIC */ + case '\016': /* $^N */ + case '\017': /* $^O */ + case '\020': /* $^P */ + case '\024': /* $^T */ + case '\027': /* $^W */ + magicalize: sv_magic(GvSVn(gv), MUTABLE_SV(gv), PERL_MAGIC_sv, name, len); break; - case '\014': /* $^L */ + case '\014': /* $^L */ sv_setpvs(GvSVn(gv),"\f"); break; - case ';': /* $; */ + case ';': /* $; */ sv_setpvs(GvSVn(gv),"\034"); break; - case ']': /* $] */ - { + case ']': /* $] */ + { SV * const sv = GvSV(gv); if (!sv_derived_from(PL_patchlevel, "version")) upg_version(PL_patchlevel, TRUE); GvSV(gv) = vnumify(PL_patchlevel); - SvREADONLY_on(GvSV(gv)); + SvREADONLY_NOPROTECT_on(GvSV(gv)); SvREFCNT_dec(sv); - } - break; - case '\026': /* $^V */ - { + break; + } + + case '\026': /* $^V */ + { SV * const sv = GvSV(gv); GvSV(gv) = new_version(PL_patchlevel); - SvREADONLY_on(GvSV(gv)); + SvREADONLY_NOPROTECT_on(GvSV(gv)); SvREFCNT_dec(sv); - } - break; - case 'a': - case 'b': + break; + } + + case 'a': /* The len > 1 case was handled above */ + case 'b': if (sv_type == SVt_PV) GvMULTI_on(gv); + break; } } - ret: /* Return true if we actually did something. */ return GvAV(gv) || GvHV(gv) || GvIO(gv) || GvCV(gv) - || ( GvSV(gv) && ( - SvOK(GvSV(gv)) || SvMAGICAL(GvSV(gv)) - ) - ); + || (GvSV(gv) && (SvOK(GvSV(gv)) || SvMAGICAL(GvSV(gv)))); } -/* If we do ever start using this later on in the file, we need to make - sure we don’t accidentally use the wrong definition. */ -#undef SvREADONLY_on - /* This function is called when the stash already holds the GV of the magic * variable we're looking for, but we need to check that it has the correct * kind of magic. For example, if someone first uses $! and then %!, the @@ -2535,6 +2515,15 @@ S_maybe_multimagic_gv(pTHX_ GV *gv, cons =for apidoc_item gv_fetchpvs =for apidoc_item gv_fetchsv =for apidoc_item gv_fetchsv_nomg +=for apidoc_flag GV_ADD +=for apidoc_flag GV_ADDMG +=for apidoc_flag GV_ADDMULTI +=for apidoc_flag GV_ADDWARN +=for apidoc_flag GV_NOINIT +=for apidoc_flag GV_NOADD_NOINIT +=for apidoc_flag GV_NOTQUAL +=for apidoc_flag GV_NO_SVGMAGIC +=for apidoc_flag SVf_UTF8 These all return the GV of type C whose name is given by the inputs, or NULL if no GV of that name and type could be found. See L, C is a C string, NUL-terminated with no intermediate NULs. -In C, C is a literal C string, hence is enclosed in -double quotes. +In C, C is a literal C string, enclosed in double quotes. C and C are identical. In these, is a Perl string whose byte length is given by C, and may contain @@ -2584,16 +2572,6 @@ the input C SV. The only differen with C. Including C in the C parameter to C makes it behave identically to C. -=for apidoc Amnh||GV_ADD -=for apidoc Amnh||GV_ADDMG -=for apidoc Amnh||GV_ADDMULTI -=for apidoc Amnh||GV_ADDWARN -=for apidoc Amnh||GV_NOINIT -=for apidoc Amnh||GV_NOADD_NOINIT -=for apidoc Amnh||GV_NOTQUAL -=for apidoc Amnh||GV_NO_SVGMAGIC -=for apidoc Amnh||SVf_UTF8 - =cut */ @@ -2601,6 +2579,8 @@ GV * Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN full_len, I32 flags, const svtype sv_type) { + PERL_ARGS_ASSERT_GV_FETCHPVN_FLAGS; + const char *name = nambeg; GV *gv = NULL; GV**gvp; @@ -2614,8 +2594,6 @@ Perl_gv_fetchpvn_flags(pTHX_ const char const char *const name_end = nambeg + full_len; U32 faking_it; - PERL_ARGS_ASSERT_GV_FETCHPVN_FLAGS; - /* If we have GV_NOTQUAL, the caller promised that * there is no stash, so we can skip the check. * Similarly if full_len is 0, since then we're @@ -2704,7 +2682,8 @@ Perl_gv_fetchpvn_flags(pTHX_ const char gv_init_pvn(gv, stash, name, len, (add & GV_ADDMULTI)|is_utf8); if ( full_len != 0 - && isIDFIRST_lazy_if_safe(name, name + full_len, is_utf8)) { + && isIDFIRST_lazy_if_safe(name, name + full_len, is_utf8)) + { if (ckWARN(WARN_ONCE)) { if (ckDEAD(WARN_ONCE)) GvONCE_FATAL_on(gv); @@ -2758,11 +2737,11 @@ kept; if C it is stripped. With void Perl_gv_fullname4(pTHX_ SV *sv, const GV *gv, const char *prefix, bool keepmain) { + PERL_ARGS_ASSERT_GV_FULLNAME4; + const char *name; const HV * const hv = GvSTASH(gv); - PERL_ARGS_ASSERT_GV_FULLNAME4; - sv_setpv(sv, prefix ? prefix : ""); if (hv && (name = HvNAME(hv))) { @@ -2779,10 +2758,10 @@ Perl_gv_fullname4(pTHX_ SV *sv, const GV void Perl_gv_efullname4(pTHX_ SV *sv, const GV *gv, const char *prefix, bool keepmain) { - const GV * const egv = GvEGVx(gv); - PERL_ARGS_ASSERT_GV_EFULLNAME4; + const GV * const egv = GvEGVx(gv); + gv_fullname4(sv, egv ? egv : gv, prefix, keepmain); } @@ -2794,10 +2773,10 @@ Perl_gv_efullname4(pTHX_ SV *sv, const G void Perl_gv_check(pTHX_ HV *stash) { - I32 i; - PERL_ARGS_ASSERT_GV_CHECK; + I32 i; + if (!HvHasAUX(stash)) return; @@ -2894,6 +2873,8 @@ Perl_newGVgen_flags(pTHX_ const char *pa GP* Perl_gp_ref(pTHX_ GP *gp) { + PERL_ARGS_ASSERT_GP_REF; + if (!gp) return NULL; gp->gp_refcnt++; @@ -2913,6 +2894,8 @@ Perl_gp_ref(pTHX_ GP *gp) void Perl_gp_free(pTHX_ GV *gv) { + PERL_ARGS_ASSERT_GP_FREE; + GP* gp; int attempts = 100; bool in_global_destruction = PL_phase == PERL_PHASE_DESTRUCT; @@ -3011,9 +2994,8 @@ Perl_gp_free(pTHX_ GV *gv) if (hv && SvTYPE(hv) == SVt_PVHV) { const HEK *hvname_hek = HvNAME_HEK(hv); if (PL_stashcache && hvname_hek) { - DEBUG_o(Perl_deb(aTHX_ - "gp_free clearing PL_stashcache for '%" HEKf "'\n", - HEKfARG(hvname_hek))); + DEBUG_o(deb("gp_free clearing PL_stashcache for '%" HEKf "'\n", + HEKfARG(hvname_hek))); (void)hv_deletehek(PL_stashcache, hvname_hek, G_DISCARD); } if (SvREFCNT(hv) > 1 || SvOBJECT(hv) || UNLIKELY(in_global_destruction)) { @@ -3123,10 +3105,10 @@ Perl_gp_free(pTHX_ GV *gv) int Perl_magic_freeovrld(pTHX_ SV *sv, MAGIC *mg) { - AMT * const amtp = (AMT*)mg->mg_ptr; + PERL_ARGS_ASSERT_MAGIC_FREEOVRLD; PERL_UNUSED_ARG(sv); - PERL_ARGS_ASSERT_MAGIC_FREEOVRLD; + AMT * const amtp = (AMT*)mg->mg_ptr; if (amtp && AMT_AMAGIC(amtp)) { int i; @@ -3165,13 +3147,13 @@ is true). int Perl_Gv_AMupdate(pTHX_ HV *stash, bool destructing) { + PERL_ARGS_ASSERT_GV_AMUPDATE; + MAGIC* const mg = mg_find((const SV *)stash, PERL_MAGIC_overload_table); AMT amt; const struct mro_meta* stash_meta = HvMROMETA(stash); U32 newgen; - PERL_ARGS_ASSERT_GV_AMUPDATE; - newgen = PL_sub_generation + stash_meta->pkg_gen + stash_meta->cache_gen; if (mg) { const AMT * const amtp = (AMT*)mg->mg_ptr; @@ -3181,7 +3163,8 @@ Perl_Gv_AMupdate(pTHX_ HV *stash, bool d sv_unmagic(MUTABLE_SV(stash), PERL_MAGIC_overload_table); } - DEBUG_o( Perl_deb(aTHX_ "Recalculating overload magic in package %s\n",HvNAME_get(stash)) ); + DEBUG_o( deb("Recalculating overload magic in package %s\n", + HvNAME_get(stash)) ); Zero(&amt,1,AMT); amt.was_ok_sub = newgen; @@ -3206,11 +3189,9 @@ Perl_Gv_AMupdate(pTHX_ HV *stash, bool d if (!gv_fetchmeth_pvn(stash, "((", 2, -1, 0)) goto no_table; } -#ifdef PERL_DONT_CREATE_GVSV else if (!sv) { NOOP; /* Equivalent to !SvTRUE and !SvOK */ } -#endif else if (SvTRUE(sv)) /* don't need to set overloading here because fallback => 1 * is the default setting for classes without overloading */ @@ -3233,7 +3214,7 @@ Perl_Gv_AMupdate(pTHX_ HV *stash, bool d const char * const cp = AMG_id2name(i); const STRLEN l = PL_AMG_namelens[i]; - DEBUG_o( Perl_deb(aTHX_ "Checking overloading of \"%s\" in package \"%.256s\"\n", + DEBUG_o( deb("Checking overloading of \"%s\" in package \"%.256s\"\n", cp, HvNAME_get(stash)) ); /* don't fill the cache while looking up! Creation of inheritance stubs in intermediate packages may @@ -3242,7 +3223,7 @@ Perl_Gv_AMupdate(pTHX_ HV *stash, bool d then we could have created stubs for "(+0" in A and C too. But if B overloads "bool", we may want to use it for numifying instead of C's "+0". */ - gv = Perl_gv_fetchmeth_pvn(aTHX_ stash, cooky, l, -1, 0); + gv = gv_fetchmeth_pvn(stash, cooky, l, -1, 0); cv = 0; if (gv && (cv = GvCV(gv)) && CvHASGV(cv)) { const HEK * const gvhek = CvGvNAME_HEK(cv); @@ -3257,8 +3238,8 @@ Perl_Gv_AMupdate(pTHX_ HV *stash, bool d GV *ngv = NULL; SV *gvsv = GvSV(gv); - DEBUG_o( Perl_deb(aTHX_ "Resolving method \"%" SVf256\ - "\" for overloaded \"%s\" in package \"%.256s\"\n", + DEBUG_o( deb("Resolving method \"%" SVf256 "\" for overloaded" + " \"%s\" in package \"%.256s\"\n", (void*)GvSV(gv), cp, HvNAME(stash)) ); if (!gvsv || !SvPOK(gvsv) || !(ngv = gv_fetchmethod_sv_flags(stash, gvsv, 0))) @@ -3285,7 +3266,8 @@ Perl_Gv_AMupdate(pTHX_ HV *stash, bool d } cv = GvCV(gv = ngv); } - DEBUG_o( Perl_deb(aTHX_ "Overloading \"%s\" in package \"%.256s\" via \"%.256s::%.256s\"\n", + DEBUG_o( deb("Overloading \"%s\" in package \"%.256s\" via" + " \"%.256s::%.256s\"\n", cp, HvNAME_get(stash), HvNAME_get(GvSTASH(CvGV(cv))), GvNAME(CvGV(cv))) ); filled = 1; @@ -3340,6 +3322,8 @@ Implements C, which you sh CV* Perl_gv_handler(pTHX_ HV *stash, I32 id) { + PERL_ARGS_ASSERT_GV_HANDLER; + MAGIC *mg; AMT *amtp; U32 newgen; @@ -3390,6 +3374,8 @@ Perl_gv_handler(pTHX_ HV *stash, I32 id) bool Perl_try_amagic_un(pTHX_ int method, int flags) { + PERL_ARGS_ASSERT_TRY_AMAGIC_UN; + SV* tmpsv; SV* const arg = PL_stack_sp[0]; bool is_rc = rpp_stack_is_rc(); @@ -3594,6 +3580,8 @@ Perl_amagic_applies(pTHX_ SV *sv, int me bool Perl_try_amagic_bin(pTHX_ int method, int flags) { + PERL_ARGS_ASSERT_TRY_AMAGIC_BIN; + SV* left = PL_stack_sp[-1]; SV* right = PL_stack_sp[0]; bool is_rc = rpp_stack_is_rc(); @@ -3684,7 +3672,11 @@ Perl_try_amagic_bin(pTHX_ int method, in /* -=for apidoc amagic_deref_call +=for apidoc amagic_deref_call +=for apidoc_flag AMGf_noleft +=for apidoc_flag AMGf_noright +=for apidoc_flag AMGf_unary +=for apidoc_flag AMGf_assign Perform C overloading dereferencing on C, returning the dereferenced result. C must be one of the dereference operations given @@ -3696,12 +3688,13 @@ If overloading is inactive on C, re */ SV * -Perl_amagic_deref_call(pTHX_ SV *ref, int method) { +Perl_amagic_deref_call(pTHX_ SV *ref, int method) +{ + PERL_ARGS_ASSERT_AMAGIC_DEREF_CALL; + SV *tmpsv = NULL; HV *stash; - PERL_ARGS_ASSERT_AMAGIC_DEREF_CALL; - if (!SvAMAGIC(ref)) return ref; /* return quickly if none of the deref ops are overloaded */ @@ -3728,6 +3721,8 @@ Perl_amagic_deref_call(pTHX_ SV *ref, in bool Perl_amagic_is_enabled(pTHX_ int method) { + PERL_ARGS_ASSERT_AMAGIC_IS_ENABLED; + SV *lex_mask = cop_hints_fetch_pvs(PL_curcop, "overloading", 0); assert(PL_curcop->cop_hints & HINT_NO_AMAGIC); @@ -3751,7 +3746,13 @@ Perl_amagic_is_enabled(pTHX_ int method) } /* -=for apidoc amagic_call +=for apidoc amagic_call +=for apidoc_flag AMGf_noleft +=for apidoc_flag AMGf_noright +=for apidoc_flag AMGf_unary +=for apidoc_flag AMGf_assign +=for apidoc_flag AMGf_force_scalar +=for apidoc_flag AMGf_force_overload Perform the overloaded (active magic) operation given by C. C is one of the values found in F. @@ -3776,6 +3777,16 @@ The operation is done only on just one o The operation changes one of the operands, e.g., $x += 1 +=item C + +In many cases amagic_call() uses the L context of the +current OP when calling the sub handling the overload. This flag +forces amagic_call() to use scalar context. + +=item C + +Perform overloading even in the context of C. + =back =cut @@ -3784,6 +3795,8 @@ The operation changes one of the operand SV* Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int flags) { + PERL_ARGS_ASSERT_AMAGIC_CALL; + MAGIC *mg; CV *cv=NULL; CV **cvp=NULL, **ocvp=NULL; @@ -3799,9 +3812,8 @@ Perl_amagic_call(pTHX_ SV *left, SV *rig #endif HV* stash=NULL; - PERL_ARGS_ASSERT_AMAGIC_CALL; - - if ( PL_curcop->cop_hints & HINT_NO_AMAGIC ) { + if ( (PL_curcop->cop_hints & HINT_NO_AMAGIC) + && !(flags & AMGf_force_overload)) { if (!amagic_is_enabled(method)) return NULL; } @@ -4008,7 +4020,7 @@ Perl_amagic_call(pTHX_ SV *left, SV *rig } else { SV *msg; if (off==-1) off=method; - msg = sv_2mortal(Perl_newSVpvf(aTHX_ + msg = sv_2mortal(newSVpvf( "Operation \"%s\": no method found,%sargument %s%" SVf "%s%" SVf, AMG_id2name(method + assignshift), (flags & AMGf_unary ? " " : "\n\tleft "), @@ -4027,7 +4039,7 @@ Perl_amagic_call(pTHX_ SV *left, SV *rig SVfARG(newSVhek_mortal(HvNAME_HEK(SvSTASH(SvRV(right))))): SVfARG(&PL_sv_no))); if (use_default_op) { - DEBUG_o( Perl_deb(aTHX_ "%" SVf, SVfARG(msg)) ); + DEBUG_o( deb("%" SVf, SVfARG(msg)) ); } else { croak("%" SVf, SVfARG(msg)); } @@ -4108,19 +4120,21 @@ Perl_amagic_call(pTHX_ SV *left, SV *rig #ifdef DEBUGGING if (!notfound) { - DEBUG_o(Perl_deb(aTHX_ - "Overloaded operator \"%s\"%s%s%s:\n\tmethod%s found%s in package %" SVf "%s\n", - AMG_id2name(off), - method+assignshift==off? "" : - " (initially \"", - method+assignshift==off? "" : - AMG_id2name(method+assignshift), - method+assignshift==off? "" : "\")", - flags & AMGf_unary? "" : - lr==1 ? " for right argument": " for left argument", - flags & AMGf_unary? " for argument" : "", - stash ? SVfARG(newSVhek_mortal(HvNAME_HEK(stash))) : SVfARG(newSVpvs_flags("null", SVs_TEMP)), - fl? ",\n\tassignment variant used": "") ); + DEBUG_o(deb("Overloaded operator \"%s\"%s%s%s:\n\tmethod%s found%s in" + " package %" SVf "%s\n", + AMG_id2name(off), + method+assignshift==off? "" : + " (initially \"", + method+assignshift==off? "" : + AMG_id2name(method+assignshift), + method+assignshift==off? "" : "\")", + flags & AMGf_unary? "" : + lr==1 ? " for right argument": " for left argument", + flags & AMGf_unary? " for argument" : "", + (stash) ? SVfARG(newSVhek_mortal(HvNAME_HEK(stash))) + : SVfARG(newSVpvs_flags("null", SVs_TEMP)), + (fl) ? ",\n\tassignment variant used" + : "") ); } #endif /* Since we use shallow copy during assignment, we need @@ -4170,7 +4184,7 @@ Perl_amagic_call(pTHX_ SV *left, SV *rig * with the context of individual concats being scalar, * regardless of the overall context of the multiconcat op */ - U8 gimme = (force_scalar || !PL_op || PL_op->op_type == OP_MULTICONCAT) + U8 gimme = (force_scalar || (flags & AMGf_force_scalar) || !PL_op ) ? G_SCALAR : GIMME_V; CATCH_SET(TRUE); @@ -4199,7 +4213,7 @@ Perl_amagic_call(pTHX_ SV *left, SV *rig ENTER; SAVEOP(); PL_op = (OP *) &myop; - if (PERLDB_SUB && PL_curstash != PL_debstash) + if (PERLDB_SUB && !CopSTASH_eq(PL_curcop, PL_debstash)) PL_op->op_private |= OPpENTERSUB_DB; PUSHMARK(PL_stack_sp); @@ -4312,10 +4326,10 @@ UTF-8; otherwise not. void Perl_gv_name_set(pTHX_ GV *gv, const char *name, U32 len, U32 flags) { - U32 hash; - PERL_ARGS_ASSERT_GV_NAME_SET; + U32 hash; + if (len > I32_MAX) croak("panic: gv name too long (%" UVuf ")", (UV) len); @@ -4350,11 +4364,12 @@ more compactly represents the same thing void Perl_gv_try_downgrade(pTHX_ GV *gv) { + PERL_ARGS_ASSERT_GV_TRY_DOWNGRADE; + HV *stash; CV *cv; HEK *namehek; SV **gvp; - PERL_ARGS_ASSERT_GV_TRY_DOWNGRADE; /* XXX Why and where does this leave dangling pointers during global destruction? */ @@ -4408,9 +4423,10 @@ Perl_gv_try_downgrade(pTHX_ GV *gv) GV * Perl_gv_override(pTHX_ const char * const name, const STRLEN len) { + PERL_ARGS_ASSERT_GV_OVERRIDE; + GV *gv = gv_fetchpvn(name, len, GV_NOTQUAL, SVt_PVCV); GV * const *gvp; - PERL_ARGS_ASSERT_GV_OVERRIDE; if (gv && GvCVu(gv) && GvIMPORTED_CV(gv)) return gv; gvp = (GV**)hv_fetch(PL_globalstash, name, len, FALSE); gv = gvp ? *gvp : NULL; Index: gnu/usr.bin/perl/gv.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/gv.h,v diff -u -p -a -u -p -r1.20 gv.h --- gnu/usr.bin/perl/gv.h 26 Dec 2025 22:14:12 -0000 1.20 +++ gnu/usr.bin/perl/gv.h 16 Nov 2026 00:57:38 -0000 @@ -46,37 +46,37 @@ the need to cast the result to the appro #if defined (DEBUGGING) && defined(PERL_USE_GCC_BRACE_GROUPS) && !defined(__INTEL_COMPILER) # define GvGP(gv) \ - ((GP *)(*({GV *const _gvgp = (GV *) (gv); \ - assert(SvTYPE(_gvgp) == SVt_PVGV || SvTYPE(_gvgp) == SVt_PVLV); \ - assert(isGV_with_GP(_gvgp)); \ - &((_gvgp)->sv_u.svu_gp);}))) + ((GP *)(*({GV *const gvgp_ = (GV *) (gv); \ + assert(SvTYPE(gvgp_) == SVt_PVGV || SvTYPE(gvgp_) == SVt_PVLV); \ + assert(isGV_with_GP(gvgp_)); \ + &((gvgp_)->sv_u.svu_gp);}))) # define GvGP_set(gv,gp) \ - {GV *const _gvgp = (GV *) (gv); \ - assert(SvTYPE(_gvgp) == SVt_PVGV || SvTYPE(_gvgp) == SVt_PVLV); \ - assert(isGV_with_GP(_gvgp)); \ - (_gvgp)->sv_u.svu_gp = (gp); } + {GV *const gvgp_ = (GV *) (gv); \ + assert(SvTYPE(gvgp_) == SVt_PVGV || SvTYPE(gvgp_) == SVt_PVLV); \ + assert(isGV_with_GP(gvgp_)); \ + (gvgp_)->sv_u.svu_gp = (gp); } # define GvFLAGS(gv) \ - (*({GV *const _gvflags = (GV *) (gv); \ - assert(SvTYPE(_gvflags) == SVt_PVGV || SvTYPE(_gvflags) == SVt_PVLV); \ - assert(isGV_with_GP(_gvflags)); \ - &(GvXPVGV(_gvflags)->xpv_cur);})) + (*({GV *const gvflags_ = (GV *) (gv); \ + assert(SvTYPE(gvflags_) == SVt_PVGV || SvTYPE(gvflags_) == SVt_PVLV); \ + assert(isGV_with_GP(gvflags_)); \ + &(GvXPVGV(gvflags_)->xpv_cur);})) # define GvSTASH(gv) \ - (*({ GV * const _gvstash = (GV *) (gv); \ - assert(isGV_with_GP(_gvstash)); \ - assert(SvTYPE(_gvstash) == SVt_PVGV || SvTYPE(_gvstash) >= SVt_PVLV); \ - &(GvXPVGV(_gvstash)->xnv_u.xgv_stash); \ + (*({ GV * const gvstash_ = (GV *) (gv); \ + assert(isGV_with_GP(gvstash_)); \ + assert(SvTYPE(gvstash_) == SVt_PVGV || SvTYPE(gvstash_) >= SVt_PVLV); \ + &(GvXPVGV(gvstash_)->xnv_u.xgv_stash); \ })) # define GvNAME_HEK(gv) \ - (*({ GV * const _gvname_hek = (GV *) (gv); \ - assert(isGV_with_GP(_gvname_hek)); \ - assert(SvTYPE(_gvname_hek) == SVt_PVGV || SvTYPE(_gvname_hek) >= SVt_PVLV); \ - &(GvXPVGV(_gvname_hek)->xiv_u.xivu_namehek); \ + (*({ GV * const gvname_hek_ = (GV *) (gv); \ + assert(isGV_with_GP(gvname_hek_)); \ + assert(SvTYPE(gvname_hek_) == SVt_PVGV || SvTYPE(gvname_hek_) >= SVt_PVLV); \ + &(GvXPVGV(gvname_hek_)->xiv_u.xivu_namehek); \ })) # define GvNAME_get(gv) ({ assert(GvNAME_HEK(gv)); (char *)HEK_KEY(GvNAME_HEK(gv)); }) # define GvNAMELEN_get(gv) ({ assert(GvNAME_HEK(gv)); HEK_LEN(GvNAME_HEK(gv)); }) # define GvNAMEUTF8(gv) ({ assert(GvNAME_HEK(gv)); HEK_UTF8(GvNAME_HEK(gv)); }) #else -# define GvGP(gv) (0+(gv)->sv_u.svu_gp) +# define GvGP(gv) ((GP *)(gv)->sv_u.svu_gp) # define GvGP_set(gv,gp) ((gv)->sv_u.svu_gp = (gp)) # define GvFLAGS(gv) (GvXPVGV(gv)->xpv_cur) # define GvSTASH(gv) (GvXPVGV(gv)->xnv_u.xgv_stash) @@ -94,9 +94,8 @@ the need to cast the result to the appro Return the SV from the GV. -Prior to Perl v5.9.3, this would add a scalar if none existed. Nowadays, use -C> for that, or compile perl with S>. See -L. +Use C> if you wish to create an empty scalar when the SV slot is +empty. =for apidoc Am|SV*|GvSVn|GV* gv Like C>, but creates an empty scalar if none already exists. @@ -117,13 +116,9 @@ Return the CV from the GV. */ #define GvSV(gv) (GvGP(gv)->gp_sv) -#ifdef PERL_DONT_CREATE_GVSV #define GvSVn(gv) (*(GvGP(gv)->gp_sv ? \ &(GvGP(gv)->gp_sv) : \ &(GvGP(gv_SVadd(gv))->gp_sv))) -#else -#define GvSVn(gv) GvSV(gv) -#endif #define GvREFCNT(gv) (GvGP(gv)->gp_refcnt) #define GvIO(gv) \ Index: gnu/usr.bin/perl/handy.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/handy.h,v diff -u -p -a -u -p -r1.25 handy.h --- gnu/usr.bin/perl/handy.h 26 Dec 2025 22:14:12 -0000 1.25 +++ gnu/usr.bin/perl/handy.h 16 Nov 2026 00:57:38 -0000 @@ -334,6 +334,22 @@ don't, so that you can portably take adv # endif #endif +/* +=for apidoc_section $numeric_scn +=for apidoc Em|bool|isEVEN|UV a +=for apidoc_item |bool|isODD|UV a + +These return a boolean as to whether or not the integer value given by the +argument is even or odd, respectively. + +=cut +*/ + +#if defined(PERL_CORE) || defined(PERL_EXT_RE_BUILD) +# define isODD(a) ((a) & 1) +# define isEVEN(a) (! isODD(a)) +#endif + /* Returns a boolean as to whether the input unsigned number is a power of 2 * (2**0, 2**1, etc). In other words if it has just a single bit set. * If not, subtracting 1 would leave the uppermost bit set, so the & would @@ -342,35 +358,20 @@ don't, so that you can portably take adv # define isPOWER_OF_2(n) ((n) && ((n) & ((n)-1)) == 0) #endif -/* Returns a mask with the lowest n bits set */ -#define nBIT_MASK(n) ((UINTMAX_C(1) << (n)) - 1) +/* Returns a mask with the lowest n bits set. Avoids undefined behavior if n + * is, say, 64 on a 64-bit system, by: + * 1) shifting only 63 yielding 1000000...000 + * 2) subtracting 1, yielding 0111111...111 + * 3) shifting by 1, yielding 1111111...110 + * 4) adding the final bit yielding all 1's */ +#define nBIT_MASK(n) \ + (((n) == 0) ? 0 : (((UINTMAX_C(1) << ((n) - 1)) - 1) << 1) | 1) + /* |_________________________| */ /* The largest unsigned number that will fit into n bits */ #define nBIT_UMAX(n) nBIT_MASK(n) /* -=for apidoc_section $directives -=for apidoc Am||__ASSERT_|bool expr - -This is a helper macro to avoid preprocessor issues, replaced by nothing -unless under DEBUGGING, where it expands to an assert of its argument, -followed by a comma (hence the comma operator). If we just used a straight -assert(), we would get a comma with nothing before it when not DEBUGGING. - -=cut - -We also use empty definition under Coverity since the __ASSERT_ -checks often check for things that Really Cannot Happen, and Coverity -detects that and gets all excited. */ - -#if defined(DEBUGGING) && !defined(__COVERITY__) \ - && ! defined(PERL_SMALL_MACRO_BUFFER) -# define __ASSERT_(statement) assert(statement), -#else -# define __ASSERT_(statement) -#endif - -/* =for apidoc_section $SV =for apidoc Ama|SV*|newSVpvs|"literal string" @@ -385,10 +386,6 @@ a string/length pair. Like C, but takes a literal string instead of a string/length pair and omits the hash parameter. -=for apidoc Am|SV *|sv_setref_pvs|SV *const rv|const char *const classname|"literal string" -Like C, but takes a literal string instead of -a string/length pair. - =cut */ @@ -440,6 +437,12 @@ Perl_xxx(aTHX_ ...) form for any API cal #define sv_setpvs(dsv, str) Perl_sv_setpvn(aTHX_ dsv, STR_WITH_LEN(str)) #define sv_setpvs_mg(dsv, str) Perl_sv_setpvn_mg(aTHX_ dsv, STR_WITH_LEN(str)) +/* +=for apidoc_defn Am|SV *|sv_setref_pvs|SV *const rv|const char *const classname|"literal string" +a string/length pair. + +=cut +*/ #define sv_setref_pvs(rv, classname, str) \ Perl_sv_setref_pvn(aTHX_ rv, classname, STR_WITH_LEN(str)) @@ -470,7 +473,7 @@ Perl_xxx(aTHX_ ...) form for any API cal /* -=for apidoc_defn mx|void|lex_stuff_pvs|"pv"|U32 flags +=for apidoc_defn Amx|void|lex_stuff_pvs|"pv"|U32 flags =cut */ @@ -703,8 +706,8 @@ based on the underlying C library functi #define strnNE(s1,s2,l) (strncmp(s1,s2,l) != 0) #define strnEQ(s1,s2,l) (strncmp(s1,s2,l) == 0) -#define memEQ(s1,s2,l) (memcmp(((const void *) (s1)), ((const void *) (s2)), l) == 0) -#define memNE(s1,s2,l) (! memEQ(s1,s2,l)) +#define memNE(s1,s2,l) (memcmp(s1,s2,l) != 0) +#define memEQ(s1,s2,l) (memcmp(s1,s2,l) == 0) /* memEQ and memNE where second comparand is a string constant */ #define memEQs(s1, l, s2) \ @@ -1434,7 +1437,24 @@ or casts * * NOT suitable for void* */ -#define ASSERT_IS_PTR(x) (__ASSERT_(sizeof(*(x))) (x)) +#define ASSERT_IS_PTR(x) (assert(sizeof(*(x))), (x)) + +/* +=for apidoc_section $directives_scn +=for apidoc Em|bool|PREVENT_LVALUE|x + +This returns its input C, but forces a compilation error if called from an +lvalue context. Its main use is to be placed in a macro that otherwise could +be used to change the value of C, but doing so is undesirable. + +A common example is when there are getter and setter macros for C, and the +setter has error checking that shouldn't be short circuited. Wrapping C +with this macro in the getter call forces the setter one to be used to change +C. + +=cut +*/ +#define PREVENT_LVALUE(x) ((x) | 0) /* FITS_IN_8_BITS(c) returns true if c doesn't have a bit set other than in * the lower 8. It is designed to be hopefully bomb-proof, making sure that no @@ -1459,8 +1479,8 @@ or casts * needed. (The NV casts stop any warnings about comparison always being true * if called with an unsigned. The cast preserves the sign, which is all we * care about.) */ -#define withinCOUNT(c, l, n) (__ASSERT_((NV) (l) >= 0) \ - __ASSERT_((NV) (n) >= 0) \ +#define withinCOUNT(c, l, n) (assert((NV) (l) >= 0), \ + assert((NV) (n) >= 0), \ withinCOUNT_KNOWN_VALID_((c), (l), (n))) /* For internal use only, this can be used in places where it is known that the @@ -1475,11 +1495,11 @@ or casts /* Returns true if c is in the range l..u, where 'l' is non-negative * Written this way so that after optimization, only one conditional test is * needed. */ -#define inRANGE(c, l, u) (__ASSERT_((NV) (l) >= 0) __ASSERT_((u) >= (l)) \ +#define inRANGE(c, l, u) (assert((NV) (l) >= 0), assert((u) >= (l)), \ ( (sizeof(c) == sizeof(U8)) ? inRANGE_helper_(U8, (c), (l), ((u))) \ : (sizeof(c) == sizeof(U16)) ? inRANGE_helper_(U16,(c), (l), ((u))) \ : (sizeof(c) == sizeof(U32)) ? inRANGE_helper_(U32,(c), (l), ((u))) \ - : (__ASSERT_(sizeof(c) == sizeof(WIDEST_UTYPE)) \ + : (assert(sizeof(c) == sizeof(WIDEST_UTYPE)), \ inRANGE_helper_(WIDEST_UTYPE,(c), (l), ((u)))))) /* For internal use, this is used by machine-generated code which generates @@ -1562,8 +1582,10 @@ or casts # define CC_BINDIGIT_ 23 # define CC_OCTDIGIT_ 24 # define CC_MNEMONIC_CNTRL_ 25 +# define CC_MAGICAL_ 26 +# define CC_UNDERSCORE_ 27 -/* Unused: 26-31 +/* Unused: 28-31 * If more bits are needed, one could add a second word for non-64bit * QUAD_IS_INT systems, using some #ifdefs to distinguish between having a 2nd * word or not. The IS_IN_SOME_FOLD bit is the most easily expendable, as it @@ -1613,10 +1635,28 @@ END_EXTERN_C /* The 1U keeps Solaris from griping when shifting sets the uppermost bit */ # define CC_mask_(classnum) (1U << (classnum)) +/* +=for apidoc_section $classification +=for apidoc Cm|U32|CC_mask_|U8 c|U8 classnum + +This translates C into a bit pattern to use in conjunction with +entries in C, and operations such is C>. +C is one of the classes defined in F for this purpose. + +=for apidoc Cm|bool|Perl_isCC_by_bit|U8 c|U32 bit_pattern + +Returns a boolean as to whether or not the character C in the Latin1 range +is a member of the class(es) given by C, as formed by +C>. + +=cut +*/ +# define Perl_isCC_by_bit(c, bit_pattern) \ + (FITS_IN_8_BITS(c) && (PL_charclass[(U8) (c)] & (bit_pattern))) + /* For internal core Perl use only: the base macro for defining macros like * isALPHA */ -# define generic_isCC_(c, classnum) cBOOL(FITS_IN_8_BITS(c) \ - && (PL_charclass[(U8) (c)] & CC_mask_(classnum))) +# define generic_isCC_(c, classnum) Perl_isCC_by_bit(c, CC_mask_(classnum)) /* The mask for the _A versions of the macros; it just adds in the bit for * ASCII. */ @@ -1672,6 +1712,13 @@ END_EXTERN_C # define isWORDCHAR_L1(c) generic_isCC_(c, CC_WORDCHAR_) # define isIDFIRST_L1(c) generic_isCC_(c, CC_IDFIRST_) +#define isFOO_or_UNDERSCORE_(c, lookup_bit) \ + (FITS_IN_8_BITS(c) && ( PL_charclass[(U8) (c)] \ + & (CC_mask_(lookup_bit)|CC_mask_(CC_UNDERSCORE_)))) +#ifdef PERL_CORE /* Keep local for now */ +# define isDIGIT_or_UNDERSCORE(c) isFOO_or_UNDERSCORE_(c, CC_DIGIT_) +#endif + # ifdef EBCDIC # define isASCII(c) generic_isCC_(c, CC_ASCII_) # endif @@ -1691,7 +1738,9 @@ END_EXTERN_C ( (! cBOOL(FITS_IN_8_BITS(c))) \ || (PL_charclass[(U8) (c)] & CC_mask_(CC_NONLATIN1_FOLD_))) -# define _isQUOTEMETA(c) generic_isCC_(c, CC_QUOTEMETA_) +# if defined(PERL_CORE) || defined(PERL_IN_XS_APITEST) +# define isQUOTEMETA(c) generic_isCC_(c, CC_QUOTEMETA_) +# endif /* is c a control character for which we have a mnemonic? */ # if defined(PERL_CORE) || defined(PERL_EXT) @@ -1822,7 +1871,9 @@ END_EXTERN_C /* The following are not fully accurate in the above-ASCII range. I (khw) * don't think it's necessary to be so for the purposes where this gets * compiled */ -# define isQUOTEMETA_(c) (FITS_IN_8_BITS(c) && ! isWORDCHAR_L1(c)) +# if defined(PERL_CORE) || defined(PERL_IN_XS_APITEST) +# define isQUOTEMETA(c) (FITS_IN_8_BITS(c) && ! isWORDCHAR_L1(c)) +# endif /* Many of the macros later in this file are defined in terms of these. By * implementing them with a function, which converts the class number into @@ -2114,7 +2165,7 @@ END_EXTERN_C : ((UNLIKELY(((U8) (c)) == LATIN_SMALL_LETTER_Y_WITH_DIAERESIS) \ ? LATIN_CAPITAL_LETTER_Y_WITH_DIAERESIS \ : (UNLIKELY(((U8)(c)) == LATIN_SMALL_LETTER_SHARP_S) \ - ? (__ASSERT_(0) (c)) /* Fail on Sharp S in DEBUGGING */ \ + ? (assert(0), (c)) /* Fail on Sharp S in DEBUGGING */ \ : PL_mod_latin1_uc[ (U8) (c) ])))))) /* In this macro, note that the result can be larger than a byte in a UTF-8 @@ -2126,8 +2177,8 @@ END_EXTERN_C # define toFOLD_LC(c) \ ((UNLIKELY((c) == MICRO_SIGN) && IN_UTF8_CTYPE_LOCALE) \ ? GREEK_SMALL_LETTER_MU \ - : (__ASSERT_( ! IN_UTF8_CTYPE_LOCALE \ - || LIKELY((c) != LATIN_SMALL_LETTER_SHARP_S)) \ + : (assert( ! IN_UTF8_CTYPE_LOCALE \ + || LIKELY((c) != LATIN_SMALL_LETTER_SHARP_S)), \ toLOWER_LC(c))) #endif @@ -2156,7 +2207,7 @@ END_EXTERN_C : above_latin1(c)) #define generic_invlist_uvchr_(classnum, c) ((c) < 256 \ ? generic_isCC_(c, classnum) \ - : _is_uni_FOO(classnum, c)) + : is_uni_FOO_(classnum, c)) #define isALPHA_uvchr(c) generic_invlist_uvchr_(CC_ALPHA_, c) #define isALPHANUMERIC_uvchr(c) generic_invlist_uvchr_(CC_ALPHANUMERIC_, c) #define isASCII_uvchr(c) isASCII(c) @@ -2165,9 +2216,9 @@ END_EXTERN_C #define isDIGIT_uvchr(c) generic_invlist_uvchr_(CC_DIGIT_, c) #define isGRAPH_uvchr(c) generic_invlist_uvchr_(CC_GRAPH_, c) #define isIDCONT_uvchr(c) \ - generic_uvchr_(CC_WORDCHAR_, _is_uni_perl_idcont, c) + generic_uvchr_(CC_WORDCHAR_, is_uni_perl_idcont_, c) #define isIDFIRST_uvchr(c) \ - generic_uvchr_(CC_IDFIRST_, _is_uni_perl_idstart, c) + generic_uvchr_(CC_IDFIRST_, is_uni_perl_idstart_, c) #define isLOWER_uvchr(c) generic_invlist_uvchr_(CC_LOWER_, c) #define isPRINT_uvchr(c) generic_invlist_uvchr_(CC_PRINT_, c) @@ -2218,7 +2269,7 @@ END_EXTERN_C #define generic_LC_uvchr_(latin1, above_latin1, c) \ (c < 256 ? latin1(c) : above_latin1(c)) #define generic_LC_invlist_uvchr_(latin1, classnum, c) \ - (c < 256 ? latin1(c) : _is_uni_FOO(classnum, c)) + (c < 256 ? latin1(c) : is_uni_FOO_(classnum, c)) #define isALPHA_LC_uvchr(c) generic_LC_invlist_uvchr_(isALPHA_LC, CC_ALPHA_, c) #define isALPHANUMERIC_LC_uvchr(c) generic_LC_invlist_uvchr_(isALPHANUMERIC_LC, \ @@ -2230,9 +2281,9 @@ END_EXTERN_C #define isDIGIT_LC_uvchr(c) generic_LC_invlist_uvchr_(isDIGIT_LC, CC_DIGIT_, c) #define isGRAPH_LC_uvchr(c) generic_LC_invlist_uvchr_(isGRAPH_LC, CC_GRAPH_, c) #define isIDCONT_LC_uvchr(c) generic_LC_uvchr_(isIDCONT_LC, \ - _is_uni_perl_idcont, c) + is_uni_perl_idcont_, c) #define isIDFIRST_LC_uvchr(c) generic_LC_uvchr_(isIDFIRST_LC, \ - _is_uni_perl_idstart, c) + is_uni_perl_idstart_, c) #define isLOWER_LC_uvchr(c) generic_LC_invlist_uvchr_(isLOWER_LC, CC_LOWER_, c) #define isPRINT_LC_uvchr(c) generic_LC_invlist_uvchr_(isPRINT_LC, CC_PRINT_, c) #define isPSXSPC_LC_uvchr(c) isSPACE_LC_uvchr(c) @@ -2265,50 +2316,59 @@ END_EXTERN_C * bunch of code in toke.c assumes that this is true, so the assertion allows * for that */ #ifdef PERL_IN_TOKE_C -# define _utf8_safe_assert(p,e) ((e) > (p) || ((e) == (p) && *(p) == '\0')) +# define utf8_safe_assert_(p,e) ((e) > (p) || ((e) == (p) && *(p) == '\0')) #else -# define _utf8_safe_assert(p,e) ((e) > (p)) +# define utf8_safe_assert_(p,e) ((e) > (p)) #endif #define generic_utf8_safe_(classnum, p, e, above_latin1) \ - ((! _utf8_safe_assert(p, e)) \ - ? (force_out_malformed_utf8_message_((U8 *) (p), (U8 *) (e), 0, MALFORMED_UTF8_DIE), 0)\ + ((! utf8_safe_assert_(p, e)) \ + ? (force_out_malformed_utf8_message_((U8 *) (p), (U8 *) (e), 0, \ + MALFORMED_UTF8_DIE), 0) \ : (UTF8_IS_INVARIANT(*(p))) \ ? generic_isCC_(*(p), classnum) \ - : (UTF8_IS_DOWNGRADEABLE_START(*(p)) \ - ? ((LIKELY((e) - (p) > 1 && UTF8_IS_CONTINUATION(*((p)+1)))) \ - ? generic_isCC_(EIGHT_BIT_UTF8_TO_NATIVE(*(p), *((p)+1 )), \ - classnum) \ - : (force_out_malformed_utf8_message_( \ - (U8 *) (p), (U8 *) (e), 0, MALFORMED_UTF8_DIE), 0)) \ - : above_latin1)) -/* Like the above, but calls 'above_latin1(p)' to get the utf8 value. + : (UTF8_IS_ABOVE_LATIN1_START(*(p)) \ + ? above_latin1 \ + : ((LIKELY((e) - (p) > 1 && UTF8_IS_CONTINUATION(*((p)+1)))) \ + /* Multiply by 2 to return byte length of matched \ + * character */ \ + ? 2 * generic_isCC_(EIGHT_BIT_UTF8_TO_NATIVE(*(p),*((p)+1)),\ + classnum) \ + : (force_out_malformed_utf8_message_((U8 *) (p), (U8 *) (e),\ + 0, MALFORMED_UTF8_DIE),\ + 0)))) + +/* Like the above, but calls 'above_latin1(p, e)' to get the utf8 value. * 'above_latin1' can be a macro */ #define generic_func_utf8_safe_(classnum, above_latin1, p, e) \ generic_utf8_safe_(classnum, p, e, above_latin1(p, e)) + #define generic_non_invlist_utf8_safe_(classnum, above_latin1, p, e) \ - generic_utf8_safe_(classnum, p, e, \ - (UNLIKELY((e) - (p) < UTF8SKIP(p)) \ - ? (force_out_malformed_utf8_message_( \ - (U8 *) (p), (U8 *) (e), 0, MALFORMED_UTF8_DIE), 0) \ - : above_latin1(p))) + generic_utf8_safe_(classnum, p, e, \ + (LIKELY((e) - (p) >= UTF8SKIP(p)) \ + ? above_latin1(p) \ + : (force_out_malformed_utf8_message_( \ + (U8 *) (p), \ + (U8 *) (e), \ + 0, \ + MALFORMED_UTF8_DIE),\ + 0))) /* Like the above, but passes classnum to _isFOO_utf8(), instead of having an * 'above_latin1' parameter */ #define generic_invlist_utf8_safe_(classnum, p, e) \ - generic_utf8_safe_(classnum, p, e, _is_utf8_FOO(classnum, p, e)) + generic_utf8_safe_(classnum, p, e, is_utf8_FOO_(classnum, p, e)) /* Like the above, but should be used only when it is known that there are no * characters in the upper-Latin1 range (128-255 on ASCII platforms) which the * class is TRUE for. Hence it can skip the tests for this range. * 'above_latin1' should include its arguments */ #define generic_utf8_safe_no_upper_latin1_(classnum, p, e, above_latin1) \ - (__ASSERT_(_utf8_safe_assert(p, e)) \ + (assert(utf8_safe_assert_(p, e)), \ (isASCII(*(p))) \ ? generic_isCC_(*(p), classnum) \ - : (UTF8_IS_DOWNGRADEABLE_START(*(p))) \ - ? 0 /* Note that doesn't check validity for latin1 */ \ - : above_latin1) - + : (UTF8_IS_ABOVE_LATIN1_START(*(p)) \ + ? above_latin1 \ + : 0)) /* Note that doesn't check validity for latin1 */ #define isALPHA_utf8(p, e) isALPHA_utf8_safe(p, e) #define isALPHANUMERIC_utf8(p, e) isALPHANUMERIC_utf8_safe(p, e) @@ -2335,7 +2395,7 @@ END_EXTERN_C #define isASCII_utf8_safe(p, e) \ /* Because ASCII is invariant under utf8, the non-utf8 macro \ * works */ \ - (__ASSERT_(_utf8_safe_assert(p, e)) isASCII(*(p))) + (assert_(utf8_safe_assert_(p, e)) isASCII(*(p))) #define isBLANK_utf8_safe(p, e) \ generic_non_invlist_utf8_safe_(CC_BLANK_, is_HORIZWS_high, p, e) @@ -2343,17 +2403,17 @@ END_EXTERN_C /* Because all controls are UTF-8 invariants in EBCDIC, we can use this * more efficient macro instead of the more general one */ # define isCNTRL_utf8_safe(p, e) \ - (__ASSERT_(_utf8_safe_assert(p, e)) isCNTRL_L1(*(p))) + (assert_(utf8_safe_assert_(p, e)) isCNTRL_L1(*(p))) #else # define isCNTRL_utf8_safe(p, e) generic_utf8_safe_(CC_CNTRL_, p, e, 0) #endif #define isDIGIT_utf8_safe(p, e) \ generic_utf8_safe_no_upper_latin1_(CC_DIGIT_, p, e, \ - _is_utf8_FOO(CC_DIGIT_, p, e)) + is_utf8_FOO_(CC_DIGIT_, p, e)) #define isGRAPH_utf8_safe(p, e) generic_invlist_utf8_safe_(CC_GRAPH_, p, e) #define isIDCONT_utf8_safe(p, e) generic_func_utf8_safe_(CC_WORDCHAR_, \ - _is_utf8_perl_idcont, p, e) + is_utf8_perl_idcont_, p, e) /* To prevent S_scan_word in toke.c from hanging, we have to make sure that * IDFIRST is an alnum. See @@ -2363,7 +2423,7 @@ END_EXTERN_C * modern Unicode definition */ #define isIDFIRST_utf8_safe(p, e) \ generic_func_utf8_safe_(CC_IDFIRST_, \ - _is_utf8_perl_idstart, (U8 *) (p), (U8 *) (e)) + is_utf8_perl_idstart_, (U8 *) (p), (U8 *) (e)) #define isLOWER_utf8_safe(p, e) generic_invlist_utf8_safe_(CC_LOWER_, p, e) #define isPRINT_utf8_safe(p, e) generic_invlist_utf8_safe_(CC_PRINT_, p, e) @@ -2389,15 +2449,15 @@ END_EXTERN_C #define toUPPER_utf8(p,e,s,l) toUPPER_utf8_safe(p,e,s,l) /* For internal core use only, subject to change */ -#define _toFOLD_utf8_flags(p,e,s,l,f) _to_utf8_fold_flags (p,e,s,l,f) -#define _toLOWER_utf8_flags(p,e,s,l,f) _to_utf8_lower_flags(p,e,s,l,f) -#define _toTITLE_utf8_flags(p,e,s,l,f) _to_utf8_title_flags(p,e,s,l,f) -#define _toUPPER_utf8_flags(p,e,s,l,f) _to_utf8_upper_flags(p,e,s,l,f) - -#define toFOLD_utf8_safe(p,e,s,l) _toFOLD_utf8_flags(p,e,s,l, FOLD_FLAGS_FULL) -#define toLOWER_utf8_safe(p,e,s,l) _toLOWER_utf8_flags(p,e,s,l, 0) -#define toTITLE_utf8_safe(p,e,s,l) _toTITLE_utf8_flags(p,e,s,l, 0) -#define toUPPER_utf8_safe(p,e,s,l) _toUPPER_utf8_flags(p,e,s,l, 0) +#define toFOLD_utf8_flags_(p,e,s,l,f) to_utf8_fold_flags_(p,e,s,l,f) +#define toLOWER_utf8_flags_(p,e,s,l,f) to_utf8_lower_flags_(p,e,s,l,f) +#define toTITLE_utf8_flags_(p,e,s,l,f) to_utf8_title_flags_(p,e,s,l,f) +#define toUPPER_utf8_flags_(p,e,s,l,f) to_utf8_upper_flags_(p,e,s,l,f) + +#define toFOLD_utf8_safe(p,e,s,l) toFOLD_utf8_flags_(p,e,s,l, FOLD_FLAGS_FULL) +#define toLOWER_utf8_safe(p,e,s,l) toLOWER_utf8_flags_(p,e,s,l, 0) +#define toTITLE_utf8_safe(p,e,s,l) toTITLE_utf8_flags_(p,e,s,l, 0) +#define toUPPER_utf8_safe(p,e,s,l) toUPPER_utf8_flags_(p,e,s,l, 0) #define isALPHA_LC_utf8(p, e) isALPHA_LC_utf8_safe(p, e) #define isALPHANUMERIC_LC_utf8(p, e) isALPHANUMERIC_LC_utf8_safe(p, e) @@ -2422,29 +2482,29 @@ END_EXTERN_C * point in 'p' is within the 0-255 range, it uses locale rules from the * passed-in 'macro' parameter */ #define generic_LC_utf8_safe_(macro, p, e, above_latin1) \ - (__ASSERT_(_utf8_safe_assert(p, e)) \ + (assert_(utf8_safe_assert_(p, e)) \ (UTF8_IS_INVARIANT(*(p))) \ ? macro(*(p)) \ - : (UTF8_IS_DOWNGRADEABLE_START(*(p)) \ - ? ((LIKELY((e) - (p) > 1 && UTF8_IS_CONTINUATION(*((p)+1)))) \ + : (UTF8_IS_ABOVE_LATIN1_START(*(p)) \ + ? above_latin1 \ + : ((LIKELY((e) - (p) > 1 && UTF8_IS_CONTINUATION(*((p)+1)))) \ ? macro(EIGHT_BIT_UTF8_TO_NATIVE(*(p), *((p)+1))) \ : (force_out_malformed_utf8_message_( \ - (U8 *) (p), (U8 *) (e), 0, MALFORMED_UTF8_DIE), 0)) \ - : above_latin1)) + (U8 *) (p), (U8 *) (e), 0, MALFORMED_UTF8_DIE), 0)))) #define generic_LC_invlist_utf8_safe_(macro, classnum, p, e) \ generic_LC_utf8_safe_(macro, p, e, \ - _is_utf8_FOO(classnum, p, e)) + is_utf8_FOO_(classnum, p, e)) #define generic_LC_func_utf8_safe_(macro, above_latin1, p, e) \ generic_LC_utf8_safe_(macro, p, e, above_latin1(p, e)) #define generic_LC_non_invlist_utf8_safe_(classnum, above_latin1, p, e) \ generic_LC_utf8_safe_(classnum, p, e, \ - (UNLIKELY((e) - (p) < UTF8SKIP(p)) \ - ? (force_out_malformed_utf8_message_( \ - (U8 *) (p), (U8 *) (e), 0, MALFORMED_UTF8_DIE), 0) \ - : above_latin1(p))) + (LIKELY((e) - (p) >= UTF8SKIP(p)) \ + ? above_latin1(p) \ + : (force_out_malformed_utf8_message_( \ + (U8 *) (p), (U8 *) (e), 0, MALFORMED_UTF8_DIE), 0))) #define isALPHANUMERIC_LC_utf8_safe(p, e) \ generic_LC_invlist_utf8_safe_(isALPHANUMERIC_LC, \ @@ -2452,7 +2512,7 @@ END_EXTERN_C #define isALPHA_LC_utf8_safe(p, e) \ generic_LC_invlist_utf8_safe_(isALPHA_LC, CC_ALPHA_, p, e) #define isASCII_LC_utf8_safe(p, e) \ - (__ASSERT_(_utf8_safe_assert(p, e)) isASCII_LC(*(p))) + (assert_(utf8_safe_assert_(p, e)) isASCII_LC(*(p))) #define isBLANK_LC_utf8_safe(p, e) \ generic_LC_non_invlist_utf8_safe_(isBLANK_LC, is_HORIZWS_high, p, e) #define isCNTRL_LC_utf8_safe(p, e) \ @@ -2463,10 +2523,10 @@ END_EXTERN_C generic_LC_invlist_utf8_safe_(isGRAPH_LC, CC_GRAPH_, p, e) #define isIDCONT_LC_utf8_safe(p, e) \ generic_LC_func_utf8_safe_(isIDCONT_LC, \ - _is_utf8_perl_idcont, p, e) + is_utf8_perl_idcont_, p, e) #define isIDFIRST_LC_utf8_safe(p, e) \ generic_LC_func_utf8_safe_(isIDFIRST_LC, \ - _is_utf8_perl_idstart, p, e) + is_utf8_perl_idstart_, p, e) #define isLOWER_LC_utf8_safe(p, e) \ generic_LC_invlist_utf8_safe_(isLOWER_LC, CC_LOWER_, p, e) #define isPRINT_LC_utf8_safe(p, e) \ @@ -2510,19 +2570,81 @@ END_EXTERN_C #define isALNUMC_utf8_safe(p,e) isALPHANUMERIC_utf8_safe(p,e) #define isALNUMC_LC_utf8_safe(p,e) isALPHANUMERIC_LC_utf8_safe(p,e) -/* On EBCDIC platforms, CTRL-@ is 0, CTRL-A is 1, etc, just like on ASCII, - * except that they don't necessarily mean the same characters, e.g. CTRL-D is - * 4 on both systems, but that is EOT on ASCII; ST on EBCDIC. - * '?' is special-cased on EBCDIC to APC, which is the control there that is - * the outlier from the block that contains the other controls, just like - * toCTRL('?') on ASCII yields DEL, the control that is the outlier from the C0 - * block. If it weren't special cased, it would yield a non-control. - * The conversion works both ways, so toCTRL('D') is 4, and toCTRL(4) is D, - * etc. */ +/* +=for apidoc_section $casing_scn +=for apidoc Am|U8|toCTRL|U8 cp +=for apidoc_item ||fromCTRL|U8 cp + +C converts the character C into its equivalent control character, +I, what the Perl construct C<\cI> would do given the same input. + +For example, C yields 1. + +C goes the other way. + +The original motivation behind this is that most keyboards for languages based +on the Latin script will have keys labelled with the ASCII alphabetic +characters. "G" is one such key. (That key should really be labelled "g", +because that's what generally gets transmitted to the computer when that key is +pressed. Getting "G" transmitted instead usually requires the "Shift" key to +simultaneously be held down.) There is typically a "Ctrl" key on such +keyboards, and C returns what gets transmitted when the "Ctrl" key +and the "G" key are simultaneously pressed, hence its name. That value in this +case is 7, which is an ASCII ALERT (or BEL). Hence, typing CTRL-G at the +command line will typically trigger the computer's bell sound. + +The values are (fairly) standardized only for the following keys: + + @ 0 + A-Z 1-26 + [ 27 + \ 28 + ] 29 + ^ 30 + _ 31 + +The Perl language includes the C<\c> construct to be able to express this +mapping, (See L and +L), and the C macro is the XS and C +language equivalent of that. + +It has been ported to work on EBCDIC as well, so that the conversion is +numerical, not semantic; that is, on EBCDIC platforms, CTRL-@ is 0, CTRL-A is +1, etc, just like on ASCII, except that they don't necessarily mean the same +character. For example, C yields 4 on both platforms, which +happens to mean C (C) on ASCII platforms (which is +why CTRL-D is often used to exit out of a shell), and C (Select) on +EBCDIC. (See perlebcdic/Unicode code points versus EBCDIC code points.) But +Perl itself does not ascribe any meaning beyond it being 4. (If your need is +to get to C from "D", no matter which platform, wrap it thusly: +C.) + +A lowercase argument yields the same result as its upper case equivalent, hence +C returns 2. + +To go the other direction, starting with a value in the range 0..31, and +yielding a character like 'A", you can use C. For alphabetic +results, this will always be the uppercase form. + +The macros also map between the "?" character and a defined value. But it is +not possible to do this portably between ASCII and EBCDIC. On ASCII platforms, +it is mapped to 127, which happens to be C. On EBCDIC, it is mapped to +the C control, whatever value this happens to be for the flavor of EBCDIC +used on the platform. What these all have in common is that the value chosen +is the only control that isn't in the same contiguous block of controls that +the others are in. + +Using any other values than those mentioned yields an undefined result. + +(It turns out that the conversion works both ways (except for lowercase inputs), +so C is 5, and C is E. But you shouldn't have to know that, so just use C to get from 5 to "E".) + +=cut +*/ #ifndef EBCDIC -# define toCTRL(c) (__ASSERT_(FITS_IN_8_BITS(c)) toUPPER(((U8)(c))) ^ 64) +# define toCTRL(c) (assert(FITS_IN_8_BITS(c)), toUPPER(((U8)(c))) ^ 64) #else -# define toCTRL(c) (__ASSERT_(FITS_IN_8_BITS(c)) \ +# define toCTRL(c) (assert(FITS_IN_8_BITS(c)), \ ((isPRINT_A(c)) \ ? (UNLIKELY((c) == '?') \ ? QUESTION_MARK_CTRL \ @@ -2531,11 +2653,15 @@ END_EXTERN_C ? '?' \ : (LATIN1_TO_NATIVE(((U8) (c)) ^ 64))))) #endif +#define fromCTRL(c) toCTRL(c) /* +=for apidoc_section $warning_scn =for apidoc Ay||line_t The typedef to use to declare variables that are to hold line numbers. +Use the C format to display these. + =cut Line numbers are unsigned, 32 bits. @@ -2560,16 +2686,18 @@ typedef U32 line_t; /* Converts a character KNOWN to represent a hexadecimal digit (0-9, A-F, or * a-f) to its numeric value without using any branches. The input is * validated only by an assert() in DEBUGGING builds. - * * It works by right shifting and isolating the bit that is 0 for the digits, * and 1 for at least the alphas A-F, a-f. The bit is shifted to the ones * position, and then to the eights position. Both are added together to form * 0 if the input is '0'-'9' and to form 9 if alpha. This is added to the * final four bits of the input to form the correct value. */ -#define XDIGIT_VALUE(c) (__ASSERT_(isXDIGIT(c)) \ - ((NATIVE_TO_LATIN1(c) >> 6) & 1) /* 1 if alpha; 0 if not */ \ - + ((NATIVE_TO_LATIN1(c) >> 3) & 8) /* 8 if alpha; 0 if not */ \ - + ((c) & 0xF)) /* 0-9 if input valid hex digit */ + +#define XDIGIT_VALUE(c) \ + (assert(isXDIGIT(c)), \ + ( ( (NATIVE_TO_LATIN1(c) & 0x40) >> 3) /* 8 if alpha; 0 if not */ \ + | (NATIVE_TO_LATIN1(c) & 0x40) >> 6) /* 1 if alpha; 0 if not */ \ + /* After OR: 9 if alpha, 0 if not */ \ + + ((c) & 0xF)) /* 0-9 if input valid hex digit */ /* The argument is a string pointer, which is advanced. */ #define READ_XDIGIT(s) ((s)++, XDIGIT_VALUE(*((s) - 1))) @@ -2577,7 +2705,7 @@ typedef U32 line_t; /* Converts a character known to represent an octal digit (0-7) to its numeric * value. The input is validated only by an assert() in DEBUGGING builds. In * both ASCII and EBCDIC the last 3 bits of the octal digits range from 0-7. */ -#define OCTAL_VALUE(c) (__ASSERT_(isOCTAL(c)) (7 & (c))) +#define OCTAL_VALUE(c) (assert(isOCTAL(c)), (7 & (c))) /* Efficiently returns a boolean as to if two native characters are equivalent * case-insensitively. At least one of the characters must be one of [A-Za-z]; @@ -2594,7 +2722,7 @@ typedef U32 line_t; * just a single 0, in the bit position where the upper- and lowercase differ. * */ #define isALPHA_FOLD_EQ(c1, c2) \ - (__ASSERT_(isALPHA_A(c1) || isALPHA_A(c2)) \ + (assert(isALPHA_A(c1) || isALPHA_A(c2)), \ ((c1) & ~('A' ^ 'a')) == ((c2) & ~('A' ^ 'a'))) #define isALPHA_FOLD_NE(c1, c2) (! isALPHA_FOLD_EQ((c1), (c2))) @@ -2686,6 +2814,7 @@ optimise. This is an architecture-independent macro that does a shallow copy of one structure to another. +=for apidoc_section $debugging =for apidoc Am|void|PoisonWith|void* dest|int nitems|type|U8 byte Fill up memory with a byte pattern (a byte repeated over and over @@ -2709,7 +2838,7 @@ These each call C for #define MEM_SIZE_MAX ((MEM_SIZE)-1) -#define _PERL_STRLEN_ROUNDUP_UNCHECKED(n) (((n) - 1 + PERL_STRLEN_ROUNDUP_QUANTUM) & ~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM - 1)) +#define PERL_STRLEN_ROUNDUP_UNCHECKED_(n) (((n) - 1 + PERL_STRLEN_ROUNDUP_QUANTUM) & ~((MEM_SIZE)PERL_STRLEN_ROUNDUP_QUANTUM - 1)) #ifdef PERL_MALLOC_WRAP @@ -2724,13 +2853,13 @@ These each call C for */ -# define _MEM_WRAP_NEEDS_RUNTIME_CHECK(n,t) \ +# define MEM_WRAP_NEEDS_RUNTIME_CHECK_(n,t) \ ( sizeof(MEM_SIZE) < sizeof(n) \ || sizeof(t) > ((MEM_SIZE)1 << 8*(sizeof(MEM_SIZE) - sizeof(n)))) /* This is written in a slightly odd way to avoid various spurious * compiler warnings. We *want* to write the expression as - * _MEM_WRAP_NEEDS_RUNTIME_CHECK(n,t) && (n > C) + * MEM_WRAP_NEEDS_RUNTIME_CHECK_(n,t) && (n > C) * (for some compile-time constant C), but even when the LHS * constant-folds to false at compile-time, g++ insists on emitting * warnings about the RHS (e.g. "comparison is always false"), so instead @@ -2745,26 +2874,26 @@ These each call C for * for X and hope that nothing else whines. */ -# define _MEM_WRAP_WILL_WRAP(n,t) \ - ((_MEM_WRAP_NEEDS_RUNTIME_CHECK(n,t) ? (MEM_SIZE)(n) : \ +# define MEM_WRAP_WILL_WRAP_(n,t) \ + ((MEM_WRAP_NEEDS_RUNTIME_CHECK_(n,t) ? (MEM_SIZE)(n) : \ MEM_SIZE_MAX/sizeof(t)) > MEM_SIZE_MAX/sizeof(t)) # define MEM_WRAP_CHECK(n,t) \ - (void)(UNLIKELY(_MEM_WRAP_WILL_WRAP(n,t)) \ + (void)(UNLIKELY(MEM_WRAP_WILL_WRAP_(n,t)) \ && (croak_memory_wrap(),0)) # define MEM_WRAP_CHECK_1(n,t,a) \ - (void)(UNLIKELY(_MEM_WRAP_WILL_WRAP(n,t)) \ + (void)(UNLIKELY(MEM_WRAP_WILL_WRAP_(n,t)) \ && (Perl_croak_nocontext("%s",(a)),0)) /* "a" arg must be a string literal */ # define MEM_WRAP_CHECK_s(n,t,a) \ - ( (void) (UNLIKELY(_MEM_WRAP_WILL_WRAP(n,t)) \ + ( (void) (UNLIKELY(MEM_WRAP_WILL_WRAP_(n,t)) \ && (Perl_croak_nocontext(ASSERT_IS_LITERAL(a)), 0))) # define MEM_WRAP_CHECK_(n,t) MEM_WRAP_CHECK(n,t), -# define PERL_STRLEN_ROUNDUP(n) ((void)(((n) > MEM_SIZE_MAX - 2 * PERL_STRLEN_ROUNDUP_QUANTUM) ? (croak_memory_wrap(),0) : 0), _PERL_STRLEN_ROUNDUP_UNCHECKED(n)) +# define PERL_STRLEN_ROUNDUP(n) ((void)(((n) > MEM_SIZE_MAX - 2 * PERL_STRLEN_ROUNDUP_QUANTUM) ? (croak_memory_wrap(),0) : 0), PERL_STRLEN_ROUNDUP_UNCHECKED_(n)) #else # define MEM_WRAP_CHECK(n,t) @@ -2772,7 +2901,7 @@ These each call C for # define MEM_WRAP_CHECK_s(n,t,a) # define MEM_WRAP_CHECK_(n,t) -# define PERL_STRLEN_ROUNDUP(n) _PERL_STRLEN_ROUNDUP_UNCHECKED(n) +# define PERL_STRLEN_ROUNDUP(n) PERL_STRLEN_ROUNDUP_UNCHECKED_(n) #endif @@ -2856,10 +2985,10 @@ enum mem_log_type { (v = (MEM_WRAP_CHECK_(n,t) (c*)MEM_LOG_REALLOC(n,t,v,saferealloc((Malloc_t)(v),(MEM_SIZE)((n)*sizeof(t)))))) #ifdef PERL_POISON -#define Safefree(d) \ +# define Safefree(d) \ ((d) ? (void)(safefree(MEM_LOG_FREE((Malloc_t)(d))), Poison(&(d), 1, Malloc_t)) : (void) 0) #else -#define Safefree(d) safefree(MEM_LOG_FREE((Malloc_t)(d))) +# define Safefree(d) safefree(MEM_LOG_FREE((Malloc_t)(d))) #endif /* assert that a valid ptr has been supplied - use this instead of assert(ptr) * @@ -2868,14 +2997,31 @@ enum mem_log_type { #define perl_assert_ptr(p) assert( ((void*)(p)) != 0 ) -#define Move(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memmove((char*)(d),(const char*)(s), (n) * sizeof(t))) -#define Copy(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), (void)memcpy((char*)(d),(const char*)(s), (n) * sizeof(t))) -#define Zero(d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), (void)memzero((char*)(d), (n) * sizeof(t))) +#define Move(s,d,n,t) ((void)MoveD(s, d, n, t)) +#define Copy(s,d,n,t) ((void)CopyD(s, d, n, t)) +#define Zero(d,n,t) ((void)ZeroD(d, n, t)) /* Like above, but returns a pointer to 'd' */ -#define MoveD(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memmove((char*)(d),(const char*)(s), (n) * sizeof(t))) -#define CopyD(s,d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), perl_assert_ptr(s), memcpy((char*)(d),(const char*)(s), (n) * sizeof(t))) -#define ZeroD(d,n,t) (MEM_WRAP_CHECK_(n,t) perl_assert_ptr(d), memzero((char*)(d), (n) * sizeof(t))) +#define MoveD(s,d,n,t) \ + ( \ + MEM_WRAP_CHECK_(n,t) \ + perl_assert_ptr(d), \ + perl_assert_ptr(s), \ + memmove((char*)(d),(const char*)(s), (n) * sizeof(t)) \ + ) +#define CopyD(s,d,n,t) \ + ( \ + MEM_WRAP_CHECK_(n,t) \ + perl_assert_ptr(d), \ + perl_assert_ptr(s), \ + memcpy((char*)(d),(const char*)(s), (n) * sizeof(t)) \ + ) +#define ZeroD(d,n,t) \ + ( \ + MEM_WRAP_CHECK_(n,t) \ + perl_assert_ptr(d), \ + memzero((char*)(d), (n) * sizeof(t)) \ + ) #define NewCopy(s,d,n,t) STMT_START { \ Newx(d,n,t); \ @@ -2955,31 +3101,34 @@ last-inclusive range. CPAN::Unpack show any users outside the core. =for apidoc_section $warning -=for apidoc Cdm||deprecate|U32 category|"message" -Wrapper around Perl_ck_warner_d() to produce a deprecated warning in the -given category with an appropriate message. The C argument must -be a C string. The string " is deprecated" will automatically be added -to the end of the C. - -=for apidoc Cdm||deprecate_disappears_in|U32 category|"when"|"message" -Wrapper around Perl_ck_warner_d() to produce a deprecated warning in the -given category with an appropriate message that the construct referred -to by the message will disappear in a specific release. The C and -C arguments must be a C string. The C string is expected -to be of the form "5.40", with no minor element in the version. The actual -message output will be the result of the following expression C which is why C -and C must be literal C strings. - -=for apidoc Cdm||deprecate_fatal_in|U32 category|"when"|"message" -Wrapper around Perl_ck_warner_d() to produce a deprecated warning in the -given category with an appropriate message that the construct referred -to by the message will become fatal in a specific release. The C -and C arguments must be a C string. The C string is expected -to be of the form "5.40", with no minor element in the version. The actual -message output will be the result of the following expression C which is why C -and C must be literal C strings. +=for apidoc dm||deprecate|U32 category|"message" +=for apidoc_item||deprecate_disappears_in|U32 category|"when"|"message" +=for apidoc_item||deprecate_fatal_in|U32 category|"when"|"message" + +These each are wrappers around Perl_ck_warner_d() to produce a deprecated +warning in the single category given by C, with an appropriate +message. + +They differ in the details of the message output, but all use as a base, the +C argument, which must be a literal C string enclosed in +double-quotes. + +In plain C, the string " is deprecated" will automatically be +added to the end of C, yielding + + is deprecated + +The other two take a third argument C, which is a literal C string in the +form like "5.40". C indicates in what release the axe is scheduled to +fall. + +In C<, the actual message output will be of the form: + + is deprecated, and will disappear in Perl + +In C, the message will be of the form: + + is deprecated, and will become fatal in Perl =cut */ Index: gnu/usr.bin/perl/hv.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/hv.c,v diff -u -p -a -u -p -r1.29 hv.c --- gnu/usr.bin/perl/hv.c 26 Dec 2025 22:14:12 -0000 1.29 +++ gnu/usr.bin/perl/hv.c 16 Nov 2026 00:57:38 -0000 @@ -152,14 +152,16 @@ STMT_START { #else -STATIC HE* +static HE* S_new_he(pTHX) { + PERL_ARGS_ASSERT_NEW_HE; + HE* he; void ** const root = &PL_body_roots[HE_ARENA_ROOT_IX]; if (!*root) - Perl_more_bodies(aTHX_ HE_ARENA_ROOT_IX, sizeof(HE), PERL_ARENA_SIZE); + Perl_more_bodies(aTHX_ HE_ARENA_ROOT_IX); he = (HE*) *root; assert(he); *root = HeNEXT(he); @@ -177,14 +179,14 @@ S_new_he(pTHX) #endif -STATIC HEK * +static HEK * S_save_hek_flags(const char *str, I32 len, U32 hash, int flags) { + PERL_ARGS_ASSERT_SAVE_HEK_FLAGS; + char *k; HEK *hek; - PERL_ARGS_ASSERT_SAVE_HEK_FLAGS; - Newx(k, HEK_BASESIZE + len + 2, char); hek = (HEK*)k; Copy(str, HEK_KEY(hek), len, char); @@ -204,6 +206,8 @@ S_save_hek_flags(const char *str, I32 le void Perl_free_tied_hv_pool(pTHX) { + PERL_ARGS_ASSERT_FREE_TIED_HV_POOL; + HE *he = PL_hv_fetch_ent_mh; while (he) { HE * const ohe = he; @@ -218,11 +222,11 @@ Perl_free_tied_hv_pool(pTHX) HEK * Perl_hek_dup(pTHX_ HEK *source, CLONE_PARAMS* param) { - HEK *shared; - PERL_ARGS_ASSERT_HEK_DUP; PERL_UNUSED_ARG(param); + HEK *shared; + if (!source) return NULL; @@ -243,10 +247,10 @@ Perl_hek_dup(pTHX_ HEK *source, CLONE_PA HE * Perl_he_dup(pTHX_ const HE *e, bool shared, CLONE_PARAMS* param) { - HE *ret; - PERL_ARGS_ASSERT_HE_DUP; + HE *ret; + /* All the *_dup functions are deemed to be API, despite most being deeply tied to the internals. Hence we can't simply remove the parameter "shared" from this function. */ @@ -303,12 +307,12 @@ static void S_hv_notallowed(pTHX_ int flags, const char *key, I32 klen, const char *msg) { + PERL_ARGS_ASSERT_HV_NOTALLOWED; + /* Straight to SVt_PVN here, as needed by sv_setpvn_fresh and * sv_usepvn would otherwise call it */ SV * const sv = newSV_type_mortal(SVt_PV); - PERL_ARGS_ASSERT_HV_NOTALLOWED; - if (!(flags & HVhek_FREEKEY)) { sv_setpvn_fresh(sv, key, klen); } @@ -418,73 +422,59 @@ valid precomputed hash value, or 0 to as =for apidoc hv_fetch =for apidoc_item hv_fetchs +=for apidoc_item hv_fetch_ent -These each return the SV which corresponds to the specified key in the hash. -They differ only in how the key is specified. +These each return the value entry in a hash which corresponds to the specified +key. + +In all, if is NULL, NULL is returned. + +They differ principally in how the key is specified, and the form of the return. In C, the key must be a C language string literal, enclosed in double quotes. It is never treated as being in UTF-8. There is no length_parameter. -In C, the absolute value of C is the length of the key. If -C is negative the key is assumed to be in UTF-8-encoded Unicode. -C may contain embedded NUL characters. - -In both, if C is set, then the fetch will be part of a store. This means -that if there is no value in the hash associated with the given key, then one -is created and a pointer to it is returned. The C it points to can be -assigned to. But always check that the return value is non-null before -dereferencing it to an C. +In C, C is either NULL or points to the first byte of the string +specifying the key, and its length in bytes is given by the absolute value of +an additional parameter, C. A NULL key indicates the key is to be +treated as C, and C is ignored. A non-NULL C may contain +embedded-NUL characters. If C is negative, C is treated as being +encoded in UTF-8; otherwise not. + +In C, the key is stored in the SV C which this function +extracts using C>. The key has the same UTF8ness as C. + +The value entry returned by C and C is an SV**. Always +check that the return value is non-null before dereferencing it to an C. + +The value entry returned by C is a pointer to a +L|perlguts/Working with HVs> structure with the all fields set. When +C is a tied hash, the HE structure is in a static location, so be sure to +make a copy of the structure if you need to store it somewhere. Also, for +MAGICAL hashes, the C field in the returned HE structure will be a +mortal sv. + +In all, if C is non-zero, then the fetch will be part of a store. This +means that if there is no value in the hash associated with the given key, +then a SV* is created, accessible through the returned value. See L for more -information on how to use this function on tied hashes. - -=cut -*/ +information on how to use these functions on tied hashes. -/* returns an HE * structure with the all fields set */ -/* note that hent_val will be a mortal sv for MAGICAL hashes */ -/* -=for apidoc hv_fetch_ent - -Returns the hash entry which corresponds to the specified key in the hash. -C must be a valid precomputed hash number for the given C, or 0 -if you want the function to compute it. IF C is set then the fetch -will be part of a store. Make sure the return value is non-null before -accessing it. The return value when C is a tied hash is a pointer to a -static location, so be sure to make a copy of the structure if you need to -store it somewhere. - -See L for more -information on how to use this function on tied hashes. +C has an additional parameter, C. It must be a valid +precomputed hash number for the given C, or 0 if you want the function to +compute it. =cut */ -/* Common code for hv_delete()/hv_exists()/hv_fetch()/hv_store() */ -void * -Perl_hv_common_key_len(pTHX_ HV *hv, const char *key, I32 klen_i32, - const int action, SV *val, const U32 hash) -{ - STRLEN klen; - int flags; - - PERL_ARGS_ASSERT_HV_COMMON_KEY_LEN; - - if (klen_i32 < 0) { - klen = -klen_i32; - flags = HVhek_UTF8; - } else { - klen = klen_i32; - flags = 0; - } - return hv_common(hv, NULL, key, klen, flags, action, val, hash); -} - void * Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, int flags, int action, SV *val, U32 hash) { + PERL_ARGS_ASSERT_HV_COMMON; + XPVHV* xhv; HE *entry; HE **oentry; @@ -545,7 +535,9 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, key = SvPV_const(keysv, klen); is_utf8 = (SvUTF8(keysv) != 0); if (SvIsCOW_shared_hash(keysv)) { - flags = HVhek_KEYCANONICAL | (is_utf8 ? HVhek_UTF8 : 0); + HEK *keysv_hek = SvSHARED_HEK_FROM_PV(SvPVX_const(keysv)); + unsigned char keysv_flags = HEK_FLAGS(keysv_hek); + flags = HVhek_KEYCANONICAL | (keysv_flags & (HVhek_UTF8|HVhek_WASUTF8)); } else { flags = 0; } @@ -1104,13 +1096,13 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, return (void *) entry; } -STATIC void +static void S_hv_magic_check(HV *hv, bool *needs_copy, bool *needs_store) { - const MAGIC *mg = SvMAGIC(hv); - PERL_ARGS_ASSERT_HV_MAGIC_CHECK; + const MAGIC *mg = SvMAGIC(hv); + *needs_copy = FALSE; *needs_store = TRUE; while (mg) { @@ -1143,11 +1135,11 @@ returned by the hv_bucket_ratio() functi SV * Perl_hv_scalar(pTHX_ HV *hv) { + PERL_ARGS_ASSERT_HV_SCALAR; + SV *sv; UV u; - PERL_ARGS_ASSERT_HV_SCALAR; - if (SvRMAGICAL(hv)) { MAGIC * const mg = mg_find((const SV *)hv, PERL_MAGIC_tied); if (mg) @@ -1193,13 +1185,14 @@ I might unroll the non-tied hv_iternext( void Perl_hv_pushkv(pTHX_ HV *hv, U32 flags) { + PERL_ARGS_ASSERT_HV_PUSHKV; + HE *entry; bool tied = SvRMAGICAL(hv) && (mg_find(MUTABLE_SV(hv), PERL_MAGIC_tied) #ifdef DYNAMIC_ENV_FETCH /* might not know number of keys yet */ || mg_find(MUTABLE_SV(hv), PERL_MAGIC_env) #endif ); - PERL_ARGS_ASSERT_HV_PUSHKV; assert(flags); /* must be pushing at least one of keys and values */ (void)hv_iterinit(hv); @@ -1260,10 +1253,10 @@ In a large hash this could be a lot of b SV * Perl_hv_bucket_ratio(pTHX_ HV *hv) { - SV *sv; - PERL_ARGS_ASSERT_HV_BUCKET_RATIO; + SV *sv; + if (SvRMAGICAL(hv)) { MAGIC * const mg = mg_find((const SV *)hv, PERL_MAGIC_tied); if (mg) @@ -1308,10 +1301,12 @@ found. =cut */ -STATIC SV * +static SV * S_hv_delete_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, int k_flags, I32 d_flags, U32 hash) { + PERL_ARGS_ASSERT_HV_DELETE_COMMON; + XPVHV* xhv; HE *entry; HE **oentry; @@ -1645,7 +1640,8 @@ S_hv_delete_common(pTHX_ HV *hv, SV *key #ifdef PERL_USE_UNSHARED_KEYS_IN_LARGE_HASHES static bool -S_large_hash_heuristic(pTHX_ HV *hv, STRLEN size) { +S_large_hash_heuristic(pTHX_ HV *hv, STRLEN size) +{ if (size > 42 && !SvOBJECT(hv) && !(HvHasAUX(hv) && HvENAME_get(hv))) { @@ -1657,14 +1653,15 @@ S_large_hash_heuristic(pTHX_ HV *hv, STR } #endif -STATIC void +static void S_hsplit(pTHX_ HV *hv, STRLEN const oldsize, STRLEN newsize) { + PERL_ARGS_ASSERT_HSPLIT; + STRLEN i = 0; char *a = (char*) HvARRAY(hv); HE **aep; - PERL_ARGS_ASSERT_HSPLIT; if (newsize > MAX_BUCKET_MAX+1) return; @@ -1757,6 +1754,8 @@ This is the same as doing the following void Perl_hv_ksplit(pTHX_ HV *hv, IV newmax) { + PERL_ARGS_ASSERT_HV_KSPLIT; + XPVHV* xhv = (XPVHV*)SvANY(hv); const I32 oldsize = (I32) xhv->xhv_max+1; /* HvMAX(hv)+1 */ I32 newsize; @@ -1764,8 +1763,6 @@ Perl_hv_ksplit(pTHX_ HV *hv, IV newmax) I32 trysize; char *a; - PERL_ARGS_ASSERT_HV_KSPLIT; - wantsize = (I32) newmax; /* possible truncation here */ if (wantsize != newmax) return; @@ -1836,6 +1833,8 @@ returned. HV * Perl_newHVhv(pTHX_ HV *ohv) { + PERL_ARGS_ASSERT_NEWHVHV; + HV * const hv = newHV(); STRLEN hv_max; @@ -1944,6 +1943,8 @@ added to it. A pointer to the new hash HV * Perl_hv_copy_hints_hv(pTHX_ HV *const ohv) { + PERL_ARGS_ASSERT_HV_COPY_HINTS_HV; + HV * const hv = newHV(); if (ohv) { @@ -1985,7 +1986,7 @@ Perl_hv_copy_hints_hv(pTHX_ HV *const oh #undef HV_SET_MAX_ADJUSTED_FOR_KEYS /* like hv_free_ent, but returns the SV rather than freeing it */ -STATIC SV* +static SV* S_hv_free_ent_ret(pTHX_ HE *entry) { PERL_ARGS_ASSERT_HV_FREE_ENT_RET; @@ -2009,6 +2010,7 @@ S_hv_free_ent_ret(pTHX_ HE *entry) void Perl_hv_free_ent(pTHX_ HV *notused, HE *entry) { + PERL_ARGS_ASSERT_HV_FREE_ENT; PERL_UNUSED_ARG(notused); if (!entry) @@ -2022,6 +2024,7 @@ Perl_hv_free_ent(pTHX_ HV *notused, HE * void Perl_hv_delayfree_ent(pTHX_ HV *notused, HE *entry) { + PERL_ARGS_ASSERT_HV_DELAYFREE_ENT; PERL_UNUSED_ARG(notused); if (!entry) @@ -2049,6 +2052,8 @@ return. void Perl_hv_clear(pTHX_ HV *hv) { + PERL_ARGS_ASSERT_HV_CLEAR; + SSize_t orig_ix; if (!hv) @@ -2124,10 +2129,10 @@ use. void Perl_hv_clear_placeholders(pTHX_ HV *hv) { - const U32 items = (U32)HvPLACEHOLDERS_get(hv); - PERL_ARGS_ASSERT_HV_CLEAR_PLACEHOLDERS; + const U32 items = (U32)HvPLACEHOLDERS_get(hv); + if (items) clear_placeholders(hv, items); } @@ -2135,11 +2140,11 @@ Perl_hv_clear_placeholders(pTHX_ HV *hv) static void S_clear_placeholders(pTHX_ HV *hv, const U32 placeholders) { + PERL_ARGS_ASSERT_CLEAR_PLACEHOLDERS; + I32 i; U32 to_find = placeholders; - PERL_ARGS_ASSERT_CLEAR_PLACEHOLDERS; - assert(to_find); i = HvMAX(hv); @@ -2178,14 +2183,14 @@ S_clear_placeholders(pTHX_ HV *hv, const NOT_REACHED; /* NOTREACHED */ } -STATIC void +static void S_hv_free_entries(pTHX_ HV *hv) { + PERL_ARGS_ASSERT_HV_FREE_ENTRIES; + STRLEN index = 0; SV *sv; - PERL_ARGS_ASSERT_HV_FREE_ENTRIES; - while ((sv = Perl_hfree_next_entry(aTHX_ hv, &index)) || HvTOTALKEYS(hv)) { SvREFCNT_dec(sv); } @@ -2204,6 +2209,8 @@ S_hv_free_entries(pTHX_ HV *hv) SV* Perl_hfree_next_entry(pTHX_ HV *hv, STRLEN *indexp) { + PERL_ARGS_ASSERT_HFREE_NEXT_ENTRY; + struct xpvhv_aux *iter; HE *entry; HE ** array; @@ -2211,8 +2218,6 @@ Perl_hfree_next_entry(pTHX_ HV *hv, STRL STRLEN orig_index = *indexp; #endif - PERL_ARGS_ASSERT_HFREE_NEXT_ENTRY; - if (HvHasAUX(hv) && ((iter = HvAUX(hv)))) { if ((entry = iter->xhv_eiter)) { /* the iterator may get resurrected after each @@ -2279,6 +2284,8 @@ return. void Perl_hv_undef_flags(pTHX_ HV *hv, U32 flags) { + PERL_ARGS_ASSERT_HV_UNDEF_FLAGS; + bool save; SSize_t orig_ix = PL_tmps_ix; /* silence compiler warning about uninitialized vars */ @@ -2300,8 +2307,8 @@ Perl_hv_undef_flags(pTHX_ HV *hv, U32 fl if (PL_phase != PERL_PHASE_DESTRUCT && HvHasNAME(hv)) { if (PL_stashcache) { HEK *hek = HvNAME_HEK(hv); - DEBUG_o(Perl_deb(aTHX_ "hv_undef_flags clearing PL_stashcache for '%" - HEKf "'\n", HEKfARG(hek))); + DEBUG_o(deb("hv_undef_flags clearing PL_stashcache for '%" + HEKf "'\n", HEKfARG(hek))); (void)hv_deletehek(PL_stashcache, hek, G_DISCARD); } hv_name_set(hv, NULL, 0, 0); @@ -2341,8 +2348,9 @@ Perl_hv_undef_flags(pTHX_ HV *hv, U32 fl if (PL_phase != PERL_PHASE_DESTRUCT) mro_isa_changed_in(hv); if (PL_stashcache) { - DEBUG_o(Perl_deb(aTHX_ "hv_undef_flags clearing PL_stashcache for effective name '%" - HEKf "'\n", HEKfARG(HvENAME_HEK_NN(hv)))); + DEBUG_o(deb( + "hv_undef_flags clearing PL_stashcache for effective name '%" + HEKf "'\n", HEKfARG(HvENAME_HEK_NN(hv)))); (void)hv_deletehek(PL_stashcache, HvENAME_HEK_NN(hv), G_DISCARD); } } @@ -2355,8 +2363,8 @@ Perl_hv_undef_flags(pTHX_ HV *hv, U32 fl : cBOOL(name)) { if (name && PL_stashcache) { - DEBUG_o(Perl_deb(aTHX_ "hv_undef_flags clearing PL_stashcache for name '%" - HEKf "'\n", HEKfARG(HvNAME_HEK_NN(hv)))); + DEBUG_o(deb("hv_undef_flags clearing PL_stashcache for name '%" + HEKf "'\n", HEKfARG(HvNAME_HEK_NN(hv)))); (void)hv_deletehek(PL_stashcache, HvNAME_HEK_NN(hv), G_DISCARD); } hv_name_set(hv, NULL, 0, flags); @@ -2434,12 +2442,12 @@ hash. STRLEN Perl_hv_fill(pTHX_ HV *const hv) { + PERL_ARGS_ASSERT_HV_FILL; + STRLEN count = 0; HE **ents = HvARRAY(hv); PERL_UNUSED_CONTEXT; - PERL_ARGS_ASSERT_HV_FILL; - /* No keys implies no buckets used. One key can only possibly mean one bucket used. */ if (HvTOTALKEYS(hv) < 2) @@ -2463,11 +2471,12 @@ Perl_hv_fill(pTHX_ HV *const hv) } static struct xpvhv_aux* -S_hv_auxinit(pTHX_ HV *hv) { - struct xpvhv_aux *iter; - +S_hv_auxinit(pTHX_ HV *hv) +{ PERL_ARGS_ASSERT_HV_AUXINIT; + struct xpvhv_aux *iter; + if (!HvHasAUX(hv)) { char *array = (char *) HvARRAY(hv); if (!array) { @@ -2545,11 +2554,12 @@ Implements C which you should u */ I32 * -Perl_hv_riter_p(pTHX_ HV *hv) { - struct xpvhv_aux *iter; - +Perl_hv_riter_p(pTHX_ HV *hv) +{ PERL_ARGS_ASSERT_HV_RITER_P; + struct xpvhv_aux *iter; + iter = HvHasAUX(hv) ? HvAUX(hv) : hv_auxinit(hv); return &(iter->xhv_riter); } @@ -2563,11 +2573,12 @@ Implements C which you should u */ HE ** -Perl_hv_eiter_p(pTHX_ HV *hv) { - struct xpvhv_aux *iter; - +Perl_hv_eiter_p(pTHX_ HV *hv) +{ PERL_ARGS_ASSERT_HV_EITER_P; + struct xpvhv_aux *iter; + iter = HvHasAUX(hv) ? HvAUX(hv) : hv_auxinit(hv); return &(iter->xhv_eiter); } @@ -2581,11 +2592,12 @@ Implements C which you shou */ void -Perl_hv_riter_set(pTHX_ HV *hv, I32 riter) { - struct xpvhv_aux *iter; - +Perl_hv_riter_set(pTHX_ HV *hv, I32 riter) +{ PERL_ARGS_ASSERT_HV_RITER_SET; + struct xpvhv_aux *iter; + if (HvHasAUX(hv)) { iter = HvAUX(hv); } else { @@ -2598,11 +2610,12 @@ Perl_hv_riter_set(pTHX_ HV *hv, I32 rite } void -Perl_hv_rand_set(pTHX_ HV *hv, U32 new_xhv_rand) { - struct xpvhv_aux *iter; - +Perl_hv_rand_set(pTHX_ HV *hv, U32 new_xhv_rand) +{ PERL_ARGS_ASSERT_HV_RAND_SET; + struct xpvhv_aux *iter; + #ifdef PERL_HASH_RANDOMIZE_KEYS if (HvHasAUX(hv)) { iter = HvAUX(hv); @@ -2624,11 +2637,12 @@ Implements C which you shou */ void -Perl_hv_eiter_set(pTHX_ HV *hv, HE *eiter) { - struct xpvhv_aux *iter; - +Perl_hv_eiter_set(pTHX_ HV *hv, HE *eiter) +{ PERL_ARGS_ASSERT_HV_EITER_SET; + struct xpvhv_aux *iter; + if (HvHasAUX(hv)) { iter = HvAUX(hv); } else { @@ -2645,6 +2659,7 @@ Perl_hv_eiter_set(pTHX_ HV *hv, HE *eite /* =for apidoc hv_name_set =for apidoc_item hv_name_sets +=for apidoc_flag HV_NAME_SETALL These each set the name of stash C to the specified name. @@ -2654,7 +2669,7 @@ In C, the name is a litera In C, C points to the first byte of the name, and an additional parameter, C, specifies its length in bytes. Hence, the name -may contain embedded-NUL characters. +may contain embedded NUL characters. If C is set in C, the name is treated as being in UTF-8; otherwise not. @@ -2662,20 +2677,18 @@ otherwise not. If C is set in C, both the name and the effective name are set. -=for apidoc Amnh||HV_NAME_SETALL - =cut */ void Perl_hv_name_set(pTHX_ HV *hv, const char *name, U32 len, U32 flags) { + PERL_ARGS_ASSERT_HV_NAME_SET; + struct xpvhv_aux *iter; U32 hash; HEK **spot; - PERL_ARGS_ASSERT_HV_NAME_SET; - if (len > I32_MAX) croak("panic: hv name too long (%" UVuf ")", (UV) len); @@ -2743,8 +2756,9 @@ This is basically sv_eq_flags() in sv.c, and bytes checking. */ -STATIC I32 -hek_eq_pvn_flags(pTHX_ const HEK *hek, const char* pv, const I32 pvlen, const U32 flags) { +static I32 +hek_eq_pvn_flags(pTHX_ const HEK *hek, const char* pv, const I32 pvlen, const U32 flags) +{ if ( (HEK_UTF8(hek) ? 1 : 0) != (flags & SVf_UTF8 ? 1 : 0) ) { if (flags & SVf_UTF8) return (bytes_cmp_utf8( @@ -2775,11 +2789,11 @@ table. void Perl_hv_ename_add(pTHX_ HV *hv, const char *name, U32 len, U32 flags) { + PERL_ARGS_ASSERT_HV_ENAME_ADD; + struct xpvhv_aux *aux = HvHasAUX(hv) ? HvAUX(hv) : hv_auxinit(hv); U32 hash; - PERL_ARGS_ASSERT_HV_ENAME_ADD; - if (len > I32_MAX) croak("panic: hv name too long (%" UVuf ")", (UV) len); @@ -2838,10 +2852,10 @@ This is called when a stash is deleted f void Perl_hv_ename_delete(pTHX_ HV *hv, const char *name, U32 len, U32 flags) { - struct xpvhv_aux *aux; - PERL_ARGS_ASSERT_HV_ENAME_DELETE; + struct xpvhv_aux *aux; + if (len > I32_MAX) croak("panic: hv name too long (%" UVuf ")", (UV) len); @@ -2901,7 +2915,8 @@ Perl_hv_ename_delete(pTHX_ HV *hv, const } AV ** -Perl_hv_backreferences_p(pTHX_ HV *hv) { +Perl_hv_backreferences_p(pTHX_ HV *hv) +{ PERL_ARGS_ASSERT_HV_BACKREFERENCES_P; /* See also Perl_sv_get_backrefs in sv.c where this logic is unrolled */ { @@ -2911,11 +2926,12 @@ Perl_hv_backreferences_p(pTHX_ HV *hv) { } void -Perl_hv_kill_backrefs(pTHX_ HV *hv) { - AV *av; - +Perl_hv_kill_backrefs(pTHX_ HV *hv) +{ PERL_ARGS_ASSERT_HV_KILL_BACKREFS; + AV *av; + if (!HvHasAUX(hv)) return; @@ -2932,45 +2948,45 @@ Perl_hv_kill_backrefs(pTHX_ HV *hv) { /* hv_iternext is implemented as a macro in hv.h -=for apidoc hv_iternext +=for apidoc hv_iternext +=for apidoc_item hv_iternext_flags +=for apidoc_flag HV_ITERNEXT_WANTPLACEHOLDERS -Returns entries from a hash iterator. See C>. +These each return entries from a hash iterator. See C>. You may call C or C on the hash entry that the iterator currently points to, without losing your place or invalidating your iterator. Note that in this case the current entry is deleted from the hash with your iterator holding the last reference to it. Your iterator is flagged to free the entry on the next call to C, so you must not discard -your iterator immediately else the entry will leak - call C to +your iterator immediately, else the entry will leak - call C to trigger the resource deallocation. -=for apidoc hv_iternext_flags +C has an extra C parameter, which will normally be zero. +If so, it behaves identically to C. + +But if the C bit is set, the placeholders keys +(for restricted hashes) will be returned in addition to normal keys. By +default placeholders are automatically skipped over. -Returns entries from a hash iterator. See C> and -C>. -The C value will normally be zero; if C is -set the placeholders keys (for restricted hashes) will be returned in addition -to normal keys. By default placeholders are automatically skipped over. Currently a placeholder is implemented with a value that is C<&PL_sv_placeholder>. Note that the implementation of placeholders and restricted hashes may change, and the implementation currently is insufficiently abstracted for any change to be tidy. -=for apidoc Amnh||HV_ITERNEXT_WANTPLACEHOLDERS - =cut */ HE * Perl_hv_iternext_flags(pTHX_ HV *hv, I32 flags) { + PERL_ARGS_ASSERT_HV_ITERNEXT_FLAGS; + HE *entry; HE *oldentry; MAGIC* mg; struct xpvhv_aux *iter; - PERL_ARGS_ASSERT_HV_ITERNEXT_FLAGS; - if (!HvHasAUX(hv)) { /* Too many things (well, pp_each at least) merrily assume that you can call hv_iternext without calling hv_iterinit, so we'll have to deal @@ -3145,11 +3161,19 @@ Perl_hv_iternext_flags(pTHX_ HV *hv, I32 } /* -=for apidoc hv_iterkey +=for apidoc hv_iterkey +=for apidoc_item hv_iterkeysv -Returns the key from the current position of the hash iterator. See +These each return the key from the current position of the hash iterator. See C>. +They differ in the form of the return value. + +C returns a C language NUL-terminated string. + +C returns a mortal SV* containing a copy of the key. +Note that this is unlike L> whose return isn't mortalized + =cut */ @@ -3170,17 +3194,6 @@ Perl_hv_iterkey(pTHX_ HE *entry, I32 *re } } -/* unlike hv_iterval(), this always returns a mortal copy of the key */ -/* -=for apidoc hv_iterkeysv - -Returns the key as an C from the current position of the hash -iterator. The return value will always be a mortal copy of the key. Also -see C>. - -=cut -*/ - SV * Perl_hv_iterkeysv(pTHX_ HE *entry) { @@ -3192,8 +3205,9 @@ Perl_hv_iterkeysv(pTHX_ HE *entry) /* =for apidoc hv_iterval -Returns the value from the current position of the hash iterator. See -C>. +Returns the value from the current position of the hash iterator. + +Note that the return value isn't mortalized, unlike C>. =cut */ @@ -3228,10 +3242,10 @@ operation. SV * Perl_hv_iternextsv(pTHX_ HV *hv, char **key, I32 *retlen) { - HE * const he = hv_iternext_flags(hv, 0); - PERL_ARGS_ASSERT_HV_ITERNEXTSV; + HE * const he = hv_iternext_flags(hv, 0); + if (!he) return NULL; *key = hv_iterkey(he, retlen); @@ -3258,6 +3272,8 @@ C and C must both be valid fo void Perl_unsharepvn(pTHX_ const char *str, I32 len, U32 hash) { + PERL_ARGS_ASSERT_UNSHAREPVN; + unshare_hek_or_pvn (NULL, str, len, hash); } @@ -3265,7 +3281,9 @@ Perl_unsharepvn(pTHX_ const char *str, I void Perl_unshare_hek(pTHX_ HEK *hek) { + PERL_ARGS_ASSERT_UNSHARE_HEK; assert(hek); + unshare_hek_or_pvn(hek, NULL, 0, 0); } @@ -3273,9 +3291,11 @@ Perl_unshare_hek(pTHX_ HEK *hek) hek if non-NULL takes priority over the other 3, else str, len and hash are used. If so, len and hash must both be valid for str. */ -STATIC void +static void S_unshare_hek_or_pvn(pTHX_ const HEK *hek, const char *str, I32 len, U32 hash) { + PERL_ARGS_ASSERT_UNSHARE_HEK_OR_PVN; + HE *entry; HE **oentry; int k_flags = 0; @@ -3368,10 +3388,10 @@ S_unshare_hek_or_pvn(pTHX_ const HEK *he HEK * Perl_share_hek(pTHX_ const char *str, SSize_t len, U32 hash) { - int flags = 0; - PERL_ARGS_ASSERT_SHARE_HEK; + int flags = 0; + if (len < 0) { len = -len; /* See the note in hv_fetch(). --jhi */ @@ -3399,14 +3419,15 @@ Perl_share_hek(pTHX_ const char *str, SS return share_hek_flags (str, len, hash, flags); } -STATIC HEK * +static HEK * S_share_hek_flags(pTHX_ const char *str, STRLEN len, U32 hash, int flags) { + PERL_ARGS_ASSERT_SHARE_HEK_FLAGS; + HE *entry; const U8 flags_masked = flags & HVhek_STORAGE_MASK; const U32 hindex = hash & (I32) HvMAX(PL_strtab); - PERL_ARGS_ASSERT_SHARE_HEK_FLAGS; assert(!(flags & HVhek_NOTSHARED)); if (UNLIKELY(len > (STRLEN) I32_MAX)) { @@ -3491,10 +3512,10 @@ S_share_hek_flags(pTHX_ const char *str, SSize_t * Perl_hv_placeholders_p(pTHX_ HV *hv) { - MAGIC *mg = mg_find((const SV *)hv, PERL_MAGIC_rhash); - PERL_ARGS_ASSERT_HV_PLACEHOLDERS_P; + MAGIC *mg = mg_find((const SV *)hv, PERL_MAGIC_rhash); + if (!mg) { mg = sv_magicext(MUTABLE_SV(hv), 0, PERL_MAGIC_rhash, 0, 0, 0); @@ -3516,11 +3537,11 @@ Implements C, which I32 Perl_hv_placeholders_get(pTHX_ const HV *hv) { - MAGIC * const mg = mg_find((const SV *)hv, PERL_MAGIC_rhash); - PERL_ARGS_ASSERT_HV_PLACEHOLDERS_GET; PERL_UNUSED_CONTEXT; + MAGIC * const mg = mg_find((const SV *)hv, PERL_MAGIC_rhash); + return mg ? mg->mg_len : 0; } @@ -3535,10 +3556,10 @@ Implements C, which void Perl_hv_placeholders_set(pTHX_ HV *hv, I32 ph) { - MAGIC * const mg = mg_find((const SV *)hv, PERL_MAGIC_rhash); - PERL_ARGS_ASSERT_HV_PLACEHOLDERS_SET; + MAGIC * const mg = mg_find((const SV *)hv, PERL_MAGIC_rhash); + if (mg) { mg->mg_len = ph; } else if (ph) { @@ -3548,13 +3569,13 @@ Perl_hv_placeholders_set(pTHX_ HV *hv, I /* else we don't need to add magic to record 0 placeholders. */ } -STATIC SV * +static SV * S_refcounted_he_value(pTHX_ const struct refcounted_he *he) { - SV *value; - PERL_ARGS_ASSERT_REFCOUNTED_HE_VALUE; + SV *value; + switch(he->refcounted_he_data[0] & HVrhek_typemask) { case HVrhek_undef: value = newSV_type(SVt_NULL); @@ -3576,7 +3597,7 @@ S_refcounted_he_value(pTHX_ const struct SvPV_set(value, (char *) he->refcounted_he_data + 1); SvCUR_set(value, he->refcounted_he_val.refcounted_he_u_len); /* This stops anything trying to free it */ - SvLEN_set(value, 0); + assert(SvLEN(value) == 0); SvPOK_on(value); SvREADONLY_on(value); if ((he->refcounted_he_data[0] & HVrhek_typemask) == HVrhek_PV_UTF8) @@ -3601,6 +3622,8 @@ C is currently unused and must be HV * Perl_refcounted_he_chain_2hv(pTHX_ const struct refcounted_he *chain, U32 flags) { + PERL_ARGS_ASSERT_REFCOUNTED_HE_CHAIN_2HV; + HV *hv; U32 placeholders, max; @@ -3701,15 +3724,35 @@ Perl_refcounted_he_chain_2hv(pTHX_ const } /* -=for apidoc refcounted_he_fetch_pvn +=for apidoc refcounted_he_fetch_pv +=for apidoc_item refcounted_he_fetch_pvn +=for apidoc_item m||refcounted_he_fetch_pvs +=for apidoc_item refcounted_he_fetch_sv + +These each search along a C C for an entry with the +specified key. The return depends on the C bit in +C. If unset, a mortal scalar representing the value associated with +the key is returned, or C<&PL_sv_placeholder> if there is no value associated +with the key. If set, and there is such a value C<&PL_yes> is returned; if no +such value, NULL is returned. + +C is a precomputed hash of the key string, or zero if it has not been +precomputed + +The forms differ only in how the key is specified. + +In C, C specifies the key as a C language +NUL-terminated string. + +In C, the key is a C language string literal, enclosed +in double quotes. + +In C, C points to the first byte of the string +specifying the key, and an additional parameter, C, specifies its +length in bytes. Hence, C may contain embedded-NUL characters. -Search along a C chain for an entry with the key specified -by C and C. If C has the C -bit set, the key octets are interpreted as UTF-8, otherwise they -are interpreted as Latin-1. C is a precomputed hash of the key -string, or zero if it has not been precomputed. Returns a mortal scalar -representing the value associated with the key, or C<&PL_sv_placeholder> -if there is no value associated with the key. +In C, C<*key> is an SV, and the key is the PV +extracted from that using L>. =cut */ @@ -3765,15 +3808,6 @@ Perl_refcounted_he_fetch_pvn(pTHX_ const return flags & REFCOUNTED_HE_EXISTS ? NULL : &PL_sv_placeholder; } -/* -=for apidoc refcounted_he_fetch_pv - -Like L, but takes a nul-terminated string -instead of a string/length pair. - -=cut -*/ - SV * Perl_refcounted_he_fetch_pv(pTHX_ const struct refcounted_he *chain, const char *key, U32 hash, U32 flags) @@ -3782,22 +3816,14 @@ Perl_refcounted_he_fetch_pv(pTHX_ const return refcounted_he_fetch_pvn(chain, key, strlen(key), hash, flags); } -/* -=for apidoc refcounted_he_fetch_sv - -Like L, but takes a Perl scalar instead of a -string/length pair. - -=cut -*/ - SV * Perl_refcounted_he_fetch_sv(pTHX_ const struct refcounted_he *chain, SV *key, U32 hash, U32 flags) { + PERL_ARGS_ASSERT_REFCOUNTED_HE_FETCH_SV; + const char *keypv; STRLEN keylen; - PERL_ARGS_ASSERT_REFCOUNTED_HE_FETCH_SV; if (flags & REFCOUNTED_HE_KEY_UTF8) croak("panic: refcounted_he_fetch_sv bad flags %" UVxf, (UV)flags); @@ -3810,26 +3836,33 @@ Perl_refcounted_he_fetch_sv(pTHX_ const } /* -=for apidoc refcounted_he_new_pvn +=for apidoc refcounted_he_new_pv +=for apidoc_item refcounted_he_new_pvn +=for apidoc_item m||refcounted_he_new_pvs +=for apidoc_item refcounted_he_new_sv + +These each create a new C. This consists of a single key/value +pair and a reference to an existing C chain (which may be +empty), thus forming a longer chain. When using the longer chain, the new +key/value pair takes precedence over any entry for the same key further along +the chain. -Creates a new C. This consists of a single key/value -pair and a reference to an existing C chain (which may -be empty), and thus forms a longer chain. When using the longer chain, -the new key/value pair takes precedence over any entry for the same key -further along the chain. +C is a precomputed hash of the key string, or zero if it has not been +precomputed. C doesn't have a C parameter, as +that is determinable at compile time. + +The forms otherwise differ only in how the key is specified. The new key is specified by C and C. If C has the C bit set, the key octets are interpreted -as UTF-8, otherwise they are interpreted as Latin-1. C is -a precomputed hash of the key string, or zero if it has not been -precomputed. +as UTF-8, otherwise they are interpreted as Latin-1. C is the scalar value to store for this key. C is copied by this function, which thus does not take ownership of any reference to it, and later changes to the scalar will not be reflected in the value visible in the C. Complex types of scalar will not be stored with referential integrity, but will be coerced to strings. -C may be either null or C<&PL_sv_placeholder> to indicate that no +C may be either NULL or C<&PL_sv_placeholder> to indicate that no value is to be associated with the key; this, as with any non-null value, takes precedence over the existence of a value for the key further along the chain. @@ -3862,7 +3895,7 @@ Perl_refcounted_he_new_pvn(pTHX_ struct } else if (SvPOK(value)) { value_type = HVrhek_PV; } else if (SvIOK(value)) { - value_type = SvUOK((const SV *)value) ? HVrhek_UV : HVrhek_IV; + value_type = SvIsUV(value) ? HVrhek_UV : HVrhek_IV; } else if (!SvOK(value)) { value_type = HVrhek_undef; } else { @@ -3927,15 +3960,6 @@ Perl_refcounted_he_new_pvn(pTHX_ struct return he; } -/* -=for apidoc refcounted_he_new_pv - -Like L, but takes a nul-terminated string instead -of a string/length pair. - -=cut -*/ - struct refcounted_he * Perl_refcounted_he_new_pv(pTHX_ struct refcounted_he *parent, const char *key, U32 hash, SV *value, U32 flags) @@ -3944,22 +3968,14 @@ Perl_refcounted_he_new_pv(pTHX_ struct r return refcounted_he_new_pvn(parent, key, strlen(key), hash, value, flags); } -/* -=for apidoc refcounted_he_new_sv - -Like L, but takes a Perl scalar instead of a -string/length pair. - -=cut -*/ - struct refcounted_he * Perl_refcounted_he_new_sv(pTHX_ struct refcounted_he *parent, SV *key, U32 hash, SV *value, U32 flags) { + PERL_ARGS_ASSERT_REFCOUNTED_HE_NEW_SV; + const char *keypv; STRLEN keylen; - PERL_ARGS_ASSERT_REFCOUNTED_HE_NEW_SV; if (flags & REFCOUNTED_HE_KEY_UTF8) croak("panic: refcounted_he_new_sv bad flags %" UVxf, (UV)flags); @@ -3985,6 +4001,7 @@ no action occurs in this case. void Perl_refcounted_he_free(pTHX_ struct refcounted_he *he) { + PERL_ARGS_ASSERT_REFCOUNTED_HE_FREE; PERL_UNUSED_CONTEXT; while (he) { @@ -4021,6 +4038,8 @@ to this function: no action occurs and a struct refcounted_he * Perl_refcounted_he_inc(pTHX_ struct refcounted_he *he) { + PERL_ARGS_ASSERT_REFCOUNTED_HE_INC; + PERL_UNUSED_CONTEXT; if (he) { HINTS_REFCNT_LOCK; @@ -4049,12 +4068,13 @@ or if you additionally don't need to kno /* pp_entereval is aware that labels are stored with a key ':' at the top of the linked list. */ const char * -Perl_cop_fetch_label(pTHX_ COP *const cop, STRLEN *len, U32 *flags) { - struct refcounted_he *const chain = cop->cop_hints_hash; - +Perl_cop_fetch_label(pTHX_ COP *const cop, STRLEN *len, U32 *flags) +{ PERL_ARGS_ASSERT_COP_FETCH_LABEL; PERL_UNUSED_CONTEXT; + struct refcounted_he *const chain = cop->cop_hints_hash; + if (!chain) return NULL; #ifdef USE_ITHREADS @@ -4097,9 +4117,10 @@ void Perl_cop_store_label(pTHX_ COP *const cop, const char *label, STRLEN len, U32 flags) { - SV *labelsv; PERL_ARGS_ASSERT_COP_STORE_LABEL; + SV *labelsv; + if (flags & ~(SVf_UTF8)) croak("panic: cop_store_label illegal flag bits 0x%" UVxf, (UV)flags); @@ -4124,6 +4145,8 @@ Check that a hash is in an internally co void Perl_hv_assert(pTHX_ HV *hv) { + PERL_ARGS_ASSERT_HV_ASSERT; + HE* entry; int withflags = 0; int placeholders = 0; @@ -4131,8 +4154,6 @@ Perl_hv_assert(pTHX_ HV *hv) int bad = 0; const I32 riter = HvRITER_get(hv); HE *eiter = HvEITER_get(hv); - - PERL_ARGS_ASSERT_HV_ASSERT; (void)hv_iterinit(hv); Index: gnu/usr.bin/perl/hv.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/hv.h,v diff -u -p -a -u -p -r1.20 hv.h --- gnu/usr.bin/perl/hv.h 26 Dec 2025 22:14:12 -0000 1.20 +++ gnu/usr.bin/perl/hv.h 16 Nov 2026 00:57:38 -0000 @@ -107,7 +107,7 @@ struct mro_meta { Don't access this directly. */ -union _xhvnameu { +union xhvnameu_ { HEK *xhvnameu_name; /* When xhv_name_count is 0 */ HEK **xhvnameu_names; /* When xhv_name_count is non-0 */ }; @@ -116,7 +116,7 @@ union _xhvnameu { struct suspended_compcv; struct xpvhv_aux { - union _xhvnameu xhv_name_u; /* name, if a symbol table */ + union xhvnameu_ xhv_name_u; /* name, if a symbol table */ AV *xhv_backreferences; /* back references for weak references */ HE *xhv_eiter; /* current entry of iterator */ I32 xhv_riter; /* current root of iterator */ @@ -137,12 +137,15 @@ struct xpvhv_aux { U32 xhv_aux_flags; /* assorted extra flags */ /* The following fields are only valid if we have the flag HvAUXf_IS_CLASS */ + U32 xhv_class_flags; HV *xhv_class_superclass; /* STASH of the :isa() base class */ CV *xhv_class_initfields_cv; /* CV for running initfields */ AV *xhv_class_adjust_blocks; /* CVs containing the ADJUST blocks */ PADNAMELIST *xhv_class_fields; /* PADNAMEs with PadnameIsFIELD() */ PADOFFSET xhv_class_next_fieldix; HV *xhv_class_param_map; /* Maps param names to field index stored in UV */ + AV *xhv_class_subclasses_pending_seal; + /* STASHes of subclasses that are awaiting seal after this */ struct suspended_compcv *xhv_class_suspended_initfields_compcv; @@ -155,18 +158,23 @@ struct xpvhv_aux { #define HvSTASH_IS_CLASS(hv) \ (HvHasAUX(hv) && HvAUX(hv)->xhv_aux_flags & HvAUXf_IS_CLASS) +#define HvCLASSf_SEALED 0x1 /* class seal operation has been invoked */ + +#define HvCLASS_IS_SEALED(hv) \ + (HvSTASH_IS_CLASS(hv) && HvAUX(hv)->xhv_class_flags & HvCLASSf_SEALED) + /* hash structure: */ /* This structure must match the beginning of struct xpvmg in sv.h. */ struct xpvhv { HV* xmg_stash; /* class package */ - union _xmgu xmg_u; + union xmgu_ xmg_u; STRLEN xhv_keys; /* total keys, including placeholders */ STRLEN xhv_max; /* subscript of last element of xhv_array */ }; struct xpvhv_with_aux { HV *xmg_stash; /* class package */ - union _xmgu xmg_u; + union xmgu_ xmg_u; STRLEN xhv_keys; /* total keys, including placeholders */ STRLEN xhv_max; /* subscript of last element of xhv_array */ struct xpvhv_aux xhv_aux; @@ -208,7 +216,10 @@ See C>, C>. =for apidoc Am|STRLEN|HvNAMELEN|HV *stash Returns the length of the stash's name. +=cut + Disfavored forms of HvNAME and HvNAMELEN; suppress mention of them + =for apidoc Cmh|char*|HvNAME_get|HV* stash =for apidoc Amh|I32|HvNAMELEN_get|HV* stash @@ -246,8 +257,8 @@ Returns the value slot (type C) stored in the hash entry. Can be assigned to. - SV *foo= HeVAL(hv); - HeVAL(hv)= sv; + SV *foo= HeVAL(he); + HeVAL(he)= sv; =for apidoc Am|U32|HeHASH|HE* he @@ -555,10 +566,12 @@ whether it is valid to call C. #define hv_exists(hv, key, klen) \ cBOOL(hv_common_key_len((hv), (key), (klen), HV_FETCH_ISEXISTS, NULL, 0)) -#define hv_fetch(hv, key, klen, lval) \ - ((SV**) hv_common_key_len((hv), (key), (klen), (lval) \ - ? (HV_FETCH_JUST_SV | HV_FETCH_LVALUE) \ - : HV_FETCH_JUST_SV, NULL, 0)) +#define hv_fetch(hv, key, klen, lval) \ + ((SV**) hv_common_key_len((hv), (key), (klen), \ + (HV_FETCH_JUST_SV | ((lval) \ + ? HV_FETCH_LVALUE \ + : 0)), \ + NULL, 0)) #define hv_delete(hv, key, klen, flags) \ (MUTABLE_SV(hv_common_key_len((hv), (key), (klen), \ @@ -579,6 +592,7 @@ whether it is valid to call C. =for apidoc_defn Am|SV**|hv_fetchs|HV* hv|"key"|I32 lval =for apidoc_defn Am|SV *|hv_deletes|HV *hv|"key"|U32 flags =for apidoc_defn Am|void|hv_name_sets|HV *hv|"name"|U32 flags +=for apidoc_defn Am|SV**|hv_stores|HV *hv|"name"|U32 flags =cut */ #define hv_fetchs(hv, key, lval) \ @@ -647,26 +661,8 @@ struct refcounted_he { char refcounted_he_data[1]; }; -/* -=for apidoc m|SV *|refcounted_he_fetch_pvs|const struct refcounted_he *chain|"key"|U32 flags - -Like L, but takes a literal string -instead of a string/length pair, and no precomputed hash. - -=cut -*/ - #define refcounted_he_fetch_pvs(chain, key, flags) \ Perl_refcounted_he_fetch_pvn(aTHX_ chain, STR_WITH_LEN(key), 0, flags) - -/* -=for apidoc m|struct refcounted_he *|refcounted_he_new_pvs|struct refcounted_he *parent|"key"|SV *value|U32 flags - -Like L, but takes a literal string -instead of a string/length pair, and no precomputed hash. - -=cut -*/ #define refcounted_he_new_pvs(parent, key, value, flags) \ Perl_refcounted_he_new_pvn(aTHX_ parent, STR_WITH_LEN(key), 0, value, flags) Index: gnu/usr.bin/perl/hv_func.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/hv_func.h,v diff -u -p -a -u -p -r1.13 hv_func.h --- gnu/usr.bin/perl/hv_func.h 14 May 2024 19:38:53 -0000 1.13 +++ gnu/usr.bin/perl/hv_func.h 16 Nov 2026 00:57:38 -0000 @@ -6,8 +6,8 @@ * If USE_HASH_SEED is defined, hash randomisation is done by default * (see also perl.c:perl_parse() and S_init_tls_and_interp() and util.c:get_hash_seed()) */ -#ifndef PERL_SEEN_HV_FUNC_H_ /* compile once */ -#define PERL_SEEN_HV_FUNC_H_ +#ifndef PERL_HV_FUNC_H_ /* compile once */ +#define PERL_HV_FUNC_H_ #include "hv_macro.h" #if !( 0 \ @@ -176,7 +176,8 @@ #endif PERL_STATIC_INLINE U32 -S_perl_hash_with_seed(const U8 * seed, const U8 *str, STRLEN len) { +S_perl_hash_with_seed(const U8 * seed, const U8 *str, STRLEN len) +{ PVT__PERL_HASH_WORD_TYPE state[PERL_HASH_STATE_WORDS]; PVT_PERL_HASH_SEED_STATE(seed,(U8*)state); return PVT_PERL_HASH_WITH_STATE((U8*)state,str,len); Index: gnu/usr.bin/perl/hv_macro.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/hv_macro.h,v diff -u -p -a -u -p -r1.1.1.4 hv_macro.h --- gnu/usr.bin/perl/hv_macro.h 14 May 2024 19:36:28 -0000 1.1.1.4 +++ gnu/usr.bin/perl/hv_macro.h 16 Nov 2026 00:57:38 -0000 @@ -1,5 +1,5 @@ -#ifndef PERL_SEEN_HV_MACRO_H_ /* compile once */ -#define PERL_SEEN_HV_MACRO_H_ +#ifndef PERL_HV_MACRO_H_ /* compile once */ +#define PERL_HV_MACRO_H_ #if IVSIZE == 8 #define CAN64BITHASH @@ -30,28 +30,28 @@ */ #ifndef U8TO16_LE - #define _shifted_octet(type,ptr,idx,shift) (((type)(((const U8*)(ptr))[(idx)]))<<(shift)) + #define shifted_octet_(type,ptr,idx,shift) (((type)(((const U8*)(ptr))[(idx)]))<<(shift)) #if defined(USE_UNALIGNED_PTR_DEREF) && (BYTEORDER == 0x1234 || BYTEORDER == 0x12345678) #define U8TO16_LE(ptr) (*((const U16*)(ptr))) #define U8TO32_LE(ptr) (*((const U32*)(ptr))) #define U8TO64_LE(ptr) (*((const U64*)(ptr))) #else - #define U8TO16_LE(ptr) (_shifted_octet(U16,(ptr),0, 0)|\ - _shifted_octet(U16,(ptr),1, 8)) + #define U8TO16_LE(ptr) (shifted_octet_(U16,(ptr),0, 0)|\ + shifted_octet_(U16,(ptr),1, 8)) - #define U8TO32_LE(ptr) (_shifted_octet(U32,(ptr),0, 0)|\ - _shifted_octet(U32,(ptr),1, 8)|\ - _shifted_octet(U32,(ptr),2,16)|\ - _shifted_octet(U32,(ptr),3,24)) - - #define U8TO64_LE(ptr) (_shifted_octet(U64,(ptr),0, 0)|\ - _shifted_octet(U64,(ptr),1, 8)|\ - _shifted_octet(U64,(ptr),2,16)|\ - _shifted_octet(U64,(ptr),3,24)|\ - _shifted_octet(U64,(ptr),4,32)|\ - _shifted_octet(U64,(ptr),5,40)|\ - _shifted_octet(U64,(ptr),6,48)|\ - _shifted_octet(U64,(ptr),7,56)) + #define U8TO32_LE(ptr) (shifted_octet_(U32,(ptr),0, 0)|\ + shifted_octet_(U32,(ptr),1, 8)|\ + shifted_octet_(U32,(ptr),2,16)|\ + shifted_octet_(U32,(ptr),3,24)) + + #define U8TO64_LE(ptr) (shifted_octet_(U64,(ptr),0, 0)|\ + shifted_octet_(U64,(ptr),1, 8)|\ + shifted_octet_(U64,(ptr),2,16)|\ + shifted_octet_(U64,(ptr),3,24)|\ + shifted_octet_(U64,(ptr),4,32)|\ + shifted_octet_(U64,(ptr),5,40)|\ + shifted_octet_(U64,(ptr),6,48)|\ + shifted_octet_(U64,(ptr),7,56)) #endif #endif Index: gnu/usr.bin/perl/inline.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/inline.h,v diff -u -p -a -u -p -r1.10 inline.h --- gnu/usr.bin/perl/inline.h 26 Dec 2025 22:14:12 -0000 1.10 +++ gnu/usr.bin/perl/inline.h 16 Nov 2026 00:57:38 -0000 @@ -56,11 +56,22 @@ PERL_STATIC_INLINE Size_t Perl_av_count(pTHX_ AV *av) { PERL_ARGS_ASSERT_AV_COUNT; - assert(SvTYPE(av) == SVt_PVAV); return AvFILL(av) + 1; } +PERL_STATIC_INLINE SSize_t +Perl_AvFILL_(pTHX_ AV *av) +{ + PERL_ARGS_ASSERT_AVFILL_; + + if (SvRMAGICAL((const SV *) (av))) { + return mg_size((SV *) av); + } + + return AvFILLp(av); +} + /* ------------------------------- av.c ------------------------------- */ /* @@ -85,10 +96,10 @@ Approximate Perl equivalent: C 0); Newx(ary, size, SV*); /* Newx performs the memwrap check */ AvALLOC(av) = ary; @@ -283,6 +292,28 @@ S_strip_spaces(pTHX_ const char * orig, } #endif +/* ------------------------------- hv.c ------------------------------- */ + +/* Common code for hv_delete()/hv_exists()/hv_fetch()/hv_store() */ +PERL_STATIC_INLINE void * +Perl_hv_common_key_len(pTHX_ HV *hv, const char *key, I32 klen_i32, + const int action, SV *val, const U32 hash) +{ + PERL_ARGS_ASSERT_HV_COMMON_KEY_LEN; + + STRLEN klen; + int flags; + + if (klen_i32 < 0) { + klen = -klen_i32; + flags = HVhek_UTF8; + } else { + klen = klen_i32; + flags = 0; + } + return hv_common(hv, NULL, key, klen, flags, action, val, hash); +} + /* ------------------------------- iperlsys.h ------------------------------- */ #if ! defined(PERL_IMPLICIT_SYS) && defined(USE_ITHREADS) @@ -364,6 +395,8 @@ S_PadnameIN_SCOPE(const PADNAME * const PERL_STATIC_INLINE Stack_off_t Perl_TOPMARK(pTHX) { + PERL_ARGS_ASSERT_TOPMARK; + DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log, "MARK top %p %" IVdf "\n", PL_markstack_ptr, @@ -374,6 +407,8 @@ Perl_TOPMARK(pTHX) PERL_STATIC_INLINE Stack_off_t Perl_POPMARK(pTHX) { + PERL_ARGS_ASSERT_POPMARK; + DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log, "MARK pop %p %" IVdf "\n", (PL_markstack_ptr-1), @@ -399,7 +434,7 @@ Perl_rpp_extend(pTHX_ SSize_t n) EXTEND_HWM_SET(PL_stack_sp, n); #ifndef STRESS_REALLOC - if (UNLIKELY(_EXTEND_NEEDS_GROW(PL_stack_sp, n))) + if (UNLIKELY(EXTEND_NEEDS_GROW_(PL_stack_sp, n))) #endif { (void)stack_grow(PL_stack_sp, PL_stack_sp, n); @@ -603,7 +638,7 @@ a simple C<*PL_stack_sp-->. PERL_STATIC_INLINE SV* Perl_rpp_pop_1_norc(pTHX) { - PERL_ARGS_ASSERT_RPP_POP_1_NORC + PERL_ARGS_ASSERT_RPP_POP_1_NORC; SV *sv = *PL_stack_sp--; @@ -628,7 +663,7 @@ Perl_rpp_pop_1_norc(pTHX) Push one or two SVs onto the stack, incrementing their reference counts and updating C. With the C variants, it extends the stack first. The C variants assume that the single argument is an immortal -such as <&PL_sv_undef> and, for efficiency, will skip incrementing its +such as C<&PL_sv_undef> and, for efficiency, will skip incrementing its reference count. =cut @@ -715,7 +750,7 @@ reference count of 1, but has not yet be PERL_STATIC_INLINE void Perl_rpp_push_1_norc(pTHX_ SV *sv) { - PERL_ARGS_ASSERT_RPP_PUSH_1; + PERL_ARGS_ASSERT_RPP_PUSH_1_NORC; *++PL_stack_sp = sv; #ifdef PERL_RC_STACK @@ -739,7 +774,7 @@ The C<_NN> variant assumes that the poin freed is non-NULL. The C variant is like the C<_NN> variant, but in addition, assumes -that the single argument is an immortal such as <&PL_sv_undef> and, for +that the single argument is an immortal such as C<&PL_sv_undef> and, for efficiency, will skip incrementing its reference count. =cut @@ -814,7 +849,7 @@ The C<_NN> variant assumes that the poin freed are non-NULL. The C variant is like the C<_NN> variant, but in addition, assumes -that the single argument is an immortal such as <&PL_sv_undef> and, for +that the single argument is an immortal such as C<&PL_sv_undef> and, for efficiency, will skip incrementing its reference count. =cut */ @@ -851,6 +886,8 @@ Perl_rpp_replace_2_1(pTHX_ SV *sv) PERL_STATIC_INLINE void Perl_rpp_replace_2_1_COMMON(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_RPP_REPLACE_2_1_COMMON; + assert(sv); #ifdef PERL_RC_STACK @@ -1082,6 +1119,8 @@ the beginning of the PP function for una PERL_STATIC_INLINE bool Perl_rpp_try_AMAGIC_1(pTHX_ int method, int flags) { + PERL_ARGS_ASSERT_RPP_TRY_AMAGIC_1; + return UNLIKELY((SvFLAGS(*PL_stack_sp) & (SVf_ROK|SVs_GMG))) && Perl_try_amagic_un(aTHX_ method, flags); } @@ -1089,6 +1128,8 @@ Perl_rpp_try_AMAGIC_1(pTHX_ int method, PERL_STATIC_INLINE bool Perl_rpp_try_AMAGIC_2(pTHX_ int method, int flags) { + PERL_ARGS_ASSERT_RPP_TRY_AMAGIC_2; + return UNLIKELY(((SvFLAGS(PL_stack_sp[-1])|SvFLAGS(PL_stack_sp[0])) & (SVf_ROK|SVs_GMG))) && Perl_try_amagic_bin(aTHX_ method, flags); @@ -1109,6 +1150,8 @@ contains zero items. PERL_STATIC_INLINE bool Perl_rpp_stack_is_rc(pTHX) { + PERL_ARGS_ASSERT_RPP_STACK_IS_RC; + #ifdef PERL_RC_STACK return AvREAL(PL_curstack) && !PL_curstackinfo->si_stack_nonrc_base; #else @@ -1135,6 +1178,8 @@ in lvalue context. PERL_STATIC_INLINE bool Perl_rpp_is_lone(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_RPP_IS_LONE; + #ifdef PERL_RC_STACK /* note that rpp_is_lone() can be used in wrapped pp functions, * where technically the stack is no longer ref-counted; but because @@ -1213,9 +1258,10 @@ Perl_sv_can_existdelete(pTHX_ SV *sv) PERL_STATIC_INLINE struct regexp * Perl_ReANY(const REGEXP * const re) { + PERL_ARGS_ASSERT_REANY; + XPV* const p = (XPV*)SvANY(re); - PERL_ARGS_ASSERT_REANY; assert(isREGEXP(re)); return SvTYPE(re) == SVt_PVLV ? p->xpv_len_u.xpvlenu_rx @@ -1231,11 +1277,11 @@ Perl_ReANY(const REGEXP * const re) PERL_STATIC_INLINE void Perl_append_utf8_from_native_byte(const U8 byte, U8** dest) { + PERL_ARGS_ASSERT_APPEND_UTF8_FROM_NATIVE_BYTE; + /* Takes an input 'byte' (Latin1 or EBCDIC) and appends it to the UTF-8 * encoded string at '*dest', updating '*dest' to include it */ - PERL_ARGS_ASSERT_APPEND_UTF8_FROM_NATIVE_BYTE; - if (NATIVE_BYTE_IS_INVARIANT(byte)) *((*dest)++) = byte; else { @@ -1247,12 +1293,16 @@ Perl_append_utf8_from_native_byte(const PERL_STATIC_INLINE U8 * Perl_bytes_to_utf8(pTHX_ const U8 *s, STRLEN *lenp) { + PERL_ARGS_ASSERT_BYTES_TO_UTF8; + return bytes_to_utf8_free_me(s, lenp, NULL); } PERL_STATIC_INLINE U8 * Perl_bytes_to_utf8_temp_pv(pTHX_ const U8 *s, STRLEN *lenp) { + PERL_ARGS_ASSERT_BYTES_TO_UTF8_TEMP_PV; + void * free_me = NULL; U8 * converted = bytes_to_utf8_free_me(s, lenp, &free_me); @@ -1266,6 +1316,8 @@ Perl_bytes_to_utf8_temp_pv(pTHX_ const U PERL_STATIC_INLINE bool Perl_utf8_to_bytes_new_pv(pTHX_ U8 const **s_ptr, STRLEN *lenp, void ** free_me) { + PERL_ARGS_ASSERT_UTF8_TO_BYTES_NEW_PV; + /* utf8_to_bytes_() is declared to take a non-const s_ptr because it may * change it, but NOT when called with PL_utf8_to_bytes_new_memory, so it * is ok to cast away const */ @@ -1276,6 +1328,8 @@ Perl_utf8_to_bytes_new_pv(pTHX_ U8 const PERL_STATIC_INLINE bool Perl_utf8_to_bytes_temp_pv(pTHX_ U8 const **s_ptr, STRLEN *lenp) { + PERL_ARGS_ASSERT_UTF8_TO_BYTES_TEMP_PV; + /* utf8_to_bytes_() requires a non-NULL pointer, but doesn't use it when * called with PL_utf8_to_bytes_use_temporary */ void* dummy = NULL; @@ -1290,6 +1344,8 @@ Perl_utf8_to_bytes_temp_pv(pTHX_ U8 cons PERL_STATIC_INLINE bool Perl_utf8_to_bytes_overwrite(pTHX_ U8 **s_ptr, STRLEN *lenp) { + PERL_ARGS_ASSERT_UTF8_TO_BYTES_OVERWRITE; + /* utf8_to_bytes_() requires a non-NULL pointer, but doesn't use it when * called with PL_utf8_to_bytes_overwrite */ void* dummy = NULL; @@ -1298,47 +1354,127 @@ Perl_utf8_to_bytes_overwrite(pTHX_ U8 ** } /* -=for apidoc valid_utf8_to_uvchr -Like C>, but should only be called when it is +=for apidoc valid_utf8_to_uv +=for apidoc_item valid_utf8_to_uvchr + +These are synonymous. + +These are like C>, but should only be called when it is known that the next character in the input UTF-8 string C is well-formed (I, it passes C>. Surrogates, non-character code points, and non-Unicode code points are allowed. +The only use for these is that they should run slightly faster than +C because no error checking is done. + +The C<_uv> form is slightly preferred so as to have a consistent spelling with +the other C<_uv> forms that are definitely preferred over the older and +problematic C<_uvchr> forms. + =cut */ PERL_STATIC_INLINE UV -Perl_valid_utf8_to_uvchr(const U8 *s, STRLEN *retlen) +Perl_valid_utf8_to_uv(const U8 *s, STRLEN *retlen) { + PERL_ARGS_ASSERT_VALID_UTF8_TO_UV; + const UV expectlen = UTF8SKIP(s); - const U8* send = s + expectlen; - UV uv = *s; + ASSUME(inRANGE(expectlen, 1, UTF8_MAXBYTES)); + UV uv = 0; - PERL_ARGS_ASSERT_VALID_UTF8_TO_UVCHR; + /* Note that this is branchless except for the switch() jump table, and + * checking that the caller wants a *retlen returned. + * + * There is wasted effort for length 1 inputs of initializing 'uv' to 0 + * and calculating 'full_shift' (unless the compiler optimizes that out). + * Benchmarks indicate this is acceptable. + * See GH #23690 */ + + /* Consider a 4-byte UTF-8-encoded charater. On ASCII platforms it looks + * like: + * 1st Byte 2nd Byte 3rd Byte 4th Byte + * 1111 0ddd 10cc cccc 10bb bbbb 10aa aaaa + * + * And the code point it represents is dddccccccbbbbbbbbaaaaaa + * Each continuation byte contributes its lower 6 bits to the total. For + * generality call that number 'L'. + * + * You get that code point by masking off the top bits of each byte, then + * or'ing together: + * the start byte shifted left by 3*L bits, + * with byte [1] shifted left by 2*L bits + * with byte [2] shifted left by 1*L bits + * with byte [3] shifted left by 0*L bits + * + * The order is immaterial, so we can rewrite that as + * 'or' together byte [3] shifted left by 0*L bits + * with byte [2] shifted left by 1*L bits + * with byte [1] shifted left by 2*L bits + * with byte [0] shifted left by 3*L bits, + * + * All share the paradigm that for byte n you mask off the top bits and + * shift the remainder left by (4 - 1 - n) * L bits. So we get + * (s[n] & mask) << (4 - 1 - n) * L + * For a three-byte character it would be + * (s[n] & mask) << (3 - 1 - n) * L + * and generally + * (s[n] & mask) << (expectlen - 1 - n) * L + * which can be rewritten + * (s[n] & mask) << (expectlen - 1) * L - nL + * Calculate the term once that isn't compile-time constant and is the same + * for all n */ + U8 full_shift = (expectlen - 1) * UTF_ACCUMULATION_SHIFT; + + /* Then create a macro that does the full calculation given n. For EBCDIC, + * we need to transform s[n] to I8 */ +#define PERL_VALID_UTF8_NEXT_ACCUMULATION(n) \ + (( (UV) ( NATIVE_UTF8_TO_I8( s[n] ) & UTF_CONTINUATION_MASK)) \ + << (full_shift - (n) * UTF_ACCUMULATION_SHIFT)) + + switch (expectlen) { + default: + uv = long_valid_utf8_to_uv(s, s + expectlen); + break; + +#if 0 /* See GH #23690 */ + /* These cases give the correct results, but the extra memory used lowers + * the chances of the compiler actually inlining this, and we only care + * about performance for Unicode code points, all of which can be + * expressed with 4 bytes (5 on EBCDIC). Experiements with clang showed + * no difference between 4,5,6, but a huge drop off with 7. */ + case 7: uv |= PERL_VALID_UTF8_NEXT_ACCUMULATION(6); + /* FALLTHROUGH */ + case 6: uv |= PERL_VALID_UTF8_NEXT_ACCUMULATION(5); + /* FALLTHROUGH */ +#endif + case 5: uv |= PERL_VALID_UTF8_NEXT_ACCUMULATION(4); + /* FALLTHROUGH */ + case 4: + uv |= PERL_VALID_UTF8_NEXT_ACCUMULATION(3); + /* FALLTHROUGH */ + case 3: + uv |= PERL_VALID_UTF8_NEXT_ACCUMULATION(2); + /* FALLTHROUGH */ + case 2: + uv |= PERL_VALID_UTF8_NEXT_ACCUMULATION(1); + + uv = UNI_TO_NATIVE(uv | ( ((UV)( NATIVE_UTF8_TO_I8(s[0]) + & UTF_START_MASK(expectlen)) + << full_shift))); + break; + + case 1: + uv = s[0]; + break; + } if (retlen) { *retlen = expectlen; } - /* An invariant is trivially returned */ - if (expectlen == 1) { - return uv; - } - - /* Remove the leading bits that indicate the number of bytes, leaving just - * the bits that are part of the value */ - uv = NATIVE_UTF8_TO_I8(uv) & UTF_START_MASK(expectlen); - - /* Now, loop through the remaining bytes, accumulating each into the - * working total as we go. (I khw tried unrolling the loop for up to 4 - * bytes, but there was no performance improvement) */ - for (++s; s < send; s++) { - uv = UTF8_ACCUMULATE(uv, *s); - } - - return UNI_TO_NATIVE(uv); - + return uv; } /* This looks like 0x010101... */ @@ -1349,14 +1485,60 @@ Perl_valid_utf8_to_uvchr(const U8 *s, ST # define PERL_WORDSIZE sizeof(PERL_UINTMAX_T) # define PERL_WORD_BOUNDARY_MASK (PERL_WORDSIZE - 1) -/* Evaluates to 0 if 'x' is at a word boundary; otherwise evaluates to 1, by - * or'ing together the lowest bits of 'x'. Hopefully the final term gets - * optimized out completely on a 32-bit system, and its mask gets optimized out - * on a 64-bit system */ -# define PERL_IS_SUBWORD_ADDR(x) (1 & ( PTR2nat(x) \ - | ( PTR2nat(x) >> 1) \ - | ( ( (PTR2nat(x) \ - & PERL_WORD_BOUNDARY_MASK) >> 2)))) +/* Given an address of a byte 'x', how many bytes away is that address to the + * following closest full word boundary. */ +# define BYTES_REMAINING_IN_WORD(x) \ + ( (PERL_WORDSIZE - (PTR2nat(x) & PERL_WORD_BOUNDARY_MASK)) \ + & PERL_WORD_BOUNDARY_MASK) +/* For example, consider two addresses in an 8 byte word size (the dots are + * don't cares): + * 0b...............010 0b...............000 + * ((8 - (0b1101010 & 0x7)) & 0x7) ((8 - (0b1101000 & 0x7)) & 0x7) + * ((8 - 0b10) & 0x7) ((8 - 0) & 0x7) + * (6 & 0x7) (8 & 0x7) + * 6 0 */ + +/* Some tasks that are byte-oriented can be done as well a full word-at-a-time, + * running 8 times faster on an 8-byte word, for example. But there is + * generally extra setup required to do this, and byte-at-a-time must be used + * anyway to get to the next word boundary. This macro calculates whether the + * trade-off is worth doing. If not, it returns NULL; if so, it returns a + * pointer to the first byte of the next word. Code using this is typically + * structured like: + * U8 * next_word_boundary = WORTH_PER_LOOP() + * if (next_word_boundary) { + * loop per-byte until next_word_boundary + * loop per-word until less than a word left before upper boundary + * } + * loop per-byte until reach final boundary + * + * 's' is the current position in the string + * 'e' is the upper string bound + * 'full_words_needed' is the caller's determination of where to make the + * trade-off between per-byte and per-word. Only if the number of words + * in the input string is at least this many, does the macro return + * non-NULL. + * + * Because of EBCDIC, there are two forms of this macro. + * WORTH_PER_WORD_LOOP_BINMODE() is for use when the data being examined is + * not dependent on the character set. The more usual form is plain + * WORTH_PER_WORD_LOOP() for character data. Because EBCDIC needs an extra + * transformation, per-word operations are not appropriate on it, so the macro + * always returns NULL, meaning don't use a per-word loop on an EBCDIC + * platform. */ +# define WORTH_PER_WORD_LOOP_BINMODE(s, e, full_words_needed) \ + /* Note multiple evaluations of 's' */ \ + ( ( ( (s) + BYTES_REMAINING_IN_WORD(s) \ + + (full_words_needed) * PERL_WORDSIZE) < (e) ) \ + ? ((s) + BYTES_REMAINING_IN_WORD(s)) \ + : NULL) + +# ifdef EBCDIC +# define WORTH_PER_WORD_LOOP(s, e, f) NULL +# else +# define WORTH_PER_WORD_LOOP(s, e, f) \ + WORTH_PER_WORD_LOOP_BINMODE(s, e, f) +# endif /* =for apidoc is_utf8_invariant_string @@ -1405,35 +1587,22 @@ C> and C= PERL_WORDSIZE - - /* This term is wordsize if subword; 0 if not */ - + PERL_WORDSIZE * PERL_IS_SUBWORD_ADDR(x) - - /* 'offset' */ - - (PTR2nat(x) & PERL_WORD_BOUNDARY_MASK)) - { + * full word left. */ + const U8 * const per_byte_end = WORTH_PER_WORD_LOOP(x, send, 1); - /* Process per-byte until reach word boundary. XXX This loop could be - * eliminated if we knew that this platform had fast unaligned reads */ - while (PTR2nat(x) & PERL_WORD_BOUNDARY_MASK) { + if (per_byte_end) { + while (x < per_byte_end ) { if (! UTF8_IS_INVARIANT(*x)) { if (ep) { *ep = x; @@ -1475,8 +1644,6 @@ Perl_is_utf8_invariant_string_loc(const } while (x + PERL_WORDSIZE <= send); } -#endif /* End of ! EBCDIC */ - /* Process per-byte. (Can't use libc functions like strpbrk() because * input isn't necessarily a C string) */ while (x < send) { @@ -1579,11 +1746,12 @@ Perl_is_utf8_invariant_string_loc(const PERL_STATIC_INLINE unsigned Perl_lsbit_pos64(U64 word) { + PERL_ARGS_ASSERT_LSBIT_POS64; + ASSUME(word != 0); + /* Find the position (0..63) of the least significant set bit in the input * word */ - ASSUME(word != 0); - /* If we can determine that the platform has a usable fast method to get * this info, use that */ @@ -1636,11 +1804,12 @@ Perl_lsbit_pos64(U64 word) PERL_STATIC_INLINE unsigned /* Like above for 32 bit word */ Perl_lsbit_pos32(U32 word) { + PERL_ARGS_ASSERT_LSBIT_POS32; + ASSUME(word != 0); + /* Find the position (0..31) of the least significant set bit in the input * word */ - ASSUME(word != 0); - #if defined(PERL_CTZ_32) # define PERL_HAS_FAST_GET_LSB_POS32 @@ -1687,11 +1856,12 @@ Perl_lsbit_pos32(U32 word) PERL_STATIC_INLINE unsigned Perl_msbit_pos64(U64 word) { + PERL_ARGS_ASSERT_MSBIT_POS64; + ASSUME(word != 0); + /* Find the position (0..63) of the most significant set bit in the input * word */ - ASSUME(word != 0); - /* If we can determine that the platform has a usable fast method to get * this, use that */ @@ -1747,11 +1917,12 @@ Perl_msbit_pos64(U64 word) PERL_STATIC_INLINE unsigned Perl_msbit_pos32(U32 word) { + PERL_ARGS_ASSERT_MSBIT_POS32; + ASSUME(word != 0); + /* Find the position (0..31) of the most significant set bit in the input * word */ - ASSUME(word != 0); - #if defined(PERL_CLZ_32) # define PERL_HAS_FAST_GET_MSB_POS32 @@ -1804,6 +1975,8 @@ Perl_msbit_pos32(U32 word) PERL_STATIC_INLINE unsigned Perl_single_1bit_pos64(U64 word) { + PERL_ARGS_ASSERT_SINGLE_1BIT_POS64; + /* Given a 64-bit word known to contain all zero bits except one 1 bit, * find and return the 1's position: 0..63 */ @@ -1843,6 +2016,8 @@ Perl_single_1bit_pos64(U64 word) PERL_STATIC_INLINE unsigned Perl_single_1bit_pos32(U32 word) { + PERL_ARGS_ASSERT_SINGLE_1BIT_POS32; + /* Given a 32-bit word known to contain all zero bits except one 1 bit, * find and return the 1's position: 0..31 */ @@ -1867,13 +2042,22 @@ Perl_single_1bit_pos32(U32 word) } -#ifndef EBCDIC +/* Returns the byte number of the lowest numbered-byte whose uppermost bit is + * set */ +#define first_upper_bit_set_byte_number(word) Perl_variant_byte_number(word) PERL_STATIC_INLINE unsigned int Perl_variant_byte_number(PERL_UINTMAX_T word) { - /* This returns the position in a word (0..7) of the first variant byte in - * it. This is a helper function. Note that there are no branches */ + PERL_ARGS_ASSERT_VARIANT_BYTE_NUMBER; + + /* This returns the position in a word (0..7) of the first byte whose + * uppermost bit is set. On ASCII boxes, this is equivalent to the first + * byte whose representation is different in UTF-8 vs not, hence the name + * and text in the comments. It was only later that this was used for + * binary data, not tied to the character set. + * + * This is a helper function. Note that there are no branches */ /* Get just the msb bits of each byte */ word &= PERL_VARIANTS_WORD_MASK; @@ -1882,7 +2066,7 @@ Perl_variant_byte_number(PERL_UINTMAX_T * word */ assert(word); -# if BYTEORDER == 0x1234 || BYTEORDER == 0x12345678 +#if BYTEORDER == 0x1234 || BYTEORDER == 0x12345678 /* Bytes are stored like * Byte8 ... Byte2 Byte1 @@ -1895,7 +2079,7 @@ Perl_variant_byte_number(PERL_UINTMAX_T * to 0..7 */ return (unsigned int) ((word + 1) >> 3) - 1; -# elif BYTEORDER == 0x4321 || BYTEORDER == 0x87654321 +#elif BYTEORDER == 0x4321 || BYTEORDER == 0x87654321 /* Bytes are stored like * Byte1 Byte2 ... Byte8 @@ -1914,13 +2098,24 @@ Perl_variant_byte_number(PERL_UINTMAX_T return (unsigned int) word; -# else -# error Unexpected byte order -# endif +#else /* Unhandled byte-order; the compiler knows which comes first */ -} + const U8 * bytes = (U8 *) &word; + for (unsigned int i = 0; i < sizeof(word); i++) { + if (bytes[i]) { + return i; + } + } + + assert(0); + + /* If all else fails, it's better to return something than just random */ + return 0; #endif + +} + #if defined(PERL_CORE) || defined(PERL_EXT) /* @@ -1953,23 +2148,16 @@ C= PERL_WORDSIZE - + PERL_WORDSIZE * PERL_IS_SUBWORD_ADDR(x) - - (PTR2nat(x) & PERL_WORD_BOUNDARY_MASK)) - { - - /* Process per-byte until reach word boundary. XXX This loop could be - * eliminated if we knew that this platform had fast unaligned reads */ - while (PTR2nat(x) & PERL_WORD_BOUNDARY_MASK) { + const U8 * const per_byte_end = WORTH_PER_WORD_LOOP(x, e, 1); + if (per_byte_end) { + while (x < per_byte_end ) { count += ! UTF8_IS_INVARIANT(*x++); } @@ -1985,8 +2173,6 @@ S_variant_under_utf8_count(const U8* con } while (x + PERL_WORDSIZE <= e); } -# endif - /* Process per-byte */ while (x < e) { if (! UTF8_IS_INVARIANT(*x)) { @@ -2007,6 +2193,7 @@ S_variant_under_utf8_count(const U8* con # undef PERL_COUNT_MULTIPLIER # undef PERL_WORD_BOUNDARY_MASK # undef PERL_VARIANTS_WORD_MASK +# undef BYTES_REMAINING_IN_WORD #endif #define is_utf8_string(s, len) is_utf8_string_loclen(s, len, NULL, NULL) @@ -2041,10 +2228,10 @@ at this low a level. A valid use case c PERL_STATIC_INLINE bool Perl_is_utf8_non_invariant_string(const U8* const s, STRLEN len) { - const U8 * first_variant; - PERL_ARGS_ASSERT_IS_UTF8_NON_INVARIANT_STRING; + const U8 * first_variant; + if (is_utf8_invariant_string_loc(s, len, &first_variant)) { return FALSE; } @@ -2139,9 +2326,10 @@ C>, PERL_STATIC_INLINE bool Perl_is_utf8_string_flags(const U8 *s, STRLEN len, const U32 flags) { + PERL_ARGS_ASSERT_IS_UTF8_STRING_FLAGS; + const U8 * first_variant; - PERL_ARGS_ASSERT_IS_UTF8_STRING_FLAGS; assert(0 == (flags & ~UTF8_DISALLOW_ILLEGAL_INTERCHANGE)); if (len == 0) { @@ -2180,16 +2368,16 @@ Perl_is_utf8_string_flags(const U8 *s, S return TRUE; } -#define Perl_is_utf8_string_loc(s, len, ep) \ - Perl_is_utf8_string_loclen(s, len, ep, 0) +#define is_utf8_string_loc(s, len, ep) \ + is_utf8_string_loclen(s, len, ep, 0) PERL_STATIC_INLINE bool Perl_is_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el) { - const U8 * first_variant; - PERL_ARGS_ASSERT_IS_UTF8_STRING_LOCLEN; + const U8 * first_variant; + if (len == 0) { len = strlen((const char *) s); } @@ -2475,10 +2663,10 @@ Perl_isC9_STRICT_UTF8_CHAR(const U8 * co PERL_STATIC_INLINE bool Perl_is_strict_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el) { - const U8 * first_variant; - PERL_ARGS_ASSERT_IS_STRICT_UTF8_STRING_LOCLEN; + const U8 * first_variant; + if (len == 0) { len = strlen((const char *) s); } @@ -2525,10 +2713,10 @@ Perl_is_strict_utf8_string_loclen(const PERL_STATIC_INLINE bool Perl_is_c9strict_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el) { - const U8 * first_variant; - PERL_ARGS_ASSERT_IS_C9STRICT_UTF8_STRING_LOCLEN; + const U8 * first_variant; + if (len == 0) { len = strlen((const char *) s); } @@ -2580,9 +2768,10 @@ Perl_is_c9strict_utf8_string_loclen(cons PERL_STATIC_INLINE bool Perl_is_utf8_string_loclen_flags(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el, const U32 flags) { + PERL_ARGS_ASSERT_IS_UTF8_STRING_LOCLEN_FLAGS; + const U8 * first_variant; - PERL_ARGS_ASSERT_IS_UTF8_STRING_LOCLEN_FLAGS; assert(0 == (flags & ~UTF8_DISALLOW_ILLEGAL_INTERCHANGE)); if (flags == 0) { @@ -2759,8 +2948,8 @@ unchanged. =cut */ -# define Perl_utf8_hop_forward( s, off, end) \ - Perl_utf8_hop_forward_overshoot(s, off, end, NULL) +# define utf8_hop_forward( s, off, end) \ + utf8_hop_forward_overshoot(s, off, end, NULL) PERL_STATIC_INLINE U8 * Perl_utf8_hop_forward_overshoot(const U8 * s, SSize_t off, @@ -2771,7 +2960,7 @@ Perl_utf8_hop_forward_overshoot(const U8 if (off != 0) { if (UNLIKELY(s >= end && ! remaining)) { - Perl_croak_nocontext("panic: Start of forward hop (0x%p) is %zd" + Perl_croak_nocontext("panic: Start of forward hop (0x%p) is %td" " bytes beyond legal end position (0x%p)", s, 1 + s - end, end); } @@ -2845,15 +3034,14 @@ displaced. =cut */ -# define Perl_utf8_hop_back( s, off, start) \ - Perl_utf8_hop_back_overshoot(s, off, start, NULL) +# define utf8_hop_back( s, off, start) \ + utf8_hop_back_overshoot(s, off, start, NULL) PERL_STATIC_INLINE U8 * Perl_utf8_hop_back_overshoot(const U8 *s, SSize_t off, const U8 * const start, SSize_t *remaining) { PERL_ARGS_ASSERT_UTF8_HOP_BACK_OVERSHOOT; - assert(start <= s); assert(off <= 0); /* Note: if we know that the input is well-formed, we can do per-word @@ -2912,7 +3100,7 @@ the excess count is the absolute value o =cut */ -#define Perl_utf8_hop_safe(s, o, b, e) Perl_utf8_hop_overshoot(s, o, b, e, 0) +#define utf8_hop_safe(s, o, b, e) utf8_hop_overshoot(s, o, b, e, 0) PERL_STATIC_INLINE U8 * Perl_utf8_hop_overshoot(const U8 *s, SSize_t off, @@ -2921,8 +3109,6 @@ Perl_utf8_hop_overshoot(const U8 *s, SSi { PERL_ARGS_ASSERT_UTF8_HOP_OVERSHOOT; - assert(start <= s && s <= end); - if (off >= 0) { return utf8_hop_forward_overshoot(s, off, end, remaining); } @@ -3101,10 +3287,10 @@ Perl_is_utf8_fixed_width_buf_loclen_flag STRLEN *el, const U32 flags) { - const U8 * maybe_partial; - PERL_ARGS_ASSERT_IS_UTF8_FIXED_WIDTH_BUF_LOCLEN_FLAGS; + const U8 * maybe_partial; + if (! ep) { ep = &maybe_partial; } @@ -3177,7 +3363,7 @@ Perl_utf8_to_uv_msgs(const U8 * const s0 * * The terminology of the dfa refers to a 'class'. The variable 'type' * would have been named 'class' except that is a reserved word in C++ - * + * * The table can be a U16 on EBCDIC platforms, so 'state' is declared * as U16; 'type' is likely to never occupy more than 5 bits. */ PERL_UINT_FAST8_T type = PL_strict_utf8_dfa_tab[*s]; @@ -3194,6 +3380,7 @@ Perl_utf8_to_uv_msgs(const U8 * const s0 if (LIKELY(state == 0)) { if (advance_p) { *advance_p = s - s0 + 1; + ASSUME(*advance_p <= UTF8_MAXBYTES); } *cp_p = UNI_TO_NATIVE(uv); @@ -3202,7 +3389,10 @@ Perl_utf8_to_uv_msgs(const U8 * const s0 } /* Here is potentially problematic. Use the full mechanism */ - return utf8_to_uv_msgs_helper_(s0, e, cp_p, advance_p, flags, errors, msgs); + bool success = utf8_to_uv_msgs_helper_(s0, e, cp_p, advance_p, + flags, errors, msgs); + ASSUME(advance_p == NULL || inRANGE(*advance_p, 1, UTF8_MAXBYTES)); + return success; } PERL_STATIC_INLINE UV @@ -3212,6 +3402,7 @@ Perl_utf8_to_uv_or_die(const U8 *s, cons UV cp; (void) utf8_to_uv_flags(s, e, &cp, advance_p, UTF8_DIE_IF_MALFORMED); + ASSUME(advance_p == NULL || inRANGE(*advance_p, 1, UTF8_MAXBYTES)); return cp; } @@ -3275,19 +3466,17 @@ Perl_utf8_to_uvchr_buf(pTHX_ const U8 *s PERL_STATIC_INLINE U8 * Perl_uv_to_utf8(pTHX_ U8 *d, UV uv) { + PERL_ARGS_ASSERT_UV_TO_UTF8; + return uv_to_utf8_msgs(d, uv, 0, 0); } PERL_STATIC_INLINE U8 * Perl_uv_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags) { - return uv_to_utf8_msgs(d, uv, flags, 0); -} + PERL_ARGS_ASSERT_UV_TO_UTF8_FLAGS; -PERL_STATIC_INLINE U8 * -Perl_uv_to_utf8_msgs(pTHX_ U8 *d, UV uv, UV flags , HV **msgs) -{ - return uvoffuni_to_utf8_flags_msgs(d, NATIVE_TO_UNI(uv), flags, msgs); + return uv_to_utf8_msgs(d, uv, flags, 0); } /* ------------------------------- perl.h ----------------------------- */ @@ -3295,9 +3484,12 @@ Perl_uv_to_utf8_msgs(pTHX_ U8 *d, UV uv, /* =for apidoc_section $utility -=for apidoc is_safe_syscall +=for apidoc is_safe_syscall +=for apidoc_item m||IS_SAFE_SYSCALL + +These are synonymous. -Test that the given C (with length C) doesn't contain any internal +They test that the given C (with length C) doesn't contain any internal C characters. If it does, set C to C, optionally warn using the C category, and return FALSE. @@ -3306,20 +3498,20 @@ Return TRUE if the name is safe. C and C are used in any warning. -Used by the C macro. - =cut + +Allows one ending \0 */ PERL_STATIC_INLINE bool Perl_is_safe_syscall(pTHX_ const char *pv, STRLEN len, const char *what, const char *op_name) { + PERL_ARGS_ASSERT_IS_SAFE_SYSCALL; + /* While the Windows CE API provides only UCS-16 (or UTF-16) APIs * perl itself uses xce*() functions which accept 8-bit strings. */ - PERL_ARGS_ASSERT_IS_SAFE_SYSCALL; - if (len > 1) { char *null_at; if (UNLIKELY((null_at = (char *)memchr(pv, 0, len-1)) != NULL)) { @@ -3356,10 +3548,10 @@ then calling: PERL_STATIC_INLINE bool S_should_warn_nl(const char *pv) { - STRLEN len; - PERL_ARGS_ASSERT_SHOULD_WARN_NL; + STRLEN len; + len = strlen(pv); return len > 0 && pv[len-1] == '\n'; @@ -3372,13 +3564,13 @@ S_should_warn_nl(const char *pv) PERL_STATIC_INLINE bool S_lossless_NV_to_IV(const NV nv, IV *ivp) { + PERL_ARGS_ASSERT_LOSSLESS_NV_TO_IV; + /* This function determines if the input NV 'nv' may be converted without * loss of data to an IV. If not, it returns FALSE taking no other action. * But if it is possible, it does the conversion, returning TRUE, and * storing the converted result in '*ivp' */ - PERL_ARGS_ASSERT_LOSSLESS_NV_TO_IV; - # if defined(NAN_COMPARE_BROKEN) && defined(Perl_isnan) /* Normally any comparison with a NaN returns false; if we can't rely * on that behaviour, check explicitly */ @@ -3410,8 +3602,334 @@ S_lossless_NV_to_IV(const NV nv, IV *ivp return FALSE; } +/* + * S_iv_{add,sub,mul}_may_overflow(a, b, p) virtually compute "a b" + * (where is +, -, or *) in infinite precision, and, if the result + * is (or may be) not representable with IV, return true. + * Otherwise (no overflow), store the result to *p and return false. + * These functions allow false positives (so their names contain "may") + * to speed up simple common cases. + */ + +/* Define IV_*_OVERFLOW_IS_EXPENSIVE below to nonzero value + * if strict overflow checks are too expensive + * (for example, for CPUs that have no hardware overflow detection flags). + * If these macros have nonzero value, or overflow-checking compiler intrinsics + * are not available, good-old heuristics (with some false positives) + * will be used. */ +# ifndef IV_ADD_SUB_OVERFLOW_IS_EXPENSIVE +# define IV_ADD_SUB_OVERFLOW_IS_EXPENSIVE 0 +# endif +# ifndef IV_MUL_OVERFLOW_IS_EXPENSIVE +/* Strict overflow check for IV multiplication is generally expensive + * when IV is a multi-word integer. + * We assume that PTRSIZE matches the platform word size; LONGSIZE might not + * match for LLP64 platforms such as Win32 x86-64. */ +# define IV_MUL_OVERFLOW_IS_EXPENSIVE (IVSIZE > PTRSIZE) +# endif + +# ifdef I_STDCKDINT +# include +# endif + +# if defined(I_STDCKDINT) && !IV_ADD_SUB_OVERFLOW_IS_EXPENSIVE +# define S_iv_add_may_overflow(il, ir, result) ckd_add(result, il, ir) +# elif defined(HAS_BUILTIN_ADD_OVERFLOW) && !IV_ADD_SUB_OVERFLOW_IS_EXPENSIVE +# define S_iv_add_may_overflow __builtin_add_overflow +# else +PERL_STATIC_INLINE bool +S_iv_add_may_overflow (IV il, IV ir, IV *const result) +{ + /* topl and topr hold only 2 bits */ + PERL_UINT_FAST8_T const topl = ((UV)il) >> (UVSIZE * 8 - 2); + PERL_UINT_FAST8_T const topr = ((UV)ir) >> (UVSIZE * 8 - 2); + + /* if both are in a range that can't under/overflow, do a simple integer + * add: if the top of both numbers are 00 or 11, then it's safe */ + if (!( ((topl+1) | (topr+1)) & 2)) { + *result = il + ir; + return false; + } + return true; /* addition may overflow */ +} +# endif + +/* + * S_uv_{add,sub,mul}_overflow(a, b, p) are similar, but the results are UV + * and they should perform strict overflow check (no false positives). + */ + +# if defined(I_STDCKDINT) +# define S_uv_add_overflow(auv, buv, result) ckd_add(result, auv, buv) +# elif defined(HAS_BUILTIN_ADD_OVERFLOW) +# define S_uv_add_overflow __builtin_add_overflow +# else +PERL_STATIC_INLINE bool +S_uv_add_overflow (UV auv, UV buv, UV *const result) +{ + /* (auv + buv) < auv means that the addition wrapped around, + i.e. overflowed. Note that unsigned integer overflow is well-defined + in standard C to wrap around, in constrast to signed integer overflow + whose behaviour is undefined. */ + return (*result = auv + buv) < auv; +} +# endif + +# if defined(I_STDCKDINT) && !IV_ADD_SUB_OVERFLOW_IS_EXPENSIVE +# define S_iv_sub_may_overflow(il, ir, result) ckd_sub(result, il, ir) +# elif defined(HAS_BUILTIN_SUB_OVERFLOW) && !IV_ADD_SUB_OVERFLOW_IS_EXPENSIVE +# define S_iv_sub_may_overflow __builtin_sub_overflow +# else +PERL_STATIC_INLINE bool +S_iv_sub_may_overflow (IV il, IV ir, IV *const result) +{ + PERL_UINT_FAST8_T const topl = ((UV)il) >> (UVSIZE * 8 - 2); + PERL_UINT_FAST8_T const topr = ((UV)ir) >> (UVSIZE * 8 - 2); + + /* if both are in a range that can't under/overflow, do a simple integer + * subtract: if the top of both numbers are 00 or 11, then it's safe */ + if (!( ((topl+1) | (topr+1)) & 2)) { + *result = il - ir; + return false; + } + return true; /* subtraction may overflow */ +} +# endif + +# if defined(I_STDCKDINT) +# define S_uv_sub_overflow(auv, buv, result) ckd_sub(result, auv, buv) +# elif defined(HAS_BUILTIN_SUB_OVERFLOW) +# define S_uv_sub_overflow __builtin_sub_overflow +# else +PERL_STATIC_INLINE bool +S_uv_sub_overflow (UV auv, UV buv, UV *const result) +{ + return (*result = auv - buv) > auv; +} +# endif + +# if defined(I_STDCKDINT) && !IV_MUL_OVERFLOW_IS_EXPENSIVE +# define S_iv_mul_may_overflow(il, ir, result) ckd_mul(result, il, ir) +# elif defined(HAS_BUILTIN_MUL_OVERFLOW) && !IV_MUL_OVERFLOW_IS_EXPENSIVE +# define S_iv_mul_may_overflow __builtin_mul_overflow +# else +PERL_STATIC_INLINE bool +S_iv_mul_may_overflow (IV il, IV ir, IV *const result) +{ + UV const topl = ((UV)il) >> (UVSIZE * 4 - 1); + UV const topr = ((UV)ir) >> (UVSIZE * 4 - 1); + + /* if both are in a range that can't under/overflow, do a simple integer + * multiply: if the top halves(*) of both numbers are 00...00 or 11...11, + * then it's safe. + * (*) for 32-bits, the "top half" is the top 17 bits, + * for 64-bits, its 33 bits */ + if (!( + ((topl+1) | (topr+1)) + & ( (((UV)1) << (UVSIZE * 4 + 1)) - 2) /* 11..110 */ + )) { + *result = il * ir; + return false; + } + return true; /* multiplication may overflow */ +} +# endif + +# if defined(I_STDCKDINT) +# define S_uv_mul_overflow(auv, buv, result) ckd_mul(result, auv, buv) +# elif defined(HAS_BUILTIN_MUL_OVERFLOW) +# define S_uv_mul_overflow __builtin_mul_overflow +# else +PERL_STATIC_INLINE bool +S_uv_mul_overflow (UV auv, UV buv, UV *const result) +{ + const UV topmask = (~ (UV)0) << (4 * sizeof (UV)); + const UV botmask = ~topmask; + +# if UVSIZE > LONGSIZE && UVSIZE <= 2 * LONGSIZE + /* If UV is double-word integer, declare these variables as single-word + integers to help compiler to avoid double-word multiplication. */ + unsigned long alow, ahigh, blow, bhigh; +# else + UV alow, ahigh, blow, bhigh; +# endif + + /* If this does sign extension on unsigned it's time for plan B */ + ahigh = auv >> (4 * sizeof (UV)); + alow = auv & botmask; + bhigh = buv >> (4 * sizeof (UV)); + blow = buv & botmask; + + if (ahigh && bhigh) + /* eg 32 bit is at least 0x10000 * 0x10000 == 0x100000000 + which is overflow. */ + return true; + + UV product_middle = 0; + if (ahigh || bhigh) { + /* One operand is large, 1 small */ + /* Either ahigh or bhigh is zero here, so the addition below + can't overflow. */ + product_middle = (UV)ahigh * blow + (UV)alow * bhigh; + if (product_middle & topmask) + return true; + /* OK, product_middle won't lose bits when we shift it. */ + product_middle <<= 4 * sizeof (UV); + } + /* else: eg 32 bit is at most 0xFFFF * 0xFFFF == 0xFFFE0001 + so the unsigned multiply cannot overflow. */ + + /* (UV) cast below is necessary to force the multiplication to produce + UV result, as alow and blow might be narrower than UV */ + UV product_low = (UV)alow * blow; + return S_uv_add_overflow(product_middle, product_low, result); +} +# endif + +#endif + +/* Number scan flags. All are used for input, the ones used for output are so + * marked */ + +/* grok_??? accept a stand-alone underscore initially or between digits in + * numbers */ +#define PERL_SCAN_ALLOW_UNDERSCORES 0x01 + +#define PERL_SCAN_DISALLOW_PREFIX 0x02 /* grok_??? reject 0x in bin/hex */ + +/* grok_??? input: ignored; output: found overflow */ +#define PERL_SCAN_GREATER_THAN_UV_MAX 0x04 + +/* grok_??? don't warn about illegal digits. To preserve total backcompat, + * this isn't set on output if one is found. Instead, see + * PERL_SCAN_NOTIFY_ILLDIGIT. */ +#define PERL_SCAN_SILENT_ILLDIGIT 0x08 + +/* grok_number_flags() allow trailing and set IS_NUMBER_TRAILING */ +#define PERL_SCAN_TRAILING 0x10 + +/* These are considered experimental, so not exposed publicly */ +#if defined(PERL_CORE) || defined(PERL_EXT) +/* grok_??? don't warn about very large numbers which are <= UV_MAX; + * output: found such a number */ +# define PERL_SCAN_SILENT_NON_PORTABLE 0x20 + +/* If this is set on input, and no illegal digit is found, it will be cleared + * on output; otherwise unchanged */ +# define PERL_SCAN_NOTIFY_ILLDIGIT 0x40 + +/* Don't warn on overflow; output flag still set */ +# define PERL_SCAN_SILENT_OVERFLOW 0x80 + +/* grok_??? accept a stand-alone underscore between digits only in numbers */ +# define PERL_SCAN_ALLOW_MEDIAL_UNDERSCORES_ONLY 0x100 + +# define PERL_SCAN_DISCARD_INSTEAD_OF_OVERFLOW 0x200 #endif +/* +=for apidoc grok_bin +=for apidoc_item grok_hex +=for apidoc_item grok_oct +=for apidoc_flag PERL_SCAN_ALLOW_UNDERSCORES +=for apidoc_flag PERL_SCAN_DISALLOW_PREFIX +=for apidoc_flag PERL_SCAN_GREATER_THAN_UV_MAX +=for apidoc_flag PERL_SCAN_SILENT_ILLDIGIT + +These each convert a string representing a number to numeric form. The +number is binary in C, octal in C, and hexadecimal in +C. + +On entry C and C<*len_p> give the string to scan, C<*flags> gives +conversion flags, and C should be C or a pointer to an NV. +The scan stops at the end of the string, or at just before the first invalid +character. Unless C is set in C<*flags>, +encountering an invalid character (except NUL) will also trigger a warning. On +return C<*len_p> is set to the length of the scanned string, and C<*flags> +gives output flags. + +If the value is S= C>, it is returned as a UV, the output flags +are clear, and nothing is written to C<*approximation>. If the value is +S C>: + +=over + +=item * + +C is returned + +=item * + +C is set in C<*flags>. + +=item * + +If C is not null, an approximation of the correct value is +written into C<*approximation> (which is an NV). + +=back + +Unless C is set in C<*flags> on entry: + +=over + +=item For C + +the input string may optionally be prefixed with C<"0b"> or plain C<"b"> + +=item For C + +the input string may optionally be prefixed with C<"0x"> or plain C<"x"> + +=item For C + +this flag is ignored; there is no optional prefix. The typical C<0> prefix is +just part of the number. + +=back + +If C is set in C<*flags> then any or all pairs of +digits may be separated from each other by a single underscore, and also a +single leading underscore is accepted. + +=cut + +Not available externally yet because experimental is +Cmg_type != PERL_MAGIC_taint && !(mg->mg_flags & MGf_GSKIP) @@ -3477,6 +3995,8 @@ Perl_sv_only_taint_gmagic(SV *sv) PERL_STATIC_INLINE U8 Perl_gimme_V(pTHX) { + PERL_ARGS_ASSERT_GIMME_V; + I32 cxix; U8 gimme = (PL_op->op_flags & OPf_WANT); @@ -3495,10 +4015,10 @@ Perl_gimme_V(pTHX) PERL_STATIC_INLINE PERL_CONTEXT * Perl_cx_pushblock(pTHX_ U8 type, U8 gimme, SV** sp, I32 saveix) { - PERL_CONTEXT * cx; - PERL_ARGS_ASSERT_CX_PUSHBLOCK; + PERL_CONTEXT * cx; + CXINC; cx = CX_CUR(); cx->cx_type = type; @@ -3564,10 +4084,10 @@ Perl_cx_topblock(pTHX_ PERL_CONTEXT *cx) PERL_STATIC_INLINE void Perl_cx_pushsub(pTHX_ PERL_CONTEXT *cx, CV *cv, OP *retop, bool hasargs) { - U8 phlags = CX_PUSHSUB_GET_LVALUE_MASK(Perl_was_lvalue_sub); - PERL_ARGS_ASSERT_CX_PUSHSUB; + U8 phlags = CX_PUSHSUB_GET_LVALUE_MASK(Perl_was_lvalue_sub); + PERL_DTRACE_PROBE_ENTRY(cv); cx->blk_sub.old_cxsubix = PL_curstackinfo->si_cxsubix; PL_curstackinfo->si_cxsubix = (I32)(cx - PL_curstackinfo->si_cxstack); @@ -3586,9 +4106,10 @@ Perl_cx_pushsub(pTHX_ PERL_CONTEXT *cx, PERL_STATIC_INLINE void Perl_cx_popsub_common(pTHX_ PERL_CONTEXT *cx) { + PERL_ARGS_ASSERT_CX_POPSUB_COMMON; + CV *cv; - PERL_ARGS_ASSERT_CX_POPSUB_COMMON; assert(CxTYPE(cx) == CXt_SUB); PL_comppad = cx->blk_sub.prevcomppad; @@ -3606,9 +4127,10 @@ Perl_cx_popsub_common(pTHX_ PERL_CONTEXT PERL_STATIC_INLINE void Perl_cx_popsub_args(pTHX_ PERL_CONTEXT *cx) { + PERL_ARGS_ASSERT_CX_POPSUB_ARGS; + AV *av; - PERL_ARGS_ASSERT_CX_POPSUB_ARGS; assert(CxTYPE(cx) == CXt_SUB); assert(AvARRAY(MUTABLE_AV( PadlistARRAY(CvPADLIST(cx->blk_sub.cv))[ @@ -3665,10 +4187,11 @@ Perl_cx_pushformat(pTHX_ PERL_CONTEXT *c PERL_STATIC_INLINE void Perl_cx_popformat(pTHX_ PERL_CONTEXT *cx) { + PERL_ARGS_ASSERT_CX_POPFORMAT; + CV *cv; GV *dfout; - PERL_ARGS_ASSERT_CX_POPFORMAT; assert(CxTYPE(cx) == CXt_FORMAT); dfout = cx->blk_format.dfoutgv; @@ -3728,9 +4251,10 @@ Perl_cx_pushtry(pTHX_ PERL_CONTEXT *cx, PERL_STATIC_INLINE void Perl_cx_popeval(pTHX_ PERL_CONTEXT *cx) { + PERL_ARGS_ASSERT_CX_POPEVAL; + SV *sv; - PERL_ARGS_ASSERT_CX_POPEVAL; assert(CxTYPE(cx) == CXt_EVAL); PL_in_eval = CxOLD_IN_EVAL(cx); @@ -3818,6 +4342,64 @@ Perl_cx_poploop(pTHX_ PERL_CONTEXT *cx) cx->blk_loop.itersave = NULL; SvREFCNT_dec(cursv); } + if (CxPADLOOP(cx)) { + /* for my ... might be multivariable. my_op->op_next will point at + * the OP_ITER whose op_targ contains the count of how many more + * variables + */ + OP *iterop = cx->blk_loop.my_op->op_next; + assert(iterop->op_type == OP_ITER); + PADOFFSET how_many = iterop->op_targ; + if(iterop->op_private & OPpITER_REFALIAS) + how_many &= 0xFF; + /* op_targ actually stores count - 1, so it's the count of additional + * vars after itervar itself */ + for (SV **svp = cx->blk_loop.itervar_u.svp + 1; how_many; svp++, how_many--) { + /* we didn't store an itersave for these, but we know they are all + * scoped to the loop we have just left. It's therefore safe to store + * &PL_sv_undef there since they weren't live before or afterwards. + */ + SvREFCNT_dec(*svp); + *svp = &PL_sv_undef; + } + } + if (cx->cx_type & CXp_FOR_LVREF) { + SV *itervar = (SV *)(cx)->blk_loop.itervar_u.gv; + SV *origval = (cx)->blk_loop.itersave; + assert(SvTYPE(itervar) == SVt_PVMG); + MAGIC *mg = SvMAGIC(itervar); + assert(mg); + assert(mg->mg_type == PERL_MAGIC_lvref); + assert(mg->mg_obj); + // LV ref around a package lexical, mg_obj gives its GV + GV *gv = (GV *)mg->mg_obj; + SV *oldsv = NULL; + switch(mg->mg_private & OPpLVREF_TYPE) { + case OPpLVREF_SV: + oldsv = GvSVn(gv); + GvSVn(gv) = origval; + break; + + case OPpLVREF_AV: + oldsv = (SV *)GvAV(gv); + GvAV(gv) = (AV *)origval; + break; + + case OPpLVREF_HV: + oldsv = (SV *)GvHV(gv); + GvHV(gv) = (HV *)origval; + break; + + case OPpLVREF_CV: + oldsv = (SV *)GvCV(gv); + GvCV_set(gv, (CV *)origval); + break; + + default: + NOT_REACHED; + } + SvREFCNT_dec(oldsv); + } if (cx->cx_type & (CXp_FOR_GV|CXp_FOR_LVREF)) SvREFCNT_dec(cx->blk_loop.itervar_u.svp); } @@ -3836,10 +4418,10 @@ PERL_STATIC_INLINE void Perl_cx_popwhen(pTHX_ PERL_CONTEXT *cx) { PERL_ARGS_ASSERT_CX_POPWHEN; + PERL_UNUSED_CONTEXT; + PERL_UNUSED_ARG(cx); assert(CxTYPE(cx) == CXt_WHEN); - PERL_UNUSED_ARG(cx); - PERL_UNUSED_CONTEXT; /* currently NOOP */ } @@ -3857,9 +4439,10 @@ Perl_cx_pushgiven(pTHX_ PERL_CONTEXT *cx PERL_STATIC_INLINE void Perl_cx_popgiven(pTHX_ PERL_CONTEXT *cx) { + PERL_ARGS_ASSERT_CX_POPGIVEN; + SV *sv; - PERL_ARGS_ASSERT_CX_POPGIVEN; assert(CxTYPE(cx) == CXt_GIVEN); sv = GvSV(PL_defgv); @@ -3878,7 +4461,6 @@ Perl_clear_defarray_simple(pTHX_ AV *av) { PERL_ARGS_ASSERT_CLEAR_DEFARRAY_SIMPLE; - assert(SvTYPE(av) == SVt_PVAV); assert(!SvREADONLY(av)); assert(!SvMAGICAL(av)); assert(SvREFCNT(av) == 1); @@ -3938,8 +4520,8 @@ Perl_push_stackinfo(pTHX_ I32 type, UV f DEBUG_l({ int i = 0; PERL_SI *p = PL_curstackinfo; while (p) { i++; p = p->si_prev; } - Perl_deb(aTHX_ "push STACKINFO %d in %s at %s:%d\n", - i, SAFE_FUNCTION__, __FILE__, __LINE__); + deb("push STACKINFO %d in %s at %s:%d\n", + i, SAFE_FUNCTION__, __FILE__, __LINE__); }) if (!next) { @@ -3978,8 +4560,8 @@ Perl_pop_stackinfo(pTHX) DEBUG_l({ int i = -1; PERL_SI *p = PL_curstackinfo; while (p) { i++; p = p->si_prev; } - Perl_deb(aTHX_ "pop STACKINFO %d in %s at %s:%d\n", - i, SAFE_FUNCTION__, __FILE__, __LINE__);}) + deb("pop STACKINFO %d in %s at %s:%d\n", + i, SAFE_FUNCTION__, __FILE__, __LINE__);}) if (!prev) { Perl_croak_popstack(); } @@ -4047,13 +4629,12 @@ instead. PERL_STATIC_INLINE I32 Perl_foldEQ(pTHX_ const char *s1, const char *s2, I32 len) { + PERL_ARGS_ASSERT_FOLDEQ; PERL_UNUSED_CONTEXT; const U8 *a = (const U8 *)s1; const U8 *b = (const U8 *)s2; - PERL_ARGS_ASSERT_FOLDEQ; - assert(len >= 0); while (len--) { @@ -4067,6 +4648,8 @@ Perl_foldEQ(pTHX_ const char *s1, const PERL_STATIC_INLINE I32 Perl_foldEQ_latin1(pTHX_ const char *s1, const char *s2, I32 len) { + PERL_ARGS_ASSERT_FOLDEQ_LATIN1; + /* Compare non-UTF-8 using Unicode (Latin1) semantics. Works on all folds * representable without UTF-8, except for LATIN_SMALL_LETTER_SHARP_S, and * does not check for this. Nor does it check that the strings each have @@ -4077,8 +4660,6 @@ Perl_foldEQ_latin1(pTHX_ const char *s1, const U8 *a = (const U8 *)s1; const U8 *b = (const U8 *)s2; - PERL_ARGS_ASSERT_FOLDEQ_LATIN1; - assert(len >= 0); while (len--) { @@ -4093,11 +4674,11 @@ Perl_foldEQ_latin1(pTHX_ const char *s1, PERL_STATIC_INLINE I32 Perl_foldEQ_locale(pTHX_ const char *s1, const char *s2, I32 len) { + PERL_ARGS_ASSERT_FOLDEQ_LOCALE; + const U8 *a = (const U8 *)s1; const U8 *b = (const U8 *)s2; - PERL_ARGS_ASSERT_FOLDEQ_LOCALE; - assert(len >= 0); while (len--) { @@ -4150,12 +4731,12 @@ Perl_my_strnlen(const char *str, Size_t PERL_STATIC_INLINE void * S_my_memrchr(const char * s, const char c, const STRLEN len) { + PERL_ARGS_ASSERT_MY_MEMRCHR; + /* memrchr(), since many platforms lack it */ const char * t = s + len - 1; - PERL_ARGS_ASSERT_MY_MEMRCHR; - while (t >= s) { if (*t == c) { return (void *) t; @@ -4171,6 +4752,8 @@ S_my_memrchr(const char * s, const char PERL_STATIC_INLINE char * Perl_mortal_getenv(const char * str) { + PERL_ARGS_ASSERT_MORTAL_GETENV; + /* This implements a (mostly) thread-safe, sequential-call-safe getenv(). * * It's (mostly) thread-safe because it uses a mutex to prevent other @@ -4208,8 +4791,6 @@ Perl_mortal_getenv(const char * str) char * ret; dTHX; - PERL_ARGS_ASSERT_MORTAL_GETENV; - /* Can't mortalize without stacks. khw believes that no other threads * should be running, so no need to lock things, and this may be during a * phase when locking isn't even available */ @@ -4379,8 +4960,8 @@ Perl_sv_isbool(pTHX_ const SV *sv) #ifdef USE_ITHREADS PERL_STATIC_INLINE AV * -Perl_cop_file_avn(pTHX_ const COP *cop) { - +Perl_cop_file_avn(pTHX_ const COP *cop) +{ PERL_ARGS_ASSERT_COP_FILE_AVN; const char *file = CopFILE(cop); @@ -4408,7 +4989,8 @@ Perl_padname_refcnt_inc(PADNAME *pn) PERL_STATIC_INLINE PADNAMELIST * Perl_padnamelist_refcnt_inc(PADNAMELIST *pnl) { - PadnamelistREFCNT(pnl)++; + if (pnl) + PadnamelistREFCNT(pnl)++; return pnl; } @@ -4425,40 +5007,64 @@ Perl_padnamelist_refcnt_inc(PADNAMELIST =for apidoc_item savesharedpvs =for apidoc_item savesharedsvpv -Perl's version of C (or C would be if it existed). - These each return a pointer to a newly allocated string which is a duplicate of -the input string. +the one given by the input argument. Effectively, they implement the C library +L>. + +The forms differ in three main ways: + +=over + +=item 1. + +Whether or not the newly allocated memory is in an area that is sharable +between threads (the forms with C in their names) or if it is in an +area exclusive to the calling thread (the other forms). + +=item 2. + +How the string to be copied is specified. + +In the C and C forms, the source string is a C language +NUL-terminated string, or C. If C, no allocation is done, and +the functions return NULL. + +In the C and C forms, C (if not NULL) points to the +first byte of the string to duplicate, and an additional parameter, C, +specifies the number of bytes to copy. Hence, C may contain embedded-NUL +characters. It is illegal for C to be NULL when calling C +(asserted against in DEBUGGING builds). If it is NULL in C, C +bytes of zeroed memory are allocated. + +In the C and C forms, the string must be a C literal +string, enclosed in double quotes. -The forms differ in how the string to be copied is specified, and where the new -memory is allocated from. +In the C and C forms, the string to duplicate is +extracted from C using L>. C must not be NULL. + +=item 3. + +Memory deallocation To prevent memory leaks, the memory allocated for the new string needs to be -freed when no longer needed. This can be done with the C> -function, or L|perlguts/SAVEFREEPV(p)>. +freed when no longer needed. + +=over + +=item C forms + +Use the C> function, or L|perlguts/SAVEFREEPV(p)>. +However, BE AWARE, this can happen automatically on some platforms, such as +Windows, when the thread that allocated it ends. So if you need that not to +happen, you need to use a C form. + +=item C forms -The forms whose names contain C differ from the corresponding form -without that in its name, only in that the memory in the former comes from -memory shared between threads. This is needed, because on some platforms, -Windows for example, all allocated memory owned by a thread is deallocated when -that thread ends. So if you need that not to happen, you need to use the -shared memory forms. - -The string to copy in C is a C language string literal surrounded by -double quotes. - -The string to copy in the forms whose name contains C comes from the PV -in the SV argument C, using C - -The string to copy in the remaining forms comes from the C argument. - -In the case of C, the size of the string is determined by C, -which means it may not contain embedded C characters, and must have a -trailing C. - -In the case of C, C gives the length of C, hence it may -contain embedded C characters. The copy will be guaranteed to have a -trailing NUL added if not already present. +Use the C function. + +=back + +=back =cut */ @@ -4466,7 +5072,9 @@ trailing NUL added if not already presen PERL_STATIC_INLINE char * Perl_savepv(pTHX_ const char *pv) { + PERL_ARGS_ASSERT_SAVEPV; PERL_UNUSED_CONTEXT; + if (!pv) return NULL; else { @@ -4482,6 +5090,8 @@ Perl_savepv(pTHX_ const char *pv) PERL_STATIC_INLINE char * Perl_savepvn(pTHX_ const char *pv, Size_t len) { + PERL_ARGS_ASSERT_SAVEPVN; + char *newaddr; PERL_UNUSED_CONTEXT; @@ -4500,12 +5110,12 @@ Perl_savepvn(pTHX_ const char *pv, Size_ PERL_STATIC_INLINE char * Perl_savesvpv(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SAVESVPV; + STRLEN len; const char * const pv = SvPV_const(sv, len); char *newaddr; - PERL_ARGS_ASSERT_SAVESVPV; - ++len; Newx(newaddr,len,char); return (char *) CopyD(pv,newaddr,len,char); @@ -4514,11 +5124,11 @@ Perl_savesvpv(pTHX_ SV *sv) PERL_STATIC_INLINE char * Perl_savesharedsvpv(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SAVESHAREDSVPV; + STRLEN len; const char * const pv = SvPV_const(sv, len); - PERL_ARGS_ASSERT_SAVESHAREDSVPV; - return savesharedpvn(pv, len); } @@ -4536,6 +5146,8 @@ Implements L PERL_STATIC_INLINE void * Perl_get_context(void) { + PERL_ARGS_ASSERT_GET_CONTEXT; + # if defined(USE_ITHREADS) # ifdef OLD_PTHREADS_API pthread_addr_t t; @@ -4558,6 +5170,7 @@ Perl_get_context(void) PERL_STATIC_INLINE MGVTBL* Perl_get_vtbl(pTHX_ int vtbl_id) { + PERL_ARGS_ASSERT_GET_VTBL; PERL_UNUSED_CONTEXT; return (vtbl_id < 0 || vtbl_id >= magic_vtable_max) @@ -4593,6 +5206,8 @@ Description stolen from http://man.openb PERL_STATIC_INLINE Size_t Perl_my_strlcat(char *dst, const char *src, Size_t size) { + PERL_ARGS_ASSERT_MY_STRLCAT; + Size_t used, length, copy; used = strlen(dst); @@ -4627,6 +5242,8 @@ Description stolen from http://man.openb PERL_STATIC_INLINE Size_t Perl_my_strlcpy(char *dst, const char *src, Size_t size) { + PERL_ARGS_ASSERT_MY_STRLCPY; + Size_t length, copy; length = strlen(src); Index: gnu/usr.bin/perl/installhtml =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/installhtml,v diff -u -p -a -u -p -r1.16 installhtml --- gnu/usr.bin/perl/installhtml 15 Feb 2023 01:36:13 -0000 1.16 +++ gnu/usr.bin/perl/installhtml 16 Nov 2026 00:57:38 -0000 @@ -1,9 +1,10 @@ -#!./perl -Ilib -w +#!./perl -Ilib # This file should really be extracted from a .PL file $| = 1; use strict; +use warnings; use Config; # for config options in the makefile use File::Path qw(remove_tree); use File::Spec::Functions qw(rel2abs no_upwards); Index: gnu/usr.bin/perl/installperl =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/installperl,v diff -u -p -a -u -p -r1.60 installperl --- gnu/usr.bin/perl/installperl 26 Dec 2025 22:15:22 -0000 1.60 +++ gnu/usr.bin/perl/installperl 16 Nov 2026 00:57:38 -0000 @@ -287,7 +287,6 @@ if ($Is_VMS) { else { my $ver = ''; # don't install a versioned perl binary install("perl$exe_ext", "$installbin/$perl_verbase$ver$exe_ext", "0755"); - `chtag -r "$installbin/$perl_verbase$ver$exe_ext"` if ($^O eq 'os390'); } # Install library files. @@ -360,7 +359,6 @@ foreach my $file (@corefiles) { } else { chmod($NON_SO_MODE, "$installarchlib/CORE/$file"); } - `chtag -r "$installarchlib/CORE/$file"` if ($^O eq 'os390'); } } @@ -430,7 +428,6 @@ if ($Config{installusrbinperl} && $Confi eval { CORE::link $instperl, $usrbinperl } ) || eval { symlink $expinstperl, $usrbinperl } || copy($instperl, $usrbinperl); - `chtag -r "$usrbinperl"` if ($^O eq 'os390'); $mainperl_is_instperl = 1; } @@ -753,7 +750,6 @@ sub copy_if_diff { my ($atime, $mtime) = (stat $from)[8,9]; utime $atime, $mtime, $to; } - `chtag -r "$to"` if ($^O eq "os390"); 1; } } Index: gnu/usr.bin/perl/intrpvar.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/intrpvar.h,v diff -u -p -a -u -p -r1.10 intrpvar.h --- gnu/usr.bin/perl/intrpvar.h 26 Dec 2025 22:14:12 -0000 1.10 +++ gnu/usr.bin/perl/intrpvar.h 16 Nov 2026 00:57:38 -0000 @@ -94,7 +94,7 @@ PERLVAR(I, delaymagic, U16) /* ($<,$>) /* =for apidoc_section $warning -=for apidoc mn|U8|PL_dowarn +=for apidoc Amn|U8|PL_dowarn The C variable that roughly corresponds to Perl's C<$^W> warning variable. However, C<$^W> is treated as a boolean, whereas C is a @@ -349,6 +349,10 @@ PERLVARI(I, dumpindent, U16, 4) /* numbe /* =for apidoc_section $embedding =for apidoc Amn|U8|PL_exit_flags +=for apidoc_flag PERL_EXIT_EXPECTED +=for apidoc_flag PERL_EXIT_ABORT +=for apidoc_flag PERL_EXIT_DESTRUCT_END +=for apidoc_flag PERL_EXIT_WARN Contains flags controlling perl's behaviour on exit(): @@ -375,11 +379,6 @@ Set by the L operator. =back -=for apidoc Amnh||PERL_EXIT_EXPECTED -=for apidoc Amnh||PERL_EXIT_ABORT -=for apidoc Amnh||PERL_EXIT_DESTRUCT_END -=for apidoc Amnh||PERL_EXIT_WARN - On threaded perls, each thread has an independent copy of this variable; each initialized at creation time with the current value of the creating thread's copy. @@ -552,11 +551,11 @@ PERLVAR(I, DBline, GV *) /* *DB::line /* =for apidoc_section $debugging -=for apidoc mn|GV *|PL_DBsub +=for apidoc Amn|GV *|PL_DBsub When Perl is run in debugging mode, with the B<-d> switch, this GV contains the SV which holds the name of the sub being debugged. This is the C variable which corresponds to Perl's $DB::sub variable. See -C>. +L>. On threaded perls, each thread has an independent copy of this variable; each initialized at creation time with the current value of the creating @@ -567,7 +566,7 @@ When Perl is run in debugging mode, with boolean which indicates whether subs are being single-stepped. Single-stepping is automatically turned on after every step. This is the C variable which corresponds to Perl's $DB::single variable. See -C>. +L>. On threaded perls, each thread has an independent copy of this variable; each initialized at creation time with the current value of the creating @@ -936,13 +935,7 @@ PERLVARI(I, lockhook, share_proc_t, Perl GCC_DIAG_IGNORE(-Wdeprecated-declarations) MSVC_DIAG_IGNORE(4996) -#ifdef NO_MATHOMS -# define PERL_UNLOCK_HOOK Perl_sv_nosharing -#else -/* This reference ensures that the mathoms are linked with perl */ -# define PERL_UNLOCK_HOOK Perl_sv_nounlocking -#endif -PERLVARI(I, unlockhook, share_proc_t, PERL_UNLOCK_HOOK) +PERLVARI(I, unlockhook, share_proc_t, Perl_sv_nosharing) MSVC_DIAG_RESTORE GCC_DIAG_RESTORE @@ -1100,6 +1093,18 @@ PERLVAR(I, prevailing_version, U16) PERLVARI(I, in_diehook, bool, FALSE) PERLVARI(I, in_warnhook, bool, FALSE) + +/* Perl_load_mathoms is defined in mathoms.c, so this forces the loading of the + * functions in that file when NO_MATHOMS isn't defined. Otherwise, it is just + * a pointer to a function that is always going to exist. The use of + * Perl_noshutdownhook is solely because there is a typedef for its signature + * and has no arguments that need to be passed */ +#ifdef NO_MATHOMS +# define PERL_LOAD_MATHOMS_HOOK Perl_noshutdownhook +#else +# define PERL_LOAD_MATHOMS_HOOK Perl_load_mathoms +#endif +PERLVARI(I, load_mathoms, shutdown_proc_t, PERL_LOAD_MATHOMS_HOOK) /* If you are adding a U8 or U16, check to see if there are 'Space' comments * above on where there are gaps which currently will be structure padding. */ Index: gnu/usr.bin/perl/invlist_inline.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/invlist_inline.h,v diff -u -p -a -u -p -r1.6 invlist_inline.h --- gnu/usr.bin/perl/invlist_inline.h 14 May 2024 19:38:53 -0000 1.6 +++ gnu/usr.bin/perl/invlist_inline.h 16 Nov 2026 00:57:38 -0000 @@ -29,15 +29,18 @@ PERL_STATIC_INLINE bool S_is_invlist(const SV* const invlist) { + PERL_ARGS_ASSERT_IS_INVLIST; + return invlist != NULL && SvTYPE(invlist) == SVt_INVLIST; } PERL_STATIC_INLINE bool* S_get_invlist_offset_addr(SV* invlist) { + PERL_ARGS_ASSERT_GET_INVLIST_OFFSET_ADDR; + /* Return the address of the field that says whether the inversion list is * offset (it contains 1) or not (contains 0) */ - PERL_ARGS_ASSERT_GET_INVLIST_OFFSET_ADDR; assert(is_invlist(invlist)); @@ -45,13 +48,13 @@ S_get_invlist_offset_addr(SV* invlist) } PERL_STATIC_INLINE UV -S__invlist_len(SV* const invlist) +S_invlist_len_(SV* const invlist) { + PERL_ARGS_ASSERT_INVLIST_LEN_; + /* Returns the current number of elements stored in the inversion list's * array */ - PERL_ARGS_ASSERT__INVLIST_LEN; - assert(is_invlist(invlist)); return (SvCUR(invlist) == 0) @@ -60,13 +63,13 @@ S__invlist_len(SV* const invlist) } PERL_STATIC_INLINE bool -S__invlist_contains_cp(SV* const invlist, const UV cp) +S_invlist_contains_cp_(SV* const invlist, const UV cp) { - /* Does contain code point as part of the set? */ + PERL_ARGS_ASSERT_INVLIST_CONTAINS_CP_; - IV index = _invlist_search(invlist, cp); + /* Does contain code point as part of the set? */ - PERL_ARGS_ASSERT__INVLIST_CONTAINS_CP; + IV index = invlist_search_(invlist, cp); return index >= 0 && ELEMENT_RANGE_MATCHES_INVLIST(index); } @@ -74,15 +77,15 @@ S__invlist_contains_cp(SV* const invlist PERL_STATIC_INLINE UV* S_invlist_array(SV* const invlist) { + PERL_ARGS_ASSERT_INVLIST_ARRAY; + /* Returns the pointer to the inversion list's array. Every time the * length changes, this needs to be called in case malloc or realloc moved * it */ - PERL_ARGS_ASSERT_INVLIST_ARRAY; - /* Must not be empty. If these fail, you probably didn't check for * being non-zero before trying to get the array */ - assert(_invlist_len(invlist)); + assert(invlist_len_(invlist)); /* The very first element always contains zero, The array begins either * there, or if the inversion list is offset, at the element after it. @@ -98,10 +101,10 @@ S_invlist_array(SV* const invlist) PERL_STATIC_INLINE void S_invlist_extend(pTHX_ SV* const invlist, const UV new_max) { - /* Grow the maximum size of an inversion list */ - PERL_ARGS_ASSERT_INVLIST_EXTEND; + /* Grow the maximum size of an inversion list */ + assert(SvTYPE(invlist) == SVt_INVLIST); /* Add one to account for the zero element at the beginning which may not @@ -112,10 +115,11 @@ S_invlist_extend(pTHX_ SV* const invlist PERL_STATIC_INLINE void S_invlist_set_len(pTHX_ SV* const invlist, const UV len, const bool offset) { + PERL_ARGS_ASSERT_INVLIST_SET_LEN; + /* Sets the current number of elements stored in the inversion list. * Updates SvCUR correspondingly */ PERL_UNUSED_CONTEXT; - PERL_ARGS_ASSERT_INVLIST_SET_LEN; assert(SvTYPE(invlist) == SVt_INVLIST); @@ -127,23 +131,26 @@ S_invlist_set_len(pTHX_ SV* const invlis } PERL_STATIC_INLINE SV* -S_add_cp_to_invlist(pTHX_ SV* invlist, const UV cp) { - return _add_range_to_invlist(invlist, cp, cp); +S_add_cp_to_invlist(pTHX_ SV* invlist, const UV cp) +{ + PERL_ARGS_ASSERT_ADD_CP_TO_INVLIST; + + return add_range_to_invlist_(invlist, cp, cp); } PERL_STATIC_INLINE UV S_invlist_highest(SV* const invlist) { + PERL_ARGS_ASSERT_INVLIST_HIGHEST; + /* Returns the highest code point that matches an inversion list. This API * has an ambiguity, as it returns 0 under either the highest is actually * 0, or if the list is empty. If this distinction matters to you, check * for emptiness before calling this function */ - UV len = _invlist_len(invlist); + UV len = invlist_len_(invlist); UV *array; - PERL_ARGS_ASSERT_INVLIST_HIGHEST; - if (len == 0) { return 0; } @@ -166,16 +173,23 @@ S_invlist_highest(SV* const invlist) PERL_STATIC_INLINE UV S_invlist_highest_range_start(SV* const invlist) { - /* Returns the lowest code point of the highest range in the inversion - * list parameter. This API has an ambiguity: it returns 0 either when - * the lowest such point is actually 0 or when the list is empty. If this - * distinction matters to you, check for emptiness before calling this - * function. */ + PERL_ARGS_ASSERT_INVLIST_HIGHEST_RANGE_START; - UV len = _invlist_len(invlist); - UV *array; +/* +=for apidoc invlist_highest_range_start - PERL_ARGS_ASSERT_INVLIST_HIGHEST_RANGE_START; +Returns the lowest code point of the highest range in the inversion list +given by its parameter. + +This API has an ambiguity: it returns 0 either when the lowest such +point is actually 0 or when the list is empty. If this distinction matters to +you, check for emptiness before calling this function. + +=cut +*/ + + UV len = invlist_len_(invlist); + UV *array; if (len == 0) { return 0; @@ -187,7 +201,7 @@ S_invlist_highest_range_start(SV* const * range that goes to infinity. That range may be for code points that are * matched in the inversion list, or it may be for ones that aren't * matched. In the first case, the lowest code point in the matching range - * is that the one that started the range. If the other case, the final + * is the one that started the range. In the other case, the final * matching range begins at the next element down (which may be 0 in the * edge case). */ return (ELEMENT_RANGE_MATCHES_INVLIST(len - 1)) @@ -204,11 +218,11 @@ S_invlist_highest_range_start(SV* const PERL_STATIC_INLINE STRLEN* S_get_invlist_iter_addr(SV* invlist) { + PERL_ARGS_ASSERT_GET_INVLIST_ITER_ADDR; + /* Return the address of the UV that contains the current iteration * position */ - PERL_ARGS_ASSERT_GET_INVLIST_ITER_ADDR; - assert(is_invlist(invlist)); return &(((XINVLIST*) SvANY(invlist))->iterator); @@ -225,6 +239,8 @@ S_invlist_iterinit(SV* invlist) /* Initi PERL_STATIC_INLINE void S_invlist_iterfinish(SV* invlist) { + PERL_ARGS_ASSERT_INVLIST_ITERFINISH; + /* Terminate iterator for invlist. This is to catch development errors. * Any iteration that is interrupted before completed should call this * function. Functions that add code points anywhere else but to the end @@ -233,14 +249,14 @@ S_invlist_iterfinish(SV* invlist) * problematical: if the iteration hadn't reached the place where things * were being added, it would be ok */ - PERL_ARGS_ASSERT_INVLIST_ITERFINISH; - *get_invlist_iter_addr(invlist) = (STRLEN) UV_MAX; } -STATIC bool +static bool S_invlist_iternext(SV* invlist, UV* start, UV* end) { + PERL_ARGS_ASSERT_INVLIST_ITERNEXT; + /* An C call on must be used to set this up. * This call sets in <*start> and <*end>, the next range in . * Returns if successful and the next call will return the next @@ -249,11 +265,9 @@ S_invlist_iternext(SV* invlist, UV* star * will start over at the beginning of the list */ STRLEN* pos = get_invlist_iter_addr(invlist); - UV len = _invlist_len(invlist); + UV len = invlist_len_(invlist); UV *array; - PERL_ARGS_ASSERT_INVLIST_ITERNEXT; - if (*pos >= len) { *pos = (STRLEN) UV_MAX; /* Force iterinit() to be required next time */ return FALSE; @@ -299,6 +313,8 @@ PERL_STATIC_INLINE SV * S_invlist_contents(pTHX_ SV* const invlist, const bool traditional_style) { + PERL_ARGS_ASSERT_INVLIST_CONTENTS; + /* Get the contents of an inversion list into a string SV so that they can * be printed out. If 'traditional_style' is TRUE, it uses the format * traditionally done for debug tracing; otherwise it uses a format @@ -317,8 +333,6 @@ S_invlist_contents(pTHX_ SV* const invli output = newSVpvs(""); } - PERL_ARGS_ASSERT_INVLIST_CONTENTS; - assert(! invlist_is_iterating(invlist)); invlist_iterinit(invlist); @@ -351,15 +365,22 @@ PERL_STATIC_INLINE UV S_invlist_lowest(SV* const invlist) { - /* Returns the lowest code point that matches an inversion list. This API - * has an ambiguity, as it returns 0 under either the lowest is actually - * 0, or if the list is empty. If this distinction matters to you, check - * for emptiness before calling this function */ + PERL_ARGS_ASSERT_INVLIST_LOWEST; - UV len = _invlist_len(invlist); - UV *array; +/* +=for apidoc invlist_lowest - PERL_ARGS_ASSERT_INVLIST_LOWEST; +Returns the lowest code point that matches an inversion list. + +This API has an ambiguity, as it returns 0 under either the lowest is actually +0, or if the list is empty. If this distinction matters to you, check for +emptiness before calling this function + +=cut +*/ + + UV len = invlist_len_(invlist); + UV *array; if (len == 0) { return 0; Index: gnu/usr.bin/perl/iperlsys.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/iperlsys.h,v diff -u -p -a -u -p -r1.7 iperlsys.h --- gnu/usr.bin/perl/iperlsys.h 26 Dec 2025 22:14:12 -0000 1.7 +++ gnu/usr.bin/perl/iperlsys.h 16 Nov 2026 00:57:38 -0000 @@ -9,8 +9,8 @@ * GSAR 21-JUN-98 */ -#ifndef __Inc__IPerl___ -#define __Inc__IPerl___ +#ifndef IPERLSYS_H +#define IPERLSYS_H /* * PerlXXX_YYY explained - DickH and DougL @ ActiveState.com @@ -770,21 +770,8 @@ struct IPerlLIOInfo # define PerlLIO_lstat(name, buf) PerlLIO_stat((name), (buf)) # endif # define PerlLIO_mktemp(file) mktemp((file)) -# if defined(OEMVS) -# if (__CHARSET_LIB == 1) - int asciiopen(const char* path, int oflag); - int asciiopen3(const char* path, int oflag, int perm); - -# define PerlLIO_open(file, flag) asciiopen((file), (flag)) -# define PerlLIO_open3(file, flag, perm) asciiopen3((file), (flag), (perm)) -# else -# define PerlLIO_open(file, flag) open((file), (flag)) -# define PerlLIO_open3(file, flag, perm) open((file), (flag), (perm)) -# endif -# else -# define PerlLIO_open(file, flag) open((file), (flag)) -# define PerlLIO_open3(file, flag, perm) open((file), (flag), (perm)) -# endif +# define PerlLIO_open(file, flag) open((file), (flag)) +# define PerlLIO_open3(file, flag, perm) open((file), (flag), (perm)) # define PerlLIO_read(fd, buf, count) read((fd), (buf), (count)) # define PerlLIO_rename(old, new) rename((old), (new)) # define PerlLIO_setmode(fd, mode) setmode((fd), (mode)) Index: gnu/usr.bin/perl/keywords.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/keywords.c,v diff -u -p -a -u -p -r1.8 keywords.c --- gnu/usr.bin/perl/keywords.c 26 Dec 2025 22:14:12 -0000 1.8 +++ gnu/usr.bin/perl/keywords.c 16 Nov 2026 00:57:38 -0000 @@ -3590,5 +3590,5 @@ unknown: } /* Generated from: - * cc0991530edda2eb87e845d9347acc0f8d2debabab27608ef65ebd2b8d221c08 regen/keywords.pl + * bdfd5529dba8257e060f7e4ed712f683cd6a533285abf8ce7ee78c4d0677ff38 regen/keywords.pl * ex: set ro ft=c: */ Index: gnu/usr.bin/perl/keywords.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/keywords.h,v diff -u -p -a -u -p -r1.17 keywords.h --- gnu/usr.bin/perl/keywords.h 26 Dec 2025 22:14:12 -0000 1.17 +++ gnu/usr.bin/perl/keywords.h 16 Nov 2026 00:57:38 -0000 @@ -14,21 +14,21 @@ */ #define KEY_NULL 0 -#define KEY___FILE__ 1 -#define KEY___LINE__ 2 -#define KEY___PACKAGE__ 3 -#define KEY___CLASS__ 4 -#define KEY___DATA__ 5 -#define KEY___END__ 6 +#define KEY___CLASS__ 1 +#define KEY___DATA__ 2 +#define KEY___END__ 3 +#define KEY___FILE__ 4 +#define KEY___LINE__ 5 +#define KEY___PACKAGE__ 6 #define KEY___SUB__ 7 #define KEY_ADJUST 8 #define KEY_AUTOLOAD 9 #define KEY_BEGIN 10 -#define KEY_UNITCHECK 11 +#define KEY_CHECK 11 #define KEY_DESTROY 12 #define KEY_END 13 #define KEY_INIT 14 -#define KEY_CHECK 15 +#define KEY_UNITCHECK 15 #define KEY_abs 16 #define KEY_accept 17 #define KEY_alarm 18 @@ -254,8 +254,8 @@ #define KEY_time 238 #define KEY_times 239 #define KEY_tr 240 -#define KEY_try 241 -#define KEY_truncate 242 +#define KEY_truncate 241 +#define KEY_try 242 #define KEY_uc 243 #define KEY_ucfirst 244 #define KEY_umask 245 @@ -282,5 +282,5 @@ #define KEY_y 266 /* Generated from: - * cc0991530edda2eb87e845d9347acc0f8d2debabab27608ef65ebd2b8d221c08 regen/keywords.pl + * bdfd5529dba8257e060f7e4ed712f683cd6a533285abf8ce7ee78c4d0677ff38 regen/keywords.pl * ex: set ro ft=c: */ Index: gnu/usr.bin/perl/l1_char_class_tab.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/l1_char_class_tab.h,v diff -u -p -a -u -p -r1.7 l1_char_class_tab.h --- gnu/usr.bin/perl/l1_char_class_tab.h 14 May 2024 19:38:53 -0000 1.7 +++ gnu/usr.bin/perl/l1_char_class_tab.h 16 Nov 2026 00:57:38 -0000 @@ -9,29 +9,29 @@ #if 'A' == 65 /* ASCII/Latin1 */ /* U+00 NUL */ (1U<' */ (1U<' */ (1U<' */ (1U<' */ (1U<' */ (1U<' */ (1U<>, @@ -4477,6 +4507,8 @@ time C is called from th const char * Perl_setlocale(const int category, const char * locale) { + PERL_ARGS_ASSERT_PERL_SETLOCALE; + /* This wraps POSIX::setlocale() */ #ifndef USE_LOCALE @@ -4587,7 +4619,7 @@ Perl_setlocale(const int category, const #ifdef USE_LOCALE # ifdef DEBUGGING -STATIC char * +static char * S_my_setlocale_debug_string_i(pTHX_ const locale_category_index cat_index, const char* locale, /* Optional locale name */ @@ -4598,6 +4630,8 @@ S_my_setlocale_debug_string_i(pTHX_ const line_t line) { + PERL_ARGS_ASSERT_MY_SETLOCALE_DEBUG_STRING_I; + /* Returns a pointer to a NUL-terminated string in static storage with * added text about the info passed in. This is not thread safe and will * be overwritten by the next call, so this should be used just to @@ -4648,7 +4682,7 @@ S_my_setlocale_debug_string_i(pTHX_ # define TOGGLE_UNLOCK(i) # endif -STATIC const char * +static const char * S_toggle_locale_i(pTHX_ const locale_category_index cat_index, const char * new_locale, const line_t caller_line) @@ -4709,17 +4743,17 @@ S_toggle_locale_i(pTHX_ const locale_cat } -STATIC void +static void S_restore_toggled_locale_i(pTHX_ const locale_category_index cat_index, const char * restore_locale, const line_t caller_line) { + PERL_ARGS_ASSERT_RESTORE_TOGGLED_LOCALE_I; + /* Restores the locale for LC_category corresponding to cat_index to * 'restore_locale' (which is a copy that will be freed by this function), * or do nothing if the latter parameter is NULL */ - PERL_ARGS_ASSERT_RESTORE_TOGGLED_LOCALE_I; - if (restore_locale == NULL) { DEBUG_Lv(PerlIO_printf(Perl_debug_log, "restore_toggled_locale_i: No need to" \ @@ -4748,7 +4782,7 @@ S_restore_toggled_locale_i(pTHX_ const l #endif #if defined(USE_LOCALE) || defined(HAS_SOME_LANGINFO) || defined(HAS_LOCALECONV) -STATIC utf8ness_t +static utf8ness_t S_get_locale_string_utf8ness_i(pTHX_ const char * string, const locale_utf8ness_t known_utf8, const char * locale, @@ -4778,7 +4812,7 @@ S_get_locale_string_utf8ness_i(pTHX_ con " index=%u(%s), string=%s, known_utf8=%d\n", locale, cat_index, category_names[cat_index], ((string) - ? _byte_dump_string((U8 *) string, + ? byte_dump_string_((U8 *) string, strlen(string), 0) : "nil"), @@ -4838,7 +4872,7 @@ S_get_locale_string_utf8ness_i(pTHX_ con } -STATIC bool +static bool S_is_locale_utf8(pTHX_ const char * locale) { PERL_ARGS_ASSERT_IS_LOCALE_UTF8; @@ -4963,15 +4997,15 @@ S_is_locale_utf8(pTHX_ const char * loca #ifdef USE_LOCALE # ifdef USE_LOCALE_CTYPE -STATIC bool +static bool S_is_codeset_name_UTF8(const char * name) { + PERL_ARGS_ASSERT_IS_CODESET_NAME_UTF8; + /* Return a boolean as to if the passed-in name indicates it is a UTF-8 * code set. Several variants are possible */ const Size_t len = strlen(name); - PERL_ARGS_ASSERT_IS_CODESET_NAME_UTF8; - # ifdef WIN32 /* https://learn.microsoft.com/en-us/windows/win32/intl/code-page-identifiers */ @@ -4994,6 +5028,8 @@ S_is_codeset_name_UTF8(const char * name bool Perl_get_win32_message_utf8ness(pTHX_ const char * string) { + PERL_ARGS_ASSERT_GET_WIN32_MESSAGE_UTF8NESS; + /* This is because Windows doesn't have LC_MESSAGES. */ # ifdef USE_LOCALE_CTYPE @@ -5020,11 +5056,13 @@ Perl_get_win32_message_utf8ness(pTHX_ co # endif -STATIC void +static void S_set_save_buffer_min_size(pTHX_ Size_t min_len, char **buf, Size_t * buf_cursize) { + PERL_ARGS_ASSERT_SET_SAVE_BUFFER_MIN_SIZE; + /* Make sure the buffer pointed to by *buf is at least as large 'min_len'; * *buf_cursize is the size of 'buf' upon entry; it will be updated to the * new size on exit. 'buf_cursize' being NULL is to be used when this is a @@ -5043,7 +5081,7 @@ S_set_save_buffer_min_size(pTHX_ Size_t } } -STATIC const char * +static const char * S_save_to_buffer(pTHX_ const char * string, char **buf, Size_t *buf_size) { PERL_ARGS_ASSERT_SAVE_TO_BUFFER; @@ -5087,7 +5125,7 @@ S_save_to_buffer(pTHX_ const char * stri "Copying '%s' to 0x%p\n", ((is_strict_utf8_string((U8 *) string, 0)) ? string - :_byte_dump_string((U8 *) string, strlen(string), 0)), + :byte_dump_string_((U8 *) string, strlen(string), 0)), *buf)); # ifdef USE_LOCALE_CTYPE @@ -5112,6 +5150,7 @@ S_save_to_buffer(pTHX_ const char * stri int Perl_mbtowc_(pTHX_ const wchar_t * pwc, const char * s, const Size_t len) { + PERL_ARGS_ASSERT_MBTOWC_; #if ! defined(HAS_MBRTOWC) && ! defined(HAS_MBTOWC) @@ -5176,6 +5215,7 @@ Perl_mbtowc_(pTHX_ const wchar_t * pwc, } /* +=for apidoc_section $locale =for apidoc Perl_localeconv This is a thread-safe version of the libc L. It is the same as @@ -5216,6 +5256,8 @@ be dealt with immediately. HV * Perl_localeconv(pTHX) { + PERL_ARGS_ASSERT_PERL_LOCALECONV; + return (HV *) sv_2mortal((SV *) my_localeconv(0)); } @@ -5275,7 +5317,7 @@ S_my_localeconv(pTHX_ const int item) #define LCONV_MONETARY_ENTRY(name) LCONV_ENTRY(name) /* There are just a few fields for NUMERIC strings */ - const lconv_offset_t lconv_numeric_strings[] = { + static const lconv_offset_t lconv_numeric_strings[] = { #ifndef NO_LOCALECONV_GROUPING LCONV_NUMERIC_ENTRY(grouping), # endif @@ -5299,7 +5341,7 @@ S_my_localeconv(pTHX_ const int item) &lconv_numeric_strings[(C_ARRAY_LENGTH(lconv_numeric_strings) - 2)] /* And the MONETARY string fields */ - const lconv_offset_t lconv_monetary_strings[] = { + static const lconv_offset_t lconv_monetary_strings[] = { LCONV_MONETARY_ENTRY(int_curr_symbol), LCONV_MONETARY_ENTRY(mon_decimal_point), #ifndef NO_LOCALECONV_MON_THOUSANDS_SEP @@ -5320,7 +5362,7 @@ S_my_localeconv(pTHX_ const int item) &lconv_monetary_strings[(C_ARRAY_LENGTH(lconv_monetary_strings) - 2)] /* Finally there are integer fields, all are for monetary purposes */ - const lconv_offset_t lconv_integers[] = { + static const lconv_offset_t lconv_integers[] = { LCONV_ENTRY(int_frac_digits), LCONV_ENTRY(frac_digits), LCONV_ENTRY(p_sep_by_space), @@ -5430,7 +5472,7 @@ S_my_localeconv(pTHX_ const int item) * the data structure could do double duty. However, both this and * RADIXCHAR would need to be in the final position of the same full * structure; an impossibility. So make this into a separate structure */ - const lconv_offset_t thousands_sep_string[] = { + static const lconv_offset_t thousands_sep_string[] = { LCONV_NUMERIC_ENTRY(thousands_sep), {NULL, 0} }; @@ -5649,7 +5691,7 @@ S_my_localeconv(pTHX_ const int item) } -STATIC void +static void S_populate_hash_from_C_localeconv(pTHX_ HV * hv, const char * locale, /* Unused */ @@ -5732,7 +5774,7 @@ S_populate_hash_from_C_localeconv(pTHX_ #if defined(HAS_LOCALECONV) && ( defined(USE_LOCALE_NUMERIC) \ || defined(USE_LOCALE_MONETARY)) -STATIC void +static void S_populate_hash_from_localeconv(pTHX_ HV * hv, /* Switch to this locale to run @@ -6178,7 +6220,10 @@ L. #endif SV * -Perl_sv_langinfo(pTHX_ const nl_item item) { +Perl_sv_langinfo(pTHX_ const nl_item item) +{ + PERL_ARGS_ASSERT_SV_LANGINFO; + utf8ness_t dummy; /* Having this tells the layers below that we want the UTF-8 flag in 'sv' to be set properly. */ @@ -6191,6 +6236,8 @@ Perl_sv_langinfo(pTHX_ const nl_item it const char * Perl_langinfo(const nl_item item) { + PERL_ARGS_ASSERT_PERL_LANGINFO; + dTHX; (void) external_call_langinfo(item, PL_langinfo_sv, NULL); @@ -6365,7 +6412,7 @@ S_external_call_langinfo(pTHX_ const nl_ #endif #if defined(USE_LOCALE) && defined(HAS_NL_LANGINFO) -STATIC const char * +static const char * S_langinfo_sv_i(pTHX_ const nl_item item, /* The item to look up */ @@ -6591,7 +6638,7 @@ S_langinfo_sv_i(pTHX_ /* nl_langinfo() is not supposed to return empty for the items below * when the locale is legal. But we have experienced it happening. - * THe panic below includes enough information to do further debugging. + * The panic below includes enough information to do further debugging. * */ if (UNLIKELY(total_len == 0)) switch (item) { case RADIXCHAR: @@ -6693,7 +6740,7 @@ S_langinfo_sv_i(pTHX_ locale_panic_(form( "Can't find separator in ALT_DIGITS" " representation '%s' for locale '%s'", - _byte_dump_string((U8 *) retval, + byte_dump_string_((U8 *) retval, total_len, 0), locale)); } @@ -6779,14 +6826,14 @@ S_langinfo_sv_i(pTHX_ * make its removal easier, as there may not be any extant platforms that need * it; and the function is located after emulate_langinfo() because it's easier * to understand when placed in the context of that code */ -STATIC bool +static bool S_maybe_override_codeset(pTHX_ const char * codeset, const char * locale, const char ** new_codeset); #endif #if ! defined(HAS_NL_LANGINFO) || defined(HAS_MISSING_LANGINFO_ITEM_) -STATIC const char * +static const char * S_emulate_langinfo(pTHX_ const PERL_INTMAX_T item, const char * locale, SV * sv, @@ -7682,10 +7729,10 @@ S_emulate_langinfo(pTHX_ const PERL_INTM * holds what field in the 'struct tm' to applies to the corresponding * format */ int year, min, sec; - const char * fmts[] = {"%Oy", "%OM", "%OS", "%Od", "%OH", "%Om", "%Ow" }; - const Size_t maxes[] = { 99, 59, 59, 31, 23, 11, 6 }; - const int offsets[] = { 0, 0, 0, 1, 0, 1, 0 }; - int * vars[] = {&year, &min, &sec, &mday, &hour, &mon, &mday }; + static const char * const fmts[] = {"%Oy", "%OM", "%OS", "%Od", "%OH", "%Om", "%Ow" }; + static const Size_t const maxes[] = { 99, 59, 59, 31, 23, 11, 6 }; + static const int const offsets[] = { 0, 0, 0, 1, 0, 1, 0 }; + int * vars[] = {&year, &min, &sec, &mday, &hour, &mon, &mday }; Size_t j = 0; /* Current index into the above tables */ orig_TIME_locale = toggle_locale_c_unless_locking(LC_TIME, locale); @@ -7840,11 +7887,13 @@ S_emulate_langinfo(pTHX_ const PERL_INTM #endif /* Needs emulate_langinfo() */ #ifndef HAS_DEFINITIVE_UTF8NESS_DETERMINATION -STATIC bool +static bool S_maybe_override_codeset(pTHX_ const char * codeset, const char * locale, const char ** new_codeset) { + PERL_ARGS_ASSERT_MY_STRFTIME; + # define NAME_INDICATES_UTF8 0x1 # define MB_CUR_MAX_SUGGESTS_UTF8 0x2 @@ -7963,7 +8012,7 @@ S_maybe_override_codeset(pTHX_ const cha utf8ness_t strings_utf8ness = UTF8NESS_UNKNOWN; /* List of strings to look at */ - const int trials[] = { + static const int trials[] = { # if defined(USE_LOCALE_MONETARY) && defined(HAS_LOCALECONV) @@ -8267,18 +8316,18 @@ aligned, as best we can, with the POSIX =over -=item C is 0 +=item C is 0 The function is to assume that daylight savings time is not in effect. This should now always work properly, as perl uses its own implementation in this case, avoiding non-conforming libc ones. -=item C is E0 +=item C is E0 The function is to assume that daylight savings time is in effect, though some underlying libc implementations treat this as a hint instead of a mandate. -=item C is E0 +=item C is E0 The function is to itself try to calculate if daylight savings time is in effect. More recent libc implementations are better at this than earlier @@ -8313,7 +8362,6 @@ Perl_my_strftime(pTHX_ const char *fmt, int mday, int mon, int year, int wday, int yday, int isdst) { /* Documented above */ - PERL_ARGS_ASSERT_MY_STRFTIME; PERL_UNUSED_ARG(wday); PERL_UNUSED_ARG(yday); @@ -8406,12 +8454,14 @@ S_sv_strftime_common(pTHX_ SV * fmt, return sv; } -STATIC void +static void S_ints_to_tm(pTHX_ struct tm * mytm, const char * locale, int sec, int min, int hour, int mday, int mon, int year, int isdst) { + PERL_ARGS_ASSERT_INTS_TO_TM; + /* Create a struct tm structure from the input time-related integer * variables for 'locale'. Unlike mini_mktime(), this populates the * tm_gmtoff and tm_zone fields of the structure if the platform has those; @@ -8520,7 +8570,7 @@ S_ints_to_tm(pTHX_ struct tm * mytm, return; } -STATIC bool +static bool S_strftime_tm(pTHX_ const char *fmt, SV * sv, const char *locale, @@ -8674,7 +8724,7 @@ S_strftime_tm(pTHX_ const char *fmt, return succeeded; } -STATIC bool +static bool S_strftime8(pTHX_ const char * fmt, SV * sv, const char * locale, @@ -8716,7 +8766,10 @@ S_strftime8(pTHX_ const char * fmt, case UTF8NESS_YES: /* Known to be UTF-8; must be UTF-8 locale if can't downgrade. */ - if (! is_locale_utf8(locale)) { + if (is_locale_utf8(locale)) { + locale_utf8ness = LOCALE_IS_UTF8; + } + else { locale_utf8ness = LOCALE_NOT_UTF8; Size_t fmt_len = strlen(fmt); @@ -8726,9 +8779,6 @@ S_strftime8(pTHX_ const char * fmt, return false; } } - else { - locale_utf8ness = LOCALE_IS_UTF8; - } break; @@ -8768,7 +8818,7 @@ S_strftime8(pTHX_ const char * fmt, fmt, ((is_strict_utf8_string((U8 *) SvPVX(sv), 0)) ? SvPVX(sv) - :_byte_dump_string((U8 *) SvPVX(sv), SvCUR(sv) ,0)), + :byte_dump_string_((U8 *) SvPVX(sv), SvCUR(sv) ,0)), *result_utf8ness)); Safefree(free_me); return true; @@ -8779,7 +8829,7 @@ S_strftime8(pTHX_ const char * fmt, #ifdef USE_LOCALE -STATIC void +static void S_give_perl_locale_control(pTHX_ # ifdef LC_ALL const char * lc_all_string, @@ -8788,6 +8838,8 @@ S_give_perl_locale_control(pTHX_ # endif const line_t caller_line) { + PERL_ARGS_ASSERT_GIVE_PERL_LOCALE_CONTROL; + PERL_UNUSED_ARG(caller_line); /* This is called when the program is in the global locale and are @@ -8848,11 +8900,13 @@ S_give_perl_locale_control(pTHX_ } -STATIC void +static void S_output_check_environment_warning(pTHX_ const char * const language, const char * const lc_all, const char * const lang) { + PERL_ARGS_ASSERT_OUTPUT_CHECK_ENVIRONMENT_WARNING; + PerlIO_printf(Perl_error_log, "perl: warning: Please check that your locale settings:\n"); @@ -8906,6 +8960,8 @@ S_output_check_environment_warning(pTHX_ int Perl_init_i18nl10n(pTHX_ int printwarn) { + PERL_ARGS_ASSERT_INIT_I18NL10N; + /* printwarn is: * 0 if not to output warning when setup locale is bad * 1 if to output warning based on value of PERL_BADLANG @@ -9541,7 +9597,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn) #undef GET_DESCRIPTION #ifdef USE_LOCALE_COLLATE -STATIC bool +static bool S_compute_collxfrm_coefficients(pTHX) { /* This is called from mem_collxfrm() the first time the latter is called @@ -9615,7 +9671,7 @@ S_compute_collxfrm_coefficients(pTHX) * digits tend to have fewer levels, and some punctuation has more, but * those are relatively sparse in text, and khw believes this gives a * reasonable result, but it could be changed if experience so dictates. */ - const char longer[] = "ABCDEFGHIJKLMnopqrstuvwxyz"; + const char * const longer = "ABCDEFGHIJKLMnopqrstuvwxyz"; char * x_longer; /* Transformed 'longer' */ Size_t x_len_longer; /* Length of 'x_longer' */ @@ -9640,7 +9696,7 @@ S_compute_collxfrm_coefficients(pTHX) /* Find out how long the transformation really is */ x_longer = mem_collxfrm_(longer, - sizeof(longer) - 1, + strlen(longer), &x_len_longer, /* We avoid converting to UTF-8 in the called @@ -9657,7 +9713,7 @@ S_compute_collxfrm_coefficients(pTHX) * first character. This minimizes the chances of being swayed by outliers * */ x_shorter = mem_collxfrm_(longer + 1, - sizeof(longer) - 2, + strlen(longer) - 1, &x_len_shorter, PL_in_utf8_COLLATE_locale); Safefree(x_shorter); @@ -9701,7 +9757,7 @@ S_compute_collxfrm_coefficients(pTHX) /* mx + b = len * so: b = len - mx * but in case something has gone wrong, make sure it is non-negative */ - base = x_len_longer - PL_collxfrm_mult * (sizeof(longer) - 1); + base = x_len_longer - PL_collxfrm_mult * strlen(longer); if (base < 0) { base = 0; } @@ -10263,7 +10319,7 @@ Perl_mem_collxfrm_(pTHX_ const char *inp DEBUG_L(PerlIO_printf(Perl_debug_log, "strxfrm failed for LC_COLLATE=%s; errno=%d, input=%s\n", PL_collation_name, errno, - _byte_dump_string((U8 *) s, len, 0))); + byte_dump_string_((U8 *) s, len, 0))); goto bad; } @@ -10405,7 +10461,7 @@ Perl_mem_collxfrm_(pTHX_ const char *inp # ifdef DEBUGGING -STATIC void +static void S_print_collxfrm_input_and_return(pTHX_ const char * s, const char * e, @@ -10413,7 +10469,6 @@ S_print_collxfrm_input_and_return(pTHX_ const STRLEN xlen, const bool is_utf8) { - PERL_ARGS_ASSERT_PRINT_COLLXFRM_INPUT_AND_RETURN; PerlIO_printf(Perl_debug_log, @@ -10425,7 +10480,7 @@ S_print_collxfrm_input_and_return(pTHX_ ? "(null)" : ((xlen == 0) ? "(empty)" - : _byte_dump_string((U8 *) xbuf + COLLXFRM_HDR_LEN, + : byte_dump_string_((U8 *) xbuf + COLLXFRM_HDR_LEN, xlen, 0))), xlen); } @@ -10734,6 +10789,7 @@ Perl_my_strerror(pTHX_ const int errnum, bool Perl_is_in_locale_category_(pTHX_ const bool compiling, const int category) { + PERL_ARGS_ASSERT_IS_IN_LOCALE_CATEGORY_; #ifndef USE_LOCALE @@ -10849,6 +10905,7 @@ handle all cases of single- vs multi-thr void Perl_switch_to_global_locale(pTHX) { + PERL_ARGS_ASSERT_SWITCH_TO_GLOBAL_LOCALE; #ifdef USE_LOCALE @@ -10923,6 +10980,7 @@ Perl_switch_to_global_locale(pTHX) /* +=for apidoc_section $locale =for apidoc sync_locale This function copies the state of the program global locale into the calling @@ -10965,6 +11023,7 @@ was in effect for the caller; and FALSE bool Perl_sync_locale(pTHX) { + PERL_ARGS_ASSERT_SYNC_LOCALE; #ifndef USE_LOCALE @@ -11032,6 +11091,8 @@ Perl_sync_locale(pTHX) void Perl_switch_locale_context(pTHX) { + PERL_ARGS_ASSERT_SWITCH_LOCALE_CONTEXT; + /* libc keeps per-thread locale status information in some configurations. * So, we can't just switch out aTHX to switch to a new thread. libc has * to follow along. This routine does that based on per-interpreter @@ -11091,6 +11152,8 @@ Perl_switch_locale_context(pTHX) void Perl_thread_locale_init(pTHX) { + PERL_ARGS_ASSERT_THREAD_LOCALE_INIT; + # ifdef USE_THREAD_SAFE_LOCALE # ifdef USE_POSIX_2008_LOCALE @@ -11133,6 +11196,8 @@ Perl_thread_locale_init(pTHX) void Perl_thread_locale_term(pTHX) { + PERL_ARGS_ASSERT_THREAD_LOCALE_TERM; + /* Called from a thread as it gets ready to terminate. * * The operations here have to be done from within the calling thread, as Index: gnu/usr.bin/perl/locale_table.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/locale_table.h,v diff -u -p -a -u -p -r1.1.1.1 locale_table.h --- gnu/usr.bin/perl/locale_table.h 28 Jan 2025 01:04:17 -0000 1.1.1.1 +++ gnu/usr.bin/perl/locale_table.h 16 Nov 2026 00:57:39 -0000 @@ -12,10 +12,10 @@ * Any changes made here will be lost! */ -/* This defines a macro for each individual locale category used on the this - * system. (The congomerate category LC_ALL is not included.) This - * file will be #included as the interior of various parallel arrays and in - * other constructs; each usage will re-#define the macro to generate its +/* This defines a macro for each individual locale category used on this + * system. (The conglomerate category LC_ALL is not included.) This file + * will be #included as the interior of various parallel arrays and in other + * constructs; each usage will re-#define the macro to generate its * appropriate data. * * This guarantees the arrays will be parallel, and populated in the order @@ -30,7 +30,7 @@ */ #ifdef LC_CTYPE -# if defined(NO_LOCALE) || defined(NO_LOCALE_CTYPE) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_CTYPE) PERL_LOCALE_TABLE_ENTRY(CTYPE, NULL) @@ -47,7 +47,7 @@ # define LC_CTYPE_AVAIL_ 0 #endif #ifdef LC_NUMERIC -# if defined(NO_LOCALE) || defined(NO_LOCALE_NUMERIC) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_NUMERIC) PERL_LOCALE_TABLE_ENTRY(NUMERIC, NULL) @@ -68,7 +68,7 @@ /* Perl outsources all its collation efforts to the libc strxfrm(), so * if it isn't available on the system, default "C" locale collation * gets used */ -# if defined(NO_LOCALE) || defined(NO_LOCALE_COLLATE) || ! defined(HAS_STRXFRM) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_COLLATE) || ! defined(HAS_STRXFRM) PERL_LOCALE_TABLE_ENTRY(COLLATE, NULL) @@ -88,7 +88,7 @@ PERL_LOCALE_TABLE_ENTRY(TIME, NULL) -# if defined(NO_LOCALE) || defined(NO_LOCALE_TIME) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_TIME) # define HAS_IGNORED_LOCALE_CATEGORIES_ # define LC_TIME_AVAIL_ 0 # else @@ -102,7 +102,7 @@ PERL_LOCALE_TABLE_ENTRY(MESSAGES, NULL) -# if defined(NO_LOCALE) || defined(NO_LOCALE_MESSAGES) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_MESSAGES) # define HAS_IGNORED_LOCALE_CATEGORIES_ # define LC_MESSAGES_AVAIL_ 0 # else @@ -116,7 +116,7 @@ PERL_LOCALE_TABLE_ENTRY(MONETARY, NULL) -# if defined(NO_LOCALE) || defined(NO_LOCALE_MONETARY) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_MONETARY) # define HAS_IGNORED_LOCALE_CATEGORIES_ # define LC_MONETARY_AVAIL_ 0 # else @@ -130,7 +130,7 @@ PERL_LOCALE_TABLE_ENTRY(ADDRESS, NULL) -# if defined(NO_LOCALE) || defined(NO_LOCALE_ADDRESS) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_ADDRESS) # define HAS_IGNORED_LOCALE_CATEGORIES_ # define LC_ADDRESS_AVAIL_ 0 # else @@ -144,7 +144,7 @@ PERL_LOCALE_TABLE_ENTRY(IDENTIFICATION, NULL) -# if defined(NO_LOCALE) || defined(NO_LOCALE_IDENTIFICATION) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_IDENTIFICATION) # define HAS_IGNORED_LOCALE_CATEGORIES_ # define LC_IDENTIFICATION_AVAIL_ 0 # else @@ -158,7 +158,7 @@ PERL_LOCALE_TABLE_ENTRY(MEASUREMENT, NULL) -# if defined(NO_LOCALE) || defined(NO_LOCALE_MEASUREMENT) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_MEASUREMENT) # define HAS_IGNORED_LOCALE_CATEGORIES_ # define LC_MEASUREMENT_AVAIL_ 0 # else @@ -172,7 +172,7 @@ PERL_LOCALE_TABLE_ENTRY(PAPER, NULL) -# if defined(NO_LOCALE) || defined(NO_LOCALE_PAPER) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_PAPER) # define HAS_IGNORED_LOCALE_CATEGORIES_ # define LC_PAPER_AVAIL_ 0 # else @@ -186,7 +186,7 @@ PERL_LOCALE_TABLE_ENTRY(TELEPHONE, NULL) -# if defined(NO_LOCALE) || defined(NO_LOCALE_TELEPHONE) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_TELEPHONE) # define HAS_IGNORED_LOCALE_CATEGORIES_ # define LC_TELEPHONE_AVAIL_ 0 # else @@ -200,7 +200,7 @@ PERL_LOCALE_TABLE_ENTRY(NAME, NULL) -# if defined(NO_LOCALE) || defined(NO_LOCALE_NAME) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_NAME) # define HAS_IGNORED_LOCALE_CATEGORIES_ # define LC_NAME_AVAIL_ 0 # else @@ -214,7 +214,7 @@ PERL_LOCALE_TABLE_ENTRY(SYNTAX, NULL) -# if defined(NO_LOCALE) || defined(NO_LOCALE_SYNTAX) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_SYNTAX) # define HAS_IGNORED_LOCALE_CATEGORIES_ # define LC_SYNTAX_AVAIL_ 0 # else @@ -228,7 +228,7 @@ PERL_LOCALE_TABLE_ENTRY(TOD, NULL) -# if defined(NO_LOCALE) || defined(NO_LOCALE_TOD) +# if ! defined(USE_LOCALE) || defined(NO_LOCALE_TOD) # define HAS_IGNORED_LOCALE_CATEGORIES_ # define LC_TOD_AVAIL_ 0 # else Index: gnu/usr.bin/perl/long_names.c =================================================================== RCS file: gnu/usr.bin/perl/long_names.c diff -N gnu/usr.bin/perl/long_names.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/usr.bin/perl/long_names.c 16 Nov 2026 00:57:39 -0000 @@ -0,0 +1,1051 @@ +/* -*- mode: C; buffer-read-only: t -*- + * + * long_names.c + * + * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + * 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, + * 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, + * 2026 by Larry Wall and others + * + * You may distribute under the terms of either the GNU General Public + * License or the Artistic License, as specified in the README file. + * + * !!!!!!! DO NOT EDIT THIS FILE !!!!!!! + * This file is built by regen/embed.pl from embed.fnc, intrpvar.h, + * perlvars.h, regen/opcodes, regen/embed.pl, regen/embed_lib.pl and + * regen/HeaderParser.pm. + * Any changes made here will be lost! + * + * Edit those files and run 'make regen_headers' to effect changes. + */ + +/* This file is automatically generated by embed.pl. + * + * Its current purpose is to contain functions that are automatically + * generated synonyms for macros for which such a synonym has been requested, + * and for which a function is necessary. The synonym's name is the name of + * the macro prefixed by 'Perl_'. In some cases, such a synonym can be + * handled by just using a macro defined to be the short name. Those synonyms + * are kept out of this file by embed.pl. + * + * To request a synonym, add the 'p' flag to the macro's entry in embed.fnc, + * or to its "=for apidoc" line whereever that is. */ + +#include "EXTERN.h" +#define PERL_IN_LONG_NAMES_C +#include "perl.h" + +#if !defined(USE_ITHREADS) +void +Perl_CopFILEGV_set(pTHX_ COP *c, GV *gv) +{ + PERL_ARGS_ASSERT_COPFILEGV_SET; + + CopFILEGV_set(c, gv); +} +#endif + +void +Perl_SvREFCNT_dec_set_NULL(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SVREFCNT_DEC_SET_NULL; + + SvREFCNT_dec_set_NULL(sv); +} + +bool +Perl_c9strict_utf8_to_uv(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p) +{ + PERL_ARGS_ASSERT_C9STRICT_UTF8_TO_UV; + + return c9strict_utf8_to_uv(s, e, cp_p, advance_p); +} + +bool +Perl_do_open(pTHX_ GV *gv, const char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp) +{ + PERL_ARGS_ASSERT_DO_OPEN; + + return do_open(gv, name, len, as_raw, rawmode, rawperm, supplied_fp); +} + +Size_t +Perl_expected_size(UV size) +{ + PERL_ARGS_ASSERT_EXPECTED_SIZE; + + return expected_size(size); +} + +bool +Perl_extended_utf8_to_uv(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p) +{ + PERL_ARGS_ASSERT_EXTENDED_UTF8_TO_UV; + + return extended_utf8_to_uv(s, e, cp_p, advance_p); +} + +I32 +Perl_foldEQ_utf8(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2) +{ + PERL_ARGS_ASSERT_FOLDEQ_UTF8; + + return foldEQ_utf8(s1, pe1, l1, u1, s2, pe2, l2, u2); +} + +GV * +Perl_gv_AVadd(pTHX_ GV *gv) +{ + PERL_ARGS_ASSERT_GV_AVADD; + + return gv_AVadd(gv); +} + +GV * +Perl_gv_HVadd(pTHX_ GV *gv) +{ + PERL_ARGS_ASSERT_GV_HVADD; + + return gv_HVadd(gv); +} + +GV * +Perl_gv_IOadd(pTHX_ GV *gv) +{ + PERL_ARGS_ASSERT_GV_IOADD; + + return gv_IOadd(gv); +} + +GV * +Perl_gv_SVadd(pTHX_ GV *gv) +{ + PERL_ARGS_ASSERT_GV_SVADD; + + return gv_SVadd(gv); +} + +void +Perl_gv_efullname3(pTHX_ SV *sv, const GV *gv, const char *prefix) +{ + PERL_ARGS_ASSERT_GV_EFULLNAME3; + + gv_efullname3(sv, gv, prefix); +} + +GV * +Perl_gv_fetchmeth(pTHX_ HV *stash, const char *name, STRLEN len, I32 level) +{ + PERL_ARGS_ASSERT_GV_FETCHMETH; + + return gv_fetchmeth(stash, name, len, level); +} + +GV * +Perl_gv_fetchmeth_autoload(pTHX_ HV *stash, const char *name, STRLEN len, I32 level) +{ + PERL_ARGS_ASSERT_GV_FETCHMETH_AUTOLOAD; + + return gv_fetchmeth_autoload(stash, name, len, level); +} + +GV * +Perl_gv_fetchmethod(pTHX_ HV *stash, const char *name) +{ + PERL_ARGS_ASSERT_GV_FETCHMETHOD; + + return gv_fetchmethod(stash, name); +} + +void +Perl_gv_fullname3(pTHX_ SV *sv, const GV *gv, const char *prefix) +{ + PERL_ARGS_ASSERT_GV_FULLNAME3; + + gv_fullname3(sv, gv, prefix); +} + +void +Perl_gv_init(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, int multi) +{ + PERL_ARGS_ASSERT_GV_INIT; + + gv_init(gv, stash, name, len, multi); +} + +SV * +Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen, I32 flags) +{ + PERL_ARGS_ASSERT_HV_DELETE; + + return hv_delete(hv, key, klen, flags); +} + +SV * +Perl_hv_delete_ent(pTHX_ HV *hv, SV *keysv, I32 flags, U32 hash) +{ + PERL_ARGS_ASSERT_HV_DELETE_ENT; + + return hv_delete_ent(hv, keysv, flags, hash); +} + +bool +Perl_hv_exists(pTHX_ HV *hv, const char *key, I32 klen) +{ + PERL_ARGS_ASSERT_HV_EXISTS; + + return hv_exists(hv, key, klen); +} + +bool +Perl_hv_exists_ent(pTHX_ HV *hv, SV *keysv, U32 hash) +{ + PERL_ARGS_ASSERT_HV_EXISTS_ENT; + + return hv_exists_ent(hv, keysv, hash); +} + +SV ** +Perl_hv_fetch(pTHX_ HV *hv, const char *key, I32 klen, I32 lval) +{ + PERL_ARGS_ASSERT_HV_FETCH; + + return hv_fetch(hv, key, klen, lval); +} + +HE * +Perl_hv_fetch_ent(pTHX_ HV *hv, SV *keysv, I32 lval, U32 hash) +{ + PERL_ARGS_ASSERT_HV_FETCH_ENT; + + return hv_fetch_ent(hv, keysv, lval, hash); +} + +HE * +Perl_hv_iternext(pTHX_ HV *hv) +{ + PERL_ARGS_ASSERT_HV_ITERNEXT; + + return hv_iternext(hv); +} + +void +Perl_hv_magic(pTHX_ HV *hv, GV *gv, int how) +{ + PERL_ARGS_ASSERT_HV_MAGIC; + + hv_magic(hv, gv, how); +} + +SV ** +Perl_hv_store(pTHX_ HV *hv, const char *key, I32 klen, SV *val, U32 hash) +{ + PERL_ARGS_ASSERT_HV_STORE; + + return hv_store(hv, key, klen, val, hash); +} + +HE * +Perl_hv_store_ent(pTHX_ HV *hv, SV *key, SV *val, U32 hash) +{ + PERL_ARGS_ASSERT_HV_STORE_ENT; + + return hv_store_ent(hv, key, val, hash); +} + +SV ** +Perl_hv_store_flags(pTHX_ HV *hv, const char *key, I32 klen, SV *val, U32 hash, int flags) +{ + PERL_ARGS_ASSERT_HV_STORE_FLAGS; + + return hv_store_flags(hv, key, klen, val, hash, flags); +} + +void +Perl_hv_undef(pTHX_ HV *hv) +{ + PERL_ARGS_ASSERT_HV_UNDEF; + + hv_undef(hv); +} + +I32 +Perl_ibcmp(pTHX_ const char *a, const char *b, I32 len) +{ + PERL_ARGS_ASSERT_IBCMP; + + return ibcmp(a, b, len); +} + +I32 +Perl_ibcmp_locale(pTHX_ const char *a, const char *b, I32 len) +{ + PERL_ARGS_ASSERT_IBCMP_LOCALE; + + return ibcmp_locale(a, b, len); +} + +I32 +Perl_ibcmp_utf8(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2) +{ + PERL_ARGS_ASSERT_IBCMP_UTF8; + + return ibcmp_utf8(s1, pe1, l1, u1, s2, pe2, l2, u2); +} + +char * +Perl_instr(const char *big, const char *little) +{ + PERL_ARGS_ASSERT_INSTR; + + return instr(big, little); +} + +bool +Perl_is_c9strict_utf8_string(const U8 *s, STRLEN len) +{ + PERL_ARGS_ASSERT_IS_C9STRICT_UTF8_STRING; + + return is_c9strict_utf8_string(s, len); +} + +bool +Perl_is_c9strict_utf8_string_loc(const U8 *s, STRLEN len, const U8 **ep) +{ + PERL_ARGS_ASSERT_IS_C9STRICT_UTF8_STRING_LOC; + + return is_c9strict_utf8_string_loc(s, len, ep); +} + +bool +Perl_is_strict_utf8_string(const U8 *s, STRLEN len) +{ + PERL_ARGS_ASSERT_IS_STRICT_UTF8_STRING; + + return is_strict_utf8_string(s, len); +} + +bool +Perl_is_strict_utf8_string_loc(const U8 *s, STRLEN len, const U8 **ep) +{ + PERL_ARGS_ASSERT_IS_STRICT_UTF8_STRING_LOC; + + return is_strict_utf8_string_loc(s, len, ep); +} + +STRLEN +Perl_is_utf8_char_buf(const U8 *buf, const U8 *buf_end) +{ + PERL_ARGS_ASSERT_IS_UTF8_CHAR_BUF; + + return is_utf8_char_buf(buf, buf_end); +} + +bool +Perl_is_utf8_fixed_width_buf_flags(const U8 * const s, STRLEN len, const U32 flags) +{ + PERL_ARGS_ASSERT_IS_UTF8_FIXED_WIDTH_BUF_FLAGS; + + return is_utf8_fixed_width_buf_flags(s, len, flags); +} + +bool +Perl_is_utf8_fixed_width_buf_loc_flags(const U8 * const s, STRLEN len, const U8 **ep, const U32 flags) +{ + PERL_ARGS_ASSERT_IS_UTF8_FIXED_WIDTH_BUF_LOC_FLAGS; + + return is_utf8_fixed_width_buf_loc_flags(s, len, ep, flags); +} + +bool +Perl_is_utf8_string(const U8 *s, STRLEN len) +{ + PERL_ARGS_ASSERT_IS_UTF8_STRING; + + return is_utf8_string(s, len); +} + +bool +Perl_is_utf8_string_loc(const U8 *s, const STRLEN len, const U8 **ep) +{ + PERL_ARGS_ASSERT_IS_UTF8_STRING_LOC; + + return is_utf8_string_loc(s, len, ep); +} + +bool +Perl_is_utf8_string_loc_flags(const U8 *s, STRLEN len, const U8 **ep, const U32 flags) +{ + PERL_ARGS_ASSERT_IS_UTF8_STRING_LOC_FLAGS; + + return is_utf8_string_loc_flags(s, len, ep, flags); +} + +bool +Perl_is_utf8_valid_partial_char(const U8 * const s0, const U8 * const e) +{ + PERL_ARGS_ASSERT_IS_UTF8_VALID_PARTIAL_CHAR; + + return is_utf8_valid_partial_char(s0, e); +} + +CV * +Perl_newATTRSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block) +{ + PERL_ARGS_ASSERT_NEWATTRSUB; + + return newATTRSUB(floor, o, proto, attrs, block); +} + +AV * +Perl_newAV(pTHX) +{ + PERL_ARGS_ASSERT_NEWAV; + + return newAV(); +} + +AV * +Perl_newAV_alloc_x(pTHX_ SSize_t size) +{ + PERL_ARGS_ASSERT_NEWAV_ALLOC_X; + + return newAV_alloc_x(size); +} + +AV * +Perl_newAV_alloc_xz(pTHX_ SSize_t size) +{ + PERL_ARGS_ASSERT_NEWAV_ALLOC_XZ; + + return newAV_alloc_xz(size); +} + +AV * +Perl_newAV_mortal(pTHX) +{ + PERL_ARGS_ASSERT_NEWAV_MORTAL; + + return newAV_mortal(); +} + +GV * +Perl_newGVgen(pTHX_ const char *pack) +{ + PERL_ARGS_ASSERT_NEWGVGEN; + + return newGVgen(pack); +} + +HV * +Perl_newHV(pTHX) +{ + PERL_ARGS_ASSERT_NEWHV; + + return newHV(); +} + +IO * +Perl_newIO(pTHX) +{ + PERL_ARGS_ASSERT_NEWIO; + + return newIO(); +} + +CV * +Perl_newSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *block) +{ + PERL_ARGS_ASSERT_NEWSUB; + + return newSUB(floor, o, proto, block); +} + +SV * +Perl_newSVsv(pTHX_ SV * const old) +{ + PERL_ARGS_ASSERT_NEWSVSV; + + return newSVsv(old); +} + +SV * +Perl_newSVsv_nomg(pTHX_ SV * const old) +{ + PERL_ARGS_ASSERT_NEWSVSV_NOMG; + + return newSVsv_nomg(old); +} + +OP * +Perl_op_lvalue(pTHX_ OP *o, I32 type) +{ + PERL_ARGS_ASSERT_OP_LVALUE; + + return op_lvalue(o, type); +} + +const char * +Perl_phase_name(pTHX_ enum perl_phase phase) +{ + PERL_ARGS_ASSERT_PHASE_NAME; + + return phase_name(phase); +} + +void +Perl_qerror(pTHX_ SV *err) +{ + PERL_ARGS_ASSERT_QERROR; + + qerror(err); +} + +void +Perl_resume_compcv_and_save(pTHX_ struct suspended_compcv *buffer) +{ + PERL_ARGS_ASSERT_RESUME_COMPCV_AND_SAVE; + + resume_compcv_and_save(buffer); +} + +void +Perl_resume_compcv_final(pTHX_ struct suspended_compcv *buffer) +{ + PERL_ARGS_ASSERT_RESUME_COMPCV_FINAL; + + resume_compcv_final(buffer); +} + +void +Perl_save_aelem(pTHX_ AV *av, SSize_t idx, SV **sptr) +{ + PERL_ARGS_ASSERT_SAVE_AELEM; + + save_aelem(av, idx, sptr); +} + +void +Perl_save_freeop(pTHX_ OP *o) +{ + PERL_ARGS_ASSERT_SAVE_FREEOP; + + save_freeop(o); +} + +void +Perl_save_freepv(pTHX_ char *pv) +{ + PERL_ARGS_ASSERT_SAVE_FREEPV; + + save_freepv(pv); +} + +void +Perl_save_freesv(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SAVE_FREESV; + + save_freesv(sv); +} + +void +Perl_save_helem(pTHX_ HV *hv, SV *key, SV **sptr) +{ + PERL_ARGS_ASSERT_SAVE_HELEM; + + save_helem(hv, key, sptr); +} + +void +Perl_save_mortalizesv(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SAVE_MORTALIZESV; + + save_mortalizesv(sv); +} + +void +Perl_save_op(pTHX) +{ + PERL_ARGS_ASSERT_SAVE_OP; + + save_op(); +} + +bool +Perl_strict_utf8_to_uv(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p) +{ + PERL_ARGS_ASSERT_STRICT_UTF8_TO_UV; + + return strict_utf8_to_uv(s, e, cp_p, advance_p); +} + +bool +Perl_sv_2bool(pTHX_ SV * const sv) +{ + PERL_ARGS_ASSERT_SV_2BOOL; + + return sv_2bool(sv); +} + +IV +Perl_sv_2iv(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_2IV; + + return sv_2iv(sv); +} + +char * +Perl_sv_2pv(pTHX_ SV *sv, STRLEN *lp) +{ + PERL_ARGS_ASSERT_SV_2PV; + + return sv_2pv(sv, lp); +} + +char * +Perl_sv_2pv_nolen(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_2PV_NOLEN; + + return sv_2pv_nolen(sv); +} + +char * +Perl_sv_2pvbyte(pTHX_ SV *sv, STRLEN * const lp) +{ + PERL_ARGS_ASSERT_SV_2PVBYTE; + + return sv_2pvbyte(sv, lp); +} + +char * +Perl_sv_2pvbyte_nolen(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_2PVBYTE_NOLEN; + + return sv_2pvbyte_nolen(sv); +} + +char * +Perl_sv_2pvutf8(pTHX_ SV *sv, STRLEN * const lp) +{ + PERL_ARGS_ASSERT_SV_2PVUTF8; + + return sv_2pvutf8(sv, lp); +} + +char * +Perl_sv_2pvutf8_nolen(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_2PVUTF8_NOLEN; + + return sv_2pvutf8_nolen(sv); +} + +UV +Perl_sv_2uv(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_2UV; + + return sv_2uv(sv); +} + +void +Perl_sv_catpvn(pTHX_ SV * const dsv, const char *sstr, STRLEN len) +{ + PERL_ARGS_ASSERT_SV_CATPVN; + + sv_catpvn(dsv, sstr, len); +} + +void +Perl_sv_catpvn_mg(pTHX_ SV * const dsv, const char *sstr, STRLEN len) +{ + PERL_ARGS_ASSERT_SV_CATPVN_MG; + + sv_catpvn_mg(dsv, sstr, len); +} + +void +Perl_sv_catsv(pTHX_ SV * const dsv, SV * const sstr) +{ + PERL_ARGS_ASSERT_SV_CATSV; + + sv_catsv(dsv, sstr); +} + +void +Perl_sv_catsv_mg(pTHX_ SV * const dsv, SV * const sstr) +{ + PERL_ARGS_ASSERT_SV_CATSV_MG; + + sv_catsv_mg(dsv, sstr); +} + +#if defined(USE_LOCALE_COLLATE) +char * +Perl_sv_collxfrm(pTHX_ SV * const sv, STRLEN * const nxp) +{ + PERL_ARGS_ASSERT_SV_COLLXFRM; + + return sv_collxfrm(sv, nxp); +} +#endif + +void +Perl_sv_copypv(pTHX_ SV * const dsv, SV * const ssv) +{ + PERL_ARGS_ASSERT_SV_COPYPV; + + sv_copypv(dsv, ssv); +} + +void +Perl_sv_copypv_nomg(pTHX_ SV * const dsv, SV * const ssv) +{ + PERL_ARGS_ASSERT_SV_COPYPV_NOMG; + + sv_copypv_nomg(dsv, ssv); +} + +I32 +Perl_sv_eq(pTHX_ SV *sv1, SV *sv2) +{ + PERL_ARGS_ASSERT_SV_EQ; + + return sv_eq(sv1, sv2); +} + +void +Perl_sv_force_normal(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_FORCE_NORMAL; + + sv_force_normal(sv); +} + +void +Perl_sv_insert(pTHX_ SV * const bigstr, const STRLEN offset, const STRLEN len, const char * const little, const STRLEN littlelen) +{ + PERL_ARGS_ASSERT_SV_INSERT; + + sv_insert(bigstr, offset, len, little, littlelen); +} + +SV * +Perl_sv_mortalcopy(pTHX_ SV * const oldsv) +{ + PERL_ARGS_ASSERT_SV_MORTALCOPY; + + return sv_mortalcopy(oldsv); +} + +I32 +Perl_sv_numcmp(pTHX_ SV *sv1, SV *sv2) +{ + PERL_ARGS_ASSERT_SV_NUMCMP; + + return sv_numcmp(sv1, sv2); +} + +bool +Perl_sv_numeq(pTHX_ SV *sv1, SV *sv2) +{ + PERL_ARGS_ASSERT_SV_NUMEQ; + + return sv_numeq(sv1, sv2); +} + +bool +Perl_sv_numge(pTHX_ SV *sv1, SV *sv2) +{ + PERL_ARGS_ASSERT_SV_NUMGE; + + return sv_numge(sv1, sv2); +} + +bool +Perl_sv_numgt(pTHX_ SV *sv1, SV *sv2) +{ + PERL_ARGS_ASSERT_SV_NUMGT; + + return sv_numgt(sv1, sv2); +} + +bool +Perl_sv_numle(pTHX_ SV *sv1, SV *sv2) +{ + PERL_ARGS_ASSERT_SV_NUMLE; + + return sv_numle(sv1, sv2); +} + +bool +Perl_sv_numlt(pTHX_ SV *sv1, SV *sv2) +{ + PERL_ARGS_ASSERT_SV_NUMLT; + + return sv_numlt(sv1, sv2); +} + +bool +Perl_sv_numne(pTHX_ SV *sv1, SV *sv2) +{ + PERL_ARGS_ASSERT_SV_NUMNE; + + return sv_numne(sv1, sv2); +} + +char * +Perl_sv_pv(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_PV; + + return sv_pv(sv); +} + +char * +Perl_sv_pvbyte(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_PVBYTE; + + return sv_pvbyte(sv); +} + +char * +Perl_sv_pvn_force(pTHX_ SV *sv, STRLEN *lp) +{ + PERL_ARGS_ASSERT_SV_PVN_FORCE; + + return sv_pvn_force(sv, lp); +} + +char * +Perl_sv_pvutf8(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_PVUTF8; + + return sv_pvutf8(sv); +} + +void +Perl_sv_setsv(pTHX_ SV *dsv, SV *ssv) +{ + PERL_ARGS_ASSERT_SV_SETSV; + + sv_setsv(dsv, ssv); +} + +bool +Perl_sv_streq(pTHX_ SV *sv1, SV *sv2) +{ + PERL_ARGS_ASSERT_SV_STREQ; + + return sv_streq(sv1, sv2); +} + +void +Perl_sv_taint(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_TAINT; + + sv_taint(sv); +} + +void +Perl_sv_unref(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_UNREF; + + sv_unref(sv); +} + +void +Perl_sv_usepvn(pTHX_ SV *sv, char *ptr, STRLEN len) +{ + PERL_ARGS_ASSERT_SV_USEPVN; + + sv_usepvn(sv, ptr, len); +} + +void +Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len) +{ + PERL_ARGS_ASSERT_SV_USEPVN_MG; + + sv_usepvn_mg(sv, ptr, len); +} + +bool +Perl_sv_utf8_downgrade(pTHX_ SV * const sv, const bool fail_ok) +{ + PERL_ARGS_ASSERT_SV_UTF8_DOWNGRADE; + + return sv_utf8_downgrade(sv, fail_ok); +} + +bool +Perl_sv_utf8_downgrade_nomg(pTHX_ SV * const sv, const bool fail_ok) +{ + PERL_ARGS_ASSERT_SV_UTF8_DOWNGRADE_NOMG; + + return sv_utf8_downgrade_nomg(sv, fail_ok); +} + +STRLEN +Perl_sv_utf8_upgrade(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_UTF8_UPGRADE; + + return sv_utf8_upgrade(sv); +} + +STRLEN +Perl_sv_utf8_upgrade_flags(pTHX_ SV * const sv, const I32 flags) +{ + PERL_ARGS_ASSERT_SV_UTF8_UPGRADE_FLAGS; + + return sv_utf8_upgrade_flags(sv, flags); +} + +STRLEN +Perl_sv_utf8_upgrade_nomg(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_UTF8_UPGRADE_NOMG; + + return sv_utf8_upgrade_nomg(sv); +} + +UV +Perl_to_uni_fold(pTHX_ UV c, U8 *p, STRLEN *lenp) +{ + PERL_ARGS_ASSERT_TO_UNI_FOLD; + + return to_uni_fold(c, p, lenp); +} + +U8 * +Perl_utf8_hop_back(const U8 *s, SSize_t off, const U8 * const start) +{ + PERL_ARGS_ASSERT_UTF8_HOP_BACK; + + return utf8_hop_back(s, off, start); +} + +U8 * +Perl_utf8_hop_forward(const U8 *s, SSize_t off, const U8 * const end) +{ + PERL_ARGS_ASSERT_UTF8_HOP_FORWARD; + + return utf8_hop_forward(s, off, end); +} + +U8 * +Perl_utf8_hop_safe(const U8 *s, SSize_t off, const U8 * const start, const U8 * const end) +{ + PERL_ARGS_ASSERT_UTF8_HOP_SAFE; + + return utf8_hop_safe(s, off, start, end); +} + +bool +Perl_utf8_to_uv(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p) +{ + PERL_ARGS_ASSERT_UTF8_TO_UV; + + return utf8_to_uv(s, e, cp_p, advance_p); +} + +bool +Perl_utf8_to_uv_errors(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p, U32 flags, U32 *errors) +{ + PERL_ARGS_ASSERT_UTF8_TO_UV_ERRORS; + + return utf8_to_uv_errors(s, e, cp_p, advance_p, flags, errors); +} + +bool +Perl_utf8_to_uv_flags(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p, U32 flags) +{ + PERL_ARGS_ASSERT_UTF8_TO_UV_FLAGS; + + return utf8_to_uv_flags(s, e, cp_p, advance_p, flags); +} + +UV +Perl_utf8n_to_uvchr(const U8 *s, STRLEN curlen, STRLEN *retlen, const U32 flags) +{ + PERL_ARGS_ASSERT_UTF8N_TO_UVCHR; + + return utf8n_to_uvchr(s, curlen, retlen, flags); +} + +UV +Perl_utf8n_to_uvchr_error(const U8 *s, STRLEN curlen, STRLEN *retlen, const U32 flags, U32 *errors) +{ + PERL_ARGS_ASSERT_UTF8N_TO_UVCHR_ERROR; + + return utf8n_to_uvchr_error(s, curlen, retlen, flags, errors); +} + +U8 * +Perl_uv_to_utf8_msgs(pTHX_ U8 *d, UV uv, UV flags, HV **msgs) +{ + PERL_ARGS_ASSERT_UV_TO_UTF8_MSGS; + + return uv_to_utf8_msgs(d, uv, flags, msgs); +} + +U8 * +Perl_uvchr_to_utf8(pTHX_ U8 *d, UV uv) +{ + PERL_ARGS_ASSERT_UVCHR_TO_UTF8; + + return uvchr_to_utf8(d, uv); +} + +U8 * +Perl_uvchr_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags) +{ + PERL_ARGS_ASSERT_UVCHR_TO_UTF8_FLAGS; + + return uvchr_to_utf8_flags(d, uv, flags); +} + +U8 * +Perl_uvchr_to_utf8_flags_msgs(pTHX_ U8 *d, UV uv, UV flags, HV **msgs) +{ + PERL_ARGS_ASSERT_UVCHR_TO_UTF8_FLAGS_MSGS; + + return uvchr_to_utf8_flags_msgs(d, uv, flags, msgs); +} + +U8 * +Perl_uvoffuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags) +{ + PERL_ARGS_ASSERT_UVOFFUNI_TO_UTF8_FLAGS; + + return uvoffuni_to_utf8_flags(d, uv, flags); +} + +UV +Perl_valid_utf8_to_uvchr(const U8 *s, STRLEN *retlen) +{ + PERL_ARGS_ASSERT_VALID_UTF8_TO_UVCHR; + + return valid_utf8_to_uvchr(s, retlen); +} + +I32 +Perl_whichsig(pTHX_ const char *sig) +{ + PERL_ARGS_ASSERT_WHICHSIG; + + return whichsig(sig); +} + + +/* ex: set ro ft=c: */ Index: gnu/usr.bin/perl/make_ext.pl =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/make_ext.pl,v diff -u -p -a -u -p -r1.5 make_ext.pl --- gnu/usr.bin/perl/make_ext.pl 15 Feb 2023 01:36:13 -0000 1.5 +++ gnu/usr.bin/perl/make_ext.pl 16 Nov 2026 00:57:39 -0000 @@ -298,65 +298,64 @@ sub build_extension { } else { $makefile = 'Makefile'; } - - if (-f $makefile) { - $makefile_no_minus_f = 0; - open my $mfh, '<', $makefile or die "Cannot open $makefile: $!"; - while (<$mfh>) { - # Plagiarised from CPAN::Distribution - last if /MakeMaker post_initialize section/; - next unless /^#\s+VERSION_FROM\s+=>\s+(.+)/; - my $vmod = eval $1; - my $oldv; - while (<$mfh>) { - next unless /^XS_VERSION = (\S+)/; - $oldv = $1; - last; - } - last unless defined $oldv; - require ExtUtils::MM_Unix; - defined (my $newv = parse_version MM $vmod) or last; - if (version->parse($newv) ne $oldv) { - close $mfh or die "close $makefile: $!"; - _unlink($makefile); - { - no warnings 'deprecated'; - goto NO_MAKEFILE; - } - } - } - if (IS_CROSS) { - # If we're cross-compiling, it's possible that the host's - # Makefiles are around. - seek($mfh, 0, 0) or die "Cannot seek $makefile: $!"; - - my $cross_makefile; + MAKEFILE_CHECK: { + if (-f $makefile) { + $makefile_no_minus_f = 0; + open my $mfh, '<', $makefile or die "Cannot open $makefile: $!"; while (<$mfh>) { - # XXX This might not be throughout enough. - # For example, it's possible to cause a false-positive - # if cross compiling on and for the Raspberry Pi, - # which is insane but plausible. - # False positives are really not troublesome, though; - # all they mean is that the module gets rebuilt. - if (/^CC = \Q$Config{cc}\E/) { - $cross_makefile = 1; + # Plagiarised from CPAN::Distribution + last if /MakeMaker post_initialize section/; + next unless /^#\s+VERSION_FROM\s+=>\s+(.+)/; + my $vmod = eval $1; + my $oldv; + while (<$mfh>) { + next unless /^XS_VERSION = (\S+)/; + $oldv = $1; last; } + last unless defined $oldv; + require ExtUtils::MM_Unix; + defined (my $newv = parse_version MM $vmod) or last; + if (version->parse($newv) ne $oldv) { + close $mfh or die "close $makefile: $!"; + _unlink($makefile); + $makefile_no_minus_f = 1; + last MAKEFILE_CHECK; + } } - - if (!$cross_makefile) { - print "Deleting non-Cross makefile\n"; - close $mfh or die "close $makefile: $!"; - _unlink($makefile); + + if (IS_CROSS) { + # If we're cross-compiling, it's possible that the host's + # Makefiles are around. + seek($mfh, 0, 0) or die "Cannot seek $makefile: $!"; + + my $cross_makefile; + while (<$mfh>) { + # XXX This might not be throughout enough. + # For example, it's possible to cause a false-positive + # if cross compiling on and for the Raspberry Pi, + # which is insane but plausible. + # False positives are really not troublesome, though; + # all they mean is that the module gets rebuilt. + if (/^CC = \Q$Config{cc}\E/) { + $cross_makefile = 1; + last; + } + } + + if (!$cross_makefile) { + print "Deleting non-Cross makefile\n"; + close $mfh or die "close $makefile: $!"; + _unlink($makefile); + } } + } else { + $makefile_no_minus_f = 1; } - } else { - $makefile_no_minus_f = 1; } if ($makefile_no_minus_f || !-f $makefile) { - NO_MAKEFILE: if (!-f 'Makefile.PL') { unless (just_pm_to_blib($target, $ext_dir, $mname, $return_dir)) { # No problems returned, so it has faked everything for us. :-) Index: gnu/usr.bin/perl/makedef.pl =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/makedef.pl,v diff -u -p -a -u -p -r1.20 makedef.pl --- gnu/usr.bin/perl/makedef.pl 26 Dec 2025 22:14:12 -0000 1.20 +++ gnu/usr.bin/perl/makedef.pl 16 Nov 2026 00:57:39 -0000 @@ -2,6 +2,9 @@ # # Create the export list for perl. # +# WARNING: This file duplicates information from some of its source files, and +# must be kept in sync with changes to them. +# # Needed by WIN32 and OS/2 for creating perl.dll, # and by AIX for creating libperl.a when -Duseshrplib is in effect, # and by VMS for creating perlshr.exe. @@ -19,7 +22,7 @@ # perlvars.h # regen/opcodes # -# plus long lists of function names hard-coded directly in this script. +# plus long lists of function names (sadly) hard-coded directly in this script. # # Writes the result to STDOUT. # @@ -37,7 +40,7 @@ use warnings; my $fold; my %ARGS; -my %define; +our %define; BEGIN { %ARGS = (CCTYPE => 'MSVC', TARG_DIR => ''); @@ -145,6 +148,9 @@ if (! $define{NO_LOCALE}) { elsif ($define{HAS_SETLOCALE}) { $define{USE_LOCALE} = 1; } + else { + undef $define{USE_LOCALE}; + } } # https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B#Internal_version_numbering @@ -208,6 +214,15 @@ if ($define{MULTIPLICITY} && ( $define $define{USE_PERL_SWITCH_LOCALE_CONTEXT} = 1; } +# enable PERL_COPY_ON_WRITE by default +$define{PERL_COPY_ON_WRITE} = 1 unless $define{PERL_NO_COW}; +if ($define{PERL_COPY_ON_WRITE}) { + $define{PERL_ANY_COW} = 1; +} +else { + $define{PERL_SAWAMPERSAND} = 1; +} + # perl.h logic duplication ends #========================================================================== @@ -270,15 +285,6 @@ sub readvar { if (PLATFORM ne 'os2') { ++$skip{$_} foreach qw( PL_opsave - Perl_dump_fds - Perl_my_bcopy - Perl_my_bzero - Perl_my_chsize - Perl_my_htonl - Perl_my_memcmp - Perl_my_memset - Perl_my_ntohl - Perl_my_swap ); if (PLATFORM eq 'vms') { ++$skip{PL_statusvalue_posix}; @@ -307,48 +313,16 @@ if (PLATFORM ne 'vms') { PL_sig_ignoring PL_sig_defaulting ); - if (PLATFORM ne 'win32') { - ++$skip{$_} foreach qw( - Perl_do_spawn - Perl_do_spawn_nowait - Perl_do_aspawn - ); - } -} - -if (PLATFORM ne 'win32') { - ++$skip{$_} foreach qw( - Perl_get_context - Perl_get_win32_message_utf8ness - Perl_Win_utf8_string_to_wstring - Perl_Win_wstring_to_utf8_string - ); -} - -unless ($define{UNLINK_ALL_VERSIONS}) { - ++$skip{Perl_unlnk}; } unless ($define{'DEBUGGING'}) { ++$skip{$_} foreach qw( - Perl_debop - Perl_debprofdump - Perl_debstack - Perl_debstackptrs - Perl_pad_sv - Perl_pad_setsv - Perl_set_padlist - Perl_hv_assert PL_watchaddr PL_watchok ); } if ($define{'PERL_IMPLICIT_SYS'}) { - ++$skip{$_} foreach qw( - Perl_my_popen - Perl_my_pclose - ); ++$export{$_} foreach qw(perl_get_host_info perl_alloc_override); ++$export{perl_clone_host} if $define{USE_ITHREADS}; } @@ -363,15 +337,9 @@ else { PL_Dir PL_Sock PL_Proc - perl_alloc_using - perl_clone_using ); } -if (!$define{'PERL_COPY_ON_WRITE'} || $define{'PERL_NO_COW'}) { - ++$skip{Perl_sv_setsv_cow}; -} - unless ($define{PERL_SAWAMPERSAND}) { ++$skip{PL_sawampersand}; } @@ -382,10 +350,6 @@ unless ($define{'USE_REENTRANT_API'}) { if ($define{'MYMALLOC'}) { try_symbols(qw( - Perl_dump_mstats - Perl_get_mstats - Perl_strdup - Perl_putenv MallocCfg_ptr MallocCfgP_ptr )); @@ -396,8 +360,6 @@ if ($define{'MYMALLOC'}) { else { ++$skip{$_} foreach qw( PL_malloc_mutex - Perl_dump_mstats - Perl_get_mstats MallocCfg_ptr MallocCfgP_ptr ); @@ -428,39 +390,9 @@ unless ($define{'USE_ITHREADS'}) { PL_stashpadix PL_stashpadmax PL_veto_switch_non_tTHX_context - Perl_alloccopstash - Perl_allocfilegv - Perl_clone_params_del - Perl_clone_params_new - Perl_parser_dup - Perl_dirp_dup - Perl_cx_dup - Perl_si_dup - Perl_any_dup - Perl_ss_dup - Perl_fp_dup - Perl_gp_dup - Perl_he_dup - Perl_mg_dup - Perl_re_dup_guts - Perl_sv_dup - Perl_sv_dup_inc - Perl_rvpv_dup - Perl_hek_dup - Perl_sys_intern_dup - perl_clone - perl_clone_using - Perl_stashpv_hvname_match - Perl_regdupe_internal - Perl_newPADOP ); } -unless ($define{'USE_THREADS'}) { - ++$skip{Perl_thread_locale_init}; - ++$skip{Perl_thread_locale_term}; -} - if (!$define{USE_ITHREADS} || $define{WIN32}) { ++$skip{PL_main_thread}; } @@ -487,13 +419,6 @@ unless ($define{USE_PL_CUR_LC_ALL}) ); } -unless ($define{USE_PERL_SWITCH_LOCALE_CONTEXT}) -{ - ++$skip{$_} foreach qw( - Perl_switch_locale_context - ); -} - unless ($define{'MULTIPLICITY'}) { ++$skip{$_} foreach qw( PL_cur_locale_obj @@ -502,33 +427,9 @@ unless ($define{'MULTIPLICITY'}) { PL_my_cxt_size PL_my_cxt_keys PL_my_cxt_keys_size - Perl_croak_nocontext - Perl_die_nocontext - Perl_deb_nocontext - Perl_form_nocontext - Perl_load_module_nocontext - Perl_mess_nocontext - Perl_warn_nocontext - Perl_warner_nocontext - Perl_newSVpvf_nocontext - Perl_sv_catpvf_nocontext - Perl_sv_setpvf_nocontext - Perl_sv_catpvf_mg_nocontext - Perl_sv_setpvf_mg_nocontext - Perl_my_cxt_init - Perl_my_cxt_index ); } -unless ($define{'USE_DTRACE'}) { - ++$skip{$_} foreach qw( - Perl_dtrace_probe_call - Perl_dtrace_probe_load - Perl_dtrace_probe_op - Perl_dtrace_probe_phase - ); -} - unless ($define{'DEBUG_LEAKING_SCALARS'}) { ++$skip{PL_sv_serial}; } @@ -537,10 +438,6 @@ unless ($define{'DEBUG_LEAKING_SCALARS_F ++$skip{PL_dumper_fd}; } -unless ($define{'PERL_DONT_CREATE_GVSV'}) { - ++$skip{Perl_gv_SVadd}; -} - unless ($define{'PERL_USES_PL_PIDSTATUS'}) { ++$skip{PL_pidstatus}; } @@ -552,11 +449,6 @@ unless ($define{'PERL_TRACK_MEMPOOL'}) { unless ($define{'PERL_MEM_LOG'}) { ++$skip{$_} foreach qw( PL_mem_log - Perl_mem_log_alloc - Perl_mem_log_realloc - Perl_mem_log_free - Perl_mem_log_new_sv - Perl_mem_log_del_sv ); } @@ -594,11 +486,6 @@ if (PLATFORM eq 'vms' && !$define{KILL_B ++$skip{PL_sig_handlers_initted} unless !$define{HAS_SIGACTION}; } -if ($define{'HAS_STRNLEN'}) -{ - ++$skip{Perl_my_strnlen}; -} - unless ($define{USE_LOCALE_COLLATE}) { ++$skip{$_} foreach qw( PL_collation_ix @@ -606,8 +493,6 @@ unless ($define{USE_LOCALE_COLLATE}) { PL_collation_standard PL_collxfrm_base PL_collxfrm_mult - Perl_sv_collxfrm - Perl_sv_collxfrm_flags PL_strxfrm_NUL_replacement PL_strxfrm_is_behaved PL_strxfrm_max_cp @@ -641,38 +526,17 @@ unless ( ! $define{HAS_NL_LANGINFO} ); } -unless ($define{'USE_C_BACKTRACE'}) { - ++$skip{Perl_get_c_backtrace_dump}; - ++$skip{Perl_dump_c_backtrace}; -} - unless ($define{HAVE_INTERP_INTERN}) { ++$skip{$_} foreach qw( - Perl_sys_intern_clear - Perl_sys_intern_dup - Perl_sys_intern_init PL_sys_intern ); } - -if ($define{HAS_SIGNBIT}) { - ++$skip{Perl_signbit}; -} - ++$skip{PL_op_exec_cnt} unless $define{PERL_TRACE_OPS}; ++$skip{PL_hash_chars} unless $define{PERL_USE_SINGLE_CHAR_HASH_CACHE}; -unless ($define{PERL_RC_STACK}) { - ++$skip{$_} foreach qw( - Perl_pp_wrap - Perl_xs_wrap - Perl_runops_wrap - ); -} - # functions from *.sym files my @syms = qw(globvar.sym); @@ -765,12 +629,6 @@ push @syms, 'perlio.sym'; # PerlIO with layers - export implementation try_symbols(@layer_syms, 'perlsio_binmode'); - -unless ($define{'USE_QUADMATH'}) { - ++$skip{Perl_quadmath_format_needed}; - ++$skip{Perl_quadmath_format_single}; -} - unless ($Config{d_mbrlen}) { ++$skip{PL_mbrlen_ps}; } @@ -791,10 +649,12 @@ unless ($Config{d_wcrtomb}) { { my %seen; my ($embed_array) = setup_embed($ARGS{TARG_DIR}); - my $excludedre = $define{'NO_MATHOMS'} ? qr/[emiIsb]/ : qr/[emiIs]/; + my $excludedre = 'eiIms'; + $excludedre .= 'b' if $define{'NO_MATHOMS'}; + $excludedre = qr/[$excludedre]/; - foreach (@$embed_array) { - my $embed= $_->{embed} + foreach my $entry (@$embed_array) { + my $embed= $entry->{embed} or next; my ($flags, $retval, $func, $args) = @{$embed}{qw(flags return_type name args)}; next unless $func; @@ -808,9 +668,67 @@ unless ($Config{d_wcrtomb}) { # within the block, as the *first* definition may have flags which # mean "don't export" next if $seen{$func}++; - # Should we also skip adding the Perl_ prefix if $flags =~ /o/ ? $func = "Perl_$func" if ($flags =~ /[psX]/ && $func !~ /^Perl_/); - ++$export{$func} unless exists $skip{$func}; + + # If no conditions, export unconditionally. + if ($entry->{cond}->@* == 0) { + ++$export{$func} unless exists $skip{$func}; + } + else { + # Replace what the HeaderLine object thinks is the output line + # with this trailing portion of a condition, with a marker + $entry->{line} = + ") { ++\$export{$func} unless exists \$skip{$func} }MAKEDEF_XXX"; + + # And get HeaderParser to surround that with any #if's that it + # found when parsing embed.fnc + my $hp= HeaderParser->new(); + my $group = $hp->group_content([$entry]); + my $lines = $hp->lines_as_str($group); + + # What that returns is something like + # #if defined(USE_THREADS + # ) { ++$export{foo} }MAKEDEF_XXX + # #endif + + # The #if may have continuations; get rid of them; they + # confuse perl + $lines =~ s/ \\ $ //mxg; + + # Get rid of everything after the marker + $lines =~ s/ MAKEDEF_XXX .* //xs; + + # Convert the C conditional(s) to be like + # $define{USE_THREADS} + $lines =~ s: \b defined \( ( [^)]+ ) \) :\$define{$1}:xg; + + # And change the #if so that the result (on a single line) + # looks like + # if ($define{USE_THREADS} { ++export{foo}; } + $lines =~ s/ \#if / if ( /x; + + # Unfortunately, we have to deal specially with some functions + # that have both the E and X flags. + my $is_EX = $flags =~ tr/EX// > 1; + + # These should be visible to Perl extensions, so they need to + # be exported. And the regular expression handling is quite + # special. That is turned into a special module that has + # copies of the related .c files, and those need access to + # certain functions that normally aren't enabled outside those + # .c files. What we do here is to locally override these few + # %define entries for just these flags. (It might be that + # this could globally be done, but it is safer to restrict it + # to here.) + local $define{PERL_EXT} = 1 if $is_EX; + local $define{PERL_IN_REGCOMP_C} = 1 if $is_EX; + local $define{PERL_IN_REGEXEC_C} = 1 if $is_EX; + local $define{PERL_IN_REGCOMP_ANY} = 1 if $is_EX; + + # And eval to do the export depending on the conditions + eval $lines; + die "eval '$lines' failed: $@" if $@; + } } } } @@ -1160,6 +1078,13 @@ elsif (PLATFORM eq 'os2') { ResetWinError CroakWinError PL_do_undump + )); +} + +if ($define{USE_ITHREADS} && $define{I_PTHREAD}) { + try_symbols(qw( + perl_tsa_mutex_lock + perl_tsa_mutex_unlock )); } Index: gnu/usr.bin/perl/makedepend_file.SH =================================================================== RCS file: gnu/usr.bin/perl/makedepend_file.SH diff -N gnu/usr.bin/perl/makedepend_file.SH --- gnu/usr.bin/perl/makedepend_file.SH 15 Feb 2023 01:31:53 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,176 +0,0 @@ -#! /bin/sh -case $PERL_CONFIG_SH in -'') - if test -f config.sh; then TOP=.; - elif test -f ../config.sh; then TOP=..; - elif test -f ../../config.sh; then TOP=../..; - elif test -f ../../../config.sh; then TOP=../../..; - elif test -f ../../../../config.sh; then TOP=../../../..; - else - echo "Can't find config.sh."; exit 1 - fi - . $TOP/config.sh - ;; -esac -: This forces SH files to create target in same directory as SH file. -: This is so that make depend always knows where to find SH derivatives. -case "$0" in -*/*) cd `expr X$0 : 'X\(.*\)/'` ;; -esac - -echo "Extracting makedepend_file (with variable substitutions)" -rm -f makedepend_file -$spitshell >makedepend_file <>makedepend_file <<'!NO!SUBS!' - -file=$1 -shift -outfile=$1 -shift - -case $PERL_CONFIG_SH in -'') - if test -f config.sh; then TOP=.; - elif test -f ../config.sh; then TOP=..; - elif test -f ../../config.sh; then TOP=../..; - elif test -f ../../../config.sh; then TOP=../../..; - elif test -f ../../../../config.sh; then TOP=../../../..; - else - echo "Can't find config.sh."; exit 1 - fi - . $TOP/config.sh - ;; -esac - -# Avoid localized gcc messages -case "$ccname" in - gcc) LC_ALL=C ; export LC_ALL ;; -esac - -# We need .. when we are in the x2p directory if we are using the -# cppstdin wrapper script. -# Put .. and . first so that we pick up the present cppstdin, not -# an older one lying about in /usr/local/bin. -PATH=".$path_sep..$path_sep$PATH" -export PATH - -case "$osname" in -amigaos) cat=/bin/cat ;; # must be absolute -esac - - case "$osname" in - os2) uwinfix="-e s,\\\\\\\\,/,g" ;; - cygwin) uwinfix="-e s,\\\\\\\\,/,g" ;; - posix-bc) uwinfix="-e s/\\*POSIX(\\(.*\\))/\\1/" ;; - vos) uwinfix="-e s/\#/\\\#/" ;; - *) uwinfix="" ;; - esac - case "$file" in - *.c) filebase=`basename $file .c` ;; - *.y) filebase=`basename $file .y` ;; - esac - case "$file" in - */*) finc="-I`echo $file | sed 's#/[^/]*$##'`" ;; - *) finc= ;; - esac - $echo "Finding dependencies for $filebase$_o" - # Below, we strip out all but preprocessor directives. - # We have to take care of situations like - # #if defined(FOO) BAR /* comment line 1 - # more comment lines */ - # If we just delete text starting from the '/*' to the end of line, we will - # screw up cases like - # #if defined(FOO) /* comment */ \ - # && defined(BAR) /* comment */ \ - # && defined(BAZ) /* comment */ \ - # etc. - # Also, in lines like - # #defined FOO(a,b) a/**/b - # the comment may be important and so needs to be retained. - # This code processes the single-line comments first; it assumes there is - # at most one straightforward comment per continued preprocessor line, - # replacing each non-empty comment (and its surrounding white space) by a - # single space. (sed only has a greedy '*' quantifier, so this doesn't - # work right if there are multiple comments per line, and strings can look - # like comments to it; both are unlikely in a preprocessor statement.) Any - # continuation line is joined, and the process repeated on the enlarged - # line as long as there are continuations. At the end, if there are any - # comments remaining, they are either completely empty or are like the - # first situation. The latter are just deleted by first deleting to the - # end of line (including preceding white space) things that start with '/*' - # and the next char isn't a '*'; then things that start with '/**', but the - # next char isn't a '/'. (Subsequent lines of the comment are irrelevant - # and get dropped.) At the end, we unjoin very long lines to avoid - # preprocessor limitations - ( $echo "#line 2 \"$file\""; \ - $sed -n <$file \ - -e "/^${filebase}_init(/q" \ - -e ': tstcont' \ - -e '/^[ ]*#/s|[ ]*/\*..*\*/[ ]*| |' \ - -e '/\\$/{' \ - -e 'N' \ - -e 'b tstcont' \ - -e '}' \ - -e 's/\\\n//g' \ - -e '/^#line/d' \ - -e '/^[ ]*#/{' \ - -e 's|[ ]*/\*[^*].*$||' \ - -e 's|[ ]*/\*\*[^/].*$||' \ - -e 's/.\{255\}/&\\\n/g' \ - -e p \ - -e '}' | $grep -v ":" ) >UU/$file.c - - # We're not sure why this was there; the #endif is extraneous on modern z/OS - #if [ "$osname" = os390 -a "$file" = perly.c ]; then - # $echo '#endif' >>UU/$file.c - #fi - - if [ "$osname" = os390 ]; then - $cppstdin -DPERL_CORE $finc -I. $cppflags $cppminus /d' \ - -e '/^#.*"-"/d' \ - -e '/^#.*git_version\.h/d' \ - -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \ - -e 's/^[ ]*#[ ]*line/#/' \ - -e '/^# *[0-9][0-9]* *[".\/]/!d' \ - -e 's/^.*"\(.*\)".*$/'$filebase'\$(OBJ_EXT): \1/' \ - -e 's/^# *[0-9][0-9]* \(.*\)$/'$filebase'\$(OBJ_EXT): \1/' \ - -e 's|: \./|: |' \ - -e 's|\.c\.c|.c|' $uwinfix | \ - $uniq | $sort | $uniq >>$outfile - else - $cppstdin -DPERL_CORE $finc -I. $cppflags $cppminus $$.cout 2>$$.cerr - $sed \ - -e '1d' \ - -e '/^#.*/d' \ - -e '/^#.*/d' \ - -e '/^#.*/d' \ - -e '/^#.*/d' \ - -e '/^#.*/d' \ - -e '/^#.*"-"/d' \ - -e '/^#.*"\/.*\/"/d' \ - -e '/: file path prefix .* never used$/d' \ - -e '/^#.*git_version\.h/d' \ - -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \ - -e 's/^[ ]*#[ ]*line/#/' \ - -e '/^# *[0-9][0-9]* *[".\/]/!d' \ - -e 's/^.*"\(.*\)".*$/'$filebase'\$(OBJ_EXT): \1/' \ - -e 's/^# *[0-9][0-9]* \(.*\)$/'$filebase'\$(OBJ_EXT): \1/' \ - -e 's|: \./|: |' \ - -e 's|\.c\.c|.c|' $uwinfix $$.cout $$.cerr| \ - $uniq | $sort | $uniq >>$outfile - rm $$.cout - rm $$.cerr - fi - $echo "$filebase\$(OBJ_EXT): $@" >>$outfile - -!NO!SUBS! -$eunicefix makedepend_file -chmod +x makedepend_file Index: gnu/usr.bin/perl/makedependfile.SH =================================================================== RCS file: gnu/usr.bin/perl/makedependfile.SH diff -N gnu/usr.bin/perl/makedependfile.SH --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/usr.bin/perl/makedependfile.SH 16 Nov 2026 00:57:39 -0000 @@ -0,0 +1,181 @@ +#! /bin/sh +case $PERL_CONFIG_SH in +'') + if test -f config.sh; then TOP=.; + elif test -f ../config.sh; then TOP=..; + elif test -f ../../config.sh; then TOP=../..; + elif test -f ../../../config.sh; then TOP=../../..; + elif test -f ../../../../config.sh; then TOP=../../../..; + else + echo "Can't find config.sh."; exit 1 + fi + . $TOP/config.sh + ;; +esac +: This forces SH files to create target in same directory as SH file. +: This is so that make depend always knows where to find SH derivatives. +case "$0" in +*/*) cd `expr X$0 : 'X\(.*\)/'` ;; +esac + +echo "Extracting makedependfile (with variable substitutions)" +rm -f makedependfile +$spitshell >makedependfile <>makedependfile <<'!NO!SUBS!' + +file=$1 +shift +outfile=$1 +shift + +case $PERL_CONFIG_SH in +'') + if test -f config.sh; then TOP=.; + elif test -f ../config.sh; then TOP=..; + elif test -f ../../config.sh; then TOP=../..; + elif test -f ../../../config.sh; then TOP=../../..; + elif test -f ../../../../config.sh; then TOP=../../../..; + else + echo "Can't find config.sh."; exit 1 + fi + . $TOP/config.sh + ;; +esac + +# Avoid localized gcc messages +case "$ccname" in + gcc) LC_ALL=C ; export LC_ALL ;; +esac + +# We need .. when we are in the x2p directory if we are using the +# cppstdin wrapper script. +# Put .. and . first so that we pick up the present cppstdin, not +# an older one lying about in /usr/local/bin. +PATH=".$path_sep..$path_sep$PATH" +export PATH + +case "$osname" in +amigaos) cat=/bin/cat ;; # must be absolute +esac + + case "$osname" in + os2) uwinfix="-e s,\\\\\\\\,/,g" ;; + cygwin) uwinfix="-e s,\\\\\\\\,/,g" ;; + posix-bc) uwinfix="-e s/\\*POSIX(\\(.*\\))/\\1/" ;; + vos) uwinfix="-e s/\#/\\\#/" ;; + *) uwinfix="" ;; + esac + case "$file" in + *.c) filebase=`basename $file .c` ;; + *.y) filebase=`basename $file .y` ;; + esac + case "$file" in + */*) finc="-I`echo $file | sed 's#/[^/]*$##'`" ;; + *) finc= ;; + esac + $echo "Finding dependencies for $filebase$_o" + # Below, we strip out all but preprocessor directives. + # We have to take care of situations like + # #if defined(FOO) BAR /* comment line 1 + # more comment lines */ + # If we just delete text starting from the '/*' to the end of line, we will + # screw up cases like + # #if defined(FOO) /* comment */ \ + # && defined(BAR) /* comment */ \ + # && defined(BAZ) /* comment */ \ + # etc. + # Also, in lines like + # #defined FOO(a,b) a/**/b + # the comment may be important and so needs to be retained. + # This code processes the single-line comments first; it assumes there is + # at most one straightforward comment per continued preprocessor line, + # replacing each non-empty comment (and its surrounding white space) by a + # single space. (sed only has a greedy '*' quantifier, so this doesn't + # work right if there are multiple comments per line, and strings can look + # like comments to it; both are unlikely in a preprocessor statement.) Any + # continuation line is joined, and the process repeated on the enlarged + # line as long as there are continuations. At the end, if there are any + # comments remaining, they are either completely empty or are like the + # first situation. The latter are just deleted by first deleting to the + # end of line (including preceding white space) things that start with '/*' + # and the next char isn't a '*'; then things that start with '/**', but the + # next char isn't a '/'. (Subsequent lines of the comment are irrelevant + # and get dropped.) At the end, we unjoin very long lines to avoid + # preprocessor limitations + ( $echo "#line 2 \"$file\""; \ + $sed -n <$file \ + -e "/^${filebase}_init(/q" \ + -e ': tstcont' \ + -e '/^[ ]*#/s|[ ]*/\*..*\*/[ ]*| |' \ + -e '/\\$/{' \ + -e 'N' \ + -e 'b tstcont' \ + -e '}' \ + -e 's/\\\n//g' \ + -e '/^#line/d' \ + -e '/^[ ]*#/{' \ + -e 's|[ ]*/\*[^*].*$||' \ + -e 's|[ ]*/\*\*[^/].*$||' \ + -e 's/.\{255\}/&\\\n/g' \ + -e p \ + -e '}' | $grep -v ":" ) >UU/$file.c + + # We're not sure why this was there; the #endif is extraneous on modern z/OS + #if [ "$osname" = os390 -a "$file" = perly.c ]; then + # $echo '#endif' >>UU/$file.c + #fi + + if [ "$osname" = os390 ]; then + $cppstdin -DPERL_CORE $finc -I. $cppflags $cppminus /d' \ + -e '/^#.*/d' \ + -e '/^#.*/d' \ + -e '/^#.*/d' \ + -e '/^#.*/d' \ + -e '/".*In file included from.*:/d' \' + -e '/^#.*"-"/d' \ + -e '/^#.*git_version\.h/d' \ + -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \ + -e 's/^[ ]*#[ ]*line/#/' \ + -e '/^# *[0-9][0-9]* *[".\/]/!d' \ + -e 's/^.*"\(.*\)".*$/'$filebase'\$(OBJ_EXT): \1/' \ + -e 's/^# *[0-9][0-9]* \(.*\)$/'$filebase'\$(OBJ_EXT): \1/' \ + -e 's|: \./|: |' \ + -e 's|\.c\.c|.c|' $uwinfix | \ + $uniq | $sort | $uniq >>$outfile + else + $cppstdin -DPERL_CORE $finc -I. $cppflags $cppminus $$.cout 2>$$.cerr + $sed \ + -e '1d' \ + -e '/^#.*/d' \ + -e '/^#.*/d' \ + -e '/^#.*/d' \ + -e '/^#.*/d' \ + -e '/^#.*/d' \ + -e '/^#.*"-"/d' \ + -e '/^#.*"\/.*\/"/d' \ + -e '/: file path prefix .* never used$/d' \ + -e '/^#.*git_version\.h/d' \ + -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \ + -e 's/^[ ]*#[ ]*line/#/' \ + -e '/^# *[0-9][0-9]* *[".\/]/!d' \ + -e 's/^.*"\(.*\)".*$/'$filebase'\$(OBJ_EXT): \1/' \ + -e 's/^# *[0-9][0-9]* \(.*\)$/'$filebase'\$(OBJ_EXT): \1/' \ + -e 's|: \./|: |' \ + -e 's|\.c\.c|.c|' $uwinfix $$.cout $$.cerr| \ + $uniq | $sort | $uniq >>$outfile + rm $$.cout + rm $$.cerr + fi + $echo "$filebase\$(OBJ_EXT): $@" >>$outfile + +!NO!SUBS! +$eunicefix makedependfile +chmod +x makedependfile Index: gnu/usr.bin/perl/malloc.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/malloc.c,v diff -u -p -a -u -p -r1.23 malloc.c --- gnu/usr.bin/perl/malloc.c 26 Dec 2025 22:14:12 -0000 1.23 +++ gnu/usr.bin/perl/malloc.c 16 Nov 2026 00:57:39 -0000 @@ -1163,15 +1163,15 @@ cmp_pat_4bytes(unsigned char *s, size_t # define FILLCHECK_DEADBEEF(s, n) ((void)0) #endif -STATIC int +static int S_adjust_size_and_find_bucket(size_t *nbytes_p) { + PERL_ARGS_ASSERT_ADJUST_SIZE_AND_FIND_BUCKET; + MEM_SIZE shiftr; int bucket; size_t nbytes; - PERL_ARGS_ASSERT_ADJUST_SIZE_AND_FIND_BUCKET; - nbytes = *nbytes_p; /* @@ -1222,6 +1222,8 @@ Implements L> which you Malloc_t Perl_malloc(size_t nbytes) { + PERL_ARGS_ASSERT_MALLOC; + union overhead *p; int bucket; #if defined(DEBUGGING) || defined(RCHECK) @@ -1795,6 +1797,8 @@ Implements L> which Free_t Perl_mfree(Malloc_t where) { + PERL_ARGS_ASSERT_MFREE; + MEM_SIZE size; union overhead *ovp; char *cp = (char*)where; @@ -1895,6 +1899,8 @@ Implements L> which you Malloc_t Perl_realloc(void *mp, size_t nbytes) { + PERL_ARGS_ASSERT_REALLOC; + MEM_SIZE onb; union overhead *ovp; char *res; @@ -2090,6 +2096,8 @@ Implements L> which you Malloc_t Perl_calloc(size_t elements, size_t size) { + PERL_ARGS_ASSERT_CALLOC; + long sz = elements * size; Malloc_t p = Perl_malloc(sz); @@ -2139,12 +2147,12 @@ Perl_putenv(char *a) MEM_SIZE Perl_malloced_size(void *p) { + PERL_ARGS_ASSERT_MALLOCED_SIZE; + union overhead * const ovp = (union overhead *) ((caddr_t)p - sizeof (union overhead) * CHUNK_SHIFT); const int bucket = OV_INDEX(ovp); - PERL_ARGS_ASSERT_MALLOCED_SIZE; - #ifdef RCHECK /* The caller wants to have a complete control over the chunk, disable the memory checking inside the chunk. */ @@ -2161,6 +2169,8 @@ Perl_malloced_size(void *p) MEM_SIZE Perl_malloc_good_size(size_t wanted) { + PERL_ARGS_ASSERT_MALLOC_GOOD_SIZE; + return BUCKET_SIZE_REAL(adjust_size_and_find_bucket(&wanted)); } @@ -2173,13 +2183,13 @@ Perl_malloc_good_size(size_t wanted) int Perl_get_mstats(pTHX_ perl_mstats_t *buf, int buflen, int level) { + PERL_ARGS_ASSERT_GET_MSTATS; + #ifdef DEBUGGING_MSTATS int i, j; union overhead *p; struct chunk_chain_s* nextchain; - PERL_ARGS_ASSERT_GET_MSTATS; - buf->topbucket = buf->topbucket_ev = buf->topbucket_odd = buf->totfree = buf->total = buf->total_chain = 0; @@ -2243,13 +2253,13 @@ S<"after compilation">. void Perl_dump_mstats(pTHX_ const char *s) { + PERL_ARGS_ASSERT_DUMP_MSTATS; + #ifdef DEBUGGING_MSTATS int i; perl_mstats_t buffer; UV nf[NBUCKETS]; UV nt[NBUCKETS]; - - PERL_ARGS_ASSERT_DUMP_MSTATS; buffer.nfree = nf; buffer.ntotal = nt; Index: gnu/usr.bin/perl/mathoms.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/mathoms.c,v diff -u -p -a -u -p -r1.8 mathoms.c --- gnu/usr.bin/perl/mathoms.c 26 Dec 2025 22:14:12 -0000 1.8 +++ gnu/usr.bin/perl/mathoms.c 16 Nov 2026 00:57:39 -0000 @@ -22,11 +22,14 @@ /* * This file contains mathoms, various binary artifacts from previous * versions of Perl which we cannot completely remove from the core - * code. There is only one reason these days for functions should be here: + * code. The remaining reasons functions should be here are: * * 1) A function has been replaced by a macro within a minor release, * so XS modules compiled against an older release will expect to * still be able to link against the function + * 2) A function is deprecated, and so placing it here will cause a compiler + * warning to be generated (for participating compilers). + * 3) A few other reasons, documented with the functions below * * It used to be that this was the way to handle the case were a function * Perl_foo(...) had been replaced by a macro. But see the 'm' flag discussion @@ -73,291 +76,24 @@ * without a compiler warning */ GCC_DIAG_IGNORE(-Wdeprecated-declarations) -/* ref() is now a macro using Perl_doref; - * this version provided for binary compatibility only. - */ -OP * -Perl_ref(pTHX_ OP *o, I32 type) -{ - return doref(o, type, TRUE); -} - -void -Perl_sv_unref(pTHX_ SV *sv) -{ - PERL_ARGS_ASSERT_SV_UNREF; - - sv_unref_flags(sv, 0); -} - -/* -=for apidoc_section $tainting -=for apidoc sv_taint - -Taint an SV. Use C instead. - -=cut -*/ - -void -Perl_sv_taint(pTHX_ SV *sv) -{ - PERL_ARGS_ASSERT_SV_TAINT; - - sv_magic((sv), NULL, PERL_MAGIC_taint, NULL, 0); -} - -/* sv_2iv() is now a macro using Perl_sv_2iv_flags(); - * this function provided for binary compatibility only - */ - -IV -Perl_sv_2iv(pTHX_ SV *sv) -{ - PERL_ARGS_ASSERT_SV_2IV; - - return sv_2iv_flags(sv, SV_GMAGIC); -} - -/* sv_2uv() is now a macro using Perl_sv_2uv_flags(); - * this function provided for binary compatibility only - */ - -UV -Perl_sv_2uv(pTHX_ SV *sv) -{ - PERL_ARGS_ASSERT_SV_2UV; - - return sv_2uv_flags(sv, SV_GMAGIC); -} - -/* sv_2nv() is now a macro using Perl_sv_2nv_flags(); - * this function provided for binary compatibility only - */ - -NV -Perl_sv_2nv(pTHX_ SV *sv) -{ - return sv_2nv_flags(sv, SV_GMAGIC); -} - - -/* sv_2pv() is now a macro using Perl_sv_2pv_flags(); - * this function provided for binary compatibility only - */ - -char * -Perl_sv_2pv(pTHX_ SV *sv, STRLEN *lp) -{ - PERL_ARGS_ASSERT_SV_2PV; - - return sv_2pv_flags(sv, lp, SV_GMAGIC); -} - -/* -=for apidoc_section $SV -=for apidoc sv_2pv_nolen - -Like C, but doesn't return the length too. You should usually -use the macro wrapper C instead. - -=cut -*/ - -char * -Perl_sv_2pv_nolen(pTHX_ SV *sv) -{ - PERL_ARGS_ASSERT_SV_2PV_NOLEN; - return sv_2pv(sv, NULL); -} - -/* -=for apidoc_section $SV -=for apidoc sv_2pvbyte_nolen - -Return a pointer to the byte-encoded representation of the SV. -May cause the SV to be downgraded from UTF-8 as a side-effect. - -Usually accessed via the C macro. - -=cut -*/ - -char * -Perl_sv_2pvbyte_nolen(pTHX_ SV *sv) -{ - PERL_ARGS_ASSERT_SV_2PVBYTE_NOLEN; - - return sv_2pvbyte(sv, NULL); -} - -/* -=for apidoc_section $SV -=for apidoc sv_2pvutf8_nolen - -Return a pointer to the UTF-8-encoded representation of the SV. -May cause the SV to be upgraded to UTF-8 as a side-effect. - -Usually accessed via the C macro. - -=cut -*/ - -char * -Perl_sv_2pvutf8_nolen(pTHX_ SV *sv) -{ - PERL_ARGS_ASSERT_SV_2PVUTF8_NOLEN; - - return sv_2pvutf8(sv, NULL); -} - void -Perl_sv_force_normal(pTHX_ SV *sv) +Perl_load_mathoms() { - PERL_ARGS_ASSERT_SV_FORCE_NORMAL; + PERL_ARGS_ASSERT_LOAD_MATHOMS; - sv_force_normal_flags(sv, 0); + /* This exists only to make sure the functions in this file get loaded, as + * it is referred to by a structure element in intrpvar.h */ } -/* sv_setsv() is now a macro using Perl_sv_setsv_flags(); - * this function provided for binary compatibility only - */ - -void -Perl_sv_setsv(pTHX_ SV *dsv, SV *ssv) -{ - PERL_ARGS_ASSERT_SV_SETSV; - - sv_setsv_flags(dsv, ssv, SV_GMAGIC); -} - -/* sv_catpvn() is now a macro using Perl_sv_catpvn_flags(); - * this function provided for binary compatibility only - */ - -void -Perl_sv_catpvn(pTHX_ SV *dsv, const char* sstr, STRLEN slen) -{ - PERL_ARGS_ASSERT_SV_CATPVN; - - sv_catpvn_flags(dsv, sstr, slen, SV_GMAGIC); -} - -void -Perl_sv_catpvn_mg(pTHX_ SV *dsv, const char *sstr, STRLEN len) -{ - PERL_ARGS_ASSERT_SV_CATPVN_MG; - - sv_catpvn_flags(dsv,sstr,len,SV_GMAGIC|SV_SMAGIC); -} - -/* sv_catsv() is now a macro using Perl_sv_catsv_flags(); - * this function provided for binary compatibility only - */ - -void -Perl_sv_catsv(pTHX_ SV *dsv, SV * const sstr) -{ - PERL_ARGS_ASSERT_SV_CATSV; - - sv_catsv_flags(dsv, sstr, SV_GMAGIC); -} - -void -Perl_sv_catsv_mg(pTHX_ SV *dsv, SV * const sstr) -{ - PERL_ARGS_ASSERT_SV_CATSV_MG; - - sv_catsv_flags(dsv,sstr,SV_GMAGIC|SV_SMAGIC); -} - -/* -=for apidoc_section $SV -=for apidoc sv_pv - -Use the C macro instead - -=cut -*/ - -/* sv_pv() is now a macro using SvPV_nolen(); - * this function provided for binary compatibility only - */ - -char * -Perl_sv_pv(pTHX_ SV *sv) -{ - PERL_ARGS_ASSERT_SV_PV; - - if (SvPOK(sv)) - return SvPVX(sv); - - return sv_2pv(sv, NULL); -} - -/* sv_pvn_force() is now a macro using Perl_sv_pvn_force_flags(); - * this function provided for binary compatibility only - */ - -char * -Perl_sv_pvn_force(pTHX_ SV *sv, STRLEN *lp) -{ - PERL_ARGS_ASSERT_SV_PVN_FORCE; - - return sv_pvn_force_flags(sv, lp, SV_GMAGIC); -} - -/* sv_pvbyte () is now a macro using Perl_sv_2pv_flags(); - * this function provided for binary compatibility only - */ - -char * -Perl_sv_pvbyte(pTHX_ SV *sv) -{ - PERL_ARGS_ASSERT_SV_PVBYTE; - - (void)sv_utf8_downgrade(sv, FALSE); - return sv_pv(sv); -} - -/* -=for apidoc_section $SV -=for apidoc sv_pvbyte - -Use C instead. - -=cut -*/ - -/* -=for apidoc_section $SV -=for apidoc sv_pvutf8 - -Use the C macro instead - -=cut -*/ - - -char * -Perl_sv_pvutf8(pTHX_ SV *sv) -{ - PERL_ARGS_ASSERT_SV_PVUTF8; - - sv_utf8_upgrade(sv); - return sv_pv(sv); -} - -/* sv_utf8_upgrade() is now a macro using sv_utf8_upgrade_flags(); - * this function provided for binary compatibility only +/* ref() is now a macro using Perl_doref; + * this version provided for binary compatibility only. */ - -STRLEN -Perl_sv_utf8_upgrade(pTHX_ SV *sv) +OP * +Perl_ref(pTHX_ OP *o, I32 type) { - PERL_ARGS_ASSERT_SV_UTF8_UPGRADE; + PERL_ARGS_ASSERT_REF; - return sv_utf8_upgrade_flags(sv, SV_GMAGIC); + return doref(o, type, TRUE); } #if defined(HUGE_VAL) || (defined(USE_LONG_DOUBLE) && defined(HUGE_VALL)) @@ -377,397 +113,6 @@ Perl_huge(void) } #endif -void -Perl_gv_fullname3(pTHX_ SV *sv, const GV *gv, const char *prefix) -{ - PERL_ARGS_ASSERT_GV_FULLNAME3; - - gv_fullname4(sv, gv, prefix, TRUE); -} - -void -Perl_gv_efullname3(pTHX_ SV *sv, const GV *gv, const char *prefix) -{ - PERL_ARGS_ASSERT_GV_EFULLNAME3; - - gv_efullname4(sv, gv, prefix, TRUE); -} - -GV * -Perl_gv_fetchmethod(pTHX_ HV *stash, const char *name) -{ - PERL_ARGS_ASSERT_GV_FETCHMETHOD; - - return gv_fetchmethod_autoload(stash, name, TRUE); -} - -HE * -Perl_hv_iternext(pTHX_ HV *hv) -{ - PERL_ARGS_ASSERT_HV_ITERNEXT; - - return hv_iternext_flags(hv, 0); -} - -void -Perl_hv_magic(pTHX_ HV *hv, GV *gv, int how) -{ - PERL_ARGS_ASSERT_HV_MAGIC; - - sv_magic(MUTABLE_SV(hv), MUTABLE_SV(gv), how, NULL, 0); -} - -bool -Perl_do_open(pTHX_ GV *gv, const char *name, I32 len, int as_raw, - int rawmode, int rawperm, PerlIO *supplied_fp) -{ - PERL_ARGS_ASSERT_DO_OPEN; - - return do_openn(gv, name, len, as_raw, rawmode, rawperm, - supplied_fp, (SV **) NULL, 0); -} - -#ifndef OS2 -bool -Perl_do_aexec(pTHX_ SV *really, SV **mark, SV **sp) -{ - PERL_ARGS_ASSERT_DO_AEXEC; - - return do_aexec5(really, mark, sp, 0, 0); -} -#endif - -/* -=for apidoc_section $SV -=for apidoc sv_nolocking - -Dummy routine which "locks" an SV when there is no locking module present. -Exists to avoid test for a C function pointer and because it could -potentially warn under some level of strict-ness. - -"Superseded" by C. - -=cut -*/ - -void -Perl_sv_nolocking(pTHX_ SV *sv) -{ - PERL_UNUSED_CONTEXT; - PERL_UNUSED_ARG(sv); -} - - -/* -=for apidoc_section $SV -=for apidoc sv_nounlocking - -Dummy routine which "unlocks" an SV when there is no locking module present. -Exists to avoid test for a C function pointer and because it could -potentially warn under some level of strict-ness. - -"Superseded" by C. - -=cut - -PERL_UNLOCK_HOOK in intrpvar.h is the macro that refers to this, and guarantees -that mathoms gets loaded. - -*/ - -void -Perl_sv_nounlocking(pTHX_ SV *sv) -{ - PERL_UNUSED_CONTEXT; - PERL_UNUSED_ARG(sv); -} - -void -Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len) -{ - PERL_ARGS_ASSERT_SV_USEPVN_MG; - - sv_usepvn_flags(sv,ptr,len, SV_SMAGIC); -} - - -void -Perl_sv_usepvn(pTHX_ SV *sv, char *ptr, STRLEN len) -{ - PERL_ARGS_ASSERT_SV_USEPVN; - - sv_usepvn_flags(sv,ptr,len, 0); -} - -HE * -Perl_hv_store_ent(pTHX_ HV *hv, SV *keysv, SV *val, U32 hash) -{ - return (HE *)hv_common(hv, keysv, NULL, 0, 0, HV_FETCH_ISSTORE, val, hash); -} - -bool -Perl_hv_exists_ent(pTHX_ HV *hv, SV *keysv, U32 hash) -{ - PERL_ARGS_ASSERT_HV_EXISTS_ENT; - - return cBOOL(hv_common(hv, keysv, NULL, 0, 0, HV_FETCH_ISEXISTS, 0, hash)); -} - -HE * -Perl_hv_fetch_ent(pTHX_ HV *hv, SV *keysv, I32 lval, U32 hash) -{ - PERL_ARGS_ASSERT_HV_FETCH_ENT; - - return (HE *)hv_common(hv, keysv, NULL, 0, 0, - (lval ? HV_FETCH_LVALUE : 0), NULL, hash); -} - -SV * -Perl_hv_delete_ent(pTHX_ HV *hv, SV *keysv, I32 flags, U32 hash) -{ - PERL_ARGS_ASSERT_HV_DELETE_ENT; - - return MUTABLE_SV(hv_common(hv, keysv, NULL, 0, 0, flags | HV_DELETE, NULL, - hash)); -} - -SV** -Perl_hv_store_flags(pTHX_ HV *hv, const char *key, I32 klen, SV *val, U32 hash, - int flags) -{ - return (SV**) hv_common(hv, NULL, key, klen, flags, - (HV_FETCH_ISSTORE|HV_FETCH_JUST_SV), val, hash); -} - -SV** -Perl_hv_store(pTHX_ HV *hv, const char *key, I32 klen_i32, SV *val, U32 hash) -{ - STRLEN klen; - int flags; - - if (klen_i32 < 0) { - klen = -klen_i32; - flags = HVhek_UTF8; - } else { - klen = klen_i32; - flags = 0; - } - return (SV **) hv_common(hv, NULL, key, klen, flags, - (HV_FETCH_ISSTORE|HV_FETCH_JUST_SV), val, hash); -} - -bool -Perl_hv_exists(pTHX_ HV *hv, const char *key, I32 klen_i32) -{ - STRLEN klen; - int flags; - - PERL_ARGS_ASSERT_HV_EXISTS; - - if (klen_i32 < 0) { - klen = -klen_i32; - flags = HVhek_UTF8; - } else { - klen = klen_i32; - flags = 0; - } - return cBOOL(hv_common(hv, NULL, key, klen, flags, HV_FETCH_ISEXISTS, 0, 0)); -} - -SV** -Perl_hv_fetch(pTHX_ HV *hv, const char *key, I32 klen_i32, I32 lval) -{ - STRLEN klen; - int flags; - - PERL_ARGS_ASSERT_HV_FETCH; - - if (klen_i32 < 0) { - klen = -klen_i32; - flags = HVhek_UTF8; - } else { - klen = klen_i32; - flags = 0; - } - return (SV **) hv_common(hv, NULL, key, klen, flags, - lval ? (HV_FETCH_JUST_SV | HV_FETCH_LVALUE) - : HV_FETCH_JUST_SV, NULL, 0); -} - -SV * -Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen_i32, I32 flags) -{ - STRLEN klen; - int k_flags; - - PERL_ARGS_ASSERT_HV_DELETE; - - if (klen_i32 < 0) { - klen = -klen_i32; - k_flags = HVhek_UTF8; - } else { - klen = klen_i32; - k_flags = 0; - } - return MUTABLE_SV(hv_common(hv, NULL, key, klen, k_flags, flags | HV_DELETE, - NULL, 0)); -} - -AV * -Perl_newAV(pTHX) -{ - return MUTABLE_AV(newSV_type(SVt_PVAV)); - /* sv_upgrade does AvREAL_only(): - AvALLOC(av) = 0; - AvARRAY(av) = NULL; - AvMAX(av) = AvFILLp(av) = -1; */ -} - -HV * -Perl_newHV(pTHX) -{ - HV * const hv = MUTABLE_HV(newSV_type(SVt_PVHV)); - assert(!SvOK(hv)); - - return hv; -} - -void -Perl_sv_insert(pTHX_ SV *const bigstr, const STRLEN offset, const STRLEN len, - const char *const little, const STRLEN littlelen) -{ - PERL_ARGS_ASSERT_SV_INSERT; - sv_insert_flags(bigstr, offset, len, little, littlelen, SV_GMAGIC); -} - -void -Perl_save_freesv(pTHX_ SV *sv) -{ - save_freesv(sv); -} - -void -Perl_save_mortalizesv(pTHX_ SV *sv) -{ - PERL_ARGS_ASSERT_SAVE_MORTALIZESV; - - save_mortalizesv(sv); -} - -void -Perl_save_freeop(pTHX_ OP *o) -{ - save_freeop(o); -} - -void -Perl_save_freepv(pTHX_ char *pv) -{ - save_freepv(pv); -} - -void -Perl_save_op(pTHX) -{ - save_op(); -} - -#ifdef PERL_DONT_CREATE_GVSV -GV * -Perl_gv_SVadd(pTHX_ GV *gv) -{ - return gv_SVadd(gv); -} -#endif - -GV * -Perl_gv_AVadd(pTHX_ GV *gv) -{ - return gv_AVadd(gv); -} - -GV * -Perl_gv_HVadd(pTHX_ GV *gv) -{ - return gv_HVadd(gv); -} - -GV * -Perl_gv_IOadd(pTHX_ GV *gv) -{ - return gv_IOadd(gv); -} - -IO * -Perl_newIO(pTHX) -{ - return MUTABLE_IO(newSV_type(SVt_PVIO)); -} - -I32 -Perl_my_stat(pTHX) -{ - return my_stat_flags(SV_GMAGIC); -} - -I32 -Perl_my_lstat(pTHX) -{ - return my_lstat_flags(SV_GMAGIC); -} - -I32 -Perl_sv_eq(pTHX_ SV *sv1, SV *sv2) -{ - return sv_eq_flags(sv1, sv2, SV_GMAGIC); -} - -#ifdef USE_LOCALE_COLLATE -char * -Perl_sv_collxfrm(pTHX_ SV *const sv, STRLEN *const nxp) -{ - PERL_ARGS_ASSERT_SV_COLLXFRM; - return sv_collxfrm_flags(sv, nxp, SV_GMAGIC); -} - -#endif - -bool -Perl_sv_2bool(pTHX_ SV *const sv) -{ - PERL_ARGS_ASSERT_SV_2BOOL; - return sv_2bool_flags(sv, SV_GMAGIC); -} - -CV * -Perl_newSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *block) -{ - return newATTRSUB(floor, o, proto, NULL, block); -} - -SV * -Perl_sv_mortalcopy(pTHX_ SV *const oldsv) -{ - return Perl_sv_mortalcopy_flags(aTHX_ oldsv, SV_GMAGIC); -} - -void -Perl_sv_copypv(pTHX_ SV *const dsv, SV *const ssv) -{ - PERL_ARGS_ASSERT_SV_COPYPV; - - sv_copypv_flags(dsv, ssv, SV_GMAGIC); -} - -STRLEN -Perl_is_utf8_char_buf(const U8 *buf, const U8* buf_end) -{ - - PERL_ARGS_ASSERT_IS_UTF8_CHAR_BUF; - - return isUTF8_CHAR(buf, buf_end); -} - /* =for apidoc_section $unicode =for apidoc utf8_to_uvuni @@ -791,6 +136,8 @@ next possible position in C that coul See L for details on when the REPLACEMENT CHARACTER is returned. =cut + +Deprecated since 5.38 */ UV @@ -799,37 +146,7 @@ Perl_utf8_to_uvuni(pTHX_ const U8 *s, ST PERL_UNUSED_CONTEXT; PERL_ARGS_ASSERT_UTF8_TO_UVUNI; - return NATIVE_TO_UNI(valid_utf8_to_uvchr(s, retlen)); -} - -SV * -Perl_newSVsv(pTHX_ SV *const old) -{ - return newSVsv(old); -} - -bool -Perl_sv_utf8_downgrade(pTHX_ SV *const sv, const bool fail_ok) -{ - PERL_ARGS_ASSERT_SV_UTF8_DOWNGRADE; - - return sv_utf8_downgrade(sv, fail_ok); -} - -char * -Perl_sv_2pvutf8(pTHX_ SV *sv, STRLEN *const lp) -{ - PERL_ARGS_ASSERT_SV_2PVUTF8; - - return sv_2pvutf8(sv, lp); -} - -char * -Perl_sv_2pvbyte(pTHX_ SV *sv, STRLEN *const lp) -{ - PERL_ARGS_ASSERT_SV_2PVBYTE; - - return sv_2pvbyte(sv, lp); + return NATIVE_TO_UNI(valid_utf8_to_uv(s, retlen)); } U8 * @@ -860,7 +177,7 @@ convert to Unicode using L= C. See C>. int Perl_mg_get(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_MG_GET; + const SSize_t mgs_ix = SSNEW(sizeof(MGS)); bool saved = FALSE; bool have_new = 0; bool taint_only = TRUE; /* the only get method seen is taint */ MAGIC *newmg, *head, *cur, *mg; - PERL_ARGS_ASSERT_MG_GET; - if (PL_localizing == 1 && sv == DEFSV) return 0; /* We must call svt_get(sv, mg) for each valid entry in the linked @@ -269,12 +270,12 @@ Do magic after a value is assigned to th int Perl_mg_set(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_MG_SET; + const SSize_t mgs_ix = SSNEW(sizeof(MGS)); MAGIC* mg; MAGIC* nextmg; - PERL_ARGS_ASSERT_MG_SET; - if (PL_localizing == 2 && sv == DEFSV) return 0; save_magic_flags(mgs_ix, sv, SVs_GMG|SVs_SMG); /* leave SVs_RMG on */ @@ -300,10 +301,10 @@ Perl_mg_set(pTHX_ SV *sv) I32 Perl_mg_size(pTHX_ SV *sv) { - MAGIC* mg; - PERL_ARGS_ASSERT_MG_SIZE; + MAGIC* mg; + for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) { const MGVTBL* const vtbl = mg->mg_virtual; if (vtbl && vtbl->svt_len) { @@ -340,12 +341,12 @@ Clear something magical that the SV repr int Perl_mg_clear(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_MG_CLEAR; + const SSize_t mgs_ix = SSNEW(sizeof(MGS)); MAGIC* mg; MAGIC *nextmg; - PERL_ARGS_ASSERT_MG_CLEAR; - save_magic(mgs_ix, sv); for (mg = SvMAGIC(sv); mg; mg = nextmg) { @@ -391,6 +392,8 @@ Finds the magic pointer for C matc MAGIC* Perl_mg_find(const SV *sv, int type) { + PERL_ARGS_ASSERT_MG_FIND; + return S_mg_findext_flags(sv, type, NULL, 0); } @@ -406,6 +409,8 @@ C>. MAGIC* Perl_mg_findext(const SV *sv, int type, const MGVTBL *vtbl) { + PERL_ARGS_ASSERT_MG_FINDEXT; + return S_mg_findext_flags(sv, type, vtbl, 1); } @@ -435,11 +440,11 @@ Copies the magic from one SV to another. int Perl_mg_copy(pTHX_ SV *sv, SV *nsv, const char *key, I32 klen) { + PERL_ARGS_ASSERT_MG_COPY; + int count = 0; MAGIC* mg; - PERL_ARGS_ASSERT_MG_COPY; - for (mg = SvMAGIC(sv); mg; mg = mg->mg_moremagic) { const MGVTBL* const vtbl = mg->mg_virtual; if ((mg->mg_flags & MGf_COPY) && vtbl->svt_copy){ @@ -478,10 +483,10 @@ and that will handle the magic. void Perl_mg_localize(pTHX_ SV *sv, SV *nsv, bool setmagic) { - MAGIC *mg; - PERL_ARGS_ASSERT_MG_LOCALIZE; + MAGIC *mg; + if (nsv == DEFSV) return; @@ -510,18 +515,25 @@ Perl_mg_localize(pTHX_ SV *sv, SV *nsv, } } -#define mg_free_struct(sv, mg) S_mg_free_struct(aTHX_ sv, mg) -static void -S_mg_free_struct(pTHX_ SV *sv, MAGIC *mg) +void +Perl_mg_free_struct(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MG_FREE_STRUCT; + const MGVTBL* const vtbl = mg->mg_virtual; if (vtbl && vtbl->svt_free) vtbl->svt_free(aTHX_ sv, mg); - if (mg->mg_len > 0) - Safefree(mg->mg_ptr); - else if (mg->mg_len == HEf_SVKEY) - SvREFCNT_dec(MUTABLE_SV(mg->mg_ptr)); + if(mg->mg_ptr) { + if (mg->mg_type == PERL_MAGIC_regex_global) + NOOP; + else if (mg->mg_len > 0) + Safefree(mg->mg_ptr); + else if (mg->mg_len == HEf_SVKEY) + SvREFCNT_dec(MUTABLE_SV(mg->mg_ptr)); + else if (mg->mg_type == PERL_MAGIC_utf8) + Safefree(mg->mg_ptr); + } if (mg->mg_flags & MGf_REFCOUNTED) SvREFCNT_dec(mg->mg_obj); @@ -539,11 +551,11 @@ Free any magic storage used by the SV. int Perl_mg_free(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_MG_FREE; + MAGIC* mg; MAGIC* moremagic; - PERL_ARGS_ASSERT_MG_FREE; - for (mg = SvMAGIC(sv); mg; mg = moremagic) { moremagic = mg->mg_moremagic; mg_free_struct(sv, mg); @@ -565,8 +577,9 @@ Remove any magic of type C from the void Perl_mg_free_type(pTHX_ SV *sv, int how) { - MAGIC *mg, *prevmg, *moremg; PERL_ARGS_ASSERT_MG_FREE_TYPE; + + MAGIC *mg, *prevmg, *moremg; for (prevmg = NULL, mg = SvMAGIC(sv); mg; prevmg = mg, mg = moremg) { moremg = mg->mg_moremagic; if (mg->mg_type == how) { @@ -601,8 +614,9 @@ C is equivale void Perl_mg_freeext(pTHX_ SV *sv, int how, const MGVTBL *vtbl) { - MAGIC *mg, *prevmg, *moremg; PERL_ARGS_ASSERT_MG_FREEEXT; + + MAGIC *mg, *prevmg, *moremg; for (prevmg = NULL, mg = SvMAGIC(sv); mg; prevmg = mg, mg = moremg) { MAGIC *newhead; moremg = mg->mg_moremagic; @@ -778,6 +792,8 @@ Perl_emulate_cop_io(pTHX_ const COP *con int Perl_get_extended_os_errno(void) { + PERL_ARGS_ASSERT_GET_EXTENDED_OS_ERRNO; + #if defined(VMS) @@ -808,14 +824,14 @@ Perl_get_extended_os_errno(void) } -STATIC void +static void S_fixup_errno_string(pTHX_ SV* sv) { + PERL_ARGS_ASSERT_FIXUP_ERRNO_STRING; + /* Do what is necessary to fixup the non-empty string in 'sv' for return to * Perl space. */ - PERL_ARGS_ASSERT_FIXUP_ERRNO_STRING; - assert(SvOK(sv)); if(strEQ(SvPVX(sv), "")) { @@ -857,6 +873,8 @@ string (currently empty) is returned. SV * Perl_sv_string_from_errnum(pTHX_ int errnum, SV *tgtsv) { + PERL_ARGS_ASSERT_SV_STRING_FROM_ERRNUM; + char const *errstr; utf8ness_t utf8ness; @@ -883,13 +901,13 @@ Perl_sv_string_from_errnum(pTHX_ int err int Perl_magic_get(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_GET; + I32 paren; const char *s = NULL; REGEXP *rx; char nextchar; - PERL_ARGS_ASSERT_MAGIC_GET; - const char * const remaining = (mg->mg_ptr) ? mg->mg_ptr + 1 : NULL; @@ -906,6 +924,9 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg) } nextchar = *remaining; + + assert(generic_isCC_(*mg->mg_ptr, CC_MAGICAL_)); + switch (*mg->mg_ptr) { case '\001': /* ^A */ if (SvOK(PL_bodytarget)) sv_copypv(sv, PL_bodytarget); @@ -1287,10 +1308,10 @@ Perl_magic_get(pTHX_ SV *sv, MAGIC *mg) int Perl_magic_getuvar(pTHX_ SV *sv, MAGIC *mg) { - struct ufuncs * const uf = (struct ufuncs *)mg->mg_ptr; - PERL_ARGS_ASSERT_MAGIC_GETUVAR; + struct ufuncs * const uf = (struct ufuncs *)mg->mg_ptr; + if (uf && uf->uf_val) (*uf->uf_val)(aTHX_ uf->uf_index, sv); return 0; @@ -1299,6 +1320,8 @@ Perl_magic_getuvar(pTHX_ SV *sv, MAGIC * int Perl_magic_setenv(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_SETENV; + STRLEN len = 0, klen; const char *key; @@ -1318,8 +1341,6 @@ Perl_magic_setenv(pTHX_ SV *sv, MAGIC *m key = SvPV_const(keysv,klen); } - PERL_ARGS_ASSERT_MAGIC_SETENV; - SvGETMAGIC(sv); if (SvOK(sv)) { /* defined environment variables are byte strings; unfortunately @@ -1472,8 +1493,9 @@ Perl_magic_clear_all_env(pTHX_ SV *sv, M #ifdef HAS_SIGPROCMASK static void -restore_sigmask(pTHX_ SV *save_sv) +restore_sigmask(pTHX_ void *ptr) { + SV *save_sv = (SV *)ptr; const sigset_t * const ossetp = (const sigset_t *) SvPV_nolen_const( save_sv ); (void)sigprocmask(SIG_SETMASK, ossetp, NULL); } @@ -1481,11 +1503,11 @@ restore_sigmask(pTHX_ SV *save_sv) int Perl_magic_getsig(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_GETSIG; + /* Are we fetching a signal entry? */ int i = (I16)mg->mg_private; - PERL_ARGS_ASSERT_MAGIC_GETSIG; - if (!i) { STRLEN siglen; const char * sig = MgPV_const(mg, siglen); @@ -1531,12 +1553,16 @@ PERL_STACK_REALIGN Signal_t Perl_csighandler(int sig, Siginfo_t *sip, void *uap) { + PERL_ARGS_ASSERT_CSIGHANDLER; + Perl_csighandler3(sig, sip, uap); } #else Signal_t Perl_csighandler(int sig) { + PERL_ARGS_ASSERT_CSIGHANDLER; + Perl_csighandler3(sig, NULL, NULL); } #endif @@ -1544,6 +1570,8 @@ Perl_csighandler(int sig) Signal_t Perl_csighandler1(int sig) { + PERL_ARGS_ASSERT_CSIGHANDLER1; + Perl_csighandler3(sig, NULL, NULL); } @@ -1558,6 +1586,8 @@ Perl_csighandler1(int sig) Signal_t Perl_csighandler3(int sig, Siginfo_t *sip PERL_UNUSED_DECL, void *uap PERL_UNUSED_DECL) { + PERL_ARGS_ASSERT_CSIGHANDLER3; + #ifdef PERL_GET_SIG_CONTEXT dTHXa(PERL_GET_SIG_CONTEXT); #else @@ -1566,7 +1596,7 @@ Perl_csighandler3(int sig, Siginfo_t *si #if defined(USE_ITHREADS) && !defined(WIN32) if (!aTHX) { - /* presumably ths signal is being delivered to a non-perl + /* presumably this signal is being delivered to a non-perl * thread, presumably created by a library, redirect it to the * main thread. */ @@ -1675,6 +1705,8 @@ unblock_sigmask(pTHX_ void* newset) void Perl_despatch_signals(pTHX) { + PERL_ARGS_ASSERT_DESPATCH_SIGNALS; + int sig; PL_sig_pending = 0; for (sig = 1; sig < SIG_SIZE; sig++) { @@ -1729,6 +1761,8 @@ Perl_despatch_signals(pTHX) int Perl_magic_setsig(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_SETSIG; + I32 i; SV** svp = NULL; /* Need to be careful with SvREFCNT_dec(), because that can have side @@ -1743,8 +1777,6 @@ Perl_magic_setsig(pTHX_ SV *sv, MAGIC *m #endif const char *s = MgPV_const(mg,len); - PERL_ARGS_ASSERT_MAGIC_SETSIG; - if (*s == '_') { if (memEQs(s, len, "__DIE__")) svp = &PL_diehook; @@ -1913,12 +1945,12 @@ Perl_magic_clearhook(pTHX_ SV *sv, MAGIC int Perl_magic_sethook(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_SETHOOK; + SV** svp = NULL; STRLEN len; const char *s = MgPV_const(mg,len); - PERL_ARGS_ASSERT_MAGIC_SETHOOK; - if (memEQs(s, len, "require__before")) { svp = &PL_hook__require__before; } @@ -2003,9 +2035,10 @@ Perl_magic_setisa(pTHX_ SV *sv, MAGIC *m int Perl_magic_clearisa(pTHX_ SV *sv, MAGIC *mg) { - HV* stash; PERL_ARGS_ASSERT_MAGIC_CLEARISA; + HV* stash; + /* Bail out if destruction is going on */ if(PL_phase == PERL_PHASE_DESTRUCT) return 0; @@ -2044,10 +2077,11 @@ Perl_magic_clearisa(pTHX_ SV *sv, MAGIC int Perl_magic_getnkeys(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_GETNKEYS; + HV * const hv = MUTABLE_HV(LvTARG(sv)); I32 i = 0; - PERL_ARGS_ASSERT_MAGIC_GETNKEYS; PERL_UNUSED_ARG(mg); if (hv) { @@ -2106,11 +2140,11 @@ SV* Perl_magic_methcall(pTHX_ SV *sv, const MAGIC *mg, SV *meth, U32 flags, U32 argc, ...) { + PERL_ARGS_ASSERT_MAGIC_METHCALL; + dSP; SV* ret = NULL; - PERL_ARGS_ASSERT_MAGIC_METHCALL; - ENTER; if (flags & G_WRITING_TO_STDERR) { @@ -2160,14 +2194,14 @@ Perl_magic_methcall(pTHX_ SV *sv, const /* wrapper for magic_methcall that creates the first arg */ -STATIC SV* +static SV* S_magic_methcall1(pTHX_ SV *sv, const MAGIC *mg, SV *meth, U32 flags, int n, SV *val) { - SV* arg1 = NULL; - PERL_ARGS_ASSERT_MAGIC_METHCALL1; + SV* arg1 = NULL; + if (mg->mg_ptr) { if (mg->mg_len >= 0) { arg1 = newSVpvn_flags(mg->mg_ptr, mg->mg_len, SVs_TEMP); @@ -2180,18 +2214,18 @@ S_magic_methcall1(pTHX_ SV *sv, const MA sv_2mortal(arg1); } if (!arg1) { - return Perl_magic_methcall(aTHX_ sv, mg, meth, flags, n - 1, val); + return magic_methcall(sv, mg, meth, flags, n - 1, val); } - return Perl_magic_methcall(aTHX_ sv, mg, meth, flags, n, arg1, val); + return magic_methcall(sv, mg, meth, flags, n, arg1, val); } -STATIC int +static int S_magic_methpack(pTHX_ SV *sv, const MAGIC *mg, SV *meth) { - SV* ret; - PERL_ARGS_ASSERT_MAGIC_METHPACK; + SV* ret; + ret = magic_methcall1(sv, mg, meth, 0, 1, NULL); if (ret) sv_setsv(sv, ret); @@ -2212,11 +2246,11 @@ Perl_magic_getpack(pTHX_ SV *sv, MAGIC * int Perl_magic_setpack(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_SETPACK; + MAGIC *tmg; SV *val; - PERL_ARGS_ASSERT_MAGIC_SETPACK; - /* in the code C<$tied{foo} = $val>, the "thing" that gets passed to * STORE() is not $val, but rather a PVLV (the sv in this call), whose * public flags indicate its value based on copying from $val. Doing @@ -2253,11 +2287,11 @@ Perl_magic_clearpack(pTHX_ SV *sv, MAGIC U32 Perl_magic_sizepack(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_SIZEPACK; + I32 retval = 0; SV* retsv; - PERL_ARGS_ASSERT_MAGIC_SIZEPACK; - retsv = magic_methcall1(sv, mg, SV_CONST(FETCHSIZE), 0, 1, NULL); if (retsv) { retval = SvIV(retsv)-1; @@ -2272,19 +2306,19 @@ Perl_magic_wipepack(pTHX_ SV *sv, MAGIC { PERL_ARGS_ASSERT_MAGIC_WIPEPACK; - Perl_magic_methcall(aTHX_ sv, mg, SV_CONST(CLEAR), G_DISCARD, 0); + magic_methcall(sv, mg, SV_CONST(CLEAR), G_DISCARD, 0); return 0; } int Perl_magic_nextpack(pTHX_ SV *sv, MAGIC *mg, SV *key) { - SV* ret; - PERL_ARGS_ASSERT_MAGIC_NEXTPACK; - ret = SvOK(key) ? Perl_magic_methcall(aTHX_ sv, mg, SV_CONST(NEXTKEY), 0, 1, key) - : Perl_magic_methcall(aTHX_ sv, mg, SV_CONST(FIRSTKEY), 0, 0); + SV* ret; + + ret = SvOK(key) ? magic_methcall(sv, mg, SV_CONST(NEXTKEY), 0, 1, key) + : magic_methcall(sv, mg, SV_CONST(FIRSTKEY), 0, 0); if (ret) sv_setsv(key,ret); return 0; @@ -2301,12 +2335,12 @@ Perl_magic_existspack(pTHX_ SV *sv, cons SV * Perl_magic_scalarpack(pTHX_ HV *hv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_SCALARPACK; + SV *retval; SV * const tied = SvTIED_obj(MUTABLE_SV(hv), mg); HV * const pkg = SvSTASH((const SV *)SvRV(tied)); - PERL_ARGS_ASSERT_MAGIC_SCALARPACK; - if (!gv_fetchmethod_autoload(pkg, "SCALAR", FALSE)) { SV *key; if (HvEITER_get(hv)) @@ -2320,7 +2354,7 @@ Perl_magic_scalarpack(pTHX_ HV *hv, MAGI } /* there is a SCALAR method that we can call */ - retval = Perl_magic_methcall(aTHX_ MUTABLE_SV(hv), mg, SV_CONST(SCALAR), 0, 0); + retval = magic_methcall(MUTABLE_SV(hv), mg, SV_CONST(SCALAR), 0, 0); if (!retval) retval = &PL_sv_undef; return retval; @@ -2329,10 +2363,10 @@ Perl_magic_scalarpack(pTHX_ HV *hv, MAGI int Perl_magic_setdbline(pTHX_ SV *sv, MAGIC *mg) { - SV **svp; - PERL_ARGS_ASSERT_MAGIC_SETDBLINE; + SV **svp; + /* The magic ptr/len for the debugger's hash should always be an SV. */ if (UNLIKELY(mg->mg_len != HEf_SVKEY)) { croak("panic: magic_setdbline len=%" IVdf ", ptr='%s'", @@ -2364,12 +2398,12 @@ Perl_magic_setdbline(pTHX_ SV *sv, MAGIC } int -Perl_magic_getarylen(pTHX_ SV *sv, const MAGIC *mg) +Perl_magic_getarylen(pTHX_ SV *sv, MAGIC *mg) { - AV * const obj = MUTABLE_AV(mg->mg_obj); - PERL_ARGS_ASSERT_MAGIC_GETARYLEN; + AV * const obj = MUTABLE_AV(mg->mg_obj); + if (obj) { sv_setiv(sv, AvFILL(obj)); } else { @@ -2381,10 +2415,10 @@ Perl_magic_getarylen(pTHX_ SV *sv, const int Perl_magic_setarylen(pTHX_ SV *sv, MAGIC *mg) { - AV * const obj = MUTABLE_AV(mg->mg_obj); - PERL_ARGS_ASSERT_MAGIC_SETARYLEN; + AV * const obj = MUTABLE_AV(mg->mg_obj); + if (obj) { av_fill(obj, SvIV(sv)); } else { @@ -2438,11 +2472,11 @@ Perl_magic_freearylen_p(pTHX_ SV *sv, MA int Perl_magic_getpos(pTHX_ SV *sv, MAGIC *mg) { - SV* const lsv = LvTARG(sv); - PERL_ARGS_ASSERT_MAGIC_GETPOS; PERL_UNUSED_ARG(mg); + SV* const lsv = LvTARG(sv); + STRLEN pos; if (sv_regex_global_pos_get(lsv, &pos, 0)) { sv_setuv(sv, pos); @@ -2455,11 +2489,11 @@ Perl_magic_getpos(pTHX_ SV *sv, MAGIC *m int Perl_magic_setpos(pTHX_ SV *sv, MAGIC *mg) { - SV* const lsv = LvTARG(sv); - PERL_ARGS_ASSERT_MAGIC_SETPOS; PERL_UNUSED_ARG(mg); + SV* const lsv = LvTARG(sv); + if(SvOK(sv)) sv_regex_global_pos_set(lsv, SvIV(sv), 0); else @@ -2471,6 +2505,8 @@ Perl_magic_setpos(pTHX_ SV *sv, MAGIC *m int Perl_magic_getsubstr(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_GETSUBSTR; + STRLEN len; SV * const lsv = LvTARG(sv); const char * const tmps = SvPV_const(lsv,len); @@ -2479,7 +2515,6 @@ Perl_magic_getsubstr(pTHX_ SV *sv, MAGIC const bool negoff = LvFLAGS(sv) & LVf_NEG_OFF; const bool negrem = LvFLAGS(sv) & LVf_NEG_LEN; - PERL_ARGS_ASSERT_MAGIC_GETSUBSTR; PERL_UNUSED_ARG(mg); if (!translate_substr_offsets( @@ -2503,6 +2538,8 @@ Perl_magic_getsubstr(pTHX_ SV *sv, MAGIC int Perl_magic_setsubstr(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_SETSUBSTR; + STRLEN len, lsv_len, oldtarglen, newtarglen; const char * const tmps = SvPV_const(sv, len); SV * const lsv = LvTARG(sv); @@ -2511,7 +2548,6 @@ Perl_magic_setsubstr(pTHX_ SV *sv, MAGIC const bool negoff = LvFLAGS(sv) & LVf_NEG_OFF; const bool neglen = LvFLAGS(sv) & LVf_NEG_LEN; - PERL_ARGS_ASSERT_MAGIC_SETSUBSTR; PERL_UNUSED_ARG(mg); SvGETMAGIC(lsv); @@ -2583,12 +2619,12 @@ Perl_magic_settaint(pTHX_ SV *sv, MAGIC int Perl_magic_getvec(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_GETVEC; + SV * const lsv = LvTARG(sv); char errflags = LvFLAGS(sv); - PERL_ARGS_ASSERT_MAGIC_GETVEC; PERL_UNUSED_ARG(mg); - /* non-zero errflags implies deferred out-of-range condition */ assert(!(errflags & ~(LVf_NEG_OFF|LVf_OUT_OF_RANGE))); sv_setuv(sv, errflags ? 0 : do_vecget(lsv, LvTARGOFF(sv), LvTARGLEN(sv))); @@ -2608,8 +2644,9 @@ Perl_magic_setvec(pTHX_ SV *sv, MAGIC *m SV * Perl_defelem_target(pTHX_ SV *sv, MAGIC *mg) { - SV *targ = NULL; PERL_ARGS_ASSERT_DEFELEM_TARGET; + + SV *targ = NULL; if (!mg) mg = mg_find(sv, PERL_MAGIC_defelem); assert(mg); if (LvTARGLEN(sv)) { @@ -2681,11 +2718,11 @@ Perl_magic_setdefelem(pTHX_ SV *sv, MAGI void Perl_vivify_defelem(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_VIVIFY_DEFELEM; + MAGIC *mg; SV *value = NULL; - PERL_ARGS_ASSERT_VIVIFY_DEFELEM; - if (!LvTARGLEN(sv) || !(mg = mg_find(sv, PERL_MAGIC_defelem))) return; if (mg->mg_obj) { @@ -2763,10 +2800,10 @@ Perl_magic_freemglob(pTHX_ SV *sv, MAGIC int Perl_magic_setuvar(pTHX_ SV *sv, MAGIC *mg) { - const struct ufuncs * const uf = (struct ufuncs *)mg->mg_ptr; - PERL_ARGS_ASSERT_MAGIC_SETUVAR; + const struct ufuncs * const uf = (struct ufuncs *)mg->mg_ptr; + if (uf && uf->uf_set) (*uf->uf_set)(aTHX_ uf->uf_index, sv); return 0; @@ -2775,10 +2812,10 @@ Perl_magic_setuvar(pTHX_ SV *sv, MAGIC * int Perl_magic_setregexp(pTHX_ SV *sv, MAGIC *mg) { - const char type = mg->mg_type; - PERL_ARGS_ASSERT_MAGIC_SETREGEXP; + const char type = mg->mg_type; + assert( type == PERL_MAGIC_fm || type == PERL_MAGIC_qr || type == PERL_MAGIC_bm); @@ -2856,8 +2893,9 @@ Perl_magic_freeutf8(pTHX_ SV *sv, MAGIC int Perl_magic_setlvref(pTHX_ SV *sv, MAGIC *mg) { - const char *bad = NULL; PERL_ARGS_ASSERT_MAGIC_SETLVREF; + + const char *bad = NULL; if (!SvROK(sv)) croak("Assigned value is not a reference"); switch (mg->mg_private & OPpLVREF_TYPE) { case OPpLVREF_SV: @@ -2990,14 +3028,14 @@ S_set_dollarzero(pTHX_ SV *sv) int Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_SET; + I32 paren; const REGEXP * rx; I32 i; STRLEN len; MAGIC *tmg; - PERL_ARGS_ASSERT_MAGIC_SET; - if (!mg->mg_ptr) { paren = mg->mg_len; if (PL_curpm && (rx = PM_GETRE(PL_curpm))) { @@ -3015,6 +3053,8 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) return 0; } + assert(generic_isCC_(*mg->mg_ptr, CC_MAGICAL_)); + switch (*mg->mg_ptr) { case '\001': /* ^A */ if (SvOK(sv)) sv_copypv(PL_bodytarget, sv); @@ -3146,9 +3186,8 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) case '\027': /* ^W & $^WARNING_BITS */ if (*(mg->mg_ptr+1) == '\0') { if ( ! (PL_dowarn & G_WARN_ALL_MASK)) { - i = SvIV(sv); PL_dowarn = (PL_dowarn & ~G_WARN_ON) - | (i ? G_WARN_ON : G_WARN_OFF) ; + | (SvTRUE_NN(sv) ? G_WARN_ON : G_WARN_OFF) ; } } else if (strEQ(mg->mg_ptr+1, "ARNING_BITS")) { @@ -3558,9 +3597,10 @@ C takes the name from the P I32 Perl_whichsig_sv(pTHX_ SV *sigsv) { + PERL_ARGS_ASSERT_WHICHSIG_SV; + const char *sigpv; STRLEN siglen; - PERL_ARGS_ASSERT_WHICHSIG_SV; sigpv = SvPV_const(sigsv, siglen); return whichsig_pvn(sigpv, siglen); } @@ -3575,11 +3615,11 @@ Perl_whichsig_pv(pTHX_ const char *sig) I32 Perl_whichsig_pvn(pTHX_ const char *sig, STRLEN len) { - char* const* sigv; - PERL_ARGS_ASSERT_WHICHSIG_PVN; PERL_UNUSED_CONTEXT; + char* const* sigv; + for (sigv = (char* const*)PL_sig_name; *sigv; sigv++) if (strlen(*sigv) == len && memEQ(sig,*sigv, len)) return PL_sig_num[sigv - (char* const*)PL_sig_name]; @@ -3613,6 +3653,8 @@ Perl_whichsig_pvn(pTHX_ const char *sig, Signal_t Perl_sighandler(int sig, Siginfo_t *sip, void *uap) { + PERL_ARGS_ASSERT_SIGHANDLER; + Perl_perly_sighandler(sig, sip, uap, 0); } @@ -3621,6 +3663,8 @@ Perl_sighandler(int sig, Siginfo_t *sip, Signal_t Perl_sighandler(int sig) { + PERL_ARGS_ASSERT_SIGHANDLER; + Perl_perly_sighandler(sig, NULL, NULL, 0); } @@ -3629,12 +3673,16 @@ Perl_sighandler(int sig) Signal_t Perl_sighandler1(int sig) { + PERL_ARGS_ASSERT_SIGHANDLER1; + Perl_perly_sighandler(sig, NULL, NULL, 0); } Signal_t Perl_sighandler3(int sig, Siginfo_t *sip PERL_UNUSED_DECL, void *uap PERL_UNUSED_DECL) { + PERL_ARGS_ASSERT_SIGHANDLER3; + Perl_perly_sighandler(sig, sip, uap, 0); } @@ -3651,6 +3699,8 @@ Signal_t Perl_perly_sighandler(int sig, Siginfo_t *sip PERL_UNUSED_DECL, void *uap PERL_UNUSED_DECL, bool safe) { + PERL_ARGS_ASSERT_PERLY_SIGHANDLER; + #ifdef PERL_GET_SIG_CONTEXT dTHXa(PERL_GET_SIG_CONTEXT); #else @@ -3797,6 +3847,7 @@ Perl_perly_sighandler(int sig, Siginfo_t /* Not clear if this will work */ /* XXX not clear if this should be protected by 'if (safe)' * too */ + PERL_UNUSED_ARG(safe); (void)rsignal(sig, SIG_IGN); (void)rsignal(sig, PL_csighandlerp); @@ -3823,8 +3874,10 @@ Perl_perly_sighandler(int sig, Siginfo_t static void -S_restore_magic(pTHX_ const void *p) +S_restore_magic(pTHX_ void *p) { + PERL_ARGS_ASSERT_RESTORE_MAGIC; + MGS* const mgs = SSPTR(PTR2IV(p), MGS*); SV* const sv = mgs->mgs_sv; bool bumped; @@ -3880,8 +3933,9 @@ S_restore_magic(pTHX_ const void *p) * skipped over. */ static void -S_unwind_handler_stack(pTHX_ const void *p) +S_unwind_handler_stack(pTHX_ void *p) { + PERL_ARGS_ASSERT_UNWIND_HANDLER_STACK; PERL_UNUSED_ARG(p); PL_savestack_ix -= 5; /* Unprotect save in progress. */ @@ -3901,11 +3955,11 @@ reference. int Perl_magic_sethint(pTHX_ SV *sv, MAGIC *mg) { + PERL_ARGS_ASSERT_MAGIC_SETHINT; + SV *key = (mg->mg_len == HEf_SVKEY) ? MUTABLE_SV(mg->mg_ptr) : newSVpvn_flags(mg->mg_ptr, mg->mg_len, SVs_TEMP); - PERL_ARGS_ASSERT_MAGIC_SETHINT; - /* mg->mg_obj isn't being used. If needed, it would be possible to store an alternative leaf in there, with PL_compiling.cop_hints being used if it's NULL. If needed for threads, the alternative could lock a mutex, @@ -3972,13 +4026,13 @@ int Perl_magic_copycallchecker(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen) { - MAGIC *nmg; - PERL_ARGS_ASSERT_MAGIC_COPYCALLCHECKER; PERL_UNUSED_ARG(sv); PERL_UNUSED_ARG(name); PERL_UNUSED_ARG(namlen); + MAGIC *nmg; + sv_magic(nsv, &PL_sv_undef, mg->mg_type, NULL, 0); nmg = mg_find(nsv, mg->mg_type); assert(nmg); @@ -3990,7 +4044,8 @@ Perl_magic_copycallchecker(pTHX_ SV *sv, } int -Perl_magic_setdebugvar(pTHX_ SV *sv, MAGIC *mg) { +Perl_magic_setdebugvar(pTHX_ SV *sv, MAGIC *mg) +{ PERL_ARGS_ASSERT_MAGIC_SETDEBUGVAR; #if DBVARMG_SINGLE != 0 @@ -4004,7 +4059,8 @@ Perl_magic_setdebugvar(pTHX_ SV *sv, MAG } int -Perl_magic_getdebugvar(pTHX_ SV *sv, MAGIC *mg) { +Perl_magic_getdebugvar(pTHX_ SV *sv, MAGIC *mg) +{ PERL_ARGS_ASSERT_MAGIC_GETDEBUGVAR; #if DBVARMG_SINGLE != 0 Index: gnu/usr.bin/perl/mg_vtable.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/mg_vtable.h,v diff -u -p -a -u -p -r1.6 mg_vtable.h --- gnu/usr.bin/perl/mg_vtable.h 28 Jan 2025 01:06:10 -0000 1.6 +++ gnu/usr.bin/perl/mg_vtable.h 16 Nov 2026 00:57:39 -0000 @@ -103,8 +103,7 @@ enum { /* pass one of these to get_vtbl magic_vtable_max }; -#ifdef DOINIT -EXTCONST char * const PL_magic_vtable_names[magic_vtable_max] = { +EXTCONST char * const PL_magic_vtable_names[magic_vtable_max] INIT( { "arylen", "arylen_p", "backref", @@ -141,10 +140,7 @@ EXTCONST char * const PL_magic_vtable_na "utf8", "uvar", "vec" -}; -#else -EXTCONST char * const PL_magic_vtable_names[magic_vtable_max]; -#endif +}); /* These all need to be 0, not NULL, as NULL can be (void*)0, which is a * pointer to data, whereas we're assigning pointers to functions, which are @@ -165,7 +161,7 @@ EXTCONST char * const PL_magic_vtable_na #ifdef DOINIT EXT_MGVTBL PL_magic_vtables[magic_vtable_max] = { - { (int (*)(pTHX_ SV *, MAGIC *))Perl_magic_getarylen, Perl_magic_setarylen, 0, 0, 0, 0, 0, 0 }, + { Perl_magic_getarylen, Perl_magic_setarylen, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, Perl_magic_cleararylen_p, Perl_magic_freearylen_p, 0, 0, 0 }, { 0, 0, 0, 0, Perl_magic_killbackrefs, 0, 0, 0 }, { 0, 0, 0, 0, 0, Perl_magic_copycallchecker, 0, 0 }, Index: gnu/usr.bin/perl/miniperlmain.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/miniperlmain.c,v diff -u -p -a -u -p -r1.20 miniperlmain.c --- gnu/usr.bin/perl/miniperlmain.c 28 Jan 2025 01:06:10 -0000 1.20 +++ gnu/usr.bin/perl/miniperlmain.c 16 Nov 2026 00:57:39 -0000 @@ -96,7 +96,7 @@ main(int argc, char **argv, char **env) * --GSAR 2001-07-20 */ PTHREAD_ATFORK(Perl_atfork_lock, Perl_atfork_unlock, - Perl_atfork_unlock); + Perl_atfork_child); #endif PERL_SYS_FPU_INIT; Index: gnu/usr.bin/perl/mro_core.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/mro_core.c,v diff -u -p -a -u -p -r1.8 mro_core.c --- gnu/usr.bin/perl/mro_core.c 26 Dec 2025 22:14:12 -0000 1.8 +++ gnu/usr.bin/perl/mro_core.c 16 Nov 2026 00:57:39 -0000 @@ -38,12 +38,13 @@ SV * Perl_mro_get_private_data(pTHX_ struct mro_meta *const smeta, const struct mro_alg *const which) { - SV **data; PERL_ARGS_ASSERT_MRO_GET_PRIVATE_DATA; - data = (SV **)Perl_hv_common(aTHX_ smeta->mro_linear_all, NULL, - which->name, which->length, which->kflags, - HV_FETCH_JUST_SV, NULL, which->hash); + SV **data; + + data = (SV **)hv_common(smeta->mro_linear_all, NULL, + which->name, which->length, which->kflags, + HV_FETCH_JUST_SV, NULL, which->hash); if (!data) return NULL; @@ -92,9 +93,10 @@ Perl_mro_set_private_data(pTHX_ struct m smeta->mro_linear_current = data; } - if (!Perl_hv_common(aTHX_ smeta->mro_linear_all, NULL, - which->name, which->length, which->kflags, - HV_FETCH_ISSTORE, data, which->hash)) { + if (!hv_common(smeta->mro_linear_all, NULL, + which->name, which->length, which->kflags, + HV_FETCH_ISSTORE, data, which->hash)) + { croak("panic: hv_store() failed in set_mro_private_data() " "for '%.*s' %d", (int) which->length, which->name, which->kflags); @@ -113,13 +115,14 @@ registered. See L>. */ const struct mro_alg * -Perl_mro_get_from_name(pTHX_ SV *name) { - SV **data; - +Perl_mro_get_from_name(pTHX_ SV *name) +{ PERL_ARGS_ASSERT_MRO_GET_FROM_NAME; - data = (SV **)Perl_hv_common(aTHX_ PL_registered_mros, name, NULL, 0, 0, - HV_FETCH_JUST_SV, NULL, 0); + SV **data; + + data = (SV **)hv_common(PL_registered_mros, name, NULL, 0, 0, + HV_FETCH_JUST_SV, NULL, 0); if (!data) return NULL; assert(SvTYPE(*data) == SVt_IV); @@ -142,9 +145,10 @@ Perl_mro_register(pTHX_ const struct mro PERL_ARGS_ASSERT_MRO_REGISTER; - if (!Perl_hv_common(aTHX_ PL_registered_mros, NULL, - mro->name, mro->length, mro->kflags, - HV_FETCH_ISSTORE, wrapper, mro->hash)) { + if (!hv_common(PL_registered_mros, NULL, + mro->name, mro->length, mro->kflags, + HV_FETCH_ISSTORE, wrapper, mro->hash)) + { SvREFCNT_dec_NN(wrapper); croak("panic: hv_store() failed in mro_register() " "for '%.*s' %d", (int) mro->length, mro->name, mro->kflags); @@ -154,9 +158,10 @@ Perl_mro_register(pTHX_ const struct mro struct mro_meta* Perl_mro_meta_init(pTHX_ HV* stash) { + PERL_ARGS_ASSERT_MRO_META_INIT; + struct mro_meta* newmeta; - PERL_ARGS_ASSERT_MRO_META_INIT; PERL_UNUSED_CONTEXT; assert(HvAUX(stash)); assert(!(HvAUX(stash)->xhv_mro_meta)); @@ -175,10 +180,10 @@ Perl_mro_meta_init(pTHX_ HV* stash) struct mro_meta* Perl_mro_meta_dup(pTHX_ struct mro_meta* smeta, CLONE_PARAMS* param) { - struct mro_meta* newmeta; - PERL_ARGS_ASSERT_MRO_META_DUP; + struct mro_meta* newmeta; + Newx(newmeta, 1, struct mro_meta); Copy(smeta, newmeta, 1, struct mro_meta); @@ -232,6 +237,8 @@ invalidated). static AV* S_mro_get_linear_isa_dfs(pTHX_ HV *stash, U32 level) { + PERL_ARGS_ASSERT_MRO_GET_LINEAR_ISA_DFS; + AV* retval; GV** gvp; GV* gv; @@ -241,7 +248,6 @@ S_mro_get_linear_isa_dfs(pTHX_ HV *stash SV *our_name; HV *stored = NULL; - PERL_ARGS_ASSERT_MRO_GET_LINEAR_ISA_DFS; assert(HvAUX(stash)); stashhek @@ -413,10 +419,11 @@ invalidated). AV* Perl_mro_get_linear_isa(pTHX_ HV *stash) { + PERL_ARGS_ASSERT_MRO_GET_LINEAR_ISA; + struct mro_meta* meta; AV *isa; - PERL_ARGS_ASSERT_MRO_GET_LINEAR_ISA; if(!HvHasAUX(stash)) croak("Can't linearize anonymous symbol table"); @@ -505,6 +512,8 @@ by the C magic, should not need void Perl_mro_isa_changed_in(pTHX_ HV* stash) { + PERL_ARGS_ASSERT_MRO_ISA_CHANGED_IN; + HV* isarev; AV* linear_mro; HE* iter; @@ -518,8 +527,6 @@ Perl_mro_isa_changed_in(pTHX_ HV* stash) const char * const stashname = HvENAME_get(stash); const STRLEN stashname_len = HvENAMELEN_get(stash); - PERL_ARGS_ASSERT_MRO_ISA_CHANGED_IN; - if(!stashname) croak("Can't call mro_isa_changed_in() on anonymous symbol table"); @@ -701,15 +708,15 @@ Perl_mro_isa_changed_in(pTHX_ HV* stash) /* Deletes name from all the isarev entries listed in isa. Don't call this if isa is already empty. */ -STATIC void +static void S_mro_clean_isarev(pTHX_ HV * const isa, const char * const name, const STRLEN len, HV * const exceptions, U32 hash, U32 flags) { - HE* iter; - PERL_ARGS_ASSERT_MRO_CLEAN_ISAREV; + HE* iter; + assert(HvTOTALKEYS(isa)); /* Delete our name from our former parents' isarevs. */ @@ -757,13 +764,14 @@ void Perl_mro_package_moved(pTHX_ HV * const stash, HV * const oldstash, const GV * const gv, U32 flags) { + PERL_ARGS_ASSERT_MRO_PACKAGE_MOVED; + SV *namesv; HEK **namep; I32 name_count; HV *stashes; HE* iter; - PERL_ARGS_ASSERT_MRO_PACKAGE_MOVED; assert(stash || oldstash); /* Determine the name(s) of the location that stash was assigned to @@ -897,10 +905,12 @@ Perl_mro_package_moved(pTHX_ HV * const } } -STATIC void +static void S_mro_gather_and_rename(pTHX_ HV * const stashes, HV * const seen_stashes, HV *stash, HV *oldstash, SV *namesv) { + PERL_ARGS_ASSERT_MRO_GATHER_AND_RENAME; + XPVHV* xhv; HE *entry; I32 riter = -1; @@ -911,8 +921,6 @@ S_mro_gather_and_rename(pTHX_ HV * const HV *isarev = NULL; SV **svp = NULL; - PERL_ARGS_ASSERT_MRO_GATHER_AND_RENAME; - /* We use the seen_stashes hash to keep track of which packages have been encountered so far. This must be separate from the main list of stashes, as we need to distinguish between stashes being assigned @@ -933,12 +941,11 @@ S_mro_gather_and_rename(pTHX_ HV * const if(oldstash) { /* Add to the big list. */ struct mro_meta * meta; - HE * const entry - = (HE *) - hv_common( - seen_stashes, NULL, (const char *)&oldstash, sizeof(HV *), 0, - HV_FETCH_LVALUE|HV_FETCH_EMPTY_HE, NULL, 0 - ); + HE * const entry = + (HE *) hv_common( + seen_stashes, NULL, (const char *)&oldstash, sizeof(HV *), + 0, HV_FETCH_LVALUE|HV_FETCH_EMPTY_HE, NULL, 0 + ); if(HeVAL(entry) == &PL_sv_undef || HeVAL(entry) == &PL_sv_yes) { oldstash = NULL; goto check_stash; @@ -972,8 +979,8 @@ S_mro_gather_and_rename(pTHX_ HV * const STRLEN len; const char *name = SvPVx_const(*svp, len); if(PL_stashcache) { - DEBUG_o(Perl_deb(aTHX_ "mro_gather_and_rename clearing PL_stashcache for '%" SVf "'\n", - SVfARG(*svp))); + DEBUG_o(deb("mro_gather_and_rename clearing PL_stashcache" + " for '%" SVf "'\n", SVfARG(*svp))); (void)hv_delete_ent(PL_stashcache, *svp, G_DISCARD, 0); } hv_ename_delete(oldstash, name, len, name_utf8); @@ -1034,8 +1041,8 @@ S_mro_gather_and_rename(pTHX_ HV * const entry = (HE *) hv_common( - seen_stashes, NULL, (const char *)&stash, sizeof(HV *), 0, - HV_FETCH_LVALUE|HV_FETCH_EMPTY_HE, NULL, 0 + seen_stashes, NULL, (const char *)&stash, sizeof(HV *), 0, + HV_FETCH_LVALUE|HV_FETCH_EMPTY_HE, NULL, 0 ); if(HeVAL(entry) == &PL_sv_yes || HeVAL(entry) == &PL_sv_no) stash = NULL; @@ -1395,10 +1402,10 @@ Croaks if C hasn't been registered void Perl_mro_set_mro(pTHX_ struct mro_meta *const meta, SV *const name) { - const struct mro_alg *const which = Perl_mro_get_from_name(aTHX_ name); - PERL_ARGS_ASSERT_MRO_SET_MRO; + const struct mro_alg *const which = Perl_mro_get_from_name(aTHX_ name); + if (!which) croak("Invalid mro name: '%" SVf "'", name); @@ -1427,6 +1434,8 @@ XS(XS_mro_method_changed_in); void Perl_boot_core_mro(pTHX) { + PERL_ARGS_ASSERT_BOOT_CORE_MRO; + static const char file[] = __FILE__; Perl_mro_register(aTHX_ &dfs_alg); Index: gnu/usr.bin/perl/numeric.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/numeric.c,v diff -u -p -a -u -p -r1.17 numeric.c --- gnu/usr.bin/perl/numeric.c 26 Dec 2025 22:15:22 -0000 1.17 +++ gnu/usr.bin/perl/numeric.c 16 Nov 2026 00:57:39 -0000 @@ -112,10 +112,10 @@ These are are available even on platform NV Perl_my_strtod(const char * const s, char **e) { - dTHX; - PERL_ARGS_ASSERT_MY_STRTOD; + dTHX; + #ifdef Perl_strtod return S_strtod(aTHX_ s, e); @@ -146,6 +146,8 @@ Perl_my_strtod(const char * const s, cha U32 Perl_cast_ulong(NV f) { + PERL_ARGS_ASSERT_CAST_ULONG; + if (f < 0.0) return f < I32_MIN ? (U32) I32_MIN : (U32)(I32) f; if (f < U32_MAX_P1) { @@ -164,6 +166,8 @@ Perl_cast_ulong(NV f) I32 Perl_cast_i32(NV f) { + PERL_ARGS_ASSERT_CAST_I32; + if (f < I32_MAX_P1) return f < I32_MIN ? I32_MIN : (I32) f; if (f < U32_MAX_P1) { @@ -182,6 +186,8 @@ Perl_cast_i32(NV f) IV Perl_cast_iv(NV f) { + PERL_ARGS_ASSERT_CAST_IV; + if (f < IV_MAX_P1) return f < IV_MIN ? IV_MIN : (IV) f; if (f < UV_MAX_P1) { @@ -201,6 +207,8 @@ Perl_cast_iv(NV f) UV Perl_cast_uv(NV f) { + PERL_ARGS_ASSERT_CAST_UV; + if (f < 0.0) return f < IV_MIN ? (UV) IV_MIN : (UV)(IV) f; if (f < UV_MAX_P1) { @@ -216,403 +224,623 @@ Perl_cast_uv(NV f) return f > 0 ? UV_MAX : 0 /* NaN */; } -/* -=for apidoc grok_bin - -converts a string representing a binary number to numeric form. - -On entry C and C<*len_p> give the string to scan, C<*flags> gives -conversion flags, and C should be C or a pointer to an NV. The -scan stops at the end of the string, or at just before the first invalid -character. Unless C is set in C<*flags>, -encountering an invalid character (except NUL) will also trigger a warning. On -return C<*len_p> is set to the length of the scanned string, and C<*flags> -gives output flags. - -If the value is <= C it is returned as a UV, the output flags are clear, -and nothing is written to C<*result>. If the value is > C, C -returns C, sets C in the output flags, -and writes an approximation of the correct value into C<*result> (which is an -NV; or the approximation is discarded if C is NULL). - -The binary number may optionally be prefixed with C<"0b"> or C<"b"> unless -C is set in C<*flags> on entry. - -If C is set in C<*flags> then any or all pairs of -digits may be separated from each other by a single underscore; also a single -leading underscore is accepted. - -=for apidoc Amnh||PERL_SCAN_ALLOW_UNDERSCORES -=for apidoc Amnh||PERL_SCAN_DISALLOW_PREFIX -=for apidoc Amnh||PERL_SCAN_GREATER_THAN_UV_MAX -=for apidoc Amnh||PERL_SCAN_SILENT_ILLDIGIT - -=cut - -Not documented yet because experimental is C and C<*len_p> give the string to scan, C<*flags> gives -conversion flags, and C should be C or a pointer to an NV. The -scan stops at the end of the string, or at just before the first invalid -character. Unless C is set in C<*flags>, -encountering an invalid character (except NUL) will also trigger a warning. On -return C<*len_p> is set to the length of the scanned string, and C<*flags> -gives output flags. - -If the value is <= C it is returned as a UV, the output flags are clear, -and nothing is written to C<*result>. If the value is > C, C -returns C, sets C in the output flags, -and writes an approximation of the correct value into C<*result> (which is an -NV; or the approximation is discarded if C is NULL). - -The hex number may optionally be prefixed with C<"0x"> or C<"x"> unless -C is set in C<*flags> on entry. - -If C is set in C<*flags> then any or all pairs of -digits may be separated from each other by a single underscore; also a single -leading underscore is accepted. - -=cut - -Not documented yet because experimental is C -which suppresses any message for non-portable numbers, but which are valid -on this platform. But, C<*flags> will have the corresponding flag bit set. - */ + PERL_ARGS_ASSERT_OUTPUT_NON_PORTABLE; -UV -Perl_grok_hex(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *result) -{ - PERL_ARGS_ASSERT_GROK_HEX; + /* Display the proper message for a number in the given input base not + * fitting in 32 bits */ + const char * which; + switch (base) { + case 2: + which = "Binary number > 0b11111111111111111111111111111111"; + break; + case 8: + which = "Octal number > 037777777777"; + break; + case 10: + return; + /* Historically no warnings of this type have been output for decimals + * which = "Decimal number > 4294967295 (0xffff_ffff)"; + */ + break; + case 16: + which = "Hexadecimal number > 0xffffffff"; + break; + default: + croak("panic: Unexpected numeric base %d", base); + } - return grok_hex(start, len_p, flags, result); + /* Also there are diag listings for the others. That's because, since + * %s is the first thing in the message, it would be hard for a user to + * find them there */ + /* diag_listed_as: Hexadecimal number > 0xffffffff non-portable */ + ck_warner(packWARN(WARN_PORTABLE), "%s non-portable", which); } -/* -=for apidoc grok_oct - -converts a string representing an octal number to numeric form. - -On entry C and C<*len_p> give the string to scan, C<*flags> gives -conversion flags, and C should be C or a pointer to an NV. The -scan stops at the end of the string, or at just before the first invalid -character. Unless C is set in C<*flags>, -encountering an invalid character (except NUL) will also trigger a warning. On -return C<*len_p> is set to the length of the scanned string, and C<*flags> -gives output flags. - -If the value is <= C it is returned as a UV, the output flags are clear, -and nothing is written to C<*result>. If the value is > C, C -returns C, sets C in the output flags, -and writes an approximation of the correct value into C<*result> (which is an -NV; or the approximation is discarded if C is NULL). - -If C is set in C<*flags> then any or all pairs of -digits may be separated from each other by a single underscore; also a single -leading underscore is accepted. +UV +Perl_grok_bin_hex(pTHX_ const char * const start, + STRLEN *len_p, + I32 *flags, + NV *approximation, + uint_fast8_t base, /* 2 or 16 */ + const U32 lookup_bit, + const char prefix /* 'b' or 'x' */ + ) +{ + PERL_ARGS_ASSERT_GROK_BIN_HEX; + assert(base == 2 || base == 16); + + /* Parse an optional 0b or 0x prefix to the number if the flags don't + * forbid these, then call grok_bin_oct_hex() with the parse set to beyond + * these prefixes */ -The C flag is always treated as being set for -this function. + uint_fast8_t offset = 0; -=cut + if (!(*flags & PERL_SCAN_DISALLOW_PREFIX)) { + const char * e = start + *len_p; -Not documented yet because experimental is C -which suppresses any message for non-portable numbers, but which are valid -on this platform. - */ - -UV -Perl_grok_oct(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *result) -{ - PERL_ARGS_ASSERT_GROK_OCT; + /* strip off leading b or 0b; x or 0x. + for compatibility silently suffer "b" and "0b" as valid binary; "x" + and "0x" as valid hex numbers. */ + if (e - start > 1) { + if (isALPHA_FOLD_EQ(start[0], prefix)) { + offset = 1; + } + else if ( e - start > 2 + && start[0] == '0' + && (isALPHA_FOLD_EQ(start[1], prefix))) + { + offset = 2; + } + } + } - return grok_oct(start, len_p, flags, result); + return grok_uint_by_base(start, len_p, flags, approximation, + base, lookup_bit, offset); } -STATIC void -S_output_non_portable(pTHX_ const U8 base) -{ - /* Display the proper message for a number in the given input base not - * fitting in 32 bits */ - const char * which = (base == 2) - ? "Binary number > 0b11111111111111111111111111111111" - : (base == 8) - ? "Octal number > 037777777777" - : "Hexadecimal number > 0xffffffff"; +/* An acceptable underscore must not be trailing, which also implies there + * must be a legal digit after it */ +#define underscore_valid(s, e, lookup_bit) \ + (s < e - 1 && Perl_isCC_by_bit(s[1], lookup_bit)) - PERL_ARGS_ASSERT_OUTPUT_NON_PORTABLE; - - /* Also there are listings for the other two. That's because, since they - * are the first word, it would be hard for a user to find them there - * starting with a %s */ - /* diag_listed_as: Hexadecimal number > 0xffffffff non-portable */ - ck_warner(packWARN(WARN_PORTABLE), "%s non-portable", which); -} UV -Perl_grok_bin_oct_hex(pTHX_ const char *start, +Perl_grok_uint_by_base(pTHX_ const char * const start, STRLEN *len_p, I32 *flags, - NV *result, - const unsigned shift, /* 1 for binary; 3 for octal; - 4 for hex */ - const U8 class_bit, - const char prefix + NV *approximation, + uint_fast8_t base, + const U32 lookup_bit, + uint_fast8_t offset /* parse starting at start+offset */ ) { - const char *s0 = start; - const char *s; - STRLEN len = *len_p; - STRLEN bytes_so_far; /* How many real digits have been processed */ - UV value = 0; - NV value_nv = 0; - const PERL_UINT_FAST8_T base = 1 << shift; /* 2, 8, or 16 */ - const UV max_div= UV_MAX / base; /* Value above which, the next digit - processed would overflow */ - const I32 input_flags = *flags; - const bool allow_underscores = - cBOOL(input_flags & PERL_SCAN_ALLOW_UNDERSCORES); - bool overflowed = FALSE; + PERL_ARGS_ASSERT_GROK_UINT_BY_BASE; + ASSUME( base == 10 + || (isPOWER_OF_2(base) && inRANGE(base, 2, 16) && base != 4)); - /* In overflows, this keeps track of how much to multiply the overflowed NV - * by as we continue to parse the remaining digits */ - NV factor = 0; - - /* This function unifies the core of grok_bin, grok_oct, and grok_hex. It - * is optimized for hex conversion. For example, it uses XDIGIT_VALUE to - * find the numeric value of a digit. That requires more instructions than - * OCTAL_VALUE would, but gives the same result for the narrowed range of - * octal digits; same for binary. If it were ever critical to squeeze more - * performance from this, the function could become grok_hex, and a regen - * perl script could scan it and write out two edited copies for the other - * two functions. That would improve the performance of all three - * somewhat. Besides eliminating XDIGIT_VALUE for the other two, extra - * parameters are now passed to this to avoid conditionals. Those could - * become declared consts, like: - * const U8 base = 16; - * const U8 base = 8; - * ... - */ +/* - PERL_ARGS_ASSERT_GROK_BIN_OCT_HEX; +=for apidoc grok_uint_by_base - ASSUME(inRANGE(shift, 1, 4) && shift != 2); +Parses a string purportedly containing ASCII digit characters in the numeric +base passed in as 'base', and translates it to a non-negative integer, if +possible, which it returns. The base is any of 2, 8, 10, or 16. The string +to be parsed starts at 'start' and has length *len_p bytes. If *len_p is 0, 0 +is returned without complaint. + +It stops parsing when it reaches *len_p bytes, or at the first illegal +character. Legal characters include any digit in the given base and, if +permitted by flags, underscores in restricted positions. It returns in +*len_p the actual number of bytes parsed. If it stopped parsing early, +it raises a warning unless the caller has set the PERL_SCAN_SILENT_ILLDIGIT +bit in *flags. The flag is cleared if no illegal character is found, +otherwise it will remain set on output. + +If the resultant integer won't fit in a UV, UV_MAX is returned, and *flags +will contain the PERL_SCAN_NUMBER_OVERFLOWED bit. If 'approximation' is not +NULL, an NV approximation to the full integer will be placed into +*approximation. And for bases 2, 8, 16, it raises a warning unless the +caller has set the PERL_SCAN_SILENT_OVERFLOW bit in *flags. + +Note that *approximation is not changed unless overflow occurs. + +For non-base10 operations, by default, a warning is raised for numbers +that don't overflow but exceed 32 bits in width. This is suppressed if +the caller has set the PERL_SCAN_SILENT_NON_PORTABLE bit in *flags. + +The function can silently accept (and otherwise ignore) underscores as well as +digits if the caller has set the PERL_SCAN_ALLOW_UNDERSCORES bit in *flags. +These are a single underscore between any two digits, and additionally an +initial underscore. + +The function takes great care to make any overflowing approximation as +accurate as possible given the platform's limitations. + +Attention has been paid to maximizing performance, but some compromises +have been made because it is the unification of grok_bin, grok_oct, +grok_hex and grok_decimal (if that existed). The unification was done +because over time, patches had been applied to one or another of the +individual functions, causing them to drift apart. Another solution +would be to have a regen script that starts with a single template and +customizes each one. Here are the compromises that could matter. + +=over + +=item * + +Each digit calculation uses XDIGIT_VALUE(), which, to accomodate hex values, +has extra bit operations not otherwise needed. This macro replaces a +subtraction with 2 shifts, 2 additions, and 3 masks + +=item * + +To accommodate base 10, each digit calculation uses an integer multiply and an +addition instead of a bitwise shift and 'or'. + +=item * + +The main switch() statement could have more case statements for non-hex bases. + +=back + +There is a special mode that functions as an alternative to overflowing. It +is triggered by the caller setting PERL_SCAN_DISCARD_INSTEAD_OF_OVERFLOW into +*flags. Should overflow otherwise occur, subsequent digits are instead simply +discarded, while rounding the result towards even. *approximation is not +changed if this flag is set. + +=cut + +Other compromises kick in only when the result is within a digit of overflowing. + +*/ + +#if UVSIZE > 4 + I32 input_flags = *flags; +#else + /* Only overflow can be non-portable on this platform, and that turns off + * this flag unconditionally */ + I32 input_flags = *flags | PERL_SCAN_SILENT_NON_PORTABLE; +#endif /* Clear output flags; unlikely to find a problem that sets them */ *flags = 0; - if (!(input_flags & PERL_SCAN_DISALLOW_PREFIX)) { + const bool allow_underscores = + cBOOL(input_flags & ( PERL_SCAN_ALLOW_UNDERSCORES + |PERL_SCAN_ALLOW_MEDIAL_UNDERSCORES_ONLY)); + const char * s = start + offset; + const char * e = start + *len_p; + + const char * const s0 = s; /* Where the significant digits start */ + UV accumulated = 0; /* Running total */ + + /* Highest value where one more hex digit will still fit and not overflow. + * */ + const UV base16_max_div = UV_MAX / 16; + + /* MULTIPLY_BY_BASE(value) multiplies 'value' by the input base */ +#define MULTIPLY_BY_BASE(value) (((value) * base)) + + /* Unroll the loop so that numbers with 8 or fewer digits can be handled + * with the minimum amount of work. Anything higher would require extra + * overhead to deal with the possibility of generating portability + * warnings for numbers above 32 bits, which is reached at 8 hex digits */ + redo_switch: + switch (e - s) { + default: - /* strip off leading b or 0b; x or 0x. - for compatibility silently suffer "b" and "0b" as valid binary; "x" - and "0x" as valid hex numbers. */ - if (len >= 1) { - if (isALPHA_FOLD_EQ(s0[0], prefix)) { - s0++; - len--; - } - else if (len >= 2 && s0[0] == '0' && (isALPHA_FOLD_EQ(s0[1], prefix))) { - s0+=2; - len-=2; - } + /* Leading zeros are common enough to deserve a special case when + * there are more digits than we handle in the switch. Strip them + * off, and try again */ + if (UNLIKELY(*s == '0')) { + do { + s++; + } while (s < e && *s == '0'); + goto redo_switch; } - } - s = s0; /* s0 potentially advanced from 'start' */ + if (! LIKELY(Perl_isCC_by_bit(*s, lookup_bit))) break; + accumulated = XDIGIT_VALUE(*s); + s++; + goto loop; - /* Unroll the loop so that the first 8 digits are branchless except for the - * switch. A ninth hex one overflows a 32 bit word. */ - switch (len) { - case 0: - return 0; - default: - if (UNLIKELY(! generic_isCC_(*s, class_bit))) break; - value = (value << shift) | XDIGIT_VALUE(*s); - s++; - /* FALLTHROUGH */ + case 8: + if (! LIKELY(Perl_isCC_by_bit(*s, lookup_bit))) break; + accumulated = XDIGIT_VALUE(*s); + s++; + /* FALLTHROUGH */ case 7: - if (UNLIKELY(! generic_isCC_(*s, class_bit))) break; - value = (value << shift) | XDIGIT_VALUE(*s); - s++; - /* FALLTHROUGH */ + if (! LIKELY(Perl_isCC_by_bit(*s, lookup_bit))) break; + accumulated = MULTIPLY_BY_BASE(accumulated) + XDIGIT_VALUE(*s); + s++; + /* FALLTHROUGH */ case 6: - if (UNLIKELY(! generic_isCC_(*s, class_bit))) break; - value = (value << shift) | XDIGIT_VALUE(*s); - s++; - /* FALLTHROUGH */ + if (! LIKELY(Perl_isCC_by_bit(*s, lookup_bit))) break; + accumulated = MULTIPLY_BY_BASE(accumulated) + XDIGIT_VALUE(*s); + s++; + /* FALLTHROUGH */ case 5: - if (UNLIKELY(! generic_isCC_(*s, class_bit))) break; - value = (value << shift) | XDIGIT_VALUE(*s); - s++; - /* FALLTHROUGH */ + if (! LIKELY(Perl_isCC_by_bit(*s, lookup_bit))) break; + accumulated = MULTIPLY_BY_BASE(accumulated) + XDIGIT_VALUE(*s); + s++; + /* FALLTHROUGH */ case 4: - if (UNLIKELY(! generic_isCC_(*s, class_bit))) break; - value = (value << shift) | XDIGIT_VALUE(*s); - s++; - /* FALLTHROUGH */ + if (! LIKELY(Perl_isCC_by_bit(*s, lookup_bit))) break; + accumulated = MULTIPLY_BY_BASE(accumulated) + XDIGIT_VALUE(*s); + s++; + /* FALLTHROUGH */ case 3: - if (UNLIKELY(! generic_isCC_(*s, class_bit))) break; - value = (value << shift) | XDIGIT_VALUE(*s); - s++; - /* FALLTHROUGH */ + if (! LIKELY(Perl_isCC_by_bit(*s, lookup_bit))) break; + accumulated = MULTIPLY_BY_BASE(accumulated) + XDIGIT_VALUE(*s); + s++; + /* FALLTHROUGH */ case 2: - if (UNLIKELY(! generic_isCC_(*s, class_bit))) break; - value = (value << shift) | XDIGIT_VALUE(*s); - s++; - /* FALLTHROUGH */ + if (! LIKELY(Perl_isCC_by_bit(*s, lookup_bit))) break; + accumulated = MULTIPLY_BY_BASE(accumulated) + XDIGIT_VALUE(*s); + s++; + /* FALLTHROUGH */ case 1: - if (UNLIKELY(! generic_isCC_(*s, class_bit))) break; - value = (value << shift) | XDIGIT_VALUE(*s); + if (! LIKELY(Perl_isCC_by_bit(*s, lookup_bit))) break; + accumulated = MULTIPLY_BY_BASE(accumulated) + XDIGIT_VALUE(*s); + s++; + /* FALLTHROUGH */ + case 0: + return accumulated; + } /* End of switch on the first so-many characters */ - if (LIKELY(len <= 8)) { - return value; - } + /* To get here, there was an unexpected character in the input (including + * an underscore, which is optionally acceptable). */ + if (*s != '_' || ! allow_underscores) { + goto done_parse; + } - s++; - break; + /* An acceptable initial underscore has to have the right flag */ + if (s == s0 && (input_flags & PERL_SCAN_ALLOW_MEDIAL_UNDERSCORES_ONLY)) { + goto done_parse; } - bytes_so_far = s - s0; - factor = shift << bytes_so_far; - len -= bytes_so_far; - - for (; len--; s++) { - if (generic_isCC_(*s, class_bit)) { - /* Write it in this wonky order with a goto to attempt to get the - compiler to make the common case integer-only loop pretty tight. - With gcc seems to be much straighter code than old scan_hex. - (khw suspects that adding a LIKELY() just above would do the - same thing) */ - redo: - if (LIKELY(value <= max_div)) { - value = (value << shift) | XDIGIT_VALUE(*s); - /* Note XDIGIT_VALUE() is branchless, works on binary - * and octal as well, so can be used here, without - * slowing those down */ - factor *= 1 << shift; - continue; + if (! underscore_valid(s, e, lookup_bit)) { + goto done_parse; + } + + /* underscore_valid() succeeds only if the next char is a legal digit */ + s++; + + /* If we haven't seen any non-zero digits yet, we can jump back in to the + * switch() without fear of exceeding the portability limits */ + if (UNLIKELY(accumulated == 0)) { + goto redo_switch; + } + + /* Here s points to a legal digit. We can save some operations by + * accumulating it now, and positioning the loop to start on the next + * character (whose value is unknown here). */ + accumulated = MULTIPLY_BY_BASE(accumulated) + XDIGIT_VALUE(*s); + s++; + + loop: ; + + /* Here, 'accumulated' contains the running total so far in the input, + * and 's' points to the next character. + * + * The loop below accumulates the integral running total of the result, + * digit by digit. + * + * As long as the running total is less than this, the next digit will + * fit. */ + UV max_div; + max_div = base16_max_div; + U32 valid_digit_or_underscore_bits; + + valid_digit_or_underscore_bits = (lookup_bit|CC_mask_(CC_UNDERSCORE_)); + + /* Loop through the characters */ + while (s < e && Perl_isCC_by_bit(*s, valid_digit_or_underscore_bits)) { + + /* Handle non-trailing underscores when those are accepted */ + if (UNLIKELY(*s == '_')) { + if ( ! allow_underscores + || ! underscore_valid(s, e, lookup_bit)) + { + break; } - /* Bah. We are about to overflow. Instead, add the unoverflowed - * value to an NV that contains an approximation to the correct - * value. Each time through the loop we have increased 'factor' so - * that it gives how much the current approximation needs to - * effectively be shifted to make room for this new value */ - value_nv *= factor; - value_nv += (NV) value; - - /* Then we keep accumulating digits, until all are parsed. We - * start over using the current input value. This will be added to - * 'value_nv' eventually, either when all digits are gone, or we - * have overflowed this fresh start. */ - value = XDIGIT_VALUE(*s); - factor = 1 << shift; - - if (! overflowed) { - overflowed = TRUE; - if ( ! (input_flags & PERL_SCAN_SILENT_OVERFLOW) - && ckWARN_d(WARN_OVERFLOW)) - { - warner(packWARN(WARN_OVERFLOW), - "Integer overflow in %s number", - (base == 16) ? "hexadecimal" - : (base == 2) - ? "binary" - : "octal"); + /* underscore_valid() succeeds only if the next char is a legal + * digit */ + ++s; + } + + check_overflow: + if (UNLIKELY(accumulated >= max_div)) { + + /* Here we have reached overflowing or nearly overflowing for at + * least base 16, which has the lowest such threshold of the bases + * we handle. For the other bases, we now set the proper upper + * limit and try again. (It's comparatively rare for a number to + * be this large, so doing it here means this code won't get + * commonly executed.) */ + if (max_div == base16_max_div) { + switch (base) { + case 16: break; + case 10: max_div = UV_MAX / 10; goto check_overflow; + case 8: max_div = UV_MAX >> 3; goto check_overflow; + case 2: max_div = UV_MAX >> 1; goto check_overflow; + default: goto bad_base; } } - continue; + + /* If we've exceeded 'max_div' this digit is going to overflow, + * but if equal, for all the power-of-two bases, this digit is + * guaranteed to not overflow. For base 10, some larger digits + * will overflow, so have to check explicitly */ + if ( accumulated > max_div + || ( base == 10 + && (unsigned) XDIGIT_VALUE(*s) > + UV_MAX - MULTIPLY_BY_BASE(max_div))) + { + goto overflowed; + } } - if ( *s == '_' - && len - && allow_underscores - && generic_isCC_(s[1], class_bit) - - /* Don't allow a leading underscore if the only-medial bit is - * set */ - && ( LIKELY(s > s0) - || UNLIKELY((input_flags & PERL_SCAN_ALLOW_MEDIAL_UNDERSCORES) - != PERL_SCAN_ALLOW_MEDIAL_UNDERSCORES))) - { - --len; - ++s; - goto redo; + /* Otherwise, there is room for this digit; accumulate it and repeat + * + * Note XDIGIT_VALUE() is branchless, works on binary and octal as + * well, so can be used here, without noticeably slowing those down. + * (It does have unnecessary shifts, ANDSs, and additions for those.) + * */ + accumulated = MULTIPLY_BY_BASE(accumulated) + XDIGIT_VALUE(*s); + s++; + } /* End of parsing loop */ + + done_parse: + +#if UVSIZE > 4 + if (UNLIKELY(accumulated <= 0xffffffff)) { + /* Fits in 32 bits; no warning necessary */ + input_flags |= PERL_SCAN_SILENT_NON_PORTABLE; + } + else { + /* Doesn't fit; return that to caller */ + *flags |= PERL_SCAN_SILENT_NON_PORTABLE; + + /* If caller doesn't want warning raised, turn it off */ + if (! (input_flags & PERL_SCAN_SILENT_NON_PORTABLE)) { + input_flags &= ~PERL_SCAN_SILENT_NON_PORTABLE; } + } +#endif - if (*s) { - if ( ! (input_flags & PERL_SCAN_SILENT_ILLDIGIT) - && ckWARN(WARN_DIGIT)) - { - if (base != 8) { - warner(packWARN(WARN_DIGIT), - "Illegal %s digit '%c' ignored", - ((base == 2) - ? "binary" - : "hexadecimal"), - *s); - } - else if (isDIGIT(*s)) { /* octal base */ + finish: + if (s < e && *s) { /* *s is to keep a terminating NUL from warning */ + if (! (input_flags & PERL_SCAN_SILENT_ILLDIGIT) && ckWARN(WARN_DIGIT)) + { + const char * base_name; - /* Allow \octal to work the DWIM way (that is, stop - * scanning as soon as non-octal characters are seen, - * complain only if someone seems to want to use the digits - * eight and nine. Since we know it is not octal, then if - * isDIGIT, must be an 8 or 9). */ - warner(packWARN(WARN_DIGIT), - "Illegal octal digit '%c' ignored", *s); + switch (base) { + default: goto bad_base; + case 2: base_name = "binary"; break; + case 16: base_name = "hexadecimal"; break; + case 10: /* Base 10 historically has not raised warnings here */ + goto illegal_warning_done; + case 8: + + /* Allow \octal to work the DWIM way (that is, stop scanning + * as soon as non-octal characters are seen, complain only if + * someone seems to want to use the digits eight and nine. + * Since we know it is not octal, then if isDIGIT, must be an + * 8 or 9). khw: XXX why not DWIM for other bases as well? */ + if (! isDIGIT(*s)) { + goto illegal_warning_done; } - } - if (input_flags & PERL_SCAN_NOTIFY_ILLDIGIT) { - *flags |= PERL_SCAN_NOTIFY_ILLDIGIT; + base_name = "octal"; + break; } + + warner(packWARN(WARN_DIGIT), "Illegal %s digit '%c' ignored", + base_name, *s); + illegal_warning_done: ; } - break; + if (input_flags & PERL_SCAN_NOTIFY_ILLDIGIT) { + *flags |= PERL_SCAN_NOTIFY_ILLDIGIT; + } + } + + if (! LIKELY(input_flags & PERL_SCAN_SILENT_NON_PORTABLE)) { + output_non_portable(base); } + /* s here points to e or to the first illegal character */ *len_p = s - start; + return accumulated; - if (LIKELY(! overflowed)) { -#if UVSIZE > 4 - if ( UNLIKELY(value > 0xffffffff) - && ! (input_flags & PERL_SCAN_SILENT_NON_PORTABLE)) + bad_base: + croak("panic: Unexpected numeric base %d", base); + + overflowed: ; + + /* Bah. We are about to overflow. The caller may want an approximation to + * the correct value (by passing a pointer to an NV, 'approximation'); or + * may not want to actually overflow, but instead return the highest, + * non-overflowing value (rounded, a flag indicates to do this, which + * overrides also passing 'approximation'). + * + * 's' points to the first overflowing digit. */ + UV high_order_batch; + if (UNLIKELY(input_flags & PERL_SCAN_DISCARD_INSTEAD_OF_OVERFLOW)) { + + /* Return that it actually happened */ + *flags |= PERL_SCAN_DISCARD_INSTEAD_OF_OVERFLOW; + + /* Override this */ + approximation = NULL; + } + else { + /* Here, does want overflow to happen. Set up return, and do + * warnings. */ + *flags |= PERL_SCAN_GREATER_THAN_UV_MAX + | PERL_SCAN_SILENT_NON_PORTABLE; + + if (input_flags & PERL_SCAN_SILENT_OVERFLOW) { + *flags |= PERL_SCAN_SILENT_OVERFLOW; + } + else if (ckWARN_d(WARN_OVERFLOW)) { + const char * base_name; + + switch (base) { + default: goto bad_base; + case 2: base_name = "binary"; break; + case 8: base_name = "octal"; break; + case 16: base_name = "hexadecimal"; break; + case 10: /* Base 10 historically has not raised a warning here */ + goto overflow_warning_done; + } + + warner(packWARN(WARN_OVERFLOW), "Integer overflow in %s number", + base_name); + overflow_warning_done: ; + } + + high_order_batch = accumulated; + accumulated = UV_MAX; + input_flags &= ~PERL_SCAN_SILENT_NON_PORTABLE; + } + + /* We always have to keep parsing to find the end of the intended number. + * If we don't need to compute an approximation, we don't have to pay much + * attention to the values */ + if (approximation == NULL) { + + /* When discarding, we round the undiscarded result to even. In some + * cases, whether to round isn't known until the final discarded digit + * is processed. This enum keeps track of that */ + enum { + dont_round, + yes_round_up, + round_to_even_if_half + } to_round = dont_round; + + if (accumulated < UV_MAX) { /* Can't round up if already at max */ + uint_fast8_t this_digit_value = XDIGIT_VALUE(*s); + to_round = (this_digit_value < base / 2) ? dont_round + : (this_digit_value > base / 2) ? yes_round_up + : round_to_even_if_half; /* Exactly half */ + } + + /* Find end of input, seeing if need to round */ + s++; + while (s < e && Perl_isCC_by_bit(*s, valid_digit_or_underscore_bits)) { + if ( UNLIKELY(*s == '_') + && ( ! allow_underscores + || ! underscore_valid(s, e, lookup_bit))) + { + break; + } + + /* If the result is no longer exactly half, set to round up */ + if (to_round == round_to_even_if_half && *s != '0') { + to_round = yes_round_up; + } + + s++; + } + + if ( to_round == yes_round_up + /* When the final non-zero digit was exactly half the base, we + * round towards even, meaning don't change if already even */ + || (to_round == round_to_even_if_half && isODD(accumulated))) { - output_non_portable(base); - *flags |= PERL_SCAN_SILENT_NON_PORTABLE; + accumulated++; } -#endif - return value; + + goto finish; } - /* Overflowed: Calculate the final overflow approximation */ - value_nv *= factor; - value_nv += (NV) value; - - output_non_portable(base); - - *flags |= PERL_SCAN_GREATER_THAN_UV_MAX - | PERL_SCAN_SILENT_NON_PORTABLE; - if (result) - *result = value_nv; - return UV_MAX; + /* Here, the caller wants an approximation to the overflowed value. + * + * It turns out that there is less precision loss if we start at the low + * order digits of the string and build up the number from there. This is + * because if we overflow multiple times, the low order digits will be so + * small in comparison to the larger ones that they are completely + * disregarded. But going the other way allows them to contribute + * whatever bits they have to offer. + * + * So, find the end of the string */ + const char * s1 = s; /* Save our place */ + s++; + while (s < e && Perl_isCC_by_bit(*s, valid_digit_or_underscore_bits)) { + if ( UNLIKELY(*s == '_') + && ( ! allow_underscores + || ! underscore_valid(s, e, lookup_bit))) + { + break; + } + + s++; + } + + /* Here we got to the end of the string; either we encountered an illegal + * character, which ends it, or got to the final position in it. 's' + * points to the position just after the final legal character. + * + * Accumulate the value starting at the lowest order digit and going + * backwards */ + const char * t = s - 1; + NV accumulated_nv = 0; + NV accumulated_factor = 1; + + UV this_batch_accumulated = 0; + UV this_batch_factor = 1; + + /* To minimize precision loss, we do integer arithmetic on batches that + * don't overflow. When one does, the final integer that didn't overflow + * is factored in to the running total, and a new batch is started */ + while (t >= s1) { + + /* Any underscores were already determined to be valid */ + if (UNLIKELY(*t == '_')) { + t--; + continue; + } + + /* If will fit, accumulate it and repeat. Each digit has to be + * multiplied by the position it occupies, like 1, 8, 8-squared, + * 8-cubed, etc */ + if ( LIKELY(this_batch_accumulated <= max_div) + && LIKELY(this_batch_factor <= max_div)) + { + U8 this_digit_value = XDIGIT_VALUE(*t); + this_batch_accumulated += this_digit_value * this_batch_factor; + this_batch_factor = MULTIPLY_BY_BASE(this_batch_factor); + t--; + continue; + } + + /* Bah. We are about to overflow again. Instead, accumulate this + * batch into the running total for all low order batches, and start a + * new batch. */ + accumulated_nv += this_batch_accumulated * accumulated_factor; + accumulated_factor *= this_batch_factor; + + this_batch_accumulated = 0; + this_batch_factor = 1; + } + + /* Here have accumulated everything. Combine the low order bits with the + * high order that we have saved in 'high_order_batch'. Those must be + * shifted left to account for the low order ones */ + accumulated_nv += this_batch_accumulated * accumulated_factor; + accumulated_factor *= this_batch_factor; + accumulated_nv += high_order_batch * accumulated_factor; + + *approximation = accumulated_nv; + goto finish; } /* @@ -634,12 +862,12 @@ For backwards compatibility. Use C, accepts various ways of spelling "infinity" or "not a number", and returns one of the following flag combinations: @@ -742,26 +976,24 @@ If an infinity or a not-a-number is reco one byte past the end of the recognized string. If the recognition fails, zero is returned, and C<*sp> will not move. -=for apidoc Amnh|bool|IS_NUMBER_GREATER_THAN_UV_MAX -=for apidoc Amnh|bool|IS_NUMBER_INFINITY -=for apidoc Amnh|bool|IS_NUMBER_IN_UV -=for apidoc Amnh|bool|IS_NUMBER_NAN -=for apidoc Amnh|bool|IS_NUMBER_NEG -=for apidoc Amnh|bool|IS_NUMBER_NOT_INT - =cut */ int Perl_grok_infnan(pTHX_ const char** sp, const char* send) { + PERL_ARGS_ASSERT_GROK_INFNAN; + const char* s = *sp; + + if (UNLIKELY(s >= send)) { + return 0; + } + int flags = 0; #if defined(NV_INF) || defined(NV_NAN) bool odh = FALSE; /* one-dot-hash: 1.#INF */ - PERL_ARGS_ASSERT_GROK_INFNAN; - if (*s == '+') { s++; if (s == send) return 0; } @@ -997,9 +1229,17 @@ Perl_grok_infnan(pTHX_ const char** sp, =for apidoc grok_number =for apidoc_item grok_number_flags +=for apidoc_flag IS_NUMBER_GREATER_THAN_UV_MAX +=for apidoc_flag IS_NUMBER_INFINITY +=for apidoc_flag IS_NUMBER_IN_UV +=for apidoc_flag IS_NUMBER_NAN +=for apidoc_flag IS_NUMBER_NEG +=for apidoc_flag IS_NUMBER_NOT_INT +=for apidoc_flag IS_NUMBER_TRAILING +=for apidoc_flag PERL_SCAN_TRAILING -Look for a number in the C bytes starting at C. If one isn't found, -return 0; otherwise return its type (and optionally its value). In +Look for a base 10 number in the C bytes starting at C. If one isn't +found, return 0; otherwise return its type (and optionally its value). In C all C bytes must be either leading C> characters or part of the number. The same is true in C unless C contains the C bit, which allows for @@ -1041,15 +1281,6 @@ In C when C co bit, and trailing non-numeric text was found, the returned type will include the C bit. -=for apidoc Amnh||IS_NUMBER_GREATER_THAN_UV_MAX -=for apidoc Amnh||IS_NUMBER_INFINITY -=for apidoc Amnh||IS_NUMBER_IN_UV -=for apidoc Amnh||IS_NUMBER_NAN -=for apidoc Amnh||IS_NUMBER_NEG -=for apidoc Amnh||IS_NUMBER_NOT_INT -=for apidoc Amnh||IS_NUMBER_TRAILING -=for apidoc Amnh||PERL_SCAN_TRAILING - =cut */ int @@ -1066,13 +1297,13 @@ static const U8 uv_max_mod_10 = UV_MAX % int Perl_grok_number_flags(pTHX_ const char *pv, STRLEN len, UV *valuep, U32 flags) { + PERL_ARGS_ASSERT_GROK_NUMBER_FLAGS; + const char *s = pv; const char * const send = pv + len; const char *d; int numtype = 0; - PERL_ARGS_ASSERT_GROK_NUMBER_FLAGS; - if (UNLIKELY(isSPACE(*s))) { s++; while (s < send) { @@ -1117,114 +1348,32 @@ Perl_grok_number_flags(pTHX_ const char /* next must be digit or the radix separator or beginning of infinity/nan */ if (LIKELY(isDIGIT(*s))) { - /* UVs are at least 32 bits, so the first 9 decimal digits cannot - overflow. */ - UV value = *s - '0'; /* Process this first (perhaps only) digit */ - int digit; + STRLEN len = send - s; + I32 grok_int_flags = PERL_SCAN_SILENT_ILLDIGIT + | PERL_SCAN_SILENT_NON_PORTABLE + | PERL_SCAN_DISCARD_INSTEAD_OF_OVERFLOW + ; + UV value = grok_uint_by_base(s, &len, &grok_int_flags, NULL, + 10, CC_mask_(CC_DIGIT_), 0); + s += len; - s++; + if (grok_int_flags & PERL_SCAN_DISCARD_INSTEAD_OF_OVERFLOW) { + numtype |= IS_NUMBER_GREATER_THAN_UV_MAX; + } + else { + // dent XXX - switch(send - s) { - default: /* 8 or more remaining characters */ - digit = *s - '0'; - if (UNLIKELY(! inRANGE(digit, 0, 9))) break; - value = value * 10 + digit; - s++; - /* FALLTHROUGH */ - case 7: - digit = *s - '0'; - if (UNLIKELY(! inRANGE(digit, 0, 9))) break; - value = value * 10 + digit; - s++; - /* FALLTHROUGH */ - case 6: - digit = *s - '0'; - if (UNLIKELY(! inRANGE(digit, 0, 9))) break; - value = value * 10 + digit; - s++; - /* FALLTHROUGH */ - case 5: - digit = *s - '0'; - if (UNLIKELY(! inRANGE(digit, 0, 9))) break; - value = value * 10 + digit; - s++; - /* FALLTHROUGH */ - case 4: - digit = *s - '0'; - if (UNLIKELY(! inRANGE(digit, 0, 9))) break; - value = value * 10 + digit; - s++; - /* FALLTHROUGH */ - case 3: - digit = *s - '0'; - if (UNLIKELY(! inRANGE(digit, 0, 9))) break; - value = value * 10 + digit; - s++; - /* FALLTHROUGH */ - case 2: - digit = *s - '0'; - if (UNLIKELY(! inRANGE(digit, 0, 9))) break; - value = value * 10 + digit; - s++; - /* FALLTHROUGH */ - case 1: - digit = *s - '0'; - if (UNLIKELY(! inRANGE(digit, 0, 9))) break; - value = value * 10 + digit; - s++; - /* FALLTHROUGH */ - case 0: /* This case means the string consists of just the one - digit we already have processed */ + numtype |= IS_NUMBER_IN_UV; - /* If we got here by falling through other than the default: case, we - * have processed the whole string, and know it consists entirely of - * digits, and can't have overflowed. */ - if (s >= send) { - if (valuep) - *valuep = value; - return numtype|IS_NUMBER_IN_UV; - } - - /* Here, there are extra characters beyond the first 9 digits. Use a - * loop to accumulate any remaining digits, until we get a non-digit or - * would overflow. Note that leading zeros could cause us to get here - * without being close to overflowing. - * - * (The conditional 's >= send' above could be eliminated by making the - * default: in the switch to instead be 'case 8:', and process longer - * strings separately by using the loop below. This would penalize - * these inputs by the extra instructions needed for looping. That - * could be eliminated by copying the unwound code from above to handle - * the firt 9 digits of these. khw didn't think this saving of a - * single conditional was worth it.) */ - do { - digit = *s - '0'; - if (! inRANGE(digit, 0, 9)) goto mantissa_done; - if ( value < uv_max_div_10 - || ( value == uv_max_div_10 - && digit <= uv_max_mod_10)) - { - value = value * 10 + digit; - s++; - } - else { /* value would overflow. skip the remaining digits, don't - worry about setting *valuep. */ - do { - s++; - } while (s < send && isDIGIT(*s)); - numtype |= - IS_NUMBER_GREATER_THAN_UV_MAX; - goto skip_value; - } - } while (s < send); - } /* End switch on input length */ + if (valuep) { + *valuep = value; + } - mantissa_done: - numtype |= IS_NUMBER_IN_UV; - if (valuep) - *valuep = value; + if (s >= send) { + return numtype; + } + } - skip_value: if (GROK_NUMERIC_RADIX(&s, send)) { numtype |= IS_NUMBER_NOT_INT; while (s < send && isDIGIT(*s)) /* optional digits after the radix */ @@ -1287,7 +1436,7 @@ Perl_grok_number_flags(pTHX_ const char if ((s + 2 < send) && UNLIKELY(memCHRs("inqs#", toFOLD(*s)))) { /* Really detect inf/nan. Start at d, not s, since the above * code might have already consumed the "1." or "1". */ - const int infnan = Perl_grok_infnan(aTHX_ &d, send); + const int infnan = grok_infnan(&d, send); if ((infnan & IS_NUMBER_TRAILING) && !(flags & PERL_SCAN_TRAILING)) { return 0; @@ -1405,7 +1554,7 @@ Perl_grok_atoUV(const char *pv, UV *valp } #ifndef Perl_strtod -STATIC NV +static NV S_mulexp10(NV value, I32 exponent) { NV result = 1.0; @@ -1511,6 +1660,7 @@ S_mulexp10(NV value, I32 exponent) NV Perl_my_atof(pTHX_ const char* s) { + PERL_ARGS_ASSERT_MY_ATOF; /* =for apidoc my_atof @@ -1528,8 +1678,6 @@ N.B. C must be NUL terminated. NV x = 0.0; - PERL_ARGS_ASSERT_MY_ATOF; - #if ! defined(USE_LOCALE_NUMERIC) ATOF(s, x); @@ -1672,6 +1820,8 @@ Perl_my_atof2(pTHX_ const char* orig, NV char* Perl_my_atof3(pTHX_ const char* orig, NV* value, const STRLEN len) { + PERL_ARGS_ASSERT_MY_ATOF3; + const char* s = orig; NV result[3] = {0.0, 0.0, 0.0}; #if defined(USE_PERL_ATOF) || defined(Perl_strtod) @@ -1694,7 +1844,6 @@ Perl_my_atof3(pTHX_ const char* orig, NV #endif #if defined(USE_PERL_ATOF) || defined(Perl_strtod) - PERL_ARGS_ASSERT_MY_ATOF3; /* leading whitespace */ while (s < send && isSPACE(*s)) @@ -1922,6 +2071,8 @@ This is also the logical inverse of Perl bool Perl_isinfnan(NV nv) { + PERL_ARGS_ASSERT_ISINFNAN; + PERL_UNUSED_ARG(nv); #ifdef Perl_isinf if (Perl_isinf(nv)) @@ -1989,7 +2140,8 @@ Perl_my_modfl(long double x, long double /* Similarly, with ilogbl and scalbnl we can emulate frexpl. */ #if ! defined(HAS_FREXPL) && defined(HAS_ILOGBL) && defined(HAS_SCALBNL) long double -Perl_my_frexpl(long double x, int *e) { +Perl_my_frexpl(long double x, int *e) +{ *e = x == 0.0L ? 0 : ilogbl(x) + 1; return (scalbnl(x, -*e)); } @@ -2019,7 +2171,10 @@ Users should just always call Copslab_slots; @@ -291,7 +298,8 @@ S_new_slab(pTHX_ OPSLAB *head, size_t sz #define link_freed_op(slab, o) S_link_freed_op(aTHX_ slab, o) static void -S_link_freed_op(pTHX_ OPSLAB *slab, OP *o) { +S_link_freed_op(pTHX_ OPSLAB *slab, OP *o) +{ U16 sz = OpSLOT(o)->opslot_size; U16 index = OPSLOT_SIZE_TO_INDEX(sz); @@ -335,6 +343,8 @@ S_link_freed_op(pTHX_ OPSLAB *slab, OP * void * Perl_Slab_Alloc(pTHX_ size_t sz) { + PERL_ARGS_ASSERT_SLAB_ALLOC; + OPSLAB *head_slab; /* first slab in the chain */ OPSLAB *slab2; OPSLOT *slot; @@ -465,10 +475,10 @@ Perl_Slab_to_ro(pTHX_ OPSLAB *slab) void Perl_Slab_to_rw(pTHX_ OPSLAB *const slab) { - OPSLAB *slab2; - PERL_ARGS_ASSERT_SLAB_TO_RW; + OPSLAB *slab2; + if (!slab->opslab_readonly) return; slab2 = slab; for (; slab2; slab2 = slab2->opslab_next) { @@ -504,11 +514,11 @@ S_pp_freed(pTHX) void Perl_Slab_Free(pTHX_ void *op) { + PERL_ARGS_ASSERT_SLAB_FREE; + OP * const o = (OP *)op; OPSLAB *slab; - PERL_ARGS_ASSERT_SLAB_FREE; - #ifdef DEBUGGING o->op_ppaddr = S_pp_freed; #endif @@ -532,8 +542,9 @@ Perl_Slab_Free(pTHX_ void *op) void Perl_opslab_free_nopad(pTHX_ OPSLAB *slab) { - const bool havepad = cBOOL(PL_comppad); PERL_ARGS_ASSERT_OPSLAB_FREE_NOPAD; + + const bool havepad = cBOOL(PL_comppad); if (havepad) { ENTER; PAD_SAVE_SETNULLPAD(); @@ -555,9 +566,10 @@ Perl_opslab_free_nopad(pTHX_ OPSLAB *sla void Perl_opslab_free(pTHX_ OPSLAB *slab) { - OPSLAB *slab2; PERL_ARGS_ASSERT_OPSLAB_FREE; PERL_UNUSED_CONTEXT; + + OPSLAB *slab2; DEBUG_S_warn((aTHX_ "freeing slab %p", (void*)slab)); assert(slab->opslab_refcnt == 1); PerlMemShared_free(slab->opslab_freed); @@ -587,11 +599,12 @@ Perl_opslab_free(pTHX_ OPSLAB *slab) void Perl_opslab_force_free(pTHX_ OPSLAB *slab) { + PERL_ARGS_ASSERT_OPSLAB_FORCE_FREE; + OPSLAB *slab2; #ifdef DEBUGGING size_t savestack_count = 0; #endif - PERL_ARGS_ASSERT_OPSLAB_FORCE_FREE; slab2 = slab; do { OPSLOT *slot = OpSLOToff(slab2, slab2->opslab_free_space); @@ -629,6 +642,8 @@ Perl_opslab_force_free(pTHX_ OPSLAB *sla OP * Perl_op_refcnt_inc(pTHX_ OP *o) { + PERL_ARGS_ASSERT_OP_REFCNT_INC; + if(o) { OPSLAB *const slab = o->op_slabbed ? OpSLAB(o) : NULL; if (slab && slab->opslab_readonly) { @@ -646,11 +661,11 @@ Perl_op_refcnt_inc(pTHX_ OP *o) PADOFFSET Perl_op_refcnt_dec(pTHX_ OP *o) { + PERL_ARGS_ASSERT_OP_REFCNT_DEC; + PADOFFSET result; OPSLAB *const slab = o->op_slabbed ? OpSLAB(o) : NULL; - PERL_ARGS_ASSERT_OP_REFCNT_DEC; - if (slab && slab->opslab_readonly) { Slab_to_rw(slab); result = --o->op_targ; @@ -674,7 +689,7 @@ Perl_op_refcnt_dec(pTHX_ OP *o) #define RETURN_UNLIMITED_NUMBER (PERL_INT_MAX / 2) -STATIC OP * +static OP * S_no_fh_allowed(pTHX_ OP *o) { PERL_ARGS_ASSERT_NO_FH_ALLOWED; @@ -684,7 +699,7 @@ S_no_fh_allowed(pTHX_ OP *o) return o; } -STATIC OP * +static OP * S_too_few_arguments_pv(pTHX_ OP *o, const char* name, U32 flags) { PERL_ARGS_ASSERT_TOO_FEW_ARGUMENTS_PV; @@ -692,7 +707,7 @@ S_too_few_arguments_pv(pTHX_ OP *o, cons return o; } -STATIC OP * +static OP * S_too_many_arguments_pv(pTHX_ OP *o, const char *name, U32 flags) { PERL_ARGS_ASSERT_TOO_MANY_ARGUMENTS_PV; @@ -701,7 +716,7 @@ S_too_many_arguments_pv(pTHX_ OP *o, con return o; } -STATIC void +static void S_bad_type_pv(pTHX_ I32 n, const char *t, const OP *o, const OP *kid) { PERL_ARGS_ASSERT_BAD_TYPE_PV; @@ -710,12 +725,13 @@ S_bad_type_pv(pTHX_ I32 n, const char *t (int)n, PL_op_desc[(o)->op_type], t, OP_DESC(kid)), 0); } -STATIC void +static void S_bad_type_gv(pTHX_ I32 n, GV *gv, const OP *kid, const char *t) { - SV * const namesv = cv_name((CV *)gv, NULL, 0); PERL_ARGS_ASSERT_BAD_TYPE_GV; + SV * const namesv = cv_name((CV *)gv, NULL, 0); + yyerror_pv(form("Type of arg %d to %" SVf " must be %s (not %s)", (int)n, SVfARG(namesv), t, OP_DESC(kid)), SvUTF8(namesv)); } @@ -725,9 +741,8 @@ Perl_no_bareword_allowed(pTHX_ OP *o) { PERL_ARGS_ASSERT_NO_BAREWORD_ALLOWED; - qerror(Perl_mess(aTHX_ - "Bareword \"%" SVf "\" not allowed while \"strict subs\" in use", - SVfARG(cSVOPo_sv))); + defer_error(mess("Bareword \"%" SVf "\" not allowed while \"strict subs\" in" + " use", SVfARG(cSVOPo_sv))); o->op_private &= ~OPpCONST_STRICT; /* prevent warning twice about the same OP */ } @@ -737,7 +752,10 @@ filehandles. */ PERL_STATIC_INLINE bool -S_is_standard_filehandle_name(const char *fhname) { +S_is_standard_filehandle_name(const char *fhname) +{ + PERL_ARGS_ASSERT_IS_STANDARD_FILEHANDLE_NAME; + return strEQ(fhname, "STDERR") || strEQ(fhname, "STDOUT") || strEQ(fhname, "STDIN") @@ -748,11 +766,13 @@ S_is_standard_filehandle_name(const char } void -Perl_no_bareword_filehandle(pTHX_ const char *fhname) { +Perl_no_bareword_filehandle(pTHX_ const char *fhname) +{ PERL_ARGS_ASSERT_NO_BAREWORD_FILEHANDLE; if (!is_standard_filehandle_name(fhname)) { - qerror(Perl_mess(aTHX_ "Bareword filehandle \"%s\" not allowed under 'no feature \"bareword_filehandles\"'", fhname)); + defer_error(mess("Bareword filehandle \"%s\" not allowed under 'no" + " feature \"bareword_filehandles\"'", fhname)); } } @@ -761,18 +781,19 @@ Perl_no_bareword_filehandle(pTHX_ const PADOFFSET Perl_allocmy(pTHX_ const char *const name, const STRLEN len, const U32 flags) { + PERL_ARGS_ASSERT_ALLOCMY; + assert(len >= 2); + assert(name[0] && name[1]); + PADOFFSET off; bool is_idfirst, is_default; const bool is_our = (PL_parser->in_my == KEY_our); - PERL_ARGS_ASSERT_ALLOCMY; - if (flags & ~SVf_UTF8) - croak("panic: allocmy illegal flag bits 0x%" UVxf, - (UV)flags); + croak("panic: allocmy illegal flag bits 0x%" U32xf, flags); is_idfirst = flags & SVf_UTF8 - ? isIDFIRST_utf8_safe((U8*)name + 1, name + len) + ? isIDFIRST_utf8_safe(name + 1, name + len) : isIDFIRST_A(name[1]); /* $_, @_, etc. */ @@ -802,11 +823,11 @@ Perl_allocmy(pTHX_ const char *const nam /* allocate a spare slot and store the name in that slot */ U32 addflags = 0; - if(is_our) + if (is_our) addflags |= padadd_OUR; - else if(PL_parser->in_my == KEY_state) + else if (PL_parser->in_my == KEY_state) addflags |= padadd_STATE; - else if(PL_parser->in_my == KEY_field) + else if (PL_parser->in_my == KEY_field) addflags |= padadd_FIELD; off = pad_add_name_pvn(name, len, addflags, @@ -819,7 +840,7 @@ Perl_allocmy(pTHX_ const char *const nam : NULL ) ); - /* anon sub prototypes contains state vars should always be cloned, + /* anon sub prototypes containing state vars should always be cloned, * otherwise the state var would be shared between anon subs */ if (PL_parser->in_my == KEY_state && CvANON(PL_compcv)) @@ -843,11 +864,11 @@ C for the stash passed to i PADOFFSET Perl_alloccopstash(pTHX_ HV *hv) { + PERL_ARGS_ASSERT_ALLOCCOPSTASH; + PADOFFSET off = 0, o = 1; bool found_slot = FALSE; - PERL_ARGS_ASSERT_ALLOCCOPSTASH; - if (PL_stashpad[PL_stashpadix] == hv) return PL_stashpadix; for (; o < PL_stashpadmax; ++o) { @@ -899,6 +920,8 @@ example: void Perl_op_free(pTHX_ OP *o) { + PERL_ARGS_ASSERT_OP_FREE; + OPCODE type; OP *top_op = o; OP *next_op = o; @@ -1026,7 +1049,7 @@ Perl_op_free(pTHX_ OP *o) /* S_op_clear_gv(): free a GV attached to an OP */ -STATIC +static #ifdef USE_ITHREADS void S_op_clear_gv(pTHX_ OP *o, PADOFFSET *ixp) #else @@ -1077,12 +1100,20 @@ void S_op_clear_gv(pTHX_ OP *o, SV**svp) } } +/* +=for apidoc op_clear + +Clean up anything allocated for an OP, except the OP itself. + +You may want to use L|/op_null> or +L|/op_free> instead. + +=cut +*/ void Perl_op_clear(pTHX_ OP *o) { - - PERL_ARGS_ASSERT_OP_CLEAR; switch (o->op_type) { @@ -1091,6 +1122,7 @@ Perl_op_clear(pTHX_ OP *o) case OP_ENTERTRY: case OP_ENTEREVAL: /* Was holding hints. */ case OP_ARGDEFELEM: /* Was holding signature index. */ + case OP_ITER: /* Was holding multivariable itervar count */ o->op_targ = 0; break; default: @@ -1225,6 +1257,20 @@ Perl_op_clear(pTHX_ OP *o) PerlMemShared_free(cUNOP_AUXo->op_aux); break; + case OP_MULTIPARAM: + { + struct op_multiparam_aux *aux = (struct op_multiparam_aux *)cUNOP_AUXo->op_aux; + if(aux->named) { + for(size_t namedix = 0; namedix < aux->n_named; namedix++) { + struct op_multiparam_named_aux *named = aux->named + namedix; + PerlMemShared_free((void *)named->namepv); + } + PerlMemShared_free(aux->named); + } + PerlMemShared_free(aux); + } + break; + case OP_MULTICONCAT: { UNOP_AUX_item *aux = cUNOP_AUXo->op_aux; @@ -1372,7 +1418,7 @@ Perl_op_clear(pTHX_ OP *o) } } -STATIC void +static void S_cop_free(pTHX_ COP* cop) { PERL_ARGS_ASSERT_COP_FREE; @@ -1403,13 +1449,13 @@ S_cop_free(pTHX_ COP* cop) PL_curcop = NULL; } -STATIC void +static void S_forget_pmop(pTHX_ PMOP *const o) { - HV * const pmstash = PmopSTASH(o); - PERL_ARGS_ASSERT_FORGET_PMOP; + HV * const pmstash = PmopSTASH(o); + if (pmstash && !SvIS_FREED(pmstash) && SvMAGICAL(pmstash)) { MAGIC * const mg = mg_find((const SV *)pmstash, PERL_MAGIC_symtab); if (mg) { @@ -1439,13 +1485,13 @@ S_forget_pmop(pTHX_ PMOP *const o) } -STATIC void +static void S_find_and_forget_pmops(pTHX_ OP *o) { - OP* top_op = o; - PERL_ARGS_ASSERT_FIND_AND_FORGET_PMOPS; + OP* top_op = o; + while (1) { switch (o->op_type) { case OP_SUBST: @@ -1485,7 +1531,6 @@ other ops. void Perl_op_null(pTHX_ OP *o) { - PERL_ARGS_ASSERT_OP_NULL; if (o->op_type == OP_NULL) @@ -1507,6 +1552,8 @@ void Perl_op_refcnt_lock(pTHX) PERL_TSA_ACQUIRE(PL_op_mutex) { + PERL_ARGS_ASSERT_OP_REFCNT_LOCK; + PERL_UNUSED_CONTEXT; OP_REFCNT_LOCK; } @@ -1523,6 +1570,8 @@ void Perl_op_refcnt_unlock(pTHX) PERL_TSA_RELEASE(PL_op_mutex) { + PERL_ARGS_ASSERT_OP_REFCNT_UNLOCK; + PERL_UNUSED_CONTEXT; OP_REFCNT_UNLOCK; } @@ -1592,6 +1641,8 @@ see C>, Cop_flags & OPf_KIDS) { OP *kid; for (kid = cLISTOPo->op_first; kid; kid = OpSIBLING(kid)) @@ -1848,7 +1902,7 @@ S_scalarkids(pTHX_ OP *o) return o; } -STATIC OP * +static OP * S_scalarboolean(pTHX_ OP *o) { PERL_ARGS_ASSERT_SCALARBOOLEAN; @@ -1975,6 +2029,8 @@ Perl_warn_elem_scalar_context(pTHX_ cons OP * Perl_scalar(pTHX_ OP *o) { + PERL_ARGS_ASSERT_SCALAR; + OP * top_op = o; while (1) { @@ -2085,8 +2141,9 @@ Perl_scalar(pTHX_ OP *o) kid = cLISTOPo->op_first; kid = OpSIBLING(kid); /* get past pushmark */ - assert(OpSIBLING(kid)); - name = op_varname(OpSIBLING(kid)); + OP *sibling = OpSIBLING(kid); + assert(sibling); + name = op_varname(sibling); if (!name) /* XS module fiddling with the op tree */ break; warn_elem_scalar_context(kid, name, o->op_type == OP_KVHSLICE, false); @@ -2126,12 +2183,12 @@ Perl_scalar(pTHX_ OP *o) OP * Perl_scalarvoid(pTHX_ OP *arg) { + PERL_ARGS_ASSERT_SCALARVOID; + OP *kid; SV* sv; OP *o = arg; - PERL_ARGS_ASSERT_SCALARVOID; - while (1) { U8 want; SV *useless_sv = NULL; @@ -2327,17 +2384,17 @@ Perl_scalarvoid(pTHX_ OP *arg) else if (SvPOK(sv)) { SV * const dsv = newSVpvs(""); useless_sv - = Perl_newSVpvf(aTHX_ - "a constant (%s)", - pv_pretty(dsv, SvPVX_const(sv), - SvCUR(sv), 32, NULL, NULL, - PERL_PV_PRETTY_DUMP - | PERL_PV_ESCAPE_NOCLEAR - | PERL_PV_ESCAPE_UNI_DETECT)); + = newSVpvf("a constant (%s)", + pv_pretty(dsv, SvPVX_const(sv), + SvCUR(sv), 32, NULL, NULL, + PERL_PV_PRETTY_DUMP + | PERL_PV_ESCAPE_NOCLEAR + | PERL_PV_ESCAPE_UNI_DETECT)); SvREFCNT_dec_NN(dsv); } else if (SvOK(sv)) { - useless_sv = Perl_newSVpvf(aTHX_ "a constant (%" SVf ")", SVfARG(sv)); + useless_sv = newSVpvf("a constant (%" SVf ")", + SVfARG(sv)); } else useless = "a constant (undef)"; @@ -2485,6 +2542,9 @@ Perl_scalarvoid(pTHX_ OP *arg) "anonymous hash ({})" : "anonymous array ([])"; break; + case OP_STUB: + op_null(o); + break; } if (useless_sv) { @@ -2521,6 +2581,8 @@ Perl_scalarvoid(pTHX_ OP *arg) static OP * S_listkids(pTHX_ OP *o) { + PERL_ARGS_ASSERT_LISTKIDS; + if (o && o->op_flags & OPf_KIDS) { OP *kid; for (kid = cLISTOPo->op_first; kid; kid = OpSIBLING(kid)) @@ -2535,6 +2597,8 @@ S_listkids(pTHX_ OP *o) OP * Perl_list(pTHX_ OP *o) { + PERL_ARGS_ASSERT_LIST; + OP * top_op = o; while (1) { @@ -2680,6 +2744,8 @@ Perl_list(pTHX_ OP *o) static OP * S_voidnonfinal(pTHX_ OP *o) { + PERL_ARGS_ASSERT_VOIDNONFINAL; + if (o) { const OPCODE type = o->op_type; @@ -2712,9 +2778,11 @@ S_voidnonfinal(pTHX_ OP *o) return o; } -STATIC OP * +static OP * S_modkids(pTHX_ OP *o, I32 type) { + PERL_ARGS_ASSERT_MODKIDS; + if (o && o->op_flags & OPf_KIDS) { OP *kid; for (kid = cLISTOPo->op_first; kid; kid = OpSIBLING(kid)) @@ -2734,6 +2802,8 @@ S_modkids(pTHX_ OP *o, I32 type) void Perl_check_hash_fields_and_hekify(pTHX_ UNOP *rop, SVOP *key_op, int real) { + PERL_ARGS_ASSERT_CHECK_HASH_FIELDS_AND_HEKIFY; + PADNAME *lexname; GV **fields; bool check_fields; @@ -2783,9 +2853,10 @@ Perl_check_hash_fields_and_hekify(pTHX_ && SvTYPE(sv) < SVt_PVMG && SvOK(sv) && !SvROK(sv) + && !(SvNOK(sv) && IN_LC_RUNTIME(LC_NUMERIC)) /* Decimal separator depends on runtime locale */ && real) { - SSize_t keylen; + STRLEN keylen; const char * const key = SvPV_const(sv, *(STRLEN*)&keylen); if (keylen > I32_MAX) { croak("Sorry, hash keys must be smaller than 2**31 bytes"); @@ -2848,8 +2919,9 @@ S_process_optree(pTHX_ CV *cv, OP *optre void Perl_op_relocate_sv(pTHX_ SV** svp, PADOFFSET* targp) { - PADOFFSET ix; PERL_ARGS_ASSERT_OP_RELOCATE_SV; + + PADOFFSET ix; if (!*svp) return; ix = pad_alloc(OP_CONST, SVf_READONLY); SvREFCNT_dec(PAD_SVl(ix)); @@ -3060,6 +3132,27 @@ S_potential_mod_type(I32 type) } +#define check_or_warn_refaliasing() S_check_or_warn_refaliasing(aTHX) +PERL_STATIC_INLINE void +S_check_or_warn_refaliasing(pTHX) +{ + if (!FEATURE_REFALIASING_IS_ENABLED) + croak("Experimental aliasing via reference not enabled"); + ck_warner_d(packWARN(WARN_EXPERIMENTAL__REFALIASING), + "Aliasing via reference is experimental"); +} + +#define check_or_warn_declared_refs() S_check_or_warn_declared_refs(aTHX) +PERL_STATIC_INLINE void +S_check_or_warn_declared_refs(pTHX) +{ + if (!FEATURE_MYREF_IS_ENABLED) + croak("The experimental declared_refs feature is not enabled"); + ck_warner_d(packWARN(WARN_EXPERIMENTAL__DECLARED_REFS), + "Declaring references is experimental"); +} + + /* =for apidoc op_lvalue @@ -3076,17 +3169,28 @@ called with an op of type C and It also flags things that need to behave specially in an lvalue context, such as C<$$x = 5> which might have to vivify a reference in C<$x>. -=cut +=for apidoc op_lvalue_flags +=for apidoc_flag OP_LVALUE_NO_CROAK + +This is a non-API lower-level interface to L>, whose +flags param has these bits: -Perl_op_lvalue_flags() is a non-API lower-level interface to -op_lvalue(). The flags param has these bits: - OP_LVALUE_NO_CROAK: return rather than croaking on error +=over +=item OP_LVALUE_NO_CROAK + +return rather than croaking on error + +=back + +=cut */ OP * Perl_op_lvalue_flags(pTHX_ OP *o, I32 type, U32 flags) { + PERL_ARGS_ASSERT_OP_LVALUE_FLAGS; + OP *top_op = o; if (!o || (PL_parser && PL_parser->error_count)) @@ -3488,11 +3592,7 @@ Perl_op_lvalue_flags(pTHX_ OP *o, I32 ty case OP_SREFGEN: if (type == OP_NULL) { /* local */ local_refgen: - if (!FEATURE_MYREF_IS_ENABLED) - croak("The experimental declared_refs " - "feature is not enabled"); - ck_warner_d(packWARN(WARN_EXPERIMENTAL__DECLARED_REFS), - "Declaring references is experimental"); + check_or_warn_declared_refs(); next_kid = cUNOPo->op_first; goto do_next; } @@ -3512,13 +3612,8 @@ Perl_op_lvalue_flags(pTHX_ OP *o, I32 ty { const U8 ec = PL_parser ? PL_parser->error_count : 0; S_lvref(aTHX_ kid, type); - if (!PL_parser || PL_parser->error_count == ec) { - if (!FEATURE_REFALIASING_IS_ENABLED) - croak( - "Experimental aliasing via reference not enabled"); - ck_warner_d(packWARN(WARN_EXPERIMENTAL__REFALIASING), - "Aliasing via reference is experimental"); - } + if (!PL_parser || PL_parser->error_count == ec) + check_or_warn_refaliasing(); } if (o->op_type == OP_REFGEN) op_null(cUNOPx(cUNOPo->op_first)->op_first); /* pushmark */ @@ -3618,9 +3713,11 @@ Perl_op_lvalue_flags(pTHX_ OP *o, I32 ty } -STATIC bool +static bool S_scalar_mod_type(const OP *o, I32 type) { + PERL_ARGS_ASSERT_SCALAR_MOD_TYPE; + switch (type) { case OP_POS: case OP_SASSIGN: @@ -3676,7 +3773,7 @@ S_scalar_mod_type(const OP *o, I32 type) } } -STATIC bool +static bool S_is_handle_constructor(const OP *o, I32 numargs) { PERL_ARGS_ASSERT_IS_HANDLE_CONSTRUCTOR; @@ -3704,6 +3801,8 @@ S_is_handle_constructor(const OP *o, I32 static OP * S_refkids(pTHX_ OP *o, I32 type) { + PERL_ARGS_ASSERT_REFKIDS; + if (o && o->op_flags & OPf_KIDS) { OP *kid; for (kid = cLISTOPo->op_first; kid; kid = OpSIBLING(kid)) @@ -3713,45 +3812,55 @@ S_refkids(pTHX_ OP *o, I32 type) } -/* Apply reference (autovivification) context to the subtree at o. - * For example in - * push @{expression}, ....; - * o will be the head of 'expression' and type will be OP_RV2AV. - * It marks the op o (or a suitable child) as autovivifying, e.g. by - * setting OPf_MOD. - * For OP_RV2AV/OP_PADAV and OP_RV2HV/OP_PADHV sets OPf_REF too if - * set_op_ref is true. +/* doref(): apply reference autovivification context (and scalar and + * lvalue context) to a subtree. For example, in: + * + * @{expression} = ...; + * + * the expression is expected to return an AV ref. If the expression + * is (for example) $h{foo}, then the OP_HELEM op associated with the + * expression needs to be flagged with: + * - OPf_MOD to indicate that it should autovivify if the element + * doesn't exist + * - OPpDEREF_AV to indicate that the autovivified return value should + * be [] rather than undef. + * + * The 'o' parameter is the head of the expression and 'type' is the + * context to apply (OP_RV2AV in the example above). + * + * If 'set_op_ref' is true, it also sets the OPf_REF flag on OP_RV2[AH]V + * and OP_PAD[AH]V ops * - * Also calls scalar(o). */ OP * Perl_doref(pTHX_ OP *o, I32 type, bool set_op_ref) { - OP * top_op = o; - PERL_ARGS_ASSERT_DOREF; + OP * top_op = o; + if (PL_parser && PL_parser->error_count) return o; + /* iterate down the tree */ + while (1) { switch (o->op_type) { case OP_ENTERSUB: if ((type == OP_EXISTS || type == OP_DEFINED) && - !(o->op_flags & OPf_STACKED)) { + !(o->op_flags & OPf_STACKED)) + { + /* 'defined &foo' etc: downgrade from a func call + * to just a special CV retrieval */ OpTYPE_set(o, OP_RV2CV); /* entersub => rv2cv */ assert(cUNOPo->op_first->op_type == OP_NULL); /* disable pushmark */ op_null(cLISTOPx(cUNOPo->op_first)->op_first); o->op_flags |= OPf_SPECIAL; } - else if (type == OP_RV2SV || type == OP_RV2AV || type == OP_RV2HV){ - o->op_private |= (type == OP_RV2AV ? OPpDEREF_AV - : type == OP_RV2HV ? OPpDEREF_HV - : OPpDEREF_SV); - o->op_flags |= OPf_MOD; - } + else + goto set_cxt; break; @@ -3769,14 +3878,20 @@ Perl_doref(pTHX_ OP *o, I32 type, bool s if (type == OP_DEFINED) o->op_flags |= OPf_SPECIAL; /* don't create GV */ /* FALLTHROUGH */ + case OP_AELEM: + case OP_HELEM: case OP_PADSV: + set_cxt: + /* if the parent wants an SV/AV/HV ref, set flags indicating + * that this op should autovivify such a value if need be */ if (type == OP_RV2SV || type == OP_RV2AV || type == OP_RV2HV) { o->op_private |= (type == OP_RV2AV ? OPpDEREF_AV : type == OP_RV2HV ? OPpDEREF_HV : OPpDEREF_SV); o->op_flags |= OPf_MOD; } - if (o->op_flags & OPf_KIDS) { + if (o->op_flags & OPf_KIDS && o->op_type != OP_ENTERSUB) { + /* propagate the context of *this* op to its children */ type = o->op_type; o = cUNOPo->op_first; continue; @@ -3808,18 +3923,6 @@ Perl_doref(pTHX_ OP *o, I32 type, bool s o = cBINOPo->op_first; continue; - case OP_AELEM: - case OP_HELEM: - if (type == OP_RV2SV || type == OP_RV2AV || type == OP_RV2HV) { - o->op_private |= (type == OP_RV2AV ? OPpDEREF_AV - : type == OP_RV2HV ? OPpDEREF_HV - : OPpDEREF_SV); - o->op_flags |= OPf_MOD; - } - type = o->op_type; - o = cBINOPo->op_first; - continue;; - case OP_SCOPE: case OP_LEAVE: set_op_ref = FALSE; @@ -3844,13 +3947,13 @@ Perl_doref(pTHX_ OP *o, I32 type, bool s } -STATIC OP * +static OP * S_dup_attrlist(pTHX_ OP *o) { - OP *rop; - PERL_ARGS_ASSERT_DUP_ATTRLIST; + OP *rop; + /* An attrlist is either a simple OP_CONST or an OP_LIST with kids, * where the first kid is OP_PUSHMARK and the remaining ones * are OP_CONST. We need to push the OP_CONST values. @@ -3870,7 +3973,7 @@ S_dup_attrlist(pTHX_ OP *o) return rop; } -STATIC void +static void S_apply_attrs(pTHX_ HV *stash, SV *target, OP *attrs) { PERL_ARGS_ASSERT_APPLY_ATTRS; @@ -3882,27 +3985,26 @@ S_apply_attrs(pTHX_ HV *stash, SV *targe #define ATTRSMODULE "attributes" #define ATTRSMODULE_PM "attributes.pm" - Perl_load_module( - aTHX_ PERL_LOADMOD_IMPORT_OPS, - newSVpvs(ATTRSMODULE), - NULL, - op_prepend_elem(OP_LIST, - newSVOP(OP_CONST, 0, stashsv), - op_prepend_elem(OP_LIST, - newSVOP(OP_CONST, 0, - newRV(target)), - dup_attrlist(attrs)))); + load_module(PERL_LOADMOD_IMPORT_OPS, + newSVpvs(ATTRSMODULE), + NULL, + op_prepend_elem(OP_LIST, + newSVOP(OP_CONST, 0, stashsv), + op_prepend_elem(OP_LIST, + newSVOP(OP_CONST, 0, + newRV(target)), + dup_attrlist(attrs)))); } } -STATIC void +static void S_apply_attrs_my(pTHX_ HV *stash, OP *target, OP *attrs, OP **imopsp) { + PERL_ARGS_ASSERT_APPLY_ATTRS_MY; + OP *pack, *imop, *arg; SV *meth, *stashsv, **svp; - PERL_ARGS_ASSERT_APPLY_ATTRS_MY; - if (!attrs) return; @@ -3916,8 +4018,7 @@ S_apply_attrs_my(pTHX_ HV *stash, OP *ta if (svp && *svp != &PL_sv_undef) NOOP; /* already in %INC */ else - Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT, - newSVpvs(ATTRSMODULE), NULL); + load_module(PERL_LOADMOD_NOIMPORT, newSVpvs(ATTRSMODULE), NULL); /* Need package name for method call. */ pack = newSVOP(OP_CONST, 0, newSVpvs(ATTRSMODULE)); @@ -3965,10 +4066,10 @@ void Perl_apply_attrs_string(pTHX_ const char *stashpv, CV *cv, const char *attrstr, STRLEN len) { - OP *attrs = NULL; - PERL_ARGS_ASSERT_APPLY_ATTRS_STRING; + OP *attrs = NULL; + if (!len) { len = strlen(attrstr); } @@ -3984,27 +4085,28 @@ Perl_apply_attrs_string(pTHX_ const char } } - Perl_load_module(aTHX_ PERL_LOADMOD_IMPORT_OPS, - newSVpvs(ATTRSMODULE), - NULL, op_prepend_elem(OP_LIST, - newSVOP(OP_CONST, 0, newSVpv(stashpv,0)), - op_prepend_elem(OP_LIST, - newSVOP(OP_CONST, 0, + load_module(PERL_LOADMOD_IMPORT_OPS, + newSVpvs(ATTRSMODULE), + NULL, + op_prepend_elem(OP_LIST, + newSVOP(OP_CONST, 0, newSVpv(stashpv,0)), + op_prepend_elem(OP_LIST, + newSVOP(OP_CONST, 0, newRV(MUTABLE_SV(cv))), attrs))); } -STATIC void +static void S_move_proto_attr(pTHX_ OP **proto, OP **attrs, const GV * name, bool curstash) { + PERL_ARGS_ASSERT_MOVE_PROTO_ATTR; + OP *new_proto = NULL; STRLEN pvlen; char *pv; OP *o; - PERL_ARGS_ASSERT_MOVE_PROTO_ATTR; - if (!*attrs) return; @@ -4110,14 +4212,14 @@ S_cant_declare(pTHX_ OP *o) "my")); } -STATIC OP * +static OP * S_my_kid(pTHX_ OP *o, OP *attrs, OP **imopsp) { + PERL_ARGS_ASSERT_MY_KID; + I32 type; const bool stately = PL_parser && PL_parser->in_my == KEY_state; - PERL_ARGS_ASSERT_MY_KID; - if (!o || (PL_parser && PL_parser->error_count)) return o; @@ -4138,7 +4240,7 @@ S_my_kid(pTHX_ OP *o, OP *attrs, OP **im } else if (attrs) { GV * const gv = cGVOPx_gv(cUNOPo->op_first); assert(PL_parser); - PL_parser->in_my = FALSE; + PL_parser->in_my = KEY_NULL; PL_parser->in_my_stash = NULL; apply_attrs(GvSTASH(gv), (type == OP_RV2SV ? GvSVn(gv) : @@ -4150,11 +4252,7 @@ S_my_kid(pTHX_ OP *o, OP *attrs, OP **im return o; } else if (type == OP_REFGEN || type == OP_SREFGEN) { - if (!FEATURE_MYREF_IS_ENABLED) - croak("The experimental declared_refs " - "feature is not enabled"); - ck_warner_d(packWARN(WARN_EXPERIMENTAL__DECLARED_REFS), - "Declaring references is experimental"); + check_or_warn_declared_refs(); /* Kid is a nulled OP_LIST, handled above. */ my_kid(cUNOPo->op_first, attrs, imopsp); return o; @@ -4171,7 +4269,7 @@ S_my_kid(pTHX_ OP *o, OP *attrs, OP **im HV *stash; assert(PL_parser); - PL_parser->in_my = FALSE; + PL_parser->in_my = KEY_NULL; PL_parser->in_my_stash = NULL; /* check for C when deciding package */ @@ -4190,11 +4288,11 @@ S_my_kid(pTHX_ OP *o, OP *attrs, OP **im OP * Perl_my_attrs(pTHX_ OP *o, OP *attrs) { + PERL_ARGS_ASSERT_MY_ATTRS; + OP *rops; int maybe_scalar = 0; - PERL_ARGS_ASSERT_MY_ATTRS; - /* [perl #17376]: this appears to be premature, and results in code such as C< our(%x); > executing in list mode rather than void mode */ #if 0 @@ -4229,7 +4327,7 @@ Perl_my_attrs(pTHX_ OP *o, OP *attrs) o = op_append_list(OP_LIST, o, rops); } } - PL_parser->in_my = FALSE; + PL_parser->in_my = KEY_NULL; PL_parser->in_my_stash = NULL; return o; } @@ -4237,7 +4335,9 @@ Perl_my_attrs(pTHX_ OP *o, OP *attrs) OP * Perl_sawparens(pTHX_ OP *o) { + PERL_ARGS_ASSERT_SAWPARENS; PERL_UNUSED_CONTEXT; + if (o) o->op_flags |= OPf_PARENS; return o; @@ -4246,13 +4346,13 @@ Perl_sawparens(pTHX_ OP *o) OP * Perl_bind_match(pTHX_ I32 type, OP *left, OP *right) { + PERL_ARGS_ASSERT_BIND_MATCH; + OP *o; bool ismatchop = 0; const OPCODE ltype = left->op_type; const OPCODE rtype = right->op_type; - PERL_ARGS_ASSERT_BIND_MATCH; - if ( (ltype == OP_RV2AV || ltype == OP_RV2HV || ltype == OP_PADAV || ltype == OP_PADHV) && ckWARN(WARN_MISC)) { @@ -4338,6 +4438,8 @@ Perl_bind_match(pTHX_ I32 type, OP *left OP * Perl_invert(pTHX_ OP *o) { + PERL_ARGS_ASSERT_INVERT; + if (!o) return NULL; return newUNOP(OP_NOT, OPf_SPECIAL, scalar(o)); @@ -4387,6 +4489,8 @@ S_is_control_transfer(pTHX_ OP *op) OP * Perl_cmpchain_start(pTHX_ I32 type, OP *left, OP *right) { + PERL_ARGS_ASSERT_CMPCHAIN_START; + BINOP *bop; OP *op; @@ -4414,10 +4518,11 @@ Perl_cmpchain_start(pTHX_ I32 type, OP * OP * Perl_cmpchain_extend(pTHX_ I32 type, OP *ch, OP *right) { + PERL_ARGS_ASSERT_CMPCHAIN_EXTEND; + BINOP *bop; OP *op; - PERL_ARGS_ASSERT_CMPCHAIN_EXTEND; if (!right) right = newOP(OP_NULL, 0); scalar(right); @@ -4453,8 +4558,8 @@ Perl_cmpchain_extend(pTHX_ I32 type, OP OP * Perl_cmpchain_finish(pTHX_ OP *ch) { - PERL_ARGS_ASSERT_CMPCHAIN_FINISH; + if (ch->op_type != OP_NULL) { OPCODE cmpoptype = ch->op_type; ch = CHECKOP(cmpoptype, ch); @@ -4518,8 +4623,15 @@ structure. OP * Perl_op_scope(pTHX_ OP *o) { + PERL_ARGS_ASSERT_OP_SCOPE; + if (o) { if (o->op_flags & OPf_PARENS || PERLDB_NOOPT || TAINTING_get) { + + /* This also makes eliding empty if/else blocks simpler. */ + if (OP_TYPE_IS(o, OP_STUB) && (o->op_flags & OPf_PARENS)) + return o; + o = op_prepend_elem(OP_LINESEQ, newOP(OP_ENTER, (o->op_flags & OPf_WANT)), o); OpTYPE_set(o, OP_LEAVE); @@ -4546,6 +4658,8 @@ Perl_op_scope(pTHX_ OP *o) OP * Perl_op_unscope(pTHX_ OP *o) { + PERL_ARGS_ASSERT_OP_UNSCOPE; + if (o && o->op_type == OP_LINESEQ) { OP *kid = cLISTOPo->op_first; for(; kid; kid = OpSIBLING(kid)) @@ -4569,6 +4683,8 @@ right. Returns a savestack index for us int Perl_block_start(pTHX_ int full) { + PERL_ARGS_ASSERT_BLOCK_START; + const int retval = PL_savestack_ix; PL_compiling.cop_seq = PL_cop_seqmax; @@ -4600,6 +4716,8 @@ possibly modified. OP* Perl_block_end(pTHX_ I32 floor, OP *seq) { + PERL_ARGS_ASSERT_BLOCK_END; + const int needblockscope = PL_hints & HINT_BLOCK_SCOPE; OP* retval = voidnonfinal(seq); OP *o; @@ -4684,6 +4802,24 @@ Perl_block_end(pTHX_ I32 floor, OP *seq) } /* +=for apidoc new_block_statement + +Returns a C representing block as statement. +Block is a loop that happens once. + +Available since: v5.44 + +=cut +*/ + +OP* +Perl_new_block_statement (pTHX_ OP *block, OP *cont) +{ + PERL_ARGS_ASSERT_NEW_BLOCK_STATEMENT; + + return newWHILEOP (0, 1, NULL, NULL, block, cont, 0); +} +/* =for apidoc_section $scope =for apidoc blockhook_register @@ -4705,10 +4841,10 @@ Perl_blockhook_register(pTHX_ BHK *hk) void Perl_newPROG(pTHX_ OP *o) { - OP *start; - PERL_ARGS_ASSERT_NEWPROG; + OP *start; + if (PL_in_eval) { PERL_CONTEXT *cx; I32 i; @@ -4854,7 +4990,7 @@ Perl_localize(pTHX_ OP *o, I32 lex) o = my(o); else o = op_lvalue(o, OP_NULL); /* a bit kludgey */ - PL_parser->in_my = FALSE; + PL_parser->in_my = KEY_NULL; PL_parser->in_my_stash = NULL; return o; } @@ -4883,10 +5019,10 @@ Perl_jmaybe(pTHX_ OP *o) PERL_STATIC_INLINE OP * S_op_std_init(pTHX_ OP *o) { - I32 type = o->op_type; - PERL_ARGS_ASSERT_OP_STD_INIT; + I32 type = o->op_type; + if (PL_opargs[type] & OA_RETSCALAR) scalar(o); if (PL_opargs[type] & OA_TARGET && !o->op_targ) @@ -4898,10 +5034,10 @@ S_op_std_init(pTHX_ OP *o) PERL_STATIC_INLINE OP * S_op_integerize(pTHX_ OP *o) { - I32 type = o->op_type; - PERL_ARGS_ASSERT_OP_INTEGERIZE; + I32 type = o->op_type; + /* integerize op. */ if ((PL_opargs[type] & OA_OTHERINT) && (PL_hints & HINT_INTEGER)) { @@ -4919,8 +5055,9 @@ S_op_integerize(pTHX_ OP *o) setjmp/longjmp() messing with auto variables. It cannot be inlined because it uses setjmp */ -STATIC int -S_fold_constants_eval(pTHX) { +static int +S_fold_constants_eval(pTHX) +{ int ret = 0; dJMPENV; @@ -4938,6 +5075,8 @@ S_fold_constants_eval(pTHX) { static OP * S_fold_constants(pTHX_ OP *const o) { + PERL_ARGS_ASSERT_FOLD_CONSTANTS; + OP *curop; OP *newop; I32 type = o->op_type; @@ -4951,8 +5090,6 @@ S_fold_constants(pTHX_ OP *const o) U8 oldwarn = PL_dowarn; I32 old_cxix; - PERL_ARGS_ASSERT_FOLD_CONSTANTS; - if (!(PL_opargs[type] & OA_FOLDCONST)) goto nope; @@ -5002,11 +5139,41 @@ S_fold_constants(pTHX_ OP *const o) break; case OP_REPEAT: if (o->op_private & OPpREPEAT_DOLIST) goto nope; + + /* Don't constant fold above a certain threshold. + * (GH#13793 & GH#20586) + * + * Implementation note: pp_pow returns powers of 2 as an NV + * e.g. my $x = "A" x (2**3); + */ + if (OP_TYPE_IS(cBINOPo->op_last, OP_CONST)) { + SV *constsv = cSVOPx_sv(cBINOPo->op_last); + + if (SvIOK(constsv)) { + if (SvIOK_UV(constsv)) { + if (SvUVX(constsv) > (UV)PERL_FOLD_REPEAT_LIMIT) + goto nope; + } else { + if (SvIVX(constsv) > (IV)PERL_FOLD_REPEAT_LIMIT) + goto nope; + } + } else { + NV rhs = 0.0; rhs = SvNV_nomg(constsv); + if (rhs > (NV)PERL_FOLD_REPEAT_LIMIT) + goto nope; + } + } break; case OP_SREFGEN: if (cUNOPx(cUNOPo->op_first)->op_first->op_type != OP_CONST || SvPADTMP(cSVOPx_sv(cUNOPx(cUNOPo->op_first)->op_first))) goto nope; + break; + case OP_DEFINED: + if ( (cUNOPo->op_first->op_type != OP_CONST) + || cUNOPo->op_first->op_moresib ) + goto nope; + break; } if (PL_parser && PL_parser->error_count) @@ -5133,6 +5300,8 @@ S_fold_constants(pTHX_ OP *const o) static void S_gen_constant_list(pTHX_ OP *o) { + PERL_ARGS_ASSERT_GEN_CONSTANT_LIST; + OP *curop, *old_next; SV * const oldwarnhook = PL_warnhook; SV * const olddiehook = PL_diehook; @@ -5451,6 +5620,8 @@ is null, the other is returned unchanged OP * Perl_op_append_elem(pTHX_ I32 type, OP *first, OP *last) { + PERL_ARGS_ASSERT_OP_APPEND_ELEM; + if (!first) return last; @@ -5484,6 +5655,8 @@ the other is returned unchanged. OP * Perl_op_append_list(pTHX_ I32 type, OP *first, OP *last) { + PERL_ARGS_ASSERT_OP_APPEND_LIST; + if (!first) return last; @@ -5522,6 +5695,8 @@ the other is returned unchanged. OP * Perl_op_prepend_elem(pTHX_ I32 type, OP *first, OP *last) { + PERL_ARGS_ASSERT_OP_PREPEND_ELEM; + if (!first) return last; @@ -5561,13 +5736,15 @@ C to make it the right OP * Perl_op_convert_list(pTHX_ I32 type, I32 flags, OP *o) { + PERL_ARGS_ASSERT_OP_CONVERT_LIST; + if (type < 0) type = -type, flags |= OPf_SPECIAL; if (type == OP_RETURN) { if (FEATURE_MODULE_TRUE_IS_ENABLED) flags |= OPf_SPECIAL; } if (type == OP_STRINGIFY && OP_TYPE_IS(o, OP_CONST) && - !(flags & OPf_FOLDED) && SvIsCOW(cSVOPx_sv(o)) ){ + !(flags & OPf_FOLDED) ) { assert(!OpSIBLING(o)); /* Don't wrap a single CONST in a list, process that list, * then constant fold the list back to the starting OP. @@ -5629,6 +5806,8 @@ empty list expression. OP * Perl_newNULLLIST(pTHX) { + PERL_ARGS_ASSERT_NEWNULLLIST; + return newOP(OP_STUB, 0); } @@ -5648,6 +5827,8 @@ Perl_newNULLLIST(pTHX) static OP * S_force_list(pTHX_ OP *o, bool nullit) { + PERL_ARGS_ASSERT_FORCE_LIST; + if (!o || o->op_type != OP_LIST) { OP *rest = NULL; if (o) { @@ -5682,6 +5863,8 @@ context; as OP * Perl_op_force_list(pTHX_ OP *o) { + PERL_ARGS_ASSERT_OP_FORCE_LIST; + return force_list(o, TRUE); } @@ -5710,6 +5893,8 @@ need to create a temporary plain C. OP * Perl_newLISTOPn(pTHX_ I32 type, I32 flags, ...) { + PERL_ARGS_ASSERT_NEWLISTOPN; + va_list args; va_start(args, flags); @@ -5800,6 +5987,8 @@ of C. OP * Perl_newOP(pTHX_ I32 type, I32 flags) { + PERL_ARGS_ASSERT_NEWOP; + OP *o; if (type == -OP_ENTEREVAL) { @@ -5827,6 +6016,7 @@ Perl_newOP(pTHX_ I32 type, I32 flags) /* =for apidoc newUNOP +=for apidoc_flag OPf_KIDS Constructs, checks, and returns an op of any unary type. C is the opcode. C gives the eight bits of C, except that @@ -5836,14 +6026,14 @@ is automatically set. C supplies child of the unary op; it is consumed by this function and become part of the constructed op tree. -=for apidoc Amnh||OPf_KIDS - =cut */ OP * Perl_newUNOP(pTHX_ I32 type, I32 flags, OP *first) { + PERL_ARGS_ASSERT_NEWUNOP; + UNOP *unop; if (type == -OP_ENTEREVAL) { @@ -5894,6 +6084,8 @@ initialised to C OP * Perl_newUNOP_AUX(pTHX_ I32 type, I32 flags, OP *first, UNOP_AUX_item *aux) { + PERL_ARGS_ASSERT_NEWUNOP_AUX; + UNOP_AUX *unop; assert((PL_opargs[type] & OA_CLASS_MASK) == OA_UNOP_AUX @@ -5931,8 +6123,11 @@ Supported optypes: C. */ static OP* -S_newMETHOP_internal(pTHX_ I32 type, I32 flags, OP* dynamic_meth, SV* const_meth) { - METHOP *methop; +S_newMETHOP_internal(pTHX_ I32 type, I32 flags, OP* dynamic_meth, SV* const_meth) +{ + PERL_ARGS_ASSERT_NEWMETHOP_INTERNAL; + + METHOP *methop; assert((PL_opargs[type] & OA_CLASS_MASK) == OA_METHOP || type == OP_CUSTOM); @@ -5966,7 +6161,8 @@ S_newMETHOP_internal(pTHX_ I32 type, I32 } OP * -Perl_newMETHOP (pTHX_ I32 type, I32 flags, OP* dynamic_meth) { +Perl_newMETHOP (pTHX_ I32 type, I32 flags, OP* dynamic_meth) +{ PERL_ARGS_ASSERT_NEWMETHOP; return newMETHOP_internal(type, flags, dynamic_meth, NULL); } @@ -5985,7 +6181,8 @@ Supported optypes: C. */ OP * -Perl_newMETHOP_named (pTHX_ I32 type, I32 flags, SV* const_meth) { +Perl_newMETHOP_named (pTHX_ I32 type, I32 flags, SV* const_meth) +{ PERL_ARGS_ASSERT_NEWMETHOP_NAMED; return newMETHOP_internal(type, flags, NULL, const_meth); } @@ -6007,6 +6204,8 @@ by this function and become part of the OP * Perl_newBINOP(pTHX_ I32 type, I32 flags, OP *first, OP *last) { + PERL_ARGS_ASSERT_NEWBINOP; + BINOP *binop; ASSUME((PL_opargs[type] & OA_CLASS_MASK) == OA_BINOP @@ -6077,7 +6276,7 @@ Perl_newBINOP(pTHX_ I32 type, I32 flags, ? 2 /* Otherwise, minimum of 2 hex digits */\ : NUM_HEX_CHARS(num))))))) -/* To make evident, Configure with `-DDEBUGGING`, build, run +/* To make evident, Configure with `-DDEBUGGING`, build, run * `./perl -Ilib -Dy t/op/tr.t` */ void @@ -6087,7 +6286,7 @@ Perl_invmap_dump(pTHX_ SV* invlist, UV * const unsigned int indent = 4; - UV len = _invlist_len(invlist); + UV len = invlist_len_(invlist); UV * array = invlist_array(invlist); if (len == 0) { @@ -6163,6 +6362,27 @@ Perl_invmap_dump(pTHX_ SV* invlist, UV * } } +#ifdef DEBUGGING + +static const char * +S_get_displayable_tr_operand(pTHX_ const U8 * s, STRLEN len, bool is_utf8) +{ + PERL_ARGS_ASSERT_GET_DISPLAYABLE_TR_OPERAND; + + SV * output = sv_2mortal(newSVpvs("")); + if (is_utf8) { + return pv_uni_display(output, s, len, 1000, UNI_DISPLAY_TR_); + } + else { + return pv_pretty(output, (const char *) s, len, 256, NULL, NULL, + ( PERL_PV_ESCAPE_NONASCII + |PERL_PV_PRETTY_LTGT + |PERL_PV_PRETTY_ELLIPSES)); + } +} + +#endif + /* Given an OP_TRANS / OP_TRANSR op o, plus OP_CONST ops expr and repl * containing the search and replacement strings, assemble into * a translation table attached as o->op_pv. @@ -6182,6 +6402,8 @@ Perl_invmap_dump(pTHX_ SV* invlist, UV * static OP * S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl) { + PERL_ARGS_ASSERT_PMTRANS; + /* This function compiles a tr///, from data gathered from toke.c, into a * form suitable for use by do_trans() in doop.c at runtime. * @@ -6508,22 +6730,27 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep * but this could be as expensive as just doing the copy. */ - PERL_ARGS_ASSERT_PMTRANS; - PL_hints |= HINT_BLOCK_SCOPE; + DEBUG_y(PerlIO_printf(Perl_debug_log, + "%s: %d: Compiling tr/*t/*r/; /c=%d; /d=%d; /s=%d\n" + "*t is '%s'\n*r is '%s'\n", + __FILE__, __LINE__, complement, del, squash, + get_displayable_tr_operand(t0, tlen, tstr_utf8), + get_displayable_tr_operand(r0, rlen, rstr_utf8))); + /* If /c, the search list is sorted and complemented. This is now done by * creating an inversion list from it, and then trivially inverting that. * The previous implementation used qsort, but creating the list * automatically keeps it sorted as we go along */ if (complement) { UV start, end; - SV * inverted_tlist = _new_invlist(tlen); + SV * inverted_tlist = new_invlist_(tlen); Size_t temp_len; DEBUG_y(PerlIO_printf(Perl_debug_log, "%s: %d: tstr before inversion=\n%s\n", - __FILE__, __LINE__, _byte_dump_string(t, tend - t, 0))); + __FILE__, __LINE__, byte_dump_string_(t, tend - t, 0))); while (t < tend) { @@ -6539,7 +6766,7 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep Size_t t_char_len; /* Get the first character */ - t_cp = valid_utf8_to_uvchr(t, &t_char_len); + t_cp = valid_utf8_to_uv(t, &t_char_len); t += t_char_len; /* If the next byte indicates that this wasn't the first @@ -6550,17 +6777,17 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep else { /* Otherwise, ignore the indicator byte, and get the final element, and add the whole range */ t++; - t_cp_end = valid_utf8_to_uvchr(t, &t_char_len); + t_cp_end = valid_utf8_to_uv(t, &t_char_len); t += t_char_len; - inverted_tlist = _add_range_to_invlist(inverted_tlist, + inverted_tlist = add_range_to_invlist_(inverted_tlist, t_cp, t_cp_end); } } } /* End of parse through tstr */ /* The inversion list is done; now invert it */ - _invlist_invert(inverted_tlist); + invlist_invert_(inverted_tlist); /* Now go through the inverted list and create a new tstr for the rest * of the routine to use. Since the UTF-8 version can have ranges, and @@ -6593,6 +6820,11 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep tend = t0 + temp_len; tstr_utf8 = TRUE; + DEBUG_y(PerlIO_printf(Perl_debug_log, + "%s: %d: *t after complementing=\n%s\n", + __FILE__, __LINE__, + get_displayable_tr_operand(t0, temp_len, tstr_utf8))); + SvREFCNT_dec_NN(inverted_tlist); } @@ -6603,10 +6835,10 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep rstr_utf8 = tstr_utf8; } - t_invlist = _new_invlist(1); + t_invlist = new_invlist_(1); /* Initialize to a single range */ - t_invlist = _add_range_to_invlist(t_invlist, 0, UV_MAX); + t_invlist = add_range_to_invlist_(t_invlist, 0, UV_MAX); /* Below, we parse the (potentially adjusted) input, creating the inversion * map. This is done in two passes. The first pass is just to determine @@ -6637,11 +6869,11 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep for (pass2 = 0; pass2 < 2; pass2++) { if (pass2) { - DEBUG_yv(PerlIO_printf(Perl_debug_log, "After pass1: \n")); - DEBUG_yv(invmap_dump(t_invlist, r_map)); + DEBUG_y(PerlIO_printf(Perl_debug_log, "After pass1: \n"); + invmap_dump(t_invlist, r_map)); /* In the second pass, we start with a single range */ - t_invlist = _add_range_to_invlist(t_invlist, 0, UV_MAX); + t_invlist = add_range_to_invlist_(t_invlist, 0, UV_MAX); len = 1; t_array = invlist_array(t_invlist); } @@ -6681,9 +6913,9 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep t_range_count = r_range_count = 0; DEBUG_y(PerlIO_printf(Perl_debug_log, "%s: %d:\ntstr=%s\n", - __FILE__, __LINE__, _byte_dump_string(t, tend - t, 0))); + __FILE__, __LINE__, byte_dump_string_(t, tend - t, 0))); DEBUG_y(PerlIO_printf(Perl_debug_log, "rstr=%s\n", - _byte_dump_string(r, rend - r, 0))); + byte_dump_string_(r, rend - r, 0))); DEBUG_y(PerlIO_printf(Perl_debug_log, "/c=%d; /s=%d; /d=%d\n" " At the beginning of pass %u\n", complement, squash, del, @@ -6730,7 +6962,7 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep * next code point is the next UTF-8 char in the input. We * know the input is valid, because the toker constructed * it */ - t_cp = CP_ADJUST(valid_utf8_to_uvchr(t, &t_char_len)); + t_cp = CP_ADJUST(valid_utf8_to_uv(t, &t_char_len)); t += t_char_len; /* UTF-8 strings (only) have been parsed in toke.c to have @@ -6742,7 +6974,7 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep && ! FORCE_RANGE_LEN_1(t_cp)) { t++; - t_range_count = valid_utf8_to_uvchr(t, &t_char_len) + t_range_count = valid_utf8_to_uv(t, &t_char_len) - t_cp + 1; t += t_char_len; } @@ -6770,9 +7002,9 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep r_range_count = t_range_count; #ifdef DEBUGGING - if (DEBUG_y_TEST && ! del) { + if (DEBUG_yv_TEST && ! del) { PerlIO_printf(Perl_debug_log, - "final_map =%" UVXf "\n", final_map); + "final_map = %" UVXf "\n", final_map); } #endif } @@ -6785,13 +7017,13 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep else { Size_t r_char_len; - r_cp = CP_ADJUST(valid_utf8_to_uvchr(r, &r_char_len)); + r_cp = CP_ADJUST(valid_utf8_to_uv(r, &r_char_len)); r += r_char_len; if ( r < rend && *r == RANGE_INDICATOR && ! FORCE_RANGE_LEN_1(r_cp)) { r++; - r_range_count = valid_utf8_to_uvchr(r, + r_range_count = valid_utf8_to_uv(r, &r_char_len) - r_cp + 1; r += r_char_len; } @@ -6827,7 +7059,7 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep * the return value is the index into the list's array of the range * that contains , that is, 'i' such that * array[i] <= cp < * array[i+1] */ - j = _invlist_search(t_invlist, t_cp); + j = invlist_search_(t_invlist, t_cp); assert(j >= 0); i = j; @@ -6888,9 +7120,25 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep * has been set up so that all members in it will be of the same * ilk) */ if (r_map[i] == TR_UNLISTED) { - DEBUG_yv(PerlIO_printf(Perl_debug_log, - "Processing %" UVxf "-%" UVxf " => %" UVxf "-%" UVxf "\n", - t_cp, t_cp_end, r_cp, r_cp_end)); + +#ifdef DEBUGGING + if (DEBUG_yv_TEST) { + PerlIO_printf(Perl_debug_log, + "Processing %" UVxf "-%" UVxf " => ", + t_cp, t_cp_end); + if (r_cp == r_cp_end && r_cp == TR_UNLISTED) { + PerlIO_printf(Perl_debug_log, "TR_UNLISTED\n"); + } + else if (r_cp == r_cp_end && r_cp == TR_SPECIAL_HANDLING) { + PerlIO_printf(Perl_debug_log, "TR_SPECIAL_HANDLING\n"); + } + else { + PerlIO_printf(Perl_debug_log, + "%" UVxf "-%" UVxf "\n", + r_cp, r_cp_end); + } + } +#endif /* This is the first definition for this chunk, hence is valid * and needs to be processed. Here and in the comments below, @@ -7195,8 +7443,8 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep DEBUG_yv(PerlIO_printf(Perl_debug_log, "Before fixing up: len=%d, i=%d\n", - (int) len, (int) i)); - DEBUG_yv(invmap_dump(t_invlist, r_map)); + (int) len, (int) i); + invmap_dump(t_invlist, r_map)); invlist_extend(t_invlist, len + 2); t_array = invlist_array(t_invlist); @@ -7218,10 +7466,11 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep r_map[i+2] = TR_UNLISTED; } DEBUG_yv(PerlIO_printf(Perl_debug_log, - "After iteration: span=%" UVuf ", t_range_count=%" - UVuf " r_range_count=%" UVuf "\n", - span, t_range_count, r_range_count)); - DEBUG_yv(invmap_dump(t_invlist, r_map)); + "After iteration: span=%" UVuf + ", t_range_count=%" UVuf + " r_range_count=%" UVuf "\n", + span, t_range_count, r_range_count); + invmap_dump(t_invlist, r_map)); } /* End of this chunk needs to be processed */ /* Done with this chunk. */ @@ -7250,8 +7499,8 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep SvREFCNT_dec(inverted_tstr); - DEBUG_y(PerlIO_printf(Perl_debug_log, "After everything: \n")); - DEBUG_y(invmap_dump(t_invlist, r_map)); + DEBUG_y(PerlIO_printf(Perl_debug_log, "After everything: \n"); + invmap_dump(t_invlist, r_map)); /* We now have normalized the input into an inversion map. * @@ -7401,7 +7650,16 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep : (short) TR_R_EMPTY; #ifdef DEBUGGING if (DEBUG_y_TEST) { - PerlIO_printf(Perl_debug_log,"%s: %d\n", __FILE__, __LINE__); + PerlIO_printf(Perl_debug_log, + "\n%s: %d: Final generated translation table:\n %" + IVdf " means this char not involved in this transliteration\n", + __FILE__, __LINE__, TR_UNLISTED); + if (del) { + PerlIO_printf(Perl_debug_log, + " %" IVdf " means delete this char\n", + TR_SPECIAL_HANDLING); + } + for (i = 0; i < tbl->size; i++) { if (tbl->map[i] < 0) { PerlIO_printf(Perl_debug_log," %02x=>%d", @@ -7415,8 +7673,32 @@ S_pmtrans(pTHX_ OP *o, OP *expr, OP *rep PerlIO_printf(Perl_debug_log,"\n"); } } - PerlIO_printf(Perl_debug_log,"Final map 0x%x=>%02x\n", - (unsigned) tbl->size, tbl->map[tbl->size]); + + PerlIO_printf(Perl_debug_log, + "The next (and final) byte "); + if ((UV) tbl->map[tbl->size] == TR_UNLISTED) { + PerlIO_printf(Perl_debug_log, + " indicates no other characters are involved in" + " the transliteration\n"); + } + else if ((UV) tbl->map[tbl->size] == TR_SPECIAL_HANDLING) { + if (! del) { + const int size = tbl->size; + croak("panic: Unexpected value %x in [%d]", + tbl->map[size], size); + } + else { + PerlIO_printf(Perl_debug_log, + "indicates that all code points above" + " 0xFF are to be deleted\n"); + } + } + else if ((UV) tbl->map[tbl->size] == TR_R_EMPTY) { + PerlIO_printf(Perl_debug_log, "is unused\n"); + } + else { + PerlIO_printf(Perl_debug_log, "%x UNUSED\n", tbl->map[256]); + } }; #endif @@ -7488,6 +7770,8 @@ and, shifted up eight bits, the eight bi OP * Perl_newPMOP(pTHX_ I32 type, I32 flags) { + PERL_ARGS_ASSERT_NEWPMOP; + PMOP *pmop; assert((PL_opargs[type] & OA_CLASS_MASK) == OA_PMOP @@ -7588,6 +7872,8 @@ S_set_haseval(pTHX) OP * Perl_pmruntime(pTHX_ OP *o, OP *expr, OP *repl, UV flags, I32 floor) { + PERL_ARGS_ASSERT_PMRUNTIME; + PMOP *pm; LOGOP *rcop; I32 repl_has_vars = 0; @@ -7597,8 +7883,6 @@ Perl_pmruntime(pTHX_ OP *o, OP *expr, OP bool isreg = cBOOL(flags & 1); bool is_split = cBOOL(flags & 2); - PERL_ARGS_ASSERT_PMRUNTIME; - if (is_trans) { return pmtrans(o, expr, repl); } @@ -7931,11 +8215,13 @@ Perl_pmruntime(pTHX_ OP *o, OP *expr, OP konst = TRUE; } else konst = FALSE; - if (konst - && !(repl_has_vars - && (!PM_GETRE(pm) - || !RX_PRELEN(PM_GETRE(pm)) - || RX_EXTFLAGS(PM_GETRE(pm)) & RXf_EVAL_SEEN))) + + REGEXP * re; + if ( konst + && ! ( repl_has_vars + && ( ! (re = PM_GETRE(pm)) + || ! RX_PRELEN(re) + || (RX_EXTFLAGS(re) & RXf_EVAL_SEEN)))) { pm->op_pmflags |= PMf_CONST; /* const for long enough */ op_prepend_elem(o->op_type, scalar(repl), o); @@ -7972,10 +8258,10 @@ takes ownership of one reference to it. OP * Perl_newSVOP(pTHX_ I32 type, I32 flags, SV *sv) { - SVOP *svop; - PERL_ARGS_ASSERT_NEWSVOP; + SVOP *svop; + /* OP_RUNCV is allowed specially so rpeep has room to convert it into an * OP_CONST */ assert((PL_opargs[type] & OA_CLASS_MASK) == OA_SVOP @@ -8008,7 +8294,9 @@ Constructs and returns an op to access C OP * Perl_newDEFSVOP(pTHX) { - return newSVREF(newGVOP(OP_GV, 0, PL_defgv)); + PERL_ARGS_ASSERT_NEWDEFSVOP; + + return newSVREF(newGVOP(OP_GV, 0, PL_defgv)); } #ifdef USE_ITHREADS @@ -8030,10 +8318,10 @@ This function only exists if Perl has be OP * Perl_newPADOP(pTHX_ I32 type, I32 flags, SV *sv) { - PADOP *padop; - PERL_ARGS_ASSERT_NEWPADOP; + PADOP *padop; + assert((PL_opargs[type] & OA_CLASS_MASK) == OA_SVOP || (PL_opargs[type] & OA_CLASS_MASK) == OA_PVOP_OR_SVOP || (PL_opargs[type] & OA_CLASS_MASK) == OA_FILESTATOP @@ -8097,6 +8385,8 @@ have been allocated using Cop_sv; - PERL_ARGS_ASSERT_PACKAGE; - SAVEGENERICSV(PL_curstash); save_item(PL_curstname); @@ -8139,17 +8427,37 @@ Perl_package(pTHX_ OP *o) op_free(o); } -void -Perl_package_version( pTHX_ OP *v ) +static void +S_set_package_version( pTHX_ OP *v ) { U32 savehints = PL_hints; - PERL_ARGS_ASSERT_PACKAGE_VERSION; + PL_hints &= ~HINT_STRICT_VARS; sv_setsv( GvSV(gv_fetchpvs("VERSION", GV_ADDMULTI, SVt_PV)), cSVOPx(v)->op_sv ); PL_hints = savehints; op_free(v); } +/* +=for apidoc package + +Function sets current stash name and if $version is not NULL, sets it as C<$VERSION>. + +It combines former C and C into single call. + +=cut +*/ + +void +Perl_package (pTHX_ OP *name, OP *version) +{ + PERL_ARGS_ASSERT_PACKAGE; + + S_set_package_name (aTHX_ name); + if (version) + S_set_package_version (aTHX_ version); +} + /* Extract the first two components of a "version" object as two 8bit integers * and return them packed into a single U16 in the format of PL_prevailing_version. * This function only ever has to cope with version objects already known @@ -8184,13 +8492,13 @@ static U16 S_extract_shortver(pTHX_ SV * void Perl_utilize(pTHX_ int aver, I32 floor, OP *version, OP *idop, OP *arg) { + PERL_ARGS_ASSERT_UTILIZE; + OP *pack; OP *imop; OP *veop; SV *use_version = NULL; - PERL_ARGS_ASSERT_UTILIZE; - if (idop->op_type != OP_CONST) croak("Module name must be constant"); @@ -8290,7 +8598,7 @@ Perl_utilize(pTHX_ int aver, I32 floor, } else { /* OK let's at least warn */ - deprecate_fatal_in(WARN_DEPRECATED__SUBSEQUENT_USE_VERSION, "5.44", + deprecate_fatal_in(WARN_DEPRECATED__SUBSEQUENT_USE_VERSION, "5.46", "Changing use VERSION while another use VERSION is in scope"); } } @@ -8369,16 +8677,24 @@ Perl_utilize(pTHX_ int aver, I32 floor, =for apidoc load_module =for apidoc_item load_module_nocontext +=for apidoc_item vload_module +=for apidoc_flag PERL_LOADMOD_DENY +=for apidoc_flag PERL_LOADMOD_NOIMPORT +=for apidoc_flag PERL_LOADMOD_IMPORT_OPS These load the module whose name is pointed to by the string part of C. Note that the actual module name, not its filename, should be given. -Eg, "Foo::Bar" instead of "Foo/Bar.pm". ver, if specified and not NULL, -provides version semantics similar to C. The optional -trailing arguments can be used to specify arguments to the module's C -method, similar to C; their precise handling depends -on the flags. The flags argument is a bitwise-ORed collection of any of -C, C, or C -(or 0 for no flags). +I, "Foo::Bar" instead of "Foo/Bar.pm". + +C, if specified and not NULL, provides version semantics similar to C. + +The optional trailing arguments can be used to specify arguments to the +module's C method, similar to C; their +precise handling depends on the flags. + +The flags argument is a bitwise-ORed collection of any of C, +C, or C (or 0 for no flags). If C is set, the module is loaded as if with an empty import list, as in C; this is the only circumstance in which @@ -8395,26 +8711,20 @@ decremented. In addition, the C ar If C is set, the module is loaded as if with C rather than C. -C and C have the same apparent signature, -but the former hides the fact that it is accessing a thread context parameter. -So use the latter when you get a compilation error about C. - -=for apidoc Amnh||PERL_LOADMOD_DENY -=for apidoc Amnh||PERL_LOADMOD_NOIMPORT -=for apidoc Amnh||PERL_LOADMOD_IMPORT_OPS +__PLAIN_vs_NOCONTEXT_wording__(load_module) -=for apidoc vload_module -Like C> but the arguments are an encapsulated argument list. +C differs from the other two only in that its trailing arguments +are a C. =cut */ void Perl_load_module(pTHX_ U32 flags, SV *name, SV *ver, ...) { - va_list args; - PERL_ARGS_ASSERT_LOAD_MODULE; + va_list args; + va_start(args, ver); vload_module(flags, name, ver, &args); va_end(args); @@ -8424,9 +8734,10 @@ Perl_load_module(pTHX_ U32 flags, SV *na void Perl_load_module_nocontext(U32 flags, SV *name, SV *ver, ...) { + PERL_ARGS_ASSERT_LOAD_MODULE_NOCONTEXT; + dTHX; va_list args; - PERL_ARGS_ASSERT_LOAD_MODULE_NOCONTEXT; va_start(args, ver); vload_module(flags, name, ver, &args); va_end(args); @@ -8436,12 +8747,12 @@ Perl_load_module_nocontext(U32 flags, SV void Perl_vload_module(pTHX_ U32 flags, SV *name, SV *ver, va_list *args) { + PERL_ARGS_ASSERT_VLOAD_MODULE; + OP *veop, *imop; OP * modname; I32 floor; - PERL_ARGS_ASSERT_VLOAD_MODULE; - /* utilize() fakes up a BEGIN { require ..; import ... }, so make sure * that it has a PL_parser to play with while doing that, and also * that it doesn't mess with any existing parser, by creating a tmp @@ -8498,11 +8809,11 @@ S_new_entersubop(pTHX_ GV *gv, OP *arg) OP * Perl_dofile(pTHX_ OP *term, I32 force_builtin) { + PERL_ARGS_ASSERT_DOFILE; + OP *doop; GV *gv; - PERL_ARGS_ASSERT_DOFILE; - if (!force_builtin && (gv = gv_override("do", 2))) { doop = S_new_entersubop(aTHX_ gv, term); } @@ -8531,6 +8842,8 @@ constructed op tree. OP * Perl_newSLICEOP(pTHX_ I32 flags, OP *subscript, OP *listval) { + PERL_ARGS_ASSERT_NEWSLICEOP; + return newBINOP(OP_LSLICE, flags, list(op_force_list(subscript)), list(op_force_list(listval))); @@ -8546,9 +8859,11 @@ Perl_newSLICEOP(pTHX_ I32 flags, OP *sub * ASSIGN_REF \$x = ... */ -STATIC I32 +static I32 S_assignment_type(pTHX_ const OP *o) { + PERL_ARGS_ASSERT_ASSIGNMENT_TYPE; + unsigned type; U8 flags; U8 ret; @@ -8685,6 +9000,8 @@ set as required. OP * Perl_newASSIGNOP(pTHX_ I32 flags, OP *left, I32 optype, OP *right) { + PERL_ARGS_ASSERT_NEWASSIGNOP; + OP *o; I32 assign_type; @@ -8898,6 +9215,8 @@ is consumed by this function and becomes OP * Perl_newSTATEOP(pTHX_ I32 flags, char *label, OP *o) { + PERL_ARGS_ASSERT_NEWSTATEOP; + const U32 seq = intro_my(); const U32 utf8 = flags & SVf_UTF8; COP *cop; @@ -8926,7 +9245,7 @@ Perl_newSTATEOP(pTHX_ I32 flags, char *l CopHINTHASH_set(cop, cophh_copy(CopHINTHASH_get(PL_curcop))); CopFEATURES_setfrom(cop, PL_curcop); if (label) { - Perl_cop_store_label(aTHX_ cop, label, strlen(label), utf8); + cop_store_label(cop, label, strlen(label), utf8); PL_hints |= HINT_BLOCK_SCOPE; /* It seems that we need to defer freeing this pointer, as other parts @@ -8970,6 +9289,105 @@ Perl_newSTATEOP(pTHX_ I32 flags, char *l } /* +=for apidoc cop_has_warning + +Returns true if the set of warnings bits contained by (or implied by) the +COP contains the given warning, as specified by one of the C +constants from F. + +=cut +*/ + +bool +Perl_cop_has_warning(pTHX_ const COP *cop, int warn_bit) +{ + PERL_ARGS_ASSERT_COP_HAS_WARNING; + + const char *warning_bits = cop->cop_warnings; + if(warning_bits == pWARN_STD) + return (PL_dowarn & G_WARN_ON) ? true : PerlWarnIsSet_(WARN_DEFAULTstring, 2*warn_bit); + else if(warning_bits == pWARN_ALL) + return true; + else if(warning_bits == pWARN_NONE) + return false; + else + return isWARN_on(cop->cop_warnings, (STRLEN)warn_bit); +} + +#define cop_inplace_expand_warning_bitmask(cop) S_cop_inplace_expand_warning_bitmask(aTHX_ cop) +static void +S_cop_inplace_expand_warning_bitmask(pTHX_ COP *cop) +{ + const char *warning_bits = cop->cop_warnings; + + if(warning_bits == pWARN_STD) + warning_bits = (PL_dowarn & G_WARN_ON) ? WARN_ALLstring : WARN_DEFAULTstring; + else if(warning_bits == pWARN_ALL) + warning_bits = WARN_ALLstring; + else if(warning_bits == pWARN_NONE) + warning_bits = WARN_NONEstring; + + /* Must allocate the new one before we throw the old buffer away */ + char *new_warnings = Perl_new_warnings_bitfield(aTHX_ NULL, warning_bits, WARNsize); + free_and_set_cop_warnings(cop, new_warnings); +} + +/* +=for apidoc cop_enable_warning + +Ensures that the set of warning bits contained by the COP includes the given +warning, as specified by one of the C constants from F. + +If the COP already includes the warning, no modification is made. Otherwise, +the stored warning bitmask is cloned, and the given warning bit is enabled +within it. The COP is modified in-place, and therefore this function is +intended only for use during compiletime when the optree is being constructed. + +=cut +*/ + +void +Perl_cop_enable_warning(pTHX_ COP *cop, int warn_bit) +{ + PERL_ARGS_ASSERT_COP_ENABLE_WARNING; + + if(cop_has_warning(cop, warn_bit)) + return; + + cop_inplace_expand_warning_bitmask(cop); + + cop->cop_warnings[Perl_Warn_Off_(2 * warn_bit)] |= Perl_Warn_Bit_(2 * warn_bit); +} + +/* +=for apidoc cop_disable_warning + +Ensures that the set of warning bits contained by the COP does not include the +given warning, as specified by one of the C constants from +F. + +If the COP does not include the warning, no modification is made. Otherwise, +the stored warning bitmask is cloned, and the given warning bit is disabled +within it. The COP is modified in-place, and therefore this function is +intended only for use during compiletime when the optree is being constructed. + +=cut +*/ + +void +Perl_cop_disable_warning(pTHX_ COP *cop, int warn_bit) +{ + PERL_ARGS_ASSERT_COP_DISABLE_WARNING; + + if(!cop_has_warning(cop, warn_bit)) + return; + + cop_inplace_expand_warning_bitmask(cop); + + cop->cop_warnings[Perl_Warn_Off_(2 * warn_bit)] &= ~Perl_Warn_Bit_(2 * warn_bit); +} + +/* =for apidoc newLOGOP Constructs, checks, and returns a logical (flow control) op. C @@ -8997,7 +9415,7 @@ Perl_newLOGOP(pTHX_ I32 type, I32 flags, * NULL. */ -STATIC OP * +static OP * S_search_const(pTHX_ OP *o) { PERL_ARGS_ASSERT_SEARCH_CONST; @@ -9047,9 +9465,11 @@ S_search_const(pTHX_ OP *o) } -STATIC OP * +static OP * S_new_logop(pTHX_ I32 type, I32 flags, OP** firstp, OP** otherp) { + PERL_ARGS_ASSERT_NEW_LOGOP; + LOGOP *logop; OP *o; OP *first; @@ -9057,8 +9477,6 @@ S_new_logop(pTHX_ I32 type, I32 flags, O OP *cstop = NULL; int prepend_not = 0; - PERL_ARGS_ASSERT_NEW_LOGOP; - first = *firstp; other = *otherp; @@ -9229,17 +9647,17 @@ this function and become part of the con OP * Perl_newCONDOP(pTHX_ I32 flags, OP *first, OP *trueop, OP *falseop) { + PERL_ARGS_ASSERT_NEWCONDOP; + LOGOP *logop; OP *start; OP *o; OP *cstop; - PERL_ARGS_ASSERT_NEWCONDOP; - if (!falseop) - return newLOGOP(OP_AND, 0, first, trueop); + return newLOGOP(OP_AND, flags, first, trueop); if (!trueop) - return newLOGOP(OP_OR, 0, first, falseop); + return newLOGOP(OP_OR, flags, first, falseop); scalarboolean(first); if (S_is_control_transfer(aTHX_ first)) { @@ -9312,9 +9730,10 @@ The C argument is currently ignor OP * Perl_newTRYCATCHOP(pTHX_ I32 flags, OP *tryblock, OP *catchvar, OP *catchblock) { + PERL_ARGS_ASSERT_NEWTRYCATCHOP; + OP *catchop; - PERL_ARGS_ASSERT_NEWTRYCATCHOP; assert(catchvar->op_type == OP_PADSV); PERL_UNUSED_ARG(flags); @@ -9367,14 +9786,14 @@ and become part of the constructed op tr OP * Perl_newRANGE(pTHX_ I32 flags, OP *left, OP *right) { + PERL_ARGS_ASSERT_NEWRANGE; + LOGOP *range; OP *flip; OP *flop; OP *leftstart; OP *o; - PERL_ARGS_ASSERT_NEWRANGE; - range = alloc_LOGOP(OP_RANGE, left, LINKLIST(right)); range->op_flags = OPf_KIDS; leftstart = LINKLIST(left); @@ -9395,10 +9814,10 @@ Perl_newRANGE(pTHX_ I32 flags, OP *left, range->op_targ = pad_add_name_pvn("$", 1, padadd_NO_DUP_CHECK|padadd_STATE, 0, 0); - sv_upgrade(PAD_SV(range->op_targ), SVt_PVNV); + SvUPGRADE(PAD_SV(range->op_targ), SVt_PVNV); flip->op_targ = pad_add_name_pvn("$", 1, padadd_NO_DUP_CHECK|padadd_STATE, 0, 0);; - sv_upgrade(PAD_SV(flip->op_targ), SVt_PVNV); + SvUPGRADE(PAD_SV(flip->op_targ), SVt_PVNV); SvPADTMP_on(PAD_SV(flip->op_targ)); flip->op_private = left->op_type == OP_CONST ? OPpFLIP_LINENUM : 0; @@ -9546,6 +9965,8 @@ OP * Perl_newWHILEOP(pTHX_ I32 flags, I32 debuggable, LOOP *loop, OP *expr, OP *block, OP *cont, I32 has_my) { + PERL_ARGS_ASSERT_NEWWHILEOP; + OP *redo; OP *next = NULL; OP *listop; @@ -9643,6 +10064,35 @@ Perl_newWHILEOP(pTHX_ I32 flags, I32 deb return o; } +#define find_argop_from_entersub(op) S_find_argop_from_entersub(op) +static OP * +S_find_argop_from_entersub(OP *entersubop) +{ + assert(entersubop != NULL); + + OP *aop = cUNOPx(entersubop)->op_first; + if (!OpHAS_SIBLING(aop)) { + aop = cUNOPx(aop)->op_first; + } + /* move past pushmark */ + aop = OpSIBLING(aop); + + return aop; +} + +#define find_cvop_from_argop(op) S_find_cvop_from_argop(op) +static OP * +S_find_cvop_from_argop(OP *cvop) +{ + assert(cvop != NULL); + + /* CV is the last argument to entersub */ + while (OpHAS_SIBLING(cvop)) { + cvop = OpSIBLING(cvop); + } + return cvop; +} + #define op_is_cv_xsub(o, xsub) S_op_is_cv_xsub(aTHX_ o, xsub) static bool S_op_is_cv_xsub(pTHX_ OP *o, XSUBADDR_t xsub) @@ -9684,13 +10134,8 @@ S_op_is_call_to_cv_xsub(pTHX_ OP *o, XSU return false; /* entersub may be a UNOP, not a LISTOP, so we can't just use op_last */ - OP *aop = cUNOPo->op_first; - if (!OpHAS_SIBLING(aop)) { - aop = cUNOPx(aop)->op_first; - } - aop = OpSIBLING(aop); - OP *cvop; - for (cvop = aop; OpHAS_SIBLING(cvop); cvop = OpSIBLING(cvop)) ; + OP *aop = find_argop_from_entersub(o); + OP *cvop = find_cvop_from_argop(aop); return op_is_cv_xsub(cvop, xsub); } @@ -9721,6 +10166,8 @@ automatically. OP * Perl_newFOROP(pTHX_ I32 flags, OP *sv, OP *expr, OP *block, OP *cont) { + PERL_ARGS_ASSERT_NEWFOROP; + LOOP *loop; OP *iter; PADOFFSET padoff = 0; @@ -9729,8 +10176,7 @@ Perl_newFOROP(pTHX_ I32 flags, OP *sv, O I32 enteriterpflags = 0; U8 iterpflags = 0; bool parens = 0; - - PERL_ARGS_ASSERT_NEWFOROP; + U32 refalias_mask = 0; if (sv) { if (sv->op_type == OP_RV2SV) { /* symbol table variable */ @@ -9760,62 +10206,108 @@ Perl_newFOROP(pTHX_ I32 flags, OP *sv, O sv = NULL; PAD_COMPNAME_GEN_set(padoff, PERL_INT_MAX); } - else if (sv->op_type == OP_NULL && sv->op_targ == OP_SREFGEN) - NOOP; + else if (OP_TYPE_IS_OR_WAS(sv, OP_SREFGEN)) { + /* for \VAR or for my \VAR, with or without parens */ + /* sv should be OP_NULL[OP_NULL[OP_LVREF]]. We can distinguish + * the 'my' version by the LVINTRO flag */ + assert(cUNOPx(sv)->op_first); + assert(cUNOPx(cUNOPx(sv)->op_first)->op_first); + + OP *varop = cUNOPx(cUNOPx(sv)->op_first)->op_first; + /* This is either OP_LVREF or one of the OP_PADxV ops */ + assert(varop->op_type == OP_LVREF || + (varop->op_type == OP_PADSV || + varop->op_type == OP_PADAV || + varop->op_type == OP_PADHV)); + + /* Any of these ops with a non-zero ->op_targ operates on lexicals + * providing it is not OPf_STACKED */ + if((varop->op_targ && !(varop->op_flags & OPf_STACKED)) || varop->op_private & OPpLVAL_INTRO) { /* for my \VAR */ + /* Throw away the sv op subtree and turn this into a simple + * padoffset + OPpITER_REFALIAS flag */ + iterpflags = OPpITER_REFALIAS; + if(varop->op_private & OPpLVAL_INTRO) + enteriterpflags = OPpLVAL_INTRO; + padoff = varop->op_targ; + varop->op_targ = 0; + op_free(sv); + sv = NULL; + } + /* else TODO(leonerd): still do something about the non-my version? */ + } else if (sv->op_type == OP_LIST) { LISTOP *list = cLISTOPx(sv); OP *pushmark = list->op_first; - OP *first_padsv; - UNOP *padsv; - PADOFFSET i; enteriterpflags = OPpLVAL_INTRO; /* for my ($k, $v) () */ parens = 1; if (!pushmark || pushmark->op_type != OP_PUSHMARK) { - croak("panic: newFORLOOP, found %s, expecting pushmark", + croak("panic: newFOROP, found %s, expecting pushmark", pushmark ? PL_op_desc[pushmark->op_type] : "NULL"); } - first_padsv = OpSIBLING(pushmark); - if (!first_padsv || first_padsv->op_type != OP_PADSV) { - croak("panic: newFORLOOP, found %s, expecting padsv", - first_padsv ? PL_op_desc[first_padsv->op_type] : "NULL"); - } - padoff = first_padsv->op_targ; - - /* There should be at least one more PADSV to find, and the ops - should have consecutive values in targ: */ - padsv = cUNOPx(OpSIBLING(first_padsv)); - do { - if (!padsv || padsv->op_type != OP_PADSV) { - croak("panic: newFORLOOP, found %s at %zd, expecting padsv", - padsv ? PL_op_desc[padsv->op_type] : "NULL", - how_many_more); - } - ++how_many_more; - if (padsv->op_targ != padoff + how_many_more) { - croak("panic: newFORLOOP, padsv at %zd targ is %zd, not %zd", - how_many_more, padsv->op_targ, padoff + how_many_more); - } - padsv = cUNOPx(OpSIBLING(padsv)); - } while (padsv); + for (OP *kid = OpSIBLING(pushmark); kid; kid = OpSIBLING(kid)) { + bool kid_refalias = false; + OP *padxv; + if (kid->op_type == OP_SREFGEN) { + /* kid == SREFGEN[NULL[PADxV]] */ + assert(kUNOP->op_first); + padxv = cUNOPx(kUNOP->op_first)->op_first; + assert(padxv); + + if(padxv->op_type != OP_PADSV && + padxv->op_type != OP_PADAV && + padxv->op_type != OP_PADHV) + croak("panic: newFOROP, found refgen(%s) at %zd, expecting refgen(padxv)", + PL_op_desc[kUNOP->op_first->op_type], + how_many_more + 1); + if(!(iterpflags & OPpITER_REFALIAS)) { + check_or_warn_declared_refs(); + check_or_warn_refaliasing(); + } + iterpflags |= OPpITER_REFALIAS; + kid_refalias = true; + } + else if (kid->op_type == OP_PADSV) + padxv = kid; + else + croak("panic: newFOROP, found %s at %zd, expecting padsv", + PL_op_desc[kid->op_type], + how_many_more + 1); + + assert(padxv->op_targ); + + if (!padoff) { + /* first */ + padoff = padxv->op_targ; + } + else { + /* subsequent */ + how_many_more++; + if (padxv->op_targ != padoff + how_many_more) { + croak("panic: newFOROP, padsv at %zd targ is %zd, not %zd", + how_many_more, padxv->op_targ, padoff + how_many_more); + } + } + if (kid_refalias) { + if((how_many_more + 1) > 24) + croak("Cannot use declared reference iterator variables in foreach loop past the 24th variable"); + refalias_mask |= (1 << how_many_more); + } + } /* OK, this optree has the shape that we expected. So now *we* "claim" the Pad slots: */ - first_padsv->op_targ = 0; - PAD_COMPNAME_GEN_set(padoff, PERL_INT_MAX); - - i = padoff; - - padsv = cUNOPx(OpSIBLING(first_padsv)); - do { - ++i; - padsv->op_targ = 0; - PAD_COMPNAME_GEN_set(i, PERL_INT_MAX); + for (OP *kid = OpSIBLING(pushmark); kid; kid = OpSIBLING(kid)) { + OP *padxv = (kid->op_type == OP_PADSV) ? kid : + (kid->op_type == OP_SREFGEN) ? cUNOPx(kUNOP->op_first)->op_first : + NULL; + assert(padxv); - padsv = cUNOPx(OpSIBLING(padsv)); - } while (padsv); + PAD_COMPNAME_GEN_set(padxv->op_targ, PERL_INT_MAX); + padxv->op_targ = 0; + } op_free(sv); sv = NULL; @@ -9960,8 +10452,16 @@ Perl_newFOROP(pTHX_ I32 flags, OP *sv, O if (parens) /* hint to deparser that this is: for my (...) ... */ loop->op_flags |= OPf_PARENS; + iter = newOP(OP_ITER, (U32)iterpflags << 8); - iter->op_targ = how_many_more; + if(iterpflags & OPpITER_REFALIAS) { + if(how_many_more > 0xFF) + croak("Cannot use more than 256 iterator variables on a foreach loop if any are declared refs"); + iter->op_targ = (how_many_more) | (refalias_mask << 8); + } + else + iter->op_targ = how_many_more; + return newWHILEOP(flags, 1, loop, iter, block, cont, 0); } @@ -9979,10 +10479,10 @@ becomes part of the constructed op tree. OP* Perl_newLOOPEX(pTHX_ I32 type, OP *label) { - OP *o = NULL; - PERL_ARGS_ASSERT_NEWLOOPEX; + OP *o = NULL; + assert((PL_opargs[type] & OA_CLASS_MASK) == OA_LOOPEXOP || type == OP_CUSTOM); @@ -10024,9 +10524,11 @@ Perl_newLOOPEX(pTHX_ I32 type, OP *label /* if the condition is a literal array or hash (or @{ ... } etc), make a reference to it. */ -STATIC OP * +static OP * S_ref_array_or_hash(pTHX_ OP *cond) { + PERL_ARGS_ASSERT_REF_ARRAY_OR_HASH; + if (cond && (cond->op_type == OP_RV2AV || cond->op_type == OP_PADAV @@ -10063,15 +10565,16 @@ S_ref_array_or_hash(pTHX_ OP *cond) op_other if the match fails.) */ -STATIC OP * +static OP * S_newGIVWHENOP(pTHX_ OP *cond, OP *block, I32 enter_opcode, I32 leave_opcode, PADOFFSET entertarg) { + PERL_ARGS_ASSERT_NEWGIVWHENOP; + LOGOP *enterop; OP *o; - PERL_ARGS_ASSERT_NEWGIVWHENOP; PERL_UNUSED_ARG(entertarg); /* used to indicate targ of lexical $_ */ enterop = alloc_LOGOP(enter_opcode, block, NULL); @@ -10119,7 +10622,7 @@ S_newGIVWHENOP(pTHX_ OP *cond, OP *block [*] possibly surprising */ -STATIC bool +static bool S_looks_like_bool(pTHX_ const OP *o) { PERL_ARGS_ASSERT_LOOKS_LIKE_BOOL; @@ -10239,11 +10742,11 @@ and may be null to generate a C OP * Perl_newWHENOP(pTHX_ OP *cond, OP *block) { + PERL_ARGS_ASSERT_NEWWHENOP; + const bool cond_llb = (!cond || looks_like_bool(cond)); OP *cond_op; - PERL_ARGS_ASSERT_NEWWHENOP; - if (cond_llb) cond_op = cond; else { @@ -10271,10 +10774,10 @@ including the C field. OP * Perl_newDEFEROP(pTHX_ I32 flags, OP *block) { - OP *o, *start, *blockfirst; - PERL_ARGS_ASSERT_NEWDEFEROP; + OP *o, *start, *blockfirst; + forbid_outofblock_ops(block, (flags & (OPpDEFER_FINALLY << 8)) ? "a \"finally\" block" : "a \"defer\" block"); @@ -10330,6 +10833,8 @@ void Perl_cv_ckproto_len_flags(pTHX_ const CV *cv, const GV *gv, const char *p, const STRLEN len, const U32 flags) { + PERL_ARGS_ASSERT_CV_CKPROTO_LEN_FLAGS; + SV *name = NULL, *msg; const char * cvp = SvROK(cv) ? SvTYPE(SvRV_const(cv)) == SVt_PVCV @@ -10338,8 +10843,6 @@ Perl_cv_ckproto_len_flags(pTHX_ const CV : CvPROTO(cv); STRLEN clen = CvPROTOLEN(cv), plen = len; - PERL_ARGS_ASSERT_CV_CKPROTO_LEN_FLAGS; - if (p == NULL && cvp == NULL) return; @@ -10421,6 +10924,8 @@ L. SV * Perl_cv_const_sv(const CV *const cv) { + PERL_ARGS_ASSERT_CV_CONST_SV; + SV *sv; if (!cv) return NULL; @@ -10434,6 +10939,8 @@ Perl_cv_const_sv(const CV *const cv) SV * Perl_cv_const_sv_or_av(const CV * const cv) { + PERL_ARGS_ASSERT_CV_CONST_SV_OR_AV; + if (!cv) return NULL; if (SvROK(cv)) return SvRV((SV *)cv); @@ -10565,6 +11072,8 @@ Similar in action to L 0 && hv_exists_ent(hv, tmpstr, 0)) { @@ -11499,14 +12009,14 @@ Perl_newATTRSUB_x(pTHX_ I32 floor, OP *o } if (name) { - if (PL_parser && PL_parser->error_count) - clear_special_blocks(name, gv, cv); + if (PL_parser && PL_parser->error_count) { + cv = clear_special_blocks(name, gv, cv); + } else evanescent = process_special_blocks(floor, name, gv, cv); } } - assert(cv); done: assert(!cv || evanescent || SvREFCNT((SV*)cv) != 0); @@ -11526,7 +12036,7 @@ Perl_newATTRSUB_x(pTHX_ I32 floor, OP *o return cv; } -STATIC void +static CV* S_clear_special_blocks(pTHX_ const char *const fullname, GV *const gv, CV *const cv) { const char *colon; @@ -11547,21 +12057,23 @@ S_clear_special_blocks(pTHX_ const char assert(isGV(gv)); } GvCV_set(gv, NULL); + SvREFCNT_dec_NN(MUTABLE_SV(cv)); } + return SvIS_FREED(cv) ? NULL : cv; } /* Returns true if the sub has been freed. */ -STATIC bool +static bool S_process_special_blocks(pTHX_ I32 floor, const char *const fullname, GV *const gv, CV *const cv) { + PERL_ARGS_ASSERT_PROCESS_SPECIAL_BLOCKS; + const char *const colon = strrchr(fullname,':'); const char *const name = colon ? colon + 1 : fullname; - PERL_ARGS_ASSERT_PROCESS_SPECIAL_BLOCKS; - if (*name == 'B') { if (strEQ(name, "BEGIN")) { /* can't goto a declaration, but a null statement is fine */ @@ -11722,11 +12234,17 @@ S_process_special_blocks(pTHX_ I32 floor } #endif - if (PL_main_start) + if (PL_main_start) { /* diag_listed_as: Too late to run %s block */ ck_warner(packWARN(WARN_VOID), "Too late to run INIT block"); - Perl_av_create_and_push(aTHX_ &PL_initav, MUTABLE_SV(cv)); + /* callers may touch cv after we return so don't + just release it. + */ + SAVEFREESV(cv); + } + else + Perl_av_create_and_push(aTHX_ &PL_initav, MUTABLE_SV(cv)); } else return FALSE; @@ -11742,6 +12260,7 @@ S_process_special_blocks(pTHX_ I32 floor CV * Perl_newCONSTSUB(pTHX_ HV *stash, const char *name, SV *sv) { + PERL_ARGS_ASSERT_NEWCONSTSUB; return newCONSTSUB_flags(stash, name, name ? strlen(name) : 0, 0, sv); } @@ -11826,6 +12345,8 @@ CV * Perl_newCONSTSUB_flags(pTHX_ HV *stash, const char *name, STRLEN len, U32 flags, SV *sv) { + PERL_ARGS_ASSERT_NEWCONSTSUB_FLAGS; + CV* cv; const char *const file = CopFILE(PL_curcop); @@ -11990,12 +12511,12 @@ Perl_newXS_len_flags(pTHX_ const char *n const char *const proto, SV **const_svp, U32 flags) { + PERL_ARGS_ASSERT_NEWXS_LEN_FLAGS; + CV *cv; bool interleave = FALSE; bool evanescent = FALSE; - PERL_ARGS_ASSERT_NEWXS_LEN_FLAGS; - { GV * const gv = gv_fetchpvn( name ? name : PL_curstash ? "__ANON__" : "__ANON__::__ANON__", @@ -12087,9 +12608,10 @@ Perl_newXS_len_flags(pTHX_ const char *n CV * Perl_newSTUB(pTHX_ GV *gv, bool fake) { + PERL_ARGS_ASSERT_NEWSTUB; + CV *cv = MUTABLE_CV(newSV_type(SVt_PVCV)); GV *cvgv; - PERL_ARGS_ASSERT_NEWSTUB; assert(!GvCVu(gv)); GvCV_set(gv, cv); GvCVGEN(gv) = 0; @@ -12107,9 +12629,19 @@ Perl_newSTUB(pTHX_ GV *gv, bool fake) return cv; } +/* +=for apidoc newFORM + +Constructs, checks, and returns a format op. + +=cut +*/ + void Perl_newFORM(pTHX_ I32 floor, OP *o, OP *block) { + PERL_ARGS_ASSERT_NEWFORM; + CV *cv; GV *gv; OP *root; @@ -12174,6 +12706,8 @@ Constructs, checks, and returns an anony OP * Perl_newANONLIST(pTHX_ OP *o) { + PERL_ARGS_ASSERT_NEWANONLIST; + return (o) ? op_convert_list(OP_ANONLIST, OPf_SPECIAL, o) : newOP(OP_EMPTYAVHV, 0); } @@ -12189,6 +12723,8 @@ Constructs, checks, and returns an anony OP * Perl_newANONHASH(pTHX_ OP *o) { + PERL_ARGS_ASSERT_NEWANONHASH; + OP * anon = (o) ? op_convert_list(OP_ANONHASH, OPf_SPECIAL, o) : newOP(OP_EMPTYAVHV, 0); if (!o) @@ -12212,6 +12748,8 @@ For more details, see Lop_type) { @@ -12277,7 +12816,6 @@ Perl_oopsAV(pTHX_ OP *o) OP * Perl_oopsHV(pTHX_ OP *o) { - PERL_ARGS_ASSERT_OOPSHV; switch (o->op_type) { @@ -12312,7 +12850,6 @@ Constructs, checks, and returns an arrar OP * Perl_newAVREF(pTHX_ OP *o) { - PERL_ARGS_ASSERT_NEWAVREF; if (o->op_type == OP_PADANY) { @@ -12336,6 +12873,8 @@ Constructs, checks, and returns a glob r OP * Perl_newGVREF(pTHX_ I32 type, OP *o) { + PERL_ARGS_ASSERT_NEWGVREF; + switch(type) { /* The thing that looks like a GVREF at the start of these operators * isn't really */ @@ -12367,7 +12906,6 @@ Constructs, checks, and returns a hash r OP * Perl_newHVREF(pTHX_ OP *o) { - PERL_ARGS_ASSERT_NEWHVREF; if (o->op_type == OP_PADANY) { @@ -12391,6 +12929,8 @@ Constructs, checks, and returns a code r OP * Perl_newCVREF(pTHX_ I32 flags, OP *o) { + PERL_ARGS_ASSERT_NEWCVREF; + if (o->op_type == OP_PADANY) { OpTYPE_set(o, OP_PADCV); } @@ -12408,7 +12948,6 @@ Constructs, checks, and returns a scalar OP * Perl_newSVREF(pTHX_ OP *o) { - PERL_ARGS_ASSERT_NEWSVREF; if (o->op_type == OP_PADANY) { @@ -12480,10 +13019,11 @@ S_io_hints(pTHX_ OP *o) OP * Perl_ck_backtick(pTHX_ OP *o) { + PERL_ARGS_ASSERT_CK_BACKTICK; + GV *gv; OP *newop = NULL; OP *sibl; - PERL_ARGS_ASSERT_CK_BACKTICK; o = ck_fun(o); /* qx and `` have a null pushmark; CORE::readpipe has only one kid. */ if (o->op_flags & OPf_KIDS && (sibl = OpSIBLING(cUNOPo->op_first)) @@ -12576,6 +13116,8 @@ is_dollar_bracket(pTHX_ const OP * const OP * Perl_ck_cmp(pTHX_ OP *o) { + PERL_ARGS_ASSERT_CK_CMP; + bool is_eq; bool neg; bool reverse; @@ -12584,8 +13126,6 @@ Perl_ck_cmp(pTHX_ OP *o) SV *sv; IV iv; - PERL_ARGS_ASSERT_CK_CMP; - is_eq = ( o->op_type == OP_EQ || o->op_type == OP_NE || o->op_type == OP_I_EQ @@ -12703,9 +13243,10 @@ Perl_ck_scmp(pTHX_ OP *o) OP * Perl_ck_concat(pTHX_ OP *o) { + PERL_ARGS_ASSERT_CK_CONCAT; + const OP * const kid = cUNOPo->op_first; - PERL_ARGS_ASSERT_CK_CONCAT; PERL_UNUSED_CONTEXT; /* reuse the padtmp returned by the concat child */ @@ -12721,7 +13262,6 @@ Perl_ck_concat(pTHX_ OP *o) OP * Perl_ck_spair(pTHX_ OP *o) { - PERL_ARGS_ASSERT_CK_SPAIR; if (o->op_flags & OPf_KIDS) { @@ -12819,7 +13359,6 @@ Perl_ck_eof(pTHX_ OP *o) OP * Perl_ck_eval(pTHX_ OP *o) { - PERL_ARGS_ASSERT_CK_EVAL; PL_hints |= HINT_BLOCK_SCOPE; @@ -12883,13 +13422,13 @@ Perl_ck_eval(pTHX_ OP *o) OP * Perl_ck_trycatch(pTHX_ OP *o) { + PERL_ARGS_ASSERT_CK_TRYCATCH; + LOGOP *enter; OP *to_free = NULL; OP *trykid, *catchkid; OP *catchroot, *catchstart; - PERL_ARGS_ASSERT_CK_TRYCATCH; - trykid = cUNOPo->op_first; if(trykid->op_type == OP_NULL || trykid->op_type == OP_PUSHMARK) { to_free = trykid; @@ -13018,10 +13557,10 @@ Perl_ck_helemexistsor(pTHX_ OP *o) OP * Perl_ck_rvconst(pTHX_ OP *o) { - SVOP * const kid = cSVOPx(cUNOPo->op_first); - PERL_ARGS_ASSERT_CK_RVCONST; + SVOP * const kid = cSVOPx(cUNOPo->op_first); + if (o->op_type == OP_RV2HV) /* rv2hv steals the bottom bit for its own uses */ o->op_private &= ~OPpARG1_MASK; @@ -13112,10 +13651,10 @@ Perl_ck_rvconst(pTHX_ OP *o) OP * Perl_ck_ftst(pTHX_ OP *o) { - const I32 type = o->op_type; - PERL_ARGS_ASSERT_CK_FTST; + const I32 type = o->op_type; + if (o->op_flags & OPf_REF) { NOOP; } @@ -13174,11 +13713,11 @@ Perl_ck_ftst(pTHX_ OP *o) OP * Perl_ck_fun(pTHX_ OP *o) { + PERL_ARGS_ASSERT_CK_FUN; + const int type = o->op_type; I32 oa = PL_opargs[type] >> OASHIFT; - PERL_ARGS_ASSERT_CK_FUN; - if (o->op_flags & OPf_STACKED) { if ((oa & OA_OPTIONAL) && (oa >> 4) && !((oa >> 4) & OA_OPTIONAL)) oa &= ~OA_OPTIONAL; @@ -13350,10 +13889,9 @@ Perl_ck_fun(pTHX_ OP *o) GV * const gv = cGVOPx_gv(firstop); if (gv) tmpstr = - Perl_newSVpvf(aTHX_ - "%s%c...%c", - GvNAME(gv), - a[0], a[1]); + newSVpvf("%s%c...%c", + GvNAME(gv), + a[0], a[1]); } else if (op->op_type == OP_PADAV || op->op_type == OP_PADHV) { @@ -13362,10 +13900,9 @@ Perl_ck_fun(pTHX_ OP *o) PAD_COMPNAME_PV(op->op_targ); if (padname) tmpstr = - Perl_newSVpvf(aTHX_ - "%s%c...%c", - padname + 1, - a[0], a[1]); + newSVpvf("%s%c...%c", + padname + 1, + a[0], a[1]); } if (tmpstr) { name = SvPV_const(tmpstr, len); @@ -13438,10 +13975,10 @@ Perl_ck_fun(pTHX_ OP *o) OP * Perl_ck_glob(pTHX_ OP *o) { - GV *gv; - PERL_ARGS_ASSERT_CK_GLOB; + GV *gv; + o = ck_fun(o); if ((o->op_flags & OPf_KIDS) && !OpHAS_SIBLING(cLISTOPo->op_first)) op_append_elem(OP_GLOB, o, newDEFSVOP()); /* glob() => glob($_) */ @@ -13471,8 +14008,8 @@ Perl_ck_glob(pTHX_ OP *o) #if !defined(PERL_EXTERNAL_GLOB) if (!PL_globhook) { ENTER; - Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT, - newSVpvs("File::Glob"), NULL, NULL, NULL); + load_module(PERL_LOADMOD_NOIMPORT, newSVpvs("File::Glob"), + NULL, NULL, NULL); LEAVE; } #endif /* !PERL_EXTERNAL_GLOB */ @@ -13488,6 +14025,8 @@ Perl_ck_glob(pTHX_ OP *o) OP * Perl_ck_grep(pTHX_ OP *o) { + PERL_ARGS_ASSERT_CK_GREP; + LOGOP *gwop; OP *kid; const OPCODE type = @@ -13495,8 +14034,6 @@ Perl_ck_grep(pTHX_ OP *o) o->op_type == OP_MAPSTART ? OP_MAPWHILE : OP_ANYWHILE; /* any and all both share this */ - PERL_ARGS_ASSERT_CK_GREP; - /* don't allocate gwop here, as we may leak it if PL_parser->error_count > 0 */ if (o->op_flags & OPf_STACKED) { @@ -13563,10 +14100,10 @@ Perl_ck_index(pTHX_ OP *o) OP * Perl_ck_lfun(pTHX_ OP *o) { - const OPCODE type = o->op_type; - PERL_ARGS_ASSERT_CK_LFUN; + const OPCODE type = o->op_type; + return modkids(ck_fun(o), type); } @@ -13623,20 +14160,20 @@ Perl_ck_readline(pTHX_ OP *o) OP * Perl_ck_rfun(pTHX_ OP *o) { - const OPCODE type = o->op_type; - PERL_ARGS_ASSERT_CK_RFUN; + const OPCODE type = o->op_type; + return refkids(ck_fun(o), type); } OP * Perl_ck_listiob(pTHX_ OP *o) { - OP *kid; - PERL_ARGS_ASSERT_CK_LISTIOB; + OP *kid; + kid = cLISTOPo->op_first; if (!kid) { o = op_force_list(o); @@ -13746,10 +14283,10 @@ S_maybe_targlex(pTHX_ OP *o) OP * Perl_ck_sassign(pTHX_ OP *o) { - OP * const kid = cBINOPo->op_first; - PERL_ARGS_ASSERT_CK_SASSIGN; + OP * const kid = cBINOPo->op_first; + if (OpHAS_SIBLING(kid)) { OP *kkid = OpSIBLING(kid); /* For state variable assignment with attributes, kkid is a list op @@ -13768,18 +14305,133 @@ Perl_ck_sassign(pTHX_ OP *o) } +/* This function is very similar to Perl_check_hash_fields_and_hekify. + * It provides compile time checks on CONST hash key fields and + * converts them to HEK-in-SVs. + * + * The primary difference is that the other function operates on + * one (HELEM) or all (HSLICE, KVSLICE) OPs, this function is called + * by functions (anonhash, aassign) taking key/value pairs, and only + * the keys require examination so values are skipped. If we lose the + * ability to tell which OPs are keys and which are values, the function + * exits prematurely so as not to inadvertently operate on any values. + * (Doing so could erroneously downgrade some UTF8 CONSTs, which could + * introduce subtle logic changes to user code.) + * + * This function also does not check for fields or for barewords. + * (finalize_op() should still report any barewords present here.) + */ +static void +S_check_alt_hash_fields_hekify(pTHX_ OP *o) +{ + PERL_ARGS_ASSERT_CHECK_ALT_HASH_FIELDS_HEKIFY; + + OP *sib = o; + + if (OP_TYPE_IS_OR_WAS(o, OP_LIST)) { + sib = cLISTOPo->op_first; + assert(OpSIBLING(sib) && + OP_TYPE_IS(sib, OP_PUSHMARK)); + sib = OpSIBLING(sib); + } else if(OP_TYPE_IS_OR_WAS(o, OP_PUSHMARK)) { + sib = OpSIBLING(sib); + } + + /* Examine the keys, skip the vals */ + while (sib) { + /* Looking at a key */ + if (OP_TYPE_IS(sib, OP_CONST)) { + SV **svp = cSVOPx_svp(sib); + SV *sv = *svp; + + if (SvTYPE(sv) < SVt_PVMG && ( + (SvPOK(sv) && !SvIsCOW_shared_hash(sv)) || SvIOK(sv) + || (SvNOK(sv) && !IN_LC_RUNTIME(LC_NUMERIC)) ) + ) { + bool was_POK = (SvFLAGS(sv) & SVf_POK); + STRLEN keylen; + /* SvPV_const will upgrade any SVt_IV or SVt_NV */ + const char * const key = SvPV_const(sv, keylen); + + if (UNLIKELY(keylen > I32_MAX)) { + croak("Sorry, hash keys must be smaller than 2**31 bytes"); + } + + SV *nsv = newSVpvn_share(key, SvUTF8(sv) ? -(I32)keylen : (I32)keylen, 0); + *svp = nsv; + + if (SvTYPE(sv) != SVt_PV) { + sv_upgrade(nsv, SvTYPE(sv)); + if (!was_POK) + SvFLAGS(nsv) &= ~SVf_POK; + SvFLAGS(nsv) |= SvFLAGS(sv) & (SVf_IOK|SVp_IOK|SVf_IVisUV|SVf_NOK|SVp_NOK); + + if (SvIOK(sv)) + SvIV_set(nsv, SvIVX(sv)); + if (SvNOK(sv)) + SvNV_set(nsv, SvNVX(sv)); + } + SvREFCNT_dec_NN(sv); + } + } else if (!(PL_opargs[sib->op_type] & OA_RETSCALAR)) + break; + + /* Looking for a corresponding value OP */ + sib = OpSIBLING(sib); + if (!sib) break; + + /* Is this OP guaranteed to only push a single SV? */ + if (!(PL_opargs[sib->op_type] & OA_RETSCALAR)) + break; + + sib = OpSIBLING(sib); + } + return; +} + +OP * +Perl_ck_aassign(pTHX_ OP *o) +{ + PERL_ARGS_ASSERT_CK_AASSIGN; + + OP * const last = cBINOPo->op_last; + if (last && OP_TYPE_IS_OR_WAS(last, OP_LIST)) { + OP * const sib = cLISTOPx(last)->op_first; + if (sib && OP_TYPE_IS(sib, OP_PUSHMARK)) { + OP * const lval = OpSIBLING(sib); + if (lval && !OpSIBLING(lval) && + (OP_TYPE_IS(lval, OP_PADHV) || OP_TYPE_IS(lval, OP_RV2HV))) { + check_alt_hash_fields_hekify(cBINOPo->op_first); + } + } + } + return o; +} + +OP * +Perl_ck_anonhash(pTHX_ OP *o) +{ + PERL_ARGS_ASSERT_CK_ANONHASH; + + check_alt_hash_fields_hekify(cLISTOPo->op_first); + return ck_fun(o); +} + OP * Perl_ck_match(pTHX_ OP *o) { - PERL_UNUSED_CONTEXT; PERL_ARGS_ASSERT_CK_MATCH; + PERL_UNUSED_CONTEXT; + return o; } OP * Perl_ck_method(pTHX_ OP *o) { + PERL_ARGS_ASSERT_CK_METHOD; + SV *sv, *methsv, *rclass; const char* method; char* compatptr; @@ -13788,7 +14440,6 @@ Perl_ck_method(pTHX_ OP *o) OP* new_op; OP * const kid = cUNOPo->op_first; - PERL_ARGS_ASSERT_CK_METHOD; if (kid->op_type != OP_CONST) return o; sv = kSVOP->op_sv; @@ -13847,11 +14498,11 @@ Perl_ck_null(pTHX_ OP *o) return o; } -__attribute__nonnull__(1) static bool S_is_dup_mode(const OP *o) { - assert(o != NULL); + PERL_ARGS_ASSERT_IS_DUP_MODE; + if (o->op_type != OP_CONST) { return false; } @@ -13899,7 +14550,7 @@ Perl_ck_open(pTHX_ OP *o) (last->op_private & OPpCONST_STRICT) && (oa = OpSIBLING(first)) && /* The fh. */ (oa = OpSIBLING(oa)) && /* The mode. */ - S_is_dup_mode(oa) && /* A dup open. */ + is_dup_mode(oa) && /* A dup open. */ (last == OpSIBLING(oa))) { /* The bareword. */ if (!FEATURE_BAREWORD_FILEHANDLES_IS_ENABLED) no_bareword_filehandle(SvPVX(cSVOPx_sv(last))); @@ -13923,12 +14574,13 @@ Perl_ck_prototype(pTHX_ OP *o) OP * Perl_ck_refassign(pTHX_ OP *o) { + PERL_ARGS_ASSERT_CK_REFASSIGN; + OP * const right = cLISTOPo->op_first; OP * const left = OpSIBLING(right); OP *varop = cUNOPx(cUNOPx(left)->op_first)->op_first; bool stacked = 0; - PERL_ARGS_ASSERT_CK_REFASSIGN; assert (left); assert (left->op_type == OP_SREFGEN); @@ -14010,11 +14662,7 @@ Perl_ck_refassign(pTHX_ OP *o) OP_DESC(varop))); return o; } - if (!FEATURE_REFALIASING_IS_ENABLED) - croak( - "Experimental aliasing via reference not enabled"); - ck_warner_d(packWARN(WARN_EXPERIMENTAL__REFALIASING), - "Aliasing via reference is experimental"); + check_or_warn_refaliasing(); if (stacked) { o->op_flags |= OPf_STACKED; op_sibling_splice(o, right, 1, varop); @@ -14050,10 +14698,10 @@ Perl_ck_repeat(pTHX_ OP *o) OP * Perl_ck_require(pTHX_ OP *o) { - GV* gv; - PERL_ARGS_ASSERT_CK_REQUIRE; + GV* gv; + if (o->op_flags & OPf_KIDS) { /* Shall we supply missing .pm? */ SVOP * const kid = cSVOPx(cUNOPo->op_first); U32 hash; @@ -14143,10 +14791,10 @@ Perl_ck_require(pTHX_ OP *o) OP * Perl_ck_return(pTHX_ OP *o) { - OP *kid; - PERL_ARGS_ASSERT_CK_RETURN; + OP *kid; + if (o->op_flags & OPf_STACKED) { kid = cUNOPx(OpSIBLING(cLISTOPo->op_first))->op_first; if (kid->op_type != OP_SCOPE && kid->op_type != OP_LEAVE) @@ -14166,10 +14814,10 @@ Perl_ck_return(pTHX_ OP *o) OP * Perl_ck_select(pTHX_ OP *o) { - OP* kid; - PERL_ARGS_ASSERT_CK_SELECT; + OP* kid; + if (o->op_flags & OPf_KIDS) { kid = OpSIBLING(cLISTOPo->op_first); /* get past pushmark */ if (kid && OpHAS_SIBLING(kid)) { @@ -14188,10 +14836,10 @@ Perl_ck_select(pTHX_ OP *o) OP * Perl_ck_shift(pTHX_ OP *o) { - const I32 type = o->op_type; - PERL_ARGS_ASSERT_CK_SHIFT; + const I32 type = o->op_type; + if (!(o->op_flags & OPf_KIDS)) { OP *argop; @@ -14210,12 +14858,12 @@ Perl_ck_shift(pTHX_ OP *o) OP * Perl_ck_sort(pTHX_ OP *o) { + PERL_ARGS_ASSERT_CK_SORT; + OP *firstkid; OP *kid; U8 stacked; - PERL_ARGS_ASSERT_CK_SORT; - if (o->op_flags & OPf_STACKED) simplify_sort(o); firstkid = OpSIBLING(cLISTOPo->op_first); /* get past pushmark */ @@ -14291,9 +14939,11 @@ Perl_ck_sort(pTHX_ OP *o) * Also, check and warn on lexical $a, $b. */ -STATIC void +static void S_simplify_sort(pTHX_ OP *o) { + PERL_ARGS_ASSERT_SIMPLIFY_SORT; + OP *kid = OpSIBLING(cLISTOPo->op_first); /* get past pushmark */ OP *k; int descending; @@ -14301,8 +14951,6 @@ S_simplify_sort(pTHX_ OP *o) const char *gvname; bool have_scopeop; - PERL_ARGS_ASSERT_SIMPLIFY_SORT; - kid = kUNOP->op_first; /* get past null */ if (!(have_scopeop = kid->op_type == OP_SCOPE) && kid->op_type != OP_LEAVE) @@ -14394,11 +15042,11 @@ S_simplify_sort(pTHX_ OP *o) OP * Perl_ck_split(pTHX_ OP *o) { + PERL_ARGS_ASSERT_CK_SPLIT; + OP *kid; OP *sibs; - PERL_ARGS_ASSERT_CK_SPLIT; - assert(o->op_type == OP_LIST); if (o->op_flags & OPf_STACKED) @@ -14475,8 +15123,9 @@ Perl_ck_split(pTHX_ OP *o) OP * Perl_ck_stringify(pTHX_ OP *o) { - OP * const kid = OpSIBLING(cUNOPo->op_first); PERL_ARGS_ASSERT_CK_STRINGIFY; + + OP * const kid = OpSIBLING(cUNOPo->op_first); if (( kid->op_type == OP_JOIN || kid->op_type == OP_QUOTEMETA || kid->op_type == OP_LC || kid->op_type == OP_LCFIRST || kid->op_type == OP_UC || kid->op_type == OP_UCFIRST) @@ -14492,10 +15141,10 @@ Perl_ck_stringify(pTHX_ OP *o) OP * Perl_ck_join(pTHX_ OP *o) { - OP * const kid = OpSIBLING(cLISTOPo->op_first); - PERL_ARGS_ASSERT_CK_JOIN; + OP * const kid = OpSIBLING(cLISTOPo->op_first); + if (kid && kid->op_type == OP_MATCH) { if (ckWARN(WARN_SYNTAX)) { const REGEXP *re = PM_GETRE(kPMOP); @@ -14530,6 +15179,10 @@ Perl_ck_join(pTHX_ OP *o) /* =for apidoc rv2cv_op_cv +=for apidoc_flag OPpEARLY_CV +=for apidoc_flag OPpENTERSUB_AMPER +=for apidoc_flag RV2CVOPCV_MARK_EARLY +=for apidoc_flag RV2CVOPCV_RETURN_NAME_GV Examines an op, which is expected to identify a subroutine at runtime, and attempts to determine at compile time which subroutine it identifies. @@ -14564,11 +15217,6 @@ referencing GV. The resulting C is A null pointer is returned as usual if there is no statically-determinable subroutine. -=for apidoc Amnh||OPpEARLY_CV -=for apidoc Amnh||OPpENTERSUB_AMPER -=for apidoc Amnh||RV2CVOPCV_MARK_EARLY -=for apidoc Amnh||RV2CVOPCV_RETURN_NAME_GV - =cut */ @@ -14576,6 +15224,8 @@ subroutine. CV * Perl_find_lexical_cv(pTHX_ PADOFFSET off) { + PERL_ARGS_ASSERT_FIND_LEXICAL_CV; + const PADNAME *name = PAD_COMPNAME(off); CV *compcv = PL_compcv; while (PadnameOUTER(name)) { @@ -14606,6 +15256,7 @@ Perl_find_lexical_cv(pTHX_ PADOFFSET off if (thisname && PadnameLEN(thisname) == PadnameLEN(name) && PadnamePV(thisname) == PadnamePV(name)) { name = thisname; + off = offset; break; } } @@ -14621,10 +15272,11 @@ Perl_find_lexical_cv(pTHX_ PADOFFSET off CV * Perl_rv2cv_op_cv(pTHX_ OP *cvop, U32 flags) { + PERL_ARGS_ASSERT_RV2CV_OP_CV; + OP *rvop; CV *cv; GV *gv; - PERL_ARGS_ASSERT_RV2CV_OP_CV; if (flags & ~RV2CVOPCV_FLAG_MASK) croak("panic: rv2cv_op_cv bad flags %x", (unsigned)flags); if (cvop->op_type != OP_RV2CV) @@ -14704,14 +15356,11 @@ or a call where the callee has no protot OP * Perl_ck_entersub_args_list(pTHX_ OP *entersubop) { - OP *aop; - PERL_ARGS_ASSERT_CK_ENTERSUB_ARGS_LIST; - aop = cUNOPx(entersubop)->op_first; - if (!OpHAS_SIBLING(aop)) - aop = cUNOPx(aop)->op_first; - for (aop = OpSIBLING(aop); OpHAS_SIBLING(aop); aop = OpSIBLING(aop)) { + OP *aop; + + for (aop = find_argop_from_entersub(entersubop); OpHAS_SIBLING(aop); aop = OpSIBLING(aop)) { /* skip the extra attributes->import() call implicitly added in * something like foo(my $x : bar) */ @@ -14756,14 +15405,15 @@ by the name defined by the C par OP * Perl_ck_entersub_args_proto(pTHX_ OP *entersubop, GV *namegv, SV *protosv) { + PERL_ARGS_ASSERT_CK_ENTERSUB_ARGS_PROTO; + STRLEN proto_len; const char *proto, *proto_end; - OP *aop, *prev, *cvop, *parent; + OP *aop, *prev, *parent; int optional = 0; I32 arg = 0; I32 contextclass = 0; const char *e = NULL; - PERL_ARGS_ASSERT_CK_ENTERSUB_ARGS_PROTO; if (SvTYPE(protosv) == SVt_PVCV ? !SvPOK(protosv) : !SvOK(protosv)) croak("panic: ck_entersub_args_proto CV with no proto, " "flags=%lx", (unsigned long) SvFLAGS(protosv)); @@ -14780,7 +15430,7 @@ Perl_ck_entersub_args_proto(pTHX_ OP *en } prev = aop; aop = OpSIBLING(aop); - for (cvop = aop; OpHAS_SIBLING(cvop); cvop = OpSIBLING(cvop)) ; + OP *cvop = find_cvop_from_argop(aop); while (aop != cvop) { OP* o3 = aop; @@ -15015,18 +15665,17 @@ Perl_ck_entersub_args_proto_or_list(pTHX OP * Perl_ck_entersub_args_core(pTHX_ OP *entersubop, GV *namegv, SV *protosv) { + PERL_ARGS_ASSERT_CK_ENTERSUB_ARGS_CORE; + IV cvflags = SvIVX(protosv); int opnum = cvflags & 0xffff; OP *aop = cUNOPx(entersubop)->op_first; - PERL_ARGS_ASSERT_CK_ENTERSUB_ARGS_CORE; - if (!opnum) { - OP *cvop; if (!OpHAS_SIBLING(aop)) aop = cUNOPx(aop)->op_first; aop = OpSIBLING(aop); - for (cvop = aop; OpSIBLING(cvop); cvop = OpSIBLING(cvop)) ; + OP *cvop = find_cvop_from_argop(aop); if (aop != cvop) { SV *namesv = cv_name((CV *)namegv, NULL, CV_NAME_NOTQUAL); yyerror_pv(form("Too many arguments for %" SVf, @@ -15042,7 +15691,7 @@ Perl_ck_entersub_args_core(pTHX_ OP *ent newSVpv(CopFILE(PL_curcop),0)); case 'L': /* __LINE__ */ return newSVOP(OP_CONST, 0, - Perl_newSVpvf(aTHX_ "%" LINE_Tf, CopLINE(PL_curcop))); + newSVpvf("%" LINE_Tf, CopLINE(PL_curcop))); case 'P': /* __PACKAGE__ */ return newSVOP(OP_CONST, 0, (PL_curstash @@ -15127,6 +15776,7 @@ Perl_ck_entersub_args_core(pTHX_ OP *ent /* =for apidoc cv_get_call_checker_flags +=for apidoc_flag CALL_CHECKER_REQUIRE_GV Retrieves the function that will be used to fix up a call to C. Specifically, the function is applied to an C op tree for a @@ -15172,8 +15822,6 @@ C is a bitset passed into C bit currently has a defined meaning (for which see above). All other bits should be clear. -=for apidoc Amnh||CALL_CHECKER_REQUIRE_GV - =for apidoc cv_get_call_checker The original form of L, which does not return @@ -15187,9 +15835,10 @@ void Perl_cv_get_call_checker_flags(pTHX_ CV *cv, U32 gflags, Perl_call_checker *ckfun_p, SV **ckobj_p, U32 *ckflags_p) { - MAGIC *callmg; PERL_ARGS_ASSERT_CV_GET_CALL_CHECKER_FLAGS; PERL_UNUSED_CONTEXT; + + MAGIC *callmg; callmg = SvMAGICAL((SV*)cv) ? mg_find((SV*)cv, PERL_MAGIC_checkcall) : NULL; if (callmg) { *ckfun_p = DPTR2FPTR(Perl_call_checker, callmg->mg_ptr); @@ -15205,9 +15854,10 @@ Perl_cv_get_call_checker_flags(pTHX_ CV void Perl_cv_get_call_checker(pTHX_ CV *cv, Perl_call_checker *ckfun_p, SV **ckobj_p) { - U32 ckflags; PERL_ARGS_ASSERT_CV_GET_CALL_CHECKER; PERL_UNUSED_CONTEXT; + + U32 ckflags; cv_get_call_checker_flags(cv, CALL_CHECKER_REQUIRE_GV, ckfun_p, ckobj_p, &ckflags); } @@ -15224,7 +15874,7 @@ The C-level function pointer is supplied it is supplied in C, and control flags are supplied in C. The function should be defined like this: - STATIC OP * ckfun(pTHX_ OP *op, GV *namegv, SV *ckobj) + static OP * ckfun(pTHX_ OP *op, GV *namegv, SV *ckobj) It is intended to be called in this manner: @@ -15304,21 +15954,15 @@ S_entersub_alloc_targ(pTHX_ OP * const o OP * Perl_ck_subr(pTHX_ OP *o) { - OP *aop, *cvop; - CV *cv; - GV *namegv; + PERL_ARGS_ASSERT_CK_SUBR; + SV **const_class = NULL; OP *const_op = NULL; - PERL_ARGS_ASSERT_CK_SUBR; - - aop = cUNOPx(o)->op_first; - if (!OpHAS_SIBLING(aop)) - aop = cUNOPx(aop)->op_first; - aop = OpSIBLING(aop); - for (cvop = aop; OpHAS_SIBLING(cvop); cvop = OpSIBLING(cvop)) ; - cv = rv2cv_op_cv(cvop, RV2CVOPCV_MARK_EARLY); - namegv = cv ? (GV*)rv2cv_op_cv(cvop, RV2CVOPCV_MAYBE_NAME_GV) : NULL; + OP *aop = find_argop_from_entersub(o); + OP *cvop = find_cvop_from_argop(aop); + CV *cv = rv2cv_op_cv(cvop, RV2CVOPCV_MARK_EARLY); + GV *namegv = cv ? (GV*)rv2cv_op_cv(cvop, RV2CVOPCV_MAYBE_NAME_GV) : NULL; o->op_private &= ~1; o->op_private |= (PL_hints & HINT_STRICT_REFS); @@ -15409,8 +16053,9 @@ Perl_ck_subr(pTHX_ OP *o) OP * Perl_ck_svconst(pTHX_ OP *o) { - SV * const sv = cSVOPo->op_sv; PERL_ARGS_ASSERT_CK_SVCONST; + + SV * const sv = cSVOPo->op_sv; PERL_UNUSED_CONTEXT; #ifdef PERL_COPY_ON_WRITE /* Since the read-only flag may be used to protect a string buffer, we @@ -15489,7 +16134,8 @@ Perl_ck_tell(pTHX_ OP *o) } PERL_STATIC_INLINE OP * -S_last_non_null_kid(OP *o) { +S_last_non_null_kid(OP *o) +{ OP *last = NULL; if (cUNOPo->op_flags & OPf_KIDS) { OP *k = cLISTOPo->op_first; @@ -15507,11 +16153,11 @@ S_last_non_null_kid(OP *o) { OP * Perl_ck_each(pTHX_ OP *o) { + PERL_ARGS_ASSERT_CK_EACH; + OP *kid = o->op_flags & OPf_KIDS ? cUNOPo->op_first : NULL; const unsigned orig_type = o->op_type; - PERL_ARGS_ASSERT_CK_EACH; - if (kid) { switch (kid->op_type) { case OP_PADHV: @@ -15582,9 +16228,8 @@ Perl_ck_each(pTHX_ OP *o) goto bad; /* FALLTHROUGH */ default: - qerror(Perl_mess(aTHX_ - "Experimental %s on scalar is now forbidden", - PL_op_desc[orig_type])); + defer_error(mess("Experimental %s on scalar is now forbidden", + PL_op_desc[orig_type])); bad: bad_type_pv(1, "hash or array", o, kid); return o; @@ -15666,15 +16311,15 @@ Perl_ck_isa(pTHX_ OP *o) /* Check for in place reverse and sort assignments like "@a = reverse @a" and modify the optree to make them work inplace */ -STATIC void -S_inplace_aassign(pTHX_ OP *o) { +static void +S_inplace_aassign(pTHX_ OP *o) +{ + PERL_ARGS_ASSERT_INPLACE_AASSIGN; OP *modop, *modop_pushmark; OP *oright; OP *oleft, *oleft_pushmark; - PERL_ARGS_ASSERT_INPLACE_AASSIGN; - assert((o->op_flags & OPf_WANT) == OPf_WANT_VOID); assert(cUNOPo->op_first->op_type == OP_NULL); @@ -15795,13 +16440,14 @@ static const MGVTBL custom_op_register_v XOPRETANY Perl_custom_op_get_field(pTHX_ const OP *o, const xop_flags_enum field) { + PERL_ARGS_ASSERT_CUSTOM_OP_GET_FIELD; + SV *keysv; HE *he = NULL; XOP *xop; static const XOP xop_null = { 0, 0, 0, 0, 0, 0 }; - PERL_ARGS_ASSERT_CUSTOM_OP_GET_FIELD; assert(o->op_type == OP_CUSTOM); /* This is wrong. It assumes a function pointer can be cast to IV, @@ -15920,10 +16566,10 @@ Register a custom op. See L, or to a new mortal SV if C is C. It returns the modified C, or C if the core function has no prototype. C is a code as returned -by C. It must not be equal to 0. +by C. It must not be equal to 0. C should be either C +or the address of a variable that will be set to the op number corresponding to +C, if any. =cut */ @@ -15950,14 +16598,14 @@ SV * Perl_core_prototype(pTHX_ SV *sv, const char *name, const int code, int * const opnum) { + PERL_ARGS_ASSERT_CORE_PROTOTYPE; + int i = 0, n = 0, seen_question = 0, defgv = 0; I32 oa; #define MAX_ARGS_OP ((sizeof(I32) - 1) * 2) char str[ MAX_ARGS_OP * 2 + 2 ]; /* One ';', one '\0' */ bool nullret = FALSE; - PERL_ARGS_ASSERT_CORE_PROTOTYPE; - assert (code); if (!sv) sv = sv_newmortal(); @@ -15980,13 +16628,14 @@ Perl_core_prototype(pTHX_ SV *sv, const case KEY_values: retsetpvs("\\[%@]", OP_VALUES); case KEY_each: retsetpvs("\\[%@]", OP_EACH); case KEY_pos: retsetpvs(";\\[$*]", OP_POS); - case KEY___CLASS__: case KEY___FILE__: case KEY___LINE__: case KEY___PACKAGE__: + /* special case: + 0 means "no actual op, but can be emulated using caller()" + */ retsetpvs("", 0); - case KEY_evalbytes: - name = "entereval"; break; - case KEY_readpipe: - name = "backtick"; + case KEY_evalbytes: name = "entereval"; break; + case KEY_readpipe: name = "backtick"; break; + case KEY___CLASS__: name = "classname"; break; } #undef retsetpvs @@ -16046,21 +16695,33 @@ OP * Perl_coresub_op(pTHX_ SV * const coreargssv, const int code, const int opnum) { + PERL_ARGS_ASSERT_CORESUB_OP; + OP * const argop = (opnum == OP_SELECT && code) ? NULL : newSVOP(OP_COREARGS,0,coreargssv); OP *o; - PERL_ARGS_ASSERT_CORESUB_OP; - switch(opnum) { - case 0: - return op_append_elem(OP_LINESEQ, - argop, - newSLICEOP(0, - newSVOP(OP_CONST, 0, newSViv(-code % 3)), - newOP(OP_CALLER,0) - ) - ); + case 0: { + IV caller_index = IV_MAX; + switch (-code) { + case KEY___PACKAGE__: caller_index = 0; break; + case KEY___FILE__: caller_index = 1; break; + case KEY___LINE__: caller_index = 2; break; + } + assert(caller_index < IV_MAX); + + return op_append_elem( + OP_LINESEQ, + argop, + newSLICEOP( + 0, + newSVOP(OP_CONST, 0, newSViv(caller_index)), + newOP(OP_CALLER, 0) + ) + ); + } + case OP_EACH: case OP_KEYS: case OP_VALUES: @@ -16121,12 +16782,12 @@ void Perl_report_redefined_cv(pTHX_ const SV *name, const CV *old_cv, SV * const *new_const_svp) { + PERL_ARGS_ASSERT_REPORT_REDEFINED_CV; + const char *hvname; bool is_const = cBOOL(CvCONST(old_cv)); SV *old_const_sv = is_const ? cv_const_sv_or_av(old_cv) : NULL; - PERL_ARGS_ASSERT_REPORT_REDEFINED_CV; - if (is_const && new_const_svp && old_const_sv == *new_const_svp) return; /* They are 2 constant subroutines generated from @@ -16230,9 +16891,9 @@ void Perl_wrap_op_checker(pTHX_ Optype opcode, Perl_check_t new_checker, Perl_check_t *old_checker_p) { - PERL_UNUSED_CONTEXT; PERL_ARGS_ASSERT_WRAP_OP_CHECKER; + if (*old_checker_p) return; OP_CHECK_MUTEX_LOCK; if (!*old_checker_p) { @@ -16291,6 +16952,8 @@ const_av_xsub(pTHX_ CV* cv) char * Perl_dup_warnings(pTHX_ char* warnings) { + PERL_ARGS_ASSERT_DUP_WARNINGS; + if (warnings == NULL || specialWARN(warnings)) return warnings; @@ -16331,12 +16994,12 @@ the input content. */ char * -Perl_rcpv_new(pTHX_ const char *pv, STRLEN len, U32 flags) { - RCPV *rcpv; - +Perl_rcpv_new(pTHX_ const char *pv, STRLEN len, U32 flags) +{ PERL_ARGS_ASSERT_RCPV_NEW; PERL_UNUSED_CONTEXT; + RCPV *rcpv; /* Musn't use both at the same time */ assert((flags & (RCPVf_NO_COPY|RCPVf_USE_STRLEN))!= @@ -16386,7 +17049,8 @@ Always returns NULL so it can be used li */ char * -Perl_rcpv_free(pTHX_ char *pv) { +Perl_rcpv_free(pTHX_ char *pv) +{ PERL_ARGS_ASSERT_RCPV_FREE; @@ -16426,7 +17090,8 @@ Returns the same pointer that was passed char * -Perl_rcpv_copy(pTHX_ char *pv) { +Perl_rcpv_copy(pTHX_ char *pv) +{ PERL_ARGS_ASSERT_RCPV_COPY; @@ -16443,11 +17108,34 @@ Perl_rcpv_copy(pTHX_ char *pv) { /* Subroutine signature parsing */ +struct yy_parser_signature_param { + size_t argix; /* positional params: index of the param */ + SV *paramname; /* named params: name of the param */ + PADOFFSET padix; /* pad index of the var holding the param */ + OP *defcop; + OPCODE defmode; + OP *defexpr; +}; + struct yy_parser_signature { - UV elems; /* number of signature elements seen so far */ - UV optelems; /* number of optional signature elems seen */ - char slurpy; /* the sigil of the slurpy var (or null) */ - OP *elemops; /* NULL, or an OP_LINESEQ of individual element ops */ + /* A note on terminology. We call each variable that appears in a + * signature a "parameter", and each scalar value the caller passes in at + * call time we call an "argument". + * Each scalar parameter variable will correspond to one argument value. + * The complication arises when we consider a slurpy array or hash + * parameter. Here, while it is exactly one *parameter*, it may account + * zero or more arguments. + */ + UV next_argix; /* the argument index of the next parameter we add */ + UV opt_params; /* number of optional positional scalar parameters */ + UV named_params; /* number of named scalar parameters */ + char slurpy; /* the sigil of the slurpy var (or null) */ + + UV nparams; /* number of elements of the following array that are in use */ + UV params_size; /* number of elements we could store in the following array */ + struct yy_parser_signature_param *params; + + OP *fenceops; /* NULL, or an OP_LINESEQ containing the ops */ }; static void @@ -16455,12 +17143,51 @@ destroy_subsignature_context(pTHX_ void { yy_parser_signature *signature = (yy_parser_signature *)p; - if(signature->elemops) - op_free(signature->elemops); + if(signature->params) { + for(size_t parami = 0; parami < signature->nparams; parami++) { + struct yy_parser_signature_param *param = signature->params + parami; + + if(param->paramname) + SvREFCNT_dec(param->paramname); + if(param->defcop) + op_free(param->defcop); + if(param->defexpr) + op_free(param->defexpr); + } + Safefree(signature->params); + } + + if(signature->fenceops) + op_free(signature->fenceops); Safefree(signature); } +#define subsignature_push_param() S_subsignature_push_param(aTHX) +static struct yy_parser_signature_param * +S_subsignature_push_param(pTHX) +{ + assert(PL_parser); + yy_parser_signature *signature = PL_parser->signature; + assert(signature); + + if(signature->nparams >= signature->params_size) { + signature->params_size *= 2; + Renew(signature->params, signature->params_size, struct yy_parser_signature_param); + } + struct yy_parser_signature_param *param = signature->params + signature->nparams; + signature->nparams++; + + param->argix = 0; + param->paramname = NULL; + param->padix = 0; + param->defcop = NULL; + param->defmode = 0; + param->defexpr = NULL; + + return param; +} + /* Called from perly.y on encountering the '(' of a subroutine signature. * Does not return anything useful, but sets up the memory structure in * `PL_parser->signature` that the following functions make use of. @@ -16473,113 +17200,217 @@ Perl_subsignature_start(pTHX) assert(PL_parser); yy_parser_signature *signature; - Newx(signature, 1, yy_parser_signature); + Newxz(signature, 1, yy_parser_signature); SAVEDESTRUCTOR_X(&destroy_subsignature_context, signature); - signature->elems = 0; - signature->optelems = 0; - signature->slurpy = 0; - - signature->elemops = NULL; + /* Most signatured subs probably won't have more than 4 params. If they do + * we'll just realloc anyway + */ + signature->params_size = 4; + Newxz(signature->params, signature->params_size, struct yy_parser_signature_param); SAVEVPTR(PL_parser->signature); PL_parser->signature = signature; + + /* TODO: This should ideally be performed by some sort of "magic" or + * "hook" mechanism on PL_compcv that class.c installed, thus decoupling + * this otherwise tightly-coupled mechanism here + */ + if(CvIsMETHOD(PL_compcv)) { + assert(PadnamelistMAX(PL_comppad_name) >= 1); + /* PADIX_SELF == 1 */ + assert(PadnamePV(PadnamelistARRAY(PL_comppad_name)[1])[0] == '$'); + subsignature_append_positional(1, 0, NULL); + subsignature_append_fence_op(newUNOP_AUX(OP_METHSTART, OPpSELF_IN_PAD << 8, NULL, NULL)); + } +} + +/* Appends another arbitrary optree into the accumulated set of signature- + * handling ops. This op will be invoked at some time after all of the + * parameters already present have received their values, but before any of + * the defaulting expressions for later parameters are executed. + */ + +void +Perl_subsignature_append_fence_op(pTHX_ OP *o) +{ + PERL_ARGS_ASSERT_SUBSIGNATURE_APPEND_FENCE_OP; + assert(PL_parser); + yy_parser_signature *signature = PL_parser->signature; + assert(signature); + + if(signature->fenceops) + op_append_elem(OP_LINESEQ, signature->fenceops, o); + else + signature->fenceops = newLISTOP(OP_LINESEQ, 0, o, NULL); +} + +#define subsignature_param_add_defexpr(param, defmode, defexpr) S_subsignature_param_add_defexpr(aTHX_ param, defmode, defexpr) +static void +S_subsignature_param_add_defexpr(pTHX_ struct yy_parser_signature_param *param, OPCODE defmode, OP *defexpr) +{ + if(defexpr->op_type == OP_NULL && !(defexpr->op_flags & OPf_KIDS)) + { + /* caller passed in newOP(OP_NULL, 0), so we should not leak it */ + op_free(defexpr); + + defexpr = newOP(OP_STUB, OPf_WANT_SCALAR); + + /* handle '$=' special case */ + if(param->padix) + yyerror("Optional parameter lacks default expression"); + } + + /* generate the COP here so the line number is correct */ + param->defcop = newSTATEOP(0, NULL, NULL); + + param->defmode = defmode; + param->defexpr = defexpr; + scalar(defexpr); + + if(!param->padix) { + /* A defaulting expression with anonymous var still needs to be + * conditional. We'll just have to allocate a pad temporary to + * store the value in anyway, so OP_PARAMTEST can check it. + */ + param->padix = pad_add_name_pvn("$", 1, padadd_NO_DUP_CHECK, NULL, NULL); + } } /* Appends another positional scalar parameter to the accumulated set of - * subroutine params. `varop` may be NULL, but if not it must be an OP_ARGELEM - * whose op_targ refers to an already-declared pad lexical. That lexical must - * be a scalar. It is not necessary to set the argument index in the op_aux - * field; that will be filled in by this function. + * subroutine params. `padix` may be zero, but if not it must be the pad + * index of a scalar pad lexical to store the incoming argument value into. * If `defexpr` is not NULL, it gives a defaulting expression to be evaluated * if required, according to `defmode` - one of zero, `OP_DORASSIGN` or * `OP_ORASSIGN`. */ void -Perl_subsignature_append_positional(pTHX_ OP *varop, OPCODE defmode, OP *defexpr) +Perl_subsignature_append_positional(pTHX_ PADOFFSET padix, OPCODE defmode, OP *defexpr) { PERL_ARGS_ASSERT_SUBSIGNATURE_APPEND_POSITIONAL; assert(PL_parser); yy_parser_signature *signature = PL_parser->signature; assert(signature); - if(signature->slurpy) + if(signature->slurpy) { yyerror("Slurpy parameter not last"); + return; + } - UV argix = signature->elems; - - if(varop) { - assert(varop->op_type == OP_ARGELEM); - assert((varop->op_private & OPpARGELEM_MASK) == OPpARGELEM_SV); - assert(varop->op_targ); - assert(PadnamePV(PadnamelistARRAY(PL_comppad_name)[varop->op_targ])[0] == '$'); + if(!defexpr && signature->opt_params) { + yyerror("Mandatory parameter follows optional parameter"); + return; + } - /* Now fill in the argix */ - cUNOP_AUXx(varop)->op_aux = INT2PTR(UNOP_AUX_item *, argix); + if(signature->named_params) { + yyerror("Positional parameter follows named parameter"); + return; } - signature->elems++; + UV argix = signature->next_argix; + signature->next_argix++; - if(defexpr) { - signature->optelems++; + if(!padix && !defexpr) + /* This param has no var and no defaulting expression. There's + * nothing else for us to do here. + */ + return; - if(defexpr->op_type == OP_NULL && !(defexpr->op_flags & OPf_KIDS)) - { - /* caller passed in newOP(OP_NULL, 0), so we should not leak it */ - op_free(defexpr); + struct yy_parser_signature_param *param = subsignature_push_param(); + param->argix = argix; - /* handle '$=' special case */ - if(varop) - yyerror("Optional parameter lacks default expression"); - } - else { - I32 flags = 0; - if(defmode == OP_DORASSIGN) - flags |= OPpARG_IF_UNDEF << 8; - if(defmode == OP_ORASSIGN) - flags |= OPpARG_IF_FALSE << 8; - - /* a normal '=default' expression */ - OP *defop = newARGDEFELEMOP(flags, defexpr, argix); - - if(varop) { - varop->op_flags |= OPf_STACKED; - (void)op_sibling_splice(varop, NULL, 0, defop); - scalar(defop); - } - else - varop = newUNOP(OP_NULL, 0, defop); + if(padix) { + assert(PadnamePV(PadnamelistARRAY(PL_comppad_name)[padix])[0] == '$'); - LINKLIST(varop); - /* NB: normally the first child of a logop is executed before the - * logop, and it pushes a boolean result ready for the logop. For - * ARGDEFELEM, the op itself does the boolean calculation, so set - * the first op to it instead. - */ - varop->op_next = defop; - defexpr->op_next = varop; - } + param->padix = padix; + + intro_my(); /* introduce the new pad variable now */ } else - if(signature->optelems) - yyerror("Mandatory parameter follows optional parameter"); + param->padix = 0; + + if(defexpr) { + signature->opt_params++; + subsignature_param_add_defexpr(param, defmode, defexpr); + } + + assert(param->padix || param->defexpr); +} + +/* Appends another named scalar parameter to the accumulated set of subroutine + * params. `padix` gives the pad index of a scalar pad lexical to store the + * incoming argument value into. It must not be zero, as "anonymous" named + * parameters are not allowed (in any case it's hard to imagine how that would + * be parsed ;) ). + * If `defexpr` is not NULL, it gives a defaulting expression to be evaluated + * if required, according to `defmode` - one of zero, `OP_DORASSIGN` or + * `OP_ORASSIGN`. + */ + +void +Perl_subsignature_append_named(pTHX_ const char *paramname, PADOFFSET padix, OPCODE defmode, OP *defexpr) +{ + PERL_ARGS_ASSERT_SUBSIGNATURE_APPEND_NAMED; + assert(padix); + + assert(PL_parser); + yy_parser_signature *signature = PL_parser->signature; + assert(signature); + + if(!signature->named_params) + /* Only warn about the first one to avoid noise on multiple */ + ck_warner_d(packWARN(WARN_EXPERIMENTAL__SIGNATURE_NAMED_PARAMETERS), + "Named parameters in signatures are experimental"); + + if(signature->slurpy) { + yyerror("Slurpy parameter not last"); + return; + } + + if(!defexpr && signature->opt_params) { + yyerror("Mandatory parameter follows optional parameter"); + return; + } + + SV *namesv = newSVpvn_utf8(paramname, strlen(paramname), true); + + for(size_t parami = 0; parami < signature->named_params; parami++) { + struct yy_parser_signature_param *param = signature->params + parami; + + if(!param->paramname || !sv_streq(param->paramname, namesv)) + continue; + + SvREFCNT_dec(namesv); + yyerror("Duplicated subroutine parameter name"); + return; + } + + struct yy_parser_signature_param *param = subsignature_push_param(); + param->paramname = namesv; + + signature->named_params++; + + param->padix = padix; + + intro_my(); /* introduce the new pad variable now */ - if(varop) { - signature->elemops = op_append_list(OP_LINESEQ, signature->elemops, - newSTATEOP(0, NULL, varop)); + if(defexpr) { + subsignature_param_add_defexpr(param, defmode, defexpr); } + + assert(param->padix); + assert(param->paramname); } /* Appends a final slurpy parameter to the accumulated set of subroutine - * params. `varop` may be NULL, but if not it must be an OP_ARGELEM whose - * op_targ refers to an already-declared pad lexical. That lexical must match - * the `sigil` parameter. It is not necessary to set the argument index in the - * op_aux field; that will be filled in by this function. + * params. `padix` may be zero, but if not it must be the pad index of an + * array or hash lexical to store the remaining argument values into. Its + * sigil must match the `sigil` parameter. */ void -Perl_subsignature_append_slurpy(pTHX_ I32 sigil, OP *varop) +Perl_subsignature_append_slurpy(pTHX_ I32 sigil, PADOFFSET padix) { PERL_ARGS_ASSERT_SUBSIGNATURE_APPEND_SLURPY; assert(PL_parser); @@ -16590,26 +17421,55 @@ Perl_subsignature_append_slurpy(pTHX_ I3 if(signature->slurpy) yyerror("Multiple slurpy parameters not allowed"); - UV argix = signature->elems; + UV argix = signature->next_argix; + /* do not increment */ - if(varop) { - assert(varop->op_type == OP_ARGELEM); - assert((varop->op_private & OPpARGELEM_MASK) == - ((sigil == '@') ? OPpARGELEM_AV : OPpARGELEM_HV)); - assert(varop->op_targ); - assert(PadnamePV(PadnamelistARRAY(PL_comppad_name)[varop->op_targ])[0] == sigil); + signature->slurpy = (char)sigil; - /* Now fill in the argix */ - cUNOP_AUXx(varop)->op_aux = INT2PTR(UNOP_AUX_item *, argix); - } + if(!padix) + return; - signature->slurpy = (char)sigil; + struct yy_parser_signature_param *param = subsignature_push_param(); - if(varop) { - /* TODO: assert() the sigil of the pad variable matches */ - signature->elemops = op_append_list(OP_LINESEQ, signature->elemops, - newSTATEOP(0, NULL, varop)); - } + param->argix = argix; + + assert(PadnamePV(PadnamelistARRAY(PL_comppad_name)[padix])[0] == sigil); + + param->padix = padix; +} + +#define subsignature_build_defop(param) S_subsignature_build_defop(aTHX_ param) +static OP * +S_subsignature_build_defop(pTHX_ struct yy_parser_signature_param *param) +{ + OP *defexpr = param->defexpr; + assert(defexpr); + OP *defexpr_start = LINKLIST(defexpr); + + /* Need to build OP_PARAMTEST[ other: OP_PARAMSTORE[ default-expr ] ] */ + OP *paramstore = newUNOP(OP_PARAMSTORE, 0, defexpr); + OP *paramtest = (OP *)alloc_LOGOP(OP_PARAMTEST, paramstore, defexpr_start); + + paramtest->op_flags |= OPf_WANT_VOID; + paramtest->op_targ = paramstore->op_targ = param->padix; + + if(param->defmode == OP_DORASSIGN) + paramtest->op_private |= OPpPARAM_IF_UNDEF; + if(param->defmode == OP_ORASSIGN) + paramtest->op_private |= OPpPARAM_IF_FALSE; + + defexpr->op_next = paramstore; + + /* Wrap both in an outer OP_NULL so we can point both ->op_next + * pointers within into it + */ + OP *o = newUNOP(OP_NULL, 0, paramtest); + + paramstore->op_next = o; + paramtest->op_next = o; + o->op_next = paramtest; /* set start of o */ + + return o; } /* Called from perly.y on encountering the closing `)` of a subroutine @@ -16626,26 +17486,156 @@ Perl_subsignature_finish(pTHX) yy_parser_signature *signature = PL_parser->signature; assert(signature); - OP *sigops = signature->elemops; - signature->elemops = NULL; + OP *sigops = NULL; + + /* a nextstate right at the beginning */ + sigops = op_append_elem(OP_LINESEQ, sigops, + newSTATEOP(0, NULL, NULL)); + + size_t end_argix = signature->next_argix; + size_t n_named = signature->named_params; + + /* This allocates two sections in one chunk: + * the op_multiparam_aux header + * an array of end_argix * PADOFFSETs + */ + struct op_multiparam_aux *aux = (struct op_multiparam_aux *)PerlMemShared_malloc( + sizeof(struct op_multiparam_aux) + + (end_argix * sizeof(PADOFFSET))); + + aux->param_padix = (PADOFFSET *)( + (char *)aux + sizeof(struct op_multiparam_aux)); + + if(n_named) { + aux->named = (struct op_multiparam_named_aux *)PerlMemShared_malloc( + n_named * sizeof(struct op_multiparam_named_aux)); + } + else + aux->named = NULL; - struct op_argcheck_aux *aux = (struct op_argcheck_aux *) - PerlMemShared_malloc( sizeof(struct op_argcheck_aux)); + aux->min_args = end_argix - signature->opt_params; + aux->n_positional = end_argix; + aux->n_named = signature->named_params; + aux->slurpy = signature->slurpy; + aux->slurpy_padix = 0; - aux->params = signature->elems; - aux->opt_params = signature->optelems; - aux->slurpy = signature->slurpy; + OP *multiparam = newUNOP_AUX(OP_MULTIPARAM, 0, NULL, (UNOP_AUX_item *)aux); - OP *check = newUNOP_AUX(OP_ARGCHECK, 0, NULL, (UNOP_AUX_item *)aux); + sigops = op_append_elem(OP_LINESEQ, sigops, + multiparam); - sigops = op_prepend_elem(OP_LINESEQ, - check, - sigops); + if(signature->fenceops) { + LISTOP *fenceops = cLISTOPx(signature->fenceops); - /* a nextstate right at the beginning */ - sigops = op_prepend_elem(OP_LINESEQ, - newSTATEOP(0, NULL, NULL), - sigops); + /* Move the entire chain of kid ops in one go */ + OpMORESIB_set(cLISTOPx(sigops)->op_last, fenceops->op_first); + cLISTOPx(sigops)->op_last = fenceops->op_last; + OpLASTSIB_set(cLISTOPx(sigops)->op_last, sigops); + + fenceops->op_first = fenceops->op_last = NULL; + fenceops->op_flags &= ~OPf_KIDS; + op_free((OP *)fenceops); + signature->fenceops = NULL; + } + + struct yy_parser_signature_param *params = signature->params; + size_t max_argix = 0; + size_t namedix = 0; + + size_t parami = 0; + + /* Collect up the positional scalar params */ + for(/**/; parami < signature->nparams; parami++) { + struct yy_parser_signature_param *param = params + parami; + + size_t argix = param->argix; + PADOFFSET padix = param->padix; + + if(param->paramname || argix >= aux->n_positional) + break; + + while(max_argix < argix) { + aux->param_padix[max_argix] = 0; + max_argix++; + } + + if(argix < aux->min_args) { + /* This is a mandatory param */ + aux->param_padix[argix] = padix; + } + else if(argix < aux->n_positional) { + /* This is an optional param */ + assert(padix); + + aux->param_padix[argix] = padix; + + sigops = op_append_elem(OP_LINESEQ, sigops, + param->defcop); + param->defcop = NULL; + + sigops = op_append_elem(OP_LINESEQ, sigops, + subsignature_build_defop(param)); + param->defexpr = NULL; + } + else { + NOT_REACHED; + } + + max_argix = argix + 1; + } + + while(max_argix < end_argix) { + aux->param_padix[max_argix] = 0; + max_argix++; + } + + /* Collect up the named params */ + for(/**/; parami < signature->nparams; parami++) { + struct yy_parser_signature_param *param = params + parami; + + if(!param->paramname) + /* this is final slurpy */ + break; + + /* For now, build the named param array in iteration order. We'll + * sort it at the end. + */ + STRLEN namelen; + char *namepv = SvPVutf8(param->paramname, namelen); + U32 namehash; + PERL_HASH(namehash, namepv, namelen); + + struct op_multiparam_named_aux *named = aux->named + namedix; + namedix++; + + named->namepv = savesharedpv(namepv); + named->namelen = namelen; + named->namehash = namehash; + named->padix = param->padix; + + if(param->defexpr) { + named->is_required = false; + + sigops = op_append_elem(OP_LINESEQ, sigops, + param->defcop); + param->defcop = NULL; + + sigops = op_append_elem(OP_LINESEQ, sigops, + subsignature_build_defop(param)); + param->defexpr = NULL; + } + else + named->is_required = true; + } + + /* The final slurpy */ + if(parami < signature->nparams) { + struct yy_parser_signature_param *param = params + parami; + + assert(param->argix >= aux->n_positional); + + aux->slurpy_padix = param->padix; + } /* a nextstate at the end handles context correctly for an empty sub body */ sigops = op_append_elem(OP_LINESEQ, sigops, Index: gnu/usr.bin/perl/op.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/op.h,v diff -u -p -a -u -p -r1.25 op.h --- gnu/usr.bin/perl/op.h 26 Dec 2025 22:14:12 -0000 1.25 +++ gnu/usr.bin/perl/op.h 16 Nov 2026 00:57:39 -0000 @@ -64,12 +64,14 @@ typedef PERL_BITFIELD16 Optype; U8 op_private; #endif +#define o1_ PERL_UNIQUE_NAME(o) +#define type1_ PERL_UNIQUE_NAME(type) #define OpTYPE_set(o,type) \ STMT_START { \ - OP *o_ = (OP *)o; \ - OPCODE type_ = type; \ - o_->op_type = type_; \ - o_->op_ppaddr = PL_ppaddr[type_]; \ + OP *o1_ = (OP *)o; \ + OPCODE type1_ = type; \ + o1_->op_type = type1_; \ + o1_->op_ppaddr = PL_ppaddr[type1_]; \ } STMT_END /* If op_type:9 is changed to :10, also change cx_pusheval() @@ -164,6 +166,8 @@ Deprecated. Use C instead. /* On OP_RETURN, module_true is in effect */ /* On OP_NEXT/OP_LAST/OP_REDO, there is no * loop label */ + /* On OP_COND_EXPR, indicates that an empty + * "else" condition was optimized away. */ /* There is no room in op_flags for this one, so it has its own bit- field member (op_folded) instead. The flag is only used to tell op_convert_list to set op_folded. */ @@ -300,12 +304,12 @@ struct pmop { * processing or asserts */ #ifdef USE_ITHREADS #define PM_GETRE_raw(o) (REGEXP*)(PL_regex_pad[(o)->op_pmoffset]) -#define PM_GETRE(o) (SvTYPE(PL_regex_pad[(o)->op_pmoffset]) == SVt_REGEXP \ - ? (REGEXP*)(PL_regex_pad[(o)->op_pmoffset]) : NULL) +#define PM_GETRE(o) (SvTYPE(PM_GETRE_raw(o)) == SVt_REGEXP \ + ? PM_GETRE_raw(o) : NULL) -#define PM_SETRE_raw(o,r) STMT_START { \ - PL_regex_pad[(o)->op_pmoffset] = MUTABLE_SV(r); \ - } STMT_END +#define PM_SETRE_raw(o,r) STMT_START { \ + PL_regex_pad[(o)->op_pmoffset] = MUTABLE_SV(r);\ + } STMT_END /* The assignment is just to enforce type safety (or at least get a warning). */ /* With first class regexps not via a reference one needs to assign @@ -315,20 +319,20 @@ struct pmop { /* BEWARE - something that calls this macro passes (r) which has a side effect. */ #define PM_SETRE(o,r) STMT_START { \ - REGEXP *const _pm_setre = (r); \ - assert(_pm_setre); \ - PL_regex_pad[(o)->op_pmoffset] = MUTABLE_SV(_pm_setre); \ + REGEXP *const pm_setre_ = (r); \ + assert(pm_setre_); \ + PM_SETRE_raw(o, pm_setre_); \ } STMT_END #else #define PM_GETRE_raw(o) ((o)->op_pmregexp) -#define PM_GETRE(o) ((o)->op_pmregexp) +#define PM_GETRE(o) PM_GETRE_raw(o) #define PM_SETRE_raw(o,r) ((o)->op_pmregexp = (r)) -#define PM_SETRE(o,r) ((o)->op_pmregexp = (r)) +#define PM_SETRE(o,r) PM_SETRE_raw(o,r) #endif /* Currently these PMf flags occupy a single 32-bit word. Not all bits are * currently used. The lower bits are shared with their corresponding RXf flag - * bits, up to but not including _RXf_PMf_SHIFT_NEXT. The unused bits + * bits, up to but not including RXf_PMf_SHIFT_NEXT_. The unused bits * immediately follow; finally the used Pmf-only (unshared) bits, so that the * highest bit in the word is used. This gathers all the unused bits as a pool * in the middle, like so: 11111111111111110000001111111111 @@ -339,7 +343,7 @@ struct pmop { * breaking binary compatibility. * * To add shared bits, do so in op_reg_common.h. This should change - * _RXf_PMf_SHIFT_NEXT so that things won't compile. Then come to regexp.h and + * RXf_PMf_SHIFT_NEXT_ so that things won't compile. Then come to regexp.h and * op.h and adjust the constant adders in the definitions of PMf_BASE_SHIFT and * Pmf_BASE_SHIFT down by the number of shared bits you added. That's it. * Things should be binary compatible. But if either of these gets to having @@ -356,7 +360,7 @@ struct pmop { * allocate off the low end until you get to PMf_BASE_SHIFT+0. If that isn't * enough, move PMf_BASE_SHIFT down (if possible) and add the new bit at the * other end instead; this preserves binary compatibility. */ -#define PMf_BASE_SHIFT (_RXf_PMf_SHIFT_NEXT+2) +#define PMf_BASE_SHIFT (RXf_PMf_SHIFT_NEXT_+2) /* Set by the parser if it discovers an error, so the regex shouldn't be * compiled */ @@ -909,7 +913,7 @@ Exactly like C parameter is identical to L. =for apidoc Amu|void|XopENTRY_set|XOP *xop|token which|value -Set a member of the XOP structure. C is a cpp token +Set a member of the XOP structure to C. C is a cpp token indicating which entry to set. See L for details about the available members and how they are used. This macro evaluates its argument @@ -1094,7 +1098,7 @@ C is non-null. For a higher-level i #define OP_IS_STAT(op) (OP_IS_FILETEST(op) || (op) == OP_LSTAT || (op) == OP_STAT) #define OpHAS_SIBLING(o) (cBOOL((o)->op_moresib)) -#define OpSIBLING(o) (0 + (o)->op_moresib ? (o)->op_sibparent : NULL) +#define OpSIBLING(o) ((o)->op_moresib ? (o)->op_sibparent : NULL) #define OpMORESIB_set(o, sib) ((o)->op_moresib = 1, (o)->op_sibparent = (sib)) #define OpLASTSIB_set(o, parent) \ ((o)->op_moresib = 0, (o)->op_sibparent = (parent)) @@ -1185,6 +1189,35 @@ struct op_argcheck_aux { UV params; /* number of positional parameters */ UV opt_params; /* number of optional positional parameters */ char slurpy; /* presence of slurpy: may be '\0', '@' or '%' */ +}; + +/* for OP_MULTIPARAM */ + +struct op_multiparam_named_aux { + PADOFFSET padix; + const char *namepv; + STRLEN namelen; + U32 namehash; + + bool is_required : 1; +}; + +struct op_multiparam_aux { + /* This struct will be allocated in one big chunk, containing this header + * itself, followed an array whose size is given by n_positional. The + * pointer at the end will point into the same malloc block + */ + size_t min_args; /* = the number of mandatory scalar parameters */ + size_t n_positional; /* = the number of mandatory + optional positional scalar parameters, not counting a final slurpy */ + size_t n_named; /* = the number of (mandatory or optional) named scalar parameters */ + char slurpy; + PADOFFSET slurpy_padix; + + /* The following points at storage allocated along with the struct itself, immediately afterwards */ + PADOFFSET *param_padix; + + /* The following may be separately allocated */ + struct op_multiparam_named_aux *named; }; #define MI_INIT_WORKAROUND_PACK "Module::Install::DSL" Index: gnu/usr.bin/perl/op_reg_common.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/op_reg_common.h,v diff -u -p -a -u -p -r1.4 op_reg_common.h --- gnu/usr.bin/perl/op_reg_common.h 14 May 2024 19:38:54 -0000 1.4 +++ gnu/usr.bin/perl/op_reg_common.h 16 Nov 2026 00:57:39 -0000 @@ -51,8 +51,8 @@ typedef enum { REGEX_ASCII_MORE_RESTRICTED_CHARSET } regex_charset; -#define _RXf_PMf_CHARSET_SHIFT ((RXf_PMf_STD_PMMOD_SHIFT)+7) -#define RXf_PMf_CHARSET (7U << (_RXf_PMf_CHARSET_SHIFT)) /* 3 bits */ +#define RXf_PMf_CHARSET_SHIFT_ ((RXf_PMf_STD_PMMOD_SHIFT)+7) +#define RXf_PMf_CHARSET (7U << (RXf_PMf_CHARSET_SHIFT_)) /* 3 bits */ /* Manually decorate these functions here with gcc-style attributes just to * avoid making the regex_charset typedef global, which it would need to be for @@ -68,7 +68,7 @@ set_regex_charset(U32 * const flags, con * the above enum */ *flags &= ~RXf_PMf_CHARSET; - *flags |= (cs << _RXf_PMf_CHARSET_SHIFT); + *flags |= (cs << RXf_PMf_CHARSET_SHIFT_); } PERL_STATIC_INLINE regex_charset @@ -80,12 +80,12 @@ get_regex_charset(const U32 flags) { /* Returns the enum corresponding to the character set in 'flags' */ - return (regex_charset) ((flags & RXf_PMf_CHARSET) >> _RXf_PMf_CHARSET_SHIFT); + return (regex_charset) ((flags & RXf_PMf_CHARSET) >> RXf_PMf_CHARSET_SHIFT_); } #define RXf_PMf_STRICT (1U<<(RXf_PMf_STD_PMMOD_SHIFT+10)) -#define _RXf_PMf_SHIFT_COMPILETIME (RXf_PMf_STD_PMMOD_SHIFT+11) +#define RXf_PMf_SHIFT_COMPILETIME_ (RXf_PMf_STD_PMMOD_SHIFT+11) /* @@ -95,9 +95,7 @@ get_regex_charset(const U32 flags) */ #define RXf_PMf_SPLIT (1U<<(RXf_PMf_STD_PMMOD_SHIFT+11)) -/* Next available bit after the above. Name begins with '_' so won't be - * exported by B */ -#define _RXf_PMf_SHIFT_NEXT (RXf_PMf_STD_PMMOD_SHIFT+12) +#define RXf_PMf_SHIFT_NEXT_ (RXf_PMf_STD_PMMOD_SHIFT+12) /* Mask of the above bits. These need to be transferred from op_pmflags to * re->extflags during compilation */ @@ -116,18 +114,6 @@ get_regex_charset(const U32 flags) ( RXf_PMf_COMPILETIME \ | RXf_PMf_SPLIT ) -/* Temporary to get Jenkins happy again - * See thread starting at http://nntp.perl.org/group/perl.perl5.porters/220710 - */ -#if 0 - /* Exclude win32 because it can't cope with I32_MAX definition */ -#ifndef WIN32 -# if RXf_PMf_COMPILETIME > I32_MAX -# error RXf_PMf_COMPILETIME wont fit in arg2 field of eval node -# endif -#endif -#endif - /* These copies need to be numerical or ext/B/Makefile.PL won't think they are * constants */ #define PMf_MULTILINE (1U<<0) @@ -149,7 +135,7 @@ get_regex_charset(const U32 flags) * directly in the #define because doing so confuses regcomp.pl. * (2**n - 1) is n 1 bits, so the below gets the contiguous bits between the * beginning and ending shifts */ -#if RXf_PMf_COMPILETIME != ((nBIT_MASK(_RXf_PMf_SHIFT_COMPILETIME)) \ +#if RXf_PMf_COMPILETIME != ((nBIT_MASK(RXf_PMf_SHIFT_COMPILETIME_)) \ & (~(nBIT_MASK( RXf_PMf_STD_PMMOD_SHIFT)))) # error RXf_PMf_COMPILETIME is invalid #endif Index: gnu/usr.bin/perl/opcode.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/opcode.h,v diff -u -p -a -u -p -r1.24 opcode.h --- gnu/usr.bin/perl/opcode.h 26 Dec 2025 22:14:12 -0000 1.24 +++ gnu/usr.bin/perl/opcode.h 16 Nov 2026 00:57:39 -0000 @@ -574,6 +574,9 @@ EXTCONST char* const PL_op_name[] INIT({ "methstart", "initfield", "classname", + "multiparam", + "paramtest", + "paramstore", "freed", }); @@ -1004,6 +1007,9 @@ EXTCONST char* const PL_op_desc[] INIT({ "method start", "initialise field", "class name", + "signature processing", + "signature argument value test", + "signature parameter default expression", "freed op", }); @@ -1439,6 +1445,9 @@ INIT({ Perl_pp_methstart, Perl_pp_initfield, Perl_pp_classname, + Perl_pp_multiparam, + Perl_pp_paramtest, + Perl_pp_paramstore, }); EXT Perl_check_t PL_check[] /* or perlvars.h */ @@ -1481,7 +1490,7 @@ INIT({ Perl_ck_match, /* trans */ Perl_ck_match, /* transr */ Perl_ck_sassign, /* sassign */ - Perl_ck_null, /* aassign */ + Perl_ck_aassign, /* aassign */ Perl_ck_spair, /* chop */ Perl_ck_null, /* schop */ Perl_ck_spair, /* chomp */ @@ -1607,7 +1616,7 @@ INIT({ Perl_ck_null, /* list */ Perl_ck_null, /* lslice */ Perl_ck_fun, /* anonlist */ - Perl_ck_fun, /* anonhash */ + Perl_ck_anonhash, /* anonhash */ Perl_ck_fun, /* emptyavhv */ Perl_ck_fun, /* splice */ Perl_ck_fun, /* push */ @@ -1869,8 +1878,30 @@ INIT({ Perl_ck_null, /* methstart */ Perl_ck_null, /* initfield */ Perl_ck_classname, /* classname */ + Perl_ck_null, /* multiparam */ + Perl_ck_null, /* paramtest */ + Perl_ck_null, /* paramstore */ + +/* The final entries are function pointers not attached to an opcode. + * These are to be used to compare with function pointers in the earlier + * part of the array, since in some platforms (notably z/OS), it is + * undefined behavior to compare function pointers for equality, even + * though calling them will invoke the same function. IBM personnel say + * that the comparisons do work when the pointers are compiled in the same + * translation unit. Hence, ck_null in all positions in the array will + * have the same value. See GH #23399 */ + Perl_ck_null, + Perl_ck_exists, + Perl_ck_delete, }); +/* Indexes into PL_check for the comparison function pointers */ +#ifdef PERL_IN_PEEP_C + #define PERL_CK_NULL 429 + #define PERL_CK_EXISTS 430 + #define PERL_CK_DELETE 431 +#endif + EXTCONST U32 PL_opargs[] INIT({ 0x00000000, /* null */ 0x00000000, /* stub */ @@ -1915,7 +1946,7 @@ EXTCONST U32 PL_opargs[] INIT({ 0x00009b8c, /* schop */ 0x00002b1d, /* chomp */ 0x00009b9c, /* schomp */ - 0x00009b84, /* defined */ + 0x00009b86, /* defined */ 0x0000fb04, /* undef */ 0x00009b84, /* study */ 0x0000fb8c, /* pos */ @@ -2298,6 +2329,9 @@ EXTCONST U32 PL_opargs[] INIT({ 0x00000f00, /* methstart */ 0x00000f00, /* initfield */ 0x00000008, /* classname */ + 0x00000f00, /* multiparam */ + 0x00000300, /* paramtest */ + 0x00000100, /* paramstore */ }); END_EXTERN_C @@ -2354,6 +2388,7 @@ END_EXTERN_C #define OPpEVAL_BYTES 0x08 #define OPpFT_STACKING 0x08 #define OPpITER_DEF 0x08 +#define OPpITER_REFALIAS 0x08 #define OPpLVREF_ITER 0x08 #define OPpMAYBE_LVSUB 0x08 #define OPpMULTICONCAT_STRINGIFY 0x08 @@ -2413,9 +2448,12 @@ END_EXTERN_C #define OPpOPEN_OUT_RAW 0x40 #define OPpOUR_INTRO 0x40 #define OPpPAD_STATE 0x40 +#define OPpPARAM_IF_FALSE 0x40 #define OPpREFCOUNTED 0x40 #define OPpREPEAT_DOLIST 0x40 +#define OPpSELF_IN_PAD 0x40 #define OPpSLICE 0x40 +#define OPpSTATEMENT 0x40 #define OPpTRANS_USE_SVOP 0x40 #define OPpPADRANGE_COUNTMASK 0x7f #define OPpARG_IF_UNDEF 0x80 @@ -2430,31 +2468,19 @@ END_EXTERN_C #define OPpLVAL_INTRO 0x80 #define OPpOFFBYONE 0x80 #define OPpOPEN_OUT_CRLF 0x80 +#define OPpPARAM_IF_UNDEF 0x80 #define OPpPV_IS_UTF8 0x80 #define OPpTRANS_DELETE 0x80 #define OPpCONST_TOKEN_MASK 0xc0 #define OPpCONST_TOKEN_PACKAGE 0xc0 START_EXTERN_C -#ifndef DOINIT - -/* data about the flags in op_private */ - -EXTCONST I16 PL_op_private_bitdef_ix[]; -EXTCONST U16 PL_op_private_bitdefs[]; -EXTCONST char PL_op_private_labels[]; -EXTCONST I16 PL_op_private_bitfields[]; -EXTCONST U8 PL_op_private_valid[]; - -#else - - /* PL_op_private_labels[]: the short descriptions of private flags. * All labels are concatenated into a single char array * (separated by \0's) for compactness. */ -EXTCONST char PL_op_private_labels[] = { +EXTCONST char PL_op_private_labels[] INIT( { '$','M','O','D','\0', '+','1','\0', '-','\0', @@ -2542,16 +2568,19 @@ EXTCONST char PL_op_private_labels[] = { 'O','U','T','B','I','N','\0', 'O','U','T','C','R','\0', 'P','A','C','K','A','G','E','\0', + 'R','E','F','A','L','I','A','S','\0', 'R','E','F','C','\0', 'R','E','P','A','R','S','E','\0', 'R','E','P','L','1','S','T','\0', 'R','E','V','\0', 'R','E','V','E','R','S','E','D','\0', + 'S','E','L','F','_','I','N','_','P','A','D','\0', 'S','H','O','R','T','\0', 'S','L','I','C','E','\0', 'S','L','I','C','E','W','A','R','N','\0', 'S','Q','U','A','S','H','\0', 'S','T','A','T','E','\0', + 'S','T','M','T','\0', 'S','T','R','I','C','T','\0', 'S','T','R','I','N','G','I','F','Y','\0', 'S','U','B','\0', @@ -2568,7 +2597,7 @@ EXTCONST char PL_op_private_labels[] = { 'o','f','f','s','e','t','\0', 'r','a','n','g','e','\0', -}; +}); @@ -2582,27 +2611,27 @@ EXTCONST char PL_op_private_labels[] = { * -1 */ -EXTCONST I16 PL_op_private_bitfields[] = { +EXTCONST I16 PL_op_private_bitfields[] INIT( { 0, 8, -1, 0, 8, -1, - 0, 715, 1, 554, 2, 71, 3, 298, -1, - 0, 749, -1, + 0, 741, 1, 554, 2, 71, 3, 298, -1, + 0, 775, -1, 0, 8, -1, 0, 8, -1, - 0, 756, -1, - 0, 745, -1, - 1, -1, 0, 694, 1, 39, 2, 324, -1, + 0, 782, -1, + 0, 771, -1, + 1, -1, 0, 720, 1, 39, 2, 324, -1, 4, -1, 1, 185, 2, 192, 3, 199, -1, - 4, -1, 0, 694, 1, 39, 2, 324, 3, 131, -1, - 6, 709, 1, 463, 2, 246, 3, 596, -1, + 4, -1, 0, 720, 1, 39, 2, 324, 3, 131, -1, + 6, 735, 1, 463, 2, 246, 3, 596, -1, -}; +}); /* PL_op_private_bitdef_ix[]: map an op number to a starting position * in PL_op_private_bitdefs. If -1, the op has no bits defined */ -EXTCONST I16 PL_op_private_bitdef_ix[] = { +EXTCONST I16 PL_op_private_bitdef_ix[] INIT( { -1, /* null */ -1, /* stub */ 0, /* scalar */ @@ -2786,54 +2815,54 @@ EXTCONST I16 PL_op_private_bitdef_ix[] 0, /* range */ 179, /* flip */ 179, /* flop */ - 0, /* and */ - 0, /* or */ + 181, /* and */ + 181, /* or */ 13, /* xor */ 0, /* dor */ - 181, /* cond_expr */ + 183, /* cond_expr */ 0, /* andassign */ 0, /* orassign */ 0, /* dorassign */ - 183, /* entersub */ - 190, /* leavesub */ - 190, /* leavesublv */ + 186, /* entersub */ + 193, /* leavesub */ + 193, /* leavesublv */ 0, /* argcheck */ - 192, /* argelem */ - 194, /* argdefelem */ - 197, /* caller */ + 195, /* argelem */ + 197, /* argdefelem */ + 200, /* caller */ 56, /* warn */ 56, /* die */ 56, /* reset */ -1, /* lineseq */ - 199, /* nextstate */ - 199, /* dbstate */ + 202, /* nextstate */ + 202, /* dbstate */ -1, /* unstack */ -1, /* enter */ - 200, /* leave */ + 203, /* leave */ -1, /* scope */ - 202, /* enteriter */ - 206, /* iter */ + 205, /* enteriter */ + 209, /* iter */ -1, /* enterloop */ - 208, /* leaveloop */ + 212, /* leaveloop */ -1, /* return */ - 210, /* last */ - 210, /* next */ - 210, /* redo */ - 210, /* dump */ - 212, /* goto */ + 214, /* last */ + 214, /* next */ + 214, /* redo */ + 214, /* dump */ + 216, /* goto */ 56, /* exit */ - 215, /* method */ - 215, /* method_named */ - 215, /* method_super */ - 215, /* method_redir */ - 215, /* method_redir_super */ + 219, /* method */ + 219, /* method_named */ + 219, /* method_super */ + 219, /* method_redir */ + 219, /* method_redir_super */ 0, /* entergiven */ 0, /* leavegiven */ 0, /* enterwhen */ 0, /* leavewhen */ -1, /* break */ -1, /* continue */ - 217, /* open */ + 221, /* open */ 56, /* close */ 56, /* pipe_op */ 56, /* fileno */ @@ -2849,7 +2878,7 @@ EXTCONST I16 PL_op_private_bitdef_ix[] 56, /* getc */ 56, /* read */ 56, /* enterwrite */ - 190, /* leavewrite */ + 193, /* leavewrite */ -1, /* prtf */ -1, /* print */ -1, /* say */ @@ -2879,33 +2908,33 @@ EXTCONST I16 PL_op_private_bitdef_ix[] 0, /* getpeername */ 0, /* lstat */ 0, /* stat */ - 222, /* ftrread */ - 222, /* ftrwrite */ - 222, /* ftrexec */ - 222, /* fteread */ - 222, /* ftewrite */ - 222, /* fteexec */ - 227, /* ftis */ - 227, /* ftsize */ - 227, /* ftmtime */ - 227, /* ftatime */ - 227, /* ftctime */ - 227, /* ftrowned */ - 227, /* fteowned */ - 227, /* ftzero */ - 227, /* ftsock */ - 227, /* ftchr */ - 227, /* ftblk */ - 227, /* ftfile */ - 227, /* ftdir */ - 227, /* ftpipe */ - 227, /* ftsuid */ - 227, /* ftsgid */ - 227, /* ftsvtx */ - 227, /* ftlink */ - 227, /* fttty */ - 227, /* fttext */ - 227, /* ftbinary */ + 226, /* ftrread */ + 226, /* ftrwrite */ + 226, /* ftrexec */ + 226, /* fteread */ + 226, /* ftewrite */ + 226, /* fteexec */ + 231, /* ftis */ + 231, /* ftsize */ + 231, /* ftmtime */ + 231, /* ftatime */ + 231, /* ftctime */ + 231, /* ftrowned */ + 231, /* fteowned */ + 231, /* ftzero */ + 231, /* ftsock */ + 231, /* ftchr */ + 231, /* ftblk */ + 231, /* ftfile */ + 231, /* ftdir */ + 231, /* ftpipe */ + 231, /* ftsuid */ + 231, /* ftsgid */ + 231, /* ftsvtx */ + 231, /* ftlink */ + 231, /* fttty */ + 231, /* fttext */ + 231, /* ftbinary */ 56, /* chdir */ 101, /* chown */ 78, /* chroot */ @@ -2925,17 +2954,17 @@ EXTCONST I16 PL_op_private_bitdef_ix[] 0, /* rewinddir */ 0, /* closedir */ -1, /* fork */ - 231, /* wait */ + 235, /* wait */ 101, /* waitpid */ 101, /* system */ 101, /* exec */ 101, /* kill */ - 231, /* getppid */ + 235, /* getppid */ 101, /* getpgrp */ 101, /* setpgrp */ 101, /* getpriority */ 101, /* setpriority */ - 231, /* time */ + 235, /* time */ -1, /* tms */ 0, /* localtime */ 56, /* gmtime */ @@ -2955,8 +2984,8 @@ EXTCONST I16 PL_op_private_bitdef_ix[] 0, /* require */ 0, /* dofile */ -1, /* hintseval */ - 232, /* entereval */ - 190, /* leaveeval */ + 236, /* entereval */ + 193, /* leaveeval */ 0, /* entertry */ -1, /* leavetry */ 0, /* ghbyname */ @@ -2994,17 +3023,17 @@ EXTCONST I16 PL_op_private_bitdef_ix[] 0, /* lock */ 0, /* once */ -1, /* custom */ - 239, /* coreargs */ - 243, /* avhvswitch */ + 243, /* coreargs */ + 247, /* avhvswitch */ 3, /* runcv */ 0, /* fc */ -1, /* padcv */ -1, /* introcv */ -1, /* clonecv */ - 245, /* padrange */ - 247, /* refassign */ - 253, /* lvref */ - 259, /* lvrefslice */ + 249, /* padrange */ + 251, /* refassign */ + 257, /* lvref */ + 263, /* lvrefslice */ 17, /* lvavref */ 0, /* anonconst */ 13, /* isa */ @@ -3014,23 +3043,26 @@ EXTCONST I16 PL_op_private_bitdef_ix[] -1, /* leavetrycatch */ -1, /* poptry */ 0, /* catch */ - 260, /* pushdefer */ + 264, /* pushdefer */ 0, /* is_bool */ 0, /* is_weak */ 0, /* weaken */ 0, /* unweaken */ 53, /* blessed */ - 262, /* refaddr */ - 262, /* reftype */ - 262, /* ceil */ - 262, /* floor */ + 266, /* refaddr */ + 266, /* reftype */ + 266, /* ceil */ + 266, /* floor */ 0, /* is_tainted */ - 265, /* helemexistsor */ - 267, /* methstart */ - 269, /* initfield */ + 269, /* helemexistsor */ + 271, /* methstart */ + 274, /* initfield */ -1, /* classname */ + 0, /* multiparam */ + 197, /* paramtest */ + 0, /* paramstore */ -}; +}); @@ -3046,98 +3078,99 @@ EXTCONST I16 PL_op_private_bitdef_ix[] * into PL_op_private_bitfields[] (for a bit field) */ -EXTCONST U16 PL_op_private_bitdefs[] = { - 0x0003, /* scalar, prototype, refgen, srefgen, readline, regcmaybe, regcreset, regcomp, substcont, chop, schop, defined, study, preinc, i_preinc, predec, i_predec, postinc, i_postinc, postdec, i_postdec, not, ucfirst, lcfirst, uc, lc, quotemeta, aeach, avalues, each, pop, shift, grepstart, anywhile, mapstart, mapwhile, range, and, or, dor, andassign, orassign, dorassign, argcheck, entergiven, leavegiven, enterwhen, leavewhen, untie, tied, dbmclose, getsockname, getpeername, lstat, stat, readlink, readdir, telldir, rewinddir, closedir, localtime, alarm, require, dofile, entertry, ghbyname, gnbyname, gpbyname, shostent, snetent, sprotoent, sservent, gpwnam, gpwuid, ggrnam, ggrgid, lock, once, fc, anonconst, cmpchain_and, cmpchain_dup, entertrycatch, catch, is_bool, is_weak, weaken, unweaken, is_tainted */ - 0x3cfc, 0x5379, /* pushmark */ +EXTCONST U16 PL_op_private_bitdefs[] INIT( { + 0x0003, /* scalar, prototype, refgen, srefgen, readline, regcmaybe, regcreset, regcomp, substcont, chop, schop, defined, study, preinc, i_preinc, predec, i_predec, postinc, i_postinc, postdec, i_postdec, not, ucfirst, lcfirst, uc, lc, quotemeta, aeach, avalues, each, pop, shift, grepstart, anywhile, mapstart, mapwhile, range, dor, andassign, orassign, dorassign, argcheck, entergiven, leavegiven, enterwhen, leavewhen, untie, tied, dbmclose, getsockname, getpeername, lstat, stat, readlink, readdir, telldir, rewinddir, closedir, localtime, alarm, require, dofile, entertry, ghbyname, gnbyname, gpbyname, shostent, snetent, sprotoent, sservent, gpwnam, gpwuid, ggrnam, ggrgid, lock, once, fc, anonconst, cmpchain_and, cmpchain_dup, entertrycatch, catch, is_bool, is_weak, weaken, unweaken, is_tainted, multiparam, paramstore */ + 0x3cfc, 0x5619, /* pushmark */ 0x00bd, /* wantarray, runcv */ - 0x077e, 0x0554, 0x1b70, 0x542c, 0x4fc8, 0x4225, /* const */ + 0x077e, 0x0554, 0x1b70, 0x576c, 0x5268, 0x4225, /* const */ 0x3cfc, 0x47f9, /* gvsv */ 0x19d5, /* gv */ 0x0067, /* gelem, lt, i_lt, gt, i_gt, le, i_le, ge, i_ge, eq, i_eq, ne, i_ne, ncmp, i_ncmp, slt, sgt, sle, sge, seq, sne, scmp, smartmatch, lslice, xor, isa */ - 0x3cfc, 0x5378, 0x04f7, /* padsv */ - 0x3cfc, 0x5378, 0x0003, /* padsv_store, lvavref */ - 0x3cfc, 0x5378, 0x06d4, 0x3dec, 0x5149, /* padav */ - 0x3cfc, 0x5378, 0x06d4, 0x0770, 0x3dec, 0x5148, 0x37c1, /* padhv */ - 0x3cfc, 0x1e38, 0x04f6, 0x3dec, 0x4148, 0x5424, 0x0003, /* rv2gv */ - 0x3cfc, 0x47f8, 0x04f6, 0x5424, 0x0003, /* rv2sv */ + 0x3cfc, 0x5618, 0x04f7, /* padsv */ + 0x3cfc, 0x5618, 0x0003, /* padsv_store, lvavref */ + 0x3cfc, 0x5618, 0x06d4, 0x3dec, 0x53e9, /* padav */ + 0x3cfc, 0x5618, 0x06d4, 0x0770, 0x3dec, 0x53e8, 0x37c1, /* padhv */ + 0x3cfc, 0x1e38, 0x04f6, 0x3dec, 0x4148, 0x5764, 0x0003, /* rv2gv */ + 0x3cfc, 0x47f8, 0x04f6, 0x5764, 0x0003, /* rv2sv */ 0x3dec, 0x0003, /* av2arylen, akeys, values, keys */ - 0x40bc, 0x1198, 0x0ef4, 0x014c, 0x5728, 0x5424, 0x0003, /* rv2cv */ + 0x40bc, 0x1198, 0x0ef4, 0x014c, 0x5a68, 0x5764, 0x0003, /* rv2cv */ 0x06d4, 0x0770, 0x0003, /* ref, blessed */ 0x02af, /* bless, glob, sprintf, formline, unpack, pack, join, anonlist, anonhash, splice, warn, die, reset, exit, close, pipe_op, fileno, umask, binmode, tie, dbmopen, sselect, select, getc, read, enterwrite, sysopen, sysseek, sysread, syswrite, eof, tell, seek, truncate, fcntl, ioctl, send, recv, socket, sockpair, bind, connect, listen, accept, shutdown, gsockopt, ssockopt, chdir, open_dir, seekdir, gmtime, shmget, shmctl, shmread, shmwrite, msgget, msgctl, msgsnd, msgrcv, semop, semget, semctl, ghbyaddr, gnbyaddr, gpbynumber, gsbyname, gsbyport, syscall */ 0x49dc, 0x48f8, 0x2e74, 0x2db0, 0x0003, /* backtick */ 0x06d5, /* subst */ - 0x129c, 0x5b98, 0x0ad4, 0x528c, 0x28e8, 0x00c7, /* trans, transr */ + 0x129c, 0x5ed8, 0x0ad4, 0x552c, 0x28e8, 0x00c7, /* trans, transr */ 0x10dc, 0x05f8, 0x0067, /* sassign */ 0x0d98, 0x0c94, 0x0b90, 0x3dec, 0x06c8, 0x0067, /* aassign */ - 0x57d0, 0x0003, /* chomp, schomp, negate, i_negate, scomplement, sin, cos, exp, log, sqrt, int, hex, oct, abs, ord, chr, chroot, rmdir */ - 0x3cfc, 0x5378, 0x36d4, 0x57d0, 0x0003, /* undef */ + 0x5b10, 0x0003, /* chomp, schomp, negate, i_negate, scomplement, sin, cos, exp, log, sqrt, int, hex, oct, abs, ord, chr, chroot, rmdir */ + 0x3cfc, 0x5618, 0x36d4, 0x5b10, 0x0003, /* undef */ 0x06d4, 0x3dec, 0x0003, /* pos */ - 0x57d0, 0x0067, /* pow, multiply, i_multiply, divide, i_divide, modulo, i_modulo, add, i_add, subtract, i_subtract */ + 0x5b10, 0x0067, /* pow, multiply, i_multiply, divide, i_divide, modulo, i_modulo, add, i_add, subtract, i_subtract */ 0x1658, 0x0067, /* repeat */ - 0x3fd8, 0x57d0, 0x0067, /* concat */ - 0x3cfc, 0x0338, 0x1e34, 0x57d0, 0x550c, 0x0003, /* multiconcat */ - 0x57d0, 0x02af, /* stringify, atan2, rand, srand, crypt, push, unshift, flock, chown, unlink, chmod, utime, rename, link, symlink, mkdir, waitpid, system, exec, kill, getpgrp, setpgrp, getpriority, setpriority, sleep */ - 0x57d0, 0x5aa9, /* left_shift, right_shift, nbit_and, nbit_xor, nbit_or, ncomplement */ - 0x5aa9, /* bit_and, bit_xor, bit_or, sbit_and, sbit_xor, sbit_or, complement */ - 0x06d4, 0x57d0, 0x0003, /* length */ - 0x4d30, 0x3dec, 0x024b, /* substr */ - 0x57d0, 0x024b, /* substr_left */ + 0x3fd8, 0x5b10, 0x0067, /* concat */ + 0x3cfc, 0x0338, 0x1e34, 0x5b10, 0x584c, 0x0003, /* multiconcat */ + 0x5b10, 0x02af, /* stringify, atan2, rand, srand, crypt, push, unshift, flock, chown, unlink, chmod, utime, rename, link, symlink, mkdir, waitpid, system, exec, kill, getpgrp, setpgrp, getpriority, setpriority, sleep */ + 0x5b10, 0x5de9, /* left_shift, right_shift, nbit_and, nbit_xor, nbit_or, ncomplement */ + 0x5de9, /* bit_and, bit_xor, bit_or, sbit_and, sbit_xor, sbit_or, complement */ + 0x06d4, 0x5b10, 0x0003, /* length */ + 0x4e50, 0x3dec, 0x024b, /* substr */ + 0x5b10, 0x024b, /* substr_left */ 0x3dec, 0x0067, /* vec */ - 0x3f58, 0x06d4, 0x57d0, 0x02af, /* index, rindex */ - 0x3cfc, 0x47f8, 0x06d4, 0x3dec, 0x5148, 0x5424, 0x0003, /* rv2av */ + 0x3f58, 0x06d4, 0x5b10, 0x02af, /* index, rindex */ + 0x3cfc, 0x47f8, 0x06d4, 0x3dec, 0x53e8, 0x5764, 0x0003, /* rv2av */ 0x037f, /* aelemfast, aelemfast_lex, aelemfastlex_store */ 0x3cfc, 0x3bf8, 0x04f6, 0x3dec, 0x0067, /* aelem, helem */ - 0x3cfc, 0x3dec, 0x5149, /* aslice, hslice */ + 0x3cfc, 0x3dec, 0x53e9, /* aslice, hslice */ 0x3ded, /* kvaslice, kvhslice */ - 0x3cfc, 0x5098, 0x3874, 0x0003, /* delete */ - 0x5658, 0x0003, /* exists */ - 0x3cfc, 0x47f8, 0x06d4, 0x0770, 0x3dec, 0x5148, 0x5424, 0x37c1, /* rv2hv */ - 0x3cfc, 0x3bf8, 0x1314, 0x1d50, 0x3dec, 0x5424, 0x0003, /* multideref */ + 0x3cfc, 0x5338, 0x3874, 0x0003, /* delete */ + 0x5998, 0x0003, /* exists */ + 0x3cfc, 0x47f8, 0x06d4, 0x0770, 0x3dec, 0x53e8, 0x5764, 0x37c1, /* rv2hv */ + 0x3cfc, 0x3bf8, 0x1314, 0x1d50, 0x3dec, 0x5764, 0x0003, /* multideref */ 0x3cfc, 0x47f8, 0x0410, 0x396c, 0x2be9, /* split */ 0x3cfc, 0x2619, /* list */ - 0x3cfc, 0x5378, 0x0214, 0x57d0, 0x02af, /* emptyavhv */ - 0x15b0, 0x34ac, 0x4e28, 0x35a4, 0x44c1, /* sort */ + 0x3cfc, 0x5618, 0x0214, 0x5b10, 0x02af, /* emptyavhv */ + 0x15b0, 0x34ac, 0x4f48, 0x35a4, 0x44c1, /* sort */ 0x34ac, 0x0003, /* reverse */ 0x06d4, 0x0003, /* grepwhile */ 0x3a98, 0x0003, /* flip, flop */ - 0x3cfc, 0x0003, /* cond_expr */ - 0x3cfc, 0x1198, 0x04f6, 0x014c, 0x5728, 0x5424, 0x2cc1, /* entersub */ - 0x4b98, 0x0003, /* leavesub, leavesublv, leavewrite, leaveeval */ + 0x56d8, 0x0003, /* and, or */ + 0x3cfc, 0x56d8, 0x0003, /* cond_expr */ + 0x3cfc, 0x1198, 0x04f6, 0x014c, 0x5a68, 0x5764, 0x2cc1, /* entersub */ + 0x4cb8, 0x0003, /* leavesub, leavesublv, leavewrite, leaveeval */ 0x03ca, 0x0003, /* argelem */ - 0x2adc, 0x29b8, 0x0003, /* argdefelem */ + 0x2adc, 0x29b8, 0x0003, /* argdefelem, paramtest */ 0x00bc, 0x02af, /* caller */ 0x27f5, /* nextstate, dbstate */ - 0x3b9c, 0x4b99, /* leave */ - 0x3cfc, 0x47f8, 0x120c, 0x4ea5, /* enteriter */ - 0x2f08, 0x4ea5, /* iter */ + 0x3b9c, 0x4cb9, /* leave */ + 0x3cfc, 0x47f8, 0x120c, 0x4fc5, /* enteriter */ + 0x4b8c, 0x2f08, 0x4fc5, /* iter */ 0x3b9c, 0x0067, /* leaveloop */ - 0x5cbc, 0x0003, /* last, next, redo, dump */ - 0x5cbc, 0x5728, 0x0003, /* goto */ + 0x5ffc, 0x0003, /* last, next, redo, dump */ + 0x5ffc, 0x5a68, 0x0003, /* goto */ 0x42e4, 0x0003, /* method, method_named, method_super, method_redir, method_redir_super */ 0x49dc, 0x48f8, 0x2e74, 0x2db0, 0x02af, /* open */ 0x2190, 0x23ec, 0x22a8, 0x2064, 0x0003, /* ftrread, ftrwrite, ftrexec, fteread, ftewrite, fteexec */ 0x2190, 0x23ec, 0x22a8, 0x0003, /* ftis, ftsize, ftmtime, ftatime, ftctime, ftrowned, fteowned, ftzero, ftsock, ftchr, ftblk, ftfile, ftdir, ftpipe, ftsuid, ftsgid, ftsvtx, ftlink, fttty, fttext, ftbinary */ - 0x57d1, /* wait, getppid, time */ - 0x1c78, 0x4c34, 0x0fb0, 0x082c, 0x5a28, 0x2704, 0x0003, /* entereval */ + 0x5b11, /* wait, getppid, time */ + 0x1c78, 0x4d54, 0x0fb0, 0x082c, 0x5d68, 0x2704, 0x0003, /* entereval */ 0x3ebc, 0x0018, 0x14c4, 0x13e1, /* coreargs */ 0x3dec, 0x01e7, /* avhvswitch */ 0x3cfc, 0x031b, /* padrange */ - 0x3cfc, 0x5378, 0x0616, 0x362c, 0x1ac8, 0x0067, /* refassign */ - 0x3cfc, 0x5378, 0x0616, 0x362c, 0x1ac8, 0x0003, /* lvref */ + 0x3cfc, 0x5618, 0x0616, 0x362c, 0x1ac8, 0x0067, /* refassign */ + 0x3cfc, 0x5618, 0x0616, 0x362c, 0x1ac8, 0x0003, /* lvref */ 0x3cfd, /* lvrefslice */ 0x1f7c, 0x0003, /* pushdefer */ - 0x57d0, 0x5728, 0x0003, /* refaddr, reftype, ceil, floor */ + 0x5b10, 0x5a68, 0x0003, /* refaddr, reftype, ceil, floor */ 0x131c, 0x0003, /* helemexistsor */ - 0x301c, 0x0003, /* methstart */ + 0x301c, 0x50f8, 0x0003, /* methstart */ 0x3308, 0x3164, 0x0003, /* initfield */ -}; +}); /* PL_op_private_valid: for each op, indexed by op_type, indicate which * flags bits in op_private are legal */ -EXTCONST U8 PL_op_private_valid[] = { +EXTCONST U8 PL_op_private_valid[] INIT( { /* NULL */ (0xff), /* STUB */ (0), /* SCALAR */ (OPpARG1_MASK), @@ -3321,11 +3354,11 @@ EXTCONST U8 PL_op_private_valid[] = { /* RANGE */ (OPpARG1_MASK), /* FLIP */ (OPpARG1_MASK|OPpFLIP_LINENUM), /* FLOP */ (OPpARG1_MASK|OPpFLIP_LINENUM), - /* AND */ (OPpARG1_MASK), - /* OR */ (OPpARG1_MASK), + /* AND */ (OPpARG1_MASK|OPpSTATEMENT), + /* OR */ (OPpARG1_MASK|OPpSTATEMENT), /* XOR */ (OPpARG2_MASK), /* DOR */ (OPpARG1_MASK), - /* COND_EXPR */ (OPpARG1_MASK|OPpLVAL_INTRO), + /* COND_EXPR */ (OPpARG1_MASK|OPpSTATEMENT|OPpLVAL_INTRO), /* ANDASSIGN */ (OPpARG1_MASK), /* ORASSIGN */ (OPpARG1_MASK), /* DORASSIGN */ (OPpARG1_MASK), @@ -3347,7 +3380,7 @@ EXTCONST U8 PL_op_private_valid[] = { /* LEAVE */ (OPpREFCOUNTED|OPpLVALUE), /* SCOPE */ (0), /* ENTERITER */ (OPpITER_REVERSED|OPpITER_DEF|OPpOUR_INTRO|OPpLVAL_INTRO), - /* ITER */ (OPpITER_REVERSED|OPpITER_INDEXED), + /* ITER */ (OPpITER_REVERSED|OPpITER_INDEXED|OPpITER_REFALIAS), /* ENTERLOOP */ (0), /* LEAVELOOP */ (OPpARG2_MASK|OPpLVALUE), /* RETURN */ (0), @@ -3561,13 +3594,14 @@ EXTCONST U8 PL_op_private_valid[] = { /* FLOOR */ (OPpARG1_MASK|OPpENTERSUB_HASTARG|OPpTARGET_MY), /* IS_TAINTED */ (OPpARG1_MASK), /* HELEMEXISTSOR */ (OPpARG1_MASK|OPpHELEMEXISTSOR_DELETE), - /* METHSTART */ (OPpARG1_MASK|OPpINITFIELDS), + /* METHSTART */ (OPpARG1_MASK|OPpSELF_IN_PAD|OPpINITFIELDS), /* INITFIELD */ (OPpARG1_MASK|OPpINITFIELD_AV|OPpINITFIELD_HV), /* CLASSNAME */ (0), + /* MULTIPARAM */ (OPpARG1_MASK), + /* PARAMTEST */ (OPpARG1_MASK|OPpPARAM_IF_FALSE|OPpPARAM_IF_UNDEF), + /* PARAMSTORE */ (OPpARG1_MASK), -}; - -#endif /* !DOINIT */ +}); END_EXTERN_C Index: gnu/usr.bin/perl/opnames.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/opnames.h,v diff -u -p -a -u -p -r1.8 opnames.h --- gnu/usr.bin/perl/opnames.h 26 Dec 2025 22:14:12 -0000 1.8 +++ gnu/usr.bin/perl/opnames.h 16 Nov 2026 00:57:39 -0000 @@ -440,6 +440,9 @@ typedef enum opcode { OP_METHSTART = 423, OP_INITFIELD = 424, OP_CLASSNAME = 425, + OP_MULTIPARAM = 426, + OP_PARAMTEST = 427, + OP_PARAMSTORE = 428, OP_max } opcode; @@ -450,7 +453,7 @@ An enum of all the legal Perl opcodes, d =cut */ -#define MAXO 426 +#define MAXO 429 #define OP_FREED MAXO /* the OP_IS_* macros are optimized to a simple range check because Index: gnu/usr.bin/perl/packsizetables.inc =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/packsizetables.inc,v diff -u -p -a -u -p -r1.3 packsizetables.inc --- gnu/usr.bin/perl/packsizetables.inc 14 May 2024 19:38:54 -0000 1.3 +++ gnu/usr.bin/perl/packsizetables.inc 16 Nov 2026 00:57:39 -0000 @@ -11,7 +11,7 @@ typedef U8 packprops_t; #if 'J'-'I' == 1 /* ASCII */ -STATIC const packprops_t packprops[512] = { +static const packprops_t packprops[512] = { /* normal */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -116,7 +116,7 @@ STATIC const packprops_t packprops[512] }; #else /* EBCDIC (or bust) */ -STATIC const packprops_t packprops[512] = { +static const packprops_t packprops[512] = { /* normal */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, Index: gnu/usr.bin/perl/pad.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/pad.c,v diff -u -p -a -u -p -r1.9 pad.c --- gnu/usr.bin/perl/pad.c 26 Dec 2025 22:14:12 -0000 1.9 +++ gnu/usr.bin/perl/pad.c 16 Nov 2026 00:57:39 -0000 @@ -21,7 +21,9 @@ /* =for apidoc_section $pad -=for apidoc Amx|PADLIST *|CvPADLIST|CV *cv +=for apidoc Amx|PADLIST *|CvPADLIST|CV *cv +=for apidoc_flag SVs_PADSTALE + CV's can have CvPADLIST(cv) set to point to a PADLIST. This is the CV's scratchpad, which stores lexical variables and opcode temporary and @@ -114,15 +116,13 @@ write is called (if necessary). The flag C is cleared on lexicals each time the C is executed, and set on scope exit. This allows the C<"Variable $x is not available"> warning -to be generated in evals, such as +to be generated in evals, such as { my $x = 1; sub f { eval '$x'} } f(); For state vars, C is overloaded to mean 'not yet initialised', but this internal state is stored in a separate pad entry. -=for apidoc Amnh||SVs_PADSTALE - =for apidoc AmnxU|PADNAMELIST *|PL_comppad_name During compilation, this points to the array containing the names part @@ -160,7 +160,8 @@ Points directly to the body of the L, the name is a C language string literal, which must be encoded in UTF-8. + +In C, the input name is a NUL-terminated string, which must be +encoded in UTF-8. + +In C, C points to the first byte of the name (which +better be the sigil), and an additional parameter, C, specifies its +length in bytes. Again, it must be encoded in UTF-8. + +In C, C is an SV, and the actual name is its PV, +extracted using L>. If C is non-null, the name is for a typed lexical, and this identifies the type. If C is non-null, it's a lexical reference -to a package variable, and this identifies the package. The following -flags can be OR'ed together: +to a package variable, and this identifies the package. + +The following flags can be OR'ed together: padadd_OUR redundantly specifies if it's a package var padadd_STATE variable will retain value persistently padadd_NO_DUP_CHECK skip check for lexical shadowing padadd_FIELD specifies that the lexical is a field for a class -In all forms, the variable name must include the leading sigil. - -In C, the input name is taken from the SV parameter using -C()>. - -In C, the input name is a NUL-terminated string, which must be -encoded in UTF-8. - -In C, C gives the length of the input name in bytes, -which means it may contain embedded NUL characters. Again, it must be encoded -in UTF-8. - =cut */ @@ -623,11 +632,11 @@ PADOFFSET Perl_pad_add_name_pvn(pTHX_ const char *namepv, STRLEN namelen, U32 flags, HV *typestash, HV *ourstash) { + PERL_ARGS_ASSERT_PAD_ADD_NAME_PVN; + PADOFFSET offset; PADNAME *name; - PERL_ARGS_ASSERT_PAD_ADD_NAME_PVN; - if (flags & ~(padadd_OUR|padadd_STATE|padadd_NO_DUP_CHECK|padadd_FIELD)) croak("panic: pad_add_name_pvn illegal flag bits 0x%" UVxf, (UV)flags); @@ -652,6 +661,11 @@ Perl_pad_add_name_pvn(pTHX_ const char * if (!PL_min_intro_pending) PL_min_intro_pending = offset; PL_max_intro_pending = offset; + + /* fields should not have entries in the pad; we're done here */ + if (flags & padadd_FIELD) + return offset; + /* if it's not a simple scalar, replace with an AV or HV */ assert(SvTYPE(PL_curpad[offset]) == SVt_NULL); assert(SvREFCNT(PL_curpad[offset]) == 1); @@ -681,9 +695,10 @@ Perl_pad_add_name_pv(pTHX_ const char *n PADOFFSET Perl_pad_add_name_sv(pTHX_ SV *name, U32 flags, HV *typestash, HV *ourstash) { + PERL_ARGS_ASSERT_PAD_ADD_NAME_SV; + char *namepv; STRLEN namelen; - PERL_ARGS_ASSERT_PAD_ADD_NAME_SV; namepv = SvPVutf8(name, namelen); return pad_add_name_pvn(namepv, namelen, flags, typestash, ourstash); } @@ -707,6 +722,10 @@ does not cause the SV in the pad slot to tells C that it I be made read-only (by the caller), or at least should be treated as such. +C can be combined with C to request that no actual +SV be allocated and stored in the pad; the pad slot will be left as NULL in +this case. + C should be an opcode indicating the type of operation that the pad entry is to support. This doesn't affect operational semantics, but is used for debugging. @@ -717,12 +736,17 @@ but is used for debugging. PADOFFSET Perl_pad_alloc(pTHX_ I32 optype, U32 tmptype) { - SV *sv; + PERL_ARGS_ASSERT_PAD_ALLOC; + + SV *sv = NULL; PADOFFSET retval; PERL_UNUSED_ARG(optype); ASSERT_CURPAD_ACTIVE("pad_alloc"); + const bool alloc_sv = !(tmptype & padalloc_NO_SV); + tmptype &= ~padalloc_NO_SV; + if (AvARRAY(PL_comppad) != PL_curpad) croak("panic: pad_alloc, %p!=%p", AvARRAY(PL_comppad), PL_curpad); @@ -730,7 +754,9 @@ Perl_pad_alloc(pTHX_ I32 optype, U32 tmp pad_reset(); if (tmptype == SVs_PADMY) { /* Not & because this ‘flag’ is 0. */ /* For a my, simply push a null SV onto the end of PL_comppad. */ - sv = *av_store_simple(PL_comppad, AvFILLp(PL_comppad) + 1, newSV_type(SVt_NULL)); + if (alloc_sv) + sv = newSV_type(SVt_NULL); + av_store_simple(PL_comppad, AvFILLp(PL_comppad) + 1, sv); retval = (PADOFFSET)AvFILLp(PL_comppad); } else { @@ -774,7 +800,8 @@ Perl_pad_alloc(pTHX_ I32 optype, U32 tmp } *(konst ? &PL_constpadix : &PL_padix) = retval; } - SvFLAGS(sv) |= tmptype; + if (sv) + SvFLAGS(sv) |= tmptype; PL_curpad = AvARRAY(PL_comppad); DEBUG_X(PerlIO_printf(Perl_debug_log, @@ -782,8 +809,10 @@ Perl_pad_alloc(pTHX_ I32 optype, U32 tmp PTR2UV(PL_comppad), PTR2UV(PL_curpad), (long) retval, PL_op_name[optype])); #ifdef DEBUG_LEAKING_SCALARS - sv->sv_debug_optype = optype; - sv->sv_debug_inpad = 1; + if (sv) { + sv->sv_debug_optype = optype; + sv->sv_debug_inpad = 1; + } #endif return retval; } @@ -809,10 +838,11 @@ but is used for debugging. PADOFFSET Perl_pad_add_anon(pTHX_ CV* func, I32 optype) { + PERL_ARGS_ASSERT_PAD_ADD_ANON; + PADOFFSET ix; PADNAME * const name = newPADNAMEpvn("&", 1); - PERL_ARGS_ASSERT_PAD_ADD_ANON; assert (SvTYPE(func) == SVt_PVCV); /* These two aren't used; just make sure they're not equal to @@ -836,12 +866,12 @@ Perl_pad_add_anon(pTHX_ CV* func, I32 op void Perl_pad_add_weakref(pTHX_ CV* func) { + PERL_ARGS_ASSERT_PAD_ADD_WEAKREF; + const PADOFFSET ix = pad_alloc(OP_NULL, SVs_PADMY); PADNAME * const name = newPADNAMEpvn("&", 1); SV * const rv = newRV_inc((SV *)func); - PERL_ARGS_ASSERT_PAD_ADD_WEAKREF; - /* These two aren't used; just make sure they're not equal to * PERL_PADSEQ_INTRO. They should be 0 by default. */ assert(COP_SEQ_RANGE_LOW (name) != PERL_PADSEQ_INTRO); @@ -865,16 +895,16 @@ C indicates that the name to che =cut */ -STATIC void +static void S_pad_check_dup(pTHX_ PADNAME *name, U32 flags, const HV *ourstash) { + PERL_ARGS_ASSERT_PAD_CHECK_DUP; + PADNAME **svp; PADOFFSET top, off; const U32 is_our = flags & padadd_OUR; bool is_field = flags & padadd_FIELD; - PERL_ARGS_ASSERT_PAD_CHECK_DUP; - ASSERT_CURPAD_ACTIVE("pad_check_dup"); assert((flags & ~(padadd_OUR|padadd_FIELD)) == 0); @@ -939,15 +969,16 @@ S_pad_check_dup(pTHX_ PADNAME *name, U32 } } - /* =for apidoc pad_findmy_pv =for apidoc_item pad_findmy_pvn =for apidoc_item pad_findmy_pvs =for apidoc_item pad_findmy_sv +=for apidoc_flag NOT_IN_PAD -Given the name of a lexical variable, including its leading sigil, find its -position in the currently-compiling pad. +Given the name of a lexical variable, including its leading sigil, these find +its position in the currently compiling pad, returning that offset, or +C if no such lexical is in scope. If it is not in the current pad but appears in the pad of any lexically enclosing scope, then a pseudo-entry for it is added in the current pad. @@ -963,31 +994,30 @@ enclosed in double quotes. In plain C, the variable name is a C language NUL-terminated string. -In C, C gives the length of the variable name in bytes, -so it may contain embedded-NUL characters. The caller must make sure C -contains at least C bytes. +In C, C points to the first byte of the name (which +better be its sigil), and an additional parameter, C, specifies its +length in bytes. Hence, C may contain embedded-NUL characters. The +caller must make sure C contains at least C bytes. In C, the variable name is taken from the SV parameter using C()>. C is reserved and must be zero. -=for apidoc Amnh||NOT_IN_PAD - =cut */ PADOFFSET Perl_pad_findmy_pvn(pTHX_ const char *namepv, STRLEN namelen, U32 flags) { + PERL_ARGS_ASSERT_PAD_FINDMY_PVN; + PADNAME *out_pn; int out_flags; PADOFFSET offset; const PADNAMELIST *namelist; PADNAME **name_p; - PERL_ARGS_ASSERT_PAD_FINDMY_PVN; - if (flags) croak("panic: pad_findmy_pvn illegal flag bits 0x%" UVxf, (UV)flags); @@ -1035,9 +1065,10 @@ Perl_pad_findmy_pv(pTHX_ const char *nam PADOFFSET Perl_pad_findmy_sv(pTHX_ SV *name, U32 flags) { + PERL_ARGS_ASSERT_PAD_FINDMY_SV; + char *namepv; STRLEN namelen; - PERL_ARGS_ASSERT_PAD_FINDMY_SV; namepv = SvPVutf8(name, namelen); return pad_findmy_pvn(namepv, namelen, flags); } @@ -1053,6 +1084,8 @@ Returns the global variable C<$_>. SV * Perl_find_rundefsv(pTHX) { + PERL_ARGS_ASSERT_FIND_RUNDEFSV; + return DEFSV; } @@ -1100,10 +1133,12 @@ S_unavailable(pTHX_ PADNAME *name) PNfARG(name)); } -STATIC PADOFFSET +static PADOFFSET S_pad_findlex(pTHX_ const char *namepv, STRLEN namelen, U32 flags, const CV* cv, U32 seq, int warn, SV** out_capture, PADNAME** out_name, int *out_flags) { + PERL_ARGS_ASSERT_PAD_FINDLEX; + PADOFFSET offset, new_offset; SV *new_capture; SV **new_capturep; @@ -1111,8 +1146,6 @@ S_pad_findlex(pTHX_ const char *namepv, const bool staleok = cBOOL(flags & padadd_STALEOK); const bool fieldok = cBOOL(flags & padfind_FIELD_OK); - PERL_ARGS_ASSERT_PAD_FINDLEX; - flags &= ~(padadd_STALEOK|padfind_FIELD_OK); /* one-shot flags */ if (flags) croak("panic: pad_findlex illegal flag bits 0x%" UVxf, @@ -1181,7 +1214,7 @@ S_pad_findlex(pTHX_ const char *namepv, DEBUG_Xv(PerlIO_printf(Perl_debug_log, "Pad findlex cv=0x%" UVxf " matched: offset=%ld flags=0x%lx index=%lu\n", PTR2UV(cv), (long)offset, (unsigned long)*out_flags, - (unsigned long) PARENT_PAD_INDEX(*out_name) + (unsigned long) PARENT_PAD_INDEX(*out_name) )); } @@ -1244,7 +1277,7 @@ S_pad_findlex(pTHX_ const char *namepv, "Pad findlex cv=0x%" UVxf " found lex=0x%" UVxf "\n", PTR2UV(cv), PTR2UV(*out_capture))); - if (SvPADSTALE(*out_capture) + if (*out_capture && SvPADSTALE(*out_capture) && (!CvDEPTH(cv) || !staleok) && !PadnameIsSTATE(name_p[offset])) { @@ -1253,7 +1286,7 @@ S_pad_findlex(pTHX_ const char *namepv, *out_capture = NULL; } } - if (!*out_capture) { + if (!*out_capture && !PadnameIsFIELD(*out_name)) { if (namelen != 0 && *namepv == '@') *out_capture = newSV_type_mortal(SVt_PVAV); else if (namelen != 0 && *namepv == '%') @@ -1292,6 +1325,7 @@ S_pad_findlex(pTHX_ const char *namepv, return NOT_IN_PAD; if (PadnameIsFIELD(*out_name)) { + assert(PadnameFIELDINFO(*out_name)); HV *fieldstash = PadnameFIELDINFO(*out_name)->fieldstash; /* fields are only visible to the class that declared them */ @@ -1371,6 +1405,8 @@ Use macro C instead of calling t SV * Perl_pad_sv(pTHX_ PADOFFSET po) { + PERL_ARGS_ASSERT_PAD_SV; + ASSERT_CURPAD_ACTIVE("pad_sv"); if (!po) @@ -1418,7 +1454,9 @@ Update the pad compilation state variabl void Perl_pad_block_start(pTHX_ int full) { + PERL_ARGS_ASSERT_PAD_BLOCK_START; ASSERT_CURPAD_ACTIVE("pad_block_start"); + SAVESTRLEN(PL_comppad_name_floor); PL_comppad_name_floor = PadnamelistMAX(PL_comppad_name); if (full) @@ -1453,6 +1491,8 @@ statements. U32 Perl_intro_my(pTHX) { + PERL_ARGS_ASSERT_INTRO_MY; + PADNAME **svp; PADOFFSET i; U32 seq; @@ -1505,6 +1545,8 @@ lexicals in this scope and warn of any l OP * Perl_pad_leavemy(pTHX) { + PERL_ARGS_ASSERT_PAD_LEAVEMY; + PADOFFSET off; OP *o = NULL; PADNAME * const * const svp = PadnamelistARRAY(PL_comppad_name); @@ -1561,7 +1603,9 @@ new one. void Perl_pad_swipe(pTHX_ PADOFFSET po, bool refadjust) { + PERL_ARGS_ASSERT_PAD_SWIPE; ASSERT_CURPAD_LEGAL("pad_swipe"); + if (!PL_curpad) return; if (AvARRAY(PL_comppad) != PL_curpad) @@ -1617,6 +1661,8 @@ Mark all the current temporaries for reu static void S_pad_reset(pTHX) { + PERL_ARGS_ASSERT_PAD_RESET; + #ifdef USE_PAD_RESET if (AvARRAY(PL_comppad) != PL_curpad) croak("panic: pad_reset curpad, %p!=%p", @@ -1654,7 +1700,7 @@ the kind of subroutine: void Perl_pad_tidy(pTHX_ padtidy_type type) { - + PERL_ARGS_ASSERT_PAD_TIDY; ASSERT_CURPAD_ACTIVE("pad_tidy"); /* If this CV has had any 'eval-capable' ops planted in it: @@ -1766,6 +1812,8 @@ Free the SV at offset po in the current void Perl_pad_free(pTHX_ PADOFFSET po) { + PERL_ARGS_ASSERT_PAD_FREE; + #ifndef USE_PAD_RESET SV *sv; #endif @@ -1804,14 +1852,14 @@ Dump the contents of a padlist void Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full) { + PERL_ARGS_ASSERT_DO_DUMP_PAD; + const PADNAMELIST *pad_name; const AV *pad; PADNAME **pname; SV **ppad; PADOFFSET ix; - PERL_ARGS_ASSERT_DO_DUMP_PAD; - if (!padlist) { return; } @@ -1819,7 +1867,7 @@ Perl_do_dump_pad(pTHX_ I32 level, PerlIO pad = PadlistARRAY(padlist)[1]; pname = PadnamelistARRAY(pad_name); ppad = AvARRAY(pad); - Perl_dump_indent(aTHX_ level, file, + dump_indent(level, file, "PADNAME = 0x%" UVxf "(0x%" UVxf ") PAD = 0x%" UVxf "(0x%" UVxf ")\n", PTR2UV(pad_name), PTR2UV(pname), PTR2UV(pad), PTR2UV(ppad) ); @@ -1831,7 +1879,7 @@ Perl_do_dump_pad(pTHX_ I32 level, PerlIO } if (namesv) { if (PadnameOUTER(namesv)) - Perl_dump_indent(aTHX_ level+1, file, + dump_indent(level+1, file, "%2d. 0x%" UVxf "<%lu> FAKE \"%s\" flags=0x%lx index=%lu\n", (int) ix, PTR2UV(ppad[ix]), @@ -1842,7 +1890,7 @@ Perl_do_dump_pad(pTHX_ I32 level, PerlIO ); else - Perl_dump_indent(aTHX_ level+1, file, + dump_indent(level+1, file, "%2d. 0x%" UVxf "<%lu> (%lu,%lu) \"%s\"\n", (int) ix, PTR2UV(ppad[ix]), @@ -1853,7 +1901,7 @@ Perl_do_dump_pad(pTHX_ I32 level, PerlIO ); } else if (full) { - Perl_dump_indent(aTHX_ level+1, file, + dump_indent(level+1, file, "%2d. 0x%" UVxf "<%lu>\n", (int) ix, PTR2UV(ppad[ix]), @@ -1873,13 +1921,13 @@ dump the contents of a CV =cut */ -STATIC void +static void S_cv_dump(pTHX_ const CV *cv, const char *title) { - const CV * const outside = CvOUTSIDE(cv); - PERL_ARGS_ASSERT_CV_DUMP; + const CV * const outside = CvOUTSIDE(cv); + PerlIO_printf(Perl_debug_log, " %s: CV=0x%" UVxf " (%s), OUTSIDE=0x%" UVxf " (%s)\n", title, @@ -1939,6 +1987,7 @@ S_cv_clone_pad(pTHX_ CV *proto, CV *cv, long depth; U32 subclones = 0; bool trouble = FALSE; + const bool cv_is_method = CvIsMETHOD(cv); assert(!CvUNIQUE(proto)); @@ -2000,6 +2049,12 @@ S_cv_clone_pad(pTHX_ CV *proto, CV *cv, if (PadnameIsOUR(namesv)) { /* or maybe not so lexical */ NOOP; } + else if (cv_is_method && PadnameIsFIELD(namesv)) { + /* fields within methods shouldn't be captured because the inner + * method's pp_methstart will set it up again. + */ + NOOP; + } else { if (PadnameOUTER(namesv)) { /* lexical from outside? */ /* formats may have an inactive, or even undefined, parent; @@ -2010,7 +2065,7 @@ S_cv_clone_pad(pTHX_ CV *proto, CV *cv, S_unavailable(aTHX_ namesv); sv = NULL; } - else + else SvREFCNT_inc_simple_void_NN(sv); } if (!sv) { @@ -2291,7 +2346,8 @@ Perl_cv_clone_into(pTHX_ CV *proto, CV * } /* -=for apidoc cv_name +=for apidoc cv_name +=for apidoc_flag CV_NAME_NOTQUAL Returns an SV containing the name of the CV, mainly for use in error reporting. The CV may actually be a GV instead, in which case the returned @@ -2306,8 +2362,6 @@ If C has the C b included. If the first argument is neither a CV nor a GV, this flag is ignored (subject to change). -=for apidoc Amnh||CV_NAME_NOTQUAL - =cut */ @@ -2357,13 +2411,14 @@ moved to a pre-existing CV struct. void Perl_pad_fixup_inner_anons(pTHX_ PADLIST *padlist, CV *old_cv, CV *new_cv) { + PERL_ARGS_ASSERT_PAD_FIXUP_INNER_ANONS; + PADOFFSET ix; PADNAMELIST * const comppad_name = PadlistNAMES(padlist); AV * const comppad = PadlistARRAY(padlist)[1]; PADNAME ** const namepad = PadnamelistARRAY(comppad_name); SV ** const curpad = AvARRAY(comppad); - PERL_ARGS_ASSERT_PAD_FIXUP_INNER_ANONS; PERL_UNUSED_ARG(old_cv); for (ix = PadnamelistMAX(comppad_name); ix > 0; ix--) { @@ -2508,12 +2563,12 @@ Duplicates a pad. PADLIST * Perl_padlist_dup(pTHX_ PADLIST *srcpad, CLONE_PARAMS *param) { + PERL_ARGS_ASSERT_PADLIST_DUP; + PADLIST *dstpad; bool cloneall; PADOFFSET max; - PERL_ARGS_ASSERT_PADLIST_DUP; - cloneall = cBOOL(param->flags & CLONEf_COPY_STACKS); assert (SvREFCNT(PadlistARRAY(srcpad)[1]) == 1); @@ -2571,8 +2626,8 @@ Perl_padlist_dup(pTHX_ PADLIST *srcpad, interacts with lexicals. */ pad1a[ix] = sv_dup_inc(oldpad[ix], param); } else { - SV *sv; - + SV *sv; + if (sigil == '@') sv = MUTABLE_SV(newAV()); else if (sigil == '%') @@ -2618,11 +2673,11 @@ Perl_padlist_dup(pTHX_ PADLIST *srcpad, PAD ** Perl_padlist_store(pTHX_ PADLIST *padlist, I32 key, PAD *val) { + PERL_ARGS_ASSERT_PADLIST_STORE; + PAD **ary; SSize_t const oldmax = PadlistMAX(padlist); - PERL_ARGS_ASSERT_PADLIST_STORE; - assert(key >= 0); if (key > PadlistMAX(padlist)) { @@ -2650,6 +2705,8 @@ is allocated. PADNAMELIST * Perl_newPADNAMELIST(size_t max) { + PERL_ARGS_ASSERT_NEWPADNAMELIST; + PADNAMELIST *pnl; Newx(pnl, 1, PADNAMELIST); Newxz(PadnamelistARRAY(pnl), max+1, PADNAME *); @@ -2672,10 +2729,10 @@ existing pad name in that slot. PADNAME ** Perl_padnamelist_store(pTHX_ PADNAMELIST *pnl, SSize_t key, PADNAME *val) { - PADNAME **ary; - PERL_ARGS_ASSERT_PADNAMELIST_STORE; + PADNAME **ary; + assert(key >= 0); if (key > pnl->xpadnl_max) @@ -2741,13 +2798,15 @@ Duplicates a pad name list. PADNAMELIST * Perl_padnamelist_dup(pTHX_ PADNAMELIST *srcpad, CLONE_PARAMS *param) { - PADNAMELIST *dstpad; - SSize_t max = PadnamelistMAX(srcpad); - PERL_ARGS_ASSERT_PADNAMELIST_DUP; + if (!srcpad) + return NULL; + + SSize_t max = PadnamelistMAX(srcpad); + /* look for it in the table first */ - dstpad = (PADNAMELIST *)ptr_table_fetch(PL_ptr_table, srcpad); + PADNAMELIST *dstpad = (PADNAMELIST *)ptr_table_fetch(PL_ptr_table, srcpad); if (dstpad) return dstpad; @@ -2781,10 +2840,11 @@ C>. PADNAME * Perl_newPADNAMEpvn(const char *s, STRLEN len) { + PERL_ARGS_ASSERT_NEWPADNAMEPVN; + struct padname_with_str *alloc; char *alloc2; /* for Newxz */ PADNAME *pn; - PERL_ARGS_ASSERT_NEWPADNAMEPVN; Newxz(alloc2, STRUCT_OFFSET(struct padname_with_str, xpadn_str[0]) + len + 1, char); @@ -2799,23 +2859,23 @@ Perl_newPADNAMEpvn(const char *s, STRLEN } /* -=for apidoc newPADNAMEouter +=for apidoc newPADNAMEouter +=for apidoc_flag PADNAMEf_OUTER Constructs and returns a new pad name. Only use this function for names that refer to outer lexicals. (See also L.) C is the outer pad name that this one mirrors. The returned pad name has the C flag already set. -=for apidoc Amnh||PADNAMEf_OUTER - =cut */ PADNAME * Perl_newPADNAMEouter(PADNAME *outer) { - PADNAME *pn; PERL_ARGS_ASSERT_NEWPADNAMEOUTER; + + PADNAME *pn; Newxz(pn, 1, PADNAME); PadnameREFCNT(pn) = 1; PadnamePV(pn) = PadnamePV(outer); @@ -2824,6 +2884,7 @@ Perl_newPADNAMEouter(PADNAME *outer) PadnameREFCNT_inc(PADNAME_FROM_PV(PadnamePV(outer))); PadnameFLAGS(pn) = PADNAMEf_OUTER; if(PadnameIsFIELD(outer)) { + assert(PadnameFIELDINFO(outer)); PadnameFIELDINFO(pn) = PadnameFIELDINFO(outer); PadnameFIELDINFO(pn)->refcount++; PadnameFLAGS(pn) |= PADNAMEf_FIELD; @@ -2846,6 +2907,7 @@ Perl_padname_free(pTHX_ PADNAME *pn) if (PadnameOUTER(pn)) PadnameREFCNT_dec(PADNAME_FROM_PV(PadnamePV(pn))); if (PadnameIsFIELD(pn)) { + assert(PadnameFIELDINFO(pn)); struct padname_fieldinfo *info = PadnameFIELDINFO(pn); if(!--info->refcount) { SvREFCNT_dec(info->fieldstash); @@ -2872,10 +2934,10 @@ Duplicates a pad name. PADNAME * Perl_padname_dup(pTHX_ PADNAME *src, CLONE_PARAMS *param) { - PADNAME *dst; - PERL_ARGS_ASSERT_PADNAME_DUP; + PADNAME *dst; + /* look for it in the table first */ dst = (PADNAME *)ptr_table_fetch(PL_ptr_table, src); if (dst) @@ -2897,18 +2959,27 @@ Perl_padname_dup(pTHX_ PADNAME *src, CLO PadnameTYPE (dst) = (HV *)sv_dup_inc((SV *)PadnameTYPE(src), param); PadnameOURSTASH(dst) = (HV *)sv_dup_inc((SV *)PadnameOURSTASH(src), param); - if(PadnameIsFIELD(src) && !PadnameOUTER(src)) { + if(PadnameIsFIELD(src)) { + assert(PadnameFIELDINFO(src)); struct padname_fieldinfo *sinfo = PadnameFIELDINFO(src); - struct padname_fieldinfo *dinfo; - Newxz(dinfo, 1, struct padname_fieldinfo); - - dinfo->refcount = 1; - dinfo->fieldix = sinfo->fieldix; - dinfo->fieldstash = hv_dup_inc(sinfo->fieldstash, param); - dinfo->paramname = sv_dup_inc(sinfo->paramname, param); - - PadnameFIELDINFO(dst) = dinfo; + struct padname_fieldinfo *dinfo = (struct padname_fieldinfo *)ptr_table_fetch(PL_ptr_table, sinfo); + if (dinfo) + PadnameFIELDINFO(dst) = dinfo; + else { + Newxz(dinfo, 1, struct padname_fieldinfo); + PadnameFIELDINFO(dst) = dinfo; + ptr_table_store(PL_ptr_table, sinfo, dinfo); + + /* We must have set PadnameFIELDINFO(dst) before we recurse into + * fieldstash in case it points back here */ + dinfo->refcount = 1; + dinfo->fieldix = sinfo->fieldix; + dinfo->fieldstash = hv_dup_inc(sinfo->fieldstash, param); + dinfo->paramname = sv_dup_inc(sinfo->paramname, param); + } + assert(PadnameFIELDINFO(dst)); } + dst->xpadn_low = src->xpadn_low; dst->xpadn_high = src->xpadn_high; dst->xpadn_gen = src->xpadn_gen; @@ -2961,6 +3032,13 @@ Perl_suspend_compcv(pTHX_ struct suspend buffer->pad_reset_pending = PL_pad_reset_pending; } +/* interface compatible with SAVEDESTRUCTOR_X */ +static void +S_suspend_compcv_destruct(pTHX_ void *p) +{ + suspend_compcv((struct suspended_compcv *)p); +} + /* =for apidoc resume_compcv_final @@ -2999,7 +3077,7 @@ Perl_resume_compcv(pTHX_ struct suspende SAVEBOOL(PL_pad_reset_pending); PL_pad_reset_pending = buffer->pad_reset_pending; if(save) - SAVEDESTRUCTOR_X(&Perl_suspend_compcv, buffer); + SAVEDESTRUCTOR_X(S_suspend_compcv_destruct, buffer); } /* Index: gnu/usr.bin/perl/pad.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/pad.h,v diff -u -p -a -u -p -r1.8 pad.h --- gnu/usr.bin/perl/pad.h 26 Dec 2025 22:14:12 -0000 1.8 +++ gnu/usr.bin/perl/pad.h 16 Nov 2026 00:57:39 -0000 @@ -57,7 +57,7 @@ struct padnamelist { struct padname_fieldinfo; -#define _PADNAME_BASE \ +#define PADNAME_BASE_ \ char * xpadn_pv; \ HV * xpadn_ourstash; \ union { \ @@ -73,19 +73,19 @@ struct padname_fieldinfo; U8 xpadn_flags struct padname { - _PADNAME_BASE; + PADNAME_BASE_; }; struct padname_with_str { #ifdef PERL_PADNAME_MINIMAL - _PADNAME_BASE; + PADNAME_BASE_; #else struct padname xpadn_padname; #endif char xpadn_str[1]; }; -#undef _PADNAME_BASE +#undef PADNAME_BASE_ #define PADNAME_FROM_PV(s) \ ((PADNAME *)((s) - STRUCT_OFFSET(struct padname_with_str, xpadn_str))) @@ -127,6 +127,10 @@ struct padname_fieldinfo { #define PAD_FAKELEX_ANON 1 /* the lex is declared in an ANON, or ... */ #define PAD_FAKELEX_MULTI 2 /* the lex can be instantiated multiple times */ +/* flags for pad_alloc */ + +#define padalloc_NO_SV 0x0001 /* this needs to not collide with SVs_PADTMP or SVf_READONLY */ + /* flags for the pad_new() function */ #define padnew_CLONE 1 /* this pad is for a cloned CV */ @@ -178,7 +182,7 @@ typedef enum { * indirectly affect pads. */ /* -=for apidoc m|void|SAVEPADSV |PADOFFSET po +=for apidoc m|void|SAVEPADSVANDMORTALIZE|PADOFFSET po Save a pad slot (used to restore after an iteration) =cut @@ -528,15 +532,6 @@ Clone the state variables associated wit PL_padix_floor = proto_perl->Ipadix_floor; \ PL_pad_reset_pending = proto_perl->Ipad_reset_pending; \ PL_cop_seqmax = proto_perl->Icop_seqmax; - -/* -=for apidoc Am|PADOFFSET|pad_add_name_pvs|"name"|U32 flags|HV *typestash|HV *ourstash - -Exactly like L, but takes a literal string -instead of a string/length pair. - -=cut -*/ #define pad_add_name_pvs(name,flags,typestash,ourstash) \ Perl_pad_add_name_pvn(aTHX_ STR_WITH_LEN(name), flags, typestash, ourstash) Index: gnu/usr.bin/perl/parser.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/parser.h,v diff -u -p -a -u -p -r1.6 parser.h --- gnu/usr.bin/perl/parser.h 26 Dec 2025 22:14:12 -0000 1.6 +++ gnu/usr.bin/perl/parser.h 16 Nov 2026 00:57:39 -0000 @@ -10,6 +10,7 @@ */ #define YYEMPTY (-2) +#define PERL_IDENTIFIER_LENGTH (256 * MAX_UNICODE_UTF8_BYTES) typedef struct { YYSTYPE val; /* semantic value */ @@ -112,7 +113,7 @@ typedef struct yy_parser { U8 lex_fakeeof; /* precedence at which to fake EOF */ U8 lex_flags; COP *saved_curcop; /* the previous PL_curcop */ - char tokenbuf[256]; + char tokenbuf[ PERL_IDENTIFIER_LENGTH ]; line_t herelines; /* number of lines in here-doc */ line_t preambling; /* line # when processing $ENV{PERL5DB} */ @@ -160,6 +161,10 @@ enum { LEX_FAKEEOF_COMPARE, /* ... and at comparison operator */ LEX_FAKEEOF_MAX }; + +#define PARSE_IDENT_ERROR_POSITION "position" +#define PARSE_IDENT_ERROR_TEXT "text" + /* * ex: set ts=8 sts=4 sw=4 et: Index: gnu/usr.bin/perl/patchlevel.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/patchlevel.h,v diff -u -p -a -u -p -r1.59 patchlevel.h --- gnu/usr.bin/perl/patchlevel.h 19 Aug 2026 00:19:00 -0000 1.59 +++ gnu/usr.bin/perl/patchlevel.h 16 Nov 2026 00:57:39 -0000 @@ -38,8 +38,8 @@ Instead use one of the version compariso * exactly on the third column */ #define PERL_REVISION 5 /* age */ -#define PERL_VERSION 42 /* epoch */ -#define PERL_SUBVERSION 3 /* generation */ +#define PERL_VERSION 44 /* epoch */ +#define PERL_SUBVERSION 0 /* generation */ /* The following numbers describe the earliest compatible version of Perl ("compatibility" here being defined as sufficient binary/API @@ -59,7 +59,7 @@ Instead use one of the version compariso changing them should not be necessary. */ #define PERL_API_REVISION 5 -#define PERL_API_VERSION 42 +#define PERL_API_VERSION 44 #define PERL_API_SUBVERSION 0 /* XXX Note: The selection of non-default Configure options, such Index: gnu/usr.bin/perl/peep.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/peep.c,v diff -u -p -a -u -p -r1.1.1.3 peep.c --- gnu/usr.bin/perl/peep.c 26 Dec 2025 22:12:28 -0000 1.1.1.3 +++ gnu/usr.bin/perl/peep.c 16 Nov 2026 00:57:39 -0000 @@ -76,8 +76,9 @@ S_scalar_slice_warning(pTHX_ const OP *o if (kid->op_type == OP_NULL && kid->op_targ == OP_LIST) return; - assert(OpSIBLING(kid)); - name = op_varname(OpSIBLING(kid)); + OP *varop = OpSIBLING(kid); + assert(varop); + name = op_varname(varop); if (!name) /* XS module fiddling with the op tree */ return; warn_elem_scalar_context(kid, name, is_hash, true); @@ -108,7 +109,7 @@ struct sprintf_ismc_info { * populated. */ -STATIC bool +static bool S_sprintf_is_multiconcatable(pTHX_ OP *o,struct sprintf_ismc_info *info) { OP *pm, *constop, *kid; @@ -229,7 +230,7 @@ S_sprintf_is_multiconcatable(pTHX_ OP *o * away with OPpTARGET_MY set on the OP_STRINGIFY or OP_CONCAT. */ -STATIC void +static void S_maybe_multiconcat(pTHX_ OP *o) { OP *lastkidop; /* the right-most of any kids unshifted onto o */ @@ -754,7 +755,9 @@ S_maybe_multiconcat(pTHX_ OP *o) lastkidop = cLISTOPx(topop)->op_last; kid = cUNOPx(topop)->op_first; /* pushmark */ op_null(kid); - op_null(OpSIBLING(kid)); /* const */ + OP * const const_op = OpSIBLING(kid); + ASSUME(const_op); + op_null(const_op); /* const */ if (o != topop) { kid = op_sibling_splice(topop, NULL, -1, NULL); /* cut all args */ op_sibling_splice(o, NULL, 0, kid); /* and attach to o */ @@ -1064,13 +1067,13 @@ S_warn_implicit_snail_cvsig(pTHX_ OP *o) * to optimise any children. */ -STATIC void +static void S_optimize_op(pTHX_ OP* o) { - OP *top_op = o; - PERL_ARGS_ASSERT_OPTIMIZE_OP; + OP *top_op = o; + while (1) { OP * next_kid = NULL; @@ -1210,12 +1213,13 @@ For now it's static, but it may be expos =cut */ -STATIC OP* -S_traverse_op_tree(pTHX_ OP *top, OP *o) { - OP *sib; - +static OP* +S_traverse_op_tree(pTHX_ OP *top, OP *o) +{ PERL_ARGS_ASSERT_TRAVERSE_OP_TREE; + OP *sib; + if ((o->op_flags & OPf_KIDS) && cUNOPo->op_first) { return cUNOPo->op_first; } @@ -1236,12 +1240,13 @@ S_traverse_op_tree(pTHX_ OP *top, OP *o) } } -STATIC void +static void S_finalize_op(pTHX_ OP* o) { - OP * const top = o; PERL_ARGS_ASSERT_FINALIZE_OP; + OP * const top = o; + do { assert(o->op_type != OP_FREED); @@ -1909,7 +1914,7 @@ S_aassign_scan(pTHX_ OP* o, bool rhs, in * OPpHINT_STRICT_REFS) as found in any rv2av/hv skipped by the caller. */ -STATIC void +static void S_maybe_multideref(pTHX_ OP *start, OP *orig_o, UV orig_action, U8 hints) { int pass; @@ -2205,14 +2210,14 @@ S_maybe_multideref(pTHX_ OP *start, OP * /* if a custom array/hash access checker is in scope, * abandon optimisation attempt */ if ( (o->op_type == OP_AELEM || o->op_type == OP_HELEM) - && PL_check[o->op_type] != Perl_ck_null) + && UNLIKELY(PL_check[o->op_type] != PL_check[PERL_CK_NULL])) return; /* similarly for customised exists and delete */ if ( (o->op_type == OP_EXISTS) - && PL_check[o->op_type] != Perl_ck_exists) + && UNLIKELY(PL_check[o->op_type] != PL_check[PERL_CK_EXISTS])) return; if ( (o->op_type == OP_DELETE) - && PL_check[o->op_type] != Perl_ck_delete) + && UNLIKELY(PL_check[o->op_type] != PL_check[PERL_CK_DELETE])) return; if ( o->op_type != OP_AELEM @@ -2703,6 +2708,8 @@ S_check_for_bool_cxt(OP*o, bool safe_and void Perl_rpeep(pTHX_ OP *o) { + PERL_ARGS_ASSERT_RPEEP; + OP* oldop = NULL; OP* oldoldop = NULL; OP** defer_queue[MAX_DEFERRED] = { NULL }; /* small queue of deferred branches */ @@ -3580,14 +3587,150 @@ Perl_rpeep(pTHX_ OP *o) o->op_next = cLOGOPx(o->op_next)->op_other; } DEFER(cLOGOP->op_other); - o->op_opt = 1; break; case OP_GREPWHILE: if ((o->op_flags & OPf_WANT) == OPf_WANT_SCALAR) S_check_for_bool_cxt(o, 1, OPpTRUEBOOL, 0); - /* FALLTHROUGH */ + goto generic_logop; + case OP_COND_EXPR: + { + /* A cond_expr op will usually have three children (all of + * which are sub-trees): + * cond_expr + * -condition- + * -true- + * -false- + * with op_other pointing to the start op within the + * true subtree and op_next to the start op within the + * false subtree. + * + * The code in this block looks for stub subtrees + * (either a single stub op, or far more likely, + * a stub op as part of an empty scope or entry/leave + * subtree). If found, the subtree is deleted (so the + * cond_expr only has two children) and the + * op_next/op_other as appropriate is made to point to + * the op following the cond_expr op. + */ + + OP *stub = cLOGOP->op_other; + OP *trueop = OpSIBLING( cLOGOP->op_first ); + OP *falseop = OpSIBLING(trueop); + + /* Is there an empty "if" block or ternary true branch? + If so, optimise away the OP_STUB if safe to do so. */ + if ( stub->op_type == OP_STUB + && ((stub->op_flags & OPf_WANT) != OPf_WANT_SCALAR) + && ( + /* bare stub */ + (stub == trueop) + /* stub in scope/enter */ + || ( OP_TYPE_IS(trueop, OP_SCOPE) + && stub == cUNOPx(trueop)->op_first + /* doesn't yet handle trailing nulls */ + && !OpSIBLING(stub) + ) + ) + ) { + assert(!(stub->op_flags & OPf_KIDS)); + cLOGOP->op_other = trueop->op_next; + op_sibling_splice(o, cLOGOP->op_first, 1, NULL); + op_free(trueop); + goto generic_logop; + } + + /* Is there an empty "else" block or ternary false branch? + If so, optimise away the OP_STUB if safe to do so. */ + stub = o->op_next; + if ((stub->op_flags & OPf_WANT) != OPf_WANT_SCALAR) { + if (stub->op_type == OP_STUB && !OpSIBLING(stub) ){ + OP *stubsib = OpSIBLING(stub); + if ((stub == falseop) && !stubsib) { + /* cond_expr + * -condition- + * - if - + * stub + */ + assert(!(stub->op_flags & OPf_KIDS)); + o->op_flags |= OPf_SPECIAL; /* For B::Deparse */ + o->op_next = stub->op_next; + op_sibling_splice(o, OpSIBLING(cLOGOP->op_first), 1, NULL); + op_free(stub); + } else { /* Unexpected */ } + } else if (OP_TYPE_IS(stub,OP_ENTER) && + OP_TYPE_IS(falseop, OP_LEAVE)) { + OP *enter = stub; + OP *stub = OpSIBLING(enter); + if (stub && OP_TYPE_IS(stub, OP_STUB) ){ + assert(!(stub->op_flags & OPf_KIDS)); + OP *stubsib = OpSIBLING(stub); + assert(stubsib); + if (OP_TYPE_IS(stubsib, OP_NULL) && + !OpSIBLING(stubsib) && + !(stubsib->op_flags & OPf_KIDS) ) { + /* cond_expr + * -condition- + * - if - + * leave + * enter + * stub + * null + */ + /* Ignoring it for now, pending further exploration.*/ + /* + o->op_flags |= OPf_SPECIAL; // For B::Deparse + o->op_next = falseop->op_next; + op_sibling_splice(o, OpSIBLING(cLOGOP->op_first), 1, NULL); + op_free(enter); + op_free(stub); + op_free(stubsib); + op_free(falseop); + */ + } + } + } + } + + goto generic_logop; + } + + case OP_ENTERTRY: + assert(cLOGOPo->op_other->op_type == OP_LEAVETRY); + goto generic_logop; + + case OP_ENTERTRYCATCH: + /* catch body is the ->op_other of the OP_CATCH */ + assert(cLOGOPo->op_other->op_type == OP_CATCH); + goto generic_logop; + + /* these LOGOPs' op_other always go to a known op which has alrady + * been processed and so don't need to run the peephole optimiser + * on it. They are included here for completeness. + * If any of the asserts fail then this assumption should be + * reconsidered. + * */ + + case OP_SUBSTCONT: + assert(cLOGOPo->op_other->op_type == OP_SUBST); + break; + + case OP_REGCOMP: + assert((PL_opargs[cLOGOPo->op_other->op_type] & OA_CLASS_MASK) + == OA_PMOP); + break; + + case OP_ENTERGIVEN: + assert(cLOGOPo->op_other->op_type == OP_LEAVEGIVEN); + break; + + case OP_ENTERWHEN: + assert(cLOGOPo->op_other->op_type == OP_LEAVEWHEN); + break; + + /* general LOGOPs */ + case OP_MAPWHILE: case OP_ANDASSIGN: case OP_ORASSIGN: @@ -3595,6 +3738,20 @@ Perl_rpeep(pTHX_ OP *o) case OP_RANGE: case OP_ONCE: case OP_ARGDEFELEM: + case OP_PARAMTEST: + case OP_HELEMEXISTSOR: + case OP_ANYWHILE: + case OP_CATCH: + + generic_logop: + + /* Handle the stuff generically needed for all LOGOPs: + * in particular, process op_other: strip nulls and + * run the peephole optimiser on it. + * + * Note that some LOGOPs, such as OP_AND, do their own + * specialised handling and never reach here. + */ while (cLOGOP->op_other->op_type == OP_NULL) cLOGOP->op_other = cLOGOP->op_other->op_next; DEFER(cLOGOP->op_other); @@ -3614,17 +3771,6 @@ Perl_rpeep(pTHX_ OP *o) DEFER(cLOOP->op_lastop); break; - case OP_ENTERTRY: - assert(cLOGOPo->op_other->op_type == OP_LEAVETRY); - DEFER(cLOGOPo->op_other); - break; - - case OP_ENTERTRYCATCH: - assert(cLOGOPo->op_other->op_type == OP_CATCH); - /* catch body is the ->op_other of the OP_CATCH */ - DEFER(cLOGOPx(cLOGOPo->op_other)->op_other); - break; - case OP_SUBST: if ((o->op_flags & OPf_WANT) == OPf_WANT_SCALAR) S_check_for_bool_cxt(o, 1, OPpTRUEBOOL, 0); @@ -4283,6 +4429,8 @@ Perl_rpeep(pTHX_ OP *o) void Perl_peep(pTHX_ OP *o) { + PERL_ARGS_ASSERT_PEEP; + CALL_RPEEP(o); } Index: gnu/usr.bin/perl/perl.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/perl.c,v diff -u -p -a -u -p -r1.52 perl.c --- gnu/usr.bin/perl/perl.c 1 Apr 2026 23:20:53 -0000 1.52 +++ gnu/usr.bin/perl/perl.c 16 Nov 2026 00:57:39 -0000 @@ -137,7 +137,6 @@ S_init_tls_and_interp(PerlInterpreter *m void Perl_sys_init(int* argc, char*** argv) { - PERL_ARGS_ASSERT_SYS_INIT; PERL_UNUSED_ARG(argc); /* may not be used depending on _BODY macro */ @@ -148,7 +147,6 @@ Perl_sys_init(int* argc, char*** argv) void Perl_sys_init3(int* argc, char*** argv, char*** env) { - PERL_ARGS_ASSERT_SYS_INIT3; PERL_UNUSED_ARG(argc); /* may not be used depending on _BODY macro */ @@ -160,6 +158,8 @@ Perl_sys_init3(int* argc, char*** argv, void Perl_sys_term(void) { + PERL_ARGS_ASSERT_SYS_TERM; + if (!PL_veto_cleanup) { PERL_SYS_TERM_BODY(); } @@ -174,10 +174,10 @@ perl_alloc_using(const struct IPerlMem** const struct IPerlDir** ipD, const struct IPerlSock** ipS, const struct IPerlProc** ipP) { - PerlInterpreter *my_perl; - PERL_ARGS_ASSERT_PERL_ALLOC_USING; + PerlInterpreter *my_perl; + /* Newx() needs interpreter, so call malloc() instead */ my_perl = (PerlInterpreter*)((*ipM)->pCalloc)(ipM, 1, sizeof(PerlInterpreter)); S_init_tls_and_interp(my_perl); @@ -209,6 +209,8 @@ Allocates a new Perl interpreter. See L PerlInterpreter * perl_alloc(void) { + PERL_ARGS_ASSERT_PERL_ALLOC; + PerlInterpreter *my_perl = (PerlInterpreter*)PerlMem_calloc(1, sizeof(PerlInterpreter)); S_init_tls_and_interp(my_perl); @@ -228,7 +230,6 @@ Initializes a new Perl interpreter. See void perl_construct(pTHXx) { - PERL_ARGS_ASSERT_PERL_CONSTRUCT; #ifdef MULTIPLICITY @@ -347,7 +348,7 @@ perl_construct(pTHXx) Newxz(PL_stashpad, PL_stashpadmax, HV *); #endif #ifdef USE_REENTRANT_API - Perl_reentrant_init(aTHX); + reentrant_init(); #endif if (PL_hash_seed_set == FALSE) { /* Initialize the hash seed and state at startup. This must be @@ -360,7 +361,7 @@ perl_construct(pTHXx) */ #if defined(USE_HASH_SEED) /* get the hash seed from the environment or from an RNG */ - Perl_get_hash_seed(aTHX_ PL_hash_seed); + get_hash_seed(PL_hash_seed); #else /* they want a hard coded seed, check that it is long enough */ assert( strlen(PERL_HASH_SEED) >= PERL_HASH_SEED_BYTES ); @@ -477,7 +478,9 @@ no threads. int Perl_nothreadhook(pTHX) { + PERL_ARGS_ASSERT_NOTHREADHOOK; PERL_UNUSED_CONTEXT; + return 0; } @@ -492,12 +495,15 @@ Stub that provides shutdown hook. void Perl_noshutdownhook() { + PERL_ARGS_ASSERT_NOSHUTDOWNHOOK; } #ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP void Perl_dump_sv_child(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_DUMP_SV_CHILD; + ssize_t got; const int sock = PL_dumper_fd; const int debug_fd = PerlIO_fileno(Perl_debug_log); @@ -508,8 +514,6 @@ Perl_dump_sv_child(pTHX_ SV *sv) int returned_errno; unsigned char buffer[256]; - PERL_ARGS_ASSERT_DUMP_SV_CHILD; - if(sock == -1 || debug_fd == -1) return; @@ -629,6 +633,8 @@ interpret specific numeric values as hav int perl_destruct(pTHXx) { + PERL_ARGS_ASSERT_PERL_DESTRUCT; + volatile signed char destruct_level; /* see possible values in intrpvar.h */ HV *hv; #ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP @@ -636,7 +642,6 @@ perl_destruct(pTHXx) #endif int i; - PERL_ARGS_ASSERT_PERL_DESTRUCT; #ifndef MULTIPLICITY PERL_UNUSED_ARG(my_perl); #endif @@ -1453,7 +1458,7 @@ perl_destruct(pTHXx) sv->sv_debug_serial ); #ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP - Perl_dump_sv_child(aTHX_ sv); + dump_sv_child(sv); #endif } } @@ -1521,7 +1526,7 @@ perl_destruct(pTHXx) PL_debug = 0; #ifdef USE_REENTRANT_API - Perl_reentrant_free(aTHX); + reentrant_free(); #endif /* These all point to HVs that are about to be blown away. @@ -1575,7 +1580,6 @@ Releases a Perl interpreter. See L. AV* Perl_get_av(pTHX_ const char *name, I32 flags) { - GV* const gv = gv_fetchpv(name, flags, SVt_PVAV); - PERL_ARGS_ASSERT_GET_AV; + GV* const gv = gv_fetchpv(name, flags, SVt_PVAV); + if (flags & ~SVf_UTF8) return GvAVn(gv); if (gv) @@ -2963,10 +2976,10 @@ returned. HV* Perl_get_hv(pTHX_ const char *name, I32 flags) { - GV* const gv = gv_fetchpv(name, flags, SVt_PVHV); - PERL_ARGS_ASSERT_GET_HV; + GV* const gv = gv_fetchpv(name, flags, SVt_PVHV); + if (flags & ~SVf_UTF8) return GvHVn(gv); if (gv) @@ -2980,6 +2993,7 @@ Perl_get_hv(pTHX_ const char *name, I32 =for apidoc get_cv =for apidoc_item get_cvn_flags =for apidoc_item get_cvs +=for apidoc_flag GV_ADD These return the CV of the specified Perl subroutine. C are passed to C. If C is set and the Perl subroutine does not @@ -2994,18 +3008,16 @@ string. With C, the name parameter, but it is a Perl string (possibly containing embedded NUL bytes), and its length in bytes is contained in the C parameter. -=for apidoc Amnh||GV_ADD - =cut */ CV* Perl_get_cvn_flags(pTHX_ const char *name, STRLEN len, I32 flags) { - GV* const gv = gv_fetchpvn_flags(name, len, flags, SVt_PVCV); - PERL_ARGS_ASSERT_GET_CVN_FLAGS; + GV* const gv = gv_fetchpvn_flags(name, len, flags, SVt_PVCV); + if (gv && UNLIKELY(SvROK(gv)) && SvTYPE(SvRV((SV *)gv)) == SVt_PVCV) return (CV*)SvRV((SV *)gv); @@ -3123,9 +3135,10 @@ Perl_call_method(pTHX_ const char *methn /* name of the subroutine */ /* See G_* flags in cop.h */ { + PERL_ARGS_ASSERT_CALL_METHOD; + STRLEN len; SV* sv; - PERL_ARGS_ASSERT_CALL_METHOD; len = strlen(methname); sv = flags & G_METHOD_NAMED @@ -3138,6 +3151,8 @@ Perl_call_method(pTHX_ const char *methn /* May be called with any of a CV, a GV, or an SV containing the name. */ /* =for apidoc call_sv +=for apidoc_flag G_METHOD +=for apidoc_flag G_METHOD_NAMED Performs a callback to the Perl sub specified by the SV. @@ -3156,9 +3171,6 @@ not be depended on. See L. -=for apidoc Amnh||G_METHOD -=for apidoc Amnh||G_METHOD_NAMED - =cut */ @@ -3166,6 +3178,8 @@ SSize_t Perl_call_sv(pTHX_ SV *sv, I32 arg_flags) /* See G_* flags in cop.h */ { + PERL_ARGS_ASSERT_CALL_SV; + LOGOP myop; /* fake syntax tree node */ METHOP method_op; SSize_t oldmark; @@ -3179,8 +3193,6 @@ Perl_call_sv(pTHX_ SV *sv, I32 arg_flags volatile I32 flags = arg_flags; dJMPENV; - PERL_ARGS_ASSERT_CALL_SV; - if (flags & G_DISCARD) { ENTER; SAVETMPS; @@ -3319,6 +3331,8 @@ Perl_call_sv(pTHX_ SV *sv, I32 arg_flags /* =for apidoc eval_sv +=for apidoc_flag G_RETHROW +=for apidoc_flag G_USEHINTS Tells Perl to C the string in the SV. It supports the same flags as C, with the obvious exception of C. See L. @@ -3330,8 +3344,6 @@ By default the code is compiled and exec such as strict and features. Set C in flags to use the current hints from C. -=for apidoc Amnh||G_RETHROW -=for apidoc Amnh||G_USEHINTS =cut */ @@ -3340,6 +3352,8 @@ Perl_eval_sv(pTHX_ SV *sv, I32 flags) /* See G_* flags in cop.h */ { + PERL_ARGS_ASSERT_EVAL_SV; + UNOP myop; /* fake syntax tree node */ volatile SSize_t oldmark; volatile SSize_t retval = 0; @@ -3347,8 +3361,6 @@ Perl_eval_sv(pTHX_ SV *sv, I32 flags) OP* const oldop = PL_op; dJMPENV; - PERL_ARGS_ASSERT_EVAL_SV; - if (flags & G_DISCARD) { ENTER; SAVETMPS; @@ -3475,10 +3487,10 @@ Tells Perl to C the given string i SV* Perl_eval_pv(pTHX_ const char *p, I32 croak_on_error) { - SV* sv = newSVpv(p, 0); - PERL_ARGS_ASSERT_EVAL_PV; + SV* sv = newSVpv(p, 0); + if (croak_on_error) { sv_2mortal(sv); eval_sv(sv, G_SCALAR | G_RETHROW); @@ -3511,27 +3523,29 @@ Perl_eval_pv(pTHX_ const char *p, I32 cr Tells Perl to C the file named by the string argument. It is analogous to the Perl code C. It's even -implemented that way; consider using load_module instead. +implemented that way; consider using C> instead. =cut */ void Perl_require_pv(pTHX_ const char *pv) { + PERL_ARGS_ASSERT_REQUIRE_PV; + dSP; SV* sv; - PERL_ARGS_ASSERT_REQUIRE_PV; - PUSHSTACKi(PERLSI_REQUIRE); - sv = Perl_newSVpvf(aTHX_ "require q%c%s%c", 0, pv, 0); + sv = newSVpvf("require q%c%s%c", 0, pv, 0); eval_sv(sv_2mortal(sv), G_DISCARD); POPSTACK; } -STATIC void +static void S_usage(pTHX) /* XXX move this out into a module ? */ { + PERL_ARGS_ASSERT_USAGE; + /* This message really ought to be max 23 lines. * Removed -h because the user already knows that option. Others? */ @@ -3589,6 +3603,8 @@ NULL int Perl_get_debug_opts(pTHX_ const char **s, bool givehelp) { + PERL_ARGS_ASSERT_GET_DEBUG_OPTS; + static const char * const usage_msgd[] = { " Debugging flag values: (see also -d)\n" " p Tokenizing and parsing (with v, displays parse stack)\n" @@ -3624,8 +3640,6 @@ Perl_get_debug_opts(pTHX_ const char **s }; UV uv = 0; - PERL_ARGS_ASSERT_GET_DEBUG_OPTS; - if (isALPHA(**s)) { /* NOTE: * If adding new options add them to the END of debopts[]. @@ -3672,11 +3686,11 @@ Perl_get_debug_opts(pTHX_ const char **s const char * Perl_moreswitches(pTHX_ const char *s) { + PERL_ARGS_ASSERT_MORESWITCHES; + UV rschar; const char option = *s; /* used to remember option in -m/-M code */ - PERL_ARGS_ASSERT_MORESWITCHES; - switch (*s) { case '0': { @@ -3978,9 +3992,11 @@ Perl_moreswitches(pTHX_ const char *s) } -STATIC void +static void S_minus_v(pTHX) { + PERL_ARGS_ASSERT_MINUS_V; + PerlIO * PIO_stdout; { const char * const level_str = "v" PERL_VERSION_STRING; @@ -4073,6 +4089,8 @@ Internet, point your browser at https:// void Perl_my_unexec(pTHX) { + PERL_ARGS_ASSERT_MY_UNEXEC; + #ifdef UNEXEC SV * prog = newSVpv(BIN_EXP, 0); SV * file = newSVpv(PL_origfilename, 0); @@ -4098,9 +4116,11 @@ Perl_my_unexec(pTHX) } /* initialize curinterp */ -STATIC void +static void S_init_interp(pTHX) { + PERL_ARGS_ASSERT_INIT_INTERP; + #ifdef MULTIPLICITY # define PERLVAR(prefix,var,type) # define PERLVARA(prefix,var,n,type) @@ -4130,9 +4150,11 @@ S_init_interp(pTHX) } -STATIC void +static void S_init_main_stash(pTHX) { + PERL_ARGS_ASSERT_INIT_MAIN_STASH; + GV *gv; HV *hv = newHV(); @@ -4166,9 +4188,7 @@ S_init_main_stash(pTHX) SvREFCNT_inc_simple_void(PL_replgv); GvMULTI_on(PL_replgv); (void)form("%240s",""); /* Preallocate temp - for immediate signals. */ -#ifdef PERL_DONT_CREATE_GVSV (void)gv_SVadd(PL_errgv); -#endif sv_grow(ERRSV, 240); /* Preallocate - for immediate signals. */ CLEAR_ERRSV(); CopSTASH_set(&PL_compiling, PL_defstash); @@ -4179,16 +4199,16 @@ S_init_main_stash(pTHX) sv_setpvs(get_sv("/", GV_ADD), "\n"); } -STATIC PerlIO * +static PerlIO * S_open_script(pTHX_ const char *scriptname, bool dosearch, bool *suidscript) { + PERL_ARGS_ASSERT_OPEN_SCRIPT; + int fdscript = -1; PerlIO *rsfp = NULL; Stat_t tmpstatbuf; int fd; - PERL_ARGS_ASSERT_OPEN_SCRIPT; - if (PL_e_script) { PL_origfilename = savepvs("-e"); } @@ -4317,16 +4337,16 @@ S_open_script(pTHX_ const char *scriptna #ifdef SETUID_SCRIPTS_ARE_SECURE_NOW /* Don't even need this function. */ #else -STATIC void +static void S_validate_suid(pTHX_ PerlIO *rsfp) { + PERL_ARGS_ASSERT_VALIDATE_SUID; + const Uid_t my_uid = PerlProc_getuid(); const Uid_t my_euid = PerlProc_geteuid(); const Gid_t my_gid = PerlProc_getgid(); const Gid_t my_egid = PerlProc_getegid(); - PERL_ARGS_ASSERT_VALIDATE_SUID; - if (my_euid != my_uid || my_egid != my_gid) { /* (suidperl doesn't exist, in fact) */ int fd = PerlIO_fileno(rsfp); Stat_t statbuf; @@ -4345,14 +4365,14 @@ FIX YOUR KERNEL, PUT A C WRAPPER AROUND } #endif /* SETUID_SCRIPTS_ARE_SECURE_NOW */ -STATIC void +static void S_find_beginning(pTHX_ SV* linestr_sv, PerlIO *rsfp) { + PERL_ARGS_ASSERT_FIND_BEGINNING; + const char *s; const char *s2; - PERL_ARGS_ASSERT_FIND_BEGINNING; - /* skip forward in input to the real script? */ do { @@ -4374,9 +4394,11 @@ S_find_beginning(pTHX_ SV* linestr_sv, P } -STATIC void +static void S_init_ids(pTHX) { + PERL_ARGS_ASSERT_INIT_IDS; + /* no need to do anything here any more if we don't * do tainting. */ #ifndef NO_TAINT_SUPPORT @@ -4408,7 +4430,11 @@ S_init_ids(pTHX) bool Perl_doing_taint(int argc, char *argv[], char *envp[]) { -#ifndef PERL_IMPLICIT_SYS + PERL_ARGS_ASSERT_DOING_TAINT; + +#ifdef PERL_IMPLICIT_SYS + PERL_UNUSED_ARG(envp); +#else /* If we have PERL_IMPLICIT_SYS we can't call getuid() et alia * before we have an interpreter-- and the whole point of this * function is to be called at such an early stage. If you are on @@ -4443,9 +4469,11 @@ Perl_doing_taint(int argc, char *argv[], optimisation. The only message that isn't /^-.$/ is "program input from stdin", which is substituted in place of '\0', which could never be a command line flag. */ -STATIC void +static void S_forbid_setid(pTHX_ const char flag, const bool suidscript) /* g */ { + PERL_ARGS_ASSERT_FORBID_SETID; + char string[3] = "-x"; const char *message = "program input from stdin"; @@ -4468,6 +4496,8 @@ S_forbid_setid(pTHX_ const char flag, co void Perl_init_dbargs(pTHX) { + PERL_ARGS_ASSERT_INIT_DBARGS; + AV *const args = PL_dbargs = GvAV(gv_AVadd((gv_fetchpvs("DB::args", GV_ADDMULTI, SVt_PVAV)))); @@ -4486,6 +4516,8 @@ Perl_init_dbargs(pTHX) void Perl_init_debugger(pTHX) { + PERL_ARGS_ASSERT_INIT_DEBUGGER; + HV * const ostash = PL_curstash; MAGIC *mg; @@ -4531,6 +4563,8 @@ Perl_init_debugger(pTHX) void Perl_init_stacks(pTHX) { + PERL_ARGS_ASSERT_INIT_STACKS; + SSize_t size; #ifdef PERL_RC_STACK @@ -4580,9 +4614,11 @@ Perl_init_stacks(pTHX) #undef REASONABLE -STATIC void +static void S_nuke_stacks(pTHX) { + PERL_ARGS_ASSERT_NUKE_STACKS; + while (PL_curstackinfo->si_next) PL_curstackinfo = PL_curstackinfo->si_next; while (PL_curstackinfo) { @@ -4604,12 +4640,12 @@ S_nuke_stacks(pTHX) void Perl_populate_isa(pTHX_ const char *name, STRLEN len, ...) { + PERL_ARGS_ASSERT_POPULATE_ISA; + GV *const gv = gv_fetchpvn(name, len, GV_ADD | GV_ADDMULTI, SVt_PVAV); AV *const isa = GvAVn(gv); va_list args; - PERL_ARGS_ASSERT_POPULATE_ISA; - if(AvFILLp(isa) != -1) return; @@ -4635,9 +4671,11 @@ Perl_populate_isa(pTHX_ const char *name } -STATIC void +static void S_init_predump_symbols(pTHX) { + PERL_ARGS_ASSERT_INIT_PREDUMP_SYMBOLS; + GV *tmpgv; IO *io; @@ -4700,8 +4738,13 @@ Perl_init_argv_symbols(pTHX_ int argc, c { PERL_ARGS_ASSERT_INIT_ARGV_SYMBOLS; + const bool mark_args_utf8 = + (!(PL_unicode & PERL_UNICODE_LOCALE_FLAG) || PL_utf8locale) + && (PL_unicode & PERL_UNICODE_ARGV_FLAG); + argc--,argv++; /* skip name of script */ if (PL_doswitches) { + const I32 flags = GV_ADD | (mark_args_utf8 ? SVf_UTF8 : 0); for (; argc > 0 && **argv == '-'; argc--,argv++) { char *s; if (!argv[0][1]) @@ -4712,11 +4755,16 @@ Perl_init_argv_symbols(pTHX_ int argc, c } if ((s = strchr(argv[0], '='))) { const char *const start_name = argv[0] + 1; - sv_setpv(GvSV(gv_fetchpvn_flags(start_name, s - start_name, - TRUE, SVt_PV)), s + 1); + SV *const sv = GvSV(gv_fetchpvn_flags(start_name, s - start_name, + flags, SVt_PV)); + sv_setpv(sv, s + 1); + if (mark_args_utf8) + SvUTF8_on(sv); + else + SvUTF8_off(sv); } else - sv_setiv(GvSV(gv_fetchpv(argv[0]+1, GV_ADD, SVt_PV)),1); + sv_setiv(GvSV(gv_fetchpv(argv[0]+1, flags, SVt_PV)), 1); } } if ((PL_argvgv = gv_fetchpvs("ARGV", GV_ADD|GV_NOTQUAL, SVt_PVAV))) { @@ -4726,12 +4774,10 @@ Perl_init_argv_symbols(pTHX_ int argc, c for (; argc > 0; argc--,argv++) { SV * const sv = newSVpv(argv[0],0); av_push(GvAV(PL_argvgv),sv); - if (!(PL_unicode & PERL_UNICODE_LOCALE_FLAG) || PL_utf8locale) { - if (PL_unicode & PERL_UNICODE_ARGV_FLAG) - SvUTF8_on(sv); - } + if (mark_args_utf8) + SvUTF8_on(sv); if (PL_unicode & PERL_UNICODE_WIDESYSCALLS_FLAG) /* Sarathy? */ - (void)sv_utf8_decode(sv); + (void)sv_utf8_decode(sv); } } @@ -4741,13 +4787,13 @@ Perl_init_argv_symbols(pTHX_ int argc, c "reading from STDIN"); } -STATIC void +static void S_init_postdump_symbols(pTHX_ int argc, char **argv, char **env) { - GV* tmpgv; - PERL_ARGS_ASSERT_INIT_POSTDUMP_SYMBOLS; + GV* tmpgv; + PL_toptarget = newSV_type(SVt_PVIV); SvPVCLEAR(PL_toptarget); PL_bodytarget = newSV_type(SVt_PVIV); @@ -4889,9 +4935,11 @@ S_init_postdump_symbols(pTHX_ int argc, } } -STATIC void +static void S_init_perllib(pTHX) { + PERL_ARGS_ASSERT_INIT_PERLLIB; + #ifndef VMS const char *perl5lib = NULL; #endif @@ -4976,13 +5024,13 @@ S_init_perllib(pTHX) /* Push a directory onto @INC if it exists. Generate a new SV if we do this, to save needing to copy the SV we push onto @INC */ -STATIC SV * +static SV * S_incpush_if_exists(pTHX_ AV *const av, SV *dir, SV *const stem) { - Stat_t tmpstatbuf; - PERL_ARGS_ASSERT_INCPUSH_IF_EXISTS; + Stat_t tmpstatbuf; + if (PerlLIO_stat(SvPVX_const(dir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) { av_push(av, dir); @@ -4995,13 +5043,14 @@ S_incpush_if_exists(pTHX_ AV *const av, } #endif -STATIC SV * +static SV * S_mayberelocate(pTHX_ const char *const dir, STRLEN len, U32 flags) { + PERL_ARGS_ASSERT_MAYBERELOCATE; + const U8 canrelocate = (U8)flags & INCPUSH_CAN_RELOCATE; SV *libdir; - PERL_ARGS_ASSERT_MAYBERELOCATE; assert(len > 0); /* I am not convinced that this is valid when PERLLIB_MANGLE is @@ -5112,7 +5161,7 @@ S_mayberelocate(pTHX_ const char *const length. libpath points somewhere into the libdir SV. We need to join the 2 with '/' and drop the result into libdir. */ - tempsv = Perl_newSVpvf(aTHX_ "%s/%s", prefix, libpath); + tempsv = newSVpvf("%s/%s", prefix, libpath); SvREFCNT_dec(libdir); /* And this is the new libdir. */ libdir = tempsv; @@ -5130,9 +5179,11 @@ S_mayberelocate(pTHX_ const char *const return libdir; } -STATIC void +static void S_incpush(pTHX_ const char *const dir, STRLEN len, U32 flags) { + PERL_ARGS_ASSERT_INCPUSH; + #ifndef PERL_IS_MINIPERL const U8 using_sub_dirs = (U8)flags & (INCPUSH_ADD_VERSIONED_SUB_DIRS @@ -5149,7 +5200,6 @@ S_incpush(pTHX_ const char *const dir, S const U8 push_basedir = (flags & INCPUSH_NOT_BASEDIR) ? 0 : 1; AV *const inc = GvAVn(PL_incgv); - PERL_ARGS_ASSERT_INCPUSH; assert(len > 0); /* Could remove this vestigial extra block, if we don't mind a lot of @@ -5174,7 +5224,7 @@ S_incpush(pTHX_ const char *const dir, S SV *subdir = newSVsv(libdir); #ifdef PERL_INC_VERSION_LIST /* Configure terminates PERL_INC_VERSION_LIST with a NULL */ - const char * const incverlist[] = { PERL_INC_VERSION_LIST }; + static const char * const incverlist[] = { PERL_INC_VERSION_LIST }; const char * const *incver; #endif @@ -5247,16 +5297,16 @@ S_incpush(pTHX_ const char *const dir, S } } -STATIC void +static void S_incpush_use_sep(pTHX_ const char *p, STRLEN len, U32 flags) { + PERL_ARGS_ASSERT_INCPUSH_USE_SEP; + const char *s; const char *end; /* This logic has been broken out from S_incpush(). It may be possible to simplify it. */ - PERL_ARGS_ASSERT_INCPUSH_USE_SEP; - /* perl compiled with -DPERL_RELOCATABLE_INCPUSH will ignore the len * argument to incpush_use_sep. This allows creation of relocatable * Perl distributions that patch the binary at install time. Those @@ -5291,6 +5341,8 @@ S_incpush_use_sep(pTHX_ const char *p, S void Perl_call_list(pTHX_ I32 oldscope, AV *paramList) { + PERL_ARGS_ASSERT_CALL_LIST; + SV *atsv; volatile const line_t oldline = PL_curcop ? CopLINE(PL_curcop) : 0; CV *cv; @@ -5298,8 +5350,6 @@ Perl_call_list(pTHX_ I32 oldscope, AV *p int ret; dJMPENV; - PERL_ARGS_ASSERT_CALL_LIST; - while (av_count(paramList) > 0) { cv = MUTABLE_CV(av_shift(paramList)); if (PL_savebegin) { @@ -5382,6 +5432,8 @@ say to do. void Perl_my_exit(pTHX_ U32 status) { + PERL_ARGS_ASSERT_MY_EXIT; + if (PL_exit_flags & PERL_EXIT_ABORT) { abort(); } @@ -5420,6 +5472,8 @@ On VMS, it takes care to set the appropr void Perl_my_failure_exit(pTHX) { + PERL_ARGS_ASSERT_MY_FAILURE_EXIT; + #ifdef VMS /* We have been called to fall on our sword. The desired exit code * should be already set in STATUS_UNIX, but could be shifted over @@ -5511,9 +5565,11 @@ Perl_my_failure_exit(pTHX) my_exit_jump(); } -STATIC void +static void S_my_exit_jump(pTHX) { + PERL_ARGS_ASSERT_MY_EXIT_JUMP; + if (PL_e_script) { SvREFCNT_dec(PL_e_script); PL_e_script = NULL; @@ -5553,6 +5609,8 @@ read_e_script(pTHX_ int idx, SV *buf_sv, void Perl_xs_boot_epilog(pTHX_ const SSize_t ax) { + PERL_ARGS_ASSERT_XS_BOOT_EPILOG; + if (PL_unitcheckav) call_list(PL_scopestack_ix, PL_unitcheckav); XSRETURN_YES; Index: gnu/usr.bin/perl/perl.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/perl.h,v diff -u -p -a -u -p -r1.31 perl.h --- gnu/usr.bin/perl/perl.h 26 Dec 2025 22:14:12 -0000 1.31 +++ gnu/usr.bin/perl/perl.h 16 Nov 2026 00:57:39 -0000 @@ -74,18 +74,19 @@ all when not under DEBUGGING, reducing t The program is responsible for maintaining the correct value for C. -=for apidoc CyW ||comma_pDEPTH -This is used in the prototype declarations for functions that take a L> -final parameter, much like L|perlguts/Background and MULTIPLICITY> -is used in functions that take a thread context initial parameter. +=for apidoc CmnW ||comma_pDEPTH +This is used in the prototype declarations for functions that take a +L> final parameter, much like L|perlguts/Background +and MULTIPLICITY> is used in functions that take a thread context initial +parameter. =for apidoc CmnW ||debug_aDEPTH -Same as L> but with no leading argument. Intended for functions with -no normal arguments, and used by L> itself. +Same as L> but with no leading argument. Intended for +functions with no normal arguments, and used by L> itself. =for apidoc CmnW ||debug_pDEPTH -Same as L> but with no leading argument. Intended for functions with -no normal arguments, and used by L> itself. +Same as L> but with no leading argument. Intended for +functions with no normal arguments, and used by L> itself. =cut */ @@ -237,6 +238,8 @@ Now a synonym for C>. # define pTHX_7 8 # define pTHX_8 9 # define pTHX_9 10 +# define pTHX_10 11 +# define pTHX_11 12 # define pTHX_12 13 # if defined(DEBUGGING) && !defined(PERL_TRACK_MEMPOOL) # define PERL_TRACK_MEMPOOL @@ -251,8 +254,6 @@ Now a synonym for C>. # define dTHX_DEBUGGING dNOOP #endif -#define STATIC static - #ifndef PERL_CORE /* Do not use these macros. They were part of PERL_OBJECT, which was an * implementation of multiplicity using C++ objects. They have been left @@ -267,6 +268,7 @@ Now a no-op. =cut */ +# define STATIC static # define CPERLscope(x) x # define CPERLarg void # define CPERLarg_ @@ -423,6 +425,9 @@ Now a no-op. # if PERL_GCC_VERSION_GE(3,3,0) # define HASATTRIBUTE_VISIBILITY # endif +# if PERL_GCC_VERSION_GE(12,0,0) +# define HASATTRIBUTE_UNINITIALIZED +# endif #endif #ifdef HASATTRIBUTE_DEPRECATED @@ -463,6 +468,9 @@ Now a no-op. */ # define __attribute__visibility__(x) __attribute__((visibility(x))) #endif +#ifdef HASATTRIBUTE_UNINITIALIZED +# define __attribute__uninitialized__ __attribute__((uninitialized)) +#endif /* If we haven't defined the attributes yet, define them to blank. */ #ifndef __attribute__deprecated__ @@ -495,6 +503,9 @@ Now a no-op. #ifndef __attribute__visibility__ # define __attribute__visibility__(x) #endif +#ifndef __attribute__uninitialized__ +# define __attribute__uninitialized__ +#endif /* Some OS warn on NULL format to printf */ #ifdef PRINTF_FORMAT_NULL_OK @@ -731,6 +742,8 @@ code. # define pTHX_7 7 # define pTHX_8 8 # define pTHX_9 9 +# define pTHX_10 10 +# define pTHX_11 11 # define pTHX_12 12 #endif @@ -1142,15 +1155,6 @@ violations are fatal. # include #endif -/* Even if not using locales, this header should be #included so as to #define - * some symbols which avoid #ifdefs to get things to compile. But make sure - * the macro it calls does nothing */ -#undef PERL_LOCALE_TABLE_ENTRY -#define PERL_LOCALE_TABLE_ENTRY(name, call_back) -#include "locale_table.h" - -#include "perl_langinfo.h" /* Needed for _NL_LOCALE_NAME */ - /* ========================================================================= * The defines from here to the following ===== line are unfortunately * duplicated in makedef.pl, and changes here MUST also be made there */ @@ -1175,12 +1179,23 @@ violations are fatal. # define USE_LOCALE # elif defined(HAS_SETLOCALE) # define USE_LOCALE +# else +# undef USE_LOCALE # endif #endif /* end of makedef.pl logic duplication. But there are other groups below. * ========================================================================= */ +/* Even if not using locales, this header should be #included so as to #define + * some symbols which avoid #ifdefs to get things to compile. But make sure + * the macro it calls does nothing */ +#undef PERL_LOCALE_TABLE_ENTRY +#define PERL_LOCALE_TABLE_ENTRY(name, call_back) +#include "locale_table.h" + +#include "perl_langinfo.h" /* Needed for _NL_LOCALE_NAME */ + #ifdef USE_LOCALE # define HAS_SKIP_LOCALE_INIT /* Solely for XS code to test for this #define */ @@ -1322,6 +1337,17 @@ typedef enum { # endif #endif /* End of USE_LOCALE */ +/* enable PERL_COPY_ON_WRITE by default */ +#if !defined(PERL_COPY_ON_WRITE) && !defined(PERL_NO_COW) +# define PERL_COPY_ON_WRITE +#endif + +#ifdef PERL_COPY_ON_WRITE +# define PERL_ANY_COW +#else +# define PERL_SAWAMPERSAND +#endif + /* end of makedef.pl logic duplication * ========================================================================= */ @@ -1422,51 +1448,6 @@ EXTERN_C int syscall(int, ...); EXTERN_C int usleep(unsigned int); #endif -/* Macros for correct constant construction. These are in C99 - * (so they will not be available in strict C89 mode), but they are nice, so - * let's define them if necessary. */ - -/* -=for apidoc_section $integer -=for apidoc Am|I16|INT16_C|number -=for apidoc_item |I32|INT32_C|number -=for apidoc_item |I64|INT64_C|number - -Returns a token the C compiler recognizes for the constant C of the -corresponding integer type on the machine. - -If the machine does not have a 64-bit type, C is undefined. -Use C> to get the largest type available on the platform. - -=for apidoc Am|U16|UINT16_C|number -=for apidoc_item |U32|UINT32_C|number -=for apidoc_item |U64|UINT64_C|number - -Returns a token the C compiler recognizes for the constant C of the -corresponding unsigned integer type on the machine. - -If the machine does not have a 64-bit type, C is undefined. -Use C> to get the largest type available on the platform. - - -=cut -*/ -#ifndef UINT16_C -# if INTSIZE >= 2 -# define UINT16_C(x) ((U16_TYPE)x##U) -# else -# define UINT16_C(x) ((U16_TYPE)x##UL) -# endif -#endif - -#ifndef UINT32_C -# if INTSIZE >= 4 -# define UINT32_C(x) ((U32_TYPE)x##U) -# else -# define UINT32_C(x) ((U32_TYPE)x##UL) -# endif -#endif - #ifdef I_STDINT typedef intmax_t PERL_INTMAX_T; typedef uintmax_t PERL_UINTMAX_T; @@ -1478,43 +1459,6 @@ Use C> to get the largest * removing the undef. */ #if defined(QUADKIND) -# undef PeRl_INT64_C -# undef PeRl_UINT64_C -/* Prefer the native integer types (int and long) over long long - * (which is not C89) and Win32-specific __int64. */ -# if QUADKIND == QUAD_IS_INT && INTSIZE == 8 -# define PeRl_INT64_C(c) (c) -# define PeRl_UINT64_C(c) CAT2(c,U) -# endif -# if QUADKIND == QUAD_IS_LONG && LONGSIZE == 8 -# define PeRl_INT64_C(c) CAT2(c,L) -# define PeRl_UINT64_C(c) CAT2(c,UL) -# endif -# if QUADKIND == QUAD_IS_LONG_LONG && defined(HAS_LONG_LONG) -# define PeRl_INT64_C(c) CAT2(c,LL) -# define PeRl_UINT64_C(c) CAT2(c,ULL) -# endif -# if QUADKIND == QUAD_IS___INT64 -# define PeRl_INT64_C(c) CAT2(c,I64) -# define PeRl_UINT64_C(c) CAT2(c,UI64) -# endif -# ifndef PeRl_INT64_C -# define PeRl_INT64_C(c) ((I64)(c)) /* last resort */ -# define PeRl_UINT64_C(c) ((U64TYPE)(c)) -# endif -/* In OS X the INT64_C/UINT64_C are defined with LL/ULL, which will - * not fly with C89-pedantic gcc, so let's undefine them first so that - * we can redefine them with our native integer preferring versions. */ -# if defined(PERL_DARWIN) && defined(PERL_GCC_PEDANTIC) -# undef INT64_C -# undef UINT64_C -# endif -# ifndef INT64_C -# define INT64_C(c) PeRl_INT64_C(c) -# endif -# ifndef UINT64_C -# define UINT64_C(c) PeRl_UINT64_C(c) -# endif /* =for apidoc_section $integer @@ -1525,8 +1469,6 @@ long>s, C would yield -1LL -See also, for example, C>. - Use L to declare variables of the maximum usable size on this platform. =for apidoc Am||UINTMAX_C|number @@ -1536,8 +1478,6 @@ Cs, C would yield 1UL -See also, for example, C>. - Use L to declare variables of the maximum usable size on this platform. =cut @@ -1625,14 +1565,6 @@ Use L to declare variables of the m #define PERL_MULTICONCAT_HEADER_SIZE 8 /* The number of fields of a multiconcat header */ -/* We no longer default to creating a new SV for GvSV. - Do this before embed. */ -#ifndef PERL_CREATE_GVSV -# ifndef PERL_DONT_CREATE_GVSV -# define PERL_DONT_CREATE_GVSV -# endif -#endif - #if !defined(HAS_WAITPID) && !defined(HAS_WAIT4) || defined(HAS_WAITPID_RUNTIME) #define PERL_USES_PL_PIDSTATUS #endif @@ -1684,6 +1616,30 @@ Use L to declare variables of the m # define PERL_STRLEN_EXPAND_SHIFT 2 #endif +/* "expected_size" is a functional stub for building on in the future. + * The intention is to pass it a number of bytes, prior to using that + * number in a call to something like malloc() or realloc(), and a best- + * guess at the size to be allocated will be returned. ("Best-guess" + * may vary by platform and malloc implementation.) + * This will be useful to (1) grow strings (or anything else) in a way + * that results in SvLEN more accurately reflecting the usable space + * that has been allocated, and (2) we don't try to shrink an + * allocation that won't actually shrink in practice. + * Right now, this macro just rounds up a given number to the nearest + * multiple of PTRSIZE, for a minimum of PERL_STRLEN_NEW_MIN. This is + * not entirely useless, just not terribly accurate. + */ +#define expected_size(n) ( ((n) > PERL_STRLEN_NEW_MIN) \ + ? ( \ + (void)( \ + (MEM_SIZE)(n) > MEM_SIZE_MAX - (PTRSIZE - 1) \ + ? (croak_memory_wrap(), 0) \ + : 0 \ + ), \ + ((MEM_SIZE)(n) + (PTRSIZE - 1)) & ~(MEM_SIZE)(PTRSIZE - 1) \ + ) \ + : PERL_STRLEN_NEW_MIN ) + /* This use of offsetof() requires /Zc:offsetof- for VS2017 (and presumably * onwards) when building Socket.xs, but we can just use a different definition * for STRUCT_OFFSET instead. */ @@ -2006,7 +1962,7 @@ any magic. SV ** const svp = &GvSV(PL_errgv); \ if (!*svp) { \ *svp = newSVpvs(""); \ - } else if (SvREADONLY(*svp)) { \ + } else if (SvREADONLY(*svp) || isGV_with_GP(*svp)) { \ SvREFCNT_dec_NN(*svp); \ *svp = newSVpvs(""); \ } else { \ @@ -2458,8 +2414,27 @@ typedef UVTYPE UV; #define Size_t_MAX (~(Size_t)0) #define SSize_t_MAX (SSize_t)(~(Size_t)0 >> 1) -#define IV_DIG (BIT_DIGITS(IVSIZE * 8)) -#define UV_DIG (BIT_DIGITS(UVSIZE * 8)) +/* +=for apidoc_section $integer +=for apidoc Amn|unsigned|IV_BITS +=for apidoc_item |unsigned|UV_BITS + +These return the number of bits in an IV and UV, respectively. These values +vary depending on platform capabilities and Configure options. + +=for apidoc Amn|unsigned|IV_DIG +=for apidoc_item |unsigned|UV_DIG + +These return the number of decimal digits required to represent any possible +number of their respective types. These values vary depending on platform +capabilities and Configure options. + +=cut +*/ +#define IV_BITS (IVSIZE * CHARBITS) +#define IV_DIG (BIT_DIGITS(IV_BITS)) +#define UV_BITS (UVSIZE * CHARBITS) +#define UV_DIG (BIT_DIGITS(UV_BITS)) #ifndef NO_PERL_PRESERVE_IVUV #define PERL_PRESERVE_IVUV /* We like our integers to stay integers. */ @@ -3277,17 +3252,6 @@ typedef struct padname PADNAME; # define PERL_OP_PARENT #endif -/* enable PERL_COPY_ON_WRITE by default */ -#if !defined(PERL_COPY_ON_WRITE) && !defined(PERL_NO_COW) -# define PERL_COPY_ON_WRITE -#endif - -#ifdef PERL_COPY_ON_WRITE -# define PERL_ANY_COW -#else -# define PERL_SAWAMPERSAND -#endif - #if defined(PERL_DEBUG_READONLY_OPS) && !defined(USE_ITHREADS) # error PERL_DEBUG_READONLY_OPS only works with ithreads #endif @@ -3749,6 +3713,9 @@ EXTERN_C int perl_tsa_mutex_lock(perl_mu EXTERN_C int perl_tsa_mutex_unlock(perl_mutex* mutex) PERL_TSA_RELEASE(*mutex) PERL_TSA_NO_TSA; +#elif defined(USE_ITHREADS) && defined(I_PTHREAD) +EXTERN_C int perl_tsa_mutex_lock(perl_mutex* mutex); +EXTERN_C int perl_tsa_mutex_unlock(perl_mutex* mutex); #endif #if defined(WIN32) @@ -4185,6 +4152,14 @@ Obsolete form of C, which you shou # define UVf UVuf #endif +/* Use this like: + * #define sv1_ PERL_UNIQUE_NAME(sv) + * and it will expand to something very likely unique to your file, beginning + * with 'PL_' which means there should be no name collision with the caller. + * an underscore. If two 'sv1_' are attempted to be defined, a compiler + * warning will get raised, so you can change one of them. */ +#define PERL_UNIQUE_NAME(name) CAT2(PL_, CAT2(name, __LINE__)) + #if !defined(DEBUGGING) && !defined(NDEBUG) # define NDEBUG 1 #endif @@ -4227,18 +4202,42 @@ hint to the compiler that this condition /* placeholder */ #endif -/* STATIC_ASSERT_DECL/STATIC_ASSERT_STMT are like assert(), but for compile - time invariants. That is, their argument must be a constant expression that - can be verified by the compiler. This expression can contain anything that's - known to the compiler, e.g. #define constants, enums, or sizeof (...). If - the expression evaluates to 0, compilation fails. - Because they generate no runtime code (i.e. their use is "free"), they're - always active, even under non-DEBUGGING builds. - STATIC_ASSERT_DECL expands to a declaration and is suitable for use at - file scope (outside of any function). - STATIC_ASSERT_STMT expands to a statement and is suitable for use inside a - function. +/* +=for apidoc Am||STATIC_ASSERT_DECL|const_expr +=for apidoc_item STATIC_ASSERT_EXPR +=for apidoc_item STATIC_ASSERT_STMT + +These are like assert(), but for compile time invariants. That is, their +argument must be a constant expression that can be verified by the compiler. +This expression can contain anything that's known to the compiler, e.g. #define +constants, enums, or sizeof (...). If the expression evaluates to 0, +compilation fails. + +Because they generate no runtime code (i.e. their use is "free"), they're +always active, even under non-DEBUGGING builds. + +C expands to a statement and is suitable for use inside a +function. + +C expands to a declaration and is suitable for use inside a +function or at file scope (outside of any function). + +C expands to an expression and is suitable anywhere an +expression is usable. It has some limitations compared to the other two when +used on a platform without L>. On those +platforms it expands to an ASSUME(). When called with a compile-time +expression, the compiler should optimize out the expression, so that the use of +this is "free", but constness is not enforced. On non-DEBUGGING builds, this +will expand to a no-op, so again it is "free", but no checking is done. + +Thus code that uses this macro can be ported to all platforms without needing +to change, and it will work as well as is possible on that platform. +Presumably it will get compiled at some point before release on a platform +where it has parity with the other two forms. + +=cut */ + #if (! defined(__IBMC__) || __IBMC__ >= 1210) \ && (( defined(static_assert) && ( defined(_ISOC11_SOURCE) \ || (__STDC_VERSION__ - 0) >= 201101L)) \ @@ -4249,21 +4248,58 @@ hint to the compiler that this condition */ # define STATIC_ASSERT_DECL(COND) static_assert(COND, #COND) #else -/* We use a bit-field instead of an array because gcc accepts - 'typedef char x[n]' where n is not a compile-time constant. - We want to enforce constantness. -*/ -# define STATIC_ASSERT_2(COND, SUFFIX) \ - typedef struct { \ - unsigned int _static_assertion_failed_##SUFFIX : (COND) ? 1 : -1; \ - } _static_assertion_failed_##SUFFIX PERL_UNUSED_DECL -# define STATIC_ASSERT_1(COND, SUFFIX) STATIC_ASSERT_2(COND, SUFFIX) -# define STATIC_ASSERT_DECL(COND) STATIC_ASSERT_1(COND, __LINE__) + +/* This generates a struct with a bit field like so: + * + * struct { unsigned int name#: size; } name# + * + * 'name#' is the name followed by the line number this is used on. The + * name is 'static_assertion_failed_', so that a typical name would be + * + * static_assertion_failed_123 + * + * The first name# will show up in the compiler's error message, clueing in the + * reader as to the problem and where. The second one makes sure that the + * struct name is unique to the compilation unit. + * + * 'size' is expressed as a ternary: '((cond) ? 1 : -1)' + * + * If 'cond' is true the size is 1, which is legal; if false, the size is -1. + * It is illegal to have a negatively-sized bit field, so the compilation will + * abort iff 'cond' is false, giving an appropriate error message. + * + * The basic struct is used in different ways depending on whether the + * application is for a declaration (typedef struct), or statement + * (STMT_START { struct } STMT_END). + * + * We use a bit-field instead of an array because gcc accepts + typedef char x[n] + where n is not a compile-time constant. We want to enforce constantness. + */ + /* Return the struct and element name */ +# define STATIC_ASSERT_STRUCT_NAME_ PERL_UNIQUE_NAME(static_assertion_failed_) + + /* Return the struct body */ +# define STATIC_ASSERT_STRUCT_BODY_(COND, NAME) \ + struct { unsigned NAME : (COND) ? 1 : -1; } + +# define STATIC_ASSERT_DECL(COND) \ + typedef STATIC_ASSERT_STRUCT_BODY_(COND, STATIC_ASSERT_STRUCT_NAME_) \ + STATIC_ASSERT_STRUCT_NAME_ PERL_UNUSED_DECL + #endif + /* We need this wrapper even in C11 because 'case X: static_assert(...);' is an error (static_assert is a declaration, and only statements can have labels). */ -#define STATIC_ASSERT_STMT(COND) STMT_START { STATIC_ASSERT_DECL(COND); } STMT_END +#define STATIC_ASSERT_STMT(COND) \ + STMT_START { STATIC_ASSERT_DECL(COND); } STMT_END + +#ifdef PERL_USE_GCC_BRACE_GROUPS +# define STATIC_ASSERT_EXPR(COND) ({ STATIC_ASSERT_DECL(COND); }) +#else +# define STATIC_ASSERT_EXPR(COND) ASSUME(COND) +#endif #ifndef __has_builtin # define __has_builtin(x) 0 /* not a clang style compiler */ @@ -4370,8 +4406,17 @@ intrinsic function, see its documents fo cBOOL(PerlLIO_setmode(fileno(fp), mode) != -1) #endif -#ifdef __CYGWIN__ +#if defined(__CYGWIN__) || defined(__MVS__) + void init_os_extras(void); + +#endif +#if defined(__MVS__) +# ifdef EBCDIC +# define __setfdccsid(to_fd, bits) 0 +# else +# include +# endif #endif union any { @@ -4436,11 +4481,18 @@ typedef struct crypt_data { / # define PERL_CALLCONV_NO_RET PERL_CALLCONV #endif -/* PERL_STATIC_NO_RET is supposed to be equivalent to STATIC on builds that +/* Some platforms require special handling of functions that don't return, but + * are declared as having a return value that isn't 'void'. Use whatever + * they've set, or if nothing, just use the normal handling. */ +#ifndef PERL_CALLCONV_NON_VOID_NO_RET +# define PERL_CALLCONV_NON_VOID_NO_RET(ret_type) PERL_CALLCONV_NO_RET +#endif + +/* PERL_STATIC_NO_RET is supposed to be equivalent to static on builds that dont have a noreturn as a declaration specifier */ #ifndef PERL_STATIC_NO_RET -# define PERL_STATIC_NO_RET STATIC +# define PERL_STATIC_NO_RET static #endif /* PERL_STATIC_INLINE_NO_RET is supposed to be equivalent to PERL_STATIC_INLINE @@ -4528,9 +4580,9 @@ struct Perl_OpDumpContext; #define my_lstat() my_lstat_flags(SV_GMAGIC) /* defined in sv.c, but also used in [ach]v.c */ -#undef _XPV_HEAD -#undef _XPVMG_HEAD -#undef _XPVCV_COMMON +#undef XPV_HEAD_ +#undef XPVMG_HEAD_ +#undef XPVCV_COMMON_ #include "parser.h" @@ -4551,7 +4603,7 @@ typedef struct regnode_charclass_posixl typedef struct regnode_ssc regnode_ssc; typedef struct RExC_state_t RExC_state_t; -struct _reg_trie_data; +struct reg_trie_data_; typedef struct scan_data_t scan_data_t; #endif @@ -4605,13 +4657,15 @@ struct ptr_tbl { htonl etc they will clash with the declarations in the Win32 headers. */ PERL_STATIC_INLINE U32 -my_swap32(const U32 x) { +my_swap32(const U32 x) +{ return ((x & 0xFF) << 24) | ((x >> 24) & 0xFF) | ((x & 0x0000FF00) << 8) | ((x & 0x00FF0000) >> 8); } PERL_STATIC_INLINE U16 -my_swap16(const U16 x) { +my_swap16(const U16 x) +{ return ((x & 0xFF) << 8) | ((x >> 8) & 0xFF); } @@ -5083,29 +5137,73 @@ Gid_t getegid (void); #define DEBUG_SCOPE(where) \ DEBUG_l( \ - Perl_deb(aTHX_ "%s scope %ld (savestack=%ld) at %s:%d\n", \ - where, (long)PL_scopestack_ix, (long)PL_savestack_ix, \ - __FILE__, __LINE__)); + deb("%s scope %ld (savestack=%ld) at %s:%d\n", \ + where, (long)PL_scopestack_ix, (long)PL_savestack_ix, \ + __FILE__, __LINE__)); +/* +=for apidoc_section $directives +=for apidoc ATmp|void|assert_|bool expr +=for apidoc_item Tm| |__ASSERT_ + +These are synonymous, used to wrap the libc C call in comma +expressions in macro expansions, but you probably don't want to use them nor +plain C; read on. + +In DEBUGGING builds, each expands to an assert of its argument, followed by +a comma. (That is what the trailing underscore signifies.) + +In non-DEBUGGING builds, each expands to nothing. + +They thus can be used to string together a bunch of asserts in a comma +expression that is syntactically valid in either type of build. + +NOTE, however, use of these (and plain C) is discouraged in a macro. +This is because their usual use is to validate some of the arguments to that +macro. That will likely lead to the evaluation of those arguments more than +once during the macro expansion. If such an argument is an expression with +side effects, the behavior of the macro will differ between DEBUGGING and +non-DEBUGGING builds. + +And, they are necessary only on platforms where the libc C expands to +nothing when not in a DEBUGGING build. There should be no such platforms now +in existence, as the C89 standard forbids that, and Perl requires at least C99. +So, you can just use plain C, and say S> +and everything will compile (and will work if none of the arguments to the +asserts is an expression with side effects). + +These macros are retained for backward compatibility. + +Do NOT use C<__ASSERT_>. A name with two leading underscores followed by a +capital letter is reserved for the use of the compiler and libc in some +contexts in C, and in all contexts in C++. + +=cut +*/ /* Keep the old croak based assert for those who want it, and as a fallback if the platform is so heretically non-ANSI that it can't assert. */ -#define Perl_assert(what) PERL_DEB2( \ - ((what) ? ((void) 0) : \ - (Perl_croak_nocontext("Assertion %s failed: file \"" __FILE__ \ - "\", line %d", STRINGIFY(what), __LINE__), \ - (void) 0)), ((void)0)) - -/* assert() gets defined if DEBUGGING. - * If no DEBUGGING, the has not been included. */ #ifndef assert -# define assert(what) Perl_assert(what) +# define assert(what) Perl_assert(what) #endif -#ifdef DEBUGGING -# define assert_(what) assert(what), + +#if defined DEBUGGING \ + && ! defined(__COVERITY__) \ + && ! defined(PERL_SMALL_MACRO_BUFFER) +# define Perl_assert(what) \ + ((what) \ + ? ((void) 0) \ + : (Perl_croak_nocontext("Assertion %s failed:" \ + " file \"" __FILE__ "\", line %" LINE_Tf, \ + STRINGIFY(what), (line_t) __LINE__), \ + (void) 0)) +# define Perl_assert_(what) assert(what), #else -# define assert_(what) +# define Perl_assert(what) ((void) 0) +# define Perl_assert_(what) #endif +#define assert_(what) Perl_assert_(what) +#define __ASSERT_(statement) Perl_assert_(statement) struct ufuncs { I32 (*uf_val)(pTHX_ IV, SV*); @@ -5413,7 +5511,7 @@ EXTCONST char PL_Zero[] /* =for apidoc_section $numeric -=for apidoc AmTuU|const char *|PL_hexdigit|U8 value +=for apidoc A@T|const char *|PL_hexdigit|U8 value This array, indexed by an integer, converts that value into the character that represents it. For example, if the input is 8, the return will be a string @@ -5473,26 +5571,24 @@ EXTCONST char PL_uudmap[256] = EXTCONST char PL_bitcount[256] = # include "bitcount.h" ; -EXTCONST char* const PL_sig_name[] = { SIG_NAME }; -EXTCONST int PL_sig_num[] = { SIG_NUM }; #else EXTCONST char PL_uudmap[256]; EXTCONST char PL_bitcount[256]; -EXTCONST char* const PL_sig_name[]; -EXTCONST int PL_sig_num[]; #endif +EXTCONST char* const PL_sig_name[] INIT( { SIG_NAME } ); +EXTCONST int PL_sig_num[] INIT( { SIG_NUM } ); + /* fast conversion and case folding tables. The folding tables complement the * fold, so that 'a' maps to 'A' and 'A' maps to 'a', ignoring more complicated * folds such as outside the range or to multiple characters. */ -#ifdef DOINIT -# ifndef EBCDIC +#ifndef EBCDIC /* The EBCDIC fold table depends on the code page, and hence is found in * ebcdic_tables.h */ -EXTCONST unsigned char PL_fold[] = { +EXTCONST unsigned char PL_fold[] INIT({ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, @@ -5525,9 +5621,9 @@ EXTCONST unsigned char PL_fold[] = { 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 -}; +}); -EXTCONST unsigned char PL_fold_latin1[] = { +EXTCONST unsigned char PL_fold_latin1[] INIT ({ /* Full latin1 complement folding, except for three problematic code points: * Micro sign (181 = 0xB5) and y with diaeresis (255 = 0xFF) have their * fold complements outside the Latin1 range, so can't match something @@ -5569,11 +5665,11 @@ EXTCONST unsigned char PL_fold_latin1[] 240-32, 241-32, 242-32, 243-32, 244-32, 245-32, 246-32, 247, 248-32, 249-32, 250-32, 251-32, 252-32, 253-32, 254-32, 255 /* y with diaeresis */ -}; +}); /* If these tables are accessed through ebcdic, the access will be converted to * latin1 first */ -EXTCONST unsigned char PL_latin1_lc[] = { /* lowercasing */ +EXTCONST unsigned char PL_latin1_lc[] INIT({ /* lowercasing */ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, @@ -5606,7 +5702,9 @@ EXTCONST unsigned char PL_latin1_lc[] = 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255 -}; +}); + +# ifdef DOINIT /* upper and title case of latin1 characters, modified so that the three tricky * ones are mapped to 255 (which is one of the three) */ @@ -5651,39 +5749,31 @@ EXTCONST unsigned char PL_mod_latin1_uc 240-32, 241-32, 242-32, 243-32, 244-32, 245-32, 246-32, 247, 248-32, 249-32, 250-32, 251-32, 252-32, 253-32, 254-32, 255 }; -# endif /* !EBCDIC, but still in DOINIT */ -#else /* ! DOINIT */ -# ifndef EBCDIC -EXTCONST unsigned char PL_fold[]; -EXTCONST unsigned char PL_fold_latin1[]; +# else /* ! DOINIT */ EXTCONST unsigned char PL_mod_latin1_uc[]; -EXTCONST unsigned char PL_latin1_lc[]; -# endif -#endif +# endif +#endif /* ! EBCDIC */ /* Although only used for debugging, these constants must be available in * non-debugging builds too, since they're used in ext/re/re_exec.c, * which has DEBUGGING enabled always */ -#ifdef DOINIT -EXTCONST char* const PL_block_type[] = { - "NULL", - "WHEN", - "BLOCK", - "GIVEN", - "LOOP_ARY", - "LOOP_LAZYSV", - "LOOP_LAZYIV", - "LOOP_LIST", - "LOOP_PLAIN", - "SUB", - "FORMAT", - "EVAL", - "SUBST", - "DEFER" -}; -#else -EXTCONST char* PL_block_type[]; -#endif +EXTCONST char* const PL_block_type[] INIT({ + "NULL", + "WHEN", + "BLOCK", + "GIVEN", + "LOOP_ARY", + "LOOP_LAZYSV", + "LOOP_LAZYIV", + "LOOP_LIST", + "LOOP_PLAIN", + "SUB", + "FORMAT", + "EVAL", + "SUBST", + "DEFER" + } + ); /* These are all the compile time options that affect binary compatibility. Other compile time options that are binary compatible are in perl.c @@ -5818,19 +5908,16 @@ enum perl_phase { PERL_PHASE_DESTRUCT = 6 }; -#ifdef DOINIT -EXTCONST char *const PL_phase_names[] = { - "CONSTRUCT", - "START", - "CHECK", - "INIT", - "RUN", - "END", - "DESTRUCT" -}; -#else -EXTCONST char *const PL_phase_names[]; -#endif +EXTCONST char *const PL_phase_names[] INIT( { + "CONSTRUCT", + "START", + "CHECK", + "INIT", + "RUN", + "END", + "DESTRUCT" + } + ); /* =for apidoc_section $utility @@ -5903,13 +5990,8 @@ typedef enum { special and there is no need for HINT_PRIVATE_MASK for COPs. NOTE: The typical module using these has the bit value hard-coded, so don't - blindly change the values of these. + blindly change the values of these. */ - If we run out of bits, the 2 locale ones could be combined. The PARTIAL one - is for "use locale 'FOO'" which excludes some categories. It requires going - to %^H to find out which are in and which are out. This could be extended - for the normal case of a plain HINT_LOCALE, so that %^H would be used for - any locale form. */ #define HINT_INTEGER 0x00000001 /* integer pragma */ #define HINT_STRICT_REFS 0x00000002 /* strict pragma */ #define HINT_LOCALE 0x00000004 /* locale pragma */ @@ -6239,7 +6321,7 @@ EXTCONST runops_proc_t PL_runops_std EXTCONST runops_proc_t PL_runops_dbg INIT(Perl_runops_debug); -#define EXT_MGVTBL EXTCONST MGVTBL +#define EXT_MGVTBL EXT MGVTBL #define PERL_MAGIC_READONLY_ACCEPTABLE 0x40 #define PERL_MAGIC_VALUE_MAGIC 0x80 @@ -6257,57 +6339,46 @@ EXTCONST runops_proc_t PL_runops_dbg #include "mg_vtable.h" +EXTCONST U8 PL_magic_data[256] #ifdef DOINIT -EXTCONST U8 PL_magic_data[256] = += # include "mg_data.h" -; -#else -EXTCONST U8 PL_magic_data[256]; #endif +; -#ifdef DOINIT /* NL IV NV PV INV PI PN MG RX GV LV AV HV CV FM IO OBJ */ EXTCONST bool -PL_valid_types_IVX[] = { 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0 }; +PL_valid_types_IVX[] INIT({ 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0 }); EXTCONST bool -PL_valid_types_NVX[] = { 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0 }; +PL_valid_types_NVX[] INIT({ 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0 }); EXTCONST bool -PL_valid_types_PVX[] = { 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0 }; +PL_valid_types_PVX[] INIT({ 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0 }); EXTCONST bool -PL_valid_types_RV[] = { 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0 }; +PL_valid_types_RV[] INIT({ 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0 }); EXTCONST bool -PL_valid_types_IV_set[] = { 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0 }; +PL_valid_types_IV_set[] + INIT({ 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0 }); EXTCONST bool -PL_valid_types_NV_set[] = { 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 }; +PL_valid_types_NV_set[] + INIT({ 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 }); EXTCONST U8 -PL_deBruijn_bitpos_tab32[] = { +PL_deBruijn_bitpos_tab32[] +INIT({ /* https://graphics.stanford.edu/~seander/bithacks.html#IntegerLogDeBruijn */ 0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9 -}; +}); EXTCONST U8 -PL_deBruijn_bitpos_tab64[] = { +PL_deBruijn_bitpos_tab64[] +INIT({ /* https://stackoverflow.com/questions/11376288/fast-computing-of-log2-for-64-bit-integers */ 63, 0, 58, 1, 59, 47, 53, 2, 60, 39, 48, 27, 54, 33, 42, 3, 61, 51, 37, 40, 49, 18, 28, 20, 55, 30, 34, 11, 43, 14, 22, 4, 62, 57, 46, 52, 38, 26, 32, 41, 50, 36, 17, 19, 29, 10, 13, 21, 56, 45, 25, 31, 35, 16, 9, 12, 44, 24, 15, 8, 23, 7, 6, 5 -}; - -#else - -EXTCONST bool PL_valid_types_IVX[]; -EXTCONST bool PL_valid_types_NVX[]; -EXTCONST bool PL_valid_types_PVX[]; -EXTCONST bool PL_valid_types_RV[]; -EXTCONST bool PL_valid_types_IV_set[]; -EXTCONST bool PL_valid_types_NV_set[]; -EXTCONST U8 PL_deBruijn_bitpos_tab32[]; -EXTCONST U8 PL_deBruijn_bitpos_tab64[]; - -#endif +}); /* The constants for using PL_deBruijn_bitpos_tab */ #define PERL_deBruijnMagic32_ 0x077CB531 @@ -6468,7 +6539,7 @@ EXTCONST U8 PL_deBruijn_bitpos_tab64[] STMT_START { \ CLANG_DIAG_IGNORE(-Wthread-safety) \ if (counter <= 0) { \ - assert(count == 0); \ + assert(counter == 0); \ PERL_READ_UNLOCK(mutex); \ } \ else if (LIKELY((mutex)->readers_count > 0)) { \ @@ -6515,10 +6586,9 @@ SOFTWARE. */ -# ifdef DOINIT -# if 0 /* This is the original table given in +# if 0 /* This is the original table given in https://bjoern.hoehrmann.de/utf-8/decoder/dfa/ */ -static U8 utf8d_C9[] = { +static U8 utf8d_C9[] INIT( { /* The first part of the table maps bytes to character classes that * to reduce the size of the transition table and create bitmasks. */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /*-1F*/ @@ -6537,9 +6607,10 @@ static U8 utf8d_C9[] = { 12,12,12,12,12,12,12,24,12,12,12,12, 12,24,12,12,12,12,12,12,12,24,12,12, 12,12,12,12,12,12,12,36,12,36,12,12, 12,36,12,12,12,12,12,36,12,36,12,12, 12,36,12,12,12,12,12,12,12,12,12,12 -}; +}); -# endif +# endif +# ifdef DOINIT /* This is a version of the above table customized for Perl that doesn't * exclude surrogates and accepts start bytes up through FD (FE on 64-bit @@ -6817,7 +6888,7 @@ EXTCONST U8 PL_strict_utf8_dfa_tab[] = { * Continuation bytes BE and BF are illegal (non-characters); the other * continuations transition to N0. * 1 Reject. All transitions not mentioned above (except the single - * byte ones (as they are always legal) are to this state. + * byte ones (as they are always legal)) are to this state. */ # undef N0 @@ -7756,26 +7827,26 @@ cannot have changed since the precalcula (! PL_numeric_underlying && PL_numeric_standard < 2) # define DECLARATION_FOR_LC_NUMERIC_MANIPULATION \ - void (*_restore_LC_NUMERIC_function)(pTHX_ const char * const file, \ + void (*restore_LC_NUMERIC_function_)(pTHX_ const char * const file, \ const line_t line) = NULL # define STORE_LC_NUMERIC_SET_TO_NEEDED_IN(in) \ STMT_START { \ - bool _in_lc_numeric = (in); \ + bool in_lc_numeric_ = (in); \ LC_NUMERIC_LOCK( \ - ( ( _in_lc_numeric && NOT_IN_NUMERIC_UNDERLYING_) \ - || (! _in_lc_numeric && NOT_IN_NUMERIC_STANDARD_))); \ - if (_in_lc_numeric) { \ + ( ( in_lc_numeric_ && NOT_IN_NUMERIC_UNDERLYING_) \ + || (! in_lc_numeric_ && NOT_IN_NUMERIC_STANDARD_))); \ + if (in_lc_numeric_) { \ if (NOT_IN_NUMERIC_UNDERLYING_) { \ Perl_set_numeric_underlying(aTHX_ __FILE__, __LINE__); \ - _restore_LC_NUMERIC_function \ + restore_LC_NUMERIC_function_ \ = &Perl_set_numeric_standard; \ } \ } \ else { \ if (NOT_IN_NUMERIC_STANDARD_) { \ Perl_set_numeric_standard(aTHX_ __FILE__, __LINE__); \ - _restore_LC_NUMERIC_function \ + restore_LC_NUMERIC_function_ \ = &Perl_set_numeric_underlying; \ } \ } \ @@ -7786,8 +7857,8 @@ cannot have changed since the precalcula # define RESTORE_LC_NUMERIC() \ STMT_START { \ - if (_restore_LC_NUMERIC_function) { \ - _restore_LC_NUMERIC_function(aTHX_ __FILE__, __LINE__); \ + if (restore_LC_NUMERIC_function_) { \ + restore_LC_NUMERIC_function_(aTHX_ __FILE__, __LINE__); \ } \ LC_NUMERIC_UNLOCK; \ } STMT_END @@ -7821,7 +7892,7 @@ cannot have changed since the precalcula STMT_START { \ LC_NUMERIC_LOCK(NOT_IN_NUMERIC_STANDARD_); \ if (NOT_IN_NUMERIC_STANDARD_) { \ - _restore_LC_NUMERIC_function = &Perl_set_numeric_underlying;\ + restore_LC_NUMERIC_function_ = &Perl_set_numeric_underlying;\ Perl_set_numeric_standard(aTHX_ __FILE__, __LINE__); \ } \ } STMT_END @@ -7833,7 +7904,7 @@ cannot have changed since the precalcula LC_NUMERIC_LOCK(NOT_IN_NUMERIC_UNDERLYING_); \ if (NOT_IN_NUMERIC_UNDERLYING_) { \ Perl_set_numeric_underlying(aTHX_ __FILE__, __LINE__); \ - _restore_LC_NUMERIC_function = &Perl_set_numeric_standard; \ + restore_LC_NUMERIC_function_ = &Perl_set_numeric_standard; \ } \ } STMT_END @@ -7943,22 +8014,7 @@ END_EXTERN_C =for apidoc_defn AmTR|NV|Strtod|NN const char * const s|NULLOK char **e -=for apidoc AmTR|NV|Strtol|NN const char * const s|NULLOK char ** e|int base - -Platform and configuration independent C. This expands to the -appropriate C-like function based on the platform and F -options>. For example it could expand to C or C instead of -C. - -=for apidoc AmTR|NV|Strtoul|NN const char * const s|NULLOK char ** e|int base - -Platform and configuration independent C. This expands to the -appropriate C-like function based on the platform and F -options>. For example it could expand to C or C instead of -C. - =cut - */ #define Strtod my_strtod @@ -7970,6 +8026,17 @@ C. # define Perl_strtod Strtod #endif + +/* +=for apidoc AmTR|NV|Strtol|NN const char * const s|NULLOK char ** e|int base + +Platform and configuration independent C. This expands to the +appropriate C-like function based on the platform and F +options>. For example it could expand to C or C instead of +C. + +=cut +*/ #if !defined(Strtol) && defined(USE_64_BIT_INT) && defined(IV_IS_QUAD) && \ (QUADKIND == QUAD_IS_LONG_LONG || QUADKIND == QUAD_IS___INT64) # ifdef __hpux @@ -8004,6 +8071,18 @@ C. # endif #endif + +/* +=for apidoc AmTR|NV|Strtoul|NN const char * const s|NULLOK char ** e|int base + +Platform and configuration independent C. This expands to the +appropriate C-like function based on the platform and F +options>. For example it could expand to C or C instead of +C. + +=cut + +*/ #if !defined(Strtoul) && defined(USE_64_BIT_INT) && defined(UV_IS_QUAD) && \ (QUADKIND == QUAD_IS_LONG_LONG || QUADKIND == QUAD_IS___INT64) # ifdef __hpux @@ -8030,14 +8109,6 @@ C. # define Atoul(s) Strtoul(s, NULL, 10) #endif -#define grok_bin(s,lp,fp,rp) \ - grok_bin_oct_hex(s, lp, fp, rp, 1, CC_BINDIGIT_, 'b') -#define grok_oct(s,lp,fp,rp) \ - (*(fp) |= PERL_SCAN_DISALLOW_PREFIX, \ - grok_bin_oct_hex(s, lp, fp, rp, 3, CC_OCTDIGIT_, '\0')) -#define grok_hex(s,lp,fp,rp) \ - grok_bin_oct_hex(s, lp, fp, rp, 4, CC_XDIGIT_, 'x') - #ifndef PERL_SCRIPT_MODE #define PERL_SCRIPT_MODE "r" #endif @@ -8264,40 +8335,6 @@ EXTERN_C int flock(int fd, int op); */ #define GROK_NUMERIC_RADIX(sp, send) grok_numeric_radix(sp, send) -/* Number scan flags. All are used for input, the ones used for output are so - * marked */ -#define PERL_SCAN_ALLOW_UNDERSCORES 0x01 /* grok_??? accept _ in numbers */ -#define PERL_SCAN_DISALLOW_PREFIX 0x02 /* grok_??? reject 0x in hex etc */ - -/* grok_??? input: ignored; output: found overflow */ -#define PERL_SCAN_GREATER_THAN_UV_MAX 0x04 - -/* grok_??? don't warn about illegal digits. To preserve total backcompat, - * this isn't set on output if one is found. Instead, see - * PERL_SCAN_NOTIFY_ILLDIGIT. */ -#define PERL_SCAN_SILENT_ILLDIGIT 0x08 - -#define PERL_SCAN_TRAILING 0x10 /* grok_number_flags() allow trailing - and set IS_NUMBER_TRAILING */ - -/* These are considered experimental, so not exposed publicly */ -#if defined(PERL_CORE) || defined(PERL_EXT) -/* grok_??? don't warn about very large numbers which are <= UV_MAX; - * output: found such a number */ -# define PERL_SCAN_SILENT_NON_PORTABLE 0x20 - -/* If this is set on input, and no illegal digit is found, it will be cleared - * on output; otherwise unchanged */ -# define PERL_SCAN_NOTIFY_ILLDIGIT 0x40 - -/* Don't warn on overflow; output flag still set */ -# define PERL_SCAN_SILENT_OVERFLOW 0x80 - -/* Forbid a leading underscore, which the other one doesn't */ -# define PERL_SCAN_ALLOW_MEDIAL_UNDERSCORES (0x100|PERL_SCAN_ALLOW_UNDERSCORES) -#endif - - /* to let user control profiling */ #ifdef PERL_GPROF_CONTROL extern void moncontrol(int); @@ -8408,18 +8445,6 @@ so no C. # define do_aexec(really, mark,sp) do_aexec5(really, mark, sp, 0, 0) #endif - -/* -=for apidoc_section $utility - -=for apidoc Am|bool|IS_SAFE_SYSCALL|NN const char *pv|STRLEN len|NN const char *what|NN const char *op_name - -Same as L. - -=cut - -Allows one ending \0 -*/ #define IS_SAFE_SYSCALL(p, len, what, op_name) (Perl_is_safe_syscall(aTHX_ (p), (len), (what), (op_name))) #define IS_SAFE_PATHNAME(p, len, op_name) IS_SAFE_SYSCALL((p), (len), "pathname", (op_name)) @@ -9264,6 +9289,14 @@ END_EXTERN_C # define PERL_STACK_REALIGN #endif +#ifdef MULTIPLICITY +# define PERL_API_VERSION_ASSERT \ + Perl_api_version_assert(sizeof(PerlInterpreter), aTHX, PERL_API_VERSION_STRING) +#else +# define PERL_API_VERSION_ASSERT \ + Perl_api_version_assert(sizeof(PerlInterpreter), NULL, PERL_API_VERSION_STRING) +#endif + /* (KEEP THIS LAST IN perl.h!) @@ -9313,6 +9346,12 @@ END_EXTERN_C (KEEP THIS LAST IN perl.h!) */ + +/* #including a second time causes it to #undef any unwanted symbols to avoid + * polluting the user name space */ +# define PERL_DO_UNDEFS +# include "embed.h" +# undef PERL_DO_UNDEFS #endif /* Include guard */ Index: gnu/usr.bin/perl/perl_inc_macro.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/perl_inc_macro.h,v diff -u -p -a -u -p -r1.1.1.3 perl_inc_macro.h --- gnu/usr.bin/perl/perl_inc_macro.h 14 May 2024 19:36:00 -0000 1.1.1.3 +++ gnu/usr.bin/perl/perl_inc_macro.h 16 Nov 2026 00:57:39 -0000 @@ -17,10 +17,10 @@ * - INCPUSH_PERL_OTHERLIBDIRS_ARCHONLY */ -#ifndef DEFINE_INC_MACROS +#ifndef PERL_INC_MACRO_H /* protect against multiple inclusions */ -#define DEFINE_INC_MACROS 1 +#define PERL_INC_MACRO_H 1 #ifdef APPLLIB_EXP # define INCPUSH_APPLLIB_EXP S_incpush_use_sep(aTHX_ STR_WITH_LEN(APPLLIB_EXP), \ Index: gnu/usr.bin/perl/perl_siphash.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/perl_siphash.h,v diff -u -p -a -u -p -r1.1.1.2 perl_siphash.h --- gnu/usr.bin/perl/perl_siphash.h 26 Dec 2025 22:12:28 -0000 1.1.1.2 +++ gnu/usr.bin/perl/perl_siphash.h 16 Nov 2026 00:57:39 -0000 @@ -219,7 +219,8 @@ do { } while (0) PERL_STATIC_INLINE -void S_perl_siphash_seed_state(const unsigned char * const seed_buf, unsigned char * state_buf) { +void S_perl_siphash_seed_state(const unsigned char * const seed_buf, unsigned char * state_buf) +{ U64 *v= (U64*) state_buf; SIPHASH_SEED_STATE(seed_buf, v[0],v[1],v[2],v[3]); } Index: gnu/usr.bin/perl/perlio.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/perlio.c,v diff -u -p -a -u -p -r1.25 perlio.c --- gnu/usr.bin/perl/perlio.c 26 Dec 2025 22:14:12 -0000 1.25 +++ gnu/usr.bin/perl/perlio.c 16 Nov 2026 00:57:39 -0000 @@ -315,6 +315,8 @@ XS(XS_PerlIO__Layer__find) void Perl_boot_core_PerlIO(pTHX) { + PERL_ARGS_ASSERT_BOOT_CORE_PERLIO; + newXS("PerlIO::Layer::find", XS_PerlIO__Layer__find, __FILE__); } @@ -381,9 +383,9 @@ PerlIO_debug(const char *fmt, ...) #else const char *s = CopFILE(PL_curcop); STRLEN len; - SV * const sv = Perl_newSVpvf(aTHX_ "%s:%" LINE_Tf " ", - s ? s : "(none)", CopLINE(PL_curcop)); - Perl_sv_vcatpvf(aTHX_ sv, fmt, &ap); + SV * const sv = newSVpvf("%s:%" LINE_Tf " ", + s ? s : "(none)", CopLINE(PL_curcop)); + sv_vcatpvf(sv, fmt, &ap); s = SvPV_const(sv, len); PERL_UNUSED_RESULT(PerlLIO_write(PL_perlio_debug_fd, s, len)); @@ -742,7 +744,7 @@ PerlIO_find_layer(pTHX_ const char *name /* * The two SVs are magically freed by load_module */ - Perl_load_module(aTHX_ 0, pkgsv, NULL, layer, NULL); + load_module(0, pkgsv, NULL, layer, NULL); LEAVE; return PerlIO_find_layer(aTHX_ name, len, 0); } @@ -1257,6 +1259,21 @@ PerlIOScalar_write(pTHX_ PerlIO * f, con PerlIOScalar *s = PerlIOSelf(f, PerlIOScalar); SV *sv = s->var; char *dst; + + /* XXX Could share the code with sv_insert() ? + Below is roughly sv_insert(sv, s->posn, count, vbuf, count) + but with small differences */ + + /* If vbuf points within sv, we need to make a private copy since + it might be modified or reallocated in sv manipulations below. + This is probably rare in reality, but possible. */ + if (SvTYPE(sv) >= SVt_PV && SvPVX_const(sv) && SvLEN(sv) && + UNLIKELY(SvPVX_const(sv) <= (const char *)vbuf && + (const char *)vbuf < SvPVX_const(sv) + SvLEN(sv))) { + vbuf = savepvn((const char *)vbuf, count); + SAVEFREEPV(vbuf); + } + SvGETMAGIC(sv); if (!SvROK(sv)) sv_force_normal(sv); if (SvOK(sv)) SvPV_force_nomg_nolen(sv); @@ -1265,14 +1282,12 @@ PerlIOScalar_write(pTHX_ PerlIO * f, con SETERRNO(EINVAL, SS_IVCHAN); return 0; } + /* Avoid calling SvCUR() on undef'ed SVs */ + STRLEN const cur = SvOK(sv) ? SvCUR(sv) : 0; if ((PerlIOBase(f)->flags) & PERLIO_F_APPEND) { - dst = SvGROW(sv, SvCUR(sv) + count + 1); - offset = SvCUR(sv); - s->posn = offset + count; + offset = cur; } else { - STRLEN const cur = SvCUR(sv); - /* ensure we don't try to create ridiculously large * SVs on small platforms */ @@ -1287,19 +1302,16 @@ PerlIOScalar_write(pTHX_ PerlIO * f, con } #endif - if ((STRLEN)s->posn > cur) { - dst = SvGROW(sv, (STRLEN)s->posn + count + 1); - Zero(SvPVX(sv) + cur, (STRLEN)s->posn - cur, char); - } - else if ((s->posn + count) >= cur) - dst = SvGROW(sv, (STRLEN)s->posn + count + 1); - else - dst = SvPVX(sv); offset = s->posn; - s->posn += count; } - Move(vbuf, dst + offset, count, char); - if ((STRLEN) s->posn > SvCUR(sv)) { + dst = SvGROW(sv, (STRLEN)offset + count + 1); + if ((STRLEN)offset > cur) + Zero(dst + cur, (STRLEN)offset - cur, char); + s->posn = offset + count; + /* vbuf is now a private copy if overlapped with sv, + so Copy should be safe here */ + Copy(vbuf, dst + offset, count, char); + if ((STRLEN) s->posn > cur) { SvCUR_set(sv, (STRLEN)s->posn); dst[(STRLEN) s->posn] = 0; } @@ -1513,6 +1525,8 @@ PerlIO_default_layers(pTHX) void Perl_boot_core_PerlIO(pTHX) { + PERL_ARGS_ASSERT_BOOT_CORE_PERLIO; + #ifdef USE_ATTRIBUTES_FOR_PERLIO newXS("io::MODIFY_SCALAR_ATTRIBUTES", XS_io_MODIFY_SCALAR_ATTRIBUTES, __FILE__); @@ -1800,6 +1814,8 @@ PerlIO__close(pTHX_ PerlIO *f) int Perl_PerlIO_close(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_CLOSE; + const int code = PerlIO__close(aTHX_ f); while (PerlIOValid(f)) { PerlIO_pop(aTHX_ f); @@ -1813,6 +1829,8 @@ Perl_PerlIO_close(pTHX_ PerlIO *f) int Perl_PerlIO_fileno(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_FILENO; + Perl_PerlIO_or_Base(f, Fileno, fileno, -1, (aTHX_ f)); } @@ -2013,18 +2031,24 @@ Perl_PerlIO_write(pTHX_ PerlIO *f, const int Perl_PerlIO_seek(pTHX_ PerlIO *f, Off_t offset, int whence) { + PERL_ARGS_ASSERT_PERLIO_SEEK; + Perl_PerlIO_or_fail(f, Seek, -1, (aTHX_ f, offset, whence)); } Off_t Perl_PerlIO_tell(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_TELL; + Perl_PerlIO_or_fail(f, Tell, -1, (aTHX_ f)); } int Perl_PerlIO_flush(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_FLUSH; + if (f) { if (*f) { const PerlIO_funcs *tab = PerlIOBase(f)->tab; @@ -2088,6 +2112,8 @@ PerlIOBase_flush_linebuf(pTHX) int Perl_PerlIO_fill(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_FILL; + Perl_PerlIO_or_fail(f, Fill, -1, (aTHX_ f)); } @@ -2105,24 +2131,32 @@ PerlIO_isutf8(PerlIO *f) int Perl_PerlIO_eof(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_EOF; + Perl_PerlIO_or_Base(f, Eof, eof, -1, (aTHX_ f)); } int Perl_PerlIO_error(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_ERROR; + Perl_PerlIO_or_Base(f, Error, error, -1, (aTHX_ f)); } void Perl_PerlIO_clearerr(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_CLEARERR; + Perl_PerlIO_or_Base_void(f, Clearerr, clearerr, (aTHX_ f)); } void Perl_PerlIO_setlinebuf(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_SETLINEBUF; + Perl_PerlIO_or_Base_void(f, Setlinebuf, setlinebuf, (aTHX_ f)); } @@ -2183,12 +2217,16 @@ PerlIO_canset_cnt(PerlIO *f) STDCHAR * Perl_PerlIO_get_base(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_GET_BASE; + Perl_PerlIO_or_fail(f, Get_base, NULL, (aTHX_ f)); } SSize_t Perl_PerlIO_get_bufsiz(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_GET_BUFSIZ; + /* Note that Get_bufsiz returns a Size_t */ Perl_PerlIO_or_fail(f, Get_bufsiz, -1, (aTHX_ f)); } @@ -2196,24 +2234,32 @@ Perl_PerlIO_get_bufsiz(pTHX_ PerlIO *f) STDCHAR * Perl_PerlIO_get_ptr(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_GET_PTR; + Perl_PerlIO_or_fail(f, Get_ptr, NULL, (aTHX_ f)); } SSize_t Perl_PerlIO_get_cnt(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_GET_CNT; + Perl_PerlIO_or_fail(f, Get_cnt, -1, (aTHX_ f)); } void Perl_PerlIO_set_cnt(pTHX_ PerlIO *f, SSize_t cnt) { + PERL_ARGS_ASSERT_PERLIO_SET_CNT; + Perl_PerlIO_or_fail_void(f, Set_ptrcnt, (aTHX_ f, NULL, cnt)); } void Perl_PerlIO_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt) { + PERL_ARGS_ASSERT_PERLIO_SET_PTRCNT; + Perl_PerlIO_or_fail_void(f, Set_ptrcnt, (aTHX_ f, ptr, cnt)); } @@ -2404,7 +2450,7 @@ PerlIOBase_pushed(pTHX_ PerlIO *f, const SETERRNO(EINVAL, LIB_INVARG); return -1; } -#ifdef __MVS__ /* XXX Perhaps should be be OEMVS instead of __MVS__ */ +#ifdef __MVS__ /* XXX Perhaps should be OEMVS instead of __MVS__ */ { /* The mode variable contains one positional parameter followed by * optional keyword parameters. The positional parameters must be @@ -2872,7 +2918,7 @@ typedef struct { } PerlIOUnix; static void -S_lockcnt_dec(pTHX_ const void* f) +S_lockcnt_dec(pTHX_ void* f) { #ifndef PERL_IMPLICIT_SYS PERL_UNUSED_CONTEXT; @@ -2885,7 +2931,8 @@ S_lockcnt_dec(pTHX_ const void* f) * this handle, free what we can and return true */ static bool -S_perlio_async_run(pTHX_ PerlIO* f) { +S_perlio_async_run(pTHX_ PerlIO* f) +{ ENTER; SAVEDESTRUCTOR_X(S_lockcnt_dec, (void*)f); PerlIO_lockcnt(f)++; @@ -5254,6 +5301,8 @@ PERLIO_FUNCS_DECL(PerlIO_crlf) = { PerlIO * Perl_PerlIO_stdin(pTHX) { + PERL_ARGS_ASSERT_PERLIO_STDIN; + if (!PL_perlio) { PerlIO_stdstreams(aTHX); } @@ -5263,6 +5312,8 @@ Perl_PerlIO_stdin(pTHX) PerlIO * Perl_PerlIO_stdout(pTHX) { + PERL_ARGS_ASSERT_PERLIO_STDOUT; + if (!PL_perlio) { PerlIO_stdstreams(aTHX); } @@ -5272,6 +5323,8 @@ Perl_PerlIO_stdout(pTHX) PerlIO * Perl_PerlIO_stderr(pTHX) { + PERL_ARGS_ASSERT_PERLIO_STDERR; + if (!PL_perlio) { PerlIO_stdstreams(aTHX); } @@ -5510,6 +5563,8 @@ PerlIO_tmpfile_flags(int imode) void Perl_PerlIO_save_errno(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_SAVE_ERRNO; + PERL_UNUSED_CONTEXT; if (!PerlIOValid(f)) return; @@ -5526,6 +5581,8 @@ Perl_PerlIO_save_errno(pTHX_ PerlIO *f) void Perl_PerlIO_restore_errno(pTHX_ PerlIO *f) { + PERL_ARGS_ASSERT_PERLIO_RESTORE_ERRNO; + PERL_UNUSED_CONTEXT; if (!PerlIOValid(f)) return; @@ -5549,6 +5606,8 @@ Perl_PerlIO_restore_errno(pTHX_ PerlIO * const char * Perl_PerlIO_context_layers(pTHX_ const char *mode) { + PERL_ARGS_ASSERT_PERLIO_CONTEXT_LAYERS; + /* Returns the layers set by "use open" */ const char *direction = NULL; @@ -5653,8 +5712,9 @@ PerlIO_getpos(PerlIO *f, SV *pos) void Perl_noperl_die(const char* pat, ...) { - va_list arglist; PERL_ARGS_ASSERT_NOPERL_DIE; + + va_list arglist; va_start(arglist, pat); vfprintf(stderr, pat, arglist); va_end(arglist); Index: gnu/usr.bin/perl/perlstatic.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/perlstatic.h,v diff -u -p -a -u -p -r1.1.1.1 perlstatic.h --- gnu/usr.bin/perl/perlstatic.h 14 May 2024 19:36:28 -0000 1.1.1.1 +++ gnu/usr.bin/perl/perlstatic.h 16 Nov 2026 00:57:39 -0000 @@ -18,9 +18,11 @@ /* saves machine code for a common noreturn idiom typically used in Newx*() */ GCC_DIAG_IGNORE_DECL(-Wunused-function); -STATIC void +static void Perl_croak_memory_wrap(void) { + PERL_ARGS_ASSERT_CROAK_MEMORY_WRAP; + Perl_croak_nocontext("%s",PL_memory_wrap); } Index: gnu/usr.bin/perl/perlvars.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/perlvars.h,v diff -u -p -a -u -p -r1.13 perlvars.h --- gnu/usr.bin/perl/perlvars.h 26 Dec 2025 22:14:12 -0000 1.13 +++ gnu/usr.bin/perl/perlvars.h 16 Nov 2026 00:57:39 -0000 @@ -123,7 +123,7 @@ PERLVARI(G, C_locale_obj, locale_t, NULL PERLVARI(G, watch_pvx, char *, NULL) /* -=for apidoc AmnU|Perl_check_t *|PL_check +=for apidoc A@nU|Perl_check_t *|PL_check Array, indexed by opcode, of functions that will be called for the "check" phase of optree building during compilation of Perl code. For most (but Index: gnu/usr.bin/perl/perly.act =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/perly.act,v diff -u -p -a -u -p -r1.9 perly.act --- gnu/usr.bin/perl/perly.act 26 Dec 2025 22:14:12 -0000 1.9 +++ gnu/usr.bin/perl/perly.act 16 Nov 2026 00:57:39 -0000 @@ -5,7 +5,7 @@ */ case 2: /* @1: %empty */ -#line 161 "perly.y" +#line 188 "perly.y" { parser->expect = XSTATE; (yyval.ival) = 0; @@ -14,7 +14,7 @@ case 2: /* @1: %empty */ break; case 3: /* grammar: GRAMPROG @1 remember stmtseq */ -#line 166 "perly.y" +#line 193 "perly.y" { newPROG(block_end((ps[-1].val.ival),(ps[0].val.opval))); PL_compiling.cop_seq = 0; @@ -24,7 +24,7 @@ case 2: /* @1: %empty */ break; case 4: /* @2: %empty */ -#line 172 "perly.y" +#line 199 "perly.y" { parser->expect = XTERM; (yyval.ival) = 0; @@ -33,7 +33,7 @@ case 2: /* @1: %empty */ break; case 5: /* grammar: GRAMEXPR @2 optexpr */ -#line 177 "perly.y" +#line 204 "perly.y" { PL_eval_root = (ps[0].val.opval); (yyval.ival) = 0; @@ -42,7 +42,7 @@ case 2: /* @1: %empty */ break; case 6: /* @3: %empty */ -#line 182 "perly.y" +#line 209 "perly.y" { parser->expect = XBLOCK; (yyval.ival) = 0; @@ -51,7 +51,7 @@ case 2: /* @1: %empty */ break; case 7: /* grammar: GRAMBLOCK @3 block */ -#line 187 "perly.y" +#line 214 "perly.y" { PL_pad_reset_pending = TRUE; PL_eval_root = (ps[0].val.opval); @@ -63,7 +63,7 @@ case 2: /* @1: %empty */ break; case 8: /* @4: %empty */ -#line 195 "perly.y" +#line 222 "perly.y" { parser->expect = XSTATE; (yyval.ival) = 0; @@ -72,7 +72,7 @@ case 2: /* @1: %empty */ break; case 9: /* grammar: GRAMBARESTMT @4 barestmt */ -#line 200 "perly.y" +#line 227 "perly.y" { PL_pad_reset_pending = TRUE; PL_eval_root = (ps[0].val.opval); @@ -84,7 +84,7 @@ case 2: /* @1: %empty */ break; case 10: /* @5: %empty */ -#line 208 "perly.y" +#line 235 "perly.y" { parser->expect = XSTATE; (yyval.ival) = 0; @@ -93,7 +93,7 @@ case 2: /* @1: %empty */ break; case 11: /* grammar: GRAMFULLSTMT @5 fullstmt */ -#line 213 "perly.y" +#line 240 "perly.y" { PL_pad_reset_pending = TRUE; PL_eval_root = (ps[0].val.opval); @@ -105,7 +105,7 @@ case 2: /* @1: %empty */ break; case 12: /* @6: %empty */ -#line 221 "perly.y" +#line 248 "perly.y" { parser->expect = XSTATE; (yyval.ival) = 0; @@ -114,7 +114,7 @@ case 2: /* @1: %empty */ break; case 13: /* grammar: GRAMSTMTSEQ @6 stmtseq */ -#line 226 "perly.y" +#line 253 "perly.y" { PL_eval_root = (ps[0].val.opval); (yyval.ival) = 0; @@ -123,7 +123,7 @@ case 2: /* @1: %empty */ break; case 14: /* @7: %empty */ -#line 231 "perly.y" +#line 258 "perly.y" { parser->expect = XSTATE; (yyval.ival) = 0; @@ -132,7 +132,7 @@ case 2: /* @1: %empty */ break; case 15: /* grammar: GRAMSUBSIGNATURE @7 subsigguts */ -#line 236 "perly.y" +#line 263 "perly.y" { PL_eval_root = (ps[0].val.opval); (yyval.ival) = 0; @@ -140,592 +140,583 @@ case 2: /* @1: %empty */ break; - case 16: /* sigsub_or_method_named: KW_SUB_named_sig */ -#line 245 "perly.y" - { (yyval.ival) = KW_SUB_named_sig; } - - break; - - case 17: /* sigsub_or_method_named: KW_METHOD_named */ -#line 247 "perly.y" - { (yyval.ival) = KW_METHOD_named; } + case 16: /* bare_statement_block: block cont */ +#line 272 "perly.y" + { + (yyval.opval) = new_block_statement ((ps[-1].val.opval), (ps[0].val.opval)); + } break; - case 18: /* block: PERLY_BRACE_OPEN remember stmtseq PERLY_BRACE_CLOSE */ -#line 252 "perly.y" - { if (parser->copline > (line_t)(ps[-3].val.ival)) - parser->copline = (line_t)(ps[-3].val.ival); - (yyval.opval) = block_end((ps[-2].val.ival), (ps[-1].val.opval)); + case 17: /* bare_statement_class_declaration: KW_CLASS BAREWORD BAREWORD optattrlist PERLY_SEMICOLON */ +#line 283 "perly.y" + { + package ((ps[-2].val.opval), (ps[-3].val.opval)); + (yyval.opval) = NULL; + class_setup_stash(PL_curstash); + if ((ps[-1].val.opval)) { + class_apply_attributes(PL_curstash, (ps[-1].val.opval)); } + } break; - case 19: /* empty: %empty */ -#line 259 "perly.y" - { (yyval.opval) = NULL; } - - break; - - case 20: /* formblock: PERLY_EQUAL_SIGN remember PERLY_SEMICOLON FORMRBRACK formstmtseq PERLY_SEMICOLON PERLY_DOT */ -#line 264 "perly.y" - { if (parser->copline > (line_t)(ps[-6].val.ival)) - parser->copline = (line_t)(ps[-6].val.ival); - (yyval.opval) = block_end((ps[-5].val.ival), (ps[-2].val.opval)); + case 18: /* $@8: %empty */ +#line 300 "perly.y" + { + package ((ps[-3].val.opval), (ps[-4].val.opval)); + class_setup_stash(PL_curstash); + if ((ps[-2].val.opval)) { + class_apply_attributes(PL_curstash, (ps[-2].val.opval)); } + } break; - case 21: /* remember: %empty */ -#line 271 "perly.y" - { (yyval.ival) = block_start(TRUE); - parser->parsed_sub = 0; } + case 19: /* bare_statement_class_definition: KW_CLASS BAREWORD BAREWORD optattrlist PERLY_BRACE_OPEN remember $@8 stmtseq PERLY_BRACE_CLOSE */ +#line 309 "perly.y" + { + (yyval.opval) = new_block_statement (block_end ((ps[-3].val.ival), (ps[-1].val.opval)), NULL); + if (parser->copline > (line_t)(ps[-4].val.ival)) + parser->copline = (line_t)(ps[-4].val.ival); + } break; - case 22: /* mblock: PERLY_BRACE_OPEN mremember stmtseq PERLY_BRACE_CLOSE */ -#line 276 "perly.y" - { if (parser->copline > (line_t)(ps[-3].val.ival)) - parser->copline = (line_t)(ps[-3].val.ival); - (yyval.opval) = block_end((ps[-2].val.ival), (ps[-1].val.opval)); - } + case 20: /* bare_statement_default: KW_DEFAULT block */ +#line 319 "perly.y" + { + (yyval.opval) = newWHENOP(0, op_scope((ps[0].val.opval))); + } break; - case 23: /* mremember: %empty */ -#line 283 "perly.y" - { (yyval.ival) = block_start(FALSE); - parser->parsed_sub = 0; } + case 21: /* bare_statement_defer: KW_DEFER mblock */ +#line 326 "perly.y" + { + (yyval.opval) = newDEFEROP(0, op_scope((ps[0].val.opval))); + } break; - case 25: /* $@8: %empty */ -#line 292 "perly.y" - { parser->in_my = 1; } + case 22: /* bare_statement_expression: sideff PERLY_SEMICOLON */ +#line 334 "perly.y" + { + (yyval.opval) = (ps[-1].val.opval); + } break; - case 26: /* $@9: %empty */ -#line 294 "perly.y" - { parser->in_my = 0; intro_my(); } + case 23: /* bare_statement_field_declaration: fielddecl PERLY_SEMICOLON */ +#line 342 "perly.y" + { + (yyval.opval) = (ps[-1].val.opval); + } break; - case 27: /* catch_paren: PERLY_PAREN_OPEN $@8 scalar $@9 PERLY_PAREN_CLOSE */ -#line 296 "perly.y" - { (yyval.opval) = (ps[-2].val.opval); } + case 24: /* $@9: %empty */ +#line 353 "perly.y" + { + parser->expect = XTERM; + } break; - case 29: /* stmtseq: stmtseq fullstmt */ -#line 303 "perly.y" - { (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), (ps[0].val.opval)); - PL_pad_reset_pending = TRUE; - if ((ps[-1].val.opval) && (ps[0].val.opval)) - PL_hints |= HINT_BLOCK_SCOPE; - } + case 25: /* $@10: %empty */ +#line 358 "perly.y" + { + parser->expect = XTERM; + } break; - case 31: /* formstmtseq: formstmtseq formline */ -#line 314 "perly.y" - { (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), (ps[0].val.opval)); - PL_pad_reset_pending = TRUE; - if ((ps[-1].val.opval) && (ps[0].val.opval)) - PL_hints |= HINT_BLOCK_SCOPE; + case 26: /* bare_statement_for: KW_FOR PERLY_PAREN_OPEN remember mnexpr PERLY_SEMICOLON $@9 texpr PERLY_SEMICOLON $@10 mintro mnexpr PERLY_PAREN_CLOSE mblock */ +#line 365 "perly.y" + { + OP *initop = (ps[-9].val.opval); + OP *forop = newWHILEOP(0, 1, NULL, scalar((ps[-6].val.opval)), (ps[0].val.opval), (ps[-2].val.opval), (ps[-3].val.ival)); + if (initop) { + forop = op_prepend_elem( + OP_LINESEQ, + initop, + op_append_elem(OP_LINESEQ, newOP(OP_UNSTACK, OPf_SPECIAL), forop) + ); } + PL_hints |= HINT_BLOCK_SCOPE; + (yyval.opval) = block_end((ps[-10].val.ival), forop); + parser->copline = (line_t)(ps[-12].val.ival); + } break; - case 32: /* fullstmt: barestmt */ -#line 323 "perly.y" - { - (yyval.opval) = (ps[0].val.opval) ? newSTATEOP(0, NULL, (ps[0].val.opval)) : NULL; - } + case 27: /* bare_statement_for: KW_FOR KW_MY remember my_scalar PERLY_PAREN_OPEN mexpr PERLY_PAREN_CLOSE mblock cont */ +#line 388 "perly.y" + { + (yyval.opval) = block_end((ps[-6].val.ival), newFOROP(0, (ps[-5].val.opval), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval))); + parser->copline = (line_t)(ps[-8].val.ival); + } break; - case 33: /* fullstmt: labfullstmt */ -#line 327 "perly.y" - { (yyval.opval) = (ps[0].val.opval); } + case 28: /* bare_statement_for: KW_FOR KW_MY remember PERLY_PAREN_OPEN my_list_of_itervars PERLY_PAREN_CLOSE PERLY_PAREN_OPEN mexpr PERLY_PAREN_CLOSE mblock cont */ +#line 403 "perly.y" + { + if ((ps[-6].val.opval)->op_type == OP_PADSV) + /* degenerate case of 1 var: for my ($x) .... + Flag it so it can be special-cased in newFOROP */ + (ps[-6].val.opval)->op_flags |= OPf_PARENS; + (yyval.opval) = block_end((ps[-8].val.ival), newFOROP(0, (ps[-6].val.opval), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval))); + parser->copline = (line_t)(ps[-10].val.ival); + } break; - case 34: /* labfullstmt: LABEL barestmt */ -#line 331 "perly.y" - { - SV *label = cSVOPx_sv((ps[-1].val.opval)); - (yyval.opval) = newSTATEOP(SvFLAGS(label) & SVf_UTF8, - savepv(SvPVX_const(label)), (ps[0].val.opval)); - op_free((ps[-1].val.opval)); - } + case 29: /* bare_statement_for: KW_FOR scalar PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock cont */ +#line 419 "perly.y" + { + (yyval.opval) = block_end((ps[-4].val.ival), newFOROP(0, op_lvalue((ps[-6].val.opval), OP_ENTERLOOP), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval))); + parser->copline = (line_t)(ps[-7].val.ival); + } break; - case 35: /* labfullstmt: LABEL labfullstmt */ -#line 338 "perly.y" - { - SV *label = cSVOPx_sv((ps[-1].val.opval)); - (yyval.opval) = newSTATEOP(SvFLAGS(label) & SVf_UTF8, - savepv(SvPVX_const(label)), (ps[0].val.opval)); - op_free((ps[-1].val.opval)); - } + case 30: /* @11: %empty */ +#line 427 "perly.y" + { + parser->in_my = 0; + (yyval.opval) = my((ps[0].val.opval)); + } break; - case 36: /* barestmt: PLUGSTMT */ -#line 348 "perly.y" - { (yyval.opval) = (ps[0].val.opval); } + case 31: /* bare_statement_for: KW_FOR my_refgen remember my_var @11 PERLY_PAREN_OPEN mexpr PERLY_PAREN_CLOSE mblock cont */ +#line 436 "perly.y" + { + (yyval.opval) = block_end( + (ps[-7].val.ival), + newFOROP( + 0, + op_lvalue( + newUNOP(OP_REFGEN, 0, (ps[-5].val.opval)), + OP_ENTERLOOP + ), + (ps[-3].val.opval), + (ps[-1].val.opval), + (ps[0].val.opval) + ) + ); + parser->copline = (line_t)(ps[-9].val.ival); + } break; - case 37: /* barestmt: KW_FORMAT startformsub formname formblock */ -#line 350 "perly.y" - { - CV *fmtcv = PL_compcv; - newFORM((ps[-2].val.ival), (ps[-1].val.opval), (ps[0].val.opval)); - (yyval.opval) = NULL; - if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) { - pad_add_weakref(fmtcv); - } - parser->parsed_sub = 1; - } + case 32: /* bare_statement_for: KW_FOR REFGEN refgen_topic PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock cont */ +#line 461 "perly.y" + { + (yyval.opval) = block_end ( + (ps[-4].val.ival), + newFOROP ( + 0, + op_lvalue (newUNOP(OP_REFGEN, 0, (ps[-6].val.opval)), OP_ENTERLOOP), + (ps[-3].val.opval), + (ps[-1].val.opval), + (ps[0].val.opval) + ) + ); + parser->copline = (line_t)(ps[-8].val.ival); + } break; - case 38: /* $@10: %empty */ -#line 362 "perly.y" - { - init_named_cv(PL_compcv, (ps[-1].val.opval)); - parser->in_my = 0; - parser->in_my_stash = NULL; - } + case 33: /* bare_statement_for: KW_FOR PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock cont */ +#line 481 "perly.y" + { + (yyval.opval) = block_end((ps[-4].val.ival), newFOROP(0, NULL, (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval))); + parser->copline = (line_t)(ps[-6].val.ival); + } break; - case 39: /* barestmt: KW_SUB_named subname startsub $@10 proto subattrlist optsubbody */ -#line 368 "perly.y" - { - SvREFCNT_inc_simple_void(PL_compcv); - (ps[-5].val.opval)->op_type == OP_CONST - ? newATTRSUB((ps[-4].val.ival), (ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval)) - : newMYSUB((ps[-4].val.ival), (ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval)) - ; - (yyval.opval) = NULL; - intro_my(); - parser->parsed_sub = 1; + case 34: /* bare_statement_format: KW_FORMAT startformsub formname formblock */ +#line 492 "perly.y" + { + CV *fmtcv = PL_compcv; + newFORM((ps[-2].val.ival), (ps[-1].val.opval), (ps[0].val.opval)); + if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) { + pad_add_weakref(fmtcv); } + parser->parsed_sub = 1; + (yyval.opval) = NULL; + } break; - case 40: /* $@11: %empty */ -#line 383 "perly.y" - { - init_named_cv(PL_compcv, (ps[-1].val.opval)); - if((ps[-2].val.ival) == KW_METHOD_named) { - croak_kw_unless_class("method"); - class_prepare_method_parse(PL_compcv); - } - parser->in_my = 0; - parser->in_my_stash = NULL; - } + case 35: /* bare_statement_given: KW_GIVEN PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock */ +#line 510 "perly.y" + { + (yyval.opval) = block_end((ps[-3].val.ival), newGIVENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)), 0)); + parser->copline = (line_t)(ps[-5].val.ival); + } break; - case 41: /* barestmt: sigsub_or_method_named subname startsub $@11 subattrlist optsigsubbody */ -#line 393 "perly.y" - { - OP *body = (ps[0].val.opval); - - SvREFCNT_inc_simple_void(PL_compcv); - (ps[-4].val.opval)->op_type == OP_CONST - ? newATTRSUB((ps[-3].val.ival), (ps[-4].val.opval), NULL, (ps[-1].val.opval), body) - : newMYSUB( (ps[-3].val.ival), (ps[-4].val.opval), NULL, (ps[-1].val.opval), body) - ; - (yyval.opval) = NULL; - intro_my(); - parser->parsed_sub = 1; - } + case 36: /* bare_statement_if: KW_IF PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock else */ +#line 524 "perly.y" + { + (yyval.opval) = block_end((ps[-4].val.ival), newCONDOP(OPpSTATEMENT<<8, + (ps[-3].val.opval), op_scope((ps[-1].val.opval)), (ps[0].val.opval))); + parser->copline = (line_t)(ps[-6].val.ival); + } break; - case 42: /* $@12: %empty */ -#line 406 "perly.y" - { - switch((ps[-1].val.ival)) { - case KEY_ADJUST: - croak_kw_unless_class("ADJUST"); - class_prepare_method_parse(PL_compcv); - break; - default: - NOT_REACHED; - } - } + case 37: /* bare_statement_null: PERLY_SEMICOLON */ +#line 533 "perly.y" + { + (yyval.opval) = NULL; + parser->copline = NOLINE; + } break; - case 43: /* barestmt: PHASER startsub $@12 optsubbody */ -#line 417 "perly.y" - { - OP *body = (ps[0].val.opval); - SvREFCNT_inc_simple_void(PL_compcv); + case 38: /* bare_statement_package_declaration: KW_PACKAGE BAREWORD BAREWORD PERLY_SEMICOLON */ +#line 549 "perly.y" + { + package ((ps[-1].val.opval), (ps[-2].val.opval)); + (yyval.opval) = NULL; + } - CV *cv; + break; - switch((ps[-3].val.ival)) { - case KEY_ADJUST: - cv = newATTRSUB((ps[-2].val.ival), NULL, NULL, NULL, body); - class_add_ADJUST(PL_curstash, cv); - break; - } - (yyval.opval) = NULL; - } + case 39: /* $@12: %empty */ +#line 561 "perly.y" + { + package ((ps[-2].val.opval), (ps[-3].val.opval)); + } break; - case 44: /* barestmt: KW_PACKAGE BAREWORD BAREWORD PERLY_SEMICOLON */ -#line 436 "perly.y" - { - package((ps[-1].val.opval)); - if ((ps[-2].val.opval)) - package_version((ps[-2].val.opval)); - (yyval.opval) = NULL; - } + case 40: /* bare_statement_package_definition: KW_PACKAGE BAREWORD BAREWORD PERLY_BRACE_OPEN remember $@12 stmtseq PERLY_BRACE_CLOSE */ +#line 566 "perly.y" + { + (yyval.opval) = new_block_statement (block_end ((ps[-3].val.ival), (ps[-1].val.opval)), NULL); + if (parser->copline > (line_t)(ps[-4].val.ival)) + parser->copline = (line_t)(ps[-4].val.ival); + } break; - case 45: /* barestmt: KW_CLASS BAREWORD BAREWORD subattrlist PERLY_SEMICOLON */ -#line 443 "perly.y" - { - package((ps[-2].val.opval)); - if ((ps[-3].val.opval)) - package_version((ps[-3].val.opval)); - (yyval.opval) = NULL; - class_setup_stash(PL_curstash); - if ((ps[-1].val.opval)) { - class_apply_attributes(PL_curstash, (ps[-1].val.opval)); - } + case 41: /* $@13: %empty */ +#line 576 "perly.y" + { + switch((ps[-1].val.ival)) { + case KEY_ADJUST: + croak_kw_unless_class("ADJUST"); + class_prepare_method_parse(PL_compcv); + break; + default: + NOT_REACHED; } + } break; - case 46: /* $@13: %empty */ -#line 454 "perly.y" - { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ } + case 42: /* bare_statement_phaser: PHASER startsub $@13 optsubbody */ +#line 587 "perly.y" + { + OP *body = (ps[0].val.opval); + SvREFCNT_inc_simple_void(PL_compcv); - break; + CV *cv; - case 47: /* barestmt: KW_USE_or_NO startsub $@13 BAREWORD BAREWORD optlistexpr PERLY_SEMICOLON */ -#line 458 "perly.y" - { - SvREFCNT_inc_simple_void(PL_compcv); - utilize((ps[-6].val.ival), (ps[-5].val.ival), (ps[-3].val.opval), (ps[-2].val.opval), (ps[-1].val.opval)); - parser->parsed_sub = 1; - (yyval.opval) = NULL; + switch((ps[-3].val.ival)) { + case KEY_ADJUST: + cv = newATTRSUB((ps[-2].val.ival), NULL, NULL, NULL, body); + class_add_ADJUST(PL_curstash, cv); + break; } + (yyval.opval) = NULL; + parser->parsed_sub = 1; + } break; - case 48: /* barestmt: KW_IF PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock else */ -#line 465 "perly.y" - { - (yyval.opval) = block_end((ps[-4].val.ival), - newCONDOP(0, (ps[-3].val.opval), op_scope((ps[-1].val.opval)), (ps[0].val.opval))); - parser->copline = (line_t)(ps[-6].val.ival); + case 43: /* $@14: %empty */ +#line 611 "perly.y" + { + init_named_cv(PL_compcv, (ps[-1].val.opval)); + if((ps[-2].val.ival) == KW_METHOD_named) { + croak_kw_unless_class("method"); + class_prepare_method_parse(PL_compcv); } + parser->in_my = 0; + parser->in_my_stash = NULL; + } break; - case 49: /* barestmt: KW_UNLESS PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock else */ -#line 471 "perly.y" - { - (yyval.opval) = block_end((ps[-4].val.ival), - newCONDOP(0, (ps[-3].val.opval), (ps[0].val.opval), op_scope((ps[-1].val.opval)))); - parser->copline = (line_t)(ps[-6].val.ival); - } + case 44: /* bare_statement_sub_signature: sigsub_or_method_named subname startsub $@14 subattrlist optsigsubbody */ +#line 622 "perly.y" + { + OP *body = (ps[0].val.opval); + + SvREFCNT_inc_simple_void(PL_compcv); + (ps[-4].val.opval)->op_type == OP_CONST + ? newATTRSUB((ps[-3].val.ival), (ps[-4].val.opval), NULL, (ps[-1].val.opval), body) + : newMYSUB( (ps[-3].val.ival), (ps[-4].val.opval), NULL, (ps[-1].val.opval), body) + ; + intro_my(); + parser->parsed_sub = 1; + (yyval.opval) = NULL; + } break; - case 50: /* barestmt: KW_GIVEN PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock */ -#line 477 "perly.y" - { - (yyval.opval) = block_end((ps[-3].val.ival), newGIVENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)), 0)); - parser->copline = (line_t)(ps[-5].val.ival); - } + case 45: /* $@15: %empty */ +#line 641 "perly.y" + { + init_named_cv(PL_compcv, (ps[-1].val.opval)); + parser->in_my = 0; + parser->in_my_stash = NULL; + } break; - case 51: /* barestmt: KW_WHEN PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock */ -#line 482 "perly.y" - { (yyval.opval) = block_end((ps[-3].val.ival), newWHENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)))); } + case 46: /* bare_statement_sub_traditional: KW_SUB_named subname startsub $@15 proto subattrlist optsubbody */ +#line 649 "perly.y" + { + SvREFCNT_inc_simple_void(PL_compcv); + (ps[-5].val.opval)->op_type == OP_CONST + ? newATTRSUB((ps[-4].val.ival), (ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval)) + : newMYSUB((ps[-4].val.ival), (ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval)) + ; + intro_my(); + parser->parsed_sub = 1; + (yyval.opval) = NULL; + } break; - case 52: /* barestmt: KW_DEFAULT block */ -#line 484 "perly.y" - { (yyval.opval) = newWHENOP(0, op_scope((ps[0].val.opval))); } + case 47: /* $@16: %empty */ +#line 667 "perly.y" + { + if(!(ps[0].val.opval)) { + yyerror("catch block requires a (VAR)"); + YYERROR; + } + } break; - case 53: /* barestmt: KW_WHILE PERLY_PAREN_OPEN remember texpr PERLY_PAREN_CLOSE mintro mblock cont */ -#line 486 "perly.y" - { - (yyval.opval) = block_end((ps[-5].val.ival), - newWHILEOP(0, 1, NULL, - (ps[-4].val.opval), (ps[-1].val.opval), (ps[0].val.opval), (ps[-2].val.ival))); - parser->copline = (line_t)(ps[-7].val.ival); - } + case 48: /* bare_statement_try_catch: KW_TRY mblock KW_CATCH remember catch_paren $@16 mblock finally */ +#line 675 "perly.y" + { + (yyval.opval) = newTRYCATCHOP(0, (ps[-6].val.opval), (ps[-3].val.opval), block_end((ps[-4].val.ival), op_scope((ps[-1].val.opval)))); + if((ps[0].val.opval)) + (yyval.opval) = op_wrap_finally((yyval.opval), (ps[0].val.opval)); + parser->copline = (line_t)(ps[-7].val.ival); + } break; - case 54: /* barestmt: KW_UNTIL PERLY_PAREN_OPEN remember iexpr PERLY_PAREN_CLOSE mintro mblock cont */ -#line 493 "perly.y" - { - (yyval.opval) = block_end((ps[-5].val.ival), - newWHILEOP(0, 1, NULL, - (ps[-4].val.opval), (ps[-1].val.opval), (ps[0].val.opval), (ps[-2].val.ival))); - parser->copline = (line_t)(ps[-7].val.ival); - } + case 49: /* bare_statement_unless: KW_UNLESS PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock else */ +#line 691 "perly.y" + { + (yyval.opval) = block_end((ps[-4].val.ival), newCONDOP(OPpSTATEMENT<<8, + (ps[-3].val.opval), (ps[0].val.opval), op_scope((ps[-1].val.opval)))); + parser->copline = (line_t)(ps[-6].val.ival); + } break; - case 55: /* $@14: %empty */ -#line 500 "perly.y" - { parser->expect = XTERM; } + case 50: /* bare_statement_until: KW_UNTIL PERLY_PAREN_OPEN remember iexpr PERLY_PAREN_CLOSE mintro mblock cont */ +#line 707 "perly.y" + { + (yyval.opval) = block_end((ps[-5].val.ival), newWHILEOP(0, 1, NULL, (ps[-4].val.opval), (ps[-1].val.opval), (ps[0].val.opval), (ps[-2].val.ival))); + parser->copline = (line_t)(ps[-7].val.ival); + } break; - case 56: /* $@15: %empty */ -#line 502 "perly.y" - { parser->expect = XTERM; } + case 51: /* $@17: %empty */ +#line 716 "perly.y" + { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ } break; - case 57: /* barestmt: KW_FOR PERLY_PAREN_OPEN remember mnexpr PERLY_SEMICOLON $@14 texpr PERLY_SEMICOLON $@15 mintro mnexpr PERLY_PAREN_CLOSE mblock */ -#line 505 "perly.y" - { - OP *initop = (ps[-9].val.opval); - OP *forop = newWHILEOP(0, 1, NULL, - scalar((ps[-6].val.opval)), (ps[0].val.opval), (ps[-2].val.opval), (ps[-3].val.ival)); - if (initop) { - forop = op_prepend_elem(OP_LINESEQ, initop, - op_append_elem(OP_LINESEQ, - newOP(OP_UNSTACK, OPf_SPECIAL), - forop)); - } - PL_hints |= HINT_BLOCK_SCOPE; - (yyval.opval) = block_end((ps[-10].val.ival), forop); - parser->copline = (line_t)(ps[-12].val.ival); - } + case 52: /* bare_statement_utilize: KW_USE_or_NO startsub $@17 BAREWORD BAREWORD optlistexpr PERLY_SEMICOLON */ +#line 723 "perly.y" + { + SvREFCNT_inc_simple_void(PL_compcv); + utilize((ps[-6].val.ival), (ps[-5].val.ival), (ps[-3].val.opval), (ps[-2].val.opval), (ps[-1].val.opval)); + parser->parsed_sub = 1; + (yyval.opval) = NULL; + } break; - case 58: /* barestmt: KW_FOR KW_MY remember my_scalar PERLY_PAREN_OPEN mexpr PERLY_PAREN_CLOSE mblock cont */ -#line 520 "perly.y" - { - (yyval.opval) = block_end((ps[-6].val.ival), newFOROP(0, (ps[-5].val.opval), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval))); - parser->copline = (line_t)(ps[-8].val.ival); - } + case 53: /* bare_statement_when: KW_WHEN PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock */ +#line 738 "perly.y" + { + (yyval.opval) = block_end((ps[-3].val.ival), newWHENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)))); + } break; - case 59: /* barestmt: KW_FOR KW_MY remember PERLY_PAREN_OPEN my_list_of_scalars PERLY_PAREN_CLOSE PERLY_PAREN_OPEN mexpr PERLY_PAREN_CLOSE mblock cont */ -#line 525 "perly.y" - { - if ((ps[-6].val.opval)->op_type == OP_PADSV) - /* degenerate case of 1 var: for my ($x) .... - Flag it so it can be special-cased in newFOROP */ - (ps[-6].val.opval)->op_flags |= OPf_PARENS; - (yyval.opval) = block_end((ps[-8].val.ival), newFOROP(0, (ps[-6].val.opval), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval))); - parser->copline = (line_t)(ps[-10].val.ival); - } + case 54: /* bare_statement_while: KW_WHILE PERLY_PAREN_OPEN remember texpr PERLY_PAREN_CLOSE mintro mblock cont */ +#line 752 "perly.y" + { + (yyval.opval) = block_end((ps[-5].val.ival), newWHILEOP(0, 1, NULL, (ps[-4].val.opval), (ps[-1].val.opval), (ps[0].val.opval), (ps[-2].val.ival))); + parser->copline = (line_t)(ps[-7].val.ival); + } break; - case 60: /* barestmt: KW_FOR scalar PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock cont */ -#line 534 "perly.y" - { - (yyval.opval) = block_end((ps[-4].val.ival), newFOROP(0, - op_lvalue((ps[-6].val.opval), OP_ENTERLOOP), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval))); - parser->copline = (line_t)(ps[-7].val.ival); - } + case 55: /* bare_statement_yadayada: YADAYADA PERLY_SEMICOLON */ +#line 760 "perly.y" + { + /* diag_listed_as: Unimplemented */ + (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0), newSVOP(OP_CONST, 0, newSVpvs("Unimplemented"))); + } break; - case 61: /* @16: %empty */ -#line 540 "perly.y" - { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); } + case 56: /* sigsub_or_method_named: KW_SUB_named_sig */ +#line 769 "perly.y" + { (yyval.ival) = KW_SUB_named_sig; } break; - case 62: /* barestmt: KW_FOR my_refgen remember my_var @16 PERLY_PAREN_OPEN mexpr PERLY_PAREN_CLOSE mblock cont */ -#line 542 "perly.y" - { - (yyval.opval) = block_end( - (ps[-7].val.ival), - newFOROP(0, - op_lvalue( - newUNOP(OP_REFGEN, 0, - (ps[-5].val.opval)), - OP_ENTERLOOP), - (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)) - ); - parser->copline = (line_t)(ps[-9].val.ival); - } + case 57: /* sigsub_or_method_named: KW_METHOD_named */ +#line 771 "perly.y" + { (yyval.ival) = KW_METHOD_named; } break; - case 63: /* barestmt: KW_FOR REFGEN refgen_topic PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock cont */ -#line 555 "perly.y" - { - (yyval.opval) = block_end((ps[-4].val.ival), newFOROP( - 0, op_lvalue(newUNOP(OP_REFGEN, 0, - (ps[-6].val.opval)), - OP_ENTERLOOP), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval))); - parser->copline = (line_t)(ps[-8].val.ival); + case 58: /* block: PERLY_BRACE_OPEN remember stmtseq PERLY_BRACE_CLOSE */ +#line 776 "perly.y" + { if (parser->copline > (line_t)(ps[-3].val.ival)) + parser->copline = (line_t)(ps[-3].val.ival); + (yyval.opval) = block_end((ps[-2].val.ival), (ps[-1].val.opval)); } break; - case 64: /* barestmt: KW_FOR PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock cont */ -#line 563 "perly.y" - { - (yyval.opval) = block_end((ps[-4].val.ival), - newFOROP(0, NULL, (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval))); - parser->copline = (line_t)(ps[-6].val.ival); - } + case 59: /* empty: %empty */ +#line 783 "perly.y" + { (yyval.opval) = NULL; } break; - case 65: /* $@17: %empty */ -#line 569 "perly.y" - { - if(!(ps[0].val.opval)) { - yyerror("catch block requires a (VAR)"); - YYERROR; - } + case 60: /* formblock: PERLY_EQUAL_SIGN remember PERLY_SEMICOLON FORMRBRACK formstmtseq PERLY_SEMICOLON PERLY_DOT */ +#line 788 "perly.y" + { if (parser->copline > (line_t)(ps[-6].val.ival)) + parser->copline = (line_t)(ps[-6].val.ival); + (yyval.opval) = block_end((ps[-5].val.ival), (ps[-2].val.opval)); } break; - case 66: /* barestmt: KW_TRY mblock KW_CATCH remember catch_paren $@17 mblock finally */ -#line 576 "perly.y" - { - (yyval.opval) = newTRYCATCHOP(0, - (ps[-6].val.opval), (ps[-3].val.opval), block_end((ps[-4].val.ival), op_scope((ps[-1].val.opval)))); - if((ps[0].val.opval)) - (yyval.opval) = op_wrap_finally((yyval.opval), (ps[0].val.opval)); - parser->copline = (line_t)(ps[-7].val.ival); - } + case 61: /* remember: %empty */ +#line 795 "perly.y" + { (yyval.ival) = block_start(TRUE); + parser->parsed_sub = 0; } break; - case 67: /* barestmt: block cont */ -#line 584 "perly.y" - { - /* a block is a loop that happens once */ - (yyval.opval) = newWHILEOP(0, 1, NULL, - NULL, (ps[-1].val.opval), (ps[0].val.opval), 0); + case 62: /* mblock: PERLY_BRACE_OPEN mremember stmtseq PERLY_BRACE_CLOSE */ +#line 800 "perly.y" + { if (parser->copline > (line_t)(ps[-3].val.ival)) + parser->copline = (line_t)(ps[-3].val.ival); + (yyval.opval) = block_end((ps[-2].val.ival), (ps[-1].val.opval)); } break; - case 68: /* $@18: %empty */ -#line 590 "perly.y" - { - package((ps[-2].val.opval)); - if ((ps[-3].val.opval)) { - package_version((ps[-3].val.opval)); - } - } + case 63: /* mremember: %empty */ +#line 807 "perly.y" + { (yyval.ival) = block_start(FALSE); + parser->parsed_sub = 0; } break; - case 69: /* barestmt: KW_PACKAGE BAREWORD BAREWORD PERLY_BRACE_OPEN remember $@18 stmtseq PERLY_BRACE_CLOSE */ -#line 597 "perly.y" - { - /* a block is a loop that happens once */ - (yyval.opval) = newWHILEOP(0, 1, NULL, - NULL, block_end((ps[-3].val.ival), (ps[-1].val.opval)), NULL, 0); - if (parser->copline > (line_t)(ps[-4].val.ival)) - parser->copline = (line_t)(ps[-4].val.ival); - } + case 65: /* $@18: %empty */ +#line 816 "perly.y" + { parser->in_my = KEY_catch; } break; - case 70: /* $@19: %empty */ -#line 605 "perly.y" - { - package((ps[-3].val.opval)); + case 66: /* $@19: %empty */ +#line 818 "perly.y" + { parser->in_my = 0; intro_my(); } - if ((ps[-4].val.opval)) { - package_version((ps[-4].val.opval)); - } - class_setup_stash(PL_curstash); - if ((ps[-2].val.opval)) { - class_apply_attributes(PL_curstash, (ps[-2].val.opval)); - } - } + break; + + case 67: /* catch_paren: PERLY_PAREN_OPEN $@18 scalar $@19 PERLY_PAREN_CLOSE */ +#line 820 "perly.y" + { (yyval.opval) = (ps[-2].val.opval); } break; - case 71: /* barestmt: KW_CLASS BAREWORD BAREWORD subattrlist PERLY_BRACE_OPEN remember $@19 stmtseq PERLY_BRACE_CLOSE */ -#line 617 "perly.y" - { - /* a block is a loop that happens once */ - (yyval.opval) = newWHILEOP(0, 1, NULL, - NULL, block_end((ps[-3].val.ival), (ps[-1].val.opval)), NULL, 0); - if (parser->copline > (line_t)(ps[-4].val.ival)) - parser->copline = (line_t)(ps[-4].val.ival); + case 69: /* stmtseq: stmtseq fullstmt */ +#line 827 "perly.y" + { (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), (ps[0].val.opval)); + PL_pad_reset_pending = TRUE; + if ((ps[-1].val.opval) && (ps[0].val.opval)) + PL_hints |= HINT_BLOCK_SCOPE; } break; - case 72: /* barestmt: fielddecl PERLY_SEMICOLON */ -#line 625 "perly.y" - { - (yyval.opval) = (ps[-1].val.opval); + case 71: /* formstmtseq: formstmtseq formline */ +#line 838 "perly.y" + { (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), (ps[0].val.opval)); + PL_pad_reset_pending = TRUE; + if ((ps[-1].val.opval) && (ps[0].val.opval)) + PL_hints |= HINT_BLOCK_SCOPE; } break; - case 73: /* barestmt: sideff PERLY_SEMICOLON */ -#line 629 "perly.y" + case 72: /* fullstmt: barestmt */ +#line 847 "perly.y" { - (yyval.opval) = (ps[-1].val.opval); + (yyval.opval) = (ps[0].val.opval) ? newSTATEOP(0, NULL, (ps[0].val.opval)) : NULL; } break; - case 74: /* barestmt: KW_DEFER mblock */ -#line 633 "perly.y" - { - (yyval.opval) = newDEFEROP(0, op_scope((ps[0].val.opval))); - } + case 73: /* fullstmt: labfullstmt */ +#line 851 "perly.y" + { (yyval.opval) = (ps[0].val.opval); } break; - case 75: /* barestmt: YADAYADA PERLY_SEMICOLON */ -#line 637 "perly.y" + case 74: /* labfullstmt: LABEL barestmt */ +#line 855 "perly.y" { - /* diag_listed_as: Unimplemented */ - (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0), - newSVOP(OP_CONST, 0, newSVpvs("Unimplemented"))); + SV *label = cSVOPx_sv((ps[-1].val.opval)); + (yyval.opval) = newSTATEOP(SvFLAGS(label) & SVf_UTF8, + savepv(SvPVX_const(label)), (ps[0].val.opval)); + op_free((ps[-1].val.opval)); } break; - case 76: /* barestmt: PERLY_SEMICOLON */ -#line 643 "perly.y" + case 75: /* labfullstmt: LABEL labfullstmt */ +#line 862 "perly.y" { - (yyval.opval) = NULL; - parser->copline = NOLINE; + SV *label = cSVOPx_sv((ps[-1].val.opval)); + (yyval.opval) = newSTATEOP(SvFLAGS(label) & SVf_UTF8, + savepv(SvPVX_const(label)), (ps[0].val.opval)); + op_free((ps[-1].val.opval)); } break; - case 77: /* formline: THING formarg */ -#line 651 "perly.y" + case 101: /* formline: THING formarg */ +#line 907 "perly.y" { OP *list; if ((ps[0].val.opval)) { OP *term = (ps[0].val.opval); @@ -743,63 +734,65 @@ case 2: /* @1: %empty */ break; - case 79: /* formarg: FORMLBRACK stmtseq FORMRBRACK */ -#line 670 "perly.y" + case 103: /* formarg: FORMLBRACK stmtseq FORMRBRACK */ +#line 926 "perly.y" { (yyval.opval) = op_unscope((ps[-1].val.opval)); } break; - case 81: /* sideff: error */ -#line 678 "perly.y" + case 105: /* sideff: error */ +#line 934 "perly.y" { (yyval.opval) = NULL; } break; - case 82: /* sideff: expr */ -#line 680 "perly.y" + case 106: /* sideff: expr */ +#line 936 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 83: /* sideff: expr KW_IF condition */ -#line 682 "perly.y" - { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[0].val.opval), (ps[-2].val.opval)); } + case 107: /* sideff: expr KW_IF condition */ +#line 938 "perly.y" + { (yyval.opval) = newLOGOP(OP_AND, OPpSTATEMENT<<8, + (ps[0].val.opval), (ps[-2].val.opval)); } break; - case 84: /* sideff: expr KW_UNLESS condition */ -#line 684 "perly.y" - { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[0].val.opval), (ps[-2].val.opval)); } + case 108: /* sideff: expr KW_UNLESS condition */ +#line 941 "perly.y" + { (yyval.opval) = newLOGOP(OP_OR, OPpSTATEMENT<<8, + (ps[0].val.opval), (ps[-2].val.opval)); } break; - case 85: /* sideff: expr KW_WHILE condition */ -#line 686 "perly.y" + case 109: /* sideff: expr KW_WHILE condition */ +#line 944 "perly.y" { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[0].val.opval)), (ps[-2].val.opval)); } break; - case 86: /* sideff: expr KW_UNTIL iexpr */ -#line 688 "perly.y" + case 110: /* sideff: expr KW_UNTIL iexpr */ +#line 946 "perly.y" { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[0].val.opval), (ps[-2].val.opval)); } break; - case 87: /* sideff: expr KW_FOR condition */ -#line 690 "perly.y" + case 111: /* sideff: expr KW_FOR condition */ +#line 948 "perly.y" { (yyval.opval) = newFOROP(0, NULL, (ps[0].val.opval), (ps[-2].val.opval), NULL); parser->copline = (line_t)(ps[-1].val.ival); } break; - case 88: /* sideff: expr KW_WHEN condition */ -#line 693 "perly.y" + case 112: /* sideff: expr KW_WHEN condition */ +#line 951 "perly.y" { (yyval.opval) = newWHENOP((ps[0].val.opval), op_scope((ps[-2].val.opval))); } break; - case 90: /* else: KW_ELSE mblock */ -#line 700 "perly.y" + case 114: /* else: KW_ELSE mblock */ +#line 958 "perly.y" { ((ps[0].val.opval))->op_flags |= OPf_PARENS; (yyval.opval) = op_scope((ps[0].val.opval)); @@ -807,10 +800,10 @@ case 2: /* @1: %empty */ break; - case 91: /* else: KW_ELSIF PERLY_PAREN_OPEN mexpr PERLY_PAREN_CLOSE mblock else */ -#line 705 "perly.y" + case 115: /* else: KW_ELSIF PERLY_PAREN_OPEN mexpr PERLY_PAREN_CLOSE mblock else */ +#line 963 "perly.y" { parser->copline = (line_t)(ps[-5].val.ival); - (yyval.opval) = newCONDOP(0, + (yyval.opval) = newCONDOP(OPpSTATEMENT<<8, newSTATEOP(OPf_SPECIAL,NULL,(ps[-3].val.opval)), op_scope((ps[-1].val.opval)), (ps[0].val.opval)); PL_hints |= HINT_BLOCK_SCOPE; @@ -818,94 +811,94 @@ case 2: /* @1: %empty */ break; - case 93: /* cont: KW_CONTINUE block */ -#line 717 "perly.y" + case 117: /* cont: KW_CONTINUE block */ +#line 975 "perly.y" { (yyval.opval) = op_scope((ps[0].val.opval)); } break; - case 94: /* finally: %empty */ -#line 722 "perly.y" + case 118: /* finally: %empty */ +#line 980 "perly.y" { (yyval.opval) = NULL; } break; - case 95: /* finally: KW_FINALLY block */ -#line 724 "perly.y" + case 119: /* finally: KW_FINALLY block */ +#line 982 "perly.y" { (yyval.opval) = op_scope((ps[0].val.opval)); } break; - case 96: /* mintro: %empty */ -#line 729 "perly.y" + case 120: /* mintro: %empty */ +#line 987 "perly.y" { (yyval.ival) = (PL_min_intro_pending && PL_max_intro_pending >= PL_min_intro_pending); intro_my(); } break; - case 99: /* texpr: %empty */ -#line 741 "perly.y" + case 123: /* texpr: %empty */ +#line 999 "perly.y" { YYSTYPE tmplval; (void)scan_num("1", &tmplval); (yyval.opval) = tmplval.opval; } break; - case 101: /* iexpr: expr */ -#line 749 "perly.y" + case 125: /* iexpr: expr */ +#line 1007 "perly.y" { (yyval.opval) = invert(scalar((ps[0].val.opval))); } break; - case 102: /* mexpr: expr */ -#line 754 "perly.y" + case 126: /* mexpr: expr */ +#line 1012 "perly.y" { (yyval.opval) = (ps[0].val.opval); intro_my(); } break; - case 103: /* mnexpr: nexpr */ -#line 758 "perly.y" + case 127: /* mnexpr: nexpr */ +#line 1016 "perly.y" { (yyval.opval) = (ps[0].val.opval); intro_my(); } break; - case 104: /* formname: BAREWORD */ -#line 761 "perly.y" + case 128: /* formname: BAREWORD */ +#line 1019 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 106: /* startsub: %empty */ -#line 766 "perly.y" + case 130: /* startsub: %empty */ +#line 1024 "perly.y" { (yyval.ival) = start_subparse(FALSE, 0); SAVEFREESV(PL_compcv); } break; - case 107: /* startanonsub: %empty */ -#line 772 "perly.y" + case 131: /* startanonsub: %empty */ +#line 1030 "perly.y" { (yyval.ival) = start_subparse(FALSE, CVf_ANON); SAVEFREESV(PL_compcv); } break; - case 108: /* startanonmethod: %empty */ -#line 777 "perly.y" + case 132: /* startanonmethod: %empty */ +#line 1035 "perly.y" { (yyval.ival) = start_subparse(FALSE, CVf_ANON|CVf_IsMETHOD); SAVEFREESV(PL_compcv); } break; - case 109: /* startformsub: %empty */ -#line 782 "perly.y" + case 133: /* startformsub: %empty */ +#line 1040 "perly.y" { (yyval.ival) = start_subparse(TRUE, 0); SAVEFREESV(PL_compcv); } break; - case 115: /* subattrlist: COLONATTR THING */ -#line 801 "perly.y" + case 139: /* subattrlist: COLONATTR ATTRLIST */ +#line 1059 "perly.y" { OP *attrlist = (ps[0].val.opval); if(attrlist && !PL_parser->sig_seen) @@ -915,120 +908,139 @@ case 2: /* @1: %empty */ break; - case 116: /* subattrlist: COLONATTR */ -#line 808 "perly.y" + case 140: /* subattrlist: COLONATTR */ +#line 1066 "perly.y" { (yyval.opval) = NULL; } break; - case 117: /* myattrlist: COLONATTR THING */ -#line 813 "perly.y" + case 141: /* attrlist: COLONATTR ATTRLIST */ +#line 1071 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 118: /* myattrlist: COLONATTR */ -#line 815 "perly.y" + case 142: /* attrlist: COLONATTR */ +#line 1073 "perly.y" { (yyval.opval) = NULL; } break; - case 119: /* sigvarname: %empty */ -#line 826 "perly.y" - { parser->in_my = 0; (yyval.opval) = NULL; } + case 145: /* sigvar: %empty */ +#line 1088 "perly.y" + { parser->in_my = 0; (yyval.ival) = 0; } break; - case 120: /* sigvarname: PRIVATEREF */ -#line 828 "perly.y" - { parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); } + case 146: /* sigvar: PRIVATEREF */ +#line 1090 "perly.y" + { parser->in_my = 0; (yyval.ival) = (ps[0].val.opval)->op_targ; op_free((ps[0].val.opval)); } break; - case 121: /* sigslurpsigil: PERLY_SNAIL */ -#line 833 "perly.y" + case 147: /* sigslurpsigil: PERLY_SNAIL */ +#line 1095 "perly.y" { (yyval.ival) = '@'; } break; - case 122: /* sigslurpsigil: PERLY_PERCENT_SIGN */ -#line 835 "perly.y" + case 148: /* sigslurpsigil: PERLY_PERCENT_SIGN */ +#line 1097 "perly.y" { (yyval.ival) = '%'; } break; - case 123: /* sigslurpelem: sigslurpsigil sigvarname */ -#line 839 "perly.y" + case 149: /* sigslurpelem: sigslurpsigil sigvar */ +#line 1101 "perly.y" { - subsignature_append_slurpy((ps[-1].val.ival), (ps[0].val.opval)); + subsignature_append_slurpy((ps[-1].val.ival), (ps[0].val.ival)); (yyval.opval) = NULL; } break; - case 124: /* sigslurpelem: sigslurpsigil sigvarname ASSIGNOP */ -#line 844 "perly.y" + case 150: /* sigslurpelem: sigslurpsigil sigvar ASSIGNOP */ +#line 1106 "perly.y" { yyerror("A slurpy parameter may not have a default value"); } break; - case 125: /* sigslurpelem: sigslurpsigil sigvarname ASSIGNOP term */ -#line 848 "perly.y" + case 151: /* sigslurpelem: sigslurpsigil sigvar ASSIGNOP term */ +#line 1110 "perly.y" { yyerror("A slurpy parameter may not have a default value"); } break; - case 126: /* sigscalarelem: PERLY_DOLLAR sigvarname */ -#line 856 "perly.y" - { - subsignature_append_positional((ps[0].val.opval), 0, NULL); - (yyval.opval) = NULL; - } + case 152: /* optcolon: %empty */ +#line 1116 "perly.y" + { (yyval.ival) = 0; } + + break; + + case 153: /* optcolon: PERLY_COLON */ +#line 1118 "perly.y" + { (yyval.ival) = ':'; } break; - case 127: /* sigscalarelem: PERLY_DOLLAR sigvarname ASSIGNOP */ -#line 861 "perly.y" + case 154: /* sigscalarelem: optcolon PERLY_DOLLAR sigvar */ +#line 1124 "perly.y" { - subsignature_append_positional((ps[-1].val.opval), (ps[0].val.ival), newOP(OP_NULL, 0)); + if((ps[-2].val.ival)) { + PADNAME *pn = PadnamelistARRAY(PL_comppad_name)[(ps[0].val.ival)]; + subsignature_append_named(PadnamePV(pn)+1, (ps[0].val.ival), 0, NULL); + } + else + subsignature_append_positional((ps[0].val.ival), 0, NULL); (yyval.opval) = NULL; } break; - case 128: /* sigscalarelem: PERLY_DOLLAR sigvarname ASSIGNOP term */ -#line 866 "perly.y" + case 155: /* sigscalarelem: optcolon PERLY_DOLLAR sigvar ASSIGNOP optsigscalardefault */ +#line 1134 "perly.y" { - subsignature_append_positional((ps[-2].val.opval), (ps[-1].val.ival), (ps[0].val.opval)); + if((ps[-4].val.ival)) { + PADNAME *pn = PadnamelistARRAY(PL_comppad_name)[(ps[-2].val.ival)]; + subsignature_append_named(PadnamePV(pn)+1, (ps[-2].val.ival), (ps[-1].val.ival), (ps[0].val.opval)); + } + else + subsignature_append_positional((ps[-2].val.ival), (ps[-1].val.ival), (ps[0].val.opval)); (yyval.opval) = NULL; } break; - case 129: /* sigelem: sigscalarelem */ -#line 875 "perly.y" + case 156: /* optsigscalardefault: %empty */ +#line 1147 "perly.y" + { (yyval.opval) = newOP(OP_NULL, 0); } + + break; + + case 158: /* sigelem: sigscalarelem */ +#line 1154 "perly.y" { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); } break; - case 130: /* sigelem: sigslurpelem */ -#line 877 "perly.y" + case 159: /* sigelem: sigslurpelem */ +#line 1156 "perly.y" { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); } break; - case 138: /* subsignature: PERLY_PAREN_OPEN subsigguts PERLY_PAREN_CLOSE */ -#line 903 "perly.y" + case 167: /* subsignature: PERLY_PAREN_OPEN subsigguts PERLY_PAREN_CLOSE */ +#line 1182 "perly.y" { (yyval.opval) = (ps[-1].val.opval); } break; - case 139: /* $@20: %empty */ -#line 906 "perly.y" + case 168: /* $@20: %empty */ +#line 1185 "perly.y" { ENTER; subsignature_start(); @@ -1037,8 +1049,8 @@ case 2: /* @1: %empty */ break; - case 140: /* subsigguts: $@20 optsiglist */ -#line 912 "perly.y" + case 169: /* subsigguts: $@20 optsiglist */ +#line 1191 "perly.y" { if (!FEATURE_SIGNATURES_IS_ENABLED && !CvIsMETHOD(PL_compcv)) croak("Experimental " @@ -1065,14 +1077,14 @@ case 2: /* @1: %empty */ break; - case 142: /* optsubbody: PERLY_SEMICOLON */ -#line 940 "perly.y" + case 171: /* optsubbody: PERLY_SEMICOLON */ +#line 1219 "perly.y" { (yyval.opval) = NULL; } break; - case 143: /* subbody: remember PERLY_BRACE_OPEN stmtseq PERLY_BRACE_CLOSE */ -#line 946 "perly.y" + case 172: /* subbody: remember PERLY_BRACE_OPEN stmtseq PERLY_BRACE_CLOSE */ +#line 1225 "perly.y" { if (parser->copline > (line_t)(ps[-2].val.ival)) parser->copline = (line_t)(ps[-2].val.ival); @@ -1081,20 +1093,20 @@ case 2: /* @1: %empty */ break; - case 145: /* optsigsubbody: PERLY_SEMICOLON */ -#line 958 "perly.y" + case 174: /* optsigsubbody: PERLY_SEMICOLON */ +#line 1237 "perly.y" { (yyval.opval) = NULL; } break; - case 146: /* $@21: %empty */ -#line 963 "perly.y" + case 175: /* $@21: %empty */ +#line 1242 "perly.y" { PL_parser->sig_seen = FALSE; } break; - case 147: /* sigsubbody: remember optsubsignature PERLY_BRACE_OPEN $@21 stmtseq PERLY_BRACE_CLOSE */ -#line 965 "perly.y" + case 176: /* sigsubbody: remember optsubsignature PERLY_BRACE_OPEN $@21 stmtseq PERLY_BRACE_CLOSE */ +#line 1244 "perly.y" { if (parser->copline > (line_t)(ps[-3].val.ival)) parser->copline = (line_t)(ps[-3].val.ival); @@ -1104,38 +1116,38 @@ case 2: /* @1: %empty */ break; - case 148: /* expr: expr ANDOP expr */ -#line 976 "perly.y" + case 177: /* expr: expr ANDOP expr */ +#line 1255 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; - case 149: /* expr: expr PLUGIN_LOGICAL_AND_LOW_OP expr */ -#line 978 "perly.y" + case 178: /* expr: expr PLUGIN_LOGICAL_AND_LOW_OP expr */ +#line 1257 "perly.y" { (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); } break; - case 150: /* expr: expr OROP expr */ -#line 980 "perly.y" + case 179: /* expr: expr OROP expr */ +#line 1259 "perly.y" { (yyval.opval) = newLOGOP((ps[-1].val.ival), 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; - case 151: /* expr: expr PLUGIN_LOGICAL_OR_LOW_OP expr */ -#line 982 "perly.y" + case 180: /* expr: expr PLUGIN_LOGICAL_OR_LOW_OP expr */ +#line 1261 "perly.y" { (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); } break; - case 153: /* listexpr: listexpr PERLY_COMMA */ -#line 988 "perly.y" + case 182: /* listexpr: listexpr PERLY_COMMA */ +#line 1267 "perly.y" { (yyval.opval) = (ps[-1].val.opval); } break; - case 154: /* listexpr: listexpr PERLY_COMMA term */ -#line 990 "perly.y" + case 183: /* listexpr: listexpr PERLY_COMMA term */ +#line 1269 "perly.y" { OP* term = (ps[0].val.opval); (yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), term); @@ -1143,32 +1155,32 @@ case 2: /* @1: %empty */ break; - case 156: /* listop: LSTOP indirob listexpr */ -#line 999 "perly.y" + case 185: /* listop: LSTOP indirob listexpr */ +#line 1278 "perly.y" { (yyval.opval) = op_convert_list((ps[-2].val.ival), OPf_STACKED, op_prepend_elem(OP_LIST, newGVREF((ps[-2].val.ival),(ps[-1].val.opval)), (ps[0].val.opval)) ); } break; - case 157: /* listop: BLKLSTOP block listexpr */ -#line 1003 "perly.y" + case 186: /* listop: BLKLSTOP block listexpr */ +#line 1282 "perly.y" { (yyval.opval) = op_convert_list((ps[-2].val.ival), OPf_STACKED, op_prepend_elem(OP_LIST, newUNOP(OP_NULL, 0, op_scope((ps[-1].val.opval))), (ps[0].val.opval)) ); } break; - case 158: /* listop: FUNC PERLY_PAREN_OPEN indirob expr PERLY_PAREN_CLOSE */ -#line 1007 "perly.y" + case 187: /* listop: FUNC PERLY_PAREN_OPEN indirob expr PERLY_PAREN_CLOSE */ +#line 1286 "perly.y" { (yyval.opval) = op_convert_list((ps[-4].val.ival), OPf_STACKED, op_prepend_elem(OP_LIST, newGVREF((ps[-4].val.ival),(ps[-2].val.opval)), (ps[-1].val.opval)) ); } break; - case 159: /* listop: term ARROW methodname PERLY_PAREN_OPEN optexpr PERLY_PAREN_CLOSE */ -#line 1011 "perly.y" + case 188: /* listop: term ARROW methodname PERLY_PAREN_OPEN optexpr PERLY_PAREN_CLOSE */ +#line 1290 "perly.y" { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, scalar((ps[-5].val.opval)), (ps[-1].val.opval)), @@ -1177,8 +1189,8 @@ case 2: /* @1: %empty */ break; - case 160: /* listop: term ARROW methodname */ -#line 1017 "perly.y" + case 189: /* listop: term ARROW methodname */ +#line 1296 "perly.y" { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, scalar((ps[-2].val.opval)), newMETHOP(OP_METHOD, 0, (ps[0].val.opval)))); @@ -1186,8 +1198,8 @@ case 2: /* @1: %empty */ break; - case 161: /* listop: term ARROW PERLY_AMPERSAND subname PERLY_PAREN_OPEN optexpr PERLY_PAREN_CLOSE */ -#line 1022 "perly.y" + case 190: /* listop: term ARROW PERLY_AMPERSAND subname PERLY_PAREN_OPEN optexpr PERLY_PAREN_CLOSE */ +#line 1301 "perly.y" { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, scalar((ps[-6].val.opval)), (ps[-1].val.opval)), @@ -1196,8 +1208,8 @@ case 2: /* @1: %empty */ break; - case 162: /* listop: term ARROW PERLY_AMPERSAND subname */ -#line 1028 "perly.y" + case 191: /* listop: term ARROW PERLY_AMPERSAND subname */ +#line 1307 "perly.y" { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, scalar((ps[-3].val.opval)), @@ -1206,8 +1218,8 @@ case 2: /* @1: %empty */ break; - case 163: /* listop: METHCALL0 indirob optlistexpr */ -#line 1034 "perly.y" + case 192: /* listop: METHCALL0 indirob optlistexpr */ +#line 1313 "perly.y" { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[-1].val.opval), (ps[0].val.opval)), @@ -1216,8 +1228,8 @@ case 2: /* @1: %empty */ break; - case 164: /* listop: METHCALL indirob PERLY_PAREN_OPEN optexpr PERLY_PAREN_CLOSE */ -#line 1040 "perly.y" + case 193: /* listop: METHCALL indirob PERLY_PAREN_OPEN optexpr PERLY_PAREN_CLOSE */ +#line 1319 "perly.y" { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[-3].val.opval), (ps[-1].val.opval)), @@ -1226,26 +1238,26 @@ case 2: /* @1: %empty */ break; - case 165: /* listop: LSTOP optlistexpr */ -#line 1046 "perly.y" + case 194: /* listop: LSTOP optlistexpr */ +#line 1325 "perly.y" { (yyval.opval) = op_convert_list((ps[-1].val.ival), 0, (ps[0].val.opval)); } break; - case 166: /* listop: FUNC PERLY_PAREN_OPEN optexpr PERLY_PAREN_CLOSE */ -#line 1048 "perly.y" + case 195: /* listop: FUNC PERLY_PAREN_OPEN optexpr PERLY_PAREN_CLOSE */ +#line 1327 "perly.y" { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); } break; - case 167: /* listop: FUNC SUBLEXSTART optexpr SUBLEXEND */ -#line 1050 "perly.y" + case 196: /* listop: FUNC SUBLEXSTART optexpr SUBLEXEND */ +#line 1329 "perly.y" { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); } break; - case 168: /* @22: %empty */ -#line 1052 "perly.y" + case 197: /* @22: %empty */ +#line 1331 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); (yyval.opval) = newANONATTRSUB((ps[-1].val.ival), 0, NULL, (ps[0].val.opval)); /* prevent double op_free() if the following fails to parse */ @@ -1254,8 +1266,8 @@ case 2: /* @1: %empty */ break; - case 169: /* listop: LSTOPSUB startanonsub block @22 optlistexpr */ -#line 1058 "perly.y" + case 198: /* listop: LSTOPSUB startanonsub block @22 optlistexpr */ +#line 1337 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[-1].val.opval), (ps[0].val.opval)), (ps[-4].val.opval))); @@ -1263,21 +1275,21 @@ case 2: /* @1: %empty */ break; - case 172: /* subscripted: gelem PERLY_BRACE_OPEN expr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ -#line 1073 "perly.y" + case 201: /* subscripted: gelem PERLY_BRACE_OPEN expr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ +#line 1352 "perly.y" { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[-4].val.opval), scalar((ps[-2].val.opval))); } break; - case 173: /* subscripted: scalar PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ -#line 1075 "perly.y" + case 202: /* subscripted: scalar PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ +#line 1354 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[-3].val.opval)), scalar((ps[-1].val.opval))); } break; - case 174: /* subscripted: term ARROW PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ -#line 1078 "perly.y" + case 203: /* subscripted: term ARROW PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ +#line 1357 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[-4].val.opval)),OP_RV2AV), scalar((ps[-1].val.opval))); @@ -1285,8 +1297,8 @@ case 2: /* @1: %empty */ break; - case 175: /* subscripted: subscripted PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ -#line 1083 "perly.y" + case 204: /* subscripted: subscripted PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ +#line 1362 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[-3].val.opval)),OP_RV2AV), scalar((ps[-1].val.opval))); @@ -1294,31 +1306,31 @@ case 2: /* @1: %empty */ break; - case 176: /* subscripted: scalar PERLY_BRACE_OPEN expr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ -#line 1088 "perly.y" + case 205: /* subscripted: scalar PERLY_BRACE_OPEN expr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ +#line 1367 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[-4].val.opval)), jmaybe((ps[-2].val.opval))); } break; - case 177: /* subscripted: term ARROW PERLY_BRACE_OPEN expr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ -#line 1091 "perly.y" + case 206: /* subscripted: term ARROW PERLY_BRACE_OPEN expr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ +#line 1370 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[-5].val.opval)),OP_RV2HV), jmaybe((ps[-2].val.opval))); } break; - case 178: /* subscripted: subscripted PERLY_BRACE_OPEN expr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ -#line 1095 "perly.y" + case 207: /* subscripted: subscripted PERLY_BRACE_OPEN expr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ +#line 1374 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[-4].val.opval)),OP_RV2HV), jmaybe((ps[-2].val.opval))); } break; - case 179: /* subscripted: term ARROW PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ -#line 1099 "perly.y" + case 208: /* subscripted: term ARROW PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ +#line 1378 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[-3].val.opval)))); if (parser->expect == XBLOCK) @@ -1327,8 +1339,8 @@ case 2: /* @1: %empty */ break; - case 180: /* subscripted: term ARROW PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */ -#line 1105 "perly.y" + case 209: /* subscripted: term ARROW PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */ +#line 1384 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[-1].val.opval), newCVREF(0, scalar((ps[-4].val.opval))))); @@ -1338,8 +1350,8 @@ case 2: /* @1: %empty */ break; - case 181: /* subscripted: subscripted PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */ -#line 1113 "perly.y" + case 210: /* subscripted: subscripted PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */ +#line 1392 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[-1].val.opval), newCVREF(0, scalar((ps[-3].val.opval))))); @@ -1349,8 +1361,8 @@ case 2: /* @1: %empty */ break; - case 182: /* subscripted: subscripted PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ -#line 1120 "perly.y" + case 211: /* subscripted: subscripted PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ +#line 1399 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[-2].val.opval)))); if (parser->expect == XBLOCK) @@ -1359,56 +1371,56 @@ case 2: /* @1: %empty */ break; - case 183: /* subscripted: PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ -#line 1126 "perly.y" + case 212: /* subscripted: PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ +#line 1405 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-4].val.opval)); } break; - case 184: /* subscripted: QWLIST PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ -#line 1128 "perly.y" + case 213: /* subscripted: QWLIST PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ +#line 1407 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-3].val.opval)); } break; - case 185: /* subscripted: PERLY_PAREN_OPEN PERLY_PAREN_CLOSE PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ -#line 1130 "perly.y" + case 214: /* subscripted: PERLY_PAREN_OPEN PERLY_PAREN_CLOSE PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ +#line 1409 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), NULL); } break; - case 186: /* termbinop: term PLUGIN_HIGH_OP term */ -#line 1135 "perly.y" + case 215: /* termbinop: term PLUGIN_HIGH_OP term */ +#line 1414 "perly.y" { (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); } break; - case 187: /* termbinop: term ASSIGNOP term */ -#line 1137 "perly.y" + case 216: /* termbinop: term ASSIGNOP term */ +#line 1416 "perly.y" { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[-2].val.opval), (ps[-1].val.ival), (ps[0].val.opval)); } break; - case 188: /* termbinop: term PLUGIN_ASSIGN_OP term */ -#line 1139 "perly.y" + case 217: /* termbinop: term PLUGIN_ASSIGN_OP term */ +#line 1418 "perly.y" { (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); } break; - case 189: /* termbinop: term POWOP term */ -#line 1141 "perly.y" + case 218: /* termbinop: term POWOP term */ +#line 1420 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; - case 190: /* termbinop: term PLUGIN_POW_OP term */ -#line 1143 "perly.y" + case 219: /* termbinop: term PLUGIN_POW_OP term */ +#line 1422 "perly.y" { (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); } break; - case 191: /* termbinop: term MULOP term */ -#line 1145 "perly.y" + case 220: /* termbinop: term MULOP term */ +#line 1424 "perly.y" { if ((ps[-1].val.ival) != OP_REPEAT) scalar((ps[-2].val.opval)); (yyval.opval) = newBINOP((ps[-1].val.ival), 0, (ps[-2].val.opval), scalar((ps[0].val.opval))); @@ -1416,220 +1428,220 @@ case 2: /* @1: %empty */ break; - case 192: /* termbinop: term PLUGIN_MUL_OP term */ -#line 1150 "perly.y" + case 221: /* termbinop: term PLUGIN_MUL_OP term */ +#line 1429 "perly.y" { (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); } break; - case 193: /* termbinop: term ADDOP term */ -#line 1152 "perly.y" + case 222: /* termbinop: term ADDOP term */ +#line 1431 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; - case 194: /* termbinop: term PLUGIN_ADD_OP term */ -#line 1154 "perly.y" + case 223: /* termbinop: term PLUGIN_ADD_OP term */ +#line 1433 "perly.y" { (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); } break; - case 195: /* termbinop: term SHIFTOP term */ -#line 1156 "perly.y" + case 224: /* termbinop: term SHIFTOP term */ +#line 1435 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; - case 196: /* termbinop: termrelop */ -#line 1158 "perly.y" + case 225: /* termbinop: termrelop */ +#line 1437 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 197: /* termbinop: termeqop */ -#line 1160 "perly.y" + case 226: /* termbinop: termeqop */ +#line 1439 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 198: /* termbinop: term BITANDOP term */ -#line 1162 "perly.y" + case 227: /* termbinop: term BITANDOP term */ +#line 1441 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; - case 199: /* termbinop: term BITOROP term */ -#line 1164 "perly.y" + case 228: /* termbinop: term BITOROP term */ +#line 1443 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; - case 200: /* termbinop: term DOTDOT term */ -#line 1166 "perly.y" + case 229: /* termbinop: term DOTDOT term */ +#line 1445 "perly.y" { (yyval.opval) = newRANGE((ps[-1].val.ival), scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; - case 201: /* termbinop: term ANDAND term */ -#line 1168 "perly.y" + case 230: /* termbinop: term ANDAND term */ +#line 1447 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; - case 202: /* termbinop: term PLUGIN_LOGICAL_AND_OP term */ -#line 1170 "perly.y" + case 231: /* termbinop: term PLUGIN_LOGICAL_AND_OP term */ +#line 1449 "perly.y" { (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); } break; - case 203: /* termbinop: term OROR term */ -#line 1172 "perly.y" + case 232: /* termbinop: term OROR term */ +#line 1451 "perly.y" { (yyval.opval) = newLOGOP((ps[-1].val.ival), 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; - case 204: /* termbinop: term PLUGIN_LOGICAL_OR_OP term */ -#line 1174 "perly.y" + case 233: /* termbinop: term PLUGIN_LOGICAL_OR_OP term */ +#line 1453 "perly.y" { (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); } break; - case 205: /* termbinop: term DORDOR term */ -#line 1176 "perly.y" + case 234: /* termbinop: term DORDOR term */ +#line 1455 "perly.y" { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; - case 206: /* termbinop: term MATCHOP term */ -#line 1178 "perly.y" + case 235: /* termbinop: term MATCHOP term */ +#line 1457 "perly.y" { (yyval.opval) = bind_match((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); } break; - case 207: /* termbinop: term PLUGIN_LOW_OP term */ -#line 1180 "perly.y" + case 236: /* termbinop: term PLUGIN_LOW_OP term */ +#line 1459 "perly.y" { (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); } break; - case 208: /* termrelop: relopchain */ -#line 1184 "perly.y" + case 237: /* termrelop: relopchain */ +#line 1463 "perly.y" { (yyval.opval) = cmpchain_finish((ps[0].val.opval)); } break; - case 209: /* termrelop: term NCRELOP term */ -#line 1186 "perly.y" + case 238: /* termrelop: term NCRELOP term */ +#line 1465 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; - case 210: /* termrelop: termrelop NCRELOP */ -#line 1188 "perly.y" + case 239: /* termrelop: termrelop NCRELOP */ +#line 1467 "perly.y" { yyerror("syntax error"); YYERROR; } break; - case 211: /* termrelop: termrelop CHRELOP */ -#line 1190 "perly.y" + case 240: /* termrelop: termrelop CHRELOP */ +#line 1469 "perly.y" { yyerror("syntax error"); YYERROR; } break; - case 212: /* termrelop: term PLUGIN_REL_OP term */ -#line 1192 "perly.y" + case 241: /* termrelop: term PLUGIN_REL_OP term */ +#line 1471 "perly.y" { (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); } break; - case 213: /* relopchain: term CHRELOP term */ -#line 1196 "perly.y" + case 242: /* relopchain: term CHRELOP term */ +#line 1475 "perly.y" { (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); } break; - case 214: /* relopchain: relopchain CHRELOP term */ -#line 1198 "perly.y" + case 243: /* relopchain: relopchain CHRELOP term */ +#line 1477 "perly.y" { (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); } break; - case 215: /* termeqop: eqopchain */ -#line 1202 "perly.y" + case 244: /* termeqop: eqopchain */ +#line 1481 "perly.y" { (yyval.opval) = cmpchain_finish((ps[0].val.opval)); } break; - case 216: /* termeqop: term NCEQOP term */ -#line 1204 "perly.y" + case 245: /* termeqop: term NCEQOP term */ +#line 1483 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; - case 217: /* termeqop: termeqop NCEQOP */ -#line 1206 "perly.y" + case 246: /* termeqop: termeqop NCEQOP */ +#line 1485 "perly.y" { yyerror("syntax error"); YYERROR; } break; - case 218: /* termeqop: termeqop CHEQOP */ -#line 1208 "perly.y" + case 247: /* termeqop: termeqop CHEQOP */ +#line 1487 "perly.y" { yyerror("syntax error"); YYERROR; } break; - case 219: /* eqopchain: term CHEQOP term */ -#line 1212 "perly.y" + case 248: /* eqopchain: term CHEQOP term */ +#line 1491 "perly.y" { (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); } break; - case 220: /* eqopchain: eqopchain CHEQOP term */ -#line 1214 "perly.y" + case 249: /* eqopchain: eqopchain CHEQOP term */ +#line 1493 "perly.y" { (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); } break; - case 221: /* termunop: PERLY_MINUS term */ -#line 1219 "perly.y" + case 250: /* termunop: PERLY_MINUS term */ +#line 1498 "perly.y" { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[0].val.opval))); } break; - case 222: /* termunop: PERLY_PLUS term */ -#line 1221 "perly.y" + case 251: /* termunop: PERLY_PLUS term */ +#line 1500 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 223: /* termunop: PERLY_EXCLAMATION_MARK term */ -#line 1224 "perly.y" + case 252: /* termunop: PERLY_EXCLAMATION_MARK term */ +#line 1503 "perly.y" { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); } break; - case 224: /* termunop: PERLY_TILDE term */ -#line 1226 "perly.y" + case 253: /* termunop: PERLY_TILDE term */ +#line 1505 "perly.y" { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, scalar((ps[0].val.opval))); } break; - case 225: /* termunop: term POSTINC */ -#line 1228 "perly.y" + case 254: /* termunop: term POSTINC */ +#line 1507 "perly.y" { (yyval.opval) = newUNOP(OP_POSTINC, 0, op_lvalue(scalar((ps[-1].val.opval)), OP_POSTINC)); } break; - case 226: /* termunop: term POSTDEC */ -#line 1231 "perly.y" + case 255: /* termunop: term POSTDEC */ +#line 1510 "perly.y" { (yyval.opval) = newUNOP(OP_POSTDEC, 0, op_lvalue(scalar((ps[-1].val.opval)), OP_POSTDEC));} break; - case 227: /* termunop: term POSTJOIN */ -#line 1234 "perly.y" + case 256: /* termunop: term POSTJOIN */ +#line 1513 "perly.y" { (yyval.opval) = op_convert_list(OP_JOIN, 0, op_append_elem( OP_LIST, @@ -1643,48 +1655,60 @@ case 2: /* @1: %empty */ break; - case 228: /* termunop: PREINC term */ -#line 1245 "perly.y" + case 257: /* termunop: PREINC term */ +#line 1524 "perly.y" { (yyval.opval) = newUNOP(OP_PREINC, 0, op_lvalue(scalar((ps[0].val.opval)), OP_PREINC)); } break; - case 229: /* termunop: PREDEC term */ -#line 1248 "perly.y" + case 258: /* termunop: PREDEC term */ +#line 1527 "perly.y" { (yyval.opval) = newUNOP(OP_PREDEC, 0, op_lvalue(scalar((ps[0].val.opval)), OP_PREDEC)); } break; - case 230: /* anonymous: PERLY_BRACKET_OPEN optexpr PERLY_BRACKET_CLOSE */ -#line 1256 "perly.y" + case 259: /* anonymous: PERLY_BRACKET_OPEN optexpr PERLY_BRACKET_CLOSE */ +#line 1535 "perly.y" { (yyval.opval) = newANONLIST((ps[-1].val.opval)); } break; - case 231: /* anonymous: HASHBRACK optexpr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ -#line 1258 "perly.y" + case 260: /* anonymous: HASHBRACK optexpr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ +#line 1537 "perly.y" { (yyval.opval) = newANONHASH((ps[-2].val.opval)); } break; - case 232: /* anonymous: KW_SUB_anon startanonsub proto subattrlist subbody */ -#line 1260 "perly.y" + case 261: /* anonymous: KW_SUB_anon startanonsub proto subattrlist subbody */ +#line 1539 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); (yyval.opval) = newANONATTRSUB((ps[-3].val.ival), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval)); } break; - case 233: /* anonymous: KW_SUB_anon_sig startanonsub subattrlist sigsubbody */ -#line 1263 "perly.y" + case 262: /* anonymous: KW_SUB_anon startanonsub proto subattrlist */ +#line 1542 "perly.y" + { yyerror("Illegal declaration of anonymous subroutine"); YYERROR; } + + break; + + case 263: /* anonymous: KW_SUB_anon_sig startanonsub subattrlist sigsubbody */ +#line 1544 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); (yyval.opval) = newANONATTRSUB((ps[-2].val.ival), NULL, (ps[-1].val.opval), (ps[0].val.opval)); } break; - case 234: /* anonymous: KW_METHOD_anon startanonmethod subattrlist sigsubbody */ -#line 1266 "perly.y" + case 264: /* anonymous: KW_SUB_anon_sig startanonsub subattrlist */ +#line 1547 "perly.y" + { yyerror("Illegal declaration of anonymous subroutine"); YYERROR; } + + break; + + case 265: /* anonymous: KW_METHOD_anon startanonmethod subattrlist sigsubbody */ +#line 1549 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); (yyval.opval) = newANONATTRSUB((ps[-2].val.ival), NULL, (ps[-1].val.opval), (ps[0].val.opval)); @@ -1692,98 +1716,104 @@ case 2: /* @1: %empty */ break; - case 235: /* termdo: KW_DO term */ -#line 1274 "perly.y" + case 266: /* anonymous: KW_METHOD_anon startanonmethod subattrlist */ +#line 1554 "perly.y" + { yyerror("Illegal declaration of anonymous subroutine"); YYERROR; } + + break; + + case 267: /* termdo: KW_DO term */ +#line 1559 "perly.y" { (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));} break; - case 236: /* termdo: KW_DO block */ -#line 1276 "perly.y" + case 268: /* termdo: KW_DO block */ +#line 1561 "perly.y" { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[0].val.opval)));} break; - case 241: /* term: term PERLY_QUESTION_MARK term PERLY_COLON term */ -#line 1284 "perly.y" + case 273: /* term: term PERLY_QUESTION_MARK term PERLY_COLON term */ +#line 1569 "perly.y" { (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), (ps[0].val.opval)); } break; - case 242: /* term: REFGEN term */ -#line 1286 "perly.y" + case 274: /* term: REFGEN term */ +#line 1571 "perly.y" { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); } break; - case 243: /* term: myattrterm */ -#line 1288 "perly.y" + case 275: /* term: myattrterm */ +#line 1573 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 244: /* term: KW_LOCAL term */ -#line 1290 "perly.y" + case 276: /* term: KW_LOCAL term */ +#line 1575 "perly.y" { (yyval.opval) = localize((ps[0].val.opval),0); } break; - case 245: /* term: PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */ -#line 1292 "perly.y" + case 277: /* term: PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */ +#line 1577 "perly.y" { (yyval.opval) = sawparens((ps[-1].val.opval)); } break; - case 246: /* term: QWLIST */ -#line 1294 "perly.y" + case 278: /* term: QWLIST */ +#line 1579 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 247: /* term: PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ -#line 1296 "perly.y" + case 279: /* term: PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ +#line 1581 "perly.y" { (yyval.opval) = sawparens(newNULLLIST()); } break; - case 248: /* term: scalar */ -#line 1298 "perly.y" + case 280: /* term: scalar */ +#line 1583 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 249: /* term: star */ -#line 1300 "perly.y" + case 281: /* term: star */ +#line 1585 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 250: /* term: hsh */ -#line 1302 "perly.y" + case 282: /* term: hsh */ +#line 1587 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 251: /* term: ary */ -#line 1304 "perly.y" + case 283: /* term: ary */ +#line 1589 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 252: /* term: arylen */ -#line 1306 "perly.y" + case 284: /* term: arylen */ +#line 1591 "perly.y" { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[0].val.opval), OP_AV2ARYLEN));} break; - case 253: /* term: subscripted */ -#line 1308 "perly.y" + case 285: /* term: subscripted */ +#line 1593 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 254: /* term: sliceme PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ -#line 1310 "perly.y" + case 286: /* term: sliceme PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ +#line 1595 "perly.y" { (yyval.opval) = op_prepend_elem(OP_ASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_ASLICE, 0, @@ -1796,8 +1826,8 @@ case 2: /* @1: %empty */ break; - case 255: /* term: kvslice PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ -#line 1320 "perly.y" + case 287: /* term: kvslice PERLY_BRACKET_OPEN expr PERLY_BRACKET_CLOSE */ +#line 1605 "perly.y" { (yyval.opval) = op_prepend_elem(OP_KVASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_KVASLICE, 0, @@ -1810,8 +1840,8 @@ case 2: /* @1: %empty */ break; - case 256: /* term: sliceme PERLY_BRACE_OPEN expr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ -#line 1330 "perly.y" + case 288: /* term: sliceme PERLY_BRACE_OPEN expr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ +#line 1615 "perly.y" { (yyval.opval) = op_prepend_elem(OP_HSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_HSLICE, 0, @@ -1824,8 +1854,8 @@ case 2: /* @1: %empty */ break; - case 257: /* term: kvslice PERLY_BRACE_OPEN expr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ -#line 1340 "perly.y" + case 289: /* term: kvslice PERLY_BRACE_OPEN expr PERLY_SEMICOLON PERLY_BRACE_CLOSE */ +#line 1625 "perly.y" { (yyval.opval) = op_prepend_elem(OP_KVHSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_KVHSLICE, 0, @@ -1838,27 +1868,27 @@ case 2: /* @1: %empty */ break; - case 258: /* term: THING */ -#line 1350 "perly.y" + case 290: /* term: THING */ +#line 1635 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 259: /* term: amper */ -#line 1352 "perly.y" + case 291: /* term: amper */ +#line 1637 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[0].val.opval))); } break; - case 260: /* term: amper PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ -#line 1354 "perly.y" + case 292: /* term: amper PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ +#line 1639 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[-2].val.opval))); } break; - case 261: /* term: amper PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */ -#line 1357 "perly.y" + case 293: /* term: amper PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */ +#line 1642 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[-1].val.opval), scalar((ps[-3].val.opval)))); @@ -1866,153 +1896,153 @@ case 2: /* @1: %empty */ break; - case 262: /* term: NOAMP subname optlistexpr */ -#line 1362 "perly.y" + case 294: /* term: NOAMP subname optlistexpr */ +#line 1647 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval)))); } break; - case 263: /* term: term ARROW PERLY_DOLLAR PERLY_STAR */ -#line 1366 "perly.y" + case 295: /* term: term ARROW PERLY_DOLLAR PERLY_STAR */ +#line 1651 "perly.y" { (yyval.opval) = newSVREF((ps[-3].val.opval)); } break; - case 264: /* term: term ARROW PERLY_SNAIL PERLY_STAR */ -#line 1368 "perly.y" + case 296: /* term: term ARROW PERLY_SNAIL PERLY_STAR */ +#line 1653 "perly.y" { (yyval.opval) = newAVREF((ps[-3].val.opval)); } break; - case 265: /* term: term ARROW PERLY_PERCENT_SIGN PERLY_STAR */ -#line 1370 "perly.y" + case 297: /* term: term ARROW PERLY_PERCENT_SIGN PERLY_STAR */ +#line 1655 "perly.y" { (yyval.opval) = newHVREF((ps[-3].val.opval)); } break; - case 266: /* term: term ARROW PERLY_AMPERSAND PERLY_STAR */ -#line 1372 "perly.y" + case 298: /* term: term ARROW PERLY_AMPERSAND PERLY_STAR */ +#line 1657 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar(newCVREF((ps[-1].val.ival),(ps[-3].val.opval)))); } break; - case 267: /* term: term ARROW PERLY_STAR PERLY_STAR */ -#line 1375 "perly.y" + case 299: /* term: term ARROW PERLY_STAR PERLY_STAR */ +#line 1660 "perly.y" { (yyval.opval) = newGVREF(0,(ps[-3].val.opval)); } break; - case 268: /* term: LOOPEX */ -#line 1377 "perly.y" + case 300: /* term: LOOPEX */ +#line 1662 "perly.y" { (yyval.opval) = newOP((ps[0].val.ival), OPf_SPECIAL); PL_hints |= HINT_BLOCK_SCOPE; } break; - case 269: /* term: LOOPEX term */ -#line 1380 "perly.y" + case 301: /* term: LOOPEX term */ +#line 1665 "perly.y" { (yyval.opval) = newLOOPEX((ps[-1].val.ival),(ps[0].val.opval)); } break; - case 270: /* term: NOTOP listexpr */ -#line 1382 "perly.y" + case 302: /* term: NOTOP listexpr */ +#line 1667 "perly.y" { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); } break; - case 271: /* term: UNIOP */ -#line 1384 "perly.y" + case 303: /* term: UNIOP */ +#line 1669 "perly.y" { (yyval.opval) = newOP((ps[0].val.ival), 0); } break; - case 272: /* term: UNIOP block */ -#line 1386 "perly.y" + case 304: /* term: UNIOP block */ +#line 1671 "perly.y" { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); } break; - case 273: /* term: UNIOP term */ -#line 1388 "perly.y" + case 305: /* term: UNIOP term */ +#line 1673 "perly.y" { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); } break; - case 274: /* term: KW_REQUIRE */ -#line 1390 "perly.y" + case 306: /* term: KW_REQUIRE */ +#line 1675 "perly.y" { (yyval.opval) = newOP(OP_REQUIRE, (ps[0].val.ival) ? OPf_SPECIAL : 0); } break; - case 275: /* term: KW_REQUIRE term */ -#line 1392 "perly.y" + case 307: /* term: KW_REQUIRE term */ +#line 1677 "perly.y" { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[-1].val.ival) ? OPf_SPECIAL : 0, (ps[0].val.opval)); } break; - case 276: /* term: UNIOPSUB */ -#line 1394 "perly.y" + case 308: /* term: UNIOPSUB */ +#line 1679 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); } break; - case 277: /* term: UNIOPSUB term */ -#line 1396 "perly.y" + case 309: /* term: UNIOPSUB term */ +#line 1681 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval)))); } break; - case 278: /* term: FUNC0 */ -#line 1399 "perly.y" + case 310: /* term: FUNC0 */ +#line 1684 "perly.y" { (yyval.opval) = newOP((ps[0].val.ival), 0); } break; - case 279: /* term: FUNC0 PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ -#line 1401 "perly.y" + case 311: /* term: FUNC0 PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ +#line 1686 "perly.y" { (yyval.opval) = newOP((ps[-2].val.ival), 0);} break; - case 280: /* term: FUNC0OP */ -#line 1403 "perly.y" + case 312: /* term: FUNC0OP */ +#line 1688 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 281: /* term: FUNC0OP PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ -#line 1405 "perly.y" + case 313: /* term: FUNC0OP PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ +#line 1690 "perly.y" { (yyval.opval) = (ps[-2].val.opval); } break; - case 282: /* term: FUNC0SUB */ -#line 1407 "perly.y" + case 314: /* term: FUNC0SUB */ +#line 1692 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); } break; - case 283: /* term: FUNC1 PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ -#line 1409 "perly.y" + case 315: /* term: FUNC1 PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ +#line 1694 "perly.y" { (yyval.opval) = ((ps[-2].val.ival) == OP_NOT) ? newUNOP((ps[-2].val.ival), 0, newSVOP(OP_CONST, 0, newSViv(0))) : newOP((ps[-2].val.ival), OPf_SPECIAL); } break; - case 284: /* term: FUNC1 PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */ -#line 1413 "perly.y" + case 316: /* term: FUNC1 PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */ +#line 1698 "perly.y" { (yyval.opval) = newUNOP((ps[-3].val.ival), 0, (ps[-1].val.opval)); } break; - case 285: /* @23: %empty */ -#line 1415 "perly.y" + case 317: /* @23: %empty */ +#line 1700 "perly.y" { if ( (ps[0].val.opval)->op_type != OP_TRANS && (ps[0].val.opval)->op_type != OP_TRANSR @@ -2026,68 +2056,68 @@ case 2: /* @1: %empty */ break; - case 286: /* term: PMFUNC @23 SUBLEXSTART listexpr optrepl SUBLEXEND */ -#line 1426 "perly.y" + case 318: /* term: PMFUNC @23 SUBLEXSTART listexpr optrepl SUBLEXEND */ +#line 1711 "perly.y" { (yyval.opval) = pmruntime((ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), 1, (ps[-4].val.ival)); } break; - case 290: /* myattrterm: KW_MY myterm myattrlist */ -#line 1435 "perly.y" + case 322: /* myattrterm: KW_MY myterm attrlist */ +#line 1720 "perly.y" { (yyval.opval) = my_attrs((ps[-1].val.opval),(ps[0].val.opval)); } break; - case 291: /* myattrterm: KW_MY myterm */ -#line 1437 "perly.y" + case 323: /* myattrterm: KW_MY myterm */ +#line 1722 "perly.y" { (yyval.opval) = localize((ps[0].val.opval),1); } break; - case 292: /* myattrterm: KW_MY REFGEN myterm myattrlist */ -#line 1439 "perly.y" + case 324: /* myattrterm: KW_MY REFGEN myterm attrlist */ +#line 1724 "perly.y" { (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[-1].val.opval),(ps[0].val.opval))); } break; - case 293: /* myattrterm: KW_MY REFGEN term */ -#line 1441 "perly.y" + case 325: /* myattrterm: KW_MY REFGEN term */ +#line 1726 "perly.y" { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); } break; - case 294: /* myterm: PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */ -#line 1446 "perly.y" + case 326: /* myterm: PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */ +#line 1731 "perly.y" { (yyval.opval) = sawparens((ps[-1].val.opval)); } break; - case 295: /* myterm: PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ -#line 1448 "perly.y" + case 327: /* myterm: PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */ +#line 1733 "perly.y" { (yyval.opval) = sawparens(newNULLLIST()); } break; - case 296: /* myterm: scalar */ -#line 1451 "perly.y" + case 328: /* myterm: scalar */ +#line 1736 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 297: /* myterm: hsh */ -#line 1453 "perly.y" + case 329: /* myterm: hsh */ +#line 1738 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 298: /* myterm: ary */ -#line 1455 "perly.y" + case 330: /* myterm: ary */ +#line 1740 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 299: /* fieldvar: scalar */ -#line 1460 "perly.y" + case 331: /* fieldvar: scalar */ +#line 1745 "perly.y" { (yyval.pval) = PadnamelistARRAY(PL_comppad_name)[(ps[0].val.opval)->op_targ]; op_free((ps[0].val.opval)); @@ -2095,8 +2125,8 @@ case 2: /* @1: %empty */ break; - case 300: /* fieldvar: hsh */ -#line 1465 "perly.y" + case 332: /* fieldvar: hsh */ +#line 1750 "perly.y" { (yyval.pval) = PadnamelistARRAY(PL_comppad_name)[(ps[0].val.opval)->op_targ]; op_free((ps[0].val.opval)); @@ -2104,8 +2134,8 @@ case 2: /* @1: %empty */ break; - case 301: /* fieldvar: ary */ -#line 1470 "perly.y" + case 333: /* fieldvar: ary */ +#line 1755 "perly.y" { (yyval.pval) = PadnamelistARRAY(PL_comppad_name)[(ps[0].val.opval)->op_targ]; op_free((ps[0].val.opval)); @@ -2113,20 +2143,8 @@ case 2: /* @1: %empty */ break; - case 302: /* optfieldattrlist: COLONATTR THING */ -#line 1478 "perly.y" - { (yyval.opval) = (ps[0].val.opval); } - - break; - - case 303: /* optfieldattrlist: COLONATTR */ -#line 1480 "perly.y" - { (yyval.opval) = NULL; } - - break; - - case 305: /* fielddecl: KW_FIELD fieldvar optfieldattrlist */ -#line 1486 "perly.y" + case 334: /* fielddecl: KW_FIELD fieldvar optattrlist */ +#line 1763 "perly.y" { parser->in_my = 0; if((ps[0].val.opval)) @@ -2136,8 +2154,8 @@ case 2: /* @1: %empty */ break; - case 306: /* $@24: %empty */ -#line 1493 "perly.y" + case 335: /* $@24: %empty */ +#line 1770 "perly.y" { parser->in_my = 0; if((ps[-1].val.opval)) @@ -2148,8 +2166,8 @@ case 2: /* @1: %empty */ break; - case 307: /* fielddecl: KW_FIELD fieldvar optfieldattrlist ASSIGNOP $@24 term */ -#line 1501 "perly.y" + case 336: /* fielddecl: KW_FIELD fieldvar optattrlist ASSIGNOP $@24 term */ +#line 1778 "perly.y" { class_set_field_defop((PADNAME *)(ps[-4].val.pval), (ps[-2].val.ival), (ps[0].val.opval)); LEAVE; @@ -2158,122 +2176,138 @@ case 2: /* @1: %empty */ break; - case 313: /* optrepl: PERLY_SLASH expr */ -#line 1521 "perly.y" + case 342: /* optrepl: PERLY_SLASH expr */ +#line 1798 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; - case 314: /* my_scalar: scalar */ -#line 1527 "perly.y" + case 343: /* my_scalar: scalar */ +#line 1804 "perly.y" { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); } break; - case 315: /* list_of_scalars: list_of_scalars PERLY_COMMA */ -#line 1532 "perly.y" + case 344: /* list_of_itervars: list_of_itervars PERLY_COMMA */ +#line 1809 "perly.y" { (yyval.opval) = (ps[-1].val.opval); } break; - case 316: /* list_of_scalars: list_of_scalars PERLY_COMMA scalar */ -#line 1534 "perly.y" + case 345: /* list_of_itervars: list_of_itervars PERLY_COMMA scalar */ +#line 1811 "perly.y" { (yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), (ps[0].val.opval)); } break; - case 318: /* my_list_of_scalars: list_of_scalars */ -#line 1541 "perly.y" + case 346: /* list_of_itervars: list_of_itervars PERLY_COMMA REFGEN my_var */ +#line 1815 "perly.y" + { + (yyval.opval) = op_append_elem(OP_LIST, (ps[-3].val.opval), newUNOP(OP_REFGEN, 0, (ps[0].val.opval))); + } + + break; + + case 348: /* list_of_itervars: REFGEN my_var */ +#line 1820 "perly.y" + { + (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); + } + + break; + + case 349: /* my_list_of_itervars: list_of_itervars */ +#line 1826 "perly.y" { parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); } break; - case 326: /* amper: PERLY_AMPERSAND indirob */ -#line 1558 "perly.y" + case 357: /* amper: PERLY_AMPERSAND indirob */ +#line 1843 "perly.y" { (yyval.opval) = newCVREF((ps[-1].val.ival),(ps[0].val.opval)); } break; - case 327: /* scalar: PERLY_DOLLAR indirob */ -#line 1562 "perly.y" + case 358: /* scalar: PERLY_DOLLAR indirob */ +#line 1847 "perly.y" { (yyval.opval) = newSVREF((ps[0].val.opval)); } break; - case 328: /* ary: PERLY_SNAIL indirob */ -#line 1566 "perly.y" + case 359: /* ary: PERLY_SNAIL indirob */ +#line 1851 "perly.y" { (yyval.opval) = newAVREF((ps[0].val.opval)); if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival); } break; - case 329: /* hsh: PERLY_PERCENT_SIGN indirob */ -#line 1572 "perly.y" + case 360: /* hsh: PERLY_PERCENT_SIGN indirob */ +#line 1857 "perly.y" { (yyval.opval) = newHVREF((ps[0].val.opval)); if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival); } break; - case 330: /* arylen: DOLSHARP indirob */ -#line 1578 "perly.y" + case 361: /* arylen: DOLSHARP indirob */ +#line 1863 "perly.y" { (yyval.opval) = newAVREF((ps[0].val.opval)); } break; - case 331: /* arylen: term ARROW DOLSHARP PERLY_STAR */ -#line 1580 "perly.y" + case 362: /* arylen: term ARROW DOLSHARP PERLY_STAR */ +#line 1865 "perly.y" { (yyval.opval) = newAVREF((ps[-3].val.opval)); } break; - case 332: /* star: PERLY_STAR indirob */ -#line 1584 "perly.y" + case 363: /* star: PERLY_STAR indirob */ +#line 1869 "perly.y" { (yyval.opval) = newGVREF(0,(ps[0].val.opval)); } break; - case 334: /* sliceme: term ARROW PERLY_SNAIL */ -#line 1589 "perly.y" + case 365: /* sliceme: term ARROW PERLY_SNAIL */ +#line 1874 "perly.y" { (yyval.opval) = newAVREF((ps[-2].val.opval)); } break; - case 336: /* kvslice: term ARROW PERLY_PERCENT_SIGN */ -#line 1594 "perly.y" + case 367: /* kvslice: term ARROW PERLY_PERCENT_SIGN */ +#line 1879 "perly.y" { (yyval.opval) = newHVREF((ps[-2].val.opval)); } break; - case 338: /* gelem: term ARROW PERLY_STAR */ -#line 1599 "perly.y" + case 369: /* gelem: term ARROW PERLY_STAR */ +#line 1884 "perly.y" { (yyval.opval) = newGVREF(0,(ps[-2].val.opval)); } break; - case 339: /* indirob: BAREWORD */ -#line 1604 "perly.y" + case 370: /* indirob: BAREWORD */ +#line 1889 "perly.y" { (yyval.opval) = scalar((ps[0].val.opval)); } break; - case 340: /* indirob: scalar */ -#line 1606 "perly.y" + case 371: /* indirob: scalar */ +#line 1891 "perly.y" { (yyval.opval) = scalar((ps[0].val.opval)); } break; - case 341: /* indirob: block */ -#line 1608 "perly.y" + case 372: /* indirob: block */ +#line 1893 "perly.y" { (yyval.opval) = op_scope((ps[0].val.opval)); } break; - case 342: /* indirob: PRIVATEREF */ -#line 1611 "perly.y" + case 373: /* indirob: PRIVATEREF */ +#line 1896 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; @@ -2285,6 +2319,6 @@ case 2: /* @1: %empty */ /* Generated from: - * 57ef509d481a8f100fca417b83deb7d66655912f27495b2f6daa0699748ea44f perly.y + * 783af8ff7ff42fd7313d85df8bbde58d7480e4964bb41ce7b92a5039a7286074 perly.y * f13e9c08cea6302f0c1d1f467405bd0e0880d0ea92d0669901017a7f7e94ab28 regen_perly.pl * ex: set ro ft=c: */ Index: gnu/usr.bin/perl/perly.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/perly.c,v diff -u -p -a -u -p -r1.20 perly.c --- gnu/usr.bin/perl/perly.c 14 May 2024 19:38:54 -0000 1.20 +++ gnu/usr.bin/perl/perly.c 16 Nov 2026 00:57:39 -0000 @@ -128,6 +128,15 @@ yysymprint(pTHX_ PerlIO * const yyoutput } +/* common prefixes of token names to strip when displaying in compact form + */ +static const char *name_prefixes[] = { + "PERLY_", + "KW_", + "bare_statement_", + NULL, +}; + /* yy_stack_print() * print the top 8 items on the parse stack. */ @@ -150,8 +159,21 @@ yy_stack_print (pTHX_ const yy_parser *p PerlIO_printf(Perl_debug_log, " %8d", ps->state); PerlIO_printf(Perl_debug_log, "\ntoken:"); - for (ps = min; ps <= parser->ps; ps++) - PerlIO_printf(Perl_debug_log, " %8.8s", ps->name); + for (ps = min; ps <= parser->ps; ps++) { + const char *name = ps->name; + const char **p = name_prefixes; + /* strip some common prefixes off the name to better display + * truncated names */ + for (; *p; p++) { + const char *prefix = *p; + STRLEN l = strlen(prefix); + if (strnEQ(name, prefix, l)) { + name += l; + break; + } + } + PerlIO_printf(Perl_debug_log, " %8.8s", name); + } PerlIO_printf(Perl_debug_log, "\nvalue:"); for (ps = min; ps <= parser->ps; ps++) { @@ -220,9 +242,12 @@ do { \ * parse stack, thus avoiding leaks if we die */ static void -S_clear_yystack(pTHX_ const yy_parser *parser) +S_clear_yystack(pTHX_ void *arg) { - yy_stack_frame *ps = parser->ps; + /* arg must be void * for this function to be compatible with + SAVEDESTRUCTOR_X/any_dxptr */ + const yy_parser *parser = (const yy_parser *)arg; + yy_stack_frame *ps = parser->ps; int i = 0; if (!parser->stack) @@ -265,6 +290,8 @@ S_clear_yystack(pTHX_ const yy_parser * int Perl_yyparse (pTHX_ int gramtype) { + PERL_ARGS_ASSERT_YYPARSE; + int yystate; int yyn; int yyresult; Index: gnu/usr.bin/perl/perly.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/perly.h,v diff -u -p -a -u -p -r1.17 perly.h --- gnu/usr.bin/perl/perly.h 26 Dec 2025 22:14:12 -0000 1.17 +++ gnu/usr.bin/perl/perly.h 16 Nov 2026 00:57:39 -0000 @@ -117,79 +117,81 @@ extern int yydebug; BAREWORD = 311, /* BAREWORD */ METHCALL0 = 312, /* METHCALL0 */ METHCALL = 313, /* METHCALL */ - THING = 314, /* THING */ - PMFUNC = 315, /* PMFUNC */ - PRIVATEREF = 316, /* PRIVATEREF */ - QWLIST = 317, /* QWLIST */ - FUNC0OP = 318, /* FUNC0OP */ - FUNC0SUB = 319, /* FUNC0SUB */ - UNIOPSUB = 320, /* UNIOPSUB */ - LSTOPSUB = 321, /* LSTOPSUB */ - PLUGEXPR = 322, /* PLUGEXPR */ - PLUGSTMT = 323, /* PLUGSTMT */ - LABEL = 324, /* LABEL */ - LOOPEX = 325, /* LOOPEX */ - DOTDOT = 326, /* DOTDOT */ - YADAYADA = 327, /* YADAYADA */ - FUNC0 = 328, /* FUNC0 */ - FUNC1 = 329, /* FUNC1 */ - FUNC = 330, /* FUNC */ - UNIOP = 331, /* UNIOP */ - LSTOP = 332, /* LSTOP */ - BLKLSTOP = 333, /* BLKLSTOP */ - POWOP = 334, /* POWOP */ - MULOP = 335, /* MULOP */ - ADDOP = 336, /* ADDOP */ - DOLSHARP = 337, /* DOLSHARP */ - HASHBRACK = 338, /* HASHBRACK */ - NOAMP = 339, /* NOAMP */ - COLONATTR = 340, /* COLONATTR */ - FORMLBRACK = 341, /* FORMLBRACK */ - FORMRBRACK = 342, /* FORMRBRACK */ - SUBLEXSTART = 343, /* SUBLEXSTART */ - SUBLEXEND = 344, /* SUBLEXEND */ - PHASER = 345, /* PHASER */ - PREC_LOW = 346, /* PREC_LOW */ - PLUGIN_LOW_OP = 347, /* PLUGIN_LOW_OP */ - OROP = 348, /* OROP */ - PLUGIN_LOGICAL_OR_LOW_OP = 349, /* PLUGIN_LOGICAL_OR_LOW_OP */ - ANDOP = 350, /* ANDOP */ - PLUGIN_LOGICAL_AND_LOW_OP = 351, /* PLUGIN_LOGICAL_AND_LOW_OP */ - NOTOP = 352, /* NOTOP */ - ASSIGNOP = 353, /* ASSIGNOP */ - PLUGIN_ASSIGN_OP = 354, /* PLUGIN_ASSIGN_OP */ - PERLY_QUESTION_MARK = 355, /* PERLY_QUESTION_MARK */ - PERLY_COLON = 356, /* PERLY_COLON */ - OROR = 357, /* OROR */ - DORDOR = 358, /* DORDOR */ - PLUGIN_LOGICAL_OR_OP = 359, /* PLUGIN_LOGICAL_OR_OP */ - ANDAND = 360, /* ANDAND */ - PLUGIN_LOGICAL_AND_OP = 361, /* PLUGIN_LOGICAL_AND_OP */ - BITOROP = 362, /* BITOROP */ - BITANDOP = 363, /* BITANDOP */ - CHEQOP = 364, /* CHEQOP */ - NCEQOP = 365, /* NCEQOP */ - CHRELOP = 366, /* CHRELOP */ - NCRELOP = 367, /* NCRELOP */ - PLUGIN_REL_OP = 368, /* PLUGIN_REL_OP */ - SHIFTOP = 369, /* SHIFTOP */ - PLUGIN_ADD_OP = 370, /* PLUGIN_ADD_OP */ - PLUGIN_MUL_OP = 371, /* PLUGIN_MUL_OP */ - MATCHOP = 372, /* MATCHOP */ - PERLY_EXCLAMATION_MARK = 373, /* PERLY_EXCLAMATION_MARK */ - PERLY_TILDE = 374, /* PERLY_TILDE */ - UMINUS = 375, /* UMINUS */ - REFGEN = 376, /* REFGEN */ - PLUGIN_POW_OP = 377, /* PLUGIN_POW_OP */ - PREINC = 378, /* PREINC */ - PREDEC = 379, /* PREDEC */ - POSTINC = 380, /* POSTINC */ - POSTDEC = 381, /* POSTDEC */ - POSTJOIN = 382, /* POSTJOIN */ - PLUGIN_HIGH_OP = 383, /* PLUGIN_HIGH_OP */ - ARROW = 384, /* ARROW */ - PERLY_PAREN_CLOSE = 385, /* PERLY_PAREN_CLOSE */ - PERLY_PAREN_OPEN = 386 /* PERLY_PAREN_OPEN */ + ATTRLIST = 314, /* ATTRLIST */ + THING = 315, /* THING */ + PMFUNC = 316, /* PMFUNC */ + PRIVATEREF = 317, /* PRIVATEREF */ + QWLIST = 318, /* QWLIST */ + FUNC0OP = 319, /* FUNC0OP */ + FUNC0SUB = 320, /* FUNC0SUB */ + UNIOPSUB = 321, /* UNIOPSUB */ + LSTOPSUB = 322, /* LSTOPSUB */ + PLUGEXPR = 323, /* PLUGEXPR */ + PLUGSTMT = 324, /* PLUGSTMT */ + LABEL = 325, /* LABEL */ + PROTOTYPE = 326, /* PROTOTYPE */ + LOOPEX = 327, /* LOOPEX */ + DOTDOT = 328, /* DOTDOT */ + YADAYADA = 329, /* YADAYADA */ + FUNC0 = 330, /* FUNC0 */ + FUNC1 = 331, /* FUNC1 */ + FUNC = 332, /* FUNC */ + UNIOP = 333, /* UNIOP */ + LSTOP = 334, /* LSTOP */ + BLKLSTOP = 335, /* BLKLSTOP */ + POWOP = 336, /* POWOP */ + MULOP = 337, /* MULOP */ + ADDOP = 338, /* ADDOP */ + DOLSHARP = 339, /* DOLSHARP */ + HASHBRACK = 340, /* HASHBRACK */ + NOAMP = 341, /* NOAMP */ + COLONATTR = 342, /* COLONATTR */ + FORMLBRACK = 343, /* FORMLBRACK */ + FORMRBRACK = 344, /* FORMRBRACK */ + SUBLEXSTART = 345, /* SUBLEXSTART */ + SUBLEXEND = 346, /* SUBLEXEND */ + PHASER = 347, /* PHASER */ + PREC_LOW = 348, /* PREC_LOW */ + PLUGIN_LOW_OP = 349, /* PLUGIN_LOW_OP */ + OROP = 350, /* OROP */ + PLUGIN_LOGICAL_OR_LOW_OP = 351, /* PLUGIN_LOGICAL_OR_LOW_OP */ + ANDOP = 352, /* ANDOP */ + PLUGIN_LOGICAL_AND_LOW_OP = 353, /* PLUGIN_LOGICAL_AND_LOW_OP */ + NOTOP = 354, /* NOTOP */ + ASSIGNOP = 355, /* ASSIGNOP */ + PLUGIN_ASSIGN_OP = 356, /* PLUGIN_ASSIGN_OP */ + PERLY_QUESTION_MARK = 357, /* PERLY_QUESTION_MARK */ + PERLY_COLON = 358, /* PERLY_COLON */ + OROR = 359, /* OROR */ + DORDOR = 360, /* DORDOR */ + PLUGIN_LOGICAL_OR_OP = 361, /* PLUGIN_LOGICAL_OR_OP */ + ANDAND = 362, /* ANDAND */ + PLUGIN_LOGICAL_AND_OP = 363, /* PLUGIN_LOGICAL_AND_OP */ + BITOROP = 364, /* BITOROP */ + BITANDOP = 365, /* BITANDOP */ + CHEQOP = 366, /* CHEQOP */ + NCEQOP = 367, /* NCEQOP */ + CHRELOP = 368, /* CHRELOP */ + NCRELOP = 369, /* NCRELOP */ + PLUGIN_REL_OP = 370, /* PLUGIN_REL_OP */ + SHIFTOP = 371, /* SHIFTOP */ + PLUGIN_ADD_OP = 372, /* PLUGIN_ADD_OP */ + PLUGIN_MUL_OP = 373, /* PLUGIN_MUL_OP */ + MATCHOP = 374, /* MATCHOP */ + PERLY_EXCLAMATION_MARK = 375, /* PERLY_EXCLAMATION_MARK */ + PERLY_TILDE = 376, /* PERLY_TILDE */ + UMINUS = 377, /* UMINUS */ + REFGEN = 378, /* REFGEN */ + PLUGIN_POW_OP = 379, /* PLUGIN_POW_OP */ + PREINC = 380, /* PREINC */ + PREDEC = 381, /* PREDEC */ + POSTINC = 382, /* POSTINC */ + POSTDEC = 383, /* POSTDEC */ + POSTJOIN = 384, /* POSTJOIN */ + PLUGIN_HIGH_OP = 385, /* PLUGIN_HIGH_OP */ + ARROW = 386, /* ARROW */ + PERLY_PAREN_CLOSE = 387, /* PERLY_PAREN_CLOSE */ + PERLY_PAREN_OPEN = 388 /* PERLY_PAREN_OPEN */ }; typedef enum yytokentype yytoken_kind_t; #endif @@ -197,8 +199,10 @@ extern int yydebug; /* Value type. */ #ifdef PERL_IN_TOKE_C static bool -S_is_opval_token(int type) { +S_is_opval_token(int type) +{ switch (type) { + case ATTRLIST: case BAREWORD: case FUNC0OP: case FUNC0SUB: @@ -210,6 +214,7 @@ S_is_opval_token(int type) { case PLUGSTMT: case PMFUNC: case PRIVATEREF: + case PROTOTYPE: case QWLIST: case THING: case UNIOPSUB: @@ -244,6 +249,6 @@ int yyparse (void); /* Generated from: - * 57ef509d481a8f100fca417b83deb7d66655912f27495b2f6daa0699748ea44f perly.y + * 783af8ff7ff42fd7313d85df8bbde58d7480e4964bb41ce7b92a5039a7286074 perly.y * f13e9c08cea6302f0c1d1f467405bd0e0880d0ea92d0669901017a7f7e94ab28 regen_perly.pl * ex: set ro ft=c: */ Index: gnu/usr.bin/perl/perly.tab =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/perly.tab,v diff -u -p -a -u -p -r1.9 perly.tab --- gnu/usr.bin/perl/perly.tab 26 Dec 2025 22:14:12 -0000 1.9 +++ gnu/usr.bin/perl/perly.tab 16 Nov 2026 00:57:39 -0000 @@ -67,192 +67,220 @@ enum yysymbol_kind_t YYSYMBOL_BAREWORD = 56, /* BAREWORD */ YYSYMBOL_METHCALL0 = 57, /* METHCALL0 */ YYSYMBOL_METHCALL = 58, /* METHCALL */ - YYSYMBOL_THING = 59, /* THING */ - YYSYMBOL_PMFUNC = 60, /* PMFUNC */ - YYSYMBOL_PRIVATEREF = 61, /* PRIVATEREF */ - YYSYMBOL_QWLIST = 62, /* QWLIST */ - YYSYMBOL_FUNC0OP = 63, /* FUNC0OP */ - YYSYMBOL_FUNC0SUB = 64, /* FUNC0SUB */ - YYSYMBOL_UNIOPSUB = 65, /* UNIOPSUB */ - YYSYMBOL_LSTOPSUB = 66, /* LSTOPSUB */ - YYSYMBOL_PLUGEXPR = 67, /* PLUGEXPR */ - YYSYMBOL_PLUGSTMT = 68, /* PLUGSTMT */ - YYSYMBOL_LABEL = 69, /* LABEL */ - YYSYMBOL_LOOPEX = 70, /* LOOPEX */ - YYSYMBOL_DOTDOT = 71, /* DOTDOT */ - YYSYMBOL_YADAYADA = 72, /* YADAYADA */ - YYSYMBOL_FUNC0 = 73, /* FUNC0 */ - YYSYMBOL_FUNC1 = 74, /* FUNC1 */ - YYSYMBOL_FUNC = 75, /* FUNC */ - YYSYMBOL_UNIOP = 76, /* UNIOP */ - YYSYMBOL_LSTOP = 77, /* LSTOP */ - YYSYMBOL_BLKLSTOP = 78, /* BLKLSTOP */ - YYSYMBOL_POWOP = 79, /* POWOP */ - YYSYMBOL_MULOP = 80, /* MULOP */ - YYSYMBOL_ADDOP = 81, /* ADDOP */ - YYSYMBOL_DOLSHARP = 82, /* DOLSHARP */ - YYSYMBOL_HASHBRACK = 83, /* HASHBRACK */ - YYSYMBOL_NOAMP = 84, /* NOAMP */ - YYSYMBOL_COLONATTR = 85, /* COLONATTR */ - YYSYMBOL_FORMLBRACK = 86, /* FORMLBRACK */ - YYSYMBOL_FORMRBRACK = 87, /* FORMRBRACK */ - YYSYMBOL_SUBLEXSTART = 88, /* SUBLEXSTART */ - YYSYMBOL_SUBLEXEND = 89, /* SUBLEXEND */ - YYSYMBOL_PHASER = 90, /* PHASER */ - YYSYMBOL_PREC_LOW = 91, /* PREC_LOW */ - YYSYMBOL_PLUGIN_LOW_OP = 92, /* PLUGIN_LOW_OP */ - YYSYMBOL_OROP = 93, /* OROP */ - YYSYMBOL_PLUGIN_LOGICAL_OR_LOW_OP = 94, /* PLUGIN_LOGICAL_OR_LOW_OP */ - YYSYMBOL_ANDOP = 95, /* ANDOP */ - YYSYMBOL_PLUGIN_LOGICAL_AND_LOW_OP = 96, /* PLUGIN_LOGICAL_AND_LOW_OP */ - YYSYMBOL_NOTOP = 97, /* NOTOP */ - YYSYMBOL_ASSIGNOP = 98, /* ASSIGNOP */ - YYSYMBOL_PLUGIN_ASSIGN_OP = 99, /* PLUGIN_ASSIGN_OP */ - YYSYMBOL_PERLY_QUESTION_MARK = 100, /* PERLY_QUESTION_MARK */ - YYSYMBOL_PERLY_COLON = 101, /* PERLY_COLON */ - YYSYMBOL_OROR = 102, /* OROR */ - YYSYMBOL_DORDOR = 103, /* DORDOR */ - YYSYMBOL_PLUGIN_LOGICAL_OR_OP = 104, /* PLUGIN_LOGICAL_OR_OP */ - YYSYMBOL_ANDAND = 105, /* ANDAND */ - YYSYMBOL_PLUGIN_LOGICAL_AND_OP = 106, /* PLUGIN_LOGICAL_AND_OP */ - YYSYMBOL_BITOROP = 107, /* BITOROP */ - YYSYMBOL_BITANDOP = 108, /* BITANDOP */ - YYSYMBOL_CHEQOP = 109, /* CHEQOP */ - YYSYMBOL_NCEQOP = 110, /* NCEQOP */ - YYSYMBOL_CHRELOP = 111, /* CHRELOP */ - YYSYMBOL_NCRELOP = 112, /* NCRELOP */ - YYSYMBOL_PLUGIN_REL_OP = 113, /* PLUGIN_REL_OP */ - YYSYMBOL_SHIFTOP = 114, /* SHIFTOP */ - YYSYMBOL_PLUGIN_ADD_OP = 115, /* PLUGIN_ADD_OP */ - YYSYMBOL_PLUGIN_MUL_OP = 116, /* PLUGIN_MUL_OP */ - YYSYMBOL_MATCHOP = 117, /* MATCHOP */ - YYSYMBOL_PERLY_EXCLAMATION_MARK = 118, /* PERLY_EXCLAMATION_MARK */ - YYSYMBOL_PERLY_TILDE = 119, /* PERLY_TILDE */ - YYSYMBOL_UMINUS = 120, /* UMINUS */ - YYSYMBOL_REFGEN = 121, /* REFGEN */ - YYSYMBOL_PLUGIN_POW_OP = 122, /* PLUGIN_POW_OP */ - YYSYMBOL_PREINC = 123, /* PREINC */ - YYSYMBOL_PREDEC = 124, /* PREDEC */ - YYSYMBOL_POSTINC = 125, /* POSTINC */ - YYSYMBOL_POSTDEC = 126, /* POSTDEC */ - YYSYMBOL_POSTJOIN = 127, /* POSTJOIN */ - YYSYMBOL_PLUGIN_HIGH_OP = 128, /* PLUGIN_HIGH_OP */ - YYSYMBOL_ARROW = 129, /* ARROW */ - YYSYMBOL_PERLY_PAREN_CLOSE = 130, /* PERLY_PAREN_CLOSE */ - YYSYMBOL_PERLY_PAREN_OPEN = 131, /* PERLY_PAREN_OPEN */ - YYSYMBOL_YYACCEPT = 132, /* $accept */ - YYSYMBOL_grammar = 133, /* grammar */ - YYSYMBOL_134_1 = 134, /* @1 */ - YYSYMBOL_135_2 = 135, /* @2 */ - YYSYMBOL_136_3 = 136, /* @3 */ - YYSYMBOL_137_4 = 137, /* @4 */ - YYSYMBOL_138_5 = 138, /* @5 */ - YYSYMBOL_139_6 = 139, /* @6 */ - YYSYMBOL_140_7 = 140, /* @7 */ - YYSYMBOL_sigsub_or_method_named = 141, /* sigsub_or_method_named */ - YYSYMBOL_block = 142, /* block */ - YYSYMBOL_empty = 143, /* empty */ - YYSYMBOL_formblock = 144, /* formblock */ - YYSYMBOL_remember = 145, /* remember */ - YYSYMBOL_mblock = 146, /* mblock */ - YYSYMBOL_mremember = 147, /* mremember */ - YYSYMBOL_catch_paren = 148, /* catch_paren */ - YYSYMBOL_149_8 = 149, /* $@8 */ - YYSYMBOL_150_9 = 150, /* $@9 */ - YYSYMBOL_stmtseq = 151, /* stmtseq */ - YYSYMBOL_formstmtseq = 152, /* formstmtseq */ - YYSYMBOL_fullstmt = 153, /* fullstmt */ - YYSYMBOL_labfullstmt = 154, /* labfullstmt */ - YYSYMBOL_barestmt = 155, /* barestmt */ - YYSYMBOL_156_10 = 156, /* $@10 */ - YYSYMBOL_157_11 = 157, /* $@11 */ - YYSYMBOL_158_12 = 158, /* $@12 */ - YYSYMBOL_159_13 = 159, /* $@13 */ - YYSYMBOL_160_14 = 160, /* $@14 */ - YYSYMBOL_161_15 = 161, /* $@15 */ - YYSYMBOL_162_16 = 162, /* @16 */ - YYSYMBOL_163_17 = 163, /* $@17 */ - YYSYMBOL_164_18 = 164, /* $@18 */ - YYSYMBOL_165_19 = 165, /* $@19 */ - YYSYMBOL_formline = 166, /* formline */ - YYSYMBOL_formarg = 167, /* formarg */ - YYSYMBOL_condition = 168, /* condition */ - YYSYMBOL_sideff = 169, /* sideff */ - YYSYMBOL_else = 170, /* else */ - YYSYMBOL_cont = 171, /* cont */ - YYSYMBOL_finally = 172, /* finally */ - YYSYMBOL_mintro = 173, /* mintro */ - YYSYMBOL_nexpr = 174, /* nexpr */ - YYSYMBOL_texpr = 175, /* texpr */ - YYSYMBOL_iexpr = 176, /* iexpr */ - YYSYMBOL_mexpr = 177, /* mexpr */ - YYSYMBOL_mnexpr = 178, /* mnexpr */ - YYSYMBOL_formname = 179, /* formname */ - YYSYMBOL_startsub = 180, /* startsub */ - YYSYMBOL_startanonsub = 181, /* startanonsub */ - YYSYMBOL_startanonmethod = 182, /* startanonmethod */ - YYSYMBOL_startformsub = 183, /* startformsub */ - YYSYMBOL_subname = 184, /* subname */ - YYSYMBOL_proto = 185, /* proto */ - YYSYMBOL_subattrlist = 186, /* subattrlist */ - YYSYMBOL_myattrlist = 187, /* myattrlist */ - YYSYMBOL_sigvarname = 188, /* sigvarname */ - YYSYMBOL_sigslurpsigil = 189, /* sigslurpsigil */ - YYSYMBOL_sigslurpelem = 190, /* sigslurpelem */ - YYSYMBOL_sigscalarelem = 191, /* sigscalarelem */ - YYSYMBOL_sigelem = 192, /* sigelem */ - YYSYMBOL_siglist = 193, /* siglist */ - YYSYMBOL_optsiglist = 194, /* optsiglist */ - YYSYMBOL_optsubsignature = 195, /* optsubsignature */ - YYSYMBOL_subsignature = 196, /* subsignature */ - YYSYMBOL_subsigguts = 197, /* subsigguts */ - YYSYMBOL_198_20 = 198, /* $@20 */ - YYSYMBOL_optsubbody = 199, /* optsubbody */ - YYSYMBOL_subbody = 200, /* subbody */ - YYSYMBOL_optsigsubbody = 201, /* optsigsubbody */ - YYSYMBOL_sigsubbody = 202, /* sigsubbody */ - YYSYMBOL_203_21 = 203, /* $@21 */ - YYSYMBOL_expr = 204, /* expr */ - YYSYMBOL_listexpr = 205, /* listexpr */ - YYSYMBOL_listop = 206, /* listop */ - YYSYMBOL_207_22 = 207, /* @22 */ - YYSYMBOL_methodname = 208, /* methodname */ - YYSYMBOL_subscripted = 209, /* subscripted */ - YYSYMBOL_termbinop = 210, /* termbinop */ - YYSYMBOL_termrelop = 211, /* termrelop */ - YYSYMBOL_relopchain = 212, /* relopchain */ - YYSYMBOL_termeqop = 213, /* termeqop */ - YYSYMBOL_eqopchain = 214, /* eqopchain */ - YYSYMBOL_termunop = 215, /* termunop */ - YYSYMBOL_anonymous = 216, /* anonymous */ - YYSYMBOL_termdo = 217, /* termdo */ - YYSYMBOL_term = 218, /* term */ - YYSYMBOL_219_23 = 219, /* @23 */ - YYSYMBOL_myattrterm = 220, /* myattrterm */ - YYSYMBOL_myterm = 221, /* myterm */ - YYSYMBOL_fieldvar = 222, /* fieldvar */ - YYSYMBOL_optfieldattrlist = 223, /* optfieldattrlist */ - YYSYMBOL_fielddecl = 224, /* fielddecl */ - YYSYMBOL_225_24 = 225, /* $@24 */ - YYSYMBOL_optlistexpr = 226, /* optlistexpr */ - YYSYMBOL_optexpr = 227, /* optexpr */ - YYSYMBOL_optrepl = 228, /* optrepl */ - YYSYMBOL_my_scalar = 229, /* my_scalar */ - YYSYMBOL_list_of_scalars = 230, /* list_of_scalars */ - YYSYMBOL_my_list_of_scalars = 231, /* my_list_of_scalars */ - YYSYMBOL_my_var = 232, /* my_var */ - YYSYMBOL_refgen_topic = 233, /* refgen_topic */ - YYSYMBOL_my_refgen = 234, /* my_refgen */ - YYSYMBOL_amper = 235, /* amper */ - YYSYMBOL_scalar = 236, /* scalar */ - YYSYMBOL_ary = 237, /* ary */ - YYSYMBOL_hsh = 238, /* hsh */ - YYSYMBOL_arylen = 239, /* arylen */ - YYSYMBOL_star = 240, /* star */ - YYSYMBOL_sliceme = 241, /* sliceme */ - YYSYMBOL_kvslice = 242, /* kvslice */ - YYSYMBOL_gelem = 243, /* gelem */ - YYSYMBOL_indirob = 244 /* indirob */ + YYSYMBOL_ATTRLIST = 59, /* ATTRLIST */ + YYSYMBOL_THING = 60, /* THING */ + YYSYMBOL_PMFUNC = 61, /* PMFUNC */ + YYSYMBOL_PRIVATEREF = 62, /* PRIVATEREF */ + YYSYMBOL_QWLIST = 63, /* QWLIST */ + YYSYMBOL_FUNC0OP = 64, /* FUNC0OP */ + YYSYMBOL_FUNC0SUB = 65, /* FUNC0SUB */ + YYSYMBOL_UNIOPSUB = 66, /* UNIOPSUB */ + YYSYMBOL_LSTOPSUB = 67, /* LSTOPSUB */ + YYSYMBOL_PLUGEXPR = 68, /* PLUGEXPR */ + YYSYMBOL_PLUGSTMT = 69, /* PLUGSTMT */ + YYSYMBOL_LABEL = 70, /* LABEL */ + YYSYMBOL_PROTOTYPE = 71, /* PROTOTYPE */ + YYSYMBOL_LOOPEX = 72, /* LOOPEX */ + YYSYMBOL_DOTDOT = 73, /* DOTDOT */ + YYSYMBOL_YADAYADA = 74, /* YADAYADA */ + YYSYMBOL_FUNC0 = 75, /* FUNC0 */ + YYSYMBOL_FUNC1 = 76, /* FUNC1 */ + YYSYMBOL_FUNC = 77, /* FUNC */ + YYSYMBOL_UNIOP = 78, /* UNIOP */ + YYSYMBOL_LSTOP = 79, /* LSTOP */ + YYSYMBOL_BLKLSTOP = 80, /* BLKLSTOP */ + YYSYMBOL_POWOP = 81, /* POWOP */ + YYSYMBOL_MULOP = 82, /* MULOP */ + YYSYMBOL_ADDOP = 83, /* ADDOP */ + YYSYMBOL_DOLSHARP = 84, /* DOLSHARP */ + YYSYMBOL_HASHBRACK = 85, /* HASHBRACK */ + YYSYMBOL_NOAMP = 86, /* NOAMP */ + YYSYMBOL_COLONATTR = 87, /* COLONATTR */ + YYSYMBOL_FORMLBRACK = 88, /* FORMLBRACK */ + YYSYMBOL_FORMRBRACK = 89, /* FORMRBRACK */ + YYSYMBOL_SUBLEXSTART = 90, /* SUBLEXSTART */ + YYSYMBOL_SUBLEXEND = 91, /* SUBLEXEND */ + YYSYMBOL_PHASER = 92, /* PHASER */ + YYSYMBOL_PREC_LOW = 93, /* PREC_LOW */ + YYSYMBOL_PLUGIN_LOW_OP = 94, /* PLUGIN_LOW_OP */ + YYSYMBOL_OROP = 95, /* OROP */ + YYSYMBOL_PLUGIN_LOGICAL_OR_LOW_OP = 96, /* PLUGIN_LOGICAL_OR_LOW_OP */ + YYSYMBOL_ANDOP = 97, /* ANDOP */ + YYSYMBOL_PLUGIN_LOGICAL_AND_LOW_OP = 98, /* PLUGIN_LOGICAL_AND_LOW_OP */ + YYSYMBOL_NOTOP = 99, /* NOTOP */ + YYSYMBOL_ASSIGNOP = 100, /* ASSIGNOP */ + YYSYMBOL_PLUGIN_ASSIGN_OP = 101, /* PLUGIN_ASSIGN_OP */ + YYSYMBOL_PERLY_QUESTION_MARK = 102, /* PERLY_QUESTION_MARK */ + YYSYMBOL_PERLY_COLON = 103, /* PERLY_COLON */ + YYSYMBOL_OROR = 104, /* OROR */ + YYSYMBOL_DORDOR = 105, /* DORDOR */ + YYSYMBOL_PLUGIN_LOGICAL_OR_OP = 106, /* PLUGIN_LOGICAL_OR_OP */ + YYSYMBOL_ANDAND = 107, /* ANDAND */ + YYSYMBOL_PLUGIN_LOGICAL_AND_OP = 108, /* PLUGIN_LOGICAL_AND_OP */ + YYSYMBOL_BITOROP = 109, /* BITOROP */ + YYSYMBOL_BITANDOP = 110, /* BITANDOP */ + YYSYMBOL_CHEQOP = 111, /* CHEQOP */ + YYSYMBOL_NCEQOP = 112, /* NCEQOP */ + YYSYMBOL_CHRELOP = 113, /* CHRELOP */ + YYSYMBOL_NCRELOP = 114, /* NCRELOP */ + YYSYMBOL_PLUGIN_REL_OP = 115, /* PLUGIN_REL_OP */ + YYSYMBOL_SHIFTOP = 116, /* SHIFTOP */ + YYSYMBOL_PLUGIN_ADD_OP = 117, /* PLUGIN_ADD_OP */ + YYSYMBOL_PLUGIN_MUL_OP = 118, /* PLUGIN_MUL_OP */ + YYSYMBOL_MATCHOP = 119, /* MATCHOP */ + YYSYMBOL_PERLY_EXCLAMATION_MARK = 120, /* PERLY_EXCLAMATION_MARK */ + YYSYMBOL_PERLY_TILDE = 121, /* PERLY_TILDE */ + YYSYMBOL_UMINUS = 122, /* UMINUS */ + YYSYMBOL_REFGEN = 123, /* REFGEN */ + YYSYMBOL_PLUGIN_POW_OP = 124, /* PLUGIN_POW_OP */ + YYSYMBOL_PREINC = 125, /* PREINC */ + YYSYMBOL_PREDEC = 126, /* PREDEC */ + YYSYMBOL_POSTINC = 127, /* POSTINC */ + YYSYMBOL_POSTDEC = 128, /* POSTDEC */ + YYSYMBOL_POSTJOIN = 129, /* POSTJOIN */ + YYSYMBOL_PLUGIN_HIGH_OP = 130, /* PLUGIN_HIGH_OP */ + YYSYMBOL_ARROW = 131, /* ARROW */ + YYSYMBOL_PERLY_PAREN_CLOSE = 132, /* PERLY_PAREN_CLOSE */ + YYSYMBOL_PERLY_PAREN_OPEN = 133, /* PERLY_PAREN_OPEN */ + YYSYMBOL_YYACCEPT = 134, /* $accept */ + YYSYMBOL_grammar = 135, /* grammar */ + YYSYMBOL_136_1 = 136, /* @1 */ + YYSYMBOL_137_2 = 137, /* @2 */ + YYSYMBOL_138_3 = 138, /* @3 */ + YYSYMBOL_139_4 = 139, /* @4 */ + YYSYMBOL_140_5 = 140, /* @5 */ + YYSYMBOL_141_6 = 141, /* @6 */ + YYSYMBOL_142_7 = 142, /* @7 */ + YYSYMBOL_bare_statement_block = 143, /* bare_statement_block */ + YYSYMBOL_bare_statement_class_declaration = 144, /* bare_statement_class_declaration */ + YYSYMBOL_bare_statement_class_definition = 145, /* bare_statement_class_definition */ + YYSYMBOL_146_8 = 146, /* $@8 */ + YYSYMBOL_bare_statement_default = 147, /* bare_statement_default */ + YYSYMBOL_bare_statement_defer = 148, /* bare_statement_defer */ + YYSYMBOL_bare_statement_expression = 149, /* bare_statement_expression */ + YYSYMBOL_bare_statement_field_declaration = 150, /* bare_statement_field_declaration */ + YYSYMBOL_bare_statement_for = 151, /* bare_statement_for */ + YYSYMBOL_152_9 = 152, /* $@9 */ + YYSYMBOL_153_10 = 153, /* $@10 */ + YYSYMBOL_154_11 = 154, /* @11 */ + YYSYMBOL_bare_statement_format = 155, /* bare_statement_format */ + YYSYMBOL_bare_statement_given = 156, /* bare_statement_given */ + YYSYMBOL_bare_statement_if = 157, /* bare_statement_if */ + YYSYMBOL_bare_statement_null = 158, /* bare_statement_null */ + YYSYMBOL_bare_statement_package_declaration = 159, /* bare_statement_package_declaration */ + YYSYMBOL_bare_statement_package_definition = 160, /* bare_statement_package_definition */ + YYSYMBOL_161_12 = 161, /* $@12 */ + YYSYMBOL_bare_statement_phaser = 162, /* bare_statement_phaser */ + YYSYMBOL_163_13 = 163, /* $@13 */ + YYSYMBOL_bare_statement_sub_signature = 164, /* bare_statement_sub_signature */ + YYSYMBOL_165_14 = 165, /* $@14 */ + YYSYMBOL_bare_statement_sub_traditional = 166, /* bare_statement_sub_traditional */ + YYSYMBOL_167_15 = 167, /* $@15 */ + YYSYMBOL_bare_statement_try_catch = 168, /* bare_statement_try_catch */ + YYSYMBOL_169_16 = 169, /* $@16 */ + YYSYMBOL_bare_statement_unless = 170, /* bare_statement_unless */ + YYSYMBOL_bare_statement_until = 171, /* bare_statement_until */ + YYSYMBOL_bare_statement_utilize = 172, /* bare_statement_utilize */ + YYSYMBOL_173_17 = 173, /* $@17 */ + YYSYMBOL_bare_statement_when = 174, /* bare_statement_when */ + YYSYMBOL_bare_statement_while = 175, /* bare_statement_while */ + YYSYMBOL_bare_statement_yadayada = 176, /* bare_statement_yadayada */ + YYSYMBOL_sigsub_or_method_named = 177, /* sigsub_or_method_named */ + YYSYMBOL_block = 178, /* block */ + YYSYMBOL_empty = 179, /* empty */ + YYSYMBOL_formblock = 180, /* formblock */ + YYSYMBOL_remember = 181, /* remember */ + YYSYMBOL_mblock = 182, /* mblock */ + YYSYMBOL_mremember = 183, /* mremember */ + YYSYMBOL_catch_paren = 184, /* catch_paren */ + YYSYMBOL_185_18 = 185, /* $@18 */ + YYSYMBOL_186_19 = 186, /* $@19 */ + YYSYMBOL_stmtseq = 187, /* stmtseq */ + YYSYMBOL_formstmtseq = 188, /* formstmtseq */ + YYSYMBOL_fullstmt = 189, /* fullstmt */ + YYSYMBOL_labfullstmt = 190, /* labfullstmt */ + YYSYMBOL_barestmt = 191, /* barestmt */ + YYSYMBOL_formline = 192, /* formline */ + YYSYMBOL_formarg = 193, /* formarg */ + YYSYMBOL_condition = 194, /* condition */ + YYSYMBOL_sideff = 195, /* sideff */ + YYSYMBOL_else = 196, /* else */ + YYSYMBOL_cont = 197, /* cont */ + YYSYMBOL_finally = 198, /* finally */ + YYSYMBOL_mintro = 199, /* mintro */ + YYSYMBOL_nexpr = 200, /* nexpr */ + YYSYMBOL_texpr = 201, /* texpr */ + YYSYMBOL_iexpr = 202, /* iexpr */ + YYSYMBOL_mexpr = 203, /* mexpr */ + YYSYMBOL_mnexpr = 204, /* mnexpr */ + YYSYMBOL_formname = 205, /* formname */ + YYSYMBOL_startsub = 206, /* startsub */ + YYSYMBOL_startanonsub = 207, /* startanonsub */ + YYSYMBOL_startanonmethod = 208, /* startanonmethod */ + YYSYMBOL_startformsub = 209, /* startformsub */ + YYSYMBOL_subname = 210, /* subname */ + YYSYMBOL_proto = 211, /* proto */ + YYSYMBOL_subattrlist = 212, /* subattrlist */ + YYSYMBOL_attrlist = 213, /* attrlist */ + YYSYMBOL_optattrlist = 214, /* optattrlist */ + YYSYMBOL_sigvar = 215, /* sigvar */ + YYSYMBOL_sigslurpsigil = 216, /* sigslurpsigil */ + YYSYMBOL_sigslurpelem = 217, /* sigslurpelem */ + YYSYMBOL_optcolon = 218, /* optcolon */ + YYSYMBOL_sigscalarelem = 219, /* sigscalarelem */ + YYSYMBOL_optsigscalardefault = 220, /* optsigscalardefault */ + YYSYMBOL_sigelem = 221, /* sigelem */ + YYSYMBOL_siglist = 222, /* siglist */ + YYSYMBOL_optsiglist = 223, /* optsiglist */ + YYSYMBOL_optsubsignature = 224, /* optsubsignature */ + YYSYMBOL_subsignature = 225, /* subsignature */ + YYSYMBOL_subsigguts = 226, /* subsigguts */ + YYSYMBOL_227_20 = 227, /* $@20 */ + YYSYMBOL_optsubbody = 228, /* optsubbody */ + YYSYMBOL_subbody = 229, /* subbody */ + YYSYMBOL_optsigsubbody = 230, /* optsigsubbody */ + YYSYMBOL_sigsubbody = 231, /* sigsubbody */ + YYSYMBOL_232_21 = 232, /* $@21 */ + YYSYMBOL_expr = 233, /* expr */ + YYSYMBOL_listexpr = 234, /* listexpr */ + YYSYMBOL_listop = 235, /* listop */ + YYSYMBOL_236_22 = 236, /* @22 */ + YYSYMBOL_methodname = 237, /* methodname */ + YYSYMBOL_subscripted = 238, /* subscripted */ + YYSYMBOL_termbinop = 239, /* termbinop */ + YYSYMBOL_termrelop = 240, /* termrelop */ + YYSYMBOL_relopchain = 241, /* relopchain */ + YYSYMBOL_termeqop = 242, /* termeqop */ + YYSYMBOL_eqopchain = 243, /* eqopchain */ + YYSYMBOL_termunop = 244, /* termunop */ + YYSYMBOL_anonymous = 245, /* anonymous */ + YYSYMBOL_termdo = 246, /* termdo */ + YYSYMBOL_term = 247, /* term */ + YYSYMBOL_248_23 = 248, /* @23 */ + YYSYMBOL_myattrterm = 249, /* myattrterm */ + YYSYMBOL_myterm = 250, /* myterm */ + YYSYMBOL_fieldvar = 251, /* fieldvar */ + YYSYMBOL_fielddecl = 252, /* fielddecl */ + YYSYMBOL_253_24 = 253, /* $@24 */ + YYSYMBOL_optlistexpr = 254, /* optlistexpr */ + YYSYMBOL_optexpr = 255, /* optexpr */ + YYSYMBOL_optrepl = 256, /* optrepl */ + YYSYMBOL_my_scalar = 257, /* my_scalar */ + YYSYMBOL_list_of_itervars = 258, /* list_of_itervars */ + YYSYMBOL_my_list_of_itervars = 259, /* my_list_of_itervars */ + YYSYMBOL_my_var = 260, /* my_var */ + YYSYMBOL_refgen_topic = 261, /* refgen_topic */ + YYSYMBOL_my_refgen = 262, /* my_refgen */ + YYSYMBOL_amper = 263, /* amper */ + YYSYMBOL_scalar = 264, /* scalar */ + YYSYMBOL_ary = 265, /* ary */ + YYSYMBOL_hsh = 266, /* hsh */ + YYSYMBOL_arylen = 267, /* arylen */ + YYSYMBOL_star = 268, /* star */ + YYSYMBOL_sliceme = 269, /* sliceme */ + YYSYMBOL_kvslice = 270, /* kvslice */ + YYSYMBOL_gelem = 271, /* gelem */ + YYSYMBOL_indirob = 272 /* indirob */ }; typedef enum yysymbol_kind_t yysymbol_kind_t; @@ -261,19 +289,19 @@ typedef enum yysymbol_kind_t yysymbol_ki #define YYFINAL 16 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 3732 +#define YYLAST 3841 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 132 +#define YYNTOKENS 134 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 113 +#define YYNNTS 139 /* YYNRULES -- Number of rules. */ -#define YYNRULES 342 +#define YYNRULES 373 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 676 +#define YYNSTATES 706 /* YYMAXUTOK -- Last valid token kind. */ -#define YYMAXUTOK 386 +#define YYMAXUTOK 388 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM @@ -325,48 +353,51 @@ static const yytype_uint8 yytranslate[] 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131 + 125, 126, 127, 128, 129, 130, 131, 132, 133 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_int16 yyrline[] = { - 0, 161, 161, 160, 172, 171, 182, 181, 195, 194, - 208, 207, 221, 220, 231, 230, 244, 246, 251, 259, - 263, 270, 275, 282, 288, 292, 294, 291, 301, 302, - 312, 313, 322, 326, 330, 337, 347, 349, 362, 359, - 383, 378, 406, 405, 431, 442, 454, 453, 464, 470, - 476, 481, 483, 485, 492, 500, 502, 499, 519, 524, - 533, 540, 539, 554, 562, 569, 568, 583, 590, 589, - 605, 604, 624, 628, 632, 636, 642, 650, 668, 669, - 673, 677, 679, 681, 683, 685, 687, 689, 692, 698, - 699, 704, 715, 716, 721, 723, 728, 735, 736, 740, - 744, 748, 753, 757, 761, 762, 765, 771, 776, 781, - 787, 788, 793, 794, 799, 800, 807, 812, 814, 825, - 827, 832, 834, 838, 843, 847, 855, 860, 865, 874, - 876, 884, 885, 886, 891, 892, 897, 898, 902, 906, - 906, 939, 940, 945, 957, 958, 963, 962, 975, 977, - 979, 981, 983, 987, 989, 994, 998, 1002, 1006, 1010, - 1016, 1021, 1027, 1033, 1039, 1045, 1047, 1049, 1052, 1051, - 1065, 1066, 1070, 1074, 1077, 1082, 1087, 1090, 1094, 1098, - 1104, 1112, 1119, 1125, 1127, 1129, 1134, 1136, 1138, 1140, - 1142, 1144, 1149, 1151, 1153, 1155, 1157, 1159, 1161, 1163, - 1165, 1167, 1169, 1171, 1173, 1175, 1177, 1179, 1183, 1185, - 1187, 1189, 1191, 1195, 1197, 1201, 1203, 1205, 1207, 1211, - 1213, 1218, 1220, 1223, 1225, 1227, 1230, 1233, 1244, 1247, - 1255, 1257, 1259, 1262, 1265, 1273, 1275, 1279, 1280, 1281, - 1282, 1283, 1285, 1287, 1289, 1291, 1293, 1295, 1297, 1299, - 1301, 1303, 1305, 1307, 1309, 1319, 1329, 1339, 1349, 1351, - 1353, 1356, 1361, 1365, 1367, 1369, 1371, 1374, 1376, 1379, - 1381, 1383, 1385, 1387, 1389, 1391, 1393, 1395, 1398, 1400, - 1402, 1404, 1406, 1408, 1412, 1415, 1414, 1427, 1428, 1429, - 1434, 1436, 1438, 1440, 1445, 1447, 1450, 1452, 1454, 1459, - 1464, 1469, 1477, 1479, 1481, 1485, 1493, 1492, 1510, 1511, - 1515, 1516, 1520, 1521, 1526, 1531, 1533, 1537, 1540, 1544, - 1545, 1546, 1549, 1550, 1553, 1554, 1557, 1561, 1565, 1571, - 1577, 1579, 1583, 1587, 1588, 1592, 1593, 1597, 1598, 1603, - 1605, 1607, 1610 + 0, 188, 188, 187, 199, 198, 209, 208, 222, 221, + 235, 234, 248, 247, 258, 257, 270, 278, 300, 294, + 317, 325, 333, 340, 353, 358, 348, 379, 392, 411, + 427, 423, 452, 474, 488, 504, 517, 532, 540, 561, + 556, 576, 574, 611, 608, 641, 638, 667, 662, 684, + 699, 716, 714, 732, 744, 759, 768, 770, 775, 783, + 787, 794, 799, 806, 812, 816, 818, 815, 825, 826, + 836, 837, 846, 850, 854, 861, 878, 879, 880, 881, + 882, 883, 884, 885, 886, 887, 888, 889, 890, 891, + 892, 893, 894, 895, 896, 897, 898, 899, 900, 901, + 902, 906, 924, 925, 929, 933, 935, 937, 940, 943, + 945, 947, 950, 956, 957, 962, 973, 974, 979, 981, + 986, 993, 994, 998, 1002, 1006, 1011, 1015, 1019, 1020, + 1023, 1029, 1034, 1039, 1045, 1046, 1051, 1052, 1057, 1058, + 1065, 1070, 1072, 1077, 1078, 1087, 1089, 1094, 1096, 1100, + 1105, 1109, 1115, 1117, 1123, 1133, 1146, 1148, 1153, 1155, + 1163, 1164, 1165, 1170, 1171, 1176, 1177, 1181, 1185, 1185, + 1218, 1219, 1224, 1236, 1237, 1242, 1241, 1254, 1256, 1258, + 1260, 1262, 1266, 1268, 1273, 1277, 1281, 1285, 1289, 1295, + 1300, 1306, 1312, 1318, 1324, 1326, 1328, 1331, 1330, 1344, + 1345, 1349, 1353, 1356, 1361, 1366, 1369, 1373, 1377, 1383, + 1391, 1398, 1404, 1406, 1408, 1413, 1415, 1417, 1419, 1421, + 1423, 1428, 1430, 1432, 1434, 1436, 1438, 1440, 1442, 1444, + 1446, 1448, 1450, 1452, 1454, 1456, 1458, 1462, 1464, 1466, + 1468, 1470, 1474, 1476, 1480, 1482, 1484, 1486, 1490, 1492, + 1497, 1499, 1502, 1504, 1506, 1509, 1512, 1523, 1526, 1534, + 1536, 1538, 1541, 1543, 1546, 1548, 1553, 1558, 1560, 1564, + 1565, 1566, 1567, 1568, 1570, 1572, 1574, 1576, 1578, 1580, + 1582, 1584, 1586, 1588, 1590, 1592, 1594, 1604, 1614, 1624, + 1634, 1636, 1638, 1641, 1646, 1650, 1652, 1654, 1656, 1659, + 1661, 1664, 1666, 1668, 1670, 1672, 1674, 1676, 1678, 1680, + 1683, 1685, 1687, 1689, 1691, 1693, 1697, 1700, 1699, 1712, + 1713, 1714, 1719, 1721, 1723, 1725, 1730, 1732, 1735, 1737, + 1739, 1744, 1749, 1754, 1762, 1770, 1769, 1787, 1788, 1792, + 1793, 1797, 1798, 1803, 1808, 1810, 1814, 1818, 1819, 1825, + 1829, 1830, 1831, 1834, 1835, 1838, 1839, 1842, 1846, 1850, + 1856, 1862, 1864, 1868, 1872, 1873, 1877, 1878, 1882, 1883, + 1888, 1890, 1892, 1895 }; #endif @@ -394,40 +425,53 @@ static const char *const yytname[] = "KW_GIVEN", "KW_WHEN", "KW_DEFAULT", "KW_TRY", "KW_CATCH", "KW_FINALLY", "KW_DEFER", "KW_REQUIRE", "KW_DO", "KW_USE_or_NO", "KW_SUB_named", "KW_SUB_named_sig", "KW_SUB_anon", "KW_SUB_anon_sig", "KW_METHOD_named", - "KW_METHOD_anon", "BAREWORD", "METHCALL0", "METHCALL", "THING", "PMFUNC", - "PRIVATEREF", "QWLIST", "FUNC0OP", "FUNC0SUB", "UNIOPSUB", "LSTOPSUB", - "PLUGEXPR", "PLUGSTMT", "LABEL", "LOOPEX", "DOTDOT", "YADAYADA", "FUNC0", - "FUNC1", "FUNC", "UNIOP", "LSTOP", "BLKLSTOP", "POWOP", "MULOP", "ADDOP", - "DOLSHARP", "HASHBRACK", "NOAMP", "COLONATTR", "FORMLBRACK", - "FORMRBRACK", "SUBLEXSTART", "SUBLEXEND", "PHASER", "PREC_LOW", - "PLUGIN_LOW_OP", "OROP", "PLUGIN_LOGICAL_OR_LOW_OP", "ANDOP", - "PLUGIN_LOGICAL_AND_LOW_OP", "NOTOP", "ASSIGNOP", "PLUGIN_ASSIGN_OP", - "PERLY_QUESTION_MARK", "PERLY_COLON", "OROR", "DORDOR", - "PLUGIN_LOGICAL_OR_OP", "ANDAND", "PLUGIN_LOGICAL_AND_OP", "BITOROP", - "BITANDOP", "CHEQOP", "NCEQOP", "CHRELOP", "NCRELOP", "PLUGIN_REL_OP", - "SHIFTOP", "PLUGIN_ADD_OP", "PLUGIN_MUL_OP", "MATCHOP", - "PERLY_EXCLAMATION_MARK", "PERLY_TILDE", "UMINUS", "REFGEN", - "PLUGIN_POW_OP", "PREINC", "PREDEC", "POSTINC", "POSTDEC", "POSTJOIN", - "PLUGIN_HIGH_OP", "ARROW", "PERLY_PAREN_CLOSE", "PERLY_PAREN_OPEN", - "$accept", "grammar", "@1", "@2", "@3", "@4", "@5", "@6", "@7", + "KW_METHOD_anon", "BAREWORD", "METHCALL0", "METHCALL", "ATTRLIST", + "THING", "PMFUNC", "PRIVATEREF", "QWLIST", "FUNC0OP", "FUNC0SUB", + "UNIOPSUB", "LSTOPSUB", "PLUGEXPR", "PLUGSTMT", "LABEL", "PROTOTYPE", + "LOOPEX", "DOTDOT", "YADAYADA", "FUNC0", "FUNC1", "FUNC", "UNIOP", + "LSTOP", "BLKLSTOP", "POWOP", "MULOP", "ADDOP", "DOLSHARP", "HASHBRACK", + "NOAMP", "COLONATTR", "FORMLBRACK", "FORMRBRACK", "SUBLEXSTART", + "SUBLEXEND", "PHASER", "PREC_LOW", "PLUGIN_LOW_OP", "OROP", + "PLUGIN_LOGICAL_OR_LOW_OP", "ANDOP", "PLUGIN_LOGICAL_AND_LOW_OP", + "NOTOP", "ASSIGNOP", "PLUGIN_ASSIGN_OP", "PERLY_QUESTION_MARK", + "PERLY_COLON", "OROR", "DORDOR", "PLUGIN_LOGICAL_OR_OP", "ANDAND", + "PLUGIN_LOGICAL_AND_OP", "BITOROP", "BITANDOP", "CHEQOP", "NCEQOP", + "CHRELOP", "NCRELOP", "PLUGIN_REL_OP", "SHIFTOP", "PLUGIN_ADD_OP", + "PLUGIN_MUL_OP", "MATCHOP", "PERLY_EXCLAMATION_MARK", "PERLY_TILDE", + "UMINUS", "REFGEN", "PLUGIN_POW_OP", "PREINC", "PREDEC", "POSTINC", + "POSTDEC", "POSTJOIN", "PLUGIN_HIGH_OP", "ARROW", "PERLY_PAREN_CLOSE", + "PERLY_PAREN_OPEN", "$accept", "grammar", "@1", "@2", "@3", "@4", "@5", + "@6", "@7", "bare_statement_block", "bare_statement_class_declaration", + "bare_statement_class_definition", "$@8", "bare_statement_default", + "bare_statement_defer", "bare_statement_expression", + "bare_statement_field_declaration", "bare_statement_for", "$@9", "$@10", + "@11", "bare_statement_format", "bare_statement_given", + "bare_statement_if", "bare_statement_null", + "bare_statement_package_declaration", + "bare_statement_package_definition", "$@12", "bare_statement_phaser", + "$@13", "bare_statement_sub_signature", "$@14", + "bare_statement_sub_traditional", "$@15", "bare_statement_try_catch", + "$@16", "bare_statement_unless", "bare_statement_until", + "bare_statement_utilize", "$@17", "bare_statement_when", + "bare_statement_while", "bare_statement_yadayada", "sigsub_or_method_named", "block", "empty", "formblock", "remember", - "mblock", "mremember", "catch_paren", "$@8", "$@9", "stmtseq", - "formstmtseq", "fullstmt", "labfullstmt", "barestmt", "$@10", "$@11", - "$@12", "$@13", "$@14", "$@15", "@16", "$@17", "$@18", "$@19", - "formline", "formarg", "condition", "sideff", "else", "cont", "finally", - "mintro", "nexpr", "texpr", "iexpr", "mexpr", "mnexpr", "formname", - "startsub", "startanonsub", "startanonmethod", "startformsub", "subname", - "proto", "subattrlist", "myattrlist", "sigvarname", "sigslurpsigil", - "sigslurpelem", "sigscalarelem", "sigelem", "siglist", "optsiglist", - "optsubsignature", "subsignature", "subsigguts", "$@20", "optsubbody", - "subbody", "optsigsubbody", "sigsubbody", "$@21", "expr", "listexpr", - "listop", "@22", "methodname", "subscripted", "termbinop", "termrelop", - "relopchain", "termeqop", "eqopchain", "termunop", "anonymous", "termdo", - "term", "@23", "myattrterm", "myterm", "fieldvar", "optfieldattrlist", - "fielddecl", "$@24", "optlistexpr", "optexpr", "optrepl", "my_scalar", - "list_of_scalars", "my_list_of_scalars", "my_var", "refgen_topic", - "my_refgen", "amper", "scalar", "ary", "hsh", "arylen", "star", - "sliceme", "kvslice", "gelem", "indirob", YY_NULLPTR + "mblock", "mremember", "catch_paren", "$@18", "$@19", "stmtseq", + "formstmtseq", "fullstmt", "labfullstmt", "barestmt", "formline", + "formarg", "condition", "sideff", "else", "cont", "finally", "mintro", + "nexpr", "texpr", "iexpr", "mexpr", "mnexpr", "formname", "startsub", + "startanonsub", "startanonmethod", "startformsub", "subname", "proto", + "subattrlist", "attrlist", "optattrlist", "sigvar", "sigslurpsigil", + "sigslurpelem", "optcolon", "sigscalarelem", "optsigscalardefault", + "sigelem", "siglist", "optsiglist", "optsubsignature", "subsignature", + "subsigguts", "$@20", "optsubbody", "subbody", "optsigsubbody", + "sigsubbody", "$@21", "expr", "listexpr", "listop", "@22", "methodname", + "subscripted", "termbinop", "termrelop", "relopchain", "termeqop", + "eqopchain", "termunop", "anonymous", "termdo", "term", "@23", + "myattrterm", "myterm", "fieldvar", "fielddecl", "$@24", "optlistexpr", + "optexpr", "optrepl", "my_scalar", "list_of_itervars", + "my_list_of_itervars", "my_var", "refgen_topic", "my_refgen", "amper", + "scalar", "ary", "hsh", "arylen", "star", "sliceme", "kvslice", "gelem", + "indirob", YY_NULLPTR }; static const char * @@ -442,7 +486,7 @@ yysymbol_name (yysymbol_kind_t yysymbol) #define yypact_value_is_default(Yyn) \ ((Yyn) == YYPACT_NINF) -#define YYTABLE_NINF (-341) +#define YYTABLE_NINF (-372) #define yytable_value_is_error(Yyn) \ ((Yyn) == YYTABLE_NINF) @@ -451,74 +495,77 @@ yysymbol_name (yysymbol_kind_t yysymbol) STATE-NUM. */ static const yytype_int16 yypact[] = { - 611, -571, -571, -571, -571, -571, -571, -571, 66, -571, - 2986, 32, 1941, 1825, -571, -571, -571, -571, 116, 2986, - 116, 2986, 116, 2986, 116, 116, 2986, 16, 2986, 2266, - -571, -571, -571, -571, 116, 116, -571, -571, 63, -39, - -571, 2986, -571, -571, 2986, -31, 11, -59, 2266, 2186, - 32, 116, 2986, 87, 2986, 2986, 2986, 2986, 2986, 2986, - 2346, -571, 396, 135, -571, 4, -571, 48, 44, 58, - 71, -571, -571, -571, 3176, -571, -571, 67, 209, 274, - 308, -571, 164, 323, 420, 197, -571, -571, -571, -571, - -571, 156, 160, 141, 88, 121, 25, 122, 131, 139, - 142, 32, 266, 266, -571, 87, -571, -571, -571, 202, - -571, 87, 247, -571, 267, 447, 268, 1825, -571, -571, - -571, -571, 675, -571, 191, 849, -571, -571, -571, -571, - -571, 283, -571, 334, -571, 334, -571, -571, 3584, 3066, - 2426, 217, -571, -571, -571, 3584, -571, 3584, 246, 226, - 226, 2986, 179, 230, 2986, 192, 3584, 32, 3176, 195, - 2506, 2986, 2186, -571, 3584, 3146, -571, 135, -571, 2586, - 2986, 2986, -571, 301, -571, -571, 2986, 135, 334, 334, - 334, 237, 237, 327, -43, 2986, 2986, 2986, 2986, 2986, - 2986, 2986, 2666, -571, -571, 2986, -571, -571, 2986, 2986, - 2986, 2986, 2986, 2986, 2986, 2986, 2986, 2986, 2986, 2986, - 2986, 2986, 2986, 2986, 2986, 2986, 2986, 2986, 2986, 2986, - 2986, 2986, 2986, 2986, -571, -571, -571, 2986, 193, 2746, - 2986, 2986, 2986, 2986, 2986, 2986, 2986, -571, 287, 303, - 315, 265, -571, -571, -571, -571, -571, 239, 456, -571, - -571, 248, -571, -571, -571, -571, -571, -571, 341, -571, - -571, -571, -571, -571, -571, 32, -571, -571, -571, 2986, - 2986, 2986, 2986, 2986, 2986, -571, -571, -571, -571, 349, - -571, -571, -571, 349, -571, -571, -571, 371, -571, -571, - 2826, 334, 217, 43, 46, 69, -571, 171, 336, -571, - -571, -571, 226, 355, -571, -571, -571, -571, 2986, 2986, - 89, -571, -571, -571, -571, 374, 338, 293, 2986, 135, - 135, 424, -571, 2986, 430, 151, 151, -571, -571, 3280, - 26, 93, -571, 438, 3545, 3525, 3384, 334, 325, 312, - 3228, 3280, 3280, 1000, 3423, 3423, 3423, 3446, 3446, 3485, - 3506, 3525, 3525, 3545, 3545, 3564, 3603, 312, 325, 334, - 334, 108, 149, 2986, 2986, 52, 421, 432, 448, -571, - 450, 2906, 314, -571, -571, 451, 281, 97, 294, 200, - 304, 213, 313, 965, -571, -571, 431, 62, 226, 422, - -571, 389, 2986, 2986, -571, 33, -571, -571, 363, -571, - -571, -571, -571, 2026, 141, -571, 2986, 2986, 2986, 2986, - -571, -571, 440, -571, 476, -571, -571, -571, 396, -571, - -571, -571, 396, -571, -571, -571, 401, 403, 191, 21, - 470, -571, -571, -571, -571, -571, 376, -571, -571, 372, - 75, -571, 2986, -571, -571, -571, 508, -571, 235, 2986, - 496, -571, -571, 2986, -571, 378, 326, 258, -571, -571, - -571, -571, -571, -571, 512, 2986, -571, 502, -571, 503, - -571, 506, -571, 507, -571, -571, -571, -571, -571, 112, - -571, -571, 391, 396, 392, 511, 393, -571, -571, -571, - -571, -571, 398, 501, 219, -571, 2986, 405, 408, 396, - 418, 425, 1129, 419, 495, 246, -571, 541, -571, -571, - 226, 2986, 2986, -571, 24, -571, -571, -571, 545, -571, - -571, 2986, -571, 468, -571, -571, -571, 262, -571, 3332, - 2986, 549, -571, -571, 444, -571, -571, -571, -571, 548, - -571, -571, -571, 2986, 266, 266, 560, 446, -571, 2986, - 2986, 266, -571, 452, 449, -571, -571, 266, 266, -571, - -571, -571, -571, 2986, 226, -571, 556, 3176, 3176, 455, - -571, 396, -571, -571, 457, -571, -571, 499, -571, -571, - 3176, 225, 225, 511, 458, 460, 461, 247, 2986, 2986, - 266, 266, 266, -571, -571, 511, 266, 571, 476, 1245, - -571, -571, -571, -571, -571, -571, -571, 1361, -571, 266, - 464, -571, -571, -571, -571, 2986, 266, 266, -571, 577, - 479, 247, 247, 247, -571, 537, -571, -571, -571, 1477, - -571, 59, -571, 1593, -571, 2986, 480, 247, 247, -571, - 266, -571, -571, -571, 491, 32, -571, -571, 605, 539, - -571, -571, 500, 266, -571, -571, -571, 247, -571, -571, - -571, -571, -571, -571, 266, 247, 2106, -571, 1709, 225, - -571, 504, -571, -571, 266, -571 + 1028, -571, -571, -571, -571, -571, -571, -571, 55, -571, + 3112, 41, 2123, 2005, -571, -571, -571, -571, 304, 3112, + 304, 3112, 304, 3112, 304, 304, 3112, 70, 3112, 2374, + -571, -571, -571, -571, 304, 304, -571, -571, 51, -74, + -571, 3112, -571, -571, 3112, -44, -27, -25, 2374, 2292, + 41, 304, 3112, 54, 3112, 3112, 3112, 3112, 3112, 3112, + 2456, -571, 22, 122, -571, 21, -571, 17, 31, 84, + 40, -571, -571, -571, 3362, -571, -571, 48, 114, 134, + 233, -571, 150, 249, 267, 162, -571, -571, -571, -571, + -571, 129, 133, 85, 96, 124, 33, 128, 135, 144, + 149, 41, 272, 272, -571, 54, -571, -571, -571, 262, + -571, -571, -571, -571, -571, -571, -571, -571, -571, -571, + -571, -571, -571, -571, -571, -571, -571, -571, -571, -571, + -571, -571, -571, -571, -571, 54, 252, -571, 276, 456, + 284, 2005, -571, -571, -571, -571, 931, -571, 75, 1049, + -571, -571, -571, -571, -571, 293, -571, 477, -571, 477, + -571, -571, 664, 3194, 2538, 221, -571, -571, -571, 664, + -571, 664, 250, 229, 229, 3112, 193, 234, 3112, 195, + 664, 41, 3362, 196, 2620, 3112, 2292, -571, 664, 3276, + -571, 122, -571, 2702, 3112, 3112, -571, 307, -571, -571, + 3112, 122, 477, 477, 477, 498, 498, 319, 470, 3112, + 3112, 3112, 3112, 3112, 3112, 3112, 2784, -571, -571, 3112, + -571, -571, 3112, 3112, 3112, 3112, 3112, 3112, 3112, 3112, + 3112, 3112, 3112, 3112, 3112, 3112, 3112, 3112, 3112, 3112, + 3112, 3112, 3112, 3112, 3112, 3112, 3112, 3112, -571, -571, + -571, 3112, 197, 2866, 3112, 3112, 3112, 3112, 3112, 3112, + 3112, -571, 277, 288, 289, 221, -571, -571, -571, -571, + -571, 216, 465, -571, -571, 215, -571, -571, -571, -571, + -571, -571, 303, -571, -571, -571, -571, -571, -571, 41, + -571, -571, -571, 3112, 3112, 3112, 3112, 3112, 3112, -571, + -571, -571, -571, -571, -571, -571, -571, 290, -571, 335, + -571, -571, 342, -571, -571, 2948, 477, 221, 49, 87, + 100, -571, 485, 299, -571, -571, -571, 229, 302, -571, + 6, 6, -571, 3112, 3112, 37, -571, -571, -571, -571, + 516, 274, 238, 3112, 122, 122, 361, -571, 3112, 369, + 126, 126, -571, -571, 3466, 26, 138, -571, 538, 737, + 385, 3570, 477, 402, 334, 3414, 3466, 3466, 3310, 3609, + 3609, 3609, 3632, 3632, 3671, 3692, 385, 385, 737, 737, + 761, 3710, 334, 402, 477, 477, 110, 194, 3112, 3112, + 181, 362, 363, 364, -571, 374, 3030, 269, -571, -571, + 549, 62, 169, 296, 191, 300, 206, 328, 1179, -571, + -571, 389, 71, 221, -571, -571, 309, 3112, 3112, -571, + 8, -571, -571, 278, -571, -571, -571, -571, 749, 85, + -571, 3112, 3112, 3112, 3112, -571, -571, 354, -571, 391, + -571, -571, -571, 22, -571, -571, -571, 22, -571, -571, + -571, 314, 290, 75, 28, 558, -571, -571, -571, 411, + -571, 294, -571, -571, 297, 46, -571, 3112, -571, -571, + -571, 619, -571, 239, 3112, 418, -571, -571, 3112, -571, + 298, 341, 245, -571, -571, -571, -571, -571, -571, 741, + 3112, -571, 420, -571, 423, -571, 428, -571, 429, -571, + -571, -571, -571, -571, 74, -571, 310, 22, 313, 20, + 321, -571, -571, -571, -571, -571, 324, 424, 258, -571, + 3112, 327, 337, 22, 338, 340, 1297, 344, 404, 250, + -571, 463, -571, -571, 229, 3112, 378, -571, 66, -571, + -571, -571, 468, -571, -571, 3112, -571, 393, -571, -571, + -571, 283, -571, 3518, 3112, 474, -571, -571, 355, -571, + -571, -571, -571, 483, -571, -571, -571, 3112, 272, 272, + 85, 481, 375, -571, 3112, 3112, 272, -571, 377, 376, + -571, -571, 272, 272, -571, -571, -571, -571, 3112, 229, + -571, 489, 3362, 3112, 386, -571, 22, -571, -571, 388, + -571, -571, 433, -571, -571, 3362, 214, 214, -571, 27, + 390, 395, 403, 252, 3112, 3112, 272, 272, 272, -571, + -571, 509, 272, 517, 391, 1415, -571, -571, -571, -571, + 3362, -571, -571, -571, -571, 1533, -571, 272, 405, -571, + -571, -571, 85, -571, 3112, 272, 272, -571, 519, 410, + 252, 252, 252, -571, 500, -571, -571, -571, 1651, -571, + 52, -571, 1769, -571, 3112, -571, 414, 252, 252, -571, + 272, -571, -571, -571, 416, 41, -571, -571, 526, 462, + -571, -571, 427, 272, -571, -571, -571, 252, -571, -571, + -571, -571, -571, -571, 272, 252, 2210, -571, 1887, 214, + -571, 431, -571, -571, 272, -571 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -526,108 +573,115 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_int16 yydefact[] = { - 0, 2, 4, 6, 8, 10, 12, 14, 0, 21, - 19, 0, 0, 0, 19, 139, 1, 19, 0, 19, - 0, 0, 0, 0, 0, 0, 0, 0, 274, 0, - 107, 107, 108, 287, 0, 0, 258, 285, 246, 280, - 282, 276, 107, 289, 268, 278, 0, 0, 271, 19, - 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, - 0, 310, 311, 152, 288, 253, 237, 196, 208, 197, - 215, 238, 239, 240, 155, 243, 5, 259, 248, 251, - 250, 252, 249, 0, 0, 0, 21, 7, 81, 76, - 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 106, 0, 16, 17, 36, 0, - 106, 0, 19, 9, 0, 82, 0, 0, 11, 33, - 32, 28, 0, 15, 19, 0, 339, 342, 341, 340, - 326, 0, 327, 221, 329, 222, 328, 332, 244, 0, - 0, 291, 296, 298, 297, 275, 236, 235, 19, 19, - 19, 19, 0, 0, 0, 0, 277, 0, 269, 0, - 0, 19, 19, 272, 273, 287, 308, 309, 165, 248, - 0, 0, 330, 0, 110, 111, 19, 270, 223, 224, - 242, 228, 229, 247, 0, 0, 0, 0, 0, 153, - 0, 0, 0, 211, 210, 0, 218, 217, 0, 0, + 0, 2, 4, 6, 8, 10, 12, 14, 0, 61, + 59, 0, 0, 0, 59, 168, 1, 59, 0, 59, + 0, 0, 0, 0, 0, 0, 0, 0, 306, 0, + 131, 131, 132, 319, 0, 0, 290, 317, 278, 312, + 314, 308, 131, 321, 300, 310, 0, 0, 303, 59, + 0, 0, 59, 0, 0, 0, 0, 0, 0, 0, + 0, 339, 340, 181, 320, 285, 269, 225, 237, 226, + 244, 270, 271, 272, 184, 275, 5, 291, 280, 283, + 282, 284, 281, 0, 0, 0, 61, 7, 105, 37, + 133, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 130, 0, 56, 57, 76, 0, + 130, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 0, 59, 9, 0, 106, + 0, 0, 11, 73, 72, 68, 0, 15, 59, 0, + 370, 373, 372, 371, 357, 0, 358, 250, 360, 251, + 359, 363, 276, 0, 0, 323, 328, 330, 329, 307, + 268, 267, 59, 59, 59, 59, 0, 0, 0, 0, + 309, 0, 301, 0, 0, 59, 59, 304, 305, 319, + 337, 338, 194, 280, 0, 0, 361, 0, 134, 135, + 59, 302, 252, 253, 274, 257, 258, 279, 0, 0, + 0, 0, 0, 182, 0, 0, 0, 240, 239, 0, + 247, 246, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 225, 226, 227, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 19, 19, 0, - 0, 19, 299, 301, 300, 21, 21, 21, 0, 21, - 21, 0, 21, 21, 21, 21, 52, 23, 0, 74, - 46, 106, 75, 42, 106, 0, 92, 67, 73, 0, - 0, 0, 0, 0, 0, 72, 35, 34, 29, 119, - 122, 121, 134, 119, 130, 129, 133, 135, 140, 230, - 0, 293, 0, 248, 251, 250, 295, 0, 118, 290, - 113, 112, 19, 116, 114, 21, 21, 163, 19, 0, - 0, 281, 168, 279, 283, 0, 0, 0, 0, 156, - 157, 0, 262, 0, 245, 150, 151, 148, 149, 154, - 0, 0, 182, 0, 214, 220, 200, 189, 191, 193, - 207, 187, 188, 0, 203, 205, 204, 201, 202, 199, - 198, 219, 216, 213, 209, 212, 195, 194, 192, 206, - 190, 186, 0, 0, 0, 0, 336, 334, 338, 170, - 0, 0, 160, 171, 260, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 104, 105, 0, 0, 19, 303, - 304, 305, 0, 0, 324, 0, 325, 322, 0, 323, - 319, 320, 321, 0, 0, 21, 0, 99, 0, 0, - 19, 21, 0, 38, 21, 40, 93, 83, 80, 84, - 87, 86, 101, 85, 88, 120, 126, 123, 131, 247, - 0, 292, 294, 117, 21, 115, 19, 233, 234, 0, - 19, 184, 19, 284, 167, 166, 0, 231, 0, 0, - 0, 175, 181, 0, 266, 162, 0, 0, 263, 265, - 264, 267, 331, 179, 0, 19, 261, 0, 173, 0, - 254, 0, 255, 0, 18, 21, 37, 21, 44, 0, - 302, 306, 0, 102, 0, 0, 0, 314, 21, 97, - 98, 103, 0, 0, 82, 61, 0, 0, 0, 100, - 0, 0, 0, 19, 0, 19, 142, 0, 43, 141, - 19, 127, 124, 132, 245, 232, 139, 136, 0, 137, - 164, 0, 312, 0, 169, 158, 185, 0, 178, 241, - 19, 0, 174, 180, 0, 176, 256, 257, 172, 0, - 68, 21, 45, 0, 0, 0, 318, 0, 317, 0, - 0, 0, 55, 0, 0, 96, 96, 0, 0, 22, - 25, 24, 65, 19, 19, 19, 21, 128, 125, 0, - 146, 313, 286, 183, 0, 177, 159, 0, 19, 70, - 307, 19, 19, 315, 0, 0, 0, 19, 99, 0, - 0, 0, 0, 50, 51, 0, 0, 0, 21, 0, - 145, 41, 144, 138, 19, 161, 19, 0, 19, 0, - 0, 89, 48, 49, 316, 0, 0, 0, 64, 0, - 0, 19, 19, 19, 26, 94, 47, 39, 143, 0, - 30, 0, 69, 0, 90, 0, 0, 19, 19, 56, - 0, 60, 54, 53, 0, 0, 66, 147, 0, 19, - 31, 71, 0, 0, 58, 63, 96, 19, 27, 95, - 20, 19, 78, 77, 0, 19, 0, 62, 0, 19, - 59, 0, 79, 91, 0, 57 + 0, 0, 0, 0, 0, 0, 0, 0, 254, 255, + 256, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 59, 59, 0, 0, 59, 331, 333, 332, 61, + 61, 61, 0, 61, 61, 0, 61, 61, 61, 61, + 20, 63, 0, 21, 51, 130, 55, 41, 130, 0, + 116, 16, 22, 0, 0, 0, 0, 0, 0, 23, + 75, 74, 69, 148, 147, 153, 163, 145, 159, 0, + 158, 162, 164, 169, 259, 0, 325, 0, 280, 283, + 282, 327, 0, 142, 322, 137, 136, 59, 140, 138, + 264, 266, 192, 59, 0, 0, 313, 197, 311, 315, + 0, 0, 0, 0, 185, 186, 0, 294, 0, 277, + 179, 180, 177, 178, 183, 0, 0, 211, 0, 243, + 249, 229, 218, 220, 222, 236, 216, 217, 0, 232, + 234, 233, 230, 231, 228, 227, 248, 245, 242, 238, + 241, 224, 223, 221, 235, 219, 215, 0, 0, 0, + 0, 367, 365, 369, 199, 0, 0, 189, 200, 292, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, + 129, 0, 0, 59, 143, 144, 334, 0, 0, 355, + 0, 356, 353, 0, 354, 350, 351, 352, 0, 0, + 61, 0, 123, 0, 0, 59, 61, 0, 45, 61, + 43, 117, 107, 104, 108, 111, 110, 125, 109, 112, + 146, 149, 145, 160, 279, 0, 324, 326, 141, 262, + 139, 59, 263, 265, 0, 59, 213, 59, 316, 196, + 195, 0, 260, 0, 0, 0, 204, 210, 0, 298, + 191, 0, 0, 295, 297, 296, 299, 362, 208, 0, + 59, 293, 0, 202, 0, 286, 0, 287, 0, 58, + 61, 34, 61, 38, 0, 335, 0, 126, 0, 0, + 0, 343, 61, 121, 122, 127, 0, 0, 106, 30, + 0, 0, 0, 124, 0, 0, 0, 59, 0, 59, + 171, 0, 42, 170, 59, 150, 154, 161, 277, 261, + 168, 165, 0, 166, 193, 0, 341, 0, 198, 187, + 214, 0, 207, 273, 59, 0, 203, 209, 0, 205, + 288, 289, 201, 0, 39, 61, 17, 0, 0, 0, + 0, 349, 0, 347, 0, 0, 0, 24, 0, 0, + 120, 120, 0, 0, 62, 65, 64, 47, 59, 59, + 59, 61, 151, 156, 0, 175, 342, 318, 212, 0, + 206, 188, 0, 59, 18, 336, 59, 59, 348, 344, + 0, 0, 0, 59, 123, 0, 0, 0, 0, 35, + 53, 0, 0, 0, 61, 0, 174, 44, 173, 155, + 157, 167, 59, 190, 59, 0, 59, 0, 0, 113, + 36, 49, 0, 345, 0, 0, 0, 33, 0, 0, + 59, 59, 59, 66, 118, 52, 46, 172, 0, 70, + 0, 40, 0, 114, 0, 346, 0, 59, 59, 25, + 0, 29, 50, 54, 0, 0, 48, 176, 0, 59, + 71, 19, 0, 0, 27, 32, 120, 59, 67, 119, + 60, 59, 102, 101, 0, 59, 0, 31, 0, 59, + 28, 0, 103, 115, 0, 26 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { -571, -571, -571, -571, -571, -571, -571, -571, -571, -571, - -4, -10, -571, 92, -80, -571, -571, -571, -571, -16, - -571, 613, 514, 12, -571, -571, -571, -571, -571, -571, - -571, -571, -571, -571, -571, -571, -41, -397, -570, -254, - -571, -530, -571, 41, 231, -315, -34, -571, -88, 73, - -571, -571, -78, 138, -140, 344, 357, -571, -571, -571, - 221, -571, -571, -571, -571, 134, -571, 54, 223, -571, - -295, -571, 9, -46, -571, -571, -571, -571, -571, -571, - -571, -571, -571, -571, -571, -571, 625, -571, -571, 519, - -571, -571, -571, -571, -138, -17, -571, -571, -571, -571, - 256, -571, -571, 413, 40, -23, -22, -571, -571, -571, - -571, -571, 61 + -571, -571, -571, -571, -571, -571, -571, -571, -571, -571, + -571, -571, -571, -571, -571, -571, -571, -571, -571, -571, + -571, -571, -571, -571, -571, -571, -571, -571, -571, -571, + -571, -571, -571, -571, -4, -10, -571, 98, 83, -571, + -571, -571, -571, -16, -571, 542, 415, 7, -571, -571, + -83, -417, -570, -267, -571, -558, -571, -54, 140, -406, + -132, -571, -97, 61, -571, -571, -95, 43, -172, -150, + 156, 121, -571, -571, -571, -571, -571, 123, -571, -571, + -571, -571, 35, -571, -47, 125, -571, -328, -571, 16, + 4, -571, -571, -571, -571, -571, -571, -571, -571, -571, + -571, -571, -571, 683, -571, -571, 422, -571, -571, -571, + -167, -14, -571, -571, -571, -571, -400, -571, -571, 316, + 53, -23, -21, -571, -571, -571, -571, -571, 32 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { 0, 8, 9, 10, 11, 12, 13, 14, 15, 111, - 112, 121, 476, 436, 258, 410, 562, 595, 644, 122, - 631, 278, 119, 120, 505, 510, 414, 412, 588, 656, - 553, 596, 578, 608, 650, 663, 417, 114, 612, 267, - 646, 591, 491, 498, 421, 482, 493, 386, 260, 148, - 150, 238, 176, 302, 305, 299, 426, 283, 284, 285, - 286, 287, 288, 518, 519, 123, 124, 508, 509, 601, - 437, 604, 115, 63, 64, 442, 372, 65, 66, 67, - 68, 69, 70, 71, 72, 73, 74, 153, 75, 141, - 241, 391, 116, 543, 168, 76, 523, 486, 546, 547, - 397, 398, 250, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 132 + 112, 113, 636, 114, 115, 116, 117, 118, 614, 686, + 578, 119, 120, 121, 122, 123, 124, 603, 125, 439, + 126, 534, 127, 529, 128, 622, 129, 130, 131, 437, + 132, 133, 134, 135, 136, 145, 501, 461, 282, 435, + 587, 621, 674, 146, 660, 302, 143, 144, 680, 693, + 442, 138, 640, 291, 676, 617, 515, 522, 446, 506, + 517, 411, 284, 172, 174, 262, 200, 327, 330, 415, + 416, 451, 307, 308, 309, 310, 629, 311, 312, 313, + 542, 543, 147, 148, 532, 533, 627, 462, 632, 139, + 63, 64, 467, 397, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 177, 75, 165, 265, 140, 567, + 192, 76, 547, 510, 571, 572, 422, 423, 274, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 156 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -635,186 +689,204 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 61, 125, 131, 167, 143, 144, 490, 87, 177, 61, - 306, 438, 613, 307, 128, 190, 128, 191, 128, 62, - 128, 128, 263, 259, 113, 146, 592, 261, 62, 161, - 128, 128, 20, 264, 323, 173, 22, 449, 322, 166, - 24, 20, 61, 86, 163, 128, 171, 128, 450, 20, - 185, 186, 187, 188, 230, 247, 231, -333, 129, -333, - 129, 62, 129, 86, 129, 129, 16, 142, 20, 184, - 243, 244, 162, 477, 129, 129, 154, 458, 484, 130, - -335, 648, -335, 134, 478, 136, 137, 324, 492, 169, - 189, 129, 155, 500, 501, 151, 152, 256, 521, 673, - 159, 17, 266, 441, 149, 167, -295, 451, 126, -294, - 170, 468, 172, 127, 282, 157, 294, 295, 649, 185, - 186, 187, 188, 541, 319, 320, 666, 86, -296, 277, - 167, -298, 20, 242, 542, 192, 251, 139, 301, 304, - 304, 166, 160, 174, 316, 317, 248, 140, 175, 297, - 189, 61, 61, 312, -297, 195, 249, 20, 128, 193, - 194, 22, 434, 310, 485, 24, 166, 196, 197, 315, - 62, 62, 126, 413, 454, -337, 415, 127, 237, 293, - 198, 554, 185, 186, 187, 188, 185, 186, 187, 188, - 185, 186, 187, 188, 325, 326, 327, 328, 229, 330, - 331, 333, 169, 362, 363, 174, 364, 279, 236, 365, - 175, 280, 239, 366, 470, 281, 240, 367, 368, 245, - 230, 383, 231, 318, 262, 401, 402, 472, 385, 419, - 420, 390, 423, 424, 585, 586, -341, 228, 375, 376, - 377, 378, 379, 380, 381, 382, 187, 188, 479, 526, - 369, 269, 246, 252, 270, 271, 272, 273, 609, 610, - 274, 416, 253, 440, 185, 186, 187, 188, 373, 490, - 254, 602, 532, 255, 620, 370, 573, 257, 418, 418, - 418, 422, 418, 418, 455, -333, 265, -333, 400, 268, - 275, 439, 304, 185, 186, 187, 188, 289, 61, 430, - 636, 432, 298, 467, 524, 300, 185, 186, 187, 188, - 308, 303, 185, 186, 187, 188, 469, 62, 309, -335, - 652, -335, 311, 321, 371, 313, 471, 446, 185, 186, - 187, 188, 448, 618, 232, 473, 233, 392, 393, 395, - 323, 403, 404, 384, 406, 407, 408, 409, 531, -102, - 389, 185, 186, 187, 188, 185, 186, 187, 188, 387, - 394, 128, -341, -341, -341, 227, 228, 641, 642, 643, - 566, 388, 456, 457, 185, 186, 187, 188, 304, 405, - 464, 401, 402, 654, 655, 411, 428, 185, 186, 187, - 188, 200, 201, 489, 502, 433, 167, 185, 186, 187, - 188, 483, 483, 667, 200, 129, 185, 186, 187, 188, - 425, 670, 494, 200, 435, 422, 499, 483, 483, 185, - 186, 187, 188, 445, 598, 597, 517, 444, 221, 222, - 522, 234, 166, 235, 223, 487, 447, 224, 225, 226, - 227, 228, 222, 449, 400, 465, 459, 223, 534, 475, - 224, 225, 226, 227, 228, 61, 223, 460, 527, 224, - 225, 226, 227, 228, 581, 582, 18, 185, 186, 187, - 188, 587, 20, 461, 62, 462, 22, 593, 594, 269, - 24, 480, 270, 271, 272, 273, 396, 481, 274, 185, - 186, 187, 188, 561, 488, 301, 504, 496, 506, 511, - 304, 512, 520, 503, 443, 483, 507, 516, 528, 530, - 621, 622, 623, 574, 535, 536, 625, 167, 537, 538, - 61, 544, 545, 552, 549, 548, 507, 20, 551, 634, - 571, 185, 186, 187, 188, 555, 637, 638, 556, 62, - 185, 186, 187, 188, 185, 186, 187, 188, 557, 599, - 560, 563, 565, 166, 304, 558, 570, 572, 483, 483, - 657, 575, 607, 185, 186, 187, 188, 539, 452, 540, - 577, 611, 611, 665, 576, 583, 584, 266, 600, 590, - 550, 466, 645, 589, 669, 603, 606, 605, 629, 615, - 616, 617, 633, 626, 675, 635, 630, 499, 483, 639, - 514, 185, 186, 187, 188, 185, 186, 187, 188, 640, - 653, 266, 266, 266, 1, 2, 3, 4, 5, 6, - 7, 658, 660, 614, 483, 661, 118, 266, 266, 619, - 664, 276, 671, 579, 674, 624, 431, 497, 525, 662, - 427, 659, 533, 564, 483, 668, 133, 266, 135, 513, - 569, 138, 627, 145, 147, 266, 489, 515, 292, 611, - 495, 399, 0, 0, 0, 0, 156, 0, 0, 158, - 0, 0, 0, 164, 0, -13, 88, 0, 0, 0, - 178, 179, 180, 181, 182, 18, 86, 0, 19, 0, - 507, 20, 0, 0, 21, 22, 23, 89, 0, 24, - 25, 90, 91, 92, 26, 27, 93, 94, 0, 0, - 95, 96, 97, 98, 0, 99, 100, 101, 102, 0, - 0, 103, 28, 29, 104, 105, 106, 30, 31, 107, - 32, 33, 34, 35, 36, 37, 0, 38, 39, 40, - 41, 42, 43, 108, 117, 44, 0, 109, 45, 46, - 47, 48, 49, 50, 0, 0, 0, 51, 52, 53, - 0, 0, 0, 0, 291, 110, 0, 0, 0, 0, - 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 55, 56, 0, 57, 0, 58, 59, - 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, - 0, 0, 0, 0, 329, 0, 0, 0, 0, 0, - 334, 0, 0, 335, 336, 337, 338, 339, 340, 341, - 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, - 352, 353, 354, 355, 356, 357, 358, 359, 360, -3, - 88, 0, 361, 0, 0, 0, 0, 0, 0, 18, - 86, 0, 19, 0, 0, 20, 0, 0, 21, 22, + 61, 149, 331, 463, 167, 155, 168, 87, 332, 61, + 285, 514, 508, 287, 152, 324, 152, -61, 152, 137, + 152, 152, 516, 618, 20, 170, 62, 524, 525, 519, + 152, 152, 214, 347, 215, 62, 20, 641, 197, 190, + 288, 348, 61, 20, 187, 152, 195, 152, 475, 20, + 154, 466, 86, 191, 158, 16, 160, 161, 201, 179, + 254, 213, 255, 271, 178, 185, 175, 176, 62, 545, + 267, 153, 268, 153, 678, 153, 208, 153, 153, 474, + 166, 194, 502, 196, 492, 565, 20, 153, 153, 183, + 22, -152, 173, 503, 24, 303, 566, 280, -364, 304, + -364, 20, 193, 181, 153, 22, 184, 17, 186, 24, + 198, -366, 679, -366, 579, -327, 199, 209, 210, 211, + 212, 209, 210, 211, 212, 254, 290, 255, 696, 703, + 217, 218, 209, 210, 211, 212, -328, 213, 306, -61, + 319, 509, 320, 570, 219, -364, 266, -364, 301, 275, + 642, 222, 476, -326, 216, 459, 272, 209, 210, 211, + 212, -368, 326, 329, 329, 190, 273, 456, 611, 612, + 608, 341, 342, 260, -330, 61, 61, 337, 305, 191, + 322, 253, 152, 493, 261, 263, 283, -329, 438, 264, + 190, 440, 86, 163, 335, 220, 221, 20, 344, 345, + 340, 62, 62, 164, 191, 495, 483, 387, 388, 649, + 389, 444, 445, 390, 448, 449, 318, 391, 343, 479, + 497, 392, 393, 211, 212, 350, 351, 352, 353, 269, + 355, 356, 358, 209, 210, 211, 212, 150, 666, 193, + -372, 252, 665, 151, -366, 408, -366, 637, 638, 426, + 198, 427, 410, 550, 394, 414, 199, 270, 682, 556, + 256, 276, 257, 628, 209, 210, 211, 212, 277, 400, + 401, 402, 403, 404, 405, 406, 407, 278, 258, 514, + 259, 395, 279, 281, 286, 441, 209, 210, 211, 212, + 293, 289, 480, 294, 295, 296, 297, 598, 292, 298, + 548, 209, 210, 211, 212, 398, 299, 314, 323, 443, + 443, 443, 447, 443, 443, 86, 328, 329, 494, 464, + 20, 325, 496, 61, 334, 425, 333, 336, 338, 346, + 396, 455, 348, 409, 209, 210, 211, 212, 465, 419, + 209, 210, 211, 212, 412, 413, 647, 436, 430, 62, + 498, 452, 450, 209, 210, 211, 212, 453, 458, 471, + 150, 460, 591, 555, 473, 469, 151, 417, 418, 420, + 470, 428, 429, 472, 431, 432, 433, 434, 209, 210, + 211, 212, 474, 671, 672, 673, 152, 484, 485, 486, + -126, 209, 210, 211, 212, 209, 210, 211, 212, 487, + 684, 685, 490, 414, 481, 482, 426, 500, 427, 505, + 528, 512, 489, 530, 535, 224, 225, 624, 513, 526, + 697, 623, -61, 209, 210, 211, 212, 540, 700, 544, + 552, 554, 559, 507, 507, 560, 209, 210, 211, 212, + 561, 562, 568, 153, 518, 569, 577, 447, 523, 507, + 507, 541, 245, 246, 574, 546, 576, 190, 247, 580, + 588, 248, 249, 250, 251, 252, 224, 225, 226, 581, + 582, 191, 583, 511, 590, 18, 558, 585, 593, 595, + 61, 20, 425, 224, 597, 22, 600, 601, 293, 24, + 551, 294, 295, 296, 297, 421, 609, 298, 240, 241, + 242, 243, 244, 245, 246, 602, 62, 610, 616, 247, + 615, 626, 248, 249, 250, 251, 252, 586, 631, 326, + 633, 246, 634, 644, 329, 20, 247, 645, 520, 248, + 249, 250, 251, 252, 527, 646, 507, 531, 664, 655, + 599, 669, 670, 690, 61, 675, 683, 426, 688, 427, + 691, 209, 210, 211, 212, 142, 300, 531, 224, 694, + 648, 596, 573, 704, 701, 209, 210, 211, 212, 504, + 62, 521, 589, 536, 625, 594, 537, 656, 190, 329, + 209, 210, 211, 212, 539, 317, 0, 635, 424, 0, + 507, 507, 191, 0, 0, 0, 639, 639, 563, 0, + 564, 247, 349, 290, 248, 249, 250, 251, 252, 0, + 575, 209, 210, 211, 212, 0, 658, 457, 0, 426, + 662, 427, 0, 425, 659, -372, -372, -372, 251, 252, + 523, 507, 0, 209, 210, 211, 212, 0, 0, 0, + 290, 290, 290, 0, 209, 210, 211, 212, 468, 0, + 0, 606, 607, 209, 210, 211, 212, 290, 290, 613, + 507, 0, 643, 604, 0, 619, 620, 0, 0, 692, + 477, 689, 0, 0, 653, 698, 0, 290, 0, 0, + 507, 491, 0, 0, 0, 290, 513, 0, 0, 639, + 538, 0, 0, 0, 0, 425, 0, 0, 0, 650, + 651, 652, 0, 0, 157, 654, 159, 0, 0, 162, + 0, 169, 171, 0, 209, 210, 211, 212, 0, 0, + 663, 0, 531, 0, 180, 0, 0, 182, 667, 668, + 0, 188, 0, 0, 0, 0, 0, 0, 202, 203, + 204, 205, 206, 0, 0, 224, 225, 226, 0, 0, + 88, 549, 0, 687, 0, 0, 0, 0, 0, 18, + 0, 0, 19, 0, 0, 20, 695, 0, 21, 22, + 23, -59, 0, 24, 25, 0, 0, 699, 26, 27, + 243, 244, 245, 246, 0, 0, 0, 705, 247, 0, + 0, 248, 249, 250, 251, 252, 28, 29, 0, 0, + 0, 30, 31, 0, 32, 33, 34, 35, 0, 36, + 37, 0, 38, 39, 40, 41, 42, 43, 224, 225, + 226, 44, 0, 0, 45, 46, 47, 48, 49, 50, + 0, 0, 0, 51, 52, 53, 209, 210, 211, 212, + 0, 0, 224, 225, 226, 0, 316, 0, 54, 0, + 0, 0, 242, 243, 244, 245, 246, 0, 0, 0, + 0, 247, 0, 0, 248, 249, 250, 251, 252, 55, + 56, 0, 57, 557, 58, 59, -372, 243, 244, 245, + 246, 0, 60, 0, 0, 247, 0, 0, 248, 249, + 250, 251, 252, 0, 0, 0, 354, 0, 0, 0, + 0, 0, 359, 0, 0, 360, 361, 362, 363, 364, + 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, + 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, + 385, -13, 88, 0, 386, 0, 0, 0, 0, 0, + 0, 18, 86, 0, 19, 0, 0, 20, 0, 0, + 21, 22, 23, 89, 0, 24, 25, 90, 91, 92, + 26, 27, 93, 94, 0, 0, 95, 96, 97, 98, + 0, 99, 100, 101, 102, 0, 0, 103, 28, 29, + 104, 105, 106, 30, 31, 107, 32, 33, 34, 35, + 0, 36, 37, 0, 38, 39, 40, 41, 42, 43, + 108, 141, 0, 44, 0, 109, 45, 46, 47, 48, + 49, 50, 0, 0, 0, 51, 52, 53, 0, 0, + 0, 0, 0, 110, 0, 0, 0, 0, 0, 0, + 54, 1, 2, 3, 4, 5, 6, 7, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, -3, + 88, 55, 56, 0, 57, 0, 58, 59, 0, 18, + 86, 0, 19, 0, 60, 20, 0, 0, 21, 22, 23, 89, 0, 24, 25, 90, 91, 92, 26, 27, 93, 94, 0, 0, 95, 96, 97, 98, 0, 99, 100, 101, 102, 0, 0, 103, 28, 29, 104, 105, - 106, 30, 31, 107, 32, 33, 34, 35, 36, 37, - 0, 38, 39, 40, 41, 42, 43, 108, 117, 44, - 0, 109, 45, 46, 47, 48, 49, 50, 0, 0, - 0, 51, 52, 53, 0, 0, 0, 0, 0, 110, - 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, + 106, 30, 31, 107, 32, 33, 34, 35, 0, 36, + 37, 0, 38, 39, 40, 41, 42, 43, 108, 141, + 0, 44, 0, 109, 45, 46, 47, 48, 49, 50, + 0, 0, 0, 51, 52, 53, 0, 0, 0, 0, + 0, 110, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 88, 55, 56, 0, - 57, 0, 58, 59, 0, 18, 86, 474, 19, 0, - 60, 20, 0, 0, 21, 22, 23, 89, 0, 24, - 25, 90, 91, 92, 26, 27, 93, 94, 0, 0, - 95, 96, 97, 98, 0, 99, 100, 101, 102, 0, - 0, 103, 28, 29, 104, 105, 106, 30, 31, 107, - 32, 33, 34, 35, 36, 37, 0, 38, 39, 40, - 41, 42, 43, 108, 117, 44, 0, 109, 45, 46, - 47, 48, 49, 50, 0, 0, 0, 51, 52, 53, - 0, 0, 0, 0, 0, 110, 0, 0, 0, 0, - 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, - 0, 199, 0, 0, 0, 0, 0, 0, 529, 200, - 201, 202, 0, 55, 56, 0, 57, 0, 58, 59, - 0, 0, 203, 0, 0, 0, 60, 0, 204, 205, - 206, 453, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 218, 219, 220, 221, 222, 0, 0, - 0, 0, 223, 0, 0, 224, 225, 226, 227, 228, - 88, 0, 0, 0, 0, 0, 567, 568, 0, 18, - 86, 559, 19, 0, 0, 20, 0, 0, 21, 22, + 0, 553, 0, 0, 0, 0, 0, 0, 0, 55, + 56, 0, 57, 0, 58, 59, 0, 0, 0, 0, + 88, 0, 60, 0, 0, 0, 0, 0, 0, 18, + 86, 499, 19, 0, 0, 20, 0, 0, 21, 22, 23, 89, 0, 24, 25, 90, 91, 92, 26, 27, - 93, 94, 0, 0, 95, 96, 97, 98, 580, 99, + 93, 94, 0, 0, 95, 96, 97, 98, 592, 99, 100, 101, 102, 0, 0, 103, 28, 29, 104, 105, - 106, 30, 31, 107, 32, 33, 34, 35, 36, 37, - 0, 38, 39, 40, 41, 42, 43, 108, 117, 44, + 106, 30, 31, 107, 32, 33, 34, 35, 0, 36, + 37, 0, 38, 39, 40, 41, 42, 43, 108, 141, + 605, 44, 0, 109, 45, 46, 47, 48, 49, 50, + 0, 0, 0, 51, 52, 53, 0, 0, 0, 0, + 0, 110, 0, 0, 0, 0, 630, 0, 54, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 88, 55, + 56, 0, 57, 0, 58, 59, 0, 18, 86, 584, + 19, 0, 60, 20, 0, 0, 21, 22, 23, 89, + 0, 24, 25, 90, 91, 92, 26, 27, 93, 94, + 0, 0, 95, 96, 97, 98, 0, 99, 100, 101, + 102, 0, 0, 103, 28, 29, 104, 105, 106, 30, + 31, 107, 32, 33, 34, 35, 0, 36, 37, 0, + 38, 39, 40, 41, 42, 43, 108, 141, 0, 44, 0, 109, 45, 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, 53, 0, 0, 0, 0, 0, 110, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 55, 56, 0, - 57, 0, 58, 59, 0, 18, 86, 628, 19, 0, + 57, 0, 58, 59, 0, 18, 86, 657, 19, 0, 60, 20, 0, 0, 21, 22, 23, 89, 0, 24, 25, 90, 91, 92, 26, 27, 93, 94, 0, 0, 95, 96, 97, 98, 0, 99, 100, 101, 102, 0, 0, 103, 28, 29, 104, 105, 106, 30, 31, 107, - 32, 33, 34, 35, 36, 37, 0, 38, 39, 40, - 41, 42, 43, 108, 117, 44, 0, 109, 45, 46, - 47, 48, 49, 50, 0, 0, 0, 51, 52, 53, - 0, 0, 0, 0, 0, 110, 0, 0, 0, 0, - 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 88, 55, 56, 0, 57, 0, 58, 59, - 0, 18, 86, 632, 19, 0, 60, 20, 0, 0, - 21, 22, 23, 89, 0, 24, 25, 90, 91, 92, - 26, 27, 93, 94, 0, 0, 95, 96, 97, 98, - 0, 99, 100, 101, 102, 0, 0, 103, 28, 29, - 104, 105, 106, 30, 31, 107, 32, 33, 34, 35, - 36, 37, 0, 38, 39, 40, 41, 42, 43, 108, - 117, 44, 0, 109, 45, 46, 47, 48, 49, 50, - 0, 0, 0, 51, 52, 53, 0, 0, 0, 0, - 0, 110, 0, 0, 0, 0, 0, 0, 54, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 88, 55, - 56, 0, 57, 0, 58, 59, 0, 18, 86, 647, - 19, 0, 60, 20, 0, 0, 21, 22, 23, 89, - 0, 24, 25, 90, 91, 92, 26, 27, 93, 94, - 0, 0, 95, 96, 97, 98, 0, 99, 100, 101, - 102, 0, 0, 103, 28, 29, 104, 105, 106, 30, - 31, 107, 32, 33, 34, 35, 36, 37, 0, 38, - 39, 40, 41, 42, 43, 108, 117, 44, 0, 109, + 32, 33, 34, 35, 0, 36, 37, 0, 38, 39, + 40, 41, 42, 43, 108, 141, 0, 44, 0, 109, 45, 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, 53, 0, 0, 0, 0, 0, 110, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 55, 56, 0, 57, 0, - 58, 59, 0, 18, 86, 651, 19, 0, 60, 20, + 58, 59, 0, 18, 86, 661, 19, 0, 60, 20, 0, 0, 21, 22, 23, 89, 0, 24, 25, 90, 91, 92, 26, 27, 93, 94, 0, 0, 95, 96, 97, 98, 0, 99, 100, 101, 102, 0, 0, 103, 28, 29, 104, 105, 106, 30, 31, 107, 32, 33, - 34, 35, 36, 37, 0, 38, 39, 40, 41, 42, - 43, 108, 117, 44, 0, 109, 45, 46, 47, 48, + 34, 35, 0, 36, 37, 0, 38, 39, 40, 41, + 42, 43, 108, 141, 0, 44, 0, 109, 45, 46, + 47, 48, 49, 50, 0, 0, 0, 51, 52, 53, + 0, 0, 0, 0, 0, 110, 0, 0, 0, 0, + 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 88, 55, 56, 0, 57, 0, 58, 59, + 0, 18, 86, 677, 19, 0, 60, 20, 0, 0, + 21, 22, 23, 89, 0, 24, 25, 90, 91, 92, + 26, 27, 93, 94, 0, 0, 95, 96, 97, 98, + 0, 99, 100, 101, 102, 0, 0, 103, 28, 29, + 104, 105, 106, 30, 31, 107, 32, 33, 34, 35, + 0, 36, 37, 0, 38, 39, 40, 41, 42, 43, + 108, 141, 0, 44, 0, 109, 45, 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, 53, 0, 0, 0, 0, 0, 110, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 55, 56, 0, 57, 0, 58, 59, 0, 18, - 86, 0, 19, 0, 60, 20, 0, 0, 21, 22, + 86, 681, 19, 0, 60, 20, 0, 0, 21, 22, 23, 89, 0, 24, 25, 90, 91, 92, 26, 27, 93, 94, 0, 0, 95, 96, 97, 98, 0, 99, 100, 101, 102, 0, 0, 103, 28, 29, 104, 105, - 106, 30, 31, 107, 32, 33, 34, 35, 36, 37, - 0, 38, 39, 40, 41, 42, 43, 108, 117, 44, + 106, 30, 31, 107, 32, 33, 34, 35, 0, 36, + 37, 0, 38, 39, 40, 41, 42, 43, 108, 141, + 0, 44, 0, 109, 45, 46, 47, 48, 49, 50, + 0, 0, 0, 51, 52, 53, 0, 0, 0, 0, + 0, 110, 0, 0, 0, 0, 0, 0, 54, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 88, 55, + 56, 0, 57, 0, 58, 59, 0, 18, 86, 0, + 19, 0, 60, 20, 0, 0, 21, 22, 23, 89, + 0, 24, 25, 90, 91, 92, 26, 27, 93, 94, + 0, 0, 95, 96, 97, 98, 0, 99, 100, 101, + 102, 0, 0, 103, 28, 29, 104, 105, 106, 30, + 31, 107, 32, 33, 34, 35, 0, 36, 37, 0, + 38, 39, 40, 41, 42, 43, 108, 141, 0, 44, 0, 109, 45, 46, 47, 48, 49, 50, 0, 0, - 0, 51, 52, 53, 0, 0, 672, 0, 0, 110, + 0, 51, 52, 53, 0, 0, 702, 0, 0, 110, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 55, 56, 0, @@ -823,724 +895,737 @@ static const yytype_int16 yytable[] = 25, 90, 91, 92, 26, 27, 93, 94, 0, 0, 95, 96, 97, 98, 0, 99, 100, 101, 102, 0, 0, 103, 28, 29, 104, 105, 106, 30, 31, 107, - 32, 33, 34, 35, 36, 37, 0, 38, 39, 40, - 41, 42, 43, 108, 117, 44, 0, 109, 45, 46, - 47, 48, 49, 50, 0, 0, 0, 51, 52, 53, - 0, 0, 0, 0, 0, 110, 0, 0, 0, 0, - 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, + 32, 33, 34, 35, 0, 36, 37, 0, 38, 39, + 40, 41, 42, 43, 108, 141, 0, 44, 0, 109, + 45, 46, 47, 48, 49, 50, 0, 0, 0, 51, + 52, 53, 0, 0, 0, 0, 0, 110, 0, 0, + 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 88, 55, 56, 0, 57, 0, 58, 59, - 0, 18, 86, 0, 19, 0, 60, 20, 0, 0, - 21, 22, 23, 89, 0, 24, 25, 90, 91, 92, - 26, 27, 93, 94, 0, 0, 95, 96, 97, 98, - 0, 99, 100, 101, 102, 0, 0, 103, 28, 29, - 104, 105, 106, 30, 31, 107, 32, 33, 34, 35, - 36, 37, 0, 38, 39, 40, 41, 42, 43, 108, - 0, 44, 0, 109, 45, 46, 47, 48, 49, 50, - 0, 0, 0, 51, 52, 53, 0, 88, 0, 0, - 0, 110, 0, 0, 0, 0, 18, 0, 54, 19, - 0, 0, 20, 0, 0, 21, 22, 23, -19, 0, - 24, 25, 0, 0, 0, 26, 27, 0, 0, 55, - 56, 0, 57, 0, 58, 59, 0, 0, 0, 0, - 0, 0, 60, 28, 29, 0, 0, 0, 30, 31, - 0, 32, 33, 34, 35, 36, 37, 0, 38, 39, - 40, 41, 42, 43, 0, 0, 44, 0, 0, 45, - 46, 47, 48, 49, 50, 0, 0, 88, 51, 52, - 53, 0, 0, 0, 0, 0, 18, 0, 0, 19, - 0, 0, 20, 54, 0, 21, 22, 23, 0, 0, - 24, 25, 0, 0, 0, 26, 27, 0, 0, 0, - 0, 0, 0, 0, 55, 56, 0, 57, 0, 58, - 59, 0, 0, 28, 29, 0, 0, 60, 30, 31, - 0, 32, 33, 34, 35, 36, 37, 0, 38, 39, - 40, 41, 42, 43, 0, 0, 44, 0, 0, 45, - 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, - 53, 0, 0, 0, 0, 0, 18, 86, 0, 19, - 0, 0, 20, 54, 0, 21, 22, 23, 0, 0, - 24, 25, 0, 0, 0, 26, 27, 0, 0, 0, - 0, 0, 0, 0, 55, 56, 0, 57, 0, 58, - 59, 0, 0, 28, 29, 0, -19, 60, 30, 31, - 0, 32, 165, 34, 35, 36, 37, 127, 38, 39, - 40, 41, 42, 43, 0, 0, 44, 0, 0, 45, - 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, - 53, 0, 0, 0, 0, 0, 18, 86, 0, 19, - 0, 0, 20, 54, 0, 21, 22, 23, 0, 0, - 24, 25, 0, 0, 0, 26, 27, 0, 0, 0, - 0, 0, 0, 0, 55, 56, 0, 57, 0, 58, - 59, 0, 0, 28, 29, 0, 0, 60, 30, 31, - 0, 32, 33, 34, 35, 36, 37, 0, 38, 39, - 40, 41, 42, 43, 0, 0, 44, 0, 0, 45, + 0, 0, 0, 0, 88, 55, 56, 0, 57, 0, + 58, 59, 0, 18, 86, 0, 19, 0, 60, 20, + 0, 0, 21, 22, 23, 89, 0, 24, 25, 90, + 91, 92, 26, 27, 93, 94, 0, 0, 95, 96, + 97, 98, 0, 99, 100, 101, 102, 0, 0, 103, + 28, 29, 104, 105, 106, 30, 31, 107, 32, 33, + 34, 35, 0, 36, 37, 0, 38, 39, 40, 41, + 42, 43, 108, 0, 0, 44, 0, 109, 45, 46, + 47, 48, 49, 50, 0, 0, 0, 51, 52, 53, + 0, 88, 0, 0, 0, 110, 0, 0, 0, 0, + 18, 0, 54, 19, 0, 0, 20, 0, 0, 21, + 22, 23, 0, 0, 24, 25, 0, 0, 0, 26, + 27, 0, 0, 55, 56, 0, 57, 0, 58, 59, + 0, 0, 0, 0, 0, 0, 60, 28, 29, 0, + 0, 0, 30, 31, 0, 32, 33, 34, 35, 0, + 36, 37, 0, 38, 39, 40, 41, 42, 43, 0, + 0, 0, 44, 0, 0, 45, 46, 47, 48, 49, + 50, 0, 0, 0, 51, 52, 53, 0, 0, 0, + 0, 0, 18, 86, 0, 19, 0, 0, 20, 54, + 0, 21, 22, 23, 0, 0, 24, 25, 0, 0, + 0, 26, 27, 0, 0, 0, 0, 0, 0, 0, + 55, 56, 0, 57, 0, 58, 59, 0, 0, 28, + 29, 0, -59, 60, 30, 31, 0, 32, 189, 34, + 35, 0, 36, 37, 151, 38, 39, 40, 41, 42, + 43, 0, 0, 0, 44, 0, 0, 45, 46, 47, + 48, 49, 50, 0, 0, 0, 51, 52, 53, 0, + 0, 0, 0, 0, 18, 86, 0, 19, 0, 0, + 20, 54, 0, 21, 22, 23, 0, 0, 24, 25, + 0, 0, 0, 26, 27, 0, 0, 0, 0, 0, + 0, 0, 55, 56, 0, 57, 0, 58, 59, 0, + 0, 28, 29, 0, 0, 60, 30, 31, 0, 32, + 33, 34, 35, 0, 36, 37, 0, 38, 39, 40, + 41, 42, 43, 0, 0, 0, 44, 0, 0, 45, 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, 53, 0, 0, 0, 0, 0, 18, 0, 0, 19, 0, 0, 20, 54, 0, 21, 22, 23, 0, 0, 24, 25, 0, 0, 0, 26, 27, 0, 0, 0, 0, 0, 0, 0, 55, 56, 0, 57, 0, 58, 59, 0, 0, 28, 29, 0, 0, 60, 30, 31, - 0, 32, 33, 34, 35, 36, 37, 0, 38, 39, - 40, 41, 42, 43, 0, 0, 44, 0, 0, 45, + 0, 32, 33, 34, 35, 0, 36, 37, 0, 38, + 39, 40, 41, 42, 43, 0, 0, 0, 44, 0, + 0, 45, 46, 47, 48, 49, 50, 0, 0, 0, + 51, 52, 53, 0, 0, 0, 0, 0, 18, 0, + 0, 19, 0, 0, 20, 54, 0, 21, 22, 23, + 0, 0, 24, 25, 0, 0, 0, 26, 27, 0, + 0, 0, 0, 0, 0, 0, 55, 56, 0, 57, + 0, 58, 59, 0, 0, 28, 29, 0, 207, 60, + 30, 31, 0, 32, 33, 34, 35, 0, 36, 37, + 0, 38, 39, 40, 41, 42, 43, 0, 0, 0, + 44, 0, 0, 45, 46, 47, 48, 49, 50, 0, + 0, 0, 51, 52, 53, 0, 0, 0, 0, 0, + 18, 0, 0, 19, 0, 0, 20, 54, 0, 21, + 22, 23, 0, 0, 24, 25, 0, 0, 0, 26, + 27, 0, 0, 0, 0, 0, 0, 0, 55, 56, + 0, 57, 0, 58, 59, 0, 0, 28, 29, 0, + 321, 60, 30, 31, 0, 32, 33, 34, 35, 0, + 36, 37, 0, 38, 39, 40, 41, 42, 43, 0, + 0, 0, 44, 0, 0, 45, 46, 47, 48, 49, + 50, 0, 0, 0, 51, 52, 53, 0, 0, 0, + 0, 0, -371, 254, 0, 255, 0, 0, -371, 54, + 0, -371, -371, -371, 0, 0, -371, -371, 0, 0, + 0, -371, -371, 0, 0, 0, 0, 0, 0, 0, + 55, 56, 0, 57, 0, 58, 59, 0, 0, -371, + -371, 0, 339, 60, -371, -371, 0, -371, -371, -371, + -371, 0, -371, -371, 0, -371, -371, -371, -371, -371, + -371, 0, 0, 0, -371, 0, 0, -371, -371, -371, + -371, -371, -371, 0, 0, 0, -371, -371, -371, 0, + 0, 0, 0, 0, 18, 0, 0, 19, 0, 0, + 20, -371, 0, 21, 22, 23, 0, 0, 24, 25, + 0, 0, 0, 26, 27, 0, 0, 0, 0, 0, + 0, 0, -371, -371, 0, -371, 0, -371, -371, 0, + 0, 28, 29, 0, 0, -371, 30, 31, 0, 32, + 33, 34, 35, 0, 36, 37, 0, 38, 39, 40, + 41, 42, 43, 0, 0, 0, 44, 0, 0, 45, 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, 53, 0, 0, 0, 0, 0, 18, 0, 0, 19, 0, 0, 20, 54, 0, 21, 22, 23, 0, 0, 24, 25, 0, 0, 0, 26, 27, 0, 0, 0, 0, 0, 0, 0, 55, 56, 0, 57, 0, 58, - 59, 0, 0, 28, 29, 0, 183, 60, 30, 31, - 0, 32, 33, 34, 35, 36, 37, 0, 38, 39, - 40, 41, 42, 43, 0, 0, 44, 0, 0, 45, + 59, 0, 0, 28, 29, 0, 357, 60, 30, 31, + 0, 32, 33, 34, 35, 0, 36, 37, 0, 38, + 39, 40, 41, 42, 43, 0, 0, 0, 44, 0, + 0, 45, 46, 47, 48, 49, 50, 0, 0, 0, + 51, 52, 53, 0, 0, 0, 0, 0, 18, 0, + 0, 19, 0, 0, 20, 54, 0, 21, 22, 23, + 0, 0, 24, 25, 0, 0, 0, 26, 27, 0, + 0, 0, 0, 0, 0, 0, 55, 56, 0, 57, + 0, 58, 59, 0, 0, 28, 29, 0, 399, 60, + 30, 31, 0, 32, 33, 34, 35, 0, 36, 37, + 0, 38, 39, 40, 41, 42, 43, 0, 0, 0, + 44, 0, 0, 45, 46, 47, 48, 49, 50, 0, + 0, 0, 51, 52, 53, 0, 0, 0, 0, 0, + 18, 0, 0, 19, 0, 0, 20, 54, 0, 21, + 22, 23, 0, 0, 24, 25, 0, 0, 0, 26, + 27, 0, 0, 0, 0, 0, 0, 0, 55, 56, + 0, 57, 0, 58, 59, 0, 0, 28, 29, 0, + 454, 60, 30, 31, 0, 32, 33, 34, 35, 0, + 36, 37, 0, 38, 39, 40, 41, 42, 43, 0, + 0, 0, 44, 0, 0, 45, 46, 47, 48, 49, + 50, 0, 0, 0, 51, 52, 53, 0, 0, 0, + 0, 0, 18, 0, 0, 19, 0, 0, 20, 54, + 0, 21, 22, 23, 0, 0, 24, 25, 0, 0, + 0, 26, 27, 0, 0, 0, 0, 0, 0, 0, + 55, 56, 0, 57, 0, 58, 59, 0, 0, 28, + 29, 0, 488, 60, 30, 31, 0, 32, 33, 34, + 35, 0, 36, 37, 0, 38, 39, 40, 41, 42, + 43, 0, 0, 0, 44, 0, 0, 45, 46, 47, + 48, 49, 50, 0, 0, 0, 51, 52, 53, 0, + 0, 0, 0, 0, 18, 0, 0, 19, 0, 0, + 20, 54, 0, 21, 22, 23, 0, 0, 24, 25, + 0, 0, 0, 26, 27, 0, 0, 0, 0, 0, + 0, 0, 55, 56, 0, 57, 0, 58, 59, 0, + 0, 28, 29, 0, 0, 60, 30, 31, 0, 32, + 33, 34, 35, 0, 36, 37, 0, 38, 39, 40, + 41, 42, 43, 0, 0, 0, 44, 0, 0, 45, 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, - 53, 0, 0, 0, 0, 0, 18, 0, 0, 19, - 0, 0, 20, 54, 0, 21, 22, 23, 0, 0, - 24, 25, 0, 0, 0, 26, 27, 0, 0, 0, + 53, 0, 0, 0, 0, 0, -370, 0, 0, -370, + 0, 0, -370, 54, 0, -370, -370, -370, 0, 0, + -370, -370, 0, 0, 0, -370, -370, 0, 0, 0, 0, 0, 0, 0, 55, 56, 0, 57, 0, 58, - 59, 0, 0, 28, 29, 0, 296, 60, 30, 31, - 0, 32, 33, 34, 35, 36, 37, 0, 38, 39, - 40, 41, 42, 43, 0, 0, 44, 0, 0, 45, - 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, - 53, 0, 0, 0, 0, 0, -340, 230, 0, 231, - 0, 0, -340, 54, 0, -340, -340, -340, 0, 0, - -340, -340, 0, 0, 0, -340, -340, 0, 0, 0, - 0, 0, 0, 0, 55, 56, 0, 57, 0, 58, - 59, 0, 0, -340, -340, 0, 314, 60, -340, -340, - 0, -340, -340, -340, -340, -340, -340, 0, -340, -340, - -340, -340, -340, -340, 0, 0, -340, 0, 0, -340, - -340, -340, -340, -340, -340, 0, 0, 0, -340, -340, - -340, 0, 0, 0, 0, 0, 18, 0, 0, 19, - 0, 0, 20, -340, 0, 21, 22, 23, 0, 0, - 24, 25, 0, 0, 0, 26, 27, 0, 0, 0, - 0, 0, 0, 0, -340, -340, 0, -340, 0, -340, - -340, 0, 0, 28, 29, 0, 0, -340, 30, 31, - 0, 32, 33, 34, 35, 36, 37, 0, 38, 39, - 40, 41, 42, 43, 0, 0, 44, 0, 0, 45, - 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, - 53, 0, 0, 0, 0, 0, 18, 0, 0, 19, - 0, 0, 20, 54, 0, 21, 22, 23, 0, 0, - 24, 25, 0, 0, 0, 26, 27, 0, 0, 0, - 0, 0, 0, 0, 55, 56, 0, 57, 0, 58, - 59, 0, 0, 28, 29, 0, 332, 60, 30, 31, - 0, 32, 33, 34, 35, 36, 37, 0, 38, 39, - 40, 41, 42, 43, 0, 0, 44, 0, 0, 45, - 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, - 53, 0, 0, 0, 0, 0, 18, 0, 0, 19, - 0, 0, 20, 54, 0, 21, 22, 23, 0, 0, - 24, 25, 0, 0, 0, 26, 27, 0, 0, 0, - 0, 0, 0, 0, 55, 56, 0, 57, 0, 58, - 59, 0, 0, 28, 29, 0, 374, 60, 30, 31, - 0, 32, 33, 34, 35, 36, 37, 0, 38, 39, - 40, 41, 42, 43, 0, 0, 44, 0, 0, 45, - 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, - 53, 0, 0, 0, 0, 0, 18, 0, 0, 19, - 0, 0, 20, 54, 0, 21, 22, 23, 0, 0, - 24, 25, 0, 0, 0, 26, 27, 0, 0, 0, - 0, 0, 0, 0, 55, 56, 0, 57, 0, 58, - 59, 0, 0, 28, 29, 0, 429, 60, 30, 31, - 0, 32, 33, 34, 35, 36, 37, 0, 38, 39, - 40, 41, 42, 43, 0, 0, 44, 0, 0, 45, - 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, - 53, 0, 0, 0, 0, 0, 18, 0, 0, 19, - 0, 0, 20, 54, 0, 21, 22, 23, 0, 0, - 24, 25, 0, 0, 0, 26, 27, 0, 0, 0, - 0, 0, 0, 0, 55, 56, 0, 57, 0, 58, - 59, 0, 0, 28, 29, 0, 463, 60, 30, 31, - 0, 32, 33, 34, 35, 36, 37, 0, 38, 39, - 40, 41, 42, 43, 0, 0, 44, 0, 0, 45, - 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, - 53, 0, 0, 0, 0, 0, 18, 0, 0, 19, - 0, 0, 20, 54, 0, 21, 22, 23, 0, 0, - 24, 25, 0, 0, 0, 26, 27, 0, 0, 0, - 0, 0, 0, 0, 55, 56, 0, 57, 0, 58, - 59, 0, 0, 28, 29, 0, 0, 60, 30, 31, - 0, 32, 33, 34, 35, 36, 37, 0, 38, 39, - 40, 41, 42, 43, 0, 0, 44, 0, 0, 45, - 46, 47, 48, 49, 50, 0, 0, 0, 51, 52, - 53, 0, 0, 0, 0, 0, -339, 0, 0, -339, - 0, 0, -339, 54, 0, -339, -339, -339, 0, 0, - -339, -339, 0, 0, 0, -339, -339, 0, 0, 0, - 0, 0, 0, 0, 55, 56, 0, 57, 0, 58, - 59, 0, 0, -339, -339, 0, 0, 290, -339, -339, - 0, -339, -339, -339, -339, -339, -339, 0, -339, -339, - -339, -339, -339, -339, 0, 0, -339, 0, 0, -339, - -339, -339, -339, -339, -339, 0, 0, 0, -339, -339, - -339, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, -339, 0, 0, 0, 199, 0, 0, - 0, 0, 0, 0, 0, 200, 201, 202, 0, 0, - 0, 0, 0, 0, -339, -339, 0, -339, 203, -339, - -339, 0, 0, 0, 204, 205, 206, -339, 207, 208, - 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, - 219, 220, 221, 222, 0, 0, 0, 0, 223, 199, - 0, 224, 225, 226, 227, 228, 0, 200, 201, 202, + 59, 0, 0, -370, -370, 0, 0, 315, -370, -370, + 0, -370, -370, -370, -370, 0, -370, -370, 0, -370, + -370, -370, -370, -370, -370, 0, 0, 0, -370, 0, + 0, -370, -370, -370, -370, -370, -370, 0, 0, 0, + -370, -370, -370, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -370, 0, 0, 0, 0, + 0, 0, 0, 223, 0, 0, 0, 0, 0, 0, + 0, 224, 225, 226, 0, 0, -370, -370, 0, -370, + 0, -370, -370, 0, 227, 0, 0, 0, 0, -370, + 228, 229, 230, 478, 231, 232, 233, 234, 235, 236, + 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, + 0, 0, 0, 0, 247, 223, 0, 248, 249, 250, + 251, 252, 0, 224, 225, 226, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 227, 0, 0, 0, + 0, 0, 228, 229, 230, 0, 231, 232, 233, 234, + 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, + 245, 246, 0, 0, 0, 0, 247, 223, 0, 248, + 249, 250, 251, 252, 0, 224, 225, 226, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, -372, 0, + 0, 0, 0, 0, 228, 229, 230, 0, 231, 232, + 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, + 243, 244, 245, 246, 0, 0, 0, 0, 247, 223, + 0, 248, 249, 250, 251, 252, 0, 224, 225, 226, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -341, 0, 0, 0, 0, 0, 204, 205, 206, 0, - 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, - 217, 218, 219, 220, 221, 222, 0, 0, 0, 0, - 223, 199, 0, 224, 225, 226, 227, 228, 0, 200, - 201, 202, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 204, 205, - 206, 0, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 218, 219, 220, 221, 222, 0, 0, - 0, 0, 223, 199, 0, 224, 225, 226, 227, 228, - 0, 200, 201, 202, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 228, 229, 230, 0, + 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, + 241, 242, 243, 244, 245, 246, 0, 0, 0, 0, + 247, 223, 0, 248, 249, 250, 251, 252, 0, 224, + 225, 226, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 206, 0, 207, 208, 209, 210, 211, 212, - 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, - 0, 0, 0, 0, 223, -341, 0, 224, 225, 226, - 227, 228, 0, 200, 201, 202, 0, 0, 0, 0, + 230, 0, 231, 232, 233, 234, 235, 236, 237, 238, + 239, 240, 241, 242, 243, 244, 245, 246, 0, 0, + 0, 0, 247, -372, 0, 248, 249, 250, 251, 252, + 0, 224, 225, 226, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 207, 208, 209, 210, - 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, - 221, 222, 200, 201, 202, 0, 223, 0, 0, 224, - 225, 226, 227, 228, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 200, 201, 202, 210, 211, - 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, - 222, 0, 0, 0, 0, 223, 0, 0, 224, 225, - 226, 227, 228, 212, 213, 214, 215, 216, 217, 218, - 219, 220, 221, 222, 200, 201, 202, 0, 223, 0, - 0, 224, 225, 226, 227, 228, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 200, 201, 202, 0, 0, - 0, 0, 0, 213, 214, 215, 216, 217, 218, 219, - 220, 221, 222, 0, 200, 201, 202, 223, 0, 0, - 224, 225, 226, 227, 228, 214, 215, 216, 217, 218, - 219, 220, 221, 222, 200, 201, 202, 0, 223, 0, - 0, 224, 225, 226, 227, 228, 216, 217, 218, 219, - 220, 221, 222, 200, 201, 202, 0, 223, 0, 0, - 224, 225, 226, 227, 228, 0, 0, 0, 218, 219, - 220, 221, 222, 200, 201, 202, 0, 223, 0, 0, - 224, 225, 226, 227, 228, 0, 0, -341, 219, 220, - 221, 222, 200, 201, 202, 0, 223, 0, 0, 224, - 225, 226, 227, 228, 0, 0, 0, 0, 219, 220, - 221, 222, 0, 0, 0, 0, 223, 0, 0, 224, - 225, 226, 227, 228, 0, 0, 0, 0, 220, 221, - 222, 0, 0, 0, 0, 223, 0, 0, 224, 225, - 226, 227, 228 + 0, 0, 0, 0, 231, 232, 233, 234, 235, 236, + 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, + 224, 225, 226, 0, 247, 0, 0, 248, 249, 250, + 251, 252, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 224, 225, 226, 234, 235, 236, 237, + 238, 239, 240, 241, 242, 243, 244, 245, 246, 0, + 0, 0, 0, 247, 0, 0, 248, 249, 250, 251, + 252, 236, 237, 238, 239, 240, 241, 242, 243, 244, + 245, 246, 224, 225, 226, 0, 247, 0, 0, 248, + 249, 250, 251, 252, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 224, 225, 226, 0, 0, 0, 0, + 0, 237, 238, 239, 240, 241, 242, 243, 244, 245, + 246, 224, 225, 226, 0, 247, 0, 0, 248, 249, + 250, 251, 252, 238, 239, 240, 241, 242, 243, 244, + 245, 246, 0, 0, 0, 0, 247, 0, 0, 248, + 249, 250, 251, 252, 0, 0, 0, 244, 245, 246, + 0, 0, 0, 0, 247, 0, 0, 248, 249, 250, + 251, 252 }; static const yytype_int16 yycheck[] = { - 10, 17, 19, 49, 27, 27, 403, 11, 54, 19, - 150, 306, 582, 151, 18, 11, 20, 13, 22, 10, - 24, 25, 110, 103, 12, 29, 556, 105, 19, 88, - 34, 35, 16, 111, 13, 52, 20, 13, 176, 49, - 24, 16, 52, 11, 48, 49, 50, 51, 22, 16, - 93, 94, 95, 96, 11, 30, 13, 11, 18, 13, - 20, 52, 22, 11, 24, 25, 0, 27, 16, 60, - 93, 93, 131, 11, 34, 35, 13, 25, 393, 18, - 11, 22, 13, 22, 22, 24, 25, 130, 403, 49, - 15, 51, 131, 408, 409, 34, 35, 101, 23, 669, - 131, 9, 112, 14, 31, 151, 85, 14, 56, 85, - 49, 14, 51, 61, 124, 42, 139, 139, 59, 93, - 94, 95, 96, 11, 170, 171, 656, 11, 85, 117, - 176, 85, 16, 93, 22, 131, 96, 121, 148, 149, - 150, 151, 131, 56, 161, 162, 121, 131, 61, 140, - 15, 161, 162, 157, 85, 111, 131, 16, 162, 111, - 112, 20, 302, 154, 131, 24, 176, 109, 110, 160, - 161, 162, 56, 261, 25, 11, 264, 61, 86, 139, - 109, 496, 93, 94, 95, 96, 93, 94, 95, 96, - 93, 94, 95, 96, 185, 186, 187, 188, 131, 190, - 191, 192, 162, 10, 11, 56, 13, 16, 11, 16, - 61, 20, 56, 20, 14, 24, 56, 24, 25, 131, - 11, 237, 13, 162, 22, 248, 248, 14, 238, 270, - 271, 241, 273, 274, 549, 550, 128, 129, 229, 230, - 231, 232, 233, 234, 235, 236, 95, 96, 388, 14, - 57, 32, 131, 131, 35, 36, 37, 38, 33, 34, - 41, 265, 131, 309, 93, 94, 95, 96, 228, 666, - 131, 566, 14, 131, 589, 82, 14, 11, 269, 270, - 271, 272, 273, 274, 362, 11, 39, 13, 248, 22, - 22, 308, 302, 93, 94, 95, 96, 14, 308, 290, - 615, 130, 85, 22, 442, 59, 93, 94, 95, 96, - 131, 85, 93, 94, 95, 96, 22, 308, 88, 11, - 635, 13, 130, 22, 131, 130, 22, 318, 93, 94, - 95, 96, 323, 587, 11, 22, 13, 245, 246, 247, - 13, 249, 250, 56, 252, 253, 254, 255, 22, 130, - 85, 93, 94, 95, 96, 93, 94, 95, 96, 56, - 121, 365, 125, 126, 127, 128, 129, 621, 622, 623, - 510, 56, 363, 364, 93, 94, 95, 96, 388, 131, - 371, 404, 404, 637, 638, 44, 15, 93, 94, 95, - 96, 79, 80, 403, 410, 59, 442, 93, 94, 95, - 96, 392, 393, 657, 79, 365, 93, 94, 95, 96, - 61, 665, 403, 79, 59, 406, 407, 408, 409, 93, - 94, 95, 96, 130, 564, 563, 436, 89, 116, 117, - 440, 11, 442, 13, 122, 395, 12, 125, 126, 127, - 128, 129, 117, 13, 404, 131, 25, 122, 465, 18, - 125, 126, 127, 128, 129, 465, 122, 25, 449, 125, - 126, 127, 128, 129, 544, 545, 10, 93, 94, 95, - 96, 551, 16, 25, 465, 25, 20, 557, 558, 32, - 24, 59, 35, 36, 37, 38, 30, 98, 41, 93, - 94, 95, 96, 503, 131, 505, 56, 405, 22, 98, - 510, 98, 130, 411, 130, 496, 414, 131, 12, 131, - 590, 591, 592, 530, 12, 12, 596, 563, 12, 12, - 530, 130, 130, 22, 131, 485, 434, 16, 130, 609, - 521, 93, 94, 95, 96, 130, 616, 617, 130, 530, - 93, 94, 95, 96, 93, 94, 95, 96, 130, 565, - 131, 56, 11, 563, 564, 130, 11, 89, 549, 550, - 640, 12, 578, 93, 94, 95, 96, 475, 130, 477, - 22, 581, 582, 653, 130, 15, 130, 587, 22, 130, - 488, 130, 45, 131, 664, 130, 87, 130, 604, 131, - 130, 130, 608, 22, 674, 131, 606, 588, 589, 22, - 130, 93, 94, 95, 96, 93, 94, 95, 96, 130, - 130, 621, 622, 623, 3, 4, 5, 6, 7, 8, - 9, 130, 17, 583, 615, 86, 13, 637, 638, 588, - 130, 117, 666, 541, 130, 595, 292, 406, 130, 649, - 283, 645, 130, 505, 635, 661, 21, 657, 23, 428, - 516, 26, 598, 28, 29, 665, 666, 434, 139, 669, - 404, 248, -1, -1, -1, -1, 41, -1, -1, 44, - -1, -1, -1, 48, -1, 0, 1, -1, -1, -1, - 55, 56, 57, 58, 59, 10, 11, -1, 13, -1, - 598, 16, -1, -1, 19, 20, 21, 22, -1, 24, - 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, - 35, 36, 37, 38, -1, 40, 41, 42, 43, -1, - -1, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, -1, 62, 63, 64, - 65, 66, 67, 68, 69, 70, -1, 72, 73, 74, - 75, 76, 77, 78, -1, -1, -1, 82, 83, 84, - -1, -1, -1, -1, 139, 90, -1, -1, -1, -1, - -1, -1, 97, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 118, 119, -1, 121, -1, 123, 124, - -1, -1, -1, -1, -1, -1, 131, -1, -1, -1, - -1, -1, -1, -1, 189, -1, -1, -1, -1, -1, - 195, -1, -1, 198, 199, 200, 201, 202, 203, 204, - 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 218, 219, 220, 221, 222, 223, 0, - 1, -1, 227, -1, -1, -1, -1, -1, -1, 10, - 11, -1, 13, -1, -1, 16, -1, -1, 19, 20, + 10, 17, 174, 331, 27, 19, 27, 11, 175, 19, + 105, 428, 418, 110, 18, 165, 20, 11, 22, 12, + 24, 25, 428, 581, 16, 29, 10, 433, 434, 429, + 34, 35, 11, 200, 13, 19, 16, 607, 52, 49, + 135, 13, 52, 16, 48, 49, 50, 51, 22, 16, + 18, 14, 11, 49, 22, 0, 24, 25, 54, 133, + 11, 15, 13, 30, 13, 90, 34, 35, 52, 23, + 93, 18, 93, 20, 22, 22, 60, 24, 25, 13, + 27, 49, 11, 51, 22, 11, 16, 34, 35, 133, + 20, 16, 31, 22, 24, 20, 22, 101, 11, 24, + 13, 16, 49, 42, 51, 20, 133, 9, 133, 24, + 56, 11, 60, 13, 520, 87, 62, 95, 96, 97, + 98, 95, 96, 97, 98, 11, 136, 13, 686, 699, + 113, 114, 95, 96, 97, 98, 87, 15, 148, 133, + 163, 133, 163, 123, 113, 11, 93, 13, 141, 96, + 123, 111, 14, 87, 133, 327, 123, 95, 96, 97, + 98, 11, 172, 173, 174, 175, 133, 317, 574, 575, + 570, 185, 186, 11, 87, 185, 186, 181, 103, 175, + 164, 133, 186, 14, 86, 56, 103, 87, 285, 56, + 200, 288, 11, 123, 178, 111, 112, 16, 194, 195, + 184, 185, 186, 133, 200, 14, 25, 10, 11, 615, + 13, 294, 295, 16, 297, 298, 163, 20, 186, 25, + 14, 24, 25, 97, 98, 209, 210, 211, 212, 133, + 214, 215, 216, 95, 96, 97, 98, 56, 644, 186, + 130, 131, 642, 62, 11, 261, 13, 33, 34, 272, + 56, 272, 262, 14, 57, 265, 62, 133, 664, 14, + 11, 133, 13, 591, 95, 96, 97, 98, 133, 253, + 254, 255, 256, 257, 258, 259, 260, 133, 11, 696, + 13, 84, 133, 11, 22, 289, 95, 96, 97, 98, + 32, 39, 387, 35, 36, 37, 38, 14, 22, 41, + 467, 95, 96, 97, 98, 252, 22, 14, 87, 293, + 294, 295, 296, 297, 298, 11, 87, 327, 22, 333, + 16, 71, 22, 333, 90, 272, 133, 132, 132, 22, + 133, 315, 13, 56, 95, 96, 97, 98, 334, 123, + 95, 96, 97, 98, 56, 56, 613, 44, 133, 333, + 22, 16, 62, 95, 96, 97, 98, 15, 59, 343, + 56, 59, 534, 22, 348, 91, 62, 269, 270, 271, + 132, 273, 274, 12, 276, 277, 278, 279, 95, 96, + 97, 98, 13, 650, 651, 652, 390, 25, 25, 25, + 132, 95, 96, 97, 98, 95, 96, 97, 98, 25, + 667, 668, 133, 413, 388, 389, 429, 18, 429, 100, + 56, 133, 396, 22, 100, 81, 82, 589, 428, 435, + 687, 588, 11, 95, 96, 97, 98, 133, 695, 132, + 12, 133, 12, 417, 418, 12, 95, 96, 97, 98, + 12, 12, 132, 390, 428, 132, 22, 431, 432, 433, + 434, 461, 118, 119, 133, 465, 132, 467, 124, 132, + 56, 127, 128, 129, 130, 131, 81, 82, 83, 132, + 132, 467, 132, 420, 11, 10, 490, 133, 100, 11, + 490, 16, 429, 81, 91, 20, 12, 132, 32, 24, + 474, 35, 36, 37, 38, 30, 15, 41, 113, 114, + 115, 116, 117, 118, 119, 22, 490, 132, 132, 124, + 133, 22, 127, 128, 129, 130, 131, 527, 132, 529, + 132, 119, 89, 133, 534, 16, 124, 132, 430, 127, + 128, 129, 130, 131, 436, 132, 520, 439, 133, 22, + 554, 22, 132, 17, 554, 45, 132, 570, 132, 570, + 88, 95, 96, 97, 98, 13, 141, 459, 81, 132, + 614, 545, 509, 132, 696, 95, 96, 97, 98, 413, + 554, 431, 529, 452, 590, 540, 453, 624, 588, 589, + 95, 96, 97, 98, 459, 163, -1, 603, 272, -1, + 574, 575, 588, -1, -1, -1, 606, 607, 500, -1, + 502, 124, 132, 613, 127, 128, 129, 130, 131, -1, + 512, 95, 96, 97, 98, -1, 632, 132, -1, 642, + 636, 642, -1, 570, 634, 127, 128, 129, 130, 131, + 614, 615, -1, 95, 96, 97, 98, -1, -1, -1, + 650, 651, 652, -1, 95, 96, 97, 98, 132, -1, + -1, 568, 569, 95, 96, 97, 98, 667, 668, 576, + 644, -1, 609, 565, -1, 582, 583, -1, -1, 679, + 132, 675, -1, -1, 621, 691, -1, 687, -1, -1, + 664, 132, -1, -1, -1, 695, 696, -1, -1, 699, + 132, -1, -1, -1, -1, 642, -1, -1, -1, 616, + 617, 618, -1, -1, 21, 622, 23, -1, -1, 26, + -1, 28, 29, -1, 95, 96, 97, 98, -1, -1, + 637, -1, 624, -1, 41, -1, -1, 44, 645, 646, + -1, 48, -1, -1, -1, -1, -1, -1, 55, 56, + 57, 58, 59, -1, -1, 81, 82, 83, -1, -1, + 1, 132, -1, 670, -1, -1, -1, -1, -1, 10, + -1, -1, 13, -1, -1, 16, 683, -1, 19, 20, + 21, 22, -1, 24, 25, -1, -1, 694, 29, 30, + 116, 117, 118, 119, -1, -1, -1, 704, 124, -1, + -1, 127, 128, 129, 130, 131, 47, 48, -1, -1, + -1, 52, 53, -1, 55, 56, 57, 58, -1, 60, + 61, -1, 63, 64, 65, 66, 67, 68, 81, 82, + 83, 72, -1, -1, 75, 76, 77, 78, 79, 80, + -1, -1, -1, 84, 85, 86, 95, 96, 97, 98, + -1, -1, 81, 82, 83, -1, 163, -1, 99, -1, + -1, -1, 115, 116, 117, 118, 119, -1, -1, -1, + -1, 124, -1, -1, 127, 128, 129, 130, 131, 120, + 121, -1, 123, 132, 125, 126, 115, 116, 117, 118, + 119, -1, 133, -1, -1, 124, -1, -1, 127, 128, + 129, 130, 131, -1, -1, -1, 213, -1, -1, -1, + -1, -1, 219, -1, -1, 222, 223, 224, 225, 226, + 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, + 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, + 247, 0, 1, -1, 251, -1, -1, -1, -1, -1, + -1, 10, 11, -1, 13, -1, -1, 16, -1, -1, + 19, 20, 21, 22, -1, 24, 25, 26, 27, 28, + 29, 30, 31, 32, -1, -1, 35, 36, 37, 38, + -1, 40, 41, 42, 43, -1, -1, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, + -1, 60, 61, -1, 63, 64, 65, 66, 67, 68, + 69, 70, -1, 72, -1, 74, 75, 76, 77, 78, + 79, 80, -1, -1, -1, 84, 85, 86, -1, -1, + -1, -1, -1, 92, -1, -1, -1, -1, -1, -1, + 99, 3, 4, 5, 6, 7, 8, 9, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, + 1, 120, 121, -1, 123, -1, 125, 126, -1, 10, + 11, -1, 13, -1, 133, 16, -1, -1, 19, 20, 21, 22, -1, 24, 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, 35, 36, 37, 38, -1, 40, 41, 42, 43, -1, -1, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, - -1, 62, 63, 64, 65, 66, 67, 68, 69, 70, - -1, 72, 73, 74, 75, 76, 77, 78, -1, -1, - -1, 82, 83, 84, -1, -1, -1, -1, -1, 90, - -1, -1, -1, -1, -1, -1, 97, -1, -1, -1, + 51, 52, 53, 54, 55, 56, 57, 58, -1, 60, + 61, -1, 63, 64, 65, 66, 67, 68, 69, 70, + -1, 72, -1, 74, 75, 76, 77, 78, 79, 80, + -1, -1, -1, 84, 85, 86, -1, -1, -1, -1, + -1, 92, -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 1, 118, 119, -1, - 121, -1, 123, 124, -1, 10, 11, 12, 13, -1, - 131, 16, -1, -1, 19, 20, 21, 22, -1, 24, - 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, - 35, 36, 37, 38, -1, 40, 41, 42, 43, -1, - -1, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, -1, 62, 63, 64, - 65, 66, 67, 68, 69, 70, -1, 72, 73, 74, - 75, 76, 77, 78, -1, -1, -1, 82, 83, 84, - -1, -1, -1, -1, -1, 90, -1, -1, -1, -1, - -1, -1, 97, -1, -1, -1, -1, -1, -1, -1, - -1, 71, -1, -1, -1, -1, -1, -1, 453, 79, - 80, 81, -1, 118, 119, -1, 121, -1, 123, 124, - -1, -1, 92, -1, -1, -1, 131, -1, 98, 99, - 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, -1, -1, - -1, -1, 122, -1, -1, 125, 126, 127, 128, 129, - 1, -1, -1, -1, -1, -1, 511, 512, -1, 10, + -1, 478, -1, -1, -1, -1, -1, -1, -1, 120, + 121, -1, 123, -1, 125, 126, -1, -1, -1, -1, + 1, -1, 133, -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, -1, -1, 16, -1, -1, 19, 20, 21, 22, -1, 24, 25, 26, 27, 28, 29, 30, - 31, 32, -1, -1, 35, 36, 37, 38, 543, 40, + 31, 32, -1, -1, 35, 36, 37, 38, 535, 40, 41, 42, 43, -1, -1, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, - -1, 62, 63, 64, 65, 66, 67, 68, 69, 70, - -1, 72, 73, 74, 75, 76, 77, 78, -1, -1, - -1, 82, 83, 84, -1, -1, -1, -1, -1, 90, - -1, -1, -1, -1, -1, -1, 97, -1, -1, -1, + 51, 52, 53, 54, 55, 56, 57, 58, -1, 60, + 61, -1, 63, 64, 65, 66, 67, 68, 69, 70, + 567, 72, -1, 74, 75, 76, 77, 78, 79, 80, + -1, -1, -1, 84, 85, 86, -1, -1, -1, -1, + -1, 92, -1, -1, -1, -1, 593, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 1, 118, 119, -1, - 121, -1, 123, 124, -1, 10, 11, 12, 13, -1, - 131, 16, -1, -1, 19, 20, 21, 22, -1, 24, - 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, - 35, 36, 37, 38, -1, 40, 41, 42, 43, -1, - -1, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, -1, 62, 63, 64, - 65, 66, 67, 68, 69, 70, -1, 72, 73, 74, - 75, 76, 77, 78, -1, -1, -1, 82, 83, 84, - -1, -1, -1, -1, -1, 90, -1, -1, -1, -1, - -1, -1, 97, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 1, 118, 119, -1, 121, -1, 123, 124, - -1, 10, 11, 12, 13, -1, 131, 16, -1, -1, - 19, 20, 21, 22, -1, 24, 25, 26, 27, 28, - 29, 30, 31, 32, -1, -1, 35, 36, 37, 38, - -1, 40, 41, 42, 43, -1, -1, 46, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, -1, 62, 63, 64, 65, 66, 67, 68, - 69, 70, -1, 72, 73, 74, 75, 76, 77, 78, - -1, -1, -1, 82, 83, 84, -1, -1, -1, -1, - -1, 90, -1, -1, -1, -1, -1, -1, 97, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 1, 118, - 119, -1, 121, -1, 123, 124, -1, 10, 11, 12, - 13, -1, 131, 16, -1, -1, 19, 20, 21, 22, + -1, -1, -1, -1, -1, -1, -1, -1, 1, 120, + 121, -1, 123, -1, 125, 126, -1, 10, 11, 12, + 13, -1, 133, 16, -1, -1, 19, 20, 21, 22, -1, 24, 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, 35, 36, 37, 38, -1, 40, 41, 42, 43, -1, -1, 46, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 59, 60, -1, 62, + 53, 54, 55, 56, 57, 58, -1, 60, 61, -1, 63, 64, 65, 66, 67, 68, 69, 70, -1, 72, - 73, 74, 75, 76, 77, 78, -1, -1, -1, 82, - 83, 84, -1, -1, -1, -1, -1, 90, -1, -1, - -1, -1, -1, -1, 97, -1, -1, -1, -1, -1, + -1, 74, 75, 76, 77, 78, 79, 80, -1, -1, + -1, 84, 85, 86, -1, -1, -1, -1, -1, 92, + -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 1, 118, 119, -1, 121, -1, - 123, 124, -1, 10, 11, 12, 13, -1, 131, 16, + -1, -1, -1, -1, -1, -1, 1, 120, 121, -1, + 123, -1, 125, 126, -1, 10, 11, 12, 13, -1, + 133, 16, -1, -1, 19, 20, 21, 22, -1, 24, + 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, + 35, 36, 37, 38, -1, 40, 41, 42, 43, -1, + -1, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, -1, 60, 61, -1, 63, 64, + 65, 66, 67, 68, 69, 70, -1, 72, -1, 74, + 75, 76, 77, 78, 79, 80, -1, -1, -1, 84, + 85, 86, -1, -1, -1, -1, -1, 92, -1, -1, + -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 1, 120, 121, -1, 123, -1, + 125, 126, -1, 10, 11, 12, 13, -1, 133, 16, -1, -1, 19, 20, 21, 22, -1, 24, 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, 35, 36, 37, 38, -1, 40, 41, 42, 43, -1, -1, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, -1, 62, 63, 64, 65, 66, - 67, 68, 69, 70, -1, 72, 73, 74, 75, 76, - 77, 78, -1, -1, -1, 82, 83, 84, -1, -1, - -1, -1, -1, 90, -1, -1, -1, -1, -1, -1, - 97, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 57, 58, -1, 60, 61, -1, 63, 64, 65, 66, + 67, 68, 69, 70, -1, 72, -1, 74, 75, 76, + 77, 78, 79, 80, -1, -1, -1, 84, 85, 86, + -1, -1, -1, -1, -1, 92, -1, -1, -1, -1, + -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 1, 118, 119, -1, 121, -1, 123, 124, -1, 10, - 11, -1, 13, -1, 131, 16, -1, -1, 19, 20, + -1, -1, 1, 120, 121, -1, 123, -1, 125, 126, + -1, 10, 11, 12, 13, -1, 133, 16, -1, -1, + 19, 20, 21, 22, -1, 24, 25, 26, 27, 28, + 29, 30, 31, 32, -1, -1, 35, 36, 37, 38, + -1, 40, 41, 42, 43, -1, -1, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, + -1, 60, 61, -1, 63, 64, 65, 66, 67, 68, + 69, 70, -1, 72, -1, 74, 75, 76, 77, 78, + 79, 80, -1, -1, -1, 84, 85, 86, -1, -1, + -1, -1, -1, 92, -1, -1, -1, -1, -1, -1, + 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 1, 120, 121, -1, 123, -1, 125, 126, -1, 10, + 11, 12, 13, -1, 133, 16, -1, -1, 19, 20, 21, 22, -1, 24, 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, 35, 36, 37, 38, -1, 40, 41, 42, 43, -1, -1, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, - -1, 62, 63, 64, 65, 66, 67, 68, 69, 70, - -1, 72, 73, 74, 75, 76, 77, 78, -1, -1, - -1, 82, 83, 84, -1, -1, 87, -1, -1, 90, - -1, -1, -1, -1, -1, -1, 97, -1, -1, -1, + 51, 52, 53, 54, 55, 56, 57, 58, -1, 60, + 61, -1, 63, 64, 65, 66, 67, 68, 69, 70, + -1, 72, -1, 74, 75, 76, 77, 78, 79, 80, + -1, -1, -1, 84, 85, 86, -1, -1, -1, -1, + -1, 92, -1, -1, -1, -1, -1, -1, 99, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 1, 120, + 121, -1, 123, -1, 125, 126, -1, 10, 11, -1, + 13, -1, 133, 16, -1, -1, 19, 20, 21, 22, + -1, 24, 25, 26, 27, 28, 29, 30, 31, 32, + -1, -1, 35, 36, 37, 38, -1, 40, 41, 42, + 43, -1, -1, 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, -1, 60, 61, -1, + 63, 64, 65, 66, 67, 68, 69, 70, -1, 72, + -1, 74, 75, 76, 77, 78, 79, 80, -1, -1, + -1, 84, 85, 86, -1, -1, 89, -1, -1, 92, + -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 1, 118, 119, -1, - 121, -1, 123, 124, -1, 10, 11, -1, 13, -1, - 131, 16, -1, -1, 19, 20, 21, 22, -1, 24, + -1, -1, -1, -1, -1, -1, 1, 120, 121, -1, + 123, -1, 125, 126, -1, 10, 11, -1, 13, -1, + 133, 16, -1, -1, 19, 20, 21, 22, -1, 24, 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, 35, 36, 37, 38, -1, 40, 41, 42, 43, -1, -1, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, -1, 62, 63, 64, - 65, 66, 67, 68, 69, 70, -1, 72, 73, 74, - 75, 76, 77, 78, -1, -1, -1, 82, 83, 84, - -1, -1, -1, -1, -1, 90, -1, -1, -1, -1, - -1, -1, 97, -1, -1, -1, -1, -1, -1, -1, + 55, 56, 57, 58, -1, 60, 61, -1, 63, 64, + 65, 66, 67, 68, 69, 70, -1, 72, -1, 74, + 75, 76, 77, 78, 79, 80, -1, -1, -1, 84, + 85, 86, -1, -1, -1, -1, -1, 92, -1, -1, + -1, -1, -1, -1, 99, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 1, 118, 119, -1, 121, -1, 123, 124, - -1, 10, 11, -1, 13, -1, 131, 16, -1, -1, - 19, 20, 21, 22, -1, 24, 25, 26, 27, 28, - 29, 30, 31, 32, -1, -1, 35, 36, 37, 38, - -1, 40, 41, 42, 43, -1, -1, 46, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, -1, 62, 63, 64, 65, 66, 67, 68, - -1, 70, -1, 72, 73, 74, 75, 76, 77, 78, - -1, -1, -1, 82, 83, 84, -1, 1, -1, -1, - -1, 90, -1, -1, -1, -1, 10, -1, 97, 13, - -1, -1, 16, -1, -1, 19, 20, 21, 22, -1, - 24, 25, -1, -1, -1, 29, 30, -1, -1, 118, - 119, -1, 121, -1, 123, 124, -1, -1, -1, -1, - -1, -1, 131, 47, 48, -1, -1, -1, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, 1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, -1, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, - 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, -1, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, 11, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, - 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, 130, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, 11, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, - 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, -1, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, -1, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, - 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, -1, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, -1, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, - 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, 130, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, -1, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, - 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, 130, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, 11, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, - 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, 130, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, -1, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, - 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, -1, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, -1, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, - 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, 130, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, -1, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, - 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, 130, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, -1, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, - 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, 130, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, -1, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, + -1, -1, -1, -1, 1, 120, 121, -1, 123, -1, + 125, 126, -1, 10, 11, -1, 13, -1, 133, 16, + -1, -1, 19, 20, 21, 22, -1, 24, 25, 26, + 27, 28, 29, 30, 31, 32, -1, -1, 35, 36, + 37, 38, -1, 40, 41, 42, 43, -1, -1, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, -1, 60, 61, -1, 63, 64, 65, 66, + 67, 68, 69, -1, -1, 72, -1, 74, 75, 76, + 77, 78, 79, 80, -1, -1, -1, 84, 85, 86, + -1, 1, -1, -1, -1, 92, -1, -1, -1, -1, + 10, -1, 99, 13, -1, -1, 16, -1, -1, 19, + 20, 21, -1, -1, 24, 25, -1, -1, -1, 29, + 30, -1, -1, 120, 121, -1, 123, -1, 125, 126, + -1, -1, -1, -1, -1, -1, 133, 47, 48, -1, + -1, -1, 52, 53, -1, 55, 56, 57, 58, -1, + 60, 61, -1, 63, 64, 65, 66, 67, 68, -1, + -1, -1, 72, -1, -1, 75, 76, 77, 78, 79, + 80, -1, -1, -1, 84, 85, 86, -1, -1, -1, + -1, -1, 10, 11, -1, 13, -1, -1, 16, 99, + -1, 19, 20, 21, -1, -1, 24, 25, -1, -1, + -1, 29, 30, -1, -1, -1, -1, -1, -1, -1, + 120, 121, -1, 123, -1, 125, 126, -1, -1, 47, + 48, -1, 132, 133, 52, 53, -1, 55, 56, 57, + 58, -1, 60, 61, 62, 63, 64, 65, 66, 67, + 68, -1, -1, -1, 72, -1, -1, 75, 76, 77, + 78, 79, 80, -1, -1, -1, 84, 85, 86, -1, + -1, -1, -1, -1, 10, 11, -1, 13, -1, -1, + 16, 99, -1, 19, 20, 21, -1, -1, 24, 25, + -1, -1, -1, 29, 30, -1, -1, -1, -1, -1, + -1, -1, 120, 121, -1, 123, -1, 125, 126, -1, + -1, 47, 48, -1, -1, 133, 52, 53, -1, 55, + 56, 57, 58, -1, 60, 61, -1, 63, 64, 65, + 66, 67, 68, -1, -1, -1, 72, -1, -1, 75, + 76, 77, 78, 79, 80, -1, -1, -1, 84, 85, + 86, -1, -1, -1, -1, -1, 10, -1, -1, 13, + -1, -1, 16, 99, -1, 19, 20, 21, -1, -1, 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, 130, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, -1, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, + -1, -1, -1, -1, 120, 121, -1, 123, -1, 125, + 126, -1, -1, 47, 48, -1, -1, 133, 52, 53, + -1, 55, 56, 57, 58, -1, 60, 61, -1, 63, + 64, 65, 66, 67, 68, -1, -1, -1, 72, -1, + -1, 75, 76, 77, 78, 79, 80, -1, -1, -1, + 84, 85, 86, -1, -1, -1, -1, -1, 10, -1, + -1, 13, -1, -1, 16, 99, -1, 19, 20, 21, + -1, -1, 24, 25, -1, -1, -1, 29, 30, -1, + -1, -1, -1, -1, -1, -1, 120, 121, -1, 123, + -1, 125, 126, -1, -1, 47, 48, -1, 132, 133, + 52, 53, -1, 55, 56, 57, 58, -1, 60, 61, + -1, 63, 64, 65, 66, 67, 68, -1, -1, -1, + 72, -1, -1, 75, 76, 77, 78, 79, 80, -1, + -1, -1, 84, 85, 86, -1, -1, -1, -1, -1, + 10, -1, -1, 13, -1, -1, 16, 99, -1, 19, + 20, 21, -1, -1, 24, 25, -1, -1, -1, 29, + 30, -1, -1, -1, -1, -1, -1, -1, 120, 121, + -1, 123, -1, 125, 126, -1, -1, 47, 48, -1, + 132, 133, 52, 53, -1, 55, 56, 57, 58, -1, + 60, 61, -1, 63, 64, 65, 66, 67, 68, -1, + -1, -1, 72, -1, -1, 75, 76, 77, 78, 79, + 80, -1, -1, -1, 84, 85, 86, -1, -1, -1, + -1, -1, 10, 11, -1, 13, -1, -1, 16, 99, + -1, 19, 20, 21, -1, -1, 24, 25, -1, -1, + -1, 29, 30, -1, -1, -1, -1, -1, -1, -1, + 120, 121, -1, 123, -1, 125, 126, -1, -1, 47, + 48, -1, 132, 133, 52, 53, -1, 55, 56, 57, + 58, -1, 60, 61, -1, 63, 64, 65, 66, 67, + 68, -1, -1, -1, 72, -1, -1, 75, 76, 77, + 78, 79, 80, -1, -1, -1, 84, 85, 86, -1, + -1, -1, -1, -1, 10, -1, -1, 13, -1, -1, + 16, 99, -1, 19, 20, 21, -1, -1, 24, 25, + -1, -1, -1, 29, 30, -1, -1, -1, -1, -1, + -1, -1, 120, 121, -1, 123, -1, 125, 126, -1, + -1, 47, 48, -1, -1, 133, 52, 53, -1, 55, + 56, 57, 58, -1, 60, 61, -1, 63, 64, 65, + 66, 67, 68, -1, -1, -1, 72, -1, -1, 75, + 76, 77, 78, 79, 80, -1, -1, -1, 84, 85, + 86, -1, -1, -1, -1, -1, 10, -1, -1, 13, + -1, -1, 16, 99, -1, 19, 20, 21, -1, -1, 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, -1, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, 10, -1, -1, 13, - -1, -1, 16, 97, -1, 19, 20, 21, -1, -1, + -1, -1, -1, -1, 120, 121, -1, 123, -1, 125, + 126, -1, -1, 47, 48, -1, 132, 133, 52, 53, + -1, 55, 56, 57, 58, -1, 60, 61, -1, 63, + 64, 65, 66, 67, 68, -1, -1, -1, 72, -1, + -1, 75, 76, 77, 78, 79, 80, -1, -1, -1, + 84, 85, 86, -1, -1, -1, -1, -1, 10, -1, + -1, 13, -1, -1, 16, 99, -1, 19, 20, 21, + -1, -1, 24, 25, -1, -1, -1, 29, 30, -1, + -1, -1, -1, -1, -1, -1, 120, 121, -1, 123, + -1, 125, 126, -1, -1, 47, 48, -1, 132, 133, + 52, 53, -1, 55, 56, 57, 58, -1, 60, 61, + -1, 63, 64, 65, 66, 67, 68, -1, -1, -1, + 72, -1, -1, 75, 76, 77, 78, 79, 80, -1, + -1, -1, 84, 85, 86, -1, -1, -1, -1, -1, + 10, -1, -1, 13, -1, -1, 16, 99, -1, 19, + 20, 21, -1, -1, 24, 25, -1, -1, -1, 29, + 30, -1, -1, -1, -1, -1, -1, -1, 120, 121, + -1, 123, -1, 125, 126, -1, -1, 47, 48, -1, + 132, 133, 52, 53, -1, 55, 56, 57, 58, -1, + 60, 61, -1, 63, 64, 65, 66, 67, 68, -1, + -1, -1, 72, -1, -1, 75, 76, 77, 78, 79, + 80, -1, -1, -1, 84, 85, 86, -1, -1, -1, + -1, -1, 10, -1, -1, 13, -1, -1, 16, 99, + -1, 19, 20, 21, -1, -1, 24, 25, -1, -1, + -1, 29, 30, -1, -1, -1, -1, -1, -1, -1, + 120, 121, -1, 123, -1, 125, 126, -1, -1, 47, + 48, -1, 132, 133, 52, 53, -1, 55, 56, 57, + 58, -1, 60, 61, -1, 63, 64, 65, 66, 67, + 68, -1, -1, -1, 72, -1, -1, 75, 76, 77, + 78, 79, 80, -1, -1, -1, 84, 85, 86, -1, + -1, -1, -1, -1, 10, -1, -1, 13, -1, -1, + 16, 99, -1, 19, 20, 21, -1, -1, 24, 25, + -1, -1, -1, 29, 30, -1, -1, -1, -1, -1, + -1, -1, 120, 121, -1, 123, -1, 125, 126, -1, + -1, 47, 48, -1, -1, 133, 52, 53, -1, 55, + 56, 57, 58, -1, 60, 61, -1, 63, 64, 65, + 66, 67, 68, -1, -1, -1, 72, -1, -1, 75, + 76, 77, 78, 79, 80, -1, -1, -1, 84, 85, + 86, -1, -1, -1, -1, -1, 10, -1, -1, 13, + -1, -1, 16, 99, -1, 19, 20, 21, -1, -1, 24, 25, -1, -1, -1, 29, 30, -1, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, -1, 123, - 124, -1, -1, 47, 48, -1, -1, 131, 52, 53, - -1, 55, 56, 57, 58, 59, 60, -1, 62, 63, - 64, 65, 66, 67, -1, -1, 70, -1, -1, 73, - 74, 75, 76, 77, 78, -1, -1, -1, 82, 83, - 84, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 97, -1, -1, -1, 71, -1, -1, - -1, -1, -1, -1, -1, 79, 80, 81, -1, -1, - -1, -1, -1, -1, 118, 119, -1, 121, 92, 123, - 124, -1, -1, -1, 98, 99, 100, 131, 102, 103, - 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, - 114, 115, 116, 117, -1, -1, -1, -1, 122, 71, - -1, 125, 126, 127, 128, 129, -1, 79, 80, 81, + -1, -1, -1, -1, 120, 121, -1, 123, -1, 125, + 126, -1, -1, 47, 48, -1, -1, 133, 52, 53, + -1, 55, 56, 57, 58, -1, 60, 61, -1, 63, + 64, 65, 66, 67, 68, -1, -1, -1, 72, -1, + -1, 75, 76, 77, 78, 79, 80, -1, -1, -1, + 84, 85, 86, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 99, -1, -1, -1, -1, + -1, -1, -1, 73, -1, -1, -1, -1, -1, -1, + -1, 81, 82, 83, -1, -1, 120, 121, -1, 123, + -1, 125, 126, -1, 94, -1, -1, -1, -1, 133, + 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + -1, -1, -1, -1, 124, 73, -1, 127, 128, 129, + 130, 131, -1, 81, 82, 83, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 94, -1, -1, -1, + -1, -1, 100, 101, 102, -1, 104, 105, 106, 107, + 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, + 118, 119, -1, -1, -1, -1, 124, 73, -1, 127, + 128, 129, 130, 131, -1, 81, 82, 83, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 94, -1, + -1, -1, -1, -1, 100, 101, 102, -1, 104, 105, + 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, -1, -1, -1, -1, 124, 73, + -1, 127, 128, 129, 130, 131, -1, 81, 82, 83, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 92, -1, -1, -1, -1, -1, 98, 99, 100, -1, - 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, 114, 115, 116, 117, -1, -1, -1, -1, - 122, 71, -1, 125, 126, 127, 128, 129, -1, 79, - 80, 81, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 98, 99, - 100, -1, 102, 103, 104, 105, 106, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, -1, -1, - -1, -1, 122, 71, -1, 125, 126, 127, 128, 129, - -1, 79, 80, 81, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 100, 101, 102, -1, + 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, -1, -1, -1, -1, + 124, 73, -1, 127, 128, 129, 130, 131, -1, 81, + 82, 83, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 100, -1, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - -1, -1, -1, -1, 122, 71, -1, 125, 126, 127, - 128, 129, -1, 79, 80, 81, -1, -1, -1, -1, + 102, -1, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 119, -1, -1, + -1, -1, 124, 73, -1, 127, 128, 129, 130, 131, + -1, 81, 82, 83, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 102, 103, 104, 105, - 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, - 116, 117, 79, 80, 81, -1, 122, -1, -1, 125, - 126, 127, 128, 129, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 79, 80, 81, 105, 106, - 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, - 117, -1, -1, -1, -1, 122, -1, -1, 125, 126, - 127, 128, 129, 107, 108, 109, 110, 111, 112, 113, - 114, 115, 116, 117, 79, 80, 81, -1, 122, -1, - -1, 125, 126, 127, 128, 129, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 79, 80, 81, -1, -1, - -1, -1, -1, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, -1, 79, 80, 81, 122, -1, -1, - 125, 126, 127, 128, 129, 109, 110, 111, 112, 113, - 114, 115, 116, 117, 79, 80, 81, -1, 122, -1, - -1, 125, 126, 127, 128, 129, 111, 112, 113, 114, - 115, 116, 117, 79, 80, 81, -1, 122, -1, -1, - 125, 126, 127, 128, 129, -1, -1, -1, 113, 114, - 115, 116, 117, 79, 80, 81, -1, 122, -1, -1, - 125, 126, 127, 128, 129, -1, -1, 113, 114, 115, - 116, 117, 79, 80, 81, -1, 122, -1, -1, 125, - 126, 127, 128, 129, -1, -1, -1, -1, 114, 115, - 116, 117, -1, -1, -1, -1, 122, -1, -1, 125, - 126, 127, 128, 129, -1, -1, -1, -1, 115, 116, - 117, -1, -1, -1, -1, 122, -1, -1, 125, 126, - 127, 128, 129 + -1, -1, -1, -1, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 81, 82, 83, -1, 124, -1, -1, 127, 128, 129, + 130, 131, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 81, 82, 83, 107, 108, 109, 110, + 111, 112, 113, 114, 115, 116, 117, 118, 119, -1, + -1, -1, -1, 124, -1, -1, 127, 128, 129, 130, + 131, 109, 110, 111, 112, 113, 114, 115, 116, 117, + 118, 119, 81, 82, 83, -1, 124, -1, -1, 127, + 128, 129, 130, 131, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 81, 82, 83, -1, -1, -1, -1, + -1, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 81, 82, 83, -1, 124, -1, -1, 127, 128, + 129, 130, 131, 111, 112, 113, 114, 115, 116, 117, + 118, 119, -1, -1, -1, -1, 124, -1, -1, 127, + 128, 129, 130, 131, -1, -1, -1, 117, 118, 119, + -1, -1, -1, -1, 124, -1, -1, 127, 128, 129, + 130, 131 }; /* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = +static const yytype_int16 yystos[] = { - 0, 3, 4, 5, 6, 7, 8, 9, 133, 134, - 135, 136, 137, 138, 139, 140, 0, 145, 10, 13, + 0, 3, 4, 5, 6, 7, 8, 9, 135, 136, + 137, 138, 139, 140, 141, 142, 0, 181, 10, 13, 16, 19, 20, 21, 24, 25, 29, 30, 47, 48, - 52, 53, 55, 56, 57, 58, 59, 60, 62, 63, - 64, 65, 66, 67, 70, 73, 74, 75, 76, 77, - 78, 82, 83, 84, 97, 118, 119, 121, 123, 124, - 131, 143, 204, 205, 206, 209, 210, 211, 212, 213, - 214, 215, 216, 217, 218, 220, 227, 235, 236, 237, - 238, 239, 240, 241, 242, 243, 11, 142, 1, 22, + 52, 53, 55, 56, 57, 58, 60, 61, 63, 64, + 65, 66, 67, 68, 72, 75, 76, 77, 78, 79, + 80, 84, 85, 86, 99, 120, 121, 123, 125, 126, + 133, 179, 233, 234, 235, 238, 239, 240, 241, 242, + 243, 244, 245, 246, 247, 249, 255, 263, 264, 265, + 266, 267, 268, 269, 270, 271, 11, 178, 1, 22, 26, 27, 28, 31, 32, 35, 36, 37, 38, 40, - 41, 42, 43, 46, 49, 50, 51, 54, 68, 72, - 90, 141, 142, 155, 169, 204, 224, 69, 153, 154, - 155, 143, 151, 197, 198, 151, 56, 61, 142, 236, - 244, 227, 244, 218, 244, 218, 244, 244, 218, 121, - 131, 221, 236, 237, 238, 218, 142, 218, 181, 181, - 182, 244, 244, 219, 13, 131, 218, 181, 218, 131, - 131, 88, 131, 142, 218, 56, 143, 205, 226, 236, - 244, 142, 244, 227, 56, 61, 184, 205, 218, 218, - 218, 218, 218, 130, 204, 93, 94, 95, 96, 15, - 11, 13, 131, 111, 112, 111, 109, 110, 109, 71, - 79, 80, 81, 92, 98, 99, 100, 102, 103, 104, - 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, 122, 125, 126, 127, 128, 129, 131, - 11, 13, 11, 13, 11, 13, 11, 145, 183, 56, - 56, 222, 236, 237, 238, 131, 131, 30, 121, 131, - 234, 236, 131, 131, 131, 131, 142, 11, 146, 146, - 180, 184, 22, 180, 184, 39, 143, 171, 22, 32, - 35, 36, 37, 38, 41, 22, 154, 155, 153, 16, - 20, 24, 143, 189, 190, 191, 192, 193, 194, 14, - 131, 218, 221, 236, 237, 238, 130, 204, 85, 187, - 59, 143, 185, 85, 143, 186, 186, 226, 131, 88, - 204, 130, 142, 130, 130, 204, 227, 227, 244, 205, - 205, 22, 226, 13, 130, 204, 204, 204, 204, 218, - 204, 204, 130, 204, 218, 218, 218, 218, 218, 218, - 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, - 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, - 218, 218, 10, 11, 13, 16, 20, 24, 25, 57, - 82, 131, 208, 236, 130, 204, 204, 204, 204, 204, - 204, 204, 204, 151, 56, 143, 179, 56, 56, 85, - 143, 223, 145, 145, 121, 145, 30, 232, 233, 235, - 236, 237, 238, 145, 145, 131, 145, 145, 145, 145, - 147, 44, 159, 180, 158, 180, 142, 168, 204, 168, - 168, 176, 204, 168, 168, 61, 188, 188, 15, 130, - 204, 187, 130, 59, 186, 59, 145, 202, 202, 227, - 205, 14, 207, 130, 89, 130, 204, 12, 204, 13, - 22, 14, 130, 101, 25, 184, 204, 204, 25, 25, - 25, 25, 25, 130, 204, 131, 130, 22, 14, 22, - 14, 22, 14, 22, 12, 18, 144, 11, 22, 186, - 59, 98, 177, 204, 177, 131, 229, 236, 131, 143, - 169, 174, 177, 178, 204, 232, 145, 176, 175, 204, - 177, 177, 151, 145, 56, 156, 22, 145, 199, 200, - 157, 98, 98, 192, 130, 200, 131, 143, 195, 196, - 130, 23, 143, 228, 226, 130, 14, 204, 12, 218, - 131, 22, 14, 130, 227, 12, 12, 12, 12, 145, - 145, 11, 22, 225, 130, 130, 230, 231, 236, 131, - 145, 130, 22, 162, 177, 130, 130, 130, 130, 12, - 131, 143, 148, 56, 185, 11, 186, 218, 218, 197, - 11, 204, 89, 14, 227, 12, 130, 22, 164, 145, - 218, 146, 146, 15, 130, 177, 177, 146, 160, 131, - 130, 173, 173, 146, 146, 149, 163, 226, 186, 151, - 22, 201, 202, 130, 203, 130, 87, 151, 165, 33, - 34, 143, 170, 170, 236, 131, 130, 130, 171, 175, - 177, 146, 146, 146, 236, 146, 22, 199, 12, 151, - 143, 152, 12, 151, 146, 131, 177, 146, 146, 22, - 130, 171, 171, 171, 150, 45, 172, 12, 22, 59, - 166, 12, 177, 130, 171, 171, 161, 146, 130, 142, - 17, 86, 143, 167, 130, 146, 173, 171, 151, 146, - 171, 178, 87, 170, 130, 146 + 41, 42, 43, 46, 49, 50, 51, 54, 69, 74, + 92, 143, 144, 145, 147, 148, 149, 150, 151, 155, + 156, 157, 158, 159, 160, 162, 164, 166, 168, 170, + 171, 172, 174, 175, 176, 177, 178, 191, 195, 233, + 252, 70, 189, 190, 191, 179, 187, 226, 227, 187, + 56, 62, 178, 264, 272, 255, 272, 247, 272, 247, + 272, 272, 247, 123, 133, 250, 264, 265, 266, 247, + 178, 247, 207, 207, 208, 272, 272, 248, 13, 133, + 247, 207, 247, 133, 133, 90, 133, 178, 247, 56, + 179, 234, 254, 264, 272, 178, 272, 255, 56, 62, + 210, 234, 247, 247, 247, 247, 247, 132, 233, 95, + 96, 97, 98, 15, 11, 13, 133, 113, 114, 113, + 111, 112, 111, 73, 81, 82, 83, 94, 100, 101, + 102, 104, 105, 106, 107, 108, 109, 110, 111, 112, + 113, 114, 115, 116, 117, 118, 119, 124, 127, 128, + 129, 130, 131, 133, 11, 13, 11, 13, 11, 13, + 11, 181, 209, 56, 56, 251, 264, 265, 266, 133, + 133, 30, 123, 133, 262, 264, 133, 133, 133, 133, + 178, 11, 182, 182, 206, 210, 22, 206, 210, 39, + 179, 197, 22, 32, 35, 36, 37, 38, 41, 22, + 190, 191, 189, 20, 24, 103, 179, 216, 217, 218, + 219, 221, 222, 223, 14, 133, 247, 250, 264, 265, + 266, 132, 233, 87, 213, 71, 179, 211, 87, 179, + 212, 212, 254, 133, 90, 233, 132, 178, 132, 132, + 233, 255, 255, 272, 234, 234, 22, 254, 13, 132, + 233, 233, 233, 233, 247, 233, 233, 132, 233, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 10, 11, 13, + 16, 20, 24, 25, 57, 84, 133, 237, 264, 132, + 233, 233, 233, 233, 233, 233, 233, 233, 187, 56, + 179, 205, 56, 56, 179, 213, 214, 181, 181, 123, + 181, 30, 260, 261, 263, 264, 265, 266, 181, 181, + 133, 181, 181, 181, 181, 183, 44, 173, 206, 163, + 206, 178, 194, 233, 194, 194, 202, 233, 194, 194, + 62, 215, 16, 15, 132, 233, 213, 132, 59, 212, + 59, 181, 231, 231, 255, 234, 14, 236, 132, 91, + 132, 233, 12, 233, 13, 22, 14, 132, 103, 25, + 210, 233, 233, 25, 25, 25, 25, 25, 132, 233, + 133, 132, 22, 14, 22, 14, 22, 14, 22, 12, + 18, 180, 11, 22, 214, 100, 203, 233, 203, 133, + 257, 264, 133, 179, 195, 200, 203, 204, 233, 260, + 181, 202, 201, 233, 203, 203, 187, 181, 56, 167, + 22, 181, 228, 229, 165, 100, 215, 221, 132, 229, + 133, 179, 224, 225, 132, 23, 179, 256, 254, 132, + 14, 233, 12, 247, 133, 22, 14, 132, 255, 12, + 12, 12, 12, 181, 181, 11, 22, 253, 132, 132, + 123, 258, 259, 264, 133, 181, 132, 22, 154, 203, + 132, 132, 132, 132, 12, 133, 179, 184, 56, 211, + 11, 212, 247, 100, 226, 11, 233, 91, 14, 255, + 12, 132, 22, 161, 181, 247, 182, 182, 260, 15, + 132, 203, 203, 182, 152, 133, 132, 199, 199, 182, + 182, 185, 169, 254, 212, 187, 22, 230, 231, 220, + 247, 132, 232, 132, 89, 187, 146, 33, 34, 179, + 196, 196, 123, 264, 133, 132, 132, 197, 201, 203, + 182, 182, 182, 264, 182, 22, 228, 12, 187, 179, + 188, 12, 187, 182, 133, 260, 203, 182, 182, 22, + 132, 197, 197, 197, 186, 45, 198, 12, 22, 60, + 192, 12, 203, 132, 197, 197, 153, 182, 132, 178, + 17, 88, 179, 193, 132, 182, 199, 197, 187, 182, + 197, 204, 89, 196, 132, 182 }; /* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ -static const yytype_uint8 yyr1[] = +static const yytype_int16 yyr1[] = { - 0, 132, 134, 133, 135, 133, 136, 133, 137, 133, - 138, 133, 139, 133, 140, 133, 141, 141, 142, 143, - 144, 145, 146, 147, 148, 149, 150, 148, 151, 151, - 152, 152, 153, 153, 154, 154, 155, 155, 156, 155, - 157, 155, 158, 155, 155, 155, 159, 155, 155, 155, - 155, 155, 155, 155, 155, 160, 161, 155, 155, 155, - 155, 162, 155, 155, 155, 163, 155, 155, 164, 155, - 165, 155, 155, 155, 155, 155, 155, 166, 167, 167, - 168, 169, 169, 169, 169, 169, 169, 169, 169, 170, - 170, 170, 171, 171, 172, 172, 173, 174, 174, 175, - 175, 176, 177, 178, 179, 179, 180, 181, 182, 183, - 184, 184, 185, 185, 186, 186, 186, 187, 187, 188, - 188, 189, 189, 190, 190, 190, 191, 191, 191, 192, - 192, 193, 193, 193, 194, 194, 195, 195, 196, 198, - 197, 199, 199, 200, 201, 201, 203, 202, 204, 204, - 204, 204, 204, 205, 205, 205, 206, 206, 206, 206, - 206, 206, 206, 206, 206, 206, 206, 206, 207, 206, - 208, 208, 209, 209, 209, 209, 209, 209, 209, 209, - 209, 209, 209, 209, 209, 209, 210, 210, 210, 210, - 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, - 210, 210, 210, 210, 210, 210, 210, 210, 211, 211, - 211, 211, 211, 212, 212, 213, 213, 213, 213, 214, - 214, 215, 215, 215, 215, 215, 215, 215, 215, 215, - 216, 216, 216, 216, 216, 217, 217, 218, 218, 218, - 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, - 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, - 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, - 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, - 218, 218, 218, 218, 218, 219, 218, 218, 218, 218, - 220, 220, 220, 220, 221, 221, 221, 221, 221, 222, - 222, 222, 223, 223, 223, 224, 225, 224, 226, 226, - 227, 227, 228, 228, 229, 230, 230, 230, 231, 232, - 232, 232, 233, 233, 234, 234, 235, 236, 237, 238, - 239, 239, 240, 241, 241, 242, 242, 243, 243, 244, - 244, 244, 244 + 0, 134, 136, 135, 137, 135, 138, 135, 139, 135, + 140, 135, 141, 135, 142, 135, 143, 144, 146, 145, + 147, 148, 149, 150, 152, 153, 151, 151, 151, 151, + 154, 151, 151, 151, 155, 156, 157, 158, 159, 161, + 160, 163, 162, 165, 164, 167, 166, 169, 168, 170, + 171, 173, 172, 174, 175, 176, 177, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 184, 187, 187, + 188, 188, 189, 189, 190, 190, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 192, 193, 193, 194, 195, 195, 195, 195, 195, + 195, 195, 195, 196, 196, 196, 197, 197, 198, 198, + 199, 200, 200, 201, 201, 202, 203, 204, 205, 205, + 206, 207, 208, 209, 210, 210, 211, 211, 212, 212, + 212, 213, 213, 214, 214, 215, 215, 216, 216, 217, + 217, 217, 218, 218, 219, 219, 220, 220, 221, 221, + 222, 222, 222, 223, 223, 224, 224, 225, 227, 226, + 228, 228, 229, 230, 230, 232, 231, 233, 233, 233, + 233, 233, 234, 234, 234, 235, 235, 235, 235, 235, + 235, 235, 235, 235, 235, 235, 235, 236, 235, 237, + 237, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 240, 240, 240, + 240, 240, 241, 241, 242, 242, 242, 242, 243, 243, + 244, 244, 244, 244, 244, 244, 244, 244, 244, 245, + 245, 245, 245, 245, 245, 245, 245, 246, 246, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 248, 247, 247, + 247, 247, 249, 249, 249, 249, 250, 250, 250, 250, + 250, 251, 251, 251, 252, 253, 252, 254, 254, 255, + 255, 256, 256, 257, 258, 258, 258, 258, 258, 259, + 260, 260, 260, 261, 261, 262, 262, 263, 264, 265, + 266, 267, 267, 268, 269, 269, 270, 270, 271, 271, + 272, 272, 272, 272 }; /* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ static const yytype_int8 yyr2[] = { 0, 2, 0, 4, 0, 3, 0, 3, 0, 3, - 0, 3, 0, 3, 0, 3, 1, 1, 4, 0, + 0, 3, 0, 3, 0, 3, 2, 5, 0, 9, + 2, 2, 2, 2, 0, 0, 13, 9, 11, 8, + 0, 10, 9, 7, 4, 6, 7, 1, 4, 0, + 8, 0, 4, 0, 6, 0, 7, 0, 8, 7, + 8, 0, 7, 6, 8, 2, 1, 1, 4, 0, 7, 0, 4, 0, 1, 0, 0, 5, 1, 2, - 1, 2, 1, 1, 2, 2, 1, 4, 0, 7, - 0, 6, 0, 4, 4, 5, 0, 7, 7, 7, - 6, 6, 2, 8, 8, 0, 0, 13, 9, 11, - 8, 0, 10, 9, 7, 0, 8, 2, 0, 8, - 0, 9, 2, 2, 2, 2, 1, 2, 1, 3, - 1, 1, 1, 3, 3, 3, 3, 3, 3, 1, - 2, 6, 1, 2, 0, 2, 0, 1, 1, 0, - 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 2, 1, 2, 1, 0, - 1, 1, 1, 2, 3, 4, 2, 3, 4, 1, - 1, 2, 3, 1, 1, 1, 1, 1, 3, 0, - 2, 1, 1, 4, 1, 1, 0, 6, 3, 3, - 3, 3, 1, 2, 3, 1, 3, 3, 5, 6, - 3, 7, 4, 3, 5, 2, 4, 4, 0, 5, - 1, 1, 5, 4, 5, 4, 5, 6, 5, 4, - 5, 4, 3, 6, 4, 5, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 1, 1, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 1, 3, - 2, 2, 3, 3, 3, 1, 3, 2, 2, 3, - 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 3, 4, 5, 4, 4, 2, 2, 1, 1, 1, - 1, 5, 2, 1, 2, 3, 1, 2, 1, 1, - 1, 1, 1, 1, 4, 4, 5, 5, 1, 1, - 3, 4, 3, 4, 4, 4, 4, 4, 1, 2, - 2, 1, 2, 2, 1, 2, 1, 2, 1, 3, - 1, 3, 1, 3, 4, 0, 6, 1, 1, 1, - 3, 2, 4, 3, 3, 2, 1, 1, 1, 1, - 1, 1, 2, 1, 1, 3, 0, 6, 1, 1, - 1, 1, 1, 2, 1, 2, 3, 1, 1, 1, - 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, - 2, 4, 2, 1, 3, 1, 3, 1, 3, 1, - 1, 1, 1 + 1, 2, 1, 1, 2, 2, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 1, 3, 1, 1, 1, 3, 3, 3, + 3, 3, 3, 1, 2, 6, 1, 2, 0, 2, + 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, + 1, 2, 1, 1, 1, 0, 1, 1, 1, 2, + 3, 4, 0, 1, 3, 5, 0, 1, 1, 1, + 2, 3, 1, 1, 1, 1, 1, 3, 0, 2, + 1, 1, 4, 1, 1, 0, 6, 3, 3, 3, + 3, 1, 2, 3, 1, 3, 3, 5, 6, 3, + 7, 4, 3, 5, 2, 4, 4, 0, 5, 1, + 1, 5, 4, 5, 4, 5, 6, 5, 4, 5, + 4, 3, 6, 4, 5, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 1, 1, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 1, 3, 2, + 2, 3, 3, 3, 1, 3, 2, 2, 3, 3, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, + 4, 5, 4, 4, 3, 4, 3, 2, 2, 1, + 1, 1, 1, 5, 2, 1, 2, 3, 1, 2, + 1, 1, 1, 1, 1, 1, 4, 4, 5, 5, + 1, 1, 3, 4, 3, 4, 4, 4, 4, 4, + 1, 2, 2, 1, 2, 2, 1, 2, 1, 2, + 1, 3, 1, 3, 1, 3, 4, 0, 6, 1, + 1, 1, 3, 2, 4, 3, 3, 2, 1, 1, + 1, 1, 1, 1, 3, 0, 6, 1, 1, 1, + 1, 1, 2, 1, 2, 3, 4, 1, 2, 1, + 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, + 2, 2, 4, 2, 1, 3, 1, 3, 1, 3, + 1, 1, 1, 1 }; typedef enum { @@ -1562,43 +1647,56 @@ static const toketypes yy_type_tab[] = toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, - toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_ival, toketype_ival, toketype_ival, - toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, + toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, + toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, - toketype_ival, toketype_ival, toketype_ival, toketype_ival, - toketype_ival, toketype_ival, toketype_ival, toketype_ival, - toketype_ival, toketype_ival, toketype_ival, toketype_ival, - toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, - toketype_ival, toketype_ival, toketype_ival, toketype_ival, + toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, + toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, + toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, - toketype_ival, toketype_ival, toketype_ival, toketype_ival, - toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, + toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, + toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, + toketype_ival, toketype_ival, toketype_opval, toketype_opval, + toketype_opval, toketype_ival, toketype_opval, + toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_ival, toketype_ival, + toketype_ival, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, + toketype_opval, + toketype_opval, toketype_ival, toketype_opval, + toketype_ival, toketype_opval, toketype_ival, + toketype_opval, toketype_ival, toketype_opval, + toketype_ival, toketype_opval, toketype_opval, + toketype_opval, toketype_ival, toketype_opval, + toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_ival, toketype_opval, toketype_ival, toketype_ival, toketype_opval, - toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_ival, - toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, - toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_opval, - toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, - toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, - toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_pval, toketype_opval, - toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, + toketype_ival, toketype_ival, toketype_ival, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_ival, + toketype_opval, toketype_ival, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, + toketype_opval, toketype_opval, toketype_pval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_opval, toketype_opval, toketype_opval, toketype_opval + toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval }; /* Generated from: - * 57ef509d481a8f100fca417b83deb7d66655912f27495b2f6daa0699748ea44f perly.y + * 783af8ff7ff42fd7313d85df8bbde58d7480e4964bb41ce7b92a5039a7286074 perly.y * f13e9c08cea6302f0c1d1f467405bd0e0880d0ea92d0669901017a7f7e94ab28 regen_perly.pl * ex: set ro ft=c: */ Index: gnu/usr.bin/perl/perly.y =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/perly.y,v diff -u -p -a -u -p -r1.24 perly.y --- gnu/usr.bin/perl/perly.y 26 Dec 2025 22:14:12 -0000 1.24 +++ gnu/usr.bin/perl/perly.y 16 Nov 2026 00:57:39 -0000 @@ -81,10 +81,10 @@ %token KW_METHOD_named KW_METHOD_anon /* Tokens emitted in other situations */ -%token BAREWORD METHCALL0 METHCALL THING PMFUNC PRIVATEREF QWLIST +%token BAREWORD METHCALL0 METHCALL ATTRLIST THING PMFUNC PRIVATEREF QWLIST %token FUNC0OP FUNC0SUB UNIOPSUB LSTOPSUB %token PLUGEXPR PLUGSTMT -%token LABEL +%token LABEL PROTOTYPE %token LOOPEX DOTDOT YADAYADA %token FUNC0 FUNC1 FUNC UNIOP LSTOP BLKLSTOP %token POWOP MULOP ADDOP @@ -94,6 +94,32 @@ %token PHASER %type grammar remember mremember + +%type bare_statement_block +%type bare_statement_class_declaration +%type bare_statement_class_definition +%type bare_statement_default +%type bare_statement_defer +%type bare_statement_expression +%type bare_statement_field_declaration +%type bare_statement_for +%type bare_statement_format +%type bare_statement_given +%type bare_statement_if +%type bare_statement_null +%type bare_statement_package_declaration +%type bare_statement_package_definition +%type bare_statement_phaser +%type bare_statement_sub_signature +%type bare_statement_sub_traditional +%type bare_statement_try_catch +%type bare_statement_unless +%type bare_statement_until +%type bare_statement_utilize +%type bare_statement_when +%type bare_statement_while +%type bare_statement_yadayada + %type startsub startanonsub startanonmethod startformsub %type mintro @@ -108,14 +134,15 @@ %type listexpr nexpr texpr iexpr mexpr mnexpr %type optlistexpr optexpr optrepl indirob listop methodname %type formname subname proto cont my_scalar my_var -%type list_of_scalars my_list_of_scalars refgen_topic formblock -%type subattrlist myattrlist myattrterm myterm +%type list_of_itervars my_list_of_itervars refgen_topic formblock +%type subattrlist attrlist optattrlist myattrterm myterm %type fieldvar /* pval is PADNAME */ -%type optfieldattrlist fielddecl +%type fielddecl %type termbinop termunop anonymous termdo %type termrelop relopchain termeqop eqopchain -%type sigslurpsigil -%type sigvarname sigscalarelem sigslurpelem +%type sigslurpsigil sigvar +%type sigscalarelem optsigscalardefault sigslurpelem +%type optcolon %type sigelem siglist optsiglist subsigguts subsignature optsubsignature %type subbody optsubbody sigsubbody optsigsubbody %type formstmtseq formline formarg @@ -239,6 +266,503 @@ grammar : GRAMPROG } ; +bare_statement_block + : block + cont + { + $$ = new_block_statement ($block, $cont); + } + ; + +bare_statement_class_declaration + : KW_CLASS + BAREWORD[version] + BAREWORD[package] + optattrlist + PERLY_SEMICOLON + { + package ($package, $version); + $$ = NULL; + class_setup_stash(PL_curstash); + if ($optattrlist) { + class_apply_attributes(PL_curstash, $optattrlist); + } + } + ; + +bare_statement_class_definition + : KW_CLASS + BAREWORD[version] + BAREWORD[package] + optattrlist + PERLY_BRACE_OPEN + remember + { + package ($package, $version); + class_setup_stash(PL_curstash); + if ($optattrlist) { + class_apply_attributes(PL_curstash, $optattrlist); + } + } + stmtseq + PERLY_BRACE_CLOSE + { + $$ = new_block_statement (block_end ($remember, $stmtseq), NULL); + if (parser->copline > (line_t)$PERLY_BRACE_OPEN) + parser->copline = (line_t)$PERLY_BRACE_OPEN; + } + ; + +bare_statement_default + : KW_DEFAULT + block + { + $$ = newWHENOP(0, op_scope($block)); + } + ; + +bare_statement_defer + : KW_DEFER mblock + { + $$ = newDEFEROP(0, op_scope($mblock)); + } + ; + +bare_statement_expression + /* expression when used as a statement */ + : sideff PERLY_SEMICOLON + { + $$ = $sideff; + } + ; + +bare_statement_field_declaration + : fielddecl + PERLY_SEMICOLON + { + $$ = $fielddecl; + } + ; + +bare_statement_for + : KW_FOR + PERLY_PAREN_OPEN + remember + mnexpr[init_mnexpr] + PERLY_SEMICOLON + { + parser->expect = XTERM; + } + texpr + PERLY_SEMICOLON + { + parser->expect = XTERM; + } + mintro + mnexpr[iterate_mnexpr] + PERLY_PAREN_CLOSE + mblock + { + OP *initop = $init_mnexpr; + OP *forop = newWHILEOP(0, 1, NULL, scalar($texpr), $mblock, $iterate_mnexpr, $mintro); + if (initop) { + forop = op_prepend_elem( + OP_LINESEQ, + initop, + op_append_elem(OP_LINESEQ, newOP(OP_UNSTACK, OPf_SPECIAL), forop) + ); + } + PL_hints |= HINT_BLOCK_SCOPE; + $$ = block_end($remember, forop); + parser->copline = (line_t)$KW_FOR; + } + | KW_FOR + KW_MY + remember + my_scalar + PERLY_PAREN_OPEN + mexpr + PERLY_PAREN_CLOSE + mblock + cont + { + $$ = block_end($remember, newFOROP(0, $my_scalar, $mexpr, $mblock, $cont)); + parser->copline = (line_t)$KW_FOR; + } + | KW_FOR + KW_MY + remember + PERLY_PAREN_OPEN + my_list_of_itervars + PERLY_PAREN_CLOSE + PERLY_PAREN_OPEN + mexpr + PERLY_PAREN_CLOSE + mblock + cont + { + if ($my_list_of_itervars->op_type == OP_PADSV) + /* degenerate case of 1 var: for my ($x) .... + Flag it so it can be special-cased in newFOROP */ + $my_list_of_itervars->op_flags |= OPf_PARENS; + $$ = block_end($remember, newFOROP(0, $my_list_of_itervars, $mexpr, $mblock, $cont)); + parser->copline = (line_t)$KW_FOR; + } + | KW_FOR + scalar + PERLY_PAREN_OPEN + remember + mexpr + PERLY_PAREN_CLOSE + mblock + cont + { + $$ = block_end($remember, newFOROP(0, op_lvalue($scalar, OP_ENTERLOOP), $mexpr, $mblock, $cont)); + parser->copline = (line_t)$KW_FOR; + } + | KW_FOR + my_refgen + remember + my_var + { + parser->in_my = 0; + $$ = my($my_var); + }[variable] + PERLY_PAREN_OPEN + mexpr + PERLY_PAREN_CLOSE + mblock + cont + { + $$ = block_end( + $remember, + newFOROP( + 0, + op_lvalue( + newUNOP(OP_REFGEN, 0, $variable), + OP_ENTERLOOP + ), + $mexpr, + $mblock, + $cont + ) + ); + parser->copline = (line_t)$KW_FOR; + } + | KW_FOR + REFGEN + refgen_topic + PERLY_PAREN_OPEN + remember + mexpr + PERLY_PAREN_CLOSE + mblock + cont + { + $$ = block_end ( + $remember, + newFOROP ( + 0, + op_lvalue (newUNOP(OP_REFGEN, 0, $refgen_topic), OP_ENTERLOOP), + $mexpr, + $mblock, + $cont + ) + ); + parser->copline = (line_t)$KW_FOR; + } + | KW_FOR + PERLY_PAREN_OPEN + remember + mexpr + PERLY_PAREN_CLOSE + mblock + cont + { + $$ = block_end($remember, newFOROP(0, NULL, $mexpr, $mblock, $cont)); + parser->copline = (line_t)$KW_FOR; + } + ; + +bare_statement_format + : KW_FORMAT + startformsub + formname + formblock + { + CV *fmtcv = PL_compcv; + newFORM($startformsub, $formname, $formblock); + if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) { + pad_add_weakref(fmtcv); + } + parser->parsed_sub = 1; + $$ = NULL; + } + ; + +bare_statement_given + : KW_GIVEN + PERLY_PAREN_OPEN + remember + mexpr + PERLY_PAREN_CLOSE + mblock + { + $$ = block_end($remember, newGIVENOP($mexpr, op_scope($mblock), 0)); + parser->copline = (line_t)$KW_GIVEN; + } + ; + +bare_statement_if + : KW_IF + PERLY_PAREN_OPEN + remember + mexpr + PERLY_PAREN_CLOSE + mblock + else + { + $$ = block_end($remember, newCONDOP(OPpSTATEMENT<<8, + $mexpr, op_scope($mblock), $else)); + parser->copline = (line_t)$KW_IF; + } + ; + +bare_statement_null + : PERLY_SEMICOLON + { + $$ = NULL; + parser->copline = NOLINE; + } + ; + +bare_statement_package_declaration + : KW_PACKAGE + BAREWORD[version] + BAREWORD[package] + PERLY_SEMICOLON + /* version and package appear in the reverse order to what may be + * expected, because toke.c has already pushed both of them to a stack + * by calling force_next() from within force_version(). + * When the parser pops them back out again they appear swapped + */ + { + package ($package, $version); + $$ = NULL; + } + ; + +bare_statement_package_definition + : KW_PACKAGE + BAREWORD[version] + BAREWORD[package] + PERLY_BRACE_OPEN + remember + { + package ($package, $version); + } + stmtseq + PERLY_BRACE_CLOSE + { + $$ = new_block_statement (block_end ($remember, $stmtseq), NULL); + if (parser->copline > (line_t)$PERLY_BRACE_OPEN) + parser->copline = (line_t)$PERLY_BRACE_OPEN; + } + ; + +bare_statement_phaser + : PHASER + startsub + { + switch($PHASER) { + case KEY_ADJUST: + croak_kw_unless_class("ADJUST"); + class_prepare_method_parse(PL_compcv); + break; + default: + NOT_REACHED; + } + } + optsubbody + { + OP *body = $optsubbody; + SvREFCNT_inc_simple_void(PL_compcv); + + CV *cv; + + switch($PHASER) { + case KEY_ADJUST: + cv = newATTRSUB($startsub, NULL, NULL, NULL, body); + class_add_ADJUST(PL_curstash, cv); + break; + } + $$ = NULL; + parser->parsed_sub = 1; + } + ; + +bare_statement_sub_signature + /* sub declaration or definition under 'use feature * "signatures"'. + * (Note that a signature isn't * allowed in a declaration) + */ + : sigsub_or_method_named + subname + startsub + { + init_named_cv(PL_compcv, $subname); + if($sigsub_or_method_named == KW_METHOD_named) { + croak_kw_unless_class("method"); + class_prepare_method_parse(PL_compcv); + } + parser->in_my = 0; + parser->in_my_stash = NULL; + } + subattrlist + optsigsubbody + { + OP *body = $optsigsubbody; + + SvREFCNT_inc_simple_void(PL_compcv); + $subname->op_type == OP_CONST + ? newATTRSUB($startsub, $subname, NULL, $subattrlist, body) + : newMYSUB( $startsub, $subname, NULL, $subattrlist, body) + ; + intro_my(); + parser->parsed_sub = 1; + $$ = NULL; + } + ; + +bare_statement_sub_traditional + /* sub declaration or definition not within scope of 'use feature "signatures"'*/ + : KW_SUB_named + subname + startsub + { + init_named_cv(PL_compcv, $subname); + parser->in_my = 0; + parser->in_my_stash = NULL; + } + proto + subattrlist + optsubbody + { + SvREFCNT_inc_simple_void(PL_compcv); + $subname->op_type == OP_CONST + ? newATTRSUB($startsub, $subname, $proto, $subattrlist, $optsubbody) + : newMYSUB($startsub, $subname, $proto, $subattrlist, $optsubbody) + ; + intro_my(); + parser->parsed_sub = 1; + $$ = NULL; + } + ; + +bare_statement_try_catch + : KW_TRY + mblock[try] + KW_CATCH + remember + catch_paren[scalar] + { + if(!$scalar) { + yyerror("catch block requires a (VAR)"); + YYERROR; + } + } + mblock[catch] + finally + { + $$ = newTRYCATCHOP(0, $try, $scalar, block_end($remember, op_scope($catch))); + if($finally) + $$ = op_wrap_finally($$, $finally); + parser->copline = (line_t)$KW_TRY; + } + ; + +bare_statement_unless + : KW_UNLESS + PERLY_PAREN_OPEN + remember + mexpr + PERLY_PAREN_CLOSE + mblock + else + { + $$ = block_end($remember, newCONDOP(OPpSTATEMENT<<8, + $mexpr, $else, op_scope($mblock))); + parser->copline = (line_t)$KW_UNLESS; + } + ; + +bare_statement_until + : KW_UNTIL + PERLY_PAREN_OPEN + remember + iexpr + PERLY_PAREN_CLOSE + mintro + mblock + cont + { + $$ = block_end($remember, newWHILEOP(0, 1, NULL, $iexpr, $mblock, $cont, $mintro)); + parser->copline = (line_t)$KW_UNTIL; + } + ; + +bare_statement_utilize + : KW_USE_or_NO + startsub + { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ } + BAREWORD[version] + BAREWORD[module] + optlistexpr + PERLY_SEMICOLON + /* version and package appear in reverse order for the same reason as + * KW_PACKAGE; see comment above */ + { + SvREFCNT_inc_simple_void(PL_compcv); + utilize($KW_USE_or_NO, $startsub, $version, $module, $optlistexpr); + parser->parsed_sub = 1; + $$ = NULL; + } + ; + +bare_statement_when + : KW_WHEN + PERLY_PAREN_OPEN + remember + mexpr + PERLY_PAREN_CLOSE + mblock + { + $$ = block_end($remember, newWHENOP($mexpr, op_scope($mblock))); + } + ; + +bare_statement_while + : KW_WHILE + PERLY_PAREN_OPEN + remember + texpr + PERLY_PAREN_CLOSE + mintro + mblock + cont + { + $$ = block_end($remember, newWHILEOP(0, 1, NULL, $texpr, $mblock, $cont, $mintro)); + parser->copline = (line_t)$KW_WHILE; + } + ; + +bare_statement_yadayada + : YADAYADA PERLY_SEMICOLON + { + /* diag_listed_as: Unimplemented */ + $$ = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0), newSVOP(OP_CONST, 0, newSVpvs("Unimplemented"))); + } + ; + /* Either a signatured 'sub' or 'method' keyword */ sigsub_or_method_named : KW_SUB_named_sig @@ -289,7 +813,7 @@ catch_paren: empty /* not really valid grammar but we detect it in the * action block to throw a nicer error message */ | PERLY_PAREN_OPEN - { parser->in_my = 1; } + { parser->in_my = KEY_catch; } scalar { parser->in_my = 0; intro_my(); } PERLY_PAREN_CLOSE @@ -343,307 +867,39 @@ labfullstmt: LABEL barestmt } ; -/* A bare statement, lacking label and other aspects of state op */ -barestmt: PLUGSTMT - { $$ = $PLUGSTMT; } - | KW_FORMAT startformsub formname formblock - { - CV *fmtcv = PL_compcv; - newFORM($startformsub, $formname, $formblock); - $$ = NULL; - if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) { - pad_add_weakref(fmtcv); - } - parser->parsed_sub = 1; - } - | KW_SUB_named subname startsub - /* sub declaration or definition not within scope - of 'use feature "signatures"'*/ - { - init_named_cv(PL_compcv, $subname); - parser->in_my = 0; - parser->in_my_stash = NULL; - } - proto subattrlist optsubbody - { - SvREFCNT_inc_simple_void(PL_compcv); - $subname->op_type == OP_CONST - ? newATTRSUB($startsub, $subname, $proto, $subattrlist, $optsubbody) - : newMYSUB($startsub, $subname, $proto, $subattrlist, $optsubbody) - ; - $$ = NULL; - intro_my(); - parser->parsed_sub = 1; - } - | sigsub_or_method_named subname startsub - /* sub declaration or definition under 'use feature - * "signatures"'. (Note that a signature isn't - * allowed in a declaration) - */ - { - init_named_cv(PL_compcv, $subname); - if($sigsub_or_method_named == KW_METHOD_named) { - croak_kw_unless_class("method"); - class_prepare_method_parse(PL_compcv); - } - parser->in_my = 0; - parser->in_my_stash = NULL; - } - subattrlist optsigsubbody - { - OP *body = $optsigsubbody; - - SvREFCNT_inc_simple_void(PL_compcv); - $subname->op_type == OP_CONST - ? newATTRSUB($startsub, $subname, NULL, $subattrlist, body) - : newMYSUB( $startsub, $subname, NULL, $subattrlist, body) - ; - $$ = NULL; - intro_my(); - parser->parsed_sub = 1; - } - | PHASER startsub - { - switch($PHASER) { - case KEY_ADJUST: - croak_kw_unless_class("ADJUST"); - class_prepare_method_parse(PL_compcv); - break; - default: - NOT_REACHED; - } - } - optsubbody - { - OP *body = $optsubbody; - SvREFCNT_inc_simple_void(PL_compcv); - - CV *cv; - - switch($PHASER) { - case KEY_ADJUST: - cv = newATTRSUB($startsub, NULL, NULL, NULL, body); - class_add_ADJUST(PL_curstash, cv); - break; - } - $$ = NULL; - } - | KW_PACKAGE BAREWORD[version] BAREWORD[package] PERLY_SEMICOLON - /* version and package appear in the reverse order to what may be - * expected, because toke.c has already pushed both of them to a stack - * by calling force_next() from within force_version(). - * When the parser pops them back out again they appear swapped */ - { - package($package); - if ($version) - package_version($version); - $$ = NULL; - } - | KW_CLASS BAREWORD[version] BAREWORD[package] subattrlist PERLY_SEMICOLON - { - package($package); - if ($version) - package_version($version); - $$ = NULL; - class_setup_stash(PL_curstash); - if ($subattrlist) { - class_apply_attributes(PL_curstash, $subattrlist); - } - } - | KW_USE_or_NO startsub - { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ } - BAREWORD[version] BAREWORD[module] optlistexpr PERLY_SEMICOLON - /* version and package appear in reverse order for the same reason as - * KW_PACKAGE; see comment above */ - { - SvREFCNT_inc_simple_void(PL_compcv); - utilize($KW_USE_or_NO, $startsub, $version, $module, $optlistexpr); - parser->parsed_sub = 1; - $$ = NULL; - } - | KW_IF PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock else - { - $$ = block_end($remember, - newCONDOP(0, $mexpr, op_scope($mblock), $else)); - parser->copline = (line_t)$KW_IF; - } - | KW_UNLESS PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock else - { - $$ = block_end($remember, - newCONDOP(0, $mexpr, $else, op_scope($mblock))); - parser->copline = (line_t)$KW_UNLESS; - } - | KW_GIVEN PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock - { - $$ = block_end($remember, newGIVENOP($mexpr, op_scope($mblock), 0)); - parser->copline = (line_t)$KW_GIVEN; - } - | KW_WHEN PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock - { $$ = block_end($remember, newWHENOP($mexpr, op_scope($mblock))); } - | KW_DEFAULT block - { $$ = newWHENOP(0, op_scope($block)); } - | KW_WHILE PERLY_PAREN_OPEN remember texpr PERLY_PAREN_CLOSE mintro mblock cont - { - $$ = block_end($remember, - newWHILEOP(0, 1, NULL, - $texpr, $mblock, $cont, $mintro)); - parser->copline = (line_t)$KW_WHILE; - } - | KW_UNTIL PERLY_PAREN_OPEN remember iexpr PERLY_PAREN_CLOSE mintro mblock cont - { - $$ = block_end($remember, - newWHILEOP(0, 1, NULL, - $iexpr, $mblock, $cont, $mintro)); - parser->copline = (line_t)$KW_UNTIL; - } - | KW_FOR PERLY_PAREN_OPEN remember mnexpr[init_mnexpr] PERLY_SEMICOLON - { parser->expect = XTERM; } - texpr PERLY_SEMICOLON - { parser->expect = XTERM; } - mintro mnexpr[iterate_mnexpr] PERLY_PAREN_CLOSE - mblock - { - OP *initop = $init_mnexpr; - OP *forop = newWHILEOP(0, 1, NULL, - scalar($texpr), $mblock, $iterate_mnexpr, $mintro); - if (initop) { - forop = op_prepend_elem(OP_LINESEQ, initop, - op_append_elem(OP_LINESEQ, - newOP(OP_UNSTACK, OPf_SPECIAL), - forop)); - } - PL_hints |= HINT_BLOCK_SCOPE; - $$ = block_end($remember, forop); - parser->copline = (line_t)$KW_FOR; - } - | KW_FOR KW_MY remember my_scalar PERLY_PAREN_OPEN mexpr PERLY_PAREN_CLOSE mblock cont - { - $$ = block_end($remember, newFOROP(0, $my_scalar, $mexpr, $mblock, $cont)); - parser->copline = (line_t)$KW_FOR; - } - | KW_FOR KW_MY remember PERLY_PAREN_OPEN my_list_of_scalars PERLY_PAREN_CLOSE PERLY_PAREN_OPEN mexpr PERLY_PAREN_CLOSE mblock cont - { - if ($my_list_of_scalars->op_type == OP_PADSV) - /* degenerate case of 1 var: for my ($x) .... - Flag it so it can be special-cased in newFOROP */ - $my_list_of_scalars->op_flags |= OPf_PARENS; - $$ = block_end($remember, newFOROP(0, $my_list_of_scalars, $mexpr, $mblock, $cont)); - parser->copline = (line_t)$KW_FOR; - } - | KW_FOR scalar PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock cont - { - $$ = block_end($remember, newFOROP(0, - op_lvalue($scalar, OP_ENTERLOOP), $mexpr, $mblock, $cont)); - parser->copline = (line_t)$KW_FOR; - } - | KW_FOR my_refgen remember my_var - { parser->in_my = 0; $$ = my($my_var); }[variable] - PERLY_PAREN_OPEN mexpr PERLY_PAREN_CLOSE mblock cont - { - $$ = block_end( - $remember, - newFOROP(0, - op_lvalue( - newUNOP(OP_REFGEN, 0, - $variable), - OP_ENTERLOOP), - $mexpr, $mblock, $cont) - ); - parser->copline = (line_t)$KW_FOR; - } - | KW_FOR REFGEN refgen_topic PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock cont - { - $$ = block_end($remember, newFOROP( - 0, op_lvalue(newUNOP(OP_REFGEN, 0, - $refgen_topic), - OP_ENTERLOOP), $mexpr, $mblock, $cont)); - parser->copline = (line_t)$KW_FOR; - } - | KW_FOR PERLY_PAREN_OPEN remember mexpr PERLY_PAREN_CLOSE mblock cont - { - $$ = block_end($remember, - newFOROP(0, NULL, $mexpr, $mblock, $cont)); - parser->copline = (line_t)$KW_FOR; - } - | KW_TRY mblock[try] KW_CATCH remember catch_paren[scalar] - { - if(!$scalar) { - yyerror("catch block requires a (VAR)"); - YYERROR; - } - } - mblock[catch] finally - { - $$ = newTRYCATCHOP(0, - $try, $scalar, block_end($remember, op_scope($catch))); - if($finally) - $$ = op_wrap_finally($$, $finally); - parser->copline = (line_t)$KW_TRY; - } - | block cont - { - /* a block is a loop that happens once */ - $$ = newWHILEOP(0, 1, NULL, - NULL, $block, $cont, 0); - } - | KW_PACKAGE BAREWORD[version] BAREWORD[package] PERLY_BRACE_OPEN remember - { - package($package); - if ($version) { - package_version($version); - } - } - stmtseq PERLY_BRACE_CLOSE - { - /* a block is a loop that happens once */ - $$ = newWHILEOP(0, 1, NULL, - NULL, block_end($remember, $stmtseq), NULL, 0); - if (parser->copline > (line_t)$PERLY_BRACE_OPEN) - parser->copline = (line_t)$PERLY_BRACE_OPEN; - } - | KW_CLASS BAREWORD[version] BAREWORD[package] subattrlist PERLY_BRACE_OPEN remember - { - package($package); - - if ($version) { - package_version($version); - } - class_setup_stash(PL_curstash); - if ($subattrlist) { - class_apply_attributes(PL_curstash, $subattrlist); - } - } - stmtseq PERLY_BRACE_CLOSE - { - /* a block is a loop that happens once */ - $$ = newWHILEOP(0, 1, NULL, - NULL, block_end($remember, $stmtseq), NULL, 0); - if (parser->copline > (line_t)$PERLY_BRACE_OPEN) - parser->copline = (line_t)$PERLY_BRACE_OPEN; - } - | fielddecl PERLY_SEMICOLON - { - $$ = $fielddecl; - } - | sideff PERLY_SEMICOLON - { - $$ = $sideff; - } - | KW_DEFER mblock - { - $$ = newDEFEROP(0, op_scope($2)); - } - | YADAYADA PERLY_SEMICOLON - { - /* diag_listed_as: Unimplemented */ - $$ = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0), - newSVOP(OP_CONST, 0, newSVpvs("Unimplemented"))); - } - | PERLY_SEMICOLON - { - $$ = NULL; - parser->copline = NOLINE; - } +/* A bare statement, lacking label and other aspects of state op + * + * Maintain rule as simple alternatives of single nonterminals, + * leveraging bison's default action: $$ = $1. + * + * Try to keep nonterminals alphabetically sorted. + */ +barestmt + : PLUGSTMT + | bare_statement_block + | bare_statement_class_declaration + | bare_statement_class_definition + | bare_statement_default + | bare_statement_defer + | bare_statement_expression + | bare_statement_field_declaration + | bare_statement_for + | bare_statement_format + | bare_statement_given + | bare_statement_if + | bare_statement_null + | bare_statement_package_declaration + | bare_statement_package_definition + | bare_statement_phaser + | bare_statement_sub_signature + | bare_statement_sub_traditional + | bare_statement_try_catch + | bare_statement_unless + | bare_statement_until + | bare_statement_utilize + | bare_statement_when + | bare_statement_while + | bare_statement_yadayada ; /* Format line */ @@ -679,9 +935,11 @@ sideff : error | expr[body] { $$ = $body; } | expr[body] KW_IF condition - { $$ = newLOGOP(OP_AND, 0, $condition, $body); } + { $$ = newLOGOP(OP_AND, OPpSTATEMENT<<8, + $condition, $body); } | expr[body] KW_UNLESS condition - { $$ = newLOGOP(OP_OR, 0, $condition, $body); } + { $$ = newLOGOP(OP_OR, OPpSTATEMENT<<8, + $condition, $body); } | expr[body] KW_WHILE condition { $$ = newLOOPOP(OPf_PARENS, 1, scalar($condition), $body); } | expr[body] KW_UNTIL iexpr @@ -703,7 +961,7 @@ else } | KW_ELSIF PERLY_PAREN_OPEN mexpr PERLY_PAREN_CLOSE mblock else[else.recurse] { parser->copline = (line_t)$KW_ELSIF; - $$ = newCONDOP(0, + $$ = newCONDOP(OPpSTATEMENT<<8, newSTATEOP(OPf_SPECIAL,NULL,$mexpr), op_scope($mblock), $[else.recurse]); PL_hints |= HINT_BLOCK_SCOPE; @@ -791,15 +1049,15 @@ subname : BAREWORD /* Subroutine prototype */ proto : empty - | THING + | PROTOTYPE ; /* Optional list of subroutine attributes */ subattrlist : empty - | COLONATTR THING + | COLONATTR ATTRLIST { - OP *attrlist = $THING; + OP *attrlist = $ATTRLIST; if(attrlist && !PL_parser->sig_seen) attrlist = apply_builtin_cv_attributes(PL_compcv, attrlist); $$ = attrlist; @@ -808,13 +1066,17 @@ subattrlist { $$ = NULL; } ; -/* List of attributes for a "my" variable declaration */ -myattrlist: COLONATTR THING - { $$ = $THING; } +/* List of attributes for some other kind of declaration (variables, classes) */ +attrlist: COLONATTR ATTRLIST + { $$ = $ATTRLIST; } | COLONATTR { $$ = NULL; } ; +optattrlist + : empty + | attrlist + ; /* -------------------------------------- @@ -822,10 +1084,10 @@ myattrlist: COLONATTR THING */ /* the '' or 'foo' part of a '$' or '@foo' etc signature variable */ -sigvarname: %empty - { parser->in_my = 0; $$ = NULL; } +sigvar: %empty + { parser->in_my = 0; $$ = 0; } | PRIVATEREF - { parser->in_my = 0; $$ = $PRIVATEREF; } + { parser->in_my = 0; $$ = $PRIVATEREF->op_targ; op_free($PRIVATEREF); } ; sigslurpsigil: @@ -835,40 +1097,57 @@ sigslurpsigil: { $$ = '%'; } /* @, %, @foo, %foo */ -sigslurpelem: sigslurpsigil sigvarname +sigslurpelem: sigslurpsigil sigvar { - subsignature_append_slurpy($sigslurpsigil, $sigvarname); + subsignature_append_slurpy($sigslurpsigil, $sigvar); $$ = NULL; } - | sigslurpsigil sigvarname ASSIGNOP + | sigslurpsigil sigvar ASSIGNOP { yyerror("A slurpy parameter may not have a default value"); } - | sigslurpsigil sigvarname ASSIGNOP term + | sigslurpsigil sigvar ASSIGNOP term { yyerror("A slurpy parameter may not have a default value"); } ; +optcolon: %empty + { $$ = 0; } + | PERLY_COLON + { $$ = ':'; } + ; + /* subroutine signature scalar element: e.g. '$x', '$=', '$x = $default' */ sigscalarelem: - PERLY_DOLLAR sigvarname + optcolon PERLY_DOLLAR sigvar { - subsignature_append_positional($sigvarname, 0, NULL); + if($optcolon) { + PADNAME *pn = PadnamelistARRAY(PL_comppad_name)[$sigvar]; + subsignature_append_named(PadnamePV(pn)+1, $sigvar, 0, NULL); + } + else + subsignature_append_positional($sigvar, 0, NULL); $$ = NULL; } - | PERLY_DOLLAR sigvarname ASSIGNOP + | optcolon PERLY_DOLLAR sigvar ASSIGNOP optsigscalardefault { - subsignature_append_positional($sigvarname, $ASSIGNOP, newOP(OP_NULL, 0)); - $$ = NULL; - } - | PERLY_DOLLAR sigvarname ASSIGNOP term[defop] - { - subsignature_append_positional($sigvarname, $ASSIGNOP, $defop); + if($optcolon) { + PADNAME *pn = PadnamelistARRAY(PL_comppad_name)[$sigvar]; + subsignature_append_named(PadnamePV(pn)+1, $sigvar, $ASSIGNOP, $optsigscalardefault); + } + else + subsignature_append_positional($sigvar, $ASSIGNOP, $optsigscalardefault); $$ = NULL; } ; +optsigscalardefault: + %empty + { $$ = newOP(OP_NULL, 0); } + | term + ; + /* subroutine signature element: e.g. '$x = $default' or '%h' */ sigelem: sigscalarelem @@ -1259,14 +1538,20 @@ anonymous | KW_SUB_anon startanonsub proto subattrlist subbody %prec PERLY_PAREN_OPEN { SvREFCNT_inc_simple_void(PL_compcv); $$ = newANONATTRSUB($startanonsub, $proto, $subattrlist, $subbody); } + | KW_SUB_anon startanonsub proto subattrlist %prec PERLY_PAREN_OPEN + { yyerror("Illegal declaration of anonymous subroutine"); YYERROR; } | KW_SUB_anon_sig startanonsub subattrlist sigsubbody %prec PERLY_PAREN_OPEN { SvREFCNT_inc_simple_void(PL_compcv); $$ = newANONATTRSUB($startanonsub, NULL, $subattrlist, $sigsubbody); } + | KW_SUB_anon_sig startanonsub subattrlist %prec PERLY_PAREN_OPEN + { yyerror("Illegal declaration of anonymous subroutine"); YYERROR; } | KW_METHOD_anon startanonmethod subattrlist sigsubbody %prec PERLY_PAREN_OPEN { SvREFCNT_inc_simple_void(PL_compcv); $$ = newANONATTRSUB($startanonmethod, NULL, $subattrlist, $sigsubbody); } + | KW_METHOD_anon startanonmethod subattrlist %prec PERLY_PAREN_OPEN + { yyerror("Illegal declaration of anonymous subroutine"); YYERROR; } ; /* Things called with "do" */ @@ -1431,12 +1716,12 @@ term[product] : termbinop /* "my" declarations, with optional attributes */ myattrterm - : KW_MY myterm myattrlist - { $$ = my_attrs($myterm,$myattrlist); } + : KW_MY myterm attrlist + { $$ = my_attrs($myterm,$attrlist); } | KW_MY myterm { $$ = localize($myterm,1); } - | KW_MY REFGEN myterm myattrlist - { $$ = newUNOP(OP_REFGEN, 0, my_attrs($myterm,$myattrlist)); } + | KW_MY REFGEN myterm attrlist + { $$ = newUNOP(OP_REFGEN, 0, my_attrs($myterm,$attrlist)); } | KW_MY REFGEN term[operand] { $$ = newUNOP(OP_REFGEN, 0, localize($operand,1)); } ; @@ -1473,27 +1758,19 @@ fieldvar: scalar %prec PERLY_PAREN_OPEN } ; -optfieldattrlist: - COLONATTR THING - { $$ = $THING; } - | COLONATTR - { $$ = NULL; } - | empty - ; - fielddecl - : KW_FIELD fieldvar optfieldattrlist + : KW_FIELD fieldvar optattrlist { parser->in_my = 0; - if($optfieldattrlist) - class_apply_field_attributes((PADNAME *)$fieldvar, $optfieldattrlist); + if($optattrlist) + class_apply_field_attributes((PADNAME *)$fieldvar, $optattrlist); $$ = newOP(OP_NULL, 0); } - | KW_FIELD fieldvar optfieldattrlist ASSIGNOP + | KW_FIELD fieldvar optattrlist ASSIGNOP { parser->in_my = 0; - if($optfieldattrlist) - class_apply_field_attributes((PADNAME *)$fieldvar, $optfieldattrlist); + if($optattrlist) + class_apply_field_attributes((PADNAME *)$fieldvar, $optattrlist); ENTER; class_prepare_initfield_parse(); } @@ -1528,17 +1805,25 @@ my_scalar: scalar ; /* A list of scalars for "for my ($foo, $bar) (@baz)" */ -list_of_scalars: list_of_scalars[list] PERLY_COMMA +list_of_itervars: list_of_itervars[list] PERLY_COMMA { $$ = $list; } - | list_of_scalars[list] PERLY_COMMA scalar + | list_of_itervars[list] PERLY_COMMA scalar { $$ = op_append_elem(OP_LIST, $list, $scalar); } + | list_of_itervars[list] PERLY_COMMA REFGEN my_var + { + $$ = op_append_elem(OP_LIST, $list, newUNOP(OP_REFGEN, 0, $my_var)); + } | scalar %prec PREC_LOW + | REFGEN my_var %prec PREC_LOW + { + $$ = newUNOP(OP_REFGEN, 0, $my_var); + } ; -my_list_of_scalars: list_of_scalars - { parser->in_my = 0; $$ = $list_of_scalars; } +my_list_of_itervars: list_of_itervars + { parser->in_my = 0; $$ = $list_of_itervars; } ; my_var : scalar Index: gnu/usr.bin/perl/pp.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/pp.c,v diff -u -p -a -u -p -r1.43 pp.c --- gnu/usr.bin/perl/pp.c 26 Dec 2025 22:15:22 -0000 1.43 +++ gnu/usr.bin/perl/pp.c 16 Nov 2026 00:57:39 -0000 @@ -217,10 +217,10 @@ GV * Perl_softref2xv(pTHX_ SV *const sv, const char *const what, const svtype type) { - GV *gv; - PERL_ARGS_ASSERT_SOFTREF2XV; + GV *gv; + if (PL_op->op_private & HINT_STRICT_REFS) { if (SvOK(sv)) die(PL_no_symref_sv, sv, @@ -499,13 +499,13 @@ PP(pp_refgen) } -STATIC SV* +static SV* S_refto(pTHX_ SV *sv) { - SV* rv; - PERL_ARGS_ASSERT_REFTO; + SV* rv; + if (SvTYPE(sv) == SVt_PVLV && LvTYPE(sv) == 'y') { if (LvTARGLEN(sv)) vivify_defelem(sv); @@ -758,12 +758,12 @@ PP_wrapped(pp_trans, ((PL_op->op_flags & static size_t S_do_chomp(pTHX_ SV *retval, SV *sv, bool chomping) { + PERL_ARGS_ASSERT_DO_CHOMP; + STRLEN len; char *s; size_t count = 0; - PERL_ARGS_ASSERT_DO_CHOMP; - if (chomping && (RsSNARF(PL_rs) || RsRECORD(PL_rs))) return 0; if (SvTYPE(sv) == SVt_PVAV) { @@ -901,7 +901,7 @@ PP(pp_schop) const size_t count = do_chomp(TARG, *PL_stack_sp, chomping); if (chomping) - sv_setiv(TARG, count); + sv_setuv(TARG, count); SvSETMAGIC(TARG); rpp_replace_1_1_NN(TARG); return NORMAL; @@ -919,7 +919,7 @@ PP_wrapped(pp_chop, 0, 1) while (MARK < SP) count += do_chomp(TARG, *++MARK, chomping); if (chomping) - sv_setiv(TARG, count); + sv_setuv(TARG, count); SP = ORIGMARK; XPUSHTARG; RETURN; @@ -1009,9 +1009,6 @@ PP(pp_undef) gp_free(MUTABLE_GV(sv)); Newxz(gp, 1, GP); GvGP_set(sv, gp_ref(gp)); -#ifndef PERL_DONT_CREATE_GVSV - GvSV(sv) = newSV_type(SVt_NULL); -#endif GvLINE(sv) = CopLINE(PL_curcop); GvEGV(sv) = MUTABLE_GV(sv); GvMULTI_on(sv); @@ -1154,7 +1151,7 @@ PP(pp_pow) bool baseuok; UV baseuv; - if (SvUOK(svr)) { + if (SvIsUV(svr)) { power = SvUVX(svr); } else { const IV iv = SvIVX(svr); @@ -1165,7 +1162,7 @@ PP(pp_pow) } } - baseuok = SvUOK(svl); + baseuok = SvIsUV(svl); if (baseuok) { baseuv = SvUVX(svl); } else { @@ -1220,7 +1217,7 @@ PP(pp_pow) on same algorithm as above */ UV result = 1; UV base = baseuv; - const bool odd_power = cBOOL(power & 1); + const bool odd_power = isODD(power); if (odd_power) { result *= base; } @@ -1336,23 +1333,12 @@ PP(pp_multiply) U32 flags = (svl->sv_flags & svr->sv_flags); if (flags & SVf_IOK) { /* both args are simple IVs */ - UV topl, topr; + IV result; il = SvIVX(svl); ir = SvIVX(svr); do_iv: - topl = ((UV)il) >> (UVSIZE * 4 - 1); - topr = ((UV)ir) >> (UVSIZE * 4 - 1); - - /* if both are in a range that can't under/overflow, do a - * simple integer multiply: if the top halves(*) of both numbers - * are 00...00 or 11...11, then it's safe. - * (*) for 32-bits, the "top half" is the top 17 bits, - * for 64-bits, its 33 bits */ - if (!( - ((topl+1) | (topr+1)) - & ( (((UV)1) << (UVSIZE * 4 + 1)) - 2) /* 11..110 */ - )) { - TARGi(il * ir, 0); /* args not GMG, so can't be tainted */ + if (!S_iv_mul_may_overflow(il, ir, &result)) { + TARGi(result, 0); /* args not GMG, so can't be tainted */ goto ret; } goto generic; @@ -1386,14 +1372,11 @@ PP(pp_multiply) we know the left is integer. */ /* Left operand is defined, so is it IV? */ if (SvIV_please_nomg(svl)) { - bool auvok = SvUOK(svl); - bool buvok = SvUOK(svr); - const UV topmask = (~ (UV)0) << (4 * sizeof (UV)); - const UV botmask = ~((~ (UV)0) << (4 * sizeof (UV))); + bool auvok = SvIsUV(svl); + bool buvok = SvIsUV(svr); UV alow; - UV ahigh; UV blow; - UV bhigh; + UV product; if (auvok) { alow = SvUVX(svl); @@ -1420,19 +1403,7 @@ PP(pp_multiply) } } - /* If this does sign extension on unsigned it's time for plan B */ - ahigh = alow >> (4 * sizeof (UV)); - alow &= botmask; - bhigh = blow >> (4 * sizeof (UV)); - blow &= botmask; - if (ahigh && bhigh) { - NOOP; - /* eg 32 bit is at least 0x10000 * 0x10000 == 0x100000000 - which is overflow. Drop to NVs below. */ - } else if (!ahigh && !bhigh) { - /* eg 32 bit is at most 0xFFFF * 0xFFFF == 0xFFFE0001 - so the unsigned multiply cannot overflow. */ - const UV product = alow * blow; + if (!S_uv_mul_overflow(alow, blow, &product)) { if (auvok == buvok) { /* -ve * -ve or +ve * +ve gives a +ve result. */ TARGu(product, 1); @@ -1442,49 +1413,13 @@ PP(pp_multiply) TARGi(NEGATE_2IV(product), 1); goto ret; } /* else drop to NVs below. */ - } else { - /* One operand is large, 1 small */ - UV product_middle; - if (bhigh) { - /* swap the operands */ - ahigh = bhigh; - bhigh = blow; /* bhigh now the temp var for the swap */ - blow = alow; - alow = bhigh; - } - /* now, ((ahigh * blow) << half_UV_len) + (alow * blow) - multiplies can't overflow. shift can, add can, -ve can. */ - product_middle = ahigh * blow; - if (!(product_middle & topmask)) { - /* OK, (ahigh * blow) won't lose bits when we shift it. */ - UV product_low; - product_middle <<= (4 * sizeof (UV)); - product_low = alow * blow; - - /* as for pp_add, UV + something mustn't get smaller. - IIRC ANSI mandates this wrapping *behaviour* for - unsigned whatever the actual representation*/ - product_low += product_middle; - if (product_low >= product_middle) { - /* didn't overflow */ - if (auvok == buvok) { - /* -ve * -ve or +ve * +ve gives a +ve result. */ - TARGu(product_low, 1); - goto ret; - } else if (product_low <= ABS_IV_MIN) { - /* -ve result, which could overflow an IV */ - TARGi(NEGATE_2IV(product_low), 1); - goto ret; - } /* else drop to NVs below. */ - } - } /* product_middle too large */ } /* ahigh && bhigh */ } /* SvIOK(svl) */ } /* SvIOK(svr) */ #endif { - NV right = SvNV_nomg(svr); NV left = SvNV_nomg(svl); + NV right = SvNV_nomg(svr); NV result = left * right; #if defined(__sgi) && defined(USE_LONG_DOUBLE) && LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE && NVSIZE == 16 @@ -1531,8 +1466,8 @@ PP(pp_divide) #ifdef PERL_TRY_UV_DIVIDE if (SvIV_please_nomg(svr) && SvIV_please_nomg(svl)) { - bool left_non_neg = SvUOK(svl); - bool right_non_neg = SvUOK(svr); + bool left_non_neg = SvIsUV(svl); + bool right_non_neg = SvIsUV(svr); UV left; UV right; @@ -1611,8 +1546,8 @@ PP(pp_divide) } /* one operand wasn't SvIOK */ #endif /* PERL_TRY_UV_DIVIDE */ { - NV right = SvNV_nomg(svr); NV left = SvNV_nomg(svl); + NV right = SvNV_nomg(svr); #if defined(NAN_COMPARE_BROKEN) && defined(Perl_isnan) if (! Perl_isnan(right) && right == 0.0) #else @@ -1650,7 +1585,7 @@ PP(pp_modulo) SV * const svr = PL_stack_sp[0]; SV * const svl = PL_stack_sp[-1]; if (SvIV_please_nomg(svr)) { - right_neg = !SvUOK(svr); + right_neg = !SvIsUV(svr); if (!right_neg) { right = SvUVX(svr); } else { @@ -1680,7 +1615,7 @@ PP(pp_modulo) a UV. In range NV has been rounded down to nearest UV and use_double false. */ if (!use_double && SvIV_please_nomg(svl)) { - left_neg = !SvUOK(svl); + left_neg = !SvIsUV(svl); if (!left_neg) { left = SvUVX(svl); } else { @@ -1919,7 +1854,7 @@ PP(pp_subtract) SV *svr = PL_stack_sp[0]; SV *svl = PL_stack_sp[-1]; - + NV nv; #ifdef PERL_PRESERVE_IVUV @@ -1929,18 +1864,12 @@ PP(pp_subtract) U32 flags = (svl->sv_flags & svr->sv_flags); if (flags & SVf_IOK) { /* both args are simple IVs */ - UV topl, topr; + IV result; il = SvIVX(svl); ir = SvIVX(svr); do_iv: - topl = ((UV)il) >> (UVSIZE * 8 - 2); - topr = ((UV)ir) >> (UVSIZE * 8 - 2); - - /* if both are in a range that can't under/overflow, do a - * simple integer subtract: if the top of both numbers - * are 00 or 11, then it's safe */ - if (!( ((topl+1) | (topr+1)) & 2)) { - TARGi(il - ir, 0); /* args not GMG, so can't be tainted */ + if (!S_iv_sub_may_overflow(il, ir, &result)) { + TARGi(result, 0); /* args not GMG, so can't be tainted */ goto ret; } goto generic; @@ -1979,7 +1908,7 @@ PP(pp_subtract) } else { /* Left operand is defined, so is it IV? */ if (SvIV_please_nomg(svl)) { - if ((auvok = SvUOK(svl))) + if ((auvok = SvIsUV(svl))) auv = SvUVX(svl); else { const IV aiv = SvIVX(svl); @@ -1997,7 +1926,7 @@ PP(pp_subtract) bool result_good = 0; UV result; UV buv; - bool buvok = SvUOK(svr); + bool buvok = SvIsUV(svr); /* svr is always IOK here */ if (buvok) buv = SvUVX(svr); @@ -2050,7 +1979,8 @@ PP(pp_subtract) TARGi(NEGATE_2IV(result), 1); else { /* result valid, but out of range for IV. */ - TARGn(-(NV)result, 1); + nv = -(NV)result; + goto ret_nv; } } goto ret; @@ -2060,17 +1990,14 @@ PP(pp_subtract) #else useleft = USE_LEFT(svl); #endif - { - NV value = SvNV_nomg(svr); - if (!useleft) { - /* left operand is undef, treat as zero - value */ - TARGn(-value, 1); - goto ret; - } - TARGn(SvNV_nomg(svl) - value, 1); - goto ret; - } + /* If left operand is undef, treat as zero - value */ + nv = useleft ? SvNV_nomg(svl) : 0.0; + /* Separate statements here to ensure SvNV_nomg(svl) is evaluated + before SvNV_nomg(svr) */ + nv -= SvNV_nomg(svr); + ret_nv: + TARGn(nv, 1); ret: rpp_replace_2_1_NN(targ); @@ -2078,9 +2005,6 @@ PP(pp_subtract) } - -#define IV_BITS (IVSIZE * 8) - /* Taking the right operand of bitwise shift operators, returns an int * indicating the shift amount clipped to the range [-IV_BITS, +IV_BITS]. */ @@ -2318,9 +2242,9 @@ Perl_do_ncmp(pTHX_ SV* const left, SV * #ifdef PERL_PRESERVE_IVUV /* Fortunately it seems NaN isn't IOK */ if (SvIV_please_nomg(right) && SvIV_please_nomg(left)) { - if (!SvUOK(left)) { + if (!SvIsUV(left)) { const IV leftiv = SvIVX(left); - if (!SvUOK(right)) { + if (!SvIsUV(right)) { /* ## IV <=> IV ## */ const IV rightiv = SvIVX(right); return (leftiv > rightiv) - (leftiv < rightiv); @@ -2335,7 +2259,7 @@ Perl_do_ncmp(pTHX_ SV* const left, SV * } } - if (SvUOK(right)) { + if (SvIsUV(right)) { /* ## UV <=> UV ## */ const UV leftuv = SvUVX(left); const UV rightuv = SvUVX(right); @@ -2356,8 +2280,8 @@ Perl_do_ncmp(pTHX_ SV* const left, SV * } #endif { - NV const rnv = SvNV_nomg(right); NV const lnv = SvNV_nomg(left); + NV const rnv = SvNV_nomg(right); #if defined(NAN_COMPARE_BROKEN) && defined(Perl_isnan) if (Perl_isnan(lnv) || Perl_isnan(rnv)) { @@ -2888,8 +2812,8 @@ PP(pp_i_multiply) if (rpp_try_AMAGIC_2(mult_amg, AMGf_assign)) return NORMAL; - IV right = SvIV_nomg(PL_stack_sp[0]); IV left = SvIV_nomg(PL_stack_sp[-1]); + IV right = SvIV_nomg(PL_stack_sp[0]); TARGi((IV)((UV)left * (UV)right), 1); rpp_replace_2_1_NN(targ); @@ -2910,10 +2834,10 @@ PP(pp_i_divide) SV *left = PL_stack_sp[-1]; { + IV num = SvIV_nomg(left); IV value = SvIV_nomg(right); if (value == 0) DIE(aTHX_ "Illegal division by zero"); - IV num = SvIV_nomg(left); /* avoid FPE_INTOVF on some platforms when num is IV_MIN */ if (value == -1) @@ -2936,8 +2860,8 @@ PP(pp_i_modulo) if (rpp_try_AMAGIC_2(modulo_amg, AMGf_assign)) return NORMAL; - IV right = SvIV_nomg(PL_stack_sp[0]); IV left = SvIV_nomg(PL_stack_sp[-1]); + IV right = SvIV_nomg(PL_stack_sp[0]); { if (!right) @@ -2962,9 +2886,9 @@ PP(pp_i_add) if (rpp_try_AMAGIC_2(add_amg, AMGf_assign)) return NORMAL; - IV right = SvIV_nomg(PL_stack_sp[0]); SV *leftsv = PL_stack_sp[-1]; IV left = USE_LEFT(leftsv) ? SvIV_nomg(leftsv) : 0; + IV right = SvIV_nomg(PL_stack_sp[0]); TARGi((IV)((UV)left + (UV)right), 1); rpp_replace_2_1_NN(targ); @@ -2981,9 +2905,9 @@ PP(pp_i_subtract) if (rpp_try_AMAGIC_2(subtr_amg, AMGf_assign)) return NORMAL; - IV right = SvIV_nomg(PL_stack_sp[0]); SV *leftsv = PL_stack_sp[-1]; IV left = USE_LEFT(leftsv) ? SvIV_nomg(leftsv) : 0; + IV right = SvIV_nomg(PL_stack_sp[0]); TARGi((IV)((UV)left - (UV)right), 1); rpp_replace_2_1_NN(targ); @@ -2996,8 +2920,8 @@ PP(pp_i_lt) if (rpp_try_AMAGIC_2(lt_amg, 0)) return NORMAL; - IV right = SvIV_nomg(PL_stack_sp[0]); IV left = SvIV_nomg(PL_stack_sp[-1]); + IV right = SvIV_nomg(PL_stack_sp[0]); rpp_replace_2_IMM_NN(boolSV(left < right)); return NORMAL; @@ -3009,8 +2933,8 @@ PP(pp_i_gt) if (rpp_try_AMAGIC_2(gt_amg, 0)) return NORMAL; - IV right = SvIV_nomg(PL_stack_sp[0]); IV left = SvIV_nomg(PL_stack_sp[-1]); + IV right = SvIV_nomg(PL_stack_sp[0]); rpp_replace_2_IMM_NN(boolSV(left > right)); return NORMAL; @@ -3022,8 +2946,8 @@ PP(pp_i_le) if (rpp_try_AMAGIC_2(le_amg, 0)) return NORMAL; - IV right = SvIV_nomg(PL_stack_sp[0]); IV left = SvIV_nomg(PL_stack_sp[-1]); + IV right = SvIV_nomg(PL_stack_sp[0]); rpp_replace_2_IMM_NN(boolSV(left <= right)); return NORMAL; @@ -3035,8 +2959,8 @@ PP(pp_i_ge) if (rpp_try_AMAGIC_2(ge_amg, 0)) return NORMAL; - IV right = SvIV_nomg(PL_stack_sp[0]); IV left = SvIV_nomg(PL_stack_sp[-1]); + IV right = SvIV_nomg(PL_stack_sp[0]); rpp_replace_2_IMM_NN(boolSV(left >= right)); return NORMAL; @@ -3048,8 +2972,8 @@ PP(pp_i_eq) if (rpp_try_AMAGIC_2(eq_amg, 0)) return NORMAL; - IV right = SvIV_nomg(PL_stack_sp[0]); IV left = SvIV_nomg(PL_stack_sp[-1]); + IV right = SvIV_nomg(PL_stack_sp[0]); rpp_replace_2_IMM_NN(boolSV(left == right)); return NORMAL; @@ -3061,8 +2985,8 @@ PP(pp_i_ne) if (rpp_try_AMAGIC_2(ne_amg, 0)) return NORMAL; - IV right = SvIV_nomg(PL_stack_sp[0]); IV left = SvIV_nomg(PL_stack_sp[-1]); + IV right = SvIV_nomg(PL_stack_sp[0]); rpp_replace_2_IMM_NN(boolSV(left != right)); return NORMAL; @@ -3075,8 +2999,8 @@ PP(pp_i_ncmp) if (rpp_try_AMAGIC_2(ncmp_amg, 0)) return NORMAL; - IV right = SvIV_nomg(PL_stack_sp[0]); IV left = SvIV_nomg(PL_stack_sp[-1]); + IV right = SvIV_nomg(PL_stack_sp[0]); { @@ -3122,8 +3046,8 @@ PP(pp_atan2) if (rpp_try_AMAGIC_2(atan2_amg, 0)) return NORMAL; - NV right = SvNV_nomg(PL_stack_sp[0]); NV left = SvNV_nomg(PL_stack_sp[-1]); + NV right = SvNV_nomg(PL_stack_sp[0]); TARGn(Perl_atan2(left, right), 1); rpp_replace_2_1_NN(targ); @@ -3522,11 +3446,11 @@ Perl_translate_substr_offsets( STRLEN cu bool len_is_uv, STRLEN *posp, STRLEN *lenp) { + PERL_ARGS_ASSERT_TRANSLATE_SUBSTR_OFFSETS; + IV pos2_iv; int pos2_is_uv; - PERL_ARGS_ASSERT_TRANSLATE_SUBSTR_OFFSETS; - if (!pos1_is_uv && pos1_iv < 0 && curlen) { pos1_is_uv = curlen-1 > ~(UV)pos1_iv; pos1_iv += curlen; @@ -3928,7 +3852,7 @@ PP(pp_index) * the routine that contains the new byte string, and donate it * to temp to ensure it will get free()d */ if (free_little_p) { - little = temp = newSV_type(SVt_NULL); + little = temp = newSV_type(SVt_PV); sv_usepvn(temp, (char *) little_p, llen); little_p = SvPVX_const(little); } @@ -4224,16 +4148,16 @@ PP_wrapped(pp_ucfirst, 1, 0) if (op_type == OP_UCFIRST) { #ifdef USE_LOCALE_CTYPE - _toTITLE_utf8_flags(s, s +slen, tmpbuf, &tculen, IN_LC_RUNTIME(LC_CTYPE)); + toTITLE_utf8_flags_(s, s +slen, tmpbuf, &tculen, IN_LC_RUNTIME(LC_CTYPE)); #else - _toTITLE_utf8_flags(s, s +slen, tmpbuf, &tculen, 0); + toTITLE_utf8_flags_(s, s +slen, tmpbuf, &tculen, 0); #endif } else { #ifdef USE_LOCALE_CTYPE - _toLOWER_utf8_flags(s, s + slen, tmpbuf, &tculen, IN_LC_RUNTIME(LC_CTYPE)); + toLOWER_utf8_flags_(s, s + slen, tmpbuf, &tculen, IN_LC_RUNTIME(LC_CTYPE)); /* In turkic locales, lower casing an 'I' normally yields U+0131, * LATIN SMALL LETTER DOTLESS I, but not if the grapheme also @@ -4265,7 +4189,7 @@ PP_wrapped(pp_ucfirst, 1, 0) #else PERL_UNUSED_VAR(remove_dot_above); - _toLOWER_utf8_flags(s, s + slen, tmpbuf, &tculen, 0); + toLOWER_utf8_flags_(s, s + slen, tmpbuf, &tculen, 0); #endif } @@ -4344,7 +4268,7 @@ PP_wrapped(pp_ucfirst, 1, 0) do_uni_rules: #endif - title_ord = _to_upper_title_latin1(*s, tmpbuf, &tculen, 's'); + title_ord = to_upper_title_latin1_(*s, tmpbuf, &tculen, 's'); if (tculen > 1) { assert(tculen == 2); @@ -4584,7 +4508,6 @@ PP_wrapped(pp_uc, 1, 0) U8 tmpbuf[UTF8_MAXBYTES_CASE+1]; #define GREEK_CAPITAL_LETTER_IOTA 0x0399 -#define COMBINING_GREEK_YPOGEGRAMMENI 0x0345 /* All occurrences of these are to be moved to follow any other marks. * This is context-dependent. We may not be passed enough context to * move the iota subscript beyond all of them, but we do the best we can @@ -4598,13 +4521,13 @@ PP_wrapped(pp_uc, 1, 0) bool in_iota_subscript = FALSE; while (s < send) { - STRLEN u; - STRLEN ulen; + STRLEN this_len; + STRLEN upper_len; UV uv; if (UNLIKELY(in_iota_subscript)) { - UV cp = utf8_to_uv_or_die(s, send, NULL); + UV cp = utf8_to_uv_or_die(s, send, &this_len); - if (! _invlist_contains_cp(PL_utf8_mark, cp)) { + if (! invlist_contains_cp_(PL_utf8_mark, cp)) { /* A non-mark. Time to output the iota subscript */ *d++ = UTF8_TWO_BYTE_HI(GREEK_CAPITAL_LETTER_IOTA); @@ -4612,24 +4535,28 @@ PP_wrapped(pp_uc, 1, 0) in_iota_subscript = FALSE; } } + else { + this_len = UTF8SKIP(s); + } /* Then handle the current character. Get the changed case value * and copy it to the output buffer */ - u = UTF8SKIP(s); #ifdef USE_LOCALE_CTYPE - uv = _toUPPER_utf8_flags(s, send, tmpbuf, &ulen, IN_LC_RUNTIME(LC_CTYPE)); + uv = toUPPER_utf8_flags_(s, send, tmpbuf, &upper_len, + IN_LC_RUNTIME(LC_CTYPE)); #else - uv = _toUPPER_utf8_flags(s, send, tmpbuf, &ulen, 0); + uv = toUPPER_utf8_flags_(s, send, tmpbuf, &upper_len, 0); #endif - if ( uv == GREEK_CAPITAL_LETTER_IOTA - && utf8_to_uv_or_die(s, send, 0) == - COMBINING_GREEK_YPOGEGRAMMENI) + if ( UNLIKELY(uv == GREEK_CAPITAL_LETTER_IOTA) + && memBEGINs(s, this_len, COMBINING_GREEK_YPOGEGRAMMENI_UTF8)) { in_iota_subscript = TRUE; } else { - if (ulen > u && (SvLEN(dest) < (min += ulen - u))) { + if ( upper_len > this_len + && (SvLEN(dest) < (min += upper_len - this_len))) + { /* If the eventually required minimum size outgrows the * available space, we need to grow. */ const UV o = d - (U8*)SvPVX_const(dest); @@ -4642,10 +4569,10 @@ PP_wrapped(pp_uc, 1, 0) * another option */ d = o + (U8*) SvGROW(dest, min); } - Copy(tmpbuf, d, ulen, U8); - d += ulen; + Copy(tmpbuf, d, upper_len, U8); + d += upper_len; } - s += u; + s += this_len; } if (in_iota_subscript) { *d++ = UTF8_TWO_BYTE_HI(GREEK_CAPITAL_LETTER_IOTA); @@ -4805,7 +4732,7 @@ PP_wrapped(pp_uc, 1, 0) *d++ = UTF8_TWO_BYTE_LO(LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE); } else { - (void) _to_upper_title_latin1(*s, d, &len, 'S'); + (void) to_upper_title_latin1_(*s, d, &len, 'S'); d += len; } } @@ -4813,7 +4740,7 @@ PP_wrapped(pp_uc, 1, 0) else #endif for (; s < send; s++) { - (void) _to_upper_title_latin1(*s, d, &len, 'S'); + (void) to_upper_title_latin1_(*s, d, &len, 'S'); d += len; } @@ -4939,12 +4866,13 @@ PP_wrapped(pp_lc, 1, 0) bool remove_dot_above = FALSE; while (s < send) { - const STRLEN u = UTF8SKIP(s); - STRLEN ulen; + const STRLEN this_len = UTF8SKIP(s); + STRLEN lower_len; #ifdef USE_LOCALE_CTYPE - _toLOWER_utf8_flags(s, send, tmpbuf, &ulen, IN_LC_RUNTIME(LC_CTYPE)); + toLOWER_utf8_flags_(s, send, tmpbuf, &lower_len, + IN_LC_RUNTIME(LC_CTYPE)); /* If we are in a Turkic locale, we have to do more work. As noted * in the comments for lcfirst, there is a special case if a 'I' @@ -4953,15 +4881,16 @@ PP_wrapped(pp_lc, 1, 0) * and set a flag if the DOT is there. Then each time through the * loop, we have to see if we need to remove the next DOT above, * and if so, do it. We know that there is a DOT because - * _toLOWER_utf8_flags() wouldn't have returned 'i' unless there + * toLOWER_utf8_flags_() wouldn't have returned 'i' unless there * was one in a proper position. */ if ( UNLIKELY(IN_UTF8_TURKIC_LOCALE) && IN_LC_RUNTIME(LC_CTYPE)) { if ( UNLIKELY(remove_dot_above) - && memBEGINs(tmpbuf, sizeof(tmpbuf), COMBINING_DOT_ABOVE_UTF8)) + && memBEGINs(tmpbuf, sizeof(tmpbuf), + COMBINING_DOT_ABOVE_UTF8)) { - s += u; + s += this_len; remove_dot_above = FALSE; continue; } @@ -4972,15 +4901,16 @@ PP_wrapped(pp_lc, 1, 0) #else PERL_UNUSED_VAR(remove_dot_above); - _toLOWER_utf8_flags(s, send, tmpbuf, &ulen, 0); + toLOWER_utf8_flags_(s, send, tmpbuf, &lower_len, 0); #endif /* Here is where we would do context-sensitive actions for the * Greek final sigma. See the commit message for 86510fb15 for why * there isn't any */ - if (ulen > u && (SvLEN(dest) < (min += ulen - u))) { - + if ( lower_len > this_len + && (SvLEN(dest) < (min += lower_len - this_len))) + { /* If the eventually required minimum size outgrows the * available space, we need to grow. */ const UV o = d - (U8*)SvPVX_const(dest); @@ -4996,9 +4926,9 @@ PP_wrapped(pp_lc, 1, 0) /* Copy the newly lowercased letter to the output buffer we're * building */ - Copy(tmpbuf, d, ulen, U8); - d += ulen; - s += u; + Copy(tmpbuf, d, lower_len, U8); + d += lower_len; + s += this_len; } /* End of looping through the source string */ SvUTF8_on(dest); *d = '\0'; @@ -5078,7 +5008,7 @@ PP(pp_quotemeta) bool to_quote = FALSE; if (UTF8_IS_INVARIANT(*s)) { - if (_isQUOTEMETA(*s)) { + if (isQUOTEMETA(*s)) { to_quote = TRUE; } } @@ -5091,7 +5021,7 @@ PP(pp_quotemeta) IN_LC_RUNTIME(LC_CTYPE) || #endif - _isQUOTEMETA(EIGHT_BIT_UTF8_TO_NATIVE(*s, *(s + 1)))) + isQUOTEMETA(EIGHT_BIT_UTF8_TO_NATIVE(*s, *(s + 1)))) { to_quote = TRUE; } @@ -5113,7 +5043,7 @@ PP(pp_quotemeta) } else if (IN_UNI_8_BIT) { while (len--) { - if (_isQUOTEMETA(*s)) + if (isQUOTEMETA(*s)) *d++ = '\\'; *d++ = *s++; } @@ -5202,19 +5132,19 @@ PP_wrapped(pp_fc, 1, 0) if (DO_UTF8(source)) { /* UTF-8 flagged string. */ while (s < send) { - const STRLEN u = UTF8SKIP(s); + const STRLEN this_len = UTF8SKIP(s); STRLEN ulen; - _toFOLD_utf8_flags(s, send, tmpbuf, &ulen, flags); + toFOLD_utf8_flags_(s, send, tmpbuf, &ulen, flags); - if (ulen > u && (SvLEN(dest) < (min += ulen - u))) { + if (ulen > this_len && (SvLEN(dest) < (min += ulen - this_len))) { const UV o = d - (U8*)SvPVX_const(dest); d = o + (U8*) SvGROW(dest, min); } Copy(tmpbuf, d, ulen, U8); d += ulen; - s += u; + s += this_len; } SvUTF8_on(dest); } /* Unflagged string */ @@ -5309,7 +5239,7 @@ PP_wrapped(pp_fc, 1, 0) for (; s < send; s++) { STRLEN ulen; - _to_uni_fold_flags(*s, d, &ulen, flags); + to_uni_fold_flags_(*s, d, &ulen, flags); d += ulen; } break; @@ -5539,7 +5469,7 @@ PP_wrapped(pp_akeys, 1, 0) } else { for (i = 0; i <= n; i++) { - SV *const *const elem = Perl_av_fetch(aTHX_ array, i, 0); + SV *const *const elem = av_fetch(array, i, 0); PUSHs(elem ? *elem : &PL_sv_undef); } } @@ -5575,9 +5505,11 @@ PP_wrapped(pp_each, 1, 0) RETURN; } -STATIC OP * +static OP * S_do_delete_local(pTHX) { + PERL_ARGS_ASSERT_DO_DELETE_LOCAL; + dSP; const U8 gimme = GIMME_V; const bool sliced = cBOOL(PL_op->op_private & OPpSLICE); @@ -6193,7 +6125,7 @@ PP_wrapped(pp_splice, 0, 1) const MAGIC * const mg = SvTIED_mg((const SV *)ary, PERL_MAGIC_tied); if (mg) { - return Perl_tied_method(aTHX_ SV_CONST(SPLICE), mark - 1, MUTABLE_SV(ary), mg, + return tied_method(SV_CONST(SPLICE), mark - 1, MUTABLE_SV(ary), mg, GIMME_V | TIED_METHOD_ARGUMENTS_ON_STACK, sp - mark); } @@ -6424,10 +6356,11 @@ PP(pp_push) PL_delaymagic = DM_DELAY; for (++MARK; MARK <= PL_stack_sp; MARK++) { SV *sv; - if (*MARK) SvGETMAGIC(*MARK); - sv = newSV_type(SVt_NULL); - if (*MARK) - sv_setsv_nomg(sv, *MARK); + if (*MARK) { + sv = newSVsv_flags(*MARK, SV_DO_COW_SVSETSV|SV_GMAGIC); + } else + sv = newSV_type(SVt_NULL); + av_store(ary, AvFILLp(ary)+1, sv); } if (PL_delaymagic & DM_ARRAY_ISA) @@ -6530,6 +6463,29 @@ PP(pp_unshift) return NORMAL; } +/* Some pp_reverse helpers for MSVC:*/ +#ifdef _MSC_VER +# pragma intrinsic(_byteswap_ushort, _byteswap_ulong, _byteswap_uint64) +# define S_bswap16(_x) _byteswap_ushort(_x) +# define S_bswap32(_x) _byteswap_ulong(_x) +# define S_bswap64(_x) _byteswap_uint64(_x) +PERL_STATIC_FORCE_INLINE void * + S_memcpy(void *dest, const void *src,size_t count); +#else +# define S_bswap16(_x) _swab_16_(_x) +# define S_bswap32(_x) _swab_32_(_x) +# define S_bswap64(_x) _swab_64_(_x) +# define S_memcpy(_d,_s,_n) memcpy((_d),(_s),(_n)) +#endif +/* this pragma can't be push/pop-ed vs whatever the cmd line to cl.exe was */ +#ifdef _MSC_VER +# pragma intrinsic(memcpy) +void * +S_memcpy(void *dest, const void *src, size_t count) +{ + return memcpy(dest, src, count); +} +#endif PP_wrapped(pp_reverse, 0, 1) { @@ -6556,15 +6512,17 @@ PP_wrapped(pp_reverse, 0, 1) SV *begin, *end; if (can_preserve) { - if (!av_exists(av, i)) { - if (av_exists(av, j)) { + bool exists_i = av_exists(av, i); + bool exists_j = av_exists(av, j); + if (!exists_i) { + if (exists_j) { SV *sv = av_delete(av, j, 0); begin = *av_fetch(av, i, TRUE); sv_setsv_mg(begin, sv); } continue; } - else if (!av_exists(av, j)) { + else if (!exists_j) { SV *sv = av_delete(av, i, 0); end = *av_fetch(av, j, TRUE); sv_setsv_mg(end, sv); @@ -6645,18 +6603,20 @@ PP_wrapped(pp_reverse, 0, 1) * in a single pass, rather than 2-3 passes. */ const char * src = SvPV_const(src_sv, len); + char* tb; /* Prepare the TARG. */ + SV_CHECK_THINKFIRST_COW_DROP(TARG); /* Drops any buffer */ if (SvTYPE(TARG) < SVt_PV) { SvUPGRADE(TARG, SvTYPE(src_sv)); /* No buffer allocation here */ - } else if(SvTHINKFIRST(TARG)) { - SV_CHECK_THINKFIRST_COW_DROP(TARG); /* Drops any buffer */ + } else { + SvSETMAGIC(TARG); } - SvSETMAGIC(TARG); - SvGROW(TARG, len + 1); + + tb = SvGROW(TARG, len + 1); SvCUR_set(TARG, len); SvPOK_only(TARG); - *SvEND(TARG) = '\0'; + tb[len] = '\0'; if (SvTAINTED(src_sv)) SvTAINT(TARG); @@ -6680,10 +6640,69 @@ PP_wrapped(pp_reverse, 0, 1) } } } else { + STRLEN i = 0; + STRLEN j = len; + uint32_t u32_1, u32_2; + uint16_t u16_1, u16_2; char * outp= SvPVX(TARG); - const char *p = src + len; - while (p != src) - *outp++ = *--p; + /* Take a chunk of bytes from the front and from the + * back, reverse the bytes in each and and swap the + * chunks over. This should have generally good + * performance but also is likely to be optimised + * into bswap instructions by the compiler. + */ +#ifdef HAS_QUAD + uint64_t u64_1, u64_2; + while (j - i >= 16) { + memcpy(&u64_1, src + j - 8, 8); + memcpy(&u64_2, src + i, 8); + u64_1 = _swab_64_(u64_1); + u64_2 = _swab_64_(u64_2); + memcpy(outp + j - 8, &u64_2, 8); + memcpy(outp + i, &u64_1, 8); + i += 8; + j -= 8; + } + + if (j - i >= 8) { + memcpy(&u32_1, src + j - 4, 4); + memcpy(&u32_2, src + i, 4); + u32_1 = _swab_32_(u32_1); + u32_2 = _swab_32_(u32_2); + memcpy(outp + j - 4, &u32_2, 4); + memcpy(outp + i, &u32_1, 4); + i += 4; + j -= 4; + } +#else + while (j - i >= 8) { + memcpy(&u32_1, src + j - 4, 4); + memcpy(&u32_2, src + i, 4); + u32_1 = _swab_32_(u32_1); + u32_2 = _swab_32_(u32_2); + memcpy(outp + j - 4, &u32_2, 4); + memcpy(outp + i, &u32_1, 4); + i += 4; + j -= 4; + } +#endif + if (j - i >= 4) { + memcpy(&u16_1, src + j - 2, 2); + memcpy(&u16_2, src + i, 2); + u16_1 = _swab_16_(u16_1); + u16_2 = _swab_16_(u16_2); + memcpy(outp + j - 2, &u16_2, 2); + memcpy(outp + i, &u16_1, 2); + i += 2; + j -= 2; + } + + /* Swap any remaining bytes one by one. */ + while (i < j) { + outp[i] = src[j - 1]; + outp[j - 1] = src[i]; + i++; j--; + } } RETURN; } @@ -6696,8 +6715,8 @@ PP_wrapped(pp_reverse, 0, 1) if (len > 1) { /* The traditional way, operate on the current byte buffer */ - char *down; if (DO_UTF8(TARG)) { /* first reverse each character */ + char *down; U8* s = (U8*)SvPVX(TARG); const U8* send = (U8*)(s + len); while (s < send) { @@ -6706,10 +6725,11 @@ PP_wrapped(pp_reverse, 0, 1) continue; } else { - if (!utf8_to_uvchr_buf(s, send, 0)) + Size_t advance = isUTF8_CHAR(s, send); + if (advance == 0) break; up = (char*)s; - s += UTF8SKIP(s); + s += advance; down = (char*)(s - 1); /* reverse this character */ while (down > up) { @@ -6721,11 +6741,64 @@ PP_wrapped(pp_reverse, 0, 1) } up = SvPVX(TARG); } - down = SvPVX(TARG) + len - 1; - while (down > up) { - const char tmp = *up; - *up++ = *down; - *down-- = tmp; + STRLEN i = 0; + STRLEN j = len; + uint32_t u32_1, u32_2; + uint16_t u16_1, u16_2; + /* Reverse the buffer in place, in chunks where possible */ +#ifdef HAS_QUAD + uint64_t u64_1, u64_2; + while (j - i >= 16) { + memcpy(&u64_1, up + j - 8, 8); + memcpy(&u64_2, up + i, 8); + u64_1 = _swab_64_(u64_1); + u64_2 = _swab_64_(u64_2); + memcpy(up + j - 8, &u64_2, 8); + memcpy(up + i, &u64_1, 8); + i += 8; + j -= 8; + } + + if (j - i >= 8) { + memcpy(&u32_1, up + j - 4, 4); + memcpy(&u32_2, up + i, 4); + u32_1 = _swab_32_(u32_1); + u32_2 = _swab_32_(u32_2); + memcpy(up + j - 4, &u32_2, 4); + memcpy(up + i, &u32_1, 4); + i += 4; + j -= 4; + } +#else + while (j - i >= 8) { + memcpy(&u32_1, up + j - 4, 4); + memcpy(&u32_2, up + i, 4); + u32_1 = _swab_32_(u32_1); + u32_2 = _swab_32_(u32_2); + memcpy(up + j - 4, &u32_2, 4); + memcpy(up + i, &u32_1, 4); + i += 4; + j -= 4; + } +#endif + if (j - i >= 4) { + memcpy(&u16_1, up + j - 2, 2); + memcpy(&u16_2, up + i, 2); + u16_1 = _swab_16_(u16_1); + u16_2 = _swab_16_(u16_2); + memcpy(up + j - 2, &u16_2, 2); + memcpy(up + i, &u16_1, 2); + i += 2; + j -= 2; + } + + /* Finally, swap any remaining bytes one-by-one. */ + while (i < j) { + unsigned char tmp = up[i]; + up[i] = up[j - 1]; + up[j - 1] = tmp; + i++; + j--; } } (void)SvPOK_only_UTF8(TARG); @@ -6733,6 +6806,12 @@ PP_wrapped(pp_reverse, 0, 1) RETURN; } +/* Undefine some pp_reverse helpers */ +#undef S_memcpy +#undef S_bswap16 +#undef S_bswap32 +#undef S_bswap64 + PP_wrapped(pp_split, ( (PL_op->op_private & OPpSPLIT_ASSIGN) && (PL_op->op_flags & OPf_STACKED)) @@ -7705,6 +7784,23 @@ PP(pp_anonconst) } +/* Helper function for use during signature argument handling from @_. + * Replaces elements in an AV with a new SV cloned from the original value + * at each position from startix onwards until endix. + */ +#define av_refresh_elements_range(av, startix, endix) S_av_refresh_elements_range(aTHX_ av, startix, endix) +static void +S_av_refresh_elements_range(pTHX_ AV *av, IV startix, IV endix) +{ + for(IV ix = startix; ix < endix; ix++) { + SV **svp = av_fetch(av, ix, FALSE); + SV *newsv = newSVsv_flags(svp ? *svp : &PL_sv_undef, + (SV_DO_COW_SVSETSV|SV_NOSTEAL)); + if(!av_store(av, ix, newsv)) + SvREFCNT_dec_NN(newsv); + } +} + /* process one subroutine argument - typically when the sub has a signature: * introduce PL_curpad[op_targ] and assign to it the value * for $: (OPf_STACKED ? *sp : $_[N]) @@ -7783,13 +7879,7 @@ PP_wrapped(pp_argelem, * to avoid the equivalent of @a = ($a[0]) prematurely freeing * elements. See similar code in pp_aassign. */ - for (i = 0; i < argc; i++) { - SV **svp = av_fetch(defav, ix + i, FALSE); - SV *newsv = newSVsv_flags(svp ? *svp : &PL_sv_undef, - (SV_DO_COW_SVSETSV|SV_NOSTEAL)); - if (!av_store(defav, ix + i, newsv)) - SvREFCNT_dec_NN(newsv); - } + av_refresh_elements_range(defav, ix, ix + argc); av_clear((AV*)targ); } @@ -7815,13 +7905,7 @@ PP_wrapped(pp_argelem, if (SvRMAGICAL(targ) || HvUSEDKEYS((HV*)targ)) { /* see "target should usually be empty" comment above */ - for (i = 0; i < argc; i++) { - SV **svp = av_fetch(defav, ix + i, FALSE); - SV *newsv = newSVsv_flags(svp ? *svp : &PL_sv_undef, - (SV_DO_COW_SVSETSV|SV_NOSTEAL)); - if (!av_store(defav, ix + i, newsv)) - SvREFCNT_dec_NN(newsv); - } + av_refresh_elements_range(defav, ix, ix + argc); hv_clear((HV*)targ); } @@ -7912,20 +7996,10 @@ S_find_runcv_name(void) * signatured subs. */ -PP(pp_argcheck) +static void +S_check_argc(pTHX_ UV argc, UV params, UV opt_params, char slurpy) { - OP * const o = PL_op; - struct op_argcheck_aux *aux = (struct op_argcheck_aux *)cUNOP_AUXo->op_aux; - UV params = aux->params; - UV opt_params = aux->opt_params; - char slurpy = aux->slurpy; - AV *defav = GvAV(PL_defgv); /* @_ */ - UV argc; - bool too_few; - - assert(!SvMAGICAL(defav)); - argc = (UV)(AvFILLp(defav) + 1); - too_few = (argc < (params - opt_params)); + bool too_few = (argc < (params - opt_params)); if (UNLIKELY(too_few || (!slurpy && argc > params))) @@ -7944,8 +8018,313 @@ PP(pp_argcheck) /* diag_listed_as: Odd name/value argument for subroutine '%s' */ Perl_croak_caller("Odd name/value argument for subroutine '%" SVf "'", S_find_runcv_name()); +} + +PP(pp_argcheck) +{ + OP * const o = PL_op; + struct op_argcheck_aux *aux = (struct op_argcheck_aux *)cUNOP_AUXo->op_aux; + AV *defav = GvAV(PL_defgv); /* @_ */ + + assert(!SvMAGICAL(defav)); + UV argc = (UV)(AvFILLp(defav) + 1); + + S_check_argc(aTHX_ argc, aux->params, aux->opt_params, aux->slurpy); return NORMAL; +} + +/* Helper function for collecting up hash key names for a human-readable + * error message string + */ +#define accumulate_error_names(n_errorsp, error_namesp, namepv, namelen) S_accumulate_error_names(aTHX_ n_errorsp, error_namesp, namepv, namelen) +static void +S_accumulate_error_names(pTHX_ size_t *n_errorsp, SV **error_namesp, const char *namepv, STRLEN namelen) +{ + size_t n_errors = ++(*n_errorsp); + + SV *error_names = (*error_namesp); + if(!error_names) + error_names = (*error_namesp) = newSVpvs_flags("", SVs_TEMP); + + if(n_errors <= 5) { + /* Only bother collecting up the first 5 */ + if(n_errors > 1) + sv_catpvs(error_names, ", "); + sv_catpvf(error_names, "'%" UTF8f "'", UTF8fARG(true, namelen, namepv)); + } +} + +PP(pp_multiparam) +{ + struct op_multiparam_aux *aux = (struct op_multiparam_aux *)cUNOP_AUX->op_aux; + size_t nparams = aux->n_positional; + char slurpy = aux->slurpy; + PADOFFSET *param_padix = aux->param_padix; + AV *defav = GvAV(PL_defgv); /* @_ */ + + assert(!SvMAGICAL(defav)); + size_t argc = (AvFILLp(defav) + 1); + + S_check_argc(aTHX_ argc, nparams, nparams - aux->min_args, + /* if there's no slurpy but we have named params, claim it to be '%' for argcheck */ + slurpy ? slurpy : aux->n_named ? '%' : 0); + + size_t parami; + for(parami = 0; parami < nparams; parami++) { + PADOFFSET padix = param_padix[parami]; + if(!padix) { + if(argc) + argc--; + continue; + } + + SV **padentry = &PAD_SVl(padix); + save_clearsv(padentry); + + if(!argc) { + /* Ran out of arg values for this param. It must be a missing + * optional. Remark that it's missing so a subsequent OP_PARAMTEST + * knows */ + SvPADSTALE_on(*padentry); + continue; + } + + SV **valp = av_fetch(defav, parami, FALSE); + SV *val = valp ? *valp : &PL_sv_undef; + argc--; + + assert(TAINTING_get || !TAINT_get); + if (UNLIKELY(TAINT_get) && !SvTAINTED(val)) + TAINT_NOT; + + SvSetMagicSV(*padentry, val); + } + + if((!slurpy || !aux->slurpy_padix) && !aux->n_named) + return PL_op->op_next; + + /* Now we know we have a slurpy, named params, or both */ + SV **slurpypad = NULL; + + if(aux->slurpy_padix) { + /* Prepare the slurpy xV */ + slurpypad = &PAD_SVl(aux->slurpy_padix); + save_clearsv(slurpypad); + + if(slurpy == '@') { + AV *av = (AV *)*slurpypad; + assert(SvTYPE(av) == SVt_PVAV); + + if(av_count(av)) { + /* see "target should be empty" comments in pp_argelem above */ + av_refresh_elements_range(defav, parami, parami + argc); + av_clear(av); + } + + av_extend(av, argc); + } + else if(slurpy == '%') { + HV *hv = (HV *)*slurpypad; + assert(SvTYPE(hv) == SVt_PVHV); + + if(SvRMAGICAL(hv) || HvUSEDKEYS(hv) > 0) { + /* see "target should be empty" comments in pp_argelem above */ + av_refresh_elements_range(defav, parami, parami + argc); + hv_clear(hv); + } + + assert((argc % 2) == 0); + } + } + + size_t n_named = aux->n_named; + if(n_named) { + /* Initially mark the pad slot for every named parameter variable as + * PADSTALE, so afterwards we can detect missing ones + */ + for(size_t namedix = 0; namedix < n_named; namedix++) { + struct op_multiparam_named_aux *named = aux->named + namedix; + SvPADSTALE_on(PAD_SVl(named->padix)); + } + + size_t n_errors = 0; + SV *error_names = NULL; + + while(argc) { + SV **svp; + + svp = av_fetch(defav, parami, FALSE); parami++; argc--; + SV *name = svp ? *svp : &PL_sv_undef; + + SV *val = NULL; + if(argc) { + svp = av_fetch(defav, parami, FALSE); parami++; argc--; + val = svp ? *svp : &PL_sv_undef; + } + + STRLEN namelen; + const char *namepv = SvPV(name, namelen); + /* namepv / namelen are always UTF-8 */ + if(!SvUTF8(name)) + namepv = (const char *)bytes_to_utf8_temp_pv((const U8 *)namepv, &namelen); + + U32 namehash; + PERL_HASH(namehash, namepv, namelen); + + PADOFFSET padix = 0; + for(size_t namedix = 0; namedix < n_named; namedix++) { + struct op_multiparam_named_aux *named = aux->named + namedix; + + if(named->namehash != namehash || named->namelen != namelen) + continue; + if(!strnEQ(named->namepv, namepv, namelen)) + continue; + + padix = named->padix; + break; + } + + if(padix) { + SV **padentry = &PAD_SVl(padix); + save_clearsv(padentry); + + if(!val) + val = &PL_sv_undef; + + assert(TAINTING_get || !TAINT_get); + if (UNLIKELY(TAINT_get) && !SvTAINTED(val)) + TAINT_NOT; + + SvPADSTALE_off(*padentry); + SvSetMagicSV(*padentry, val); + } + else if(slurpy && !slurpypad) { + /* unnamed slurpy just ignores extra values */ + } + else if(slurpypad && slurpy == '@') { + AV *av = (AV *)*slurpypad; + + assert(TAINTING_get || !TAINT_get); + if (UNLIKELY(TAINT_get) && !SvTAINTED(name)) + TAINT_NOT; + av_push(av, newSVsv(name)); + + if(val) { + if (UNLIKELY(TAINT_get) && !SvTAINTED(val)) + TAINT_NOT; + av_push(av, newSVsv(val)); + } + } + else if(slurpypad && slurpy == '%') { + HV *hv = (HV *)*slurpypad; + + if (UNLIKELY(SvGMAGICAL(name))) + name = sv_mortalcopy(name); + + assert(val); /* this must have passed the argc parity check */ + if (UNLIKELY(TAINT_get) && !SvTAINTED(val)) + TAINT_NOT; + hv_store_ent(hv, name, newSVsv(val), 0); + } + else { + accumulate_error_names(&n_errors, &error_names, namepv, namelen); + } + } + + if(n_errors) { + if(n_errors > 5) + sv_catpvs(error_names, ", ..."); + /* diag_listed_as: Unrecognized named parameter '%s' to subroutine '%s' */ + croak_caller("Unrecognized named parameter%s %" SVf " to subroutine '%" SVf "'", + n_errors > 1 ? "s" : "", SVfARG(error_names), SVfARG(S_find_runcv_name())); + } + + for(size_t namedix = 0; namedix < n_named; namedix++) { + struct op_multiparam_named_aux *named = aux->named + namedix; + if(!named->is_required || !SvPADSTALE(PAD_SVl(named->padix))) + continue; + + accumulate_error_names(&n_errors, &error_names, named->namepv, named->namelen); + } + + if(n_errors) { + if(n_errors > 5) + sv_catpvs(error_names, ", ..."); + /* diag_listed_as: Missing required named parameter '%s' to subroutine '%s' */ + croak_caller("Missing required named parameter%s %" SVf " to subroutine '%" SVf "'", + n_errors > 1 ? "s" : "", SVfARG(error_names), SVfARG(S_find_runcv_name())); + } + } + + if(argc && slurpypad) { + if(slurpy == '@') { + AV *av = (AV *)*slurpypad; + size_t avidx = 0; + while(argc) { + SV **valp = av_fetch(defav, parami, FALSE); parami++; + SV *val = valp ? *valp : &PL_sv_undef; + argc -= 1; + + assert(TAINTING_get || !TAINT_get); + if (UNLIKELY(TAINT_get) && !SvTAINTED(val)) + TAINT_NOT; + + av_store(av, avidx++, newSVsv(val)); + } + } + else if(slurpy == '%') { + HV *hv = (HV *)*slurpypad; + while(argc) { + SV **svp; + + svp = av_fetch(defav, parami, FALSE); parami++; + SV *key = svp ? *svp : &PL_sv_undef; + svp = av_fetch(defav, parami, FALSE); parami++; + SV *val = svp ? *svp : &PL_sv_undef; + argc -= 2; + + if (UNLIKELY(SvGMAGICAL(key))) + key = sv_mortalcopy(key); + + hv_store_ent(hv, key, newSVsv(val), 0); + if (UNLIKELY(TAINT_get) && !SvTAINTED(val)) + TAINT_NOT; + } + } + } + + return PL_op->op_next; +} + +PP(pp_paramtest) +{ + dTARGET; + U8 priv = PL_op->op_private; + + bool ok = TARG && !SvPADSTALE(TARG); + + if (ok && (priv & OPpPARAM_IF_UNDEF) && !SvOK(TARG)) + ok = false; + if (ok && (priv & OPpPARAM_IF_FALSE) && !SvTRUE(TARG)) + ok = false; + + if(!ok) + return cLOGOP->op_other; + + return PL_op->op_next; +} + +PP_wrapped(pp_paramstore, 1, 0) +{ + dSP; + dTARGET; + SV *value = POPs; + + SvPADSTALE_off(TARG); + SvSetMagicSV(TARG, value); + + RETURN; } PP_wrapped(pp_isa, 2, 0) Index: gnu/usr.bin/perl/pp.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/pp.h,v diff -u -p -a -u -p -r1.23 pp.h --- gnu/usr.bin/perl/pp.h 26 Dec 2025 22:14:12 -0000 1.23 +++ gnu/usr.bin/perl/pp.h 16 Nov 2026 00:57:39 -0000 @@ -43,13 +43,13 @@ rewritten to replace PUSHs() etc with rp #ifdef PERL_RC_STACK # define XSPP_wrapped(xsppw_name, xsppw_nargs, xsppw_nlists) \ \ -STATIC OP* S_##xsppw_name##_norc(pTHX); \ +static OP* S_##xsppw_name##_norc(pTHX); \ OP* xsppw_name(pTHX) \ { \ return Perl_pp_wrap(aTHX_ S_##xsppw_name##_norc, \ (xsppw_nargs), (xsppw_nlists)); \ } \ -STATIC OP* S_##xsppw_name##_norc(pTHX) +static OP* S_##xsppw_name##_norc(pTHX) #else # define XSPP_wrapped(xsppw_name, xsppw_nargs, xsppw_nlists) \ @@ -79,7 +79,7 @@ L. Declares a local copy of perl's stack pointer for the XSUB, available via the C macro. See C>. -=for apidoc m;||djSP +=for apidoc mn;||djSP Declare Just C. This is actually identical to C, and declares a local copy of perl's stack pointer, available via the C macro. @@ -397,33 +397,33 @@ Does not use C. See also C sizeof(SSize_t) && ((SSize_t)(n) != (n)) ? -1 : (n)) #ifdef STRESS_REALLOC # define EXTEND_SKIP(p, n) EXTEND_HWM_SET(p, n) # define EXTEND(p,n) STMT_START { \ - sp = stack_grow(sp,p,_EXTEND_SAFE_N(n)); \ + sp = stack_grow(sp,p,EXTEND_SAFE_N_(n)); \ PERL_UNUSED_VAR(sp); \ } STMT_END /* Same thing, but update mark register too. */ # define MEXTEND(p,n) STMT_START { \ const SSize_t markoff = mark - PL_stack_base; \ - sp = stack_grow(sp,p,_EXTEND_SAFE_N(n)); \ + sp = stack_grow(sp,p,EXTEND_SAFE_N_(n)); \ mark = PL_stack_base + markoff; \ PERL_UNUSED_VAR(sp); \ } STMT_END #else -/* _EXTEND_NEEDS_GROW(p,n): private helper macro for EXTEND(). +/* EXTEND_NEEDS_GROW_(p,n): private helper macro for EXTEND(). * Tests to see whether n is too big and we need to grow the stack. Be * very careful if modifying this. There are many ways to get things wrong * (wrapping, truncating etc) that could cause a false negative and cause @@ -439,7 +439,7 @@ Does not use C. See also C. See also C. See also C. See also C to call any unary magic. + +Sets the C and C flags. + +=cut +*/ + #define AMG_CALLunary(sv,meth) \ amagic_call(sv,&PL_sv_undef, meth, AMGf_noright | AMGf_unary) + +#define AMG_CALLunary_flags(sv,meth, flags) \ + amagic_call(sv,&PL_sv_undef, meth, AMGf_noright | AMGf_unary | (flags)) /* No longer used in core. Use AMG_CALLunary instead */ #define AMG_CALLun(sv,meth) AMG_CALLunary(sv, CAT2(meth,_amg)) Index: gnu/usr.bin/perl/pp_ctl.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/pp_ctl.c,v diff -u -p -a -u -p -r1.28 pp_ctl.c --- gnu/usr.bin/perl/pp_ctl.c 26 Dec 2025 22:14:12 -0000 1.28 +++ gnu/usr.bin/perl/pp_ctl.c 16 Nov 2026 00:57:39 -0000 @@ -172,7 +172,7 @@ PP(pp_regcomp) } /* handle the empty pattern */ - if (!RX_PRELEN(PM_GETRE(pm)) && PL_curpm) { + if (!RX_PRELEN(new_re) && PL_curpm) { if (PL_curpm == PL_reg_curpm) { if (PL_curpm_under && PL_curpm_under == PL_reg_curpm) { croak("Infinite recursion via empty pattern"); @@ -417,10 +417,11 @@ PP(pp_substcont) void Perl_rxres_save(pTHX_ void **rsp, REGEXP *rx) { + PERL_ARGS_ASSERT_RXRES_SAVE; + UV *p = (UV*)*rsp; U32 i; - PERL_ARGS_ASSERT_RXRES_SAVE; PERL_UNUSED_CONTEXT; /* deal with regexp_paren_pair items */ @@ -460,12 +461,12 @@ Perl_rxres_save(pTHX_ void **rsp, REGEXP static void S_rxres_restore(pTHX_ void **rsp, REGEXP *rx) { + PERL_ARGS_ASSERT_RXRES_RESTORE; + UV *p = (UV*)*rsp; U32 i; - PERL_ARGS_ASSERT_RXRES_RESTORE; PERL_UNUSED_CONTEXT; - RX_MATCH_COPY_FREE(rx); RX_MATCH_COPIED_set(rx, *p); *p++ = 0; @@ -491,19 +492,19 @@ S_rxres_restore(pTHX_ void **rsp, REGEXP static void S_rxres_free(pTHX_ void **rsp) { - UV * const p = (UV*)*rsp; - PERL_ARGS_ASSERT_RXRES_FREE; PERL_UNUSED_CONTEXT; + UV * const p = (UV*)*rsp; + if (p) { void *tmp = INT2PTR(char*,*p); #ifdef PERL_POISON -#ifdef PERL_ANY_COW +# ifdef PERL_ANY_COW U32 i = 9 + p[1] * 2; -#else +# else U32 i = 8 + p[1] * 2; -#endif +# endif #endif #ifdef PERL_ANY_COW @@ -1571,13 +1572,13 @@ static const char * const context_name[] "defer block", }; -STATIC I32 +static I32 S_dopoptolabel(pTHX_ const char *label, STRLEN len, U32 flags) { - I32 i; - PERL_ARGS_ASSERT_DOPOPTOLABEL; + I32 i; + for (i = cxstack_ix; i >= 0; i--) { const PERL_CONTEXT * const cx = &cxstack[i]; switch (CxTYPE(cx)) { @@ -1615,11 +1616,12 @@ S_dopoptolabel(pTHX_ const char *label, (const U8*)cx_label, cx_label_len) == 0) : (len == cx_label_len && ((cx_label == label) || memEQ(cx_label, label, len))) )) { - DEBUG_l(Perl_deb(aTHX_ "(poptolabel(): skipping label at cx=%ld %s)\n", - (long)i, cx_label)); + DEBUG_l(deb("(poptolabel(): skipping label at cx=%ld %s)\n", + (long)i, cx_label)); continue; } - DEBUG_l( Perl_deb(aTHX_ "(poptolabel(): found label at cx=%ld %s)\n", (long)i, label)); + DEBUG_l( deb("(poptolabel(): found label at cx=%ld %s)\n", + (long)i, label)); return i; } } @@ -1634,11 +1636,16 @@ S_dopoptolabel(pTHX_ const char *label, Implements the deprecated L>. =cut + +Deprecated since 5.38 + */ U8 Perl_dowantarray(pTHX) { + PERL_ARGS_ASSERT_DOWANTARRAY; + const U8 gimme = block_gimme(); return (gimme == G_VOID) ? G_SCALAR : gimme; } @@ -1648,6 +1655,8 @@ Perl_dowantarray(pTHX) U8 Perl_block_gimme(pTHX) { + PERL_ARGS_ASSERT_BLOCK_GIMME; + const I32 cxix = dopopto_cursub(); U8 gimme; if (cxix < 0) @@ -1671,6 +1680,8 @@ context. Returns 0 otherwise. I32 Perl_is_lvalue_sub(pTHX) { + PERL_ARGS_ASSERT_IS_LVALUE_SUB; + const I32 cxix = dopopto_cursub(); assert(cxix >= 0); /* We should only be called from inside subs */ @@ -1684,6 +1695,8 @@ Perl_is_lvalue_sub(pTHX) I32 Perl_was_lvalue_sub(pTHX) { + PERL_ARGS_ASSERT_WAS_LVALUE_SUB; + const I32 cxix = dopoptosub(cxstack_ix-1); assert(cxix >= 0); /* We should only be called from inside subs */ @@ -1693,12 +1706,13 @@ Perl_was_lvalue_sub(pTHX) return 0; } -STATIC I32 +static I32 S_dopoptosub_at(pTHX_ const PERL_CONTEXT *cxstk, I32 startingblock) { + PERL_ARGS_ASSERT_DOPOPTOSUB_AT; + I32 i; - PERL_ARGS_ASSERT_DOPOPTOSUB_AT; #ifndef DEBUGGING PERL_UNUSED_CONTEXT; #endif @@ -1715,26 +1729,28 @@ S_dopoptosub_at(pTHX_ const PERL_CONTEXT * code block. Hide this faked entry from the world. */ if (cx->cx_type & CXp_SUB_RE_FAKE) continue; - DEBUG_l( Perl_deb(aTHX_ "(dopoptosub_at(): found sub at cx=%ld)\n", (long)i)); + DEBUG_l( deb("(dopoptosub_at(): found sub at cx=%ld)\n", (long)i)); return i; case CXt_EVAL: if (CxTRY(cx)) continue; - DEBUG_l( Perl_deb(aTHX_ "(dopoptosub_at(): found sub at cx=%ld)\n", (long)i)); + DEBUG_l( deb("(dopoptosub_at(): found sub at cx=%ld)\n", (long)i)); return i; case CXt_FORMAT: - DEBUG_l( Perl_deb(aTHX_ "(dopoptosub_at(): found sub at cx=%ld)\n", (long)i)); + DEBUG_l( deb("(dopoptosub_at(): found sub at cx=%ld)\n", (long)i)); return i; } } return i; } -STATIC I32 +static I32 S_dopoptoeval(pTHX_ I32 startingblock) { + PERL_ARGS_ASSERT_DOPOPTOEVAL; + I32 i; for (i = startingblock; i >= 0; i--) { const PERL_CONTEXT *cx = &cxstack[i]; @@ -1742,16 +1758,18 @@ S_dopoptoeval(pTHX_ I32 startingblock) default: continue; case CXt_EVAL: - DEBUG_l( Perl_deb(aTHX_ "(dopoptoeval(): found eval at cx=%ld)\n", (long)i)); + DEBUG_l( deb("(dopoptoeval(): found eval at cx=%ld)\n", (long)i)); return i; } } return i; } -STATIC I32 +static I32 S_dopoptoloop(pTHX_ I32 startingblock) { + PERL_ARGS_ASSERT_DOPOPTOLOOP; + I32 i; for (i = startingblock; i >= 0; i--) { const PERL_CONTEXT * const cx = &cxstack[i]; @@ -1775,7 +1793,7 @@ S_dopoptoloop(pTHX_ I32 startingblock) case CXt_LOOP_LAZYSV: case CXt_LOOP_LIST: case CXt_LOOP_ARY: - DEBUG_l( Perl_deb(aTHX_ "(dopoptoloop(): found loop at cx=%ld)\n", (long)i)); + DEBUG_l( deb("(dopoptoloop(): found loop at cx=%ld)\n", (long)i)); return i; } } @@ -1784,9 +1802,11 @@ S_dopoptoloop(pTHX_ I32 startingblock) /* find the next GIVEN or FOR (with implicit $_) loop context block */ -STATIC I32 +static I32 S_dopoptogivenfor(pTHX_ I32 startingblock) { + PERL_ARGS_ASSERT_DOPOPTOGIVENFOR; + I32 i; for (i = startingblock; i >= 0; i--) { const PERL_CONTEXT *cx = &cxstack[i]; @@ -1794,7 +1814,8 @@ S_dopoptogivenfor(pTHX_ I32 startingbloc default: continue; case CXt_GIVEN: - DEBUG_l( Perl_deb(aTHX_ "(dopoptogivenfor(): found given at cx=%ld)\n", (long)i)); + DEBUG_l( deb("(dopoptogivenfor(): found given at cx=%ld)\n", + (long)i)); return i; case CXt_LOOP_PLAIN: assert(!(cx->cx_type & CXp_FOR_DEF)); @@ -1804,7 +1825,8 @@ S_dopoptogivenfor(pTHX_ I32 startingbloc case CXt_LOOP_LIST: case CXt_LOOP_ARY: if (cx->cx_type & CXp_FOR_DEF) { - DEBUG_l( Perl_deb(aTHX_ "(dopoptogivenfor(): found foreach at cx=%ld)\n", (long)i)); + DEBUG_l( deb("(dopoptogivenfor(): found foreach at cx=%ld)\n", + (long)i)); return i; } } @@ -1812,9 +1834,11 @@ S_dopoptogivenfor(pTHX_ I32 startingbloc return i; } -STATIC I32 +static I32 S_dopoptowhen(pTHX_ I32 startingblock) { + PERL_ARGS_ASSERT_DOPOPTOWHEN; + I32 i; for (i = startingblock; i >= 0; i--) { const PERL_CONTEXT *cx = &cxstack[i]; @@ -1822,7 +1846,7 @@ S_dopoptowhen(pTHX_ I32 startingblock) default: continue; case CXt_WHEN: - DEBUG_l( Perl_deb(aTHX_ "(dopoptowhen(): found when at cx=%ld)\n", (long)i)); + DEBUG_l( deb("(dopoptowhen(): found when at cx=%ld)\n", (long)i)); return i; } } @@ -1839,6 +1863,8 @@ S_dopoptowhen(pTHX_ I32 startingblock) void Perl_dounwind(pTHX_ I32 cxix) { + PERL_ARGS_ASSERT_DOUNWIND; + if (!PL_curstackinfo) /* can happen if die during thread cloning */ return; @@ -1905,6 +1931,8 @@ Perl_dounwind(pTHX_ I32 cxix) void Perl_rpp_obliterate_stack_to(pTHX_ I32 ix) { + PERL_ARGS_ASSERT_RPP_OBLITERATE_STACK_TO; + #ifdef PERL_RC_STACK I32 nonrc_base = PL_curstackinfo->si_stack_nonrc_base; assert(ix >= 0); @@ -1928,11 +1956,43 @@ Perl_rpp_obliterate_stack_to(pTHX_ I32 i } +/* +=for apidoc defer_error + +Called to report compilation errors, doing one of: + +=over + +=item * + +adding C to C<$@> within an C, + +=item * + +appending C to C, to be reported when the next +exception is thrown, or + +=item * + +by warning, if called early in interpreter construction or late in +interpreter destruction, when PL_errors isn't available. + +=back + +and incrementing the parser error count if we're parsing. + +This function may throw an exception if too many errors have been +produced. + +This is intended for use during compilation. + +=cut +*/ void -Perl_qerror(pTHX_ SV *err) +Perl_defer_error(pTHX_ SV *err) { - PERL_ARGS_ASSERT_QERROR; + PERL_ARGS_ASSERT_DEFER_ERROR; if (err!=NULL) { if (PL_in_eval) { if (PL_in_eval & EVAL_KEEPERR) { @@ -2037,9 +2097,10 @@ S_pop_eval_context_maybe_croak(pTHX_ PER void Perl_die_unwind(pTHX_ SV *msv) { + PERL_ARGS_ASSERT_DIE_UNWIND; + SV *exceptsv = msv; U8 in_eval = PL_in_eval; - PERL_ARGS_ASSERT_DIE_UNWIND; if (in_eval) { I32 cxix; @@ -2211,6 +2272,8 @@ frame for the sub call itself. const PERL_CONTEXT * Perl_caller_cx(pTHX_ I32 count, const PERL_CONTEXT **dbcxp) { + PERL_ARGS_ASSERT_CALLER_CX; + I32 cxix = dopopto_cursub(); const PERL_CONTEXT *cx; const PERL_CONTEXT *ccstack = cxstack; @@ -2385,7 +2448,7 @@ PP_wrapped(pp_caller, MAXARG, 0) mPUSHs(newSVsv(cx->blk_eval.old_namesv)); PUSHs(&PL_sv_yes); } - /* eval BLOCK (try blocks have old_namesv == 0) */ + /* eval BLOCK (eval blocks have old_namesv == 0) */ else { PUSHs(&PL_sv_undef); PUSHs(&PL_sv_undef); @@ -2593,12 +2656,13 @@ PP(pp_enteriter) void *itervarp; /* GV or pad slot of the iteration variable */ SV *itersave; /* the old var in the iterator var slot */ U8 cxflags = 0; + U8 priv = PL_op->op_private; if (PL_op->op_targ) { /* "my" variable */ itervarp = &PAD_SVl(PL_op->op_targ); itersave = *(SV**)itervarp; assert(itersave); - if (PL_op->op_private & OPpLVAL_INTRO) { /* for my $x (...) */ + if (priv & OPpLVAL_INTRO) { /* for my $x (...) */ /* the SV currently in the pad slot is never live during * iteration (the slot is always aliased to one of the items) * so it's always stale */ @@ -2614,14 +2678,26 @@ PP(pp_enteriter) itersave = GvSV(sv); SvREFCNT_inc_simple_void(itersave); cxflags = CXp_FOR_GV; - if (PL_op->op_private & OPpITER_DEF) + if (priv & OPpITER_DEF) cxflags |= CXp_FOR_DEF; } else { /* LV ref: for \$foo (...) */ assert(SvTYPE(sv) == SVt_PVMG); - assert(SvMAGIC(sv)); - assert(SvMAGIC(sv)->mg_type == PERL_MAGIC_lvref); itersave = NULL; + MAGIC *mg = SvMAGIC(sv); + assert(mg); + assert(mg->mg_type == PERL_MAGIC_lvref); + assert(mg->mg_obj); + // LV ref around a package lexical, mg_obj gives its GV + GV *gv = (GV *)mg->mg_obj; + assert(SvTYPE(gv) == SVt_PVGV); + switch(mg->mg_private & OPpLVREF_TYPE) { + case OPpLVREF_SV: itersave = GvSVn(gv); break; + case OPpLVREF_AV: itersave = (SV *)GvAV(gv); break; + case OPpLVREF_HV: itersave = (SV *)GvHV(gv); break; + case OPpLVREF_CV: itersave = (SV *)GvCV(gv); break; + } + SvREFCNT_inc_void(itersave); cxflags = CXp_FOR_LVREF; } /* we transfer ownership of 1 ref count of itervarp from the stack @@ -2629,7 +2705,7 @@ PP(pp_enteriter) (void)rpp_pop_1_norc(); } /* OPpITER_DEF (implicit $_) should only occur with a GV iter var */ - assert((cxflags & CXp_FOR_GV) || !(PL_op->op_private & OPpITER_DEF)); + assert((cxflags & CXp_FOR_GV) || !(priv & OPpITER_DEF)); /* Note that this context is initially set as CXt_NULL. Further on * down it's changed to one of the CXt_LOOP_*. Before it's changed, @@ -2648,11 +2724,26 @@ PP(pp_enteriter) /* range */ SV* sv = PL_stack_sp[-1]; SV * const right = maybe_ary; - if (UNLIKELY(cxflags & CXp_FOR_LVREF)) + assert(PL_op->op_next->op_type == OP_ITER); + if (UNLIKELY((cxflags & CXp_FOR_LVREF) || + (PL_op->op_next->op_private & OPpITER_REFALIAS))) DIE(aTHX_ "Assigned value is not a reference"); SvGETMAGIC(sv); SvGETMAGIC(right); - if (RANGE_IS_NUMERIC(sv,right)) { + /* S_outside_integer will convert to NV and perform + * assorted comparisons. Skip this effort for simple IV + * cases. It should be possible to do this for all SvIOK, + * but that would need edge cases in t/op/range.t to be + * revisited, especially for (! $Config{d_nv_preserves_uv}) + */ + if (SvIOK_notUV(sv) && SvIVX(sv) > -1 && + SvIOK_notUV(right) && SvIVX(right) > -1) { + cx->cx_type |= CXt_LOOP_LAZYIV; + cx->blk_loop.state_u.lazyiv.cur = SvIVX(sv); + cx->blk_loop.state_u.lazyiv.end = SvIVX(right); + rpp_popfree_2_NN(); + } + else if (RANGE_IS_NUMERIC(sv,right)) { cx->cx_type |= CXt_LOOP_LAZYIV; if (S_outside_integer(aTHX_ sv) || S_outside_integer(aTHX_ right)) @@ -2691,7 +2782,7 @@ PP(pp_enteriter) * stack to the CX .ary entry, so no SvREFCNT_dec() needed */ (void)rpp_pop_1_norc(); cx->blk_loop.state_u.ary.ix = - (PL_op->op_private & OPpITER_REVERSED) ? + (priv & OPpITER_REVERSED) ? AvFILL(cx->blk_loop.state_u.ary.ary) + 1 : -1; } @@ -2703,7 +2794,7 @@ PP(pp_enteriter) cx->blk_oldsp = PL_stack_sp - PL_stack_base; cx->blk_loop.state_u.stack.basesp = MARK - PL_stack_base; cx->blk_loop.state_u.stack.ix = - (PL_op->op_private & OPpITER_REVERSED) + (priv & OPpITER_REVERSED) ? cx->blk_oldsp + 1 : cx->blk_loop.state_u.stack.basesp; /* pre-extend stack so pp_iter doesn't have to check every time @@ -2878,11 +2969,13 @@ PP(pp_return) assert(cxstack_ix >= 0); if (cxix < cxstack_ix) { I32 i; - /* Check for defer { return; } */ + /* Check for defer { return; } */ for(i = cxstack_ix; i > cxix; i--) { if(CxTYPE(&cxstack[i]) == CXt_DEFER) /* diag_listed_as: Can't "%s" out of a "defer" block */ /* diag_listed_as: Can't "%s" out of a "finally" block */ + /* GH 23948: probably not reachable from test suite, but + * possibly from XS code; retain */ croak("Can't \"%s\" out of a \"%s\" block", "return", S_defer_blockname(&cxstack[i])); } @@ -3048,7 +3141,7 @@ S_unwind_loop(pTHX) if (cxix < cxstack_ix) { I32 i; - /* Check for defer { last ... } etc */ + /* Check for defer { last ... } etc */ for(i = cxstack_ix; i > cxix; i--) { if(CxTYPE(&cxstack[i]) == CXt_DEFER) /* diag_listed_as: Can't "%s" out of a "defer" block */ @@ -3127,14 +3220,14 @@ PP(pp_redo) #define UNENTERABLE (OP *)1 #define GOTO_DEPTH 64 -STATIC OP * +static OP * S_dofindlabel(pTHX_ OP *o, const char *label, STRLEN len, U32 flags, OP **opstack, OP **oplimit) { + PERL_ARGS_ASSERT_DOFINDLABEL; + OP **ops = opstack; static const char* const too_deep = "Target of goto is too deeply nested"; - PERL_ARGS_ASSERT_DOFINDLABEL; - if (ops >= oplimit) croak("%s", too_deep); if (o->op_type == OP_LEAVE || @@ -3247,6 +3340,7 @@ PP(pp_goto) I32 ix; PERL_CONTEXT *cx; OP *enterops[GOTO_DEPTH]; + bool into_construct = FALSE; const char *label = NULL; STRLEN label_len = 0; U32 label_flags = 0; @@ -3284,6 +3378,8 @@ PP(pp_goto) gv_efullname3(tmpstr, gv, NULL); DIE(aTHX_ "Goto undefined subroutine &%" SVf, SVfARG(tmpstr)); } + /* GH-23969: This exception should be retained because it can + * be reached from XS code. */ DIE(aTHX_ "Goto undefined subroutine"); } @@ -3304,14 +3400,6 @@ PP(pp_goto) else if (CxMULTICALL(cx)) DIE(aTHX_ "Can't goto subroutine from a sort sub (or similar callback)"); - /* Check for defer { goto &...; } */ - for(ix = cxstack_ix; ix > cxix; ix--) { - if(CxTYPE(&cxstack[ix]) == CXt_DEFER) - /* diag_listed_as: Can't "%s" out of a "defer" block */ - croak("Can't \"%s\" out of a \"%s\" block", - "goto", S_defer_blockname(&cxstack[ix])); - } - /* First do some returnish stuff. */ SvREFCNT_inc_simple_void(cv); /* avoid premature free during unwind */ @@ -3371,6 +3459,8 @@ PP(pp_goto) DIE(aTHX_ "Goto undefined subroutine &%" SVf, SVfARG(tmpstr)); } + /* GH-23969: This exception should be retained because it can + * be reached from XS code. */ DIE(aTHX_ "Goto undefined subroutine"); } @@ -3451,9 +3541,10 @@ PP(pp_goto) * provide that information. */ Copy(PL_op, &fake_goto_op, 1, UNOP); + U8 gimme = (cx->blk_gimme & G_WANT); fake_goto_op.op_flags = (fake_goto_op.op_flags & ~OPf_WANT) - | (cx->blk_gimme & G_WANT); + | gimme; PL_op = (OP*)&fake_goto_op; /* XS subs don't have a CXt_SUB, so pop it; @@ -3467,9 +3558,32 @@ PP(pp_goto) /* Push a mark for the start of arglist */ PUSHMARK(mark); + SSize_t markix = TOPMARK; rpp_invoke_xs(cv); + + /* Enforce some sanity in scalar context. */ + if (gimme == G_SCALAR) { + SV **svp = PL_stack_base + markix + 1; + if (svp != PL_stack_sp) { +#ifdef PERL_RC_STACK + if (svp < PL_stack_sp) { + /* move return value to bottom of stack frame + * and free everything else */ + SV* retsv = *PL_stack_sp; + *PL_stack_sp = *svp; + *svp = retsv; + rpp_popfree_to_NN(svp); + } + else + rpp_push_IMM(&PL_sv_undef); +#else + *svp = svp > PL_stack_sp ? &PL_sv_undef : *PL_stack_sp; + PL_stack_sp = svp; +#endif + } + } + LEAVE; - goto finish; } else { PADLIST * const padlist = CvPADLIST(cv); @@ -3525,8 +3639,8 @@ PP(pp_goto) } } retop = CvSTART(cv); - goto finish; } + goto finish; } else { /* goto EXPR */ @@ -3649,9 +3763,7 @@ PP(pp_goto) ? 2 : 1; if (enterops[i]) - deprecate_fatal_in(WARN_DEPRECATED__GOTO_CONSTRUCT, - "5.42", - "Use of \"goto\" to jump into a construct"); + into_construct = TRUE; } /* pop unwanted frames */ @@ -3675,7 +3787,7 @@ PP(pp_goto) for (; enterops[ix]; ix++) { PL_op = enterops[ix]; S_check_op_type(aTHX_ PL_op); - DEBUG_l( Perl_deb(aTHX_ "pp_goto: Entering %s\n", + DEBUG_l( deb("pp_goto: Entering %s\n", OP_NAME(PL_op))); PL_op->op_ppaddr(aTHX); } @@ -3683,6 +3795,9 @@ PP(pp_goto) } } + if (into_construct) + croak("Use of \"goto\" to jump into a construct is no longer permitted"); + if (do_dump) { #ifdef VMS if (!retop) retop = PL_main_start; @@ -3729,15 +3844,15 @@ PP_wrapped(pp_exit, 1, 0) /* Eval. */ -STATIC void +static void S_save_lines(pTHX_ AV *array, SV *sv) { + PERL_ARGS_ASSERT_SAVE_LINES; + const char *s = SvPVX_const(sv); const char * const send = SvPVX_const(sv) + SvCUR(sv); I32 line = 1; - PERL_ARGS_ASSERT_SAVE_LINES; - while (s && s < send) { const char *t; SV * const tmpstr = newSV_type(SVt_PVIV); @@ -3750,7 +3865,7 @@ S_save_lines(pTHX_ AV *array, SV *sv) sv_setpvn_fresh(tmpstr, s, t - s); /* not breakable until we compile a COP for it */ - SvIV_set(tmpstr, 0); + assert(SvIVX(tmpstr) == 0); SvIOK_on(tmpstr); av_store(array, line++, tmpstr); s = t; @@ -3819,9 +3934,11 @@ See L fo =cut */ -STATIC OP * +static OP * S_docatch(pTHX_ Perl_ppaddr_t firstpp) { + PERL_ARGS_ASSERT_DOCATCH; + int ret; OP * const oldop = PL_op; dJMPENV; @@ -3882,13 +3999,17 @@ rather than in the scope of the debugger CV* Perl_find_runcv(pTHX_ U32 *db_seqp) { - return Perl_find_runcv_where(aTHX_ 0, 0, db_seqp); + PERL_ARGS_ASSERT_FIND_RUNCV; + + return find_runcv_where(0, 0, db_seqp); } /* If this becomes part of the API, it might need a better name. */ CV * Perl_find_runcv_where(pTHX_ U8 cond, IV arg, U32 *db_seqp) { + PERL_ARGS_ASSERT_FIND_RUNCV_WHERE; + PERL_SI *si; int level = 0; @@ -3952,7 +4073,7 @@ Perl_find_runcv_where(pTHX_ U8 cond, IV * See also try_run_unitcheck(). * */ -STATIC int +static int S_try_yyparse(pTHX_ int gramtype, OP *caller_op) { /* if we die during compilation PL_restartop and PL_restartjmpenv @@ -4008,7 +4129,7 @@ S_try_yyparse(pTHX_ int gramtype, OP *ca * * See also try_yyparse(). */ -STATIC int +static int S_try_run_unitcheck(pTHX_ OP* caller_op) { /* if we die during compilation PL_restartop and PL_restartjmpenv @@ -4067,9 +4188,11 @@ S_try_run_unitcheck(pTHX_ OP* caller_op) * These can be distinguished by whether PL_op is entereval. */ -STATIC bool +static bool S_doeval_compile(pTHX_ U8 gimme, CV* outside, U32 seq, HV *hh) { + PERL_ARGS_ASSERT_DOEVAL_COMPILE; + OP * const saveop = PL_op; bool clear_hints = saveop->op_type != OP_ENTEREVAL; COP * const oldcurcop = PL_curcop; @@ -4188,14 +4311,14 @@ S_doeval_compile(pTHX_ U8 gimme, CV* out PL_compiling.cop_warnings = DUP_WARNINGS(oldcurcop->cop_warnings); cophh_free(CopHINTHASH_get(&PL_compiling)); - if (Perl_cop_fetch_label(aTHX_ oldcurcop, NULL, NULL)) { + if (cop_fetch_label(oldcurcop, NULL, NULL)) { /* The label, if present, is the first entry on the chain. So rather than writing a blank label in front of it (which involves an allocation), just use the next entry in the chain. */ PL_compiling.cop_hints_hash = cophh_copy(oldcurcop->cop_hints_hash->refcounted_he_next); /* Check the assumption that this removed the label. */ - assert(Perl_cop_fetch_label(aTHX_ &PL_compiling, NULL, NULL) == NULL); + assert(cop_fetch_label(&PL_compiling, NULL, NULL) == NULL); } else PL_compiling.cop_hints_hash = cophh_copy(oldcurcop->cop_hints_hash); @@ -4325,17 +4448,17 @@ S_doeval_compile(pTHX_ U8 gimme, CV* out * else return PerlIO_openn(). */ -STATIC PerlIO * +static PerlIO * S_check_type_and_open(pTHX_ SV *name) { + PERL_ARGS_ASSERT_CHECK_TYPE_AND_OPEN; + Stat_t st; STRLEN len; PerlIO * retio; const char *p = SvPV_const(name, len); int st_rc; - PERL_ARGS_ASSERT_CHECK_TYPE_AND_OPEN; - /* checking here captures a reasonable error message when * PERL_DISABLE_PMC is true, but when PMC checks are enabled, the * user gets a confusing message about looking for the .pmc file @@ -4399,14 +4522,14 @@ S_check_type_and_open(pTHX_ SV *name) * try loading Foo.pmc first. */ #ifndef PERL_DISABLE_PMC -STATIC PerlIO * +static PerlIO * S_doopen_pm(pTHX_ SV *name) { + PERL_ARGS_ASSERT_DOOPEN_PM; + STRLEN namelen; const char *p = SvPV_const(name, namelen); - PERL_ARGS_ASSERT_DOOPEN_PM; - /* check the name before trying for the .pmc name to avoid the * warning referring to the .pmc which the user probably doesn't * know or care about @@ -4415,13 +4538,11 @@ S_doopen_pm(pTHX_ SV *name) return NULL; if (memENDPs(p, namelen, ".pm")) { - SV *const pmcsv = sv_newmortal(); - PerlIO * pmcio; + SV *const pmcsv = sv_mortalcopy_flags(name, SV_GMAGIC|SV_NOSTEAL|SV_DO_COW_SVSETSV); - SvSetSV_nosteal(pmcsv,name); sv_catpvs(pmcsv, "c"); - pmcio = check_type_and_open(pmcsv); + PerlIO * pmcio = check_type_and_open(pmcsv); if (pmcio) return pmcio; } @@ -4505,8 +4626,7 @@ S_require_version(pTHX_ SV *sv) second = SvIV(*av_fetch(lav,1,0)); second /= second >= 600 ? 100 : 10; - hintsv = Perl_newSVpvf(aTHX_ "v%d.%d.0", - (int)first, (int)second); + hintsv = newSVpvf("v%d.%d.0", (int)first, (int)second); upg_version(hintsv, TRUE); DIE(aTHX_ "Perl %" SVf " required (did you mean %" SVf "?)" @@ -4698,9 +4818,9 @@ S_require_file(pTHX_ SV *sv) * of checks here at runtime. */ const STRLEN package_len = len - 3; - const char slashdot[2] = {'/', '.'}; + static const char slashdot[2] = {'/', '.'}; #ifdef DOSISH - const char backslashdot[2] = {'\\', '.'}; + static const char backslashdot[2] = {'\\', '.'}; #endif /* Disallow *purported* barewords that map to absolute @@ -4813,8 +4933,7 @@ S_require_file(pTHX_ SV *sv) } if (SvPADTMP(nsv)) { - nsv = sv_newmortal(); - SvSetSV_nosteal(nsv,sv); + nsv = sv_mortalcopy_flags(sv, SV_GMAGIC|SV_NOSTEAL|SV_DO_COW_SVSETSV); } const char *method = NULL; @@ -5192,11 +5311,17 @@ S_require_file(pTHX_ SV *sv) S_parse_ident */ c = name; while (c < e) { - if (utf8 && isIDFIRST_utf8_safe(c, e)) { - c += UTF8SKIP(c); - while (c < e && isIDCONT_utf8_safe( - (const U8*) c, (const U8*) e)) - c += UTF8SKIP(c); + Size_t advance; + + if (utf8 && (advance = isIDFIRST_utf8_safe(c, e))) + { + c += advance; + while ( c < e + && (advance = isIDCONT_utf8_safe( + (const U8*) c, (const U8*) e))) + { + c += advance; + } } else if (isWORDCHAR_A(*c)) { while (c < e && isWORDCHAR_A(*c)) @@ -5701,6 +5826,8 @@ PP(pp_catch) void Perl_delete_eval_scope(pTHX) { + PERL_ARGS_ASSERT_DELETE_EVAL_SCOPE; + PERL_CONTEXT *cx; cx = CX_CUR(); @@ -5715,11 +5842,11 @@ Perl_delete_eval_scope(pTHX) void Perl_create_eval_scope(pTHX_ OP *retop, SV **sp, U32 flags) { + PERL_ARGS_ASSERT_CREATE_EVAL_SCOPE; + PERL_CONTEXT *cx; const U8 gimme = GIMME_V; - PERL_ARGS_ASSERT_CREATE_EVAL_SCOPE; - cx = cx_pushblock((CXt_EVAL|CXp_EVALBLOCK), gimme, sp, PL_savestack_ix); cx_pusheval(cx, retop, NULL); @@ -5830,13 +5957,13 @@ PP(pp_leavegiven) } /* Helper routines used by pp_smartmatch */ -STATIC PMOP * +static PMOP * S_make_matcher(pTHX_ REGEXP *re) { - PMOP *matcher = cPMOPx(newPMOP(OP_MATCH, OPf_WANT_SCALAR | OPf_STACKED)); - PERL_ARGS_ASSERT_MAKE_MATCHER; + PMOP *matcher = cPMOPx(newPMOP(OP_MATCH, OPf_WANT_SCALAR | OPf_STACKED)); + PM_SETRE(matcher, ReREFCNT_inc(re)); SAVEFREEOP((OP *) matcher); @@ -5845,13 +5972,13 @@ S_make_matcher(pTHX_ REGEXP *re) return matcher; } -STATIC bool +static bool S_matcher_matches_sv(pTHX_ PMOP *matcher, SV *sv) { + PERL_ARGS_ASSERT_MATCHER_MATCHES_SV; + bool result; - PERL_ARGS_ASSERT_MATCHER_MATCHES_SV; - PL_op = (OP *) matcher; rpp_xpush_1(sv); (void) Perl_pp_match(aTHX); @@ -5860,7 +5987,7 @@ S_matcher_matches_sv(pTHX_ PMOP *matcher return result; } -STATIC void +static void S_destroy_matcher(pTHX_ PMOP *matcher) { PERL_ARGS_ASSERT_DESTROY_MATCHER; @@ -5874,7 +6001,7 @@ S_destroy_matcher(pTHX_ PMOP *matcher) /* Do a smart match */ PP(pp_smartmatch) { - DEBUG_M(Perl_deb(aTHX_ "Starting smart match resolution\n")); + DEBUG_M(deb("Starting smart match resolution\n")); return do_smartmatch(NULL, NULL, 0); } @@ -5882,9 +6009,11 @@ PP(pp_smartmatch) /* This version of do_smartmatch() implements the * table of smart matches that is found in perlsyn. */ -STATIC OP * +static OP * S_do_smartmatch(pTHX_ HV *seen_this, HV *seen_other, const bool copied) { + PERL_ARGS_ASSERT_DO_SMARTMATCH; + bool object_on_left = FALSE; SV *e = PL_stack_sp[0]; /* e is for 'expression' */ SV *d = PL_stack_sp[-1]; /* d is for 'default', as in PL_defgv */ @@ -5905,20 +6034,20 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV /* First of all, handle overload magic of the rightmost argument */ if (SvAMAGIC(e)) { SV * tmpsv; - DEBUG_M(Perl_deb(aTHX_ " applying rule Any-Object\n")); - DEBUG_M(Perl_deb(aTHX_ " attempting overload\n")); + DEBUG_M(deb(" applying rule Any-Object\n")); + DEBUG_M(deb(" attempting overload\n")); tmpsv = amagic_call(d, e, smart_amg, AMGf_noleft); if (tmpsv) { rpp_replace_2_1_NN(tmpsv); return NORMAL; } - DEBUG_M(Perl_deb(aTHX_ " failed to run overload method; continuing...\n")); + DEBUG_M(deb(" failed to run overload method; continuing...\n")); } /* ~~ undef */ if (!SvOK(e)) { - DEBUG_M(Perl_deb(aTHX_ " applying rule Any-undef\n")); + DEBUG_M(deb(" applying rule Any-undef\n")); if (SvOK(d)) goto ret_no; else @@ -5926,7 +6055,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV } if (SvROK(e) && SvOBJECT(SvRV(e)) && (SvTYPE(SvRV(e)) != SVt_REGEXP)) { - DEBUG_M(Perl_deb(aTHX_ " applying rule Any-Object\n")); + DEBUG_M(deb(" applying rule Any-Object\n")); croak("Smart matching a non-overloaded object breaks encapsulation"); } if (SvROK(d) && SvOBJECT(SvRV(d)) && (SvTYPE(SvRV(d)) != SVt_REGEXP)) @@ -5943,12 +6072,12 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV bool andedresults = TRUE; HV *hv = (HV*) SvRV(d); I32 numkeys = hv_iterinit(hv); - DEBUG_M(Perl_deb(aTHX_ " applying rule Hash-CodeRef\n")); + DEBUG_M(deb(" applying rule Hash-CodeRef\n")); if (numkeys == 0) goto ret_yes; push_stackinfo(PERLSI_SMARTMATCH, 1); while ( (he = hv_iternext(hv)) ) { - DEBUG_M(Perl_deb(aTHX_ " testing hash key...\n")); + DEBUG_M(deb(" testing hash key...\n")); ENTER_with_name("smartmatch_hash_key_test"); SAVETMPS; PUSHMARK(PL_stack_sp); @@ -5971,13 +6100,13 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV bool andedresults = TRUE; AV *av = (AV*) SvRV(d); const Size_t len = av_count(av); - DEBUG_M(Perl_deb(aTHX_ " applying rule Array-CodeRef\n")); + DEBUG_M(deb(" applying rule Array-CodeRef\n")); if (len == 0) goto ret_yes; push_stackinfo(PERLSI_SMARTMATCH, 1); for (i = 0; i < len; ++i) { SV * const * const svp = av_fetch(av, i, FALSE); - DEBUG_M(Perl_deb(aTHX_ " testing array element...\n")); + DEBUG_M(deb(" testing array element...\n")); ENTER_with_name("smartmatch_array_elem_test"); SAVETMPS; PUSHMARK(PL_stack_sp); @@ -5997,7 +6126,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV } else { sm_any_sub: - DEBUG_M(Perl_deb(aTHX_ " applying rule Any-CodeRef\n")); + DEBUG_M(deb(" applying rule Any-CodeRef\n")); push_stackinfo(PERLSI_SMARTMATCH, 1); ENTER_with_name("smartmatch_coderef"); PUSHMARK(PL_stack_sp); @@ -6019,7 +6148,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV goto sm_any_hash; /* Treat objects like scalars */ } else if (!SvOK(d)) { - DEBUG_M(Perl_deb(aTHX_ " applying rule Any-Hash ($a undef)\n")); + DEBUG_M(deb(" applying rule Any-Hash ($a undef)\n")); goto ret_no; } else if (SvROK(d) && SvTYPE(SvRV(d)) == SVt_PVHV) { @@ -6032,7 +6161,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV other_key_count = 0; HV *hv = HV_FROM_REF(e); - DEBUG_M(Perl_deb(aTHX_ " applying rule Hash-Hash\n")); + DEBUG_M(deb(" applying rule Hash-Hash\n")); /* Tied hashes don't know how many keys they have. */ tied = cBOOL(SvTIED_mg((SV*)hv, PERL_MAGIC_tied)); other_tied = cBOOL(SvTIED_mg((const SV *)other_hv, PERL_MAGIC_tied)); @@ -6055,7 +6184,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV while ( (he = hv_iternext(hv)) ) { SV *key = hv_iterkeysv(he); - DEBUG_M(Perl_deb(aTHX_ " comparing hash key...\n")); + DEBUG_M(deb(" comparing hash key...\n")); ++ this_key_count; if(!hv_exists_ent(other_hv, key, 0)) { @@ -6083,10 +6212,10 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV Size_t i; HV *hv = HV_FROM_REF(e); - DEBUG_M(Perl_deb(aTHX_ " applying rule Array-Hash\n")); + DEBUG_M(deb(" applying rule Array-Hash\n")); for (i = 0; i < other_len; ++i) { SV ** const svp = av_fetch(other_av, i, FALSE); - DEBUG_M(Perl_deb(aTHX_ " checking for key existence...\n")); + DEBUG_M(deb(" checking for key existence...\n")); if (svp) { /* ??? When can this not happen? */ if (hv_exists_ent(hv, *svp, 0)) goto ret_yes; @@ -6095,7 +6224,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV goto ret_no; } else if (SvROK(d) && SvTYPE(SvRV(d)) == SVt_REGEXP) { - DEBUG_M(Perl_deb(aTHX_ " applying rule Regex-Hash\n")); + DEBUG_M(deb(" applying rule Regex-Hash\n")); sm_regex_hash: { PMOP * const matcher = make_matcher((REGEXP*) SvRV(d)); @@ -6104,7 +6233,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV (void) hv_iterinit(hv); while ( (he = hv_iternext(hv)) ) { - DEBUG_M(Perl_deb(aTHX_ " testing key against pattern...\n")); + DEBUG_M(deb(" testing key against pattern...\n")); if (matcher_matches_sv(matcher, hv_iterkeysv(he))) { (void) hv_iterinit(hv); destroy_matcher(matcher); @@ -6117,7 +6246,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV } else { sm_any_hash: - DEBUG_M(Perl_deb(aTHX_ " applying rule Any-Hash\n")); + DEBUG_M(deb(" applying rule Any-Hash\n")); if (hv_exists_ent(HV_FROM_REF(e), d, 0)) goto ret_yes; else @@ -6134,11 +6263,11 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV const Size_t other_len = av_count(other_av); Size_t i; - DEBUG_M(Perl_deb(aTHX_ " applying rule Hash-Array\n")); + DEBUG_M(deb(" applying rule Hash-Array\n")); for (i = 0; i < other_len; ++i) { SV ** const svp = av_fetch(other_av, i, FALSE); - DEBUG_M(Perl_deb(aTHX_ " testing for key existence...\n")); + DEBUG_M(deb(" testing for key existence...\n")); if (svp) { /* ??? When can this not happen? */ if (hv_exists_ent(HV_FROM_REF(d), *svp, 0)) goto ret_yes; @@ -6148,7 +6277,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV } if (SvROK(d) && SvTYPE(SvRV(d)) == SVt_PVAV) { AV *other_av = AV_FROM_REF(d); - DEBUG_M(Perl_deb(aTHX_ " applying rule Array-Array\n")); + DEBUG_M(deb(" applying rule Array-Array\n")); if (av_count(AV_FROM_REF(e)) != av_count(other_av)) goto ret_no; else { @@ -6186,9 +6315,9 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV sv_2mortal(newSViv(PTR2IV(*other_elem))), &PL_sv_undef, 0); rpp_xpush_2(*other_elem, *this_elem); - DEBUG_M(Perl_deb(aTHX_ " recursively comparing array element...\n")); + DEBUG_M(deb(" recursively comparing array element...\n")); (void) do_smartmatch(seen_this, seen_other, 0); - DEBUG_M(Perl_deb(aTHX_ " recursion finished\n")); + DEBUG_M(deb(" recursion finished\n")); bool ok = SvTRUEx(PL_stack_sp[0]); rpp_popfree_1_NN(); @@ -6200,7 +6329,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV } } else if (SvROK(d) && SvTYPE(SvRV(d)) == SVt_REGEXP) { - DEBUG_M(Perl_deb(aTHX_ " applying rule Regex-Array\n")); + DEBUG_M(deb(" applying rule Regex-Array\n")); sm_regex_array: { PMOP * const matcher = make_matcher((REGEXP*) SvRV(d)); @@ -6209,7 +6338,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV for(i = 0; i < this_len; ++i) { SV * const * const svp = av_fetch(AV_FROM_REF(e), i, FALSE); - DEBUG_M(Perl_deb(aTHX_ " testing element against pattern...\n")); + DEBUG_M(deb(" testing element against pattern...\n")); if (svp && matcher_matches_sv(matcher, *svp)) { destroy_matcher(matcher); goto ret_yes; @@ -6224,10 +6353,10 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV const Size_t this_len = av_count(AV_FROM_REF(e)); Size_t i; - DEBUG_M(Perl_deb(aTHX_ " applying rule Undef-Array\n")); + DEBUG_M(deb(" applying rule Undef-Array\n")); for (i = 0; i < this_len; ++i) { SV * const * const svp = av_fetch(AV_FROM_REF(e), i, FALSE); - DEBUG_M(Perl_deb(aTHX_ " testing for undef element...\n")); + DEBUG_M(deb(" testing for undef element...\n")); if (!svp || !SvOK(*svp)) goto ret_yes; } @@ -6239,7 +6368,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV Size_t i; const Size_t this_len = av_count(AV_FROM_REF(e)); - DEBUG_M(Perl_deb(aTHX_ " applying rule Any-Array\n")); + DEBUG_M(deb(" applying rule Any-Array\n")); for (i = 0; i < this_len; ++i) { SV * const * const svp = av_fetch(AV_FROM_REF(e), i, FALSE); if (!svp) @@ -6247,9 +6376,9 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV rpp_xpush_2(d, *svp); /* infinite recursion isn't supposed to happen here */ - DEBUG_M(Perl_deb(aTHX_ " recursively testing array element...\n")); + DEBUG_M(deb(" recursively testing array element...\n")); (void) do_smartmatch(NULL, NULL, 1); - DEBUG_M(Perl_deb(aTHX_ " recursion finished\n")); + DEBUG_M(deb(" recursion finished\n")); bool ok = SvTRUEx(PL_stack_sp[0]); rpp_popfree_1_NN(); if (ok) @@ -6263,19 +6392,19 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV else if (SvROK(e) && SvTYPE(SvRV(e)) == SVt_REGEXP) { if (!object_on_left && SvROK(d) && SvTYPE(SvRV(d)) == SVt_PVHV) { SV *t = d; d = e; e = t; - DEBUG_M(Perl_deb(aTHX_ " applying rule Hash-Regex\n")); + DEBUG_M(deb(" applying rule Hash-Regex\n")); goto sm_regex_hash; } else if (!object_on_left && SvROK(d) && SvTYPE(SvRV(d)) == SVt_PVAV) { SV *t = d; d = e; e = t; - DEBUG_M(Perl_deb(aTHX_ " applying rule Array-Regex\n")); + DEBUG_M(deb(" applying rule Array-Regex\n")); goto sm_regex_array; } else { PMOP * const matcher = make_matcher((REGEXP*) SvRV(e)); bool result; - DEBUG_M(Perl_deb(aTHX_ " applying rule Any-Regex\n")); + DEBUG_M(deb(" applying rule Any-Regex\n")); result = matcher_matches_sv(matcher, d); destroy_matcher(matcher); if (result) @@ -6288,29 +6417,29 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV /* See if there is overload magic on left */ else if (object_on_left && SvAMAGIC(d)) { SV *tmpsv; - DEBUG_M(Perl_deb(aTHX_ " applying rule Object-Any\n")); - DEBUG_M(Perl_deb(aTHX_ " attempting overload\n")); + DEBUG_M(deb(" applying rule Object-Any\n")); + DEBUG_M(deb(" attempting overload\n")); tmpsv = amagic_call(d, e, smart_amg, AMGf_noright); if (tmpsv) { rpp_replace_2_1_NN(tmpsv); return NORMAL; } - DEBUG_M(Perl_deb(aTHX_ " failed to run overload method; falling back...\n")); + DEBUG_M(deb(" failed to run overload method; falling back...\n")); goto sm_any_scalar; } else if (!SvOK(d)) { /* undef ~~ scalar ; we already know that the scalar is SvOK */ - DEBUG_M(Perl_deb(aTHX_ " applying rule undef-Any\n")); + DEBUG_M(deb(" applying rule undef-Any\n")); goto ret_no; } else sm_any_scalar: if (SvNIOK(e) || (SvPOK(e) && looks_like_number(e) && SvNIOK(d))) { DEBUG_M(if (SvNIOK(e)) - Perl_deb(aTHX_ " applying rule Any-Num\n"); + deb(" applying rule Any-Num\n"); else - Perl_deb(aTHX_ " applying rule Num-numish\n"); + deb(" applying rule Num-numish\n"); ); /* numeric comparison */ rpp_xpush_2(d, e); @@ -6327,7 +6456,7 @@ S_do_smartmatch(pTHX_ HV *seen_this, HV } /* As a last resort, use string comparison */ - DEBUG_M(Perl_deb(aTHX_ " applying rule Any-Any\n")); + DEBUG_M(deb(" applying rule Any-Any\n")); rpp_xpush_2(d, e); Perl_pp_seq(aTHX); { @@ -6468,9 +6597,9 @@ PP(pp_break) } static void -_invoke_defer_block(pTHX_ U8 type, void *_arg) +invoke_defer_block_(pTHX_ U8 type, void * arg_) { - OP *start = (OP *)_arg; + OP *start = (OP *) arg_; #ifdef DEBUGGING I32 was_cxstack_ix = cxstack_ix; #endif @@ -6541,15 +6670,15 @@ redo_body: } static void -invoke_defer_block(pTHX_ void *_arg) +invoke_defer_block(pTHX_ void * arg_) { - _invoke_defer_block(aTHX_ CXt_DEFER, _arg); + invoke_defer_block_(aTHX_ CXt_DEFER, arg_); } static void -invoke_finally_block(pTHX_ void *_arg) +invoke_finally_block(pTHX_ void * arg_) { - _invoke_defer_block(aTHX_ CXt_DEFER|CXp_FINALLY, _arg); + invoke_defer_block_(aTHX_ CXt_DEFER|CXp_FINALLY, arg_); } PP(pp_pushdefer) @@ -6565,6 +6694,8 @@ PP(pp_pushdefer) static MAGIC * S_doparseform(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_DOPARSEFORM; + STRLEN len; char *s = SvPV(sv, len); char *send; @@ -6583,8 +6714,6 @@ S_doparseform(pTHX_ SV *sv) MAGIC *mg = NULL; SV *sv_copy; - PERL_ARGS_ASSERT_DOPARSEFORM; - if (len == 0) croak("Null picture in formline"); @@ -6815,9 +6944,11 @@ S_doparseform(pTHX_ SV *sv) } -STATIC bool +static bool S_num_overflow(NV value, I32 fldsize, I32 frcsize) { + PERL_ARGS_ASSERT_NUM_OVERFLOW; + /* Can value be printed in fldsize chars, using %*.*f ? */ NV pwr = 1; NV eps = 0.5; @@ -6845,11 +6976,13 @@ S_num_overflow(NV value, I32 fldsize, I3 static I32 S_run_user_filter(pTHX_ int idx, SV *buf_sv, int maxlen) { + PERL_ARGS_ASSERT_RUN_USER_FILTER; + SV * const datasv = FILTER_DATA(idx); const int filter_has_file = IoLINES(datasv); SV * const filter_state = MUTABLE_SV(IoTOP_GV(datasv)); SV * const filter_sub = MUTABLE_SV(IoBOTTOM_GV(datasv)); - int status = 0; + I32 status = 0; SV *upstream; STRLEN got_len; char *got_p = NULL; @@ -6857,8 +6990,6 @@ S_run_user_filter(pTHX_ int idx, SV *buf bool read_from_cache = FALSE; STRLEN umaxlen; SV *err = NULL; - - PERL_ARGS_ASSERT_RUN_USER_FILTER; assert(maxlen >= 0); umaxlen = maxlen; Index: gnu/usr.bin/perl/pp_hot.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/pp_hot.c,v diff -u -p -a -u -p -r1.28 pp_hot.c --- gnu/usr.bin/perl/pp_hot.c 26 Dec 2025 22:14:13 -0000 1.28 +++ gnu/usr.bin/perl/pp_hot.c 16 Nov 2026 00:57:39 -0000 @@ -47,7 +47,7 @@ * args */ -STATIC void +static void S_pp_xs_wrap_return(pTHX_ I32 nargs, I32 old_sp) { I32 nret = (I32)(PL_stack_sp - PL_stack_base) - old_sp; @@ -192,7 +192,6 @@ void Perl_rpp_free_2_(pTHX_ SV *const sv1, SV *const sv2, const U32 rc1, const U32 rc2) { - PERL_ARGS_ASSERT_RPP_FREE_2_; #ifdef PERL_RC_STACK @@ -224,7 +223,9 @@ Perl_rpp_free_2_(pTHX_ SV *const sv1, S PP(pp_const) { - rpp_xpush_1(cSVOP_sv); + rpp_extend(1); /* Keep together all PL_op derefs (cSVOP_sv/NORMAL) */ + SV* sv = cSVOP_sv; /* in this hot pp op. stack_grow() is a function. */ + rpp_push_1(sv); /* Previously rpp_xpush_1(). */ return NORMAL; } @@ -357,7 +358,7 @@ PP(pp_aelemfastlex_store) /* inlined av_fetch() for simple cases ... */ if (!SvRMAGICAL(av) && key >=0 && key <= AvFILLp(av)) { - targ = AvARRAY(av)[key]; + targ = AvARRAY(av)[ (U8) key ]; } /* ... else do it the hard way */ if (!targ) { @@ -706,7 +707,8 @@ PP(pp_multiconcat) *svpv_p, /* ptr for looping through svpv_buf */ *svpv_base, /* first slot (may be greater than svpv_buf), */ *svpv_end, /* and slot after highest result so far, of: */ - svpv_buf[PERL_MULTICONCAT_MAXARG]; /* buf for storing SvPV() results */ + /* buf for storing SvPV() results */ + svpv_buf[PERL_MULTICONCAT_MAXARG] __attribute__uninitialized__; aux = cUNOP_AUXx(PL_op)->op_aux; stack_adj = nargs = aux[PERL_MULTICONCAT_IX_NARGS].ssize; @@ -1375,7 +1377,8 @@ PP(pp_multiconcat) ) { SV * const tmpsv = amagic_call(left, right, concat_amg, - (nextappend ? AMGf_assign: 0)); + (nextappend ? AMGf_assign: 0) + | AMGf_force_scalar); if (tmpsv) { /* NB: tryAMAGICbin_MG() includes an OPpTARGET_MY test * here, which isn't needed as any implicit @@ -1436,7 +1439,7 @@ PP(pp_multiconcat) /* push the elements of av onto the stack. * Returns PL_op->op_next to allow tail-call optimisation of its callers */ -STATIC OP* +static OP* S_pushav(pTHX_ AV* const av) { const SSize_t maxarg = AvFILL(av) + 1; @@ -1588,7 +1591,7 @@ PP(pp_readline) SvGETMAGIC(arg); /* unrolled tryAMAGICunTARGETlist(iter_amg, 0) */ - SV *tmpsv; + SV *tmpsv = NULL; U8 gimme = GIMME_V; if (UNLIKELY(SvAMAGIC(arg) && (tmpsv = amagic_call(arg, &PL_sv_undef, iter_amg, @@ -1811,6 +1814,7 @@ PP(pp_add) SV *targ = (PL_op->op_flags & OPf_STACKED) ? PL_stack_sp[-1] : PAD_SV(PL_op->op_targ); + NV nv; if (rpp_try_AMAGIC_2(add_amg, AMGf_assign|AMGf_numeric)) return NORMAL; @@ -1826,18 +1830,12 @@ PP(pp_add) U32 flags = (svl->sv_flags & svr->sv_flags); if (flags & SVf_IOK) { /* both args are simple IVs */ - UV topl, topr; + IV result; il = SvIVX(svl); ir = SvIVX(svr); do_iv: - topl = ((UV)il) >> (UVSIZE * 8 - 2); - topr = ((UV)ir) >> (UVSIZE * 8 - 2); - - /* if both are in a range that can't under/overflow, do a - * simple integer add: if the top of both numbers - * are 00 or 11, then it's safe */ - if (!( ((topl+1) | (topr+1)) & 2)) { - TARGi(il + ir, 0); /* args not GMG, so can't be tainted */ + if (!S_iv_add_may_overflow(il, ir, &result)) { + TARGi(result, 0); /* args not GMG, so can't be tainted */ goto ret; } goto generic; @@ -1923,7 +1921,7 @@ PP(pp_add) } else { /* Left operand is defined, so is it IV? */ if (SvIV_please_nomg(svl)) { - if ((auvok = SvUOK(svl))) + if ((auvok = SvIsUV(svl))) auv = SvUVX(svl); else { const IV aiv = SvIVX(svl); @@ -1941,7 +1939,7 @@ PP(pp_add) bool result_good = 0; UV result; UV buv; - bool buvok = SvUOK(svr); + bool buvok = SvIsUV(svr); /* svr is always IOK here */ if (buvok) buv = SvUVX(svr); @@ -1994,7 +1992,8 @@ PP(pp_add) TARGi(NEGATE_2IV(result), 1); else { /* result valid, but out of range for IV. */ - TARGn(-(NV)result, 1); + nv = -(NV)result; + goto ret_nv; } } goto ret; @@ -2006,16 +2005,13 @@ PP(pp_add) useleft = USE_LEFT(svl); #endif - { - NV value = SvNV_nomg(svr); - if (!useleft) { - /* left operand is undef, treat as zero. + 0.0 is identity. */ - TARGn(value, 1); - } - else { - TARGn(value + SvNV_nomg(svl), 1); - } - } + /* If left operand is undef, treat as zero. */ + nv = useleft ? SvNV_nomg(svl) : 0.0; + /* Separate statements here to ensure SvNV_nomg(svl) is evaluated + before SvNV_nomg(svr) */ + nv += SvNV_nomg(svr); + ret_nv: + TARGn(nv, 1); ret: rpp_replace_2_1_NN(targ); @@ -2038,7 +2034,7 @@ PP(pp_aelemfast) /* inlined av_fetch() for simple cases ... */ if (!SvRMAGICAL(av) && key >= 0 && key <= AvFILLp(av)) { - sv = AvARRAY(av)[key]; + sv = AvARRAY(av)[ (U8) key ]; if (sv) goto ret; if (!lval) { @@ -2102,7 +2098,7 @@ PP(pp_print) *MARK = NULL; ++PL_stack_sp; } - return Perl_tied_method(aTHX_ SV_CONST(PRINT), mark - 1, MUTABLE_SV(io), + return tied_method(SV_CONST(PRINT), mark - 1, MUTABLE_SV(io), mg, (G_SCALAR | TIED_METHOD_ARGUMENTS_ON_STACK | (PL_op->op_type == OP_SAY @@ -2498,7 +2494,7 @@ PP(pp_rv2av) } -STATIC void +static void S_do_oddball(pTHX_ SV **oddkey, SV **firstkey) { PERL_ARGS_ASSERT_DO_ODDBALL; @@ -2709,7 +2705,7 @@ S_aassign_copy_common(pTHX_ SV **firstle * PL_delaymagic; now we tell the OS to update the uids/gids atomically. */ -STATIC void +static void S_aassign_uid(pTHX) { /* Will be used to set PL_tainting below */ @@ -3151,11 +3147,13 @@ PP(pp_aassign) case SVt_PVHV: { /* normal hash */ SV **svp; +#ifndef PERL_RC_STACK SSize_t i; +#endif SSize_t nelems = lastrelem - relem + 1; HV *hash = MUTABLE_HV(lsv); - if (UNLIKELY(nelems & 1)) { + if (UNLIKELY(isODD(nelems))) { do_oddball(lastrelem, relem); /* we have firstlelem to reuse, it's not needed any more */ #ifdef PERL_RC_STACK @@ -3330,7 +3328,12 @@ PP(pp_aassign) SV **svp; SV **topelem = relem; - for (i = 0, svp = relem; svp <= lastrelem; i++, svp++) { +#ifdef PERL_RC_STACK + for (svp = relem; svp <= lastrelem; svp++) +#else + for (i = 0, svp = relem; svp <= lastrelem; i++, svp++) +#endif + { SV *key = *svp++; SV *val = *svp; /* remove duplicates from list we return */ @@ -3375,7 +3378,12 @@ PP(pp_aassign) } else { SV **svp; - for (i = 0, svp = relem; svp <= lastrelem; i++, svp++) { +#ifdef PERL_RC_STACK + for (svp = relem; svp <= lastrelem; svp++) +#else + for (i = 0, svp = relem; svp <= lastrelem; i++, svp++) +#endif + { SV *key = *svp++; SV *val = *svp; #ifdef PERL_RC_STACK @@ -3641,7 +3649,7 @@ PP(pp_qr) return NORMAL; } -STATIC bool +static bool S_are_we_in_Debug_EXECUTE_r(pTHX) { /* Given a 'use re' is in effect, does it ask for outputting execution @@ -3989,7 +3997,8 @@ PP(pp_match) is non-blocking but would have blocked if blocking */ PERL_STATIC_INLINE bool -error_is_would_block(int err) { +error_is_would_block(int err) +{ #ifdef EAGAIN if (err == EAGAIN) return true; @@ -4043,6 +4052,7 @@ error_is_would_block(int err) { OP * Perl_do_readline(pTHX) { + PERL_ARGS_ASSERT_DO_READLINE; const I32 type = PL_op->op_type; @@ -4080,7 +4090,7 @@ Perl_do_readline(pTHX) /* tied_method() frees everything currently above the passed * mark, and returns any values at mark[1] onwards */ - Perl_tied_method(aTHX_ SV_CONST(READLINE), + tied_method(SV_CONST(READLINE), /* mark => */ PL_stack_sp, MUTABLE_SV(io), mg, gimme, 0); @@ -4435,7 +4445,7 @@ PP(pp_helem) /* a stripped-down version of Perl_softref2xv() for use by * pp_multideref(), which doesn't use PL_op->op_flags */ -STATIC GV * +static GV * S_softref2xv_lite(pTHX_ SV *const sv, const char *const what, const svtype type) { @@ -4767,6 +4777,7 @@ PP(pp_multideref) || SvTYPE(keysv) >= SVt_PVMG || !SvOK(keysv) || SvROK(keysv) + || SvNOK(keysv) || SvIsCOW_shared_hash(keysv)); /* this is basically a copy of pp_helem with OPpDEREF skipped */ @@ -4871,6 +4882,11 @@ PP(pp_iter) SV **itersvp = CxITERVAR(cx); const U8 type = CxTYPE(cx); U8 pflags = PL_op->op_private; + bool pflag_refalias = (pflags & OPpITER_REFALIAS); + + // TODO: This needs to be an opchecker or compiletime complaint + if(pflag_refalias) + assert(type == CXt_LOOP_LIST || type == CXt_LOOP_ARY); /* Classic "for" syntax iterates one-at-a-time. Many-at-a-time for loops are only for lexicals declared as part of the @@ -4882,8 +4898,25 @@ PP(pp_iter) for many-at-a-time. We actually store C, so that for the case of one-at-a-time we have zero (as before), as this makes all the logic of the for loop below much simpler, with all the other - one-at-a-time cases just falling out of this "naturally". */ + one-at-a-time cases just falling out of this "naturally". + + If OPpITER_REFALIAS is set, this field actually stores two values. + The actual count sits in the lower 8 bits, and the upper 24 bits form a + bitmask indicating which of the iterator variables have refalias + behaviour */ PADOFFSET how_many = PL_op->op_targ; + U32 refalias_mask = 0; + if (pflag_refalias) { + refalias_mask = how_many >> 8; + how_many &= 0xFF; + + if (!how_many) + /* OPpITER_REFALIAS with how_many==0 means that one variable is + * refaliased + */ + refalias_mask = 1; + } + PADOFFSET i = 0; assert(itersvp); @@ -4895,10 +4928,14 @@ PP(pp_iter) IV ix; IV inc; + bool refalias_this = refalias_mask & (1<blk_loop.state_u.lazysv.cur; SV *end = cx->blk_loop.state_u.lazysv.end; /* If the maximum is !SvOK(), pp_enteriter substitutes PL_sv_no. @@ -4961,6 +4998,8 @@ PP(pp_iter) case CXt_LOOP_LAZYIV: /* integer increment */ { + /* This should have been forbidden by pp_enteriter */ + assert(!refalias_this); IV cur = cx->blk_loop.state_u.lazyiv.cur; bool pad_it = FALSE; if (UNLIKELY(cur > cx->blk_loop.state_u.lazyiv.end)) { @@ -5078,6 +5117,38 @@ PP(pp_iter) loop_ary_common: + if (refalias_this) { + /* TODO(leonerd): pull out this behaviour into a shared place. + * This is mostly copypaste from mg.c's Perl_magic_setlvref */ + if (!sv || !SvROK(sv)) croak("Assigned value is not a reference"); + SV *rv = SvRV(sv); + + const char *bad = NULL; + /* TODO(leonerd): is it sufficient to use the existing var type? */ + switch (SvTYPE(*itersvp)) { + case SVt_PVAV: + if(SvTYPE(rv) != SVt_PVAV) bad = "an ARRAY"; + break; + case SVt_PVHV: + if(SvTYPE(rv) != SVt_PVHV) bad = "a HASH"; + break; + case SVt_PVCV: + if(SvTYPE(rv) != SVt_PVCV) bad = "a CODE"; + break; + default: + if(SvTYPE(rv) > SVt_PVLV) bad = "a SCALAR"; + break; + } + if (bad) + croak("Assigned value is not %s reference", bad); + + oldsv = *itersvp; + *itersvp = SvREFCNT_inc_NN(rv); + SvREFCNT_dec(oldsv); + + break; + } + if (UNLIKELY(cx->cx_type & CXp_FOR_LVREF)) { SvSetMagicSV(*itersvp, sv); break; @@ -5375,8 +5446,7 @@ PP(pp_subst) if (dstr) { /* replacement needing upgrading? */ if (DO_UTF8(TARG) && !doutf8) { - nsv = sv_newmortal(); - SvSetSV(nsv, dstr); + nsv = sv_mortalcopy_flags(dstr, SV_GMAGIC|SV_DO_COW_SVSETSV); sv_utf8_upgrade(nsv); c = SvPV_const(nsv, clen); doutf8 = TRUE; @@ -5841,11 +5911,11 @@ PP(pp_grepwhile) void Perl_leave_adjust_stacks(pTHX_ SV **from_sp, SV **to_sp, U8 gimme, int pass) { + PERL_ARGS_ASSERT_LEAVE_ADJUST_STACKS; + SSize_t tmps_base; /* lowest index into tmps stack that needs freeing now */ SSize_t nargs; - PERL_ARGS_ASSERT_LEAVE_ADJUST_STACKS; - TAINT_NOT; if (gimme == G_LIST) { @@ -6135,7 +6205,7 @@ Perl_leave_adjust_stacks(pTHX_ SV **from while (PL_tmps_ix >= tmps_base) { SV* const sv = PL_tmps_stack[PL_tmps_ix--]; #ifdef PERL_POISON - PoisonWith(PL_tmps_stack + PL_tmps_ix + 1, 1, SV *, 0xAB); + PoisonNew(PL_tmps_stack + PL_tmps_ix + 1, 1, SV *); #endif if (LIKELY(sv)) { SvTEMP_off(sv); @@ -6618,6 +6688,8 @@ Perl_sub_crush_depth(pTHX_ CV *cv) void Perl_croak_caller(const char *pat, ...) { + PERL_ARGS_ASSERT_CROAK_CALLER; + dTHX; va_list args; const PERL_CONTEXT *cx = caller_cx(0, NULL); @@ -6753,6 +6825,8 @@ Perl_vivify_ref(pTHX_ SV *sv, U32 to_wha PERL_STATIC_INLINE HV * S_opmethod_stash(pTHX_ SV* meth) { + PERL_ARGS_ASSERT_OPMETHOD_STASH; + SV* ob; HV* stash; @@ -6761,8 +6835,6 @@ S_opmethod_stash(pTHX_ SV* meth) "package or object reference", SVfARG(meth)), (SV *)NULL) : *(PL_stack_base + TOPMARK + 1); - - PERL_ARGS_ASSERT_OPMETHOD_STASH; if (UNLIKELY(!sv)) undefined: Index: gnu/usr.bin/perl/pp_pack.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/pp_pack.c,v diff -u -p -a -u -p -r1.12 pp_pack.c --- gnu/usr.bin/perl/pp_pack.c 23 Jul 2026 04:25:35 -0000 1.12 +++ gnu/usr.bin/perl/pp_pack.c 16 Nov 2026 00:57:39 -0000 @@ -113,14 +113,14 @@ typedef union { --jhi Feb 1999 */ #if U16SIZE <= SIZE16 && U32SIZE <= SIZE32 -# define OFF16(p) ((char *) (p)) -# define OFF32(p) ((char *) (p)) +# define OFF16(p) ((U8 *)(p)) +# define OFF32(p) ((U8 *)(p)) #elif BYTEORDER == 0x1234 || BYTEORDER == 0x12345678 /* little-endian */ -# define OFF16(p) ((char*)(p)) -# define OFF32(p) ((char*)(p)) +# define OFF16(p) ((U8 *)(p)) +# define OFF32(p) ((U8 *)(p)) #elif BYTEORDER == 0x4321 || BYTEORDER == 0x87654321 /* big-endian */ -# define OFF16(p) ((char*)(p) + (sizeof(U16) - SIZE16)) -# define OFF32(p) ((char*)(p) + (sizeof(U32) - SIZE32)) +# define OFF16(p) ((U8 *)(p) + (sizeof(U16) - SIZE16)) +# define OFF32(p) ((U8 *)(p) + (sizeof(U32) - SIZE32)) #else # error "bad cray byte order" #endif @@ -148,7 +148,7 @@ typedef union { STMT_START { \ if (UNLIKELY(utf8)) { \ if (!S_utf8_to_bytes(aTHX_ &s, strend, \ - (char *) (buf), len, datumtype)) break; \ + (U8 *)(buf), len, datumtype)) break; \ } else { \ if (UNLIKELY(needs_swap)) \ S_reverse_copy(s, (char *) (buf), len); \ @@ -182,15 +182,15 @@ STMT_START { \ #define FLAG_COMMA 0x02 #define FLAG_PACK 0x01 -STATIC SV * +static SV * S_mul128(pTHX_ SV *sv, U8 m) { + PERL_ARGS_ASSERT_MUL128; + STRLEN len; char *s = SvPV(sv, len); char *t; - PERL_ARGS_ASSERT_MUL128; - if (! memBEGINs(s, len, "0000")) { /* need to grow sv */ SV * const tmpNew = newSVpvs("0000000000"); @@ -244,7 +244,7 @@ S_reverse_copy(const char *src, char *de *--dest = *src++; } -STATIC U8 +static U8 utf8_to_byte(pTHX_ const char **s, const char *end, I32 datumtype) { STRLEN retlen; @@ -253,12 +253,14 @@ utf8_to_byte(pTHX_ const char **s, const if (*s >= end) { goto croak; } - val = utf8n_to_uvchr((U8 *) *s, end-*s, &retlen, - ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANY); - if (retlen == (STRLEN) -1) + if (! utf8_to_uv_flags((U8 *) *s, (U8 *) end, &val, &retlen, + ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANY)) + { croak: croak("Malformed UTF-8 string in '%c' format in unpack", (int) TYPE_NO_MODIFIERS(datumtype)); + } + if (val >= 0x100) { ck_warner(packWARN(WARN_UNPACK), "Character in '%c' format wrapped in unpack", @@ -273,61 +275,89 @@ utf8_to_byte(pTHX_ const char **s, const utf8_to_byte(aTHX_ &(s), (strend), (datumtype)) : \ *(U8 *)(s)++) -STATIC bool -S_utf8_to_bytes(pTHX_ const char **s, const char *end, const char *buf, SSize_t buf_len, I32 datumtype) +static bool +S_utf8_to_bytes(pTHX_ const char **s, const char *end, U8 *buf, SSize_t buf_len, I32 datumtype) { UV val; STRLEN retlen; const char *from = *s; - int bad = 0; - const U32 flags = ckWARN(WARN_UTF8) ? - UTF8_CHECK_ONLY : (UTF8_CHECK_ONLY | UTF8_ALLOW_ANY); + bool bad = false; + const U32 flags = ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANY; const bool needs_swap = NEEDS_SWAP(datumtype); if (UNLIKELY(needs_swap)) buf += buf_len; - for (;buf_len > 0; buf_len--) { + AV * msgs = NULL; + for (; buf_len > 0; buf_len--) { if (from >= end) return FALSE; - val = utf8n_to_uvchr((U8 *) from, end-from, &retlen, flags); - if (retlen == (STRLEN) -1) { - from += UTF8_SAFE_SKIP(from, end); - bad |= 1; - } else from += retlen; - if (val >= 0x100) { - bad |= 2; - val = (U8) val; + + AV * this_msgs = NULL; + if (utf8_to_uv_msgs((U8 *) from, (U8 *) end, &val, &retlen, flags, + NULL, &this_msgs)) + { + if (val >= 0x100) { + bad = true; + val = (U8) val; + } } + + from += retlen; + + /* Add any messages from this conversion to the list for later output + * */ + if (this_msgs) { + while (av_count(this_msgs) > 0) { + Perl_av_create_and_push(aTHX_ &msgs, av_shift(this_msgs)); + } + + Safefree(this_msgs); + } + if (UNLIKELY(needs_swap)) - *(U8 *)--buf = (U8)val; + *--buf = (U8)val; else - *(U8 *)buf++ = (U8)val; + *buf++ = (U8)val; } + /* We have enough characters for the buffer. Did we have problems ? */ + if (msgs) { + while (av_count(msgs) > 0) { + HV * msg_hash = (HV *) av_shift(msgs); + SV ** packed_categories_p = hv_fetchs(msg_hash, "warn_categories", 0); + if (packed_categories_p == NULL) { + continue; + } + + UV packed_categories = SvUV(*packed_categories_p); + if (packed_categories == 0) { + continue; + } + + SV ** warn_text_p = hv_fetchs(msg_hash, "text", 0); + if (warn_text_p) { + warner(packed_categories, "%s", SvPV_nolen(*warn_text_p)); + } + } + + Safefree(msgs); + } + if (bad) { - if (bad & 1) { - /* Rewalk the string fragment while warning */ - const char *ptr; - const U32 flags = ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANY; - for (ptr = *s; ptr < from; ptr += UTF8SKIP(ptr)) { - if (ptr >= end) break; - utf8n_to_uvchr((U8 *) ptr, end-ptr, &retlen, flags); - } - if (from > end) from = end; - } - if ((bad & 2)) - ck_warner(packWARN(datumtype & TYPE_IS_PACK ? - WARN_PACK : WARN_UNPACK), - "Character(s) in '%c' format wrapped in %s", - (int) TYPE_NO_MODIFIERS(datumtype), - datumtype & TYPE_IS_PACK ? "pack" : "unpack"); + ck_warner(packWARN(datumtype & TYPE_IS_PACK ? + WARN_PACK : WARN_UNPACK), + "Character(s) in '%c' format wrapped in %s", + (int) TYPE_NO_MODIFIERS(datumtype), + datumtype & TYPE_IS_PACK ? "pack" : "unpack"); } + *s = from; return TRUE; } -STATIC char * -S_my_bytes_to_utf8(const U8 *start, STRLEN len, char *dest, const bool needs_swap) { +static char * +S_my_bytes_to_utf8(const U8 *start, STRLEN len, char *dest, const bool needs_swap) +{ PERL_ARGS_ASSERT_MY_BYTES_TO_UTF8; if (UNLIKELY(needs_swap)) { @@ -408,38 +438,38 @@ STMT_START { \ } STMT_END /* Only to be used inside a loop (see the break) */ -#define NEXT_UNI_VAL(val, cur, str, end, utf8_flags) \ -STMT_START { \ - STRLEN retlen; \ - if (str >= end) break; \ - val = utf8n_to_uvchr((U8 *) str, end-str, &retlen, utf8_flags); \ - if (retlen == (STRLEN) -1) { \ - *cur = '\0'; \ - croak("Malformed UTF-8 string in pack"); \ - } \ - str += retlen; \ +#define NEXT_UNI_VAL(val, cur, str, end, utf8_flags) \ +STMT_START { \ + STRLEN retlen; \ + if (str >= end) break; \ + if (! utf8_to_uv_flags((U8 *) str, (U8 *) end, &val, &retlen, \ + utf8_flags)) { \ + *cur = '\0'; \ + croak("Malformed UTF-8 string in pack"); \ + } \ + str += retlen; \ } STMT_END -static const char *_action( const tempsym_t* symptr ) +static const char *action_( const tempsym_t* symptr ) { return (const char *)(( symptr->flags & FLAG_PACK ) ? "pack" : "unpack"); } /* Returns the sizeof() struct described by pat */ -STATIC SSize_t +static SSize_t S_measure_struct(pTHX_ tempsym_t* symptr) { - SSize_t total = 0; - PERL_ARGS_ASSERT_MEASURE_STRUCT; + SSize_t total = 0; + while (next_symbol(symptr)) { SSize_t len, size; switch (symptr->howlen) { case e_star: croak("Within []-length '*' not allowed in %s", - _action( symptr ) ); + action_( symptr ) ); default: /* e_no_len and e_number */ @@ -456,7 +486,7 @@ S_measure_struct(pTHX_ tempsym_t* symptr /* diag_listed_as: Invalid type '%s' in %s */ croak("Invalid type '%c' in %s", (int)TYPE_NO_MODIFIERS(symptr->code), - _action( symptr ) ); + action_( symptr ) ); case '.' | TYPE_IS_SHRIEKING: case '@' | TYPE_IS_SHRIEKING: case '@': @@ -467,7 +497,7 @@ S_measure_struct(pTHX_ tempsym_t* symptr case 'u': croak("Within []-length '%c' not allowed in %s", (int) TYPE_NO_MODIFIERS(symptr->code), - _action( symptr ) ); + action_( symptr ) ); case '%': size = 0; break; @@ -494,7 +524,7 @@ S_measure_struct(pTHX_ tempsym_t* symptr case 'X': size = -1; if (total < len) - croak("'X' outside of string in %s", _action( symptr ) ); + croak("'X' outside of string in %s", action_( symptr ) ); break; case 'x' | TYPE_IS_SHRIEKING: if (!len) /* Avoid division by 0 */ @@ -541,7 +571,7 @@ S_measure_struct(pTHX_ tempsym_t* symptr /* locate matching closing parenthesis or bracket * returns char pointer to char after match, or NULL */ -STATIC const char * +static const char * S_group_end(pTHX_ const char *patptr, const char *patend, char ender) { PERL_ARGS_ASSERT_GROUP_END; @@ -574,13 +604,13 @@ S_group_end(pTHX_ const char *patptr, co * Expects a pointer to the first digit and address of length variable * Advances char pointer to 1st non-digit char and returns number */ -STATIC const char * +static const char * S_get_num(pTHX_ const char *patptr, SSize_t *lenptr ) { - SSize_t len = *patptr++ - '0'; - PERL_ARGS_ASSERT_GET_NUM; + SSize_t len = *patptr++ - '0'; + while (isDIGIT(*patptr)) { SSize_t nlen = (len * 10) + (*patptr++ - '0'); if (nlen < 0 || nlen/10 != len) @@ -594,14 +624,14 @@ S_get_num(pTHX_ const char *patptr, SSiz /* The marvellous template parsing routine: Using state stored in *symptr, * locates next template code and count */ -STATIC bool +static bool S_next_symbol(pTHX_ tempsym_t* symptr ) { + PERL_ARGS_ASSERT_NEXT_SYMBOL; + const char* patptr = symptr->patptr; const char* const patend = symptr->patend; - PERL_ARGS_ASSERT_NEXT_SYMBOL; - symptr->flags &= ~FLAG_SLASH; while (patptr < patend) { @@ -625,7 +655,7 @@ S_next_symbol(pTHX_ tempsym_t* symptr ) symptr->flags |= FLAG_COMMA; /* diag_listed_as: Invalid type '%s' in %s */ warner(packWARN(WARN_UNPACK), - "Invalid type ',' in %s", _action( symptr ) ); + "Invalid type ',' in %s", action_( symptr ) ); } continue; } @@ -634,12 +664,12 @@ S_next_symbol(pTHX_ tempsym_t* symptr ) if (code == '(') { if( isDIGIT(*patptr) || *patptr == '*' || *patptr == '[' ) croak("()-group starts with a count in %s", - _action( symptr ) ); + action_( symptr ) ); symptr->grpbeg = patptr; patptr = 1 + ( symptr->grpend = group_end(patptr, patend, ')') ); if( symptr->level >= MAX_SUB_TEMPLATE_LEVEL ) croak("Too deeply nested ()-groups in %s", - _action( symptr ) ); + action_( symptr ) ); } /* look for group modifiers to inherit */ @@ -676,21 +706,21 @@ S_next_symbol(pTHX_ tempsym_t* symptr ) if (!strchr(allowed, TYPE_NO_MODIFIERS(code))) croak("'%c' allowed only after types %s in %s", *patptr, - allowed, _action( symptr ) ); + allowed, action_( symptr ) ); if (TYPE_ENDIANNESS(code | modifier) == TYPE_ENDIANNESS_MASK) croak("Can't use both '<' and '>' after type '%c' in %s", - (int) TYPE_NO_MODIFIERS(code), _action( symptr ) ); + (int) TYPE_NO_MODIFIERS(code), action_( symptr ) ); else if (TYPE_ENDIANNESS(code | modifier | inherited_modifiers) == TYPE_ENDIANNESS_MASK) croak("Can't use '%c' in a group with different byte-order in %s", - *patptr, _action( symptr ) ); + *patptr, action_( symptr ) ); if ((code & modifier)) { ck_warner(packWARN(WARN_UNPACK), "Duplicate modifier '%c' after '%c' in %s", *patptr, (int) TYPE_NO_MODIFIERS(code), - _action( symptr ) ); + action_( symptr ) ); } code |= modifier; @@ -719,7 +749,7 @@ S_next_symbol(pTHX_ tempsym_t* symptr ) lenptr = get_num( lenptr, &symptr->length ); if( *lenptr != ']' ) croak("Malformed integer in [] in %s", - _action( symptr ) ); + action_( symptr ) ); } else { tempsym_t savsym = *symptr; symptr->patend = patptr-1; @@ -749,7 +779,7 @@ S_next_symbol(pTHX_ tempsym_t* symptr ) if (patptr < patend && (isDIGIT(*patptr) || *patptr == '*' || *patptr == '[')) croak("'/' does not take a repeat count in %s", - _action( symptr ) ); + action_( symptr ) ); } break; } @@ -778,13 +808,13 @@ S_next_symbol(pTHX_ tempsym_t* symptr ) version of the string. Users are advised to upgrade their pack string themselves if they need to do a lot of unpacks like this on it */ -STATIC bool -need_utf8(const char *pat, const char *patend) +static bool +S_need_utf8(const char *pat, const char *patend) { - bool first = TRUE; - PERL_ARGS_ASSERT_NEED_UTF8; + bool first = TRUE; + while (pat < patend) { if (pat[0] == '#') { pat++; @@ -798,8 +828,9 @@ need_utf8(const char *pat, const char *p return FALSE; } -STATIC char -first_symbol(const char *pat, const char *patend) { +static char +S_first_symbol(const char *pat, const char *patend) +{ PERL_ARGS_ASSERT_FIRST_SYMBOL; while (pat < patend) { @@ -837,10 +868,10 @@ example). SSize_t Perl_unpackstring(pTHX_ const char *pat, const char *patend, const char *s, const char *strend, U32 flags) { - tempsym_t sym; - PERL_ARGS_ASSERT_UNPACKSTRING; + tempsym_t sym; + if (flags & FLAG_DO_UTF8) flags |= FLAG_WAS_UTF8; else if (need_utf8(pat, patend)) { /* We probably should try to avoid this in case a scalar context call @@ -859,9 +890,11 @@ Perl_unpackstring(pTHX_ const char *pat, return unpack_rec(&sym, s, s, strend, NULL ); } -STATIC SSize_t +static SSize_t S_unpack_rec(pTHX_ tempsym_t* symptr, const char *s, const char *strbeg, const char *strend, const char **new_s ) { + PERL_ARGS_ASSERT_UNPACK_REC; + dSP; SV *sv = NULL; const SSize_t start_sp_offset = SP - PL_stack_base; @@ -875,8 +908,6 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, co const bool unpack_only_one = (symptr->flags & FLAG_UNPACK_ONLY_ONE) != 0; bool utf8 = (symptr->flags & FLAG_PARSE_UTF8) ? 1 : 0; - PERL_ARGS_ASSERT_UNPACK_REC; - symptr->strbeg = s - strbeg; while (next_symbol(symptr)) { @@ -1234,17 +1265,28 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, co case 'c': while (len-- > 0 && s < strend) { int aint; - if (utf8) - { + if (utf8) { STRLEN retlen; - aint = utf8n_to_uvchr((U8 *) s, strend-s, &retlen, - ckWARN(WARN_UTF8) ? 0 : UTF8_ALLOW_ANY); - if (retlen == (STRLEN) -1) + UV auv; + if (! utf8_to_uv_flags((U8 *) s, (U8 *) strend, + &auv, &retlen, + (ckWARN(WARN_UTF8)) + ? 0 + : UTF8_ALLOW_ANY)) + { + croak("Malformed UTF-8 string in unpack"); + } + + aint = auv; + if ( (UV) aint != auv) { croak("Malformed UTF-8 string in unpack"); + } + s += retlen; - } - else - aint = *(U8 *)(s)++; + } + else { + aint = *(U8 *)(s)++; + } if (aint >= 128 && datumtype != 'C') /* fake up signed chars */ aint -= 256; if (!checksum) @@ -1309,20 +1351,21 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, co STRLEN len; /* Bug: warns about bad utf8 even if we are short on bytes and will break out of the loop */ - if (!S_utf8_to_bytes(aTHX_ &ptr, strend, (char *) result, 1, + if (!S_utf8_to_bytes(aTHX_ &ptr, strend, result, 1, 'U')) break; len = UTF8SKIP(result); if (!S_utf8_to_bytes(aTHX_ &ptr, strend, - (char *) &result[1], len-1, 'U')) break; - auv = utf8n_to_uvchr(result, len, &retlen, - UTF8_ALLOW_DEFAULT); + &result[1], len - 1, 'U')) + { + break; + } + + auv = utf8_to_uv_or_die(result, result + len, &retlen); s = ptr; - } else { - auv = utf8n_to_uvchr((U8*)s, strend - s, &retlen, - UTF8_ALLOW_DEFAULT); - if (retlen == (STRLEN) -1) - croak("Malformed UTF-8 string in unpack"); + } + else { + (void) utf8_to_uv((U8 *) s, (U8 *) strend, &auv, &retlen); s += retlen; } if (!checksum) @@ -1600,8 +1643,7 @@ S_unpack_rec(pTHX_ tempsym_t* symptr, co if (++bytes >= sizeof(UV)) { /* promote to string */ const char *t; - sv = Perl_newSVpvf(aTHX_ "%.*" UVuf, - (int)TYPE_DIGITS(UV), auv); + sv = newSVpvf("%.*" UVuf, (int)TYPE_DIGITS(UV), auv); while (s < strend) { ch = SHIFT_BYTE(utf8, s, strend, datumtype); sv = mul128(sv, (U8)(ch & 0x7f)); @@ -1865,7 +1907,7 @@ PP_wrapped(pp_unpack, 2, 0) RETURN; } -STATIC U8 * +static U8 * doencodes(U8 *h, const U8 *s, SSize_t len) { *h++ = PL_uuemap[len]; @@ -1888,17 +1930,17 @@ doencodes(U8 *h, const U8 *s, SSize_t le return h; } -STATIC SV * +static SV * S_is_an_int(pTHX_ const char *s, STRLEN l) { + PERL_ARGS_ASSERT_IS_AN_INT; + SV *result = newSVpvn(s, l); char *const result_c = SvPV_nolen(result); /* convenience */ char *out = result_c; bool skip = 1; bool ignore = 0; - PERL_ARGS_ASSERT_IS_AN_INT; - while (*s) { switch (*s) { case ' ': @@ -1906,7 +1948,7 @@ S_is_an_int(pTHX_ const char *s, STRLEN case '+': if (!skip) { SvREFCNT_dec(result); - return (NULL); + return NULL; } break; case '0': @@ -1929,7 +1971,7 @@ S_is_an_int(pTHX_ const char *s, STRLEN break; default: SvREFCNT_dec(result); - return (NULL); + return NULL; } s++; } @@ -1939,16 +1981,16 @@ S_is_an_int(pTHX_ const char *s, STRLEN } /* pnum must be '\0' terminated */ -STATIC int +static int S_div128(pTHX_ SV *pnum, bool *done) { + PERL_ARGS_ASSERT_DIV128; + STRLEN len; char * const s = SvPV(pnum, len); char *t = s; int m = 0; - PERL_ARGS_ASSERT_DIV128; - *done = 1; while (*t) { const int i = m * 10 + (*t - '0'); @@ -1975,10 +2017,10 @@ The engine implementing C Perl f void Perl_packlist(pTHX_ SV *cat, const char *pat, const char *patend, SV **beglist, SV **endlist ) { - tempsym_t sym; - PERL_ARGS_ASSERT_PACKLIST; + tempsym_t sym; + TEMPSYM_INIT(&sym, pat, patend, FLAG_PACK); /* We're going to do changes through SvPVX(cat). Make sure it's valid. @@ -1991,8 +2033,9 @@ Perl_packlist(pTHX_ SV *cat, const char } /* like sv_utf8_upgrade, but also repoint the group start markers */ -STATIC void -marked_upgrade(pTHX_ SV *sv, tempsym_t *sym_ptr) { +static void +marked_upgrade(pTHX_ SV *sv, tempsym_t *sym_ptr) +{ STRLEN len; tempsym_t *group; const char *from_ptr, *from_start, *from_end, **marks, **m; @@ -2059,14 +2102,15 @@ marked_upgrade(pTHX_ SV *sv, tempsym_t * needed says how many extra bytes we need (not counting the final '\0') Only grows the string if there is an actual lack of space */ -STATIC char * -S_sv_exp_grow(pTHX_ SV *sv, STRLEN needed) { +static char * +S_sv_exp_grow(pTHX_ SV *sv, STRLEN needed) +{ + PERL_ARGS_ASSERT_SV_EXP_GROW; + const STRLEN cur = SvCUR(sv); const STRLEN len = SvLEN(sv); STRLEN extend; - PERL_ARGS_ASSERT_SV_EXP_GROW; - if (len - cur > needed) return SvPVX(sv); extend = needed > len ? needed : len; return SvGROW(sv, len+extend+1); @@ -2094,10 +2138,12 @@ S_sv_check_infnan(pTHX_ SV *sv, I32 datu #define SvUV_no_inf(sv,d) \ ((sv) = S_sv_check_infnan(aTHX_ sv,d), SvUV_nomg(sv)) -STATIC +static SV ** S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist ) { + PERL_ARGS_ASSERT_PACK_REC; + tempsym_t lookahead; SSize_t items = endlist - beglist; bool found = next_symbol(symptr); @@ -2105,8 +2151,6 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* sym bool warn_utf8 = ckWARN(WARN_UTF8); char* from; - PERL_ARGS_ASSERT_PACK_REC; - if (symptr->level == 0 && found && symptr->code == 'U') { marked_upgrade(aTHX_ cat, symptr); symptr->flags |= FLAG_DO_UTF8; @@ -2373,7 +2417,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* sym if (datumtype == 'Z') len++; } GROWING(0, cat, start, cur, len); - if (!S_utf8_to_bytes(aTHX_ &aptr, end, cur, fromlen, + if (!S_utf8_to_bytes(aTHX_ &aptr, end, (U8 *)cur, fromlen, datumtype | TYPE_IS_PACK)) croak("panic: predicted utf8 length not available, " "for '%c', aptr=%p end=%p cur=%p, fromlen=%zu", @@ -3105,7 +3149,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* sym else todo = fromlen; if (from_utf8) { - char buffer[64]; + U8 buffer[64]; if (!S_utf8_to_bytes(aTHX_ &aptr, aend, buffer, todo, 'u' | TYPE_IS_PACK)) { *cur = '\0'; @@ -3114,7 +3158,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* sym "aptr=%p, aend=%p, buffer=%p, todo=%zd", aptr, aend, buffer, todo); } - end = doencodes(hunk, (const U8 *)buffer, todo); + end = doencodes(hunk, buffer, todo); } else { end = doencodes(hunk, (const U8 *)aptr, todo); aptr += todo; Index: gnu/usr.bin/perl/pp_proto.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/pp_proto.h,v diff -u -p -a -u -p -r1.8 pp_proto.h --- gnu/usr.bin/perl/pp_proto.h 26 Dec 2025 22:14:13 -0000 1.8 +++ gnu/usr.bin/perl/pp_proto.h 16 Nov 2026 00:57:39 -0000 @@ -183,6 +183,7 @@ PERL_CALLCONV PP(pp_mkdir) __attribute__ PERL_CALLCONV PP(pp_modulo) __attribute__visibility__("hidden"); PERL_CALLCONV PP(pp_multiconcat) __attribute__visibility__("hidden"); PERL_CALLCONV PP(pp_multideref) __attribute__visibility__("hidden"); +PERL_CALLCONV PP(pp_multiparam) __attribute__visibility__("hidden"); PERL_CALLCONV PP(pp_multiply) __attribute__visibility__("hidden"); PERL_CALLCONV PP(pp_nbit_and) __attribute__visibility__("hidden"); PERL_CALLCONV PP(pp_nbit_or) __attribute__visibility__("hidden"); @@ -207,6 +208,8 @@ PERL_CALLCONV PP(pp_padhv) __attribute__ PERL_CALLCONV PP(pp_padrange) __attribute__visibility__("hidden"); PERL_CALLCONV PP(pp_padsv) __attribute__visibility__("hidden"); PERL_CALLCONV PP(pp_padsv_store) __attribute__visibility__("hidden"); +PERL_CALLCONV PP(pp_paramstore) __attribute__visibility__("hidden"); +PERL_CALLCONV PP(pp_paramtest) __attribute__visibility__("hidden"); PERL_CALLCONV PP(pp_pipe_op) __attribute__visibility__("hidden"); PERL_CALLCONV PP(pp_poptry) __attribute__visibility__("hidden"); PERL_CALLCONV PP(pp_pos) __attribute__visibility__("hidden"); Index: gnu/usr.bin/perl/pp_sort.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/pp_sort.c,v diff -u -p -a -u -p -r1.8 pp_sort.c --- gnu/usr.bin/perl/pp_sort.c 26 Dec 2025 22:14:13 -0000 1.8 +++ gnu/usr.bin/perl/pp_sort.c 16 Nov 2026 00:57:39 -0000 @@ -333,6 +333,8 @@ typedef struct { PERL_STATIC_FORCE_INLINE void S_sortsv_flags_impl(pTHX_ gptr *base, size_t nmemb, SVCOMPARE_t cmp, U32 flags) { + PERL_ARGS_ASSERT_SORTSV_FLAGS_IMPL; + IV i, run, offset; I32 sense, level; gptr *f1, *f2, *t, *b, *p; @@ -344,7 +346,6 @@ S_sortsv_flags_impl(pTHX_ gptr *base, si off_runs stack[60], *stackp; PERL_UNUSED_ARG(flags); - PERL_ARGS_ASSERT_SORTSV_FLAGS_IMPL; if (nmemb <= 1) return; /* sorted trivially */ if (nmemb <= SMALLSORT) aux = small; /* use stack for aux array */ @@ -537,10 +538,29 @@ S_sortsv_flags_impl(pTHX_ gptr *base, si } /* -=for apidoc sortsv_flags -In-place sort an array of SV pointers with the given comparison routine, -with various SORTf_* flag options. +=for apidoc sortsv +=for apidoc_item sortsv_flags + +These functions are currently identical; they perform an in-place mergesort of +an array of SV pointers C (length C) with the given comparison +routine, C, which should be declared as C. It will be +called as + + ret = cmp(aTHX_ sv_a, sv_b) + if (ret < 0) { + // sv_a is first + } + else if (ret > 0) { + // sv_b is first + } + else { + // they compare equal + } + +C is currently ignored in C. + +=for apidoc Ayh ||SVCOMPARE_t =cut */ @@ -662,18 +682,6 @@ sortsv_cmp_locale_desc(pTHX_ gptr *base, #endif -/* - -=for apidoc sortsv - -In-place sort an array of SV pointers with the given comparison routine. - -Currently this always uses mergesort. See C> for a more -flexible routine. - -=cut -*/ - void Perl_sortsv(pTHX_ SV **array, size_t nmemb, SVCOMPARE_t cmp) { @@ -966,7 +974,7 @@ PP(pp_sort) } start = p1 - max; - Perl_sortsv_flags(aTHX_ start, max, + sortsv_flags(start, max, (is_xsub ? S_sortcv_xsub : hasargs ? S_sortcv_stacked : S_sortcv), sort_flags); @@ -1166,14 +1174,13 @@ PP(pp_sort) static I32 S_sortcv(pTHX_ SV *const a, SV *const b) { + PERL_ARGS_ASSERT_SORTCV; + const I32 oldsaveix = PL_savestack_ix; - I32 result; PMOP * const pm = PL_curpm; COP * const cop = PL_curcop; SV *olda, *oldb; - PERL_ARGS_ASSERT_SORTCV; - #ifdef PERL_RC_STACK assert(rpp_stack_is_rc()); #endif @@ -1191,7 +1198,11 @@ S_sortcv(pTHX_ SV *const a, SV *const b) /* entry zero of a stack is always PL_sv_undef, which * simplifies converting a '()' return into undef in scalar context */ assert(PL_stack_sp > PL_stack_base || *PL_stack_base == &PL_sv_undef); - result = SvIV(*PL_stack_sp); + const IV iv = SvIV(*PL_stack_sp); + const I32 result = + iv > 0 ? 1 : + iv < 0 ? -1 : + 0; rpp_popfree_to_NN(PL_stack_base); LEAVE_SCOPE(oldsaveix); @@ -1205,14 +1216,13 @@ S_sortcv(pTHX_ SV *const a, SV *const b) static I32 S_sortcv_stacked(pTHX_ SV *const a, SV *const b) { + PERL_ARGS_ASSERT_SORTCV_STACKED; + const I32 oldsaveix = PL_savestack_ix; - I32 result; AV * const av = GvAV(PL_defgv); PMOP * const pm = PL_curpm; COP * const cop = PL_curcop; - PERL_ARGS_ASSERT_SORTCV_STACKED; - #ifdef PERL_RC_STACK assert(rpp_stack_is_rc()); #endif @@ -1256,7 +1266,11 @@ S_sortcv_stacked(pTHX_ SV *const a, SV * /* entry zero of a stack is always PL_sv_undef, which * simplifies converting a '()' return into undef in scalar context */ assert(PL_stack_sp > PL_stack_base || *PL_stack_base == &PL_sv_undef); - result = SvIV(*PL_stack_sp); + const IV iv = SvIV(*PL_stack_sp); + const I32 result = + iv > 0 ? 1 : + iv < 0 ? -1 : + 0; rpp_popfree_to_NN(PL_stack_base); LEAVE_SCOPE(oldsaveix); @@ -1271,13 +1285,12 @@ S_sortcv_stacked(pTHX_ SV *const a, SV * static I32 S_sortcv_xsub(pTHX_ SV *const a, SV *const b) { + PERL_ARGS_ASSERT_SORTCV_XSUB; + const I32 oldsaveix = PL_savestack_ix; CV * const cv=MUTABLE_CV(PL_sortcop); - I32 result; PMOP * const pm = PL_curpm; - PERL_ARGS_ASSERT_SORTCV_XSUB; - #ifdef PERL_RC_STACK assert(rpp_stack_is_rc()); #endif @@ -1291,7 +1304,11 @@ S_sortcv_xsub(pTHX_ SV *const a, SV *con /* entry zero of a stack is always PL_sv_undef, which * simplifies converting a '()' return into undef in scalar context */ assert(PL_stack_sp > PL_stack_base || *PL_stack_base == &PL_sv_undef); - result = SvIV(*PL_stack_sp); + const IV iv = SvIV(*PL_stack_sp); + const I32 result = + iv > 0 ? 1 : + iv < 0 ? -1 : + 0; rpp_popfree_to_NN(PL_stack_base); LEAVE_SCOPE(oldsaveix); @@ -1301,12 +1318,23 @@ S_sortcv_xsub(pTHX_ SV *const a, SV *con PERL_STATIC_FORCE_INLINE I32 -S_sv_ncmp(pTHX_ SV *const a, SV *const b) +S_sv_ncmp(pTHX_ SV *a, SV *b) { - I32 cmp = do_ncmp(a, b); - PERL_ARGS_ASSERT_SV_NCMP; + /* Numify since do_ncmp will just SvNV() non-IVs. + + Even for the non-overloading case, if RVs are allocated with + large 64-bit addresses (only theoretically possible I think) + the bottom bits of the RV might be lost. + */ + if (SvROK(a)) + a = sv_2num(a); + if (SvROK(b)) + b = sv_2num(b); + + I32 cmp = do_ncmp(a, b); + if (cmp == 2) { if (ckWARN(WARN_UNINITIALIZED)) report_uninit(NULL); return 0; @@ -1326,11 +1354,11 @@ S_sv_ncmp_desc(pTHX_ SV *const a, SV *co PERL_STATIC_FORCE_INLINE I32 S_sv_i_ncmp(pTHX_ SV *const a, SV *const b) { + PERL_ARGS_ASSERT_SV_I_NCMP; + const IV iv1 = SvIV(a); const IV iv2 = SvIV(b); - PERL_ARGS_ASSERT_SV_I_NCMP; - return iv1 < iv2 ? -1 : iv1 > iv2 ? 1 : 0; } @@ -1350,12 +1378,12 @@ S_sv_i_ncmp_desc(pTHX_ SV *const a, SV * #define SORT_NORMAL_RETURN_VALUE(val) (((val) > 0) ? 1 : ((val) ? -1 : 0)) PERL_STATIC_FORCE_INLINE I32 -S_amagic_ncmp(pTHX_ SV *const a, SV *const b) +S_amagic_ncmp(pTHX_ SV *a, SV *b) { - SV * const tmpsv = tryCALL_AMAGICbin(a,b,ncmp_amg); - PERL_ARGS_ASSERT_AMAGIC_NCMP; + SV * const tmpsv = tryCALL_AMAGICbin(a,b,ncmp_amg); + if (tmpsv) { if (SvIOK(tmpsv)) { const I32 i = SvIVX(tmpsv); @@ -1366,6 +1394,7 @@ S_amagic_ncmp(pTHX_ SV *const a, SV *con return SORT_NORMAL_RETURN_VALUE(d); } } + return S_sv_ncmp(aTHX_ a, b); } @@ -1380,10 +1409,10 @@ S_amagic_ncmp_desc(pTHX_ SV *const a, SV PERL_STATIC_FORCE_INLINE I32 S_amagic_i_ncmp(pTHX_ SV *const a, SV *const b) { - SV * const tmpsv = tryCALL_AMAGICbin(a,b,ncmp_amg); - PERL_ARGS_ASSERT_AMAGIC_I_NCMP; + SV * const tmpsv = tryCALL_AMAGICbin(a,b,ncmp_amg); + if (tmpsv) { if (SvIOK(tmpsv)) { const I32 i = SvIVX(tmpsv); @@ -1408,10 +1437,10 @@ S_amagic_i_ncmp_desc(pTHX_ SV *const a, PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp(pTHX_ SV *const str1, SV *const str2) { - SV * const tmpsv = tryCALL_AMAGICbin(str1,str2,scmp_amg); - PERL_ARGS_ASSERT_AMAGIC_CMP; + SV * const tmpsv = tryCALL_AMAGICbin(str1,str2,scmp_amg); + if (tmpsv) { if (SvIOK(tmpsv)) { const I32 i = SvIVX(tmpsv); @@ -1446,9 +1475,9 @@ S_cmp_desc(pTHX_ SV *const str1, SV *con PERL_STATIC_FORCE_INLINE I32 S_amagic_cmp_locale(pTHX_ SV *const str1, SV *const str2) { - SV * const tmpsv = tryCALL_AMAGICbin(str1,str2,scmp_amg); - PERL_ARGS_ASSERT_AMAGIC_CMP_LOCALE; + + SV * const tmpsv = tryCALL_AMAGICbin(str1,str2,scmp_amg); if (tmpsv) { if (SvIOK(tmpsv)) { Index: gnu/usr.bin/perl/pp_sys.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/pp_sys.c,v diff -u -p -a -u -p -r1.31 pp_sys.c --- gnu/usr.bin/perl/pp_sys.c 26 Dec 2025 22:15:22 -0000 1.31 +++ gnu/usr.bin/perl/pp_sys.c 16 Nov 2026 00:57:39 -0000 @@ -224,7 +224,7 @@ void endservent(void); && (defined(HAS_SETREUID) || defined(HAS_SETRESUID) \ || defined(HAS_SETREGID) || defined(HAS_SETRESGID)) /* The Hard Way. */ -STATIC int +static int S_emulate_eaccess(pTHX_ const char* path, Mode_t mode) { const Uid_t ruid = getuid(); @@ -394,7 +394,7 @@ PP(pp_glob) /* unrolled tryAMAGICunTARGETlist(iter_amg, (PL_op->op_flags & OPf_SPECIAL)); */ - SV *tmpsv; + SV *tmpsv = NULL; U8 gimme = GIMME_V; if (UNLIKELY(SvAMAGIC(arg) && (tmpsv = amagic_call(arg, &PL_sv_undef, iter_amg, @@ -672,14 +672,14 @@ OP * Perl_tied_method(pTHX_ SV *methname, SV **mark, SV *const sv, const MAGIC *const mg, const U32 flags, U32 argc, ...) { + PERL_ARGS_ASSERT_TIED_METHOD; + I32 ret_args; SSize_t extend_size; #ifdef PERL_RC_STACK bool was_rc = rpp_stack_is_rc(); #endif - PERL_ARGS_ASSERT_TIED_METHOD; - /* Ensure that our flag bits do not overlap. */ STATIC_ASSERT_STMT((TIED_METHOD_MORTALIZE_NOT_NEEDED & G_WANT) == 0); STATIC_ASSERT_STMT((TIED_METHOD_ARGUMENTS_ON_STACK & G_WANT) == 0); @@ -802,11 +802,11 @@ Perl_tied_method(pTHX_ SV *methname, SV #define tied_method0(a,b,c,d) \ - Perl_tied_method(aTHX_ a,b,c,d,G_SCALAR,0) + tied_method(a,b,c,d,G_SCALAR,0) #define tied_method1(a,b,c,d,e) \ - Perl_tied_method(aTHX_ a,b,c,d,G_SCALAR,1,e) + tied_method(a,b,c,d,G_SCALAR,1,e) #define tied_method2(a,b,c,d,e,f) \ - Perl_tied_method(aTHX_ a,b,c,d,G_SCALAR,2,e,f) + tied_method(a,b,c,d,G_SCALAR,2,e,f) PP_wrapped(pp_open, 0, 1) { @@ -836,7 +836,7 @@ PP_wrapped(pp_open, 0, 1) if (mg) { /* Method's args are same as ours ... */ /* ... except handle is replaced by the object */ - return Perl_tied_method(aTHX_ SV_CONST(OPEN), mark - 1, MUTABLE_SV(io), mg, + return tied_method(SV_CONST(OPEN), mark - 1, MUTABLE_SV(io), mg, G_SCALAR | TIED_METHOD_ARGUMENTS_ON_STACK, sp - mark); } @@ -1036,7 +1036,7 @@ PP_wrapped(pp_binmode, MAXARG, 0) function, which I don't think that the optimiser will be able to figure out. Although, as it's a static function, in theory it could. */ - return Perl_tied_method(aTHX_ SV_CONST(BINMODE), SP, MUTABLE_SV(io), mg, + return tied_method(SV_CONST(BINMODE), SP, MUTABLE_SV(io), mg, G_SCALAR|TIED_METHOD_MORTALIZE_NOT_NEEDED, discp ? 1 : 0, discp); } @@ -1546,10 +1546,10 @@ See C>. void Perl_setdefout(pTHX_ GV *gv) { - GV *oldgv = PL_defoutgv; - PERL_ARGS_ASSERT_SETDEFOUT; + GV *oldgv = PL_defoutgv; + SvREFCNT_inc_simple_void_NN(gv); PL_defoutgv = gv; SvREFCNT_dec(oldgv); @@ -1602,7 +1602,7 @@ PP_wrapped(pp_getc, MAXARG, 0) const MAGIC * const mg = SvTIED_mg((const SV *)io, PERL_MAGIC_tiedscalar); if (mg) { const U8 gimme = GIMME_V; - Perl_tied_method(aTHX_ SV_CONST(GETC), SP, MUTABLE_SV(io), mg, gimme, 0); + tied_method(SV_CONST(GETC), SP, MUTABLE_SV(io), mg, gimme, 0); if (gimme == G_SCALAR) { SPAGAIN; SvSetMagicSV_nosteal(TARG, TOPs); @@ -1634,14 +1634,14 @@ PP_wrapped(pp_getc, MAXARG, 0) RETURN; } -STATIC OP * +static OP * S_doform(pTHX_ CV *cv, GV *gv, OP *retop) { + PERL_ARGS_ASSERT_DOFORM; + PERL_CONTEXT *cx; const U8 gimme = GIMME_V; - PERL_ARGS_ASSERT_DOFORM; - if (CvCLONE(cv)) cv = MUTABLE_CV(sv_2mortal(MUTABLE_SV(cv_clone(cv)))); @@ -1731,8 +1731,8 @@ PP(pp_leavewrite) SV *topname; if (!IoFMT_NAME(io)) IoFMT_NAME(io) = savepv(GvNAME(gv)); - topname = sv_2mortal(Perl_newSVpvf(aTHX_ "%" HEKf "_TOP", - HEKfARG(GvNAME_HEK(gv)))); + topname = sv_2mortal(newSVpvf("%" HEKf "_TOP", + HEKfARG(GvNAME_HEK(gv)))); topgv = gv_fetchsv(topname, 0, SVt_PVFM); if ((topgv && GvFORM(topgv)) || !gv_fetchpvs("top", GV_NOTQUAL, SVt_PVFM)) @@ -1856,7 +1856,7 @@ PP(pp_prtf) *MARK = NULL; ++PL_stack_sp; } - return Perl_tied_method(aTHX_ SV_CONST(PRINTF), mark - 1, MUTABLE_SV(io), + return tied_method(SV_CONST(PRINTF), mark - 1, MUTABLE_SV(io), mg, G_SCALAR | TIED_METHOD_ARGUMENTS_ON_STACK, PL_stack_sp - mark); @@ -1946,7 +1946,7 @@ PP_wrapped(pp_sysread, 0, 1) { const MAGIC *const mg = SvTIED_mg((const SV *)io, PERL_MAGIC_tiedscalar); if (mg) { - return Perl_tied_method(aTHX_ SV_CONST(READ), mark - 1, MUTABLE_SV(io), mg, + return tied_method(SV_CONST(READ), mark - 1, MUTABLE_SV(io), mg, G_SCALAR | TIED_METHOD_ARGUMENTS_ON_STACK, sp - mark); } @@ -2204,7 +2204,7 @@ PP_wrapped(pp_syswrite, 0, 1) PUTBACK; } - return Perl_tied_method(aTHX_ SV_CONST(WRITE), mark - 1, MUTABLE_SV(io), mg, + return tied_method(SV_CONST(WRITE), mark - 1, MUTABLE_SV(io), mg, G_SCALAR | TIED_METHOD_ARGUMENTS_ON_STACK, sp - mark); } @@ -2937,7 +2937,24 @@ PP_wrapped(pp_ssockopt,(PL_op->op_type = (void)SvPOK_only(sv); SvCUR_set(sv, PERL_GETSOCKOPT_SIZE); *SvEND(sv) ='\0'; + +#ifdef OEMVS + + /* Work around z/OS limitation. The buffer size parameter on this + * platform must be the precise sizeof the type being returned. Other + * platforms, and the POSIX standard, require it to be large enough to + * hold the returned value, not necessarily the precise sizeof. On + * z/OS 3.1 all currently handled options but SO_LINGER are of type + * int */ + if (optname == SO_LINGER) { + len = sizeof(struct linger); + } + else { + len = sizeof(int); + } +#else len = SvCUR(sv); +#endif if (PerlSock_getsockopt(fd, lvl, optname, SvPVX(sv), &len) < 0) goto nuts2; #if defined(_AIX) @@ -3305,7 +3322,8 @@ PP_wrapped(pp_stat, !(PL_op->op_flags & */ static OP * -S_ft_return_false(pTHX_ SV *ret) { +S_ft_return_false(pTHX_ SV *ret) +{ OP *next = NORMAL; if (PL_op->op_flags & OPf_REF) { @@ -3323,7 +3341,8 @@ S_ft_return_false(pTHX_ SV *ret) { } PERL_STATIC_INLINE OP * -S_ft_return_true(pTHX_ SV *ret) { +S_ft_return_true(pTHX_ SV *ret) +{ if (PL_op->op_flags & OPf_REF) { rpp_xpush_1((PL_op->op_private & OPpFT_STACKING) ? (SV*)cGVOP_gv : ret); @@ -3347,8 +3366,9 @@ S_ft_return_true(pTHX_ SV *ret) { } \ } STMT_END -STATIC OP * -S_try_amagic_ftest(pTHX_ char chr) { +static OP * +S_try_amagic_ftest(pTHX_ char chr) +{ SV *const arg = *PL_stack_sp; assert(chr != '?'); @@ -4093,9 +4113,11 @@ PP_wrapped(pp_readlink, 1, 0) } #if !defined(HAS_MKDIR) || !defined(HAS_RMDIR) -STATIC int +static int S_dooneliner(pTHX_ const char *cmd, const char *filename) { + PERL_ARGS_ASSERT_DOONELINER; + char * const save_filename = filename; char *cmdline; char *s; @@ -4103,8 +4125,6 @@ S_dooneliner(pTHX_ const char *cmd, cons int anum = 1; Size_t size = strlen(cmd) + (strlen(filename) * 2) + 10; - PERL_ARGS_ASSERT_DOONELINER; - Newx(cmdline, size, char); my_strlcpy(cmdline, cmd, size); my_strlcat(cmdline, " ", size); @@ -4273,7 +4293,10 @@ PP_wrapped(pp_open_dir, 2, 0) } static void -S_warn_not_dirhandle(pTHX_ GV *gv) { +S_warn_not_dirhandle(pTHX_ GV *gv) +{ + PERL_ARGS_ASSERT_WARN_NOT_DIRHANDLE; + IO *io = GvIOn(gv); if (IoIFP(io)) { @@ -4291,6 +4314,7 @@ S_warn_not_dirhandle(pTHX_ GV *gv) { PP_wrapped(pp_readdir, 1, 0) { + #if !defined(Direntry_t) || !defined(HAS_READDIR) DIE(aTHX_ PL_no_dir_func, "readdir"); #else @@ -5053,7 +5077,7 @@ PP_wrapped(pp_gmtime, MAXARG, 0) else { dTARGET; PUSHs(TARG); - Perl_sv_setpvf_mg(aTHX_ TARG, "%s %s %2d %02d:%02d:%02d %" IVdf, + sv_setpvf_mg(TARG, "%s %s %2d %02d:%02d:%02d %" IVdf, dayname[tmbuf.tm_wday], monname[tmbuf.tm_mon], tmbuf.tm_mday, @@ -5125,7 +5149,7 @@ PP_wrapped(pp_sleep, MAXARG, 0) if (MAXARG < 1 || (!TOPs && !POPs)) PerlProc_pause(); else { - const I32 duration = POPi; + const IV duration = POPi; if (duration < 0) { /* diag_listed_as: %s() with negative argument */ ck_warner_d(packWARN(WARN_MISC), @@ -5223,6 +5247,8 @@ PP_wrapped(pp_semctl, 0, 1) static SV * S_space_join_names_mortal(pTHX_ char *const *array) { + PERL_ARGS_ASSERT_SPACE_JOIN_NAMES_MORTAL; + SV *target; if (array && *array) { @@ -5560,6 +5586,7 @@ PP_wrapped(pp_shostent, 1, 0) { dSP; const int stayopen = TOPi; + PERL_UNUSED_VAR(stayopen); switch(PL_op->op_type) { case OP_SHOSTENT: #ifdef HAS_SETHOSTENT Index: gnu/usr.bin/perl/proto.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/proto.h,v diff -u -p -a -u -p -r1.33 proto.h --- gnu/usr.bin/perl/proto.h 26 Dec 2025 22:14:13 -0000 1.33 +++ gnu/usr.bin/perl/proto.h 16 Nov 2026 00:57:39 -0000 @@ -4,8 +4,8 @@ * * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, * 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, - * 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 - * by Larry Wall and others + * 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, + * 2026 by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -19,56 +19,83 @@ * Edit those files and run 'make regen_headers' to effect changes. */ +#ifdef DEBUGGING /* See GH #23641 */ +# define Perl_attribute_nonnull(which) +#else +# define Perl_attribute_nonnull(which) __attribute__nonnull__(which) +#endif + +#if defined(MULTIPLICITY) + # define Perl_assert_aTHX assert(aTHX) + # define Perl_attribute_nonnull_aTHX __attribute__nonnull__(1) +#else + # define Perl_assert_aTHX + # define Perl_attribute_nonnull_aTHX +#endif + START_EXTERN_C + PERL_CALLCONV int -Perl_Gv_AMupdate(pTHX_ HV *stash, bool destructing); +Perl_Gv_AMupdate(pTHX_ HV *stash, bool destructing) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GV_AMUPDATE \ - assert(stash); assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV) PERL_CALLCONV const char * -Perl_PerlIO_context_layers(pTHX_ const char *mode); -#define PERL_ARGS_ASSERT_PERLIO_CONTEXT_LAYERS +Perl_PerlIO_context_layers(pTHX_ const char *mode) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PERLIO_CONTEXT_LAYERS \ + Perl_assert_aTHX PERL_CALLCONV int Perl_PerlLIO_dup2_cloexec(pTHX_ int oldfd, int newfd) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_PERLLIO_DUP2_CLOEXEC +#define PERL_ARGS_ASSERT_PERLLIO_DUP2_CLOEXEC \ + Perl_assert_aTHX PERL_CALLCONV int Perl_PerlLIO_dup_cloexec(pTHX_ int oldfd) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__ __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_PERLLIO_DUP_CLOEXEC +#define PERL_ARGS_ASSERT_PERLLIO_DUP_CLOEXEC \ + Perl_assert_aTHX PERL_CALLCONV int Perl_PerlLIO_open3_cloexec(pTHX_ const char *file, int flag, int perm) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_PERLLIO_OPEN3_CLOEXEC \ - assert(file) + Perl_assert_aTHX; assert(file) PERL_CALLCONV int Perl_PerlLIO_open_cloexec(pTHX_ const char *file, int flag) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_PERLLIO_OPEN_CLOEXEC \ - assert(file) - -/* PERL_CALLCONV const XOP * -Perl_custom_op_xop(pTHX_ const OP *o); */ + Perl_assert_aTHX; assert(file) PERL_CALLCONV const char * Perl_langinfo(const nl_item item); #define PERL_ARGS_ASSERT_PERL_LANGINFO PERL_CALLCONV const char * -Perl_langinfo8(const nl_item item, utf8ness_t *utf8ness); +Perl_langinfo8(const nl_item item, utf8ness_t *utf8ness) + Perl_attribute_nonnull(2); #define PERL_ARGS_ASSERT_PERL_LANGINFO8 \ assert(utf8ness) PERL_CALLCONV HV * -Perl_localeconv(pTHX); -#define PERL_ARGS_ASSERT_PERL_LOCALECONV +Perl_localeconv(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PERL_LOCALECONV \ + Perl_assert_aTHX PERL_CALLCONV const char * Perl_setlocale(const int category, const char *locale); @@ -76,139 +103,114 @@ Perl_setlocale(const int category, const PERL_CALLCONV void * Perl_Slab_Alloc(pTHX_ size_t sz) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_SLAB_ALLOC +#define PERL_ARGS_ASSERT_SLAB_ALLOC \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_Slab_Free(pTHX_ void *op); +Perl_Slab_Free(pTHX_ void *op) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SLAB_FREE \ - assert(op) - -/* PERL_CALLCONV void -SvREFCNT_dec_set_NULL(pTHX_ SV *sv); */ - -PERL_CALLCONV const char * -Perl__byte_dump_string(pTHX_ const U8 * const start, const STRLEN len, const bool format); -#define PERL_ARGS_ASSERT__BYTE_DUMP_STRING - -PERL_CALLCONV Size_t -Perl__inverse_folds(pTHX_ const UV cp, U32 *first_folds_to, const U32 **remaining_folds_to) - __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT__INVERSE_FOLDS \ - assert(first_folds_to); assert(remaining_folds_to) - -PERL_CALLCONV bool -Perl__is_uni_FOO(pTHX_ const U8 classnum, const UV c) - __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT__IS_UNI_FOO - -PERL_CALLCONV bool -Perl__is_uni_perl_idcont(pTHX_ UV c) - __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT__IS_UNI_PERL_IDCONT - -PERL_CALLCONV bool -Perl__is_uni_perl_idstart(pTHX_ UV c) - __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT__IS_UNI_PERL_IDSTART - -PERL_CALLCONV bool -Perl__is_utf8_FOO(pTHX_ const U8 classnum, const U8 *p, const U8 * const e) - __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT__IS_UTF8_FOO \ - assert(p); assert(e) - -PERL_CALLCONV bool -Perl__is_utf8_perl_idcont(pTHX_ const U8 *p, const U8 * const e) - __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT__IS_UTF8_PERL_IDCONT \ - assert(p); assert(e) - -PERL_CALLCONV bool -Perl__is_utf8_perl_idstart(pTHX_ const U8 *p, const U8 * const e) - __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT__IS_UTF8_PERL_IDSTART \ - assert(p); assert(e) - -PERL_CALLCONV UV -Perl__to_uni_fold_flags(pTHX_ UV c, U8 *p, STRLEN *lenp, U8 flags); -#define PERL_ARGS_ASSERT__TO_UNI_FOLD_FLAGS \ - assert(p); assert(lenp) - -PERL_CALLCONV UV -Perl__to_utf8_fold_flags(pTHX_ const U8 *p, const U8 *e, U8 *ustrp, STRLEN *lenp, U8 flags); -#define PERL_ARGS_ASSERT__TO_UTF8_FOLD_FLAGS \ - assert(p); assert(ustrp) - -PERL_CALLCONV UV -Perl__to_utf8_lower_flags(pTHX_ const U8 *p, const U8 *e, U8 *ustrp, STRLEN *lenp, bool flags); -#define PERL_ARGS_ASSERT__TO_UTF8_LOWER_FLAGS \ - assert(p); assert(ustrp) - -PERL_CALLCONV UV -Perl__to_utf8_title_flags(pTHX_ const U8 *p, const U8 *e, U8 *ustrp, STRLEN *lenp, bool flags); -#define PERL_ARGS_ASSERT__TO_UTF8_TITLE_FLAGS \ - assert(p); assert(ustrp) + Perl_assert_aTHX; assert(op) -PERL_CALLCONV UV -Perl__to_utf8_upper_flags(pTHX_ const U8 *p, const U8 *e, U8 *ustrp, STRLEN *lenp, bool flags); -#define PERL_ARGS_ASSERT__TO_UTF8_UPPER_FLAGS \ - assert(p); assert(ustrp) +PERL_CALLCONV void +Perl_SvREFCNT_dec_set_NULL(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SVREFCNT_DEC_SET_NULL \ + Perl_assert_aTHX PERL_CALLCONV_NO_RET void Perl_abort_execution(pTHX_ SV *msg_sv, const char * const name) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__noreturn__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_ABORT_EXECUTION \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV LOGOP * Perl_alloc_LOGOP(pTHX_ I32 type, OP *first, OP *other) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_ALLOC_LOGOP +#define PERL_ARGS_ASSERT_ALLOC_LOGOP \ + Perl_assert_aTHX PERL_CALLCONV PADOFFSET Perl_allocmy(pTHX_ const char * const name, const STRLEN len, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_ALLOCMY \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV bool -Perl_amagic_applies(pTHX_ SV *sv, int method, int flags); +Perl_amagic_applies(pTHX_ SV *sv, int method, int flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_AMAGIC_APPLIES \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV SV * -Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int dir); +Perl_amagic_call(pTHX_ SV *left, SV *right, int method, int dir) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_AMAGIC_CALL \ - assert(left); assert(right) + Perl_assert_aTHX; assert(left); assert(right) PERL_CALLCONV SV * -Perl_amagic_deref_call(pTHX_ SV *ref, int method); +Perl_amagic_deref_call(pTHX_ SV *ref, int method) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_AMAGIC_DEREF_CALL \ - assert(ref) + Perl_assert_aTHX; assert(ref) PERL_CALLCONV bool Perl_amagic_is_enabled(pTHX_ int method) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_AMAGIC_IS_ENABLED +#define PERL_ARGS_ASSERT_AMAGIC_IS_ENABLED \ + Perl_assert_aTHX + +PERL_CALLCONV void +Perl_api_version_assert(size_t interp_size, void *v_my_perl, const char *api_version) + Perl_attribute_nonnull(3); +#define PERL_ARGS_ASSERT_API_VERSION_ASSERT \ + assert(api_version) PERL_CALLCONV SSize_t Perl_apply(pTHX_ I32 type, SV **mark, SV **sp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_APPLY \ - assert(mark); assert(sp) + Perl_assert_aTHX; assert(mark); assert(sp) PERL_CALLCONV void -Perl_apply_attrs_string(pTHX_ const char *stashpv, CV *cv, const char *attrstr, STRLEN len); +Perl_apply_attrs_string(pTHX_ const char *stashpv, CV *cv, const char *attrstr, STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_APPLY_ATTRS_STRING \ - assert(stashpv); assert(cv); assert(attrstr); \ - assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(stashpv); assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM); \ + assert(attrstr) PERL_CALLCONV OP * -Perl_apply_builtin_cv_attributes(pTHX_ CV *cv, OP *attrlist); +Perl_apply_builtin_cv_attributes(pTHX_ CV *cv, OP *attrlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_APPLY_BUILTIN_CV_ATTRIBUTES \ - assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + +PERL_CALLCONV void +Perl_atfork_child(void); +#define PERL_ARGS_ASSERT_ATFORK_CHILD PERL_CALLCONV void Perl_atfork_lock(void); @@ -219,225 +221,335 @@ Perl_atfork_unlock(void); #define PERL_ARGS_ASSERT_ATFORK_UNLOCK PERL_CALLCONV SV ** -Perl_av_arylen_p(pTHX_ AV *av); +Perl_av_arylen_p(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_AV_ARYLEN_P \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV void -Perl_av_clear(pTHX_ AV *av); +Perl_av_clear(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_AV_CLEAR \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV void -Perl_av_create_and_push(pTHX_ AV ** const avp, SV * const val); +Perl_av_create_and_push(pTHX_ AV ** const avp, SV * const val) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_AV_CREATE_AND_PUSH \ - assert(avp); assert(val) + Perl_assert_aTHX; assert(avp); assert(val) PERL_CALLCONV SV ** -Perl_av_create_and_unshift_one(pTHX_ AV ** const avp, SV * const val); +Perl_av_create_and_unshift_one(pTHX_ AV ** const avp, SV * const val) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_AV_CREATE_AND_UNSHIFT_ONE \ - assert(avp); assert(val) + Perl_assert_aTHX; assert(avp); assert(val) PERL_CALLCONV SV * -Perl_av_delete(pTHX_ AV *av, SSize_t key, I32 flags); +Perl_av_delete(pTHX_ AV *av, SSize_t key, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_AV_DELETE \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV void -Perl_av_dump(pTHX_ AV *av); -#define PERL_ARGS_ASSERT_AV_DUMP +Perl_av_dump(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_AV_DUMP \ + Perl_assert_aTHX; assert(!av || SvTYPE(av) == SVt_PVAV) PERL_CALLCONV bool Perl_av_exists(pTHX_ AV *av, SSize_t key) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_AV_EXISTS \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV void -Perl_av_extend(pTHX_ AV *av, SSize_t key); +Perl_av_extend(pTHX_ AV *av, SSize_t key) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_AV_EXTEND \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV void Perl_av_extend_guts(pTHX_ AV *av, SSize_t key, SSize_t *maxp, SV ***allocp, SV ***arrayp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_AV_EXTEND_GUTS \ - assert(maxp); assert(allocp); assert(arrayp); \ - assert(!av || SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(!av || SvTYPE(av) == SVt_PVAV); assert(maxp); \ + assert(allocp); assert(arrayp) PERL_CALLCONV SV ** Perl_av_fetch(pTHX_ AV *av, SSize_t key, I32 lval) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_AV_FETCH \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV void -Perl_av_fill(pTHX_ AV *av, SSize_t fill); +Perl_av_fill(pTHX_ AV *av, SSize_t fill) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_AV_FILL \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV IV * -Perl_av_iter_p(pTHX_ AV *av); +Perl_av_iter_p(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_AV_ITER_P \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV SSize_t Perl_av_len(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_AV_LEN \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV AV * Perl_av_make(pTHX_ SSize_t size, SV **strp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_AV_MAKE \ - assert(strp) + Perl_assert_aTHX; assert(strp) PERL_CALLCONV SV * Perl_av_nonelem(pTHX_ AV *av, SSize_t ix) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_AV_NONELEM \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV SV * -Perl_av_pop(pTHX_ AV *av); +Perl_av_pop(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_AV_POP \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV void -Perl_av_push(pTHX_ AV *av, SV *val); +Perl_av_push(pTHX_ AV *av, SV *val) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_AV_PUSH \ - assert(av); assert(val); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV); \ + assert(val) PERL_CALLCONV void -Perl_av_reify(pTHX_ AV *av); +Perl_av_reify(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_AV_REIFY \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV SV * Perl_av_shift(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_AV_SHIFT \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV SV ** -Perl_av_store(pTHX_ AV *av, SSize_t key, SV *val); +Perl_av_store(pTHX_ AV *av, SSize_t key, SV *val) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_AV_STORE \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV void -Perl_av_undef(pTHX_ AV *av); +Perl_av_undef(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_AV_UNDEF \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV void -Perl_av_unshift(pTHX_ AV *av, SSize_t num); +Perl_av_unshift(pTHX_ AV *av, SSize_t num) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_AV_UNSHIFT \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV OP * Perl_bind_match(pTHX_ I32 type, OP *left, OP *right) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_BIND_MATCH \ - assert(left); assert(right) + Perl_assert_aTHX; assert(left); assert(right) PERL_CALLCONV OP * Perl_block_end(pTHX_ I32 floor, OP *seq) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_BLOCK_END +#define PERL_ARGS_ASSERT_BLOCK_END \ + Perl_assert_aTHX PERL_CALLCONV U8 Perl_block_gimme(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_BLOCK_GIMME +#define PERL_ARGS_ASSERT_BLOCK_GIMME \ + Perl_assert_aTHX PERL_CALLCONV int Perl_block_start(pTHX_ int full) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_BLOCK_START +#define PERL_ARGS_ASSERT_BLOCK_START \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_blockhook_register(pTHX_ BHK *hk); +Perl_blockhook_register(pTHX_ BHK *hk) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_BLOCKHOOK_REGISTER \ - assert(hk) + Perl_assert_aTHX; assert(hk) PERL_CALLCONV void Perl_boot_core_PerlIO(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_BOOT_CORE_PERLIO +#define PERL_ARGS_ASSERT_BOOT_CORE_PERLIO \ + Perl_assert_aTHX PERL_CALLCONV void Perl_boot_core_UNIVERSAL(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_BOOT_CORE_UNIVERSAL +#define PERL_ARGS_ASSERT_BOOT_CORE_UNIVERSAL \ + Perl_assert_aTHX PERL_CALLCONV void Perl_boot_core_builtin(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_BOOT_CORE_BUILTIN +#define PERL_ARGS_ASSERT_BOOT_CORE_BUILTIN \ + Perl_assert_aTHX PERL_CALLCONV void Perl_boot_core_mro(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_BOOT_CORE_MRO +#define PERL_ARGS_ASSERT_BOOT_CORE_MRO \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_build_infix_plugin(pTHX_ OP *lhs, OP *rhs, void *tokendata) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_BUILD_INFIX_PLUGIN \ - assert(lhs); assert(rhs); assert(tokendata) + Perl_assert_aTHX; assert(lhs); assert(rhs); assert(tokendata) + +PERL_CALLCONV const char * +Perl_byte_dump_string_(pTHX_ const U8 * const start, const STRLEN len, const bool format) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_BYTE_DUMP_STRING_ \ + Perl_assert_aTHX PERL_CALLCONV int -Perl_bytes_cmp_utf8(pTHX_ const U8 *b, STRLEN blen, const U8 *u, STRLEN ulen); +Perl_bytes_cmp_utf8(pTHX_ const U8 *b, STRLEN blen, const U8 *u, STRLEN ulen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_BYTES_CMP_UTF8 \ - assert(b); assert(u) + Perl_assert_aTHX; assert(b); assert(u) PERL_CALLCONV U8 * -Perl_bytes_from_utf8(pTHX_ const U8 *s, STRLEN *lenp, bool *is_utf8p); +Perl_bytes_from_utf8(pTHX_ const U8 *s, STRLEN *lenp, bool *is_utf8p) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_BYTES_FROM_UTF8 \ - assert(s); assert(lenp); assert(is_utf8p) + Perl_assert_aTHX; assert(s); assert(lenp); assert(is_utf8p) PERL_CALLCONV U8 * -Perl_bytes_to_utf8_free_me(pTHX_ const U8 *s, STRLEN *lenp, void **free_me); +Perl_bytes_to_utf8_free_me(pTHX_ const U8 *s, STRLEN *lenp, void **free_me) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_BYTES_TO_UTF8_FREE_ME \ - assert(s); assert(lenp) + Perl_assert_aTHX; assert(s); assert(lenp) -/* PERL_CALLCONV bool -Perl_c9strict_utf8_to_uv(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p); */ +PERL_CALLCONV bool +Perl_c9strict_utf8_to_uv(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3); +#define PERL_ARGS_ASSERT_C9STRICT_UTF8_TO_UV \ + assert(s); assert(e); assert(cp_p); assert(s <= e) PERL_CALLCONV SSize_t -Perl_call_argv(pTHX_ const char *sub_name, I32 flags, char **argv); +Perl_call_argv(pTHX_ const char *sub_name, I32 flags, char **argv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_CALL_ARGV \ - assert(sub_name); assert(argv) + Perl_assert_aTHX; assert(sub_name); assert(argv) PERL_CALLCONV void -Perl_call_atexit(pTHX_ ATEXIT_t fn, void *ptr); -#define PERL_ARGS_ASSERT_CALL_ATEXIT +Perl_call_atexit(pTHX_ ATEXIT_t fn, void *ptr) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_CALL_ATEXIT \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_call_list(pTHX_ I32 oldscope, AV *paramList); +Perl_call_list(pTHX_ I32 oldscope, AV *paramList) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_CALL_LIST \ - assert(paramList); assert(SvTYPE(paramList) == SVt_PVAV) + Perl_assert_aTHX; assert(paramList); \ + assert(SvTYPE(paramList) == SVt_PVAV) PERL_CALLCONV SSize_t -Perl_call_method(pTHX_ const char *methname, I32 flags); +Perl_call_method(pTHX_ const char *methname, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_CALL_METHOD \ - assert(methname) + Perl_assert_aTHX; assert(methname) PERL_CALLCONV SSize_t -Perl_call_pv(pTHX_ const char *sub_name, I32 flags); +Perl_call_pv(pTHX_ const char *sub_name, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_CALL_PV \ - assert(sub_name) + Perl_assert_aTHX; assert(sub_name) PERL_CALLCONV SSize_t -Perl_call_sv(pTHX_ SV *sv, I32 flags); +Perl_call_sv(pTHX_ SV *sv, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_CALL_SV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV const PERL_CONTEXT * -Perl_caller_cx(pTHX_ I32 level, const PERL_CONTEXT **dbcxp); -#define PERL_ARGS_ASSERT_CALLER_CX +Perl_caller_cx(pTHX_ I32 level, const PERL_CONTEXT **dbcxp) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_CALLER_CX \ + Perl_assert_aTHX PERL_CALLCONV Malloc_t Perl_calloc(MEM_SIZE elements, MEM_SIZE size) @@ -447,10 +559,12 @@ Perl_calloc(MEM_SIZE elements, MEM_SIZE PERL_CALLCONV bool Perl_cando(pTHX_ Mode_t mode, bool effective, const Stat_t *statbufp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_CANDO \ - assert(statbufp) + Perl_assert_aTHX; assert(statbufp) PERL_CALLCONV I32 Perl_cast_i32(NV f) @@ -474,124 +588,192 @@ Perl_cast_uv(NV f) PERL_CALLCONV bool Perl_check_utf8_print(pTHX_ const U8 *s, const STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_CHECK_UTF8_PRINT \ - assert(s) + Perl_assert_aTHX; assert(s) PERL_CALLCONV OP * Perl_ck_entersub_args_core(pTHX_ OP *entersubop, GV *namegv, SV *protosv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_CK_ENTERSUB_ARGS_CORE \ - assert(entersubop); assert(namegv); assert(protosv) + Perl_assert_aTHX; assert(entersubop); assert(namegv); assert(protosv) PERL_CALLCONV OP * -Perl_ck_entersub_args_list(pTHX_ OP *entersubop); +Perl_ck_entersub_args_list(pTHX_ OP *entersubop) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_CK_ENTERSUB_ARGS_LIST \ - assert(entersubop) + Perl_assert_aTHX; assert(entersubop) PERL_CALLCONV OP * -Perl_ck_entersub_args_proto(pTHX_ OP *entersubop, GV *namegv, SV *protosv); +Perl_ck_entersub_args_proto(pTHX_ OP *entersubop, GV *namegv, SV *protosv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_CK_ENTERSUB_ARGS_PROTO \ - assert(entersubop); assert(namegv); assert(protosv) + Perl_assert_aTHX; assert(entersubop); assert(namegv); assert(protosv) PERL_CALLCONV OP * -Perl_ck_entersub_args_proto_or_list(pTHX_ OP *entersubop, GV *namegv, SV *protosv); +Perl_ck_entersub_args_proto_or_list(pTHX_ OP *entersubop, GV *namegv, SV *protosv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_CK_ENTERSUB_ARGS_PROTO_OR_LIST \ - assert(entersubop); assert(namegv); assert(protosv) + Perl_assert_aTHX; assert(entersubop); assert(namegv); assert(protosv) PERL_CALLCONV void Perl_ck_warner(pTHX_ U32 err, const char *pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__format__(__printf__,pTHX_2,pTHX_3); #define PERL_ARGS_ASSERT_CK_WARNER \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV void Perl_ck_warner_d(pTHX_ U32 err, const char *pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__format__(__printf__,pTHX_2,pTHX_3); #define PERL_ARGS_ASSERT_CK_WARNER_D \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV bool Perl_ckwarn(pTHX_ U32 w) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__ __attribute__pure__; -#define PERL_ARGS_ASSERT_CKWARN +#define PERL_ARGS_ASSERT_CKWARN \ + Perl_assert_aTHX PERL_CALLCONV bool Perl_ckwarn_d(pTHX_ U32 w) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__ __attribute__pure__; -#define PERL_ARGS_ASSERT_CKWARN_D +#define PERL_ARGS_ASSERT_CKWARN_D \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_clear_defarray(pTHX_ AV *av, bool abandon); +Perl_clear_defarray(pTHX_ AV *av, bool abandon) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_CLEAR_DEFARRAY \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV const COP * Perl_closest_cop(pTHX_ const COP *cop, const OP *o, const OP *curop, bool opnext) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_CLOSEST_COP \ - assert(cop) + Perl_assert_aTHX; assert(cop) PERL_CALLCONV OP * Perl_cmpchain_extend(pTHX_ I32 type, OP *ch, OP *right) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_CMPCHAIN_EXTEND \ - assert(ch) + Perl_assert_aTHX; assert(ch) PERL_CALLCONV OP * Perl_cmpchain_finish(pTHX_ OP *ch) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_CMPCHAIN_FINISH \ - assert(ch) + Perl_assert_aTHX; assert(ch) PERL_CALLCONV OP * Perl_cmpchain_start(pTHX_ I32 type, OP *left, OP *right) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__ __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_CMPCHAIN_START +#define PERL_ARGS_ASSERT_CMPCHAIN_START \ + Perl_assert_aTHX PERL_CALLCONV const char * Perl_cntrl_to_mnemonic(const U8 c) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_CNTRL_TO_MNEMONIC +PERL_CALLCONV void +Perl_cop_disable_warning(pTHX_ COP *cop, int warn_bit) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_COP_DISABLE_WARNING \ + Perl_assert_aTHX; assert(cop) + +PERL_CALLCONV void +Perl_cop_enable_warning(pTHX_ COP *cop, int warn_bit) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_COP_ENABLE_WARNING \ + Perl_assert_aTHX; assert(cop) + PERL_CALLCONV const char * -Perl_cop_fetch_label(pTHX_ COP * const cop, STRLEN *len, U32 *flags); +Perl_cop_fetch_label(pTHX_ COP * const cop, STRLEN *len, U32 *flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_COP_FETCH_LABEL \ - assert(cop) + Perl_assert_aTHX; assert(cop) + +PERL_CALLCONV bool +Perl_cop_has_warning(pTHX_ const COP *cop, int warn_bit) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_COP_HAS_WARNING \ + Perl_assert_aTHX; assert(cop) PERL_CALLCONV void -Perl_cop_store_label(pTHX_ COP * const cop, const char *label, STRLEN len, U32 flags); +Perl_cop_store_label(pTHX_ COP * const cop, const char *label, STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_COP_STORE_LABEL \ - assert(cop); assert(label) + Perl_assert_aTHX; assert(cop); assert(label) PERL_CALLCONV SV * Perl_core_prototype(pTHX_ SV *sv, const char *name, const int code, int * const opnum) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_CORE_PROTOTYPE \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV OP * Perl_coresub_op(pTHX_ SV * const coreargssv, const int code, const int opnum) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_CORESUB_OP \ - assert(coreargssv) + Perl_assert_aTHX; assert(coreargssv) PERL_CALLCONV void Perl_create_eval_scope(pTHX_ OP *retop, SV **sp, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_CREATE_EVAL_SCOPE \ - assert(sp) + Perl_assert_aTHX; assert(sp) PERL_CALLCONV_NO_RET void Perl_croak(pTHX_ const char *pat, ...) + Perl_attribute_nonnull_aTHX __attribute__noreturn__ __attribute__format__null_ok__(__printf__,pTHX_1,pTHX_2); -#define PERL_ARGS_ASSERT_CROAK +#define PERL_ARGS_ASSERT_CROAK \ + Perl_assert_aTHX PERL_CALLCONV_NO_RET void Perl_croak_caller(const char *pat, ...) @@ -613,6 +795,7 @@ Perl_croak_no_mem(void) PERL_CALLCONV_NO_RET void Perl_croak_no_mem_ext(const char *context, STRLEN len) + Perl_attribute_nonnull(1) __attribute__noreturn__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_CROAK_NO_MEM_EXT \ @@ -630,12 +813,16 @@ Perl_croak_popstack(void) PERL_CALLCONV_NO_RET void Perl_croak_sv(pTHX_ SV *baseex) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__noreturn__; #define PERL_ARGS_ASSERT_CROAK_SV \ - assert(baseex) + Perl_assert_aTHX; assert(baseex) PERL_CALLCONV_NO_RET void Perl_croak_xs_usage(const CV * const cv, const char * const params) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__noreturn__; #define PERL_ARGS_ASSERT_CROAK_XS_USAGE \ assert(cv); assert(params) @@ -649,37 +836,52 @@ Perl_csighandler3(int sig, Siginfo_t *in #define PERL_ARGS_ASSERT_CSIGHANDLER3 PERL_CALLCONV regexp_engine const * -Perl_current_re_engine(pTHX); -#define PERL_ARGS_ASSERT_CURRENT_RE_ENGINE +Perl_current_re_engine(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_CURRENT_RE_ENGINE \ + Perl_assert_aTHX PERL_CALLCONV XOPRETANY Perl_custom_op_get_field(pTHX_ const OP *o, const xop_flags_enum field) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_CUSTOM_OP_GET_FIELD \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV void -Perl_custom_op_register(pTHX_ Perl_ppaddr_t ppaddr, const XOP *xop); +Perl_custom_op_register(pTHX_ Perl_ppaddr_t ppaddr, const XOP *xop) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_CUSTOM_OP_REGISTER \ - assert(ppaddr); assert(xop) + Perl_assert_aTHX; assert(ppaddr); assert(xop) PERL_CALLCONV void -Perl_cv_ckproto_len_flags(pTHX_ const CV *cv, const GV *gv, const char *p, const STRLEN len, const U32 flags); +Perl_cv_ckproto_len_flags(pTHX_ const CV *cv, const GV *gv, const char *p, const STRLEN len, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_CV_CKPROTO_LEN_FLAGS \ - assert(cv) + Perl_assert_aTHX; assert(cv) PERL_CALLCONV CV * -Perl_cv_clone(pTHX_ CV *proto); +Perl_cv_clone(pTHX_ CV *proto) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_CV_CLONE \ - assert(proto); \ + Perl_assert_aTHX; assert(proto); \ assert(SvTYPE(proto) == SVt_PVCV || SvTYPE(proto) == SVt_PVFM) PERL_CALLCONV CV * Perl_cv_clone_into(pTHX_ CV *proto, CV *target) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_CV_CLONE_INTO \ - assert(proto); assert(target); \ + Perl_assert_aTHX; assert(proto); \ assert(SvTYPE(proto) == SVt_PVCV || SvTYPE(proto) == SVt_PVFM); \ + assert(target); \ assert(SvTYPE(target) == SVt_PVCV || SvTYPE(target) == SVt_PVFM) PERL_CALLCONV SV * @@ -695,311 +897,476 @@ Perl_cv_const_sv_or_av(const CV * const PERL_CALLCONV void Perl_cv_forget_slab(pTHX_ CV *cv) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_CV_FORGET_SLAB +#define PERL_ARGS_ASSERT_CV_FORGET_SLAB \ + Perl_assert_aTHX; \ + assert(!cv || SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_CALLCONV void -Perl_cv_get_call_checker(pTHX_ CV *cv, Perl_call_checker *ckfun_p, SV **ckobj_p); +Perl_cv_get_call_checker(pTHX_ CV *cv, Perl_call_checker *ckfun_p, SV **ckobj_p) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_CV_GET_CALL_CHECKER \ - assert(cv); assert(ckfun_p); assert(ckobj_p); \ - assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM); \ + assert(ckfun_p); assert(ckobj_p) PERL_CALLCONV void -Perl_cv_get_call_checker_flags(pTHX_ CV *cv, U32 gflags, Perl_call_checker *ckfun_p, SV **ckobj_p, U32 *ckflags_p); +Perl_cv_get_call_checker_flags(pTHX_ CV *cv, U32 gflags, Perl_call_checker *ckfun_p, SV **ckobj_p, U32 *ckflags_p) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5); #define PERL_ARGS_ASSERT_CV_GET_CALL_CHECKER_FLAGS \ - assert(cv); assert(ckfun_p); assert(ckobj_p); assert(ckflags_p); \ - assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM); \ + assert(ckfun_p); assert(ckobj_p); assert(ckflags_p) PERL_CALLCONV SV * -Perl_cv_name(pTHX_ CV *cv, SV *sv, U32 flags); +Perl_cv_name(pTHX_ CV *cv, SV *sv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_CV_NAME \ - assert(cv) + Perl_assert_aTHX; assert(cv) PERL_CALLCONV void -Perl_cv_set_call_checker(pTHX_ CV *cv, Perl_call_checker ckfun, SV *ckobj); +Perl_cv_set_call_checker(pTHX_ CV *cv, Perl_call_checker ckfun, SV *ckobj) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_CV_SET_CALL_CHECKER \ - assert(cv); assert(ckfun); assert(ckobj); \ - assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM); assert(ckfun); \ + assert(ckobj) PERL_CALLCONV void -Perl_cv_set_call_checker_flags(pTHX_ CV *cv, Perl_call_checker ckfun, SV *ckobj, U32 ckflags); +Perl_cv_set_call_checker_flags(pTHX_ CV *cv, Perl_call_checker ckfun, SV *ckobj, U32 ckflags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_CV_SET_CALL_CHECKER_FLAGS \ - assert(cv); assert(ckfun); assert(ckobj); \ - assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM); assert(ckfun); \ + assert(ckobj) PERL_CALLCONV void -Perl_cv_undef(pTHX_ CV *cv); +Perl_cv_undef(pTHX_ CV *cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_CV_UNDEF \ - assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_CALLCONV void Perl_cv_undef_flags(pTHX_ CV *cv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_CV_UNDEF_FLAGS \ - assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_CALLCONV GV * -Perl_cvgv_from_hek(pTHX_ CV *cv); +Perl_cvgv_from_hek(pTHX_ CV *cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_CVGV_FROM_HEK \ - assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_CALLCONV void -Perl_cvgv_set(pTHX_ CV *cv, GV *gv); +Perl_cvgv_set(pTHX_ CV *cv, GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_CVGV_SET \ - assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_CALLCONV void -Perl_cvstash_set(pTHX_ CV *cv, HV *stash); +Perl_cvstash_set(pTHX_ CV *cv, HV *stash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_CVSTASH_SET \ - assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM); \ + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM); \ assert(!stash || SvTYPE(stash) == SVt_PVHV) PERL_CALLCONV void -Perl_cx_dump(pTHX_ PERL_CONTEXT *cx); +Perl_cx_dump(pTHX_ PERL_CONTEXT *cx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_CX_DUMP \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_CALLCONV I32 Perl_cxinc(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_CXINC +#define PERL_ARGS_ASSERT_CXINC \ + Perl_assert_aTHX PERL_CALLCONV void Perl_deb(pTHX_ const char *pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__format__(__printf__,pTHX_1,pTHX_2); #define PERL_ARGS_ASSERT_DEB \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV void Perl_deb_stack_all(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_DEB_STACK_ALL +#define PERL_ARGS_ASSERT_DEB_STACK_ALL \ + Perl_assert_aTHX PERL_CALLCONV I32 -Perl_debop(pTHX_ const OP *o); +Perl_debop(pTHX_ const OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_DEBOP \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV void -Perl_debprofdump(pTHX); -#define PERL_ARGS_ASSERT_DEBPROFDUMP +Perl_debprofdump(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_DEBPROFDUMP \ + Perl_assert_aTHX PERL_CALLCONV I32 -Perl_debstack(pTHX); -#define PERL_ARGS_ASSERT_DEBSTACK +Perl_debstack(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_DEBSTACK \ + Perl_assert_aTHX PERL_CALLCONV I32 -Perl_debstackptrs(pTHX); -#define PERL_ARGS_ASSERT_DEBSTACKPTRS +Perl_debstackptrs(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_DEBSTACKPTRS \ + Perl_assert_aTHX PERL_CALLCONV void Perl_debug_hash_seed(pTHX_ bool via_debug_h) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_DEBUG_HASH_SEED +#define PERL_ARGS_ASSERT_DEBUG_HASH_SEED \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_defelem_target(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DEFELEM_TARGET \ - assert(sv) + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV void +Perl_defer_error(pTHX_ SV *err) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_DEFER_ERROR \ + Perl_assert_aTHX PERL_CALLCONV void Perl_delete_eval_scope(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_DELETE_EVAL_SCOPE +#define PERL_ARGS_ASSERT_DELETE_EVAL_SCOPE \ + Perl_assert_aTHX PERL_CALLCONV char * -Perl_delimcpy(char *to, const char *to_end, const char *from, const char *from_end, const int delim, I32 *retlen); +Perl_delimcpy(char *to, const char *to_end, const char *from, const char *from_end, const int delim, I32 *retlen) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3) + Perl_attribute_nonnull(4) + Perl_attribute_nonnull(6); #define PERL_ARGS_ASSERT_DELIMCPY \ assert(to); assert(to_end); assert(from); assert(from_end); \ - assert(retlen) + assert(retlen); assert(to <= to_end); assert(from <= from_end) PERL_CALLCONV char * -Perl_delimcpy_no_escape(char *to, const char *to_end, const char *from, const char *from_end, const int delim, I32 *retlen); +Perl_delimcpy_no_escape(char *to, const char *to_end, const char *from, const char *from_end, const int delim, I32 *retlen) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3) + Perl_attribute_nonnull(4) + Perl_attribute_nonnull(6); #define PERL_ARGS_ASSERT_DELIMCPY_NO_ESCAPE \ assert(to); assert(to_end); assert(from); assert(from_end); \ - assert(retlen) + assert(retlen); assert(to <= to_end); assert(from <= from_end) PERL_CALLCONV void -Perl_despatch_signals(pTHX); -#define PERL_ARGS_ASSERT_DESPATCH_SIGNALS +Perl_despatch_signals(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_DESPATCH_SIGNALS \ + Perl_assert_aTHX -PERL_CALLCONV_NO_RET OP * +PERL_CALLCONV_NON_VOID_NO_RET(OP *) OP * Perl_die(pTHX_ const char *pat, ...) + Perl_attribute_nonnull_aTHX __attribute__noreturn__ __attribute__format__null_ok__(__printf__,pTHX_1,pTHX_2); -#define PERL_ARGS_ASSERT_DIE +#define PERL_ARGS_ASSERT_DIE \ + Perl_assert_aTHX -PERL_CALLCONV_NO_RET OP * +PERL_CALLCONV_NON_VOID_NO_RET(OP *) OP * Perl_die_sv(pTHX_ SV *baseex) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__noreturn__; #define PERL_ARGS_ASSERT_DIE_SV \ - assert(baseex) + Perl_assert_aTHX; assert(baseex) PERL_CALLCONV_NO_RET void Perl_die_unwind(pTHX_ SV *msv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__noreturn__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DIE_UNWIND \ - assert(msv) + Perl_assert_aTHX; assert(msv) PERL_CALLCONV bool Perl_do_aexec5(pTHX_ SV *really, SV **mark, SV **sp, int fd, int do_report) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DO_AEXEC5 \ - assert(mark); assert(sp) + Perl_assert_aTHX; assert(mark); assert(sp) PERL_CALLCONV bool -Perl_do_close(pTHX_ GV *gv, bool is_explicit); -#define PERL_ARGS_ASSERT_DO_CLOSE +Perl_do_close(pTHX_ GV *gv, bool is_explicit) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_DO_CLOSE \ + Perl_assert_aTHX PERL_CALLCONV void Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DO_DUMP_PAD \ - assert(file) + Perl_assert_aTHX; assert(file) PERL_CALLCONV bool Perl_do_eof(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DO_EOF \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV void -Perl_do_gv_dump(pTHX_ I32 level, PerlIO *file, const char *name, GV *sv); +Perl_do_gv_dump(pTHX_ I32 level, PerlIO *file, const char *name, GV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_DO_GV_DUMP \ - assert(file); assert(name) + Perl_assert_aTHX; assert(file); assert(name) PERL_CALLCONV void -Perl_do_gvgv_dump(pTHX_ I32 level, PerlIO *file, const char *name, GV *sv); +Perl_do_gvgv_dump(pTHX_ I32 level, PerlIO *file, const char *name, GV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_DO_GVGV_DUMP \ - assert(file); assert(name) + Perl_assert_aTHX; assert(file); assert(name) PERL_CALLCONV void -Perl_do_hv_dump(pTHX_ I32 level, PerlIO *file, const char *name, HV *sv); +Perl_do_hv_dump(pTHX_ I32 level, PerlIO *file, const char *name, HV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_DO_HV_DUMP \ - assert(file); assert(name); assert(!sv || SvTYPE(sv) == SVt_PVHV) + Perl_assert_aTHX; assert(file); assert(name); \ + assert(!sv || SvTYPE(sv) == SVt_PVHV) PERL_CALLCONV void -Perl_do_join(pTHX_ SV *sv, SV *delim, SV **mark, SV **sp); +Perl_do_join(pTHX_ SV *sv, SV *delim, SV **mark, SV **sp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); #define PERL_ARGS_ASSERT_DO_JOIN \ - assert(sv); assert(delim); assert(mark); assert(sp) + Perl_assert_aTHX; assert(sv); assert(delim); assert(mark); assert(sp) PERL_CALLCONV void -Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim); +Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_DO_MAGIC_DUMP \ - assert(file) + Perl_assert_aTHX; assert(file) PERL_CALLCONV I32 Perl_do_ncmp(pTHX_ SV * const left, SV * const right) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DO_NCMP \ - assert(left); assert(right) + Perl_assert_aTHX; assert(left); assert(right) PERL_CALLCONV void -Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o); +Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_DO_OP_DUMP \ - assert(file) + Perl_assert_aTHX; assert(file) + +PERL_CALLCONV bool +Perl_do_open(pTHX_ GV *gv, const char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_DO_OPEN \ + Perl_assert_aTHX; assert(gv); assert(name) PERL_CALLCONV bool Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len, PerlIO *supplied_fp, SV **svp, U32 num) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DO_OPEN6 \ - assert(gv); assert(oname) + Perl_assert_aTHX; assert(gv); assert(oname) PERL_CALLCONV bool Perl_do_open_raw(pTHX_ GV *gv, const char *oname, STRLEN len, int rawmode, int rawperm, Stat_t *statbufp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DO_OPEN_RAW \ - assert(gv); assert(oname) + Perl_assert_aTHX; assert(gv); assert(oname) PERL_CALLCONV bool -Perl_do_openn(pTHX_ GV *gv, const char *oname, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp, SV **svp, I32 num); +Perl_do_openn(pTHX_ GV *gv, const char *oname, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp, SV **svp, I32 num) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_DO_OPENN \ - assert(gv); assert(oname) + Perl_assert_aTHX; assert(gv); assert(oname) PERL_CALLCONV void -Perl_do_pmop_dump(pTHX_ I32 level, PerlIO *file, const PMOP *pm); +Perl_do_pmop_dump(pTHX_ I32 level, PerlIO *file, const PMOP *pm) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_DO_PMOP_DUMP \ - assert(file) + Perl_assert_aTHX; assert(file) PERL_CALLCONV bool Perl_do_print(pTHX_ SV *sv, PerlIO *fp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DO_PRINT \ - assert(fp) + Perl_assert_aTHX; assert(fp) PERL_CALLCONV OP * Perl_do_readline(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__ __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_DO_READLINE +#define PERL_ARGS_ASSERT_DO_READLINE \ + Perl_assert_aTHX PERL_CALLCONV bool Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_DO_SEEK +#define PERL_ARGS_ASSERT_DO_SEEK \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_do_sprintf(pTHX_ SV *sv, SSize_t len, SV **sarg); +Perl_do_sprintf(pTHX_ SV *sv, SSize_t len, SV **sarg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_DO_SPRINTF \ - assert(sv); assert(sarg) + Perl_assert_aTHX; assert(sv); assert(sarg) PERL_CALLCONV void -Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim); +Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_DO_SV_DUMP \ - assert(file) + Perl_assert_aTHX; assert(file) PERL_CALLCONV Off_t Perl_do_sysseek(pTHX_ GV *gv, Off_t pos, int whence) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DO_SYSSEEK \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV Off_t Perl_do_tell(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DO_TELL \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV Size_t Perl_do_trans(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DO_TRANS \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV I16 Perl_do_uniprop_match(const char * const key, const U16 key_len) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_DO_UNIPROP_MATCH \ assert(key) PERL_CALLCONV UV Perl_do_vecget(pTHX_ SV *sv, STRLEN offset, int size) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DO_VECGET \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void Perl_do_vecset(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DO_VECSET \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void Perl_do_vop(pTHX_ I32 optype, SV *sv, SV *left, SV *right) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DO_VOP \ - assert(sv); assert(left); assert(right) + Perl_assert_aTHX; assert(sv); assert(left); assert(right) PERL_CALLCONV OP * Perl_dofile(pTHX_ OP *term, I32 force_builtin) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DOFILE \ - assert(term) + Perl_assert_aTHX; assert(term) PERL_CALLCONV bool Perl_doing_taint(int argc, char **argv, char **env) @@ -1007,224 +1374,333 @@ Perl_doing_taint(int argc, char **argv, #define PERL_ARGS_ASSERT_DOING_TAINT PERL_CALLCONV OP * -Perl_doref(pTHX_ OP *o, I32 type, bool set_op_ref); +Perl_doref(pTHX_ OP *o, I32 type, bool set_op_ref) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_DOREF \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV void -Perl_dounwind(pTHX_ I32 cxix); -#define PERL_ARGS_ASSERT_DOUNWIND +Perl_dounwind(pTHX_ I32 cxix) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_DOUNWIND \ + Perl_assert_aTHX PERL_CALLCONV U8 Perl_dowantarray(pTHX) + Perl_attribute_nonnull_aTHX __attribute__deprecated__ __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_DOWANTARRAY +#define PERL_ARGS_ASSERT_DOWANTARRAY \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_drand48_init_r(perl_drand48_t *random_state, U32 seed); +Perl_drand48_init_r(perl_drand48_t *random_state, U32 seed) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_DRAND48_INIT_R \ assert(random_state) PERL_CALLCONV double -Perl_drand48_r(perl_drand48_t *random_state); +Perl_drand48_r(perl_drand48_t *random_state) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_DRAND48_R \ assert(random_state) PERL_CALLCONV void -Perl_dump_all(pTHX); -#define PERL_ARGS_ASSERT_DUMP_ALL +Perl_dump_all(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_DUMP_ALL \ + Perl_assert_aTHX PERL_CALLCONV void Perl_dump_all_perl(pTHX_ bool justperl) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_DUMP_ALL_PERL +#define PERL_ARGS_ASSERT_DUMP_ALL_PERL \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_dump_eval(pTHX); -#define PERL_ARGS_ASSERT_DUMP_EVAL +Perl_dump_eval(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_DUMP_EVAL \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_dump_form(pTHX_ const GV *gv); +Perl_dump_form(pTHX_ const GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_DUMP_FORM \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV void Perl_dump_indent(pTHX_ I32 level, PerlIO *file, const char *pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__format__(__printf__,pTHX_3,pTHX_4); #define PERL_ARGS_ASSERT_DUMP_INDENT \ - assert(file); assert(pat) + Perl_assert_aTHX; assert(file); assert(pat) PERL_CALLCONV void -Perl_dump_packsubs(pTHX_ const HV *stash); +Perl_dump_packsubs(pTHX_ const HV *stash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_DUMP_PACKSUBS \ - assert(stash) + Perl_assert_aTHX; assert(stash) PERL_CALLCONV void Perl_dump_packsubs_perl(pTHX_ const HV *stash, bool justperl) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DUMP_PACKSUBS_PERL \ - assert(stash) + Perl_assert_aTHX; assert(stash) PERL_CALLCONV void -Perl_dump_sub(pTHX_ const GV *gv); +Perl_dump_sub(pTHX_ const GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_DUMP_SUB \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV void Perl_dump_sub_perl(pTHX_ const GV *gv, bool justperl) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_DUMP_SUB_PERL \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV void -Perl_dump_vindent(pTHX_ I32 level, PerlIO *file, const char *pat, va_list *args); +Perl_dump_vindent(pTHX_ I32 level, PerlIO *file, const char *pat, va_list *args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_DUMP_VINDENT \ - assert(file); assert(pat) + Perl_assert_aTHX; assert(file); assert(pat) PERL_CALLCONV char * -Perl_dup_warnings(pTHX_ char *warnings); -#define PERL_ARGS_ASSERT_DUP_WARNINGS +Perl_dup_warnings(pTHX_ char *warnings) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_DUP_WARNINGS \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_emulate_cop_io(pTHX_ const COP * const c, SV * const sv); +Perl_emulate_cop_io(pTHX_ const COP * const c, SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_EMULATE_COP_IO \ - assert(c); assert(sv) + Perl_assert_aTHX; assert(c); assert(sv) PERL_CALLCONV SV * -Perl_eval_pv(pTHX_ const char *p, I32 croak_on_error); +Perl_eval_pv(pTHX_ const char *p, I32 croak_on_error) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_EVAL_PV \ - assert(p) + Perl_assert_aTHX; assert(p) PERL_CALLCONV SSize_t -Perl_eval_sv(pTHX_ SV *sv, I32 flags); +Perl_eval_sv(pTHX_ SV *sv, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_EVAL_SV \ - assert(sv) + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV Size_t +Perl_expected_size(UV size); +#define PERL_ARGS_ASSERT_EXPECTED_SIZE -/* PERL_CALLCONV bool -Perl_extended_utf8_to_uv(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p); */ +PERL_CALLCONV bool +Perl_extended_utf8_to_uv(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3); +#define PERL_ARGS_ASSERT_EXTENDED_UTF8_TO_UV \ + assert(s); assert(e); assert(cp_p); assert(s <= e) PERL_CALLCONV void Perl_fatal_warner(pTHX_ U32 err, const char *pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__format__(__printf__,pTHX_2,pTHX_3); #define PERL_ARGS_ASSERT_FATAL_WARNER \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV void -Perl_fbm_compile(pTHX_ SV *sv, U32 flags); +Perl_fbm_compile(pTHX_ SV *sv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_FBM_COMPILE \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV char * Perl_fbm_instr(pTHX_ unsigned char *big, unsigned char *bigend, SV *littlestr, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_FBM_INSTR \ - assert(big); assert(bigend); assert(littlestr) + Perl_assert_aTHX; assert(big); assert(bigend); assert(littlestr); \ + assert(big <= bigend) PERL_CALLCONV SV * -Perl_filter_add(pTHX_ filter_t funcp, SV *datasv); -#define PERL_ARGS_ASSERT_FILTER_ADD +Perl_filter_add(pTHX_ filter_t funcp, SV *datasv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_FILTER_ADD \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_filter_del(pTHX_ filter_t funcp); +Perl_filter_del(pTHX_ filter_t funcp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_FILTER_DEL \ - assert(funcp) + Perl_assert_aTHX; assert(funcp) PERL_CALLCONV I32 Perl_filter_read(pTHX_ int idx, SV *buf_sv, int maxlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_FILTER_READ \ - assert(buf_sv) + Perl_assert_aTHX; assert(buf_sv) PERL_CALLCONV CV * Perl_find_lexical_cv(pTHX_ PADOFFSET off) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_FIND_LEXICAL_CV +#define PERL_ARGS_ASSERT_FIND_LEXICAL_CV \ + Perl_assert_aTHX PERL_CALLCONV CV * Perl_find_runcv(pTHX_ U32 *db_seqp) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_FIND_RUNCV +#define PERL_ARGS_ASSERT_FIND_RUNCV \ + Perl_assert_aTHX PERL_CALLCONV CV * Perl_find_runcv_where(pTHX_ U8 cond, IV arg, U32 *db_seqp) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__ __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_FIND_RUNCV_WHERE +#define PERL_ARGS_ASSERT_FIND_RUNCV_WHERE \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_find_rundefsv(pTHX); -#define PERL_ARGS_ASSERT_FIND_RUNDEFSV +Perl_find_rundefsv(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_FIND_RUNDEFSV \ + Perl_assert_aTHX PERL_CALLCONV char * Perl_find_script(pTHX_ const char *scriptname, bool dosearch, const char * const * const search_ext, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_FIND_SCRIPT \ - assert(scriptname) + Perl_assert_aTHX; assert(scriptname) -/* PERL_CALLCONV I32 -foldEQ_utf8(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2); */ +PERL_CALLCONV I32 +Perl_foldEQ_utf8(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_5); +#define PERL_ARGS_ASSERT_FOLDEQ_UTF8 \ + Perl_assert_aTHX; assert(s1); assert(s2) PERL_CALLCONV I32 -Perl_foldEQ_utf8_flags(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2, U32 flags); +Perl_foldEQ_utf8_flags(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_5); #define PERL_ARGS_ASSERT_FOLDEQ_UTF8_FLAGS \ - assert(s1); assert(s2) + Perl_assert_aTHX; assert(s1); assert(s2) PERL_CALLCONV void -Perl_forbid_outofblock_ops(pTHX_ OP *o, const char *blockname); +Perl_forbid_outofblock_ops(pTHX_ OP *o, const char *blockname) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_FORBID_OUTOFBLOCK_OPS \ - assert(o); assert(blockname) + Perl_assert_aTHX; assert(o); assert(blockname) PERL_CALLCONV void Perl_force_locale_unlock(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_FORCE_LOCALE_UNLOCK +#define PERL_ARGS_ASSERT_FORCE_LOCALE_UNLOCK \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_force_out_malformed_utf8_message_(pTHX_ const U8 * const p, const U8 * const e, U32 flags, const bool die_here); +Perl_force_out_malformed_utf8_message_(pTHX_ const U8 * const p, const U8 * const e, U32 flags, const bool die_here) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_FORCE_OUT_MALFORMED_UTF8_MESSAGE_ \ - assert(p); assert(e) + Perl_assert_aTHX; assert(p); assert(e); assert(p < e) PERL_CALLCONV char * Perl_form(pTHX_ const char *pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__format__(__printf__,pTHX_1,pTHX_2); #define PERL_ARGS_ASSERT_FORM \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV void Perl_free_tied_hv_pool(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_FREE_TIED_HV_POOL +#define PERL_ARGS_ASSERT_FREE_TIED_HV_POOL \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_free_tmps(pTHX); -#define PERL_ARGS_ASSERT_FREE_TMPS +Perl_free_tmps(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_FREE_TMPS \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_get_and_check_backslash_N_name(pTHX_ const char *s, const char *e, const bool is_utf8, const char **error_msg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_4) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_GET_AND_CHECK_BACKSLASH_N_NAME \ - assert(s); assert(e); assert(error_msg) + Perl_assert_aTHX; assert(s); assert(e); assert(error_msg); \ + assert(s <= e) PERL_CALLCONV AV * -Perl_get_av(pTHX_ const char *name, I32 flags); +Perl_get_av(pTHX_ const char *name, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GET_AV \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV CV * -Perl_get_cv(pTHX_ const char *name, I32 flags); +Perl_get_cv(pTHX_ const char *name, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GET_CV \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV CV * -Perl_get_cvn_flags(pTHX_ const char *name, STRLEN len, I32 flags); +Perl_get_cvn_flags(pTHX_ const char *name, STRLEN len, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GET_CVN_FLAGS \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV void -Perl_get_db_sub(pTHX_ SV **svp, CV *cv); +Perl_get_db_sub(pTHX_ SV **svp, CV *cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GET_DB_SUB \ - assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_CALLCONV const char * Perl_get_deprecated_property_msg(const Size_t warning_offset) @@ -1238,56 +1714,72 @@ Perl_get_extended_os_errno(void) PERL_CALLCONV void Perl_get_hash_seed(pTHX_ unsigned char * const seed_buffer) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_GET_HASH_SEED \ - assert(seed_buffer) + Perl_assert_aTHX; assert(seed_buffer) PERL_CALLCONV HV * -Perl_get_hv(pTHX_ const char *name, I32 flags); +Perl_get_hv(pTHX_ const char *name, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GET_HV \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV const char * Perl_get_no_modify(pTHX) + Perl_attribute_nonnull_aTHX __attribute__deprecated__ __attribute__warn_unused_result__ __attribute__pure__ __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_GET_NO_MODIFY +#define PERL_ARGS_ASSERT_GET_NO_MODIFY \ + Perl_assert_aTHX PERL_CALLCONV char ** Perl_get_op_descs(pTHX) + Perl_attribute_nonnull_aTHX __attribute__deprecated__ __attribute__warn_unused_result__ __attribute__pure__; -#define PERL_ARGS_ASSERT_GET_OP_DESCS +#define PERL_ARGS_ASSERT_GET_OP_DESCS \ + Perl_assert_aTHX PERL_CALLCONV char ** Perl_get_op_names(pTHX) + Perl_attribute_nonnull_aTHX __attribute__deprecated__ __attribute__warn_unused_result__ __attribute__pure__; -#define PERL_ARGS_ASSERT_GET_OP_NAMES +#define PERL_ARGS_ASSERT_GET_OP_NAMES \ + Perl_assert_aTHX PERL_CALLCONV U32 * Perl_get_opargs(pTHX) + Perl_attribute_nonnull_aTHX __attribute__deprecated__ __attribute__warn_unused_result__ __attribute__pure__ __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_GET_OPARGS +#define PERL_ARGS_ASSERT_GET_OPARGS \ + Perl_assert_aTHX PERL_CALLCONV PPADDR_t * Perl_get_ppaddr(pTHX) + Perl_attribute_nonnull_aTHX __attribute__deprecated__ __attribute__warn_unused_result__ __attribute__pure__; -#define PERL_ARGS_ASSERT_GET_PPADDR +#define PERL_ARGS_ASSERT_GET_PPADDR \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_get_prop_definition(pTHX_ const int table_index) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_GET_PROP_DEFINITION +#define PERL_ARGS_ASSERT_GET_PROP_DEFINITION \ + Perl_assert_aTHX PERL_CALLCONV const char * const * Perl_get_prop_values(const int table_index) @@ -1295,588 +1787,1059 @@ Perl_get_prop_values(const int table_ind #define PERL_ARGS_ASSERT_GET_PROP_VALUES PERL_CALLCONV REGEXP * -Perl_get_re_arg(pTHX_ SV *sv); -#define PERL_ARGS_ASSERT_GET_RE_ARG +Perl_get_re_arg(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_GET_RE_ARG \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_get_sv(pTHX_ const char *name, I32 flags); +Perl_get_sv(pTHX_ const char *name, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GET_SV \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV int -Perl_getcwd_sv(pTHX_ SV *sv); +Perl_getcwd_sv(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GETCWD_SV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_gp_free(pTHX_ GV *gv); -#define PERL_ARGS_ASSERT_GP_FREE +Perl_gp_free(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_GP_FREE \ + Perl_assert_aTHX PERL_CALLCONV GP * -Perl_gp_ref(pTHX_ GP *gp); -#define PERL_ARGS_ASSERT_GP_REF +Perl_gp_ref(pTHX_ GP *gp) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_GP_REF \ + Perl_assert_aTHX PERL_CALLCONV bool -Perl_grok_atoUV(const char *pv, UV *valptr, const char **endptr); +Perl_grok_atoUV(const char *pv, UV *valptr, const char **endptr) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2); #define PERL_ARGS_ASSERT_GROK_ATOUV \ assert(pv); assert(valptr) PERL_CALLCONV UV -Perl_grok_bin(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *result); -#define PERL_ARGS_ASSERT_GROK_BIN \ - assert(start); assert(len_p); assert(flags) - -PERL_CALLCONV UV -Perl_grok_bin_oct_hex(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *result, const unsigned shift, const U8 lookup_bit, const char prefix); -#define PERL_ARGS_ASSERT_GROK_BIN_OCT_HEX \ - assert(start); assert(len_p); assert(flags) - -PERL_CALLCONV UV -Perl_grok_hex(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *result); -#define PERL_ARGS_ASSERT_GROK_HEX \ - assert(start); assert(len_p); assert(flags) +Perl_grok_bin_hex(pTHX_ const char * const start, STRLEN *len_p, I32 *flags, NV *approximation, uint_fast8_t base, const U32 lookup_bit, const char prefix) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +#define PERL_ARGS_ASSERT_GROK_BIN_HEX \ + Perl_assert_aTHX; assert(start); assert(len_p); assert(flags) PERL_CALLCONV int -Perl_grok_infnan(pTHX_ const char **sp, const char *send); +Perl_grok_infnan(pTHX_ const char **sp, const char *send) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GROK_INFNAN \ - assert(sp); assert(send) + Perl_assert_aTHX; assert(sp); assert(*sp); assert(send); \ + assert(*sp <= send) PERL_CALLCONV int -Perl_grok_number(pTHX_ const char *pv, STRLEN len, UV *valuep); +Perl_grok_number(pTHX_ const char *pv, STRLEN len, UV *valuep) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GROK_NUMBER \ - assert(pv) + Perl_assert_aTHX; assert(pv) PERL_CALLCONV int -Perl_grok_number_flags(pTHX_ const char *pv, STRLEN len, UV *valuep, U32 flags); +Perl_grok_number_flags(pTHX_ const char *pv, STRLEN len, UV *valuep, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GROK_NUMBER_FLAGS \ - assert(pv) + Perl_assert_aTHX; assert(pv) PERL_CALLCONV bool Perl_grok_numeric_radix(pTHX_ const char **sp, const char *send) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_GROK_NUMERIC_RADIX \ - assert(sp); assert(send) + Perl_assert_aTHX; assert(sp); assert(*sp); assert(send); \ + assert(*sp <= send) PERL_CALLCONV UV -Perl_grok_oct(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *result); -#define PERL_ARGS_ASSERT_GROK_OCT \ - assert(start); assert(len_p); assert(flags) +Perl_grok_uint_by_base(pTHX_ const char * const start, STRLEN *len_p, I32 *flags, NV *approximation, uint_fast8_t base, const U32 lookup_bit, uint_fast8_t offset) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +#define PERL_ARGS_ASSERT_GROK_UINT_BY_BASE \ + Perl_assert_aTHX; assert(start); assert(len_p); assert(flags) + +PERL_CALLCONV GV * +Perl_gv_AVadd(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_GV_AVADD \ + Perl_assert_aTHX + +PERL_CALLCONV GV * +Perl_gv_HVadd(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_GV_HVADD \ + Perl_assert_aTHX + +PERL_CALLCONV GV * +Perl_gv_IOadd(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_GV_IOADD \ + Perl_assert_aTHX + +PERL_CALLCONV GV * +Perl_gv_SVadd(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_GV_SVADD \ + Perl_assert_aTHX PERL_CALLCONV GV * -Perl_gv_add_by_type(pTHX_ GV *gv, svtype type); -#define PERL_ARGS_ASSERT_GV_ADD_BY_TYPE +Perl_gv_add_by_type(pTHX_ GV *gv, svtype type) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_GV_ADD_BY_TYPE \ + Perl_assert_aTHX PERL_CALLCONV GV * Perl_gv_autoload_pv(pTHX_ HV *stash, const char *namepv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_GV_AUTOLOAD_PV \ - assert(namepv) + Perl_assert_aTHX; assert(namepv) PERL_CALLCONV GV * Perl_gv_autoload_pvn(pTHX_ HV *stash, const char *name, STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_GV_AUTOLOAD_PVN \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV GV * Perl_gv_autoload_sv(pTHX_ HV *stash, SV *namesv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_GV_AUTOLOAD_SV \ - assert(namesv) + Perl_assert_aTHX; assert(namesv) PERL_CALLCONV void -Perl_gv_check(pTHX_ HV *stash); +Perl_gv_check(pTHX_ HV *stash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GV_CHECK \ - assert(stash); assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV) PERL_CALLCONV SV * Perl_gv_const_sv(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_GV_CONST_SV \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV void -Perl_gv_dump(pTHX_ GV *gv); -#define PERL_ARGS_ASSERT_GV_DUMP +Perl_gv_dump(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_GV_DUMP \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_gv_efullname4(pTHX_ SV *sv, const GV *gv, const char *prefix, bool keepmain); +Perl_gv_efullname3(pTHX_ SV *sv, const GV *gv, const char *prefix) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_GV_EFULLNAME3 \ + Perl_assert_aTHX; assert(sv); assert(gv) + +PERL_CALLCONV void +Perl_gv_efullname4(pTHX_ SV *sv, const GV *gv, const char *prefix, bool keepmain) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GV_EFULLNAME4 \ - assert(sv); assert(gv) + Perl_assert_aTHX; assert(sv); assert(gv) PERL_CALLCONV GV * -Perl_gv_fetchfile(pTHX_ const char *name); +Perl_gv_fetchfile(pTHX_ const char *name) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GV_FETCHFILE \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV GV * -Perl_gv_fetchfile_flags(pTHX_ const char * const name, const STRLEN len, const U32 flags); +Perl_gv_fetchfile_flags(pTHX_ const char * const name, const STRLEN len, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GV_FETCHFILE_FLAGS \ - assert(name) + Perl_assert_aTHX; assert(name) -/* PERL_CALLCONV GV * -gv_fetchmeth(pTHX_ HV *stash, const char *name, STRLEN len, I32 level); */ +PERL_CALLCONV GV * +Perl_gv_fetchmeth(pTHX_ HV *stash, const char *name, STRLEN len, I32 level) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_GV_FETCHMETH \ + Perl_assert_aTHX; assert(name) -/* PERL_CALLCONV GV * -gv_fetchmeth_autoload(pTHX_ HV *stash, const char *name, STRLEN len, I32 level); */ +PERL_CALLCONV GV * +Perl_gv_fetchmeth_autoload(pTHX_ HV *stash, const char *name, STRLEN len, I32 level) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_GV_FETCHMETH_AUTOLOAD \ + Perl_assert_aTHX; assert(name) PERL_CALLCONV GV * -Perl_gv_fetchmeth_pv(pTHX_ HV *stash, const char *name, I32 level, U32 flags); +Perl_gv_fetchmeth_pv(pTHX_ HV *stash, const char *name, I32 level, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GV_FETCHMETH_PV \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV GV * -Perl_gv_fetchmeth_pv_autoload(pTHX_ HV *stash, const char *name, I32 level, U32 flags); +Perl_gv_fetchmeth_pv_autoload(pTHX_ HV *stash, const char *name, I32 level, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GV_FETCHMETH_PV_AUTOLOAD \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV GV * -Perl_gv_fetchmeth_pvn(pTHX_ HV *stash, const char *name, STRLEN len, I32 level, U32 flags); +Perl_gv_fetchmeth_pvn(pTHX_ HV *stash, const char *name, STRLEN len, I32 level, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GV_FETCHMETH_PVN \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV GV * -Perl_gv_fetchmeth_pvn_autoload(pTHX_ HV *stash, const char *name, STRLEN len, I32 level, U32 flags); +Perl_gv_fetchmeth_pvn_autoload(pTHX_ HV *stash, const char *name, STRLEN len, I32 level, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GV_FETCHMETH_PVN_AUTOLOAD \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV GV * -Perl_gv_fetchmeth_sv(pTHX_ HV *stash, SV *namesv, I32 level, U32 flags); +Perl_gv_fetchmeth_sv(pTHX_ HV *stash, SV *namesv, I32 level, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GV_FETCHMETH_SV \ - assert(namesv) + Perl_assert_aTHX; assert(namesv) PERL_CALLCONV GV * -Perl_gv_fetchmeth_sv_autoload(pTHX_ HV *stash, SV *namesv, I32 level, U32 flags); +Perl_gv_fetchmeth_sv_autoload(pTHX_ HV *stash, SV *namesv, I32 level, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GV_FETCHMETH_SV_AUTOLOAD \ - assert(namesv) + Perl_assert_aTHX; assert(namesv) + +PERL_CALLCONV GV * +Perl_gv_fetchmethod(pTHX_ HV *stash, const char *name) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_GV_FETCHMETHOD \ + Perl_assert_aTHX; assert(stash); assert(name) PERL_CALLCONV GV * -Perl_gv_fetchmethod_autoload(pTHX_ HV *stash, const char *name, I32 autoload); +Perl_gv_fetchmethod_autoload(pTHX_ HV *stash, const char *name, I32 autoload) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GV_FETCHMETHOD_AUTOLOAD \ - assert(stash); assert(name) + Perl_assert_aTHX; assert(stash); assert(name) PERL_CALLCONV GV * -Perl_gv_fetchmethod_pv_flags(pTHX_ HV *stash, const char *name, U32 flags); +Perl_gv_fetchmethod_pv_flags(pTHX_ HV *stash, const char *name, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GV_FETCHMETHOD_PV_FLAGS \ - assert(stash); assert(name) + Perl_assert_aTHX; assert(stash); assert(name) PERL_CALLCONV GV * -Perl_gv_fetchmethod_pvn_flags(pTHX_ HV *stash, const char *name, const STRLEN len, U32 flags); +Perl_gv_fetchmethod_pvn_flags(pTHX_ HV *stash, const char *name, const STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GV_FETCHMETHOD_PVN_FLAGS \ - assert(stash); assert(name) + Perl_assert_aTHX; assert(stash); assert(name) PERL_CALLCONV GV * -Perl_gv_fetchmethod_sv_flags(pTHX_ HV *stash, SV *namesv, U32 flags); +Perl_gv_fetchmethod_sv_flags(pTHX_ HV *stash, SV *namesv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GV_FETCHMETHOD_SV_FLAGS \ - assert(stash); assert(namesv) + Perl_assert_aTHX; assert(stash); assert(namesv) PERL_CALLCONV GV * -Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 flags, const svtype sv_type); +Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 flags, const svtype sv_type) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GV_FETCHPV \ - assert(nambeg) + Perl_assert_aTHX; assert(nambeg) PERL_CALLCONV GV * -Perl_gv_fetchpvn_flags(pTHX_ const char *name, STRLEN len, I32 flags, const svtype sv_type); +Perl_gv_fetchpvn_flags(pTHX_ const char *nambeg, STRLEN len, I32 flags, const svtype sv_type) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GV_FETCHPVN_FLAGS \ - assert(name) + Perl_assert_aTHX; assert(nambeg) PERL_CALLCONV GV * -Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, const svtype sv_type); +Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, const svtype sv_type) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GV_FETCHSV \ - assert(name) + Perl_assert_aTHX; assert(name) + +PERL_CALLCONV void +Perl_gv_fullname3(pTHX_ SV *sv, const GV *gv, const char *prefix) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_GV_FULLNAME3 \ + Perl_assert_aTHX; assert(sv); assert(gv) PERL_CALLCONV void -Perl_gv_fullname4(pTHX_ SV *sv, const GV *gv, const char *prefix, bool keepmain); +Perl_gv_fullname4(pTHX_ SV *sv, const GV *gv, const char *prefix, bool keepmain) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GV_FULLNAME4 \ - assert(sv); assert(gv) + Perl_assert_aTHX; assert(sv); assert(gv) PERL_CALLCONV CV * Perl_gv_handler(pTHX_ HV *stash, I32 id) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_GV_HANDLER +#define PERL_ARGS_ASSERT_GV_HANDLER \ + Perl_assert_aTHX; assert(!stash || SvTYPE(stash) == SVt_PVHV) -/* PERL_CALLCONV void -gv_init(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, int multi); */ +PERL_CALLCONV void +Perl_gv_init(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, int multi) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); +#define PERL_ARGS_ASSERT_GV_INIT \ + Perl_assert_aTHX; assert(gv); \ + assert(!stash || SvTYPE(stash) == SVt_PVHV); assert(name) PERL_CALLCONV void -Perl_gv_init_pv(pTHX_ GV *gv, HV *stash, const char *name, U32 flags); +Perl_gv_init_pv(pTHX_ GV *gv, HV *stash, const char *name, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_GV_INIT_PV \ - assert(gv); assert(name); assert(!stash || SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(gv); \ + assert(!stash || SvTYPE(stash) == SVt_PVHV); assert(name) PERL_CALLCONV void -Perl_gv_init_pvn(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, U32 flags); +Perl_gv_init_pvn(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_GV_INIT_PVN \ - assert(gv); assert(name); assert(!stash || SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(gv); \ + assert(!stash || SvTYPE(stash) == SVt_PVHV); assert(name) PERL_CALLCONV void -Perl_gv_init_sv(pTHX_ GV *gv, HV *stash, SV *namesv, U32 flags); +Perl_gv_init_sv(pTHX_ GV *gv, HV *stash, SV *namesv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_GV_INIT_SV \ - assert(gv); assert(namesv); assert(!stash || SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(gv); \ + assert(!stash || SvTYPE(stash) == SVt_PVHV); assert(namesv) PERL_CALLCONV void -Perl_gv_name_set(pTHX_ GV *gv, const char *name, U32 len, U32 flags); +Perl_gv_name_set(pTHX_ GV *gv, const char *name, U32 len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_GV_NAME_SET \ - assert(gv); assert(name) + Perl_assert_aTHX; assert(gv); assert(name) PERL_CALLCONV GV * -Perl_gv_override(pTHX_ const char * const name, const STRLEN len); +Perl_gv_override(pTHX_ const char * const name, const STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GV_OVERRIDE \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV void Perl_gv_setref(pTHX_ SV * const dsv, SV * const ssv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_GV_SETREF \ - assert(dsv); assert(ssv) + Perl_assert_aTHX; assert(dsv); assert(ssv) PERL_CALLCONV HV * -Perl_gv_stashpv(pTHX_ const char *name, I32 flags); +Perl_gv_stashpv(pTHX_ const char *name, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GV_STASHPV \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV HV * -Perl_gv_stashpvn(pTHX_ const char *name, U32 namelen, I32 flags); +Perl_gv_stashpvn(pTHX_ const char *name, U32 namelen, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GV_STASHPVN \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV HV * -Perl_gv_stashsv(pTHX_ SV *sv, I32 flags); +Perl_gv_stashsv(pTHX_ SV *sv, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GV_STASHSV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_gv_try_downgrade(pTHX_ GV *gv); +Perl_gv_try_downgrade(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_GV_TRY_DOWNGRADE \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV struct xpvhv_aux * Perl_hv_auxalloc(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_HV_AUXALLOC \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV AV ** Perl_hv_backreferences_p(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_HV_BACKREFERENCES_P \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV SV * Perl_hv_bucket_ratio(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_HV_BUCKET_RATIO \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void -Perl_hv_clear(pTHX_ HV *hv); -#define PERL_ARGS_ASSERT_HV_CLEAR +Perl_hv_clear(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_HV_CLEAR \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void -Perl_hv_clear_placeholders(pTHX_ HV *hv); +Perl_hv_clear_placeholders(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_HV_CLEAR_PLACEHOLDERS \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) - -PERL_CALLCONV void * -Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, int flags, int action, SV *val, U32 hash); -#define PERL_ARGS_ASSERT_HV_COMMON + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void * -Perl_hv_common_key_len(pTHX_ HV *hv, const char *key, I32 klen_i32, const int action, SV *val, const U32 hash); -#define PERL_ARGS_ASSERT_HV_COMMON_KEY_LEN \ - assert(key); assert(!hv || SvTYPE(hv) == SVt_PVHV) +Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, int flags, int action, SV *val, U32 hash) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_HV_COMMON \ + Perl_assert_aTHX PERL_CALLCONV HV * Perl_hv_copy_hints_hv(pTHX_ HV * const ohv) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_HV_COPY_HINTS_HV +#define PERL_ARGS_ASSERT_HV_COPY_HINTS_HV \ + Perl_assert_aTHX; assert(!ohv || SvTYPE(ohv) == SVt_PVHV) PERL_CALLCONV void -Perl_hv_delayfree_ent(pTHX_ HV *notused, HE *entry); -#define PERL_ARGS_ASSERT_HV_DELAYFREE_ENT +Perl_hv_delayfree_ent(pTHX_ HV *notused, HE *entry) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_HV_DELAYFREE_ENT \ + Perl_assert_aTHX; assert(!notused || SvTYPE(notused) == SVt_PVHV) + +PERL_CALLCONV SV * +Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_HV_DELETE \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV); assert(key) + +PERL_CALLCONV SV * +Perl_hv_delete_ent(pTHX_ HV *hv, SV *keysv, I32 flags, U32 hash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_HV_DELETE_ENT \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV); assert(keysv) PERL_CALLCONV void -Perl_hv_dump(pTHX_ HV *hv); -#define PERL_ARGS_ASSERT_HV_DUMP +Perl_hv_dump(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_HV_DUMP \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV HE ** Perl_hv_eiter_p(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_HV_EITER_P \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void -Perl_hv_eiter_set(pTHX_ HV *hv, HE *eiter); +Perl_hv_eiter_set(pTHX_ HV *hv, HE *eiter) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_HV_EITER_SET \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void Perl_hv_ename_add(pTHX_ HV *hv, const char *name, U32 len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_HV_ENAME_ADD \ - assert(hv); assert(name); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV); \ + assert(name) PERL_CALLCONV void Perl_hv_ename_delete(pTHX_ HV *hv, const char *name, U32 len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_HV_ENAME_DELETE \ - assert(hv); assert(name); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV); \ + assert(name) + +PERL_CALLCONV bool +Perl_hv_exists(pTHX_ HV *hv, const char *key, I32 klen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_HV_EXISTS \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV); assert(key) + +PERL_CALLCONV bool +Perl_hv_exists_ent(pTHX_ HV *hv, SV *keysv, U32 hash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_HV_EXISTS_ENT \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV); assert(keysv) + +PERL_CALLCONV SV ** +Perl_hv_fetch(pTHX_ HV *hv, const char *key, I32 klen, I32 lval) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_HV_FETCH \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV); assert(key) + +PERL_CALLCONV HE * +Perl_hv_fetch_ent(pTHX_ HV *hv, SV *keysv, I32 lval, U32 hash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_HV_FETCH_ENT \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV); assert(keysv) PERL_CALLCONV STRLEN -Perl_hv_fill(pTHX_ HV * const hv); +Perl_hv_fill(pTHX_ HV * const hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_HV_FILL \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void -Perl_hv_free_ent(pTHX_ HV *notused, HE *entry); -#define PERL_ARGS_ASSERT_HV_FREE_ENT +Perl_hv_free_ent(pTHX_ HV *notused, HE *entry) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_HV_FREE_ENT \ + Perl_assert_aTHX; assert(!notused || SvTYPE(notused) == SVt_PVHV) PERL_CALLCONV I32 -Perl_hv_iterinit(pTHX_ HV *hv); +Perl_hv_iterinit(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_HV_ITERINIT \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV char * Perl_hv_iterkey(pTHX_ HE *entry, I32 *retlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_HV_ITERKEY \ - assert(entry); assert(retlen) + Perl_assert_aTHX; assert(entry); assert(retlen) PERL_CALLCONV SV * Perl_hv_iterkeysv(pTHX_ HE *entry) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_HV_ITERKEYSV \ - assert(entry) + Perl_assert_aTHX; assert(entry) + +PERL_CALLCONV HE * +Perl_hv_iternext(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_HV_ITERNEXT \ + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV HE * Perl_hv_iternext_flags(pTHX_ HV *hv, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_HV_ITERNEXT_FLAGS \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV SV * Perl_hv_iternextsv(pTHX_ HV *hv, char **key, I32 *retlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_HV_ITERNEXTSV \ - assert(hv); assert(key); assert(retlen); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV); \ + assert(key); assert(retlen) PERL_CALLCONV SV * Perl_hv_iterval(pTHX_ HV *hv, HE *entry) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_HV_ITERVAL \ - assert(hv); assert(entry); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV); \ + assert(entry) PERL_CALLCONV void -Perl_hv_ksplit(pTHX_ HV *hv, IV newmax); +Perl_hv_ksplit(pTHX_ HV *hv, IV newmax) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_HV_KSPLIT \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void -Perl_hv_name_set(pTHX_ HV *hv, const char *name, U32 len, U32 flags); +Perl_hv_magic(pTHX_ HV *hv, GV *gv, int how) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_HV_MAGIC \ + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + +PERL_CALLCONV void +Perl_hv_name_set(pTHX_ HV *hv, const char *name, U32 len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_HV_NAME_SET \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV I32 Perl_hv_placeholders_get(pTHX_ const HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_HV_PLACEHOLDERS_GET \ - assert(hv) + Perl_assert_aTHX; assert(hv) PERL_CALLCONV SSize_t * Perl_hv_placeholders_p(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_HV_PLACEHOLDERS_P \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void -Perl_hv_placeholders_set(pTHX_ HV *hv, I32 ph); +Perl_hv_placeholders_set(pTHX_ HV *hv, I32 ph) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_HV_PLACEHOLDERS_SET \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void Perl_hv_pushkv(pTHX_ HV *hv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_HV_PUSHKV \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void -Perl_hv_rand_set(pTHX_ HV *hv, U32 new_xhv_rand); +Perl_hv_rand_set(pTHX_ HV *hv, U32 new_xhv_rand) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_HV_RAND_SET \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV I32 * Perl_hv_riter_p(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_HV_RITER_P \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void -Perl_hv_riter_set(pTHX_ HV *hv, I32 riter); +Perl_hv_riter_set(pTHX_ HV *hv, I32 riter) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_HV_RITER_SET \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV SV * Perl_hv_scalar(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_HV_SCALAR \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) -/* PERL_CALLCONV SV ** -hv_stores(pTHX_ HV *hv, const char * const key, SV *val); */ +PERL_CALLCONV SV ** +Perl_hv_store(pTHX_ HV *hv, const char *key, I32 klen, SV *val, U32 hash) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_HV_STORE \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV) -/* PERL_CALLCONV void -hv_undef(pTHX_ HV *hv); */ +PERL_CALLCONV HE * +Perl_hv_store_ent(pTHX_ HV *hv, SV *key, SV *val, U32 hash) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_HV_STORE_ENT \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV) + +PERL_CALLCONV SV ** +Perl_hv_store_flags(pTHX_ HV *hv, const char *key, I32 klen, SV *val, U32 hash, int flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_HV_STORE_FLAGS \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV) + +PERL_CALLCONV void +Perl_hv_undef(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_HV_UNDEF \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void -Perl_hv_undef_flags(pTHX_ HV *hv, U32 flags); -#define PERL_ARGS_ASSERT_HV_UNDEF_FLAGS +Perl_hv_undef_flags(pTHX_ HV *hv, U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_HV_UNDEF_FLAGS \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV) -/* PERL_CALLCONV I32 -ibcmp(pTHX_ const char *a, const char *b, I32 len) +PERL_CALLCONV I32 +Perl_ibcmp(pTHX_ const char *a, const char *b, I32 len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__ - __attribute__pure__; */ + __attribute__pure__; +#define PERL_ARGS_ASSERT_IBCMP \ + Perl_assert_aTHX; assert(a); assert(b) -/* PERL_CALLCONV I32 -ibcmp_locale(pTHX_ const char *a, const char *b, I32 len) +PERL_CALLCONV I32 +Perl_ibcmp_locale(pTHX_ const char *a, const char *b, I32 len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__ - __attribute__pure__; */ + __attribute__pure__; +#define PERL_ARGS_ASSERT_IBCMP_LOCALE \ + Perl_assert_aTHX; assert(a); assert(b) -/* PERL_CALLCONV I32 -ibcmp_utf8(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2); */ +PERL_CALLCONV I32 +Perl_ibcmp_utf8(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_5); +#define PERL_ARGS_ASSERT_IBCMP_UTF8 \ + Perl_assert_aTHX; assert(s1); assert(s2) PERL_CALLCONV STRLEN -Perl_infix_plugin_standard(pTHX_ char *operator_ptr, STRLEN operator_len, struct Perl_custom_infix **def); +Perl_infix_plugin_standard(pTHX_ char *operator_ptr, STRLEN operator_len, struct Perl_custom_infix **def) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_INFIX_PLUGIN_STANDARD \ - assert(operator_ptr); assert(def) + Perl_assert_aTHX; assert(operator_ptr); assert(def) PERL_CALLCONV void Perl_init_argv_symbols(pTHX_ int argc, char **argv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_INIT_ARGV_SYMBOLS \ - assert(argv) + Perl_assert_aTHX; assert(argv) PERL_CALLCONV void Perl_init_constants(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_INIT_CONSTANTS +#define PERL_ARGS_ASSERT_INIT_CONSTANTS \ + Perl_assert_aTHX PERL_CALLCONV void Perl_init_dbargs(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_INIT_DBARGS +#define PERL_ARGS_ASSERT_INIT_DBARGS \ + Perl_assert_aTHX PERL_CALLCONV void Perl_init_debugger(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_INIT_DEBUGGER +#define PERL_ARGS_ASSERT_INIT_DEBUGGER \ + Perl_assert_aTHX PERL_CALLCONV int -Perl_init_i18nl10n(pTHX_ int printwarn); -#define PERL_ARGS_ASSERT_INIT_I18NL10N +Perl_init_i18nl10n(pTHX_ int printwarn) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_INIT_I18NL10N \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_init_named_cv(pTHX_ CV *cv, OP *nameop); +Perl_init_named_cv(pTHX_ CV *cv, OP *nameop) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_INIT_NAMED_CV \ - assert(cv); assert(nameop); \ - assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM); assert(nameop) PERL_CALLCONV void -Perl_init_stacks(pTHX); -#define PERL_ARGS_ASSERT_INIT_STACKS +Perl_init_stacks(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_INIT_STACKS \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_init_tm(pTHX_ struct tm *ptm); +Perl_init_tm(pTHX_ struct tm *ptm) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_INIT_TM \ - assert(ptm) + Perl_assert_aTHX; assert(ptm) PERL_CALLCONV void Perl_init_uniprops(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_INIT_UNIPROPS +#define PERL_ARGS_ASSERT_INIT_UNIPROPS \ + Perl_assert_aTHX -/* PERL_CALLCONV char * +PERL_CALLCONV char * Perl_instr(const char *big, const char *little) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__ - __attribute__pure__; */ + __attribute__pure__; +#define PERL_ARGS_ASSERT_INSTR \ + assert(big); assert(little) PERL_CALLCONV U32 -Perl_intro_my(pTHX); -#define PERL_ARGS_ASSERT_INTRO_MY +Perl_intro_my(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_INTRO_MY \ + Perl_assert_aTHX + +PERL_CALLCONV Size_t +Perl_inverse_folds_(pTHX_ const UV cp, U32 *first_folds_to, const U32 **remaining_folds_to) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_INVERSE_FOLDS_ \ + Perl_assert_aTHX; assert(first_folds_to); assert(remaining_folds_to) PERL_CALLCONV OP * Perl_invert(pTHX_ OP *cmd) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__ __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_INVERT +#define PERL_ARGS_ASSERT_INVERT \ + Perl_assert_aTHX PERL_CALLCONV void Perl_invmap_dump(pTHX_ SV *invlist, UV *map) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_INVMAP_DUMP \ - assert(invlist); assert(map) + Perl_assert_aTHX; assert(invlist); assert(map) PERL_CALLCONV bool Perl_io_close(pTHX_ IO *io, GV *gv, bool is_explicit, bool warn_on_fail) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_IO_CLOSE \ - assert(io) + Perl_assert_aTHX; assert(io) -/* PERL_CALLCONV bool -is_c9strict_utf8_string(const U8 *s, STRLEN len) - __attribute__warn_unused_result__; */ +PERL_CALLCONV bool +Perl_is_c9strict_utf8_string(const U8 *s, STRLEN len) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_IS_C9STRICT_UTF8_STRING \ + assert(s) -/* PERL_CALLCONV bool -is_c9strict_utf8_string_loc(const U8 *s, STRLEN len, const U8 **ep); */ +PERL_CALLCONV bool +Perl_is_c9strict_utf8_string_loc(const U8 *s, STRLEN len, const U8 **ep) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3); +#define PERL_ARGS_ASSERT_IS_C9STRICT_UTF8_STRING_LOC \ + assert(s); assert(ep) PERL_CALLCONV bool -Perl_is_in_locale_category_(pTHX_ const bool compiling, const int category); -#define PERL_ARGS_ASSERT_IS_IN_LOCALE_CATEGORY_ +Perl_is_in_locale_category_(pTHX_ const bool compiling, const int category) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_IS_IN_LOCALE_CATEGORY_ \ + Perl_assert_aTHX PERL_CALLCONV I32 Perl_is_lvalue_sub(pTHX) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_IS_LVALUE_SUB \ + Perl_assert_aTHX + +PERL_CALLCONV bool +Perl_is_strict_utf8_string(const U8 *s, STRLEN len) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_IS_STRICT_UTF8_STRING \ + assert(s) + +PERL_CALLCONV bool +Perl_is_strict_utf8_string_loc(const U8 *s, STRLEN len, const U8 **ep) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3); +#define PERL_ARGS_ASSERT_IS_STRICT_UTF8_STRING_LOC \ + assert(s); assert(ep) + +PERL_CALLCONV bool +Perl_is_uni_FOO_(pTHX_ const U8 classnum, const UV c) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_IS_LVALUE_SUB +#define PERL_ARGS_ASSERT_IS_UNI_FOO_ \ + Perl_assert_aTHX -/* PERL_CALLCONV bool -is_strict_utf8_string(const U8 *s, STRLEN len) - __attribute__warn_unused_result__; */ +PERL_CALLCONV bool +Perl_is_uni_perl_idcont_(pTHX_ UV c) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_IS_UNI_PERL_IDCONT_ \ + Perl_assert_aTHX -/* PERL_CALLCONV bool -is_strict_utf8_string_loc(const U8 *s, STRLEN len, const U8 **ep); */ +PERL_CALLCONV bool +Perl_is_uni_perl_idstart_(pTHX_ UV c) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_IS_UNI_PERL_IDSTART_ \ + Perl_assert_aTHX PERL_CALLCONV Size_t Perl_is_utf8_FF_helper_(const U8 * const s0, const U8 * const e, const bool require_partial) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__ __attribute__pure__; #define PERL_ARGS_ASSERT_IS_UTF8_FF_HELPER_ \ - assert(s0); assert(e) + assert(s0); assert(e); assert(s0 < e) + +PERL_CALLCONV Size_t +Perl_is_utf8_FOO_(pTHX_ const U8 classnum, const U8 *p, const U8 * const e) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_IS_UTF8_FOO_ \ + Perl_assert_aTHX; assert(p); assert(e); assert(p < e) + +PERL_CALLCONV STRLEN +Perl_is_utf8_char_buf(const U8 *buf, const U8 *buf_end) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2); +#define PERL_ARGS_ASSERT_IS_UTF8_CHAR_BUF \ + assert(buf); assert(buf_end); assert(buf <= buf_end) PERL_CALLCONV STRLEN Perl_is_utf8_char_helper_(const U8 * const s, const U8 *e, const U32 flags) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__ __attribute__pure__; #define PERL_ARGS_ASSERT_IS_UTF8_CHAR_HELPER_ \ - assert(s); assert(e) + assert(s); assert(e); assert(s < e) + +PERL_CALLCONV bool +Perl_is_utf8_fixed_width_buf_flags(const U8 * const s, STRLEN len, const U32 flags) + Perl_attribute_nonnull(1); +#define PERL_ARGS_ASSERT_IS_UTF8_FIXED_WIDTH_BUF_FLAGS \ + assert(s) + +PERL_CALLCONV bool +Perl_is_utf8_fixed_width_buf_loc_flags(const U8 * const s, STRLEN len, const U8 **ep, const U32 flags) + Perl_attribute_nonnull(1); +#define PERL_ARGS_ASSERT_IS_UTF8_FIXED_WIDTH_BUF_LOC_FLAGS \ + assert(s) -/* PERL_CALLCONV bool -is_utf8_fixed_width_buf_flags(const U8 * const s, STRLEN len, const U32 flags); */ +PERL_CALLCONV Size_t +Perl_is_utf8_perl_idcont_(pTHX_ const U8 *p, const U8 * const e) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_IS_UTF8_PERL_IDCONT_ \ + Perl_assert_aTHX; assert(p); assert(e); assert(p < e) -/* PERL_CALLCONV bool -is_utf8_fixed_width_buf_loc_flags(const U8 * const s, STRLEN len, const U8 **ep, const U32 flags); */ +PERL_CALLCONV Size_t +Perl_is_utf8_perl_idstart_(pTHX_ const U8 *p, const U8 * const e) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_IS_UTF8_PERL_IDSTART_ \ + Perl_assert_aTHX; assert(p); assert(e); assert(p < e) -/* PERL_CALLCONV bool -is_utf8_string(const U8 *s, STRLEN len) - __attribute__warn_unused_result__; */ +PERL_CALLCONV bool +Perl_is_utf8_string(const U8 *s, STRLEN len) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_IS_UTF8_STRING \ + assert(s) -/* PERL_CALLCONV bool -Perl_is_utf8_string_loc(const U8 *s, const STRLEN len, const U8 **ep); */ +PERL_CALLCONV bool +Perl_is_utf8_string_loc(const U8 *s, const STRLEN len, const U8 **ep) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3); +#define PERL_ARGS_ASSERT_IS_UTF8_STRING_LOC \ + assert(s); assert(ep) -/* PERL_CALLCONV bool -is_utf8_string_loc_flags(const U8 *s, STRLEN len, const U8 **ep, const U32 flags); */ +PERL_CALLCONV bool +Perl_is_utf8_string_loc_flags(const U8 *s, STRLEN len, const U8 **ep, const U32 flags) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3); +#define PERL_ARGS_ASSERT_IS_UTF8_STRING_LOC_FLAGS \ + assert(s); assert(ep) -/* PERL_CALLCONV bool -is_utf8_valid_partial_char(const U8 * const s0, const U8 * const e) +PERL_CALLCONV bool +Perl_is_utf8_valid_partial_char(const U8 * const s0, const U8 * const e) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__ - __attribute__pure__; */ + __attribute__pure__; +#define PERL_ARGS_ASSERT_IS_UTF8_VALID_PARTIAL_CHAR \ + assert(s0); assert(e); assert(s0 < e) PERL_CALLCONV bool Perl_isinfnan(NV nv) @@ -1886,505 +2849,762 @@ Perl_isinfnan(NV nv) PERL_CALLCONV bool Perl_isinfnansv(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_ISINFNANSV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV OP * Perl_jmaybe(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_JMAYBE \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV I32 Perl_keyword(pTHX_ const char *name, I32 len, bool all_keywords) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__pure__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_KEYWORD \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV int -Perl_keyword_plugin_standard(pTHX_ char *keyword_ptr, STRLEN keyword_len, OP **op_ptr); +Perl_keyword_plugin_standard(pTHX_ char *keyword_ptr, STRLEN keyword_len, OP **op_ptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_KEYWORD_PLUGIN_STANDARD \ - assert(keyword_ptr); assert(op_ptr) + Perl_assert_aTHX; assert(keyword_ptr); assert(op_ptr) PERL_CALLCONV void -Perl_leave_adjust_stacks(pTHX_ SV **from_sp, SV **to_sp, U8 gimme, int filter); +Perl_leave_adjust_stacks(pTHX_ SV **from_sp, SV **to_sp, U8 gimme, int filter) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_LEAVE_ADJUST_STACKS \ - assert(from_sp); assert(to_sp) + Perl_assert_aTHX; assert(from_sp); assert(to_sp) PERL_CALLCONV void -Perl_leave_scope(pTHX_ I32 base); -#define PERL_ARGS_ASSERT_LEAVE_SCOPE +Perl_leave_scope(pTHX_ I32 base) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_LEAVE_SCOPE \ + Perl_assert_aTHX PERL_CALLCONV bool -Perl_lex_bufutf8(pTHX); -#define PERL_ARGS_ASSERT_LEX_BUFUTF8 +Perl_lex_bufutf8(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_LEX_BUFUTF8 \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_lex_discard_to(pTHX_ char *ptr); +Perl_lex_discard_to(pTHX_ char *ptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_LEX_DISCARD_TO \ - assert(ptr) + Perl_assert_aTHX; assert(ptr) PERL_CALLCONV char * -Perl_lex_grow_linestr(pTHX_ STRLEN len); -#define PERL_ARGS_ASSERT_LEX_GROW_LINESTR +Perl_lex_grow_linestr(pTHX_ STRLEN len) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_LEX_GROW_LINESTR \ + Perl_assert_aTHX PERL_CALLCONV bool -Perl_lex_next_chunk(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_LEX_NEXT_CHUNK +Perl_lex_next_chunk(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_LEX_NEXT_CHUNK \ + Perl_assert_aTHX PERL_CALLCONV I32 -Perl_lex_peek_unichar(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_LEX_PEEK_UNICHAR +Perl_lex_peek_unichar(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_LEX_PEEK_UNICHAR \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_lex_read_space(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_LEX_READ_SPACE +Perl_lex_read_space(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_LEX_READ_SPACE \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_lex_read_to(pTHX_ char *ptr); +Perl_lex_read_to(pTHX_ char *ptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_LEX_READ_TO \ - assert(ptr) + Perl_assert_aTHX; assert(ptr) PERL_CALLCONV I32 -Perl_lex_read_unichar(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_LEX_READ_UNICHAR +Perl_lex_read_unichar(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_LEX_READ_UNICHAR \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_lex_start(pTHX_ SV *line, PerlIO *rsfp, U32 flags); -#define PERL_ARGS_ASSERT_LEX_START +Perl_lex_start(pTHX_ SV *line, PerlIO *rsfp, U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_LEX_START \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_lex_stuff_pv(pTHX_ const char *pv, U32 flags); +Perl_lex_stuff_pv(pTHX_ const char *pv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_LEX_STUFF_PV \ - assert(pv) + Perl_assert_aTHX; assert(pv) PERL_CALLCONV void -Perl_lex_stuff_pvn(pTHX_ const char *pv, STRLEN len, U32 flags); +Perl_lex_stuff_pvn(pTHX_ const char *pv, STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_LEX_STUFF_PVN \ - assert(pv) + Perl_assert_aTHX; assert(pv) PERL_CALLCONV void -Perl_lex_stuff_sv(pTHX_ SV *sv, U32 flags); +Perl_lex_stuff_sv(pTHX_ SV *sv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_LEX_STUFF_SV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_lex_unstuff(pTHX_ char *ptr); +Perl_lex_unstuff(pTHX_ char *ptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_LEX_UNSTUFF \ - assert(ptr) + Perl_assert_aTHX; assert(ptr) PERL_CALLCONV OP * Perl_list(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_LIST +#define PERL_ARGS_ASSERT_LIST \ + Perl_assert_aTHX PERL_CALLCONV HV * Perl_load_charnames(pTHX_ SV *char_name, const char *context, const STRLEN context_len, const char **error_msg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_4) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_LOAD_CHARNAMES \ - assert(char_name); assert(context); assert(error_msg) + Perl_assert_aTHX; assert(char_name); assert(context); assert(error_msg) PERL_CALLCONV void -Perl_load_module(pTHX_ U32 flags, SV *name, SV *ver, ...); +Perl_load_module(pTHX_ U32 flags, SV *name, SV *ver, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_LOAD_MODULE \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV_NO_RET void Perl_locale_panic(const char *msg, const line_t immediate_caller_line, const char * const higher_caller_file, const line_t higher_caller_line) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3) __attribute__noreturn__; #define PERL_ARGS_ASSERT_LOCALE_PANIC \ assert(msg); assert(higher_caller_file) PERL_CALLCONV OP * Perl_localize(pTHX_ OP *o, I32 lex) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_LOCALIZE \ - assert(o) + Perl_assert_aTHX; assert(o) + +PERL_CALLCONV UV +Perl_long_valid_utf8_to_uv(const U8 * const s, const U8 * const e) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2); +#define PERL_ARGS_ASSERT_LONG_VALID_UTF8_TO_UV \ + assert(s); assert(e); assert(s < e) PERL_CALLCONV I32 Perl_looks_like_number(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_LOOKS_LIKE_NUMBER \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV int Perl_magic_clear_all_env(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_CLEAR_ALL_ENV \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_cleararylen_p(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_CLEARARYLEN_P \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_clearenv(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_CLEARENV \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_clearhint(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_CLEARHINT \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_clearhints(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_CLEARHINTS \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_clearhook(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_CLEARHOOK \ - assert(mg) + Perl_assert_aTHX; assert(mg) PERL_CALLCONV int Perl_magic_clearhookall(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_CLEARHOOKALL \ - assert(mg) + Perl_assert_aTHX; assert(mg) PERL_CALLCONV int Perl_magic_clearisa(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_CLEARISA \ - assert(mg) + Perl_assert_aTHX; assert(mg) PERL_CALLCONV int Perl_magic_clearpack(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_CLEARPACK \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_clearsig(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_CLEARSIG \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_copycallchecker(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_COPYCALLCHECKER \ - assert(sv); assert(mg); assert(nsv) + Perl_assert_aTHX; assert(sv); assert(mg); assert(nsv) PERL_CALLCONV void -Perl_magic_dump(pTHX_ const MAGIC *mg); -#define PERL_ARGS_ASSERT_MAGIC_DUMP +Perl_magic_dump(pTHX_ const MAGIC *mg) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_MAGIC_DUMP \ + Perl_assert_aTHX PERL_CALLCONV int Perl_magic_existspack(pTHX_ SV *sv, const MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_EXISTSPACK \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_freearylen_p(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_FREEARYLEN_P \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_freedestruct(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_FREEDESTRUCT \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_freemglob(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_FREEMGLOB \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_freeovrld(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_FREEOVRLD \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_freeutf8(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_FREEUTF8 \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_get(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_GET \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int -Perl_magic_getarylen(pTHX_ SV *sv, const MAGIC *mg) +Perl_magic_getarylen(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_GETARYLEN \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_getdebugvar(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_GETDEBUGVAR \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_getdefelem(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_GETDEFELEM \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_getnkeys(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_GETNKEYS \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_getpack(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_GETPACK \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_getpos(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_GETPOS \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_getsig(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_GETSIG \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_getsubstr(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_GETSUBSTR \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_gettaint(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_GETTAINT \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_getuvar(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_GETUVAR \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_getvec(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_GETVEC \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_killbackrefs(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_KILLBACKREFS \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV SV * Perl_magic_methcall(pTHX_ SV *sv, const MAGIC *mg, SV *meth, U32 flags, U32 argc, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_METHCALL \ - assert(sv); assert(mg); assert(meth) + Perl_assert_aTHX; assert(sv); assert(mg); assert(meth) PERL_CALLCONV int Perl_magic_nextpack(pTHX_ SV *sv, MAGIC *mg, SV *key) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_NEXTPACK \ - assert(sv); assert(mg); assert(key) + Perl_assert_aTHX; assert(sv); assert(mg); assert(key) PERL_CALLCONV U32 Perl_magic_regdata_cnt(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_REGDATA_CNT \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_regdatum_get(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_REGDATUM_GET \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) + +PERL_CALLCONV_NON_VOID_NO_RET(int) int +Perl_magic_regdatum_set(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + __attribute__noreturn__ + __attribute__visibility__("hidden"); +#define PERL_ARGS_ASSERT_MAGIC_REGDATUM_SET \ + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV SV * Perl_magic_scalarpack(pTHX_ HV *hv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SCALARPACK \ - assert(hv); assert(mg); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV); assert(mg) PERL_CALLCONV int Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SET \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_set_all_env(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SET_ALL_ENV \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setarylen(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETARYLEN \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setdbline(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETDBLINE \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setdebugvar(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETDEBUGVAR \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setdefelem(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETDEFELEM \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setenv(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETENV \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_sethint(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETHINT \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_sethook(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETHOOK \ - assert(mg) + Perl_assert_aTHX; assert(mg) PERL_CALLCONV int Perl_magic_sethookall(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETHOOKALL \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setisa(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETISA \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setlvref(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETLVREF \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setmglob(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETMGLOB \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setnkeys(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETNKEYS \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setnonelem(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETNONELEM \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setpack(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETPACK \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setpos(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETPOS \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setregexp(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETREGEXP \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setsig(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETSIG \ - assert(mg) + Perl_assert_aTHX; assert(mg) PERL_CALLCONV int Perl_magic_setsigall(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETSIGALL \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setsubstr(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETSUBSTR \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_settaint(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETTAINT \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setutf8(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETUTF8 \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setuvar(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETUVAR \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setvec(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SETVEC \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV U32 Perl_magic_sizepack(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_SIZEPACK \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_wipepack(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MAGIC_WIPEPACK \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV Malloc_t Perl_malloc(MEM_SIZE nbytes) @@ -2393,37 +3613,50 @@ Perl_malloc(MEM_SIZE nbytes) #define PERL_ARGS_ASSERT_MALLOC PERL_CALLCONV Stack_off_t * -Perl_markstack_grow(pTHX); -#define PERL_ARGS_ASSERT_MARKSTACK_GROW +Perl_markstack_grow(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_MARKSTACK_GROW \ + Perl_assert_aTHX PERL_CALLCONV int -Perl_mbtowc_(pTHX_ const wchar_t *pwc, const char *s, const Size_t len); -#define PERL_ARGS_ASSERT_MBTOWC_ +Perl_mbtowc_(pTHX_ const wchar_t *pwc, const char *s, const Size_t len) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_MBTOWC_ \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_mess(pTHX_ const char *pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__format__(__printf__,pTHX_1,pTHX_2); #define PERL_ARGS_ASSERT_MESS \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV SV * -Perl_mess_sv(pTHX_ SV *basemsg, bool consume); +Perl_mess_sv(pTHX_ SV *basemsg, bool consume) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MESS_SV \ - assert(basemsg) + Perl_assert_aTHX; assert(basemsg) PERL_CALLCONV Free_t Perl_mfree(Malloc_t where); #define PERL_ARGS_ASSERT_MFREE PERL_CALLCONV int -Perl_mg_clear(pTHX_ SV *sv); +Perl_mg_clear(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MG_CLEAR \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV int -Perl_mg_copy(pTHX_ SV *sv, SV *nsv, const char *key, I32 klen); +Perl_mg_copy(pTHX_ SV *sv, SV *nsv, const char *key, I32 klen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_MG_COPY \ - assert(sv); assert(nsv) + Perl_assert_aTHX; assert(sv); assert(nsv) PERL_CALLCONV MAGIC * Perl_mg_find(const SV *sv, int type) @@ -2432,9 +3665,11 @@ Perl_mg_find(const SV *sv, int type) PERL_CALLCONV MAGIC * Perl_mg_find_mglob(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_MG_FIND_MGLOB \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV MAGIC * Perl_mg_findext(const SV *sv, int type, const MGVTBL *vtbl) @@ -2442,161 +3677,234 @@ Perl_mg_findext(const SV *sv, int type, #define PERL_ARGS_ASSERT_MG_FINDEXT PERL_CALLCONV int -Perl_mg_free(pTHX_ SV *sv); +Perl_mg_free(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MG_FREE \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_mg_free_type(pTHX_ SV *sv, int how); +Perl_mg_free_type(pTHX_ SV *sv, int how) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MG_FREE_TYPE \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_mg_freeext(pTHX_ SV *sv, int how, const MGVTBL *vtbl); +Perl_mg_freeext(pTHX_ SV *sv, int how, const MGVTBL *vtbl) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MG_FREEEXT \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV int -Perl_mg_get(pTHX_ SV *sv); +Perl_mg_get(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MG_GET \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void Perl_mg_localize(pTHX_ SV *sv, SV *nsv, bool setmagic) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MG_LOCALIZE \ - assert(sv); assert(nsv) + Perl_assert_aTHX; assert(sv); assert(nsv) PERL_CALLCONV void -Perl_mg_magical(SV *sv); +Perl_mg_magical(SV *sv) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_MG_MAGICAL \ assert(sv) PERL_CALLCONV int -Perl_mg_set(pTHX_ SV *sv); +Perl_mg_set(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MG_SET \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV I32 -Perl_mg_size(pTHX_ SV *sv); +Perl_mg_size(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MG_SIZE \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_mini_mktime(struct tm *ptm); +Perl_mini_mktime(struct tm *ptm) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_MINI_MKTIME \ assert(ptm) PERL_CALLCONV int Perl_mode_from_discipline(pTHX_ const char *s, STRLEN len) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_MODE_FROM_DISCIPLINE +#define PERL_ARGS_ASSERT_MODE_FROM_DISCIPLINE \ + Perl_assert_aTHX PERL_CALLCONV void * -Perl_more_bodies(pTHX_ const svtype sv_type, const size_t body_size, const size_t arena_size); -#define PERL_ARGS_ASSERT_MORE_BODIES +Perl_more_bodies(pTHX_ const svtype sv_type) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_MORE_BODIES \ + Perl_assert_aTHX + +PERL_CALLCONV SV * +Perl_more_sv(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_MORE_SV \ + Perl_assert_aTHX PERL_CALLCONV const char * -Perl_moreswitches(pTHX_ const char *s); +Perl_moreswitches(pTHX_ const char *s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MORESWITCHES \ - assert(s) + Perl_assert_aTHX; assert(s) PERL_CALLCONV void -Perl_mortal_destructor_sv(pTHX_ SV *coderef, SV *args); +Perl_mortal_destructor_sv(pTHX_ SV *coderef, SV *args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MORTAL_DESTRUCTOR_SV \ - assert(coderef) + Perl_assert_aTHX; assert(coderef) PERL_CALLCONV void -Perl_mortal_svfunc_x(pTHX_ SVFUNC_t f, SV *p); -#define PERL_ARGS_ASSERT_MORTAL_SVFUNC_X +Perl_mortal_svfunc_x(pTHX_ SVFUNC_t f, SV *p) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_MORTAL_SVFUNC_X \ + Perl_assert_aTHX PERL_CALLCONV const struct mro_alg * -Perl_mro_get_from_name(pTHX_ SV *name); +Perl_mro_get_from_name(pTHX_ SV *name) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MRO_GET_FROM_NAME \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV AV * -Perl_mro_get_linear_isa(pTHX_ HV *stash); +Perl_mro_get_linear_isa(pTHX_ HV *stash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MRO_GET_LINEAR_ISA \ - assert(stash); assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV) PERL_CALLCONV SV * -Perl_mro_get_private_data(pTHX_ struct mro_meta * const smeta, const struct mro_alg * const which); +Perl_mro_get_private_data(pTHX_ struct mro_meta * const smeta, const struct mro_alg * const which) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_MRO_GET_PRIVATE_DATA \ - assert(smeta); assert(which) + Perl_assert_aTHX; assert(smeta); assert(which) PERL_CALLCONV void Perl_mro_isa_changed_in(pTHX_ HV *stash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MRO_ISA_CHANGED_IN \ - assert(stash); assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV) PERL_CALLCONV struct mro_meta * -Perl_mro_meta_init(pTHX_ HV *stash); +Perl_mro_meta_init(pTHX_ HV *stash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MRO_META_INIT \ - assert(stash); assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV) PERL_CALLCONV void -Perl_mro_method_changed_in(pTHX_ HV *stash); +Perl_mro_method_changed_in(pTHX_ HV *stash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MRO_METHOD_CHANGED_IN \ - assert(stash); assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV) PERL_CALLCONV void -Perl_mro_package_moved(pTHX_ HV * const stash, HV * const oldstash, const GV * const gv, U32 flags); +Perl_mro_package_moved(pTHX_ HV * const stash, HV * const oldstash, const GV * const gv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_MRO_PACKAGE_MOVED \ - assert(gv); assert(!stash || SvTYPE(stash) == SVt_PVHV); \ - assert(!oldstash || SvTYPE(oldstash) == SVt_PVHV) + Perl_assert_aTHX; assert(!stash || SvTYPE(stash) == SVt_PVHV); \ + assert(!oldstash || SvTYPE(oldstash) == SVt_PVHV); assert(gv) PERL_CALLCONV void -Perl_mro_register(pTHX_ const struct mro_alg *mro); +Perl_mro_register(pTHX_ const struct mro_alg *mro) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MRO_REGISTER \ - assert(mro) + Perl_assert_aTHX; assert(mro) PERL_CALLCONV void -Perl_mro_set_mro(pTHX_ struct mro_meta * const meta, SV * const name); +Perl_mro_set_mro(pTHX_ struct mro_meta * const meta, SV * const name) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_MRO_SET_MRO \ - assert(meta); assert(name) + Perl_assert_aTHX; assert(meta); assert(name) PERL_CALLCONV SV * -Perl_mro_set_private_data(pTHX_ struct mro_meta * const smeta, const struct mro_alg * const which, SV * const data); +Perl_mro_set_private_data(pTHX_ struct mro_meta * const smeta, const struct mro_alg * const which, SV * const data) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_MRO_SET_PRIVATE_DATA \ - assert(smeta); assert(which); assert(data) + Perl_assert_aTHX; assert(smeta); assert(which); assert(data) PERL_CALLCONV SV * -Perl_multiconcat_stringify(pTHX_ const OP *o); +Perl_multiconcat_stringify(pTHX_ const OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MULTICONCAT_STRINGIFY \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV SV * -Perl_multideref_stringify(pTHX_ const OP *o, CV *cv); +Perl_multideref_stringify(pTHX_ const OP *o, CV *cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MULTIDEREF_STRINGIFY \ - assert(o); \ + Perl_assert_aTHX; assert(o); \ assert(!cv || SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_CALLCONV NV -Perl_my_atof(pTHX_ const char *s); +Perl_my_atof(pTHX_ const char *s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_MY_ATOF \ - assert(s) + Perl_assert_aTHX; assert(s) PERL_CALLCONV char * -Perl_my_atof2(pTHX_ const char *orig, NV *value); +Perl_my_atof2(pTHX_ const char *orig, NV *value) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_MY_ATOF2 \ - assert(orig); assert(value) + Perl_assert_aTHX; assert(orig); assert(value) PERL_CALLCONV char * -Perl_my_atof3(pTHX_ const char *orig, NV *value, const STRLEN len); +Perl_my_atof3(pTHX_ const char *orig, NV *value, const STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_MY_ATOF3 \ - assert(orig); assert(value) + Perl_assert_aTHX; assert(orig); assert(value) PERL_CALLCONV OP * Perl_my_attrs(pTHX_ OP *o, OP *attrs) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MY_ATTRS \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV void -Perl_my_clearenv(pTHX); -#define PERL_ARGS_ASSERT_MY_CLEARENV +Perl_my_clearenv(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_MY_CLEARENV \ + Perl_assert_aTHX PERL_CALLCONV int Perl_my_dirfd(DIR *dir); @@ -2604,31 +3912,37 @@ Perl_my_dirfd(DIR *dir); PERL_CALLCONV_NO_RET void Perl_my_exit(pTHX_ U32 status) + Perl_attribute_nonnull_aTHX __attribute__noreturn__; -#define PERL_ARGS_ASSERT_MY_EXIT +#define PERL_ARGS_ASSERT_MY_EXIT \ + Perl_assert_aTHX PERL_CALLCONV_NO_RET void Perl_my_failure_exit(pTHX) + Perl_attribute_nonnull_aTHX __attribute__noreturn__; -#define PERL_ARGS_ASSERT_MY_FAILURE_EXIT +#define PERL_ARGS_ASSERT_MY_FAILURE_EXIT \ + Perl_assert_aTHX PERL_CALLCONV I32 -Perl_my_fflush_all(pTHX); -#define PERL_ARGS_ASSERT_MY_FFLUSH_ALL +Perl_my_fflush_all(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_MY_FFLUSH_ALL \ + Perl_assert_aTHX PERL_CALLCONV Pid_t Perl_my_fork(void); #define PERL_ARGS_ASSERT_MY_FORK -/* PERL_CALLCONV I32 -my_lstat(pTHX); */ - PERL_CALLCONV I32 -Perl_my_lstat_flags(pTHX_ const U32 flags); -#define PERL_ARGS_ASSERT_MY_LSTAT_FLAGS +Perl_my_lstat_flags(pTHX_ const U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_MY_LSTAT_FLAGS \ + Perl_assert_aTHX PERL_CALLCONV int Perl_my_mkostemp_cloexec(char *templte, int flags) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MY_MKOSTEMP_CLOEXEC \ @@ -2636,22 +3950,30 @@ Perl_my_mkostemp_cloexec(char *templte, PERL_CALLCONV int Perl_my_mkstemp_cloexec(char *templte) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MY_MKSTEMP_CLOEXEC \ assert(templte) PERL_CALLCONV PerlIO * -Perl_my_popen_list(pTHX_ const char *mode, int n, SV **args); +Perl_my_popen_list(pTHX_ const char *mode, int n, SV **args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_MY_POPEN_LIST \ - assert(mode); assert(args) + Perl_assert_aTHX; assert(mode); assert(args) PERL_CALLCONV void -Perl_my_setenv(pTHX_ const char *nam, const char *val); -#define PERL_ARGS_ASSERT_MY_SETENV +Perl_my_setenv(pTHX_ const char *nam, const char *val) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_MY_SETENV \ + Perl_assert_aTHX PERL_CALLCONV int Perl_my_snprintf(char *buffer, const Size_t len, const char *format, ...) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3) __attribute__format__(__printf__,3,4); #define PERL_ARGS_ASSERT_MY_SNPRINTF \ assert(buffer); assert(format) @@ -2660,246 +3982,365 @@ PERL_CALLCONV int Perl_my_socketpair(int family, int type, int protocol, int fd[2]); #define PERL_ARGS_ASSERT_MY_SOCKETPAIR -/* PERL_CALLCONV I32 -my_stat(pTHX); */ - PERL_CALLCONV I32 -Perl_my_stat_flags(pTHX_ const U32 flags); -#define PERL_ARGS_ASSERT_MY_STAT_FLAGS +Perl_my_stat_flags(pTHX_ const U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_MY_STAT_FLAGS \ + Perl_assert_aTHX PERL_CALLCONV const char * Perl_my_strerror(pTHX_ const int errnum, utf8ness_t *utf8ness) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_MY_STRERROR \ - assert(utf8ness) + Perl_assert_aTHX; assert(utf8ness) PERL_CALLCONV char * Perl_my_strftime(pTHX_ const char *fmt, int sec, int min, int hour, int mday, int mon, int year, int wday, int yday, int isdst) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__format__(__strftime__,pTHX_1,0); #define PERL_ARGS_ASSERT_MY_STRFTIME \ - assert(fmt) + Perl_assert_aTHX; assert(fmt) PERL_CALLCONV NV Perl_my_strtod(const char * const s, char **e) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_MY_STRTOD \ assert(s) PERL_CALLCONV void Perl_my_unexec(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_MY_UNEXEC +#define PERL_ARGS_ASSERT_MY_UNEXEC \ + Perl_assert_aTHX PERL_CALLCONV int -Perl_my_vsnprintf(char *buffer, const Size_t len, const char *format, va_list ap); +Perl_my_vsnprintf(char *buffer, const Size_t len, const char *format, va_list ap) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3); #define PERL_ARGS_ASSERT_MY_VSNPRINTF \ assert(buffer); assert(format) PERL_CALLCONV OP * -Perl_newANONATTRSUB(pTHX_ I32 floor, OP *proto, OP *attrs, OP *block); -#define PERL_ARGS_ASSERT_NEWANONATTRSUB +Perl_newANONATTRSUB(pTHX_ I32 floor, OP *proto, OP *attrs, OP *block) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_NEWANONATTRSUB \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newANONHASH(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWANONHASH +#define PERL_ARGS_ASSERT_NEWANONHASH \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newANONLIST(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWANONLIST +#define PERL_ARGS_ASSERT_NEWANONLIST \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_newANONSUB(pTHX_ I32 floor, OP *proto, OP *block); -#define PERL_ARGS_ASSERT_NEWANONSUB +Perl_newANONSUB(pTHX_ I32 floor, OP *proto, OP *block) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_NEWANONSUB \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newARGDEFELEMOP(pTHX_ I32 flags, OP *expr, I32 argindex) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWARGDEFELEMOP \ - assert(expr) + Perl_assert_aTHX; assert(expr) PERL_CALLCONV OP * Perl_newASSIGNOP(pTHX_ I32 flags, OP *left, I32 optype, OP *right) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWASSIGNOP +#define PERL_ARGS_ASSERT_NEWASSIGNOP \ + Perl_assert_aTHX -/* PERL_CALLCONV CV * -newATTRSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block); */ +PERL_CALLCONV CV * +Perl_newATTRSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_NEWATTRSUB \ + Perl_assert_aTHX PERL_CALLCONV CV * -Perl_newATTRSUB_x(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block, bool o_is_gv); -#define PERL_ARGS_ASSERT_NEWATTRSUB_X +Perl_newATTRSUB_x(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block, bool o_is_gv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_NEWATTRSUB_X \ + Perl_assert_aTHX + +PERL_CALLCONV AV * +Perl_newAV(pTHX) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_NEWAV \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newAVREF(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWAVREF \ - assert(o) + Perl_assert_aTHX; assert(o) + +PERL_CALLCONV AV * +Perl_newAV_alloc_x(pTHX_ SSize_t size) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_NEWAV_ALLOC_X \ + Perl_assert_aTHX + +PERL_CALLCONV AV * +Perl_newAV_alloc_xz(pTHX_ SSize_t size) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_NEWAV_ALLOC_XZ \ + Perl_assert_aTHX -/* PERL_CALLCONV AV * -newAV_alloc_x(pTHX_ SSize_t size) - __attribute__warn_unused_result__; */ - -/* PERL_CALLCONV AV * -newAV_alloc_xz(pTHX_ SSize_t size) - __attribute__warn_unused_result__; */ - -/* PERL_CALLCONV AV * -newAV_mortal(pTHX) - __attribute__warn_unused_result__; */ +PERL_CALLCONV AV * +Perl_newAV_mortal(pTHX) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_NEWAV_MORTAL \ + Perl_assert_aTHX PERL_CALLCONV AV * Perl_newAVav(pTHX_ AV *oav) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWAVAV +#define PERL_ARGS_ASSERT_NEWAVAV \ + Perl_assert_aTHX; assert(!oav || SvTYPE(oav) == SVt_PVAV) PERL_CALLCONV AV * Perl_newAVhv(pTHX_ HV *ohv) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWAVHV +#define PERL_ARGS_ASSERT_NEWAVHV \ + Perl_assert_aTHX; assert(!ohv || SvTYPE(ohv) == SVt_PVHV) PERL_CALLCONV OP * Perl_newBINOP(pTHX_ I32 type, I32 flags, OP *first, OP *last) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWBINOP +#define PERL_ARGS_ASSERT_NEWBINOP \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newCONDOP(pTHX_ I32 flags, OP *first, OP *trueop, OP *falseop) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWCONDOP \ - assert(first) + Perl_assert_aTHX; assert(first) PERL_CALLCONV CV * -Perl_newCONSTSUB(pTHX_ HV *stash, const char *name, SV *sv); -#define PERL_ARGS_ASSERT_NEWCONSTSUB +Perl_newCONSTSUB(pTHX_ HV *stash, const char *name, SV *sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_NEWCONSTSUB \ + Perl_assert_aTHX; assert(!stash || SvTYPE(stash) == SVt_PVHV) PERL_CALLCONV CV * -Perl_newCONSTSUB_flags(pTHX_ HV *stash, const char *name, STRLEN len, U32 flags, SV *sv); -#define PERL_ARGS_ASSERT_NEWCONSTSUB_FLAGS +Perl_newCONSTSUB_flags(pTHX_ HV *stash, const char *name, STRLEN len, U32 flags, SV *sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_NEWCONSTSUB_FLAGS \ + Perl_assert_aTHX; assert(!stash || SvTYPE(stash) == SVt_PVHV) PERL_CALLCONV OP * Perl_newCVREF(pTHX_ I32 flags, OP *o) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWCVREF +#define PERL_ARGS_ASSERT_NEWCVREF \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newDEFEROP(pTHX_ I32 flags, OP *block) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWDEFEROP \ - assert(block) + Perl_assert_aTHX; assert(block) PERL_CALLCONV OP * Perl_newDEFSVOP(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWDEFSVOP +#define PERL_ARGS_ASSERT_NEWDEFSVOP \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_newFORM(pTHX_ I32 floor, OP *o, OP *block); -#define PERL_ARGS_ASSERT_NEWFORM +Perl_newFORM(pTHX_ I32 floor, OP *o, OP *block) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_NEWFORM \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newFOROP(pTHX_ I32 flags, OP *sv, OP *expr, OP *block, OP *cont) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWFOROP \ - assert(expr) + Perl_assert_aTHX; assert(expr) PERL_CALLCONV OP * Perl_newGIVENOP(pTHX_ OP *cond, OP *block, PADOFFSET defsv_off) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWGIVENOP \ - assert(cond); assert(block) + Perl_assert_aTHX; assert(cond); assert(block) PERL_CALLCONV GP * -Perl_newGP(pTHX_ GV * const gv); +Perl_newGP(pTHX_ GV * const gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_NEWGP \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV OP * Perl_newGVOP(pTHX_ I32 type, I32 flags, GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWGVOP \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV OP * Perl_newGVREF(pTHX_ I32 type, OP *o) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWGVREF +#define PERL_ARGS_ASSERT_NEWGVREF \ + Perl_assert_aTHX -/* PERL_CALLCONV GV * -newGVgen(pTHX_ const char *pack); */ +PERL_CALLCONV GV * +Perl_newGVgen(pTHX_ const char *pack) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_NEWGVGEN \ + Perl_assert_aTHX; assert(pack) PERL_CALLCONV GV * Perl_newGVgen_flags(pTHX_ const char *pack, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWGVGEN_FLAGS \ - assert(pack) + Perl_assert_aTHX; assert(pack) + +PERL_CALLCONV HV * +Perl_newHV(pTHX) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_NEWHV \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newHVREF(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWHVREF \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV HV * -Perl_newHVhv(pTHX_ HV *hv) +Perl_newHVhv(pTHX_ HV *ohv) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_NEWHVHV \ + Perl_assert_aTHX; assert(!ohv || SvTYPE(ohv) == SVt_PVHV) + +PERL_CALLCONV IO * +Perl_newIO(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWHVHV +#define PERL_ARGS_ASSERT_NEWIO \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newLISTOP(pTHX_ I32 type, I32 flags, OP *first, OP *last) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWLISTOP +#define PERL_ARGS_ASSERT_NEWLISTOP \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newLISTOPn(pTHX_ I32 type, I32 flags, ...) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWLISTOPN +#define PERL_ARGS_ASSERT_NEWLISTOPN \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newLOGOP(pTHX_ I32 optype, I32 flags, OP *first, OP *other) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWLOGOP \ - assert(first); assert(other) + Perl_assert_aTHX; assert(first); assert(other) PERL_CALLCONV OP * Perl_newLOOPEX(pTHX_ I32 type, OP *label) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWLOOPEX \ - assert(label) + Perl_assert_aTHX; assert(label) PERL_CALLCONV OP * Perl_newLOOPOP(pTHX_ I32 flags, I32 debuggable, OP *expr, OP *block) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWLOOPOP \ - assert(expr) + Perl_assert_aTHX; assert(expr) PERL_CALLCONV OP * Perl_newMETHOP(pTHX_ I32 type, I32 flags, OP *dynamic_meth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWMETHOP \ - assert(dynamic_meth) + Perl_assert_aTHX; assert(dynamic_meth) PERL_CALLCONV OP * Perl_newMETHOP_named(pTHX_ I32 type, I32 flags, SV * const_meth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWMETHOP_NAMED \ - assert(const_meth) + Perl_assert_aTHX; assert(const_meth) PERL_CALLCONV CV * -Perl_newMYSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block); +Perl_newMYSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_NEWMYSUB \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_newNULLLIST(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWNULLLIST +#define PERL_ARGS_ASSERT_NEWNULLLIST \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newOP(pTHX_ I32 optype, I32 flags) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWOP +#define PERL_ARGS_ASSERT_NEWOP \ + Perl_assert_aTHX PERL_CALLCONV PADNAMELIST * Perl_newPADNAMELIST(size_t max) @@ -2908,264 +4349,391 @@ Perl_newPADNAMELIST(size_t max) PERL_CALLCONV PADNAME * Perl_newPADNAMEouter(PADNAME *outer) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWPADNAMEOUTER \ assert(outer) PERL_CALLCONV PADNAME * Perl_newPADNAMEpvn(const char *s, STRLEN len) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWPADNAMEPVN \ assert(s) PERL_CALLCONV OP * Perl_newPMOP(pTHX_ I32 type, I32 flags) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWPMOP +#define PERL_ARGS_ASSERT_NEWPMOP \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_newPROG(pTHX_ OP *o); +Perl_newPROG(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_NEWPROG \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_newPVOP(pTHX_ I32 type, I32 flags, char *pv) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWPVOP +#define PERL_ARGS_ASSERT_NEWPVOP \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newRANGE(pTHX_ I32 flags, OP *left, OP *right) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWRANGE \ - assert(left); assert(right) + Perl_assert_aTHX; assert(left); assert(right) PERL_CALLCONV SV * Perl_newRV(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWRV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV OP * Perl_newSLICEOP(pTHX_ I32 flags, OP *subscript, OP *listop) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSLICEOP +#define PERL_ARGS_ASSERT_NEWSLICEOP \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newSTATEOP(pTHX_ I32 flags, char *label, OP *o) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSTATEOP +#define PERL_ARGS_ASSERT_NEWSTATEOP \ + Perl_assert_aTHX PERL_CALLCONV CV * Perl_newSTUB(pTHX_ GV *gv, bool fake) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_NEWSTUB \ - assert(gv) + Perl_assert_aTHX; assert(gv) + +PERL_CALLCONV CV * +Perl_newSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *block) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_NEWSUB \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSV(pTHX_ const STRLEN len) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSV +#define PERL_ARGS_ASSERT_NEWSV \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newSVOP(pTHX_ I32 type, I32 flags, SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWSVOP \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV OP * Perl_newSVREF(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWSVREF \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV SV * Perl_newSV_false(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSV_FALSE +#define PERL_ARGS_ASSERT_NEWSV_FALSE \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSV_true(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSV_TRUE +#define PERL_ARGS_ASSERT_NEWSV_TRUE \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSVavdefelem(pTHX_ AV *av, SSize_t ix, bool extendible) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_NEWSVAVDEFELEM \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_CALLCONV SV * Perl_newSVbool(pTHX_ const bool bool_val) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSVBOOL +#define PERL_ARGS_ASSERT_NEWSVBOOL \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSVhek(pTHX_ const HEK * const hek) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSVHEK +#define PERL_ARGS_ASSERT_NEWSVHEK \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSVhek_mortal(pTHX_ const HEK * const hek) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSVHEK_MORTAL +#define PERL_ARGS_ASSERT_NEWSVHEK_MORTAL \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSViv(pTHX_ const IV i) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSVIV +#define PERL_ARGS_ASSERT_NEWSVIV \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSVnv(pTHX_ const NV n) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSVNV +#define PERL_ARGS_ASSERT_NEWSVNV \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSVpv(pTHX_ const char * const s, const STRLEN len) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSVPV +#define PERL_ARGS_ASSERT_NEWSVPV \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSVpv_share(pTHX_ const char *s, U32 hash) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSVPV_SHARE +#define PERL_ARGS_ASSERT_NEWSVPV_SHARE \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSVpvf(pTHX_ const char * const pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__format__(__printf__,pTHX_1,pTHX_2); #define PERL_ARGS_ASSERT_NEWSVPVF \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV SV * Perl_newSVpvn(pTHX_ const char * const s, const STRLEN len) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSVPVN +#define PERL_ARGS_ASSERT_NEWSVPVN \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSVpvn_flags(pTHX_ const char * const s, const STRLEN len, const U32 flags) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSVPVN_FLAGS +#define PERL_ARGS_ASSERT_NEWSVPVN_FLAGS \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSVpvn_share(pTHX_ const char *s, I32 len, U32 hash) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSVPVN_SHARE +#define PERL_ARGS_ASSERT_NEWSVPVN_SHARE \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSVpvz(pTHX_ const STRLEN len) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSVPVZ +#define PERL_ARGS_ASSERT_NEWSVPVZ \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_newSVrv(pTHX_ SV * const rv, const char * const classname); +Perl_newSVrv(pTHX_ SV * const rv, const char * const classname) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_NEWSVRV \ - assert(rv) + Perl_assert_aTHX; assert(rv) PERL_CALLCONV SV * -Perl_newSVsv_flags(pTHX_ SV * const old, I32 flags) +Perl_newSVsv(pTHX_ SV * const old) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSVSV_FLAGS +#define PERL_ARGS_ASSERT_NEWSVSV \ + Perl_assert_aTHX -/* PERL_CALLCONV SV * -newSVsv_nomg(pTHX_ SV * const old) - __attribute__warn_unused_result__; */ +PERL_CALLCONV SV * +Perl_newSVsv_flags_NN(pTHX_ SV * const old, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_NEWSVSV_FLAGS_NN \ + Perl_assert_aTHX; assert(old) + +PERL_CALLCONV SV * +Perl_newSVsv_nomg(pTHX_ SV * const old) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_NEWSVSV_NOMG \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_newSVuv(pTHX_ const UV u) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWSVUV +#define PERL_ARGS_ASSERT_NEWSVUV \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newTRYCATCHOP(pTHX_ I32 flags, OP *tryblock, OP *catchvar, OP *catchblock) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWTRYCATCHOP \ - assert(tryblock); assert(catchvar); assert(catchblock) + Perl_assert_aTHX; assert(tryblock); assert(catchvar); assert(catchblock) PERL_CALLCONV OP * Perl_newUNOP(pTHX_ I32 type, I32 flags, OP *first) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWUNOP +#define PERL_ARGS_ASSERT_NEWUNOP \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newUNOP_AUX(pTHX_ I32 type, I32 flags, OP *first, UNOP_AUX_item *aux) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWUNOP_AUX +#define PERL_ARGS_ASSERT_NEWUNOP_AUX \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_newWHENOP(pTHX_ OP *cond, OP *block) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEWWHENOP \ - assert(block) + Perl_assert_aTHX; assert(block) PERL_CALLCONV OP * Perl_newWHILEOP(pTHX_ I32 flags, I32 debuggable, LOOP *loop, OP *expr, OP *block, OP *cont, I32 has_my) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEWWHILEOP +#define PERL_ARGS_ASSERT_NEWWHILEOP \ + Perl_assert_aTHX PERL_CALLCONV CV * -Perl_newXS(pTHX_ const char *name, XSUBADDR_t subaddr, const char *filename); +Perl_newXS(pTHX_ const char *name, XSUBADDR_t subaddr, const char *filename) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_NEWXS \ - assert(subaddr); assert(filename) + Perl_assert_aTHX; assert(subaddr); assert(filename) PERL_CALLCONV CV * -Perl_newXS_deffile(pTHX_ const char *name, XSUBADDR_t subaddr); +Perl_newXS_deffile(pTHX_ const char *name, XSUBADDR_t subaddr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_NEWXS_DEFFILE \ - assert(name); assert(subaddr) + Perl_assert_aTHX; assert(name); assert(subaddr) PERL_CALLCONV CV * -Perl_newXS_flags(pTHX_ const char *name, XSUBADDR_t subaddr, const char * const filename, const char * const proto, U32 flags); +Perl_newXS_flags(pTHX_ const char *name, XSUBADDR_t subaddr, const char * const filename, const char * const proto, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_NEWXS_FLAGS \ - assert(subaddr); assert(filename) + Perl_assert_aTHX; assert(subaddr); assert(filename) PERL_CALLCONV CV * Perl_newXS_len_flags(pTHX_ const char *name, STRLEN len, XSUBADDR_t subaddr, const char * const filename, const char * const proto, SV ** const_svp, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_NEWXS_LEN_FLAGS \ - assert(subaddr) + Perl_assert_aTHX; assert(subaddr) + +PERL_CALLCONV OP * +Perl_new_block_statement(pTHX_ OP *block, OP *cont) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__visibility__("hidden"); +#define PERL_ARGS_ASSERT_NEW_BLOCK_STATEMENT \ + Perl_assert_aTHX; assert(block) PERL_CALLCONV PERL_SI * Perl_new_stackinfo(pTHX_ I32 stitems, I32 cxitems) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEW_STACKINFO +#define PERL_ARGS_ASSERT_NEW_STACKINFO \ + Perl_assert_aTHX PERL_CALLCONV PERL_SI * Perl_new_stackinfo_flags(pTHX_ I32 stitems, I32 cxitems, UV flags) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_NEW_STACKINFO_FLAGS +#define PERL_ARGS_ASSERT_NEW_STACKINFO_FLAGS \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_new_version(pTHX_ SV *ver); +Perl_new_version(pTHX_ SV *ver) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_NEW_VERSION \ - assert(ver) + Perl_assert_aTHX; assert(ver) PERL_CALLCONV char * Perl_new_warnings_bitfield(pTHX_ char *buffer, const char * const bits, STRLEN size) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_NEW_WARNINGS_BITFIELD \ - assert(bits) + Perl_assert_aTHX; assert(bits) PERL_CALLCONV PerlIO * Perl_nextargv(pTHX_ GV *gv, bool nomagicopen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_NEXTARGV \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV char * Perl_ninstr(const char *big, const char *bigend, const char *little, const char *lend) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3) + Perl_attribute_nonnull(4) __attribute__warn_unused_result__ __attribute__pure__; #define PERL_ARGS_ASSERT_NINSTR \ - assert(big); assert(bigend); assert(little); assert(lend) + assert(big); assert(bigend); assert(little); assert(lend); \ + assert(big <= bigend); assert(little <= lend) PERL_CALLCONV void Perl_no_bareword_filehandle(pTHX_ const char *fhname) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_NO_BAREWORD_FILEHANDLE \ - assert(fhname) + Perl_assert_aTHX; assert(fhname) PERL_CALLCONV_NO_RET void Perl_noperl_die(const char *pat, ...) + Perl_attribute_nonnull(1) __attribute__noreturn__ __attribute__format__(__printf__,1,2); #define PERL_ARGS_ASSERT_NOPERL_DIE \ @@ -3173,349 +4741,502 @@ Perl_noperl_die(const char *pat, ...) PERL_CALLCONV void Perl_noshutdownhook(void); +#define PERL_ARGS_ASSERT_NOSHUTDOWNHOOK PERL_CALLCONV int -Perl_nothreadhook(pTHX); -#define PERL_ARGS_ASSERT_NOTHREADHOOK +Perl_nothreadhook(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_NOTHREADHOOK \ + Perl_assert_aTHX PERL_CALLCONV void Perl_notify_parser_that_encoding_changed(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_NOTIFY_PARSER_THAT_ENCODING_CHANGED +#define PERL_ARGS_ASSERT_NOTIFY_PARSER_THAT_ENCODING_CHANGED \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_oopsAV(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_OOPSAV \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_oopsHV(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_OOPSHV \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * -Perl_op_append_elem(pTHX_ I32 optype, OP *first, OP *last); -#define PERL_ARGS_ASSERT_OP_APPEND_ELEM +Perl_op_append_elem(pTHX_ I32 optype, OP *first, OP *last) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_OP_APPEND_ELEM \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_op_append_list(pTHX_ I32 optype, OP *first, OP *last); -#define PERL_ARGS_ASSERT_OP_APPEND_LIST +Perl_op_append_list(pTHX_ I32 optype, OP *first, OP *last) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_OP_APPEND_LIST \ + Perl_assert_aTHX PERL_CALLCONV OPclass -Perl_op_class(pTHX_ const OP *o); -#define PERL_ARGS_ASSERT_OP_CLASS +Perl_op_class(pTHX_ const OP *o) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_OP_CLASS \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_op_clear(pTHX_ OP *o); +Perl_op_clear(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_OP_CLEAR \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * -Perl_op_contextualize(pTHX_ OP *o, I32 context); +Perl_op_contextualize(pTHX_ OP *o, I32 context) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_OP_CONTEXTUALIZE \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_op_convert_list(pTHX_ I32 optype, I32 flags, OP *o) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_OP_CONVERT_LIST +#define PERL_ARGS_ASSERT_OP_CONVERT_LIST \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_op_dump(pTHX_ const OP *o); +Perl_op_dump(pTHX_ const OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_OP_DUMP \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * -Perl_op_force_list(pTHX_ OP *o); -#define PERL_ARGS_ASSERT_OP_FORCE_LIST +Perl_op_force_list(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_OP_FORCE_LIST \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_op_free(pTHX_ OP *arg); -#define PERL_ARGS_ASSERT_OP_FREE +Perl_op_free(pTHX_ OP *arg) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_OP_FREE \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_op_linklist(pTHX_ OP *o); +Perl_op_linklist(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_OP_LINKLIST \ - assert(o) + Perl_assert_aTHX; assert(o) -/* PERL_CALLCONV OP * -op_lvalue(pTHX_ OP *o, I32 type); */ +PERL_CALLCONV OP * +Perl_op_lvalue(pTHX_ OP *o, I32 type) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_OP_LVALUE \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_op_lvalue_flags(pTHX_ OP *o, I32 type, U32 flags); -#define PERL_ARGS_ASSERT_OP_LVALUE_FLAGS +Perl_op_lvalue_flags(pTHX_ OP *o, I32 type, U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_OP_LVALUE_FLAGS \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_op_null(pTHX_ OP *o); +Perl_op_null(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_OP_NULL \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * -Perl_op_parent(OP *o); +Perl_op_parent(OP *o) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_OP_PARENT \ assert(o) PERL_CALLCONV OP * -Perl_op_prepend_elem(pTHX_ I32 optype, OP *first, OP *last); -#define PERL_ARGS_ASSERT_OP_PREPEND_ELEM +Perl_op_prepend_elem(pTHX_ I32 optype, OP *first, OP *last) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_OP_PREPEND_ELEM \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_op_refcnt_lock(pTHX); -#define PERL_ARGS_ASSERT_OP_REFCNT_LOCK +Perl_op_refcnt_lock(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_OP_REFCNT_LOCK \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_op_refcnt_unlock(pTHX); -#define PERL_ARGS_ASSERT_OP_REFCNT_UNLOCK +Perl_op_refcnt_unlock(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_OP_REFCNT_UNLOCK \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_op_scope(pTHX_ OP *o); -#define PERL_ARGS_ASSERT_OP_SCOPE +Perl_op_scope(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_OP_SCOPE \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_op_sibling_splice(pTHX_ OP *parent, OP *start, int del_count, OP *insert); -#define PERL_ARGS_ASSERT_OP_SIBLING_SPLICE +Perl_op_sibling_splice(pTHX_ OP *parent, OP *start, int del_count, OP *insert) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_OP_SIBLING_SPLICE \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_op_unscope(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_OP_UNSCOPE +#define PERL_ARGS_ASSERT_OP_UNSCOPE \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_op_wrap_finally(pTHX_ OP *block, OP *finally) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_OP_WRAP_FINALLY \ - assert(block); assert(finally) + Perl_assert_aTHX; assert(block); assert(finally) PERL_CALLCONV void Perl_opdump_printf(pTHX_ struct Perl_OpDumpContext *ctx, const char *pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__format__(__printf__,pTHX_2,pTHX_3); #define PERL_ARGS_ASSERT_OPDUMP_PRINTF \ - assert(ctx); assert(pat) + Perl_assert_aTHX; assert(ctx); assert(pat) PERL_CALLCONV void -Perl_package(pTHX_ OP *o) +Perl_output_non_portable(pTHX_ const U8 shift) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_PACKAGE \ - assert(o) +#define PERL_ARGS_ASSERT_OUTPUT_NON_PORTABLE \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_package_version(pTHX_ OP *v) +Perl_package(pTHX_ OP *name, OP *version) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_PACKAGE_VERSION \ - assert(v) +#define PERL_ARGS_ASSERT_PACKAGE \ + Perl_assert_aTHX; assert(name) PERL_CALLCONV void -Perl_packlist(pTHX_ SV *cat, const char *pat, const char *patend, SV **beglist, SV **endlist); +Perl_packlist(pTHX_ SV *cat, const char *pat, const char *patend, SV **beglist, SV **endlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5); #define PERL_ARGS_ASSERT_PACKLIST \ - assert(cat); assert(pat); assert(patend); assert(beglist); \ - assert(endlist) + Perl_assert_aTHX; assert(cat); assert(pat); assert(patend); \ + assert(beglist); assert(endlist); assert(pat <= patend); \ + assert(*patend == '\0') PERL_CALLCONV PADOFFSET -Perl_pad_add_anon(pTHX_ CV *func, I32 optype); +Perl_pad_add_anon(pTHX_ CV *func, I32 optype) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PAD_ADD_ANON \ - assert(func); \ + Perl_assert_aTHX; assert(func); \ assert(SvTYPE(func) == SVt_PVCV || SvTYPE(func) == SVt_PVFM) PERL_CALLCONV PADOFFSET -Perl_pad_add_name_pv(pTHX_ const char *name, const U32 flags, HV *typestash, HV *ourstash); +Perl_pad_add_name_pv(pTHX_ const char *name, const U32 flags, HV *typestash, HV *ourstash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PAD_ADD_NAME_PV \ - assert(name); assert(!typestash || SvTYPE(typestash) == SVt_PVHV); \ + Perl_assert_aTHX; assert(name); \ + assert(!typestash || SvTYPE(typestash) == SVt_PVHV); \ assert(!ourstash || SvTYPE(ourstash) == SVt_PVHV) PERL_CALLCONV PADOFFSET -Perl_pad_add_name_pvn(pTHX_ const char *namepv, STRLEN namelen, U32 flags, HV *typestash, HV *ourstash); +Perl_pad_add_name_pvn(pTHX_ const char *namepv, STRLEN namelen, U32 flags, HV *typestash, HV *ourstash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PAD_ADD_NAME_PVN \ - assert(namepv); assert(!typestash || SvTYPE(typestash) == SVt_PVHV); \ + Perl_assert_aTHX; assert(namepv); \ + assert(!typestash || SvTYPE(typestash) == SVt_PVHV); \ assert(!ourstash || SvTYPE(ourstash) == SVt_PVHV) PERL_CALLCONV PADOFFSET -Perl_pad_add_name_sv(pTHX_ SV *name, U32 flags, HV *typestash, HV *ourstash); +Perl_pad_add_name_sv(pTHX_ SV *name, U32 flags, HV *typestash, HV *ourstash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PAD_ADD_NAME_SV \ - assert(name); assert(!typestash || SvTYPE(typestash) == SVt_PVHV); \ + Perl_assert_aTHX; assert(name); \ + assert(!typestash || SvTYPE(typestash) == SVt_PVHV); \ assert(!ourstash || SvTYPE(ourstash) == SVt_PVHV) PERL_CALLCONV void Perl_pad_add_weakref(pTHX_ CV *func) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_PAD_ADD_WEAKREF \ - assert(func); \ + Perl_assert_aTHX; assert(func); \ assert(SvTYPE(func) == SVt_PVCV || SvTYPE(func) == SVt_PVFM) PERL_CALLCONV PADOFFSET -Perl_pad_alloc(pTHX_ I32 optype, U32 tmptype); -#define PERL_ARGS_ASSERT_PAD_ALLOC +Perl_pad_alloc(pTHX_ I32 optype, U32 tmptype) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PAD_ALLOC \ + Perl_assert_aTHX PERL_CALLCONV void Perl_pad_block_start(pTHX_ int full) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_PAD_BLOCK_START +#define PERL_ARGS_ASSERT_PAD_BLOCK_START \ + Perl_assert_aTHX PERL_CALLCONV PADOFFSET -Perl_pad_findmy_pv(pTHX_ const char *name, U32 flags); +Perl_pad_findmy_pv(pTHX_ const char *name, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PAD_FINDMY_PV \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV PADOFFSET -Perl_pad_findmy_pvn(pTHX_ const char *namepv, STRLEN namelen, U32 flags); +Perl_pad_findmy_pvn(pTHX_ const char *namepv, STRLEN namelen, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PAD_FINDMY_PVN \ - assert(namepv) + Perl_assert_aTHX; assert(namepv) PERL_CALLCONV PADOFFSET -Perl_pad_findmy_sv(pTHX_ SV *name, U32 flags); +Perl_pad_findmy_sv(pTHX_ SV *name, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PAD_FINDMY_SV \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV void Perl_pad_fixup_inner_anons(pTHX_ PADLIST *padlist, CV *old_cv, CV *new_cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_PAD_FIXUP_INNER_ANONS \ - assert(padlist); assert(old_cv); assert(new_cv); \ + Perl_assert_aTHX; assert(padlist); assert(old_cv); \ assert(SvTYPE(old_cv) == SVt_PVCV || SvTYPE(old_cv) == SVt_PVFM); \ + assert(new_cv); \ assert(SvTYPE(new_cv) == SVt_PVCV || SvTYPE(new_cv) == SVt_PVFM) PERL_CALLCONV void Perl_pad_free(pTHX_ PADOFFSET po) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_PAD_FREE +#define PERL_ARGS_ASSERT_PAD_FREE \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_pad_leavemy(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_PAD_LEAVEMY +#define PERL_ARGS_ASSERT_PAD_LEAVEMY \ + Perl_assert_aTHX PERL_CALLCONV PADLIST * Perl_pad_new(pTHX_ int flags) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_PAD_NEW +#define PERL_ARGS_ASSERT_PAD_NEW \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_pad_push(pTHX_ PADLIST *padlist, int depth); +Perl_pad_push(pTHX_ PADLIST *padlist, int depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PAD_PUSH \ - assert(padlist) + Perl_assert_aTHX; assert(padlist) PERL_CALLCONV void Perl_pad_swipe(pTHX_ PADOFFSET po, bool refadjust) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_PAD_SWIPE +#define PERL_ARGS_ASSERT_PAD_SWIPE \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_pad_tidy(pTHX_ padtidy_type type); -#define PERL_ARGS_ASSERT_PAD_TIDY +Perl_pad_tidy(pTHX_ padtidy_type type) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PAD_TIDY \ + Perl_assert_aTHX PERL_CALLCONV PAD ** Perl_padlist_store(pTHX_ PADLIST *padlist, I32 key, PAD *val) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_PADLIST_STORE \ - assert(padlist) + Perl_assert_aTHX; assert(padlist) PERL_CALLCONV void -Perl_padname_free(pTHX_ PADNAME *pn); +Perl_padname_free(pTHX_ PADNAME *pn) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PADNAME_FREE \ - assert(pn) + Perl_assert_aTHX; assert(pn) PERL_CALLCONV PADNAME * Perl_padnamelist_fetch(PADNAMELIST *pnl, SSize_t key) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_PADNAMELIST_FETCH \ assert(pnl) PERL_CALLCONV void -Perl_padnamelist_free(pTHX_ PADNAMELIST *pnl); +Perl_padnamelist_free(pTHX_ PADNAMELIST *pnl) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PADNAMELIST_FREE \ - assert(pnl) + Perl_assert_aTHX; assert(pnl) PERL_CALLCONV PADNAME ** -Perl_padnamelist_store(pTHX_ PADNAMELIST *pnl, SSize_t key, PADNAME *val); +Perl_padnamelist_store(pTHX_ PADNAMELIST *pnl, SSize_t key, PADNAME *val) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PADNAMELIST_STORE \ - assert(pnl) + Perl_assert_aTHX; assert(pnl) PERL_CALLCONV OP * -Perl_parse_arithexpr(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_PARSE_ARITHEXPR +Perl_parse_arithexpr(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PARSE_ARITHEXPR \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_parse_barestmt(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_PARSE_BARESTMT +Perl_parse_barestmt(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PARSE_BARESTMT \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_parse_block(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_PARSE_BLOCK +Perl_parse_block(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PARSE_BLOCK \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_parse_fullexpr(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_PARSE_FULLEXPR +Perl_parse_fullexpr(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PARSE_FULLEXPR \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_parse_fullstmt(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_PARSE_FULLSTMT +Perl_parse_fullstmt(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PARSE_FULLSTMT \ + Perl_assert_aTHX + +PERL_CALLCONV char * +Perl_parse_ident_msg(pTHX_ const char *s, const char *end, bool is_utf8, HV **failure_details, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_PARSE_IDENT_MSG \ + Perl_assert_aTHX; assert(s); assert(end); assert(s < end) PERL_CALLCONV SV * -Perl_parse_label(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_PARSE_LABEL +Perl_parse_label(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PARSE_LABEL \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_parse_listexpr(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_PARSE_LISTEXPR +Perl_parse_listexpr(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PARSE_LISTEXPR \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_parse_stmtseq(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_PARSE_STMTSEQ +Perl_parse_stmtseq(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PARSE_STMTSEQ \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_parse_subsignature(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_PARSE_SUBSIGNATURE +Perl_parse_subsignature(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PARSE_SUBSIGNATURE \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_parse_termexpr(pTHX_ U32 flags); -#define PERL_ARGS_ASSERT_PARSE_TERMEXPR +Perl_parse_termexpr(pTHX_ U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PARSE_TERMEXPR \ + Perl_assert_aTHX PERL_CALLCONV U32 Perl_parse_unicode_opts(pTHX_ const char **popt) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_PARSE_UNICODE_OPTS \ - assert(popt) + Perl_assert_aTHX; assert(popt) PERL_CALLCONV void Perl_parser_free(pTHX_ const yy_parser *parser) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_PARSER_FREE \ - assert(parser) + Perl_assert_aTHX; assert(parser) PERL_CALLCONV void Perl_peep(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_PEEP +#define PERL_ARGS_ASSERT_PEEP \ + Perl_assert_aTHX PERL_CALLCONV PerlInterpreter * perl_alloc(void); #define PERL_ARGS_ASSERT_PERL_ALLOC PERL_CALLCONV void -perl_construct(PerlInterpreter *my_perl); +perl_construct(PerlInterpreter *my_perl) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_PERL_CONSTRUCT \ assert(my_perl) PERL_CALLCONV int -perl_destruct(PerlInterpreter *my_perl); +perl_destruct(PerlInterpreter *my_perl) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_PERL_DESTRUCT \ assert(my_perl) PERL_CALLCONV void -perl_free(PerlInterpreter *my_perl); +perl_free(PerlInterpreter *my_perl) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_PERL_FREE \ assert(my_perl) PERL_CALLCONV int -perl_parse(PerlInterpreter *my_perl, XSINIT_t xsinit, int argc, char **argv, char **env); +perl_parse(PerlInterpreter *my_perl, XSINIT_t xsinit, int argc, char **argv, char **env) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_PERL_PARSE \ assert(my_perl) PERL_CALLCONV int -perl_run(PerlInterpreter *my_perl); +perl_run(PerlInterpreter *my_perl) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_PERL_RUN \ assert(my_perl) @@ -3523,140 +5244,212 @@ PERL_CALLCONV Signal_t Perl_perly_sighandler(int sig, Siginfo_t *info, void *uap, bool safe); #define PERL_ARGS_ASSERT_PERLY_SIGHANDLER -/* PERL_CALLCONV const char * const -phase_name(pTHX_ enum perl_phase); */ +PERL_CALLCONV const char * +Perl_phase_name(pTHX_ enum perl_phase phase) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PHASE_NAME \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_pmop_dump(pTHX_ PMOP *pm); -#define PERL_ARGS_ASSERT_PMOP_DUMP +Perl_pmop_dump(pTHX_ PMOP *pm) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PMOP_DUMP \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_pmruntime(pTHX_ OP *o, OP *expr, OP *repl, UV flags, I32 floor) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_PMRUNTIME \ - assert(o); assert(expr) + Perl_assert_aTHX; assert(o); assert(expr) PERL_CALLCONV void -Perl_pop_scope(pTHX); -#define PERL_ARGS_ASSERT_POP_SCOPE +Perl_pop_scope(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_POP_SCOPE \ + Perl_assert_aTHX PERL_CALLCONV void Perl_populate_isa(pTHX_ const char *name, STRLEN len, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_POPULATE_ISA \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV REGEXP * -Perl_pregcomp(pTHX_ SV * const pattern, const U32 flags); +Perl_pregcomp(pTHX_ SV * const pattern, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PREGCOMP \ - assert(pattern) + Perl_assert_aTHX; assert(pattern) PERL_CALLCONV I32 -Perl_pregexec(pTHX_ REGEXP * const prog, char *stringarg, char *strend, char *strbeg, SSize_t minend, SV *screamer, U32 nosave); +Perl_pregexec(pTHX_ REGEXP * const prog, char *stringarg, char *strend, char *strbeg, SSize_t minend, SV *screamer, U32 nosave) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_6); #define PERL_ARGS_ASSERT_PREGEXEC \ - assert(prog); assert(stringarg); assert(strend); assert(strbeg); \ - assert(screamer) + Perl_assert_aTHX; assert(prog); assert(stringarg); assert(strend); \ + assert(strbeg); assert(screamer); assert(strbeg <= stringarg); \ + assert(stringarg <= strend) PERL_CALLCONV void -Perl_pregfree(pTHX_ REGEXP *r); -#define PERL_ARGS_ASSERT_PREGFREE +Perl_pregfree(pTHX_ REGEXP *r) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PREGFREE \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_pregfree2(pTHX_ REGEXP *rx); +Perl_pregfree2(pTHX_ REGEXP *rx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PREGFREE2 \ - assert(rx) + Perl_assert_aTHX; assert(rx) PERL_CALLCONV const char * -Perl_prescan_version(pTHX_ const char *s, bool strict, const char **errstr, bool *sqv, int *ssaw_decimal, int *swidth, bool *salpha); +Perl_prescan_version(pTHX_ const char *s, bool strict, const char **errstr, bool *sqv, int *ssaw_decimal, int *swidth, bool *salpha) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PRESCAN_VERSION \ - assert(s) + Perl_assert_aTHX; assert(s) PERL_CALLCONV void * Perl_ptr_table_fetch(pTHX_ PTR_TBL_t * const tbl, const void * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_PTR_TABLE_FETCH \ - assert(tbl) + Perl_assert_aTHX; assert(tbl) PERL_CALLCONV void -Perl_ptr_table_free(pTHX_ PTR_TBL_t * const tbl); -#define PERL_ARGS_ASSERT_PTR_TABLE_FREE +Perl_ptr_table_free(pTHX_ PTR_TBL_t * const tbl) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PTR_TABLE_FREE \ + Perl_assert_aTHX PERL_CALLCONV PTR_TBL_t * Perl_ptr_table_new(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_PTR_TABLE_NEW +#define PERL_ARGS_ASSERT_PTR_TABLE_NEW \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_ptr_table_split(pTHX_ PTR_TBL_t * const tbl); +Perl_ptr_table_split(pTHX_ PTR_TBL_t * const tbl) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_PTR_TABLE_SPLIT \ - assert(tbl) + Perl_assert_aTHX; assert(tbl) PERL_CALLCONV void -Perl_ptr_table_store(pTHX_ PTR_TBL_t * const tbl, const void * const oldsv, void * const newsv); +Perl_ptr_table_store(pTHX_ PTR_TBL_t * const tbl, const void * const oldsv, void * const newsv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_PTR_TABLE_STORE \ - assert(tbl); assert(newsv) + Perl_assert_aTHX; assert(tbl); assert(newsv) PERL_CALLCONV void -Perl_push_scope(pTHX); -#define PERL_ARGS_ASSERT_PUSH_SCOPE +Perl_push_scope(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_PUSH_SCOPE \ + Perl_assert_aTHX PERL_CALLCONV char * -Perl_pv_display(pTHX_ SV *dsv, const char *pv, STRLEN cur, STRLEN len, STRLEN pvlim); +Perl_pv_display(pTHX_ SV *dsv, const char *pv, STRLEN cur, STRLEN len, STRLEN pvlim) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_PV_DISPLAY \ - assert(dsv); assert(pv) + Perl_assert_aTHX; assert(dsv); assert(pv) PERL_CALLCONV char * -Perl_pv_escape(pTHX_ SV *dsv, char const * const str, const STRLEN count, STRLEN max, STRLEN * const escaped, U32 flags); +Perl_pv_escape(pTHX_ SV *dsv, char const * const str, const STRLEN count, STRLEN max, STRLEN * const escaped, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_PV_ESCAPE \ - assert(str) + Perl_assert_aTHX; assert(str) PERL_CALLCONV char * -Perl_pv_pretty(pTHX_ SV *dsv, char const * const str, const STRLEN count, const STRLEN max, char const * const start_color, char const * const end_color, const U32 flags); +Perl_pv_pretty(pTHX_ SV *dsv, char const * const str, const STRLEN count, const STRLEN max, char const * const start_color, char const * const end_color, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_PV_PRETTY \ - assert(dsv); assert(str) + Perl_assert_aTHX; assert(dsv); assert(str) PERL_CALLCONV char * -Perl_pv_uni_display(pTHX_ SV *dsv, const U8 *spv, STRLEN len, STRLEN pvlim, UV flags); +Perl_pv_uni_display(pTHX_ SV *dsv, const U8 *spv, STRLEN len, STRLEN pvlim, UV flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_PV_UNI_DISPLAY \ - assert(dsv); assert(spv) + Perl_assert_aTHX; assert(dsv); assert(spv) PERL_CALLCONV void -Perl_qerror(pTHX_ SV *err); -#define PERL_ARGS_ASSERT_QERROR +Perl_qerror(pTHX_ SV *err) + Perl_attribute_nonnull_aTHX + __attribute__deprecated__; +#define PERL_ARGS_ASSERT_QERROR \ + Perl_assert_aTHX PERL_CALLCONV char * -Perl_rcpv_copy(pTHX_ char * const pv); -#define PERL_ARGS_ASSERT_RCPV_COPY +Perl_rcpv_copy(pTHX_ char * const pv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_RCPV_COPY \ + Perl_assert_aTHX PERL_CALLCONV char * -Perl_rcpv_free(pTHX_ char * const pv); -#define PERL_ARGS_ASSERT_RCPV_FREE +Perl_rcpv_free(pTHX_ char * const pv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_RCPV_FREE \ + Perl_assert_aTHX PERL_CALLCONV char * Perl_rcpv_new(pTHX_ const char * const pv, STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX __attribute__malloc__ __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_RCPV_NEW +#define PERL_ARGS_ASSERT_RCPV_NEW \ + Perl_assert_aTHX PERL_CALLCONV REGEXP * -Perl_re_compile(pTHX_ SV * const pattern, U32 orig_rx_flags); +Perl_re_compile(pTHX_ SV * const pattern, U32 orig_rx_flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_RE_COMPILE \ - assert(pattern) + Perl_assert_aTHX; assert(pattern) PERL_CALLCONV char * -Perl_re_intuit_start(pTHX_ REGEXP * const rx, SV *sv, const char * const strbeg, char *strpos, char *strend, const U32 flags, re_scream_pos_data *data); +Perl_re_intuit_start(pTHX_ REGEXP * const rx, SV *sv, const char * const strbeg, char *strpos, char *strend, const U32 flags, re_scream_pos_data *data) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5); #define PERL_ARGS_ASSERT_RE_INTUIT_START \ - assert(rx); assert(strbeg); assert(strpos); assert(strend) + Perl_assert_aTHX; assert(rx); assert(strbeg); assert(strpos); \ + assert(strend); assert(strbeg <= strpos); assert(strpos <= strend) PERL_CALLCONV SV * -Perl_re_intuit_string(pTHX_ REGEXP * const r); +Perl_re_intuit_string(pTHX_ REGEXP * const r) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_RE_INTUIT_STRING \ - assert(r) + Perl_assert_aTHX; assert(r) PERL_CALLCONV REGEXP * -Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, OP *expr, const regexp_engine *eng, REGEXP *old_re, bool *is_bare_re, const U32 rx_flags, const U32 pm_flags); +Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, OP *expr, const regexp_engine *eng, REGEXP *old_re, bool *is_bare_re, const U32 rx_flags, const U32 pm_flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_4); #define PERL_ARGS_ASSERT_RE_OP_COMPILE \ - assert(eng) + Perl_assert_aTHX; assert(eng) PERL_CALLCONV Malloc_t Perl_realloc(Malloc_t where, MEM_SIZE nbytes) @@ -3664,253 +5457,373 @@ Perl_realloc(Malloc_t where, MEM_SIZE nb #define PERL_ARGS_ASSERT_REALLOC PERL_CALLCONV void -Perl_reentrant_free(pTHX); -#define PERL_ARGS_ASSERT_REENTRANT_FREE +Perl_reentrant_free(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_REENTRANT_FREE \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_reentrant_init(pTHX); -#define PERL_ARGS_ASSERT_REENTRANT_INIT +Perl_reentrant_init(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_REENTRANT_INIT \ + Perl_assert_aTHX PERL_CALLCONV void * -Perl_reentrant_retry(const char *f, ...); +Perl_reentrant_retry(const char *f, ...) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_REENTRANT_RETRY \ assert(f) PERL_CALLCONV void -Perl_reentrant_size(pTHX); -#define PERL_ARGS_ASSERT_REENTRANT_SIZE +Perl_reentrant_size(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_REENTRANT_SIZE \ + Perl_assert_aTHX PERL_CALLCONV HV * -Perl_refcounted_he_chain_2hv(pTHX_ const struct refcounted_he *c, U32 flags); -#define PERL_ARGS_ASSERT_REFCOUNTED_HE_CHAIN_2HV +Perl_refcounted_he_chain_2hv(pTHX_ const struct refcounted_he *c, U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_REFCOUNTED_HE_CHAIN_2HV \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_refcounted_he_fetch_pv(pTHX_ const struct refcounted_he *chain, const char *key, U32 hash, U32 flags); +Perl_refcounted_he_fetch_pv(pTHX_ const struct refcounted_he *chain, const char *key, U32 hash, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_REFCOUNTED_HE_FETCH_PV \ - assert(key) + Perl_assert_aTHX; assert(key) PERL_CALLCONV SV * -Perl_refcounted_he_fetch_pvn(pTHX_ const struct refcounted_he *chain, const char *keypv, STRLEN keylen, U32 hash, U32 flags); +Perl_refcounted_he_fetch_pvn(pTHX_ const struct refcounted_he *chain, const char *keypv, STRLEN keylen, U32 hash, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_REFCOUNTED_HE_FETCH_PVN \ - assert(keypv) + Perl_assert_aTHX; assert(keypv) PERL_CALLCONV SV * -Perl_refcounted_he_fetch_sv(pTHX_ const struct refcounted_he *chain, SV *key, U32 hash, U32 flags); +Perl_refcounted_he_fetch_sv(pTHX_ const struct refcounted_he *chain, SV *key, U32 hash, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_REFCOUNTED_HE_FETCH_SV \ - assert(key) + Perl_assert_aTHX; assert(key) PERL_CALLCONV void -Perl_refcounted_he_free(pTHX_ struct refcounted_he *he); -#define PERL_ARGS_ASSERT_REFCOUNTED_HE_FREE +Perl_refcounted_he_free(pTHX_ struct refcounted_he *he) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_REFCOUNTED_HE_FREE \ + Perl_assert_aTHX PERL_CALLCONV struct refcounted_he * -Perl_refcounted_he_inc(pTHX_ struct refcounted_he *he); -#define PERL_ARGS_ASSERT_REFCOUNTED_HE_INC +Perl_refcounted_he_inc(pTHX_ struct refcounted_he *he) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_REFCOUNTED_HE_INC \ + Perl_assert_aTHX PERL_CALLCONV struct refcounted_he * -Perl_refcounted_he_new_pv(pTHX_ struct refcounted_he *parent, const char *key, U32 hash, SV *value, U32 flags); +Perl_refcounted_he_new_pv(pTHX_ struct refcounted_he *parent, const char *key, U32 hash, SV *value, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_REFCOUNTED_HE_NEW_PV \ - assert(key) + Perl_assert_aTHX; assert(key) PERL_CALLCONV struct refcounted_he * -Perl_refcounted_he_new_pvn(pTHX_ struct refcounted_he *parent, const char *keypv, STRLEN keylen, U32 hash, SV *value, U32 flags); +Perl_refcounted_he_new_pvn(pTHX_ struct refcounted_he *parent, const char *keypv, STRLEN keylen, U32 hash, SV *value, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_REFCOUNTED_HE_NEW_PVN \ - assert(keypv) + Perl_assert_aTHX; assert(keypv) PERL_CALLCONV struct refcounted_he * -Perl_refcounted_he_new_sv(pTHX_ struct refcounted_he *parent, SV *key, U32 hash, SV *value, U32 flags); +Perl_refcounted_he_new_sv(pTHX_ struct refcounted_he *parent, SV *key, U32 hash, SV *value, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_REFCOUNTED_HE_NEW_SV \ - assert(key) + Perl_assert_aTHX; assert(key) PERL_CALLCONV SV * -Perl_reg_named_buff(pTHX_ REGEXP * const rx, SV * const key, SV * const value, const U32 flags); +Perl_reg_named_buff(pTHX_ REGEXP * const rx, SV * const key, SV * const value, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_REG_NAMED_BUFF \ - assert(rx) + Perl_assert_aTHX; assert(rx) PERL_CALLCONV SV * -Perl_reg_named_buff_all(pTHX_ REGEXP * const rx, const U32 flags); +Perl_reg_named_buff_all(pTHX_ REGEXP * const r, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_ALL \ - assert(rx) + Perl_assert_aTHX; assert(r) PERL_CALLCONV bool -Perl_reg_named_buff_exists(pTHX_ REGEXP * const rx, SV * const key, const U32 flags); +Perl_reg_named_buff_exists(pTHX_ REGEXP * const r, SV * const key, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_EXISTS \ - assert(rx); assert(key) + Perl_assert_aTHX; assert(r); assert(key) PERL_CALLCONV SV * -Perl_reg_named_buff_fetch(pTHX_ REGEXP * const rx, SV * const namesv, const U32 flags); +Perl_reg_named_buff_fetch(pTHX_ REGEXP * const r, SV * const namesv, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_FETCH \ - assert(rx); assert(namesv) + Perl_assert_aTHX; assert(r); assert(namesv) PERL_CALLCONV SV * -Perl_reg_named_buff_firstkey(pTHX_ REGEXP * const rx, const U32 flags); +Perl_reg_named_buff_firstkey(pTHX_ REGEXP * const r, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_FIRSTKEY \ - assert(rx) + Perl_assert_aTHX; assert(r) PERL_CALLCONV SV * -Perl_reg_named_buff_iter(pTHX_ REGEXP * const rx, const SV * const lastkey, const U32 flags); +Perl_reg_named_buff_iter(pTHX_ REGEXP * const rx, const SV * const lastkey, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_ITER \ - assert(rx) + Perl_assert_aTHX; assert(rx) PERL_CALLCONV SV * -Perl_reg_named_buff_nextkey(pTHX_ REGEXP * const rx, const U32 flags); +Perl_reg_named_buff_nextkey(pTHX_ REGEXP * const r, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_NEXTKEY \ - assert(rx) + Perl_assert_aTHX; assert(r) PERL_CALLCONV SV * -Perl_reg_named_buff_scalar(pTHX_ REGEXP * const rx, const U32 flags); +Perl_reg_named_buff_scalar(pTHX_ REGEXP * const r, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_SCALAR \ - assert(rx) + Perl_assert_aTHX; assert(r) PERL_CALLCONV void -Perl_reg_numbered_buff_fetch(pTHX_ REGEXP * const re, const I32 paren, SV * const sv); +Perl_reg_numbered_buff_fetch(pTHX_ REGEXP * const re, const I32 paren, SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_REG_NUMBERED_BUFF_FETCH \ - assert(re) + Perl_assert_aTHX; assert(re) PERL_CALLCONV void -Perl_reg_numbered_buff_fetch_flags(pTHX_ REGEXP * const re, const I32 paren, SV * const sv, U32 flags); +Perl_reg_numbered_buff_fetch_flags(pTHX_ REGEXP * const re, const I32 paren, SV * const sv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_REG_NUMBERED_BUFF_FETCH_FLAGS \ - assert(re) + Perl_assert_aTHX; assert(re) PERL_CALLCONV I32 -Perl_reg_numbered_buff_length(pTHX_ REGEXP * const rx, const SV * const sv, const I32 paren); +Perl_reg_numbered_buff_length(pTHX_ REGEXP * const r, const SV * const sv, const I32 paren) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_REG_NUMBERED_BUFF_LENGTH \ - assert(rx); assert(sv) + Perl_assert_aTHX; assert(r); assert(sv) PERL_CALLCONV void -Perl_reg_numbered_buff_store(pTHX_ REGEXP * const rx, const I32 paren, SV const * const value); +Perl_reg_numbered_buff_store(pTHX_ REGEXP * const rx, const I32 paren, SV const * const value) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_REG_NUMBERED_BUFF_STORE \ - assert(rx) + Perl_assert_aTHX; assert(rx) PERL_CALLCONV SV * -Perl_reg_qr_package(pTHX_ REGEXP * const rx); +Perl_reg_qr_package(pTHX_ REGEXP * const rx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_REG_QR_PACKAGE \ - assert(rx) + Perl_assert_aTHX; assert(rx) PERL_CALLCONV REGEXP * -Perl_reg_temp_copy(pTHX_ REGEXP *dsv, REGEXP *ssv); +Perl_reg_temp_copy(pTHX_ REGEXP *dsv, REGEXP *ssv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_REG_TEMP_COPY \ - assert(ssv) + Perl_assert_aTHX; assert(ssv) PERL_CALLCONV void -Perl_regdump(pTHX_ const regexp *r); +Perl_regdump(pTHX_ const regexp *r) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_REGDUMP \ - assert(r) + Perl_assert_aTHX; assert(r) PERL_CALLCONV I32 -Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, char *strbeg, SSize_t minend, SV *sv, void *data, U32 flags); +Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, char *strbeg, SSize_t minend, SV *sv, void *data, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_6); #define PERL_ARGS_ASSERT_REGEXEC_FLAGS \ - assert(rx); assert(stringarg); assert(strend); assert(strbeg); \ - assert(sv) + Perl_assert_aTHX; assert(rx); assert(stringarg); assert(strend); \ + assert(strbeg); assert(sv); assert(strbeg <= stringarg); \ + assert(stringarg <= strend) PERL_CALLCONV void -Perl_regfree_internal(pTHX_ REGEXP * const rx); +Perl_regfree_internal(pTHX_ REGEXP * const rx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_REGFREE_INTERNAL \ - assert(rx) + Perl_assert_aTHX; assert(rx) PERL_CALLCONV void -Perl_reginitcolors(pTHX); -#define PERL_ARGS_ASSERT_REGINITCOLORS +Perl_reginitcolors(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_REGINITCOLORS \ + Perl_assert_aTHX PERL_CALLCONV void Perl_release_RExC_state(pTHX_ void *vstate) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_RELEASE_REXC_STATE \ - assert(vstate) + Perl_assert_aTHX; assert(vstate) PERL_CALLCONV void -Perl_repeatcpy(char *to, const char *from, SSize_t len, IV count); +Perl_repeatcpy(char *to, const char *from, SSize_t len, IV count) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2); #define PERL_ARGS_ASSERT_REPEATCPY \ assert(to); assert(from) PERL_CALLCONV void Perl_report_evil_fh(pTHX_ const GV *gv) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_REPORT_EVIL_FH +#define PERL_ARGS_ASSERT_REPORT_EVIL_FH \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_report_uninit(pTHX_ const SV *uninit_sv); -#define PERL_ARGS_ASSERT_REPORT_UNINIT +Perl_report_uninit(pTHX_ const SV *uninit_sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_REPORT_UNINIT \ + Perl_assert_aTHX PERL_CALLCONV void Perl_report_wrongway_fh(pTHX_ const GV *gv, const char have) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_REPORT_WRONGWAY_FH +#define PERL_ARGS_ASSERT_REPORT_WRONGWAY_FH \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_require_pv(pTHX_ const char *pv); +Perl_require_pv(pTHX_ const char *pv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_REQUIRE_PV \ - assert(pv) + Perl_assert_aTHX; assert(pv) PERL_CALLCONV void -Perl_resume_compcv(pTHX_ struct suspended_compcv *buffer, bool save); +Perl_resume_compcv(pTHX_ struct suspended_compcv *buffer, bool save) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_RESUME_COMPCV \ - assert(buffer) + Perl_assert_aTHX; assert(buffer) -/* PERL_CALLCONV void -resume_compcv_and_save(pTHX_ struct suspended_compcv *buffer); */ +PERL_CALLCONV void +Perl_resume_compcv_and_save(pTHX_ struct suspended_compcv *buffer) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_RESUME_COMPCV_AND_SAVE \ + Perl_assert_aTHX; assert(buffer) -/* PERL_CALLCONV void -resume_compcv_final(pTHX_ struct suspended_compcv *buffer); */ +PERL_CALLCONV void +Perl_resume_compcv_final(pTHX_ struct suspended_compcv *buffer) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_RESUME_COMPCV_FINAL \ + Perl_assert_aTHX; assert(buffer) PERL_CALLCONV char * Perl_rninstr(const char *big, const char *bigend, const char *little, const char *lend) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3) + Perl_attribute_nonnull(4) __attribute__warn_unused_result__ __attribute__pure__; #define PERL_ARGS_ASSERT_RNINSTR \ - assert(big); assert(bigend); assert(little); assert(lend) + assert(big); assert(bigend); assert(little); assert(lend); \ + assert(big <= bigend); assert(little <= lend) PERL_CALLCONV void Perl_rpeep(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_RPEEP +#define PERL_ARGS_ASSERT_RPEEP \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_rpp_free_2_(pTHX_ SV * const sv1, SV * const sv2, const U32 rc1, const U32 rc2); +Perl_rpp_free_2_(pTHX_ SV * const sv1, SV * const sv2, const U32 rc1, const U32 rc2) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_RPP_FREE_2_ \ - assert(sv1); assert(sv2) + Perl_assert_aTHX; assert(sv1); assert(sv2) PERL_CALLCONV void -Perl_rpp_obliterate_stack_to(pTHX_ I32 ix); -#define PERL_ARGS_ASSERT_RPP_OBLITERATE_STACK_TO +Perl_rpp_obliterate_stack_to(pTHX_ I32 ix) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_RPP_OBLITERATE_STACK_TO \ + Perl_assert_aTHX PERL_CALLCONV Sighandler_t -Perl_rsignal(pTHX_ int i, Sighandler_t t); -#define PERL_ARGS_ASSERT_RSIGNAL +Perl_rsignal(pTHX_ int i, Sighandler_t t) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_RSIGNAL \ + Perl_assert_aTHX PERL_CALLCONV int Perl_rsignal_restore(pTHX_ int i, Sigsave_t *t) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_RSIGNAL_RESTORE +#define PERL_ARGS_ASSERT_RSIGNAL_RESTORE \ + Perl_assert_aTHX PERL_CALLCONV int Perl_rsignal_save(pTHX_ int i, Sighandler_t t1, Sigsave_t *save) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_RSIGNAL_SAVE \ - assert(save) + Perl_assert_aTHX; assert(save) PERL_CALLCONV Sighandler_t -Perl_rsignal_state(pTHX_ int i); -#define PERL_ARGS_ASSERT_RSIGNAL_STATE - -PERL_CALLCONV int -Perl_runops_debug(pTHX); -#define PERL_ARGS_ASSERT_RUNOPS_DEBUG - -PERL_CALLCONV int -Perl_runops_standard(pTHX); -#define PERL_ARGS_ASSERT_RUNOPS_STANDARD +Perl_rsignal_state(pTHX_ int i) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_RSIGNAL_STATE \ + Perl_assert_aTHX + +PERL_CALLCONV int +Perl_runops_debug(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_RUNOPS_DEBUG \ + Perl_assert_aTHX + +PERL_CALLCONV int +Perl_runops_standard(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_RUNOPS_STANDARD \ + Perl_assert_aTHX PERL_CALLCONV CV * -Perl_rv2cv_op_cv(pTHX_ OP *cvop, U32 flags); +Perl_rv2cv_op_cv(pTHX_ OP *cvop, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_RV2CV_OP_CV \ - assert(cvop) + Perl_assert_aTHX; assert(cvop) PERL_CALLCONV void Perl_rxres_save(pTHX_ void **rsp, REGEXP *rx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_RXRES_SAVE \ - assert(rsp); assert(rx) + Perl_assert_aTHX; assert(rsp); assert(rx) PERL_CALLCONV Malloc_t Perl_safesyscalloc(MEM_SIZE elements, MEM_SIZE size) @@ -3934,306 +5847,496 @@ Perl_safesysrealloc(Malloc_t where, MEM_ #define PERL_ARGS_ASSERT_SAFESYSREALLOC PERL_CALLCONV void -Perl_save_I16(pTHX_ I16 *intp); +Perl_save_I16(pTHX_ I16 *intp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_I16 \ - assert(intp) + Perl_assert_aTHX; assert(intp) PERL_CALLCONV void -Perl_save_I32(pTHX_ I32 *intp); +Perl_save_I32(pTHX_ I32 *intp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_I32 \ - assert(intp) + Perl_assert_aTHX; assert(intp) PERL_CALLCONV void -Perl_save_I8(pTHX_ I8 *bytep); +Perl_save_I8(pTHX_ I8 *bytep) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_I8 \ - assert(bytep) + Perl_assert_aTHX; assert(bytep) PERL_CALLCONV void -Perl_save_adelete(pTHX_ AV *av, SSize_t key); +Perl_save_adelete(pTHX_ AV *av, SSize_t key) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_ADELETE \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) -/* PERL_CALLCONV void -save_aelem(pTHX_ AV *av, SSize_t idx, SV **sptr); */ +PERL_CALLCONV void +Perl_save_aelem(pTHX_ AV *av, SSize_t idx, SV **sptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); +#define PERL_ARGS_ASSERT_SAVE_AELEM \ + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV); \ + assert(sptr) PERL_CALLCONV void -Perl_save_aelem_flags(pTHX_ AV *av, SSize_t idx, SV **sptr, const U32 flags); +Perl_save_aelem_flags(pTHX_ AV *av, SSize_t idx, SV **sptr, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_SAVE_AELEM_FLAGS \ - assert(av); assert(sptr); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV); \ + assert(sptr) PERL_CALLCONV SSize_t -Perl_save_alloc(pTHX_ SSize_t size, I32 pad); -#define PERL_ARGS_ASSERT_SAVE_ALLOC +Perl_save_alloc(pTHX_ SSize_t size, I32 pad) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVE_ALLOC \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_save_aptr(pTHX_ AV **aptr); +Perl_save_aptr(pTHX_ AV **aptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_APTR \ - assert(aptr) + Perl_assert_aTHX; assert(aptr) PERL_CALLCONV AV * -Perl_save_ary(pTHX_ GV *gv); +Perl_save_ary(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_ARY \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV void -Perl_save_bool(pTHX_ bool *boolp); +Perl_save_bool(pTHX_ bool *boolp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_BOOL \ - assert(boolp) + Perl_assert_aTHX; assert(boolp) PERL_CALLCONV void -Perl_save_clearsv(pTHX_ SV **svp); +Perl_save_clearsv(pTHX_ SV **svp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_CLEARSV \ - assert(svp) + Perl_assert_aTHX; assert(svp) PERL_CALLCONV void -Perl_save_delete(pTHX_ HV *hv, char *key, I32 klen); +Perl_save_delete(pTHX_ HV *hv, char *key, I32 klen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SAVE_DELETE \ - assert(hv); assert(key); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV); \ + assert(key) PERL_CALLCONV void -Perl_save_destructor(pTHX_ DESTRUCTORFUNC_NOCONTEXT_t f, void *p); +Perl_save_destructor(pTHX_ DESTRUCTORFUNC_NOCONTEXT_t f, void *p) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SAVE_DESTRUCTOR \ - assert(p) + Perl_assert_aTHX; assert(p) + +PERL_CALLCONV void +Perl_save_destructor_x(pTHX_ DESTRUCTORFUNC_t f, void *p) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVE_DESTRUCTOR_X \ + Perl_assert_aTHX + +PERL_CALLCONV void +Perl_save_freeop(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVE_FREEOP \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_save_destructor_x(pTHX_ DESTRUCTORFUNC_t f, void *p); -#define PERL_ARGS_ASSERT_SAVE_DESTRUCTOR_X +Perl_save_freepv(pTHX_ char *pv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVE_FREEPV \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_save_freercpv(pTHX_ char *rcpv); +Perl_save_freercpv(pTHX_ char *rcpv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_FREERCPV \ - assert(rcpv) + Perl_assert_aTHX; assert(rcpv) + +PERL_CALLCONV void +Perl_save_freesv(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVE_FREESV \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_save_generic_pvref(pTHX_ char **str); +Perl_save_generic_pvref(pTHX_ char **str) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_GENERIC_PVREF \ - assert(str) + Perl_assert_aTHX; assert(str) PERL_CALLCONV void -Perl_save_generic_svref(pTHX_ SV **sptr); +Perl_save_generic_svref(pTHX_ SV **sptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_GENERIC_SVREF \ - assert(sptr) + Perl_assert_aTHX; assert(sptr) PERL_CALLCONV void -Perl_save_gp(pTHX_ GV *gv, I32 empty); +Perl_save_gp(pTHX_ GV *gv, I32 empty) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_GP \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV HV * -Perl_save_hash(pTHX_ GV *gv); +Perl_save_hash(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_HASH \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV void -Perl_save_hdelete(pTHX_ HV *hv, SV *keysv); +Perl_save_hdelete(pTHX_ HV *hv, SV *keysv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SAVE_HDELETE \ - assert(hv); assert(keysv); assert(SvTYPE(hv) == SVt_PVHV) - -/* PERL_CALLCONV void -save_helem(pTHX_ HV *hv, SV *key, SV **sptr); */ + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV); \ + assert(keysv) PERL_CALLCONV void -Perl_save_helem_flags(pTHX_ HV *hv, SV *key, SV **sptr, const U32 flags); +Perl_save_helem(pTHX_ HV *hv, SV *key, SV **sptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +#define PERL_ARGS_ASSERT_SAVE_HELEM \ + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV); \ + assert(key); assert(sptr) + +PERL_CALLCONV void +Perl_save_helem_flags(pTHX_ HV *hv, SV *key, SV **sptr, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_SAVE_HELEM_FLAGS \ - assert(hv); assert(key); assert(sptr); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV); \ + assert(key); assert(sptr) PERL_CALLCONV void -Perl_save_hints(pTHX); -#define PERL_ARGS_ASSERT_SAVE_HINTS +Perl_save_hints(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVE_HINTS \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_save_hptr(pTHX_ HV **hptr); +Perl_save_hptr(pTHX_ HV **hptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_HPTR \ - assert(hptr) + Perl_assert_aTHX; assert(hptr) PERL_CALLCONV void -Perl_save_int(pTHX_ int *intp); +Perl_save_int(pTHX_ int *intp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_INT \ - assert(intp) + Perl_assert_aTHX; assert(intp) PERL_CALLCONV void -Perl_save_item(pTHX_ SV *item); +Perl_save_item(pTHX_ SV *item) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_ITEM \ - assert(item) + Perl_assert_aTHX; assert(item) PERL_CALLCONV void -Perl_save_iv(pTHX_ IV *ivp); +Perl_save_iv(pTHX_ IV *ivp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_IV \ - assert(ivp) + Perl_assert_aTHX; assert(ivp) + +PERL_CALLCONV void +Perl_save_mortalizesv(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SAVE_MORTALIZESV \ + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV void +Perl_save_op(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVE_OP \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_save_padsv_and_mortalize(pTHX_ PADOFFSET off); -#define PERL_ARGS_ASSERT_SAVE_PADSV_AND_MORTALIZE +Perl_save_padsv(pTHX_ PADOFFSET padix) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVE_PADSV \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_save_pptr(pTHX_ char **pptr); +Perl_save_padsv_and_mortalize(pTHX_ PADOFFSET off) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVE_PADSV_AND_MORTALIZE \ + Perl_assert_aTHX + +PERL_CALLCONV void +Perl_save_pptr(pTHX_ char **pptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_PPTR \ - assert(pptr) + Perl_assert_aTHX; assert(pptr) PERL_CALLCONV void -Perl_save_pushi32ptr(pTHX_ const I32 i, void * const ptr, const int type); -#define PERL_ARGS_ASSERT_SAVE_PUSHI32PTR +Perl_save_pushi32ptr(pTHX_ const I32 i, void * const ptr, const int type) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVE_PUSHI32PTR \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_save_pushptr(pTHX_ void * const ptr, const int type); -#define PERL_ARGS_ASSERT_SAVE_PUSHPTR +Perl_save_pushptr(pTHX_ void * const ptr, const int type) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVE_PUSHPTR \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_save_pushptrptr(pTHX_ void * const ptr1, void * const ptr2, const int type); -#define PERL_ARGS_ASSERT_SAVE_PUSHPTRPTR +Perl_save_pushptrptr(pTHX_ void * const ptr1, void * const ptr2, const int type) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVE_PUSHPTRPTR \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_save_rcpv(pTHX_ char **prcpv); +Perl_save_rcpv(pTHX_ char **prcpv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_RCPV \ - assert(prcpv) + Perl_assert_aTHX; assert(prcpv) PERL_CALLCONV void -Perl_save_re_context(pTHX); -#define PERL_ARGS_ASSERT_SAVE_RE_CONTEXT +Perl_save_re_context(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVE_RE_CONTEXT \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_save_scalar(pTHX_ GV *gv); +Perl_save_scalar(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_SCALAR \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV void -Perl_save_set_svflags(pTHX_ SV *sv, U32 mask, U32 val); +Perl_save_set_svflags(pTHX_ SV *sv, U32 mask, U32 val) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_SET_SVFLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_save_shared_pvref(pTHX_ char **str); +Perl_save_shared_pvref(pTHX_ char **str) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_SHARED_PVREF \ - assert(str) + Perl_assert_aTHX; assert(str) PERL_CALLCONV void -Perl_save_sptr(pTHX_ SV **sptr); +Perl_save_sptr(pTHX_ SV **sptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_SPTR \ - assert(sptr) + Perl_assert_aTHX; assert(sptr) PERL_CALLCONV void -Perl_save_strlen(pTHX_ STRLEN *ptr); +Perl_save_strlen(pTHX_ STRLEN *ptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_STRLEN \ - assert(ptr) + Perl_assert_aTHX; assert(ptr) PERL_CALLCONV SV * -Perl_save_svref(pTHX_ SV **sptr); +Perl_save_svref(pTHX_ SV **sptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_SVREF \ - assert(sptr) + Perl_assert_aTHX; assert(sptr) PERL_CALLCONV void -Perl_save_vptr(pTHX_ void *ptr); +Perl_save_vptr(pTHX_ void *ptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SAVE_VPTR \ - assert(ptr) + Perl_assert_aTHX; assert(ptr) PERL_CALLCONV char * Perl_savesharedpv(pTHX_ const char *pv) + Perl_attribute_nonnull_aTHX __attribute__malloc__ __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_SAVESHAREDPV +#define PERL_ARGS_ASSERT_SAVESHAREDPV \ + Perl_assert_aTHX PERL_CALLCONV char * Perl_savesharedpvn(pTHX_ const char * const pv, const STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__malloc__ __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_SAVESHAREDPVN +#define PERL_ARGS_ASSERT_SAVESHAREDPVN \ + Perl_assert_aTHX; assert(pv) PERL_CALLCONV void -Perl_savestack_grow(pTHX); -#define PERL_ARGS_ASSERT_SAVESTACK_GROW +Perl_savestack_grow(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVESTACK_GROW \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_savestack_grow_cnt(pTHX_ I32 need); -#define PERL_ARGS_ASSERT_SAVESTACK_GROW_CNT +Perl_savestack_grow_cnt(pTHX_ I32 need) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVESTACK_GROW_CNT \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_savetmps(pTHX); -#define PERL_ARGS_ASSERT_SAVETMPS +Perl_savetmps(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SAVETMPS \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_sawparens(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SAWPARENS +#define PERL_ARGS_ASSERT_SAWPARENS \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_scalar(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SCALAR +#define PERL_ARGS_ASSERT_SCALAR \ + Perl_assert_aTHX PERL_CALLCONV OP * -Perl_scalarvoid(pTHX_ OP *o) +Perl_scalarvoid(pTHX_ OP *arg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_SCALARVOID \ - assert(o) + Perl_assert_aTHX; assert(arg) PERL_CALLCONV NV -Perl_scan_bin(pTHX_ const char *start, STRLEN len, STRLEN *retlen); +Perl_scan_bin(pTHX_ const char *start, STRLEN len, STRLEN *retlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_SCAN_BIN \ - assert(start); assert(retlen) + Perl_assert_aTHX; assert(start); assert(retlen) PERL_CALLCONV NV -Perl_scan_hex(pTHX_ const char *start, STRLEN len, STRLEN *retlen); +Perl_scan_hex(pTHX_ const char *start, STRLEN len, STRLEN *retlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_SCAN_HEX \ - assert(start); assert(retlen) + Perl_assert_aTHX; assert(start); assert(retlen) PERL_CALLCONV char * -Perl_scan_num(pTHX_ const char *s, YYSTYPE *lvalp); +Perl_scan_num(pTHX_ const char *start, YYSTYPE *lvalp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SCAN_NUM \ - assert(s); assert(lvalp) + Perl_assert_aTHX; assert(start); assert(lvalp) PERL_CALLCONV NV -Perl_scan_oct(pTHX_ const char *start, STRLEN len, STRLEN *retlen); +Perl_scan_oct(pTHX_ const char *start, STRLEN len, STRLEN *retlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_SCAN_OCT \ - assert(start); assert(retlen) + Perl_assert_aTHX; assert(start); assert(retlen) PERL_CALLCONV char * Perl_scan_str(pTHX_ char *start, int keep_quoted, int keep_delims, int re_reparse, char **delimp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SCAN_STR \ - assert(start) + Perl_assert_aTHX; assert(start) PERL_CALLCONV const char * -Perl_scan_version(pTHX_ const char *s, SV *rv, bool qv); +Perl_scan_version(pTHX_ const char *s, SV *rv, bool qv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SCAN_VERSION \ - assert(s); assert(rv) + Perl_assert_aTHX; assert(s); assert(rv) PERL_CALLCONV char * -Perl_scan_vstring(pTHX_ const char *s, const char * const e, SV *sv); +Perl_scan_vstring(pTHX_ const char *s, const char * const e, SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_SCAN_VSTRING \ - assert(s); assert(e); assert(sv) + Perl_assert_aTHX; assert(s); assert(e); assert(sv); assert(s < e) PERL_CALLCONV char * -Perl_scan_word(pTHX_ char *s, char *dest, STRLEN destlen, int allow_package, STRLEN *slp); +Perl_scan_word(pTHX_ char *s, char *dest, STRLEN destlen, int allow_package, STRLEN *slp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_5); #define PERL_ARGS_ASSERT_SCAN_WORD \ - assert(s); assert(dest); assert(slp) + Perl_assert_aTHX; assert(s); assert(dest); assert(slp) -PERL_CALLCONV U32 -Perl_seed(pTHX); -#define PERL_ARGS_ASSERT_SEED +PERL_CALLCONV U64 +Perl_seed(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SEED \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_set_caret_X(pTHX); -#define PERL_ARGS_ASSERT_SET_CARET_X +Perl_set_caret_X(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SET_CARET_X \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_set_context(void *t); +Perl_set_context(void *t) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_SET_CONTEXT \ assert(t) PERL_CALLCONV void -Perl_set_numeric_standard(pTHX_ const char *file, const line_t caller_line); +Perl_set_numeric_standard(pTHX_ const char *file, const line_t caller_line) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SET_NUMERIC_STANDARD \ - assert(file) + Perl_assert_aTHX; assert(file) PERL_CALLCONV void -Perl_set_numeric_underlying(pTHX_ const char *file, const line_t caller_line); +Perl_set_numeric_underlying(pTHX_ const char *file, const line_t caller_line) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SET_NUMERIC_UNDERLYING \ - assert(file) + Perl_assert_aTHX; assert(file) PERL_CALLCONV void -Perl_setdefout(pTHX_ GV *gv); +Perl_setdefout(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SETDEFOUT \ - assert(gv) + Perl_assert_aTHX; assert(gv) PERL_CALLCONV void Perl_setfd_cloexec(int fd) @@ -4242,13 +6345,17 @@ Perl_setfd_cloexec(int fd) PERL_CALLCONV void Perl_setfd_cloexec_for_nonsysfd(pTHX_ int fd) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SETFD_CLOEXEC_FOR_NONSYSFD +#define PERL_ARGS_ASSERT_SETFD_CLOEXEC_FOR_NONSYSFD \ + Perl_assert_aTHX PERL_CALLCONV void Perl_setfd_cloexec_or_inhexec_by_sysfdness(pTHX_ int fd) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SETFD_CLOEXEC_OR_INHEXEC_BY_SYSFDNESS +#define PERL_ARGS_ASSERT_SETFD_CLOEXEC_OR_INHEXEC_BY_SYSFDNESS \ + Perl_assert_aTHX PERL_CALLCONV void Perl_setfd_inhexec(int fd) @@ -4257,13 +6364,17 @@ Perl_setfd_inhexec(int fd) PERL_CALLCONV void Perl_setfd_inhexec_for_sysfd(pTHX_ int fd) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SETFD_INHEXEC_FOR_SYSFD +#define PERL_ARGS_ASSERT_SETFD_INHEXEC_FOR_SYSFD \ + Perl_assert_aTHX PERL_CALLCONV HEK * -Perl_share_hek(pTHX_ const char *str, SSize_t len, U32 hash); +Perl_share_hek(pTHX_ const char *str, SSize_t len, U32 hash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SHARE_HEK \ - assert(str) + Perl_assert_aTHX; assert(str) PERL_CALLCONV Signal_t Perl_sighandler1(int sig) @@ -4277,841 +6388,1546 @@ Perl_sighandler3(int sig, Siginfo_t *inf PERL_CALLCONV char * Perl_skipspace_flags(pTHX_ char *s, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SKIPSPACE_FLAGS \ - assert(s) + Perl_assert_aTHX; assert(s) PERL_CALLCONV void -Perl_sortsv(pTHX_ SV **array, size_t num_elts, SVCOMPARE_t cmp); +Perl_sortsv(pTHX_ SV **array, size_t num_elts, SVCOMPARE_t cmp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_SORTSV \ - assert(cmp) + Perl_assert_aTHX; assert(cmp) PERL_CALLCONV void -Perl_sortsv_flags(pTHX_ SV **array, size_t num_elts, SVCOMPARE_t cmp, U32 flags); +Perl_sortsv_flags(pTHX_ SV **array, size_t num_elts, SVCOMPARE_t cmp, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_SORTSV_FLAGS \ - assert(cmp) + Perl_assert_aTHX; assert(cmp) PERL_CALLCONV SV ** -Perl_stack_grow(pTHX_ SV **sp, SV **p, SSize_t n); +Perl_stack_grow(pTHX_ SV **sp, SV **p, SSize_t n) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_STACK_GROW \ - assert(sp); assert(p) + Perl_assert_aTHX; assert(sp); assert(p) PERL_CALLCONV PerlIO * Perl_start_glob(pTHX_ SV *tmpglob, IO *io) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_START_GLOB \ - assert(tmpglob); assert(io) + Perl_assert_aTHX; assert(tmpglob); assert(io) PERL_CALLCONV I32 -Perl_start_subparse(pTHX_ I32 is_format, U32 flags); -#define PERL_ARGS_ASSERT_START_SUBPARSE +Perl_start_subparse(pTHX_ I32 is_format, U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_START_SUBPARSE \ + Perl_assert_aTHX PERL_CALLCONV NV Perl_str_to_version(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_STR_TO_VERSION \ - assert(sv) + Perl_assert_aTHX; assert(sv) -/* PERL_CALLCONV bool -Perl_strict_utf8_to_uv(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p); */ +PERL_CALLCONV bool +Perl_strict_utf8_to_uv(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3); +#define PERL_ARGS_ASSERT_STRICT_UTF8_TO_UV \ + assert(s); assert(e); assert(cp_p); assert(s <= e) PERL_CALLCONV void Perl_sub_crush_depth(pTHX_ CV *cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_SUB_CRUSH_DEPTH \ - assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + +PERL_CALLCONV void +Perl_subsignature_append_fence_op(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__visibility__("hidden"); +#define PERL_ARGS_ASSERT_SUBSIGNATURE_APPEND_FENCE_OP \ + Perl_assert_aTHX; assert(o) + +PERL_CALLCONV void +Perl_subsignature_append_named(pTHX_ const char *paramname, PADOFFSET padix, OPCODE defmode, OP *defexpr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__visibility__("hidden"); +#define PERL_ARGS_ASSERT_SUBSIGNATURE_APPEND_NAMED \ + Perl_assert_aTHX; assert(paramname) PERL_CALLCONV void -Perl_subsignature_append_positional(pTHX_ OP *varop, OPCODE defmode, OP *defexpr) +Perl_subsignature_append_positional(pTHX_ PADOFFSET padix, OPCODE defmode, OP *defexpr) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SUBSIGNATURE_APPEND_POSITIONAL +#define PERL_ARGS_ASSERT_SUBSIGNATURE_APPEND_POSITIONAL \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_subsignature_append_slurpy(pTHX_ I32 sigil, OP *varop) +Perl_subsignature_append_slurpy(pTHX_ I32 sigil, PADOFFSET padix) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SUBSIGNATURE_APPEND_SLURPY +#define PERL_ARGS_ASSERT_SUBSIGNATURE_APPEND_SLURPY \ + Perl_assert_aTHX PERL_CALLCONV OP * Perl_subsignature_finish(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SUBSIGNATURE_FINISH +#define PERL_ARGS_ASSERT_SUBSIGNATURE_FINISH \ + Perl_assert_aTHX PERL_CALLCONV void Perl_subsignature_start(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SUBSIGNATURE_START +#define PERL_ARGS_ASSERT_SUBSIGNATURE_START \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_suspend_compcv(pTHX_ struct suspended_compcv *buffer); +Perl_suspend_compcv(pTHX_ struct suspended_compcv *buffer) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SUSPEND_COMPCV \ - assert(buffer) + Perl_assert_aTHX; assert(buffer) PERL_CALLCONV bool -Perl_sv_2bool_flags(pTHX_ SV *sv, I32 flags); +Perl_sv_2bool(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_2BOOL \ + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV bool +Perl_sv_2bool_flags(pTHX_ SV *sv, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_2BOOL_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV CV * -Perl_sv_2cv(pTHX_ SV *sv, HV ** const st, GV ** const gvp, const I32 lref); +Perl_sv_2cv(pTHX_ SV *sv, HV ** const st, GV ** const gvp, const I32 lref) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_SV_2CV \ - assert(st); assert(gvp) + Perl_assert_aTHX; assert(st); assert(gvp) PERL_CALLCONV IO * -Perl_sv_2io(pTHX_ SV * const sv); +Perl_sv_2io(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_2IO \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV IV -Perl_sv_2iv_flags(pTHX_ SV * const sv, const I32 flags); +Perl_sv_2iv(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_2IV \ + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV IV +Perl_sv_2iv_flags(pTHX_ SV * const sv, const I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_2IV_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV SV * -Perl_sv_2mortal(pTHX_ SV * const sv); -#define PERL_ARGS_ASSERT_SV_2MORTAL +Perl_sv_2mortal(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_2MORTAL \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_sv_2num(pTHX_ SV * const sv) +Perl_sv_2num_flags(pTHX_ SV * const sv, int flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SV_2NUM \ - assert(sv) +#define PERL_ARGS_ASSERT_SV_2NUM_FLAGS \ + Perl_assert_aTHX; assert(sv) PERL_CALLCONV NV -Perl_sv_2nv_flags(pTHX_ SV * const sv, const I32 flags); +Perl_sv_2nv_flags(pTHX_ SV * const sv, const I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_2NV_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV char * +Perl_sv_2pv(pTHX_ SV *sv, STRLEN *lp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_2PV \ + Perl_assert_aTHX; assert(sv) PERL_CALLCONV char * -Perl_sv_2pv_flags(pTHX_ SV * const sv, STRLEN * const lp, const U32 flags); +Perl_sv_2pv_flags(pTHX_ SV * const sv, STRLEN * const lp, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_2PV_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV char * -Perl_sv_2pvbyte_flags(pTHX_ SV *sv, STRLEN * const lp, const U32 flags); +Perl_sv_2pv_nolen(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_SV_2PV_NOLEN \ + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV char * +Perl_sv_2pvbyte(pTHX_ SV *sv, STRLEN * const lp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_2PVBYTE \ + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV char * +Perl_sv_2pvbyte_flags(pTHX_ SV *sv, STRLEN * const lp, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_2PVBYTE_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV char * +Perl_sv_2pvbyte_nolen(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_SV_2PVBYTE_NOLEN \ + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV char * +Perl_sv_2pvutf8(pTHX_ SV *sv, STRLEN * const lp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_2PVUTF8 \ + Perl_assert_aTHX; assert(sv) PERL_CALLCONV char * -Perl_sv_2pvutf8_flags(pTHX_ SV *sv, STRLEN * const lp, const U32 flags); +Perl_sv_2pvutf8_flags(pTHX_ SV *sv, STRLEN * const lp, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_2PVUTF8_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV char * +Perl_sv_2pvutf8_nolen(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_SV_2PVUTF8_NOLEN \ + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV UV +Perl_sv_2uv(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_2UV \ + Perl_assert_aTHX; assert(sv) PERL_CALLCONV UV -Perl_sv_2uv_flags(pTHX_ SV * const sv, const I32 flags); +Perl_sv_2uv_flags(pTHX_ SV * const sv, const I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_2UV_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_backoff(SV * const sv); +Perl_sv_backoff(SV * const sv) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_SV_BACKOFF \ assert(sv) PERL_CALLCONV SV * -Perl_sv_bless(pTHX_ SV * const sv, HV * const stash); +Perl_sv_bless(pTHX_ SV * const sv, HV * const stash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_BLESS \ - assert(sv); assert(stash) + Perl_assert_aTHX; assert(sv); assert(stash) PERL_CALLCONV bool -Perl_sv_can_swipe_pv_buf(pTHX_ SV *sv); +Perl_sv_can_swipe_pv_buf(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_CAN_SWIPE_PV_BUF \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV bool -Perl_sv_cat_decode(pTHX_ SV *dsv, SV *encoding, SV *ssv, int *offset, char *tstr, int tlen); +Perl_sv_cat_decode(pTHX_ SV *dsv, SV *encoding, SV *ssv, int *offset, char *tstr, int tlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5); #define PERL_ARGS_ASSERT_SV_CAT_DECODE \ - assert(dsv); assert(encoding); assert(ssv); assert(offset); assert(tstr) + Perl_assert_aTHX; assert(dsv); assert(encoding); assert(ssv); \ + assert(offset); assert(tstr) PERL_CALLCONV void -Perl_sv_catpv(pTHX_ SV * const dsv, const char *sstr); +Perl_sv_catpv(pTHX_ SV * const dsv, const char *sstr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_CATPV \ - assert(dsv) + Perl_assert_aTHX; assert(dsv) PERL_CALLCONV void -Perl_sv_catpv_flags(pTHX_ SV * const dsv, const char *sstr, const I32 flags); +Perl_sv_catpv_flags(pTHX_ SV * const dsv, const char *sstr, const I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_CATPV_FLAGS \ - assert(dsv); assert(sstr) + Perl_assert_aTHX; assert(dsv); assert(sstr) PERL_CALLCONV void -Perl_sv_catpv_mg(pTHX_ SV * const dsv, const char * const sstr); +Perl_sv_catpv_mg(pTHX_ SV * const dsv, const char * const sstr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_CATPV_MG \ - assert(dsv) + Perl_assert_aTHX; assert(dsv) PERL_CALLCONV void Perl_sv_catpvf(pTHX_ SV * const sv, const char * const pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__format__(__printf__,pTHX_2,pTHX_3); #define PERL_ARGS_ASSERT_SV_CATPVF \ - assert(sv); assert(pat) + Perl_assert_aTHX; assert(sv); assert(pat) PERL_CALLCONV void Perl_sv_catpvf_mg(pTHX_ SV * const sv, const char * const pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__format__(__printf__,pTHX_2,pTHX_3); #define PERL_ARGS_ASSERT_SV_CATPVF_MG \ - assert(sv); assert(pat) + Perl_assert_aTHX; assert(sv); assert(pat) PERL_CALLCONV void -Perl_sv_catpvn_flags(pTHX_ SV * const dsv, const char *sstr, const STRLEN len, const I32 flags); +Perl_sv_catpvn(pTHX_ SV * const dsv, const char *sstr, STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_SV_CATPVN \ + Perl_assert_aTHX; assert(dsv); assert(sstr) + +PERL_CALLCONV void +Perl_sv_catpvn_flags(pTHX_ SV * const dsv, const char *sstr, const STRLEN len, const I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_CATPVN_FLAGS \ - assert(dsv); assert(sstr) + Perl_assert_aTHX; assert(dsv); assert(sstr) + +PERL_CALLCONV void +Perl_sv_catpvn_mg(pTHX_ SV * const dsv, const char *sstr, STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_SV_CATPVN_MG \ + Perl_assert_aTHX; assert(dsv); assert(sstr) PERL_CALLCONV void -Perl_sv_catsv_flags(pTHX_ SV * const dsv, SV * const sstr, const I32 flags); +Perl_sv_catsv(pTHX_ SV * const dsv, SV * const sstr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_CATSV \ + Perl_assert_aTHX; assert(dsv) + +PERL_CALLCONV void +Perl_sv_catsv_flags(pTHX_ SV * const dsv, SV * const sstr, const I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_CATSV_FLAGS \ - assert(dsv) + Perl_assert_aTHX; assert(dsv) + +PERL_CALLCONV void +Perl_sv_catsv_mg(pTHX_ SV * const dsv, SV * const sstr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_CATSV_MG \ + Perl_assert_aTHX; assert(dsv) PERL_CALLCONV void -Perl_sv_chop(pTHX_ SV * const sv, const char * const ptr); +Perl_sv_chop(pTHX_ SV * const sv, const char * const ptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_CHOP \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV SSize_t Perl_sv_clean_all(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SV_CLEAN_ALL +#define PERL_ARGS_ASSERT_SV_CLEAN_ALL \ + Perl_assert_aTHX PERL_CALLCONV void Perl_sv_clean_objs(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SV_CLEAN_OBJS +#define PERL_ARGS_ASSERT_SV_CLEAN_OBJS \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_sv_clear(pTHX_ SV * const orig_sv); +Perl_sv_clear(pTHX_ SV * const orig_sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_CLEAR \ - assert(orig_sv) + Perl_assert_aTHX; assert(orig_sv) PERL_CALLCONV I32 -Perl_sv_cmp(pTHX_ SV * const sv1, SV * const sv2); -#define PERL_ARGS_ASSERT_SV_CMP +Perl_sv_cmp(pTHX_ SV * const sv1, SV * const sv2) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_CMP \ + Perl_assert_aTHX PERL_CALLCONV I32 -Perl_sv_cmp_flags(pTHX_ SV * const sv1, SV * const sv2, const U32 flags); -#define PERL_ARGS_ASSERT_SV_CMP_FLAGS +Perl_sv_cmp_flags(pTHX_ SV * const sv1, SV * const sv2, const U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_CMP_FLAGS \ + Perl_assert_aTHX PERL_CALLCONV I32 -Perl_sv_cmp_locale(pTHX_ SV * const sv1, SV * const sv2); -#define PERL_ARGS_ASSERT_SV_CMP_LOCALE +Perl_sv_cmp_locale(pTHX_ SV * const sv1, SV * const sv2) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_CMP_LOCALE \ + Perl_assert_aTHX PERL_CALLCONV I32 -Perl_sv_cmp_locale_flags(pTHX_ SV * const sv1, SV * const sv2, const U32 flags); -#define PERL_ARGS_ASSERT_SV_CMP_LOCALE_FLAGS +Perl_sv_cmp_locale_flags(pTHX_ SV * const sv1, SV * const sv2, const U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_CMP_LOCALE_FLAGS \ + Perl_assert_aTHX + +PERL_CALLCONV void +Perl_sv_copypv(pTHX_ SV * const dsv, SV * const ssv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_SV_COPYPV \ + Perl_assert_aTHX; assert(dsv); assert(ssv) PERL_CALLCONV void -Perl_sv_copypv_flags(pTHX_ SV * const dsv, SV * const ssv, const I32 flags); +Perl_sv_copypv_flags(pTHX_ SV * const dsv, SV * const ssv, const I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_COPYPV_FLAGS \ - assert(dsv); assert(ssv) + Perl_assert_aTHX; assert(dsv); assert(ssv) -/* PERL_CALLCONV void -sv_copypv_nomg(pTHX_ SV * const dsv, SV * const ssv); */ +PERL_CALLCONV void +Perl_sv_copypv_nomg(pTHX_ SV * const dsv, SV * const ssv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +#define PERL_ARGS_ASSERT_SV_COPYPV_NOMG \ + Perl_assert_aTHX; assert(dsv); assert(ssv) PERL_CALLCONV void -Perl_sv_dec(pTHX_ SV * const sv); -#define PERL_ARGS_ASSERT_SV_DEC +Perl_sv_dec(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_DEC \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_sv_dec_nomg(pTHX_ SV * const sv); -#define PERL_ARGS_ASSERT_SV_DEC_NOMG +Perl_sv_dec_nomg(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_DEC_NOMG \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_sv_del_backref(pTHX_ SV * const tsv, SV * const sv); +Perl_sv_del_backref(pTHX_ SV * const tsv, SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_DEL_BACKREF \ - assert(tsv); assert(sv) + Perl_assert_aTHX; assert(tsv); assert(sv) PERL_CALLCONV bool Perl_sv_derived_from(pTHX_ SV *sv, const char * const name) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_DERIVED_FROM \ - assert(sv); assert(name) + Perl_assert_aTHX; assert(sv); assert(name) PERL_CALLCONV bool Perl_sv_derived_from_hv(pTHX_ SV *sv, HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_DERIVED_FROM_HV \ - assert(sv); assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(sv); assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV bool Perl_sv_derived_from_pv(pTHX_ SV *sv, const char * const name, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_DERIVED_FROM_PV \ - assert(sv); assert(name) + Perl_assert_aTHX; assert(sv); assert(name) PERL_CALLCONV bool Perl_sv_derived_from_pvn(pTHX_ SV *sv, const char * const name, const STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_DERIVED_FROM_PVN \ - assert(sv); assert(name) + Perl_assert_aTHX; assert(sv); assert(name) PERL_CALLCONV bool Perl_sv_derived_from_sv(pTHX_ SV *sv, SV *namesv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_DERIVED_FROM_SV \ - assert(sv); assert(namesv) + Perl_assert_aTHX; assert(sv); assert(namesv) PERL_CALLCONV bool -Perl_sv_destroyable(pTHX_ SV *sv); -#define PERL_ARGS_ASSERT_SV_DESTROYABLE +Perl_sv_destroyable(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_DESTROYABLE \ + Perl_assert_aTHX PERL_CALLCONV bool Perl_sv_does(pTHX_ SV *sv, const char * const name) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_DOES \ - assert(sv); assert(name) + Perl_assert_aTHX; assert(sv); assert(name) PERL_CALLCONV bool Perl_sv_does_pv(pTHX_ SV *sv, const char * const name, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_DOES_PV \ - assert(sv); assert(name) + Perl_assert_aTHX; assert(sv); assert(name) PERL_CALLCONV bool Perl_sv_does_pvn(pTHX_ SV *sv, const char * const name, const STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_DOES_PVN \ - assert(sv); assert(name) + Perl_assert_aTHX; assert(sv); assert(name) PERL_CALLCONV bool Perl_sv_does_sv(pTHX_ SV *sv, SV *namesv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_DOES_SV \ - assert(sv); assert(namesv) + Perl_assert_aTHX; assert(sv); assert(namesv) PERL_CALLCONV void -Perl_sv_dump(pTHX_ SV *sv); -#define PERL_ARGS_ASSERT_SV_DUMP +Perl_sv_dump(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_DUMP \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_sv_dump_depth(pTHX_ SV *sv, I32 depth); -#define PERL_ARGS_ASSERT_SV_DUMP_DEPTH +Perl_sv_dump_depth(pTHX_ SV *sv, I32 depth) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_DUMP_DEPTH \ + Perl_assert_aTHX + +PERL_CALLCONV I32 +Perl_sv_eq(pTHX_ SV *sv1, SV *sv2) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_EQ \ + Perl_assert_aTHX PERL_CALLCONV I32 -Perl_sv_eq_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags); -#define PERL_ARGS_ASSERT_SV_EQ_FLAGS +Perl_sv_eq_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_EQ_FLAGS \ + Perl_assert_aTHX + +PERL_CALLCONV void +Perl_sv_force_normal(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_FORCE_NORMAL \ + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_force_normal_flags(pTHX_ SV * const sv, const U32 flags); +Perl_sv_force_normal_flags(pTHX_ SV * const sv, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_FORCE_NORMAL_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_free(pTHX_ SV * const sv); -#define PERL_ARGS_ASSERT_SV_FREE +Perl_sv_free(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_FREE \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_sv_free2(pTHX_ SV * const sv, const U32 refcnt); +Perl_sv_free2(pTHX_ SV * const sv, const U32 refcnt) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_FREE2 \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void Perl_sv_free_arenas(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SV_FREE_ARENAS +#define PERL_ARGS_ASSERT_SV_FREE_ARENAS \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_sv_get_backrefs(SV * const sv); +Perl_sv_get_backrefs(SV * const sv) + Perl_attribute_nonnull(1); #define PERL_ARGS_ASSERT_SV_GET_BACKREFS \ assert(sv) PERL_CALLCONV char * -Perl_sv_gets(pTHX_ SV * const sv, PerlIO * const fp, SSize_t append); +Perl_sv_gets(pTHX_ SV * const sv, PerlIO * const fp, SSize_t append) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_GETS \ - assert(sv); assert(fp) + Perl_assert_aTHX; assert(sv); assert(fp) PERL_CALLCONV char * -Perl_sv_grow(pTHX_ SV * const sv, STRLEN newlen); +Perl_sv_grow(pTHX_ SV * const sv, STRLEN newlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_GROW \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV char * -Perl_sv_grow_fresh(pTHX_ SV * const sv, STRLEN newlen); +Perl_sv_grow_fresh(pTHX_ SV * const sv, STRLEN newlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_GROW_FRESH \ - assert(sv) + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV void +Perl_sv_inc(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_INC \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_sv_inc(pTHX_ SV * const sv); -#define PERL_ARGS_ASSERT_SV_INC +Perl_sv_inc_nomg(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_INC_NOMG \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_sv_inc_nomg(pTHX_ SV * const sv); -#define PERL_ARGS_ASSERT_SV_INC_NOMG +Perl_sv_insert(pTHX_ SV * const bigstr, const STRLEN offset, const STRLEN len, const char * const little, const STRLEN littlelen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_4); +#define PERL_ARGS_ASSERT_SV_INSERT \ + Perl_assert_aTHX; assert(bigstr); assert(little) PERL_CALLCONV void -Perl_sv_insert_flags(pTHX_ SV * const bigstr, const STRLEN offset, const STRLEN len, const char *little, const STRLEN littlelen, const U32 flags); +Perl_sv_insert_flags(pTHX_ SV * const bigstr, const STRLEN offset, const STRLEN len, const char *little, const STRLEN littlelen, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_4); #define PERL_ARGS_ASSERT_SV_INSERT_FLAGS \ - assert(bigstr); assert(little) + Perl_assert_aTHX; assert(bigstr); assert(little) PERL_CALLCONV int -Perl_sv_isa(pTHX_ SV *sv, const char * const name); +Perl_sv_isa(pTHX_ SV *sv, const char * const name) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_ISA \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV bool Perl_sv_isa_sv(pTHX_ SV *sv, SV *namesv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_ISA_SV \ - assert(sv); assert(namesv) + Perl_assert_aTHX; assert(sv); assert(namesv) PERL_CALLCONV int -Perl_sv_isobject(pTHX_ SV *sv); -#define PERL_ARGS_ASSERT_SV_ISOBJECT +Perl_sv_isobject(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_ISOBJECT \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_sv_langinfo(pTHX_ const nl_item item); -#define PERL_ARGS_ASSERT_SV_LANGINFO +Perl_sv_langinfo(pTHX_ const nl_item item) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_LANGINFO \ + Perl_assert_aTHX PERL_CALLCONV STRLEN -Perl_sv_len(pTHX_ SV * const sv); -#define PERL_ARGS_ASSERT_SV_LEN +Perl_sv_len(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_LEN \ + Perl_assert_aTHX PERL_CALLCONV STRLEN -Perl_sv_len_utf8(pTHX_ SV * const sv); -#define PERL_ARGS_ASSERT_SV_LEN_UTF8 +Perl_sv_len_utf8(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_LEN_UTF8 \ + Perl_assert_aTHX PERL_CALLCONV STRLEN -Perl_sv_len_utf8_nomg(pTHX_ SV * const sv); +Perl_sv_len_utf8_nomg(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_LEN_UTF8_NOMG \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_magic(pTHX_ SV * const sv, SV * const obj, const int how, const char * const name, const I32 namlen); +Perl_sv_magic(pTHX_ SV * const sv, SV * const obj, const int how, const char * const name, const I32 namlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_MAGIC \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV MAGIC * -Perl_sv_magicext(pTHX_ SV * const sv, SV * const obj, const int how, const MGVTBL * const vtbl, const char * const name, const I32 namlen); +Perl_sv_magicext(pTHX_ SV * const sv, SV * const obj, const int how, const MGVTBL * const vtbl, const char * const name, const I32 namlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_MAGICEXT \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV MAGIC * -Perl_sv_magicext_mglob(pTHX_ SV *sv); +Perl_sv_magicext_mglob(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_MAGICEXT_MGLOB \ - assert(sv) + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV SV * +Perl_sv_mortalcopy(pTHX_ SV * const oldsv) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_SV_MORTALCOPY \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_sv_mortalcopy_flags(pTHX_ SV * const oldsv, U32 flags) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_SV_MORTALCOPY_FLAGS +#define PERL_ARGS_ASSERT_SV_MORTALCOPY_FLAGS \ + Perl_assert_aTHX PERL_CALLCONV SV * Perl_sv_newmortal(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_SV_NEWMORTAL +#define PERL_ARGS_ASSERT_SV_NEWMORTAL \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_sv_newref(pTHX_ SV * const sv); -#define PERL_ARGS_ASSERT_SV_NEWREF +Perl_sv_newref(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NEWREF \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_sv_nosharing(pTHX_ SV *sv); -#define PERL_ARGS_ASSERT_SV_NOSHARING +Perl_sv_nosharing(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NOSHARING \ + Perl_assert_aTHX + +PERL_CALLCONV I32 +Perl_sv_numcmp(pTHX_ SV *sv1, SV *sv2) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMCMP \ + Perl_assert_aTHX + +PERL_CALLCONV I32 +Perl_sv_numcmp_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMCMP_FLAGS \ + Perl_assert_aTHX + +PERL_CALLCONV bool +Perl_sv_numeq(pTHX_ SV *sv1, SV *sv2) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMEQ \ + Perl_assert_aTHX + +PERL_CALLCONV bool +Perl_sv_numeq_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMEQ_FLAGS \ + Perl_assert_aTHX + +PERL_CALLCONV bool +Perl_sv_numge(pTHX_ SV *sv1, SV *sv2) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMGE \ + Perl_assert_aTHX + +PERL_CALLCONV bool +Perl_sv_numge_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMGE_FLAGS \ + Perl_assert_aTHX + +PERL_CALLCONV bool +Perl_sv_numgt(pTHX_ SV *sv1, SV *sv2) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMGT \ + Perl_assert_aTHX + +PERL_CALLCONV bool +Perl_sv_numgt_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMGT_FLAGS \ + Perl_assert_aTHX -/* PERL_CALLCONV bool -sv_numeq(pTHX_ SV *sv1, SV *sv2); */ +PERL_CALLCONV bool +Perl_sv_numle(pTHX_ SV *sv1, SV *sv2) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMLE \ + Perl_assert_aTHX + +PERL_CALLCONV bool +Perl_sv_numle_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMLE_FLAGS \ + Perl_assert_aTHX + +PERL_CALLCONV bool +Perl_sv_numlt(pTHX_ SV *sv1, SV *sv2) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMLT \ + Perl_assert_aTHX + +PERL_CALLCONV bool +Perl_sv_numlt_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMLT_FLAGS \ + Perl_assert_aTHX + +PERL_CALLCONV bool +Perl_sv_numne(pTHX_ SV *sv1, SV *sv2) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMNE \ + Perl_assert_aTHX PERL_CALLCONV bool -Perl_sv_numeq_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags); -#define PERL_ARGS_ASSERT_SV_NUMEQ_FLAGS +Perl_sv_numne_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_NUMNE_FLAGS \ + Perl_assert_aTHX PERL_CALLCONV char * -Perl_sv_peek(pTHX_ SV *sv); -#define PERL_ARGS_ASSERT_SV_PEEK +Perl_sv_peek(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_PEEK \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_sv_pos_b2u(pTHX_ SV * const sv, I32 * const offsetp); +Perl_sv_pos_b2u(pTHX_ SV * const sv, I32 * const offsetp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_POS_B2U \ - assert(offsetp) + Perl_assert_aTHX; assert(offsetp) PERL_CALLCONV STRLEN -Perl_sv_pos_b2u_flags(pTHX_ SV * const sv, STRLEN const offset, U32 flags); +Perl_sv_pos_b2u_flags(pTHX_ SV * const sv, STRLEN const offset, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_POS_B2U_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_pos_u2b(pTHX_ SV * const sv, I32 * const offsetp, I32 * const lenp); +Perl_sv_pos_u2b(pTHX_ SV * const sv, I32 * const offsetp, I32 * const lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_POS_U2B \ - assert(offsetp) + Perl_assert_aTHX; assert(offsetp) PERL_CALLCONV STRLEN -Perl_sv_pos_u2b_flags(pTHX_ SV * const sv, STRLEN uoffset, STRLEN * const lenp, U32 flags); +Perl_sv_pos_u2b_flags(pTHX_ SV * const sv, STRLEN uoffset, STRLEN * const lenp, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_POS_U2B_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV char * +Perl_sv_pv(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_SV_PV \ + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV char * +Perl_sv_pvbyte(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_SV_PVBYTE \ + Perl_assert_aTHX; assert(sv) PERL_CALLCONV char * -Perl_sv_pvbyten_force(pTHX_ SV * const sv, STRLEN * const lp); +Perl_sv_pvbyten_force(pTHX_ SV * const sv, STRLEN * const lp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_PVBYTEN_FORCE \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV char * -Perl_sv_pvn_force_flags(pTHX_ SV * const sv, STRLEN * const lp, const U32 flags); +Perl_sv_pvn_force(pTHX_ SV *sv, STRLEN *lp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_PVN_FORCE \ + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV char * +Perl_sv_pvn_force_flags(pTHX_ SV * const sv, STRLEN * const lp, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_PVN_FORCE_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV char * +Perl_sv_pvutf8(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_SV_PVUTF8 \ + Perl_assert_aTHX; assert(sv) PERL_CALLCONV char * -Perl_sv_pvutf8n_force(pTHX_ SV * const sv, STRLEN * const lp); +Perl_sv_pvutf8n_force(pTHX_ SV * const sv, STRLEN * const lp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_PVUTF8N_FORCE \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV char * -Perl_sv_recode_to_utf8(pTHX_ SV *sv, SV *encoding); +Perl_sv_recode_to_utf8(pTHX_ SV *sv, SV *encoding) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_RECODE_TO_UTF8 \ - assert(sv); assert(encoding) + Perl_assert_aTHX; assert(sv); assert(encoding) PERL_CALLCONV SV * -Perl_sv_ref(pTHX_ SV *dst, const SV * const sv, const int ob); +Perl_sv_ref(pTHX_ SV *dst, const SV * const sv, const int ob) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_REF \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV const char * Perl_sv_reftype(pTHX_ const SV * const sv, const int ob) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_REFTYPE \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_regex_global_pos_clear(pTHX_ SV *sv); +Perl_sv_regex_global_pos_clear(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_REGEX_GLOBAL_POS_CLEAR \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV bool Perl_sv_regex_global_pos_get(pTHX_ SV *sv, STRLEN *posp, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_REGEX_GLOBAL_POS_GET \ - assert(sv); assert(posp) + Perl_assert_aTHX; assert(sv); assert(posp) PERL_CALLCONV void -Perl_sv_regex_global_pos_set(pTHX_ SV *sv, STRLEN pos, U32 flags); +Perl_sv_regex_global_pos_set(pTHX_ SV *sv, STRLEN pos, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_REGEX_GLOBAL_POS_SET \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_replace(pTHX_ SV * const sv, SV * const nsv); +Perl_sv_replace(pTHX_ SV * const sv, SV * const nsv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_REPLACE \ - assert(sv); assert(nsv) + Perl_assert_aTHX; assert(sv); assert(nsv) PERL_CALLCONV void -Perl_sv_report_used(pTHX); -#define PERL_ARGS_ASSERT_SV_REPORT_USED +Perl_sv_report_used(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_REPORT_USED \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_sv_reset(pTHX_ const char *s, HV * const stash); +Perl_sv_reset(pTHX_ const char *s, HV * const stash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_RESET \ - assert(s); assert(!stash || SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(s); assert(!stash || SvTYPE(stash) == SVt_PVHV) PERL_CALLCONV void Perl_sv_resetpvn(pTHX_ const char *s, STRLEN len, HV * const stash) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_SV_RESETPVN +#define PERL_ARGS_ASSERT_SV_RESETPVN \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_sv_rvunweaken(pTHX_ SV * const sv); +Perl_sv_rvunweaken(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_RVUNWEAKEN \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV SV * -Perl_sv_rvweaken(pTHX_ SV * const sv); +Perl_sv_rvweaken(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_RVWEAKEN \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_set_bool(pTHX_ SV *sv, const bool bool_val); +Perl_sv_set_bool(pTHX_ SV *sv, const bool bool_val) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SET_BOOL \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_set_false(pTHX_ SV *sv); +Perl_sv_set_false(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SET_FALSE \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_set_true(pTHX_ SV *sv); +Perl_sv_set_true(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SET_TRUE \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_set_undef(pTHX_ SV *sv); +Perl_sv_set_undef(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SET_UNDEF \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_sethek(pTHX_ SV * const sv, const HEK * const hek); +Perl_sv_sethek(pTHX_ SV * const sv, const HEK * const hek) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETHEK \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_setiv(pTHX_ SV * const sv, const IV num); +Perl_sv_setiv(pTHX_ SV * const sv, const IV num) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETIV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_setiv_mg(pTHX_ SV * const sv, const IV i); +Perl_sv_setiv_mg(pTHX_ SV * const sv, const IV i) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETIV_MG \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_setnv(pTHX_ SV * const sv, const NV num); +Perl_sv_setnv(pTHX_ SV * const sv, const NV num) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETNV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_setnv_mg(pTHX_ SV * const sv, const NV num); +Perl_sv_setnv_mg(pTHX_ SV * const sv, const NV num) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETNV_MG \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_setpv(pTHX_ SV * const sv, const char * const ptr); +Perl_sv_setpv(pTHX_ SV * const sv, const char * const ptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETPV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV char * -Perl_sv_setpv_bufsize(pTHX_ SV * const sv, const STRLEN cur, const STRLEN len); +Perl_sv_setpv_bufsize(pTHX_ SV * const sv, const STRLEN cur, const STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETPV_BUFSIZE \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_setpv_mg(pTHX_ SV * const sv, const char * const ptr); +Perl_sv_setpv_mg(pTHX_ SV * const sv, const char * const ptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETPV_MG \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void Perl_sv_setpvf(pTHX_ SV * const sv, const char * const pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__format__(__printf__,pTHX_2,pTHX_3); #define PERL_ARGS_ASSERT_SV_SETPVF \ - assert(sv); assert(pat) + Perl_assert_aTHX; assert(sv); assert(pat) PERL_CALLCONV void Perl_sv_setpvf_mg(pTHX_ SV * const sv, const char * const pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__format__(__printf__,pTHX_2,pTHX_3); #define PERL_ARGS_ASSERT_SV_SETPVF_MG \ - assert(sv); assert(pat) + Perl_assert_aTHX; assert(sv); assert(pat) PERL_CALLCONV void -Perl_sv_setpvn(pTHX_ SV * const sv, const char * const ptr, const STRLEN len); +Perl_sv_setpvn(pTHX_ SV * const sv, const char * const ptr, const STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETPVN \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_setpvn_fresh(pTHX_ SV * const sv, const char * const ptr, const STRLEN len); +Perl_sv_setpvn_fresh(pTHX_ SV * const sv, const char * const ptr, const STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETPVN_FRESH \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_setpvn_mg(pTHX_ SV * const sv, const char * const ptr, const STRLEN len); +Perl_sv_setpvn_mg(pTHX_ SV * const sv, const char * const ptr, const STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_SETPVN_MG \ - assert(sv); assert(ptr) + Perl_assert_aTHX; assert(sv); assert(ptr) PERL_CALLCONV SV * -Perl_sv_setref_iv(pTHX_ SV * const rv, const char * const classname, const IV iv); +Perl_sv_setref_iv(pTHX_ SV * const rv, const char * const classname, const IV iv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETREF_IV \ - assert(rv) + Perl_assert_aTHX; assert(rv) PERL_CALLCONV SV * -Perl_sv_setref_nv(pTHX_ SV * const rv, const char * const classname, const NV nv); +Perl_sv_setref_nv(pTHX_ SV * const rv, const char * const classname, const NV nv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETREF_NV \ - assert(rv) + Perl_assert_aTHX; assert(rv) PERL_CALLCONV SV * -Perl_sv_setref_pv(pTHX_ SV * const rv, const char * const classname, void * const pv); +Perl_sv_setref_pv(pTHX_ SV * const rv, const char * const classname, void * const pv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETREF_PV \ - assert(rv) + Perl_assert_aTHX; assert(rv) PERL_CALLCONV SV * -Perl_sv_setref_pvn(pTHX_ SV * const rv, const char * const classname, const char * const pv, const STRLEN n); +Perl_sv_setref_pvn(pTHX_ SV * const rv, const char * const classname, const char * const pv, const STRLEN n) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_SV_SETREF_PVN \ - assert(rv); assert(pv) + Perl_assert_aTHX; assert(rv); assert(pv) PERL_CALLCONV SV * -Perl_sv_setref_uv(pTHX_ SV * const rv, const char * const classname, const UV uv); +Perl_sv_setref_uv(pTHX_ SV * const rv, const char * const classname, const UV uv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETREF_UV \ - assert(rv) + Perl_assert_aTHX; assert(rv) PERL_CALLCONV void -Perl_sv_setrv_inc(pTHX_ SV * const sv, SV * const ref); +Perl_sv_setrv_inc(pTHX_ SV * const sv, SV * const ref) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_SETRV_INC \ - assert(sv); assert(ref) + Perl_assert_aTHX; assert(sv); assert(ref) PERL_CALLCONV void -Perl_sv_setrv_inc_mg(pTHX_ SV * const sv, SV * const ref); +Perl_sv_setrv_inc_mg(pTHX_ SV * const sv, SV * const ref) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_SETRV_INC_MG \ - assert(sv); assert(ref) + Perl_assert_aTHX; assert(sv); assert(ref) PERL_CALLCONV void -Perl_sv_setrv_noinc(pTHX_ SV * const sv, SV * const ref); +Perl_sv_setrv_noinc(pTHX_ SV * const sv, SV * const ref) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_SETRV_NOINC \ - assert(sv); assert(ref) + Perl_assert_aTHX; assert(sv); assert(ref) PERL_CALLCONV void -Perl_sv_setrv_noinc_mg(pTHX_ SV * const sv, SV * const ref); +Perl_sv_setrv_noinc_mg(pTHX_ SV * const sv, SV * const ref) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_SETRV_NOINC_MG \ - assert(sv); assert(ref) + Perl_assert_aTHX; assert(sv); assert(ref) + +PERL_CALLCONV void +Perl_sv_setsv(pTHX_ SV *dsv, SV *ssv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_SETSV \ + Perl_assert_aTHX; assert(dsv) PERL_CALLCONV void -Perl_sv_setsv_flags(pTHX_ SV *dsv, SV *ssv, const I32 flags); +Perl_sv_setsv_flags(pTHX_ SV *dsv, SV *ssv, const I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETSV_FLAGS \ - assert(dsv) + Perl_assert_aTHX; assert(dsv) PERL_CALLCONV void -Perl_sv_setsv_mg(pTHX_ SV * const dsv, SV * const ssv); +Perl_sv_setsv_mg(pTHX_ SV * const dsv, SV * const ssv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETSV_MG \ - assert(dsv) + Perl_assert_aTHX; assert(dsv) PERL_CALLCONV void -Perl_sv_setuv(pTHX_ SV * const sv, const UV num); +Perl_sv_setuv(pTHX_ SV * const sv, const UV num) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETUV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_setuv_mg(pTHX_ SV * const sv, const UV u); +Perl_sv_setuv_mg(pTHX_ SV * const sv, const UV u) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_SETUV_MG \ - assert(sv) + Perl_assert_aTHX; assert(sv) -/* PERL_CALLCONV bool -sv_streq(pTHX_ SV *sv1, SV *sv2); */ +PERL_CALLCONV bool +Perl_sv_streq(pTHX_ SV *sv1, SV *sv2) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_STREQ \ + Perl_assert_aTHX PERL_CALLCONV bool -Perl_sv_streq_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags); -#define PERL_ARGS_ASSERT_SV_STREQ_FLAGS +Perl_sv_streq_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_STREQ_FLAGS \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_sv_strftime_ints(pTHX_ SV *fmt, int sec, int min, int hour, int mday, int mon, int year, int isdst); +Perl_sv_strftime_ints(pTHX_ SV *fmt, int sec, int min, int hour, int mday, int mon, int year, int isdst) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_STRFTIME_INTS \ - assert(fmt) + Perl_assert_aTHX; assert(fmt) PERL_CALLCONV SV * -Perl_sv_strftime_tm(pTHX_ SV *fmt, const struct tm *mytm); +Perl_sv_strftime_tm(pTHX_ SV *fmt, const struct tm *mytm) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_STRFTIME_TM \ - assert(fmt); assert(mytm) + Perl_assert_aTHX; assert(fmt); assert(mytm) PERL_CALLCONV SV * -Perl_sv_string_from_errnum(pTHX_ int errnum, SV *tgtsv); -#define PERL_ARGS_ASSERT_SV_STRING_FROM_ERRNUM +Perl_sv_string_from_errnum(pTHX_ int errnum, SV *tgtsv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_STRING_FROM_ERRNUM \ + Perl_assert_aTHX + +PERL_CALLCONV void +Perl_sv_taint(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_TAINT \ + Perl_assert_aTHX; assert(sv) PERL_CALLCONV bool Perl_sv_tainted(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_TAINTED \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV I32 -Perl_sv_true(pTHX_ SV * const sv); -#define PERL_ARGS_ASSERT_SV_TRUE +Perl_sv_true(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SV_TRUE \ + Perl_assert_aTHX PERL_CALLCONV char * Perl_sv_uni_display(pTHX_ SV *dsv, SV *ssv, STRLEN pvlim, UV flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_SV_UNI_DISPLAY \ - assert(dsv); assert(ssv) + Perl_assert_aTHX; assert(dsv); assert(ssv) PERL_CALLCONV int -Perl_sv_unmagic(pTHX_ SV * const sv, const int type); +Perl_sv_unmagic(pTHX_ SV * const sv, const int type) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_UNMAGIC \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV int -Perl_sv_unmagicext(pTHX_ SV * const sv, const int type, const MGVTBL *vtbl); +Perl_sv_unmagicext(pTHX_ SV * const sv, const int type, const MGVTBL *vtbl) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_UNMAGICEXT \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_unref_flags(pTHX_ SV * const ref, const U32 flags); +Perl_sv_unref(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_UNREF \ + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV void +Perl_sv_unref_flags(pTHX_ SV * const ref, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_UNREF_FLAGS \ - assert(ref) + Perl_assert_aTHX; assert(ref) PERL_CALLCONV void -Perl_sv_untaint(pTHX_ SV * const sv); +Perl_sv_untaint(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_UNTAINT \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_upgrade(pTHX_ SV * const sv, svtype new_type); +Perl_sv_upgrade(pTHX_ SV * const sv, svtype new_type) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_UPGRADE \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_usepvn_flags(pTHX_ SV * const sv, char *ptr, const STRLEN len, const U32 flags); +Perl_sv_usepvn(pTHX_ SV *sv, char *ptr, STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_USEPVN \ + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV void +Perl_sv_usepvn_flags(pTHX_ SV * const sv, char *ptr, const STRLEN len, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_USEPVN_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV void +Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_USEPVN_MG \ + Perl_assert_aTHX; assert(sv) PERL_CALLCONV bool -Perl_sv_utf8_decode(pTHX_ SV * const sv); +Perl_sv_utf8_decode(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_UTF8_DECODE \ - assert(sv) + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV bool +Perl_sv_utf8_downgrade(pTHX_ SV * const sv, const bool fail_ok) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_UTF8_DOWNGRADE \ + Perl_assert_aTHX; assert(sv) PERL_CALLCONV bool -Perl_sv_utf8_downgrade_flags(pTHX_ SV * const sv, const bool fail_ok, const U32 flags); +Perl_sv_utf8_downgrade_flags(pTHX_ SV * const sv, const bool fail_ok, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_UTF8_DOWNGRADE_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) -/* PERL_CALLCONV bool -sv_utf8_downgrade_nomg(pTHX_ SV * const sv, const bool fail_ok); */ +PERL_CALLCONV bool +Perl_sv_utf8_downgrade_nomg(pTHX_ SV * const sv, const bool fail_ok) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_UTF8_DOWNGRADE_NOMG \ + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_utf8_encode(pTHX_ SV * const sv); +Perl_sv_utf8_encode(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_UTF8_ENCODE \ - assert(sv) + Perl_assert_aTHX; assert(sv) + +PERL_CALLCONV STRLEN +Perl_sv_utf8_upgrade(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_UTF8_UPGRADE \ + Perl_assert_aTHX; assert(sv) -/* PERL_CALLCONV STRLEN -sv_utf8_upgrade_flags(pTHX_ SV * const sv, const I32 flags); */ +PERL_CALLCONV STRLEN +Perl_sv_utf8_upgrade_flags(pTHX_ SV * const sv, const I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_UTF8_UPGRADE_FLAGS \ + Perl_assert_aTHX; assert(sv) PERL_CALLCONV STRLEN -Perl_sv_utf8_upgrade_flags_grow(pTHX_ SV * const sv, const I32 flags, STRLEN extra); +Perl_sv_utf8_upgrade_flags_grow(pTHX_ SV * const sv, const I32 flags, STRLEN extra) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_UTF8_UPGRADE_FLAGS_GROW \ - assert(sv) + Perl_assert_aTHX; assert(sv) -/* PERL_CALLCONV STRLEN -sv_utf8_upgrade_nomg(pTHX_ SV *sv); */ +PERL_CALLCONV STRLEN +Perl_sv_utf8_upgrade_nomg(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_SV_UTF8_UPGRADE_NOMG \ + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_sv_vcatpvf(pTHX_ SV * const sv, const char * const pat, va_list * const args); +Perl_sv_vcatpvf(pTHX_ SV * const sv, const char * const pat, va_list * const args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_VCATPVF \ - assert(sv); assert(pat) + Perl_assert_aTHX; assert(sv); assert(pat) PERL_CALLCONV void -Perl_sv_vcatpvf_mg(pTHX_ SV * const sv, const char * const pat, va_list * const args); +Perl_sv_vcatpvf_mg(pTHX_ SV * const sv, const char * const pat, va_list * const args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_VCATPVF_MG \ - assert(sv); assert(pat) + Perl_assert_aTHX; assert(sv); assert(pat) PERL_CALLCONV void -Perl_sv_vcatpvfn(pTHX_ SV * const sv, const char * const pat, const STRLEN patlen, va_list * const args, SV ** const svargs, const Size_t sv_count, bool * const maybe_tainted); +Perl_sv_vcatpvfn(pTHX_ SV * const sv, const char * const pat, const STRLEN patlen, va_list * const args, SV ** const svargs, const Size_t sv_count, bool * const maybe_tainted) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_VCATPVFN \ - assert(sv); assert(pat) + Perl_assert_aTHX; assert(sv); assert(pat) PERL_CALLCONV void -Perl_sv_vcatpvfn_flags(pTHX_ SV * const sv, const char * const pat, const STRLEN patlen, va_list * const args, SV ** const svargs, const Size_t sv_count, bool * const maybe_tainted, const U32 flags); +Perl_sv_vcatpvfn_flags(pTHX_ SV * const sv, const char * const pat, const STRLEN patlen, va_list * const args, SV ** const svargs, const Size_t sv_count, bool * const maybe_tainted, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_VCATPVFN_FLAGS \ - assert(sv); assert(pat) + Perl_assert_aTHX; assert(sv); assert(pat) PERL_CALLCONV void -Perl_sv_vsetpvf(pTHX_ SV * const sv, const char * const pat, va_list * const args); +Perl_sv_vsetpvf(pTHX_ SV * const sv, const char * const pat, va_list * const args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_VSETPVF \ - assert(sv); assert(pat) + Perl_assert_aTHX; assert(sv); assert(pat) PERL_CALLCONV void -Perl_sv_vsetpvf_mg(pTHX_ SV * const sv, const char * const pat, va_list * const args); +Perl_sv_vsetpvf_mg(pTHX_ SV * const sv, const char * const pat, va_list * const args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_VSETPVF_MG \ - assert(sv); assert(pat) + Perl_assert_aTHX; assert(sv); assert(pat) PERL_CALLCONV void -Perl_sv_vsetpvfn(pTHX_ SV * const sv, const char * const pat, const STRLEN patlen, va_list * const args, SV ** const svargs, const Size_t sv_count, bool * const maybe_tainted); +Perl_sv_vsetpvfn(pTHX_ SV * const sv, const char * const pat, const STRLEN patlen, va_list * const args, SV ** const svargs, const Size_t sv_count, bool * const maybe_tainted) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_SV_VSETPVFN \ - assert(sv); assert(pat) + Perl_assert_aTHX; assert(sv); assert(pat) PERL_CALLCONV const char * -Perl_sv_vstring_get(pTHX_ SV * const sv, STRLEN *lenp); +Perl_sv_vstring_get(pTHX_ SV * const sv, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_SV_VSTRING_GET \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_switch_to_global_locale(pTHX); -#define PERL_ARGS_ASSERT_SWITCH_TO_GLOBAL_LOCALE +Perl_switch_to_global_locale(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SWITCH_TO_GLOBAL_LOCALE \ + Perl_assert_aTHX PERL_CALLCONV bool -Perl_sync_locale(pTHX); -#define PERL_ARGS_ASSERT_SYNC_LOCALE +Perl_sync_locale(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_SYNC_LOCALE \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_sys_init(int *argc, char ***argv); +Perl_sys_init(int *argc, char ***argv) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2); #define PERL_ARGS_ASSERT_SYS_INIT \ assert(argc); assert(argv) PERL_CALLCONV void -Perl_sys_init3(int *argc, char ***argv, char ***env); +Perl_sys_init3(int *argc, char ***argv, char ***env) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3); #define PERL_ARGS_ASSERT_SYS_INIT3 \ assert(argc); assert(argv); assert(env) @@ -5120,411 +7936,678 @@ Perl_sys_term(void); #define PERL_ARGS_ASSERT_SYS_TERM PERL_CALLCONV void -Perl_taint_env(pTHX); -#define PERL_ARGS_ASSERT_TAINT_ENV +Perl_taint_env(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_TAINT_ENV \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_taint_proper(pTHX_ const char *f, const char * const s); +Perl_taint_proper(pTHX_ const char *f, const char * const s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_TAINT_PROPER \ - assert(s) + Perl_assert_aTHX; assert(s) PERL_CALLCONV OP * Perl_tied_method(pTHX_ SV *methname, SV **mark, SV * const sv, const MAGIC * const mg, const U32 flags, U32 argc, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_TIED_METHOD \ - assert(methname); assert(mark); assert(sv); assert(mg) + Perl_assert_aTHX; assert(methname); assert(mark); assert(sv); assert(mg) PERL_CALLCONV SSize_t -Perl_tmps_grow_p(pTHX_ SSize_t ix); -#define PERL_ARGS_ASSERT_TMPS_GROW_P +Perl_tmps_grow_p(pTHX_ SSize_t ix) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_TMPS_GROW_P \ + Perl_assert_aTHX + +PERL_CALLCONV UV +Perl_to_uni_fold(pTHX_ UV c, U8 *p, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +#define PERL_ARGS_ASSERT_TO_UNI_FOLD \ + Perl_assert_aTHX; assert(p); assert(lenp) -/* PERL_CALLCONV UV -to_uni_fold(pTHX_ UV c, U8 *p, STRLEN *lenp); */ +PERL_CALLCONV UV +Perl_to_uni_fold_flags_(pTHX_ UV c, U8 *p, STRLEN *lenp, U8 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +#define PERL_ARGS_ASSERT_TO_UNI_FOLD_FLAGS_ \ + Perl_assert_aTHX; assert(p); assert(lenp) PERL_CALLCONV UV -Perl_to_uni_lower(pTHX_ UV c, U8 *p, STRLEN *lenp); +Perl_to_uni_lower(pTHX_ UV c, U8 *p, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_TO_UNI_LOWER \ - assert(p); assert(lenp) + Perl_assert_aTHX; assert(p); assert(lenp) PERL_CALLCONV UV -Perl_to_uni_title(pTHX_ UV c, U8 *p, STRLEN *lenp); +Perl_to_uni_title(pTHX_ UV c, U8 *p, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_TO_UNI_TITLE \ - assert(p); assert(lenp) + Perl_assert_aTHX; assert(p); assert(lenp) PERL_CALLCONV UV -Perl_to_uni_upper(pTHX_ UV c, U8 *p, STRLEN *lenp); +Perl_to_uni_upper(pTHX_ UV c, U8 *p, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_TO_UNI_UPPER \ - assert(p); assert(lenp) + Perl_assert_aTHX; assert(p); assert(lenp) -PERL_CALLCONV bool -Perl_try_amagic_bin(pTHX_ int method, int flags); -#define PERL_ARGS_ASSERT_TRY_AMAGIC_BIN +PERL_CALLCONV UV +Perl_to_utf8_fold_flags_(pTHX_ const U8 *p, const U8 *e, U8 *ustrp, STRLEN *lenp, U8 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +#define PERL_ARGS_ASSERT_TO_UTF8_FOLD_FLAGS_ \ + Perl_assert_aTHX; assert(p); assert(e); assert(ustrp); assert(p < e) -PERL_CALLCONV bool -Perl_try_amagic_un(pTHX_ int method, int flags); -#define PERL_ARGS_ASSERT_TRY_AMAGIC_UN +PERL_CALLCONV UV +Perl_to_utf8_lower_flags_(pTHX_ const U8 *p, const U8 *e, U8 *ustrp, STRLEN *lenp, bool flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +#define PERL_ARGS_ASSERT_TO_UTF8_LOWER_FLAGS_ \ + Perl_assert_aTHX; assert(p); assert(e); assert(ustrp); assert(p < e) + +PERL_CALLCONV UV +Perl_to_utf8_title_flags_(pTHX_ const U8 *p, const U8 *e, U8 *ustrp, STRLEN *lenp, bool flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +#define PERL_ARGS_ASSERT_TO_UTF8_TITLE_FLAGS_ \ + Perl_assert_aTHX; assert(p); assert(e); assert(ustrp); assert(p < e) + +PERL_CALLCONV UV +Perl_to_utf8_upper_flags_(pTHX_ const U8 *p, const U8 *e, U8 *ustrp, STRLEN *lenp, bool flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +#define PERL_ARGS_ASSERT_TO_UTF8_UPPER_FLAGS_ \ + Perl_assert_aTHX; assert(p); assert(e); assert(ustrp); assert(p < e) + +PERL_CALLCONV bool +Perl_try_amagic_bin(pTHX_ int method, int flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_TRY_AMAGIC_BIN \ + Perl_assert_aTHX + +PERL_CALLCONV bool +Perl_try_amagic_un(pTHX_ int method, int flags) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_TRY_AMAGIC_UN \ + Perl_assert_aTHX PERL_CALLCONV char * Perl_uiv_2buf(char * const buf, const IV iv, UV uv, const int is_uv, char ** const peob) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(5) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_UIV_2BUF \ assert(buf); assert(peob) PERL_CALLCONV SSize_t -Perl_unpackstring(pTHX_ const char *pat, const char *patend, const char *s, const char *strend, U32 flags); +Perl_unpackstring(pTHX_ const char *pat, const char *patend, const char *s, const char *strend, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); #define PERL_ARGS_ASSERT_UNPACKSTRING \ - assert(pat); assert(patend); assert(s); assert(strend) + Perl_assert_aTHX; assert(pat); assert(patend); assert(s); assert(strend); \ + assert(pat <= patend); assert(s <= strend) PERL_CALLCONV void -Perl_unshare_hek(pTHX_ HEK *hek); -#define PERL_ARGS_ASSERT_UNSHARE_HEK +Perl_unshare_hek(pTHX_ HEK *hek) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_UNSHARE_HEK \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_unsharepvn(pTHX_ const char *sv, I32 len, U32 hash); -#define PERL_ARGS_ASSERT_UNSHAREPVN +Perl_unsharepvn(pTHX_ const char *sv, I32 len, U32 hash) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_UNSHAREPVN \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_upg_version(pTHX_ SV *ver, bool qv); +Perl_upg_version(pTHX_ SV *ver, bool qv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_UPG_VERSION \ - assert(ver) - -PERL_CALLCONV U8 * -Perl_utf16_to_utf8(pTHX_ U8 *p, U8 *d, Size_t bytelen, Size_t *newlen); -#define PERL_ARGS_ASSERT_UTF16_TO_UTF8 \ - assert(p); assert(d); assert(newlen) + Perl_assert_aTHX; assert(ver) PERL_CALLCONV U8 * -Perl_utf16_to_utf8_base(pTHX_ U8 *p, U8 *d, Size_t bytelen, Size_t *newlen, const bool high, const bool low); +Perl_utf16_to_utf8_base(pTHX_ U8 *p, U8 *d, Size_t bytelen, Size_t *newlen, const bool high, const bool low) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_4); #define PERL_ARGS_ASSERT_UTF16_TO_UTF8_BASE \ - assert(p); assert(d); assert(newlen) + Perl_assert_aTHX; assert(p); assert(d); assert(newlen) PERL_CALLCONV U8 * -Perl_utf16_to_utf8_reversed(pTHX_ U8 *p, U8 *d, Size_t bytelen, Size_t *newlen); -#define PERL_ARGS_ASSERT_UTF16_TO_UTF8_REVERSED \ - assert(p); assert(d); assert(newlen) - -/* PERL_CALLCONV U8 * Perl_utf8_hop_back(const U8 *s, SSize_t off, const U8 * const start) - __attribute__warn_unused_result__; */ + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_UTF8_HOP_BACK \ + assert(s); assert(start); assert(start <= s) -/* PERL_CALLCONV U8 * +PERL_CALLCONV U8 * Perl_utf8_hop_forward(const U8 *s, SSize_t off, const U8 * const end) - __attribute__warn_unused_result__; */ + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_UTF8_HOP_FORWARD \ + assert(s); assert(end); assert(s <= end) -/* PERL_CALLCONV U8 * +PERL_CALLCONV U8 * Perl_utf8_hop_safe(const U8 *s, SSize_t off, const U8 * const start, const U8 * const end) - __attribute__warn_unused_result__; */ + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3) + Perl_attribute_nonnull(4) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_UTF8_HOP_SAFE \ + assert(s); assert(start); assert(end); assert(start <= s); \ + assert(s <= end) PERL_CALLCONV STRLEN Perl_utf8_length(pTHX_ const U8 *s0, const U8 *e) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_UTF8_LENGTH \ - assert(s0); assert(e) + Perl_assert_aTHX; assert(s0); assert(e); assert(s0 <= e) PERL_CALLCONV U8 * -Perl_utf8_to_bytes(pTHX_ U8 *s, STRLEN *lenp); +Perl_utf8_to_bytes(pTHX_ U8 *s, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_UTF8_TO_BYTES \ - assert(s); assert(lenp) + Perl_assert_aTHX; assert(s); assert(lenp) PERL_CALLCONV bool -Perl_utf8_to_bytes_(pTHX_ U8 **s_ptr, STRLEN *lenp, void **free_me, Perl_utf8_to_bytes_arg result_as); +Perl_utf8_to_bytes_(pTHX_ U8 **s_ptr, STRLEN *lenp, void **free_me, Perl_utf8_to_bytes_arg result_as) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_UTF8_TO_BYTES_ \ - assert(s_ptr); assert(lenp); assert(free_me) + Perl_assert_aTHX; assert(s_ptr); assert(lenp); assert(free_me) PERL_CALLCONV U8 * -Perl_utf8_to_utf16_base(pTHX_ U8 *s, U8 *d, Size_t bytelen, Size_t *newlen, const bool high, const bool low); +Perl_utf8_to_utf16_base(pTHX_ U8 *s, U8 *d, Size_t bytelen, Size_t *newlen, const bool high, const bool low) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_4); #define PERL_ARGS_ASSERT_UTF8_TO_UTF16_BASE \ - assert(s); assert(d); assert(newlen) + Perl_assert_aTHX; assert(s); assert(d); assert(newlen) -/* PERL_CALLCONV bool -Perl_utf8_to_uv(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p); */ +PERL_CALLCONV bool +Perl_utf8_to_uv(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3); +#define PERL_ARGS_ASSERT_UTF8_TO_UV \ + assert(s); assert(e); assert(cp_p); assert(s <= e) -/* PERL_CALLCONV bool -Perl_utf8_to_uv_errors(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p, U32 flags, U32 *errors); */ +PERL_CALLCONV bool +Perl_utf8_to_uv_errors(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p, U32 flags, U32 *errors) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3); +#define PERL_ARGS_ASSERT_UTF8_TO_UV_ERRORS \ + assert(s); assert(e); assert(cp_p); assert(s <= e) -/* PERL_CALLCONV bool -Perl_utf8_to_uv_flags(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p, U32 flags); */ +PERL_CALLCONV bool +Perl_utf8_to_uv_flags(const U8 * const s, const U8 * const e, UV *cp_p, Size_t *advance_p, U32 flags) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3); +#define PERL_ARGS_ASSERT_UTF8_TO_UV_FLAGS \ + assert(s); assert(e); assert(cp_p); assert(s <= e) PERL_CALLCONV bool -Perl_utf8_to_uv_msgs_helper_(const U8 * const s0, const U8 * const e, UV *cp_p, Size_t *advance_p, U32 flags, U32 *errors, AV **msgs); +Perl_utf8_to_uv_msgs_helper_(const U8 * const s0, const U8 * const e, UV *cp_p, Size_t *advance_p, U32 flags, U32 *errors, AV **msgs) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3); #define PERL_ARGS_ASSERT_UTF8_TO_UV_MSGS_HELPER_ \ - assert(s0); assert(e); assert(cp_p) + assert(s0); assert(e); assert(cp_p); assert(s0 <= e) -/* PERL_CALLCONV UV -Perl_utf8n_to_uvchr(const U8 *s, STRLEN curlen, STRLEN *retlen, const U32 flags); */ +PERL_CALLCONV UV +Perl_utf8n_to_uvchr(const U8 *s, STRLEN curlen, STRLEN *retlen, const U32 flags) + Perl_attribute_nonnull(1); +#define PERL_ARGS_ASSERT_UTF8N_TO_UVCHR \ + assert(s) -/* PERL_CALLCONV UV -Perl_utf8n_to_uvchr_error(const U8 *s, STRLEN curlen, STRLEN *retlen, const U32 flags, U32 *errors); */ +PERL_CALLCONV UV +Perl_utf8n_to_uvchr_error(const U8 *s, STRLEN curlen, STRLEN *retlen, const U32 flags, U32 *errors) + Perl_attribute_nonnull(1); +#define PERL_ARGS_ASSERT_UTF8N_TO_UVCHR_ERROR \ + assert(s) PERL_CALLCONV void Perl_utilize(pTHX_ int aver, I32 floor, OP *version, OP *idop, OP *arg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_4) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_UTILIZE \ - assert(idop) + Perl_assert_aTHX; assert(idop) -/* PERL_CALLCONV U8 * -uvchr_to_utf8(pTHX_ U8 *d, UV uv); */ +PERL_CALLCONV U8 * +Perl_uv_to_utf8_msgs(pTHX_ U8 *d, UV uv, UV flags, HV **msgs) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_UV_TO_UTF8_MSGS \ + Perl_assert_aTHX; assert(d) -/* PERL_CALLCONV U8 * -uvchr_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags); */ +PERL_CALLCONV U8 * +Perl_uvchr_to_utf8(pTHX_ U8 *d, UV uv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_UVCHR_TO_UTF8 \ + Perl_assert_aTHX; assert(d) -/* PERL_CALLCONV U8 * -uvchr_to_utf8_flags_msgs(pTHX_ U8 *d, UV uv, UV flags, HV **msgs); */ +PERL_CALLCONV U8 * +Perl_uvchr_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_UVCHR_TO_UTF8_FLAGS \ + Perl_assert_aTHX; assert(d) + +PERL_CALLCONV U8 * +Perl_uvchr_to_utf8_flags_msgs(pTHX_ U8 *d, UV uv, UV flags, HV **msgs) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_UVCHR_TO_UTF8_FLAGS_MSGS \ + Perl_assert_aTHX; assert(d) PERL_CALLCONV U8 * -Perl_uvoffuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags); +Perl_uvoffuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_UVOFFUNI_TO_UTF8_FLAGS \ - assert(d) + Perl_assert_aTHX; assert(d) PERL_CALLCONV U8 * -Perl_uvoffuni_to_utf8_flags_msgs(pTHX_ U8 *d, UV input_uv, const UV flags, HV **msgs); +Perl_uvoffuni_to_utf8_flags_msgs(pTHX_ U8 *d, UV input_uv, const UV flags, HV **msgs) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_UVOFFUNI_TO_UTF8_FLAGS_MSGS \ - assert(d) + Perl_assert_aTHX; assert(d) PERL_CALLCONV bool -Perl_valid_identifier_pve(pTHX_ const char *s, const char *end, U32 flags); +Perl_valid_identifier_pve(pTHX_ const char *s, const char *end, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_VALID_IDENTIFIER_PVE \ - assert(s); assert(end) + Perl_assert_aTHX; assert(s); assert(end); assert(s <= end) PERL_CALLCONV bool -Perl_valid_identifier_pvn(pTHX_ const char *s, STRLEN len, U32 flags); +Perl_valid_identifier_pvn(pTHX_ const char *s, STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_VALID_IDENTIFIER_PVN \ - assert(s) + Perl_assert_aTHX; assert(s) PERL_CALLCONV bool -Perl_valid_identifier_sv(pTHX_ SV *sv); -#define PERL_ARGS_ASSERT_VALID_IDENTIFIER_SV +Perl_valid_identifier_sv(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_VALID_IDENTIFIER_SV \ + Perl_assert_aTHX + +PERL_CALLCONV UV +Perl_valid_utf8_to_uvchr(const U8 *s, STRLEN *retlen) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +#define PERL_ARGS_ASSERT_VALID_UTF8_TO_UVCHR \ + assert(s) PERL_CALLCONV bool -Perl_validate_proto(pTHX_ SV *name, SV *proto, bool warn, bool curstash); +Perl_validate_proto(pTHX_ SV *name, SV *proto, bool warn, bool curstash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_VALIDATE_PROTO \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV int -Perl_vcmp(pTHX_ SV *lhv, SV *rhv); +Perl_vcmp(pTHX_ SV *lhv, SV *rhv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_VCMP \ - assert(lhv); assert(rhv) + Perl_assert_aTHX; assert(lhv); assert(rhv) PERL_CALLCONV_NO_RET void Perl_vcroak(pTHX_ const char *pat, va_list *args) + Perl_attribute_nonnull_aTHX __attribute__noreturn__; -#define PERL_ARGS_ASSERT_VCROAK +#define PERL_ARGS_ASSERT_VCROAK \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_vdeb(pTHX_ const char *pat, va_list *args); +Perl_vdeb(pTHX_ const char *pat, va_list *args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_VDEB \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV void -Perl_vfatal_warner(pTHX_ U32 err, const char *pat, va_list *args); +Perl_vfatal_warner(pTHX_ U32 err, const char *pat, va_list *args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_VFATAL_WARNER \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV char * -Perl_vform(pTHX_ const char *pat, va_list *args); +Perl_vform(pTHX_ const char *pat, va_list *args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_VFORM \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV void -Perl_vivify_defelem(pTHX_ SV *sv); +Perl_vivify_defelem(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_VIVIFY_DEFELEM \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV SV * Perl_vivify_ref(pTHX_ SV *sv, U32 to_what) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_VIVIFY_REF \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV void -Perl_vload_module(pTHX_ U32 flags, SV *name, SV *ver, va_list *args); +Perl_vload_module(pTHX_ U32 flags, SV *name, SV *ver, va_list *args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_VLOAD_MODULE \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV SV * -Perl_vmess(pTHX_ const char *pat, va_list *args); +Perl_vmess(pTHX_ const char *pat, va_list *args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_VMESS \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV SV * Perl_vnewSVpvf(pTHX_ const char * const pat, va_list * const args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; #define PERL_ARGS_ASSERT_VNEWSVPVF \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV SV * -Perl_vnormal(pTHX_ SV *vs); +Perl_vnormal(pTHX_ SV *vs) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_VNORMAL \ - assert(vs) + Perl_assert_aTHX; assert(vs) PERL_CALLCONV SV * -Perl_vnumify(pTHX_ SV *vs); +Perl_vnumify(pTHX_ SV *vs) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_VNUMIFY \ - assert(vs) + Perl_assert_aTHX; assert(vs) PERL_CALLCONV SV * -Perl_vstringify(pTHX_ SV *vs); +Perl_vstringify(pTHX_ SV *vs) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_VSTRINGIFY \ - assert(vs) + Perl_assert_aTHX; assert(vs) PERL_CALLCONV SV * -Perl_vverify(pTHX_ SV *vs); +Perl_vverify(pTHX_ SV *vs) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_VVERIFY \ - assert(vs) + Perl_assert_aTHX; assert(vs) PERL_CALLCONV void -Perl_vwarn(pTHX_ const char *pat, va_list *args); +Perl_vwarn(pTHX_ const char *pat, va_list *args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_VWARN \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV void -Perl_vwarner(pTHX_ U32 err, const char *pat, va_list *args); +Perl_vwarner(pTHX_ U32 err, const char *pat, va_list *args) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_VWARNER \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV I32 Perl_wait4pid(pTHX_ Pid_t pid, int *statusp, int flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_WAIT4PID \ - assert(statusp) + Perl_assert_aTHX; assert(statusp) PERL_CALLCONV void Perl_warn(pTHX_ const char *pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__format__(__printf__,pTHX_1,pTHX_2); #define PERL_ARGS_ASSERT_WARN \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV void -Perl_warn_sv(pTHX_ SV *baseex); +Perl_warn_sv(pTHX_ SV *baseex) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_WARN_SV \ - assert(baseex) + Perl_assert_aTHX; assert(baseex) PERL_CALLCONV void Perl_warner(pTHX_ U32 err, const char *pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__format__(__printf__,pTHX_2,pTHX_3); #define PERL_ARGS_ASSERT_WARNER \ - assert(pat) + Perl_assert_aTHX; assert(pat) PERL_CALLCONV I32 Perl_was_lvalue_sub(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -#define PERL_ARGS_ASSERT_WAS_LVALUE_SUB +#define PERL_ARGS_ASSERT_WAS_LVALUE_SUB \ + Perl_assert_aTHX PERL_CALLCONV void Perl_watch(pTHX_ char **addr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_WATCH \ - assert(addr) + Perl_assert_aTHX; assert(addr) -/* PERL_CALLCONV I32 -whichsig(pTHX_ const char *sig); */ +PERL_CALLCONV I32 +Perl_whichsig(pTHX_ const char *sig) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +#define PERL_ARGS_ASSERT_WHICHSIG \ + Perl_assert_aTHX; assert(sig) PERL_CALLCONV I32 -Perl_whichsig_pv(pTHX_ const char *sig); +Perl_whichsig_pv(pTHX_ const char *sig) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_WHICHSIG_PV \ - assert(sig) + Perl_assert_aTHX; assert(sig) PERL_CALLCONV I32 -Perl_whichsig_pvn(pTHX_ const char *sig, STRLEN len); +Perl_whichsig_pvn(pTHX_ const char *sig, STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_WHICHSIG_PVN \ - assert(sig) + Perl_assert_aTHX; assert(sig) PERL_CALLCONV I32 -Perl_whichsig_sv(pTHX_ SV *sigsv); +Perl_whichsig_sv(pTHX_ SV *sigsv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); #define PERL_ARGS_ASSERT_WHICHSIG_SV \ - assert(sigsv) + Perl_assert_aTHX; assert(sigsv) PERL_CALLCONV void -Perl_wrap_infix_plugin(pTHX_ Perl_infix_plugin_t new_plugin, Perl_infix_plugin_t *old_plugin_p); +Perl_wrap_infix_plugin(pTHX_ Perl_infix_plugin_t new_plugin, Perl_infix_plugin_t *old_plugin_p) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_WRAP_INFIX_PLUGIN \ - assert(new_plugin); assert(old_plugin_p) + Perl_assert_aTHX; assert(new_plugin); assert(old_plugin_p) PERL_CALLCONV void -Perl_wrap_keyword_plugin(pTHX_ Perl_keyword_plugin_t new_plugin, Perl_keyword_plugin_t *old_plugin_p); +Perl_wrap_keyword_plugin(pTHX_ Perl_keyword_plugin_t new_plugin, Perl_keyword_plugin_t *old_plugin_p) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); #define PERL_ARGS_ASSERT_WRAP_KEYWORD_PLUGIN \ - assert(new_plugin); assert(old_plugin_p) + Perl_assert_aTHX; assert(new_plugin); assert(old_plugin_p) PERL_CALLCONV void -Perl_wrap_op_checker(pTHX_ Optype opcode, Perl_check_t new_checker, Perl_check_t *old_checker_p); +Perl_wrap_op_checker(pTHX_ Optype opcode, Perl_check_t new_checker, Perl_check_t *old_checker_p) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); #define PERL_ARGS_ASSERT_WRAP_OP_CHECKER \ - assert(new_checker); assert(old_checker_p) + Perl_assert_aTHX; assert(new_checker); assert(old_checker_p) PERL_CALLCONV void Perl_write_to_stderr(pTHX_ SV *msv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_WRITE_TO_STDERR \ - assert(msv) + Perl_assert_aTHX; assert(msv) PERL_CALLCONV void -Perl_xs_boot_epilog(pTHX_ const SSize_t ax); -#define PERL_ARGS_ASSERT_XS_BOOT_EPILOG +Perl_xs_boot_epilog(pTHX_ const SSize_t ax) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_XS_BOOT_EPILOG \ + Perl_assert_aTHX PERL_CALLCONV Stack_off_t -Perl_xs_handshake(const U32 key, void *v_my_perl, const char *file, ...); +Perl_xs_handshake(const U32 key, void *v_my_perl, const char *file, ...) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3); #define PERL_ARGS_ASSERT_XS_HANDSHAKE \ assert(v_my_perl); assert(file) PERL_CALLCONV int Perl_yyerror(pTHX_ const char * const s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_YYERROR \ - assert(s) + Perl_assert_aTHX; assert(s) PERL_CALLCONV int Perl_yyerror_pv(pTHX_ const char * const s, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); #define PERL_ARGS_ASSERT_YYERROR_PV \ - assert(s) + Perl_assert_aTHX; assert(s) PERL_CALLCONV int Perl_yyerror_pvn(pTHX_ const char * const s, STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_YYERROR_PVN +#define PERL_ARGS_ASSERT_YYERROR_PVN \ + Perl_assert_aTHX PERL_CALLCONV int -Perl_yylex(pTHX); -#define PERL_ARGS_ASSERT_YYLEX +Perl_yylex(pTHX) + Perl_attribute_nonnull_aTHX; +#define PERL_ARGS_ASSERT_YYLEX \ + Perl_assert_aTHX PERL_CALLCONV int Perl_yyparse(pTHX_ int gramtype) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_YYPARSE +#define PERL_ARGS_ASSERT_YYPARSE \ + Perl_assert_aTHX PERL_CALLCONV void Perl_yyquit(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_YYQUIT +#define PERL_ARGS_ASSERT_YYQUIT \ + Perl_assert_aTHX PERL_CALLCONV void Perl_yyunlex(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -#define PERL_ARGS_ASSERT_YYUNLEX +#define PERL_ARGS_ASSERT_YYUNLEX \ + Perl_assert_aTHX #if defined(DEBUGGING) PERL_CALLCONV int Perl_get_debug_opts(pTHX_ const char **s, bool givehelp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_GET_DEBUG_OPTS \ - assert(s) + Perl_assert_aTHX; assert(s) PERL_CALLCONV void -Perl_hv_assert(pTHX_ HV *hv); +Perl_hv_assert(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_HV_ASSERT \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void -Perl_pad_setsv(pTHX_ PADOFFSET po, SV *sv); +Perl_pad_setsv(pTHX_ PADOFFSET po, SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_PAD_SETSV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV SV * -Perl_pad_sv(pTHX_ PADOFFSET po); -# define PERL_ARGS_ASSERT_PAD_SV +Perl_pad_sv(pTHX_ PADOFFSET po) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PAD_SV \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_set_padlist(CV *cv, PADLIST *padlist); +Perl_set_padlist(CV *cv, PADLIST *padlist) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_SET_PADLIST \ assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) @@ -5532,39 +8615,37 @@ Perl_set_padlist(CV *cv, PADLIST *padlis #if defined(DEBUG_LEAKING_SCALARS_FORK_DUMP) PERL_CALLCONV void Perl_dump_sv_child(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_DUMP_SV_CHILD \ - assert(sv) - -#endif -#if !defined(EBCDIC) - -# if !defined(PERL_NO_INLINE_FUNCTIONS) -PERL_STATIC_INLINE unsigned int -Perl_variant_byte_number(PERL_UINTMAX_T word) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_VARIANT_BYTE_NUMBER + Perl_assert_aTHX; assert(sv) -# endif -#endif +#endif /* defined(DEBUG_LEAKING_SCALARS_FORK_DUMP) */ #if defined(F_FREESP) && !defined(HAS_CHSIZE) && !defined(HAS_TRUNCATE) PERL_CALLCONV I32 Perl_my_chsize(pTHX_ int fd, Off_t length) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_MY_CHSIZE +# define PERL_ARGS_ASSERT_MY_CHSIZE \ + Perl_assert_aTHX #endif #if !defined(HAS_GETENV_LEN) PERL_CALLCONV char * Perl_getenv_len(pTHX_ const char *env_elem, unsigned long *len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_GETENV_LEN \ - assert(env_elem); assert(len) + Perl_assert_aTHX; assert(env_elem); assert(len) -#endif +#endif /* !defined(HAS_GETENV_LEN) */ #if !defined(HAS_MKOSTEMP) PERL_CALLCONV int Perl_my_mkostemp(char *templte, int flags) + Perl_attribute_nonnull(1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_MY_MKOSTEMP \ assert(templte) @@ -5573,6 +8654,7 @@ Perl_my_mkostemp(char *templte, int flag #if !defined(HAS_MKSTEMP) PERL_CALLCONV int Perl_my_mkstemp(char *templte) + Perl_attribute_nonnull(1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_MY_MKSTEMP \ assert(templte) @@ -5581,58 +8663,81 @@ Perl_my_mkstemp(char *templte) #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) PERL_CALLCONV I32 Perl_do_ipcctl(pTHX_ I32 optype, SV **mark, SV **sp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_DO_IPCCTL \ - assert(mark); assert(sp) + Perl_assert_aTHX; assert(mark); assert(sp) PERL_CALLCONV I32 Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_DO_IPCGET \ - assert(mark); assert(sp) + Perl_assert_aTHX; assert(mark); assert(sp) PERL_CALLCONV SSize_t Perl_do_msgrcv(pTHX_ SV **mark, SV **sp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_DO_MSGRCV \ - assert(mark); assert(sp) + Perl_assert_aTHX; assert(mark); assert(sp) PERL_CALLCONV I32 Perl_do_msgsnd(pTHX_ SV **mark, SV **sp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_DO_MSGSND \ - assert(mark); assert(sp) + Perl_assert_aTHX; assert(mark); assert(sp) PERL_CALLCONV I32 Perl_do_semop(pTHX_ SV **mark, SV **sp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_DO_SEMOP \ - assert(mark); assert(sp) + Perl_assert_aTHX; assert(mark); assert(sp) PERL_CALLCONV I32 Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_DO_SHMIO \ - assert(mark); assert(sp) + Perl_assert_aTHX; assert(mark); assert(sp) #endif /* defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) */ #if defined(HAS_PIPE) PERL_CALLCONV int Perl_PerlProc_pipe_cloexec(pTHX_ int *pipefd) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_PERLPROC_PIPE_CLOEXEC \ - assert(pipefd) + Perl_assert_aTHX; assert(pipefd) -#endif +#endif /* defined(HAS_PIPE) */ #if !defined(HAS_RENAME) PERL_CALLCONV I32 Perl_same_dirent(pTHX_ const char *a, const char *b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_SAME_DIRENT \ - assert(a); assert(b) + Perl_assert_aTHX; assert(a); assert(b) -#endif +#endif /* !defined(HAS_RENAME) */ #if !defined(HAS_SIGNBIT) PERL_CALLCONV int Perl_signbit(NV f) @@ -5644,15 +8749,19 @@ Perl_signbit(NV f) #if defined(HAS_SOCKET) PERL_CALLCONV int Perl_PerlSock_accept_cloexec(pTHX_ int listenfd, struct sockaddr *addr, Sock_size_t *addrlen) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__ __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_PERLSOCK_ACCEPT_CLOEXEC +# define PERL_ARGS_ASSERT_PERLSOCK_ACCEPT_CLOEXEC \ + Perl_assert_aTHX PERL_CALLCONV int Perl_PerlSock_socket_cloexec(pTHX_ int domain, int type, int protocol) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__ __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_PERLSOCK_SOCKET_CLOEXEC +# define PERL_ARGS_ASSERT_PERLSOCK_SOCKET_CLOEXEC \ + Perl_assert_aTHX #endif /* defined(HAS_SOCKET) */ #if defined(HAS_SOCKETPAIR) || \ @@ -5660,51 +8769,57 @@ Perl_PerlSock_socket_cloexec(pTHX_ int d defined(SOCK_DGRAM) ) PERL_CALLCONV int Perl_PerlSock_socketpair_cloexec(pTHX_ int domain, int type, int protocol, int *pairfd) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_4) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_PERLSOCK_SOCKETPAIR_CLOEXEC \ - assert(pairfd) + Perl_assert_aTHX; assert(pairfd) -#endif +#endif /* defined(HAS_SOCKETPAIR) || + ( defined(AF_INET) && defined(HAS_SOCKET) && defined(PF_INET) && + defined(SOCK_DGRAM) ) */ #if !defined(HAS_STRLCPY) -STATIC Size_t +static Size_t Perl_my_strlcpy(char *dst, const char *src, Size_t size); # define PERL_ARGS_ASSERT_MY_STRLCPY #endif +#if !defined(HAS_STRNLEN) + +# if !defined(PERL_NO_INLINE_FUNCTIONS) +PERL_STATIC_INLINE Size_t +Perl_my_strnlen(const char *str, Size_t maxlen) + Perl_attribute_nonnull(1); +# define PERL_ARGS_ASSERT_MY_STRNLEN \ + assert(str) + +# endif +#endif /* !defined(HAS_STRNLEN) */ #if defined(HAVE_INTERP_INTERN) PERL_CALLCONV void -Perl_sys_intern_clear(pTHX); -# define PERL_ARGS_ASSERT_SYS_INTERN_CLEAR +Perl_sys_intern_clear(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_SYS_INTERN_CLEAR \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_sys_intern_init(pTHX); -# define PERL_ARGS_ASSERT_SYS_INTERN_INIT +Perl_sys_intern_init(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_SYS_INTERN_INIT \ + Perl_assert_aTHX # if defined(USE_ITHREADS) PERL_CALLCONV void -Perl_sys_intern_dup(pTHX_ struct interp_intern *src, struct interp_intern *dst); +Perl_sys_intern_dup(pTHX_ struct interp_intern *src, struct interp_intern *dst) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_SYS_INTERN_DUP \ - assert(src); assert(dst) + Perl_assert_aTHX; assert(src); assert(dst) -# endif +# endif /* defined(USE_ITHREADS) */ #endif /* defined(HAVE_INTERP_INTERN) */ -#if defined(_MSC_VER) -PERL_CALLCONV int -Perl_magic_regdatum_set(pTHX_ SV *sv, MAGIC *mg) - __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_MAGIC_REGDATUM_SET \ - assert(sv); assert(mg) - -#else -PERL_CALLCONV_NO_RET int -Perl_magic_regdatum_set(pTHX_ SV *sv, MAGIC *mg) - __attribute__noreturn__ - __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_MAGIC_REGDATUM_SET \ - assert(sv); assert(mg) - -#endif #if defined(MULTIPLICITY) PERL_CALLCONV_NO_RET void Perl_croak_nocontext(const char *pat, ...) @@ -5714,11 +8829,12 @@ Perl_croak_nocontext(const char *pat, .. PERL_CALLCONV void Perl_deb_nocontext(const char *pat, ...) + Perl_attribute_nonnull(1) __attribute__format__(__printf__,1,2); # define PERL_ARGS_ASSERT_DEB_NOCONTEXT \ assert(pat) -PERL_CALLCONV_NO_RET OP * +PERL_CALLCONV_NON_VOID_NO_RET(OP *) OP * Perl_die_nocontext(const char *pat, ...) __attribute__noreturn__ __attribute__format__null_ok__(__printf__,1,2); @@ -5726,64 +8842,80 @@ Perl_die_nocontext(const char *pat, ...) PERL_CALLCONV char * Perl_form_nocontext(const char *pat, ...) + Perl_attribute_nonnull(1) __attribute__format__(__printf__,1,2); # define PERL_ARGS_ASSERT_FORM_NOCONTEXT \ assert(pat) PERL_CALLCONV void -Perl_load_module_nocontext(U32 flags, SV *name, SV *ver, ...); +Perl_load_module_nocontext(U32 flags, SV *name, SV *ver, ...) + Perl_attribute_nonnull(2); # define PERL_ARGS_ASSERT_LOAD_MODULE_NOCONTEXT \ assert(name) PERL_CALLCONV SV * Perl_mess_nocontext(const char *pat, ...) + Perl_attribute_nonnull(1) __attribute__format__(__printf__,1,2); # define PERL_ARGS_ASSERT_MESS_NOCONTEXT \ assert(pat) PERL_CALLCONV void * -Perl_my_cxt_init(pTHX_ int *indexp, size_t size); +Perl_my_cxt_init(pTHX_ int *indexp, size_t size) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_MY_CXT_INIT \ - assert(indexp) + Perl_assert_aTHX; assert(indexp) PERL_CALLCONV SV * Perl_newSVpvf_nocontext(const char * const pat, ...) + Perl_attribute_nonnull(1) __attribute__format__(__printf__,1,2); # define PERL_ARGS_ASSERT_NEWSVPVF_NOCONTEXT \ assert(pat) PERL_CALLCONV void Perl_sv_catpvf_mg_nocontext(SV * const sv, const char * const pat, ...) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__format__(__printf__,2,3); # define PERL_ARGS_ASSERT_SV_CATPVF_MG_NOCONTEXT \ assert(sv); assert(pat) PERL_CALLCONV void Perl_sv_catpvf_nocontext(SV * const sv, const char * const pat, ...) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__format__(__printf__,2,3); # define PERL_ARGS_ASSERT_SV_CATPVF_NOCONTEXT \ assert(sv); assert(pat) PERL_CALLCONV void Perl_sv_setpvf_mg_nocontext(SV * const sv, const char * const pat, ...) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__format__(__printf__,2,3); # define PERL_ARGS_ASSERT_SV_SETPVF_MG_NOCONTEXT \ assert(sv); assert(pat) PERL_CALLCONV void Perl_sv_setpvf_nocontext(SV * const sv, const char * const pat, ...) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__format__(__printf__,2,3); # define PERL_ARGS_ASSERT_SV_SETPVF_NOCONTEXT \ assert(sv); assert(pat) PERL_CALLCONV void Perl_warn_nocontext(const char *pat, ...) + Perl_attribute_nonnull(1) __attribute__format__(__printf__,1,2); # define PERL_ARGS_ASSERT_WARN_NOCONTEXT \ assert(pat) PERL_CALLCONV void Perl_warner_nocontext(U32 err, const char *pat, ...) + Perl_attribute_nonnull(2) __attribute__format__(__printf__,2,3); # define PERL_ARGS_ASSERT_WARNER_NOCONTEXT \ assert(pat) @@ -5791,14 +8923,18 @@ Perl_warner_nocontext(U32 err, const cha #endif /* defined(MULTIPLICITY) */ #if defined(MYMALLOC) PERL_CALLCONV void -Perl_dump_mstats(pTHX_ const char *s); +Perl_dump_mstats(pTHX_ const char *s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_DUMP_MSTATS \ - assert(s) + Perl_assert_aTHX; assert(s) PERL_CALLCONV int -Perl_get_mstats(pTHX_ perl_mstats_t *buf, int buflen, int level); +Perl_get_mstats(pTHX_ perl_mstats_t *buf, int buflen, int level) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_GET_MSTATS \ - assert(buf) + Perl_assert_aTHX; assert(buf) PERL_CALLCONV MEM_SIZE Perl_malloc_good_size(size_t nbytes) @@ -5808,6 +8944,7 @@ Perl_malloc_good_size(size_t nbytes) PERL_CALLCONV MEM_SIZE Perl_malloced_size(void *p) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_MALLOCED_SIZE \ @@ -5815,881 +8952,838 @@ Perl_malloced_size(void *p) #endif /* defined(MYMALLOC) */ #if !defined(NO_MATHOMS) -PERL_CALLCONV bool -Perl_do_aexec(pTHX_ SV *really, SV **mark, SV **sp); -# define PERL_ARGS_ASSERT_DO_AEXEC \ - assert(mark); assert(sp) +PERL_CALLCONV void +Perl_load_mathoms(void); +# define PERL_ARGS_ASSERT_LOAD_MATHOMS -PERL_CALLCONV bool -Perl_do_open(pTHX_ GV *gv, const char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp); -# define PERL_ARGS_ASSERT_DO_OPEN \ - assert(gv); assert(name) +PERL_CALLCONV UV +Perl_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__deprecated__; +# define PERL_ARGS_ASSERT_UTF8_TO_UVCHR \ + Perl_assert_aTHX; assert(s) -PERL_CALLCONV GV * -Perl_gv_AVadd(pTHX_ GV *gv); -# define PERL_ARGS_ASSERT_GV_AVADD +PERL_CALLCONV UV +Perl_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__deprecated__; +# define PERL_ARGS_ASSERT_UTF8_TO_UVUNI \ + Perl_assert_aTHX; assert(s) -PERL_CALLCONV GV * -Perl_gv_HVadd(pTHX_ GV *gv); -# define PERL_ARGS_ASSERT_GV_HVADD +PERL_CALLCONV UV +Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__deprecated__; +# define PERL_ARGS_ASSERT_UTF8N_TO_UVUNI \ + Perl_assert_aTHX; assert(s) -PERL_CALLCONV GV * -Perl_gv_IOadd(pTHX_ GV *gv); -# define PERL_ARGS_ASSERT_GV_IOADD +PERL_CALLCONV U8 * +Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__deprecated__; +# define PERL_ARGS_ASSERT_UVUNI_TO_UTF8 \ + Perl_assert_aTHX; assert(d) + +# if defined(PERL_IN_MATHOMS_C) || defined(PERL_IN_OP_C) || \ + defined(PERL_IN_PERLY_C) || defined(PERL_IN_TOKE_C) +PERL_CALLCONV OP * +Perl_ref(pTHX_ OP *o, I32 type) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_REF \ + Perl_assert_aTHX + +# endif +#endif /* !defined(NO_MATHOMS) */ +#if defined(PERL_ANY_COW) +PERL_CALLCONV SV * +Perl_sv_setsv_cow(pTHX_ SV *dsv, SV *ssv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); +# define PERL_ARGS_ASSERT_SV_SETSV_COW \ + Perl_assert_aTHX; assert(ssv) + +#endif +#if defined(PERL_CORE) +PERL_CALLCONV void +Perl_opslab_force_free(pTHX_ OPSLAB *slab) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__visibility__("hidden"); +# define PERL_ARGS_ASSERT_OPSLAB_FORCE_FREE \ + Perl_assert_aTHX; assert(slab) PERL_CALLCONV void -Perl_gv_efullname3(pTHX_ SV *sv, const GV *gv, const char *prefix); -# define PERL_ARGS_ASSERT_GV_EFULLNAME3 \ - assert(sv); assert(gv) +Perl_opslab_free(pTHX_ OPSLAB *slab) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__visibility__("hidden"); +# define PERL_ARGS_ASSERT_OPSLAB_FREE \ + Perl_assert_aTHX; assert(slab) -PERL_CALLCONV GV * -Perl_gv_fetchmethod(pTHX_ HV *stash, const char *name); -# define PERL_ARGS_ASSERT_GV_FETCHMETHOD \ - assert(stash); assert(name) +PERL_CALLCONV void +Perl_opslab_free_nopad(pTHX_ OPSLAB *slab) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__visibility__("hidden"); +# define PERL_ARGS_ASSERT_OPSLAB_FREE_NOPAD \ + Perl_assert_aTHX; assert(slab) PERL_CALLCONV void -Perl_gv_fullname3(pTHX_ SV *sv, const GV *gv, const char *prefix); -# define PERL_ARGS_ASSERT_GV_FULLNAME3 \ - assert(sv); assert(gv) +Perl_parser_free_nexttoke_ops(pTHX_ yy_parser *parser, OPSLAB *slab) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + __attribute__visibility__("hidden"); +# define PERL_ARGS_ASSERT_PARSER_FREE_NEXTTOKE_OPS \ + Perl_assert_aTHX; assert(parser); assert(slab) -PERL_CALLCONV SV * -Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen, I32 flags); -# define PERL_ARGS_ASSERT_HV_DELETE \ - assert(key); assert(!hv || SvTYPE(hv) == SVt_PVHV) +# if defined(PERL_DEBUG_READONLY_OPS) +PERL_CALLCONV void +Perl_Slab_to_ro(pTHX_ OPSLAB *slab) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# define PERL_ARGS_ASSERT_SLAB_TO_RO \ + Perl_assert_aTHX; assert(slab) -PERL_CALLCONV SV * -Perl_hv_delete_ent(pTHX_ HV *hv, SV *keysv, I32 flags, U32 hash); -# define PERL_ARGS_ASSERT_HV_DELETE_ENT \ - assert(keysv); assert(!hv || SvTYPE(hv) == SVt_PVHV) +PERL_CALLCONV void +Perl_Slab_to_rw(pTHX_ OPSLAB * const slab) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# define PERL_ARGS_ASSERT_SLAB_TO_RW \ + Perl_assert_aTHX; assert(slab) -PERL_CALLCONV bool -Perl_hv_exists(pTHX_ HV *hv, const char *key, I32 klen) +# endif /* defined(PERL_DEBUG_READONLY_OPS) */ +# if !defined(PERL_NO_INLINE_FUNCTIONS) +PERL_STATIC_INLINE bool +S_should_warn_nl(const char *pv) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_HV_EXISTS \ - assert(key); assert(!hv || SvTYPE(hv) == SVt_PVHV) +# define PERL_ARGS_ASSERT_SHOULD_WARN_NL \ + assert(pv) +# endif +#endif /* defined(PERL_CORE) */ +#if defined(PERL_CORE) || defined(PERL_EXT) +/* PERL_CALLCONV U8 * +Perl_utf16_to_utf8(U8 *p, U8 *d, Size_t bytelen, Size_t *newlen); */ +/* PERL_CALLCONV U8 * +Perl_utf16_to_utf8_reversed(U8 *p, U8 *d, Size_t bytelen, Size_t *newlen); */ PERL_CALLCONV bool -Perl_hv_exists_ent(pTHX_ HV *hv, SV *keysv, U32 hash) +Perl_isSCRIPT_RUN(pTHX_ const U8 *s, const U8 *send, const bool utf8_target) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_HV_EXISTS_ENT \ - assert(keysv); assert(!hv || SvTYPE(hv) == SVt_PVHV) - -PERL_CALLCONV SV ** -Perl_hv_fetch(pTHX_ HV *hv, const char *key, I32 klen, I32 lval); -# define PERL_ARGS_ASSERT_HV_FETCH \ - assert(key); assert(!hv || SvTYPE(hv) == SVt_PVHV) +# define PERL_ARGS_ASSERT_ISSCRIPT_RUN \ + Perl_assert_aTHX; assert(s); assert(send); assert(s <= send) -PERL_CALLCONV HE * -Perl_hv_fetch_ent(pTHX_ HV *hv, SV *keysv, I32 lval, U32 hash); -# define PERL_ARGS_ASSERT_HV_FETCH_ENT \ - assert(keysv); assert(!hv || SvTYPE(hv) == SVt_PVHV) +# if !defined(HAS_MEMRCHR) -PERL_CALLCONV HE * -Perl_hv_iternext(pTHX_ HV *hv) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_HV_ITERNEXT \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) +# endif +# if defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || \ + defined(PERL_IN_REGCOMP_ANY) || defined(PERL_IN_UTF8_C) +/* PERL_CALLCONV void +invlist_intersection_(SV * const a, SV * const b, SV **i); */ +/* PERL_CALLCONV void +invlist_subtract_(SV * const a, SV * const b, SV **result); */ +/* PERL_CALLCONV void +invlist_union_(SV * const a, SV * const b, SV **output); */ +# endif +# if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) || \ + defined(PERL_IN_TOKE_C) +PERL_CALLCONV bool +Perl_is_grapheme(pTHX_ const U8 *strbeg, const U8 *s, const U8 *strend, const UV cp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + __attribute__warn_unused_result__ + __attribute__visibility__("hidden"); +# endif +# if defined(PERL_IN_REGCOMP_DEBUG_C) && defined(DEBUGGING) +static U8 +S_put_charclass_bitmap_innards(pTHX_ SV *sv, char *bitmap, SV *nonbitmap_invlist, SV *only_utf8_locale_invlist, const regnode * const node, const U8 flags, const bool force_as_is_display) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static SV * +S_put_charclass_bitmap_innards_common(pTHX_ SV *invlist, SV *posixes, SV *only_utf8, SV *not_utf8, SV *only_utf8_locale, const bool invert) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static void +S_put_charclass_bitmap_innards_invlist(pTHX_ SV *sv, SV *invlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +static void +S_put_code_point(pTHX_ SV *sv, UV c) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static void +S_put_range(pTHX_ SV *sv, UV start, const UV end, const bool allow_literals) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static void +S_regdump_extflags(pTHX_ const char *lead, const U32 flags) + Perl_attribute_nonnull_aTHX; +static void +S_regdump_intflags(pTHX_ const char *lead, const U32 flags) + Perl_attribute_nonnull_aTHX; +# endif /* defined(PERL_IN_REGCOMP_DEBUG_C) && defined(DEBUGGING) */ +#endif /* defined(PERL_CORE) || defined(PERL_EXT) */ +#if defined(PERL_CORE) || defined(PERL_USE_VOLATILE_API) +PERL_CALLCONV void +Perl_finalize_optree(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# define PERL_ARGS_ASSERT_FINALIZE_OPTREE \ + Perl_assert_aTHX; assert(o) PERL_CALLCONV void -Perl_hv_magic(pTHX_ HV *hv, GV *gv, int how); -# define PERL_ARGS_ASSERT_HV_MAGIC \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) +Perl_optimize_optree(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# define PERL_ARGS_ASSERT_OPTIMIZE_OPTREE \ + Perl_assert_aTHX; assert(o) -PERL_CALLCONV SV ** -Perl_hv_store(pTHX_ HV *hv, const char *key, I32 klen, SV *val, U32 hash); -# define PERL_ARGS_ASSERT_HV_STORE +#endif /* defined(PERL_CORE) || defined(PERL_USE_VOLATILE_API) */ +#if defined(PERL_DEBUG_READONLY_COW) +PERL_CALLCONV void +Perl_sv_buf_to_ro(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__visibility__("hidden"); +# define PERL_ARGS_ASSERT_SV_BUF_TO_RO \ + Perl_assert_aTHX; assert(sv) -PERL_CALLCONV HE * -Perl_hv_store_ent(pTHX_ HV *hv, SV *key, SV *val, U32 hash); -# define PERL_ARGS_ASSERT_HV_STORE_ENT - -PERL_CALLCONV SV ** -Perl_hv_store_flags(pTHX_ HV *hv, const char *key, I32 klen, SV *val, U32 hash, int flags); -# define PERL_ARGS_ASSERT_HV_STORE_FLAGS - -PERL_CALLCONV STRLEN -Perl_is_utf8_char_buf(const U8 *buf, const U8 *buf_end); -# define PERL_ARGS_ASSERT_IS_UTF8_CHAR_BUF \ - assert(buf); assert(buf_end) - -PERL_CALLCONV AV * -Perl_newAV(pTHX) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_NEWAV - -PERL_CALLCONV HV * -Perl_newHV(pTHX) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_NEWHV - -PERL_CALLCONV IO * -Perl_newIO(pTHX) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_NEWIO - -PERL_CALLCONV CV * -Perl_newSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *block); -# define PERL_ARGS_ASSERT_NEWSUB - -PERL_CALLCONV SV * -Perl_newSVsv(pTHX_ SV * const old) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_NEWSVSV - -PERL_CALLCONV void -Perl_save_freeop(pTHX_ OP *o); -# define PERL_ARGS_ASSERT_SAVE_FREEOP - -PERL_CALLCONV void -Perl_save_freepv(pTHX_ char *pv); -# define PERL_ARGS_ASSERT_SAVE_FREEPV - -PERL_CALLCONV void -Perl_save_freesv(pTHX_ SV *sv); -# define PERL_ARGS_ASSERT_SAVE_FREESV - -PERL_CALLCONV void -Perl_save_mortalizesv(pTHX_ SV *sv); -# define PERL_ARGS_ASSERT_SAVE_MORTALIZESV \ - assert(sv) - -PERL_CALLCONV void -Perl_save_op(pTHX); -# define PERL_ARGS_ASSERT_SAVE_OP - -PERL_CALLCONV bool -Perl_sv_2bool(pTHX_ SV * const sv); -# define PERL_ARGS_ASSERT_SV_2BOOL \ - assert(sv) - -PERL_CALLCONV IV -Perl_sv_2iv(pTHX_ SV *sv); -# define PERL_ARGS_ASSERT_SV_2IV \ - assert(sv) - -PERL_CALLCONV char * -Perl_sv_2pv(pTHX_ SV *sv, STRLEN *lp); -# define PERL_ARGS_ASSERT_SV_2PV \ - assert(sv) - -PERL_CALLCONV char * -Perl_sv_2pv_nolen(pTHX_ SV *sv) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_SV_2PV_NOLEN \ - assert(sv) - -PERL_CALLCONV char * -Perl_sv_2pvbyte(pTHX_ SV *sv, STRLEN * const lp); -# define PERL_ARGS_ASSERT_SV_2PVBYTE \ - assert(sv) - -PERL_CALLCONV char * -Perl_sv_2pvbyte_nolen(pTHX_ SV *sv) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_SV_2PVBYTE_NOLEN \ - assert(sv) - -PERL_CALLCONV char * -Perl_sv_2pvutf8(pTHX_ SV *sv, STRLEN * const lp); -# define PERL_ARGS_ASSERT_SV_2PVUTF8 \ - assert(sv) - -PERL_CALLCONV char * -Perl_sv_2pvutf8_nolen(pTHX_ SV *sv) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_SV_2PVUTF8_NOLEN \ - assert(sv) - -PERL_CALLCONV UV -Perl_sv_2uv(pTHX_ SV *sv); -# define PERL_ARGS_ASSERT_SV_2UV \ - assert(sv) - -PERL_CALLCONV void -Perl_sv_catpvn(pTHX_ SV * const dsv, const char *sstr, STRLEN len); -# define PERL_ARGS_ASSERT_SV_CATPVN \ - assert(dsv); assert(sstr) - -PERL_CALLCONV void -Perl_sv_catpvn_mg(pTHX_ SV * const dsv, const char *sstr, STRLEN len); -# define PERL_ARGS_ASSERT_SV_CATPVN_MG \ - assert(dsv); assert(sstr) - -PERL_CALLCONV void -Perl_sv_catsv(pTHX_ SV * const dsv, SV * const sstr); -# define PERL_ARGS_ASSERT_SV_CATSV \ - assert(dsv) - -PERL_CALLCONV void -Perl_sv_catsv_mg(pTHX_ SV * const dsv, SV * const sstr); -# define PERL_ARGS_ASSERT_SV_CATSV_MG \ - assert(dsv) - -PERL_CALLCONV void -Perl_sv_copypv(pTHX_ SV * const dsv, SV * const ssv); -# define PERL_ARGS_ASSERT_SV_COPYPV \ - assert(dsv); assert(ssv) - -PERL_CALLCONV I32 -Perl_sv_eq(pTHX_ SV *sv1, SV *sv2); -# define PERL_ARGS_ASSERT_SV_EQ - -PERL_CALLCONV void -Perl_sv_force_normal(pTHX_ SV *sv); -# define PERL_ARGS_ASSERT_SV_FORCE_NORMAL \ - assert(sv) - -PERL_CALLCONV void -Perl_sv_insert(pTHX_ SV * const bigstr, const STRLEN offset, const STRLEN len, const char * const little, const STRLEN littlelen); -# define PERL_ARGS_ASSERT_SV_INSERT \ - assert(bigstr); assert(little) - -PERL_CALLCONV SV * -Perl_sv_mortalcopy(pTHX_ SV * const oldsv) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_SV_MORTALCOPY - -PERL_CALLCONV void -Perl_sv_nolocking(pTHX_ SV *sv) - __attribute__deprecated__; -# define PERL_ARGS_ASSERT_SV_NOLOCKING - -PERL_CALLCONV void -Perl_sv_nounlocking(pTHX_ SV *sv) - __attribute__deprecated__; -# define PERL_ARGS_ASSERT_SV_NOUNLOCKING - -PERL_CALLCONV char * -Perl_sv_pv(pTHX_ SV *sv) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_SV_PV \ - assert(sv) - -PERL_CALLCONV char * -Perl_sv_pvbyte(pTHX_ SV *sv) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_SV_PVBYTE \ - assert(sv) - -PERL_CALLCONV char * -Perl_sv_pvn_force(pTHX_ SV *sv, STRLEN *lp); -# define PERL_ARGS_ASSERT_SV_PVN_FORCE \ - assert(sv) - -PERL_CALLCONV char * -Perl_sv_pvutf8(pTHX_ SV *sv) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_SV_PVUTF8 \ - assert(sv) - -PERL_CALLCONV void -Perl_sv_setsv(pTHX_ SV *dsv, SV *ssv); -# define PERL_ARGS_ASSERT_SV_SETSV \ - assert(dsv) - -PERL_CALLCONV void -Perl_sv_taint(pTHX_ SV *sv); -# define PERL_ARGS_ASSERT_SV_TAINT \ - assert(sv) - -PERL_CALLCONV void -Perl_sv_unref(pTHX_ SV *sv); -# define PERL_ARGS_ASSERT_SV_UNREF \ - assert(sv) - -PERL_CALLCONV void -Perl_sv_usepvn(pTHX_ SV *sv, char *ptr, STRLEN len); -# define PERL_ARGS_ASSERT_SV_USEPVN \ - assert(sv) - -PERL_CALLCONV void -Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len); -# define PERL_ARGS_ASSERT_SV_USEPVN_MG \ - assert(sv) - -PERL_CALLCONV bool -Perl_sv_utf8_downgrade(pTHX_ SV * const sv, const bool fail_ok); -# define PERL_ARGS_ASSERT_SV_UTF8_DOWNGRADE \ - assert(sv) - -PERL_CALLCONV STRLEN -Perl_sv_utf8_upgrade(pTHX_ SV *sv); -# define PERL_ARGS_ASSERT_SV_UTF8_UPGRADE \ - assert(sv) - -PERL_CALLCONV UV -Perl_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen) - __attribute__deprecated__; -# define PERL_ARGS_ASSERT_UTF8_TO_UVCHR \ - assert(s) - -PERL_CALLCONV UV -Perl_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen) - __attribute__deprecated__; -# define PERL_ARGS_ASSERT_UTF8_TO_UVUNI \ - assert(s) - -PERL_CALLCONV UV -Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags) - __attribute__deprecated__; -# define PERL_ARGS_ASSERT_UTF8N_TO_UVUNI \ - assert(s) - -PERL_CALLCONV U8 * -Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv) - __attribute__deprecated__; -# define PERL_ARGS_ASSERT_UVUNI_TO_UTF8 \ - assert(d) - -# if defined(PERL_DONT_CREATE_GVSV) -PERL_CALLCONV GV * -Perl_gv_SVadd(pTHX_ GV *gv); -# define PERL_ARGS_ASSERT_GV_SVADD - -# endif -# if defined(PERL_IN_MATHOMS_C) || defined(PERL_IN_OP_C) || \ - defined(PERL_IN_PERLY_C) || defined(PERL_IN_TOKE_C) -PERL_CALLCONV OP * -Perl_ref(pTHX_ OP *o, I32 type); -# define PERL_ARGS_ASSERT_REF - -# endif -# if defined(USE_LOCALE_COLLATE) -PERL_CALLCONV char * -Perl_sv_collxfrm(pTHX_ SV * const sv, STRLEN * const nxp); -# define PERL_ARGS_ASSERT_SV_COLLXFRM \ - assert(sv); assert(nxp) - -# endif -#endif /* !defined(NO_MATHOMS) */ -#if defined(PERL_ANY_COW) -PERL_CALLCONV SV * -Perl_sv_setsv_cow(pTHX_ SV *dsv, SV *ssv); -# define PERL_ARGS_ASSERT_SV_SETSV_COW \ - assert(ssv) - -#endif -#if defined(PERL_CORE) -PERL_CALLCONV void -Perl_opslab_force_free(pTHX_ OPSLAB *slab) - __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_OPSLAB_FORCE_FREE \ - assert(slab) - -PERL_CALLCONV void -Perl_opslab_free(pTHX_ OPSLAB *slab) - __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_OPSLAB_FREE \ - assert(slab) - -PERL_CALLCONV void -Perl_opslab_free_nopad(pTHX_ OPSLAB *slab) - __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_OPSLAB_FREE_NOPAD \ - assert(slab) - -PERL_CALLCONV void -Perl_parser_free_nexttoke_ops(pTHX_ yy_parser *parser, OPSLAB *slab) - __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_PARSER_FREE_NEXTTOKE_OPS \ - assert(parser); assert(slab) - -# if defined(PERL_DEBUG_READONLY_OPS) -PERL_CALLCONV void -Perl_Slab_to_ro(pTHX_ OPSLAB *slab); -# define PERL_ARGS_ASSERT_SLAB_TO_RO \ - assert(slab) - -PERL_CALLCONV void -Perl_Slab_to_rw(pTHX_ OPSLAB * const slab); -# define PERL_ARGS_ASSERT_SLAB_TO_RW \ - assert(slab) - -# endif /* defined(PERL_DEBUG_READONLY_OPS) */ -# if !defined(PERL_NO_INLINE_FUNCTIONS) -PERL_STATIC_INLINE bool -S_should_warn_nl(const char *pv) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_SHOULD_WARN_NL \ - assert(pv) - -# endif -#endif /* defined(PERL_CORE) */ -#if defined(PERL_CORE) || defined(PERL_EXT) -PERL_CALLCONV bool -Perl_isSCRIPT_RUN(pTHX_ const U8 *s, const U8 *send, const bool utf8_target) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_ISSCRIPT_RUN \ - assert(s); assert(send) - -#endif /* defined(PERL_CORE) || defined(PERL_EXT) */ -#if defined(PERL_CORE) || defined(PERL_USE_VOLATILE_API) -PERL_CALLCONV void -Perl_finalize_optree(pTHX_ OP *o); -# define PERL_ARGS_ASSERT_FINALIZE_OPTREE \ - assert(o) - -PERL_CALLCONV void -Perl_optimize_optree(pTHX_ OP *o); -# define PERL_ARGS_ASSERT_OPTIMIZE_OPTREE \ - assert(o) - -#endif /* defined(PERL_CORE) || defined(PERL_USE_VOLATILE_API) */ -#if defined(PERL_DEBUG_READONLY_COW) -PERL_CALLCONV void -Perl_sv_buf_to_ro(pTHX_ SV *sv) - __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_SV_BUF_TO_RO \ - assert(sv) - -#endif +#endif /* defined(PERL_DEBUG_READONLY_COW) */ #if defined(PERL_DEBUG_READONLY_OPS) PERL_CALLCONV PADOFFSET -Perl_op_refcnt_dec(pTHX_ OP *o); +Perl_op_refcnt_dec(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_OP_REFCNT_DEC \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * -Perl_op_refcnt_inc(pTHX_ OP *o); -# define PERL_ARGS_ASSERT_OP_REFCNT_INC +Perl_op_refcnt_inc(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_OP_REFCNT_INC \ + Perl_assert_aTHX #endif /* defined(PERL_DEBUG_READONLY_OPS) */ #if defined(PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION) PERL_CALLCONV bool Perl_do_exec(pTHX_ const char *cmd) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_DO_EXEC \ - assert(cmd) + Perl_assert_aTHX; assert(cmd) -#else +#else /* if !defined(PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION) */ PERL_CALLCONV bool Perl_do_exec(pTHX_ const char *cmd) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_DO_EXEC \ - assert(cmd) + Perl_assert_aTHX; assert(cmd) -#endif +#endif /* !defined(PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION) */ #if defined(PERL_IMPLICIT_SYS) PERL_CALLCONV PerlInterpreter * -perl_alloc_using(const struct IPerlMem **ipM, const struct IPerlMem **ipMS, const struct IPerlMem **ipMP, const struct IPerlEnv **ipE, const struct IPerlStdIO **ipStd, const struct IPerlLIO **ipLIO, const struct IPerlDir **ipD, const struct IPerlSock **ipS, const struct IPerlProc **ipP); +perl_alloc_using(const struct IPerlMem **ipM, const struct IPerlMem **ipMS, const struct IPerlMem **ipMP, const struct IPerlEnv **ipE, const struct IPerlStdIO **ipStd, const struct IPerlLIO **ipLIO, const struct IPerlDir **ipD, const struct IPerlSock **ipS, const struct IPerlProc **ipP) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3) + Perl_attribute_nonnull(4) + Perl_attribute_nonnull(5) + Perl_attribute_nonnull(6) + Perl_attribute_nonnull(7) + Perl_attribute_nonnull(8) + Perl_attribute_nonnull(9); # define PERL_ARGS_ASSERT_PERL_ALLOC_USING \ assert(ipM); assert(ipMS); assert(ipMP); assert(ipE); assert(ipStd); \ assert(ipLIO); assert(ipD); assert(ipS); assert(ipP) # if defined(USE_ITHREADS) PERL_CALLCONV PerlInterpreter * -perl_clone_using(PerlInterpreter *proto_perl, UV flags, const struct IPerlMem **ipM, const struct IPerlMem **ipMS, const struct IPerlMem **ipMP, const struct IPerlEnv **ipE, const struct IPerlStdIO **ipStd, const struct IPerlLIO **ipLIO, const struct IPerlDir **ipD, const struct IPerlSock **ipS, const struct IPerlProc **ipP); +perl_clone_using(PerlInterpreter *proto_perl, UV flags, const struct IPerlMem **ipM, const struct IPerlMem **ipMS, const struct IPerlMem **ipMP, const struct IPerlEnv **ipE, const struct IPerlStdIO **ipStd, const struct IPerlLIO **ipLIO, const struct IPerlDir **ipD, const struct IPerlSock **ipS, const struct IPerlProc **ipP) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3) + Perl_attribute_nonnull(4) + Perl_attribute_nonnull(5) + Perl_attribute_nonnull(6) + Perl_attribute_nonnull(7) + Perl_attribute_nonnull(8) + Perl_attribute_nonnull(9) + Perl_attribute_nonnull(10) + Perl_attribute_nonnull(11); # define PERL_ARGS_ASSERT_PERL_CLONE_USING \ assert(proto_perl); assert(ipM); assert(ipMS); assert(ipMP); assert(ipE); \ assert(ipStd); assert(ipLIO); assert(ipD); assert(ipS); assert(ipP) -# endif +# endif /* defined(USE_ITHREADS) */ #else /* if !defined(PERL_IMPLICIT_SYS) */ PERL_CALLCONV I32 -Perl_my_pclose(pTHX_ PerlIO *ptr); -# define PERL_ARGS_ASSERT_MY_PCLOSE +Perl_my_pclose(pTHX_ PerlIO *ptr) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_MY_PCLOSE \ + Perl_assert_aTHX PERL_CALLCONV PerlIO * -Perl_my_popen(pTHX_ const char *cmd, const char *mode); +Perl_my_popen(pTHX_ const char *cmd, const char *mode) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_MY_POPEN \ - assert(cmd); assert(mode) + Perl_assert_aTHX; assert(cmd); assert(mode) + +# if defined(USE_ITHREADS) + +# if !defined(PERL_NO_INLINE_FUNCTIONS) +PERL_STATIC_INLINE bool +S_PerlEnv_putenv(pTHX_ char *str) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# define PERL_ARGS_ASSERT_PERLENV_PUTENV \ + Perl_assert_aTHX; assert(str) +# endif +# endif /* defined(USE_ITHREADS) */ #endif /* !defined(PERL_IMPLICIT_SYS) */ #if defined(PERL_IN_AV_C) -STATIC MAGIC * -S_get_aux_mg(pTHX_ AV *av); +static MAGIC * +S_get_aux_mg(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_GET_AUX_MG \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) #endif #if defined(PERL_IN_BUILTIN_C) || defined(PERL_IN_OP_C) PERL_CALLCONV void Perl_XS_builtin_indexed(pTHX_ CV *cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_XS_BUILTIN_INDEXED \ - assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_CALLCONV void Perl_finish_export_lexical(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_FINISH_EXPORT_LEXICAL +# define PERL_ARGS_ASSERT_FINISH_EXPORT_LEXICAL \ + Perl_assert_aTHX PERL_CALLCONV void Perl_import_builtin_bundle(pTHX_ U16 ver) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_IMPORT_BUILTIN_BUNDLE +# define PERL_ARGS_ASSERT_IMPORT_BUILTIN_BUNDLE \ + Perl_assert_aTHX PERL_CALLCONV void Perl_prepare_export_lexical(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_PREPARE_EXPORT_LEXICAL +# define PERL_ARGS_ASSERT_PREPARE_EXPORT_LEXICAL \ + Perl_assert_aTHX #endif /* defined(PERL_IN_BUILTIN_C) || defined(PERL_IN_OP_C) */ #if defined(PERL_IN_CLASS_C) -STATIC void -S_class_cleanup_definition(pTHX_ HV *stash); +static void +S_class_cleanup_definition(pTHX_ HV *stash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CLASS_CLEANUP_DEFINITION \ - assert(stash); assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV) #endif #if defined(PERL_IN_CLASS_C) || defined(PERL_IN_GLOBALS_C) || \ defined(PERL_IN_OP_C) || defined(PERL_IN_PEEP_C) PERL_CALLCONV OP * +Perl_ck_aassign(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__warn_unused_result__ + __attribute__visibility__("hidden"); +# define PERL_ARGS_ASSERT_CK_AASSIGN \ + Perl_assert_aTHX; assert(o) + +PERL_CALLCONV OP * Perl_ck_anoncode(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_ANONCODE \ - assert(o) + Perl_assert_aTHX; assert(o) + +PERL_CALLCONV OP * +Perl_ck_anonhash(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__warn_unused_result__ + __attribute__visibility__("hidden"); +# define PERL_ARGS_ASSERT_CK_ANONHASH \ + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_backtick(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_BACKTICK \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_bitop(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_BITOP \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_classname(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_CLASSNAME \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_cmp(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_CMP \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_concat(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_CONCAT \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_defined(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_DEFINED \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_delete(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_DELETE \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_each(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_EACH \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_eof(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_EOF \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_eval(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_EVAL \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_exec(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_EXEC \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_exists(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_EXISTS \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_ftst(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_FTST \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_fun(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_FUN \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_glob(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_GLOB \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_grep(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_GREP \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_helemexistsor(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_HELEMEXISTSOR \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_index(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_INDEX \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_isa(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_ISA \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_join(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_JOIN \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_length(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_LENGTH \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_lfun(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_LFUN \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_listiob(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_LISTIOB \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_match(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_MATCH \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_method(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_METHOD \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_null(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_NULL \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_open(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_OPEN \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_prototype(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_PROTOTYPE \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_readline(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_READLINE \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_refassign(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_REFASSIGN \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_repeat(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_REPEAT \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_require(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_REQUIRE \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_return(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_RETURN \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_rfun(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_RFUN \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_rvconst(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_RVCONST \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_sassign(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_SASSIGN \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_scmp(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_SCMP \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_select(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_SELECT \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_shift(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_SHIFT \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_smartmatch(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_SMARTMATCH \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_sort(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_SORT \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_spair(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_SPAIR \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_split(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_SPLIT \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_stringify(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_STRINGIFY \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_subr(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_SUBR \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_substr(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_SUBSTR \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_svconst(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_SVCONST \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_tell(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_TELL \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_trunc(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_TRUNC \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV OP * Perl_ck_trycatch(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_CK_TRYCATCH \ - assert(o) + Perl_assert_aTHX; assert(o) #endif /* defined(PERL_IN_CLASS_C) || defined(PERL_IN_GLOBALS_C) || defined(PERL_IN_OP_C) || defined(PERL_IN_PEEP_C) */ @@ -6697,134 +9791,200 @@ Perl_ck_trycatch(pTHX_ OP *o) defined(PERL_IN_PAD_C) || defined(PERL_IN_PERLY_C) || \ defined(PERL_IN_TOKE_C) PERL_CALLCONV void -Perl_class_add_ADJUST(pTHX_ HV *stash, CV *cv); +Perl_class_add_ADJUST(pTHX_ HV *stash, CV *cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_CLASS_ADD_ADJUST \ - assert(stash); assert(cv); assert(SvTYPE(stash) == SVt_PVHV); \ - assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV); \ + assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_CALLCONV void -Perl_class_add_field(pTHX_ HV *stash, PADNAME *pn); +Perl_class_add_field(pTHX_ HV *stash, PADNAME *pn) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_CLASS_ADD_FIELD \ - assert(stash); assert(pn); assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV); \ + assert(pn) PERL_CALLCONV void -Perl_class_apply_attributes(pTHX_ HV *stash, OP *attrlist); +Perl_class_apply_attributes(pTHX_ HV *stash, OP *attrlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CLASS_APPLY_ATTRIBUTES \ - assert(stash); assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV) PERL_CALLCONV void -Perl_class_apply_field_attributes(pTHX_ PADNAME *pn, OP *attrlist); +Perl_class_apply_field_attributes(pTHX_ PADNAME *pn, OP *attrlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CLASS_APPLY_FIELD_ATTRIBUTES \ - assert(pn) + Perl_assert_aTHX; assert(pn) PERL_CALLCONV void -Perl_class_prepare_initfield_parse(pTHX); -# define PERL_ARGS_ASSERT_CLASS_PREPARE_INITFIELD_PARSE +Perl_class_prepare_initfield_parse(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_CLASS_PREPARE_INITFIELD_PARSE \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_class_prepare_method_parse(pTHX_ CV *cv); +Perl_class_prepare_method_parse(pTHX_ CV *cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CLASS_PREPARE_METHOD_PARSE \ - assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_CALLCONV void -Perl_class_seal_stash(pTHX_ HV *stash); +Perl_class_seal_stash(pTHX_ HV *stash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CLASS_SEAL_STASH \ - assert(stash); assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV) PERL_CALLCONV void -Perl_class_set_field_defop(pTHX_ PADNAME *pn, OPCODE defmode, OP *defop); +Perl_class_set_field_defop(pTHX_ PADNAME *pn, OPCODE defmode, OP *defop) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_CLASS_SET_FIELD_DEFOP \ - assert(pn); assert(defop) + Perl_assert_aTHX; assert(pn); assert(defop) PERL_CALLCONV void -Perl_class_setup_stash(pTHX_ HV *stash); +Perl_class_setup_stash(pTHX_ HV *stash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CLASS_SETUP_STASH \ - assert(stash); assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV) PERL_CALLCONV OP * -Perl_class_wrap_method_body(pTHX_ OP *o); -# define PERL_ARGS_ASSERT_CLASS_WRAP_METHOD_BODY +Perl_class_wrap_method_body(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_CLASS_WRAP_METHOD_BODY \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_croak_kw_unless_class(pTHX_ const char *kw); +Perl_croak_kw_unless_class(pTHX_ const char *kw) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CROAK_KW_UNLESS_CLASS \ - assert(kw) + Perl_assert_aTHX; assert(kw) #endif /* defined(PERL_IN_CLASS_C) || defined(PERL_IN_OP_C) || defined(PERL_IN_PAD_C) || defined(PERL_IN_PERLY_C) || defined(PERL_IN_TOKE_C) */ #if defined(PERL_IN_DEB_C) -STATIC void -S_deb_stack_n(pTHX_ SV **stack_base, SSize_t stack_min, SSize_t stack_max, SSize_t mark_min, SSize_t mark_max, SSize_t nonrc_base); +static void +S_deb_stack_n(pTHX_ SV **stack_base, SSize_t stack_min, SSize_t stack_max, SSize_t mark_min, SSize_t mark_max, SSize_t nonrc_base) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_DEB_STACK_N \ - assert(stack_base) + Perl_assert_aTHX; assert(stack_base) #endif #if defined(PERL_IN_DOIO_C) -STATIC bool -S_argvout_final(pTHX_ MAGIC *mg, IO *io, bool is_explicit); +static bool +S_argvout_final(pTHX_ MAGIC *mg, IO *io, bool is_explicit) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_ARGVOUT_FINAL \ - assert(mg); assert(io) + Perl_assert_aTHX; assert(mg); assert(io) -STATIC void -S_exec_failed(pTHX_ const char *cmd, int fd, int do_report); +static void +S_exec_failed(pTHX_ const char *cmd, int fd, int do_report) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_EXEC_FAILED \ - assert(cmd) + Perl_assert_aTHX; assert(cmd) -STATIC bool -S_is_fork_open(const char *name); +static bool +S_is_fork_open(const char *name) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_IS_FORK_OPEN \ assert(name) -STATIC bool -S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname, PerlIO *saveifp, PerlIO *saveofp, int savefd, char savetype, int writing, bool was_fdopen, const char *type, Stat_t *statbufp); +static bool +S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname, PerlIO *saveifp, PerlIO *saveofp, int savefd, char savetype, int writing, bool was_fdopen, const char *type, Stat_t *statbufp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5); # define PERL_ARGS_ASSERT_OPENN_CLEANUP \ - assert(gv); assert(io); assert(mode); assert(oname) + Perl_assert_aTHX; assert(gv); assert(io); assert(mode); assert(oname) -STATIC IO * -S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp, int *savefd, char *savetype); +static IO * +S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp, int *savefd, char *savetype) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5) + Perl_attribute_nonnull(pTHX_6); # define PERL_ARGS_ASSERT_OPENN_SETUP \ - assert(gv); assert(mode); assert(saveifp); assert(saveofp); \ - assert(savefd); assert(savetype) + Perl_assert_aTHX; assert(gv); assert(mode); assert(saveifp); \ + assert(saveofp); assert(savefd); assert(savetype) # if !defined(DOSISH) -STATIC bool +static bool S_ingroup(pTHX_ Gid_t testgid, bool effective) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_INGROUP +# define PERL_ARGS_ASSERT_INGROUP \ + Perl_assert_aTHX # endif #endif /* defined(PERL_IN_DOIO_C) */ #if defined(PERL_IN_DOOP_C) -STATIC Size_t +static Size_t S_do_trans_complex(pTHX_ SV * const sv, const OPtrans_map * const tbl) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_DO_TRANS_COMPLEX \ - assert(sv); assert(tbl) + Perl_assert_aTHX; assert(sv); assert(tbl) -STATIC Size_t +static Size_t S_do_trans_count(pTHX_ SV * const sv, const OPtrans_map * const tbl) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_DO_TRANS_COUNT \ - assert(sv); assert(tbl) + Perl_assert_aTHX; assert(sv); assert(tbl) -STATIC Size_t +static Size_t S_do_trans_count_invmap(pTHX_ SV * const sv, AV * const invmap) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_DO_TRANS_COUNT_INVMAP \ - assert(sv); assert(invmap); assert(SvTYPE(invmap) == SVt_PVAV) + Perl_assert_aTHX; assert(sv); assert(invmap); \ + assert(SvTYPE(invmap) == SVt_PVAV) -STATIC Size_t +static Size_t S_do_trans_invmap(pTHX_ SV * const sv, AV * const invmap) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_DO_TRANS_INVMAP \ - assert(sv); assert(invmap); assert(SvTYPE(invmap) == SVt_PVAV) + Perl_assert_aTHX; assert(sv); assert(invmap); \ + assert(SvTYPE(invmap) == SVt_PVAV) -STATIC Size_t +static Size_t S_do_trans_simple(pTHX_ SV * const sv, const OPtrans_map * const tbl) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_DO_TRANS_SIMPLE \ - assert(sv); assert(tbl) + Perl_assert_aTHX; assert(sv); assert(tbl) #endif /* defined(PERL_IN_DOOP_C) */ #if defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || \ @@ -6833,9 +9993,10 @@ S_do_trans_simple(pTHX_ SV * const sv, c defined(PERL_IN_UTF8_C) PERL_CALLCONV SSize_t -Perl__invlist_search(SV * const invlist, const UV cp) +Perl_invlist_search_(SV * const invlist, const UV cp) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT__INVLIST_SEARCH \ +# define PERL_ARGS_ASSERT_INVLIST_SEARCH_ \ assert(invlist) #endif /* defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || @@ -6849,44 +10010,49 @@ Perl__invlist_search(SV * const invlist, #if defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || \ defined(PERL_IN_REGCOMP_ANY) || defined(PERL_IN_UTF8_C) PERL_CALLCONV SV * -Perl__add_range_to_invlist(pTHX_ SV *invlist, UV start, UV end) +Perl_add_range_to_invlist_(pTHX_ SV *invlist, UV start, UV end) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT__ADD_RANGE_TO_INVLIST - -/* PERL_CALLCONV void -_invlist_intersection(pTHX_ SV * const a, SV * const b, SV **i); */ +# define PERL_ARGS_ASSERT_ADD_RANGE_TO_INVLIST_ \ + Perl_assert_aTHX PERL_CALLCONV void -Perl__invlist_intersection_maybe_complement_2nd(pTHX_ SV * const a, SV * const b, const bool complement_b, SV **i); -# define PERL_ARGS_ASSERT__INVLIST_INTERSECTION_MAYBE_COMPLEMENT_2ND \ - assert(b); assert(i) +Perl_invlist_intersection_maybe_complement_2nd_(pTHX_ SV * const a, SV * const b, const bool complement_b, SV **i) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_4); +# define PERL_ARGS_ASSERT_INVLIST_INTERSECTION_MAYBE_COMPLEMENT_2ND_ \ + Perl_assert_aTHX; assert(b); assert(i) PERL_CALLCONV void -Perl__invlist_invert(pTHX_ SV * const invlist); -# define PERL_ARGS_ASSERT__INVLIST_INVERT \ - assert(invlist) - -/* PERL_CALLCONV void -_invlist_subtract(pTHX_ SV * const a, SV * const b, SV **result); */ - -/* PERL_CALLCONV void -_invlist_union(pTHX_ SV * const a, SV * const b, SV **output); */ +Perl_invlist_invert_(pTHX_ SV * const invlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# define PERL_ARGS_ASSERT_INVLIST_INVERT_ \ + Perl_assert_aTHX; assert(invlist) PERL_CALLCONV void -Perl__invlist_union_maybe_complement_2nd(pTHX_ SV * const a, SV * const b, const bool complement_b, SV **output); -# define PERL_ARGS_ASSERT__INVLIST_UNION_MAYBE_COMPLEMENT_2ND \ - assert(b); assert(output) +Perl_invlist_union_maybe_complement_2nd_(pTHX_ SV * const a, SV * const b, const bool complement_b, SV **output) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_4); +# define PERL_ARGS_ASSERT_INVLIST_UNION_MAYBE_COMPLEMENT_2ND_ \ + Perl_assert_aTHX; assert(b); assert(output) PERL_CALLCONV SV * -Perl__new_invlist(pTHX_ IV initial_size) +Perl_new_invlist_(pTHX_ IV initial_size) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT__NEW_INVLIST +# define PERL_ARGS_ASSERT_NEW_INVLIST_ \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl__setup_canned_invlist(pTHX_ const STRLEN size, const UV element0, UV **other_elements_ptr) +Perl_setup_canned_invlist_(pTHX_ const STRLEN size, const UV element0, UV **other_elements_ptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT__SETUP_CANNED_INVLIST \ - assert(other_elements_ptr) +# define PERL_ARGS_ASSERT_SETUP_CANNED_INVLIST_ \ + Perl_assert_aTHX; assert(other_elements_ptr) #endif /* defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || defined(PERL_IN_REGCOMP_ANY) || defined(PERL_IN_UTF8_C) */ @@ -6894,27 +10060,46 @@ Perl__setup_canned_invlist(pTHX_ const S defined(PERL_IN_TOKE_C) PERL_CALLCONV const char * Perl_form_alien_digit_msg(pTHX_ const U8 which, const STRLEN valids_len, const char * const first_bad, const char * const send, const bool UTF, const bool braced) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_FORM_ALIEN_DIGIT_MSG \ - assert(first_bad); assert(send) + Perl_assert_aTHX; assert(first_bad); assert(send); \ + assert(first_bad < send) PERL_CALLCONV bool Perl_grok_bslash_c(pTHX_ const char source, U8 *result, const char **message, U32 *packed_warn) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_GROK_BSLASH_C \ - assert(result); assert(message) + Perl_assert_aTHX; assert(result); assert(message) PERL_CALLCONV bool Perl_grok_bslash_o(pTHX_ char **s, const char * const send, UV *uv, const char **message, U32 *packed_warn, const bool strict, const bool allow_UV_MAX, const bool utf8) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_GROK_BSLASH_O \ - assert(s); assert(send); assert(uv); assert(message) + Perl_assert_aTHX; assert(s); assert(*s); assert(send); assert(uv); \ + assert(message); assert(*s < send) PERL_CALLCONV bool Perl_grok_bslash_x(pTHX_ char **s, const char * const send, UV *uv, const char **message, U32 *packed_warn, const bool strict, const bool allow_UV_MAX, const bool utf8) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_GROK_BSLASH_X \ - assert(s); assert(send); assert(uv); assert(message) + Perl_assert_aTHX; assert(s); assert(*s); assert(send); assert(uv); \ + assert(message); assert(*s < send) #endif /* defined(PERL_IN_DQUOTE_C) || defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_TOKE_C) */ @@ -6922,98 +10107,154 @@ Perl_grok_bslash_x(pTHX_ char **s, const defined(PERL_IN_TOKE_C) || defined(PERL_IN_UTF8_C) PERL_CALLCONV const char * Perl_form_cp_too_large_msg(pTHX_ const U8 which, const char *string, const Size_t len, const UV cp) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_FORM_CP_TOO_LARGE_MSG +# define PERL_ARGS_ASSERT_FORM_CP_TOO_LARGE_MSG \ + Perl_assert_aTHX #endif #if defined(PERL_IN_DUMP_C) -STATIC CV * -S_deb_curcv(pTHX_ I32 ix); -# define PERL_ARGS_ASSERT_DEB_CURCV - -STATIC void -S_debprof(pTHX_ const OP *o); +static CV * +S_deb_curcv(pTHX_ I32 ix) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_DEB_CURCV \ + Perl_assert_aTHX + +static void +S_debprof(pTHX_ const OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_DEBPROF \ - assert(o) + Perl_assert_aTHX; assert(o) -STATIC SV * -S_pm_description(pTHX_ const PMOP *pm); +static SV * +S_pm_description(pTHX_ const PMOP *pm) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_PM_DESCRIPTION \ - assert(pm) + Perl_assert_aTHX; assert(pm) -STATIC UV -S_sequence_num(pTHX_ const OP *o); -# define PERL_ARGS_ASSERT_SEQUENCE_NUM +static char * +S_pv_display_flags(pTHX_ SV *dsv, const char *pv, STRLEN cur, STRLEN len, STRLEN pvlim, I32 pretty_flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +# define PERL_ARGS_ASSERT_PV_DISPLAY_FLAGS \ + Perl_assert_aTHX; assert(dsv); assert(pv) + +static UV +S_sequence_num(pTHX_ const OP *o) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_SEQUENCE_NUM \ + Perl_assert_aTHX #endif /* defined(PERL_IN_DUMP_C) */ #if defined(PERL_IN_DUMP_C) || defined(PERL_IN_HV_C) || \ defined(PERL_IN_SCOPE_C) || defined(PERL_IN_SV_C) PERL_CALLCONV void Perl_hv_kill_backrefs(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_HV_KILL_BACKREFS \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) -#endif +#endif /* defined(PERL_IN_DUMP_C) || defined(PERL_IN_HV_C) || + defined(PERL_IN_SCOPE_C) || defined(PERL_IN_SV_C) */ #if defined(PERL_IN_DUMP_C) || defined(PERL_IN_OP_C) || \ defined(PERL_IN_REGCOMP_ANY) PERL_CALLCONV void -Perl__invlist_dump(pTHX_ PerlIO *file, I32 level, const char * const indent, SV * const invlist); -# define PERL_ARGS_ASSERT__INVLIST_DUMP \ - assert(file); assert(indent); assert(invlist) +Perl_invlist_dump_(pTHX_ PerlIO *file, I32 level, const char * const indent, SV * const invlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); +# define PERL_ARGS_ASSERT_INVLIST_DUMP_ \ + Perl_assert_aTHX; assert(file); assert(indent); assert(invlist) -#endif +#endif /* defined(PERL_IN_DUMP_C) || defined(PERL_IN_OP_C) || + defined(PERL_IN_REGCOMP_ANY) */ #if defined(PERL_IN_GV_C) -STATIC bool -S_find_default_stash(pTHX_ HV **stash, const char *name, STRLEN len, const U32 is_utf8, const I32 add, const svtype sv_type); +static bool +S_find_default_stash(pTHX_ HV **stash, const char *name, STRLEN len, const U32 is_utf8, const I32 add, const svtype sv_type) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_FIND_DEFAULT_STASH \ - assert(stash); assert(name) + Perl_assert_aTHX; assert(stash); assert(name) -STATIC void -S_gv_init_svtype(pTHX_ GV *gv, const svtype sv_type); +static void +S_gv_init_svtype(pTHX_ GV *gv, const svtype sv_type) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_GV_INIT_SVTYPE \ - assert(gv) + Perl_assert_aTHX; assert(gv) -STATIC bool -S_gv_is_in_main(pTHX_ const char *name, STRLEN len, const U32 is_utf8); +static bool +S_gv_is_in_main(pTHX_ const char *name, STRLEN len, const U32 is_utf8) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_GV_IS_IN_MAIN \ - assert(name) + Perl_assert_aTHX; assert(name) -STATIC bool -S_gv_magicalize(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, const svtype sv_type); +static bool +S_gv_magicalize(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, const svtype sv_type) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_GV_MAGICALIZE \ - assert(gv); assert(stash); assert(name); \ - assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(gv); assert(stash); \ + assert(SvTYPE(stash) == SVt_PVHV); assert(name) -STATIC void -S_gv_magicalize_isa(pTHX_ GV *gv); +static void +S_gv_magicalize_isa(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_GV_MAGICALIZE_ISA \ - assert(gv) + Perl_assert_aTHX; assert(gv) -STATIC void -S_maybe_multimagic_gv(pTHX_ GV *gv, const char *name, const svtype sv_type); +static void +S_maybe_multimagic_gv(pTHX_ GV *gv, const char *name, const svtype sv_type) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_MAYBE_MULTIMAGIC_GV \ - assert(gv); assert(name) + Perl_assert_aTHX; assert(gv); assert(name) -STATIC bool -S_parse_gv_stash_name(pTHX_ HV **stash, GV **gv, const char **name, STRLEN *len, const char *nambeg, STRLEN full_len, const U32 is_utf8, const I32 add); +static bool +S_parse_gv_stash_name(pTHX_ HV **stash, GV **gv, const char **name, STRLEN *len, const char *nambeg, STRLEN full_len, const U32 is_utf8, const I32 add) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5); # define PERL_ARGS_ASSERT_PARSE_GV_STASH_NAME \ - assert(stash); assert(gv); assert(name); assert(len); assert(nambeg) + Perl_assert_aTHX; assert(stash); assert(gv); assert(name); assert(*name); \ + assert(len); assert(nambeg); assert(nambeg <= *name) -STATIC void -S_require_tie_mod(pTHX_ GV *gv, const char varname, const char *name, STRLEN len, const U32 flags); +static void +S_require_tie_mod(pTHX_ GV *gv, const char varname, const char *name, STRLEN len, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_REQUIRE_TIE_MOD \ - assert(gv); assert(varname); assert(name) + Perl_assert_aTHX; assert(gv); assert(name) # if !defined(PERL_NO_INLINE_FUNCTIONS) PERL_STATIC_INLINE GV * -S_gv_fetchmeth_internal(pTHX_ HV *stash, SV *meth, const char *name, STRLEN len, I32 level, U32 flags); -# define PERL_ARGS_ASSERT_GV_FETCHMETH_INTERNAL +S_gv_fetchmeth_internal(pTHX_ HV *stash, SV *meth, const char *name, STRLEN len, I32 level, U32 flags) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_GV_FETCHMETH_INTERNAL \ + Perl_assert_aTHX; assert(!stash || SvTYPE(stash) == SVt_PVHV) PERL_STATIC_INLINE HV * -S_gv_stashpvn_internal(pTHX_ const char *name, U32 namelen, I32 flags); +S_gv_stashpvn_internal(pTHX_ const char *name, U32 namelen, I32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_GV_STASHPVN_INTERNAL \ - assert(name) + Perl_assert_aTHX; assert(name) # endif /* !defined(PERL_NO_INLINE_FUNCTIONS) */ #endif /* defined(PERL_IN_GV_C) */ @@ -7021,635 +10262,940 @@ S_gv_stashpvn_internal(pTHX_ const char defined(PERL_IN_PAD_C) || defined(PERL_IN_SV_C) PERL_CALLCONV void Perl_sv_add_backref(pTHX_ SV * const tsv, SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_SV_ADD_BACKREF \ - assert(tsv); assert(sv) + Perl_assert_aTHX; assert(tsv); assert(sv) -#endif +#endif /* defined(PERL_IN_GV_C) || defined(PERL_IN_OP_C) || + defined(PERL_IN_PAD_C) || defined(PERL_IN_SV_C) */ #if defined(PERL_IN_GV_C) || defined(PERL_IN_UNIVERSAL_C) +# define PERL_ARGS_ASSERT_GV_STASHSVPVN_CACHED \ + Perl_assert_aTHX; assert(namesv || name) + +# if defined(PERL_CORE) || defined(PERL_EXT) PERL_CALLCONV HV * Perl_gv_stashsvpvn_cached(pTHX_ SV *namesv, const char *name, U32 namelen, I32 flags) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); - -#endif +# endif +#endif /* defined(PERL_IN_GV_C) || defined(PERL_IN_UNIVERSAL_C) */ #if defined(PERL_IN_HV_C) -STATIC void -S_clear_placeholders(pTHX_ HV *hv, U32 items); +static void +S_clear_placeholders(pTHX_ HV *hv, U32 items) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CLEAR_PLACEHOLDERS \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) -STATIC void -S_hsplit(pTHX_ HV *hv, STRLEN const oldsize, STRLEN newsize); +static void +S_hsplit(pTHX_ HV *hv, STRLEN const oldsize, STRLEN newsize) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_HSPLIT \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) -STATIC struct xpvhv_aux * -S_hv_auxinit(pTHX_ HV *hv); +static struct xpvhv_aux * +S_hv_auxinit(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_HV_AUXINIT \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) - -STATIC SV * -S_hv_delete_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, int k_flags, I32 d_flags, U32 hash); -# define PERL_ARGS_ASSERT_HV_DELETE_COMMON + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) -STATIC SV * -S_hv_free_ent_ret(pTHX_ HE *entry); +static SV * +S_hv_delete_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, int k_flags, I32 d_flags, U32 hash) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_HV_DELETE_COMMON \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV) + +static SV * +S_hv_free_ent_ret(pTHX_ HE *entry) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_HV_FREE_ENT_RET \ - assert(entry) + Perl_assert_aTHX; assert(entry) -STATIC void -S_hv_free_entries(pTHX_ HV *hv); +static void +S_hv_free_entries(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_HV_FREE_ENTRIES \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) -STATIC void -S_hv_magic_check(HV *hv, bool *needs_copy, bool *needs_store); +static void +S_hv_magic_check(HV *hv, bool *needs_copy, bool *needs_store) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3); # define PERL_ARGS_ASSERT_HV_MAGIC_CHECK \ - assert(hv); assert(needs_copy); assert(needs_store); \ - assert(SvTYPE(hv) == SVt_PVHV) + assert(hv); assert(SvTYPE(hv) == SVt_PVHV); assert(needs_copy); \ + assert(needs_store) PERL_STATIC_NO_RET void S_hv_notallowed(pTHX_ int flags, const char *key, I32 klen, const char *msg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_4) __attribute__noreturn__; # define PERL_ARGS_ASSERT_HV_NOTALLOWED \ - assert(key); assert(msg) + Perl_assert_aTHX; assert(key); assert(msg) -STATIC SV * -S_refcounted_he_value(pTHX_ const struct refcounted_he *he); +static SV * +S_refcounted_he_value(pTHX_ const struct refcounted_he *he) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_REFCOUNTED_HE_VALUE \ - assert(he) + Perl_assert_aTHX; assert(he) -STATIC HEK * +static HEK * S_save_hek_flags(const char *str, I32 len, U32 hash, int flags) + Perl_attribute_nonnull(1) __attribute__malloc__ __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SAVE_HEK_FLAGS \ assert(str) -STATIC HEK * +static HEK * S_share_hek_flags(pTHX_ const char *str, STRLEN len, U32 hash, int flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SHARE_HEK_FLAGS \ - assert(str) + Perl_assert_aTHX; assert(str) -STATIC void -S_unshare_hek_or_pvn(pTHX_ const HEK *hek, const char *str, I32 len, U32 hash); -# define PERL_ARGS_ASSERT_UNSHARE_HEK_OR_PVN +static void +S_unshare_hek_or_pvn(pTHX_ const HEK *hek, const char *str, I32 len, U32 hash) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_UNSHARE_HEK_OR_PVN \ + Perl_assert_aTHX # if !defined(PURIFY) -STATIC HE * +static HE * S_new_he(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_NEW_HE +# define PERL_ARGS_ASSERT_NEW_HE \ + Perl_assert_aTHX # endif #endif /* defined(PERL_IN_HV_C) */ #if defined(PERL_IN_HV_C) || defined(PERL_IN_MG_C) || defined(PERL_IN_SV_C) PERL_CALLCONV void Perl_sv_kill_backrefs(pTHX_ SV * const sv, AV * const av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_SV_KILL_BACKREFS \ - assert(sv) + Perl_assert_aTHX; assert(sv) -#endif +#endif /* defined(PERL_IN_HV_C) || defined(PERL_IN_MG_C) || + defined(PERL_IN_SV_C) */ #if defined(PERL_IN_HV_C) || defined(PERL_IN_SV_C) PERL_CALLCONV SV * Perl_hfree_next_entry(pTHX_ HV *hv, STRLEN *indexp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_HFREE_NEXT_ENTRY \ - assert(hv); assert(indexp); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV); \ + assert(indexp) -#endif +#endif /* defined(PERL_IN_HV_C) || defined(PERL_IN_SV_C) */ #if defined(PERL_IN_LOCALE_C) -STATIC utf8ness_t -S_get_locale_string_utf8ness_i(pTHX_ const char *string, const locale_utf8ness_t known_utf8, const char *locale, const locale_category_index cat_index); -# define PERL_ARGS_ASSERT_GET_LOCALE_STRING_UTF8NESS_I - -STATIC void -S_ints_to_tm(pTHX_ struct tm *my_tm, const char *locale, int sec, int min, int hour, int mday, int mon, int year, int isdst); +static utf8ness_t +S_get_locale_string_utf8ness_i(pTHX_ const char *string, const locale_utf8ness_t known_utf8, const char *locale, const locale_category_index cat_index) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_GET_LOCALE_STRING_UTF8NESS_I \ + Perl_assert_aTHX + +static void +S_ints_to_tm(pTHX_ struct tm *mytm, const char *locale, int sec, int min, int hour, int mday, int mon, int year, int isdst) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_INTS_TO_TM \ - assert(my_tm); assert(locale) + Perl_assert_aTHX; assert(mytm); assert(locale) -STATIC bool -S_is_locale_utf8(pTHX_ const char *locale); +static bool +S_is_locale_utf8(pTHX_ const char *locale) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_IS_LOCALE_UTF8 \ - assert(locale) - -STATIC HV * -S_my_localeconv(pTHX_ const int item); -# define PERL_ARGS_ASSERT_MY_LOCALECONV + Perl_assert_aTHX; assert(locale) -STATIC void -S_populate_hash_from_C_localeconv(pTHX_ HV *hv, const char *locale, const U32 which_mask, const lconv_offset_t *strings[2], const lconv_offset_t *integers[2]); +static HV * +S_my_localeconv(pTHX_ const int item) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_MY_LOCALECONV \ + Perl_assert_aTHX + +static void +S_populate_hash_from_C_localeconv(pTHX_ HV *hv, const char *locale, const U32 which_mask, const lconv_offset_t *strings[2], const lconv_offset_t *integers[2]) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5); # define PERL_ARGS_ASSERT_POPULATE_HASH_FROM_C_LOCALECONV \ - assert(hv); assert(locale); assert(strings); assert(integers); \ - assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV); \ + assert(locale); assert(strings); assert(integers) -STATIC bool -S_strftime8(pTHX_ const char *fmt, SV *sv, const char *locale, const struct tm *mytm, const utf8ness_t fmt_utf8ness, utf8ness_t *result_utf8ness, const bool called_externally); +static bool +S_strftime8(pTHX_ const char *fmt, SV *sv, const char *locale, const struct tm *mytm, const utf8ness_t fmt_utf8ness, utf8ness_t *result_utf8ness, const bool called_externally) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_6); # define PERL_ARGS_ASSERT_STRFTIME8 \ - assert(fmt); assert(sv); assert(locale); assert(mytm); \ + Perl_assert_aTHX; assert(fmt); assert(sv); assert(locale); assert(mytm); \ assert(result_utf8ness) -STATIC bool +static bool S_strftime_tm(pTHX_ const char *fmt, SV *sv, const char *locale, const struct tm *mytm) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) __attribute__format__(__strftime__,pTHX_1,0); # define PERL_ARGS_ASSERT_STRFTIME_TM \ - assert(fmt); assert(sv); assert(locale); assert(mytm) + Perl_assert_aTHX; assert(fmt); assert(sv); assert(locale); assert(mytm) -STATIC SV * -S_sv_strftime_common(pTHX_ SV *fmt, const char *locale, const struct tm *mytm); +static SV * +S_sv_strftime_common(pTHX_ SV *fmt, const char *locale, const struct tm *mytm) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_SV_STRFTIME_COMMON \ - assert(fmt); assert(locale); assert(mytm) + Perl_assert_aTHX; assert(fmt); assert(locale); assert(mytm) # if defined(HAS_MISSING_LANGINFO_ITEM_) || !defined(HAS_NL_LANGINFO) -STATIC const char * -S_emulate_langinfo(pTHX_ const PERL_INTMAX_T item, const char *locale, SV *sv, utf8ness_t *utf8ness); +static const char * +S_emulate_langinfo(pTHX_ const PERL_INTMAX_T item, const char *locale, SV *sv, utf8ness_t *utf8ness) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_EMULATE_LANGINFO \ - assert(locale); assert(sv) + Perl_assert_aTHX; assert(locale); assert(sv) -# endif +# endif /* defined(HAS_MISSING_LANGINFO_ITEM_) || !defined(HAS_NL_LANGINFO) */ # if defined(USE_LOCALE) -STATIC const char * -S_calculate_LC_ALL_string(pTHX_ const char **category_locales_list, const calc_LC_ALL_format format, const calc_LC_ALL_return returning, const line_t caller_line); -# define PERL_ARGS_ASSERT_CALCULATE_LC_ALL_STRING - -STATIC const char * -S_external_call_langinfo(pTHX_ const nl_item item, SV *sv, utf8ness_t *utf8ness); +static const char * +S_calculate_LC_ALL_string(pTHX_ const char **category_locales_list, const calc_LC_ALL_format format, const calc_LC_ALL_return returning, const line_t caller_line) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_CALCULATE_LC_ALL_STRING \ + Perl_assert_aTHX + +static const char * +S_external_call_langinfo(pTHX_ const nl_item item, SV *sv, utf8ness_t *utf8ness) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_EXTERNAL_CALL_LANGINFO \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC locale_category_index +static locale_category_index S_get_category_index_helper(pTHX_ const int category, bool *success, const line_t caller_line) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_GET_CATEGORY_INDEX_HELPER - -STATIC const char * -S_native_querylocale_i(pTHX_ const locale_category_index cat_index); -# define PERL_ARGS_ASSERT_NATIVE_QUERYLOCALE_I +# define PERL_ARGS_ASSERT_GET_CATEGORY_INDEX_HELPER \ + Perl_assert_aTHX -STATIC void -S_new_LC_ALL(pTHX_ const char *lc_all, bool force); +static const char * +S_native_querylocale_i(pTHX_ const locale_category_index cat_index) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_NATIVE_QUERYLOCALE_I \ + Perl_assert_aTHX + +static void +S_new_LC_ALL(pTHX_ const char *lc_all, bool force) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_NEW_LC_ALL \ - assert(lc_all) - -STATIC void -S_output_check_environment_warning(pTHX_ const char * const language, const char * const lc_all, const char * const lang); -# define PERL_ARGS_ASSERT_OUTPUT_CHECK_ENVIRONMENT_WARNING + Perl_assert_aTHX; assert(lc_all) -STATIC parse_LC_ALL_string_return -S_parse_LC_ALL_string(pTHX_ const char *string, const char **output, const parse_LC_ALL_STRING_action, bool always_use_full_array, const bool panic_on_error, const line_t caller_line); +static void +S_output_check_environment_warning(pTHX_ const char * const language, const char * const lc_all, const char * const lang) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_OUTPUT_CHECK_ENVIRONMENT_WARNING \ + Perl_assert_aTHX + +static parse_LC_ALL_string_return +S_parse_LC_ALL_string(pTHX_ const char *string, const char **output, const parse_LC_ALL_STRING_action, bool always_use_full_array, const bool panic_on_error, const line_t caller_line) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_PARSE_LC_ALL_STRING \ - assert(string); assert(output) + Perl_assert_aTHX; assert(string); assert(output) -STATIC void -S_restore_toggled_locale_i(pTHX_ const locale_category_index cat_index, const char *original_locale, const line_t caller_line); -# define PERL_ARGS_ASSERT_RESTORE_TOGGLED_LOCALE_I - -STATIC const char * -S_save_to_buffer(pTHX_ const char *string, char **buf, Size_t *buf_size); -# define PERL_ARGS_ASSERT_SAVE_TO_BUFFER - -STATIC void -S_set_save_buffer_min_size(pTHX_ const Size_t min_len, char **buf, Size_t *buf_size); -# define PERL_ARGS_ASSERT_SET_SAVE_BUFFER_MIN_SIZE +static void +S_restore_toggled_locale_i(pTHX_ const locale_category_index cat_index, const char *original_locale, const line_t caller_line) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_RESTORE_TOGGLED_LOCALE_I \ + Perl_assert_aTHX + +static const char * +S_save_to_buffer(pTHX_ const char *string, char **buf, Size_t *buf_size) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_SAVE_TO_BUFFER \ + Perl_assert_aTHX + +static void +S_set_save_buffer_min_size(pTHX_ const Size_t min_len, char **buf, Size_t *buf_size) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_SET_SAVE_BUFFER_MIN_SIZE \ + Perl_assert_aTHX PERL_STATIC_NO_RET void S_setlocale_failure_panic_via_i(pTHX_ const locale_category_index cat_index, const char *current, const char *failed, const line_t proxy_caller_line, const line_t immediate_caller_line, const char *higher_caller_file, const line_t higher_caller_line) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_6) __attribute__noreturn__; # define PERL_ARGS_ASSERT_SETLOCALE_FAILURE_PANIC_VIA_I \ - assert(failed); assert(higher_caller_file) + Perl_assert_aTHX; assert(failed); assert(higher_caller_file) -STATIC const char * -S_toggle_locale_i(pTHX_ const locale_category_index cat_index, const char *new_locale, const line_t caller_line); +static const char * +S_toggle_locale_i(pTHX_ const locale_category_index cat_index, const char *new_locale, const line_t caller_line) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_TOGGLE_LOCALE_I \ - assert(new_locale) + Perl_assert_aTHX; assert(new_locale) # if defined(DEBUGGING) -STATIC char * +static char * S_my_setlocale_debug_string_i(pTHX_ const locale_category_index cat_index, const char *locale, const char *retval, const line_t line) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_MY_SETLOCALE_DEBUG_STRING_I +# define PERL_ARGS_ASSERT_MY_SETLOCALE_DEBUG_STRING_I \ + Perl_assert_aTHX # endif # if defined(HAS_LOCALECONV) && \ ( defined(USE_LOCALE_MONETARY) || defined(USE_LOCALE_NUMERIC) ) -STATIC void -S_populate_hash_from_localeconv(pTHX_ HV *hv, const char *locale, const U32 which_mask, const lconv_offset_t *strings[2], const lconv_offset_t *integers[2]); +static void +S_populate_hash_from_localeconv(pTHX_ HV *hv, const char *locale, const U32 which_mask, const lconv_offset_t *strings[2], const lconv_offset_t *integers[2]) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5); # define PERL_ARGS_ASSERT_POPULATE_HASH_FROM_LOCALECONV \ - assert(hv); assert(locale); assert(strings); assert(integers); \ - assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV); \ + assert(locale); assert(strings); assert(integers) -# endif +# endif /* defined(HAS_LOCALECONV) && + ( defined(USE_LOCALE_MONETARY) || + defined(USE_LOCALE_NUMERIC) ) */ # if defined(HAS_NL_LANGINFO) -STATIC const char * -S_langinfo_sv_i(pTHX_ const nl_item item, locale_category_index cat_index, const char *locale, SV *sv, utf8ness_t *utf8ness); +static const char * +S_langinfo_sv_i(pTHX_ const nl_item item, locale_category_index cat_index, const char *locale, SV *sv, utf8ness_t *utf8ness) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_LANGINFO_SV_I \ - assert(locale); assert(sv) + Perl_assert_aTHX; assert(locale); assert(sv) -# endif +# endif /* defined(HAS_NL_LANGINFO) */ # if defined(LC_ALL) -STATIC void -S_give_perl_locale_control(pTHX_ const char *lc_all_string, const line_t caller_line); +static void +S_give_perl_locale_control(pTHX_ const char *lc_all_string, const line_t caller_line) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_GIVE_PERL_LOCALE_CONTROL \ - assert(lc_all_string) + Perl_assert_aTHX; assert(lc_all_string) # else -STATIC void -S_give_perl_locale_control(pTHX_ const char **curlocales, const line_t caller_line); +static void +S_give_perl_locale_control(pTHX_ const char **curlocales, const line_t caller_line) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_GIVE_PERL_LOCALE_CONTROL \ - assert(curlocales) + Perl_assert_aTHX; assert(curlocales) # endif # if !defined(PERL_NO_INLINE_FUNCTIONS) PERL_STATIC_INLINE const char * S_mortalized_pv_copy(pTHX_ const char * const pv) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_MORTALIZED_PV_COPY +# define PERL_ARGS_ASSERT_MORTALIZED_PV_COPY \ + Perl_assert_aTHX # endif # if defined(USE_LOCALE_COLLATE) -STATIC void -S_new_collate(pTHX_ const char *newcoll, bool force); +static void +S_new_collate(pTHX_ const char *newcoll, bool force) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_NEW_COLLATE \ - assert(newcoll) + Perl_assert_aTHX; assert(newcoll) # if defined(DEBUGGING) -STATIC void -S_print_collxfrm_input_and_return(pTHX_ const char *s, const char *e, const char *xbuf, const STRLEN xlen, const bool is_utf8); +static void +S_print_collxfrm_input_and_return(pTHX_ const char *s, const char *e, const char *xbuf, const STRLEN xlen, const bool is_utf8) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_PRINT_COLLXFRM_INPUT_AND_RETURN \ - assert(s); assert(e) + Perl_assert_aTHX; assert(s); assert(e); assert(s <= e) -# endif +# endif /* defined(DEBUGGING) */ # endif /* defined(USE_LOCALE_COLLATE) */ # if defined(USE_LOCALE_CTYPE) -STATIC bool -S_is_codeset_name_UTF8(const char *name); +static bool +S_is_codeset_name_UTF8(const char *name) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_IS_CODESET_NAME_UTF8 \ assert(name) -STATIC void -S_new_ctype(pTHX_ const char *newctype, bool force); +static void +S_new_ctype(pTHX_ const char *newctype, bool force) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_NEW_CTYPE \ - assert(newctype) + Perl_assert_aTHX; assert(newctype) # endif /* defined(USE_LOCALE_CTYPE) */ # if defined(USE_LOCALE_NUMERIC) -STATIC void -S_new_numeric(pTHX_ const char *newnum, bool force); +static void +S_new_numeric(pTHX_ const char *newnum, bool force) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_NEW_NUMERIC \ - assert(newnum) + Perl_assert_aTHX; assert(newnum) # endif # if defined(USE_PERL_SWITCH_LOCALE_CONTEXT) || defined(DEBUGGING) -STATIC const char * -S_get_LC_ALL_display(pTHX); -# define PERL_ARGS_ASSERT_GET_LC_ALL_DISPLAY +static const char * +S_get_LC_ALL_display(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_GET_LC_ALL_DISPLAY \ + Perl_assert_aTHX # endif # if defined(USE_POSIX_2008_LOCALE) -STATIC bool -S_bool_setlocale_2008_i(pTHX_ const locale_category_index index, const char *new_locale, const line_t caller_line); +static bool +S_bool_setlocale_2008_i(pTHX_ const locale_category_index index, const char *new_locale, const line_t caller_line) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_BOOL_SETLOCALE_2008_I \ - assert(new_locale) + Perl_assert_aTHX; assert(new_locale) -STATIC const char * -S_querylocale_2008_i(pTHX_ const locale_category_index index, const line_t line); -# define PERL_ARGS_ASSERT_QUERYLOCALE_2008_I - -STATIC locale_t -S_use_curlocale_scratch(pTHX); -# define PERL_ARGS_ASSERT_USE_CURLOCALE_SCRATCH +static const char * +S_querylocale_2008_i(pTHX_ const locale_category_index index, const line_t line) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_QUERYLOCALE_2008_I \ + Perl_assert_aTHX + +static locale_t +S_use_curlocale_scratch(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_USE_CURLOCALE_SCRATCH \ + Perl_assert_aTHX # if !defined(USE_QUERYLOCALE) -STATIC void -S_update_PL_curlocales_i(pTHX_ const locale_category_index index, const char *new_locale, const line_t caller_line); +static void +S_update_PL_curlocales_i(pTHX_ const locale_category_index index, const char *new_locale, const line_t caller_line) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_UPDATE_PL_CURLOCALES_I \ - assert(new_locale) + Perl_assert_aTHX; assert(new_locale) # endif # elif defined(USE_LOCALE_THREADS) && \ !defined(USE_THREAD_SAFE_LOCALE) && \ !defined(USE_THREAD_SAFE_LOCALE_EMULATION) /* && !defined(USE_POSIX_2008_LOCALE) */ -STATIC bool -S_less_dicey_bool_setlocale_r(pTHX_ const int cat, const char *locale); +static bool +S_less_dicey_bool_setlocale_r(pTHX_ const int cat, const char *locale) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_LESS_DICEY_BOOL_SETLOCALE_R \ - assert(locale) + Perl_assert_aTHX; assert(locale) -STATIC const char * -S_less_dicey_setlocale_r(pTHX_ const int category, const char *locale); -# define PERL_ARGS_ASSERT_LESS_DICEY_SETLOCALE_R +static const char * +S_less_dicey_setlocale_r(pTHX_ const int category, const char *locale) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_LESS_DICEY_SETLOCALE_R \ + Perl_assert_aTHX # endif /* defined(USE_LOCALE_THREADS) && !defined(USE_POSIX_2008_LOCALE) && !defined(USE_THREAD_SAFE_LOCALE) && !defined(USE_THREAD_SAFE_LOCALE_EMULATION) */ # if defined(WIN32) || defined(WIN32_USE_FAKE_OLD_MINGW_LOCALES) -STATIC wchar_t * +static wchar_t * S_Win_byte_string_to_wstring(const UINT code_page, const char *byte_string); # define PERL_ARGS_ASSERT_WIN_BYTE_STRING_TO_WSTRING -STATIC char * +static char * S_Win_wstring_to_byte_string(const UINT code_page, const wchar_t *wstring); # define PERL_ARGS_ASSERT_WIN_WSTRING_TO_BYTE_STRING -STATIC const char * -S_win32_setlocale(pTHX_ int category, const char *locale); -# define PERL_ARGS_ASSERT_WIN32_SETLOCALE - -STATIC const char * -S_wrap_wsetlocale(pTHX_ const int category, const char *locale); -# define PERL_ARGS_ASSERT_WRAP_WSETLOCALE +static const char * +S_win32_setlocale(pTHX_ int category, const char *locale) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_WIN32_SETLOCALE \ + Perl_assert_aTHX + +static const char * +S_wrap_wsetlocale(pTHX_ const int category, const char *locale) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_WRAP_WSETLOCALE \ + Perl_assert_aTHX # endif /* defined(WIN32) || defined(WIN32_USE_FAKE_OLD_MINGW_LOCALES) */ # if defined(WIN32) || defined(WIN32_USE_FAKE_OLD_MINGW_LOCALES) || \ ( defined(USE_POSIX_2008_LOCALE) && !defined(USE_QUERYLOCALE) ) -STATIC const char * -S_find_locale_from_environment(pTHX_ const locale_category_index index); -# define PERL_ARGS_ASSERT_FIND_LOCALE_FROM_ENVIRONMENT +static const char * +S_find_locale_from_environment(pTHX_ const locale_category_index index) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_FIND_LOCALE_FROM_ENVIRONMENT \ + Perl_assert_aTHX # endif # endif /* defined(USE_LOCALE) */ # if defined(USE_LOCALE) || defined(DEBUGGING) -STATIC const char * -S_get_displayable_string(pTHX_ const char * const s, const char * const e, const bool is_utf8); +static const char * +S_get_displayable_string(pTHX_ const char * const s, const char * const e, const bool is_utf8) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_GET_DISPLAYABLE_STRING \ - assert(s); assert(e) + Perl_assert_aTHX; assert(s); assert(e); assert(s <= e) -# endif +# endif /* defined(USE_LOCALE) || defined(DEBUGGING) */ #endif /* defined(PERL_IN_LOCALE_C) */ #if defined(PERL_IN_MALLOC_C) -STATIC int -S_adjust_size_and_find_bucket(size_t *nbytes_p); +static int +S_adjust_size_and_find_bucket(size_t *nbytes_p) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_ADJUST_SIZE_AND_FIND_BUCKET \ assert(nbytes_p) #endif +#if defined(PERL_IN_MATHOMS_C) || defined(PERL_IN_OP_C) || \ + defined(PERL_IN_PERLY_C) || defined(PERL_IN_TOKE_C) + +#endif #if defined(PERL_IN_MG_C) -STATIC void -S_fixup_errno_string(pTHX_ SV *sv); +static void +S_fixup_errno_string(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_FIXUP_ERRNO_STRING \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC SV * -S_magic_methcall1(pTHX_ SV *sv, const MAGIC *mg, SV *meth, U32 flags, int n, SV *val); +static SV * +S_magic_methcall1(pTHX_ SV *sv, const MAGIC *mg, SV *meth, U32 flags, int n, SV *val) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_MAGIC_METHCALL1 \ - assert(sv); assert(mg); assert(meth) + Perl_assert_aTHX; assert(sv); assert(mg); assert(meth) -STATIC int -S_magic_methpack(pTHX_ SV *sv, const MAGIC *mg, SV *meth); +static int +S_magic_methpack(pTHX_ SV *sv, const MAGIC *mg, SV *meth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_MAGIC_METHPACK \ - assert(sv); assert(mg); assert(meth) - -STATIC void -S_restore_magic(pTHX_ const void *p); -# define PERL_ARGS_ASSERT_RESTORE_MAGIC + Perl_assert_aTHX; assert(sv); assert(mg); assert(meth) -STATIC void -S_save_magic_flags(pTHX_ SSize_t mgs_ix, SV *sv, U32 flags); +static void +S_restore_magic(pTHX_ void *p) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_RESTORE_MAGIC \ + Perl_assert_aTHX + +static void +S_save_magic_flags(pTHX_ SSize_t mgs_ix, SV *sv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_SAVE_MAGIC_FLAGS \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC void -S_unwind_handler_stack(pTHX_ const void *p); -# define PERL_ARGS_ASSERT_UNWIND_HANDLER_STACK +static void +S_unwind_handler_stack(pTHX_ void *p) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_UNWIND_HANDLER_STACK \ + Perl_assert_aTHX #endif /* defined(PERL_IN_MG_C) */ #if defined(PERL_IN_MG_C) || defined(PERL_IN_PP_C) PERL_CALLCONV bool Perl_translate_substr_offsets(STRLEN curlen, IV pos1_iv, bool pos1_is_uv, IV len_iv, bool len_is_uv, STRLEN *posp, STRLEN *lenp) + Perl_attribute_nonnull(6) + Perl_attribute_nonnull(7) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_TRANSLATE_SUBSTR_OFFSETS \ assert(posp); assert(lenp) -#endif +#endif /* defined(PERL_IN_MG_C) || defined(PERL_IN_PP_C) */ +#if defined(PERL_IN_MG_C) || defined(PERL_IN_SV_C) +PERL_CALLCONV void +Perl_mg_free_struct(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + __attribute__visibility__("hidden"); +# define PERL_ARGS_ASSERT_MG_FREE_STRUCT \ + Perl_assert_aTHX; assert(sv); assert(mg) + +#endif /* defined(PERL_IN_MG_C) || defined(PERL_IN_SV_C) */ #if defined(PERL_IN_MRO_C) -STATIC void -S_mro_clean_isarev(pTHX_ HV * const isa, const char * const name, const STRLEN len, HV * const exceptions, U32 hash, U32 flags); +static void +S_mro_clean_isarev(pTHX_ HV * const isa, const char * const name, const STRLEN len, HV * const exceptions, U32 hash, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_MRO_CLEAN_ISAREV \ - assert(isa); assert(name); assert(SvTYPE(isa) == SVt_PVHV); \ - assert(!exceptions || SvTYPE(exceptions) == SVt_PVHV) + Perl_assert_aTHX; assert(isa); assert(SvTYPE(isa) == SVt_PVHV); \ + assert(name); assert(!exceptions || SvTYPE(exceptions) == SVt_PVHV) -STATIC void -S_mro_gather_and_rename(pTHX_ HV * const stashes, HV * const seen_stashes, HV *stash, HV *oldstash, SV *namesv); +static void +S_mro_gather_and_rename(pTHX_ HV * const stashes, HV * const seen_stashes, HV *stash, HV *oldstash, SV *namesv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_5); # define PERL_ARGS_ASSERT_MRO_GATHER_AND_RENAME \ - assert(stashes); assert(seen_stashes); assert(namesv); \ - assert(SvTYPE(stashes) == SVt_PVHV); \ - assert(SvTYPE(seen_stashes) == SVt_PVHV); \ + Perl_assert_aTHX; assert(stashes); assert(SvTYPE(stashes) == SVt_PVHV); \ + assert(seen_stashes); assert(SvTYPE(seen_stashes) == SVt_PVHV); \ assert(!stash || SvTYPE(stash) == SVt_PVHV); \ - assert(!oldstash || SvTYPE(oldstash) == SVt_PVHV) + assert(!oldstash || SvTYPE(oldstash) == SVt_PVHV); assert(namesv) -STATIC AV * -S_mro_get_linear_isa_dfs(pTHX_ HV *stash, U32 level); +static AV * +S_mro_get_linear_isa_dfs(pTHX_ HV *stash, U32 level) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_MRO_GET_LINEAR_ISA_DFS \ - assert(stash); assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV) #endif /* defined(PERL_IN_MRO_C) */ -#if defined(PERL_IN_NUMERIC_C) -STATIC void -S_output_non_portable(pTHX_ const U8 shift); -# define PERL_ARGS_ASSERT_OUTPUT_NON_PORTABLE - -#endif #if defined(PERL_IN_OP_C) -STATIC void -S_apply_attrs(pTHX_ HV *stash, SV *target, OP *attrs); +static void +S_apply_attrs(pTHX_ HV *stash, SV *target, OP *attrs) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_APPLY_ATTRS \ - assert(stash); assert(target); assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV); \ + assert(target) -STATIC void -S_apply_attrs_my(pTHX_ HV *stash, OP *target, OP *attrs, OP **imopsp); +static void +S_apply_attrs_my(pTHX_ HV *stash, OP *target, OP *attrs, OP **imopsp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_APPLY_ATTRS_MY \ - assert(stash); assert(target); assert(imopsp); \ - assert(SvTYPE(stash) == SVt_PVHV) + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV); \ + assert(target); assert(imopsp) -STATIC I32 +static I32 S_assignment_type(pTHX_ const OP *o) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_ASSIGNMENT_TYPE +# define PERL_ARGS_ASSERT_ASSIGNMENT_TYPE \ + Perl_assert_aTHX -STATIC void -S_bad_type_gv(pTHX_ I32 n, GV *gv, const OP *kid, const char *t); +static void +S_bad_type_gv(pTHX_ I32 n, GV *gv, const OP *kid, const char *t) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_BAD_TYPE_GV \ - assert(gv); assert(kid); assert(t) + Perl_assert_aTHX; assert(gv); assert(kid); assert(t) -STATIC void -S_bad_type_pv(pTHX_ I32 n, const char *t, const OP *o, const OP *kid); +static void +S_bad_type_pv(pTHX_ I32 n, const char *t, const OP *o, const OP *kid) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_BAD_TYPE_PV \ - assert(t); assert(o); assert(kid) + Perl_assert_aTHX; assert(t); assert(o); assert(kid) -STATIC void -S_clear_special_blocks(pTHX_ const char * const fullname, GV * const gv, CV * const cv); +static void +S_check_alt_hash_fields_hekify(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# define PERL_ARGS_ASSERT_CHECK_ALT_HASH_FIELDS_HEKIFY \ + Perl_assert_aTHX; assert(o) + +static CV * +S_clear_special_blocks(pTHX_ const char * const fullname, GV * const gv, CV * const cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_CLEAR_SPECIAL_BLOCKS \ - assert(fullname); assert(gv); assert(cv); \ + Perl_assert_aTHX; assert(fullname); assert(gv); assert(cv); \ assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) -STATIC void -S_cop_free(pTHX_ COP *cop); +static void +S_cop_free(pTHX_ COP *cop) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_COP_FREE \ - assert(cop) + Perl_assert_aTHX; assert(cop) -STATIC OP * -S_dup_attrlist(pTHX_ OP *o); +static OP * +S_dup_attrlist(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_DUP_ATTRLIST \ - assert(o) + Perl_assert_aTHX; assert(o) -STATIC void -S_find_and_forget_pmops(pTHX_ OP *o); +static void +S_find_and_forget_pmops(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_FIND_AND_FORGET_PMOPS \ - assert(o) + Perl_assert_aTHX; assert(o) -STATIC OP * -S_fold_constants(pTHX_ OP * const o); +static OP * +S_fold_constants(pTHX_ OP * const o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_FOLD_CONSTANTS \ - assert(o) - -STATIC OP * -S_force_list(pTHX_ OP *arg, bool nullit); -# define PERL_ARGS_ASSERT_FORCE_LIST + Perl_assert_aTHX; assert(o) -STATIC void -S_forget_pmop(pTHX_ PMOP * const o); +static OP * +S_force_list(pTHX_ OP *arg, bool nullit) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_FORCE_LIST \ + Perl_assert_aTHX + +static void +S_forget_pmop(pTHX_ PMOP * const o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_FORGET_PMOP \ - assert(o) - -STATIC void -S_gen_constant_list(pTHX_ OP *o); -# define PERL_ARGS_ASSERT_GEN_CONSTANT_LIST + Perl_assert_aTHX; assert(o) -STATIC void -S_inplace_aassign(pTHX_ OP *o); +static void +S_gen_constant_list(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_GEN_CONSTANT_LIST \ + Perl_assert_aTHX + +static void +S_inplace_aassign(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_INPLACE_AASSIGN \ + Perl_assert_aTHX; assert(o) + +static bool +S_is_dup_mode(const OP *o) + Perl_attribute_nonnull(1); +# define PERL_ARGS_ASSERT_IS_DUP_MODE \ assert(o) -STATIC bool +static bool S_is_handle_constructor(const OP *o, I32 numargs) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_IS_HANDLE_CONSTRUCTOR \ assert(o) -STATIC OP * -S_listkids(pTHX_ OP *o); -# define PERL_ARGS_ASSERT_LISTKIDS - -STATIC bool -S_looks_like_bool(pTHX_ const OP *o); +static OP * +S_listkids(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_LISTKIDS \ + Perl_assert_aTHX + +static bool +S_looks_like_bool(pTHX_ const OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_LOOKS_LIKE_BOOL \ - assert(o) - -STATIC OP * -S_modkids(pTHX_ OP *o, I32 type); -# define PERL_ARGS_ASSERT_MODKIDS + Perl_assert_aTHX; assert(o) -STATIC void -S_move_proto_attr(pTHX_ OP **proto, OP **attrs, const GV *name, bool curstash); +static OP * +S_modkids(pTHX_ OP *o, I32 type) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_MODKIDS \ + Perl_assert_aTHX + +static void +S_move_proto_attr(pTHX_ OP **proto, OP **attrs, const GV *name, bool curstash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_MOVE_PROTO_ATTR \ - assert(proto); assert(attrs); assert(name) + Perl_assert_aTHX; assert(proto); assert(attrs); assert(name) -STATIC OP * -S_my_kid(pTHX_ OP *o, OP *attrs, OP **imopsp); +static OP * +S_my_kid(pTHX_ OP *o, OP *attrs, OP **imopsp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_MY_KID \ - assert(imopsp) + Perl_assert_aTHX; assert(imopsp) -STATIC OP * -S_newGIVWHENOP(pTHX_ OP *cond, OP *block, I32 enter_opcode, I32 leave_opcode, PADOFFSET entertarg); +static OP * +S_newGIVWHENOP(pTHX_ OP *cond, OP *block, I32 enter_opcode, I32 leave_opcode, PADOFFSET entertarg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_NEWGIVWHENOP \ - assert(block) + Perl_assert_aTHX; assert(block) -STATIC OP * +static OP * S_new_logop(pTHX_ I32 type, I32 flags, OP **firstp, OP **otherp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_NEW_LOGOP \ - assert(firstp); assert(otherp) + Perl_assert_aTHX; assert(firstp); assert(otherp) -STATIC OP * +static OP * S_no_fh_allowed(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_NO_FH_ALLOWED \ - assert(o) + Perl_assert_aTHX; assert(o) -STATIC OP * -S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl); +static OP * +S_pmtrans(pTHX_ OP *o, OP *expr, OP *repl) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_PMTRANS \ - assert(o); assert(expr); assert(repl) + Perl_assert_aTHX; assert(o); assert(expr); assert(repl) -STATIC bool -S_process_special_blocks(pTHX_ I32 floor, const char * const fullname, GV * const gv, CV * const cv); +static bool +S_process_special_blocks(pTHX_ I32 floor, const char * const fullname, GV * const gv, CV * const cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_PROCESS_SPECIAL_BLOCKS \ - assert(fullname); assert(gv); assert(cv); \ + Perl_assert_aTHX; assert(fullname); assert(gv); assert(cv); \ assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) -STATIC OP * -S_ref_array_or_hash(pTHX_ OP *cond); -# define PERL_ARGS_ASSERT_REF_ARRAY_OR_HASH - -STATIC OP * -S_refkids(pTHX_ OP *o, I32 type); -# define PERL_ARGS_ASSERT_REFKIDS +static OP * +S_ref_array_or_hash(pTHX_ OP *cond) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_REF_ARRAY_OR_HASH \ + Perl_assert_aTHX + +static OP * +S_refkids(pTHX_ OP *o, I32 type) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_REFKIDS \ + Perl_assert_aTHX -STATIC bool +static bool S_scalar_mod_type(const OP *o, I32 type) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SCALAR_MOD_TYPE -STATIC OP * -S_scalarboolean(pTHX_ OP *o); +static OP * +S_scalarboolean(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SCALARBOOLEAN \ - assert(o) + Perl_assert_aTHX; assert(o) -STATIC OP * -S_scalarkids(pTHX_ OP *o); -# define PERL_ARGS_ASSERT_SCALARKIDS +static OP * +S_scalarkids(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_SCALARKIDS \ + Perl_assert_aTHX -STATIC OP * +static OP * S_search_const(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SEARCH_CONST \ - assert(o) + Perl_assert_aTHX; assert(o) -STATIC void -S_simplify_sort(pTHX_ OP *o); +static void +S_simplify_sort(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SIMPLIFY_SORT \ - assert(o) + Perl_assert_aTHX; assert(o) -STATIC OP * +static OP * S_too_few_arguments_pv(pTHX_ OP *o, const char *name, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_TOO_FEW_ARGUMENTS_PV \ - assert(o); assert(name) + Perl_assert_aTHX; assert(o); assert(name) -STATIC OP * -S_too_many_arguments_pv(pTHX_ OP *o, const char *name, U32 flags); +static OP * +S_too_many_arguments_pv(pTHX_ OP *o, const char *name, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_TOO_MANY_ARGUMENTS_PV \ - assert(o); assert(name) + Perl_assert_aTHX; assert(o); assert(name) -STATIC OP * -S_voidnonfinal(pTHX_ OP *o); -# define PERL_ARGS_ASSERT_VOIDNONFINAL +static OP * +S_voidnonfinal(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_VOIDNONFINAL \ + Perl_assert_aTHX + +# if defined(DEBUGGING) +static const char * +S_get_displayable_tr_operand(pTHX_ const U8 *s, STRLEN len, bool is_utf8) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# define PERL_ARGS_ASSERT_GET_DISPLAYABLE_TR_OPERAND \ + Perl_assert_aTHX; assert(s) +# endif # if !defined(PERL_NO_INLINE_FUNCTIONS) PERL_STATIC_INLINE bool -S_is_standard_filehandle_name(const char *fhname); +S_is_standard_filehandle_name(const char *fhname) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_IS_STANDARD_FILEHANDLE_NAME \ assert(fhname) PERL_STATIC_INLINE OP * -S_newMETHOP_internal(pTHX_ I32 type, I32 flags, OP *dynamic_meth, SV * const_meth); -# define PERL_ARGS_ASSERT_NEWMETHOP_INTERNAL +S_newMETHOP_internal(pTHX_ I32 type, I32 flags, OP *dynamic_meth, SV * const_meth) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_NEWMETHOP_INTERNAL \ + Perl_assert_aTHX PERL_STATIC_INLINE OP * -S_op_integerize(pTHX_ OP *o); +S_op_integerize(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_OP_INTEGERIZE \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_STATIC_INLINE OP * -S_op_std_init(pTHX_ OP *o); +S_op_std_init(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_OP_STD_INIT \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_STATIC_INLINE U16 -S_opslab_slot_offset(const OPSLAB *slab, const OPSLOT *slot); +S_opslab_slot_offset(const OPSLAB *slab, const OPSLOT *slot) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2); # define PERL_ARGS_ASSERT_OPSLAB_SLOT_OFFSET \ assert(slab); assert(slot) @@ -7659,35 +11205,48 @@ S_size_to_psize(size_t size); # endif /* !defined(PERL_NO_INLINE_FUNCTIONS) */ #endif /* defined(PERL_IN_OP_C) */ +#if defined(PERL_IN_OP_C) || defined(PERL_IN_PAD_C) + +#endif #if defined(PERL_IN_OP_C) || defined(PERL_IN_PEEP_C) PERL_CALLCONV void Perl_check_hash_fields_and_hekify(pTHX_ UNOP *rop, SVOP *key_op, int real) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_CHECK_HASH_FIELDS_AND_HEKIFY +# define PERL_ARGS_ASSERT_CHECK_HASH_FIELDS_AND_HEKIFY \ + Perl_assert_aTHX PERL_CALLCONV void Perl_no_bareword_allowed(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_NO_BAREWORD_ALLOWED \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV void Perl_op_prune_chain_head(OP **op_p) + Perl_attribute_nonnull(1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_OP_PRUNE_CHAIN_HEAD \ assert(op_p) PERL_CALLCONV SV * Perl_op_varname(pTHX_ const OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_OP_VARNAME \ - assert(o) + Perl_assert_aTHX; assert(o) PERL_CALLCONV void Perl_warn_elem_scalar_context(pTHX_ const OP *o, SV *name, bool is_hash, bool is_slice) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_WARN_ELEM_SCALAR_CONTEXT \ - assert(o); assert(name) + Perl_assert_aTHX; assert(o); assert(name) #endif /* defined(PERL_IN_OP_C) || defined(PERL_IN_PEEP_C) */ #if defined(PERL_IN_OP_C) || defined(PERL_IN_REGCOMP_ANY) @@ -7696,326 +11255,472 @@ Perl_warn_elem_scalar_context(pTHX_ cons #if defined(PERL_IN_OP_C) || defined(PERL_IN_SV_C) PERL_CALLCONV void Perl_report_redefined_cv(pTHX_ const SV *name, const CV *old_cv, SV * const *new_const_svp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_REPORT_REDEFINED_CV \ - assert(name); assert(old_cv) + Perl_assert_aTHX; assert(name); assert(old_cv) PERL_CALLCONV SV * Perl_varname(pTHX_ const GV * const gv, const char gvtype, PADOFFSET targ, const SV * const keyname, SSize_t aindex, int subscript_type) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__ __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_VARNAME +# define PERL_ARGS_ASSERT_VARNAME \ + Perl_assert_aTHX #endif /* defined(PERL_IN_OP_C) || defined(PERL_IN_SV_C) */ #if defined(PERL_IN_PAD_C) -STATIC PADOFFSET -S_pad_alloc_name(pTHX_ PADNAME *name, U32 flags, HV *typestash, HV *ourstash); +static PADOFFSET +S_pad_alloc_name(pTHX_ PADNAME *name, U32 flags, HV *typestash, HV *ourstash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_PAD_ALLOC_NAME \ - assert(name); assert(!ourstash || SvTYPE(ourstash) == SVt_PVHV) + Perl_assert_aTHX; assert(name); \ + assert(!ourstash || SvTYPE(ourstash) == SVt_PVHV) -STATIC void -S_pad_check_dup(pTHX_ PADNAME *name, U32 flags, const HV *ourstash); +static void +S_pad_check_dup(pTHX_ PADNAME *name, U32 flags, const HV *ourstash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_PAD_CHECK_DUP \ - assert(name) + Perl_assert_aTHX; assert(name) -STATIC PADOFFSET -S_pad_findlex(pTHX_ const char *namepv, STRLEN namelen, U32 flags, const CV *cv, U32 seq, int warn, SV **out_capture, PADNAME **out_name, int *out_flags); +static PADOFFSET +S_pad_findlex(pTHX_ const char *namepv, STRLEN namelen, U32 flags, const CV *cv, U32 seq, int warn, SV **out_capture, PADNAME **out_name, int *out_flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_8) + Perl_attribute_nonnull(pTHX_9); # define PERL_ARGS_ASSERT_PAD_FINDLEX \ - assert(namepv); assert(cv); assert(out_name); assert(out_flags) + Perl_assert_aTHX; assert(namepv); assert(cv); assert(out_name); \ + assert(out_flags) -STATIC void -S_pad_reset(pTHX); -# define PERL_ARGS_ASSERT_PAD_RESET +static void +S_pad_reset(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PAD_RESET \ + Perl_assert_aTHX # if defined(DEBUGGING) -STATIC void -S_cv_dump(pTHX_ const CV *cv, const char *title); +static void +S_cv_dump(pTHX_ const CV *cv, const char *title) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_CV_DUMP \ - assert(cv); assert(title) + Perl_assert_aTHX; assert(cv); assert(title) -# endif +# endif /* defined(DEBUGGING) */ #endif /* defined(PERL_IN_PAD_C) */ #if defined(PERL_IN_PEEP_C) -STATIC void -S_finalize_op(pTHX_ OP *o); +static void +S_finalize_op(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_FINALIZE_OP \ - assert(o) + Perl_assert_aTHX; assert(o) -STATIC void -S_optimize_op(pTHX_ OP *o); +static void +S_optimize_op(pTHX_ OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_OPTIMIZE_OP \ - assert(o) + Perl_assert_aTHX; assert(o) -STATIC OP * -S_traverse_op_tree(pTHX_ OP *top, OP *o); +static OP * +S_traverse_op_tree(pTHX_ OP *top, OP *o) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_TRAVERSE_OP_TREE \ - assert(top); assert(o) + Perl_assert_aTHX; assert(top); assert(o) #endif /* defined(PERL_IN_PEEP_C) */ #if defined(PERL_IN_PERL_C) -STATIC void -S_find_beginning(pTHX_ SV *linestr_sv, PerlIO *rsfp); +static void +S_find_beginning(pTHX_ SV *linestr_sv, PerlIO *rsfp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_FIND_BEGINNING \ - assert(linestr_sv); assert(rsfp) - -STATIC void -S_forbid_setid(pTHX_ const char flag, const bool suidscript); -# define PERL_ARGS_ASSERT_FORBID_SETID + Perl_assert_aTHX; assert(linestr_sv); assert(rsfp) -STATIC void -S_incpush(pTHX_ const char * const dir, STRLEN len, U32 flags); +static void +S_forbid_setid(pTHX_ const char flag, const bool suidscript) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_FORBID_SETID \ + Perl_assert_aTHX + +static void +S_incpush(pTHX_ const char * const dir, STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_INCPUSH \ - assert(dir) + Perl_assert_aTHX; assert(dir) -STATIC void -S_incpush_use_sep(pTHX_ const char *p, STRLEN len, U32 flags); +static void +S_incpush_use_sep(pTHX_ const char *p, STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_INCPUSH_USE_SEP \ - assert(p) + Perl_assert_aTHX; assert(p) -STATIC void -S_init_ids(pTHX); -# define PERL_ARGS_ASSERT_INIT_IDS - -STATIC void -S_init_interp(pTHX); -# define PERL_ARGS_ASSERT_INIT_INTERP - -STATIC void -S_init_main_stash(pTHX); -# define PERL_ARGS_ASSERT_INIT_MAIN_STASH - -STATIC void -S_init_perllib(pTHX); -# define PERL_ARGS_ASSERT_INIT_PERLLIB - -STATIC void -S_init_postdump_symbols(pTHX_ int argc, char **argv, char **env); +static void +S_init_ids(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_INIT_IDS \ + Perl_assert_aTHX + +static void +S_init_interp(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_INIT_INTERP \ + Perl_assert_aTHX + +static void +S_init_main_stash(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_INIT_MAIN_STASH \ + Perl_assert_aTHX + +static void +S_init_perllib(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_INIT_PERLLIB \ + Perl_assert_aTHX + +static void +S_init_postdump_symbols(pTHX_ int argc, char **argv, char **env) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_INIT_POSTDUMP_SYMBOLS \ - assert(argv) - -STATIC void -S_init_predump_symbols(pTHX); -# define PERL_ARGS_ASSERT_INIT_PREDUMP_SYMBOLS + Perl_assert_aTHX; assert(argv) -STATIC SV * -S_mayberelocate(pTHX_ const char * const dir, STRLEN len, U32 flags); +static void +S_init_predump_symbols(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_INIT_PREDUMP_SYMBOLS \ + Perl_assert_aTHX + +static SV * +S_mayberelocate(pTHX_ const char * const dir, STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_MAYBERELOCATE \ - assert(dir) + Perl_assert_aTHX; assert(dir) PERL_STATIC_NO_RET void S_minus_v(pTHX) + Perl_attribute_nonnull_aTHX __attribute__noreturn__; -# define PERL_ARGS_ASSERT_MINUS_V +# define PERL_ARGS_ASSERT_MINUS_V \ + Perl_assert_aTHX PERL_STATIC_NO_RET void S_my_exit_jump(pTHX) + Perl_attribute_nonnull_aTHX __attribute__noreturn__; -# define PERL_ARGS_ASSERT_MY_EXIT_JUMP +# define PERL_ARGS_ASSERT_MY_EXIT_JUMP \ + Perl_assert_aTHX -STATIC void -S_nuke_stacks(pTHX); -# define PERL_ARGS_ASSERT_NUKE_STACKS - -STATIC PerlIO * -S_open_script(pTHX_ const char *scriptname, bool dosearch, bool *suidscript); +static void +S_nuke_stacks(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_NUKE_STACKS \ + Perl_assert_aTHX + +static PerlIO * +S_open_script(pTHX_ const char *scriptname, bool dosearch, bool *suidscript) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_OPEN_SCRIPT \ - assert(scriptname); assert(suidscript) + Perl_assert_aTHX; assert(scriptname); assert(suidscript) -STATIC void * -S_parse_body(pTHX_ char **env, XSINIT_t xsinit); -# define PERL_ARGS_ASSERT_PARSE_BODY +static void * +S_parse_body(pTHX_ char **env, XSINIT_t xsinit) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PARSE_BODY \ + Perl_assert_aTHX PERL_STATIC_NO_RET void S_run_body(pTHX_ I32 oldscope) + Perl_attribute_nonnull_aTHX __attribute__noreturn__; -# define PERL_ARGS_ASSERT_RUN_BODY +# define PERL_ARGS_ASSERT_RUN_BODY \ + Perl_assert_aTHX PERL_STATIC_NO_RET void S_usage(pTHX) + Perl_attribute_nonnull_aTHX __attribute__noreturn__; -# define PERL_ARGS_ASSERT_USAGE +# define PERL_ARGS_ASSERT_USAGE \ + Perl_assert_aTHX # if !defined(PERL_IS_MINIPERL) -STATIC SV * -S_incpush_if_exists(pTHX_ AV * const av, SV *dir, SV * const stem); +static SV * +S_incpush_if_exists(pTHX_ AV * const av, SV *dir, SV * const stem) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_INCPUSH_IF_EXISTS \ - assert(av); assert(dir); assert(stem); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV); \ + assert(dir); assert(stem) -# endif +# endif /* !defined(PERL_IS_MINIPERL) */ # if !defined(SETUID_SCRIPTS_ARE_SECURE_NOW) -STATIC void -S_validate_suid(pTHX_ PerlIO *rsfp); +static void +S_validate_suid(pTHX_ PerlIO *rsfp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_VALIDATE_SUID \ - assert(rsfp) + Perl_assert_aTHX; assert(rsfp) # endif #endif /* defined(PERL_IN_PERL_C) */ #if defined(PERL_IN_PERL_C) || defined(PERL_IN_REGCOMP_ANY) || \ defined(PERL_IN_UTF8_C) PERL_CALLCONV bool -Perl__invlistEQ(pTHX_ SV * const a, SV * const b, const bool complement_b); -# define PERL_ARGS_ASSERT__INVLISTEQ \ - assert(a); assert(b) +Perl_invlistEQ_(pTHX_ SV * const a, SV * const b, const bool complement_b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +# define PERL_ARGS_ASSERT_INVLISTEQ_ \ + Perl_assert_aTHX; assert(a); assert(b) PERL_CALLCONV SV * -Perl__new_invlist_C_array(pTHX_ const UV * const list) +Perl_new_invlist_C_array_(pTHX_ const UV * const list) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT__NEW_INVLIST_C_ARRAY \ - assert(list) +# define PERL_ARGS_ASSERT_NEW_INVLIST_C_ARRAY_ \ + Perl_assert_aTHX; assert(list) #endif /* defined(PERL_IN_PERL_C) || defined(PERL_IN_REGCOMP_ANY) || defined(PERL_IN_UTF8_C) */ #if defined(PERL_IN_PP_C) -STATIC size_t -S_do_chomp(pTHX_ SV *retval, SV *sv, bool chomping); +static size_t +S_do_chomp(pTHX_ SV *retval, SV *sv, bool chomping) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_DO_CHOMP \ - assert(retval); assert(sv) + Perl_assert_aTHX; assert(retval); assert(sv) -STATIC OP * -S_do_delete_local(pTHX); -# define PERL_ARGS_ASSERT_DO_DELETE_LOCAL +static OP * +S_do_delete_local(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_DO_DELETE_LOCAL \ + Perl_assert_aTHX -STATIC SV * +static SV * S_refto(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_REFTO \ - assert(sv) + Perl_assert_aTHX; assert(sv) #endif /* defined(PERL_IN_PP_C) */ #if defined(PERL_IN_PP_C) || defined(PERL_IN_PP_HOT_C) PERL_CALLCONV GV * Perl_softref2xv(pTHX_ SV * const sv, const char * const what, const svtype type) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SOFTREF2XV \ - assert(sv); assert(what) + Perl_assert_aTHX; assert(sv); assert(what) + +#endif /* defined(PERL_IN_PP_C) || defined(PERL_IN_PP_HOT_C) */ +#if defined(PERL_IN_PP_C) || defined(PERL_IN_REGCOMP_ANY) || \ + defined(PERL_IN_TOKE_C) || defined(PERL_IN_UNIVERSAL_C) #endif #if defined(PERL_IN_PP_C) || defined(PERL_IN_UTF8_C) PERL_CALLCONV UV -Perl__to_upper_title_latin1(pTHX_ const U8 c, U8 *p, STRLEN *lenp, const char S_or_s) +Perl_to_upper_title_latin1_(pTHX_ const U8 c, U8 *p, STRLEN *lenp, const char S_or_s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT__TO_UPPER_TITLE_LATIN1 \ - assert(p); assert(lenp) +# define PERL_ARGS_ASSERT_TO_UPPER_TITLE_LATIN1_ \ + Perl_assert_aTHX; assert(p); assert(lenp) -#endif +#endif /* defined(PERL_IN_PP_C) || defined(PERL_IN_UTF8_C) */ #if defined(PERL_IN_PP_CTL_C) -STATIC PerlIO * +static PerlIO * S_check_type_and_open(pTHX_ SV *name) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_CHECK_TYPE_AND_OPEN \ - assert(name) + Perl_assert_aTHX; assert(name) -STATIC void -S_destroy_matcher(pTHX_ PMOP *matcher); +static void +S_destroy_matcher(pTHX_ PMOP *matcher) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_DESTROY_MATCHER \ - assert(matcher) + Perl_assert_aTHX; assert(matcher) -STATIC OP * -S_do_smartmatch(pTHX_ HV *seen_this, HV *seen_other, const bool copied); -# define PERL_ARGS_ASSERT_DO_SMARTMATCH +static OP * +S_do_smartmatch(pTHX_ HV *seen_this, HV *seen_other, const bool copied) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_DO_SMARTMATCH \ + Perl_assert_aTHX; assert(!seen_this || SvTYPE(seen_this) == SVt_PVHV); \ + assert(!seen_other || SvTYPE(seen_other) == SVt_PVHV) -STATIC OP * +static OP * S_docatch(pTHX_ Perl_ppaddr_t firstpp) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_DOCATCH +# define PERL_ARGS_ASSERT_DOCATCH \ + Perl_assert_aTHX -STATIC bool -S_doeval_compile(pTHX_ U8 gimme, CV *outside, U32 seq, HV *hh); -# define PERL_ARGS_ASSERT_DOEVAL_COMPILE +static bool +S_doeval_compile(pTHX_ U8 gimme, CV *outside, U32 seq, HV *hh) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_DOEVAL_COMPILE \ + Perl_assert_aTHX; \ + assert(!outside || SvTYPE(outside) == SVt_PVCV || SvTYPE(outside) == SVt_PVFM); \ + assert(!hh || SvTYPE(hh) == SVt_PVHV) -STATIC OP * +static OP * S_dofindlabel(pTHX_ OP *o, const char *label, STRLEN len, U32 flags, OP **opstack, OP **oplimit) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_5) + Perl_attribute_nonnull(pTHX_6) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_DOFINDLABEL \ - assert(o); assert(label); assert(opstack); assert(oplimit) + Perl_assert_aTHX; assert(o); assert(label); assert(opstack); \ + assert(oplimit) -STATIC MAGIC * -S_doparseform(pTHX_ SV *sv); +static MAGIC * +S_doparseform(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_DOPARSEFORM \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC I32 +static I32 S_dopoptoeval(pTHX_ I32 startingblock) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_DOPOPTOEVAL +# define PERL_ARGS_ASSERT_DOPOPTOEVAL \ + Perl_assert_aTHX -STATIC I32 +static I32 S_dopoptogivenfor(pTHX_ I32 startingblock) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_DOPOPTOGIVENFOR +# define PERL_ARGS_ASSERT_DOPOPTOGIVENFOR \ + Perl_assert_aTHX -STATIC I32 +static I32 S_dopoptolabel(pTHX_ const char *label, STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_DOPOPTOLABEL \ - assert(label) + Perl_assert_aTHX; assert(label) -STATIC I32 +static I32 S_dopoptoloop(pTHX_ I32 startingblock) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_DOPOPTOLOOP +# define PERL_ARGS_ASSERT_DOPOPTOLOOP \ + Perl_assert_aTHX -STATIC I32 +static I32 S_dopoptosub_at(pTHX_ const PERL_CONTEXT *cxstk, I32 startingblock) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_DOPOPTOSUB_AT \ - assert(cxstk) + Perl_assert_aTHX; assert(cxstk) -STATIC I32 +static I32 S_dopoptowhen(pTHX_ I32 startingblock) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_DOPOPTOWHEN +# define PERL_ARGS_ASSERT_DOPOPTOWHEN \ + Perl_assert_aTHX -STATIC PMOP * +static PMOP * S_make_matcher(pTHX_ REGEXP *re) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_MAKE_MATCHER \ - assert(re) + Perl_assert_aTHX; assert(re) -STATIC bool +static bool S_matcher_matches_sv(pTHX_ PMOP *matcher, SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_MATCHER_MATCHES_SV \ - assert(matcher); assert(sv) + Perl_assert_aTHX; assert(matcher); assert(sv) -STATIC bool +static bool S_num_overflow(NV value, I32 fldsize, I32 frcsize) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_NUM_OVERFLOW -STATIC I32 +static I32 S_run_user_filter(pTHX_ int idx, SV *buf_sv, int maxlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_RUN_USER_FILTER \ - assert(buf_sv) + Perl_assert_aTHX; assert(buf_sv) -STATIC void -S_rxres_free(pTHX_ void **rsp); +static void +S_rxres_free(pTHX_ void **rsp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RXRES_FREE \ - assert(rsp) + Perl_assert_aTHX; assert(rsp) -STATIC void -S_rxres_restore(pTHX_ void **rsp, REGEXP *rx); +static void +S_rxres_restore(pTHX_ void **rsp, REGEXP *rx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_RXRES_RESTORE \ - assert(rsp); assert(rx) + Perl_assert_aTHX; assert(rsp); assert(rx) -STATIC void -S_save_lines(pTHX_ AV *array, SV *sv); +static void +S_save_lines(pTHX_ AV *array, SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_SAVE_LINES \ - assert(sv); assert(!array || SvTYPE(array) == SVt_PVAV) + Perl_assert_aTHX; assert(!array || SvTYPE(array) == SVt_PVAV); \ + assert(sv) # if !defined(PERL_DISABLE_PMC) -STATIC PerlIO * +static PerlIO * S_doopen_pm(pTHX_ SV *name) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_DOOPEN_PM \ - assert(name) + Perl_assert_aTHX; assert(name) -# endif +# endif /* !defined(PERL_DISABLE_PMC) */ # if !defined(PERL_NO_INLINE_FUNCTIONS) PERL_STATIC_INLINE bool S_path_is_searchable(const char *name) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_PATH_IS_SEARCHABLE \ assert(name) @@ -8025,1608 +11730,2424 @@ S_path_is_searchable(const char *name) #if defined(PERL_IN_PP_CTL_C) || defined(PERL_IN_UTIL_C) PERL_CALLCONV bool Perl_invoke_exception_hook(pTHX_ SV *ex, bool warn) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_INVOKE_EXCEPTION_HOOK +# define PERL_ARGS_ASSERT_INVOKE_EXCEPTION_HOOK \ + Perl_assert_aTHX #endif #if defined(PERL_IN_PP_HOT_C) -STATIC void -S_do_oddball(pTHX_ SV **oddkey, SV **firstkey); +static void +S_do_oddball(pTHX_ SV **oddkey, SV **firstkey) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_DO_ODDBALL \ - assert(oddkey); assert(firstkey) + Perl_assert_aTHX; assert(oddkey); assert(firstkey) # if !defined(PERL_NO_INLINE_FUNCTIONS) PERL_STATIC_INLINE HV * -S_opmethod_stash(pTHX_ SV *meth); +S_opmethod_stash(pTHX_ SV *meth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_OPMETHOD_STASH \ - assert(meth) + Perl_assert_aTHX; assert(meth) PERL_STATIC_FORCE_INLINE bool S_should_we_output_Debug_r(pTHX_ regexp *prog) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__always_inline__; # define PERL_ARGS_ASSERT_SHOULD_WE_OUTPUT_DEBUG_R \ - assert(prog) + Perl_assert_aTHX; assert(prog) # endif /* !defined(PERL_NO_INLINE_FUNCTIONS) */ #endif /* defined(PERL_IN_PP_HOT_C) */ #if defined(PERL_IN_PP_PACK_C) -STATIC int -S_div128(pTHX_ SV *pnum, bool *done); +static int +S_div128(pTHX_ SV *pnum, bool *done) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_DIV128 \ - assert(pnum); assert(done) + Perl_assert_aTHX; assert(pnum); assert(done) -STATIC char -S_first_symbol(const char *pat, const char *patend); +static char +S_first_symbol(const char *pat, const char *patend) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2); # define PERL_ARGS_ASSERT_FIRST_SYMBOL \ - assert(pat); assert(patend) + assert(pat); assert(patend); assert(pat <= patend) -STATIC const char * +static const char * S_get_num(pTHX_ const char *patptr, SSize_t *lenptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_GET_NUM \ - assert(patptr); assert(lenptr) + Perl_assert_aTHX; assert(patptr); assert(lenptr) -STATIC const char * -S_group_end(pTHX_ const char *patptr, const char *patend, char ender); +static const char * +S_group_end(pTHX_ const char *patptr, const char *patend, char ender) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_GROUP_END \ - assert(patptr); assert(patend) + Perl_assert_aTHX; assert(patptr); assert(patend); \ + assert(patptr <= patend) -STATIC SV * +static SV * S_is_an_int(pTHX_ const char *s, STRLEN l) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_IS_AN_INT \ - assert(s) + Perl_assert_aTHX; assert(s) -STATIC SSize_t -S_measure_struct(pTHX_ struct tempsym *symptr); +static SSize_t +S_measure_struct(pTHX_ struct tempsym *symptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_MEASURE_STRUCT \ - assert(symptr) + Perl_assert_aTHX; assert(symptr) -STATIC SV * -S_mul128(pTHX_ SV *sv, U8 m); +static SV * +S_mul128(pTHX_ SV *sv, U8 m) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_MUL128 \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC char * +static char * S_my_bytes_to_utf8(const U8 *start, STRLEN len, char *dest, const bool needs_swap) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_MY_BYTES_TO_UTF8 \ assert(start); assert(dest) -STATIC bool -S_need_utf8(const char *pat, const char *patend); +static bool +S_need_utf8(const char *pat, const char *patend) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2); # define PERL_ARGS_ASSERT_NEED_UTF8 \ - assert(pat); assert(patend) + assert(pat); assert(patend); assert(pat <= patend) -STATIC bool -S_next_symbol(pTHX_ struct tempsym *symptr); +static bool +S_next_symbol(pTHX_ struct tempsym *symptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_NEXT_SYMBOL \ - assert(symptr) + Perl_assert_aTHX; assert(symptr) -STATIC SV ** -S_pack_rec(pTHX_ SV *cat, struct tempsym *symptr, SV **beglist, SV **endlist); +static SV ** +S_pack_rec(pTHX_ SV *cat, struct tempsym *symptr, SV **beglist, SV **endlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_PACK_REC \ - assert(cat); assert(symptr); assert(beglist); assert(endlist) + Perl_assert_aTHX; assert(cat); assert(symptr); assert(beglist); \ + assert(endlist) -STATIC char * +static char * S_sv_exp_grow(pTHX_ SV *sv, STRLEN needed) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SV_EXP_GROW \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC SSize_t -S_unpack_rec(pTHX_ struct tempsym *symptr, const char *s, const char *strbeg, const char *strend, const char **new_s); +static SSize_t +S_unpack_rec(pTHX_ struct tempsym *symptr, const char *s, const char *strbeg, const char *strend, const char **new_s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_UNPACK_REC \ - assert(symptr); assert(s); assert(strbeg); assert(strend) + Perl_assert_aTHX; assert(symptr); assert(s); assert(strbeg); \ + assert(strend); assert(strbeg <= s); assert(s <= strend) #endif /* defined(PERL_IN_PP_PACK_C) */ #if defined(PERL_IN_PP_SORT_C) -STATIC I32 -S_sortcv(pTHX_ SV * const a, SV * const b); + +static I32 +S_sortcv(pTHX_ SV * const a, SV * const b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_SORTCV \ - assert(a); assert(b) + Perl_assert_aTHX; assert(a); assert(b) -STATIC I32 -S_sortcv_stacked(pTHX_ SV * const a, SV * const b); +static I32 +S_sortcv_stacked(pTHX_ SV * const a, SV * const b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_SORTCV_STACKED \ - assert(a); assert(b) + Perl_assert_aTHX; assert(a); assert(b) -STATIC I32 -S_sortcv_xsub(pTHX_ SV * const a, SV * const b); +static I32 +S_sortcv_xsub(pTHX_ SV * const a, SV * const b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_SORTCV_XSUB \ - assert(a); assert(b) + Perl_assert_aTHX; assert(a); assert(b) # if !defined(PERL_NO_INLINE_FUNCTIONS) PERL_STATIC_INLINE I32 -S_amagic_cmp(pTHX_ SV * const str1, SV * const str2); +S_amagic_cmp(pTHX_ SV * const str1, SV * const str2) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_AMAGIC_CMP \ - assert(str1); assert(str2) + Perl_assert_aTHX; assert(str1); assert(str2) PERL_STATIC_INLINE I32 -S_amagic_cmp_desc(pTHX_ SV * const str1, SV * const str2); +S_amagic_cmp_desc(pTHX_ SV * const str1, SV * const str2) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_AMAGIC_CMP_DESC \ - assert(str1); assert(str2) + Perl_assert_aTHX; assert(str1); assert(str2) PERL_STATIC_INLINE I32 -S_amagic_i_ncmp(pTHX_ SV * const a, SV * const b); +S_amagic_i_ncmp(pTHX_ SV * const a, SV * const b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_AMAGIC_I_NCMP \ - assert(a); assert(b) + Perl_assert_aTHX; assert(a); assert(b) PERL_STATIC_INLINE I32 -S_amagic_i_ncmp_desc(pTHX_ SV * const a, SV * const b); +S_amagic_i_ncmp_desc(pTHX_ SV * const a, SV * const b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_AMAGIC_I_NCMP_DESC \ - assert(a); assert(b) + Perl_assert_aTHX; assert(a); assert(b) PERL_STATIC_INLINE I32 -S_amagic_ncmp(pTHX_ SV * const a, SV * const b); +S_amagic_ncmp(pTHX_ SV * const a, SV * const b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_AMAGIC_NCMP \ - assert(a); assert(b) + Perl_assert_aTHX; assert(a); assert(b) PERL_STATIC_INLINE I32 -S_amagic_ncmp_desc(pTHX_ SV * const a, SV * const b); +S_amagic_ncmp_desc(pTHX_ SV * const a, SV * const b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_AMAGIC_NCMP_DESC \ - assert(a); assert(b) + Perl_assert_aTHX; assert(a); assert(b) PERL_STATIC_INLINE I32 -S_cmp_desc(pTHX_ SV * const str1, SV * const str2); +S_cmp_desc(pTHX_ SV * const str1, SV * const str2) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_CMP_DESC \ - assert(str1); assert(str2) + Perl_assert_aTHX; assert(str1); assert(str2) PERL_STATIC_FORCE_INLINE void S_sortsv_flags_impl(pTHX_ SV **array, size_t num_elts, SVCOMPARE_t cmp, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) __attribute__always_inline__; # define PERL_ARGS_ASSERT_SORTSV_FLAGS_IMPL \ - assert(cmp) + Perl_assert_aTHX; assert(cmp) PERL_STATIC_INLINE I32 -S_sv_i_ncmp(pTHX_ SV * const a, SV * const b); +S_sv_i_ncmp(pTHX_ SV * const a, SV * const b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_SV_I_NCMP \ - assert(a); assert(b) + Perl_assert_aTHX; assert(a); assert(b) PERL_STATIC_INLINE I32 -S_sv_i_ncmp_desc(pTHX_ SV * const a, SV * const b); +S_sv_i_ncmp_desc(pTHX_ SV * const a, SV * const b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_SV_I_NCMP_DESC \ - assert(a); assert(b) + Perl_assert_aTHX; assert(a); assert(b) PERL_STATIC_INLINE I32 -S_sv_ncmp(pTHX_ SV * const a, SV * const b); +S_sv_ncmp(pTHX_ SV *a, SV *b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_SV_NCMP \ - assert(a); assert(b) + Perl_assert_aTHX; assert(a); assert(b) PERL_STATIC_INLINE I32 -S_sv_ncmp_desc(pTHX_ SV * const a, SV * const b); +S_sv_ncmp_desc(pTHX_ SV * const a, SV * const b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_SV_NCMP_DESC \ - assert(a); assert(b) + Perl_assert_aTHX; assert(a); assert(b) # if defined(USE_LOCALE_COLLATE) PERL_STATIC_INLINE I32 -S_amagic_cmp_locale(pTHX_ SV * const str1, SV * const str2); +S_amagic_cmp_locale(pTHX_ SV * const str1, SV * const str2) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_AMAGIC_CMP_LOCALE \ - assert(str1); assert(str2) + Perl_assert_aTHX; assert(str1); assert(str2) PERL_STATIC_INLINE I32 -S_amagic_cmp_locale_desc(pTHX_ SV * const str1, SV * const str2); +S_amagic_cmp_locale_desc(pTHX_ SV * const str1, SV * const str2) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_AMAGIC_CMP_LOCALE_DESC \ - assert(str1); assert(str2) + Perl_assert_aTHX; assert(str1); assert(str2) PERL_STATIC_INLINE I32 -S_cmp_locale_desc(pTHX_ SV * const str1, SV * const str2); +S_cmp_locale_desc(pTHX_ SV * const str1, SV * const str2) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_CMP_LOCALE_DESC \ - assert(str1); assert(str2) + Perl_assert_aTHX; assert(str1); assert(str2) # endif /* defined(USE_LOCALE_COLLATE) */ # endif /* !defined(PERL_NO_INLINE_FUNCTIONS) */ +# if defined(USE_LOCALE_COLLATE) + +# endif #endif /* defined(PERL_IN_PP_SORT_C) */ #if defined(PERL_IN_PP_SYS_C) -STATIC OP * -S_doform(pTHX_ CV *cv, GV *gv, OP *retop); +static OP * +S_doform(pTHX_ CV *cv, GV *gv, OP *retop) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_DOFORM \ - assert(cv); assert(gv); \ - assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM); assert(gv) -STATIC SV * -S_space_join_names_mortal(pTHX_ char * const *array); -# define PERL_ARGS_ASSERT_SPACE_JOIN_NAMES_MORTAL - -STATIC void -S_warn_not_dirhandle(pTHX_ GV *gv); +static SV * +S_space_join_names_mortal(pTHX_ char * const *array) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_SPACE_JOIN_NAMES_MORTAL \ + Perl_assert_aTHX + +static void +S_warn_not_dirhandle(pTHX_ GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_WARN_NOT_DIRHANDLE \ - assert(gv) + Perl_assert_aTHX; assert(gv) # if !defined(HAS_MKDIR) || !defined(HAS_RMDIR) -STATIC int +static int S_dooneliner(pTHX_ const char *cmd, const char *filename) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_DOONELINER \ - assert(cmd); assert(filename) + Perl_assert_aTHX; assert(cmd); assert(filename) -# endif +# endif /* !defined(HAS_MKDIR) || !defined(HAS_RMDIR) */ #endif /* defined(PERL_IN_PP_SYS_C) */ #if defined(PERL_IN_REGCOMP_ANY) +# define PERL_ARGS_ASSERT_ADD_ABOVE_LATIN1_FOLDS \ + Perl_assert_aTHX; assert(pRExC_state); assert(invlist) + +# define PERL_ARGS_ASSERT_CONSTRUCT_AHOCORASICK_FROM_TRIE \ + Perl_assert_aTHX; assert(pRExC_state); assert(source) + +# define PERL_ARGS_ASSERT_GET_ANYOFHBBM_CONTENTS \ + Perl_assert_aTHX; assert(n) + +# define PERL_ARGS_ASSERT_GET_ANYOFM_CONTENTS \ + Perl_assert_aTHX; assert(n) + +# define PERL_ARGS_ASSERT_JOIN_EXACT \ + Perl_assert_aTHX; assert(pRExC_state); assert(scan); \ + assert(min_subtract); assert(unfolded_multi_char) + +# define PERL_ARGS_ASSERT_MAKE_TRIE \ + Perl_assert_aTHX; assert(pRExC_state); assert(startbranch); \ + assert(first); assert(last); assert(tail) + +# define PERL_ARGS_ASSERT_POPULATE_ANYOF_BITMAP_FROM_INVLIST \ + Perl_assert_aTHX; assert(node); assert(invlist_ptr) + +# define PERL_ARGS_ASSERT_REG_ADD_DATA \ + assert(pRExC_state); assert(s) + +# define PERL_ARGS_ASSERT_SCAN_COMMIT \ + Perl_assert_aTHX; assert(pRExC_state); assert(data); assert(minlenp) + +# define PERL_ARGS_ASSERT_SET_ANYOF_ARG \ + Perl_assert_aTHX; assert(pRExC_state); assert(node) + +# define PERL_ARGS_ASSERT_SSC_INIT \ + Perl_assert_aTHX; assert(pRExC_state); assert(ssc) + +# define PERL_ARGS_ASSERT_STUDY_CHUNK \ + Perl_assert_aTHX; assert(pRExC_state); assert(scanp); assert(minlenp); \ + assert(deltap); assert(last) + +# if defined(PERL_CORE) || defined(PERL_EXT) PERL_CALLCONV void Perl_add_above_Latin1_folds(pTHX_ RExC_state_t *pRExC_state, const U8 cp, SV **invlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_ADD_ABOVE_LATIN1_FOLDS \ - assert(pRExC_state); assert(invlist) - PERL_CALLCONV regnode * Perl_construct_ahocorasick_from_trie(pTHX_ RExC_state_t *pRExC_state, regnode *source, U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_CONSTRUCT_AHOCORASICK_FROM_TRIE \ - assert(pRExC_state); assert(source) - PERL_CALLCONV SV * Perl_get_ANYOFHbbm_contents(pTHX_ const regnode *n) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_GET_ANYOFHBBM_CONTENTS \ - assert(n) - PERL_CALLCONV SV * Perl_get_ANYOFM_contents(pTHX_ const regnode *n) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_GET_ANYOFM_CONTENTS \ - assert(n) - PERL_CALLCONV U32 Perl_join_exact(pTHX_ RExC_state_t *pRExC_state, regnode *scan, UV *min_subtract, bool *unfolded_multi_char, U32 flags, regnode *val, U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_JOIN_EXACT \ - assert(pRExC_state); assert(scan); assert(min_subtract); \ - assert(unfolded_multi_char) - PERL_CALLCONV I32 Perl_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, regnode *first, regnode *last, regnode *tail, U32 word_count, U32 flags, U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_MAKE_TRIE \ - assert(pRExC_state); assert(startbranch); assert(first); assert(last); \ - assert(tail) - PERL_CALLCONV void Perl_populate_anyof_bitmap_from_invlist(pTHX_ regnode *node, SV **invlist_ptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_POPULATE_ANYOF_BITMAP_FROM_INVLIST \ - assert(node); assert(invlist_ptr) - PERL_CALLCONV U32 Perl_reg_add_data(RExC_state_t * const pRExC_state, const char * const s, const U32 n) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_REG_ADD_DATA \ - assert(pRExC_state); assert(s) - PERL_CALLCONV void Perl_scan_commit(pTHX_ const RExC_state_t *pRExC_state, struct scan_data_t *data, SSize_t *minlenp, int is_inf) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_SCAN_COMMIT \ - assert(pRExC_state); assert(data); assert(minlenp) - PERL_CALLCONV void Perl_set_ANYOF_arg(pTHX_ RExC_state_t * const pRExC_state, regnode * const node, SV * const cp_list, SV * const runtime_defns, SV * const only_utf8_locale_list) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_SET_ANYOF_ARG \ - assert(pRExC_state); assert(node) - PERL_CALLCONV void Perl_ssc_init(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_SSC_INIT \ - assert(pRExC_state); assert(ssc) - PERL_CALLCONV SSize_t Perl_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, SSize_t *minlenp, SSize_t *deltap, regnode *last, struct scan_data_t *data, I32 stopparen, U32 recursed_depth, regnode_ssc *and_withp, U32 flags, U32 depth, bool was_mutate_ok) - __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_STUDY_CHUNK \ - assert(pRExC_state); assert(scanp); assert(minlenp); assert(deltap); \ - assert(last) - + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5) + __attribute__visibility__("hidden"); +# if defined(PERL_IN_REGCOMP_TRIE_C) && defined(DEBUGGING) +static void +S_dump_trie(pTHX_ const struct reg_trie_data_ *trie, HV *widecharmap, AV *revcharmap, U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); +static void +S_dump_trie_interim_list(pTHX_ const struct reg_trie_data_ *trie, HV *widecharmap, AV *revcharmap, U32 next_alloc, U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); +static void +S_dump_trie_interim_table(pTHX_ const struct reg_trie_data_ *trie, HV *widecharmap, AV *revcharmap, U32 next_alloc, U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); +# endif /* defined(PERL_IN_REGCOMP_TRIE_C) && defined(DEBUGGING) */ +# endif /* defined(PERL_CORE) || defined(PERL_EXT) */ # if defined(PERL_IN_REGCOMP_TRIE_C) && defined(DEBUGGING) -STATIC void -S_dump_trie(pTHX_ const struct _reg_trie_data *trie, HV *widecharmap, AV *revcharmap, U32 depth); # define PERL_ARGS_ASSERT_DUMP_TRIE \ - assert(trie); assert(revcharmap); \ + Perl_assert_aTHX; assert(trie); \ assert(!widecharmap || SvTYPE(widecharmap) == SVt_PVHV); \ - assert(SvTYPE(revcharmap) == SVt_PVAV) + assert(revcharmap); assert(SvTYPE(revcharmap) == SVt_PVAV) -STATIC void -S_dump_trie_interim_list(pTHX_ const struct _reg_trie_data *trie, HV *widecharmap, AV *revcharmap, U32 next_alloc, U32 depth); # define PERL_ARGS_ASSERT_DUMP_TRIE_INTERIM_LIST \ - assert(trie); assert(revcharmap); \ + Perl_assert_aTHX; assert(trie); \ assert(!widecharmap || SvTYPE(widecharmap) == SVt_PVHV); \ - assert(SvTYPE(revcharmap) == SVt_PVAV) + assert(revcharmap); assert(SvTYPE(revcharmap) == SVt_PVAV) + +# define PERL_ARGS_ASSERT_DUMP_TRIE_INTERIM_TABLE \ + Perl_assert_aTHX; assert(trie); \ + assert(!widecharmap || SvTYPE(widecharmap) == SVt_PVHV); \ + assert(revcharmap); assert(SvTYPE(revcharmap) == SVt_PVAV) + +# endif /* defined(PERL_IN_REGCOMP_TRIE_C) && defined(DEBUGGING) */ +# if !defined(PERL_NO_INLINE_FUNCTIONS) +# define PERL_ARGS_ASSERT_INVLIST_CONTENTS \ + Perl_assert_aTHX; assert(invlist) + +# define PERL_ARGS_ASSERT_INVLIST_HIGHEST_RANGE_START \ + assert(invlist) + +# define PERL_ARGS_ASSERT_INVLIST_IS_ITERATING \ + assert(invlist) -STATIC void -S_dump_trie_interim_table(pTHX_ const struct _reg_trie_data *trie, HV *widecharmap, AV *revcharmap, U32 next_alloc, U32 depth); -# define PERL_ARGS_ASSERT_DUMP_TRIE_INTERIM_TABLE \ - assert(trie); assert(revcharmap); \ - assert(!widecharmap || SvTYPE(widecharmap) == SVt_PVHV); \ - assert(SvTYPE(revcharmap) == SVt_PVAV) +# define PERL_ARGS_ASSERT_INVLIST_LOWEST \ + assert(invlist) -# endif /* defined(PERL_IN_REGCOMP_TRIE_C) && defined(DEBUGGING) */ -# if !defined(PERL_NO_INLINE_FUNCTIONS) +# if defined(PERL_CORE) || defined(PERL_EXT) PERL_STATIC_INLINE SV * S_invlist_contents(pTHX_ SV * const invlist, const bool traditional_style) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_INVLIST_CONTENTS \ - assert(invlist) - PERL_STATIC_INLINE UV S_invlist_highest_range_start(SV * const invlist) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_INVLIST_HIGHEST_RANGE_START \ - assert(invlist) - PERL_STATIC_INLINE bool S_invlist_is_iterating(const SV * const invlist) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_INVLIST_IS_ITERATING \ - assert(invlist) - PERL_STATIC_INLINE UV S_invlist_lowest(SV * const invlist) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_INVLIST_LOWEST \ - assert(invlist) - +# endif /* defined(PERL_CORE) || defined(PERL_EXT) */ # endif /* !defined(PERL_NO_INLINE_FUNCTIONS) */ #endif /* defined(PERL_IN_REGCOMP_ANY) */ #if defined(PERL_IN_REGCOMP_ANY) || defined(PERL_IN_SV_C) PERL_CALLCONV SV * -Perl_invlist_clone(pTHX_ SV * const invlist, SV *newlist); +Perl_invlist_clone(pTHX_ SV * const invlist, SV *newlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_INVLIST_CLONE \ - assert(invlist) + Perl_assert_aTHX; assert(invlist) #endif #if defined(PERL_IN_REGCOMP_C) -STATIC AV * -S_add_multi_match(pTHX_ AV *multi_char_matches, SV *multi_string, const STRLEN cp_count); # define PERL_ARGS_ASSERT_ADD_MULTI_MATCH \ - assert(multi_string); \ - assert(!multi_char_matches || SvTYPE(multi_char_matches) == SVt_PVAV) + Perl_assert_aTHX; \ + assert(!multi_char_matches || SvTYPE(multi_char_matches) == SVt_PVAV); \ + assert(multi_string) -STATIC void -S_change_engine_size(pTHX_ RExC_state_t *pRExC_state, const ptrdiff_t size); # define PERL_ARGS_ASSERT_CHANGE_ENGINE_SIZE \ - assert(pRExC_state) + Perl_assert_aTHX; assert(pRExC_state) -STATIC REGEXP * -S_compile_wildcard(pTHX_ const char *subpattern, const STRLEN len, const bool ignore_case) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_COMPILE_WILDCARD \ - assert(subpattern) + Perl_assert_aTHX; assert(subpattern) -STATIC U8 -S_compute_EXACTish(RExC_state_t *pRExC_state); # define PERL_ARGS_ASSERT_COMPUTE_EXACTISH \ assert(pRExC_state) -STATIC int -S_edit_distance(const UV *src, const UV *tgt, const STRLEN x, const STRLEN y, const SSize_t maxDistance) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_EDIT_DISTANCE \ assert(src); assert(tgt) -STATIC I32 -S_execute_wildcard(pTHX_ REGEXP * const prog, char *stringarg, char *strend, char *strbeg, SSize_t minend, SV *screamer, U32 nosave); # define PERL_ARGS_ASSERT_EXECUTE_WILDCARD \ - assert(prog); assert(stringarg); assert(strend); assert(strbeg); \ - assert(screamer) + Perl_assert_aTHX; assert(prog); assert(stringarg); assert(strend); \ + assert(strbeg); assert(screamer); assert(strbeg <= stringarg); \ + assert(stringarg <= strend); assert(*strend == '\0') -STATIC U32 -S_get_quantifier_value(pTHX_ RExC_state_t *pRExC_state, const char *start, const char *end); # define PERL_ARGS_ASSERT_GET_QUANTIFIER_VALUE \ - assert(pRExC_state); assert(start); assert(end) + Perl_assert_aTHX; assert(pRExC_state); assert(start); assert(end); \ + assert(start < end) -STATIC bool -S_grok_bslash_N(pTHX_ RExC_state_t *pRExC_state, regnode_offset *nodep, UV *code_point_p, int *cp_count, I32 *flagp, const bool strict, const U32 depth); # define PERL_ARGS_ASSERT_GROK_BSLASH_N \ - assert(pRExC_state); assert(flagp) + Perl_assert_aTHX; assert(pRExC_state); assert(flagp) -STATIC regnode_offset -S_handle_named_backref(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, char *backref_parse_start, char ch); # define PERL_ARGS_ASSERT_HANDLE_NAMED_BACKREF \ - assert(pRExC_state); assert(flagp); assert(backref_parse_start) + Perl_assert_aTHX; assert(pRExC_state); assert(flagp); \ + assert(backref_parse_start) -STATIC bool -S_handle_names_wildcard(pTHX_ const char *wname, const STRLEN wname_len, SV **prop_definition, AV **strings); # define PERL_ARGS_ASSERT_HANDLE_NAMES_WILDCARD \ - assert(wname); assert(prop_definition); assert(strings) + Perl_assert_aTHX; assert(wname); assert(prop_definition); \ + assert(strings) -STATIC int -S_handle_possible_posix(pTHX_ RExC_state_t *pRExC_state, const char * const s, char **updated_parse_ptr, AV **posix_warnings, const bool check_only); # define PERL_ARGS_ASSERT_HANDLE_POSSIBLE_POSIX \ - assert(pRExC_state); assert(s) + Perl_assert_aTHX; assert(pRExC_state); assert(s) -STATIC regnode_offset -S_handle_regex_sets(pTHX_ RExC_state_t *pRExC_state, SV **return_invlist, I32 *flagp, U32 depth); # define PERL_ARGS_ASSERT_HANDLE_REGEX_SETS \ - assert(pRExC_state); assert(flagp) + Perl_assert_aTHX; assert(pRExC_state); assert(flagp) -STATIC SV * -S_handle_user_defined_property(pTHX_ const char *name, const STRLEN name_len, const bool is_utf8, const bool to_fold, const bool runtime, const bool deferrable, SV *contents, bool *user_defined_ptr, SV *msg, const STRLEN level); # define PERL_ARGS_ASSERT_HANDLE_USER_DEFINED_PROPERTY \ - assert(name); assert(contents); assert(user_defined_ptr); assert(msg) + Perl_assert_aTHX; assert(name); assert(contents); \ + assert(user_defined_ptr); assert(msg) -STATIC bool -S_is_ssc_worth_it(const RExC_state_t *pRExC_state, const regnode_ssc *ssc); # define PERL_ARGS_ASSERT_IS_SSC_WORTH_IT \ assert(pRExC_state); assert(ssc) -STATIC void -S_nextchar(pTHX_ RExC_state_t *pRExC_state); # define PERL_ARGS_ASSERT_NEXTCHAR \ - assert(pRExC_state) + Perl_assert_aTHX; assert(pRExC_state) -STATIC U8 -S_optimize_regclass(pTHX_ RExC_state_t *pRExC_state, SV *cp_list, SV *only_utf8_locale_list, SV *upper_latin1_only_utf8_matches, const U32 has_runtime_dependency, const U32 posixl, U8 *anyof_flags, bool *invert, regnode_offset *ret, I32 *flagp); # define PERL_ARGS_ASSERT_OPTIMIZE_REGCLASS \ - assert(pRExC_state); assert(anyof_flags); assert(invert); assert(ret); \ - assert(flagp) + Perl_assert_aTHX; assert(pRExC_state); assert(anyof_flags); \ + assert(invert); assert(ret); assert(flagp) -STATIC void -S_output_posix_warnings(pTHX_ RExC_state_t *pRExC_state, AV *posix_warnings); # define PERL_ARGS_ASSERT_OUTPUT_POSIX_WARNINGS \ - assert(pRExC_state); assert(posix_warnings); \ + Perl_assert_aTHX; assert(pRExC_state); assert(posix_warnings); \ assert(SvTYPE(posix_warnings) == SVt_PVAV) -STATIC void -S_parse_lparen_question_flags(pTHX_ RExC_state_t *pRExC_state); # define PERL_ARGS_ASSERT_PARSE_LPAREN_QUESTION_FLAGS \ - assert(pRExC_state) + Perl_assert_aTHX; assert(pRExC_state) -STATIC SV * -S_parse_uniprop_string(pTHX_ const char * const name, Size_t name_len, const bool is_utf8, const bool to_fold, const bool runtime, const bool deferrable, AV **strings, bool *user_defined_ptr, SV *msg, const STRLEN level); # define PERL_ARGS_ASSERT_PARSE_UNIPROP_STRING \ - assert(name); assert(user_defined_ptr); assert(msg) + Perl_assert_aTHX; assert(name); assert(user_defined_ptr); assert(msg) PERL_STATIC_NO_RET void S_re_croak(pTHX_ bool utf8, const char *pat, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__noreturn__ __attribute__format__(__printf__,pTHX_2,pTHX_3); # define PERL_ARGS_ASSERT_RE_CROAK \ - assert(pat) + Perl_assert_aTHX; assert(pat) -STATIC regnode_offset -S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth); # define PERL_ARGS_ASSERT_REG \ - assert(pRExC_state); assert(flagp) + Perl_assert_aTHX; assert(pRExC_state); assert(flagp) -STATIC regnode_offset -S_reg1node(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg); # define PERL_ARGS_ASSERT_REG1NODE \ - assert(pRExC_state) + Perl_assert_aTHX; assert(pRExC_state) -STATIC regnode_offset -S_reg2node(pTHX_ RExC_state_t *pRExC_state, const U8 op, const U32 arg1, const I32 arg2); # define PERL_ARGS_ASSERT_REG2NODE \ - assert(pRExC_state) + Perl_assert_aTHX; assert(pRExC_state) -STATIC regnode_offset -S_reg_la_NOTHING(pTHX_ RExC_state_t *pRExC_state, U32 flags, const char *type); # define PERL_ARGS_ASSERT_REG_LA_NOTHING \ - assert(pRExC_state); assert(type) + Perl_assert_aTHX; assert(pRExC_state); assert(type) -STATIC regnode_offset -S_reg_la_OPFAIL(pTHX_ RExC_state_t *pRExC_state, U32 flags, const char *type); # define PERL_ARGS_ASSERT_REG_LA_OPFAIL \ - assert(pRExC_state); assert(type) + Perl_assert_aTHX; assert(pRExC_state); assert(type) -STATIC regnode_offset -S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op); # define PERL_ARGS_ASSERT_REG_NODE \ - assert(pRExC_state) + Perl_assert_aTHX; assert(pRExC_state) -STATIC SV * -S_reg_scan_name(pTHX_ RExC_state_t *pRExC_state, U32 flags); # define PERL_ARGS_ASSERT_REG_SCAN_NAME \ - assert(pRExC_state) + Perl_assert_aTHX; assert(pRExC_state) -STATIC regnode_offset -S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth); # define PERL_ARGS_ASSERT_REGATOM \ - assert(pRExC_state); assert(flagp) + Perl_assert_aTHX; assert(pRExC_state); assert(flagp) -STATIC regnode_offset -S_regbranch(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, I32 first, U32 depth); # define PERL_ARGS_ASSERT_REGBRANCH \ - assert(pRExC_state); assert(flagp) + Perl_assert_aTHX; assert(pRExC_state); assert(flagp) -STATIC regnode_offset -S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth, const bool stop_at_1, bool allow_multi_fold, const bool silence_non_portable, const bool strict, bool optimizable, SV **ret_invlist); # define PERL_ARGS_ASSERT_REGCLASS \ - assert(pRExC_state); assert(flagp) + Perl_assert_aTHX; assert(pRExC_state); assert(flagp) -STATIC unsigned int -S_regex_set_precedence(const U8 my_operator) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_REGEX_SET_PRECEDENCE -STATIC void -S_reginsert(pTHX_ RExC_state_t *pRExC_state, const U8 op, const regnode_offset operand, const U32 depth); # define PERL_ARGS_ASSERT_REGINSERT \ - assert(pRExC_state) + Perl_assert_aTHX; assert(pRExC_state) -STATIC regnode_offset -S_regnode_guts(pTHX_ RExC_state_t *pRExC_state, const STRLEN extra_len); # define PERL_ARGS_ASSERT_REGNODE_GUTS \ - assert(pRExC_state) + Perl_assert_aTHX; assert(pRExC_state) -STATIC regnode_offset -S_regpiece(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth); # define PERL_ARGS_ASSERT_REGPIECE \ - assert(pRExC_state); assert(flagp) + Perl_assert_aTHX; assert(pRExC_state); assert(flagp) -STATIC regnode_offset -S_regpnode(pTHX_ RExC_state_t *pRExC_state, U8 op, SV *arg); # define PERL_ARGS_ASSERT_REGPNODE \ - assert(pRExC_state); assert(arg) + Perl_assert_aTHX; assert(pRExC_state); assert(arg) -STATIC bool -S_regtail(pTHX_ RExC_state_t *pRExC_state, const regnode_offset p, const regnode_offset val, const U32 depth) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_REGTAIL \ - assert(pRExC_state); assert(p); assert(val) + Perl_assert_aTHX; assert(pRExC_state) -STATIC void -S_set_regex_pv(pTHX_ RExC_state_t *pRExC_state, REGEXP *Rx); # define PERL_ARGS_ASSERT_SET_REGEX_PV \ - assert(pRExC_state); assert(Rx) + Perl_assert_aTHX; assert(pRExC_state); assert(Rx) + +# define PERL_ARGS_ASSERT_SKIP_BRACKETED_WHITE_SPACE \ + Perl_assert_aTHX; assert(pRExC_state); assert(p_start); assert(p); \ + assert(*p); assert(stop_p); assert(p_start <= *p); assert(*p <= stop_p) -STATIC void -S_skip_to_be_ignored_text(pTHX_ RExC_state_t *pRExC_state, char **p, const bool force_to_xmod); # define PERL_ARGS_ASSERT_SKIP_TO_BE_IGNORED_TEXT \ - assert(pRExC_state); assert(p) + Perl_assert_aTHX; assert(pRExC_state); assert(p) -STATIC void -S_ssc_finalize(pTHX_ RExC_state_t *pRExC_state, regnode_ssc *ssc); # define PERL_ARGS_ASSERT_SSC_FINALIZE \ - assert(pRExC_state); assert(ssc) + Perl_assert_aTHX; assert(pRExC_state); assert(ssc) # if defined(DEBUGGING) -STATIC regnode_offset -S_regnode_guts_debug(pTHX_ RExC_state_t *pRExC_state, const U8 op, const STRLEN extra_len); # define PERL_ARGS_ASSERT_REGNODE_GUTS_DEBUG \ - assert(pRExC_state) + Perl_assert_aTHX; assert(pRExC_state) -STATIC bool -S_regtail_study(pTHX_ RExC_state_t *pRExC_state, regnode_offset p, const regnode_offset val, U32 depth) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_REGTAIL_STUDY \ - assert(pRExC_state); assert(p); assert(val) + Perl_assert_aTHX; assert(pRExC_state); assert(p); assert(val) # if defined(ENABLE_REGEX_SETS_DEBUGGING) -STATIC void -S_dump_regex_sets_structures(pTHX_ RExC_state_t *pRExC_state, AV *stack, const IV fence, AV *fence_stack); # define PERL_ARGS_ASSERT_DUMP_REGEX_SETS_STRUCTURES \ - assert(pRExC_state); assert(stack); assert(fence_stack); \ - assert(SvTYPE(stack) == SVt_PVAV); \ + Perl_assert_aTHX; assert(pRExC_state); assert(stack); \ + assert(SvTYPE(stack) == SVt_PVAV); assert(fence_stack); \ assert(SvTYPE(fence_stack) == SVt_PVAV) # endif # endif /* defined(DEBUGGING) */ +# if defined(PERL_CORE) || defined(PERL_EXT) +static AV * +S_add_multi_match(pTHX_ AV *multi_char_matches, SV *multi_string, const STRLEN cp_count) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); +static void +S_change_engine_size(pTHX_ RExC_state_t *pRExC_state, const ptrdiff_t size) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static REGEXP * +S_compile_wildcard(pTHX_ const char *subpattern, const STRLEN len, const bool ignore_case) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__warn_unused_result__; +static U8 +S_compute_EXACTish(RExC_state_t *pRExC_state) + Perl_attribute_nonnull(1); +static int +S_edit_distance(const UV *src, const UV *tgt, const STRLEN x, const STRLEN y, const SSize_t maxDistance) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + __attribute__warn_unused_result__; +static I32 +S_execute_wildcard(pTHX_ REGEXP * const prog, char *stringarg, char *strend, char *strbeg, SSize_t minend, SV *screamer, U32 nosave) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_6); +static U32 +S_get_quantifier_value(pTHX_ RExC_state_t *pRExC_state, const char *start, const char *end) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +static bool +S_grok_bslash_N(pTHX_ RExC_state_t *pRExC_state, regnode_offset *nodep, UV *code_point_p, int *cp_count, I32 *flagp, const bool strict, const U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_5); +static regnode_offset +S_handle_named_backref(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, char *backref_parse_start, char ch) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +static bool +S_handle_names_wildcard(pTHX_ const char *wname, const STRLEN wname_len, SV **prop_definition, AV **strings) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); +static int +S_handle_possible_posix(pTHX_ RExC_state_t *pRExC_state, const char * const s, char **updated_parse_ptr, AV **posix_warnings, const bool check_only) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +static regnode_offset +S_handle_regex_sets(pTHX_ RExC_state_t *pRExC_state, SV **return_invlist, I32 *flagp, U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); +static SV * +S_handle_user_defined_property(pTHX_ const char *name, const STRLEN name_len, const bool is_utf8, const bool to_fold, const bool runtime, const bool deferrable, SV *contents, bool *user_defined_ptr, SV *msg, const STRLEN level) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_7) + Perl_attribute_nonnull(pTHX_8) + Perl_attribute_nonnull(pTHX_9); +static bool +S_is_ssc_worth_it(const RExC_state_t *pRExC_state, const regnode_ssc *ssc) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2); +static void +S_nextchar(pTHX_ RExC_state_t *pRExC_state) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static U8 +S_optimize_regclass(pTHX_ RExC_state_t *pRExC_state, SV *cp_list, SV *only_utf8_locale_list, SV *upper_latin1_only_utf8_matches, const U32 has_runtime_dependency, const U32 posixl, U8 *anyof_flags, bool *invert, regnode_offset *ret, I32 *flagp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_7) + Perl_attribute_nonnull(pTHX_8) + Perl_attribute_nonnull(pTHX_9) + Perl_attribute_nonnull(pTHX_10); +static void +S_output_posix_warnings(pTHX_ RExC_state_t *pRExC_state, AV *posix_warnings) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +static void +S_parse_lparen_question_flags(pTHX_ RExC_state_t *pRExC_state) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static SV * +S_parse_uniprop_string(pTHX_ const char * const name, Size_t name_len, const bool is_utf8, const bool to_fold, const bool runtime, const bool deferrable, AV **strings, bool *user_defined_ptr, SV *msg, const STRLEN level) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_8) + Perl_attribute_nonnull(pTHX_9); +static regnode_offset +S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); +static regnode_offset +S_reg1node(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static regnode_offset +S_reg2node(pTHX_ RExC_state_t *pRExC_state, const U8 op, const U32 arg1, const I32 arg2) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static regnode_offset +S_reg_la_NOTHING(pTHX_ RExC_state_t *pRExC_state, U32 flags, const char *type) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); +static regnode_offset +S_reg_la_OPFAIL(pTHX_ RExC_state_t *pRExC_state, U32 flags, const char *type) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); +static regnode_offset +S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static SV * +S_reg_scan_name(pTHX_ RExC_state_t *pRExC_state, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static regnode_offset +S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +static regnode_offset +S_regbranch(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, I32 first, U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +static regnode_offset +S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth, const bool stop_at_1, bool allow_multi_fold, const bool silence_non_portable, const bool strict, bool optimizable, SV **ret_invlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +static unsigned int +S_regex_set_precedence(const U8 my_operator) + __attribute__warn_unused_result__; +static void +S_reginsert(pTHX_ RExC_state_t *pRExC_state, const U8 op, const regnode_offset operand, const U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static regnode_offset +S_regnode_guts(pTHX_ RExC_state_t *pRExC_state, const STRLEN extra_len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static regnode_offset +S_regpiece(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +static regnode_offset +S_regpnode(pTHX_ RExC_state_t *pRExC_state, U8 op, SV *arg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); +static bool +S_regtail(pTHX_ RExC_state_t *pRExC_state, const regnode_offset p, const regnode_offset val, const U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__warn_unused_result__; +static void +S_set_regex_pv(pTHX_ RExC_state_t *pRExC_state, REGEXP *Rx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +static void +S_skip_bracketed_white_space(pTHX_ RExC_state_t *pRExC_state, U8 do_skip, const char *p_start, char **p, char *stop_p) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5); +static void +S_skip_to_be_ignored_text(pTHX_ RExC_state_t *pRExC_state, char **p, const bool force_to_xmod) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +static void +S_ssc_finalize(pTHX_ RExC_state_t *pRExC_state, regnode_ssc *ssc) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +# if defined(DEBUGGING) +static regnode_offset +S_regnode_guts_debug(pTHX_ RExC_state_t *pRExC_state, const U8 op, const STRLEN extra_len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static bool +S_regtail_study(pTHX_ RExC_state_t *pRExC_state, regnode_offset p, const regnode_offset val, U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + __attribute__warn_unused_result__; +# if defined(ENABLE_REGEX_SETS_DEBUGGING) +static void +S_dump_regex_sets_structures(pTHX_ RExC_state_t *pRExC_state, AV *stack, const IV fence, AV *fence_stack) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_4); +# endif +# endif /* defined(DEBUGGING) */ +# endif /* defined(PERL_CORE) || defined(PERL_EXT) */ # if !defined(PERL_NO_INLINE_FUNCTIONS) -PERL_STATIC_INLINE Size_t -S_find_first_differing_byte_pos(const U8 *s1, const U8 *s2, const Size_t max); # define PERL_ARGS_ASSERT_FIND_FIRST_DIFFERING_BYTE_POS \ assert(s1); assert(s2) -PERL_STATIC_INLINE char * -S_reg_skipcomment(RExC_state_t *pRExC_state, char *p); # define PERL_ARGS_ASSERT_REG_SKIPCOMMENT \ - assert(pRExC_state); assert(p) + Perl_assert_aTHX; assert(pRExC_state); assert(p_start); assert(p); \ + assert(*p); assert(p_end); assert(p_start <= *p); assert(*p <= p_end) +# if defined(PERL_CORE) || defined(PERL_EXT) +PERL_STATIC_INLINE Size_t +S_find_first_differing_byte_pos(const U8 *s1, const U8 *s2, const Size_t max) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2); +PERL_STATIC_INLINE void +S_reg_skipcomment(pTHX_ RExC_state_t *pRExC_state, const char *p_start, char **p, char *p_end, bool check_for_R_bracket) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); +# endif /* defined(PERL_CORE) || defined(PERL_EXT) */ # endif /* !defined(PERL_NO_INLINE_FUNCTIONS) */ #endif /* defined(PERL_IN_REGCOMP_C) */ #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGCOMP_INVLIST_C) +# define PERL_ARGS_ASSERT_POPULATE_BITMAP_FROM_INVLIST \ + Perl_assert_aTHX; assert(invlist); assert(bitmap) + +# define PERL_ARGS_ASSERT_POPULATE_INVLIST_FROM_BITMAP \ + Perl_assert_aTHX; assert(bitmap); assert(invlist) + +# if defined(PERL_CORE) || defined(PERL_EXT) PERL_CALLCONV void Perl_populate_bitmap_from_invlist(pTHX_ SV *invlist, const UV offset, const U8 *bitmap, const Size_t len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_POPULATE_BITMAP_FROM_INVLIST \ - assert(invlist); assert(bitmap) - PERL_CALLCONV void Perl_populate_invlist_from_bitmap(pTHX_ const U8 *bitmap, const Size_t bitmap_len, SV **invlist, const UV offset) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_POPULATE_INVLIST_FROM_BITMAP \ - assert(bitmap); assert(invlist) - +# endif /* defined(PERL_CORE) || defined(PERL_EXT) */ #endif /* defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGCOMP_INVLIST_C) */ #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) || \ defined(PERL_IN_TOKE_C) -PERL_CALLCONV bool -Perl_is_grapheme(pTHX_ const U8 *strbeg, const U8 *s, const U8 *strend, const UV cp) - __attribute__warn_unused_result__ - __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_IS_GRAPHEME \ - assert(strbeg); assert(s); assert(strend) + Perl_assert_aTHX; assert(strbeg); assert(s); assert(strend); \ + assert(strbeg <= s); assert(s < strend) #endif #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) || \ defined(PERL_IN_UTF8_C) PERL_CALLCONV UV -Perl__to_fold_latin1(const U8 c, U8 *p, STRLEN *lenp, const unsigned int flags); -# define PERL_ARGS_ASSERT__TO_FOLD_LATIN1 \ +Perl_to_fold_latin1_(const U8 c, U8 *p, STRLEN *lenp, const unsigned int flags) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3); +# define PERL_ARGS_ASSERT_TO_FOLD_LATIN1_ \ assert(p); assert(lenp) #endif #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_TOKE_C) PERL_CALLCONV bool Perl_regcurly(const char *s, const char *e, const char *result[5]) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_REGCURLY \ - assert(s); assert(e) + assert(s); assert(e); assert(s < e) -#endif +#endif /* defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_TOKE_C) */ #if defined(PERL_IN_REGCOMP_DEBUG_C) && defined(DEBUGGING) -STATIC U8 -S_put_charclass_bitmap_innards(pTHX_ SV *sv, char *bitmap, SV *nonbitmap_invlist, SV *only_utf8_locale_invlist, const regnode * const node, const U8 flags, const bool force_as_is_display); # define PERL_ARGS_ASSERT_PUT_CHARCLASS_BITMAP_INNARDS \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC SV * -S_put_charclass_bitmap_innards_common(pTHX_ SV *invlist, SV *posixes, SV *only_utf8, SV *not_utf8, SV *only_utf8_locale, const bool invert); # define PERL_ARGS_ASSERT_PUT_CHARCLASS_BITMAP_INNARDS_COMMON \ - assert(invlist) + Perl_assert_aTHX; assert(invlist) -STATIC void -S_put_charclass_bitmap_innards_invlist(pTHX_ SV *sv, SV *invlist); # define PERL_ARGS_ASSERT_PUT_CHARCLASS_BITMAP_INNARDS_INVLIST \ - assert(sv); assert(invlist) + Perl_assert_aTHX; assert(sv); assert(invlist) -STATIC void -S_put_code_point(pTHX_ SV *sv, UV c); # define PERL_ARGS_ASSERT_PUT_CODE_POINT \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC void -S_put_range(pTHX_ SV *sv, UV start, const UV end, const bool allow_literals); # define PERL_ARGS_ASSERT_PUT_RANGE \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC void -S_regdump_extflags(pTHX_ const char *lead, const U32 flags); -# define PERL_ARGS_ASSERT_REGDUMP_EXTFLAGS - -STATIC void -S_regdump_intflags(pTHX_ const char *lead, const U32 flags); -# define PERL_ARGS_ASSERT_REGDUMP_INTFLAGS +# define PERL_ARGS_ASSERT_REGDUMP_EXTFLAGS \ + Perl_assert_aTHX + +# define PERL_ARGS_ASSERT_REGDUMP_INTFLAGS \ + Perl_assert_aTHX #endif /* defined(PERL_IN_REGCOMP_DEBUG_C) && defined(DEBUGGING) */ #if defined(PERL_IN_REGCOMP_INVLIST_C) && !defined(PERL_EXT_RE_BUILD) -STATIC void -S__append_range_to_invlist(pTHX_ SV * const invlist, const UV start, const UV end); -# define PERL_ARGS_ASSERT__APPEND_RANGE_TO_INVLIST \ - assert(invlist) +# define PERL_ARGS_ASSERT_APPEND_RANGE_TO_INVLIST_ \ + Perl_assert_aTHX; assert(invlist) -STATIC void -S_initialize_invlist_guts(pTHX_ SV *invlist, const Size_t initial_size); +static void +S_initialize_invlist_guts(pTHX_ SV *invlist, const Size_t initial_size) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_INITIALIZE_INVLIST_GUTS \ - assert(invlist) + Perl_assert_aTHX; assert(invlist) -STATIC void -S_invlist_replace_list_destroys_src(pTHX_ SV *dest, SV *src); # define PERL_ARGS_ASSERT_INVLIST_REPLACE_LIST_DESTROYS_SRC \ - assert(dest); assert(src) + Perl_assert_aTHX; assert(dest); assert(src) +# if defined(PERL_CORE) || defined(PERL_EXT) +static void +S_append_range_to_invlist_(pTHX_ SV * const invlist, const UV start, const UV end) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static void +S_invlist_replace_list_destroys_src(pTHX_ SV *dest, SV *src) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +# endif /* defined(PERL_CORE) || defined(PERL_EXT) */ # if !defined(PERL_NO_INLINE_FUNCTIONS) -PERL_STATIC_INLINE UV * -S__invlist_array_init(SV * const invlist, const bool will_have_0) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT__INVLIST_ARRAY_INIT \ +# define PERL_ARGS_ASSERT_GET_INVLIST_PREVIOUS_INDEX_ADDR \ assert(invlist) -PERL_STATIC_INLINE IV * -S_get_invlist_previous_index_addr(SV *invlist) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_GET_INVLIST_PREVIOUS_INDEX_ADDR \ +# define PERL_ARGS_ASSERT_INVLIST_ARRAY_INIT_ \ assert(invlist) -PERL_STATIC_INLINE void -S_invlist_clear(pTHX_ SV *invlist); # define PERL_ARGS_ASSERT_INVLIST_CLEAR \ - assert(invlist) + Perl_assert_aTHX; assert(invlist) -PERL_STATIC_INLINE UV -S_invlist_max(const SV * const invlist) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_INVLIST_MAX \ assert(invlist) -PERL_STATIC_INLINE IV -S_invlist_previous_index(SV * const invlist) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_INVLIST_PREVIOUS_INDEX \ assert(invlist) -PERL_STATIC_INLINE void -S_invlist_set_previous_index(SV * const invlist, const IV index); # define PERL_ARGS_ASSERT_INVLIST_SET_PREVIOUS_INDEX \ assert(invlist) -PERL_STATIC_INLINE void -S_invlist_trim(SV *invlist); # define PERL_ARGS_ASSERT_INVLIST_TRIM \ assert(invlist) +# if defined(PERL_CORE) || defined(PERL_EXT) +PERL_STATIC_INLINE IV * +S_get_invlist_previous_index_addr(SV *invlist) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +PERL_STATIC_INLINE UV * +S_invlist_array_init_(SV * const invlist, const bool will_have_0) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +PERL_STATIC_INLINE void +S_invlist_clear(pTHX_ SV *invlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +PERL_STATIC_INLINE UV +S_invlist_max(const SV * const invlist) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +PERL_STATIC_INLINE IV +S_invlist_previous_index(SV * const invlist) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +PERL_STATIC_INLINE void +S_invlist_set_previous_index(SV * const invlist, const IV index) + Perl_attribute_nonnull(1); +PERL_STATIC_INLINE void +S_invlist_trim(SV *invlist) + Perl_attribute_nonnull(1); +# endif /* defined(PERL_CORE) || defined(PERL_EXT) */ # endif /* !defined(PERL_NO_INLINE_FUNCTIONS) */ #endif /* defined(PERL_IN_REGCOMP_INVLIST_C) && !defined(PERL_EXT_RE_BUILD) */ #if defined(PERL_IN_REGCOMP_STUDY_C) -STATIC SV * -S_get_ANYOF_cp_list_for_ssc(pTHX_ const RExC_state_t *pRExC_state, const regnode_charclass * const node); # define PERL_ARGS_ASSERT_GET_ANYOF_CP_LIST_FOR_SSC \ - assert(pRExC_state); assert(node) + Perl_assert_aTHX; assert(pRExC_state); assert(node) -STATIC SV * -S_make_exactf_invlist(pTHX_ RExC_state_t *pRExC_state, regnode *node) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_MAKE_EXACTF_INVLIST \ - assert(pRExC_state); assert(node) + Perl_assert_aTHX; assert(pRExC_state); assert(node) -STATIC void -S_rck_elide_nothing(pTHX_ regnode *node); # define PERL_ARGS_ASSERT_RCK_ELIDE_NOTHING \ - assert(node) + Perl_assert_aTHX; assert(node) -STATIC void -S_ssc_add_range(pTHX_ regnode_ssc *ssc, UV const start, UV const end); # define PERL_ARGS_ASSERT_SSC_ADD_RANGE \ - assert(ssc) + Perl_assert_aTHX; assert(ssc) -STATIC void -S_ssc_and(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc, const regnode_charclass *and_with); # define PERL_ARGS_ASSERT_SSC_AND \ - assert(pRExC_state); assert(ssc); assert(and_with) + Perl_assert_aTHX; assert(pRExC_state); assert(ssc); assert(and_with) -STATIC void -S_ssc_anything(pTHX_ regnode_ssc *ssc); # define PERL_ARGS_ASSERT_SSC_ANYTHING \ - assert(ssc) + Perl_assert_aTHX; assert(ssc) -STATIC void -S_ssc_clear_locale(regnode_ssc *ssc); # define PERL_ARGS_ASSERT_SSC_CLEAR_LOCALE \ assert(ssc) -STATIC void -S_ssc_cp_and(pTHX_ regnode_ssc *ssc, UV const cp); # define PERL_ARGS_ASSERT_SSC_CP_AND \ - assert(ssc) + Perl_assert_aTHX; assert(ssc) -STATIC void -S_ssc_intersection(pTHX_ regnode_ssc *ssc, SV * const invlist, const bool invert_2nd); # define PERL_ARGS_ASSERT_SSC_INTERSECTION \ - assert(ssc); assert(invlist) + Perl_assert_aTHX; assert(ssc); assert(invlist) -STATIC int -S_ssc_is_anything(const regnode_ssc *ssc) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SSC_IS_ANYTHING \ assert(ssc) -STATIC int -S_ssc_is_cp_posixl_init(const RExC_state_t *pRExC_state, const regnode_ssc *ssc) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SSC_IS_CP_POSIXL_INIT \ assert(pRExC_state); assert(ssc) -STATIC void -S_ssc_or(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc, const regnode_charclass *or_with); # define PERL_ARGS_ASSERT_SSC_OR \ - assert(pRExC_state); assert(ssc); assert(or_with) + Perl_assert_aTHX; assert(pRExC_state); assert(ssc); assert(or_with) -STATIC void -S_ssc_union(pTHX_ regnode_ssc *ssc, SV * const invlist, const bool invert_2nd); # define PERL_ARGS_ASSERT_SSC_UNION \ - assert(ssc); assert(invlist) + Perl_assert_aTHX; assert(ssc); assert(invlist) -STATIC void -S_unwind_scan_frames(pTHX_ const void *p); # define PERL_ARGS_ASSERT_UNWIND_SCAN_FRAMES \ - assert(p) + Perl_assert_aTHX; assert(p) +# if defined(PERL_CORE) || defined(PERL_EXT) +static SV * +S_get_ANYOF_cp_list_for_ssc(pTHX_ const RExC_state_t *pRExC_state, const regnode_charclass * const node) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +static SV * +S_make_exactf_invlist(pTHX_ RExC_state_t *pRExC_state, regnode *node) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + __attribute__warn_unused_result__; +static void +S_rck_elide_nothing(pTHX_ regnode *node) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static void +S_ssc_add_range(pTHX_ regnode_ssc *ssc, UV const start, UV const end) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static void +S_ssc_and(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc, const regnode_charclass *and_with) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +static void +S_ssc_anything(pTHX_ regnode_ssc *ssc) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static void +S_ssc_clear_locale(regnode_ssc *ssc) + Perl_attribute_nonnull(1); +static void +S_ssc_cp_and(pTHX_ regnode_ssc *ssc, UV const cp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static void +S_ssc_intersection(pTHX_ regnode_ssc *ssc, SV * const invlist, const bool invert_2nd) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +static int +S_ssc_is_anything(const regnode_ssc *ssc) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +static int +S_ssc_is_cp_posixl_init(const RExC_state_t *pRExC_state, const regnode_ssc *ssc) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + __attribute__warn_unused_result__; +static void +S_ssc_or(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc, const regnode_charclass *or_with) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +static void +S_ssc_union(pTHX_ regnode_ssc *ssc, SV * const invlist, const bool invert_2nd) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +static void +S_unwind_scan_frames(pTHX_ void *p) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# endif /* defined(PERL_CORE) || defined(PERL_EXT) */ #endif /* defined(PERL_IN_REGCOMP_STUDY_C) */ #if defined(PERL_IN_REGEXEC_C) -STATIC LB_enum -S_advance_one_LB(pTHX_ U8 **curpos, const U8 * const strend, const bool utf8_target) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ADVANCE_ONE_LB \ - assert(curpos); assert(strend) + Perl_assert_aTHX; assert(curpos); assert(*curpos); assert(strend); \ + assert(*curpos < strend) -STATIC SB_enum -S_advance_one_SB(pTHX_ U8 **curpos, const U8 * const strend, const bool utf8_target) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ADVANCE_ONE_SB \ - assert(curpos); assert(strend) + Perl_assert_aTHX; assert(curpos); assert(*curpos); assert(strend); \ + assert(*curpos < strend) -STATIC WB_enum -S_advance_one_WB_(pTHX_ U8 **curpos, const U8 * const strend, const bool utf8_target, const bool skip_Extend_Format) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ADVANCE_ONE_WB_ \ - assert(curpos); assert(strend) + Perl_assert_aTHX; assert(curpos); assert(*curpos); assert(strend); \ + assert(*curpos < strend) -STATIC GCB_enum -S_backup_one_GCB(pTHX_ const U8 * const strbeg, U8 **curpos, const bool utf8_target) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_BACKUP_ONE_GCB \ - assert(strbeg); assert(curpos) + Perl_assert_aTHX; assert(strbeg); assert(curpos); assert(*curpos); \ + assert(strbeg <= *curpos) -STATIC LB_enum -S_backup_one_LB_(pTHX_ const U8 * const strbeg, U8 **curpos, const bool utf8_target, bool skip_CM_ZWJ) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_BACKUP_ONE_LB_ \ - assert(strbeg); assert(curpos) + Perl_assert_aTHX; assert(strbeg); assert(curpos); assert(*curpos); \ + assert(strbeg <= *curpos) -STATIC SB_enum -S_backup_one_SB(pTHX_ const U8 * const strbeg, U8 **curpos, const bool utf8_target) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_BACKUP_ONE_SB \ - assert(strbeg); assert(curpos) + Perl_assert_aTHX; assert(strbeg); assert(curpos); assert(*curpos); \ + assert(strbeg <= *curpos) -STATIC WB_enum -S_backup_one_WB_but_over_Extend_FO(pTHX_ WB_enum *previous, const U8 * const strbeg, U8 **curpos, const bool utf8_target) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_BACKUP_ONE_WB_BUT_OVER_EXTEND_FO \ - assert(previous); assert(strbeg); assert(curpos) + Perl_assert_aTHX; assert(previous); assert(strbeg); assert(curpos); \ + assert(*curpos); assert(strbeg <= *curpos) -STATIC char * -S_find_byclass(pTHX_ regexp *prog, const regnode *c, char *s, const char *strend, regmatch_info *reginfo) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_FIND_BYCLASS \ - assert(prog); assert(c); assert(s); assert(strend) + Perl_assert_aTHX; assert(prog); assert(c); assert(s); assert(strend); \ + assert(s <= strend) -STATIC U8 * -S_find_next_masked(U8 *s, const U8 *send, const U8 byte, const U8 mask) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_FIND_NEXT_MASKED \ - assert(s); assert(send) + assert(s); assert(send); assert(s <= send) -STATIC U8 * -S_find_span_end(U8 *s, const U8 *send, const U8 span_byte) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_FIND_SPAN_END \ - assert(s); assert(send) + assert(s); assert(send); assert(s <= send) -STATIC U8 * -S_find_span_end_mask(U8 *s, const U8 *send, const U8 span_byte, const U8 mask) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_FIND_SPAN_END_MASK \ - assert(s); assert(send) + assert(s); assert(send); assert(s <= send) -STATIC bool -S_isFOO_lc(pTHX_ const U8 classnum, const U8 character) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_ISFOO_LC +# define PERL_ARGS_ASSERT_ISFOO_LC \ + Perl_assert_aTHX -STATIC bool -S_isFOO_utf8_lc(pTHX_ const U8 classnum, const U8 *character, const U8 *e) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ISFOO_UTF8_LC \ - assert(character); assert(e) + Perl_assert_aTHX; assert(character); assert(e); assert(character < e) -STATIC bool -S_isGCB(pTHX_ const GCB_enum before, const GCB_enum after, const U8 * const strbeg, const U8 * const curpos, const bool utf8_target) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ISGCB \ - assert(strbeg); assert(curpos) + Perl_assert_aTHX; assert(strbeg); assert(curpos); \ + assert(strbeg <= curpos) -STATIC bool -S_isLB(pTHX_ LB_enum before, LB_enum after, const U8 * const strbeg, const U8 * const curpos, const U8 * const strend, const bool utf8_target) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ISLB \ - assert(strbeg); assert(curpos); assert(strend) + Perl_assert_aTHX; assert(strbeg); assert(curpos); assert(strend); \ + assert(strbeg <= curpos); assert(curpos < strend) -STATIC bool -S_isSB(pTHX_ SB_enum before, SB_enum after, const U8 * const strbeg, const U8 * const curpos, const U8 * const strend, const bool utf8_target) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ISSB \ - assert(strbeg); assert(curpos); assert(strend) + Perl_assert_aTHX; assert(strbeg); assert(curpos); assert(strend); \ + assert(strbeg <= curpos); assert(curpos < strend) -STATIC bool -S_isWB(pTHX_ WB_enum previous, WB_enum before, WB_enum after, const U8 * const strbeg, const U8 * const curpos, const U8 * const strend, const bool utf8_target) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ISWB \ - assert(strbeg); assert(curpos); assert(strend) + Perl_assert_aTHX; assert(strbeg); assert(curpos); assert(strend); \ + assert(strbeg <= curpos); assert(curpos < strend) -STATIC I32 -S_reg_check_named_buff_matched(const regexp *rex, const regnode *scan) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_REG_CHECK_NAMED_BUFF_MATCHED \ assert(rex); assert(scan) -STATIC void -S_regcp_restore(pTHX_ regexp *rex, I32 ix, U32 *maxopenparen_p comma_pDEPTH); # define PERL_ARGS_ASSERT_REGCP_RESTORE \ - assert(rex); assert(maxopenparen_p) + Perl_assert_aTHX; assert(rex); assert(maxopenparen_p) -STATIC void -S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p comma_pDEPTH); # define PERL_ARGS_ASSERT_REGCPPOP \ - assert(rex); assert(maxopenparen_p) + Perl_assert_aTHX; assert(rex); assert(maxopenparen_p) -STATIC CHECKPOINT -S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen comma_pDEPTH); # define PERL_ARGS_ASSERT_REGCPPUSH \ - assert(rex) + Perl_assert_aTHX; assert(rex) -STATIC U8 * -S_reghop3(U8 *s, SSize_t off, const U8 *lim) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_REGHOP3 \ assert(s); assert(lim) -STATIC U8 * -S_reghopmaybe3(U8 *s, SSize_t off, const U8 * const lim) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_REGHOPMAYBE3 \ assert(s); assert(lim) -STATIC bool -S_reginclass(pTHX_ regexp * const prog, const regnode * const n, const U8 * const p, const U8 * const p_end, bool const utf8_target) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_REGINCLASS \ - assert(n); assert(p); assert(p_end) + Perl_assert_aTHX; assert(n); assert(p); assert(p_end); assert(p < p_end) -STATIC SSize_t -S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_REGMATCH \ - assert(reginfo); assert(startpos); assert(prog) + Perl_assert_aTHX; assert(reginfo); assert(startpos); assert(prog) -STATIC I32 -S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, char *loceol, regmatch_info * const reginfo, I32 max comma_pDEPTH) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_REGREPEAT \ - assert(prog); assert(startposp); assert(p); assert(loceol); \ - assert(reginfo); assert(max) + Perl_assert_aTHX; assert(prog); assert(startposp); assert(p); \ + assert(loceol); assert(reginfo); assert(max) -STATIC bool -S_regtry(pTHX_ regmatch_info *reginfo, char **startposp) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_REGTRY \ - assert(reginfo); assert(startposp) + Perl_assert_aTHX; assert(reginfo); assert(startposp) -STATIC bool -S_to_byte_substr(pTHX_ regexp *prog); # define PERL_ARGS_ASSERT_TO_BYTE_SUBSTR \ - assert(prog) + Perl_assert_aTHX; assert(prog) -STATIC void -S_to_utf8_substr(pTHX_ regexp *prog); # define PERL_ARGS_ASSERT_TO_UTF8_SUBSTR \ - assert(prog) + Perl_assert_aTHX; assert(prog) # if defined(DEBUGGING) -STATIC void -S_debug_start_match(pTHX_ const REGEXP *prog, const bool do_utf8, const char *start, const char *end, const char *blurb); # define PERL_ARGS_ASSERT_DEBUG_START_MATCH \ - assert(prog); assert(start); assert(end); assert(blurb) + Perl_assert_aTHX; assert(prog); assert(start); assert(end); \ + assert(blurb); assert(start <= end) -STATIC void -S_dump_exec_pos(pTHX_ const char *locinput, const regnode *scan, const char *loc_regeol, const char *loc_bostr, const char *loc_reg_starttry, const bool do_utf8, const U32 depth); # define PERL_ARGS_ASSERT_DUMP_EXEC_POS \ - assert(locinput); assert(scan); assert(loc_regeol); assert(loc_bostr); \ - assert(loc_reg_starttry) + Perl_assert_aTHX; assert(locinput); assert(scan); assert(loc_regeol); \ + assert(loc_bostr); assert(loc_reg_starttry); \ + assert(locinput <= loc_regeol) -PERL_CALLCONV int -Perl_re_exec_indentf(pTHX_ const char *fmt, U32 depth, ...) - __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_RE_EXEC_INDENTF \ - assert(fmt) + Perl_assert_aTHX; assert(fmt) # endif /* defined(DEBUGGING) */ +# if defined(PERL_CORE) || defined(PERL_EXT) +static LB_enum +S_advance_one_LB(pTHX_ U8 **curpos, const U8 * const strend, const bool utf8_target) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + __attribute__warn_unused_result__; +static SB_enum +S_advance_one_SB(pTHX_ U8 **curpos, const U8 * const strend, const bool utf8_target) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + __attribute__warn_unused_result__; +static WB_enum +S_advance_one_WB_(pTHX_ U8 **curpos, const U8 * const strend, const bool utf8_target, const bool skip_Extend_Format) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + __attribute__warn_unused_result__; +static GCB_enum +S_backup_one_GCB(pTHX_ const U8 * const strbeg, U8 **curpos, const bool utf8_target) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + __attribute__warn_unused_result__; +static LB_enum +S_backup_one_LB_(pTHX_ const U8 * const strbeg, U8 **curpos, const bool utf8_target, bool skip_CM_ZWJ) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + __attribute__warn_unused_result__; +static SB_enum +S_backup_one_SB(pTHX_ const U8 * const strbeg, U8 **curpos, const bool utf8_target) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + __attribute__warn_unused_result__; +static WB_enum +S_backup_one_WB_but_over_Extend_FO(pTHX_ WB_enum *previous, const U8 * const strbeg, U8 **curpos, const bool utf8_target) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + __attribute__warn_unused_result__; +static char * +S_find_byclass(pTHX_ regexp *prog, const regnode *c, char *s, const char *strend, regmatch_info *reginfo) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + __attribute__warn_unused_result__; +static U8 * +S_find_next_masked(U8 *s, const U8 *send, const U8 byte, const U8 mask) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + __attribute__warn_unused_result__; +static U8 * +S_find_span_end(U8 *s, const U8 *send, const U8 span_byte) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + __attribute__warn_unused_result__; +static U8 * +S_find_span_end_mask(U8 *s, const U8 *send, const U8 span_byte, const U8 mask) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + __attribute__warn_unused_result__; +static bool +S_isFOO_lc(pTHX_ const U8 classnum, const U8 character) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +static bool +S_isFOO_utf8_lc(pTHX_ const U8 classnum, const U8 *character, const U8 *e) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + __attribute__warn_unused_result__; +static bool +S_isGCB(pTHX_ const GCB_enum before, const GCB_enum after, const U8 * const strbeg, const U8 * const curpos, const bool utf8_target) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + __attribute__warn_unused_result__; +static bool +S_isLB(pTHX_ LB_enum before, LB_enum after, const U8 * const strbeg, const U8 * const curpos, const U8 * const strend, const bool utf8_target) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5) + __attribute__warn_unused_result__; +static bool +S_isSB(pTHX_ SB_enum before, SB_enum after, const U8 * const strbeg, const U8 * const curpos, const U8 * const strend, const bool utf8_target) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5) + __attribute__warn_unused_result__; +static bool +S_isWB(pTHX_ WB_enum previous, WB_enum before, WB_enum after, const U8 * const strbeg, const U8 * const curpos, const U8 * const strend, const bool utf8_target) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5) + Perl_attribute_nonnull(pTHX_6) + __attribute__warn_unused_result__; +static I32 +S_reg_check_named_buff_matched(const regexp *rex, const regnode *scan) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + __attribute__warn_unused_result__; +static void +S_regcp_restore(pTHX_ regexp *rex, I32 ix, U32 *maxopenparen_p comma_pDEPTH) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); +static void +S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p comma_pDEPTH) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +static CHECKPOINT +S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen comma_pDEPTH) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static U8 * +S_reghop3(U8 *s, SSize_t off, const U8 *lim) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3) + __attribute__warn_unused_result__; +static U8 * +S_reghopmaybe3(U8 *s, SSize_t off, const U8 * const lim) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3) + __attribute__warn_unused_result__; +static bool +S_reginclass(pTHX_ regexp * const prog, const regnode * const n, const U8 * const p, const U8 * const p_end, bool const utf8_target) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + __attribute__warn_unused_result__; +static SSize_t +S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + __attribute__warn_unused_result__; +static I32 +S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, char *loceol, regmatch_info * const reginfo, I32 max comma_pDEPTH) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5) + __attribute__warn_unused_result__; +static bool +S_regtry(pTHX_ regmatch_info *reginfo, char **startposp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + __attribute__warn_unused_result__; +static bool +S_to_byte_substr(pTHX_ regexp *prog) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +static void +S_to_utf8_substr(pTHX_ regexp *prog) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# if defined(DEBUGGING) +static void +S_debug_start_match(pTHX_ const REGEXP *prog, const bool do_utf8, const char *start, const char *end, const char *blurb) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5); +static void +S_dump_exec_pos(pTHX_ const char *locinput, const regnode *scan, const char *loc_regeol, const char *loc_bostr, const char *loc_reg_starttry, const bool do_utf8, const U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5); +PERL_CALLCONV int +Perl_re_exec_indentf(pTHX_ const char *fmt, U32 depth, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__visibility__("hidden"); +# endif /* defined(DEBUGGING) */ +# endif /* defined(PERL_CORE) || defined(PERL_EXT) */ # if !defined(PERL_NO_INLINE_FUNCTIONS) -PERL_STATIC_INLINE void -S_capture_clear(pTHX_ regexp *rex, U16 from_ix, U16 to_ix, const char *str comma_pDEPTH); # define PERL_ARGS_ASSERT_CAPTURE_CLEAR \ - assert(rex); assert(str) + Perl_assert_aTHX; assert(rex); assert(str) -PERL_STATIC_INLINE I32 -S_foldEQ_latin1_s2_folded(pTHX_ const char *a, const char *b, I32 len); # define PERL_ARGS_ASSERT_FOLDEQ_LATIN1_S2_FOLDED \ - assert(a); assert(b) + Perl_assert_aTHX; assert(s1); assert(s2) + +# define PERL_ARGS_ASSERT_UNWIND_PAREN \ + Perl_assert_aTHX; assert(rex) + +# if defined(PERL_CORE) || defined(PERL_EXT) +PERL_STATIC_INLINE void +S_capture_clear(pTHX_ regexp *rex, U16 from_ix, U16 to_ix, const char *str comma_pDEPTH) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_4); +PERL_STATIC_INLINE I32 +S_foldEQ_latin1_s2_folded(pTHX_ const char *s1, const char *s2, I32 len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +PERL_STATIC_INLINE void +S_unwind_paren(pTHX_ regexp *rex, U32 lp, U32 lcp comma_pDEPTH) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# endif /* defined(PERL_CORE) || defined(PERL_EXT) */ +# endif /* !defined(PERL_NO_INLINE_FUNCTIONS) */ +#endif /* defined(PERL_IN_REGEXEC_C) */ +#if defined(PERL_IN_REGEX_ENGINE) + +# define PERL_ARGS_ASSERT_REGPROP \ + Perl_assert_aTHX; assert(sv); assert(o) + +# if defined(DEBUGGING) +# define PERL_ARGS_ASSERT_DEBUG_PEEP \ + Perl_assert_aTHX; assert(str); assert(pRExC_state) + +# define PERL_ARGS_ASSERT_DEBUG_SHOW_STUDY_FLAGS \ + Perl_assert_aTHX; assert(open_str); assert(close_str) + +# define PERL_ARGS_ASSERT_DEBUG_STUDYDATA \ + Perl_assert_aTHX; assert(where) + +# define PERL_ARGS_ASSERT_DUMPUNTIL \ + Perl_assert_aTHX; assert(r); assert(start); assert(node); assert(sv) -PERL_STATIC_INLINE void -S_unwind_paren(pTHX_ regexp *rex, U32 lp, U32 lcp comma_pDEPTH); -# define PERL_ARGS_ASSERT_UNWIND_PAREN \ - assert(rex) +# define PERL_ARGS_ASSERT_RE_INDENTF \ + Perl_assert_aTHX; assert(fmt) -# endif /* !defined(PERL_NO_INLINE_FUNCTIONS) */ -#endif /* defined(PERL_IN_REGEXEC_C) */ -#if defined(PERL_IN_REGEX_ENGINE) +# define PERL_ARGS_ASSERT_RE_PRINTF \ + Perl_assert_aTHX; assert(fmt) -# if defined(DEBUGGING) +# endif /* defined(DEBUGGING) */ +# if defined(PERL_CORE) || defined(PERL_EXT) +PERL_CALLCONV void +Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o, const regmatch_info *reginfo, const RExC_state_t *pRExC_state) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + __attribute__visibility__("hidden"); +# if defined(DEBUGGING) PERL_CALLCONV void Perl_debug_peep(pTHX_ const char *str, const RExC_state_t *pRExC_state, regnode *scan, U32 depth, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_DEBUG_PEEP \ - assert(str); assert(pRExC_state) - PERL_CALLCONV void Perl_debug_show_study_flags(pTHX_ U32 flags, const char *open_str, const char *close_str) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_DEBUG_SHOW_STUDY_FLAGS \ - assert(open_str); assert(close_str) - PERL_CALLCONV void Perl_debug_studydata(pTHX_ const char *where, scan_data_t *data, U32 depth, int is_inf, SSize_t min, SSize_t stopmin, SSize_t delta) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_DEBUG_STUDYDATA \ - assert(where) - PERL_CALLCONV const regnode * Perl_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, const regnode *last, const regnode *plast, SV *sv, I32 indent, U32 depth) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_6) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_DUMPUNTIL \ - assert(r); assert(start); assert(node); assert(sv) - PERL_CALLCONV int Perl_re_indentf(pTHX_ const char *fmt, U32 depth, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_RE_INDENTF \ - assert(fmt) - PERL_CALLCONV int Perl_re_printf(pTHX_ const char *fmt, ...) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden") __attribute__format__(__printf__,pTHX_1,pTHX_2); -# define PERL_ARGS_ASSERT_RE_PRINTF \ - assert(fmt) - -PERL_CALLCONV void -Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o, const regmatch_info *reginfo, const RExC_state_t *pRExC_state) - __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_REGPROP \ - assert(sv); assert(o) - -# endif /* defined(DEBUGGING) */ +# endif /* defined(DEBUGGING) */ +# endif /* defined(PERL_CORE) || defined(PERL_EXT) */ # if defined(PERL_EXT_RE_BUILD) +# define PERL_ARGS_ASSERT_GET_RE_GCLASS_AUX_DATA \ + Perl_assert_aTHX; assert(node) + +# if defined(PERL_CORE) || defined(PERL_EXT) PERL_CALLCONV SV * Perl_get_re_gclass_aux_data(pTHX_ const regexp *prog, const struct regnode *node, bool doinit, SV **listsvp, SV **lonly_utf8_locale, SV **output_invlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_GET_RE_GCLASS_AUX_DATA \ - assert(node) +# endif +# else /* if !defined(PERL_EXT_RE_BUILD) */ +# define PERL_ARGS_ASSERT_GET_REGCLASS_AUX_DATA \ + Perl_assert_aTHX; assert(node) -# else +# if defined(PERL_CORE) || defined(PERL_EXT) PERL_CALLCONV SV * Perl_get_regclass_aux_data(pTHX_ const regexp *prog, const struct regnode *node, bool doinit, SV **listsvp, SV **lonly_utf8_locale, SV **output_invlist) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_GET_REGCLASS_AUX_DATA \ - assert(node) - -# endif +# endif +# endif /* !defined(PERL_EXT_RE_BUILD) */ # if !defined(PERL_NO_INLINE_FUNCTIONS) PERL_STATIC_INLINE bool Perl_check_regnode_after(pTHX_ const regnode *p, const STRLEN extra) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_CHECK_REGNODE_AFTER +# define PERL_ARGS_ASSERT_CHECK_REGNODE_AFTER \ + Perl_assert_aTHX PERL_STATIC_INLINE regnode * Perl_regnext(pTHX_ const regnode *p) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_REGNEXT +# define PERL_ARGS_ASSERT_REGNEXT \ + Perl_assert_aTHX PERL_STATIC_INLINE regnode * Perl_regnode_after(pTHX_ const regnode *p, bool varies) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_REGNODE_AFTER +# define PERL_ARGS_ASSERT_REGNODE_AFTER \ + Perl_assert_aTHX # endif /* !defined(PERL_NO_INLINE_FUNCTIONS) */ #endif /* defined(PERL_IN_REGEX_ENGINE) */ #if defined(PERL_IN_SCOPE_C) -STATIC void -S_save_pushptri32ptr(pTHX_ void * const ptr1, const I32 i, void * const ptr2, const int type); -# define PERL_ARGS_ASSERT_SAVE_PUSHPTRI32PTR - -STATIC SV * -S_save_scalar_at(pTHX_ SV **sptr, const U32 flags); +static void +S_save_pushptri32ptr(pTHX_ void * const ptr1, const I32 i, void * const ptr2, const int type) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_SAVE_PUSHPTRI32PTR \ + Perl_assert_aTHX + +static SV * +S_save_scalar_at(pTHX_ SV **sptr, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SAVE_SCALAR_AT \ - assert(sptr) + Perl_assert_aTHX; assert(sptr) #endif /* defined(PERL_IN_SCOPE_C) */ #if defined(PERL_IN_SV_C) -STATIC char * -S_F0convert(NV nv, char * const endbuf, STRLEN * const len); +static char * +S_F0convert(NV nv, char * const endbuf, STRLEN * const len) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3); # define PERL_ARGS_ASSERT_F0CONVERT \ assert(endbuf); assert(len) -STATIC void -S_anonymise_cv_maybe(pTHX_ GV *gv, CV *cv); +static void +S_anonymise_cv_maybe(pTHX_ GV *gv, CV *cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_ANONYMISE_CV_MAYBE \ - assert(gv); assert(cv); \ + Perl_assert_aTHX; assert(gv); assert(cv); \ assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) -STATIC void -S_assert_uft8_cache_coherent(pTHX_ const char * const func, STRLEN from_cache, STRLEN real, SV * const sv); +static void +S_assert_uft8_cache_coherent(pTHX_ const char * const func, STRLEN from_cache, STRLEN real, SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_ASSERT_UFT8_CACHE_COHERENT \ - assert(func); assert(sv) + Perl_assert_aTHX; assert(func); assert(sv) -STATIC void -S_croak_sv_setsv_flags(pTHX_ SV * const dsv, SV * const ssv); +static void +S_croak_sv_setsv_flags(pTHX_ SV * const dsv, SV * const ssv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_CROAK_SV_SETSV_FLAGS \ - assert(dsv); assert(ssv) + Perl_assert_aTHX; assert(dsv); assert(ssv) -STATIC bool -S_curse(pTHX_ SV * const sv, const bool check_refcnt); +static bool +S_curse(pTHX_ SV * const sv, const bool check_refcnt) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CURSE \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC STRLEN +static STRLEN S_expect_number(pTHX_ const char ** const pattern) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_EXPECT_NUMBER \ - assert(pattern) + Perl_assert_aTHX; assert(pattern) -STATIC SSize_t -S_find_array_subscript(pTHX_ const AV * const av, const SV * const val); +static SSize_t +S_find_array_subscript(pTHX_ const AV * const av, const SV * const val) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_FIND_ARRAY_SUBSCRIPT \ - assert(val) + Perl_assert_aTHX; assert(val) -STATIC SV * -S_find_hash_subscript(pTHX_ const HV * const hv, const SV * const val); +static SV * +S_find_hash_subscript(pTHX_ const HV * const hv, const SV * const val) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_FIND_HASH_SUBSCRIPT \ - assert(val) + Perl_assert_aTHX; assert(val) -STATIC SV * -S_find_uninit_var(pTHX_ const OP * const obase, const SV * const uninit_sv, bool match, const char **desc_p); +static SV * +S_find_uninit_var(pTHX_ const OP * const obase, const SV * const uninit_sv, bool match, const char **desc_p) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_FIND_UNINIT_VAR \ - assert(desc_p) + Perl_assert_aTHX; assert(desc_p) -STATIC bool -S_glob_2number(pTHX_ GV * const gv); +static bool +S_glob_2number(pTHX_ GV * const gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_GLOB_2NUMBER \ - assert(gv) + Perl_assert_aTHX; assert(gv) -STATIC void -S_glob_assign_glob(pTHX_ SV * const dsv, SV * const ssv, const int dtype); +static void +S_glob_assign_glob(pTHX_ SV * const dsv, SV * const ssv, const int dtype) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_GLOB_ASSIGN_GLOB \ - assert(dsv); assert(ssv) - -PERL_CALLCONV SV * -Perl_more_sv(pTHX); -# define PERL_ARGS_ASSERT_MORE_SV + Perl_assert_aTHX; assert(dsv); assert(ssv) -STATIC void -S_not_a_number(pTHX_ SV * const sv); +static void +S_not_a_number(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_NOT_A_NUMBER \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC void -S_not_incrementable(pTHX_ SV * const sv); +static void +S_not_incrementable(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_NOT_INCREMENTABLE \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC PTR_TBL_ENT_t * +static PTR_TBL_ENT_t * S_ptr_table_find(PTR_TBL_t * const tbl, const void * const sv) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_PTR_TABLE_FIND \ assert(tbl) -STATIC bool -S_sv_2iuv_common(pTHX_ SV * const sv); +static bool +S_sv_2iuv_common(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SV_2IUV_COMMON \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC void -S_sv_add_arena(pTHX_ char * const ptr, const U32 size, const U32 flags); +static void +S_sv_add_arena(pTHX_ char * const ptr, const U32 size, const U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SV_ADD_ARENA \ - assert(ptr) + Perl_assert_aTHX; assert(ptr) -STATIC const char * -S_sv_display(pTHX_ SV * const sv, char *tmpbuf, STRLEN tmpbuf_size); +static const char * +S_sv_display(pTHX_ SV * const sv, char *tmpbuf, STRLEN tmpbuf_size) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_SV_DISPLAY \ - assert(sv); assert(tmpbuf) + Perl_assert_aTHX; assert(sv); assert(tmpbuf) -STATIC STRLEN -S_sv_pos_b2u_midway(pTHX_ const U8 * const s, const U8 * const target, const U8 *end, STRLEN endu); +static bool +S_sv_numcmp_common(pTHX_ SV **sv1, SV **sv2, const U32 flags, int method, SV **result) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_5); +# define PERL_ARGS_ASSERT_SV_NUMCMP_COMMON \ + Perl_assert_aTHX; assert(result) + +static STRLEN +S_sv_pos_b2u_midway(pTHX_ const U8 * const s, const U8 * const target, const U8 *end, STRLEN endu) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_SV_POS_B2U_MIDWAY \ - assert(s); assert(target); assert(end) + Perl_assert_aTHX; assert(s); assert(target); assert(end); \ + assert(s <= target); assert(target <= end) -STATIC STRLEN -S_sv_pos_u2b_cached(pTHX_ SV * const sv, MAGIC ** const mgp, const U8 * const start, const U8 * const send, STRLEN uoffset, STRLEN uoffset0, STRLEN boffset0); +static STRLEN +S_sv_pos_u2b_cached(pTHX_ SV * const sv, MAGIC ** const mgp, const U8 * const start, const U8 * const send, STRLEN uoffset, STRLEN uoffset0, STRLEN boffset0) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_SV_POS_U2B_CACHED \ - assert(sv); assert(mgp); assert(start); assert(send) + Perl_assert_aTHX; assert(sv); assert(mgp); assert(start); assert(send); \ + assert(start < send) -STATIC STRLEN -S_sv_pos_u2b_forwards(const U8 * const start, const U8 * const send, STRLEN * const uoffset, bool * const at_end, bool *canonical_position); +static STRLEN +S_sv_pos_u2b_forwards(const U8 * const start, const U8 * const send, STRLEN * const uoffset_p, bool * const at_end, bool *canonical_position) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3) + Perl_attribute_nonnull(4) + Perl_attribute_nonnull(5); # define PERL_ARGS_ASSERT_SV_POS_U2B_FORWARDS \ - assert(start); assert(send); assert(uoffset); assert(at_end); \ - assert(canonical_position) + assert(start); assert(send); assert(uoffset_p); assert(at_end); \ + assert(canonical_position); assert(start < send) -STATIC STRLEN -S_sv_pos_u2b_midway(const U8 * const start, const U8 *send, STRLEN uoffset, const STRLEN uend); +static STRLEN +S_sv_pos_u2b_midway(const U8 * const start, const U8 *send, STRLEN uoffset, const STRLEN uend) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2); # define PERL_ARGS_ASSERT_SV_POS_U2B_MIDWAY \ - assert(start); assert(send) + assert(start); assert(send); assert(start < send) -STATIC void -S_utf8_mg_len_cache_update(pTHX_ SV * const sv, MAGIC ** const mgp, const STRLEN ulen); +static void +S_utf8_mg_len_cache_update(pTHX_ SV * const sv, MAGIC ** const mgp, const STRLEN ulen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_UTF8_MG_LEN_CACHE_UPDATE \ - assert(sv); assert(mgp) + Perl_assert_aTHX; assert(sv); assert(mgp) -STATIC void -S_utf8_mg_pos_cache_update(pTHX_ SV * const sv, MAGIC ** const mgp, const STRLEN byte, const STRLEN utf8, const STRLEN blen); +static void +S_utf8_mg_pos_cache_update(pTHX_ SV * const sv, MAGIC ** const mgp, const STRLEN byte, const STRLEN utf8, const STRLEN blen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_UTF8_MG_POS_CACHE_UPDATE \ - assert(sv); assert(mgp) + Perl_assert_aTHX; assert(sv); assert(mgp) -STATIC SSize_t -S_visit(pTHX_ SVFUNC_t f, const U32 flags, const U32 mask); +static SSize_t +S_visit(pTHX_ SVFUNC_t f, const U32 flags, const U32 mask) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_VISIT \ - assert(f) + Perl_assert_aTHX; assert(f) # if defined(DEBUGGING) -STATIC void -S_del_sv(pTHX_ SV *p); +static void +S_del_sv(pTHX_ SV *p) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_DEL_SV \ - assert(p) + Perl_assert_aTHX; assert(p) PERL_CALLCONV void Perl_sv_mark_arenas(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_SV_MARK_ARENAS +# define PERL_ARGS_ASSERT_SV_MARK_ARENAS \ + Perl_assert_aTHX PERL_CALLCONV void Perl_sv_sweep_arenas(pTHX) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_SV_SWEEP_ARENAS +# define PERL_ARGS_ASSERT_SV_SWEEP_ARENAS \ + Perl_assert_aTHX # endif /* defined(DEBUGGING) */ # if !defined(NV_PRESERVES_UV) # if defined(DEBUGGING) -STATIC int -S_sv_2iuv_non_preserve(pTHX_ SV * const sv, I32 numtype); +static int +S_sv_2iuv_non_preserve(pTHX_ SV * const sv, I32 numtype) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SV_2IUV_NON_PRESERVE \ - assert(sv) + Perl_assert_aTHX; assert(sv) # else -STATIC int -S_sv_2iuv_non_preserve(pTHX_ SV * const sv); +static int +S_sv_2iuv_non_preserve(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SV_2IUV_NON_PRESERVE \ - assert(sv) + Perl_assert_aTHX; assert(sv) # endif # endif /* !defined(NV_PRESERVES_UV) */ # if defined(PERL_DEBUG_READONLY_COW) -STATIC void -S_sv_buf_to_rw(pTHX_ SV *sv); +static void +S_sv_buf_to_rw(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SV_BUF_TO_RW \ - assert(sv) + Perl_assert_aTHX; assert(sv) # endif # if !defined(PERL_NO_INLINE_FUNCTIONS) PERL_STATIC_INLINE void -S_sv_unglob(pTHX_ SV * const sv, U32 flags); +S_sv_unglob(pTHX_ SV * const sv, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SV_UNGLOB \ - assert(sv) + Perl_assert_aTHX; assert(sv) # endif # if defined(USE_ITHREADS) -STATIC SV * +static SV * S_sv_dup_common(pTHX_ const SV * const ssv, CLONE_PARAMS * const param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SV_DUP_COMMON \ - assert(ssv); assert(param) + Perl_assert_aTHX; assert(ssv); assert(param) -STATIC void -S_sv_dup_hvaux(pTHX_ const SV * const ssv, SV *dsv, CLONE_PARAMS * const param); +static void +S_sv_dup_hvaux(pTHX_ const SV * const ssv, SV *dsv, CLONE_PARAMS * const param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_SV_DUP_HVAUX \ - assert(ssv); assert(dsv); assert(param) + Perl_assert_aTHX; assert(ssv); assert(dsv); assert(param) -STATIC SV ** -S_sv_dup_inc_multiple(pTHX_ SV * const *source, SV **dest, SSize_t items, CLONE_PARAMS * const param); +static SV ** +S_sv_dup_inc_multiple(pTHX_ SV * const *source, SV **dest, SSize_t items, CLONE_PARAMS * const param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_SV_DUP_INC_MULTIPLE \ - assert(source); assert(dest); assert(param) + Perl_assert_aTHX; assert(source); assert(dest); assert(param) -STATIC void -S_unreferenced_to_tmp_stack(pTHX_ AV * const unreferenced); +static void +S_unreferenced_to_tmp_stack(pTHX_ AV * const unreferenced) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_UNREFERENCED_TO_TMP_STACK \ - assert(unreferenced); assert(SvTYPE(unreferenced) == SVt_PVAV) + Perl_assert_aTHX; assert(unreferenced); \ + assert(SvTYPE(unreferenced) == SVt_PVAV) # endif /* defined(USE_ITHREADS) */ #endif /* defined(PERL_IN_SV_C) */ #if defined(PERL_IN_TOKE_C) -STATIC int -S_ao(pTHX_ int toketype); -# define PERL_ARGS_ASSERT_AO - -STATIC void -S_check_uni(pTHX); -# define PERL_ARGS_ASSERT_CHECK_UNI - -STATIC void -S_checkcomma(pTHX_ const char *s, const char *name, const char *what); +static int +S_ao(pTHX_ int toketype) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_AO \ + Perl_assert_aTHX + +static void +S_check_unary(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_CHECK_UNARY \ + Perl_assert_aTHX + +static void +S_checkcomma(pTHX_ const char *s, const char *name, const char *what) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_CHECKCOMMA \ - assert(s); assert(name); assert(what) + Perl_assert_aTHX; assert(s); assert(name); assert(what) -STATIC char * +static char * S_filter_gets(pTHX_ SV *sv, STRLEN append) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_FILTER_GETS \ - assert(sv) + Perl_assert_aTHX; assert(sv) -STATIC HV * +static HV * S_find_in_my_stash(pTHX_ const char *pkgname, STRLEN len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_FIND_IN_MY_STASH \ - assert(pkgname) + Perl_assert_aTHX; assert(pkgname) -STATIC void -S_force_ident(pTHX_ const char *s, int kind); +static void +S_force_ident(pTHX_ const char *s, int kind) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_FORCE_IDENT \ - assert(s) - -STATIC void -S_force_ident_maybe_lex(pTHX_ char pit); -# define PERL_ARGS_ASSERT_FORCE_IDENT_MAYBE_LEX - -STATIC void -S_force_next(pTHX_ I32 type); -# define PERL_ARGS_ASSERT_FORCE_NEXT + Perl_assert_aTHX; assert(s) -STATIC char * -S_force_strict_version(pTHX_ char *s); +static void +S_force_ident_maybe_lex(pTHX_ char pit) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_FORCE_IDENT_MAYBE_LEX \ + Perl_assert_aTHX + +static void +S_force_next(pTHX_ I32 type) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_FORCE_NEXT \ + Perl_assert_aTHX + +static char * +S_force_strict_version(pTHX_ char *s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_FORCE_STRICT_VERSION \ - assert(s) + Perl_assert_aTHX; assert(s) -STATIC char * -S_force_version(pTHX_ char *s, int guessing); +static char * +S_force_version(pTHX_ char *s, int guessing) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_FORCE_VERSION \ - assert(s) + Perl_assert_aTHX; assert(s) -STATIC char * -S_force_word(pTHX_ char *start, int token, int check_keyword, int allow_pack); +static char * +S_force_word(pTHX_ char *start, int token, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_FORCE_WORD \ - assert(start) + Perl_assert_aTHX; assert(start) -STATIC SV * +static SV * S_get_and_check_backslash_N_name_wrapper(pTHX_ const char *s, const char * const e) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_GET_AND_CHECK_BACKSLASH_N_NAME_WRAPPER \ - assert(s); assert(e) + Perl_assert_aTHX; assert(s); assert(e); assert(s <= e) -STATIC void -S_incline(pTHX_ const char *s, const char *end); +static void +S_incline(pTHX_ const char *s, const char *end) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_INCLINE \ - assert(s); assert(end) + Perl_assert_aTHX; assert(s); assert(end); assert(s <= end); \ + assert(*end == '\0') -STATIC int -S_intuit_method(pTHX_ char *s, SV *ioname, CV *cv); +static int +S_intuit_method(pTHX_ char *start, SV *ioname, CV *cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_INTUIT_METHOD \ - assert(s) + Perl_assert_aTHX; assert(start) -STATIC int -S_intuit_more(pTHX_ char *s, char *e); +static int +S_intuit_more(pTHX_ char *s, char *e, U8 caller_context, char *caller_s, Size_t caller_length) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_INTUIT_MORE \ - assert(s); assert(e) + Perl_assert_aTHX; assert(s); assert(e); assert(s <= e); \ + assert(*e == '\0') -STATIC I32 -S_lop(pTHX_ enum yytokentype t, I32 f, U8 x, char *s); +static bool +S_is_existing_identifier(pTHX_ char *s, Size_t len, char sigil, bool is_utf8) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# define PERL_ARGS_ASSERT_IS_EXISTING_IDENTIFIER \ + Perl_assert_aTHX; assert(s) + +static I32 +S_lop(pTHX_ enum yytokentype t, I32 f, U8 x, char *s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_LOP \ - assert(s) + Perl_assert_aTHX; assert(s) PERL_STATIC_NO_RET void S_missingterm(pTHX_ char *s, STRLEN len) + Perl_attribute_nonnull_aTHX __attribute__noreturn__; -# define PERL_ARGS_ASSERT_MISSINGTERM +# define PERL_ARGS_ASSERT_MISSINGTERM \ + Perl_assert_aTHX -STATIC SV * -S_new_constant(pTHX_ const char *s, STRLEN len, const char *key, STRLEN keylen, SV *sv, SV *pv, const char *type, STRLEN typelen, const char **error_msg); +static SV * +S_new_constant(pTHX_ const char *s, STRLEN len, const char *key, STRLEN keylen, SV *sv, SV *pv, const char *type, STRLEN typelen, const char **error_msg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_5); # define PERL_ARGS_ASSERT_NEW_CONSTANT \ - assert(key); assert(sv) + Perl_assert_aTHX; assert(key); assert(sv) -STATIC void -S_parse_ident(pTHX_ char **s, char **d, char * const e, int allow_package, bool is_utf8, bool check_dollar); +static char * +S_parse_ident(pTHX_ const char *s, const char * const s_end, char **d, char * const e, bool is_utf8, HV **failure_details, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_PARSE_IDENT \ - assert(s); assert(d); assert(e) + Perl_assert_aTHX; assert(s); assert(s_end); assert(d); assert(*d); \ + assert(e); assert(s <= s_end); assert(*d < e) -STATIC int -S_pending_ident(pTHX); -# define PERL_ARGS_ASSERT_PENDING_IDENT +static char * +S_parse_ident_no_copy(pTHX_ const char *s, const char * const s_end, bool is_utf8, HV **failure_details, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +# define PERL_ARGS_ASSERT_PARSE_IDENT_NO_COPY \ + Perl_assert_aTHX; assert(s); assert(s_end); assert(s < s_end) + +static int +S_pending_ident(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PENDING_IDENT \ + Perl_assert_aTHX -STATIC char * +static char * S_scan_const(pTHX_ char *start) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SCAN_CONST \ - assert(start) + Perl_assert_aTHX; assert(start) -STATIC char * +static char * S_scan_formline(pTHX_ char *s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SCAN_FORMLINE \ - assert(s) + Perl_assert_aTHX; assert(s) -STATIC char * +static char * S_scan_heredoc(pTHX_ char *s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SCAN_HEREDOC \ - assert(s) + Perl_assert_aTHX; assert(s) -STATIC char * -S_scan_ident(pTHX_ char *s, char *dest, STRLEN destlen, I32 ck_uni); +static char * +S_scan_ident(pTHX_ char *s, char *dest, char *dest_end, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_SCAN_IDENT \ - assert(s); assert(dest) + Perl_assert_aTHX; assert(s); assert(dest); assert(dest_end); \ + assert(dest < dest_end) -STATIC char * +static char * S_scan_inputsymbol(pTHX_ char *start) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SCAN_INPUTSYMBOL \ - assert(start) + Perl_assert_aTHX; assert(start) -STATIC char * +static char * S_scan_pat(pTHX_ char *start, I32 type) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SCAN_PAT \ - assert(start) + Perl_assert_aTHX; assert(start) -STATIC char * +static char * S_scan_subst(pTHX_ char *start) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SCAN_SUBST \ - assert(start) + Perl_assert_aTHX; assert(start) -STATIC char * +static char * S_scan_trans(pTHX_ char *start) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SCAN_TRANS \ - assert(start) + Perl_assert_aTHX; assert(start) -STATIC I32 +static I32 S_sublex_done(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_SUBLEX_DONE +# define PERL_ARGS_ASSERT_SUBLEX_DONE \ + Perl_assert_aTHX -STATIC I32 +static I32 S_sublex_push(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_SUBLEX_PUSH +# define PERL_ARGS_ASSERT_SUBLEX_PUSH \ + Perl_assert_aTHX -STATIC I32 +static I32 S_sublex_start(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_SUBLEX_START +# define PERL_ARGS_ASSERT_SUBLEX_START \ + Perl_assert_aTHX -STATIC char * +static char * S_swallow_bom(pTHX_ U8 *s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SWALLOW_BOM \ - assert(s) + Perl_assert_aTHX; assert(s) -STATIC char * +static char * S_tokenize_use(pTHX_ int is_use, char *s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_TOKENIZE_USE \ - assert(s) + Perl_assert_aTHX; assert(s) -STATIC SV * -S_tokeq(pTHX_ SV *sv); +static SV * +S_tokeq(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_TOKEQ \ - assert(sv) - -STATIC void -S_update_debugger_info(pTHX_ SV *orig_sv, const char * const buf, STRLEN len); -# define PERL_ARGS_ASSERT_UPDATE_DEBUGGER_INFO + Perl_assert_aTHX; assert(sv) -STATIC void -S_warn_expect_operator(pTHX_ const char * const what, char *s, I32 pop_oldbufptr); +static void +S_update_debugger_info(pTHX_ SV *orig_sv, const char * const buf, STRLEN len) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_UPDATE_DEBUGGER_INFO \ + Perl_assert_aTHX + +static void +S_warn_expect_operator(pTHX_ const char * const what, char *s, I32 pop_oldbufptr) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_WARN_EXPECT_OPERATOR \ - assert(what) + Perl_assert_aTHX; assert(what) -STATIC void -S_yyerror_non_ascii_message(pTHX_ const U8 * const s); +static void +S_yyerror_non_ascii_message(pTHX_ const U8 * const s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_YYERROR_NON_ASCII_MESSAGE \ - assert(s) + Perl_assert_aTHX; assert(s) -STATIC int -S_yywarn(pTHX_ const char * const s, U32 flags); +static int +S_yywarn(pTHX_ const char * const s, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_YYWARN \ - assert(s) + Perl_assert_aTHX; assert(s) # if defined(DEBUGGING) -STATIC void +static void S_printbuf(pTHX_ const char * const fmt, const char * const s) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__format__(__printf__,pTHX_1,0); # define PERL_ARGS_ASSERT_PRINTBUF \ - assert(fmt); assert(s) + Perl_assert_aTHX; assert(fmt); assert(s) -STATIC int -S_tokereport(pTHX_ I32 rv, const YYSTYPE *lvalp); +static int +S_tokereport(pTHX_ I32 rv, const YYSTYPE *lvalp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_TOKEREPORT \ - assert(lvalp) + Perl_assert_aTHX; assert(lvalp) # endif /* defined(DEBUGGING) */ # if !defined(PERL_NO_UTF16_FILTER) -STATIC U8 * -S_add_utf16_textfilter(pTHX_ U8 * const s, bool reversed); +static U8 * +S_add_utf16_textfilter(pTHX_ U8 * const s, bool reversed) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_ADD_UTF16_TEXTFILTER \ - assert(s) + Perl_assert_aTHX; assert(s) -STATIC I32 -S_utf16_textfilter(pTHX_ int idx, SV *sv, int maxlen); +static I32 +S_utf16_textfilter(pTHX_ int idx, SV *sv, int maxlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_UTF16_TEXTFILTER \ - assert(sv) + Perl_assert_aTHX; assert(sv) # endif /* !defined(PERL_NO_UTF16_FILTER) */ #endif /* defined(PERL_IN_TOKE_C) */ #if defined(PERL_IN_UNIVERSAL_C) -STATIC bool -S_isa_lookup(pTHX_ HV *stash, SV *namesv, const char *name, STRLEN len, U32 flags); +static bool +S_isa_lookup(pTHX_ HV *stash, SV *namesv, const char *name, STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# define PERL_ARGS_ASSERT_ISA_LOOKUP \ + Perl_assert_aTHX; assert(stash); assert(SvTYPE(stash) == SVt_PVHV); \ + assert(namesv || name) + +static bool +S_sv_derived_from_svpvn(pTHX_ SV *sv, SV *namesv, const char *name, const STRLEN len, U32 flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# define PERL_ARGS_ASSERT_SV_DERIVED_FROM_SVPVN \ + Perl_assert_aTHX; assert(sv); assert(namesv || name) -STATIC bool -S_sv_derived_from_svpvn(pTHX_ SV *sv, SV *namesv, const char *name, const STRLEN len, U32 flags); - -#endif +#endif /* defined(PERL_IN_UNIVERSAL_C) */ #if defined(PERL_IN_UTF8_C) -STATIC UV -S__to_utf8_case(pTHX_ const UV original, const U8 *p, U8 *ustrp, STRLEN *lenp, SV *invlist, const I32 * const invmap, const U32 * const * const aux_tables, const U8 * const aux_table_lengths, const char * const normal); -# define PERL_ARGS_ASSERT__TO_UTF8_CASE \ - assert(ustrp); assert(lenp); assert(invlist); assert(invmap); \ - assert(normal) - -STATIC UV +static UV S_check_locale_boundary_crossing(pTHX_ const U8 * const p, const UV result, U8 * const ustrp, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_CHECK_LOCALE_BOUNDARY_CROSSING \ - assert(p); assert(ustrp); assert(lenp) + Perl_assert_aTHX; assert(p); assert(ustrp); assert(lenp) -STATIC HV * +static HV * S_new_msg_hv(pTHX_ const char * const message, U32 categories, U32 flag) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_NEW_MSG_HV \ - assert(message) + Perl_assert_aTHX; assert(message) -STATIC UV -S_to_case_cp_list(pTHX_ const UV original, const U32 ** const remaining_list, Size_t *remaining_count, SV *invlist, const I32 * const invmap, const U32 * const * const aux_tables, const U8 * const aux_table_lengths, const char * const normal); +static UV +S_to_case_cp_list(pTHX_ const UV original, const U32 ** const remaining_list, Size_t *remaining_count, SV *invlist, const I32 * const invmap, const U32 * const * const aux_tables, const U8 * const aux_table_lengths, const char * const normal) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5) + Perl_attribute_nonnull(pTHX_8); # define PERL_ARGS_ASSERT_TO_CASE_CP_LIST \ - assert(invlist); assert(invmap); assert(normal) + Perl_assert_aTHX; assert(invlist); assert(invmap); assert(normal) -STATIC U8 +static U8 S_to_lower_latin1(const U8 c, U8 *p, STRLEN *lenp, const char dummy) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_TO_LOWER_LATIN1 -STATIC UV -S_turkic_fc(pTHX_ const U8 * const p, const U8 * const e, U8 *ustrp, STRLEN *lenp); +static UV +S_to_utf8_case_(pTHX_ const UV original, const U8 *p, U8 *ustrp, STRLEN *lenp, SV *invlist, const I32 * const invmap, const U32 * const * const aux_tables, const U8 * const aux_table_lengths, const char * const normal) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) + Perl_attribute_nonnull(pTHX_5) + Perl_attribute_nonnull(pTHX_6) + Perl_attribute_nonnull(pTHX_9); +# define PERL_ARGS_ASSERT_TO_UTF8_CASE_ \ + Perl_assert_aTHX; assert(ustrp); assert(lenp); assert(invlist); \ + assert(invmap); assert(normal) + +static UV +S_turkic_fc(pTHX_ const U8 * const p, const U8 * const e, U8 *ustrp, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_TURKIC_FC \ - assert(p); assert(e); assert(ustrp); assert(lenp) + Perl_assert_aTHX; assert(p); assert(e); assert(ustrp); assert(lenp); \ + assert(p < e) -STATIC UV -S_turkic_lc(pTHX_ const U8 * const p0, const U8 * const e, U8 *ustrp, STRLEN *lenp); +static UV +S_turkic_lc(pTHX_ const U8 * const p0, const U8 * const e, U8 *ustrp, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_TURKIC_LC \ - assert(p0); assert(e); assert(ustrp); assert(lenp) + Perl_assert_aTHX; assert(p0); assert(e); assert(ustrp); assert(lenp); \ + assert(p0 < e) -STATIC UV -S_turkic_uc(pTHX_ const U8 * const p, const U8 * const e, U8 *ustrp, STRLEN *lenp); +static UV +S_turkic_uc(pTHX_ const U8 * const p, const U8 * const e, U8 *ustrp, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4); # define PERL_ARGS_ASSERT_TURKIC_UC \ - assert(p); assert(e); assert(ustrp); assert(lenp) + Perl_assert_aTHX; assert(p); assert(e); assert(ustrp); assert(lenp); \ + assert(p < e) -STATIC char * +static char * S_unexpected_non_continuation_text(pTHX_ const U8 * const s, STRLEN print_len, const STRLEN non_cont_byte_pos, const STRLEN expect_len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_UNEXPECTED_NON_CONTINUATION_TEXT \ - assert(s) + Perl_assert_aTHX; assert(s) # if 0 -STATIC void -S_warn_on_first_deprecated_use(pTHX_ U32 category, const char * const name, const char * const alternative, const bool use_locale, const char * const file, const unsigned line); +static void +S_warn_on_first_deprecated_use(pTHX_ U32 category, const char * const name, const char * const alternative, const bool use_locale, const char * const file, const unsigned line) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_5); # define PERL_ARGS_ASSERT_WARN_ON_FIRST_DEPRECATED_USE \ - assert(name); assert(alternative); assert(file) + Perl_assert_aTHX; assert(name); assert(alternative); assert(file) -# endif +# endif /* 0 */ # if !defined(PERL_NO_INLINE_FUNCTIONS) PERL_STATIC_INLINE int S_does_utf8_overflow(const U8 * const s, const U8 *e) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_DOES_UTF8_OVERFLOW \ - assert(s); assert(e) + assert(s); assert(e); assert(s < e) PERL_STATIC_INLINE int S_isFF_overlong(const U8 * const s, const STRLEN len) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ISFF_OVERLONG \ assert(s) -PERL_STATIC_INLINE int +PERL_STATIC_INLINE SSize_t S_is_utf8_overlong(const U8 * const s, const STRLEN len) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_IS_UTF8_OVERLONG \ assert(s) @@ -9634,151 +14155,217 @@ S_is_utf8_overlong(const U8 * const s, c # endif /* !defined(PERL_NO_INLINE_FUNCTIONS) */ #endif /* defined(PERL_IN_UTF8_C) */ #if defined(PERL_IN_UTIL_C) -STATIC bool -S_ckwarn_common(pTHX_ U32 w); -# define PERL_ARGS_ASSERT_CKWARN_COMMON - -STATIC SV * -S_mess_alloc(pTHX); -# define PERL_ARGS_ASSERT_MESS_ALLOC - -STATIC SV * -S_with_queued_errors(pTHX_ SV *ex); +static bool +S_ckwarn_common(pTHX_ U32 w) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_CKWARN_COMMON \ + Perl_assert_aTHX + +static SV * +S_mess_alloc(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_MESS_ALLOC \ + Perl_assert_aTHX + +static SV * +S_with_queued_errors(pTHX_ SV *ex) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_WITH_QUEUED_ERRORS \ - assert(ex) + Perl_assert_aTHX; assert(ex) -STATIC void -S_xs_version_bootcheck(pTHX_ SSize_t items, SSize_t ax, const char *xs_p, STRLEN xs_len); +static void +S_xs_version_bootcheck(pTHX_ SSize_t items, SSize_t ax, const char *xs_p, STRLEN xs_len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_XS_VERSION_BOOTCHECK \ - assert(xs_p) + Perl_assert_aTHX; assert(xs_p) # if defined(PERL_MEM_LOG) && !defined(PERL_MEM_LOG_NOIMPL) -STATIC void -S_mem_log_common(enum mem_log_type mlt, const UV n, const UV typesize, const char *type_name, const SV *sv, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname); +static void +S_mem_log_common(enum mem_log_type mlt, const UV n, const UV typesize, const char *type_name, const SV *sv, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname) + Perl_attribute_nonnull(4) + Perl_attribute_nonnull(8) + Perl_attribute_nonnull(10); # define PERL_ARGS_ASSERT_MEM_LOG_COMMON \ assert(type_name); assert(filename); assert(funcname) -# endif -# if !defined(PERL_NO_INLINE_FUNCTIONS) -PERL_STATIC_INLINE U32 -S_ptr_hash(PTRV u); -# define PERL_ARGS_ASSERT_PTR_HASH - -# endif +# endif /* defined(PERL_MEM_LOG) && !defined(PERL_MEM_LOG_NOIMPL) */ # if defined(PERL_USES_PL_PIDSTATUS) -STATIC void -S_pidgone(pTHX_ Pid_t pid, int status); -# define PERL_ARGS_ASSERT_PIDGONE +static void +S_pidgone(pTHX_ Pid_t pid, int status) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PIDGONE \ + Perl_assert_aTHX # endif #endif /* defined(PERL_IN_UTIL_C) */ #if defined(PERL_MEM_LOG) PERL_CALLCONV Malloc_t -Perl_mem_log_alloc(const UV nconst, UV typesize, const char *type_name, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname); +Perl_mem_log_alloc(const UV nconst, UV typesize, const char *type_name, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname) + Perl_attribute_nonnull(3) + Perl_attribute_nonnull(5) + Perl_attribute_nonnull(7); # define PERL_ARGS_ASSERT_MEM_LOG_ALLOC \ assert(type_name); assert(filename); assert(funcname) PERL_CALLCONV void -Perl_mem_log_del_sv(const SV *sv, const char *filename, int linenumber, const char *funcname); +Perl_mem_log_del_sv(const SV *sv, const char *filename, int linenumber, const char *funcname) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(4); # define PERL_ARGS_ASSERT_MEM_LOG_DEL_SV \ assert(sv); assert(filename); assert(funcname) PERL_CALLCONV Malloc_t -Perl_mem_log_free(Malloc_t oldalloc, const char *filename, const int linenumber, const char *funcname); +Perl_mem_log_free(Malloc_t oldalloc, const char *filename, const int linenumber, const char *funcname) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(4); # define PERL_ARGS_ASSERT_MEM_LOG_FREE \ assert(filename); assert(funcname) PERL_CALLCONV void -Perl_mem_log_new_sv(const SV *sv, const char *filename, int linenumber, const char *funcname); +Perl_mem_log_new_sv(const SV *sv, const char *filename, int linenumber, const char *funcname) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(4); # define PERL_ARGS_ASSERT_MEM_LOG_NEW_SV \ assert(sv); assert(filename); assert(funcname) PERL_CALLCONV Malloc_t -Perl_mem_log_realloc(const UV n, const UV typesize, const char *type_name, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname); +Perl_mem_log_realloc(const UV n, const UV typesize, const char *type_name, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname) + Perl_attribute_nonnull(3) + Perl_attribute_nonnull(6) + Perl_attribute_nonnull(8); # define PERL_ARGS_ASSERT_MEM_LOG_REALLOC \ assert(type_name); assert(filename); assert(funcname) #endif /* defined(PERL_MEM_LOG) */ #if !defined(PERL_NO_INLINE_FUNCTIONS) +PERL_STATIC_INLINE SSize_t +Perl_AvFILL_(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + __attribute__warn_unused_result__; +# define PERL_ARGS_ASSERT_AVFILL_ \ + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) + PERL_STATIC_INLINE I32 * -Perl_CvDEPTH(const CV * const sv); +Perl_CvDEPTH(const CV * const sv) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_CVDEPTH \ assert(sv) PERL_STATIC_INLINE GV * -Perl_CvGV(pTHX_ CV *sv); +Perl_CvGV(pTHX_ CV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CVGV \ - assert(sv); assert(SvTYPE(sv) == SVt_PVCV || SvTYPE(sv) == SVt_PVFM) + Perl_assert_aTHX; assert(sv); \ + assert(SvTYPE(sv) == SVt_PVCV || SvTYPE(sv) == SVt_PVFM) PERL_STATIC_INLINE Stack_off_t -Perl_POPMARK(pTHX); -# define PERL_ARGS_ASSERT_POPMARK +Perl_POPMARK(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_POPMARK \ + Perl_assert_aTHX PERL_STATIC_INLINE struct regexp * -Perl_ReANY(const REGEXP * const re); +Perl_ReANY(const REGEXP * const re) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_REANY \ assert(re) PERL_STATIC_INLINE void -Perl_SvAMAGIC_off(SV *sv); +Perl_SvAMAGIC_off(SV *sv) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_SVAMAGIC_OFF \ assert(sv) PERL_STATIC_INLINE void -Perl_SvAMAGIC_on(SV *sv); +Perl_SvAMAGIC_on(SV *sv) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_SVAMAGIC_ON \ assert(sv) PERL_STATIC_INLINE void -Perl_SvGETMAGIC(pTHX_ SV *sv); +Perl_SvGETMAGIC(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SVGETMAGIC \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE IV -Perl_SvIV(pTHX_ SV *sv); +Perl_SvIV(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SVIV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE IV -Perl_SvIV_nomg(pTHX_ SV *sv); +Perl_SvIV_nomg(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SVIV_NOMG \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE NV -Perl_SvNV(pTHX_ SV *sv); +Perl_SvNV(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SVNV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE NV -Perl_SvNV_nomg(pTHX_ SV *sv); +Perl_SvNV_nomg(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SVNV_NOMG \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_FORCE_INLINE bool Perl_SvPVXtrue(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__always_inline__; # define PERL_ARGS_ASSERT_SVPVXTRUE \ - assert(sv) + Perl_assert_aTHX; assert(sv) + +PERL_STATIC_FORCE_INLINE char * +Perl_SvPV_helper(pTHX_ SV * const sv, STRLEN * const lp, const U32 flags, const PL_SvPVtype type, Perl_SvPV_helper_non_trivial_t non_trivial, const bool or_null, const U32 return_flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_5) + __attribute__always_inline__; +# define PERL_ARGS_ASSERT_SVPV_HELPER \ + Perl_assert_aTHX; assert(sv); assert(non_trivial) PERL_STATIC_INLINE void -Perl_SvREFCNT_dec(pTHX_ SV *sv); -# define PERL_ARGS_ASSERT_SVREFCNT_DEC +Perl_SvREFCNT_dec(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_SVREFCNT_DEC \ + Perl_assert_aTHX PERL_STATIC_INLINE void -Perl_SvREFCNT_dec_NN(pTHX_ SV *sv); +Perl_SvREFCNT_dec_NN(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SVREFCNT_DEC_NN \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE SV * -Perl_SvREFCNT_dec_ret_NULL(pTHX_ SV *sv); -# define PERL_ARGS_ASSERT_SVREFCNT_DEC_RET_NULL +Perl_SvREFCNT_dec_ret_NULL(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_SVREFCNT_DEC_RET_NULL \ + Perl_assert_aTHX PERL_STATIC_INLINE SV * Perl_SvREFCNT_inc(SV *sv); # define PERL_ARGS_ASSERT_SVREFCNT_INC PERL_STATIC_INLINE SV * -Perl_SvREFCNT_inc_NN(SV *sv); +Perl_SvREFCNT_inc_NN(SV *sv) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_SVREFCNT_INC_NN \ assert(sv) @@ -9787,181 +14374,284 @@ Perl_SvREFCNT_inc_void(SV *sv); # define PERL_ARGS_ASSERT_SVREFCNT_INC_VOID PERL_STATIC_INLINE bool -Perl_SvTRUE(pTHX_ SV *sv); -# define PERL_ARGS_ASSERT_SVTRUE +Perl_SvTRUE(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_SVTRUE \ + Perl_assert_aTHX PERL_STATIC_INLINE bool -Perl_SvTRUE_NN(pTHX_ SV *sv); +Perl_SvTRUE_NN(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SVTRUE_NN \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE bool -Perl_SvTRUE_common(pTHX_ SV *sv, const bool sv_2bool_is_fallback); +Perl_SvTRUE_common(pTHX_ SV *sv, const bool sv_2bool_is_fallback) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SVTRUE_COMMON \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE bool -Perl_SvTRUE_nomg(pTHX_ SV *sv); -# define PERL_ARGS_ASSERT_SVTRUE_NOMG +Perl_SvTRUE_nomg(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_SVTRUE_NOMG \ + Perl_assert_aTHX PERL_STATIC_INLINE UV -Perl_SvUV(pTHX_ SV *sv); +Perl_SvUV(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SVUV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE UV -Perl_SvUV_nomg(pTHX_ SV *sv); +Perl_SvUV_nomg(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SVUV_NOMG \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE Stack_off_t -Perl_TOPMARK(pTHX); -# define PERL_ARGS_ASSERT_TOPMARK +Perl_TOPMARK(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_TOPMARK \ + Perl_assert_aTHX PERL_STATIC_INLINE void -Perl_append_utf8_from_native_byte(const U8 byte, U8 **dest); +Perl_append_utf8_from_native_byte(const U8 byte, U8 **dest) + Perl_attribute_nonnull(2); # define PERL_ARGS_ASSERT_APPEND_UTF8_FROM_NATIVE_BYTE \ assert(dest) PERL_STATIC_INLINE Size_t Perl_av_count(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_AV_COUNT \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_STATIC_INLINE SV ** Perl_av_fetch_simple(pTHX_ AV *av, SSize_t key, I32 lval) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_AV_FETCH_SIMPLE \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_STATIC_INLINE AV * Perl_av_new_alloc(pTHX_ SSize_t size, bool zeroflag) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_AV_NEW_ALLOC +# define PERL_ARGS_ASSERT_AV_NEW_ALLOC \ + Perl_assert_aTHX; assert(size > 0) PERL_STATIC_INLINE void -Perl_av_push_simple(pTHX_ AV *av, SV *val); +Perl_av_push_simple(pTHX_ AV *av, SV *val) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_AV_PUSH_SIMPLE \ - assert(av); assert(val); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV); \ + assert(val) PERL_STATIC_INLINE void -Perl_av_remove_offset(pTHX_ AV *av); +Perl_av_remove_offset(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_AV_REMOVE_OFFSET \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_STATIC_INLINE SV ** -Perl_av_store_simple(pTHX_ AV *av, SSize_t key, SV *val); +Perl_av_store_simple(pTHX_ AV *av, SSize_t key, SV *val) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_AV_STORE_SIMPLE \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_STATIC_INLINE U8 * -Perl_bytes_to_utf8(pTHX_ const U8 *s, STRLEN *lenp); +Perl_bytes_to_utf8(pTHX_ const U8 *s, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_BYTES_TO_UTF8 \ - assert(s); assert(lenp) + Perl_assert_aTHX; assert(s); assert(lenp) PERL_STATIC_INLINE U8 * -Perl_bytes_to_utf8_temp_pv(pTHX_ const U8 *s, STRLEN *lenp); +Perl_bytes_to_utf8_temp_pv(pTHX_ const U8 *s, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_BYTES_TO_UTF8_TEMP_PV \ - assert(s); assert(lenp) + Perl_assert_aTHX; assert(s); assert(lenp) PERL_STATIC_INLINE void -Perl_clear_defarray_simple(pTHX_ AV *av); +Perl_clear_defarray_simple(pTHX_ AV *av) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CLEAR_DEFARRAY_SIMPLE \ - assert(av); assert(SvTYPE(av) == SVt_PVAV) + Perl_assert_aTHX; assert(av); assert(SvTYPE(av) == SVt_PVAV) PERL_STATIC_INLINE I32 -Perl_foldEQ(pTHX_ const char *a, const char *b, I32 len); +Perl_foldEQ(pTHX_ const char *s1, const char *s2, I32 len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_FOLDEQ \ - assert(a); assert(b) + Perl_assert_aTHX; assert(s1); assert(s2) PERL_STATIC_INLINE I32 -Perl_foldEQ_latin1(pTHX_ const char *a, const char *b, I32 len); +Perl_foldEQ_latin1(pTHX_ const char *s1, const char *s2, I32 len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_FOLDEQ_LATIN1 \ - assert(a); assert(b) + Perl_assert_aTHX; assert(s1); assert(s2) PERL_STATIC_INLINE I32 -Perl_foldEQ_locale(pTHX_ const char *a, const char *b, I32 len); +Perl_foldEQ_locale(pTHX_ const char *s1, const char *s2, I32 len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_FOLDEQ_LOCALE \ - assert(a); assert(b) + Perl_assert_aTHX; assert(s1); assert(s2) PERL_STATIC_INLINE MGVTBL * Perl_get_vtbl(pTHX_ int vtbl_id) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_GET_VTBL +# define PERL_ARGS_ASSERT_GET_VTBL \ + Perl_assert_aTHX + +PERL_STATIC_INLINE UV +Perl_grok_bin(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *approximation) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +# define PERL_ARGS_ASSERT_GROK_BIN \ + Perl_assert_aTHX; assert(start); assert(len_p); assert(flags) + +PERL_STATIC_INLINE UV +Perl_grok_hex(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *approximation) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +# define PERL_ARGS_ASSERT_GROK_HEX \ + Perl_assert_aTHX; assert(start); assert(len_p); assert(flags) + +PERL_STATIC_INLINE UV +Perl_grok_oct(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *approximation) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); +# define PERL_ARGS_ASSERT_GROK_OCT \ + Perl_assert_aTHX; assert(start); assert(len_p); assert(flags) + +PERL_STATIC_INLINE void * +Perl_hv_common_key_len(pTHX_ HV *hv, const char *key, I32 klen_i32, const int action, SV *val, const U32 hash) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); +# define PERL_ARGS_ASSERT_HV_COMMON_KEY_LEN \ + Perl_assert_aTHX; assert(!hv || SvTYPE(hv) == SVt_PVHV); assert(key) PERL_STATIC_INLINE Size_t Perl_isC9_STRICT_UTF8_CHAR(const U8 * const s0, const U8 * const e) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ISC9_STRICT_UTF8_CHAR \ - assert(s0); assert(e) + assert(s0); assert(e); assert(s0 <= e) PERL_STATIC_INLINE Size_t Perl_isSTRICT_UTF8_CHAR(const U8 * const s0, const U8 * const e) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ISSTRICT_UTF8_CHAR \ - assert(s0); assert(e) + assert(s0); assert(e); assert(s0 <= e) PERL_STATIC_INLINE Size_t Perl_isUTF8_CHAR(const U8 * const s0, const U8 * const e) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ISUTF8_CHAR \ - assert(s0); assert(e) + assert(s0); assert(e); assert(s0 <= e) PERL_STATIC_INLINE Size_t Perl_isUTF8_CHAR_flags(const U8 * const s0, const U8 * const e, const U32 flags) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ISUTF8_CHAR_FLAGS \ - assert(s0); assert(e) + assert(s0); assert(e); assert(s0 <= e) PERL_STATIC_INLINE bool -Perl_is_c9strict_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el); +Perl_is_c9strict_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_IS_C9STRICT_UTF8_STRING_LOCLEN \ assert(s) PERL_STATIC_INLINE bool Perl_is_safe_syscall(pTHX_ const char *pv, STRLEN len, const char *what, const char *op_name) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3) + Perl_attribute_nonnull(pTHX_4) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_IS_SAFE_SYSCALL \ - assert(pv); assert(what); assert(op_name) + Perl_assert_aTHX; assert(pv); assert(what); assert(op_name) PERL_STATIC_INLINE bool -Perl_is_strict_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el); +Perl_is_strict_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_IS_STRICT_UTF8_STRING_LOCLEN \ assert(s) PERL_STATIC_INLINE bool -Perl_is_utf8_fixed_width_buf_loclen_flags(const U8 * const s, STRLEN len, const U8 **ep, STRLEN *el, const U32 flags); +Perl_is_utf8_fixed_width_buf_loclen_flags(const U8 * const s, STRLEN len, const U8 **ep, STRLEN *el, const U32 flags) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_IS_UTF8_FIXED_WIDTH_BUF_LOCLEN_FLAGS \ assert(s) PERL_STATIC_INLINE bool Perl_is_utf8_invariant_string_loc(const U8 * const s, STRLEN len, const U8 **ep) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_IS_UTF8_INVARIANT_STRING_LOC \ assert(s) PERL_STATIC_INLINE bool Perl_is_utf8_string_flags(const U8 *s, STRLEN len, const U32 flags) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_IS_UTF8_STRING_FLAGS \ assert(s) PERL_STATIC_INLINE bool -Perl_is_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el); +Perl_is_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_IS_UTF8_STRING_LOCLEN \ assert(s) PERL_STATIC_INLINE bool -Perl_is_utf8_string_loclen_flags(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el, const U32 flags); +Perl_is_utf8_string_loclen_flags(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el, const U32 flags) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_IS_UTF8_STRING_LOCLEN_FLAGS \ assert(s) PERL_STATIC_INLINE bool Perl_is_utf8_valid_partial_char_flags(const U8 * const s0, const U8 * const e, const U32 flags) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_IS_UTF8_VALID_PARTIAL_CHAR_FLAGS \ - assert(s0); assert(e) + assert(s0); assert(e); assert(s0 < e) PERL_STATIC_INLINE unsigned Perl_lsbit_pos32(U32 word) @@ -9970,6 +14660,7 @@ Perl_lsbit_pos32(U32 word) PERL_STATIC_INLINE char * Perl_mortal_getenv(const char *str) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_MORTAL_GETENV \ assert(str) @@ -9981,432 +14672,618 @@ Perl_msbit_pos32(U32 word) PERL_STATIC_INLINE OP * Perl_newPADxVOP(pTHX_ I32 type, I32 flags, PADOFFSET padix) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_NEWPADXVOP +# define PERL_ARGS_ASSERT_NEWPADXVOP \ + Perl_assert_aTHX PERL_STATIC_INLINE SV * Perl_newRV_noinc(pTHX_ SV * const tmpRef) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_NEWRV_NOINC \ - assert(tmpRef) + Perl_assert_aTHX; assert(tmpRef) PERL_STATIC_INLINE SV * Perl_newSV_type(pTHX_ const svtype type) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_NEWSV_TYPE +# define PERL_ARGS_ASSERT_NEWSV_TYPE \ + Perl_assert_aTHX PERL_STATIC_FORCE_INLINE SV * Perl_newSV_type_mortal(pTHX_ const svtype type) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__ __attribute__always_inline__; -# define PERL_ARGS_ASSERT_NEWSV_TYPE_MORTAL +# define PERL_ARGS_ASSERT_NEWSV_TYPE_MORTAL \ + Perl_assert_aTHX + +PERL_STATIC_INLINE SV * +Perl_newSVsv_flags(pTHX_ SV * const old, I32 flags) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +# define PERL_ARGS_ASSERT_NEWSVSV_FLAGS \ + Perl_assert_aTHX PERL_STATIC_INLINE SV * -Perl_new_sv(pTHX_ const char *file, int line, const char *func); +Perl_new_sv(pTHX_ const char *file, int line, const char *func) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_NEW_SV \ - assert(file); assert(func) + Perl_assert_aTHX; assert(file); assert(func) PERL_STATIC_INLINE void -Perl_pop_stackinfo(pTHX); -# define PERL_ARGS_ASSERT_POP_STACKINFO +Perl_pop_stackinfo(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_POP_STACKINFO \ + Perl_assert_aTHX PERL_STATIC_INLINE void -Perl_push_stackinfo(pTHX_ I32 type, UV flags); -# define PERL_ARGS_ASSERT_PUSH_STACKINFO +Perl_push_stackinfo(pTHX_ I32 type, UV flags) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PUSH_STACKINFO \ + Perl_assert_aTHX PERL_STATIC_INLINE void -Perl_rpp_context(pTHX_ SV **mark, U8 gimme, SSize_t extra); +Perl_rpp_context(pTHX_ SV **mark, U8 gimme, SSize_t extra) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_CONTEXT \ - assert(mark) + Perl_assert_aTHX; assert(mark) PERL_STATIC_INLINE void -Perl_rpp_extend(pTHX_ SSize_t n); -# define PERL_ARGS_ASSERT_RPP_EXTEND +Perl_rpp_extend(pTHX_ SSize_t n) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_RPP_EXTEND \ + Perl_assert_aTHX PERL_STATIC_INLINE void -Perl_rpp_invoke_xs(pTHX_ CV *cv); +Perl_rpp_invoke_xs(pTHX_ CV *cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_INVOKE_XS \ - assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_STATIC_INLINE bool -Perl_rpp_is_lone(pTHX_ SV *sv); +Perl_rpp_is_lone(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_IS_LONE \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE SV * -Perl_rpp_pop_1_norc(pTHX); -# define PERL_ARGS_ASSERT_RPP_POP_1_NORC +Perl_rpp_pop_1_norc(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_RPP_POP_1_NORC \ + Perl_assert_aTHX PERL_STATIC_INLINE void -Perl_rpp_popfree_1(pTHX); -# define PERL_ARGS_ASSERT_RPP_POPFREE_1 +Perl_rpp_popfree_1(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_RPP_POPFREE_1 \ + Perl_assert_aTHX PERL_STATIC_INLINE void -Perl_rpp_popfree_1_NN(pTHX); -# define PERL_ARGS_ASSERT_RPP_POPFREE_1_NN +Perl_rpp_popfree_1_NN(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_RPP_POPFREE_1_NN \ + Perl_assert_aTHX PERL_STATIC_INLINE void -Perl_rpp_popfree_2(pTHX); -# define PERL_ARGS_ASSERT_RPP_POPFREE_2 +Perl_rpp_popfree_2(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_RPP_POPFREE_2 \ + Perl_assert_aTHX PERL_STATIC_INLINE void -Perl_rpp_popfree_2_NN(pTHX); -# define PERL_ARGS_ASSERT_RPP_POPFREE_2_NN +Perl_rpp_popfree_2_NN(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_RPP_POPFREE_2_NN \ + Perl_assert_aTHX PERL_STATIC_INLINE void -Perl_rpp_popfree_to(pTHX_ SV **sp); +Perl_rpp_popfree_to(pTHX_ SV **sp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_POPFREE_TO \ - assert(sp) + Perl_assert_aTHX; assert(sp) PERL_STATIC_INLINE void -Perl_rpp_popfree_to_NN(pTHX_ SV **sp); +Perl_rpp_popfree_to_NN(pTHX_ SV **sp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_POPFREE_TO_NN \ - assert(sp) + Perl_assert_aTHX; assert(sp) PERL_STATIC_INLINE void -Perl_rpp_push_1(pTHX_ SV *sv); +Perl_rpp_push_1(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_PUSH_1 \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE void -Perl_rpp_push_1_norc(pTHX_ SV *sv); +Perl_rpp_push_1_norc(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_PUSH_1_NORC \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE void -Perl_rpp_push_2(pTHX_ SV *sv1, SV *sv2); +Perl_rpp_push_2(pTHX_ SV *sv1, SV *sv2) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_RPP_PUSH_2 \ - assert(sv1); assert(sv2) + Perl_assert_aTHX; assert(sv1); assert(sv2) PERL_STATIC_INLINE void -Perl_rpp_push_IMM(pTHX_ SV *sv); +Perl_rpp_push_IMM(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_PUSH_IMM \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE void -Perl_rpp_replace_1_1(pTHX_ SV *sv); +Perl_rpp_replace_1_1(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_REPLACE_1_1 \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE void -Perl_rpp_replace_1_1_NN(pTHX_ SV *sv); +Perl_rpp_replace_1_1_NN(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_REPLACE_1_1_NN \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE void -Perl_rpp_replace_1_IMM_NN(pTHX_ SV *sv); +Perl_rpp_replace_1_IMM_NN(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_REPLACE_1_IMM_NN \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE void -Perl_rpp_replace_2_1(pTHX_ SV *sv); +Perl_rpp_replace_2_1(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_REPLACE_2_1 \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE void -Perl_rpp_replace_2_1_COMMON(pTHX_ SV *sv); +Perl_rpp_replace_2_1_COMMON(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_REPLACE_2_1_COMMON \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE void -Perl_rpp_replace_2_1_NN(pTHX_ SV *sv); +Perl_rpp_replace_2_1_NN(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_REPLACE_2_1_NN \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE void -Perl_rpp_replace_2_IMM_NN(pTHX_ SV *sv); +Perl_rpp_replace_2_IMM_NN(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_REPLACE_2_IMM_NN \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE void -Perl_rpp_replace_at(pTHX_ SV **sp, SV *sv); +Perl_rpp_replace_at(pTHX_ SV **sp, SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_RPP_REPLACE_AT \ - assert(sp); assert(sv) + Perl_assert_aTHX; assert(sp); assert(sv) PERL_STATIC_INLINE void -Perl_rpp_replace_at_NN(pTHX_ SV **sp, SV *sv); +Perl_rpp_replace_at_NN(pTHX_ SV **sp, SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_RPP_REPLACE_AT_NN \ - assert(sp); assert(sv) + Perl_assert_aTHX; assert(sp); assert(sv) PERL_STATIC_INLINE void -Perl_rpp_replace_at_norc(pTHX_ SV **sp, SV *sv); +Perl_rpp_replace_at_norc(pTHX_ SV **sp, SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_RPP_REPLACE_AT_NORC \ - assert(sp); assert(sv) + Perl_assert_aTHX; assert(sp); assert(sv) PERL_STATIC_INLINE void -Perl_rpp_replace_at_norc_NN(pTHX_ SV **sp, SV *sv); +Perl_rpp_replace_at_norc_NN(pTHX_ SV **sp, SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_RPP_REPLACE_AT_NORC_NN \ - assert(sp); assert(sv) + Perl_assert_aTHX; assert(sp); assert(sv) PERL_STATIC_INLINE bool -Perl_rpp_stack_is_rc(pTHX); -# define PERL_ARGS_ASSERT_RPP_STACK_IS_RC +Perl_rpp_stack_is_rc(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_RPP_STACK_IS_RC \ + Perl_assert_aTHX PERL_STATIC_INLINE bool -Perl_rpp_try_AMAGIC_1(pTHX_ int method, int flags); -# define PERL_ARGS_ASSERT_RPP_TRY_AMAGIC_1 +Perl_rpp_try_AMAGIC_1(pTHX_ int method, int flags) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_RPP_TRY_AMAGIC_1 \ + Perl_assert_aTHX PERL_STATIC_INLINE bool -Perl_rpp_try_AMAGIC_2(pTHX_ int method, int flags); -# define PERL_ARGS_ASSERT_RPP_TRY_AMAGIC_2 +Perl_rpp_try_AMAGIC_2(pTHX_ int method, int flags) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_RPP_TRY_AMAGIC_2 \ + Perl_assert_aTHX PERL_STATIC_INLINE void -Perl_rpp_xpush_1(pTHX_ SV *sv); +Perl_rpp_xpush_1(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_XPUSH_1 \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE void -Perl_rpp_xpush_2(pTHX_ SV *sv1, SV *sv2); +Perl_rpp_xpush_2(pTHX_ SV *sv1, SV *sv2) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_RPP_XPUSH_2 \ - assert(sv1); assert(sv2) + Perl_assert_aTHX; assert(sv1); assert(sv2) PERL_STATIC_INLINE void -Perl_rpp_xpush_IMM(pTHX_ SV *sv); +Perl_rpp_xpush_IMM(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_RPP_XPUSH_IMM \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE char * Perl_savepv(pTHX_ const char *pv) + Perl_attribute_nonnull_aTHX __attribute__malloc__ __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_SAVEPV +# define PERL_ARGS_ASSERT_SAVEPV \ + Perl_assert_aTHX PERL_STATIC_INLINE char * Perl_savepvn(pTHX_ const char *pv, Size_t len) + Perl_attribute_nonnull_aTHX __attribute__malloc__ __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_SAVEPVN +# define PERL_ARGS_ASSERT_SAVEPVN \ + Perl_assert_aTHX PERL_STATIC_INLINE char * Perl_savesharedsvpv(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__malloc__ __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SAVESHAREDSVPV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE char * Perl_savesvpv(pTHX_ SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__malloc__ __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SAVESVPV \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE unsigned Perl_single_1bit_pos32(U32 word) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SINGLE_1BIT_POS32 -PERL_STATIC_INLINE bool -Perl_sv_only_taint_gmagic(SV *sv); # define PERL_ARGS_ASSERT_SV_ONLY_TAINT_GMAGIC \ assert(sv) PERL_STATIC_INLINE char * -Perl_sv_pvbyten_force_wrapper(pTHX_ SV * const sv, STRLEN * const lp, const U32 dummy); +Perl_sv_pvbyten_force_wrapper(pTHX_ SV * const sv, STRLEN * const lp, const U32 dummy) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SV_PVBYTEN_FORCE_WRAPPER \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE char * -Perl_sv_pvutf8n_force_wrapper(pTHX_ SV * const sv, STRLEN * const lp, const U32 dummy); +Perl_sv_pvutf8n_force_wrapper(pTHX_ SV * const sv, STRLEN * const lp, const U32 dummy) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SV_PVUTF8N_FORCE_WRAPPER \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE char * -Perl_sv_setpv_freshbuf(pTHX_ SV * const sv); +Perl_sv_setpv_freshbuf(pTHX_ SV * const sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SV_SETPV_FRESHBUF \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_STATIC_INLINE void -Perl_switch_argstack(pTHX_ AV *to); +Perl_switch_argstack(pTHX_ AV *to) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_SWITCH_ARGSTACK \ - assert(to); assert(SvTYPE(to) == SVt_PVAV) + Perl_assert_aTHX; assert(to); assert(SvTYPE(to) == SVt_PVAV) PERL_STATIC_INLINE IV Perl_utf8_distance(pTHX_ const U8 *a, const U8 *b) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_UTF8_DISTANCE \ - assert(a); assert(b) + Perl_assert_aTHX; assert(a); assert(b) PERL_STATIC_INLINE U8 * Perl_utf8_hop(const U8 *s, SSize_t off) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_UTF8_HOP \ assert(s) PERL_STATIC_INLINE U8 * Perl_utf8_hop_back_overshoot(const U8 *s, SSize_t off, const U8 * const start, SSize_t *remaining) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_UTF8_HOP_BACK_OVERSHOOT \ - assert(s); assert(start) + assert(s); assert(start); assert(start <= s) PERL_STATIC_INLINE U8 * Perl_utf8_hop_forward_overshoot(const U8 *s, SSize_t off, const U8 * const end, SSize_t *remaining) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_UTF8_HOP_FORWARD_OVERSHOOT \ - assert(s); assert(end) + assert(s); assert(end); assert(s <= end) PERL_STATIC_INLINE U8 * Perl_utf8_hop_overshoot(const U8 *s, SSize_t off, const U8 * const start, const U8 * const end, SSize_t *remaining) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(3) + Perl_attribute_nonnull(4) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_UTF8_HOP_OVERSHOOT \ - assert(s); assert(start); assert(end) + assert(s); assert(start); assert(end); assert(start <= s); \ + assert(s <= end) PERL_STATIC_INLINE bool -Perl_utf8_to_bytes_new_pv(pTHX_ U8 const **s_ptr, STRLEN *lenp, void **free_me); +Perl_utf8_to_bytes_new_pv(pTHX_ U8 const **s_ptr, STRLEN *lenp, void **free_me) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_UTF8_TO_BYTES_NEW_PV \ - assert(s_ptr); assert(lenp); assert(free_me) + Perl_assert_aTHX; assert(s_ptr); assert(lenp); assert(free_me) PERL_STATIC_INLINE bool -Perl_utf8_to_bytes_overwrite(pTHX_ U8 **s_ptr, STRLEN *lenp); +Perl_utf8_to_bytes_overwrite(pTHX_ U8 **s_ptr, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_UTF8_TO_BYTES_OVERWRITE \ - assert(s_ptr); assert(lenp) + Perl_assert_aTHX; assert(s_ptr); assert(lenp) PERL_STATIC_INLINE bool -Perl_utf8_to_bytes_temp_pv(pTHX_ U8 const **s_ptr, STRLEN *lenp); +Perl_utf8_to_bytes_temp_pv(pTHX_ U8 const **s_ptr, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_UTF8_TO_BYTES_TEMP_PV \ - assert(s_ptr); assert(lenp) + Perl_assert_aTHX; assert(s_ptr); assert(lenp) PERL_STATIC_INLINE bool -Perl_utf8_to_uv_msgs(const U8 * const s0, const U8 *e, UV *cp_p, Size_t *advance_p, U32 flags, U32 *errors, AV **msgs); +Perl_utf8_to_uv_msgs(const U8 * const s0, const U8 *e, UV *cp_p, Size_t *advance_p, U32 flags, U32 *errors, AV **msgs) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3); # define PERL_ARGS_ASSERT_UTF8_TO_UV_MSGS \ - assert(s0); assert(e); assert(cp_p) + assert(s0); assert(e); assert(cp_p); assert(s0 <= e) PERL_STATIC_INLINE UV -Perl_utf8_to_uv_or_die(const U8 * const s, const U8 *e, Size_t *advance_p); +Perl_utf8_to_uv_or_die(const U8 * const s, const U8 *e, Size_t *advance_p) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2); # define PERL_ARGS_ASSERT_UTF8_TO_UV_OR_DIE \ - assert(s); assert(e) + assert(s); assert(e); assert(s <= e) PERL_STATIC_INLINE UV -Perl_utf8_to_uvchr_buf(pTHX_ const U8 *s, const U8 *send, STRLEN *retlen); +Perl_utf8_to_uvchr_buf(pTHX_ const U8 *s, const U8 *send, STRLEN *retlen) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_UTF8_TO_UVCHR_BUF \ - assert(s); assert(send) + Perl_assert_aTHX; assert(s); assert(send); assert(s <= send) PERL_STATIC_INLINE UV -Perl_utf8n_to_uvchr_msgs(const U8 * const s0, STRLEN curlen, STRLEN *retlen, const U32 flags, U32 *errors, AV **msgs); +Perl_utf8n_to_uvchr_msgs(const U8 * const s0, STRLEN curlen, STRLEN *retlen, const U32 flags, U32 *errors, AV **msgs) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_UTF8N_TO_UVCHR_MSGS \ assert(s0) PERL_STATIC_INLINE U8 * -Perl_uv_to_utf8(pTHX_ U8 *d, UV uv); +Perl_uv_to_utf8(pTHX_ U8 *d, UV uv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_UV_TO_UTF8 \ - assert(d) + Perl_assert_aTHX; assert(d) PERL_STATIC_INLINE U8 * -Perl_uv_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags); +Perl_uv_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_UV_TO_UTF8_FLAGS \ - assert(d) - -PERL_STATIC_INLINE U8 * -Perl_uv_to_utf8_msgs(pTHX_ U8 *d, UV uv, UV flags, HV **msgs); -# define PERL_ARGS_ASSERT_UV_TO_UTF8_MSGS \ - assert(d) + Perl_assert_aTHX; assert(d) PERL_STATIC_INLINE UV -Perl_valid_utf8_to_uvchr(const U8 *s, STRLEN *retlen) +Perl_valid_utf8_to_uv(const U8 *s, STRLEN *retlen) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_VALID_UTF8_TO_UVCHR \ +# define PERL_ARGS_ASSERT_VALID_UTF8_TO_UV \ assert(s) +PERL_STATIC_INLINE unsigned int +Perl_variant_byte_number(PERL_UINTMAX_T word) + __attribute__warn_unused_result__; +# define PERL_ARGS_ASSERT_VARIANT_BYTE_NUMBER + PERL_STATIC_INLINE void -Perl_cx_popblock(pTHX_ PERL_CONTEXT *cx); +Perl_cx_popblock(pTHX_ PERL_CONTEXT *cx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_POPBLOCK \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE void -Perl_cx_popeval(pTHX_ PERL_CONTEXT *cx); +Perl_cx_popeval(pTHX_ PERL_CONTEXT *cx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_POPEVAL \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE void -Perl_cx_popformat(pTHX_ PERL_CONTEXT *cx); +Perl_cx_popformat(pTHX_ PERL_CONTEXT *cx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_POPFORMAT \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE void -Perl_cx_popgiven(pTHX_ PERL_CONTEXT *cx); +Perl_cx_popgiven(pTHX_ PERL_CONTEXT *cx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_POPGIVEN \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE void -Perl_cx_poploop(pTHX_ PERL_CONTEXT *cx); +Perl_cx_poploop(pTHX_ PERL_CONTEXT *cx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_POPLOOP \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE void -Perl_cx_popsub(pTHX_ PERL_CONTEXT *cx); +Perl_cx_popsub(pTHX_ PERL_CONTEXT *cx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_POPSUB \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE void -Perl_cx_popsub_args(pTHX_ PERL_CONTEXT *cx); +Perl_cx_popsub_args(pTHX_ PERL_CONTEXT *cx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_POPSUB_ARGS \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE void -Perl_cx_popsub_common(pTHX_ PERL_CONTEXT *cx); +Perl_cx_popsub_common(pTHX_ PERL_CONTEXT *cx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_POPSUB_COMMON \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE void -Perl_cx_popwhen(pTHX_ PERL_CONTEXT *cx); +Perl_cx_popwhen(pTHX_ PERL_CONTEXT *cx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_POPWHEN \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE PERL_CONTEXT * -Perl_cx_pushblock(pTHX_ U8 type, U8 gimme, SV **sp, I32 saveix); +Perl_cx_pushblock(pTHX_ U8 type, U8 gimme, SV **sp, I32 saveix) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_CX_PUSHBLOCK \ - assert(sp) + Perl_assert_aTHX; assert(sp) PERL_STATIC_INLINE void -Perl_cx_pusheval(pTHX_ PERL_CONTEXT *cx, OP *retop, SV *namesv); +Perl_cx_pusheval(pTHX_ PERL_CONTEXT *cx, OP *retop, SV *namesv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_PUSHEVAL \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE void -Perl_cx_pushformat(pTHX_ PERL_CONTEXT *cx, CV *cv, OP *retop, GV *gv); +Perl_cx_pushformat(pTHX_ PERL_CONTEXT *cx, CV *cv, OP *retop, GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_CX_PUSHFORMAT \ - assert(cx); assert(cv); \ + Perl_assert_aTHX; assert(cx); assert(cv); \ assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_STATIC_INLINE void -Perl_cx_pushgiven(pTHX_ PERL_CONTEXT *cx, SV *orig_defsv); +Perl_cx_pushgiven(pTHX_ PERL_CONTEXT *cx, SV *orig_defsv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_PUSHGIVEN \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE void -Perl_cx_pushloop_for(pTHX_ PERL_CONTEXT *cx, void *itervarp, SV *itersave); +Perl_cx_pushloop_for(pTHX_ PERL_CONTEXT *cx, void *itervarp, SV *itersave) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_CX_PUSHLOOP_FOR \ - assert(cx); assert(itervarp) + Perl_assert_aTHX; assert(cx); assert(itervarp) PERL_STATIC_INLINE void -Perl_cx_pushloop_plain(pTHX_ PERL_CONTEXT *cx); +Perl_cx_pushloop_plain(pTHX_ PERL_CONTEXT *cx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_PUSHLOOP_PLAIN \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE void -Perl_cx_pushsub(pTHX_ PERL_CONTEXT *cx, CV *cv, OP *retop, bool hasargs); +Perl_cx_pushsub(pTHX_ PERL_CONTEXT *cx, CV *cv, OP *retop, bool hasargs) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_CX_PUSHSUB \ - assert(cx); assert(cv); \ + Perl_assert_aTHX; assert(cx); assert(cv); \ assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_STATIC_INLINE void -Perl_cx_pushtry(pTHX_ PERL_CONTEXT *cx, OP *retop); +Perl_cx_pushtry(pTHX_ PERL_CONTEXT *cx, OP *retop) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_PUSHTRY \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE void -Perl_cx_pushwhen(pTHX_ PERL_CONTEXT *cx); +Perl_cx_pushwhen(pTHX_ PERL_CONTEXT *cx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_PUSHWHEN \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE void -Perl_cx_topblock(pTHX_ PERL_CONTEXT *cx); +Perl_cx_topblock(pTHX_ PERL_CONTEXT *cx) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_CX_TOPBLOCK \ - assert(cx) + Perl_assert_aTHX; assert(cx) PERL_STATIC_INLINE U8 -Perl_gimme_V(pTHX); -# define PERL_ARGS_ASSERT_GIMME_V +Perl_gimme_V(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_GIMME_V \ + Perl_assert_aTHX # if !defined(HAS_STRLCAT) PERL_STATIC_INLINE Size_t @@ -10414,70 +15291,111 @@ Perl_my_strlcat(char *dst, const char *s # define PERL_ARGS_ASSERT_MY_STRLCAT # endif -# if !defined(HAS_STRNLEN) -PERL_STATIC_INLINE Size_t -Perl_my_strnlen(const char *str, Size_t maxlen); -# define PERL_ARGS_ASSERT_MY_STRNLEN \ - assert(str) - -# endif # if defined(PERL_CORE) || defined(PERL_EXT) PERL_STATIC_INLINE bool +Perl_sv_only_taint_gmagic(SV *sv) + Perl_attribute_nonnull(1); +PERL_STATIC_INLINE bool Perl_is_utf8_non_invariant_string(const U8 * const s, STRLEN len) + Perl_attribute_nonnull(1) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_IS_UTF8_NON_INVARIANT_STRING \ assert(s) PERL_STATIC_INLINE STRLEN -S_sv_or_pv_pos_u2b(pTHX_ SV *sv, const char *pv, STRLEN pos, STRLEN *lenp); +S_sv_or_pv_pos_u2b(pTHX_ SV *sv, const char *pv, STRLEN pos, STRLEN *lenp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_SV_OR_PV_POS_U2B \ - assert(sv); assert(pv) + Perl_assert_aTHX; assert(sv); assert(pv) PERL_STATIC_INLINE Size_t S_variant_under_utf8_count(const U8 * const s, const U8 * const e) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_VARIANT_UNDER_UTF8_COUNT \ - assert(s); assert(e) + assert(s); assert(e); assert(s <= e) # if !defined(HAS_MEMRCHR) PERL_STATIC_INLINE void * -S_my_memrchr(const char *s, const char c, const STRLEN len); +S_my_memrchr(const char *s, const char c, const STRLEN len) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_MY_MEMRCHR \ assert(s) # endif +# if defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || \ + defined(PERL_IN_PP_C) || defined(PERL_IN_REGCOMP_ANY) || \ + defined(PERL_IN_REGEXEC_C) || defined(PERL_IN_TOKE_C) || \ + defined(PERL_IN_UTF8_C) +PERL_STATIC_INLINE bool * +S_get_invlist_offset_addr(SV *invlist) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +PERL_STATIC_INLINE UV * +S_invlist_array(SV * const invlist) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +PERL_STATIC_INLINE bool +S_invlist_contains_cp_(SV * const invlist, const UV cp) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +PERL_STATIC_INLINE UV +S_invlist_len_(SV * const invlist) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +PERL_STATIC_INLINE bool +S_is_invlist(const SV * const invlist) + __attribute__warn_unused_result__; +# endif /* defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || + defined(PERL_IN_PP_C) || defined(PERL_IN_REGCOMP_ANY) || + defined(PERL_IN_REGEXEC_C) || defined(PERL_IN_TOKE_C) || + defined(PERL_IN_UTF8_C) */ +# if defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || \ + defined(PERL_IN_REGCOMP_ANY) +PERL_STATIC_INLINE SV * +S_add_cp_to_invlist(pTHX_ SV *invlist, const UV cp) + Perl_attribute_nonnull_aTHX + __attribute__warn_unused_result__; +PERL_STATIC_INLINE void +S_invlist_extend(pTHX_ SV * const invlist, const UV len) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +PERL_STATIC_INLINE UV +S_invlist_highest(SV * const invlist) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +PERL_STATIC_INLINE void +S_invlist_set_len(pTHX_ SV * const invlist, const UV len, const bool offset) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); +# endif /* defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || + defined(PERL_IN_REGCOMP_ANY) */ +# if defined(PERL_IN_PP_C) || defined(PERL_IN_REGCOMP_ANY) || \ + defined(PERL_IN_TOKE_C) || defined(PERL_IN_UNIVERSAL_C) +PERL_STATIC_INLINE const char * +S_get_regex_charset_name(const U32 flags, STRLEN * const lenp) + Perl_attribute_nonnull(2); +# endif # endif /* defined(PERL_CORE) || defined(PERL_EXT) */ # if defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || \ defined(PERL_IN_PP_C) || defined(PERL_IN_REGCOMP_ANY) || \ defined(PERL_IN_REGEXEC_C) || defined(PERL_IN_TOKE_C) || \ defined(PERL_IN_UTF8_C) -PERL_STATIC_INLINE bool -S__invlist_contains_cp(SV * const invlist, const UV cp) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT__INVLIST_CONTAINS_CP \ +# define PERL_ARGS_ASSERT_GET_INVLIST_OFFSET_ADDR \ assert(invlist) -PERL_STATIC_INLINE UV -S__invlist_len(SV * const invlist) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT__INVLIST_LEN \ +# define PERL_ARGS_ASSERT_INVLIST_ARRAY \ assert(invlist) -PERL_STATIC_INLINE bool * -S_get_invlist_offset_addr(SV *invlist) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_GET_INVLIST_OFFSET_ADDR \ +# define PERL_ARGS_ASSERT_INVLIST_CONTAINS_CP_ \ assert(invlist) -PERL_STATIC_INLINE UV * -S_invlist_array(SV * const invlist) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_INVLIST_ARRAY \ +# define PERL_ARGS_ASSERT_INVLIST_LEN_ \ assert(invlist) -PERL_STATIC_INLINE bool -S_is_invlist(const SV * const invlist) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_IS_INVLIST # endif /* defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || @@ -10486,63 +15404,64 @@ S_is_invlist(const SV * const invlist) defined(PERL_IN_UTF8_C) */ # if defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || \ defined(PERL_IN_REGCOMP_ANY) -PERL_STATIC_INLINE SV * -S_add_cp_to_invlist(pTHX_ SV *invlist, const UV cp) - __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_ADD_CP_TO_INVLIST +# define PERL_ARGS_ASSERT_ADD_CP_TO_INVLIST \ + Perl_assert_aTHX -PERL_STATIC_INLINE void -S_invlist_extend(pTHX_ SV * const invlist, const UV len); # define PERL_ARGS_ASSERT_INVLIST_EXTEND \ - assert(invlist) + Perl_assert_aTHX; assert(invlist) -PERL_STATIC_INLINE UV -S_invlist_highest(SV * const invlist) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_INVLIST_HIGHEST \ assert(invlist) -PERL_STATIC_INLINE void -S_invlist_set_len(pTHX_ SV * const invlist, const UV len, const bool offset); # define PERL_ARGS_ASSERT_INVLIST_SET_LEN \ - assert(invlist) + Perl_assert_aTHX; assert(invlist) # endif /* defined(PERL_IN_DOOP_C) || defined(PERL_IN_OP_C) || defined(PERL_IN_REGCOMP_ANY) */ # if defined(PERL_IN_OP_C) || defined(PERL_IN_PAD_C) PERL_STATIC_INLINE bool -S_PadnameIN_SCOPE(const PADNAME * const pn, const U32 seq); +S_PadnameIN_SCOPE(const PADNAME * const pn, const U32 seq) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_PADNAMEIN_SCOPE \ assert(pn) # endif # if defined(PERL_IN_OP_C) || defined(PERL_IN_REGCOMP_ANY) -PERL_STATIC_INLINE STRLEN * -S_get_invlist_iter_addr(SV *invlist) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_GET_INVLIST_ITER_ADDR \ assert(invlist) -PERL_STATIC_INLINE void -S_invlist_iterfinish(SV *invlist); # define PERL_ARGS_ASSERT_INVLIST_ITERFINISH \ assert(invlist) -PERL_STATIC_INLINE void -S_invlist_iterinit(SV *invlist); # define PERL_ARGS_ASSERT_INVLIST_ITERINIT \ assert(invlist) -PERL_STATIC_INLINE bool -S_invlist_iternext(SV *invlist, UV *start, UV *end) - __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_INVLIST_ITERNEXT \ assert(invlist); assert(start); assert(end) +# if defined(PERL_CORE) || defined(PERL_EXT) +PERL_STATIC_INLINE STRLEN * +S_get_invlist_iter_addr(SV *invlist) + Perl_attribute_nonnull(1) + __attribute__warn_unused_result__; +PERL_STATIC_INLINE void +S_invlist_iterfinish(SV *invlist) + Perl_attribute_nonnull(1); +PERL_STATIC_INLINE void +S_invlist_iterinit(SV *invlist) + Perl_attribute_nonnull(1); +PERL_STATIC_INLINE bool +S_invlist_iternext(SV *invlist, UV *start, UV *end) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) + Perl_attribute_nonnull(3) + __attribute__warn_unused_result__; +# endif /* defined(PERL_CORE) || defined(PERL_EXT) */ # endif /* defined(PERL_IN_OP_C) || defined(PERL_IN_REGCOMP_ANY) */ # if defined(PERL_IN_PP_C) || defined(PERL_IN_PP_HOT_C) PERL_STATIC_INLINE bool S_lossless_NV_to_IV(const NV nv, IV *ivp) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_LOSSLESS_NV_TO_IV \ assert(ivp) @@ -10550,8 +15469,6 @@ S_lossless_NV_to_IV(const NV nv, IV *ivp # endif # if defined(PERL_IN_PP_C) || defined(PERL_IN_REGCOMP_ANY) || \ defined(PERL_IN_TOKE_C) || defined(PERL_IN_UNIVERSAL_C) -PERL_STATIC_INLINE const char * -S_get_regex_charset_name(const U32 flags, STRLEN * const lenp); # define PERL_ARGS_ASSERT_GET_REGEX_CHARSET_NAME \ assert(lenp) @@ -10575,18 +15492,13 @@ Perl_single_1bit_pos64(U64 word) # endif /* defined(U64TYPE) */ # if defined(USE_ITHREADS) PERL_STATIC_INLINE AV * -Perl_cop_file_avn(pTHX_ const COP *cop); +Perl_cop_file_avn(pTHX_ const COP *cop) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_COP_FILE_AVN \ - assert(cop) + Perl_assert_aTHX; assert(cop) -# if !defined(PERL_IMPLICIT_SYS) -PERL_STATIC_INLINE bool -S_PerlEnv_putenv(pTHX_ char *str); -# define PERL_ARGS_ASSERT_PERLENV_PUTENV \ - assert(str) - -# endif -# endif /* defined(USE_ITHREADS) */ +# endif # if !defined(WIN32) PERL_STATIC_INLINE void * Perl_get_context(void) @@ -10597,18 +15509,25 @@ Perl_get_context(void) #endif /* !defined(PERL_NO_INLINE_FUNCTIONS) */ #if defined(PERL_RC_STACK) PERL_CALLCONV OP * -Perl_pp_wrap(pTHX_ Perl_ppaddr_t real_pp_fn, I32 nargs, int nlists); +Perl_pp_wrap(pTHX_ Perl_ppaddr_t real_pp_fn, I32 nargs, int nlists) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_PP_WRAP \ - assert(real_pp_fn) + Perl_assert_aTHX; assert(real_pp_fn) PERL_CALLCONV int -Perl_runops_wrap(pTHX); -# define PERL_ARGS_ASSERT_RUNOPS_WRAP +Perl_runops_wrap(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_RUNOPS_WRAP \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_xs_wrap(pTHX_ XSUBADDR_t xsub, CV *cv); +Perl_xs_wrap(pTHX_ XSUBADDR_t xsub, CV *cv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_XS_WRAP \ - assert(xsub); assert(cv); \ + Perl_assert_aTHX; assert(xsub); assert(cv); \ assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) #endif /* defined(PERL_RC_STACK) */ @@ -10638,242 +15557,346 @@ Perl_sighandler(int sig) #endif #if defined(UNLINK_ALL_VERSIONS) PERL_CALLCONV I32 -Perl_unlnk(pTHX_ const char *f); +Perl_unlnk(pTHX_ const char *f) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_UNLNK \ - assert(f) + Perl_assert_aTHX; assert(f) #endif #if defined(USE_C_BACKTRACE) PERL_CALLCONV bool -Perl_dump_c_backtrace(pTHX_ PerlIO *fp, int max_depth, int skip); +Perl_dump_c_backtrace(pTHX_ PerlIO *fp, int max_depth, int skip) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_DUMP_C_BACKTRACE \ - assert(fp) - -/* PERL_CALLCONV void -free_c_backtrace(pTHX_ Perl_c_backtrace *bt); */ + Perl_assert_aTHX; assert(fp) PERL_CALLCONV Perl_c_backtrace * Perl_get_c_backtrace(pTHX_ int max_depth, int skip) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_GET_C_BACKTRACE +# define PERL_ARGS_ASSERT_GET_C_BACKTRACE \ + Perl_assert_aTHX PERL_CALLCONV SV * -Perl_get_c_backtrace_dump(pTHX_ int max_depth, int skip); -# define PERL_ARGS_ASSERT_GET_C_BACKTRACE_DUMP +Perl_get_c_backtrace_dump(pTHX_ int max_depth, int skip) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_GET_C_BACKTRACE_DUMP \ + Perl_assert_aTHX #endif /* defined(USE_C_BACKTRACE) */ #if defined(USE_DTRACE) PERL_CALLCONV void -Perl_dtrace_probe_call(pTHX_ CV *cv, bool is_call); +Perl_dtrace_probe_call(pTHX_ CV *cv, bool is_call) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_DTRACE_PROBE_CALL \ - assert(cv); assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) + Perl_assert_aTHX; assert(cv); \ + assert(SvTYPE(cv) == SVt_PVCV || SvTYPE(cv) == SVt_PVFM) PERL_CALLCONV void -Perl_dtrace_probe_load(pTHX_ const char *name, bool is_loading); +Perl_dtrace_probe_load(pTHX_ const char *name, bool is_loading) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_DTRACE_PROBE_LOAD \ - assert(name) + Perl_assert_aTHX; assert(name) PERL_CALLCONV void -Perl_dtrace_probe_op(pTHX_ const OP *op); +Perl_dtrace_probe_op(pTHX_ const OP *op) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_DTRACE_PROBE_OP \ - assert(op) + Perl_assert_aTHX; assert(op) PERL_CALLCONV void -Perl_dtrace_probe_phase(pTHX_ enum perl_phase phase); -# define PERL_ARGS_ASSERT_DTRACE_PROBE_PHASE +Perl_dtrace_probe_phase(pTHX_ enum perl_phase phase) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_DTRACE_PROBE_PHASE \ + Perl_assert_aTHX #endif /* defined(USE_DTRACE) */ #if defined(USE_ITHREADS) PERL_CALLCONV PADOFFSET -Perl_alloccopstash(pTHX_ HV *hv); +Perl_alloccopstash(pTHX_ HV *hv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_ALLOCCOPSTASH \ - assert(hv); assert(SvTYPE(hv) == SVt_PVHV) + Perl_assert_aTHX; assert(hv); assert(SvTYPE(hv) == SVt_PVHV) PERL_CALLCONV void * Perl_any_dup(pTHX_ void *v, const PerlInterpreter *proto_perl) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_ANY_DUP \ - assert(proto_perl) + Perl_assert_aTHX; assert(proto_perl) PERL_CALLCONV void -Perl_clone_params_del(CLONE_PARAMS *param); +Perl_clone_params_del(CLONE_PARAMS *param) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_CLONE_PARAMS_DEL \ assert(param) PERL_CALLCONV CLONE_PARAMS * Perl_clone_params_new(PerlInterpreter * const from, PerlInterpreter * const to) + Perl_attribute_nonnull(1) + Perl_attribute_nonnull(2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_CLONE_PARAMS_NEW \ assert(from); assert(to) PERL_CALLCONV PERL_CONTEXT * Perl_cx_dup(pTHX_ PERL_CONTEXT *cx, I32 ix, I32 max, CLONE_PARAMS *param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_4) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_CX_DUP \ - assert(param) + Perl_assert_aTHX; assert(param) PERL_CALLCONV DIR * Perl_dirp_dup(pTHX_ DIR * const dp, CLONE_PARAMS * const param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_DIRP_DUP \ - assert(param) + Perl_assert_aTHX; assert(param) PERL_CALLCONV PerlIO * -Perl_fp_dup(pTHX_ PerlIO * const fp, const char type, CLONE_PARAMS * const param); +Perl_fp_dup(pTHX_ PerlIO * const fp, const char type, CLONE_PARAMS * const param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_FP_DUP \ - assert(param) + Perl_assert_aTHX; assert(param) PERL_CALLCONV GP * Perl_gp_dup(pTHX_ GP * const gp, CLONE_PARAMS * const param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_GP_DUP \ - assert(param) + Perl_assert_aTHX; assert(param) PERL_CALLCONV HE * Perl_he_dup(pTHX_ const HE *e, bool shared, CLONE_PARAMS *param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_HE_DUP \ - assert(param) + Perl_assert_aTHX; assert(param) PERL_CALLCONV HEK * Perl_hek_dup(pTHX_ HEK *e, CLONE_PARAMS *param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_HEK_DUP \ - assert(param) + Perl_assert_aTHX; assert(param) PERL_CALLCONV MAGIC * Perl_mg_dup(pTHX_ MAGIC *mg, CLONE_PARAMS * const param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_MG_DUP \ - assert(param) + Perl_assert_aTHX; assert(param) PERL_CALLCONV struct mro_meta * Perl_mro_meta_dup(pTHX_ struct mro_meta *smeta, CLONE_PARAMS *param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_MRO_META_DUP \ - assert(smeta); assert(param) + Perl_assert_aTHX; assert(smeta); assert(param) PERL_CALLCONV OP * Perl_newPADOP(pTHX_ I32 type, I32 flags, SV *sv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_3) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_NEWPADOP \ - assert(sv) + Perl_assert_aTHX; assert(sv) PERL_CALLCONV PADLIST * Perl_padlist_dup(pTHX_ PADLIST *srcpad, CLONE_PARAMS *param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_PADLIST_DUP \ - assert(srcpad); assert(param) + Perl_assert_aTHX; assert(srcpad); assert(param) PERL_CALLCONV PADNAME * Perl_padname_dup(pTHX_ PADNAME *src, CLONE_PARAMS *param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_PADNAME_DUP \ - assert(src); assert(param) + Perl_assert_aTHX; assert(src); assert(param) PERL_CALLCONV PADNAMELIST * Perl_padnamelist_dup(pTHX_ PADNAMELIST *srcpad, CLONE_PARAMS *param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__ __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_PADNAMELIST_DUP \ - assert(srcpad); assert(param) + Perl_assert_aTHX; assert(param) PERL_CALLCONV yy_parser * -Perl_parser_dup(pTHX_ const yy_parser * const proto, CLONE_PARAMS * const param); +Perl_parser_dup(pTHX_ const yy_parser * const proto, CLONE_PARAMS * const param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_PARSER_DUP \ - assert(param) + Perl_assert_aTHX; assert(param) PERL_CALLCONV PerlInterpreter * -perl_clone(PerlInterpreter *proto_perl, UV flags); +perl_clone(PerlInterpreter *proto_perl, UV flags) + Perl_attribute_nonnull(1); # define PERL_ARGS_ASSERT_PERL_CLONE \ assert(proto_perl) PERL_CALLCONV void -Perl_re_dup_guts(pTHX_ const REGEXP *sstr, REGEXP *dstr, CLONE_PARAMS *param); +Perl_re_dup_guts(pTHX_ const REGEXP *sstr, REGEXP *dstr, CLONE_PARAMS *param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_RE_DUP_GUTS \ - assert(sstr); assert(dstr); assert(param) + Perl_assert_aTHX; assert(sstr); assert(dstr); assert(param) PERL_CALLCONV void * -Perl_regdupe_internal(pTHX_ REGEXP * const r, CLONE_PARAMS *param); +Perl_regdupe_internal(pTHX_ REGEXP * const rx, CLONE_PARAMS *param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_REGDUPE_INTERNAL \ - assert(r); assert(param) + Perl_assert_aTHX; assert(rx); assert(param) PERL_CALLCONV void -Perl_rvpv_dup(pTHX_ SV * const dsv, const SV * const ssv, CLONE_PARAMS * const param); +Perl_rvpv_dup(pTHX_ SV * const dsv, const SV * const ssv, CLONE_PARAMS * const param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_RVPV_DUP \ - assert(dsv); assert(ssv); assert(param) + Perl_assert_aTHX; assert(dsv); assert(ssv); assert(param) PERL_CALLCONV PERL_SI * Perl_si_dup(pTHX_ PERL_SI *si, CLONE_PARAMS *param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SI_DUP \ - assert(param) + Perl_assert_aTHX; assert(param) PERL_CALLCONV ANY * Perl_ss_dup(pTHX_ PerlInterpreter *proto_perl, CLONE_PARAMS *param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SS_DUP \ - assert(proto_perl); assert(param) + Perl_assert_aTHX; assert(proto_perl); assert(param) PERL_CALLCONV SV * Perl_sv_dup(pTHX_ const SV * const ssv, CLONE_PARAMS * const param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SV_DUP \ - assert(param) + Perl_assert_aTHX; assert(param) PERL_CALLCONV SV * Perl_sv_dup_inc(pTHX_ const SV * const ssv, CLONE_PARAMS * const param) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) __attribute__warn_unused_result__; # define PERL_ARGS_ASSERT_SV_DUP_INC \ - assert(param) + Perl_assert_aTHX; assert(param) # if defined(PERL_IN_OP_C) || defined(PERL_IN_PEEP_C) PERL_CALLCONV void Perl_op_relocate_sv(pTHX_ SV **svp, PADOFFSET *targp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_OP_RELOCATE_SV \ - assert(svp); assert(targp) + Perl_assert_aTHX; assert(svp); assert(targp) -# endif +# endif /* defined(PERL_IN_OP_C) || defined(PERL_IN_PEEP_C) */ #else /* if !defined(USE_ITHREADS) */ -/* PERL_CALLCONV void -CopFILEGV_set(pTHX_ COP *c, GV *gv); */ +PERL_CALLCONV void +Perl_CopFILEGV_set(pTHX_ COP *c, GV *gv) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +# define PERL_ARGS_ASSERT_COPFILEGV_SET \ + Perl_assert_aTHX; assert(c); assert(gv) -#endif +#endif /* !defined(USE_ITHREADS) */ #if defined(USE_LOCALE_COLLATE) PERL_CALLCONV int Perl_magic_freecollxfrm(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_MAGIC_FREECOLLXFRM \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV int Perl_magic_setcollxfrm(pTHX_ SV *sv, MAGIC *mg) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_MAGIC_SETCOLLXFRM \ - assert(sv); assert(mg) + Perl_assert_aTHX; assert(sv); assert(mg) PERL_CALLCONV SV * -Perl_strxfrm(pTHX_ SV *src); +Perl_strxfrm(pTHX_ SV *src) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_STRXFRM \ - assert(src) + Perl_assert_aTHX; assert(src) + +PERL_CALLCONV char * +Perl_sv_collxfrm(pTHX_ SV * const sv, STRLEN * const nxp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); +# define PERL_ARGS_ASSERT_SV_COLLXFRM \ + Perl_assert_aTHX; assert(sv); assert(nxp) PERL_CALLCONV char * -Perl_sv_collxfrm_flags(pTHX_ SV * const sv, STRLEN * const nxp, I32 const flags); +Perl_sv_collxfrm_flags(pTHX_ SV * const sv, STRLEN * const nxp, I32 const flags) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_SV_COLLXFRM_FLAGS \ - assert(sv); assert(nxp) + Perl_assert_aTHX; assert(sv); assert(nxp) # if defined(PERL_IN_LOCALE_C) || defined(PERL_IN_MATHOMS_C) || \ defined(PERL_IN_SV_C) +# define PERL_ARGS_ASSERT_MEM_COLLXFRM_ \ + Perl_assert_aTHX; assert(input_string); assert(xlen) + +# if defined(PERL_CORE) || defined(PERL_EXT) PERL_CALLCONV char * Perl_mem_collxfrm_(pTHX_ const char *input_string, STRLEN len, STRLEN *xlen, bool utf8) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) + Perl_attribute_nonnull(pTHX_3) __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_MEM_COLLXFRM_ \ - assert(input_string); assert(xlen) - -# endif +# endif +# endif /* defined(PERL_IN_LOCALE_C) || defined(PERL_IN_MATHOMS_C) || + defined(PERL_IN_SV_C) */ #endif /* defined(USE_LOCALE_COLLATE) */ #if defined(USE_LOCALE_CTYPE) PERL_CALLCONV void @@ -10883,125 +15906,177 @@ Perl_warn_problematic_locale(void); #endif #if defined(USE_PERLIO) PERL_CALLCONV void -Perl_PerlIO_clearerr(pTHX_ PerlIO *f); -# define PERL_ARGS_ASSERT_PERLIO_CLEARERR +Perl_PerlIO_clearerr(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_CLEARERR \ + Perl_assert_aTHX PERL_CALLCONV int -Perl_PerlIO_close(pTHX_ PerlIO *f); -# define PERL_ARGS_ASSERT_PERLIO_CLOSE +Perl_PerlIO_close(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_CLOSE \ + Perl_assert_aTHX PERL_CALLCONV int -Perl_PerlIO_eof(pTHX_ PerlIO *f); -# define PERL_ARGS_ASSERT_PERLIO_EOF +Perl_PerlIO_eof(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_EOF \ + Perl_assert_aTHX PERL_CALLCONV int -Perl_PerlIO_error(pTHX_ PerlIO *f); -# define PERL_ARGS_ASSERT_PERLIO_ERROR +Perl_PerlIO_error(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_ERROR \ + Perl_assert_aTHX PERL_CALLCONV int -Perl_PerlIO_fileno(pTHX_ PerlIO *f); -# define PERL_ARGS_ASSERT_PERLIO_FILENO +Perl_PerlIO_fileno(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_FILENO \ + Perl_assert_aTHX PERL_CALLCONV int -Perl_PerlIO_fill(pTHX_ PerlIO *f); -# define PERL_ARGS_ASSERT_PERLIO_FILL +Perl_PerlIO_fill(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_FILL \ + Perl_assert_aTHX PERL_CALLCONV int -Perl_PerlIO_flush(pTHX_ PerlIO *f); -# define PERL_ARGS_ASSERT_PERLIO_FLUSH +Perl_PerlIO_flush(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_FLUSH \ + Perl_assert_aTHX PERL_CALLCONV STDCHAR * -Perl_PerlIO_get_base(pTHX_ PerlIO *f); -# define PERL_ARGS_ASSERT_PERLIO_GET_BASE +Perl_PerlIO_get_base(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_GET_BASE \ + Perl_assert_aTHX PERL_CALLCONV SSize_t Perl_PerlIO_get_bufsiz(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_PERLIO_GET_BUFSIZ +# define PERL_ARGS_ASSERT_PERLIO_GET_BUFSIZ \ + Perl_assert_aTHX PERL_CALLCONV SSize_t Perl_PerlIO_get_cnt(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_PERLIO_GET_CNT +# define PERL_ARGS_ASSERT_PERLIO_GET_CNT \ + Perl_assert_aTHX PERL_CALLCONV STDCHAR * -Perl_PerlIO_get_ptr(pTHX_ PerlIO *f); -# define PERL_ARGS_ASSERT_PERLIO_GET_PTR +Perl_PerlIO_get_ptr(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_GET_PTR \ + Perl_assert_aTHX PERL_CALLCONV SSize_t -Perl_PerlIO_read(pTHX_ PerlIO *f, void *vbuf, Size_t count); +Perl_PerlIO_read(pTHX_ PerlIO *f, void *vbuf, Size_t count) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_PERLIO_READ \ - assert(vbuf) + Perl_assert_aTHX; assert(vbuf) PERL_CALLCONV void -Perl_PerlIO_restore_errno(pTHX_ PerlIO *f); -# define PERL_ARGS_ASSERT_PERLIO_RESTORE_ERRNO +Perl_PerlIO_restore_errno(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_RESTORE_ERRNO \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_PerlIO_save_errno(pTHX_ PerlIO *f); -# define PERL_ARGS_ASSERT_PERLIO_SAVE_ERRNO +Perl_PerlIO_save_errno(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_SAVE_ERRNO \ + Perl_assert_aTHX PERL_CALLCONV int -Perl_PerlIO_seek(pTHX_ PerlIO *f, Off_t offset, int whence); -# define PERL_ARGS_ASSERT_PERLIO_SEEK +Perl_PerlIO_seek(pTHX_ PerlIO *f, Off_t offset, int whence) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_SEEK \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_PerlIO_set_cnt(pTHX_ PerlIO *f, SSize_t cnt); -# define PERL_ARGS_ASSERT_PERLIO_SET_CNT +Perl_PerlIO_set_cnt(pTHX_ PerlIO *f, SSize_t cnt) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_SET_CNT \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_PerlIO_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR *ptr, SSize_t cnt); -# define PERL_ARGS_ASSERT_PERLIO_SET_PTRCNT +Perl_PerlIO_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR *ptr, SSize_t cnt) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_SET_PTRCNT \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_PerlIO_setlinebuf(pTHX_ PerlIO *f); -# define PERL_ARGS_ASSERT_PERLIO_SETLINEBUF +Perl_PerlIO_setlinebuf(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_SETLINEBUF \ + Perl_assert_aTHX PERL_CALLCONV PerlIO * Perl_PerlIO_stderr(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_PERLIO_STDERR +# define PERL_ARGS_ASSERT_PERLIO_STDERR \ + Perl_assert_aTHX PERL_CALLCONV PerlIO * Perl_PerlIO_stdin(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_PERLIO_STDIN +# define PERL_ARGS_ASSERT_PERLIO_STDIN \ + Perl_assert_aTHX PERL_CALLCONV PerlIO * Perl_PerlIO_stdout(pTHX) + Perl_attribute_nonnull_aTHX __attribute__warn_unused_result__; -# define PERL_ARGS_ASSERT_PERLIO_STDOUT +# define PERL_ARGS_ASSERT_PERLIO_STDOUT \ + Perl_assert_aTHX PERL_CALLCONV Off_t -Perl_PerlIO_tell(pTHX_ PerlIO *f); -# define PERL_ARGS_ASSERT_PERLIO_TELL +Perl_PerlIO_tell(pTHX_ PerlIO *f) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_PERLIO_TELL \ + Perl_assert_aTHX PERL_CALLCONV SSize_t -Perl_PerlIO_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count); +Perl_PerlIO_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_PERLIO_UNREAD \ - assert(vbuf) + Perl_assert_aTHX; assert(vbuf) PERL_CALLCONV SSize_t -Perl_PerlIO_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count); +Perl_PerlIO_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2); # define PERL_ARGS_ASSERT_PERLIO_WRITE \ - assert(vbuf) + Perl_assert_aTHX; assert(vbuf) #endif /* defined(USE_PERLIO) */ #if defined(USE_PERL_SWITCH_LOCALE_CONTEXT) PERL_CALLCONV void -Perl_switch_locale_context(pTHX); -# define PERL_ARGS_ASSERT_SWITCH_LOCALE_CONTEXT +Perl_switch_locale_context(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_SWITCH_LOCALE_CONTEXT \ + Perl_assert_aTHX #endif #if defined(USE_QUADMATH) PERL_CALLCONV bool Perl_quadmath_format_needed(const char *format) + Perl_attribute_nonnull(1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_QUADMATH_FORMAT_NEEDED \ assert(format) PERL_CALLCONV bool Perl_quadmath_format_valid(const char *format) + Perl_attribute_nonnull(1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_QUADMATH_FORMAT_VALID \ assert(format) @@ -11009,29 +16084,40 @@ Perl_quadmath_format_valid(const char *f #endif /* defined(USE_QUADMATH) */ #if defined(USE_THREADS) PERL_CALLCONV void -Perl_thread_locale_init(pTHX); -# define PERL_ARGS_ASSERT_THREAD_LOCALE_INIT +Perl_thread_locale_init(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_THREAD_LOCALE_INIT \ + Perl_assert_aTHX PERL_CALLCONV void -Perl_thread_locale_term(pTHX); -# define PERL_ARGS_ASSERT_THREAD_LOCALE_TERM +Perl_thread_locale_term(pTHX) + Perl_attribute_nonnull_aTHX; +# define PERL_ARGS_ASSERT_THREAD_LOCALE_TERM \ + Perl_assert_aTHX -#endif +#endif /* defined(USE_THREADS) */ #if defined(VMS) || defined(WIN32) PERL_CALLCONV int -Perl_do_aspawn(pTHX_ SV *really, SV **mark, SV **sp); +Perl_do_aspawn(pTHX_ SV *really, SV **mark, SV **sp) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_2) + Perl_attribute_nonnull(pTHX_3); # define PERL_ARGS_ASSERT_DO_ASPAWN \ - assert(mark); assert(sp) + Perl_assert_aTHX; assert(mark); assert(sp) PERL_CALLCONV int -Perl_do_spawn(pTHX_ char *cmd); +Perl_do_spawn(pTHX_ char *cmd) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_DO_SPAWN \ - assert(cmd) + Perl_assert_aTHX; assert(cmd) PERL_CALLCONV int -Perl_do_spawn_nowait(pTHX_ char *cmd); +Perl_do_spawn_nowait(pTHX_ char *cmd) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1); # define PERL_ARGS_ASSERT_DO_SPAWN_NOWAIT \ - assert(cmd) + Perl_assert_aTHX; assert(cmd) #endif /* defined(VMS) || defined(WIN32) */ #if defined(WIN32) @@ -11042,11 +16128,14 @@ Perl_get_context(void) PERL_CALLCONV bool Perl_get_win32_message_utf8ness(pTHX_ const char *string) + Perl_attribute_nonnull_aTHX __attribute__visibility__("hidden"); -# define PERL_ARGS_ASSERT_GET_WIN32_MESSAGE_UTF8NESS +# define PERL_ARGS_ASSERT_GET_WIN32_MESSAGE_UTF8NESS \ + Perl_assert_aTHX PERL_CALLCONV_NO_RET void win32_croak_not_implemented(const char *fname) + Perl_attribute_nonnull(1) __attribute__noreturn__; # define PERL_ARGS_ASSERT_WIN32_CROAK_NOT_IMPLEMENTED \ assert(fname) @@ -11054,11 +16143,13 @@ win32_croak_not_implemented(const char * #else /* if !defined(WIN32) */ PERL_CALLCONV bool Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report) + Perl_attribute_nonnull_aTHX + Perl_attribute_nonnull(pTHX_1) __attribute__visibility__("hidden"); # define PERL_ARGS_ASSERT_DO_EXEC3 \ - assert(incmd) + Perl_assert_aTHX; assert(incmd) -#endif +#endif /* !defined(WIN32) */ #ifdef PERL_CORE # include "pp_proto.h" Index: gnu/usr.bin/perl/reentr.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/reentr.c,v diff -u -p -a -u -p -r1.7 reentr.c --- gnu/usr.bin/perl/reentr.c 28 Jan 2025 01:06:10 -0000 1.7 +++ gnu/usr.bin/perl/reentr.c 16 Nov 2026 00:57:39 -0000 @@ -45,6 +45,7 @@ void Perl_reentrant_size(pTHX) { + PERL_ARGS_ASSERT_REENTRANT_SIZE; PERL_UNUSED_CONTEXT; /* Set the sizes of the reentrant buffers */ @@ -171,6 +172,7 @@ Perl_reentrant_size(pTHX) { void Perl_reentrant_init(pTHX) { + PERL_ARGS_ASSERT_REENTRANT_INIT; PERL_UNUSED_CONTEXT; /* Initialize the whole thing */ @@ -276,6 +278,7 @@ Perl_reentrant_init(pTHX) { void Perl_reentrant_free(pTHX) { + PERL_ARGS_ASSERT_REENTRANT_FREE; PERL_UNUSED_CONTEXT; /* Tear down */ @@ -371,6 +374,8 @@ Perl_reentrant_free(pTHX) { void* Perl_reentrant_retry(const char *f, ...) { + PERL_ARGS_ASSERT_REENTRANT_RETRY; + /* This function is set up to be called if the normal function returns * failure with errno ERANGE, which indicates the buffer is too small. * This function calls the failing one again with a larger buffer. @@ -396,7 +401,6 @@ Perl_reentrant_retry(const char *f, ...) /* Easier to special case this here than in embed.pl. (Look at what it generates for proto.h) */ - PERL_ARGS_ASSERT_REENTRANT_RETRY; #endif Index: gnu/usr.bin/perl/regcharclass.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regcharclass.h,v diff -u -p -a -u -p -r1.9 regcharclass.h --- gnu/usr.bin/perl/regcharclass.h 26 Dec 2025 22:14:13 -0000 1.9 +++ gnu/usr.bin/perl/regcharclass.h 16 Nov 2026 00:57:39 -0000 @@ -27,7 +27,7 @@ */ /*** GENERATED CODE ***/ #define is_LNBREAK_safe(s,e,is_utf8) \ -( ((e)-(s) > 2) ? \ +( (STRLEN)( ((e)-(s) > 2) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[0], '\n', '\f') ) ? 1 \ : ( '\r' == ((const U8*)s)[0] ) ? \ ( ( '\n' == ((const U8*)s)[1] ) ? 2 : 1 ) \ @@ -48,11 +48,11 @@ : ( !( is_utf8 ) ) ? \ ( 0x85 == ((const U8*)s)[0] ) \ : 0 ) \ -: 0 ) +: 0 ) ) /*** GENERATED CODE ***/ #define is_LNBREAK_utf8_safe(s,e) \ -( ((e)-(s) > 2) ? \ +( (STRLEN)( ((e)-(s) > 2) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[0], '\n', '\f') ) ? 1 \ : ( '\r' == ((const U8*)s)[0] ) ? \ ( ( '\n' == ((const U8*)s)[1] ) ? 2 : 1 ) \ @@ -66,18 +66,18 @@ : ( ( 0xC2 == ((const U8*)s)[0] ) && ( 0x85 == ((const U8*)s)[1] ) ) ? 2 : 0 )\ : ((e)-(s) > 0) ? \ ( inRANGE_helper_(U8, ((const U8*)s)[0], '\n', '\r') ) \ -: 0 ) +: 0 ) ) /*** GENERATED CODE ***/ #define is_LNBREAK_latin1_safe(s,e) \ -( ((e)-(s) > 1) ? \ +( (STRLEN)( ((e)-(s) > 1) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[0], '\n', '\f') || 0x85 == ((const U8*)s)[0] ) ? 1\ : ( '\r' == ((const U8*)s)[0] ) ? \ ( ( '\n' == ((const U8*)s)[1] ) ? 2 : 1 ) \ : 0 ) \ : ((e)-(s) > 0) ? \ ( inRANGE_helper_(U8, ((const U8*)s)[0], '\n', '\r') || 0x85 == ((const U8*)s)[0] )\ -: 0 ) +: 0 ) ) /* HORIZWS: Horizontal Whitespace: \h \H @@ -86,20 +86,20 @@ */ /*** GENERATED CODE ***/ #define is_HORIZWS_high(s) \ -( ( 0xE1 == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xE1 == ((const U8*)s)[0] ) ? \ ( ( ( 0x9A == ((const U8*)s)[1] ) && ( 0x80 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( 0xE2 == ((const U8*)s)[0] ) ? \ ( ( 0x80 == ((const U8*)s)[1] ) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0x8A) || 0xAF == ((const U8*)s)[2] ) ? 3 : 0 )\ : ( ( 0x81 == ((const U8*)s)[1] ) && ( 0x9F == ((const U8*)s)[2] ) ) ? 3 : 0 )\ -: ( ( ( 0xE3 == ((const U8*)s)[0] ) && ( 0x80 == ((const U8*)s)[1] ) ) && ( 0x80 == ((const U8*)s)[2] ) ) ? 3 : 0 ) +: ( ( ( 0xE3 == ((const U8*)s)[0] ) && ( 0x80 == ((const U8*)s)[1] ) ) && ( 0x80 == ((const U8*)s)[2] ) ) ? 3 : 0 ) ) /*** GENERATED CODE ***/ #define is_HORIZWS_cp_high(cp) \ -( 0x1680 == cp || ( 0x1680 < cp && \ +( (STRLEN)( 0x1680 == cp || ( 0x1680 < cp && \ ( inRANGE_helper_(UV, cp, 0x2000, 0x200A) || ( 0x200A < cp && \ ( 0x202F == cp || ( 0x202F < cp && \ -( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) ) +( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) ) ) /* VERTWS: Vertical Whitespace: \v \V @@ -108,11 +108,11 @@ */ /*** GENERATED CODE ***/ #define is_VERTWS_high(s) \ -( ( ( ( 0xE2 == ((const U8*)s)[0] ) && ( 0x80 == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0xA8, 0xA9) ) ) ? 3 : 0 ) +( (STRLEN)( ( ( ( 0xE2 == ((const U8*)s)[0] ) && ( 0x80 == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0xA8, 0xA9) ) ) ? 3 : 0 ) ) /*** GENERATED CODE ***/ #define is_VERTWS_cp_high(cp) \ -( inRANGE_helper_(UV, cp, 0x2028, 0x2029) ) +( (STRLEN)( inRANGE_helper_(UV, cp, 0x2028, 0x2029) ) ) /* XDIGIT: Hexadecimal digits @@ -121,16 +121,16 @@ */ /*** GENERATED CODE ***/ #define is_XDIGIT_high(s) \ -( ( 0xEF == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xEF == ((const U8*)s)[0] ) ? \ ( ( 0xBC == ((const U8*)s)[1] ) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x90, 0x99) || inRANGE_helper_(U8, ((const U8*)s)[2], 0xA1, 0xA6) ) ? 3 : 0 )\ : ( ( 0xBD == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x81, 0x86) ) ) ? 3 : 0 )\ -: 0 ) +: 0 ) ) /*** GENERATED CODE ***/ #define is_XDIGIT_cp_high(cp) \ -( inRANGE_helper_(UV, cp, 0xFF10, 0xFF19) || ( 0xFF19 < cp && \ -( inRANGE_helper_(UV, cp, 0xFF21, 0xFF26) || inRANGE_helper_(UV, cp, 0xFF41, 0xFF46) ) ) ) +( (STRLEN)( inRANGE_helper_(UV, cp, 0xFF10, 0xFF19) || ( 0xFF19 < cp && \ +( inRANGE_helper_(UV, cp, 0xFF21, 0xFF26) || inRANGE_helper_(UV, cp, 0xFF41, 0xFF46) ) ) ) ) /* XPERLSPACE: \p{XPerlSpace} @@ -139,21 +139,21 @@ */ /*** GENERATED CODE ***/ #define is_XPERLSPACE_high(s) \ -( ( 0xE1 == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xE1 == ((const U8*)s)[0] ) ? \ ( ( ( 0x9A == ((const U8*)s)[1] ) && ( 0x80 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( 0xE2 == ((const U8*)s)[0] ) ? \ ( ( 0x80 == ((const U8*)s)[1] ) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0x8A) || inRANGE_helper_(U8, ((const U8*)s)[2], 0xA8, 0xA9) || 0xAF == ((const U8*)s)[2] ) ? 3 : 0 )\ : ( ( 0x81 == ((const U8*)s)[1] ) && ( 0x9F == ((const U8*)s)[2] ) ) ? 3 : 0 )\ -: ( ( ( 0xE3 == ((const U8*)s)[0] ) && ( 0x80 == ((const U8*)s)[1] ) ) && ( 0x80 == ((const U8*)s)[2] ) ) ? 3 : 0 ) +: ( ( ( 0xE3 == ((const U8*)s)[0] ) && ( 0x80 == ((const U8*)s)[1] ) ) && ( 0x80 == ((const U8*)s)[2] ) ) ? 3 : 0 ) ) /*** GENERATED CODE ***/ #define is_XPERLSPACE_cp_high(cp) \ -( 0x1680 == cp || ( 0x1680 < cp && \ +( (STRLEN)( 0x1680 == cp || ( 0x1680 < cp && \ ( inRANGE_helper_(UV, cp, 0x2000, 0x200A) || ( 0x200A < cp && \ ( inRANGE_helper_(UV, cp, 0x2028, 0x2029) || ( 0x2029 < cp && \ ( 0x202F == cp || ( 0x202F < cp && \ -( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) ) ) ) +( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) ) ) ) ) /* SPACE: Backwards \p{XPerlSpace} @@ -162,7 +162,7 @@ */ /*** GENERATED CODE ***/ #define is_SPACE_utf8_safe_backwards(s,e) \ -( ((s) - (e) > 2) ? \ +( (STRLEN)( ((s) - (e) > 2) ? \ ( ( inRANGE_helper_(U8, *((const U8*)s - 1), '\t', '\r') || ' ' == *((const U8*)s - 1) ) ? 1\ : ( 0x80 == *((const U8*)s - 1) ) ? \ ( ( 0x80 == *((const U8*)s - 2) ) ? \ @@ -182,7 +182,7 @@ : ( ( 0x85 == *((const U8*)s - 1) || 0xA0 == *((const U8*)s - 1) ) && ( 0xC2 == *((const U8*)s - 2) ) ) ? 2 : 0 )\ : ((s) - (e) > 0) ? \ ( inRANGE_helper_(U8, *((const U8*)s - 1), '\t', '\r') || ' ' == *((const U8*)s - 1) )\ -: 0 ) +: 0 ) ) /* NONCHAR: Non character code points @@ -191,7 +191,7 @@ */ /*** GENERATED CODE ***/ #define is_NONCHAR_utf8_safe(s,e) \ -( ( ( LIKELY((e) > (s)) ) && ( LIKELY(((e) - (s)) >= UTF8SKIP(s)) ) ) ? ( ( 0xEF == ((const U8*)s)[0] ) ?\ +( (STRLEN)( ( ( LIKELY((e) > (s)) ) && ( LIKELY(((e) - (s)) >= UTF8SKIP(s)) ) ) ? ( ( 0xEF == ((const U8*)s)[0] ) ?\ ( ( 0xB7 == ((const U8*)s)[1] ) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x90, 0xAF) ) ? 3 : 0 )\ : ( ( 0xBF == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0xBE, 0xBF) ) ) ? 3 : 0 )\ @@ -199,7 +199,7 @@ ( ( ( ( ((const U8*)s)[1] == 0x9F || ( ( ((const U8*)s)[1] & 0xEF ) == 0xAF ) ) && ( 0xBF == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0xBE, 0xBF) ) ) ? 4 : 0 )\ : ( inRANGE_helper_(U8, ((const U8*)s)[0], 0xF1, 0xF3) ) ? \ ( ( ( ( ( ((const U8*)s)[1] & 0xCF ) == 0x8F ) && ( 0xBF == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0xBE, 0xBF) ) ) ? 4 : 0 )\ - : ( ( ( ( 0xF4 == ((const U8*)s)[0] ) && ( 0x8F == ((const U8*)s)[1] ) ) && ( 0xBF == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0xBE, 0xBF) ) ) ? 4 : 0 ) : 0 ) + : ( ( ( ( 0xF4 == ((const U8*)s)[0] ) && ( 0x8F == ((const U8*)s)[1] ) ) && ( 0xBF == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0xBE, 0xBF) ) ) ? 4 : 0 ) : 0 ) ) /* SHORTER_NON_CHARS: # 3 bytes @@ -209,11 +209,11 @@ */ /*** GENERATED CODE ***/ #define is_SHORTER_NON_CHARS_utf8(s) \ -( ( 0xEF == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xEF == ((const U8*)s)[0] ) ? \ ( ( 0xB7 == ((const U8*)s)[1] ) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x90, 0xAF) ) ? 3 : 0 ) \ : ( ( 0xBF == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0xBE, 0xBF) ) ) ? 3 : 0 )\ -: 0 ) +: 0 ) ) /* LARGER_NON_CHARS: # 4 bytes @@ -237,11 +237,11 @@ */ /*** GENERATED CODE ***/ #define is_LARGER_NON_CHARS_utf8(s) \ -( ( 0xF0 == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xF0 == ((const U8*)s)[0] ) ? \ ( ( ( ( ((const U8*)s)[1] == 0x9F || ( ( ((const U8*)s)[1] & 0xEF ) == 0xAF ) ) && ( 0xBF == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0xBE, 0xBF) ) ) ? 4 : 0 )\ : ( inRANGE_helper_(U8, ((const U8*)s)[0], 0xF1, 0xF3) ) ? \ ( ( ( ( ( ((const U8*)s)[1] & 0xCF ) == 0x8F ) && ( 0xBF == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0xBE, 0xBF) ) ) ? 4 : 0 )\ -: ( ( ( ( 0xF4 == ((const U8*)s)[0] ) && ( 0x8F == ((const U8*)s)[1] ) ) && ( 0xBF == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0xBE, 0xBF) ) ) ? 4 : 0 ) +: ( ( ( ( 0xF4 == ((const U8*)s)[0] ) && ( 0x8F == ((const U8*)s)[1] ) ) && ( 0xBF == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0xBE, 0xBF) ) ) ? 4 : 0 ) ) /* SURROGATE: Surrogate code points @@ -250,11 +250,11 @@ */ /*** GENERATED CODE ***/ #define is_SURROGATE_utf8(s) \ -( ( ( 0xED == ((const U8*)s)[0] ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0xA0, 0xBF) ) ) ? 3 : 0 ) +( (STRLEN)( ( ( 0xED == ((const U8*)s)[0] ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0xA0, 0xBF) ) ) ? 3 : 0 ) ) /*** GENERATED CODE ***/ #define is_SURROGATE_utf8_safe(s,e) \ -( ( ( ( ( ((e) - (s)) >= 3 ) && ( 0xED == ((const U8*)s)[0] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0xA0, 0xBF) ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0xBF) ) ) ? 3 : 0 ) +( (STRLEN)( ( ( ( ( ((e) - (s)) >= 3 ) && ( 0xED == ((const U8*)s)[0] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0xA0, 0xBF) ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0xBF) ) ) ? 3 : 0 ) ) /* QUOTEMETA: Meta-characters that \Q should quote @@ -263,7 +263,7 @@ */ /*** GENERATED CODE ***/ #define is_QUOTEMETA_high(s) \ -( ( 0xCD == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xCD == ((const U8*)s)[0] ) ? \ ( ( 0x8F == ((const U8*)s)[1] ) ? 2 : 0 ) \ : ( 0xD8 == ((const U8*)s)[0] ) ? \ ( ( 0x9C == ((const U8*)s)[1] ) ? 2 : 0 ) \ @@ -309,7 +309,7 @@ ( ( 0x9B == ((const U8*)s)[1] ) ? \ ( ( ( 0xB2 == ((const U8*)s)[2] ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0xA0, 0xA3) ) ) ? 4 : 0 )\ : ( ( ( 0x9D == ((const U8*)s)[1] ) && ( 0x85 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0xB3, 0xBA) ) ) ? 4 : 0 )\ -: ( ( 0xF3 == ((const U8*)s)[0] ) && ( 0xA0 == ((const U8*)s)[1] ) ) ? 4 : 0 ) +: ( ( 0xF3 == ((const U8*)s)[0] ) && ( 0xA0 == ((const U8*)s)[1] ) ) ? 4 : 0 ) ) /* MULTI_CHAR_FOLD: multi-char strings that are folded to by a single character @@ -489,7 +489,7 @@ /*** GENERATED CODE ***/ #define is_MULTI_CHAR_FOLD_utf8_safe(s,e) \ -( ((e)-(s) > 5) ? \ +( (STRLEN)( ((e)-(s) > 5) ? \ ( ( ( ((const U8*)s)[0] & 0xDF ) == 'A' ) ? \ ( ( ( 0xCA == ((const U8*)s)[1] ) && ( 0xBE == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( ( ((const U8*)s)[0] & 0xDF ) == 'F' ) ? is_MULTI_CHAR_FOLD_utf8_safe_part0_(s,e) : is_MULTI_CHAR_FOLD_utf8_safe_part1_(s,e) )\ @@ -551,7 +551,7 @@ ( ( ( ( ( ((const U8*)s)[2] & 0xD8 ) == 0x80 ) && ( 0xCE == ((const U8*)s)[3] ) ) && ( 0xB9 == ((const U8*)s)[4] ) ) ? 5 : 0 )\ : ( ( ( ( 0xBD == ((const U8*)s)[1] ) && ( ( ( ((const U8*)s)[2] & 0xF8 ) == 0xA0 ) || ( ( ((const U8*)s)[2] & 0xFB ) == 0xB0 ) || ((const U8*)s)[2] == 0xBC ) ) && ( 0xCE == ((const U8*)s)[3] ) ) && ( 0xB9 == ((const U8*)s)[4] ) ) ? 5 : 0 )\ : 0 ) \ -: ((e)-(s) > 3) ? is_MULTI_CHAR_FOLD_utf8_safe_part2_(s,e) : is_MULTI_CHAR_FOLD_utf8_safe_part3_(s,e) ) +: ((e)-(s) > 3) ? is_MULTI_CHAR_FOLD_utf8_safe_part2_(s,e) : is_MULTI_CHAR_FOLD_utf8_safe_part3_(s,e) ) ) /*** GENERATED CODE ***/ #define what_MULTI_CHAR_FOLD_utf8_safe_part0_(s,e) \ @@ -986,7 +986,7 @@ */ /*** GENERATED CODE ***/ #define is_MULTI_CHAR_FOLD_latin1_safe(s,e) \ -( ((e)-(s) > 2) ? \ +( (STRLEN)( ((e)-(s) > 2) ? \ ( ( ( ((const U8*)s)[0] & 0xDF ) == 'F' ) ? \ ( ( ( ((const U8*)s)[1] & 0xDF ) == 'F' ) ? \ ( ( ( ( ((const U8*)s)[2] & 0xDF ) == 'I' ) || ( ( ((const U8*)s)[2] & 0xDF ) == 'L' ) ) ? 3 : 2 )\ @@ -996,7 +996,7 @@ ( ( ( ((const U8*)s)[0] & 0xDF ) == 'F' ) ? \ ( ( ( ( ((const U8*)s)[1] & 0xDF ) == 'F' ) || ( ( ((const U8*)s)[1] & 0xDF ) == 'I' ) || ( ( ((const U8*)s)[1] & 0xDF ) == 'L' ) ) ? 2 : 0 )\ : ( ( ( ((const U8*)s)[0] & 0xDF ) == 'S' ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 'S', 'T') || inRANGE_helper_(U8, ((const U8*)s)[1], 's', 't') ) ) ? 2 : 0 )\ -: 0 ) +: 0 ) ) /*** GENERATED CODE ***/ #define what_MULTI_CHAR_FOLD_latin1_safe(s,e) \ @@ -1029,7 +1029,7 @@ */ /*** GENERATED CODE ***/ #define is_THREE_CHAR_FOLD_utf8_safe(s,e) \ -( ((e)-(s) > 5) ? \ +( (STRLEN)( ((e)-(s) > 5) ? \ ( ( ( ((const U8*)s)[0] & 0xDF ) == 'F' ) ? \ ( ( ( ( ((const U8*)s)[1] & 0xDF ) == 'F' ) && ( ( ( ((const U8*)s)[2] & 0xDF ) == 'I' ) || ( ( ((const U8*)s)[2] & 0xDF ) == 'L' ) ) ) ? 3 : 0 )\ : ( 0xCE == ((const U8*)s)[0] ) ? \ @@ -1045,7 +1045,7 @@ : ( ( 0xCD == ((const U8*)s)[4] ) && ( 0x82 == ((const U8*)s)[5] ) ) ? 6 : 0 ) : 0 )\ : ( ( ( ( ( 0x89 == ((const U8*)s)[1] ) && ( 0xCD == ((const U8*)s)[2] ) ) && ( 0x82 == ((const U8*)s)[3] ) ) && ( 0xCE == ((const U8*)s)[4] ) ) && ( 0xB9 == ((const U8*)s)[5] ) ) ? 6 : 0 )\ : 0 ) \ -: ( ( ( ((e)-(s) > 2) && ( ( ((const U8*)s)[0] & 0xDF ) == 'F' ) ) && ( ( ((const U8*)s)[1] & 0xDF ) == 'F' ) ) && ( ( ( ((const U8*)s)[2] & 0xDF ) == 'I' ) || ( ( ((const U8*)s)[2] & 0xDF ) == 'L' ) ) ) ? 3 : 0 ) +: ( ( ( ((e)-(s) > 2) && ( ( ((const U8*)s)[0] & 0xDF ) == 'F' ) ) && ( ( ((const U8*)s)[1] & 0xDF ) == 'F' ) ) && ( ( ( ((const U8*)s)[2] & 0xDF ) == 'I' ) || ( ( ((const U8*)s)[2] & 0xDF ) == 'L' ) ) ) ? 3 : 0 ) ) /* THREE_CHAR_FOLD: A three-character multi-char fold @@ -1054,7 +1054,7 @@ */ /*** GENERATED CODE ***/ #define is_THREE_CHAR_FOLD_latin1_safe(s,e) \ -( ( ( ( ( ((e) - (s)) >= 3 ) && ( ( ((const U8*)s)[0] & 0xDF ) == 'F' ) ) && ( ( ((const U8*)s)[1] & 0xDF ) == 'F' ) ) && ( ( ( ((const U8*)s)[2] & 0xDF ) == 'I' ) || ( ( ((const U8*)s)[2] & 0xDF ) == 'L' ) ) ) ? 3 : 0 ) +( (STRLEN)( ( ( ( ( ((e) - (s)) >= 3 ) && ( ( ((const U8*)s)[0] & 0xDF ) == 'F' ) ) && ( ( ((const U8*)s)[1] & 0xDF ) == 'F' ) ) && ( ( ( ((const U8*)s)[2] & 0xDF ) == 'I' ) || ( ( ((const U8*)s)[2] & 0xDF ) == 'L' ) ) ) ? 3 : 0 ) ) /* THREE_CHAR_FOLD_HEAD: The first two of three-character multi-char folds @@ -1063,7 +1063,7 @@ */ /*** GENERATED CODE ***/ #define is_THREE_CHAR_FOLD_HEAD_utf8_safe(s,e) \ -( ((e)-(s) > 3) ? \ +( (STRLEN)( ((e)-(s) > 3) ? \ ( ( ( ( ((const U8*)s)[0] & 0xDF ) == 'A' ) || ( ( ((const U8*)s)[0] & 0xDE ) == 'H' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'J' ) || ( ( ((const U8*)s)[0] & 0xDB ) == 'S' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'T' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'Y' ) ) ? 1\ : ( ( ((const U8*)s)[0] & 0xDF ) == 'F' ) ? \ ( ( ( ((const U8*)s)[1] & 0xDF ) == 'F' ) ? 2 : 1 ) \ @@ -1126,7 +1126,7 @@ : ( ( 0xD5 == ((const U8*)s)[0] ) && ( 0xA5 == ((const U8*)s)[1] || 0xB4 == ((const U8*)s)[1] || 0xBE == ((const U8*)s)[1] ) ) ? 2 : 0 )\ : ((e)-(s) > 0) ? \ ( ( ( ((const U8*)s)[0] & 0xDF ) == 'A' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'F' ) || ( ( ((const U8*)s)[0] & 0xDE ) == 'H' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'J' ) || ( ( ((const U8*)s)[0] & 0xDB ) == 'S' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'T' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'Y' ) )\ -: 0 ) +: 0 ) ) /* THREE_CHAR_FOLD_HEAD: The first two of three-character multi-char folds @@ -1135,14 +1135,14 @@ */ /*** GENERATED CODE ***/ #define is_THREE_CHAR_FOLD_HEAD_latin1_safe(s,e) \ -( ((e)-(s) > 1) ? \ +( (STRLEN)( ((e)-(s) > 1) ? \ ( ( ( ( ((const U8*)s)[0] & 0xDF ) == 'A' ) || ( ( ((const U8*)s)[0] & 0xDE ) == 'H' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'J' ) || ( ( ((const U8*)s)[0] & 0xDB ) == 'S' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'T' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'Y' ) ) ? 1\ : ( ( ((const U8*)s)[0] & 0xDF ) == 'F' ) ? \ ( ( ( ((const U8*)s)[1] & 0xDF ) == 'F' ) ? 2 : 1 ) \ : 0 ) \ : ((e)-(s) > 0) ? \ ( ( ( ((const U8*)s)[0] & 0xDF ) == 'A' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'F' ) || ( ( ((const U8*)s)[0] & 0xDE ) == 'H' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'J' ) || ( ( ((const U8*)s)[0] & 0xDB ) == 'S' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'T' ) || ( ( ((const U8*)s)[0] & 0xDF ) == 'Y' ) )\ -: 0 ) +: 0 ) ) /* FOLDS_TO_MULTI: characters that fold to multi-char strings @@ -1151,7 +1151,7 @@ */ /*** GENERATED CODE ***/ #define is_FOLDS_TO_MULTI_utf8(s) \ -( ( 0xC3 == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xC3 == ((const U8*)s)[0] ) ? \ ( ( 0x9F == ((const U8*)s)[1] ) ? 2 : 0 ) \ : ( 0xC4 == ((const U8*)s)[0] || 0xC7 == ((const U8*)s)[0] ) ? \ ( ( 0xB0 == ((const U8*)s)[1] ) ? 2 : 0 ) \ @@ -1169,7 +1169,7 @@ : ( 0xBE == ((const U8*)s)[1] ) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0xAF) || inRANGE_helper_(U8, ((const U8*)s)[2], 0xB2, 0xB4) || inRANGE_helper_(U8, ((const U8*)s)[2], 0xB6, 0xB7) || 0xBC == ((const U8*)s)[2] ) ? 3 : 0 )\ : ( ( 0xBF == ((const U8*)s)[1] ) && ( ( ( ((const U8*)s)[2] & 0xCA ) == 0x82 ) || ( ( ((const U8*)s)[2] & 0xF7 ) == 0x84 ) || ((const U8*)s)[2] == 0xA4 || ( ( ((const U8*)s)[2] & 0xF7 ) == 0xB4 ) ) ) ? 3 : 0 )\ -: ( ( ( 0xEF == ((const U8*)s)[0] ) && ( 0xAC == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0x86) || inRANGE_helper_(U8, ((const U8*)s)[2], 0x93, 0x97) ) ) ? 3 : 0 ) +: ( ( ( 0xEF == ((const U8*)s)[0] ) && ( 0xAC == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0x86) || inRANGE_helper_(U8, ((const U8*)s)[2], 0x93, 0x97) ) ) ? 3 : 0 ) ) /* PROBLEMATIC_LOCALE_FOLD: characters whose fold is problematic under locale @@ -1178,7 +1178,7 @@ */ /*** GENERATED CODE ***/ #define is_PROBLEMATIC_LOCALE_FOLD_utf8(s) \ -( ( ((const U8*)s)[0] <= 0x7F ) ? 1 \ +( (STRLEN)( ( ((const U8*)s)[0] <= 0x7F ) ? 1 \ : ( inRANGE_helper_(U8, ((const U8*)s)[0], 0xC2, 0xC3) ) ? \ 2 \ : ( 0xC4 == ((const U8*)s)[0] ) ? \ @@ -1195,11 +1195,11 @@ ( ( ( 0xBA == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x96, 0x9A) || 0x9E == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( 0xE2 == ((const U8*)s)[0] ) ? \ ( ( ( 0x84 == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0xAA, 0xAB) ) ) ? 3 : 0 )\ -: ( ( ( 0xEF == ((const U8*)s)[0] ) && ( 0xAC == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0x86) ) ) ? 3 : 0 ) +: ( ( ( 0xEF == ((const U8*)s)[0] ) && ( 0xAC == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0x86) ) ) ? 3 : 0 ) ) /*** GENERATED CODE ***/ #define is_PROBLEMATIC_LOCALE_FOLD_cp(cp) \ -( cp <= 0xFF || ( 0xFF < cp && \ +( (STRLEN)( cp <= 0xFF || ( 0xFF < cp && \ ( inRANGE_helper_(UV, cp, 0x130, 0x131) || ( 0x131 < cp && \ ( 0x149 == cp || ( 0x149 < cp && \ ( 0x178 == cp || ( 0x178 < cp && \ @@ -1210,7 +1210,7 @@ ( 0x3BC == cp || ( 0x3BC < cp && \ ( inRANGE_helper_(UV, cp, 0x1E96, 0x1E9A) || ( 0x1E9A < cp && \ ( 0x1E9E == cp || ( 0x1E9E < cp && \ -( inRANGE_helper_(UV, cp, 0x212A, 0x212B) || inRANGE_helper_(UV, cp, 0xFB00, 0xFB06) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) +( inRANGE_helper_(UV, cp, 0x212A, 0x212B) || inRANGE_helper_(UV, cp, 0xFB00, 0xFB06) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) /* PROBLEMATIC_LOCALE_FOLDEDS_START: The first folded character of folds which are problematic under locale @@ -1219,7 +1219,7 @@ */ /*** GENERATED CODE ***/ #define is_PROBLEMATIC_LOCALE_FOLDEDS_START_utf8(s) \ -( ( ((const U8*)s)[0] <= 0x7F ) ? 1 \ +( (STRLEN)( ( ((const U8*)s)[0] <= 0x7F ) ? 1 \ : ( inRANGE_helper_(U8, ((const U8*)s)[0], 0xC2, 0xC3) ) ? \ 2 \ : ( 0xC4 == ((const U8*)s)[0] ) ? \ @@ -1236,11 +1236,11 @@ ( ( ( 0xBA == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x96, 0x9A) || 0x9E == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( 0xE2 == ((const U8*)s)[0] ) ? \ ( ( ( 0x84 == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0xAA, 0xAB) ) ) ? 3 : 0 )\ -: ( ( ( 0xEF == ((const U8*)s)[0] ) && ( 0xAC == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0x86) ) ) ? 3 : 0 ) +: ( ( ( 0xEF == ((const U8*)s)[0] ) && ( 0xAC == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0x86) ) ) ? 3 : 0 ) ) /*** GENERATED CODE ***/ #define is_PROBLEMATIC_LOCALE_FOLDEDS_START_cp(cp) \ -( cp <= 0xFF || ( 0xFF < cp && \ +( (STRLEN)( cp <= 0xFF || ( 0xFF < cp && \ ( inRANGE_helper_(UV, cp, 0x130, 0x131) || ( 0x131 < cp && \ ( 0x149 == cp || ( 0x149 < cp && \ ( 0x178 == cp || ( 0x178 < cp && \ @@ -1251,7 +1251,7 @@ ( 0x3BC == cp || ( 0x3BC < cp && \ ( inRANGE_helper_(UV, cp, 0x1E96, 0x1E9A) || ( 0x1E9A < cp && \ ( 0x1E9E == cp || ( 0x1E9E < cp && \ -( inRANGE_helper_(UV, cp, 0x212A, 0x212B) || inRANGE_helper_(UV, cp, 0xFB00, 0xFB06) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) +( inRANGE_helper_(UV, cp, 0x212A, 0x212B) || inRANGE_helper_(UV, cp, 0xFB00, 0xFB06) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) /* PATWS: pattern white space @@ -1260,7 +1260,7 @@ */ /*** GENERATED CODE ***/ #define is_PATWS_safe(s,e,is_utf8) \ -( ( LIKELY((e) > (s)) ) ? \ +( (STRLEN)( ( LIKELY((e) > (s)) ) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[0], '\t', '\r') || ' ' == ((const U8*)s)[0] ) ? 1\ : (! is_utf8 ) ? \ ( 0x85 == ((const U8*)s)[0] ) \ @@ -1269,7 +1269,7 @@ ( ( 0x85 == ((const U8*)s)[1] ) ? 2 : 0 ) \ : ( ( ( 0xE2 == ((const U8*)s)[0] ) && ( 0x80 == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x8E, 0x8F) || inRANGE_helper_(U8, ((const U8*)s)[2], 0xA8, 0xA9) ) ) ? 3 : 0 )\ : 0 ) \ -: 0 ) +: 0 ) ) /* HANGUL_ED: Hangul syllables whose first UTF-8 byte is \xED @@ -1278,7 +1278,42 @@ */ /*** GENERATED CODE ***/ #define is_HANGUL_ED_utf8_safe(s,e) \ -( ( ( ( ( ((e) - (s)) >= 3 ) && ( 0xED == ((const U8*)s)[0] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0x80, 0x9F) ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0xBF) ) ) ? 3 : 0 ) +( (STRLEN)( ( ( ( ( ((e) - (s)) >= 3 ) && ( 0xED == ((const U8*)s)[0] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0x80, 0x9F) ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0xBF) ) ) ? 3 : 0 ) ) + +/* + WORD_BUT_NONCONT: Word characters that perhaps surprisingly are forbidden in names + + \p{_Perl_Word_But_NonCont} +*/ +/*** GENERATED CODE ***/ +#define is_WORD_BUT_NONCONT_safe(s,e,is_utf8) \ +( (STRLEN)( ( ( LIKELY((e) > (s)) ) && ( LIKELY(((e) - (s)) >= UTF8SKIP(s)) ) ) ? ( ( 0xCD == ((const U8*)s)[0] ) ?\ + ( ( 0xBA == ((const U8*)s)[1] ) ? 2 : 0 ) \ + : ( 0xD2 == ((const U8*)s)[0] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[1], 0x88, 0x89) ) ? 2 : 0 )\ + : ( 0xE1 == ((const U8*)s)[0] ) ? \ + ( ( ( 0xAA == ((const U8*)s)[1] ) && ( 0xBE == ((const U8*)s)[2] ) ) ? 3 : 0 )\ + : ( 0xE2 == ((const U8*)s)[0] ) ? \ + ( ( 0x83 == ((const U8*)s)[1] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x9D, 0xA0) || inRANGE_helper_(U8, ((const U8*)s)[2], 0xA2, 0xA4) ) ? 3 : 0 )\ + : ( 0x92 == ((const U8*)s)[1] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0xB6, 0xBF) ) ? 3 : 0 )\ + : ( 0x93 == ((const U8*)s)[1] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x80, 0xA9) ) ? 3 : 0 )\ + : ( ( 0xB8 == ((const U8*)s)[1] ) && ( 0xAF == ((const U8*)s)[2] ) ) ? 3 : 0 )\ + : ( 0xEA == ((const U8*)s)[0] ) ? \ + ( ( ( 0x99 == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0xB0, 0xB2) ) ) ? 3 : 0 )\ + : ( 0xEF == ((const U8*)s)[0] ) ? \ + ( ( 0xB1 == ((const U8*)s)[1] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x9E, 0xA3) ) ? 3 : 0 )\ + : ( 0xB7 == ((const U8*)s)[1] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0xBA, 0xBB) ) ? 3 : 0 )\ + : ( ( 0xB9 == ((const U8*)s)[1] ) && ( ( ((const U8*)s)[2] & 0xF1 ) == 0xB0 ) ) ? 3 : 0 )\ + : ( ( 0xF0 == ((const U8*)s)[0] ) && ( 0x9F == ((const U8*)s)[1] ) ) ? ( ( 0x84 == ((const U8*)s)[2] ) ?\ + ( ( inRANGE_helper_(U8, ((const U8*)s)[3], 0xB0, 0xBF) ) ? 4 : 0 )\ + : ( 0x85 == ((const U8*)s)[2] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x80, 0x89) || inRANGE_helper_(U8, ((const U8*)s)[3], 0x90, 0xA9) || inRANGE_helper_(U8, ((const U8*)s)[3], 0xB0, 0xBF) ) ? 4 : 0 )\ + : ( ( 0x86 == ((const U8*)s)[2] ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x80, 0x89) ) ) ? 4 : 0 ) : 0 ) : 0 ) ) #endif /* ASCII/Latin1 */ @@ -1294,7 +1329,7 @@ */ /*** GENERATED CODE ***/ #define is_LNBREAK_safe(s,e,is_utf8) \ -( ((e)-(s) > 2) ? \ +( (STRLEN)( ((e)-(s) > 2) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\f') || '\n' == ((const U8*)s)[0] || 0x25 == ((const U8*)s)[0] ) ? 1\ : ( '\r' == ((const U8*)s)[0] ) ? \ ( ( '\n' == ((const U8*)s)[1] ) ? 2 : 1 ) \ @@ -1306,11 +1341,11 @@ : 0 ) \ : ((e)-(s) > 0) ? \ ( inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\r') || '\n' == ((const U8*)s)[0] || 0x25 == ((const U8*)s)[0] )\ -: 0 ) +: 0 ) ) /*** GENERATED CODE ***/ #define is_LNBREAK_utf8_safe(s,e) \ -( ((e)-(s) > 2) ? \ +( (STRLEN)( ((e)-(s) > 2) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\f') || '\n' == ((const U8*)s)[0] || 0x25 == ((const U8*)s)[0] ) ? 1\ : ( '\r' == ((const U8*)s)[0] ) ? \ ( ( '\n' == ((const U8*)s)[1] ) ? 2 : 1 ) \ @@ -1322,18 +1357,18 @@ : 0 ) \ : ((e)-(s) > 0) ? \ ( inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\r') || '\n' == ((const U8*)s)[0] || 0x25 == ((const U8*)s)[0] )\ -: 0 ) +: 0 ) ) /*** GENERATED CODE ***/ #define is_LNBREAK_latin1_safe(s,e) \ -( ((e)-(s) > 1) ? \ +( (STRLEN)( ((e)-(s) > 1) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\f') || '\n' == ((const U8*)s)[0] || 0x25 == ((const U8*)s)[0] ) ? 1\ : ( '\r' == ((const U8*)s)[0] ) ? \ ( ( '\n' == ((const U8*)s)[1] ) ? 2 : 1 ) \ : 0 ) \ : ((e)-(s) > 0) ? \ ( inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\r') || '\n' == ((const U8*)s)[0] || 0x25 == ((const U8*)s)[0] )\ -: 0 ) +: 0 ) ) /* HORIZWS: Horizontal Whitespace: \h \H @@ -1342,7 +1377,7 @@ */ /*** GENERATED CODE ***/ #define is_HORIZWS_high(s) \ -( ( 0xBC == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xBC == ((const U8*)s)[0] ) ? \ ( ( ( 0x63 == ((const U8*)s)[1] ) && ( 0x41 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( 0xCA == ((const U8*)s)[0] ) ? \ ( ( 0x41 == ((const U8*)s)[1] ) ? \ @@ -1350,14 +1385,14 @@ : ( 0x42 == ((const U8*)s)[1] ) ? \ ( ( 0x56 == ((const U8*)s)[2] ) ? 3 : 0 ) \ : ( ( 0x43 == ((const U8*)s)[1] ) && ( 0x73 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ -: ( ( ( 0xCE == ((const U8*)s)[0] ) && ( 0x41 == ((const U8*)s)[1] ) ) && ( 0x41 == ((const U8*)s)[2] ) ) ? 3 : 0 ) +: ( ( ( 0xCE == ((const U8*)s)[0] ) && ( 0x41 == ((const U8*)s)[1] ) ) && ( 0x41 == ((const U8*)s)[2] ) ) ? 3 : 0 ) ) /*** GENERATED CODE ***/ #define is_HORIZWS_cp_high(cp) \ -( 0x1680 == cp || ( 0x1680 < cp && \ +( (STRLEN)( 0x1680 == cp || ( 0x1680 < cp && \ ( inRANGE_helper_(UV, cp, 0x2000, 0x200A) || ( 0x200A < cp && \ ( 0x202F == cp || ( 0x202F < cp && \ -( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) ) +( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) ) ) /* VERTWS: Vertical Whitespace: \v \V @@ -1366,11 +1401,11 @@ */ /*** GENERATED CODE ***/ #define is_VERTWS_high(s) \ -( ( ( ( 0xCA == ((const U8*)s)[0] ) && ( 0x42 == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x49, 0x4A) ) ) ? 3 : 0 ) +( (STRLEN)( ( ( ( 0xCA == ((const U8*)s)[0] ) && ( 0x42 == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x49, 0x4A) ) ) ? 3 : 0 ) ) /*** GENERATED CODE ***/ #define is_VERTWS_cp_high(cp) \ -( inRANGE_helper_(UV, cp, 0x2028, 0x2029) ) +( (STRLEN)( inRANGE_helper_(UV, cp, 0x2028, 0x2029) ) ) /* XDIGIT: Hexadecimal digits @@ -1379,14 +1414,14 @@ */ /*** GENERATED CODE ***/ #define is_XDIGIT_high(s) \ -( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x73 == ((const U8*)s)[1] ) ) ? ( ( 0x67 == ((const U8*)s)[2] ) ?\ +( (STRLEN)( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x73 == ((const U8*)s)[1] ) ) ? ( ( 0x67 == ((const U8*)s)[2] ) ?\ ( ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xB0, 0xB9) ) ? 4 : 0 )\ - : ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x68, 0x69) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x42, 0x47) ) ) ? 4 : 0 ) : 0 ) + : ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x68, 0x69) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x42, 0x47) ) ) ? 4 : 0 ) : 0 ) ) /*** GENERATED CODE ***/ #define is_XDIGIT_cp_high(cp) \ -( inRANGE_helper_(UV, cp, 0xFF10, 0xFF19) || ( 0xFF19 < cp && \ -( inRANGE_helper_(UV, cp, 0xFF21, 0xFF26) || inRANGE_helper_(UV, cp, 0xFF41, 0xFF46) ) ) ) +( (STRLEN)( inRANGE_helper_(UV, cp, 0xFF10, 0xFF19) || ( 0xFF19 < cp && \ +( inRANGE_helper_(UV, cp, 0xFF21, 0xFF26) || inRANGE_helper_(UV, cp, 0xFF41, 0xFF46) ) ) ) ) /* XPERLSPACE: \p{XPerlSpace} @@ -1395,7 +1430,7 @@ */ /*** GENERATED CODE ***/ #define is_XPERLSPACE_high(s) \ -( ( 0xBC == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xBC == ((const U8*)s)[0] ) ? \ ( ( ( 0x63 == ((const U8*)s)[1] ) && ( 0x41 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( 0xCA == ((const U8*)s)[0] ) ? \ ( ( 0x41 == ((const U8*)s)[1] ) ? \ @@ -1403,15 +1438,15 @@ : ( 0x42 == ((const U8*)s)[1] ) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x49, 0x4A) || 0x56 == ((const U8*)s)[2] ) ? 3 : 0 )\ : ( ( 0x43 == ((const U8*)s)[1] ) && ( 0x73 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ -: ( ( ( 0xCE == ((const U8*)s)[0] ) && ( 0x41 == ((const U8*)s)[1] ) ) && ( 0x41 == ((const U8*)s)[2] ) ) ? 3 : 0 ) +: ( ( ( 0xCE == ((const U8*)s)[0] ) && ( 0x41 == ((const U8*)s)[1] ) ) && ( 0x41 == ((const U8*)s)[2] ) ) ? 3 : 0 ) ) /*** GENERATED CODE ***/ #define is_XPERLSPACE_cp_high(cp) \ -( 0x1680 == cp || ( 0x1680 < cp && \ +( (STRLEN)( 0x1680 == cp || ( 0x1680 < cp && \ ( inRANGE_helper_(UV, cp, 0x2000, 0x200A) || ( 0x200A < cp && \ ( inRANGE_helper_(UV, cp, 0x2028, 0x2029) || ( 0x2029 < cp && \ ( 0x202F == cp || ( 0x202F < cp && \ -( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) ) ) ) +( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) ) ) ) ) /* SPACE: Backwards \p{XPerlSpace} @@ -1420,7 +1455,7 @@ */ /*** GENERATED CODE ***/ #define is_SPACE_utf8_safe_backwards(s,e) \ -( ((s) - (e) > 2) ? \ +( (STRLEN)( ((s) - (e) > 2) ? \ ( ( '\t' == *((const U8*)s - 1) || inRANGE_helper_(U8, *((const U8*)s - 1), '\v', '\r') || '\n' == *((const U8*)s - 1) || 0x25 == *((const U8*)s - 1) || ' ' == *((const U8*)s - 1) ) ? 1\ : ( 0x41 == *((const U8*)s - 1) ) ? \ ( ( 0x41 == *((const U8*)s - 2) ) ? \ @@ -1440,7 +1475,7 @@ : ( ( 0x41 == *((const U8*)s - 1) ) && ( 0x80 == *((const U8*)s - 2) ) ) ? 2 : 0 )\ : ((s) - (e) > 0) ? \ ( '\t' == *((const U8*)s - 1) || inRANGE_helper_(U8, *((const U8*)s - 1), '\v', '\r') || '\n' == *((const U8*)s - 1) || 0x25 == *((const U8*)s - 1) || ' ' == *((const U8*)s - 1) )\ -: 0 ) +: 0 ) ) /* NONCHAR: Non character code points @@ -1449,7 +1484,7 @@ */ /*** GENERATED CODE ***/ #define is_NONCHAR_utf8_safe(s,e) \ -( ( ( LIKELY((e) > (s)) ) && ( LIKELY(((e) - (s)) >= UTF8SKIP(s)) ) ) ? ( ( 0xDD == ((const U8*)s)[0] ) ?\ +( (STRLEN)( ( ( LIKELY((e) > (s)) ) && ( LIKELY(((e) - (s)) >= UTF8SKIP(s)) ) ) ? ( ( 0xDD == ((const U8*)s)[0] ) ?\ ( ( 0x73 == ((const U8*)s)[1] ) ? \ ( ( 0x55 == ((const U8*)s)[2] ) ? \ ( ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xB0, 0xBF) ) ? 4 : 0 )\ @@ -1461,7 +1496,7 @@ ( ( ( ( 0x73 == ((const U8*)s)[1] ) && ( 0x73 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x72, 0x73) ) ) ? 4 : 0 )\ : ( 0xED == ((const U8*)s)[0] ) ? \ ( ( ( ( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[1]) & 0xF9 ) == 0xA9 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[1]) & 0xF1 ) == 0xB1 ) ) && ( 0x73 == ((const U8*)s)[2] ) ) && ( 0x73 == ((const U8*)s)[3] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[4], 0x72, 0x73) ) ) ? 5 : 0 )\ - : ( ( ( ( ( 0xEE == ((const U8*)s)[0] ) && ( 0x42 == ((const U8*)s)[1] ) ) && ( 0x73 == ((const U8*)s)[2] ) ) && ( 0x73 == ((const U8*)s)[3] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[4], 0x72, 0x73) ) ) ? 5 : 0 ) : 0 ) + : ( ( ( ( ( 0xEE == ((const U8*)s)[0] ) && ( 0x42 == ((const U8*)s)[1] ) ) && ( 0x73 == ((const U8*)s)[2] ) ) && ( 0x73 == ((const U8*)s)[3] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[4], 0x72, 0x73) ) ) ? 5 : 0 ) : 0 ) ) /* SHORTER_NON_CHARS: # 4 bytes @@ -1474,7 +1509,7 @@ */ /*** GENERATED CODE ***/ #define is_SHORTER_NON_CHARS_utf8(s) \ -( ( 0xDD == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xDD == ((const U8*)s)[0] ) ? \ ( ( 0x73 == ((const U8*)s)[1] ) ? \ ( ( 0x55 == ((const U8*)s)[2] ) ? \ ( ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xB0, 0xBF) ) ? 4 : 0 )\ @@ -1482,7 +1517,7 @@ ( ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xA0, 0xAF) ) ? 4 : 0 )\ : ( ( 0x73 == ((const U8*)s)[2] ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x72, 0x73) ) ) ? 4 : 0 )\ : 0 ) \ -: ( ( ( ( ((const U8*)s)[0] == 0xDF || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0xFD ) == 0xF5 ) ) && ( 0x73 == ((const U8*)s)[1] ) ) && ( 0x73 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x72, 0x73) ) ) ? 4 : 0 ) +: ( ( ( ( ((const U8*)s)[0] == 0xDF || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0xFD ) == 0xF5 ) ) && ( 0x73 == ((const U8*)s)[1] ) ) && ( 0x73 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x72, 0x73) ) ) ? 4 : 0 ) ) /* LARGER_NON_CHARS: # 5 bytes @@ -1503,9 +1538,9 @@ */ /*** GENERATED CODE ***/ #define is_LARGER_NON_CHARS_utf8(s) \ -( ( 0xED == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xED == ((const U8*)s)[0] ) ? \ ( ( ( ( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[1]) & 0xF9 ) == 0xA9 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[1]) & 0xF1 ) == 0xB1 ) ) && ( 0x73 == ((const U8*)s)[2] ) ) && ( 0x73 == ((const U8*)s)[3] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[4], 0x72, 0x73) ) ) ? 5 : 0 )\ -: ( ( ( ( ( 0xEE == ((const U8*)s)[0] ) && ( 0x42 == ((const U8*)s)[1] ) ) && ( 0x73 == ((const U8*)s)[2] ) ) && ( 0x73 == ((const U8*)s)[3] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[4], 0x72, 0x73) ) ) ? 5 : 0 ) +: ( ( ( ( ( 0xEE == ((const U8*)s)[0] ) && ( 0x42 == ((const U8*)s)[1] ) ) && ( 0x73 == ((const U8*)s)[2] ) ) && ( 0x73 == ((const U8*)s)[3] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[4], 0x72, 0x73) ) ) ? 5 : 0 ) ) /* SURROGATE: Surrogate code points @@ -1514,11 +1549,11 @@ */ /*** GENERATED CODE ***/ #define is_SURROGATE_utf8(s) \ -( ( ( 0xDD == ((const U8*)s)[0] ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0x65, 0x66) ) ) ? 4 : 0 ) +( (STRLEN)( ( ( 0xDD == ((const U8*)s)[0] ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0x65, 0x66) ) ) ? 4 : 0 ) ) /*** GENERATED CODE ***/ #define is_SURROGATE_utf8_safe(s,e) \ -( ( ( ( ( ( ((e) - (s)) >= 4 ) && ( 0xDD == ((const U8*)s)[0] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0x65, 0x66) ) ) && ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[2]), 0xA0, 0xBF) ) ) && ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xA0, 0xBF) ) ) ? 4 : 0 ) +( (STRLEN)( ( ( ( ( ( ((e) - (s)) >= 4 ) && ( 0xDD == ((const U8*)s)[0] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0x65, 0x66) ) ) && ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[2]), 0xA0, 0xBF) ) ) && ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xA0, 0xBF) ) ) ? 4 : 0 ) ) /* QUOTEMETA: Meta-characters that \Q should quote @@ -1527,7 +1562,7 @@ */ /*** GENERATED CODE ***/ #define is_QUOTEMETA_high(s) \ -( ( 0xB1 == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xB1 == ((const U8*)s)[0] ) ? \ ( ( 0x56 == ((const U8*)s)[1] ) ? 2 : 0 ) \ : ( 0xB8 == ((const U8*)s)[0] ) ? \ ( ( ( 0x57 == ((const U8*)s)[1] ) && ( 0x70 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ @@ -1587,7 +1622,7 @@ ( ( 0x56 == ((const U8*)s)[1] ) ? \ ( ( ( 0x46 == ((const U8*)s)[2] ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x44) ) ) ? 4 : 0 )\ : ( ( ( 0x63 == ((const U8*)s)[1] ) && ( 0x52 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x62, 0x69) ) ) ? 4 : 0 )\ -: ( ( ( 0xED == ((const U8*)s)[0] ) && ( 0x70 == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x41, 0x44) ) ) ? 5 : 0 ) +: ( ( ( 0xED == ((const U8*)s)[0] ) && ( 0x70 == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x41, 0x44) ) ) ? 5 : 0 ) ) /* MULTI_CHAR_FOLD: multi-char strings that are folded to by a single character @@ -1816,7 +1851,7 @@ /*** GENERATED CODE ***/ #define is_MULTI_CHAR_FOLD_utf8_safe(s,e) \ -( ((e)-(s) > 5) ? \ +( (STRLEN)( ((e)-(s) > 5) ? \ ( ( ( ((const U8*)s)[0] & 0xBF ) == 'a' ) ? \ ( ( ( 0xAB == ((const U8*)s)[1] ) && ( 0x72 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ? \ @@ -1826,7 +1861,7 @@ : ( ( ((const U8*)s)[0] & 0xBF ) == 'h' ) ? \ ( ( ( 0xB0 == ((const U8*)s)[1] ) && ( 0x58 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( ( ((const U8*)s)[0] & 0xBF ) == 'i' ) ? is_MULTI_CHAR_FOLD_utf8_safe_part0_(s,e) : is_MULTI_CHAR_FOLD_utf8_safe_part1_(s,e) )\ -: ((e)-(s) > 4) ? is_MULTI_CHAR_FOLD_utf8_safe_part2_(s,e) : is_MULTI_CHAR_FOLD_utf8_safe_part3_(s,e) ) +: ((e)-(s) > 4) ? is_MULTI_CHAR_FOLD_utf8_safe_part2_(s,e) : is_MULTI_CHAR_FOLD_utf8_safe_part3_(s,e) ) ) /*** GENERATED CODE ***/ #define what_MULTI_CHAR_FOLD_utf8_safe_part0_(s,e) \ @@ -2246,7 +2281,7 @@ */ /*** GENERATED CODE ***/ #define is_MULTI_CHAR_FOLD_latin1_safe(s,e) \ -( ((e)-(s) > 2) ? \ +( (STRLEN)( ((e)-(s) > 2) ? \ ( ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ? \ ( ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ? \ ( ( ( ( ((const U8*)s)[2] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[2] & 0xBF ) == 'l' ) ) ? 3 : 2 )\ @@ -2256,7 +2291,7 @@ ( ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ? \ ( ( ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) || ( ( ((const U8*)s)[1] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[1] & 0xBF ) == 'l' ) ) ? 2 : 0 )\ : ( ( ( ((const U8*)s)[0] & 0xBF ) == 's' ) && ( ( ((const U8*)s)[1] & 0xBE ) == 's' ) ) ? 2 : 0 )\ -: 0 ) +: 0 ) ) /*** GENERATED CODE ***/ #define what_MULTI_CHAR_FOLD_latin1_safe(s,e) \ @@ -2289,7 +2324,7 @@ */ /*** GENERATED CODE ***/ #define is_THREE_CHAR_FOLD_utf8_safe(s,e) \ -( ((e)-(s) > 5) ? \ +( (STRLEN)( ((e)-(s) > 5) ? \ ( ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ? \ ( ( ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) && ( ( ( ((const U8*)s)[2] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[2] & 0xBF ) == 'l' ) ) ) ? 3 : 0 )\ : ( 0xB4 == ((const U8*)s)[0] ) ? \ @@ -2305,7 +2340,7 @@ : ( ( 0xB1 == ((const U8*)s)[4] ) && ( 0x43 == ((const U8*)s)[5] ) ) ? 6 : 0 ) : 0 )\ : ( ( ( ( ( 0x4A == ((const U8*)s)[1] ) && ( 0xB1 == ((const U8*)s)[2] ) ) && ( 0x43 == ((const U8*)s)[3] ) ) && ( 0xB4 == ((const U8*)s)[4] ) ) && ( 0x68 == ((const U8*)s)[5] ) ) ? 6 : 0 )\ : 0 ) \ -: ( ( ( ((e)-(s) > 2) && ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ) && ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ) && ( ( ( ((const U8*)s)[2] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[2] & 0xBF ) == 'l' ) ) ) ? 3 : 0 ) +: ( ( ( ((e)-(s) > 2) && ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ) && ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ) && ( ( ( ((const U8*)s)[2] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[2] & 0xBF ) == 'l' ) ) ) ? 3 : 0 ) ) /* THREE_CHAR_FOLD: A three-character multi-char fold @@ -2314,7 +2349,7 @@ */ /*** GENERATED CODE ***/ #define is_THREE_CHAR_FOLD_latin1_safe(s,e) \ -( ( ( ( ( ((e) - (s)) >= 3 ) && ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ) && ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ) && ( ( ( ((const U8*)s)[2] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[2] & 0xBF ) == 'l' ) ) ) ? 3 : 0 ) +( (STRLEN)( ( ( ( ( ((e) - (s)) >= 3 ) && ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ) && ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ) && ( ( ( ((const U8*)s)[2] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[2] & 0xBF ) == 'l' ) ) ) ? 3 : 0 ) ) /* THREE_CHAR_FOLD_HEAD: The first two of three-character multi-char folds @@ -2323,7 +2358,7 @@ */ /*** GENERATED CODE ***/ #define is_THREE_CHAR_FOLD_HEAD_utf8_safe(s,e) \ -( ((e)-(s) > 3) ? \ +( (STRLEN)( ((e)-(s) > 3) ? \ ( ( ( ( ((const U8*)s)[0] & 0xAF ) == 'a' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 'h' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 's' ) || ( ( ((const U8*)s)[0] & 0xBF ) == 'w' ) || ( ( ((const U8*)s)[0] & 0xBF ) == 'y' ) ) ? 1\ : ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ? \ ( ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ? 2 : 1 ) \ @@ -2384,7 +2419,7 @@ : ( ( 0xB5 == ((const U8*)s)[0] ) && ( ( ( ((const U8*)s)[1] & 0xFB ) == 0x42 ) || ((const U8*)s)[1] == 0x4A || ((const U8*)s)[1] == 0x55 ) ) ? 2 : 0 )\ : ((e)-(s) > 0) ? \ ( ( ( ((const U8*)s)[0] & 0xAF ) == 'a' ) || ( ( ((const U8*)s)[0] & 0x9F ) == 'f' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 'h' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 's' ) || ( ( ((const U8*)s)[0] & 0xBF ) == 'y' ) )\ -: 0 ) +: 0 ) ) /* THREE_CHAR_FOLD_HEAD: The first two of three-character multi-char folds @@ -2393,14 +2428,14 @@ */ /*** GENERATED CODE ***/ #define is_THREE_CHAR_FOLD_HEAD_latin1_safe(s,e) \ -( ((e)-(s) > 1) ? \ +( (STRLEN)( ((e)-(s) > 1) ? \ ( ( ( ( ((const U8*)s)[0] & 0xAF ) == 'a' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 'h' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 's' ) || ( ( ((const U8*)s)[0] & 0xBF ) == 'w' ) || ( ( ((const U8*)s)[0] & 0xBF ) == 'y' ) ) ? 1\ : ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ? \ ( ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ? 2 : 1 ) \ : 0 ) \ : ((e)-(s) > 0) ? \ ( ( ( ((const U8*)s)[0] & 0xAF ) == 'a' ) || ( ( ((const U8*)s)[0] & 0x9F ) == 'f' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 'h' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 's' ) || ( ( ((const U8*)s)[0] & 0xBF ) == 'y' ) )\ -: 0 ) +: 0 ) ) /* FOLDS_TO_MULTI: characters that fold to multi-char strings @@ -2409,7 +2444,7 @@ */ /*** GENERATED CODE ***/ #define is_FOLDS_TO_MULTI_utf8(s) \ -( ( 0x8A == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0x8A == ((const U8*)s)[0] ) ? \ ( ( 0x73 == ((const U8*)s)[1] ) ? 2 : 0 ) \ : ( 0x8D == ((const U8*)s)[0] || 0x9C == ((const U8*)s)[0] || inRANGE_helper_(U8, ((const U8*)s)[0], 0xB3, 0xB4) ) ?\ ( ( 0x57 == ((const U8*)s)[1] ) ? 2 : 0 ) \ @@ -2429,7 +2464,7 @@ : ( 0x72 == ((const U8*)s)[1] ) ? \ ( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[2]) & 0xEA ) == 0xA2 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[2]) & 0xF7 ) == 0xA4 ) ) ? 3 : 0 )\ : ( ( 0x73 == ((const U8*)s)[1] ) && ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[2]) & 0xEA ) == 0xA2 ) || ((const U8*)s)[2] == 0x45 || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[2]) & 0xF7 ) == 0xB4 ) ) ) ? 3 : 0 )\ -: ( ( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x72 == ((const U8*)s)[1] ) ) && ( 0x67 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x47) || inRANGE_helper_(U8, ((const U8*)s)[3], 0x62, 0x66) ) ) ? 4 : 0 ) +: ( ( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x72 == ((const U8*)s)[1] ) ) && ( 0x67 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x47) || inRANGE_helper_(U8, ((const U8*)s)[3], 0x62, 0x66) ) ) ? 4 : 0 ) ) /* PROBLEMATIC_LOCALE_FOLD: characters whose fold is problematic under locale @@ -2438,7 +2473,7 @@ */ /*** GENERATED CODE ***/ #define is_PROBLEMATIC_LOCALE_FOLD_utf8(s) \ -( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0x80 ) == 0x00 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0xE0 ) == 0x80 ) ) ? 1\ +( (STRLEN)( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0x80 ) == 0x00 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0xE0 ) == 0x80 ) ) ? 1\ : ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[0]), 0xC5, 0xC7) ) ?\ 2 \ : ( 0x8D == ((const U8*)s)[0] ) ? \ @@ -2457,11 +2492,11 @@ ( ( ( 0x63 == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x65, 0x69) || 0x72 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( 0xCA == ((const U8*)s)[0] ) ? \ ( ( ( 0x4A == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x51, 0x52) ) ) ? 3 : 0 )\ -: ( ( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x72 == ((const U8*)s)[1] ) ) && ( 0x67 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x47) ) ) ? 4 : 0 ) +: ( ( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x72 == ((const U8*)s)[1] ) ) && ( 0x67 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x47) ) ) ? 4 : 0 ) ) /*** GENERATED CODE ***/ #define is_PROBLEMATIC_LOCALE_FOLD_cp(cp) \ -( cp <= 0xFF || ( 0xFF < cp && \ +( (STRLEN)( cp <= 0xFF || ( 0xFF < cp && \ ( inRANGE_helper_(UV, cp, 0x130, 0x131) || ( 0x131 < cp && \ ( 0x149 == cp || ( 0x149 < cp && \ ( 0x178 == cp || ( 0x178 < cp && \ @@ -2472,7 +2507,7 @@ ( 0x3BC == cp || ( 0x3BC < cp && \ ( inRANGE_helper_(UV, cp, 0x1E96, 0x1E9A) || ( 0x1E9A < cp && \ ( 0x1E9E == cp || ( 0x1E9E < cp && \ -( inRANGE_helper_(UV, cp, 0x212A, 0x212B) || inRANGE_helper_(UV, cp, 0xFB00, 0xFB06) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) +( inRANGE_helper_(UV, cp, 0x212A, 0x212B) || inRANGE_helper_(UV, cp, 0xFB00, 0xFB06) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) /* PROBLEMATIC_LOCALE_FOLDEDS_START: The first folded character of folds which are problematic under locale @@ -2481,7 +2516,7 @@ */ /*** GENERATED CODE ***/ #define is_PROBLEMATIC_LOCALE_FOLDEDS_START_utf8(s) \ -( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0x80 ) == 0x00 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0xE0 ) == 0x80 ) ) ? 1\ +( (STRLEN)( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0x80 ) == 0x00 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0xE0 ) == 0x80 ) ) ? 1\ : ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[0]), 0xC5, 0xC7) ) ?\ 2 \ : ( 0x8D == ((const U8*)s)[0] ) ? \ @@ -2498,11 +2533,11 @@ ( ( ( 0x63 == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x65, 0x69) || 0x72 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( 0xCA == ((const U8*)s)[0] ) ? \ ( ( ( 0x4A == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x51, 0x52) ) ) ? 3 : 0 )\ -: ( ( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x72 == ((const U8*)s)[1] ) ) && ( 0x67 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x47) ) ) ? 4 : 0 ) +: ( ( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x72 == ((const U8*)s)[1] ) ) && ( 0x67 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x47) ) ) ? 4 : 0 ) ) /*** GENERATED CODE ***/ #define is_PROBLEMATIC_LOCALE_FOLDEDS_START_cp(cp) \ -( cp <= 0xFF || ( 0xFF < cp && \ +( (STRLEN)( cp <= 0xFF || ( 0xFF < cp && \ ( inRANGE_helper_(UV, cp, 0x130, 0x131) || ( 0x131 < cp && \ ( 0x149 == cp || ( 0x149 < cp && \ ( 0x178 == cp || ( 0x178 < cp && \ @@ -2513,7 +2548,7 @@ ( 0x3BC == cp || ( 0x3BC < cp && \ ( inRANGE_helper_(UV, cp, 0x1E96, 0x1E9A) || ( 0x1E9A < cp && \ ( 0x1E9E == cp || ( 0x1E9E < cp && \ -( inRANGE_helper_(UV, cp, 0x212A, 0x212B) || inRANGE_helper_(UV, cp, 0xFB00, 0xFB06) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) +( inRANGE_helper_(UV, cp, 0x212A, 0x212B) || inRANGE_helper_(UV, cp, 0xFB00, 0xFB06) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) /* PATWS: pattern white space @@ -2522,12 +2557,12 @@ */ /*** GENERATED CODE ***/ #define is_PATWS_safe(s,e,is_utf8) \ -( ( LIKELY((e) > (s)) ) ? \ +( (STRLEN)( ( LIKELY((e) > (s)) ) ? \ ( ( '\t' == ((const U8*)s)[0] || inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\r') || '\n' == ((const U8*)s)[0] || 0x25 == ((const U8*)s)[0] || ' ' == ((const U8*)s)[0] ) ? 1\ : ( ( is_utf8 && LIKELY(((e) - (s)) >= UTF8SKIP(s)) ) && ( 0xCA == ((const U8*)s)[0] ) ) ? ( ( 0x41 == ((const U8*)s)[1] ) ?\ ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x55, 0x56) ) ? 3 : 0 )\ : ( ( 0x42 == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x49, 0x4A) ) ) ? 3 : 0 ) : 0 )\ -: 0 ) +: 0 ) ) /* HANGUL_ED: Hangul syllables whose first UTF-8 byte is \xED @@ -2536,7 +2571,50 @@ */ /*** GENERATED CODE ***/ #define is_HANGUL_ED_utf8_safe(s,e) \ -( 0 ) +( (STRLEN)( 0 ) ) + +/* + WORD_BUT_NONCONT: Word characters that perhaps surprisingly are forbidden in names + + \p{_Perl_Word_But_NonCont} +*/ +/*** GENERATED CODE ***/ +#define is_WORD_BUT_NONCONT_safe(s,e,is_utf8) \ +( (STRLEN)( ( ( LIKELY((e) > (s)) ) && ( LIKELY(((e) - (s)) >= UTF8SKIP(s)) ) ) ? ( ( 0xB2 == ((const U8*)s)[0] ) ?\ + ( ( 0x69 == ((const U8*)s)[1] ) ? 2 : 0 ) \ + : ( 0xB8 == ((const U8*)s)[0] ) ? \ + ( ( ( 0x45 == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x49, 0x4A) ) ) ? 3 : 0 )\ + : ( 0xBE == ((const U8*)s)[0] ) ? \ + ( ( ( 0x64 == ((const U8*)s)[1] ) && ( 0x72 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ + : ( 0xCA == ((const U8*)s)[0] ) ? \ + ( ( 0x47 == ((const U8*)s)[1] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x71, 0x73) ) ? 3 : 0 )\ + : ( ( 0x48 == ((const U8*)s)[1] ) && ( 0x41 == ((const U8*)s)[2] || inRANGE_helper_(U8, ((const U8*)s)[2], 0x43, 0x45) ) ) ? 3 : 0 )\ + : ( 0xCB == ((const U8*)s)[0] ) ? \ + ( ( 0x46 == ((const U8*)s)[1] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x65, 0x6A) || inRANGE_helper_(U8, ((const U8*)s)[2], 0x70, 0x73) ) ? 3 : 0 )\ + : ( 0x47 == ((const U8*)s)[1] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x41, 0x4A) || inRANGE_helper_(U8, ((const U8*)s)[2], 0x51, 0x59) || inRANGE_helper_(U8, ((const U8*)s)[2], 0x62, 0x6A) || inRANGE_helper_(U8, ((const U8*)s)[2], 0x70, 0x73) ) ? 3 : 0 )\ + : ( ( 0x48 == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x41, 0x4A) ) ) ? 3 : 0 )\ + : ( 0xCD == ((const U8*)s)[0] ) ? \ + ( ( ( 0x58 == ((const U8*)s)[1] ) && ( 0x56 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ + : ( 0xDD == ((const U8*)s)[0] ) ? \ + ( ( 0x4A == ((const U8*)s)[1] ) ? \ + ( ( ( 0x62 == ((const U8*)s)[2] ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x57, 0x59) ) ) ? 4 : 0 )\ + : ( 0x73 == ((const U8*)s)[1] ) ? \ + ( ( 0x43 == ((const U8*)s)[2] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x72, 0x73) ) ? 4 : 0 )\ + : ( 0x44 == ((const U8*)s)[2] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x44) ) ? 4 : 0 )\ + : ( 0x56 == ((const U8*)s)[2] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x69, 0x6A) ) ? 4 : 0 )\ + : ( ( 0x62 == ((const U8*)s)[2] ) && ( ((const U8*)s)[3] == 0x57 || ((const U8*)s)[3] == 0x59 || ((const U8*)s)[3] == 0x63 || ( ( ((const U8*)s)[3] & 0xFD ) == 0x65 ) || ((const U8*)s)[3] == 0x69 || ( ( ((const U8*)s)[3] & 0xFD ) == 0x70 ) ) ) ? 4 : 0 )\ + : 0 ) \ + : ( ( 0xDF == ((const U8*)s)[0] ) && ( 0x70 == ((const U8*)s)[1] ) ) ? ( ( 0x4A == ((const U8*)s)[2] ) ?\ + ( ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x57, 0x59) || inRANGE_helper_(U8, ((const U8*)s)[3], 0x62, 0x6A) || inRANGE_helper_(U8, ((const U8*)s)[3], 0x70, 0x73) ) ? 4 : 0 )\ + : ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x51, 0x52) ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x4A) || inRANGE_helper_(U8, ((const U8*)s)[3], 0x57, 0x59) || inRANGE_helper_(U8, ((const U8*)s)[3], 0x62, 0x6A) || inRANGE_helper_(U8, ((const U8*)s)[3], 0x70, 0x73) ) ? 4 : 0 )\ + : ( ( 0x53 == ((const U8*)s)[2] ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x4A) ) ) ? 4 : 0 ) : 0 ) : 0 ) ) #endif /* EBCDIC 1047 */ @@ -2552,7 +2630,7 @@ */ /*** GENERATED CODE ***/ #define is_LNBREAK_safe(s,e,is_utf8) \ -( ((e)-(s) > 2) ? \ +( (STRLEN)( ((e)-(s) > 2) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\f') || 0x15 == ((const U8*)s)[0] || '\n' == ((const U8*)s)[0] ) ? 1\ : ( '\r' == ((const U8*)s)[0] ) ? \ ( ( '\n' == ((const U8*)s)[1] ) ? 2 : 1 ) \ @@ -2564,11 +2642,11 @@ : 0 ) \ : ((e)-(s) > 0) ? \ ( inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\r') || 0x15 == ((const U8*)s)[0] || '\n' == ((const U8*)s)[0] )\ -: 0 ) +: 0 ) ) /*** GENERATED CODE ***/ #define is_LNBREAK_utf8_safe(s,e) \ -( ((e)-(s) > 2) ? \ +( (STRLEN)( ((e)-(s) > 2) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\f') || 0x15 == ((const U8*)s)[0] || '\n' == ((const U8*)s)[0] ) ? 1\ : ( '\r' == ((const U8*)s)[0] ) ? \ ( ( '\n' == ((const U8*)s)[1] ) ? 2 : 1 ) \ @@ -2580,18 +2658,18 @@ : 0 ) \ : ((e)-(s) > 0) ? \ ( inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\r') || 0x15 == ((const U8*)s)[0] || '\n' == ((const U8*)s)[0] )\ -: 0 ) +: 0 ) ) /*** GENERATED CODE ***/ #define is_LNBREAK_latin1_safe(s,e) \ -( ((e)-(s) > 1) ? \ +( (STRLEN)( ((e)-(s) > 1) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\f') || 0x15 == ((const U8*)s)[0] || '\n' == ((const U8*)s)[0] ) ? 1\ : ( '\r' == ((const U8*)s)[0] ) ? \ ( ( '\n' == ((const U8*)s)[1] ) ? 2 : 1 ) \ : 0 ) \ : ((e)-(s) > 0) ? \ ( inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\r') || 0x15 == ((const U8*)s)[0] || '\n' == ((const U8*)s)[0] )\ -: 0 ) +: 0 ) ) /* HORIZWS: Horizontal Whitespace: \h \H @@ -2600,7 +2678,7 @@ */ /*** GENERATED CODE ***/ #define is_HORIZWS_high(s) \ -( ( 0xBD == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xBD == ((const U8*)s)[0] ) ? \ ( ( ( 0x62 == ((const U8*)s)[1] ) && ( 0x41 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( 0xCA == ((const U8*)s)[0] ) ? \ ( ( 0x41 == ((const U8*)s)[1] ) ? \ @@ -2608,14 +2686,14 @@ : ( 0x42 == ((const U8*)s)[1] ) ? \ ( ( 0x56 == ((const U8*)s)[2] ) ? 3 : 0 ) \ : ( ( 0x43 == ((const U8*)s)[1] ) && ( 0x72 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ -: ( ( ( 0xCE == ((const U8*)s)[0] ) && ( 0x41 == ((const U8*)s)[1] ) ) && ( 0x41 == ((const U8*)s)[2] ) ) ? 3 : 0 ) +: ( ( ( 0xCE == ((const U8*)s)[0] ) && ( 0x41 == ((const U8*)s)[1] ) ) && ( 0x41 == ((const U8*)s)[2] ) ) ? 3 : 0 ) ) /*** GENERATED CODE ***/ #define is_HORIZWS_cp_high(cp) \ -( 0x1680 == cp || ( 0x1680 < cp && \ +( (STRLEN)( 0x1680 == cp || ( 0x1680 < cp && \ ( inRANGE_helper_(UV, cp, 0x2000, 0x200A) || ( 0x200A < cp && \ ( 0x202F == cp || ( 0x202F < cp && \ -( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) ) +( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) ) ) /* VERTWS: Vertical Whitespace: \v \V @@ -2624,11 +2702,11 @@ */ /*** GENERATED CODE ***/ #define is_VERTWS_high(s) \ -( ( ( ( 0xCA == ((const U8*)s)[0] ) && ( 0x42 == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x49, 0x4A) ) ) ? 3 : 0 ) +( (STRLEN)( ( ( ( 0xCA == ((const U8*)s)[0] ) && ( 0x42 == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x49, 0x4A) ) ) ? 3 : 0 ) ) /*** GENERATED CODE ***/ #define is_VERTWS_cp_high(cp) \ -( inRANGE_helper_(UV, cp, 0x2028, 0x2029) ) +( (STRLEN)( inRANGE_helper_(UV, cp, 0x2028, 0x2029) ) ) /* XDIGIT: Hexadecimal digits @@ -2637,14 +2715,14 @@ */ /*** GENERATED CODE ***/ #define is_XDIGIT_high(s) \ -( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x72 == ((const U8*)s)[1] ) ) ? ( ( 0x66 == ((const U8*)s)[2] ) ?\ +( (STRLEN)( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x72 == ((const U8*)s)[1] ) ) ? ( ( 0x66 == ((const U8*)s)[2] ) ?\ ( ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xB0, 0xB9) ) ? 4 : 0 )\ - : ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x67, 0x68) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x42, 0x47) ) ) ? 4 : 0 ) : 0 ) + : ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x67, 0x68) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x42, 0x47) ) ) ? 4 : 0 ) : 0 ) ) /*** GENERATED CODE ***/ #define is_XDIGIT_cp_high(cp) \ -( inRANGE_helper_(UV, cp, 0xFF10, 0xFF19) || ( 0xFF19 < cp && \ -( inRANGE_helper_(UV, cp, 0xFF21, 0xFF26) || inRANGE_helper_(UV, cp, 0xFF41, 0xFF46) ) ) ) +( (STRLEN)( inRANGE_helper_(UV, cp, 0xFF10, 0xFF19) || ( 0xFF19 < cp && \ +( inRANGE_helper_(UV, cp, 0xFF21, 0xFF26) || inRANGE_helper_(UV, cp, 0xFF41, 0xFF46) ) ) ) ) /* XPERLSPACE: \p{XPerlSpace} @@ -2653,7 +2731,7 @@ */ /*** GENERATED CODE ***/ #define is_XPERLSPACE_high(s) \ -( ( 0xBD == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xBD == ((const U8*)s)[0] ) ? \ ( ( ( 0x62 == ((const U8*)s)[1] ) && ( 0x41 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( 0xCA == ((const U8*)s)[0] ) ? \ ( ( 0x41 == ((const U8*)s)[1] ) ? \ @@ -2661,15 +2739,15 @@ : ( 0x42 == ((const U8*)s)[1] ) ? \ ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x49, 0x4A) || 0x56 == ((const U8*)s)[2] ) ? 3 : 0 )\ : ( ( 0x43 == ((const U8*)s)[1] ) && ( 0x72 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ -: ( ( ( 0xCE == ((const U8*)s)[0] ) && ( 0x41 == ((const U8*)s)[1] ) ) && ( 0x41 == ((const U8*)s)[2] ) ) ? 3 : 0 ) +: ( ( ( 0xCE == ((const U8*)s)[0] ) && ( 0x41 == ((const U8*)s)[1] ) ) && ( 0x41 == ((const U8*)s)[2] ) ) ? 3 : 0 ) ) /*** GENERATED CODE ***/ #define is_XPERLSPACE_cp_high(cp) \ -( 0x1680 == cp || ( 0x1680 < cp && \ +( (STRLEN)( 0x1680 == cp || ( 0x1680 < cp && \ ( inRANGE_helper_(UV, cp, 0x2000, 0x200A) || ( 0x200A < cp && \ ( inRANGE_helper_(UV, cp, 0x2028, 0x2029) || ( 0x2029 < cp && \ ( 0x202F == cp || ( 0x202F < cp && \ -( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) ) ) ) +( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) ) ) ) ) /* SPACE: Backwards \p{XPerlSpace} @@ -2678,7 +2756,7 @@ */ /*** GENERATED CODE ***/ #define is_SPACE_utf8_safe_backwards(s,e) \ -( ((s) - (e) > 2) ? \ +( (STRLEN)( ((s) - (e) > 2) ? \ ( ( '\t' == *((const U8*)s - 1) || inRANGE_helper_(U8, *((const U8*)s - 1), '\v', '\r') || 0x15 == *((const U8*)s - 1) || '\n' == *((const U8*)s - 1) || ' ' == *((const U8*)s - 1) ) ? 1\ : ( 0x41 == *((const U8*)s - 1) ) ? \ ( ( 0x41 == *((const U8*)s - 2) ) ? \ @@ -2698,7 +2776,7 @@ : ( ( 0x41 == *((const U8*)s - 1) ) && ( 0x78 == *((const U8*)s - 2) ) ) ? 2 : 0 )\ : ((s) - (e) > 0) ? \ ( '\t' == *((const U8*)s - 1) || inRANGE_helper_(U8, *((const U8*)s - 1), '\v', '\r') || 0x15 == *((const U8*)s - 1) || '\n' == *((const U8*)s - 1) || ' ' == *((const U8*)s - 1) )\ -: 0 ) +: 0 ) ) /* NONCHAR: Non character code points @@ -2707,7 +2785,7 @@ */ /*** GENERATED CODE ***/ #define is_NONCHAR_utf8_safe(s,e) \ -( ( ( LIKELY((e) > (s)) ) && ( LIKELY(((e) - (s)) >= UTF8SKIP(s)) ) ) ? ( ( 0xDD == ((const U8*)s)[0] ) ?\ +( (STRLEN)( ( ( LIKELY((e) > (s)) ) && ( LIKELY(((e) - (s)) >= UTF8SKIP(s)) ) ) ? ( ( 0xDD == ((const U8*)s)[0] ) ?\ ( ( 0x72 == ((const U8*)s)[1] ) ? \ ( ( 0x55 == ((const U8*)s)[2] ) ? \ ( ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xB0, 0xBF) ) ? 4 : 0 )\ @@ -2719,7 +2797,7 @@ ( ( ( ( 0x72 == ((const U8*)s)[1] ) && ( 0x72 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x71, 0x72) ) ) ? 4 : 0 )\ : ( 0xED == ((const U8*)s)[0] ) ? \ ( ( ( ( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[1]) & 0xF9 ) == 0xA9 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[1]) & 0xF1 ) == 0xB1 ) ) && ( 0x72 == ((const U8*)s)[2] ) ) && ( 0x72 == ((const U8*)s)[3] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[4], 0x71, 0x72) ) ) ? 5 : 0 )\ - : ( ( ( ( ( 0xEE == ((const U8*)s)[0] ) && ( 0x42 == ((const U8*)s)[1] ) ) && ( 0x72 == ((const U8*)s)[2] ) ) && ( 0x72 == ((const U8*)s)[3] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[4], 0x71, 0x72) ) ) ? 5 : 0 ) : 0 ) + : ( ( ( ( ( 0xEE == ((const U8*)s)[0] ) && ( 0x42 == ((const U8*)s)[1] ) ) && ( 0x72 == ((const U8*)s)[2] ) ) && ( 0x72 == ((const U8*)s)[3] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[4], 0x71, 0x72) ) ) ? 5 : 0 ) : 0 ) ) /* SHORTER_NON_CHARS: # 4 bytes @@ -2732,7 +2810,7 @@ */ /*** GENERATED CODE ***/ #define is_SHORTER_NON_CHARS_utf8(s) \ -( ( 0xDD == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xDD == ((const U8*)s)[0] ) ? \ ( ( 0x72 == ((const U8*)s)[1] ) ? \ ( ( 0x55 == ((const U8*)s)[2] ) ? \ ( ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xB0, 0xBF) ) ? 4 : 0 )\ @@ -2740,7 +2818,7 @@ ( ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xA0, 0xAF) ) ? 4 : 0 )\ : ( ( 0x72 == ((const U8*)s)[2] ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x71, 0x72) ) ) ? 4 : 0 )\ : 0 ) \ -: ( ( ( ( ((const U8*)s)[0] == 0xDF || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0xFD ) == 0xF5 ) ) && ( 0x72 == ((const U8*)s)[1] ) ) && ( 0x72 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x71, 0x72) ) ) ? 4 : 0 ) +: ( ( ( ( ((const U8*)s)[0] == 0xDF || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0xFD ) == 0xF5 ) ) && ( 0x72 == ((const U8*)s)[1] ) ) && ( 0x72 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x71, 0x72) ) ) ? 4 : 0 ) ) /* LARGER_NON_CHARS: # 5 bytes @@ -2761,9 +2839,9 @@ */ /*** GENERATED CODE ***/ #define is_LARGER_NON_CHARS_utf8(s) \ -( ( 0xED == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xED == ((const U8*)s)[0] ) ? \ ( ( ( ( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[1]) & 0xF9 ) == 0xA9 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[1]) & 0xF1 ) == 0xB1 ) ) && ( 0x72 == ((const U8*)s)[2] ) ) && ( 0x72 == ((const U8*)s)[3] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[4], 0x71, 0x72) ) ) ? 5 : 0 )\ -: ( ( ( ( ( 0xEE == ((const U8*)s)[0] ) && ( 0x42 == ((const U8*)s)[1] ) ) && ( 0x72 == ((const U8*)s)[2] ) ) && ( 0x72 == ((const U8*)s)[3] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[4], 0x71, 0x72) ) ) ? 5 : 0 ) +: ( ( ( ( ( 0xEE == ((const U8*)s)[0] ) && ( 0x42 == ((const U8*)s)[1] ) ) && ( 0x72 == ((const U8*)s)[2] ) ) && ( 0x72 == ((const U8*)s)[3] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[4], 0x71, 0x72) ) ) ? 5 : 0 ) ) /* SURROGATE: Surrogate code points @@ -2772,11 +2850,11 @@ */ /*** GENERATED CODE ***/ #define is_SURROGATE_utf8(s) \ -( ( ( 0xDD == ((const U8*)s)[0] ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0x64, 0x65) ) ) ? 4 : 0 ) +( (STRLEN)( ( ( 0xDD == ((const U8*)s)[0] ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0x64, 0x65) ) ) ? 4 : 0 ) ) /*** GENERATED CODE ***/ #define is_SURROGATE_utf8_safe(s,e) \ -( ( ( ( ( ( ((e) - (s)) >= 4 ) && ( 0xDD == ((const U8*)s)[0] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0x64, 0x65) ) ) && ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[2]), 0xA0, 0xBF) ) ) && ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xA0, 0xBF) ) ) ? 4 : 0 ) +( (STRLEN)( ( ( ( ( ( ((e) - (s)) >= 4 ) && ( 0xDD == ((const U8*)s)[0] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[1], 0x64, 0x65) ) ) && ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[2]), 0xA0, 0xBF) ) ) && ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xA0, 0xBF) ) ) ? 4 : 0 ) ) /* QUOTEMETA: Meta-characters that \Q should quote @@ -2785,7 +2863,7 @@ */ /*** GENERATED CODE ***/ #define is_QUOTEMETA_high(s) \ -( ( 0xAF == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0xAF == ((const U8*)s)[0] ) ? \ ( ( 0x56 == ((const U8*)s)[1] ) ? 2 : 0 ) \ : ( 0xB7 == ((const U8*)s)[0] ) ? \ ( ( ( 0x57 == ((const U8*)s)[1] ) && ( 0x6A == ((const U8*)s)[2] ) ) ? 3 : 0 )\ @@ -2845,7 +2923,7 @@ ( ( 0x56 == ((const U8*)s)[1] ) ? \ ( ( ( 0x46 == ((const U8*)s)[2] ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x44) ) ) ? 4 : 0 )\ : ( ( ( 0x62 == ((const U8*)s)[1] ) && ( 0x52 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xB3, 0xBA) ) ) ? 4 : 0 )\ -: ( ( ( 0xED == ((const U8*)s)[0] ) && ( 0x6A == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x41, 0x44) ) ) ? 5 : 0 ) +: ( ( ( 0xED == ((const U8*)s)[0] ) && ( 0x6A == ((const U8*)s)[1] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x41, 0x44) ) ) ? 5 : 0 ) ) /* MULTI_CHAR_FOLD: multi-char strings that are folded to by a single character @@ -3074,7 +3152,7 @@ /*** GENERATED CODE ***/ #define is_MULTI_CHAR_FOLD_utf8_safe(s,e) \ -( ((e)-(s) > 5) ? \ +( (STRLEN)( ((e)-(s) > 5) ? \ ( ( ( ((const U8*)s)[0] & 0xBF ) == 'a' ) ? \ ( ( ( 0xAA == ((const U8*)s)[1] ) && ( 0x71 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ? \ @@ -3084,7 +3162,7 @@ : ( ( ((const U8*)s)[0] & 0xBF ) == 'h' ) ? \ ( ( ( 0xAE == ((const U8*)s)[1] ) && ( 0x58 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( ( ((const U8*)s)[0] & 0xBF ) == 'i' ) ? is_MULTI_CHAR_FOLD_utf8_safe_part0_(s,e) : is_MULTI_CHAR_FOLD_utf8_safe_part1_(s,e) )\ -: ((e)-(s) > 4) ? is_MULTI_CHAR_FOLD_utf8_safe_part2_(s,e) : is_MULTI_CHAR_FOLD_utf8_safe_part3_(s,e) ) +: ((e)-(s) > 4) ? is_MULTI_CHAR_FOLD_utf8_safe_part2_(s,e) : is_MULTI_CHAR_FOLD_utf8_safe_part3_(s,e) ) ) /*** GENERATED CODE ***/ #define what_MULTI_CHAR_FOLD_utf8_safe_part0_(s,e) \ @@ -3504,7 +3582,7 @@ */ /*** GENERATED CODE ***/ #define is_MULTI_CHAR_FOLD_latin1_safe(s,e) \ -( ((e)-(s) > 2) ? \ +( (STRLEN)( ((e)-(s) > 2) ? \ ( ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ? \ ( ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ? \ ( ( ( ( ((const U8*)s)[2] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[2] & 0xBF ) == 'l' ) ) ? 3 : 2 )\ @@ -3514,7 +3592,7 @@ ( ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ? \ ( ( ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) || ( ( ((const U8*)s)[1] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[1] & 0xBF ) == 'l' ) ) ? 2 : 0 )\ : ( ( ( ((const U8*)s)[0] & 0xBF ) == 's' ) && ( ( ((const U8*)s)[1] & 0xBE ) == 's' ) ) ? 2 : 0 )\ -: 0 ) +: 0 ) ) /*** GENERATED CODE ***/ #define what_MULTI_CHAR_FOLD_latin1_safe(s,e) \ @@ -3547,7 +3625,7 @@ */ /*** GENERATED CODE ***/ #define is_THREE_CHAR_FOLD_utf8_safe(s,e) \ -( ((e)-(s) > 5) ? \ +( (STRLEN)( ((e)-(s) > 5) ? \ ( ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ? \ ( ( ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) && ( ( ( ((const U8*)s)[2] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[2] & 0xBF ) == 'l' ) ) ) ? 3 : 0 )\ : ( 0xB3 == ((const U8*)s)[0] ) ? \ @@ -3563,7 +3641,7 @@ : ( ( 0xAF == ((const U8*)s)[4] ) && ( 0x43 == ((const U8*)s)[5] ) ) ? 6 : 0 ) : 0 )\ : ( ( ( ( ( 0x4A == ((const U8*)s)[1] ) && ( 0xAF == ((const U8*)s)[2] ) ) && ( 0x43 == ((const U8*)s)[3] ) ) && ( 0xB3 == ((const U8*)s)[4] ) ) && ( 0x67 == ((const U8*)s)[5] ) ) ? 6 : 0 )\ : 0 ) \ -: ( ( ( ((e)-(s) > 2) && ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ) && ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ) && ( ( ( ((const U8*)s)[2] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[2] & 0xBF ) == 'l' ) ) ) ? 3 : 0 ) +: ( ( ( ((e)-(s) > 2) && ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ) && ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ) && ( ( ( ((const U8*)s)[2] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[2] & 0xBF ) == 'l' ) ) ) ? 3 : 0 ) ) /* THREE_CHAR_FOLD: A three-character multi-char fold @@ -3572,7 +3650,7 @@ */ /*** GENERATED CODE ***/ #define is_THREE_CHAR_FOLD_latin1_safe(s,e) \ -( ( ( ( ( ((e) - (s)) >= 3 ) && ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ) && ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ) && ( ( ( ((const U8*)s)[2] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[2] & 0xBF ) == 'l' ) ) ) ? 3 : 0 ) +( (STRLEN)( ( ( ( ( ((e) - (s)) >= 3 ) && ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ) && ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ) && ( ( ( ((const U8*)s)[2] & 0xBF ) == 'i' ) || ( ( ((const U8*)s)[2] & 0xBF ) == 'l' ) ) ) ? 3 : 0 ) ) /* THREE_CHAR_FOLD_HEAD: The first two of three-character multi-char folds @@ -3581,7 +3659,7 @@ */ /*** GENERATED CODE ***/ #define is_THREE_CHAR_FOLD_HEAD_utf8_safe(s,e) \ -( ((e)-(s) > 3) ? \ +( (STRLEN)( ((e)-(s) > 3) ? \ ( ( ( ( ((const U8*)s)[0] & 0xAF ) == 'a' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 'h' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 's' ) || ( ( ((const U8*)s)[0] & 0xBF ) == 'w' ) || ( ( ((const U8*)s)[0] & 0xBF ) == 'y' ) ) ? 1\ : ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ? \ ( ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ? 2 : 1 ) \ @@ -3642,7 +3720,7 @@ : ( ( 0xB4 == ((const U8*)s)[0] ) && ( ( ( ((const U8*)s)[1] & 0xFB ) == 0x42 ) || ((const U8*)s)[1] == 0x4A || ((const U8*)s)[1] == 0x55 ) ) ? 2 : 0 )\ : ((e)-(s) > 0) ? \ ( ( ( ((const U8*)s)[0] & 0xAF ) == 'a' ) || ( ( ((const U8*)s)[0] & 0x9F ) == 'f' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 'h' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 's' ) || ( ( ((const U8*)s)[0] & 0xBF ) == 'y' ) )\ -: 0 ) +: 0 ) ) /* THREE_CHAR_FOLD_HEAD: The first two of three-character multi-char folds @@ -3651,14 +3729,14 @@ */ /*** GENERATED CODE ***/ #define is_THREE_CHAR_FOLD_HEAD_latin1_safe(s,e) \ -( ((e)-(s) > 1) ? \ +( (STRLEN)( ((e)-(s) > 1) ? \ ( ( ( ( ((const U8*)s)[0] & 0xAF ) == 'a' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 'h' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 's' ) || ( ( ((const U8*)s)[0] & 0xBF ) == 'w' ) || ( ( ((const U8*)s)[0] & 0xBF ) == 'y' ) ) ? 1\ : ( ( ((const U8*)s)[0] & 0xBF ) == 'f' ) ? \ ( ( ( ((const U8*)s)[1] & 0xBF ) == 'f' ) ? 2 : 1 ) \ : 0 ) \ : ((e)-(s) > 0) ? \ ( ( ( ((const U8*)s)[0] & 0xAF ) == 'a' ) || ( ( ((const U8*)s)[0] & 0x9F ) == 'f' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 'h' ) || ( ( ((const U8*)s)[0] & 0xBE ) == 's' ) || ( ( ((const U8*)s)[0] & 0xBF ) == 'y' ) )\ -: 0 ) +: 0 ) ) /* FOLDS_TO_MULTI: characters that fold to multi-char strings @@ -3667,7 +3745,7 @@ */ /*** GENERATED CODE ***/ #define is_FOLDS_TO_MULTI_utf8(s) \ -( ( 0x80 == ((const U8*)s)[0] ) ? \ +( (STRLEN)( ( 0x80 == ((const U8*)s)[0] ) ? \ ( ( 0x72 == ((const U8*)s)[1] ) ? 2 : 0 ) \ : ( 0x8C == ((const U8*)s)[0] || 0x9B == ((const U8*)s)[0] || inRANGE_helper_(U8, ((const U8*)s)[0], 0xB2, 0xB3) ) ?\ ( ( 0x57 == ((const U8*)s)[1] ) ? 2 : 0 ) \ @@ -3687,7 +3765,7 @@ : ( 0x71 == ((const U8*)s)[1] ) ? \ ( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[2]) & 0xEA ) == 0xA2 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[2]) & 0xF7 ) == 0xA4 ) ) ? 3 : 0 )\ : ( ( 0x72 == ((const U8*)s)[1] ) && ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[2]) & 0xEA ) == 0xA2 ) || ((const U8*)s)[2] == 0x45 || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[2]) & 0xF7 ) == 0xB4 ) ) ) ? 3 : 0 )\ -: ( ( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x71 == ((const U8*)s)[1] ) ) && ( 0x66 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xA0, 0xA6) || inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xB3, 0xB7) ) ) ? 4 : 0 ) +: ( ( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x71 == ((const U8*)s)[1] ) ) && ( 0x66 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xA0, 0xA6) || inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[3]), 0xB3, 0xB7) ) ) ? 4 : 0 ) ) /* PROBLEMATIC_LOCALE_FOLD: characters whose fold is problematic under locale @@ -3696,7 +3774,7 @@ */ /*** GENERATED CODE ***/ #define is_PROBLEMATIC_LOCALE_FOLD_utf8(s) \ -( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0x80 ) == 0x00 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0xE0 ) == 0x80 ) ) ? 1\ +( (STRLEN)( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0x80 ) == 0x00 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0xE0 ) == 0x80 ) ) ? 1\ : ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[0]), 0xC5, 0xC7) ) ?\ 2 \ : ( 0x8C == ((const U8*)s)[0] ) ? \ @@ -3715,11 +3793,11 @@ ( ( ( 0x62 == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x64, 0x68) || 0x71 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( 0xCA == ((const U8*)s)[0] ) ? \ ( ( ( 0x4A == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x51, 0x52) ) ) ? 3 : 0 )\ -: ( ( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x71 == ((const U8*)s)[1] ) ) && ( 0x66 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x47) ) ) ? 4 : 0 ) +: ( ( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x71 == ((const U8*)s)[1] ) ) && ( 0x66 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x47) ) ) ? 4 : 0 ) ) /*** GENERATED CODE ***/ #define is_PROBLEMATIC_LOCALE_FOLD_cp(cp) \ -( cp <= 0xFF || ( 0xFF < cp && \ +( (STRLEN)( cp <= 0xFF || ( 0xFF < cp && \ ( inRANGE_helper_(UV, cp, 0x130, 0x131) || ( 0x131 < cp && \ ( 0x149 == cp || ( 0x149 < cp && \ ( 0x178 == cp || ( 0x178 < cp && \ @@ -3730,7 +3808,7 @@ ( 0x3BC == cp || ( 0x3BC < cp && \ ( inRANGE_helper_(UV, cp, 0x1E96, 0x1E9A) || ( 0x1E9A < cp && \ ( 0x1E9E == cp || ( 0x1E9E < cp && \ -( inRANGE_helper_(UV, cp, 0x212A, 0x212B) || inRANGE_helper_(UV, cp, 0xFB00, 0xFB06) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) +( inRANGE_helper_(UV, cp, 0x212A, 0x212B) || inRANGE_helper_(UV, cp, 0xFB00, 0xFB06) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) /* PROBLEMATIC_LOCALE_FOLDEDS_START: The first folded character of folds which are problematic under locale @@ -3739,7 +3817,7 @@ */ /*** GENERATED CODE ***/ #define is_PROBLEMATIC_LOCALE_FOLDEDS_START_utf8(s) \ -( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0x80 ) == 0x00 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0xE0 ) == 0x80 ) ) ? 1\ +( (STRLEN)( ( ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0x80 ) == 0x00 ) || ( ( NATIVE_UTF8_TO_I8(((const U8*)s)[0]) & 0xE0 ) == 0x80 ) ) ? 1\ : ( inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(((const U8*)s)[0]), 0xC5, 0xC7) ) ?\ 2 \ : ( 0x8C == ((const U8*)s)[0] ) ? \ @@ -3756,11 +3834,11 @@ ( ( ( 0x62 == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x64, 0x68) || 0x71 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ : ( 0xCA == ((const U8*)s)[0] ) ? \ ( ( ( 0x4A == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x51, 0x52) ) ) ? 3 : 0 )\ -: ( ( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x71 == ((const U8*)s)[1] ) ) && ( 0x66 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x47) ) ) ? 4 : 0 ) +: ( ( ( ( 0xDD == ((const U8*)s)[0] ) && ( 0x71 == ((const U8*)s)[1] ) ) && ( 0x66 == ((const U8*)s)[2] ) ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x47) ) ) ? 4 : 0 ) ) /*** GENERATED CODE ***/ #define is_PROBLEMATIC_LOCALE_FOLDEDS_START_cp(cp) \ -( cp <= 0xFF || ( 0xFF < cp && \ +( (STRLEN)( cp <= 0xFF || ( 0xFF < cp && \ ( inRANGE_helper_(UV, cp, 0x130, 0x131) || ( 0x131 < cp && \ ( 0x149 == cp || ( 0x149 < cp && \ ( 0x178 == cp || ( 0x178 < cp && \ @@ -3771,7 +3849,7 @@ ( 0x3BC == cp || ( 0x3BC < cp && \ ( inRANGE_helper_(UV, cp, 0x1E96, 0x1E9A) || ( 0x1E9A < cp && \ ( 0x1E9E == cp || ( 0x1E9E < cp && \ -( inRANGE_helper_(UV, cp, 0x212A, 0x212B) || inRANGE_helper_(UV, cp, 0xFB00, 0xFB06) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) +( inRANGE_helper_(UV, cp, 0x212A, 0x212B) || inRANGE_helper_(UV, cp, 0xFB00, 0xFB06) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) /* PATWS: pattern white space @@ -3780,12 +3858,12 @@ */ /*** GENERATED CODE ***/ #define is_PATWS_safe(s,e,is_utf8) \ -( ( LIKELY((e) > (s)) ) ? \ +( (STRLEN)( ( LIKELY((e) > (s)) ) ? \ ( ( '\t' == ((const U8*)s)[0] || inRANGE_helper_(U8, ((const U8*)s)[0], '\v', '\r') || 0x15 == ((const U8*)s)[0] || '\n' == ((const U8*)s)[0] || ' ' == ((const U8*)s)[0] ) ? 1\ : ( ( is_utf8 && LIKELY(((e) - (s)) >= UTF8SKIP(s)) ) && ( 0xCA == ((const U8*)s)[0] ) ) ? ( ( 0x41 == ((const U8*)s)[1] ) ?\ ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x55, 0x56) ) ? 3 : 0 )\ : ( ( 0x42 == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x49, 0x4A) ) ) ? 3 : 0 ) : 0 )\ -: 0 ) +: 0 ) ) /* HANGUL_ED: Hangul syllables whose first UTF-8 byte is \xED @@ -3794,66 +3872,109 @@ */ /*** GENERATED CODE ***/ #define is_HANGUL_ED_utf8_safe(s,e) \ -( 0 ) +( (STRLEN)( 0 ) ) + +/* + WORD_BUT_NONCONT: Word characters that perhaps surprisingly are forbidden in names + + \p{_Perl_Word_But_NonCont} +*/ +/*** GENERATED CODE ***/ +#define is_WORD_BUT_NONCONT_safe(s,e,is_utf8) \ +( (STRLEN)( ( ( LIKELY((e) > (s)) ) && ( LIKELY(((e) - (s)) >= UTF8SKIP(s)) ) ) ? ( ( 0xB1 == ((const U8*)s)[0] ) ?\ + ( ( 0x68 == ((const U8*)s)[1] ) ? 2 : 0 ) \ + : ( 0xB7 == ((const U8*)s)[0] ) ? \ + ( ( ( 0x45 == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x49, 0x4A) ) ) ? 3 : 0 )\ + : ( 0xBE == ((const U8*)s)[0] ) ? \ + ( ( ( 0x63 == ((const U8*)s)[1] ) && ( 0x71 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ + : ( 0xCA == ((const U8*)s)[0] ) ? \ + ( ( 0x47 == ((const U8*)s)[1] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x70, 0x72) ) ? 3 : 0 )\ + : ( ( 0x48 == ((const U8*)s)[1] ) && ( 0x41 == ((const U8*)s)[2] || inRANGE_helper_(U8, ((const U8*)s)[2], 0x43, 0x45) ) ) ? 3 : 0 )\ + : ( 0xCB == ((const U8*)s)[0] ) ? \ + ( ( 0x46 == ((const U8*)s)[1] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x64, 0x6A) || inRANGE_helper_(U8, ((const U8*)s)[2], 0x70, 0x72) ) ? 3 : 0 )\ + : ( 0x47 == ((const U8*)s)[1] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x41, 0x4A) || inRANGE_helper_(U8, ((const U8*)s)[2], 0x51, 0x59) || 0x5F == ((const U8*)s)[2] || inRANGE_helper_(U8, ((const U8*)s)[2], 0x62, 0x6A) || inRANGE_helper_(U8, ((const U8*)s)[2], 0x70, 0x72) ) ? 3 : 0 )\ + : ( ( 0x48 == ((const U8*)s)[1] ) && ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x41, 0x4A) ) ) ? 3 : 0 )\ + : ( 0xCD == ((const U8*)s)[0] ) ? \ + ( ( ( 0x58 == ((const U8*)s)[1] ) && ( 0x56 == ((const U8*)s)[2] ) ) ? 3 : 0 )\ + : ( 0xDD == ((const U8*)s)[0] ) ? \ + ( ( 0x4A == ((const U8*)s)[1] ) ? \ + ( ( ( 0x5F == ((const U8*)s)[2] ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x57, 0x59) ) ) ? 4 : 0 )\ + : ( 0x72 == ((const U8*)s)[1] ) ? \ + ( ( 0x43 == ((const U8*)s)[2] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x71, 0x72) ) ? 4 : 0 )\ + : ( 0x44 == ((const U8*)s)[2] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x44) ) ? 4 : 0 )\ + : ( 0x56 == ((const U8*)s)[2] ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x68, 0x69) ) ? 4 : 0 )\ + : ( ( 0x5F == ((const U8*)s)[2] ) && ( ((const U8*)s)[3] == 0x57 || ((const U8*)s)[3] == 0x59 || ((const U8*)s)[3] == 0x62 || ( ( ((const U8*)s)[3] & 0xFD ) == 0x64 ) || ( ( ((const U8*)s)[3] & 0xFD ) == 0x68 ) || ((const U8*)s)[3] == 0x71 ) ) ? 4 : 0 )\ + : 0 ) \ + : ( ( 0xDF == ((const U8*)s)[0] ) && ( 0x6A == ((const U8*)s)[1] ) ) ? ( ( 0x4A == ((const U8*)s)[2] ) ?\ + ( ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x57, 0x59) || 0x5F == ((const U8*)s)[3] || inRANGE_helper_(U8, ((const U8*)s)[3], 0x62, 0x6A) || inRANGE_helper_(U8, ((const U8*)s)[3], 0x70, 0x72) ) ? 4 : 0 )\ + : ( inRANGE_helper_(U8, ((const U8*)s)[2], 0x51, 0x52) ) ? \ + ( ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x4A) || inRANGE_helper_(U8, ((const U8*)s)[3], 0x57, 0x59) || 0x5F == ((const U8*)s)[3] || inRANGE_helper_(U8, ((const U8*)s)[3], 0x62, 0x6A) || inRANGE_helper_(U8, ((const U8*)s)[3], 0x70, 0x72) ) ? 4 : 0 )\ + : ( ( 0x53 == ((const U8*)s)[2] ) && ( inRANGE_helper_(U8, ((const U8*)s)[3], 0x41, 0x4A) ) ) ? 4 : 0 ) : 0 ) : 0 ) ) #endif /* EBCDIC 037 */ #endif /* PERL_REGCHARCLASS_H_ */ /* Generated from: - * b7f46fc1010fd83f5a678b268a23fef0142a18d0ab2a142edd0bb03328e667c3 lib/Unicode/UCD.pm - * 764f420cedfc8b43d9fec251c957a5d55fc45d40f6573f162990ed1dce7e36e0 lib/unicore/ArabicShaping.txt - * b8f32554c6f658821fb0ee742d21c5b1f2086b9bf13071fed04894b022f93d67 lib/unicore/BidiBrackets.txt - * d7afdadd1bbd66f5a663ac0e8f7958f18fd9491fc0bc59ec5877cb82db71db7d lib/unicore/BidiMirroring.txt - * f3907b395d410f1b97342292ca6bc83dd12eb4b205f2a0c48efdef99e517d7b0 lib/unicore/Blocks.txt - * 6f1f9c588eb4a5c718d9e8f93b782685e5c7fec872cf05e8e6878053599e09bb lib/unicore/CaseFolding.txt - * 89e83cf9cc8bef6c1f8bf77e42cf6f0341dfa42e66261f4dbe9b492e7a23c8ee lib/unicore/CompositionExclusions.txt - * 60caa81b99a4dfb0bc5d38440d323073e3f356f46f9ca7869da848cd0715408b lib/unicore/DAge.txt - * 39d35161f2954497f69e08bdb9e701493f476a3d30222de20028feda36c1dabd lib/unicore/DCoreProperties.txt - * 4d4c03892dea9146d674b686e495df2d55a28d071ac474041d73518f887abddc lib/unicore/DNormalizationProps.txt - * 43adc76c0686a42cb370764eb8cfe2b2a45b10b855e5572a2db4a0eecce15d5b lib/unicore/EastAsianWidth.txt - * 628929adae97427348337003e39d29da7b55acdddfac21e06d3dacad92237834 lib/unicore/EquivalentUnifiedIdeograph.txt - * 329612f2aea8672379d93202ca6fcd948b4f08062d4fc43ee31c7061c66ed279 lib/unicore/HangulSyllableType.txt - * c6108ca140e054b55a5b0378e7ebed8b1ef0e846251f6195361bc9af8ffc61b1 lib/unicore/IdStatus.txt - * c7e57f71176fb3035e0c85e4d9f30b08374588b2bd16e729efbc7e49c7c9438f lib/unicore/IdType.txt - * cbb9e2193e26c9b3d595a8f0ff4fd2ad956482309143ceb4ce5469c19f14feba lib/unicore/IndicPositionalCategory.txt - * 615f1b92ba7ec76e18c5b5c05d2e1836e4b98bc791eb9e27946c7621fc047ae7 lib/unicore/IndicSyllabicCategory.txt - * e0f42a73ec3bf9fa4bc404ea0a2921675c73742905dacbe439675fe8c9b2359f lib/unicore/Jamo.txt - * e97e4259d0d20fab150b9c7b4b28abfae5cd78ca97e7f4ac6ed20d685d5f4a7c lib/unicore/LineBreak.txt - * 9953f0fcebf5ea8091c5c581e4df0e43f20d2533c84ccca7987a9bb819a896a8 lib/unicore/NameAliases.txt - * 4ff660cb922480cd5aab9a689b1a6905d0a54575baf9967d0f1e00ac866f04dd lib/unicore/NamedSequences.txt - * d811971453e7075e1ad56fb1b301eece5aa80757b81f6156e74a1bfb3ae5ceb1 lib/unicore/NormTest.txt - * 53d614508e2a0b2305a8aa21cd60d993de9326cdf65993660dfcce4503548583 lib/unicore/PropList.txt - * 440fd3e5460b9bfe31da67b6f923992e1989d31fe2ed91e091c4b8f8e2620bf9 lib/unicore/PropValueAliases.txt - * 33a9f2266ad6b8e8de05c0ea3dfac411ac62cf8839ff1c94057471e4c5f6a2b3 lib/unicore/PropertyAliases.txt - * 049117ce26b9769fe2749b06eef51a50a89faef4a97764dd2d81daa715980700 lib/unicore/ScriptExtensions.txt - * 9e88f0a677df47311106340be8ede2ecdacd9c1c931831218d2be6d5508e0039 lib/unicore/Scripts.txt - * 8d5de354eef79f2395a54c9c7dcebbaf3d30fc962d0f85611ea97aa973a0c451 lib/unicore/SpecialCasing.txt - * ff58e5823bd095166564a006e47d111130813dcf8bf234ef79fa51a870edb48f lib/unicore/UnicodeData.txt - * b71d2d4b57b4f751a40658e9ddb1ddc8aa0a9220bf37890d9a825e30e0612ddc lib/unicore/Unikemet.txt - * 24ac1474554eb55c85ace5c16d551535a8c52cdc2f4c13cf68c3839214339bbe lib/unicore/VerticalOrientation.txt - * ee2b9354d270ac061b29f09662cafea06341d77e704b8cc6bd72aaeeda363cb5 lib/unicore/auxiliary/GCBTest.txt - * c29360bd6f7132811d701d29069541e827eb44bfc4c8fbde8c370d6982689dc1 lib/unicore/auxiliary/GraphemeBreakProperty.txt - * 910759a611a479f37df4f535d2e64d7589be3c5ac5f7491cf1fb4fa4cdb211e9 lib/unicore/auxiliary/LBTest.txt - * 0aef84034ee1789eb71021454fac384e83080b05922272d63cf297f4bf08150e lib/unicore/auxiliary/SBTest.txt - * 20aab5eca3842c7a27cc6756d74488a4a5f744c8dca2948ec1128f26a60d1f79 lib/unicore/auxiliary/SentenceBreakProperty.txt - * ad985d5721f3fa6b45495663dfe44180f2f68976100dee0ea7451ef1a8f838e8 lib/unicore/auxiliary/WBTest.txt - * 476464e71a4b7b779b8ba7c5671f4338fea77da8e6b6b05fb82b3fdd14603779 lib/unicore/auxiliary/WordBreakProperty.txt - * f1365a5173eee18e1f98b240cdc492e84a25f1ce7e0c9d1094eb29c41a22696a lib/unicore/emoji/emoji.txt - * 71ed943a49c58568d8d92e80ecc2ba2f06e62aee9c8ebb0e6e8bd2c3ed8b180e lib/unicore/extracted/DBidiClass.txt - * 1ed4d4791c0e34fcad4dfcb5dd4c4122e16428241b75452f05d780ffa661f89d lib/unicore/extracted/DBinaryProperties.txt - * 52064d588c98c623b2373905e6a449eb520f900113954bcd212e94ef0810b471 lib/unicore/extracted/DCombiningClass.txt - * 29f8bff31296bab424e8d728e2a3c0a3240c5a67dadf47fa7092ec0585ad91b6 lib/unicore/extracted/DDecompositionType.txt - * 372e34de237e5a644ce8379a0d02b91a1f584f04d4fb240ea6ccc87c5767f926 lib/unicore/extracted/DEastAsianWidth.txt - * 7676ab755a41ef82108460238569e60ad65c191ddafe61b36c6765ec1353f293 lib/unicore/extracted/DGeneralCategory.txt - * ab2c98db3f945f14f7fe8ab1c80e5c77734cecfd1f34a443ffa283c51fd4c9d7 lib/unicore/extracted/DJoinGroup.txt - * 6bd08b97da66b70ccfdab105a352de2984e02625239ec5695422c99b33d854f0 lib/unicore/extracted/DJoinType.txt - * 4be1c18e7b121d951018065b453bb05083f624c8f905ce8be7c0f354c9097c95 lib/unicore/extracted/DLineBreak.txt - * 786833e0a3f5ec0c0cd0940e4c15f730f3a92163f354ecd7dede28a70c0fa892 lib/unicore/extracted/DNumType.txt - * 00b43cc5c9b86a834f82389c4537f103e652821387daa556f0bd220f6c23007e lib/unicore/extracted/DNumValues.txt - * 308c29a8d4df1761b0ea5a6a93fbe8649a80b7863d2848be6dc2d65238348e13 lib/unicore/mktables - * 63f771c327e92574fbd77919586079c38f669058a5e6b67ccec385ef8fcde882 lib/unicore/version + * 198105a1b3637a4bc7240628bae2f65f6d0c31df2cee4f0242c2561421ea2e75 lib/Unicode/UCD.pm + * 39afa01e680e27d0fd10b67a9b27be13fbaa3d0efecfb5be45991de9a0d267d0 lib/unicore/ArabicShaping.txt + * dadbaf38a0d0246e5b805bf8725cb81b7c621f93d030595635f5ba2c2f179428 lib/unicore/BidiBrackets.txt + * a2f16fb873ab4fcdf3221cb1a8a85a134ddd6ed03603181823ff5206af3741ce lib/unicore/BidiMirroring.txt + * c0edefaf1a19771e830a82735472716af6bf3c3975f6c2a23ffbe2580fbbcb15 lib/unicore/Blocks.txt + * ff8d8fefbf123574205085d6714c36149eb946d717a0c585c27f0f4ef58c4183 lib/unicore/CaseFolding.txt + * 5e6e9c8f8e76561da04cb1703a9306c63707be2ed8ff2eb12cd3a942368a6f72 lib/unicore/CompositionExclusions.txt + * f8ecdf768bdc210f201abd271d9bc587825618a86a7046a8146cc816393f1998 lib/unicore/DAge.txt + * 24c7fed1195c482faaefd5c1e7eb821c5ee1fb6de07ecdbaa64b56a99da22c08 lib/unicore/DCoreProperties.txt + * 71fd6a206a2c0cdd41feb6b7f656aa31091db45e9cedc926985d718397f9e488 lib/unicore/DNormalizationProps.txt + * ea7ce50f3444a050333448dffef1cadd9325af55cbb764b4a2280faf52170a33 lib/unicore/EastAsianWidth.txt + * 38619c05a17e771554000fe604afee92e10eb49e0616ecf0c87af3c1eb0f4320 lib/unicore/EquivalentUnifiedIdeograph.txt + * 5a57450afde0d082bc5026f7458649eac3b615490cc7e3d916b0367f1593c0e3 lib/unicore/HangulSyllableType.txt + * 617228a16da13850bf8af28b6cd08f5e9b6595d2eb60404fe6eee2c85b4e4a35 lib/unicore/IdStatus.txt + * 924ac63faa97ed73420d6ac48d08279d90968c7da0502ab701e08bfbb9683c22 lib/unicore/IdType.txt + * 68cedc29a7e57f984d90fe2c7712f2e6d0c717e253db219607daea8997d6c480 lib/unicore/IndicPositionalCategory.txt + * 3fc122f4cf58b0c19268d5f810263b04ab4e1e67743386ec0e0ada9c76aec5be lib/unicore/IndicSyllabicCategory.txt + * 17bb07f5e37f995351ddcef393c04464a9e3891ed0c0bd56a03a5c5e400a6326 lib/unicore/Jamo.txt + * e6a18fa91f8f6a6f8e534b1d3f128c21ada45bfe152eb6b1bcc5e15fd8ac92e6 lib/unicore/LineBreak.txt + * 793f6f1e4d15fd90f05ae66460191dc4d75d1fea90136a25f30dd6a4cb950eac lib/unicore/NameAliases.txt + * 360dac27d5abafdcd8c03a8597f47acf92e8ebf7f6ee28020c173ed8b2ed0cc5 lib/unicore/NamedSequences.txt + * 5019ffd530751a741900c849c0e010332f142a3612234639bd200b82138a87db lib/unicore/NormTest.txt + * 130dcddcaadaf071008bdfce1e7743e04fdfbc910886f017d9f9ac931d8c64dd lib/unicore/PropList.txt + * 670d2bebb48649c04fabfbf033308073dcff47946324a8033237254c048b3b01 lib/unicore/PropValueAliases.txt + * 4441f573caf952ffece1d7c892e7715bd7136dfc26f96eb6f268bf1e474715fb lib/unicore/PropertyAliases.txt + * ec2107e58825a1586acee8e0911ce18260394ac8b87e535ca325f1ccbeb06bc6 lib/unicore/ScriptExtensions.txt + * 9f5e50d3abaee7d6ce09480f325c706f485ae3240912527e651954d2d6b035bf lib/unicore/Scripts.txt + * efc25faf19de21b92c1194c111c932e03d2a5eaf18194e33f1156e96de4c9588 lib/unicore/SpecialCasing.txt + * 2e1efc1dcb59c575eedf5ccae60f95229f706ee6d031835247d843c11d96470c lib/unicore/UnicodeData.txt + * 76a3081265e6eb673873f9c93d6f36062e82c7ed027c5c1a592accfbe48c20a5 lib/unicore/Unikemet.txt + * dcef09c3fb24d356b042569c328ec341efc5b53447700d799f2fb4834c3cd3cd lib/unicore/VerticalOrientation.txt + * e2d134d2c52919bace503ebb6a551c1855fe1a1faec18478c78fff254a1793ec lib/unicore/auxiliary/GCBTest.txt + * d6b51d1d2ae5c33b451b7ed994b48f1f4dc62b2272a5831e7fd418514a6bae89 lib/unicore/auxiliary/GraphemeBreakProperty.txt + * e69884e0dde6a8724873f885d68c52dc14518abf9ae4ca9e2283b8773db3b752 lib/unicore/auxiliary/LBTest.txt + * 12cb47d028ded0c1cb8a28558f95479cbcd24559c46977015c82f3b50a1cc6e4 lib/unicore/auxiliary/SBTest.txt + * 871c0c985ad95125e25b302414065a10839d068970bceb383ecec138f22a0a18 lib/unicore/auxiliary/SentenceBreakProperty.txt + * 1de23a75f37904abc7d206239ee8d34f8fdf0fb4ab32a7174dfbabbde25419b2 lib/unicore/auxiliary/WBTest.txt + * 72274cac1e6b919507db35655c3e175aa27274668a1ece95c28d2069f2ad9852 lib/unicore/auxiliary/WordBreakProperty.txt + * 2cb2bb9455cda83e8481541ecf5b6dfda66a3bb89efa3fa7c5297eccf607b72b lib/unicore/emoji/emoji.txt + * 4867b4b7f0731ed1bfcd34cc6251211ff1542541fce0734b6fbda139ee80b3a4 lib/unicore/extracted/DBidiClass.txt + * 13dd09d35a9377e33eb388a01e6581d4bfec6b2685316078c341982fa444071a lib/unicore/extracted/DBinaryProperties.txt + * 191463abfbd202703c6fd6776a92a23ac44ec65e0476a7f95aa91ca492cef29b lib/unicore/extracted/DCombiningClass.txt + * f44e5ceaf40edc1fe06ea0404e8bebc7d356dcc38aac076543b6874008a06e3e lib/unicore/extracted/DDecompositionType.txt + * 0b5523a2217cb318d20b329a05d31eec5af5686ba09d263b85bb75a28989a3a8 lib/unicore/extracted/DEastAsianWidth.txt + * d62e5bab70ca74f099343f71224fa051cb1fdd61a1ab45c0488c44cfc0b6102e lib/unicore/extracted/DGeneralCategory.txt + * bb67e0c00b88acfa5be633967b66b23326844a86e49c6fde7b57960d3af66cae lib/unicore/extracted/DJoinGroup.txt + * f39ebe974825d6736aee15582250307aa532b2cfab3caf3f86bd23fddc9c5c4d lib/unicore/extracted/DJoinType.txt + * dad3ef492d198d6f1dde4922b175f7371a27dfe62fce489f3e04807015a4c682 lib/unicore/extracted/DLineBreak.txt + * 7c83684d3336b698381745b78a971c3e1242cb3fcac58604469086c19b6edcee lib/unicore/extracted/DNumType.txt + * 139b976bdc288be01c80f018523da769cf2845109b5a7f0f8a432db64bfedcfa lib/unicore/extracted/DNumValues.txt + * e3ac360c03d18779fea6d6497fbbe53798135da55e3764d3c9f90a79bbf7e8b5 lib/unicore/mktables + * 8c30575264b2772c7a69c5bb6069a28f0e0a7a0df735871bde2d99ee674316ac lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl - * 2a984ef37eb37e718ed25d472988745196816f9147d6ee6822a8efeafda340e5 regen/regcharclass.pl + * 852a8a7814f08a155d79fead2656fe2b4450ab17a2bce8a1127016119c9c3bc3 regen/regcharclass.pl * b2f896452d2b30da3e04800f478c60c1fd0b03d6b668689b020f1e3cf1f1cdd9 regen/regcharclass_multi_char_folds.pl * ex: set ro ft=c: */ Index: gnu/usr.bin/perl/regcomp.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regcomp.c,v diff -u -p -a -u -p -r1.37 regcomp.c --- gnu/usr.bin/perl/regcomp.c 26 Dec 2025 22:14:13 -0000 1.37 +++ gnu/usr.bin/perl/regcomp.c 16 Nov 2026 00:57:39 -0000 @@ -144,6 +144,7 @@ EXTERN_C const struct regexp_engine wild #include "invlist_inline.h" #include "unicode_constants.h" #include "regcomp_internal.h" +#include "feature.h" /* ========================================================= * BEGIN edit_distance stuff. @@ -223,7 +224,7 @@ dict_free(item* head) /* End of Dictionary Stuff */ /* All calculations/work are done here */ -STATIC int +static int S_edit_distance(const UV* src, const UV* tgt, const STRLEN x, /* length of src[] */ @@ -231,13 +232,13 @@ S_edit_distance(const UV* src, const SSize_t maxDistance ) { + PERL_ARGS_ASSERT_EDIT_DISTANCE; + item *head = NULL; UV swapCount, swapScore, targetCharCount, i, j; UV *scores; UV score_ceil = x + y; - PERL_ARGS_ASSERT_EDIT_DISTANCE; - /* initialize matrix start values */ Newx(scores, ( (x + 2) * (y + 2)), UV); scores[0] = score_ceil; @@ -298,10 +299,10 @@ S_edit_distance(const UV* src, U32 Perl_reg_add_data(RExC_state_t* const pRExC_state, const char* const s, const U32 n) { - U32 count = RExC_rxi->data ? RExC_rxi->data->count : 1; - PERL_ARGS_ASSERT_REG_ADD_DATA; + U32 count = RExC_rxi->data ? RExC_rxi->data->count : 1; + /* in the below expression we have (count + n - 1), the minus one is there * because the struct that we allocate already contains a slot for 1 data * item, so we do not need to allocate it the first time. IOW, the @@ -349,6 +350,8 @@ Perl_reg_add_data(RExC_state_t* const pR void Perl_reginitcolors(pTHX) { + PERL_ARGS_ASSERT_REGINITCOLORS; + const char * const s = PerlEnv_getenv("PERL_RE_COLORS"); if (s) { char *t = savepv(s); @@ -395,26 +398,30 @@ Perl_reginitcolors(pTHX) regexp_engine const * Perl_current_re_engine(pTHX) { + PERL_ARGS_ASSERT_CURRENT_RE_ENGINE; + + SV *ptr; if (IN_PERL_COMPILETIME) { HV * const table = GvHV(PL_hintgv); - SV **ptr; + SV **pptr; if (!table || !(PL_hints & HINT_LOCALIZE_HH)) return &PL_core_reg_engine; - ptr = hv_fetchs(table, "regcomp", false); - if ( !(ptr && SvIOK(*ptr) && SvIV(*ptr))) + pptr = hv_fetchs(table, "regcomp", false); + if (!pptr) return &PL_core_reg_engine; - return INT2PTR(regexp_engine*, SvIV(*ptr)); + ptr = *pptr; } else { - SV *ptr; if (!PL_curcop->cop_hints_hash) return &PL_core_reg_engine; ptr = cop_hints_fetch_pvs(PL_curcop, "regcomp", 0); - if ( !(ptr && SvIOK(ptr) && SvIV(ptr))) - return &PL_core_reg_engine; - return INT2PTR(regexp_engine*, SvIV(ptr)); } + + IV iv; + if ( !(ptr && SvIOK(ptr) && (iv = SvIV(ptr))) ) + return &PL_core_reg_engine; + return INT2PTR(regexp_engine*, iv); } @@ -428,14 +435,14 @@ Perl_current_re_engine(pTHX) REGEXP * Perl_pregcomp(pTHX_ SV * const pattern, const U32 flags) { + PERL_ARGS_ASSERT_PREGCOMP; + regexp_engine const *eng = current_re_engine(); DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_PREGCOMP; - /* Dispatch a request to compile a regexp to correct regexp engine. */ DEBUG_COMPILE_r({ - Perl_re_printf( aTHX_ "Using engine %" UVxf "\n", + re_printf("Using engine %" UVxf "\n", PTR2UV(eng)); }); return CALLREGCOMP_ENG(eng, pattern, flags); @@ -471,10 +478,10 @@ all begin with C. REGEXP * Perl_re_compile(pTHX_ SV * const pattern, U32 rx_flags) { - SV *pat = pattern; /* defeat constness! */ - PERL_ARGS_ASSERT_RE_COMPILE; + SV *pat = pattern; /* defeat constness! */ + return Perl_re_op_compile(aTHX_ &pat, 1, NULL, #ifdef PERL_IN_XSUB_RE &my_reg_engine, @@ -485,8 +492,9 @@ Perl_re_compile(pTHX_ SV * const pattern } static void -S_free_codeblocks(pTHX_ struct reg_code_blocks *cbs) +S_free_codeblocks(pTHX_ void *ptr) { + struct reg_code_blocks *cbs = (struct reg_code_blocks *)ptr; int n; if (--cbs->refcnt > 0) @@ -560,7 +568,7 @@ S_pat_upgrade_to_utf8(pTHX_ RExC_state_t bool do_end = 0; DECLARE_AND_GET_RE_DEBUG_FLAGS; - DEBUG_PARSE_r(Perl_re_printf( aTHX_ + DEBUG_PARSE_r(re_printf( "UTF8 mismatch! Converting to utf8 for resizing and compile\n")); int nblocks = 0; @@ -595,7 +603,7 @@ S_pat_upgrade_to_utf8(pTHX_ RExC_state_t *plen_p = d - dst; *pat_p = (char*) dst; SAVEFREEPV(*pat_p); - RExC_orig_utf8 = RExC_utf8 = 1; + RExC_orig_utf8 = RExC_utf8 = true; } @@ -876,7 +884,6 @@ S_has_runtime_code(pTHX_ RExC_state_t * { int n = 0; STRLEN s; - PERL_UNUSED_CONTEXT; for (s = 0; s < plen; s++) { @@ -1000,7 +1007,7 @@ S_compile_runtime_code(pTHX_ RExC_state_ } *p++ = '\0'; DEBUG_COMPILE_r({ - Perl_re_printf( aTHX_ + re_printf( "%sre-parsing pattern for runtime code:%s %s\n", PL_colors[4], PL_colors[5], newpat); }); @@ -1117,7 +1124,7 @@ S_compile_runtime_code(pTHX_ RExC_state_ } -STATIC bool +static bool S_setup_longest(pTHX_ RExC_state_t *pRExC_state, struct reg_substr_datum *rsd, struct scan_data_substrs *sub, @@ -1171,9 +1178,11 @@ S_setup_longest(pTHX_ RExC_state_t *pREx return true; } -STATIC void +static void S_set_regex_pv(pTHX_ RExC_state_t *pRExC_state, REGEXP *Rx) { + PERL_ARGS_ASSERT_SET_REGEX_PV; + /* Calculates and sets in the compiled pattern 'Rx' the string to compile, * properly wrapped with the right modifiers */ @@ -1205,8 +1214,6 @@ S_set_regex_pv(pTHX_ RExC_state_t *pRExC + ((has_charset) ? MAX_CHARSET_NAME_LENGTH : 0) + (sizeof("(?:)") - 1); - PERL_ARGS_ASSERT_SET_REGEX_PV; - /* make sure PL_bitcount bounds not exceeded */ STATIC_ASSERT_STMT(sizeof(STD_PAT_MODS) <= 8); @@ -1260,9 +1267,11 @@ S_set_regex_pv(pTHX_ RExC_state_t *pRExC SvCUR_set(Rx, p - RX_WRAPPED(Rx)); } -STATIC void +static void S_ssc_finalize(pTHX_ RExC_state_t *pRExC_state, regnode_ssc *ssc) { + PERL_ARGS_ASSERT_SSC_FINALIZE; + /* The inversion list in the SSC is marked mortal; now we need a more * permanent copy, which is stored the same way that is done in a regular * ANYOF node, with the first NUM_ANYOF_CODE_POINTS code points in a bit @@ -1270,8 +1279,6 @@ S_ssc_finalize(pTHX_ RExC_state_t *pRExC SV* invlist = invlist_clone(ssc->invlist, NULL); - PERL_ARGS_ASSERT_SSC_FINALIZE; - assert(is_ANYOF_SYNTHETIC(ssc)); /* The code in this file assumes that all but these flags aren't relevant @@ -1301,9 +1308,11 @@ S_ssc_finalize(pTHX_ RExC_state_t *pRExC assert(! (ANYOF_FLAGS(ssc) & ANYOF_LOCALE_FLAGS) || RExC_contains_locale); } -STATIC bool +static bool S_is_ssc_worth_it(const RExC_state_t * pRExC_state, const regnode_ssc * ssc) { + PERL_ARGS_ASSERT_IS_SSC_WORTH_IT; + /* The synthetic start class is used to hopefully quickly winnow down * places where a pattern could start a match in the target string. If it * doesn't really narrow things down that much, there isn't much point to @@ -1338,8 +1347,6 @@ S_is_ssc_worth_it(const RExC_state_t * p : NON_OTHER_COUNT); const U32 max_match = max_code_points / 2; - PERL_ARGS_ASSERT_IS_SSC_WORTH_IT; - invlist_iterinit(ssc->invlist); while (invlist_iternext(ssc->invlist, &start, &end)) { if (start >= max_code_points) { @@ -1359,7 +1366,8 @@ S_is_ssc_worth_it(const RExC_state_t * p #ifdef PERL_RE_BUILD_AUX void -Perl_release_RExC_state(pTHX_ void *vstate) { +Perl_release_RExC_state(pTHX_ void *vstate) +{ PERL_ARGS_ASSERT_RELEASE_REXC_STATE; RExC_state_t *pRExC_state = (RExC_state_t *)vstate; @@ -1440,6 +1448,8 @@ Perl_re_op_compile(pTHX_ SV ** const pat OP *expr, const regexp_engine* eng, REGEXP *old_re, bool *is_bare_re, const U32 orig_rx_flags, const U32 pm_flags) { + PERL_ARGS_ASSERT_RE_OP_COMPILE; + REGEXP *Rx; /* Capital 'R' means points to a REGEXP */ STRLEN plen; char *exp; @@ -1469,8 +1479,6 @@ Perl_re_op_compile(pTHX_ SV ** const pat #endif DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_RE_OP_COMPILE; - DEBUG_r(if (!PL_colorset) reginitcolors()); RExC_state_t *pRExC_state = NULL; @@ -1546,7 +1554,7 @@ Perl_re_op_compile(pTHX_ SV ** const pat } - DEBUG_PARSE_r(Perl_re_printf( aTHX_ + DEBUG_PARSE_r(re_printf( "Assembling pattern from %d elements%s\n", pat_count, orig_rx_flags & RXf_SPLIT ? " for split" : "")); @@ -1575,7 +1583,7 @@ Perl_re_op_compile(pTHX_ SV ** const pat if (is_bare_re) *is_bare_re = true; SvREFCNT_inc(re); - DEBUG_PARSE_r(Perl_re_printf( aTHX_ + DEBUG_PARSE_r(re_printf( "Precompiled pattern%s\n", orig_rx_flags & RXf_SPLIT ? " for split" : "")); @@ -1602,13 +1610,13 @@ Perl_re_op_compile(pTHX_ SV ** const pat } /* ignore the utf8ness if the pattern is 0 length */ - RExC_utf8 = RExC_orig_utf8 = (plen == 0 || IN_BYTES) ? 0 : SvUTF8(pat); + RExC_utf8 = RExC_orig_utf8 = (plen == 0 || IN_BYTES) ? false : cBOOL(SvUTF8(pat)); RExC_strict = cBOOL(pm_flags & RXf_PMf_STRICT); DEBUG_COMPILE_r({ RE_PV_QUOTED_DECL(s, RExC_utf8, RExC_mysv, exp, plen, PL_dump_re_max_len); - Perl_re_printf( aTHX_ "%sCompiling REx%s %s\n", + re_printf("%sCompiling REx%s %s\n", PL_colors[4], PL_colors[5], s); }); @@ -1637,7 +1645,7 @@ Perl_re_op_compile(pTHX_ SV ** const pat if ( old_re && !recompile - && cBOOL(RX_UTF8(old_re)) == cBOOL(RExC_utf8) + && cBOOL(RX_UTF8(old_re)) == RExC_utf8 && ( RX_COMPFLAGS(old_re) == ( orig_rx_flags & RXf_PMf_FLAGCOPYMASK ) ) && RX_PRELEN(old_re) == plen && memEQ(RX_PRECOMP(old_re), exp, plen) @@ -1645,7 +1653,7 @@ Perl_re_op_compile(pTHX_ SV ** const pat { DEBUG_COMPILE_r({ RE_PV_QUOTED_DECL(s, RExC_utf8, RExC_mysv, exp, plen, PL_dump_re_max_len); - Perl_re_printf( aTHX_ "%sSkipping recompilation of unchanged REx%s %s\n", + re_printf("%sSkipping recompilation of unchanged REx%s %s\n", PL_colors[4], PL_colors[5], s); }); LEAVE_with_name("re_op_compile"); @@ -1669,7 +1677,7 @@ Perl_re_op_compile(pTHX_ SV ** const pat /* Set to use unicode semantics if the pattern is in utf8 and has the * 'depends' charset specified, as it means unicode when utf8 */ set_regex_charset(&rx_flags, REGEX_UNICODE_CHARSET); - RExC_uni_semantics = 1; + RExC_uni_semantics = true; } RExC_pm_flags = pm_flags; @@ -1688,14 +1696,14 @@ Perl_re_op_compile(pTHX_ SV ** const pat } assert(!pRExC_state->runtime_code_qr); - RExC_sawback = 0; + RExC_sawback = false; RExC_seen = 0; RExC_maxlen = 0; - RExC_in_lookaround = 0; + RExC_in_lookaround = false; RExC_seen_zerolen = *exp == '^' ? -1 : 0; - RExC_recode_x_to_native = 0; - RExC_in_multi_char_class = 0; + RExC_recode_x_to_native = false; + RExC_in_multi_char_class = false; RExC_start = RExC_copy_start_in_constructed = RExC_copy_start_in_input = RExC_precomp = exp; RExC_precomp_end = RExC_end = exp + plen; @@ -1714,7 +1722,7 @@ Perl_re_op_compile(pTHX_ SV ** const pat set_regex_pv(pRExC_state, Rx); DEBUG_PARSE_r({ - Perl_re_printf( aTHX_ + re_printf( "Starting parse and generation\n"); RExC_lastnum = 0; RExC_lastparse = NULL; @@ -1830,10 +1838,10 @@ Perl_re_op_compile(pTHX_ SV ** const pat + RExC_latest_warn_offset); } S_pat_upgrade_to_utf8(aTHX_ pRExC_state, &exp, &plen); - DEBUG_PARSE_r(Perl_re_printf( aTHX_ "Need to redo parse after upgrade\n")); + DEBUG_PARSE_r(re_printf("Need to redo parse after upgrade\n")); } else { - DEBUG_PARSE_r(Perl_re_printf( aTHX_ "Need to redo parse\n")); + DEBUG_PARSE_r(re_printf("Need to redo parse\n")); } if (ALL_PARENS_COUNTED) { @@ -1891,8 +1899,8 @@ Perl_re_op_compile(pTHX_ SV ** const pat RExC_whilem_seen = 15; DEBUG_PARSE_r({ - Perl_re_printf( aTHX_ - "Required size %" IVdf " nodes\n", (IV)RExC_size); + re_printf( + "Required size %zd nodes\n", RExC_size); RExC_lastnum = 0; RExC_lastparse = NULL; }); @@ -1903,14 +1911,14 @@ Perl_re_op_compile(pTHX_ SV ** const pat SV * const sv = sv_newmortal(); /* can this use RExC_mysv? */ RXi_GET_DECL(RExC_rx, ri); DEBUG_RExC_seen(); - Perl_re_printf( aTHX_ "Program before optimization:\n"); + re_printf("Program before optimization:\n"); (void)dumpuntil(RExC_rx, ri->program, ri->program + 1, NULL, NULL, sv, 0, 0); }); DEBUG_OPTIMISE_r( - Perl_re_printf( aTHX_ "Starting post parse optimization\n"); + re_printf("Starting post parse optimization\n"); ); /* XXXX To minimize changes to RE engine we always allocate @@ -1950,7 +1958,7 @@ Perl_re_op_compile(pTHX_ SV ** const pat copyRExC_state = *pRExC_state; } else { U32 seen = RExC_seen; - DEBUG_OPTIMISE_r(Perl_re_printf( aTHX_ "Restudying\n")); + DEBUG_OPTIMISE_r(re_printf("Restudying\n")); *pRExC_state = copyRExC_state; if (seen & REG_TOP_LEVEL_BRANCHES_SEEN) @@ -2092,13 +2100,11 @@ Perl_re_op_compile(pTHX_ SV ** const pat /* search for "restudy" in this file for a detailed explanation */ DEBUG_PARSE_r( if (!restudied) - Perl_re_printf( aTHX_ "first at %" IVdf "\n", - (IV)(first - scan + 1)) + re_printf("first at %td\n", first - scan + 1) ); #else DEBUG_PARSE_r( - Perl_re_printf( aTHX_ "first at %" IVdf "\n", - (IV)(first - scan + 1)) + re_printf("first at %td\n", first - scan + 1) ); #endif @@ -2220,7 +2226,7 @@ Perl_re_op_compile(pTHX_ SV ** const pat RExC_rx->intflags &= ~PREGf_SKIP; /* Used in find_byclass(). */ DEBUG_COMPILE_r({ SV *sv = sv_newmortal(); regprop(RExC_rx, sv, (regnode*)data.start_class, NULL, pRExC_state); - Perl_re_printf( aTHX_ + re_printf( "synthetic stclass \"%s\".\n", SvPVX_const(sv));}); data.start_class = NULL; @@ -2258,7 +2264,7 @@ Perl_re_op_compile(pTHX_ SV ** const pat SSize_t last_close = 0; regnode *last_close_op = NULL; - DEBUG_PARSE_r(Perl_re_printf( aTHX_ "\nMulti Top Level\n")); + DEBUG_PARSE_r(re_printf("\nMulti Top Level\n")); scan = RExC_rxi->program + 1; ssc_init(pRExC_state, &ch_class); @@ -2304,7 +2310,7 @@ Perl_re_op_compile(pTHX_ SV ** const pat RExC_rx->intflags &= ~PREGf_SKIP; /* Used in find_byclass(). */ DEBUG_COMPILE_r({ SV* sv = sv_newmortal(); regprop(RExC_rx, sv, (regnode*)data.start_class, NULL, pRExC_state); - Perl_re_printf( aTHX_ + re_printf( "synthetic stclass \"%s\".\n", SvPVX_const(sv));}); data.start_class = NULL; @@ -2322,8 +2328,8 @@ Perl_re_op_compile(pTHX_ SV ** const pat /* Guard against an embedded (?=) or (?<=) with a longer minlen than the "real" pattern. */ DEBUG_OPTIMISE_r({ - Perl_re_printf( aTHX_ "minlen: %" IVdf " RExC_rx->minlen:%" IVdf " maxlen:%" IVdf "\n", - (IV)minlen, (IV)RExC_rx->minlen, (IV)RExC_maxlen); + re_printf("minlen: %zd RExC_rx->minlen:%zd maxlen:%zd\n", + minlen, RExC_rx->minlen, RExC_maxlen); }); RExC_rx->minlenret = minlen; if (RExC_rx->minlen < minlen) @@ -2462,12 +2468,12 @@ Perl_re_op_compile(pTHX_ SV ** const pat Newxz(RXp_OFFSp(RExC_rx), RExC_total_parens, regexp_paren_pair); /* assume we don't need to swap parens around before we match */ DEBUG_TEST_r({ - Perl_re_printf( aTHX_ "study_chunk_recursed_count: %lu\n", + re_printf("study_chunk_recursed_count: %lu\n", (unsigned long)RExC_study_chunk_recursed_count); }); DEBUG_DUMP_r({ DEBUG_RExC_seen(); - Perl_re_printf( aTHX_ "Final program:\n"); + re_printf("Final program:\n"); regdump(RExC_rx); }); @@ -2512,32 +2518,36 @@ Perl_reg_qr_package(pTHX_ REGEXP * const #define REG_RSN_RETURN_NAME 1 #define REG_RSN_RETURN_DATA 2 -STATIC SV* +static SV* S_reg_scan_name(pTHX_ RExC_state_t *pRExC_state, U32 flags) { + PERL_ARGS_ASSERT_REG_SCAN_NAME; + assert (RExC_parse <= RExC_end); + char *name_start = RExC_parse; SV* sv_name; + HV * error_message = NULL; - PERL_ARGS_ASSERT_REG_SCAN_NAME; - - assert (RExC_parse <= RExC_end); - if (RExC_parse == RExC_end) NOOP; - else if (isIDFIRST_lazy_if_safe(RExC_parse, RExC_end, UTF)) { - /* Note that the code here assumes well-formed UTF-8. Skip IDFIRST by - * using do...while */ - if (UTF) - do { - RExC_parse_inc_utf8(); - } while ( RExC_parse < RExC_end - && isWORDCHAR_utf8_safe((U8*)RExC_parse, (U8*) RExC_end)); - else - do { - RExC_parse_inc_by(1); - } while (RExC_parse < RExC_end && isWORDCHAR(*RExC_parse)); - } else { - RExC_parse_inc_by(1); /* so the <- from the vFAIL is after the offending - character */ - vFAIL("Group name must start with a non-digit word character"); + if (RExC_parse == RExC_end) { + NOOP; + } + else { + RExC_parse_set(parse_ident_msg(RExC_parse, RExC_end, cBOOL(UTF), + &error_message, 0)); + if (RExC_parse == NULL) { + + /* Here, parse_ident_msg found a serious error. Use its returned + * message for the failure */ + RExC_parse_inc_by(SvUV(*hv_fetchs(error_message, + PARSE_IDENT_ERROR_POSITION, 0))); + vFAIL(SvPVX(*hv_fetchs(error_message, PARSE_IDENT_ERROR_TEXT, 0))); + } + else if (RExC_parse == name_start) { + /* Here, the parse didn't advance, so is an error */ + RExC_parse_inc(); /* so the <- from the vFAIL is after the + offending character */ + vFAIL("Group name must start with a non-digit word character"); + } } sv_name = newSVpvn_flags(name_start, (int)(RExC_parse - name_start), SVs_TEMP | (UTF ? SVf_UTF8 : 0)); @@ -2573,47 +2583,49 @@ S_reg_scan_name(pTHX_ RExC_state_t *pREx #define DEBUG_PARSE_MSG(funcname) DEBUG_PARSE_r({ \ if (RExC_lastparse!=RExC_parse) { \ - Perl_re_printf( aTHX_ "%s", \ - Perl_pv_pretty(aTHX_ RExC_mysv1, RExC_parse, \ - RExC_end - RExC_parse, 16, \ - "", "", \ - PERL_PV_ESCAPE_UNI_DETECT | \ - PERL_PV_PRETTY_ELLIPSES | \ - PERL_PV_PRETTY_LTGT | \ - PERL_PV_ESCAPE_RE | \ - PERL_PV_PRETTY_EXACTSIZE \ + re_printf("%s", \ + pv_pretty(RExC_mysv1, RExC_parse, \ + RExC_end - RExC_parse, 16, \ + "", "", \ + PERL_PV_ESCAPE_UNI_DETECT | \ + PERL_PV_PRETTY_ELLIPSES | \ + PERL_PV_PRETTY_LTGT | \ + PERL_PV_ESCAPE_RE | \ + PERL_PV_PRETTY_EXACTSIZE \ ) \ ); \ } else \ - Perl_re_printf( aTHX_ "%16s",""); \ + re_printf("%16s",""); \ \ if (RExC_lastnum!=RExC_emit) \ - Perl_re_printf( aTHX_ "|%4zu", RExC_emit); \ + re_printf("|%4zu", RExC_emit); \ else \ - Perl_re_printf( aTHX_ "|%4s",""); \ - Perl_re_printf( aTHX_ "|%*s%-4s", \ + re_printf("|%4s",""); \ + re_printf("|%*s%-4s", \ (int)((depth*2)), "", \ (funcname) \ ); \ - RExC_lastnum = RExC_emit; \ - RExC_lastparse = RExC_parse; \ + RExC_lastnum = RExC_emit; \ + RExC_lastparse = RExC_parse; \ }) #define DEBUG_PARSE(funcname) DEBUG_PARSE_r({ \ DEBUG_PARSE_MSG((funcname)); \ - Perl_re_printf( aTHX_ "%4s","\n"); \ + re_printf("%4s","\n"); \ }) #define DEBUG_PARSE_FMT(funcname,fmt,args) DEBUG_PARSE_r({\ DEBUG_PARSE_MSG((funcname)); \ - Perl_re_printf( aTHX_ fmt "\n",args); \ + re_printf(fmt "\n",args); \ }) -STATIC void +static void S_parse_lparen_question_flags(pTHX_ RExC_state_t *pRExC_state) { + PERL_ARGS_ASSERT_PARSE_LPAREN_QUESTION_FLAGS; + /* This parses the flags that are in either the '(?foo)' or '(?foo:bar)' * constructs, and updates RExC_flags with them. On input, RExC_parse * should point to the first flag; it is updated on output to point to the @@ -2636,8 +2648,6 @@ S_parse_lparen_question_flags(pTHX_ RExC const char* const seqstart = RExC_parse - 1; /* Point to the '?' */ int x_mod_count = 0; - PERL_ARGS_ASSERT_PARSE_LPAREN_QUESTION_FLAGS; - /* '^' as an initial flag sets certain defaults */ if (UCHARAT(RExC_parse) == '^') { RExC_parse_inc_by(1); @@ -2880,21 +2890,21 @@ S_parse_lparen_question_flags(pTHX_ RExC * follows makes it hard to avoid. */ -STATIC regnode_offset +static regnode_offset S_handle_named_backref(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, char * backref_parse_start, char ch ) { + PERL_ARGS_ASSERT_HANDLE_NAMED_BACKREF; + regnode_offset ret; char* name_start = RExC_parse; U32 num = 0; SV *sv_dat = reg_scan_name(pRExC_state, REG_RSN_RETURN_DATA); DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_HANDLE_NAMED_BACKREF; - if (RExC_parse != name_start && ch == '}') { while (isBLANK(*RExC_parse)) { RExC_parse_inc_by(1); @@ -2910,7 +2920,7 @@ S_handle_named_backref(pTHX_ RExC_state_ RExC_rxi->data->data[num]=(void*)sv_dat; SvREFCNT_inc_simple_void_NN(sv_dat); } - RExC_sawback = 1; + RExC_sawback = true; ret = reg2node(pRExC_state, ((! FOLD) ? REFN @@ -2945,7 +2955,7 @@ S_handle_named_backref(pTHX_ RExC_state_ * If the construct is empty generates a NOTHING op and returns its * regnode_offset, which the caller would then return to its caller. * - * If the construct is not empty increments RExC_in_lookaround, and turns + * If the construct is not empty sets RExC_in_lookaround, and turns * on any flags provided in RExC_seen, and then returns 0 to signify * that parsing should continue. * @@ -2953,11 +2963,10 @@ S_handle_named_backref(pTHX_ RExC_state_ * any use of it would have had to be broken onto multiple lines, hence * the abbreviation. */ -STATIC regnode_offset +static regnode_offset S_reg_la_NOTHING(pTHX_ RExC_state_t *pRExC_state, U32 flags, const char *type) { - PERL_ARGS_ASSERT_REG_LA_NOTHING; /* false below so we do not force /x */ @@ -2976,7 +2985,7 @@ S_reg_la_NOTHING(pTHX_ RExC_state_t *pRE } RExC_seen |= flags; - RExC_in_lookaround++; + RExC_in_lookaround = true; return 0; /* keep parsing! */ } @@ -2993,7 +3002,7 @@ S_reg_la_NOTHING(pTHX_ RExC_state_t *pRE * If the construct is empty generates an OPFAIL op and returns its * regnode_offset which the caller should then return to its caller. * - * If the construct is not empty increments RExC_in_lookaround, and also + * If the construct is not empty sets RExC_in_lookaround, and also * increments RExC_seen_zerolen, and turns on the flags provided in * RExC_seen, and then returns 0 to signify that parsing should continue. * @@ -3002,11 +3011,10 @@ S_reg_la_NOTHING(pTHX_ RExC_state_t *pRE * the abbreviation. */ -STATIC regnode_offset +static regnode_offset S_reg_la_OPFAIL(pTHX_ RExC_state_t *pRExC_state, U32 flags, const char *type) { - PERL_ARGS_ASSERT_REG_LA_OPFAIL; /* false so we don't force to /x below */; @@ -3026,7 +3034,7 @@ S_reg_la_OPFAIL(pTHX_ RExC_state_t *pREx * does not match ever. */ RExC_seen_zerolen++; RExC_seen |= flags; - RExC_in_lookaround++; + RExC_in_lookaround = true; return 0; /* keep parsing! */ } @@ -3084,13 +3092,15 @@ S_reg_la_OPFAIL(pTHX_ RExC_state_t *pREx * NEED_UTF8 if the pattern needs to be upgraded to UTF-8. * Otherwise would only return 0 if regbranch() returns 0, which cannot * happen. */ -STATIC regnode_offset +static regnode_offset S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth) /* paren: Parenthesized? 0 = top; 1,2 = inside '(': changed to letter. * 2 is like 1, but indicates that nextchar() has been called to advance * RExC_parse beyond the '('. Things like '(?' are indivisible tokens, and * this flag alerts us to the need to check for that */ { + PERL_ARGS_ASSERT_REG; + regnode_offset ret = 0; /* Will be the head of the group. */ regnode_offset br; regnode_offset lastbr; @@ -3105,7 +3115,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I I32 after_freeze = 0; I32 num; /* numeric backreferences */ SV * max_open; /* Max number of unclosed parens */ - I32 was_in_lookaround = RExC_in_lookaround; + bool was_in_lookaround = RExC_in_lookaround; I32 fake_eval = 0; /* matches paren */ /* The difference between the following variables can be seen with * @@ -3121,7 +3131,6 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_REG; DEBUG_PARSE("reg "); max_open = get_sv(RE_COMPILE_RECURSION_LIMIT, GV_ADD); @@ -3427,7 +3436,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I } RExC_seen_zerolen++; - RExC_in_lookaround++; + RExC_in_lookaround = true; RExC_seen |= seen_flag_set; RExC_parse_set(start_arg); @@ -3483,9 +3492,9 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I bool is_logical = 0, is_optimistic = 0; const char * const seqstart = RExC_parse; const char * endptr; - const char non_existent_group_msg[] + const char * const non_existent_group_msg = "Reference to nonexistent group"; - const char impossible_group[] = "Invalid reference to group"; + const char * const impossible_group = "Invalid reference to group"; if (has_intervening_patws) { RExC_parse_inc_by(1); @@ -3815,7 +3824,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I */ ret = reg2node(pRExC_state, GOSUB, num, RExC_recurse_count); RExC_recurse_count++; - DEBUG_OPTIMISE_MORE_r(Perl_re_printf( aTHX_ + DEBUG_OPTIMISE_MORE_r(re_printf( "%*s%*s Recurse #%" UVuf " to %" IVdf "\n", 22, "| |", (int)(depth * 2 + 1), "", (UV)ARG1u(REGNODE_p(ret)), @@ -4220,7 +4229,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I RExC_nestroot = parno; if (RExC_open_parens && !RExC_open_parens[parno]) { - DEBUG_OPTIMISE_MORE_r(Perl_re_printf( aTHX_ + DEBUG_OPTIMISE_MORE_r(re_printf( "%*s%*s Setting open paren #%" IVdf " to %zu\n", 22, "| |", (int)(depth * 2 + 1), "", (IV)parno, ret)); @@ -4336,7 +4345,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I case 1: case 2: ender = reg1node(pRExC_state, CLOSE, parno); if ( RExC_close_parens ) { - DEBUG_OPTIMISE_MORE_r(Perl_re_printf( aTHX_ + DEBUG_OPTIMISE_MORE_r(re_printf( "%*s%*s Setting close paren #%" IVdf " to %zu\n", 22, "| |", (int)(depth * 2 + 1), "", (IV)parno, ender)); @@ -4373,7 +4382,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I assert(!RExC_end_op); /* there can only be one! */ RExC_end_op = REGNODE_p(ender); if (RExC_close_parens) { - DEBUG_OPTIMISE_MORE_r(Perl_re_printf( aTHX_ + DEBUG_OPTIMISE_MORE_r(re_printf( "%*s%*s Setting close paren #0 (END) to %zu\n", 22, "| |", (int)(depth * 2 + 1), "", ender)); @@ -4386,12 +4395,12 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I DEBUG_PARSE_MSG("lsbr"); regprop(RExC_rx, RExC_mysv1, REGNODE_p(lastbr), NULL, pRExC_state); regprop(RExC_rx, RExC_mysv2, REGNODE_p(ender), NULL, pRExC_state); - Perl_re_printf( aTHX_ "~ tying lastbr %s (%" IVdf ") to ender %s (%" IVdf ") offset %" IVdf "\n", + re_printf("~ tying lastbr %s (%zd) to ender %s (%zd) offset %zd\n", SvPV_nolen_const(RExC_mysv1), - (IV)lastbr, + lastbr, SvPV_nolen_const(RExC_mysv2), - (IV)ender, - (IV)(ender - lastbr) + ender, + (ender - lastbr) ); }); if (OP(REGNODE_p(lastbr)) == BRANCH) { @@ -4450,23 +4459,23 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I NULL, pRExC_state); regprop(RExC_rx, RExC_mysv2, REGNODE_p(ender), NULL, pRExC_state); - Perl_re_printf( aTHX_ "~ converting ret %s (%" IVdf ") to ender %s (%" IVdf ") offset %" IVdf "\n", + re_printf("~ converting ret %s (%" IVdf ") to ender %s (%zd) offset %zd\n", SvPV_nolen_const(RExC_mysv1), (IV)REG_NODE_NUM(ret_as_regnode), SvPV_nolen_const(RExC_mysv2), - (IV)ender, - (IV)(ender - ret) + ender, + (ender - ret) ); }); OP(br)= NOTHING; if (OP(REGNODE_p(ender)) == TAIL) { - NEXT_OFF(br)= 0; + NEXT_OFF_set(br, 0); RExC_emit = REGNODE_OFFSET(br) + NODE_STEP_REGNODE; } else { regnode *opt; for ( opt = br + 1; opt < REGNODE_p(ender) ; opt++ ) OP(opt)= OPTIMIZED; - NEXT_OFF(br)= REGNODE_p(ender) - br; + NEXT_OFF_set(br, REGNODE_p(ender) - br); } } } @@ -4475,7 +4484,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I { const char *p; /* Even/odd or x = don't care: 010101x10x */ - static const char parens[] = "=!aA<,>Bbt"; + const char * const parens = "=!aA<,>Bbt"; /* flag below is set to 0 up through 'A'; 1 for larger */ if (paren && (p = strchr(parens, paren))) { @@ -4532,16 +4541,18 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I * * Implements the concatenation operator. * - * On success, returns the offset at which any next node should be placed into - * the regex engine program being compiled. + * On success, creates a branch node, and returns the position any next node + * should be placed into the regex engine program being compiled. * * Returns 0 otherwise, setting flagp to RESTART_PARSE if the parse needs * to be restarted, or'd with NEED_UTF8 if the pattern needs to be upgraded to * UTF-8 */ -STATIC regnode_offset +static regnode_offset S_regbranch(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, I32 first, U32 depth) { + PERL_ARGS_ASSERT_REGBRANCH; + regnode_offset ret; regnode_offset chain = 0; regnode_offset latest; @@ -4549,8 +4560,6 @@ S_regbranch(pTHX_ RExC_state_t *pRExC_st I32 flags = 0, c = 0; DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_REGBRANCH; - DEBUG_PARSE("brnc"); if (first) @@ -4618,6 +4627,8 @@ S_regbranch(pTHX_ RExC_state_t *pRExC_st bool Perl_regcurly(const char *s, const char *e, const char * result[5]) { + PERL_ARGS_ASSERT_REGCURLY; + /* This function matches a {m,n} quantifier. When called with a NULL final * argument, it simply parses the input from 's' up through 'e-1', and * returns a boolean as to whether or not this input is syntactically a @@ -4657,8 +4668,6 @@ Perl_regcurly(const char *s, const char bool has_comma = false; - PERL_ARGS_ASSERT_REGCURLY; - if (s >= e || *s++ != '{') return false; @@ -4736,6 +4745,8 @@ U32 S_get_quantifier_value(pTHX_ RExC_state_t *pRExC_state, const char * start, const char * end) { + PERL_ARGS_ASSERT_GET_QUANTIFIER_VALUE; + /* This is a helper function for regpiece() to compute, given the * quantifier {m,n}, the value of either m or n, based on the starting * position 'start' in the string, through the byte 'end-1', returning it @@ -4745,8 +4756,6 @@ S_get_quantifier_value(pTHX_ RExC_state_ UV uv; STATIC_ASSERT_DECL(REG_INFTY <= U32_MAX); - PERL_ARGS_ASSERT_GET_QUANTIFIER_VALUE; - if (grok_atoUV(start, &uv, &end)) { if (uv < REG_INFTY) { /* A valid, small-enough number */ return (U32) uv; @@ -4788,9 +4797,11 @@ S_get_quantifier_value(pTHX_ RExC_state_ * RESTART_PARSE if the parse needs to be restarted, or'd with * NEED_UTF8 if the pattern needs to be upgraded to UTF-8. */ -STATIC regnode_offset +static regnode_offset S_regpiece(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) { + PERL_ARGS_ASSERT_REGPIECE; + regnode_offset ret; char op; I32 flags; @@ -4804,8 +4815,6 @@ S_regpiece(pTHX_ RExC_state_t *pRExC_sta DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_REGPIECE; - DEBUG_PARSE("piec"); ret = regatom(pRExC_state, &flags, depth+1); @@ -4868,8 +4877,8 @@ S_regpiece(pTHX_ RExC_state_t *pRExC_sta unconditionally */ reginsert(pRExC_state, OPFAIL, orig_emit, depth+1); ckWARNreg(RExC_parse, "Quantifier {n,m} with n > m can't match"); - NEXT_OFF(REGNODE_p(orig_emit)) = - REGNODE_ARG_LEN(OPFAIL) + NODE_STEP_REGNODE; + NEXT_OFF_set(REGNODE_p(orig_emit), + REGNODE_ARG_LEN(OPFAIL) + NODE_STEP_REGNODE); return ret; } else if (min == max && *RExC_parse == '?') { @@ -5042,7 +5051,7 @@ S_regpiece(pTHX_ RExC_state_t *pRExC_sta NOT_REACHED; /*NOTREACHED*/ } -STATIC bool +static bool S_grok_bslash_N(pTHX_ RExC_state_t *pRExC_state, regnode_offset * node_p, UV * code_point_p, @@ -5052,6 +5061,8 @@ S_grok_bslash_N(pTHX_ RExC_state_t *pREx const U32 depth ) { + PERL_ARGS_ASSERT_GROK_BSLASH_N; + /* This routine teases apart the various meanings of \N and returns * accordingly. The input parameters constrain which meaning(s) is/are valid * in the current context. @@ -5142,8 +5153,6 @@ S_grok_bslash_N(pTHX_ RExC_state_t *pREx DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_GROK_BSLASH_N; - assert(cBOOL(node_p) ^ cBOOL(code_point_p)); /* Exactly one should be set */ assert(! (node_p && cp_count)); /* At most 1 should be set */ @@ -5293,7 +5302,7 @@ S_grok_bslash_N(pTHX_ RExC_state_t *pREx /* Convert from string to numeric code point */ *code_point_p = (SvUTF8(value_sv)) - ? valid_utf8_to_uvchr(value, NULL) + ? valid_utf8_to_uv(value, NULL) : *value; /* Have parsed this entire single code point \N{...}. *cp_count @@ -5354,7 +5363,7 @@ S_grok_bslash_N(pTHX_ RExC_state_t *pREx I32 flags = PERL_SCAN_SILENT_OVERFLOW | PERL_SCAN_SILENT_ILLDIGIT | PERL_SCAN_NOTIFY_ILLDIGIT - | PERL_SCAN_ALLOW_MEDIAL_UNDERSCORES + | PERL_SCAN_ALLOW_MEDIAL_UNDERSCORES_ONLY | PERL_SCAN_DISALLOW_PREFIX; STRLEN len = e - RExC_parse; NV overflow_value; @@ -5453,7 +5462,7 @@ S_grok_bslash_N(pTHX_ RExC_state_t *pREx /* The values are Unicode, and therefore have to be converted to native * on a non-Unicode (meaning non-ASCII) platform. */ - SET_recode_x_to_native(1); + SET_recode_x_to_native(true); } /* Here, we have the string the name evaluates to, ready to be parsed, @@ -5479,7 +5488,7 @@ S_grok_bslash_N(pTHX_ RExC_state_t *pREx RExC_start = save_start; RExC_parse_set(endbrace); RExC_end = orig_end; - SET_recode_x_to_native(0); + SET_recode_x_to_native(true); SvREFCNT_dec_NN(substitute_parse); @@ -5496,13 +5505,13 @@ S_grok_bslash_N(pTHX_ RExC_state_t *pREx } -STATIC U8 +static U8 S_compute_EXACTish(RExC_state_t *pRExC_state) { - U8 op; - PERL_ARGS_ASSERT_COMPUTE_EXACTISH; + U8 op; + if (! FOLD) { return (LOC) ? EXACTL @@ -5608,9 +5617,11 @@ S_backref_value(const char *p, const cha */ -STATIC regnode_offset +static regnode_offset S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) { + PERL_ARGS_ASSERT_REGATOM; + regnode_offset ret = 0; I32 flags = 0; char *atom_parse_start; @@ -5623,8 +5634,6 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat DEBUG_PARSE("atom"); - PERL_ARGS_ASSERT_REGATOM; - tryagain: atom_parse_start = RExC_parse; assert(RExC_parse < RExC_end); @@ -5901,7 +5910,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat RExC_seen_d_op = true; } else if (op == BOUNDL) { - RExC_contains_locale = 1; + RExC_contains_locale = true; } if (invert) { @@ -6203,7 +6212,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat REQUIRE_PARENS_PASS; } } - RExC_sawback = 1; + RExC_sawback = true; ret = reg2node(pRExC_state, ((! FOLD) ? REF @@ -6245,7 +6254,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat assert((RExC_flags & RXf_PMf_EXTENDED) == 0); /* if (RExC_flags & RXf_PMf_EXTENDED) { - RExC_parse_set( reg_skipcomment( pRExC_state, RExC_parse ) ); + RExC_parse_set( reg_skipcomment( pRExC_state, &RExC_parse ) ); if (RExC_parse < RExC_end) goto tryagain; } @@ -6770,7 +6779,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat * existing node, so can start a new node with this one */ if (! len) { node_type = EXACTFL; - RExC_contains_locale = 1; + RExC_contains_locale = true; } else if (node_type == EXACT) { p = oldp; @@ -6804,7 +6813,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat else /* regular fold; see if actually is in a fold */ if ( (ender < 256 && ! IS_IN_SOME_FOLD_L1(ender)) || (ender > 255 - && ! _invlist_contains_cp(PL_in_some_fold, ender))) + && ! invlist_contains_cp_(PL_in_some_fold, ender))) { /* Here, folding, but the character isn't in a fold. * @@ -6847,7 +6856,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat UV folded; fold_anyway: - folded = _to_uni_fold_flags( + folded = to_uni_fold_flags_( ender, (U8 *) s, /* We have allocated extra space in 's' so can't run off the @@ -7155,7 +7164,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat if (UTF) { Size_t added_len; - (void) _to_utf8_fold_flags((U8 *) redo_p, + (void) to_utf8_fold_flags_((U8 *) redo_p, (U8 *) RExC_end, (U8 *) redo_e, &added_len, @@ -7261,7 +7270,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat Size_t added_len; /* Append the fold of ender */ - (void) _to_uni_fold_flags( + (void) to_uni_fold_flags_( ender, (U8 *) e, &added_len, @@ -7304,7 +7313,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat * 'e' (having deliberately reserved enough space * for this eventuality) and drop down to check if * the three actually do form a folded sequence */ - (void) _to_utf8_fold_flags( + (void) to_utf8_fold_flags_( (U8 *) p, (U8 *) RExC_end, (U8 *) e, &added_len, @@ -7437,8 +7446,8 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat if (need_to_fold_loc) { upper_fill = loc_correspondence[s - s_start]; if (upper_fill == 0) { - FAIL2("panic: loc_correspondence[%d] is 0", - (int) (s - s_start)); + FAIL2("panic: loc_correspondence[%td] is 0", + (s - s_start)); } Safefree(locfold_buf); Safefree(loc_correspondence); @@ -7515,7 +7524,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat node_type = EXACTFLU8; } else if (UNLIKELY( - _invlist_contains_cp(PL_HasMultiCharFold, ender))) + invlist_contains_cp_(PL_HasMultiCharFold, ender))) { /* A character that folds to more than one will * match multiple characters, so can't be SIMPLE. @@ -7616,13 +7625,13 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat void Perl_populate_anyof_bitmap_from_invlist(pTHX_ regnode *node, SV** invlist_ptr) { + PERL_ARGS_ASSERT_POPULATE_ANYOF_BITMAP_FROM_INVLIST; + /* Uses the inversion list '*invlist_ptr' to populate the ANYOF 'node'. It * sets up the bitmap and any flags, removing those code points from the * inversion list, setting it to NULL should it become completely empty */ - PERL_ARGS_ASSERT_POPULATE_ANYOF_BITMAP_FROM_INVLIST; - /* There is no bitmap for this node type */ if (REGNODE_TYPE(OP(node)) != ANYOF) { return; @@ -7662,11 +7671,11 @@ Perl_populate_anyof_bitmap_from_invlist( /* Done with loop; remove any code points that are in the bitmap from * *invlist_ptr */ if (change_invlist) { - _invlist_subtract(*invlist_ptr, PL_InBitmap, invlist_ptr); + invlist_subtract_(*invlist_ptr, PL_InBitmap, invlist_ptr); } /* If have completely emptied it, remove it completely */ - if (_invlist_len(*invlist_ptr) == 0) { + if (invlist_len_(*invlist_ptr) == 0) { SvREFCNT_dec_NN(*invlist_ptr); *invlist_ptr = NULL; } @@ -7697,7 +7706,7 @@ Perl_populate_anyof_bitmap_from_invlist( if (posix_warnings) { \ if (! RExC_warn_text ) RExC_warn_text = \ MUTABLE_AV(newSV_type_mortal(SVt_PVAV)); \ - av_push_simple(RExC_warn_text, Perl_newSVpvf(aTHX_ \ + av_push_simple(RExC_warn_text, newSVpvf(\ WARNING_PREFIX \ text \ REPORT_LOCATION, \ @@ -7716,7 +7725,7 @@ Perl_populate_anyof_bitmap_from_invlist( return ret; \ } STMT_END -STATIC int +static int S_handle_possible_posix(pTHX_ RExC_state_t *pRExC_state, const char * const s, /* Where the putative posix class begins. @@ -7730,6 +7739,8 @@ S_handle_possible_posix(pTHX_ RExC_state const bool check_only /* Don't die if error */ ) { + PERL_ARGS_ASSERT_HANDLE_POSSIBLE_POSIX; + /* This parses what the caller thinks may be one of the three POSIX * constructs: * 1) a character class, like [:blank:] @@ -7843,8 +7854,6 @@ S_handle_possible_posix(pTHX_ RExC_state UV input_text[15]; STATIC_ASSERT_DECL(C_ARRAY_LENGTH(input_text) >= sizeof "alphanumeric"); - PERL_ARGS_ASSERT_HANDLE_POSSIBLE_POSIX; - CLEAR_POSIX_WARNINGS(); if (p >= e) { @@ -8182,10 +8191,11 @@ S_handle_possible_posix(pTHX_ RExC_state p++; } else { + Size_t advance; input_text[name_len++] = utf8_to_uv_or_die((const U8 *) p, (const U8 *) e, - NULL); - p+= UTF8SKIP(p); + &advance); + p += advance; } /* The declaration of 'input_text' is how long we allow a potential @@ -8349,7 +8359,7 @@ S_handle_possible_posix(pTHX_ RExC_state * was, but there was a typo. We tease these apart by doing fuzzy * matching on the name */ if (class_number == OOB_NAMEDCLASS && found_problem) { - const UV posix_names[][6] = { + static const UV posix_names[][6] = { { 'a', 'l', 'n', 'u', 'm' }, { 'a', 'l', 'p', 'h', 'a' }, { 'a', 's', 'c', 'i', 'i' }, @@ -8367,7 +8377,7 @@ S_handle_possible_posix(pTHX_ RExC_state }; /* The names of the above all have added NULs to make them the same * size, so we need to also have the real lengths */ - const UV posix_name_lengths[] = { + static const UV posix_name_lengths[] = { sizeof("alnum") - 1, sizeof("alpha") - 1, sizeof("ascii") - 1, @@ -8497,8 +8507,10 @@ S_handle_possible_posix(pTHX_ RExC_state } #undef ADD_POSIX_WARNING -STATIC unsigned int -S_regex_set_precedence(const U8 my_operator) { +static unsigned int +S_regex_set_precedence(const U8 my_operator) +{ + PERL_ARGS_ASSERT_REGEX_SET_PRECEDENCE; /* Returns the precedence in the (?[...]) construct of the input operator, * specified by its character representation. The precedence follows @@ -8525,10 +8537,12 @@ S_regex_set_precedence(const U8 my_opera return 0; /* Silence compiler warning */ } -STATIC regnode_offset +static regnode_offset S_handle_regex_sets(pTHX_ RExC_state_t *pRExC_state, SV** return_invlist, I32 *flagp, U32 depth) { + PERL_ARGS_ASSERT_HANDLE_REGEX_SETS; + /* Handle the (?[...]) construct to do set operations */ U8 curchar; /* Current character being parsed */ @@ -8555,8 +8569,6 @@ S_handle_regex_sets(pTHX_ RExC_state_t * DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_HANDLE_REGEX_SETS; - DEBUG_PARSE("xcls"); if (in_locale) { @@ -8961,16 +8973,16 @@ redo_curchar: switch (stacked_operator) { case '&': - _invlist_intersection(lhs, rhs, &rhs); + invlist_intersection_(lhs, rhs, &rhs); break; case '|': case '+': - _invlist_union(lhs, rhs, &rhs); + invlist_union_(lhs, rhs, &rhs); break; case '-': - _invlist_subtract(lhs, rhs, &rhs); + invlist_subtract_(lhs, rhs, &rhs); break; case '^': /* The union minus the intersection */ @@ -8978,9 +8990,9 @@ redo_curchar: SV* i = NULL; SV* u = NULL; - _invlist_union(lhs, rhs, &u); - _invlist_intersection(lhs, rhs, &i); - _invlist_subtract(u, i, &rhs); + invlist_union_(lhs, rhs, &u); + invlist_intersection_(lhs, rhs, &i); + invlist_subtract_(u, i, &rhs); SvREFCNT_dec_NN(i); SvREFCNT_dec_NN(u); break; @@ -9046,7 +9058,7 @@ redo_curchar: "preceding operand", curchar); } - _invlist_invert(current); + invlist_invert_(current); only_to_avoid_leaks = av_pop(stack); SvREFCNT_dec(only_to_avoid_leaks); @@ -9213,7 +9225,7 @@ redo_curchar: #ifdef ENABLE_REGEX_SETS_DEBUGGING -STATIC void +static void S_dump_regex_sets_structures(pTHX_ RExC_state_t *pRExC_state, AV * stack, const IV fence, AV * fence_stack) { /* Dumps the stacks in handle_regex_sets() */ @@ -9272,6 +9284,8 @@ S_dump_regex_sets_structures(pTHX_ RExC_ void Perl_add_above_Latin1_folds(pTHX_ RExC_state_t *pRExC_state, const U8 cp, SV** invlist) { + PERL_ARGS_ASSERT_ADD_ABOVE_LATIN1_FOLDS; + /* This adds the Latin1/above-Latin1 folding rules. * * This should be called only for a Latin1-range code points, cp, which is @@ -9280,8 +9294,6 @@ Perl_add_above_Latin1_folds(pTHX_ RExC_s * Multi-char folds are outside the scope of this, and must be handled * specially. */ - PERL_ARGS_ASSERT_ADD_ABOVE_LATIN1_FOLDS; - assert(HAS_NONLATIN1_SIMPLE_FOLD_CLOSURE(cp)); /* The rules that are valid for all Unicode versions are hard-coded in */ @@ -9322,14 +9334,14 @@ Perl_add_above_Latin1_folds(pTHX_ RExC_s else { U8 dummy_fold[UTF8_MAXBYTES_CASE+1]; Size_t dummy_len; - folded_cp = _to_fold_latin1(cp, dummy_fold, &dummy_len, 0); + folded_cp = to_fold_latin1_(cp, dummy_fold, &dummy_len, 0); } if (folded_cp > 255) { *invlist = add_cp_to_invlist(*invlist, folded_cp); } - folds_count = _inverse_folds(folded_cp, &first_fold, + folds_count = inverse_folds_(folded_cp, &first_fold, &remaining_folds); if (folds_count == 0) { @@ -9359,17 +9371,17 @@ Perl_add_above_Latin1_folds(pTHX_ RExC_s #endif /* PERL_RE_BUILD_AUX */ -STATIC void +static void S_output_posix_warnings(pTHX_ RExC_state_t *pRExC_state, AV* posix_warnings) { + PERL_ARGS_ASSERT_OUTPUT_POSIX_WARNINGS; + /* Output the elements of the array given by '*posix_warnings' as REGEXP * warnings. */ SV * msg; const bool first_is_fatal = ckDEAD(packWARN(WARN_REGEXP)); - PERL_ARGS_ASSERT_OUTPUT_POSIX_WARNINGS; - if (! TO_OUTPUT_WARNINGS(RExC_parse)) { CLEAR_POSIX_WARNINGS(); return; @@ -9382,7 +9394,7 @@ S_output_posix_warnings(pTHX_ RExC_state fail-safe */ (void) sv_2mortal(msg); } - Perl_warner(aTHX_ packWARN(WARN_REGEXP), "%s", SvPVX(msg)); + warner(packWARN(WARN_REGEXP), "%s", SvPVX(msg)); SvREFCNT_dec_NN(msg); } @@ -9392,11 +9404,11 @@ S_output_posix_warnings(pTHX_ RExC_state PERL_STATIC_INLINE Size_t S_find_first_differing_byte_pos(const U8 * s1, const U8 * s2, const Size_t max) { + PERL_ARGS_ASSERT_FIND_FIRST_DIFFERING_BYTE_POS; + const U8 * const start = s1; const U8 * const send = start + max; - PERL_ARGS_ASSERT_FIND_FIRST_DIFFERING_BYTE_POS; - while (s1 < send && *s1 == *s2) { s1++; s2++; } @@ -9404,9 +9416,11 @@ S_find_first_differing_byte_pos(const U8 return s1 - start; } -STATIC AV * +static AV * S_add_multi_match(pTHX_ AV* multi_char_matches, SV* multi_string, const STRLEN cp_count) { + PERL_ARGS_ASSERT_ADD_MULTI_MATCH; + /* This adds the string scalar to the array * . is known to have exactly * code points in it. This is used when constructing a @@ -9431,8 +9445,6 @@ S_add_multi_match(pTHX_ AV* multi_char_m AV* this_array; AV** this_array_ptr; - PERL_ARGS_ASSERT_ADD_MULTI_MATCH; - if (! multi_char_matches) { multi_char_matches = newAV(); } @@ -9463,17 +9475,49 @@ S_add_multi_match(pTHX_ AV* multi_char_m * * There is a line below that uses the same white space criteria but is outside * this macro. Both here and there must use the same definition */ -#define SKIP_BRACKETED_WHITE_SPACE(do_skip, p, stop_p) \ - STMT_START { \ - if (do_skip) { \ - while (p < stop_p && isBLANK_A(UCHARAT(p))) \ - { \ - p++; \ - } \ - } \ - } STMT_END -STATIC regnode_offset +static void +S_skip_bracketed_white_space(pTHX_ RExC_state_t *pRExC_state, + U8 do_skip, + const char * p_start, + char ** p, + char * stop_p) +{ + PERL_ARGS_ASSERT_SKIP_BRACKETED_WHITE_SPACE; + + if (! do_skip) { + return; + } + + if (! FEATURE_ENHANCED_XX_IS_ENABLED) { + while (*p < stop_p && isBLANK_A(UCHARAT(*p))) { + (*p)++; + } + } + else { + + /* With this feature, vertical space is allowed (isSPACE_A() vs the + * isBLANK_A() above, and we have to take into account the possibility + * of comments, and vertical space */ + while (*p < stop_p) { + if (**p == '#') { + reg_skipcomment(pRExC_state, + p_start, + p, + stop_p, + "]"); + } + + if (! isSPACE_A((**p))) { + break; + } + + (*p)++; + } + } +} + +static regnode_offset S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth, const bool stop_at_1, /* Just parse the next thing, don't look for a full character class */ @@ -9487,6 +9531,9 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta SV** ret_invlist /* Return an inversion list, not a node */ ) { + PERL_ARGS_ASSERT_REGCLASS; + assert(! (ret_invlist && allow_mutiple_chars)); + /* parse a bracketed class specification. Most of these will produce an * ANYOF node; but something like [a] will produce an EXACT node; [aA], an * EXACTFish node; [[:ascii:]], a POSIXA node; etc. It is more complex @@ -9614,11 +9661,9 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_REGCLASS; #ifndef DEBUGGING PERL_UNUSED_ARG(depth); #endif - assert(! (ret_invlist && allow_mutiple_chars)); /* If wants an inversion list returned, we can't optimize to something @@ -9637,11 +9682,12 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta /* We include the /i status at the beginning of this so that we can * know it at runtime */ - listsv = sv_2mortal(Perl_newSVpvf(aTHX_ "#%d\n", cBOOL(FOLD))); + listsv = sv_2mortal(newSVpvf("#%d\n", cBOOL(FOLD))); initial_listsv_len = SvCUR(listsv); SvTEMP_off(listsv); /* Grr, TEMPs and mortals are conflated. */ - SKIP_BRACKETED_WHITE_SPACE(skip_white, RExC_parse, RExC_end); + skip_bracketed_white_space(pRExC_state, skip_white, orig_parse, + &RExC_parse, RExC_end); assert(RExC_parse <= RExC_end); @@ -9650,7 +9696,8 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta invert = true; allow_mutiple_chars = false; MARK_NAUGHTY(1); - SKIP_BRACKETED_WHITE_SPACE(skip_white, RExC_parse, RExC_end); + skip_bracketed_white_space(pRExC_state, skip_white, orig_parse, + &RExC_parse, RExC_end); } /* Check that they didn't say [:posix:] instead of [[:posix:]] */ @@ -9697,7 +9744,8 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta output_posix_warnings(pRExC_state, posix_warnings); } - SKIP_BRACKETED_WHITE_SPACE(skip_white, RExC_parse, RExC_end); + skip_bracketed_white_space(pRExC_state, skip_white, orig_parse, + &RExC_parse, RExC_end); if (RExC_parse >= stop_ptr) { break; @@ -9768,12 +9816,6 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta do_posix_warnings ? &posix_warnings : NULL, true /* checking only */); } - else if ( strict && ! skip_white - && ( generic_isCC_(value, CC_VERTSPACE_) - || is_VERTWS_cp_high(value))) - { - vFAIL("Literal vertical space in [] is illegal except under /x"); - } else if (value == '\\') { /* Is a backslash; get the code point of the char after it */ @@ -9982,8 +10024,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta RExC_utf8 = true; } /* diag_listed_as: Can't find Unicode property definition "%s" in regex; marked by <-- HERE in m/%s/ */ - vFAIL2utf8f("%" UTF8f, UTF8fARG(SvUTF8(msg), - SvCUR(msg), SvPVX(msg))); + vFAIL2utf8f("%" SVf, SVfARG(msg)); } assert(prop_definition || strings); @@ -10090,8 +10131,8 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta * if the match would return true, except don't * warn for \p{All}, which has exactly one element * = 0 */ - (_invlist_contains_cp(prop_definition, 0x110000) - && (! (_invlist_len(prop_definition) == 1 + (invlist_contains_cp_(prop_definition, 0x110000) + && (! (invlist_len_(prop_definition) == 1 && *invlist_array(prop_definition) == 0)))) { warn_super = true; @@ -10099,12 +10140,12 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta /* Invert if asking for the complement */ if (value == 'P') { - _invlist_union_complement_2nd(properties, + invlist_union_complement_2nd_(properties, prop_definition, &properties); } else { - _invlist_union(properties, prop_definition, &properties); + invlist_union_(properties, prop_definition, &properties); } } } @@ -10215,7 +10256,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta } default: /* Allow \_ to not give an error */ - if (isWORDCHAR(value) && value != '_') { + if (isALPHANUMERIC_A(value)) { if (strict) { vFAIL2("Unrecognized escape \\%c in character class", (int)value); @@ -10229,6 +10270,28 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta break; } /* End of switch on char following backslash */ } /* end of handling backslash escape sequences */ + else if ( generic_isCC_(value, CC_VERTSPACE_) + || is_VERTWS_cp_high(value)) + { + if (strict && ! skip_white) { + vFAIL("Literal vertical space in [] is illegal except" + " under /x"); + } + else if ( RExC_flags & RXf_PMf_EXTENDED_MORE + && ! FEATURE_ENHANCED_XX_IS_ENABLED) + { + ckWARNdep(RExC_parse, WARN_DEPRECATED, + "Use of literal vertical space in [] is" + " deprecated under /xx"); + } + } + else if ( value == '#' + && RExC_flags & RXf_PMf_EXTENDED_MORE + && ! FEATURE_ENHANCED_XX_IS_ENABLED) + { + ckWARNdep(RExC_parse, WARN_DEPRECATED, + "Use of unescaped '#' in [] is deprecated under /xx"); + } /* Here, we have the current token in 'value' */ @@ -10284,7 +10347,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta * trust that the locale is well behaved, we leave this to * runtime to sort out) */ if (POSIXL_TEST(posixl, namedclass ^ 1)) { - cp_list = _add_range_to_invlist(cp_list, 0, UV_MAX); + cp_list = add_range_to_invlist_(cp_list, 0, UV_MAX); POSIXL_ZERO(posixl); has_runtime_dependency &= ~HAS_L_RUNTIME_DEPENDENCY; anyof_flags &= ~ANYOF_MATCHES_POSIXL; @@ -10303,7 +10366,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta /* Get the list of the above-Latin1 code points this * matches */ - _invlist_intersection_maybe_complement_2nd(PL_AboveLatin1, + invlist_intersection_maybe_complement_2nd_(PL_AboveLatin1, PL_XPosix_ptrs[classnum], /* Odd numbers are complements, @@ -10318,7 +10381,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta cp_list = scratch_list; } else { - _invlist_union(cp_list, scratch_list, &cp_list); + invlist_union_(cp_list, scratch_list, &cp_list); SvREFCNT_dec_NN(scratch_list); } continue; /* Go get next character */ @@ -10343,7 +10406,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta classnum = CC_BLANK_; } - _invlist_union_maybe_complement_2nd( + invlist_union_maybe_complement_2nd_( cp_list, PL_XPosix_ptrs[classnum], namedclass % 2 != 0, /* Complement if odd @@ -10365,7 +10428,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta * runtime differences under /d. So we can special case * these, and avoid some extra work below, and at runtime. * */ - _invlist_union_maybe_complement_2nd( + invlist_union_maybe_complement_2nd_( simple_posixes, ((AT_LEAST_ASCII_RESTRICTED) ? PL_Posix_ptrs[classnum] @@ -10378,7 +10441,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta SV** posixes_ptr = namedclass % 2 == 0 ? &posixes : &nposixes; - _invlist_union_maybe_complement_2nd( + invlist_union_maybe_complement_2nd_( *posixes_ptr, PL_XPosix_ptrs[classnum], namedclass % 2 != 0, @@ -10387,7 +10450,8 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta } } /* end of namedclass \blah */ - SKIP_BRACKETED_WHITE_SPACE(skip_white, RExC_parse, RExC_end); + skip_bracketed_white_space(pRExC_state, skip_white, orig_parse, + &RExC_parse, RExC_end); /* If 'range' is set, 'value' is the ending of a range--check its * validity. (If value isn't a single code point in the case of a @@ -10430,7 +10494,9 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta char* next_char_ptr = RExC_parse + 1; /* Get the next real char after the '-' */ - SKIP_BRACKETED_WHITE_SPACE(skip_white, next_char_ptr, RExC_end); + skip_bracketed_white_space(pRExC_state, skip_white, + orig_parse, &next_char_ptr, + RExC_end); /* If the '-' is at the end of the class (just before the ']', * it is a literal minus; otherwise it is a range */ @@ -10500,7 +10566,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta * See [perl #89750] */ if (FOLD && allow_mutiple_chars && value == prevvalue) { if ( value == LATIN_SMALL_LETTER_SHARP_S - || (value > 255 && _invlist_contains_cp(PL_HasMultiCharFold, + || (value > 255 && invlist_contains_cp_(PL_HasMultiCharFold, value))) { /* Here is indeed a multi-char fold. Get what it is */ @@ -10508,7 +10574,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta U8 foldbuf[UTF8_MAXBYTES_CASE+1]; STRLEN foldlen; - UV folded = _to_uni_fold_flags( + UV folded = to_uni_fold_flags_( value, foldbuf, &foldlen, @@ -10632,7 +10698,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta * algorithm is just to check if both end points * are in the same series, which is the same range. * */ - index_start = _invlist_search( + index_start = invlist_search_( PL_XPosix_ptrs[CC_DIGIT_], prevvalue); @@ -10641,7 +10707,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta if ( index_start >= 0 && ELEMENT_RANGE_MATCHES_INVLIST(index_start) && (index_final = - _invlist_search(PL_XPosix_ptrs[CC_DIGIT_], + invlist_search_(PL_XPosix_ptrs[CC_DIGIT_], value)) != index_start && index_final >= 0 && ELEMENT_RANGE_MATCHES_INVLIST(index_final)) @@ -10686,7 +10752,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta /* Deal with this element of the class */ #ifndef EBCDIC - cp_foldable_list = _add_range_to_invlist(cp_foldable_list, + cp_foldable_list = add_range_to_invlist_(cp_foldable_list, prevvalue, value); #else /* On non-ASCII platforms, for ranges that span all of 0..255, and ones @@ -10700,7 +10766,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta || (isUPPER_A(prevvalue) && isUPPER_A(value))))))) { - cp_foldable_list = _add_range_to_invlist(cp_foldable_list, + cp_foldable_list = add_range_to_invlist_(cp_foldable_list, prevvalue, value); } else { @@ -10718,7 +10784,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta cp_foldable_list = add_cp_to_invlist(cp_foldable_list, LATIN1_TO_NATIVE(j)); } if (value > 255) { - cp_foldable_list = _add_range_to_invlist(cp_foldable_list, + cp_foldable_list = add_range_to_invlist_(cp_foldable_list, 256, value); } } @@ -10822,7 +10888,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta RExC_parse_set( RExC_start ); RExC_copy_start_in_constructed = RExC_start + constructed_prefix_len; RExC_end = RExC_parse + len; - RExC_in_multi_char_class = 1; + RExC_in_multi_char_class = true; ret = reg(pRExC_state, 1, ®_flags, depth+1); @@ -10832,7 +10898,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta RExC_parse_set(save_parse); RExC_start = RExC_copy_start_in_constructed = RExC_copy_start_in_input = save_start; RExC_end = save_end; - RExC_in_multi_char_class = 0; + RExC_in_multi_char_class = false; SvREFCNT_dec_NN(multi_char_matches); SvREFCNT_dec(properties); SvREFCNT_dec(cp_list); @@ -10869,7 +10935,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta * be checked. Get the intersection of this class and all the * possible characters that are foldable. This can quickly narrow * down a large class */ - _invlist_intersection(PL_in_some_fold, cp_foldable_list, + invlist_intersection_(PL_in_some_fold, cp_foldable_list, &fold_intersection); /* Now look at the foldable characters in this class individually */ @@ -10929,7 +10995,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta * rules hard-coded for it. First, get its fold. This is * the simple fold, as the multi-character folds have been * handled earlier and separated out */ - folded = _to_uni_fold_flags(j, foldbuf, &foldlen, + folded = to_uni_fold_flags_(j, foldbuf, &foldlen, (ASCII_FOLD_RESTRICTED) ? FOLD_FLAGS_NOMIX_ASCII : 0); @@ -10937,7 +11003,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta /* Single character fold of above Latin1. Add everything * in its fold closure to the list that this node should * match. */ - folds_count = _inverse_folds(folded, &first_fold, + folds_count = inverse_folds_(folded, &first_fold, &remaining_folds); for (k = 0; k <= folds_count; k++) { UV c = (k == 0) /* First time through use itself */ @@ -10983,7 +11049,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta /* Now that we have finished adding all the folds, there is no reason * to keep the foldable list separate */ - _invlist_union(cp_list, cp_foldable_list, &cp_list); + invlist_union_(cp_list, cp_foldable_list, &cp_list); SvREFCNT_dec_NN(cp_foldable_list); } @@ -10993,7 +11059,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta if (simple_posixes) { /* These are the classes known to be unaffected by /a, /aa, and /d */ if (cp_list) { - _invlist_union(cp_list, simple_posixes, &cp_list); + invlist_union_(cp_list, simple_posixes, &cp_list); SvREFCNT_dec_NN(simple_posixes); } else { @@ -11007,7 +11073,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta * 'nposixes' to the main list */ if (posixes) { if (cp_list) { - _invlist_union(cp_list, posixes, &cp_list); + invlist_union_(cp_list, posixes, &cp_list); SvREFCNT_dec_NN(posixes); } else { @@ -11016,7 +11082,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta } if (nposixes) { if (cp_list) { - _invlist_union(cp_list, nposixes, &cp_list); + invlist_union_(cp_list, nposixes, &cp_list); SvREFCNT_dec_NN(nposixes); } else { @@ -11039,7 +11105,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta * matched regardless, so can just be added to the * unconditional list */ if (cp_list) { - _invlist_union(cp_list, nposixes, &cp_list); + invlist_union_(cp_list, nposixes, &cp_list); SvREFCNT_dec_NN(nposixes); nposixes = NULL; } @@ -11048,13 +11114,13 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta } /* Likewise for 'posixes' */ - _invlist_union(posixes, cp_list, &cp_list); + invlist_union_(posixes, cp_list, &cp_list); SvREFCNT_dec(posixes); /* Likewise for anything else in the range that matched only * under UTF-8 */ if (upper_latin1_only_utf8_matches) { - _invlist_union(cp_list, + invlist_union_(cp_list, upper_latin1_only_utf8_matches, &cp_list); SvREFCNT_dec_NN(upper_latin1_only_utf8_matches); @@ -11064,9 +11130,9 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta /* If we don't match all the upper Latin1 characters regardless * of UTF-8ness, we have to set a flag to match the rest when * not in UTF-8 */ - _invlist_subtract(only_non_utf8_list, cp_list, + invlist_subtract_(only_non_utf8_list, cp_list, &only_non_utf8_list); - if (_invlist_len(only_non_utf8_list) != 0) { + if (invlist_len_(only_non_utf8_list) != 0) { anyof_flags |= ANYOFD_NON_UTF8_MATCHES_ALL_NON_ASCII__shared; } SvREFCNT_dec_NN(only_non_utf8_list); @@ -11080,21 +11146,21 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta * * First calculate what they are */ SV* nonascii_but_latin1_properties = NULL; - _invlist_intersection(posixes, PL_UpperLatin1, + invlist_intersection_(posixes, PL_UpperLatin1, &nonascii_but_latin1_properties); /* And add them to the final list of such characters. */ - _invlist_union(upper_latin1_only_utf8_matches, + invlist_union_(upper_latin1_only_utf8_matches, nonascii_but_latin1_properties, &upper_latin1_only_utf8_matches); /* Remove them from what now becomes the unconditional list */ - _invlist_subtract(posixes, nonascii_but_latin1_properties, + invlist_subtract_(posixes, nonascii_but_latin1_properties, &posixes); /* And add those unconditional ones to the final list */ if (cp_list) { - _invlist_union(cp_list, posixes, &cp_list); + invlist_union_(cp_list, posixes, &cp_list); SvREFCNT_dec_NN(posixes); posixes = NULL; } @@ -11107,10 +11173,10 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta /* Get rid of any characters from the conditional list that we * now know are matched unconditionally, which may make that * list empty */ - _invlist_subtract(upper_latin1_only_utf8_matches, + invlist_subtract_(upper_latin1_only_utf8_matches, cp_list, &upper_latin1_only_utf8_matches); - if (_invlist_len(upper_latin1_only_utf8_matches) == 0) { + if (invlist_len_(upper_latin1_only_utf8_matches) == 0) { SvREFCNT_dec_NN(upper_latin1_only_utf8_matches); upper_latin1_only_utf8_matches = NULL; } @@ -11144,7 +11210,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta ^ (UNICODE_IS_SUPER(invlist_highest(cp_list)))); } - _invlist_union(properties, cp_list, &cp_list); + invlist_union_(properties, cp_list, &cp_list); SvREFCNT_dec_NN(properties); } else { @@ -11179,19 +11245,19 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta * other components. Remove them, and clean up the list if it goes to * 0 elements */ if (only_utf8_locale_list && cp_list) { - _invlist_subtract(only_utf8_locale_list, cp_list, + invlist_subtract_(only_utf8_locale_list, cp_list, &only_utf8_locale_list); - if (_invlist_len(only_utf8_locale_list) == 0) { + if (invlist_len_(only_utf8_locale_list) == 0) { SvREFCNT_dec_NN(only_utf8_locale_list); only_utf8_locale_list = NULL; } } if ( only_utf8_locale_list || ( cp_list - && ( _invlist_contains_cp(cp_list, + && ( invlist_contains_cp_(cp_list, LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE) - || _invlist_contains_cp(cp_list, + || invlist_contains_cp_(cp_list, LATIN_SMALL_LETTER_DOTLESS_I)))) { has_runtime_dependency |= HAS_L_RUNTIME_DEPENDENCY; @@ -11205,8 +11271,8 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta /* In a Turkish locale these could match, notify the run-time code * to check for that */ - if ( _invlist_contains_cp(cp_list, 'I') - || _invlist_contains_cp(cp_list, 'i')) + if ( invlist_contains_cp_(cp_list, 'I') + || invlist_contains_cp_(cp_list, 'i')) { anyof_flags |= ANYOFL_FOLD|ANYOF_HAS_EXTRA_RUNTIME_MATCHES; } @@ -11227,7 +11293,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta && invert && ! has_runtime_dependency) { - _invlist_invert(cp_list); + invlist_invert_(cp_list); /* Clear the invert flag since have just done it here */ invert = false; @@ -11245,7 +11311,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta } if (anyof_flags & ANYOF_LOCALE_FLAGS) { - RExC_contains_locale = 1; + RExC_contains_locale = true; } if (optimizable) { @@ -11317,7 +11383,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta * */ if (upper_latin1_only_utf8_matches) { if (cp_list) { - _invlist_union(cp_list, + invlist_union_(cp_list, upper_latin1_only_utf8_matches, &cp_list); SvREFCNT_dec_NN(upper_latin1_only_utf8_matches); @@ -11339,7 +11405,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta return ret; } -STATIC U8 +static U8 S_optimize_regclass(pTHX_ RExC_state_t *pRExC_state, SV * cp_list, @@ -11353,6 +11419,8 @@ S_optimize_regclass(pTHX_ I32 *flagp ) { + PERL_ARGS_ASSERT_OPTIMIZE_REGCLASS; + /* This function exists just to make S_regclass() smaller. It extracts out * the code that looks for potential optimizations away from a full generic * ANYOF node. The parameter names are the same as the corresponding @@ -11375,8 +11443,6 @@ S_optimize_regclass(pTHX_ bool single_range = false; UV lowest_cp = 0, highest_cp = 0; - PERL_ARGS_ASSERT_OPTIMIZE_REGCLASS; - if (cp_list) { /* Count the code points in enough ranges that we would see all the ones possible in any fold in this version of Unicode */ @@ -11460,12 +11526,12 @@ S_optimize_regclass(pTHX_ * the constructed node list is inverted, and restricted to only * the above latin1 code points, which are the only ones known at * compile time */ - _invlist_intersection_maybe_complement_2nd( + invlist_intersection_maybe_complement_2nd_( PL_AboveLatin1, PL_XPosix_ptrs[classnum], already_inverted, &class_above_latin1); - are_equivalent = _invlistEQ(class_above_latin1, cp_list, false); + are_equivalent = invlistEQ_(class_above_latin1, cp_list, false); SvREFCNT_dec_NN(class_above_latin1); if (are_equivalent) { @@ -11589,7 +11655,7 @@ S_optimize_regclass(pTHX_ else { /* /i, larger code point. Since we are under /i, and have just this code point, we know that it can't fold to something else, so PL_InMultiCharFold applies to it */ - op = (_invlist_contains_cp(PL_InMultiCharFold, lowest_cp)) + op = (invlist_contains_cp_(PL_InMultiCharFold, lowest_cp)) ? EXACTFU_REQ8 : EXACT_REQ8; } @@ -11597,7 +11663,7 @@ S_optimize_regclass(pTHX_ value = lowest_cp; } else if ( ! (has_runtime_dependency & ~HAS_D_RUNTIME_DEPENDENCY) - && _invlist_contains_cp(PL_in_some_fold, lowest_cp)) + && invlist_contains_cp_(PL_in_some_fold, lowest_cp)) { /* Here, the only runtime dependency, if any, is from /d, and the * class matches more than one code point, and the lowest code @@ -11650,7 +11716,7 @@ S_optimize_regclass(pTHX_ } } else if ( ! upper_latin1_only_utf8_matches - || ( _invlist_len(upper_latin1_only_utf8_matches) == 2 + || ( invlist_len_(upper_latin1_only_utf8_matches) == 2 && PL_fold_latin1[ invlist_highest(upper_latin1_only_utf8_matches)] == lowest_cp)) @@ -11687,15 +11753,15 @@ S_optimize_regclass(pTHX_ Size_t foldlen; U8 foldbuf[UTF8_MAXBYTES_CASE]; - UV folded = _to_uni_fold_flags(lowest_cp, foldbuf, &foldlen, 0); + UV folded = to_uni_fold_flags_(lowest_cp, foldbuf, &foldlen, 0); U32 first_fold; const U32 * remaining_folds; - Size_t folds_to_this_cp_count = _inverse_folds( + Size_t folds_to_this_cp_count = inverse_folds_( folded, &first_fold, &remaining_folds); Size_t folds_count = folds_to_this_cp_count + 1; - SV * fold_list = _new_invlist(folds_count); + SV * fold_list = new_invlist_(folds_count); unsigned int i; /* If there are UTF-8 dependent matches, create a temporary @@ -11704,9 +11770,9 @@ S_optimize_regclass(pTHX_ SV ** use_this_list = &cp_list; if (upper_latin1_only_utf8_matches) { - all_cp_list = _new_invlist(0); + all_cp_list = new_invlist_(0); use_this_list = &all_cp_list; - _invlist_union(cp_list, + invlist_union_(cp_list, upper_latin1_only_utf8_matches, use_this_list); } @@ -11726,7 +11792,7 @@ S_optimize_regclass(pTHX_ /* If the fold list is identical to what's in this ANYOF node, * the node can be represented by an EXACTFish one instead */ - if (_invlistEQ(*use_this_list, fold_list, + if (invlistEQ_(*use_this_list, fold_list, 0 /* Don't complement */ ) ) { @@ -11741,7 +11807,7 @@ S_optimize_regclass(pTHX_ * are folding, and if not, if it is not part of a * multi-char fold. */ if (lowest_cp > 255) { /* Highish code point */ - if (FOLD || ! _invlist_contains_cp( + if (FOLD || ! invlist_contains_cp_( PL_InMultiCharFold, folded)) { op = (LOC) @@ -11811,7 +11877,7 @@ S_optimize_regclass(pTHX_ /* This is a kludge to the special casing issues with this * ligature under /aa. FB05 should fold to FB06, but the call - * above to _to_uni_fold_flags() didn't find this, as it didn't + * above to to_uni_fold_flags_() didn't find this, as it didn't * use the /aa restriction in order to not miss other folds * that would be affected. This is the only instance likely to * ever be a problem in all of Unicode. So special case it. */ @@ -11872,7 +11938,7 @@ S_optimize_regclass(pTHX_ * that works we will instead later generate an NANYOFM, and invert * back when through */ if (highest_cp > max_permissible) { - _invlist_invert(cp_list); + invlist_invert_(cp_list); inverted = 1; } @@ -11948,7 +12014,7 @@ S_optimize_regclass(pTHX_ } if (inverted) { - _invlist_invert(cp_list); + invlist_invert_(cp_list); } if (op != END) { @@ -12019,9 +12085,9 @@ S_optimize_regclass(pTHX_ /* /d classes don't match anything non-ASCII below 256 * unconditionally (which cp_list contains) */ - _invlist_intersection(cp_list, PL_UpperLatin1, + invlist_intersection_(cp_list, PL_UpperLatin1, &intersection); - if (_invlist_len(intersection) != 0) { + if (invlist_len_(intersection) != 0) { continue; } @@ -12033,7 +12099,7 @@ S_optimize_regclass(pTHX_ * we check below that these are identical to what the * tested class should match */ if (upper_latin1_only_utf8_matches) { - _invlist_union( + invlist_union_( d_invlist, upper_latin1_only_utf8_matches, &d_invlist); @@ -12056,7 +12122,7 @@ S_optimize_regclass(pTHX_ * ('*our_code_points') precisely matches those of the * class we are currently checking against * ('*official_code_points'). */ - if (_invlistEQ(*our_code_points, + if (invlistEQ_(*our_code_points, *official_code_points, try_inverted)) { @@ -12170,7 +12236,7 @@ S_optimize_regclass(pTHX_ Size_t high_len = uv_to_utf8(high_utf8, highest_cp) - high_utf8; /* If the lowest and highest are the same, we can get an exact - * first byte instead of a just minimum or even a sequence of exact + * first byte instead of just a minimum or even a sequence of exact * leading bytes. We signal these with different regnodes */ if (low_utf8[0] == high_utf8[0]) { Size_t len = find_first_differing_byte_pos(low_utf8, @@ -12287,6 +12353,8 @@ Perl_set_ANYOF_arg(pTHX_ RExC_state_t* c SV* const runtime_defns, SV* const only_utf8_locale_list) { + PERL_ARGS_ASSERT_SET_ANYOF_ARG; + /* Sets the arg field of an ANYOF-type node 'node', using information about * the node passed-in. If only the bitmap is needed to determine what * matches, the arg is set appropriately to either @@ -12305,8 +12373,6 @@ Perl_set_ANYOF_arg(pTHX_ RExC_state_t* c UV n; - PERL_ARGS_ASSERT_SET_ANYOF_ARG; - /* If this is set, the final disposition won't be known until runtime, so * we can't do any of the compile time optimizations */ if (! runtime_defns) { @@ -12373,7 +12439,7 @@ Perl_set_ANYOF_arg(pTHX_ RExC_state_t* c } /* If the inversion lists aren't equivalent, can't share */ - if (cp_list && ! _invlistEQ(cp_list, + if (cp_list && ! invlistEQ_(cp_list, *stored_cp_list_ptr, false /* don't complement */)) { @@ -12391,7 +12457,7 @@ Perl_set_ANYOF_arg(pTHX_ RExC_state_t* c continue; } - if (only_utf8_locale_list && ! _invlistEQ( + if (only_utf8_locale_list && ! invlistEQ_( only_utf8_locale_list, *stored_only_utf8_locale_list_ptr, false /* don't complement */)) @@ -12447,6 +12513,14 @@ Perl_get_re_gclass_aux_data(pTHX_ const #endif { + +#if !defined(PERL_IN_XSUB_RE) || defined(PLUGGABLE_RE_EXTENSION) + PERL_ARGS_ASSERT_GET_REGCLASS_AUX_DATA; +#else + PERL_ARGS_ASSERT_GET_RE_GCLASS_AUX_DATA; +#endif + assert(! output_invlist || listsvp); + /* For internal core use only. * Returns the inversion list for the input 'node' in the regex 'prog'. * If is 'true', will attempt to create the inversion list if not @@ -12483,13 +12557,6 @@ Perl_get_re_gclass_aux_data(pTHX_ const RXi_GET_DECL_NULL(prog, progi); const struct reg_data * const data = prog ? progi->data : NULL; -#if !defined(PERL_IN_XSUB_RE) || defined(PLUGGABLE_RE_EXTENSION) - PERL_ARGS_ASSERT_GET_REGCLASS_AUX_DATA; -#else - PERL_ARGS_ASSERT_GET_RE_GCLASS_AUX_DATA; -#endif - assert(! output_invlist || listsvp); - if (data && data->count) { const U32 n = ARG1u(node); @@ -12529,12 +12596,11 @@ Perl_get_re_gclass_aux_data(pTHX_ const if (SvCUR(msg)) { assert(prop_definition == NULL); - croak("%" UTF8f, - UTF8fARG(SvUTF8(msg), SvCUR(msg), SvPVX(msg))); + croak_sv(msg); } if (invlist) { - _invlist_union(invlist, prop_definition, &invlist); + invlist_union_(invlist, prop_definition, &invlist); SvREFCNT_dec_NN(prop_definition); } else { @@ -12605,7 +12671,7 @@ Perl_get_re_gclass_aux_data(pTHX_ const * up to the next \n */ if ( *(si_string + len) == '\n') { if (count) { /* 2nd code point on line */ - *output_invlist = _add_range_to_invlist(*output_invlist, prev_cp, cp); + *output_invlist = add_range_to_invlist_(*output_invlist, prev_cp, cp); } else { *output_invlist = add_cp_to_invlist(*output_invlist, cp); @@ -12681,7 +12747,7 @@ Perl_get_re_gclass_aux_data(pTHX_ const *output_invlist = invlist_clone(invlist, NULL); } else { - _invlist_union(*output_invlist, invlist, output_invlist); + invlist_union_(*output_invlist, invlist, output_invlist); } } @@ -12693,42 +12759,146 @@ Perl_get_re_gclass_aux_data(pTHX_ const /* reg_skipcomment() - Absorbs an /x style # comment from the input stream, - returning a pointer to the first character beyond the comment, or if the - comment terminates the pattern without anything following it, this returns - one past the final character of the pattern (in other words, RExC_end) and - sets the REG_RUN_ON_COMMENT_SEEN flag. + Absorbs an /x style '#" comment from the input stream, advancing the stream + to the first character beyond the comment. + + If 'check_for_R_bracket' is true, it is being called while parsing a + bracketed character class, and checks that no unescaped, unquoted ']' is in + the comment, warning if one is found there. + + Otherwise, it handles the case of the comment terminating the pattern + without anything following it. If so, it sets the parse to RExC_end (which + should be one byte following the final byte of the pattern) and also sets + the REG_RUN_ON_COMMENT_SEEN flag. Note it's the callers responsibility to ensure that we are actually in /x mode */ -PERL_STATIC_INLINE char* -S_reg_skipcomment(RExC_state_t *pRExC_state, char* p) +PERL_STATIC_INLINE void +S_reg_skipcomment(pTHX_ RExC_state_t *pRExC_state, + const char *p_start, + char ** p, + char *p_end, + bool check_for_R_bracket) { PERL_ARGS_ASSERT_REG_SKIPCOMMENT; + assert(**p == '#'); + + /* Some people like to string multiple '#'s together to mark a comment */ + char * p0 = *p; + do { + (*p)++; + } while (**p == '#'); + + bool warned = false; + + /* With this feature, it's suspicious if a comment: + * 1) isn't surrounded by horizontal white space; or + * 2) isn't the final character on the line; or + * 3) isn't multiple '#'s in a row + **/ + if (FEATURE_ENHANCED_XX_IS_ENABLED && *p == p0 + 1) { + if ( (*p < p_end && **p != '\n' && ! isBLANK(**p)) + || (*p > p_start + 1 && ! isBLANK(*(*p - 2)))) + { + vWARN(*p, "Did you mean this to be a comment?\nIf so, to" + " silence this message add blanks like so: \"" + " # \"\n"); + warned = true; + } + } + + bool quoted = false; + size_t backslash_count = 0; + + /* Absorb the text up to and including the next \n */ + while (*p < p_end) { + if (**p == '\n') { + (*p)++; + return; + } + + /* Without this feature, all characters get absorbed. With it, some + * characters need special attention, unless we've already raised a + * warning */ + if ( ! FEATURE_ENHANCED_XX_IS_ENABLED + || warned + || ! strchr("\\'\"#]", **p)) + { + (*p)++; - assert(*p == '#'); + backslash_count = 0; + quoted = false; + continue; + } - while (p < RExC_end) { - if (*(++p) == '\n') { - return p+1; + /* Keep track of how many sequential backslashes we've found */ + if (**p == '\\') { + backslash_count++; + quoted = false; + (*p)++; + continue; } + + /* Note that the current character is a quote */ + if (**p == '"' || **p == '\'') { + quoted = isEVEN(backslash_count); + backslash_count = 0; + (*p)++; + continue; + } + + /* If the previous character was a quote, or there were an odd number + * of backslashes just before this character, this character is + * considered to be escaped */ + bool isnt_a_problem = isODD(backslash_count) || quoted; + + /* Here it isn't a backslash nor a quote, so reset for next iteration. + * */ + backslash_count = 0; + quoted = false; + + /* Done with this character if not a problem */ + if (isnt_a_problem) { + (*p)++; + continue; + } + + /* When a problematic second '#' is encountered, warn. But a final + * '#' on the line isn't considered problematic */ + if (**p == '#' && (*p < p_end - 1 || *p_end == '\0')) { + vWARN(*p + 1, "Did you mean to have a second '#' in your comment?" + "\nIf so, escape with '\\' or quote with \" or \'" + " to silence this message\n"); + warned = true; + } + else if (check_for_R_bracket && **p == ']') { + vWARN(*p + 1, "Did you mean to have a ']' in your comment?" + "\nIf so, escape with '\\' or quote with \" or \'" + " to silence this message\n"); + warned = true; + } + + (*p)++; } /* we ran off the end of the pattern without ending the comment, so we have * to add an \n when wrapping */ - RExC_seen |= REG_RUN_ON_COMMENT_SEEN; - return p; + if (! check_for_R_bracket) { + RExC_seen |= REG_RUN_ON_COMMENT_SEEN; + } } -STATIC void +static void S_skip_to_be_ignored_text(pTHX_ RExC_state_t *pRExC_state, char ** p, const bool force_to_xmod ) { + PERL_ARGS_ASSERT_SKIP_TO_BE_IGNORED_TEXT; + /* If the text at the current parse position '*p' is a '(?#...)' comment, * or if we are under /x or 'force_to_xmod' is true, and the text at '*p' * is /x whitespace, advance '*p' so that on exit it points to the first @@ -12736,8 +12906,6 @@ S_skip_to_be_ignored_text(pTHX_ RExC_sta const bool use_xmod = force_to_xmod || (RExC_flags & RXf_PMf_EXTENDED); - PERL_ARGS_ASSERT_SKIP_TO_BE_IGNORED_TEXT; - assert( ! UTF || UTF8_IS_INVARIANT(**p) || UTF8_IS_START(**p)); for (;;) { @@ -12763,7 +12931,11 @@ S_skip_to_be_ignored_text(pTHX_ RExC_sta (*p) += len; } else if (*(*p) == '#') { - (*p) = reg_skipcomment(pRExC_state, (*p)); + reg_skipcomment(pRExC_state, + (const char *) RExC_start, + p, + RExC_end, + false); } else { break; @@ -12790,7 +12962,7 @@ S_skip_to_be_ignored_text(pTHX_ RExC_sta This is the UTF, (?#...), and /x friendly way of saying RExC_parse_inc_by(1). */ -STATIC void +static void S_nextchar(pTHX_ RExC_state_t *pRExC_state) { PERL_ARGS_ASSERT_NEXTCHAR; @@ -12807,15 +12979,15 @@ S_nextchar(pTHX_ RExC_state_t *pRExC_sta } } -STATIC void +static void S_change_engine_size(pTHX_ RExC_state_t *pRExC_state, const ptrdiff_t size) { + PERL_ARGS_ASSERT_CHANGE_ENGINE_SIZE; + /* 'size' is the delta number of smallest regnode equivalents to add or * subtract from the current memory allocated to the regex engine being * constructed. */ - PERL_ARGS_ASSERT_CHANGE_ENGINE_SIZE; - RExC_size += size; Renewc(RExC_rxi, @@ -12833,9 +13005,11 @@ S_change_engine_size(pTHX_ RExC_state_t } } -STATIC regnode_offset +static regnode_offset S_regnode_guts(pTHX_ RExC_state_t *pRExC_state, const STRLEN extra_size) { + PERL_ARGS_ASSERT_REGNODE_GUTS; + /* Allocate a regnode that is (1 + extra_size) times as big as the * smallest regnode worth of space, and also aligns and increments * RExC_size appropriately. @@ -12844,8 +13018,6 @@ S_regnode_guts(pTHX_ RExC_state_t *pRExC const regnode_offset ret = RExC_emit; - PERL_ARGS_ASSERT_REGNODE_GUTS; - SIZE_ALIGN(RExC_size); change_engine_size(pRExC_state, (ptrdiff_t) 1 + extra_size); NODE_ALIGN_FILL(REGNODE_p(ret)); @@ -12854,8 +13026,9 @@ S_regnode_guts(pTHX_ RExC_state_t *pRExC #ifdef DEBUGGING -STATIC regnode_offset -S_regnode_guts_debug(pTHX_ RExC_state_t *pRExC_state, const U8 op, const STRLEN extra_size) { +static regnode_offset +S_regnode_guts_debug(pTHX_ RExC_state_t *pRExC_state, const U8 op, const STRLEN extra_size) +{ PERL_ARGS_ASSERT_REGNODE_GUTS_DEBUG; assert(extra_size >= REGNODE_ARG_LEN(op) || REGNODE_TYPE(op) == ANYOF); return S_regnode_guts(aTHX_ pRExC_state, extra_size); @@ -12868,14 +13041,14 @@ S_regnode_guts_debug(pTHX_ RExC_state_t /* - reg_node - emit a node */ -STATIC regnode_offset /* Location. */ +static regnode_offset /* Location. */ S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op) { + PERL_ARGS_ASSERT_REG_NODE; + const regnode_offset ret = REGNODE_GUTS(pRExC_state, op, REGNODE_ARG_LEN(op)); regnode_offset ptr = ret; - PERL_ARGS_ASSERT_REG_NODE; - assert(REGNODE_ARG_LEN(op) == 0); FILL_ADVANCE_NODE(ptr, op); @@ -12886,14 +13059,14 @@ S_reg_node(pTHX_ RExC_state_t *pRExC_sta /* - reg1node - emit a node with an argument */ -STATIC regnode_offset /* Location. */ +static regnode_offset /* Location. */ S_reg1node(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg) { + PERL_ARGS_ASSERT_REG1NODE; + const regnode_offset ret = REGNODE_GUTS(pRExC_state, op, REGNODE_ARG_LEN(op)); regnode_offset ptr = ret; - PERL_ARGS_ASSERT_REG1NODE; - /* ANYOF are special cased to allow non-length 1 args */ assert(REGNODE_ARG_LEN(op) == 1); @@ -12905,29 +13078,29 @@ S_reg1node(pTHX_ RExC_state_t *pRExC_sta /* - regpnode - emit a temporary node with a SV* argument */ -STATIC regnode_offset /* Location. */ +static regnode_offset /* Location. */ S_regpnode(pTHX_ RExC_state_t *pRExC_state, U8 op, SV * arg) { + PERL_ARGS_ASSERT_REGPNODE; + const regnode_offset ret = REGNODE_GUTS(pRExC_state, op, REGNODE_ARG_LEN(op)); regnode_offset ptr = ret; - PERL_ARGS_ASSERT_REGPNODE; - FILL_ADVANCE_NODE_ARGp(ptr, op, arg); RExC_emit = ptr; return(ret); } -STATIC regnode_offset +static regnode_offset S_reg2node(pTHX_ RExC_state_t *pRExC_state, const U8 op, const U32 arg1, const I32 arg2) { + PERL_ARGS_ASSERT_REG2NODE; + /* emit a node with U32 and I32 arguments */ const regnode_offset ret = REGNODE_GUTS(pRExC_state, op, REGNODE_ARG_LEN(op)); regnode_offset ptr = ret; - PERL_ARGS_ASSERT_REG2NODE; - assert(REGNODE_ARG_LEN(op) == 2); FILL_ADVANCE_NODE_2ui_ARG(ptr, op, arg1, arg2); @@ -12945,14 +13118,17 @@ S_reg2node(pTHX_ RExC_state_t *pRExC_sta * set up NEXT_OFF() of the inserted node if needed. Something like this: * * reginsert(pRExC, OPFAIL, orig_emit, depth+1); -* NEXT_OFF(REGNODE_p(orig_emit)) = REGNODE_ARG_LEN(OPFAIL) + NODE_STEP_REGNODE; +* NEXT_OFF_set(REGNODE_p(orig_emit), +* REGNODE_ARG_LEN(OPFAIL) + NODE_STEP_REGNODE); * * ALSO NOTE - FLAGS(newly-inserted-operator) will be set to 0 as well. */ -STATIC void +static void S_reginsert(pTHX_ RExC_state_t *pRExC_state, const U8 op, const regnode_offset operand, const U32 depth) { + PERL_ARGS_ASSERT_REGINSERT; + regnode *src; regnode *dst; regnode *place; @@ -12960,7 +13136,6 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_st const int size = NODE_STEP_REGNODE + offset; DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_REGINSERT; PERL_UNUSED_CONTEXT; PERL_UNUSED_ARG(depth); DEBUG_PARSE_FMT("inst"," - %s", REGNODE_NAME(op)); @@ -13022,20 +13197,20 @@ S_reginsert(pTHX_ RExC_state_t *pRExC_st engine is designed for.) - SEE ALSO: regtail_study */ -STATIC bool +static bool S_regtail(pTHX_ RExC_state_t * pRExC_state, const regnode_offset p, const regnode_offset val, const U32 depth) { + PERL_ARGS_ASSERT_REGTAIL; + regnode_offset scan; DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_REGTAIL; #ifndef DEBUGGING PERL_UNUSED_ARG(depth); #endif - /* The final node in the chain is the first one with a nonzero next pointer * */ scan = (regnode_offset) p; @@ -13044,7 +13219,7 @@ S_regtail(pTHX_ RExC_state_t * pRExC_sta DEBUG_PARSE_r({ DEBUG_PARSE_MSG((scan == p ? "tail" : "")); regprop(RExC_rx, RExC_mysv, REGNODE_p(scan), NULL, pRExC_state); - Perl_re_printf( aTHX_ "~ %s (%zu) %s %s\n", + re_printf("~ %s (%zu) %s %s\n", SvPV_nolen_const(RExC_mysv), scan, (temp == NULL ? "->" : ""), (temp == NULL ? REGNODE_NAME(OP(REGNODE_p(val))) : "") @@ -13066,10 +13241,10 @@ S_regtail(pTHX_ RExC_state_t * pRExC_sta /* Populate this with something that won't loop and will likely * lead to a crash if the caller ignores the failure return, and * execution continues */ - NEXT_OFF(REGNODE_p(scan)) = U16_MAX; + NEXT_OFF_set(REGNODE_p(scan), U16_MAX); return false; } - NEXT_OFF(REGNODE_p(scan)) = val - scan; + NEXT_OFF_set(REGNODE_p(scan), val - scan); } return true; @@ -13096,10 +13271,12 @@ so both currently return a pass/fail ret */ /* TODO: All four parms should be const */ -STATIC bool +static bool S_regtail_study(pTHX_ RExC_state_t *pRExC_state, regnode_offset p, const regnode_offset val, U32 depth) { + PERL_ARGS_ASSERT_REGTAIL_STUDY; + regnode_offset scan; U8 exact = PSEUDO; #ifdef EXPERIMENTAL_INPLACESCAN @@ -13107,8 +13284,6 @@ S_regtail_study(pTHX_ RExC_state_t *pREx #endif DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_REGTAIL_STUDY; - /* Find last node. */ @@ -13137,7 +13312,7 @@ S_regtail_study(pTHX_ RExC_state_t *pREx DEBUG_PARSE_r({ DEBUG_PARSE_MSG((scan == p ? "tsdy" : "")); regprop(RExC_rx, RExC_mysv, REGNODE_p(scan), NULL, pRExC_state); - Perl_re_printf( aTHX_ "~ %s (%zu) -> %s\n", + re_printf("~ %s (%zu) -> %s\n", SvPV_nolen_const(RExC_mysv), scan, REGNODE_NAME(exact)); @@ -13149,11 +13324,11 @@ S_regtail_study(pTHX_ RExC_state_t *pREx DEBUG_PARSE_r({ DEBUG_PARSE_MSG(""); regprop(RExC_rx, RExC_mysv, REGNODE_p(val), NULL, pRExC_state); - Perl_re_printf( aTHX_ - "~ attach to %s (%" IVdf ") offset to %" IVdf "\n", + re_printf( + "~ attach to %s (%zd) offset to %zd\n", SvPV_nolen_const(RExC_mysv), - (IV)val, - (IV)(val - scan) + val, + (val - scan) ); }); if (REGNODE_OFF_BY_ARG(OP(REGNODE_p(scan)))) { @@ -13165,10 +13340,10 @@ S_regtail_study(pTHX_ RExC_state_t *pREx /* Populate this with something that won't loop and will likely * lead to a crash if the caller ignores the failure return, and * execution continues */ - NEXT_OFF(REGNODE_p(scan)) = U16_MAX; + NEXT_OFF_set(REGNODE_p(scan), U16_MAX); return false; } - NEXT_OFF(REGNODE_p(scan)) = val - scan; + NEXT_OFF_set(REGNODE_p(scan), val - scan); } return true; /* Was 'return exact' */ @@ -13178,19 +13353,19 @@ S_regtail_study(pTHX_ RExC_state_t *pREx #ifdef PERL_RE_BUILD_AUX SV* -Perl_get_ANYOFM_contents(pTHX_ const regnode * n) { +Perl_get_ANYOFM_contents(pTHX_ const regnode * n) +{ + PERL_ARGS_ASSERT_GET_ANYOFM_CONTENTS; /* Returns an inversion list of all the code points matched by the * ANYOFM/NANYOFM node 'n' */ - SV * cp_list = _new_invlist(-1); + SV * cp_list = new_invlist_(-1); const U8 lowest = (U8) ARG1u(n); unsigned int i; U8 count = 0; U8 needed = 1U << PL_bitcount[ (U8) ~ FLAGS(n)]; - PERL_ARGS_ASSERT_GET_ANYOFM_CONTENTS; - /* Starting with the lowest code point, any code point that ANDed with the * mask yields the lowest code point is in the set */ for (i = lowest; i <= 0xFF; i++) { @@ -13205,13 +13380,14 @@ Perl_get_ANYOFM_contents(pTHX_ const reg } if (OP(n) == NANYOFM) { - _invlist_invert(cp_list); + invlist_invert_(cp_list); } return cp_list; } SV * -Perl_get_ANYOFHbbm_contents(pTHX_ const regnode * n) { +Perl_get_ANYOFHbbm_contents(pTHX_ const regnode * n) +{ PERL_ARGS_ASSERT_GET_ANYOFHBBM_CONTENTS; SV * cp_list = NULL; @@ -13249,7 +13425,7 @@ Perl_re_intuit_string(pTHX_ REGEXP * con ? prog->check_utf8 : prog->check_substr); if (!PL_colorset) reginitcolors(); - Perl_re_printf( aTHX_ + re_printf( "%sUsing REx %ssubstr:%s \"%s%.60s%s%s\"\n", PL_colors[4], RX_UTF8(r) ? "utf8 " : "", @@ -13280,17 +13456,19 @@ Perl_re_intuit_string(pTHX_ REGEXP * con void Perl_pregfree(pTHX_ REGEXP *r) { + PERL_ARGS_ASSERT_PREGFREE; + SvREFCNT_dec(r); } void Perl_pregfree2(pTHX_ REGEXP *rx) { + PERL_ARGS_ASSERT_PREGFREE2; + struct regexp *const r = ReANY(rx); DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_PREGFREE2; - if (! r) return; @@ -13352,12 +13530,12 @@ Perl_pregfree2(pTHX_ REGEXP *rx) REGEXP * Perl_reg_temp_copy(pTHX_ REGEXP *dsv, REGEXP *ssv) { + PERL_ARGS_ASSERT_REG_TEMP_COPY; + struct regexp *drx; struct regexp *const srx = ReANY(ssv); const bool islv = dsv && SvTYPE(dsv) == SVt_PVLV; - PERL_ARGS_ASSERT_REG_TEMP_COPY; - if (!dsv) dsv = (REGEXP*) newSV_type(SVt_REGEXP); else { @@ -13482,12 +13660,12 @@ Perl_reg_temp_copy(pTHX_ REGEXP *dsv, RE void Perl_regfree_internal(pTHX_ REGEXP * const rx) { + PERL_ARGS_ASSERT_REGFREE_INTERNAL; + struct regexp *const r = ReANY(rx); RXi_GET_DECL(r, ri); DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_REGFREE_INTERNAL; - if (! ri) { return; } @@ -13499,7 +13677,7 @@ Perl_regfree_internal(pTHX_ REGEXP * con SV *dsv= sv_newmortal(); RE_PV_QUOTED_DECL(s, RX_UTF8(rx), dsv, RX_PRECOMP(rx), RX_PRELEN(rx), PL_dump_re_max_len); - Perl_re_printf( aTHX_ "%sFreeing REx:%s %s\n", + re_printf("%sFreeing REx:%s %s\n", PL_colors[4], PL_colors[5], s); } }); @@ -13619,12 +13797,12 @@ any duplication they need to do. void Perl_re_dup_guts(pTHX_ const REGEXP *sstr, REGEXP *dstr, CLONE_PARAMS *param) { + PERL_ARGS_ASSERT_RE_DUP_GUTS; + I32 npar; const struct regexp *r = ReANY(sstr); struct regexp *ret = ReANY(dstr); - PERL_ARGS_ASSERT_RE_DUP_GUTS; - npar = r->nparens+1; NewCopy(RXp_OFFSp(r), RXp_OFFSp(ret), npar, regexp_paren_pair); @@ -13733,13 +13911,13 @@ Perl_re_dup_guts(pTHX_ const REGEXP *sst void * Perl_regdupe_internal(pTHX_ REGEXP * const rx, CLONE_PARAMS *param) { + PERL_ARGS_ASSERT_REGDUPE_INTERNAL; + struct regexp *const r = ReANY(rx); regexp_internal *reti; int len; RXi_GET_DECL(r, ri); - PERL_ARGS_ASSERT_REGDUPE_INTERNAL; - len = ProgLen(ri); Newxc(reti, sizeof(regexp_internal) + len*sizeof(regnode), @@ -13861,17 +14039,17 @@ Perl_regdupe_internal(pTHX_ REGEXP * con #endif /* USE_ITHREADS */ -STATIC void +static void S_re_croak(pTHX_ bool utf8, const char* pat,...) { + PERL_ARGS_ASSERT_RE_CROAK; + va_list args; STRLEN len = strlen(pat); char buf[512]; SV *msv; const char *message; - PERL_ARGS_ASSERT_RE_CROAK; - if (len > 510) len = 510; Copy(pat, buf, len , char); @@ -13894,6 +14072,8 @@ S_re_croak(pTHX_ bool utf8, const char* void Perl_save_re_context(pTHX) { + PERL_ARGS_ASSERT_SAVE_RE_CONTEXT; + I32 nparens = -1; I32 i; @@ -13916,7 +14096,7 @@ Perl_save_re_context(pTHX) for (i = 1; i <= nparens; i++) { char digits[TYPE_CHARS(long)]; const STRLEN len = my_snprintf(digits, sizeof(digits), - "%lu", (long)i); + "%" I32df, i); GV *const *const gvp = (GV**)hv_fetch(PL_defstash, digits, len, 0); @@ -13928,7 +14108,6 @@ Perl_save_re_context(pTHX) } } #endif - #ifndef PERL_IN_XSUB_RE # include "uni_keywords.h" @@ -13936,6 +14115,7 @@ Perl_save_re_context(pTHX) void Perl_init_uniprops(pTHX) { + PERL_ARGS_ASSERT_INIT_UNIPROPS; # ifdef DEBUGGING char * dump_len_string; @@ -13959,79 +14139,79 @@ Perl_init_uniprops(pTHX) /* Set up the inversion list interpreter-level variables */ - PL_XPosix_ptrs[CC_ASCII_] = _new_invlist_C_array(uni_prop_ptrs[UNI_ASCII]); - PL_XPosix_ptrs[CC_ALPHANUMERIC_] = _new_invlist_C_array(uni_prop_ptrs[UNI_XPOSIXALNUM]); - PL_XPosix_ptrs[CC_ALPHA_] = _new_invlist_C_array(uni_prop_ptrs[UNI_XPOSIXALPHA]); - PL_XPosix_ptrs[CC_BLANK_] = _new_invlist_C_array(uni_prop_ptrs[UNI_XPOSIXBLANK]); - PL_XPosix_ptrs[CC_CASED_] = _new_invlist_C_array(uni_prop_ptrs[UNI_CASED]); - PL_XPosix_ptrs[CC_CNTRL_] = _new_invlist_C_array(uni_prop_ptrs[UNI_XPOSIXCNTRL]); - PL_XPosix_ptrs[CC_DIGIT_] = _new_invlist_C_array(uni_prop_ptrs[UNI_XPOSIXDIGIT]); - PL_XPosix_ptrs[CC_GRAPH_] = _new_invlist_C_array(uni_prop_ptrs[UNI_XPOSIXGRAPH]); - PL_XPosix_ptrs[CC_LOWER_] = _new_invlist_C_array(uni_prop_ptrs[UNI_XPOSIXLOWER]); - PL_XPosix_ptrs[CC_PRINT_] = _new_invlist_C_array(uni_prop_ptrs[UNI_XPOSIXPRINT]); - PL_XPosix_ptrs[CC_PUNCT_] = _new_invlist_C_array(uni_prop_ptrs[UNI_XPOSIXPUNCT]); - PL_XPosix_ptrs[CC_SPACE_] = _new_invlist_C_array(uni_prop_ptrs[UNI_XPOSIXSPACE]); - PL_XPosix_ptrs[CC_UPPER_] = _new_invlist_C_array(uni_prop_ptrs[UNI_XPOSIXUPPER]); - PL_XPosix_ptrs[CC_VERTSPACE_] = _new_invlist_C_array(uni_prop_ptrs[UNI_VERTSPACE]); - PL_XPosix_ptrs[CC_WORDCHAR_] = _new_invlist_C_array(uni_prop_ptrs[UNI_XPOSIXWORD]); - PL_XPosix_ptrs[CC_XDIGIT_] = _new_invlist_C_array(uni_prop_ptrs[UNI_XPOSIXXDIGIT]); - - PL_Posix_ptrs[CC_ASCII_] = _new_invlist_C_array(uni_prop_ptrs[UNI_ASCII]); - PL_Posix_ptrs[CC_ALPHANUMERIC_] = _new_invlist_C_array(uni_prop_ptrs[UNI_POSIXALNUM]); - PL_Posix_ptrs[CC_ALPHA_] = _new_invlist_C_array(uni_prop_ptrs[UNI_POSIXALPHA]); - PL_Posix_ptrs[CC_BLANK_] = _new_invlist_C_array(uni_prop_ptrs[UNI_POSIXBLANK]); + PL_XPosix_ptrs[CC_ASCII_] = new_invlist_C_array_(uni_prop_ptrs[UNI_ASCII]); + PL_XPosix_ptrs[CC_ALPHANUMERIC_] = new_invlist_C_array_(uni_prop_ptrs[UNI_XPOSIXALNUM]); + PL_XPosix_ptrs[CC_ALPHA_] = new_invlist_C_array_(uni_prop_ptrs[UNI_XPOSIXALPHA]); + PL_XPosix_ptrs[CC_BLANK_] = new_invlist_C_array_(uni_prop_ptrs[UNI_XPOSIXBLANK]); + PL_XPosix_ptrs[CC_CASED_] = new_invlist_C_array_(uni_prop_ptrs[UNI_CASED]); + PL_XPosix_ptrs[CC_CNTRL_] = new_invlist_C_array_(uni_prop_ptrs[UNI_XPOSIXCNTRL]); + PL_XPosix_ptrs[CC_DIGIT_] = new_invlist_C_array_(uni_prop_ptrs[UNI_XPOSIXDIGIT]); + PL_XPosix_ptrs[CC_GRAPH_] = new_invlist_C_array_(uni_prop_ptrs[UNI_XPOSIXGRAPH]); + PL_XPosix_ptrs[CC_LOWER_] = new_invlist_C_array_(uni_prop_ptrs[UNI_XPOSIXLOWER]); + PL_XPosix_ptrs[CC_PRINT_] = new_invlist_C_array_(uni_prop_ptrs[UNI_XPOSIXPRINT]); + PL_XPosix_ptrs[CC_PUNCT_] = new_invlist_C_array_(uni_prop_ptrs[UNI_XPOSIXPUNCT]); + PL_XPosix_ptrs[CC_SPACE_] = new_invlist_C_array_(uni_prop_ptrs[UNI_XPOSIXSPACE]); + PL_XPosix_ptrs[CC_UPPER_] = new_invlist_C_array_(uni_prop_ptrs[UNI_XPOSIXUPPER]); + PL_XPosix_ptrs[CC_VERTSPACE_] = new_invlist_C_array_(uni_prop_ptrs[UNI_VERTSPACE]); + PL_XPosix_ptrs[CC_WORDCHAR_] = new_invlist_C_array_(uni_prop_ptrs[UNI_XPOSIXWORD]); + PL_XPosix_ptrs[CC_XDIGIT_] = new_invlist_C_array_(uni_prop_ptrs[UNI_XPOSIXXDIGIT]); + + PL_Posix_ptrs[CC_ASCII_] = new_invlist_C_array_(uni_prop_ptrs[UNI_ASCII]); + PL_Posix_ptrs[CC_ALPHANUMERIC_] = new_invlist_C_array_(uni_prop_ptrs[UNI_POSIXALNUM]); + PL_Posix_ptrs[CC_ALPHA_] = new_invlist_C_array_(uni_prop_ptrs[UNI_POSIXALPHA]); + PL_Posix_ptrs[CC_BLANK_] = new_invlist_C_array_(uni_prop_ptrs[UNI_POSIXBLANK]); PL_Posix_ptrs[CC_CASED_] = PL_Posix_ptrs[CC_ALPHA_]; - PL_Posix_ptrs[CC_CNTRL_] = _new_invlist_C_array(uni_prop_ptrs[UNI_POSIXCNTRL]); - PL_Posix_ptrs[CC_DIGIT_] = _new_invlist_C_array(uni_prop_ptrs[UNI_POSIXDIGIT]); - PL_Posix_ptrs[CC_GRAPH_] = _new_invlist_C_array(uni_prop_ptrs[UNI_POSIXGRAPH]); - PL_Posix_ptrs[CC_LOWER_] = _new_invlist_C_array(uni_prop_ptrs[UNI_POSIXLOWER]); - PL_Posix_ptrs[CC_PRINT_] = _new_invlist_C_array(uni_prop_ptrs[UNI_POSIXPRINT]); - PL_Posix_ptrs[CC_PUNCT_] = _new_invlist_C_array(uni_prop_ptrs[UNI_POSIXPUNCT]); - PL_Posix_ptrs[CC_SPACE_] = _new_invlist_C_array(uni_prop_ptrs[UNI_POSIXSPACE]); - PL_Posix_ptrs[CC_UPPER_] = _new_invlist_C_array(uni_prop_ptrs[UNI_POSIXUPPER]); + PL_Posix_ptrs[CC_CNTRL_] = new_invlist_C_array_(uni_prop_ptrs[UNI_POSIXCNTRL]); + PL_Posix_ptrs[CC_DIGIT_] = new_invlist_C_array_(uni_prop_ptrs[UNI_POSIXDIGIT]); + PL_Posix_ptrs[CC_GRAPH_] = new_invlist_C_array_(uni_prop_ptrs[UNI_POSIXGRAPH]); + PL_Posix_ptrs[CC_LOWER_] = new_invlist_C_array_(uni_prop_ptrs[UNI_POSIXLOWER]); + PL_Posix_ptrs[CC_PRINT_] = new_invlist_C_array_(uni_prop_ptrs[UNI_POSIXPRINT]); + PL_Posix_ptrs[CC_PUNCT_] = new_invlist_C_array_(uni_prop_ptrs[UNI_POSIXPUNCT]); + PL_Posix_ptrs[CC_SPACE_] = new_invlist_C_array_(uni_prop_ptrs[UNI_POSIXSPACE]); + PL_Posix_ptrs[CC_UPPER_] = new_invlist_C_array_(uni_prop_ptrs[UNI_POSIXUPPER]); PL_Posix_ptrs[CC_VERTSPACE_] = NULL; - PL_Posix_ptrs[CC_WORDCHAR_] = _new_invlist_C_array(uni_prop_ptrs[UNI_POSIXWORD]); - PL_Posix_ptrs[CC_XDIGIT_] = _new_invlist_C_array(uni_prop_ptrs[UNI_POSIXXDIGIT]); + PL_Posix_ptrs[CC_WORDCHAR_] = new_invlist_C_array_(uni_prop_ptrs[UNI_POSIXWORD]); + PL_Posix_ptrs[CC_XDIGIT_] = new_invlist_C_array_(uni_prop_ptrs[UNI_POSIXXDIGIT]); - PL_GCB_invlist = _new_invlist_C_array(_Perl_GCB_invlist); - PL_SB_invlist = _new_invlist_C_array(_Perl_SB_invlist); - PL_WB_invlist = _new_invlist_C_array(_Perl_WB_invlist); - PL_LB_invlist = _new_invlist_C_array(_Perl_LB_invlist); - PL_SCX_invlist = _new_invlist_C_array(_Perl_SCX_invlist); - - PL_InBitmap = _new_invlist_C_array(InBitmap_invlist); - PL_AboveLatin1 = _new_invlist_C_array(AboveLatin1_invlist); - PL_Latin1 = _new_invlist_C_array(Latin1_invlist); - PL_UpperLatin1 = _new_invlist_C_array(UpperLatin1_invlist); - - PL_Assigned_invlist = _new_invlist_C_array(uni_prop_ptrs[UNI_ASSIGNED]); + PL_GCB_invlist = new_invlist_C_array_(_Perl_GCB_invlist); + PL_SB_invlist = new_invlist_C_array_(_Perl_SB_invlist); + PL_WB_invlist = new_invlist_C_array_(_Perl_WB_invlist); + PL_LB_invlist = new_invlist_C_array_(_Perl_LB_invlist); + PL_SCX_invlist = new_invlist_C_array_(_Perl_SCX_invlist); + + PL_InBitmap = new_invlist_C_array_(InBitmap_invlist); + PL_AboveLatin1 = new_invlist_C_array_(AboveLatin1_invlist); + PL_Latin1 = new_invlist_C_array_(Latin1_invlist); + PL_UpperLatin1 = new_invlist_C_array_(UpperLatin1_invlist); + + PL_Assigned_invlist = new_invlist_C_array_(uni_prop_ptrs[UNI_ASSIGNED]); - PL_utf8_perl_idstart = _new_invlist_C_array(uni_prop_ptrs[UNI__PERL_IDSTART]); - PL_utf8_perl_idcont = _new_invlist_C_array(uni_prop_ptrs[UNI__PERL_IDCONT]); + PL_utf8_perl_idstart = new_invlist_C_array_(uni_prop_ptrs[UNI__PERL_IDSTART]); + PL_utf8_perl_idcont = new_invlist_C_array_(uni_prop_ptrs[UNI__PERL_IDCONT]); - PL_utf8_charname_begin = _new_invlist_C_array(uni_prop_ptrs[UNI__PERL_CHARNAME_BEGIN]); - PL_utf8_charname_continue = _new_invlist_C_array(uni_prop_ptrs[UNI__PERL_CHARNAME_CONTINUE]); + PL_utf8_charname_begin = new_invlist_C_array_(uni_prop_ptrs[UNI__PERL_CHARNAME_BEGIN]); + PL_utf8_charname_continue = new_invlist_C_array_(uni_prop_ptrs[UNI__PERL_CHARNAME_CONTINUE]); - PL_in_some_fold = _new_invlist_C_array(uni_prop_ptrs[UNI__PERL_ANY_FOLDS]); - PL_HasMultiCharFold = _new_invlist_C_array(uni_prop_ptrs[ + PL_in_some_fold = new_invlist_C_array_(uni_prop_ptrs[UNI__PERL_ANY_FOLDS]); + PL_HasMultiCharFold = new_invlist_C_array_(uni_prop_ptrs[ UNI__PERL_FOLDS_TO_MULTI_CHAR]); - PL_InMultiCharFold = _new_invlist_C_array(uni_prop_ptrs[ + PL_InMultiCharFold = new_invlist_C_array_(uni_prop_ptrs[ UNI__PERL_IS_IN_MULTI_CHAR_FOLD]); - PL_utf8_toupper = _new_invlist_C_array(Uppercase_Mapping_invlist); - PL_utf8_tolower = _new_invlist_C_array(Lowercase_Mapping_invlist); - PL_utf8_totitle = _new_invlist_C_array(Titlecase_Mapping_invlist); - PL_utf8_tofold = _new_invlist_C_array(Case_Folding_invlist); - PL_utf8_tosimplefold = _new_invlist_C_array(Simple_Case_Folding_invlist); - PL_utf8_foldclosures = _new_invlist_C_array(_Perl_IVCF_invlist); - PL_utf8_mark = _new_invlist_C_array(uni_prop_ptrs[UNI_M]); - PL_CCC_non0_non230 = _new_invlist_C_array(_Perl_CCC_non0_non230_invlist); - PL_Private_Use = _new_invlist_C_array(uni_prop_ptrs[UNI_CO]); + PL_utf8_toupper = new_invlist_C_array_(Uppercase_Mapping_invlist); + PL_utf8_tolower = new_invlist_C_array_(Lowercase_Mapping_invlist); + PL_utf8_totitle = new_invlist_C_array_(Titlecase_Mapping_invlist); + PL_utf8_tofold = new_invlist_C_array_(Case_Folding_invlist); + PL_utf8_tosimplefold = new_invlist_C_array_(Simple_Case_Folding_invlist); + PL_utf8_foldclosures = new_invlist_C_array_(_Perl_IVCF_invlist); + PL_utf8_mark = new_invlist_C_array_(uni_prop_ptrs[UNI_M]); + PL_CCC_non0_non230 = new_invlist_C_array_(_Perl_CCC_non0_non230_invlist); + PL_Private_Use = new_invlist_C_array_(uni_prop_ptrs[UNI_CO]); # ifdef UNI_XIDC /* The below are used only by deprecated functions. They could be removed */ - PL_utf8_xidcont = _new_invlist_C_array(uni_prop_ptrs[UNI_XIDC]); - PL_utf8_idcont = _new_invlist_C_array(uni_prop_ptrs[UNI_IDC]); - PL_utf8_xidstart = _new_invlist_C_array(uni_prop_ptrs[UNI_XIDS]); + PL_utf8_xidcont = new_invlist_C_array_(uni_prop_ptrs[UNI_XIDC]); + PL_utf8_idcont = new_invlist_C_array_(uni_prop_ptrs[UNI_IDC]); + PL_utf8_xidstart = new_invlist_C_array_(uni_prop_ptrs[UNI_XIDS]); # endif } @@ -14053,7 +14233,7 @@ Perl_get_prop_definition(pTHX_ const int PERL_ARGS_ASSERT_GET_PROP_DEFINITION; /* Create and return the inversion list */ - return _new_invlist_C_array(uni_prop_ptrs[table_index]); + return new_invlist_C_array_(uni_prop_ptrs[table_index]); } const char * const * @@ -14104,10 +14284,12 @@ S_get_extended_utf8_msg(pTHX_ const UV c # endif #endif /* end of ! PERL_IN_XSUB_RE */ -STATIC REGEXP * +static REGEXP * S_compile_wildcard(pTHX_ const char * subpattern, const STRLEN len, const bool ignore_case) { + PERL_ARGS_ASSERT_COMPILE_WILDCARD; + /* Pretends that the input subpattern is qr/subpattern/aam, compiling it * possibly with /i if the 'ignore_case' parameter is true. Use /aa * because nothing outside of ASCII will match. Use /m because the input @@ -14121,8 +14303,6 @@ S_compile_wildcard(pTHX_ const char * su REGEXP * subpattern_re; DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_COMPILE_WILDCARD; - if (ignore_case) { flags |= PMf_FOLD; } @@ -14176,15 +14356,15 @@ S_compile_wildcard(pTHX_ const char * su return subpattern_re; } -STATIC I32 +static I32 S_execute_wildcard(pTHX_ REGEXP * const prog, char* stringarg, char *strend, char *strbeg, SSize_t minend, SV *screamer, U32 nosave) { + PERL_ARGS_ASSERT_EXECUTE_WILDCARD; + I32 result; DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_EXECUTE_WILDCARD; - ENTER; /* The compilation has set things up so that if the program doesn't want to @@ -14240,6 +14420,8 @@ S_handle_user_defined_property(pTHX_ this */ const STRLEN level) /* Recursion level of this call */ { + PERL_ARGS_ASSERT_HANDLE_USER_DEFINED_PROPERTY; + STRLEN len; const char * string = SvPV_const(contents, len); const char * const e = string + len; @@ -14248,11 +14430,9 @@ S_handle_user_defined_property(pTHX_ const char * s0 = string; /* Points to first byte in the current line being parsed in 'string' */ - const char overflow_msg[] = "Code point too large in \""; + const char * const overflow_msg = "Code point too large in \""; SV* running_definition = NULL; - PERL_ARGS_ASSERT_HANDLE_USER_DEFINED_PROPERTY; - *user_defined_ptr = true; /* Look at each line */ @@ -14396,8 +14576,8 @@ S_handle_user_defined_property(pTHX_ # endif /* Here, this line contains a legal range */ - this_definition = sv_2mortal(_new_invlist(2)); - this_definition = _add_range_to_invlist(this_definition, min, max); + this_definition = sv_2mortal(new_invlist_(2)); + this_definition = add_range_to_invlist_(this_definition, min, max); goto calculate; check_if_property: @@ -14447,19 +14627,19 @@ S_handle_user_defined_property(pTHX_ switch (op) { case '+': - _invlist_union(running_definition, this_definition, + invlist_union_(running_definition, this_definition, &running_definition); break; case '-': - _invlist_subtract(running_definition, this_definition, + invlist_subtract_(running_definition, this_definition, &running_definition); break; case '&': - _invlist_intersection(running_definition, this_definition, + invlist_intersection_(running_definition, this_definition, &running_definition); break; case '!': - _invlist_union_complement_2nd(running_definition, + invlist_union_complement_2nd_(running_definition, this_definition, &running_definition); break; default: @@ -14479,7 +14659,7 @@ S_handle_user_defined_property(pTHX_ /* If the expansion was empty, the answer isn't nothing: its an empty * inversion list */ if (running_definition == NULL) { - running_definition = _new_invlist(1); + running_definition = new_invlist_(1); } return running_definition; @@ -14519,7 +14699,7 @@ S_handle_user_defined_property(pTHX_ # define ORIGINAL_CONTEXT NULL # endif -STATIC void +static void S_delete_recursion_entry(pTHX_ void *key) { /* Deletes the entry used to detect recursion when expanding user-defined @@ -14547,7 +14727,7 @@ S_delete_recursion_entry(pTHX_ void *key RESTORE_CONTEXT; } -STATIC SV * +static SV * S_get_fq_name(pTHX_ const char * const name, /* The first non-blank in the \p{}, \P{} */ const Size_t name_len, /* Its length in bytes, not including any trailing space */ @@ -14567,11 +14747,8 @@ S_get_fq_name(pTHX_ const HV * pkg = (IN_PERL_COMPILETIME) ? PL_curstash : CopSTASH(PL_curcop); - const char* pkgname = HvNAME(pkg); - sv_catpvf(fq_name, "%" UTF8f, - UTF8fARG(is_utf8, strlen(pkgname), pkgname)); - sv_catpvs(fq_name, "::"); + sv_catpvf(fq_name, "%" HvNAMEf "::", HvNAMEfARG(pkg)); } sv_catpvf(fq_name, "%" UTF8f, @@ -14579,7 +14756,7 @@ S_get_fq_name(pTHX_ return fq_name; } -STATIC SV * +static SV * S_parse_uniprop_string(pTHX_ /* Parse the interior of a \p{}, \P{}. Returns its definition if knowable @@ -14618,6 +14795,8 @@ S_parse_uniprop_string(pTHX_ this */ const STRLEN level) /* Recursion level of this call */ { + PERL_ARGS_ASSERT_PARSE_UNIPROP_STRING; + char* lookup_name; /* normalized name for lookup in our tables */ unsigned lookup_len; /* Its length */ enum { Not_Strict = 0, /* Some properties have stricter name */ @@ -14663,8 +14842,6 @@ S_parse_uniprop_string(pTHX_ * official Unicode property whose expansion was deferred */ bool could_be_deferred_official = false; - PERL_ARGS_ASSERT_PARSE_UNIPROP_STRING; - /* The input will be normalized into 'lookup_name' */ Newx(lookup_name, name_len, char); SAVEFREEPV(lookup_name); @@ -14847,7 +15024,7 @@ S_parse_uniprop_string(pTHX_ goto append_name_to_msg; } - Perl_ck_warner_d(aTHX_ + ck_warner_d( packWARN(WARN_EXPERIMENTAL__UNIPROP_WILDCARDS), "The Unicode property wildcards feature is experimental"); @@ -14924,7 +15101,7 @@ S_parse_uniprop_string(pTHX_ user_defined_ptr, msg, level + 1); - _invlist_union(prop_definition, sub_invlist, + invlist_union_(prop_definition, sub_invlist, &prop_definition); } @@ -15049,7 +15226,7 @@ S_parse_uniprop_string(pTHX_ goto failed; } - cp = valid_utf8_to_uvchr((U8 *) SvPVX(character), &character_len); + cp = valid_utf8_to_uv((U8 *) SvPVX(character), &character_len); if (character_len == SvCUR(character)) { prop_definition = add_cp_to_invlist(NULL, cp); } @@ -15072,7 +15249,7 @@ S_parse_uniprop_string(pTHX_ av_push_simple(this_string, newSVuv(cp)); do { - cp = valid_utf8_to_uvchr((U8 *) remaining, &character_len); + cp = valid_utf8_to_uv((U8 *) remaining, &character_len); av_push_simple(this_string, newSVuv(cp)); remaining += character_len; } while (remaining < SvEND(character)); @@ -15336,7 +15513,7 @@ S_parse_uniprop_string(pTHX_ /* Drop down to look up in the official properties */ } else { - const char insecure[] = "Insecure user-defined property"; + const char * const insecure = "Insecure user-defined property"; /* Here, there is a sub by the correct name. Normally we call it * to get the property definition */ @@ -15361,7 +15538,7 @@ S_parse_uniprop_string(pTHX_ * error instead */ if (TAINT_get) { if (SvCUR(msg) > 0) sv_catpvs(msg, "; "); - sv_catpvn(msg, insecure, sizeof(insecure) - 1); + sv_catpvn(msg, insecure, strlen(insecure)); goto append_name_to_msg; } @@ -15549,7 +15726,7 @@ S_parse_uniprop_string(pTHX_ } if (TAINT_get) { if (SvTRUE(error)) sv_catpvs(msg, "; "); - sv_catpvn(msg, insecure, sizeof(insecure) - 1); + sv_catpvn(msg, insecure, strlen(insecure)); } if (name_len > 0) { @@ -15852,7 +16029,7 @@ S_parse_uniprop_string(pTHX_ if (table_index > MAX_UNI_KEYWORD_INDEX) { Size_t warning_offset = table_index / MAX_UNI_KEYWORD_INDEX; table_index %= MAX_UNI_KEYWORD_INDEX; - Perl_ck_warner_d(aTHX_ packWARN(WARN_DEPRECATED__UNICODE_PROPERTY_NAME), + ck_warner_d(packWARN(WARN_DEPRECATED__UNICODE_PROPERTY_NAME), "Use of '%.*s' in \\p{} or \\P{} is deprecated because: %s", (int) name_len, name, get_deprecated_property_msg(warning_offset)); @@ -15896,7 +16073,7 @@ S_parse_uniprop_string(pTHX_ if (UNLIKELY(pu_overrides && SvPOK(pu_overrides))) { /* See if there is an element in the hints hash for this table */ - SV * pu_lookup = Perl_newSVpvf(aTHX_ "%d=", table_index); + SV * pu_lookup = newSVpvf("%d=", table_index); const char * pos = strstr(SvPVX(pu_overrides), SvPVX(pu_lookup)); if (pos) { @@ -15929,14 +16106,15 @@ S_parse_uniprop_string(pTHX_ /* For now, as a safety measure, make sure that it doesn't * override non-private use code points */ - _invlist_intersection(pu_invlist, PL_Private_Use, &pu_invlist); + invlist_intersection_(pu_invlist, PL_Private_Use, &pu_invlist); /* Add it to the list to be returned */ - _invlist_union(prop_definition, pu_invlist, + invlist_union_(prop_definition, pu_invlist, &expanded_prop_definition); prop_definition = expanded_prop_definition; cloned = true; - Perl_ck_warner_d(aTHX_ packWARN(WARN_EXPERIMENTAL__PRIVATE_USE), "The private_use feature is experimental"); + ck_warner_d(packWARN(WARN_EXPERIMENTAL__PRIVATE_USE), + "The private_use feature is experimental"); } } } @@ -15945,7 +16123,7 @@ S_parse_uniprop_string(pTHX_ if (! cloned) { prop_definition = sv_2mortal(invlist_clone(prop_definition, NULL)); } - _invlist_invert(prop_definition); + invlist_invert_(prop_definition); } return prop_definition; @@ -16009,12 +16187,14 @@ S_parse_uniprop_string(pTHX_ } } -STATIC bool +static bool S_handle_names_wildcard(pTHX_ const char * wname, /* wildcard name to match */ const STRLEN wname_len, /* Its length */ SV ** prop_definition, AV ** strings) { + PERL_ARGS_ASSERT_HANDLE_NAMES_WILDCARD; + /* Deal with Name property wildcard subpatterns; returns true if there were * any matches, adding them to prop_definition */ @@ -16037,8 +16217,8 @@ S_handle_names_wildcard(pTHX_ const char const char * must; /* The PV of 'must' */ STRLEN must_len; /* And its length */ SV * syllable_name = NULL; /* For Hangul syllables */ - const char hangul_prefix[] = "HANGUL SYLLABLE "; - const STRLEN hangul_prefix_len = sizeof(hangul_prefix) - 1; + const char * const hangul_prefix = "HANGUL SYLLABLE "; + const STRLEN hangul_prefix_len = strlen(hangul_prefix); /* By inspection, there are a maximum of 7 bytes in the suffix of a hangul * syllable name, and these are immutable and guaranteed by the Unicode @@ -16047,8 +16227,6 @@ S_handle_names_wildcard(pTHX_ const char IV i; - PERL_ARGS_ASSERT_HANDLE_NAMES_WILDCARD; - /* Make sure _charnames is loaded. (The parameters give context * for any errors generated */ get_names_info = get_cv("_charnames::_get_names_info", 0); @@ -16271,20 +16449,20 @@ S_handle_names_wildcard(pTHX_ const char /* These constants, names, values, and algorithm are adapted from the * Unicode standard, version 5.1, section 3.12, and should never * change. */ - const char * JamoL[] = { + static const char * const JamoL[] = { "G", "GG", "N", "D", "DD", "R", "M", "B", "BB", "S", "SS", "", "J", "JJ", "C", "K", "T", "P", "H" }; const int LCount = C_ARRAY_LENGTH(JamoL); - const char * JamoV[] = { + static const char * const JamoV[] = { "A", "AE", "YA", "YAE", "EO", "E", "YEO", "YE", "O", "WA", "WAE", "OE", "YO", "U", "WEO", "WE", "WI", "YU", "EU", "YI", "I" }; const int VCount = C_ARRAY_LENGTH(JamoV); - const char * JamoT[] = { + static const char * const JamoT[] = { "", "G", "GG", "GS", "N", "NJ", "NH", "D", "L", "LG", "LM", "LB", "LS", "LT", "LP", "LH", "M", "B", "BS", "S", "SS", "NG", "J", "C", "K", "T", "P", "H" @@ -16335,7 +16513,7 @@ S_handle_names_wildcard(pTHX_ const char * were returned to us in the array 'algorithmic_names' from data in * lib/unicore/Name.pm. 'code_point' in the name is expressed in hex. */ for (i = 0; i <= av_top_index((AV *) algorithmic_names); i++) { - IV j; + UV j; /* Each element of the array is a hash, giving the details for the * series of names it covers. There is the base name of the characters @@ -16344,12 +16522,12 @@ S_handle_names_wildcard(pTHX_ const char * characters that could possibly be in a name in this series. */ HV * this_series = (HV *) SvRV(* av_fetch((AV *) algorithmic_names, i, 0)); SV * prefix = * hv_fetchs(this_series, "name", 0); - IV low = SvIV(* hv_fetchs(this_series, "low", 0)); - IV high = SvIV(* hv_fetchs(this_series, "high", 0)); + UV low = SvUV(* hv_fetchs(this_series, "low", 0)); + UV high = SvUV(* hv_fetchs(this_series, "high", 0)); char * legal = SvPVX(* hv_fetchs(this_series, "legal", 0)); /* Pre-allocate an SV with enough space */ - SV * algo_name = sv_2mortal(Perl_newSVpvf(aTHX_ "%s-0000", + SV * algo_name = sv_2mortal(newSVpvf("%s-0000", SvPVX(prefix))); if (high >= 0x10000) { sv_catpvs(algo_name, "0"); @@ -16366,8 +16544,7 @@ S_handle_names_wildcard(pTHX_ const char for (j = low; j <= high; j++) { /* For each code point in the series */ /* Get its name, and see if it matches the subpattern */ - sv_setpvf(algo_name, "%s-%X", SvPVX(prefix), - (unsigned) j); + sv_setpvf(algo_name, "%s-%" UVXf, SvPVX(prefix), j); if (execute_wildcard(subpattern_re, SvPVX(algo_name), @@ -16401,15 +16578,15 @@ S_handle_names_wildcard(pTHX_ const char SV * subtract = get_prop_definition(UNI_CC); - _invlist_subtract(empty_names, subtract, &empty_names); + invlist_subtract_(empty_names, subtract, &empty_names); SvREFCNT_dec_NN(empty_names_ref); SvREFCNT_dec_NN(subtract); subtract = get_prop_definition(UNI_CF); - _invlist_subtract(empty_names, subtract, &empty_names); + invlist_subtract_(empty_names, subtract, &empty_names); SvREFCNT_dec_NN(subtract); - _invlist_union(*prop_definition, empty_names, prop_definition); + invlist_union_(*prop_definition, empty_names, prop_definition); found_matches = true; SvREFCNT_dec_NN(empty_names); } @@ -16419,7 +16596,7 @@ S_handle_names_wildcard(pTHX_ const char /* If we ever were to accept aliases for, say private use names, we would * need to do something fancier to find empty names. The code below works * (at the time it was written), and is slower than the above */ - const char empties_pat[] = "^."; + const char * const empties_pat = "^."; if (strNE(name, empties_pat)) { SV * empty = newSVpvs(""); if (execute_wildcard(subpattern_re, @@ -16433,7 +16610,7 @@ S_handle_names_wildcard(pTHX_ const char (void) handle_names_wildcard(empties_pat, strlen(empties_pat), &empties); - _invlist_union_complement_2nd(*prop_definition, empties, prop_definition); + invlist_union_complement_2nd_(*prop_definition, empties, prop_definition); SvREFCNT_dec_NN(empties); found_matches = true; Index: gnu/usr.bin/perl/regcomp.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regcomp.h,v diff -u -p -a -u -p -r1.22 regcomp.h --- gnu/usr.bin/perl/regcomp.h 28 Jan 2025 01:06:10 -0000 1.22 +++ gnu/usr.bin/perl/regcomp.h 16 Nov 2026 00:57:39 -0000 @@ -386,7 +386,7 @@ struct regnode_ssc { #define set_ANYOF_SYNTHETIC(n) \ STMT_START{ \ OP(n) = ANYOF; \ - NEXT_OFF(n) = 1; \ + NEXT_OFF_set(n, 1); \ } STMT_END #define is_ANYOF_SYNTHETIC(n) (REGNODE_TYPE(OP(n)) == ANYOF && NEXT_OFF(n) == 1) @@ -481,16 +481,22 @@ struct regnode_ssc { #undef NEXT_OFF #undef NODE_ALIGN -#define NEXT_OFF(p) ((p)->head.data.next_off) +#define NEXT_OFF_base(p)((p)->head.data.next_off) #define OP(p) ((p)->head.data.type) #define STR_LEN_U8(p) ((p)->head.data.u_8.str_len_u8) #define FIRST_BYTE(p) ((p)->head.data.u_8.first_byte) -#define FLAGS(p) ((p)->head.data.u_8.flags) /* Caution: Doesn't apply to all \ - regnode types. For some, it's the \ - character set of the regnode */ -#define STR_LENs(p) (__ASSERT_(OP(p) != LEXACT && OP(p) != LEXACT_REQ8) \ + +/* Caution: Doesn't apply to all regnode types. For some, it's the character + * set of the regnode */ +#define FLAGS(p) ((p)->head.data.u_8.flags) + +#define NEXT_OFF_set(p, v) \ + (assert(inRANGE((v), 0, U16_MAX)), NEXT_OFF_base(p) = (v)) +#define NEXT_OFF(p) PREVENT_LVALUE(NEXT_OFF_base(p)) + +#define STR_LENs(p) (assert(OP(p) != LEXACT && OP(p) != LEXACT_REQ8), \ STR_LEN_U8((struct regnode_string *)p)) -#define STRINGs(p) (__ASSERT_(OP(p) != LEXACT && OP(p) != LEXACT_REQ8) \ +#define STRINGs(p) (assert(OP(p) != LEXACT && OP(p) != LEXACT_REQ8), \ ((struct regnode_string *)p)->string) #define OPERANDs(p) STRINGs(p) @@ -510,9 +516,9 @@ struct regnode_ssc { * node to be an ARG2L, using the second 32 bit field for the length, and not * using the flags nor next_off fields at all. One could have an llstring node * and even an lllstring type. */ -#define STR_LENl(p) (__ASSERT_(OP(p) == LEXACT || OP(p) == LEXACT_REQ8) \ +#define STR_LENl(p) (assert(OP(p) == LEXACT || OP(p) == LEXACT_REQ8), \ (((struct regnode_lstring *)p)->str_len_u32)) -#define STRINGl(p) (__ASSERT_(OP(p) == LEXACT || OP(p) == LEXACT_REQ8) \ +#define STRINGl(p) (assert(OP(p) == LEXACT || OP(p) == LEXACT_REQ8), \ (((struct regnode_lstring *)p)->string)) #define OPERANDl(p) STRINGl(p) @@ -666,7 +672,7 @@ struct regnode_ssc { #define FILL_NODE(offset, op) \ STMT_START { \ OP(REGNODE_p(offset)) = op; \ - NEXT_OFF(REGNODE_p(offset)) = 0; \ + NEXT_OFF_set(REGNODE_p(offset), 0); \ } STMT_END #define FILL_ADVANCE_NODE(offset, op) \ STMT_START { \ @@ -1189,24 +1195,24 @@ struct reg_data { field. the next field determines which state is to be transitioned to if any. */ -struct _reg_trie_trans { +struct reg_trie_trans_ { U32 next; U32 check; }; /* a transition list element for the list based representation */ -struct _reg_trie_trans_list_elem { +struct reg_trie_trans_list_elem_ { U16 forid; U32 newstate; }; -typedef struct _reg_trie_trans_list_elem reg_trie_trans_le; +typedef struct reg_trie_trans_list_elem_ reg_trie_trans_le; /* a state for compressed nodes. base is an offset into an array of reg_trie_trans array. If wordnum is nonzero the state is accepting. if base is zero then the state has no children (and will be accepting) */ -struct _reg_trie_state { +struct reg_trie_state_ { U16 wordnum; union { U32 base; @@ -1225,15 +1231,15 @@ typedef struct { } reg_trie_wordinfo; -typedef struct _reg_trie_state reg_trie_state; -typedef struct _reg_trie_trans reg_trie_trans; +typedef struct reg_trie_state_ reg_trie_state; +typedef struct reg_trie_trans_ reg_trie_trans; /* anything in here that needs to be freed later should be dealt with in pregfree. - refcount is first in both this and _reg_ac_data to allow a space + refcount is first in both this and reg_ac_data_ to allow a space optimisation in Perl_regdupe. */ -struct _reg_trie_data { +struct reg_trie_data_ { U32 refcount; /* number of times this trie is referenced */ U32 lasttrans; /* last valid transition element */ U16 *charmap; /* byte to charid lookup array */ @@ -1274,17 +1280,17 @@ struct _reg_trie_data { #define TRIE_WORDS_OFFSET 2 -typedef struct _reg_trie_data reg_trie_data; +typedef struct reg_trie_data_ reg_trie_data; -/* refcount is first in both this and _reg_trie_data to allow a space +/* refcount is first in both this and reg_trie_data_ to allow a space optimisation in Perl_regdupe. */ -struct _reg_ac_data { +struct reg_ac_data_ { U32 refcount; U32 trie; U32 *fail; reg_trie_state *states; }; -typedef struct _reg_ac_data reg_ac_data; +typedef struct reg_ac_data_ reg_ac_data; /* ANY_BIT doesn't use the structure, so we can borrow it here. This is simpler than refactoring all of it as wed end up with Index: gnu/usr.bin/perl/regcomp.sym =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regcomp.sym,v diff -u -p -a -u -p -r1.8 regcomp.sym --- gnu/usr.bin/perl/regcomp.sym 26 Dec 2025 22:14:13 -0000 1.8 +++ gnu/usr.bin/perl/regcomp.sym 16 Nov 2026 00:57:39 -0000 @@ -236,7 +236,7 @@ SRCLOSE SRCLOSE, none ; Clos REF REF, num 2 V ; Match some already matched string REFF REF, num 2 V ; Match already matched string, using /di rules. REFFL REF, num 2 V ; Match already matched string, using /li rules. -# N?REFF[AU] could have been implemented using the FLAGS field of the +# REFF[AU]N? could have been implemented using the FLAGS field of the # regnode, but by having a separate node type, we can use the existing switch # statement to avoid some tests REFFU REF, num 2 V ; Match already matched string, using /ui. @@ -332,7 +332,7 @@ REGEX_SET REGEX_SET, depth p S ; Rege # # TRIE next:FAIL -EVAL B,postponed_AB:FAIL +EVAL B,postponed_A,postponed_B:FAIL CURLYX end:FAIL WHILEM A_pre,A_min,A_max,B_min,B_max:FAIL BRANCH next:FAIL Index: gnu/usr.bin/perl/regcomp_debug.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regcomp_debug.c,v diff -u -p -a -u -p -r1.1.1.3 regcomp_debug.c --- gnu/usr.bin/perl/regcomp_debug.c 26 Dec 2025 22:12:24 -0000 1.1.1.3 +++ gnu/usr.bin/perl/regcomp_debug.c 16 Nov 2026 00:57:39 -0000 @@ -22,10 +22,11 @@ int Perl_re_printf(pTHX_ const char *fmt, ...) { + PERL_ARGS_ASSERT_RE_PRINTF; + va_list ap; int result; PerlIO *f= Perl_debug_log; - PERL_ARGS_ASSERT_RE_PRINTF; va_start(ap, fmt); result = PerlIO_vprintf(f, fmt, ap); va_end(ap); @@ -35,10 +36,11 @@ Perl_re_printf(pTHX_ const char *fmt, .. int Perl_re_indentf(pTHX_ const char *fmt, U32 depth, ...) { + PERL_ARGS_ASSERT_RE_INDENTF; + va_list ap; int result; PerlIO *f= Perl_debug_log; - PERL_ARGS_ASSERT_RE_INDENTF; va_start(ap, depth); PerlIO_printf(f, "%*s", ( (int)depth % 20 ) * 2, ""); result = PerlIO_vprintf(f, fmt, ap); @@ -54,7 +56,7 @@ Perl_debug_show_study_flags(pTHX_ U32 fl if (!flags) return; - Perl_re_printf( aTHX_ "%s", open_str); + re_printf("%s", open_str); DEBUG_SHOW_STUDY_FLAG(flags, SF_BEFORE_SEOL); DEBUG_SHOW_STUDY_FLAG(flags, SF_BEFORE_MEOL); DEBUG_SHOW_STUDY_FLAG(flags, SF_IS_INF); @@ -70,7 +72,7 @@ Perl_debug_show_study_flags(pTHX_ U32 fl DEBUG_SHOW_STUDY_FLAG(flags, SCF_SEEN_ACCEPT); DEBUG_SHOW_STUDY_FLAG(flags, SCF_TRIE_DOING_RESTUDY); DEBUG_SHOW_STUDY_FLAG(flags, SCF_IN_DEFINE); - Perl_re_printf( aTHX_ "%s", close_str); + re_printf("%s", close_str); } void @@ -83,12 +85,10 @@ Perl_debug_studydata(pTHX_ const char *w DEBUG_OPTIMISE_MORE_r({ if (!data) { - Perl_re_indentf(aTHX_ "%s: NO DATA", - depth, - where); + re_indentf("%s: NO DATA", depth, where); return; } - Perl_re_indentf(aTHX_ "%s: M/S/D: %" IVdf "/%" IVdf "/%" IVdf " Pos:%" IVdf "/%" IVdf " Flags: 0x%" UVXf, + re_indentf("%s: M/S/D: %" IVdf "/%" IVdf "/%" IVdf " Pos:%" IVdf "/%" IVdf " Flags: 0x%" UVXf, depth, where, min, stopmin, delta, @@ -97,9 +97,9 @@ Perl_debug_studydata(pTHX_ const char *w (UV)data->flags ); - Perl_debug_show_study_flags(aTHX_ data->flags," [","]"); + debug_show_study_flags(data->flags," [","]"); - Perl_re_printf( aTHX_ + re_printf( " Whilem_c: %" IVdf " Lcp: %" IVdf " %s", (IV)data->whilem_c, (IV)(data->last_closep ? *((data)->last_closep) : -1), @@ -108,7 +108,7 @@ Perl_debug_studydata(pTHX_ const char *w if (data->last_found) { int i; - Perl_re_printf(aTHX_ + re_printf( "Last:'%s' %" IVdf ":%" IVdf "/%" IVdf, SvPVX_const(data->last_found), (IV)data->last_end, @@ -117,7 +117,7 @@ Perl_debug_studydata(pTHX_ const char *w ); for (i = 0; i < 2; i++) { - Perl_re_printf(aTHX_ + re_printf( " %s%s: '%s' @ %" IVdf "/%" IVdf, data->cur_is_floating == i ? "*" : "", i ? "Float" : "Fixed", @@ -125,11 +125,11 @@ Perl_debug_studydata(pTHX_ const char *w (IV)data->substrs[i].min_offset, (IV)data->substrs[i].max_offset ); - Perl_debug_show_study_flags(aTHX_ data->substrs[i].flags," [","]"); + debug_show_study_flags(data->substrs[i].flags," [","]"); } } - Perl_re_printf( aTHX_ "\n"); + re_printf("\n"); }); } @@ -148,13 +148,13 @@ Perl_debug_peep(pTHX_ const char *str, c return; Next = regnext(scan); regprop(RExC_rx, RExC_mysv, scan, NULL, pRExC_state); - Perl_re_indentf( aTHX_ "%s>%3d: %s (%d)", - depth, - str, - REG_NODE_NUM(scan), SvPV_nolen_const(RExC_mysv), - Next ? (REG_NODE_NUM(Next)) : 0 ); - Perl_debug_show_study_flags(aTHX_ flags," [ ","]"); - Perl_re_printf( aTHX_ "\n"); + re_indentf("%s>%3d: %s (%d)", + depth, + str, + REG_NODE_NUM(scan), SvPV_nolen_const(RExC_mysv), + Next ? (REG_NODE_NUM(Next)) : 0 ); + debug_show_study_flags(flags," [ ","]"); + re_printf("\n"); }); } @@ -163,16 +163,16 @@ Perl_dumpuntil(pTHX_ const regexp *r, co const regnode *last, const regnode *plast, SV* sv, I32 indent, U32 depth) { + PERL_ARGS_ASSERT_DUMPUNTIL; + const regnode *next; const regnode *optstart= NULL; RXi_GET_DECL(r, ri); DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_DUMPUNTIL; - #ifdef DEBUG_DUMPUNTIL - Perl_re_printf( aTHX_ "--- %d : %d - %d - %d\n", indent, node-start, + re_printf("--- %d : %d - %d - %d\n", indent, node-start, last ? last-start : 0, plast ? plast-start : 0); #endif @@ -197,18 +197,18 @@ Perl_dumpuntil(pTHX_ const regexp *r, co CLEAR_OPTSTART; regprop(r, sv, node, NULL, NULL); - Perl_re_printf( aTHX_ "%4" IVdf ":%*s%s", (IV)(node - start), + re_printf("%4" IVdf ":%*s%s", (IV)(node - start), (int)(2*indent + 1), "", SvPVX_const(sv)); if (op != OPTIMIZED) { if (next == NULL) /* Next ptr. */ - Perl_re_printf( aTHX_ " (0)"); + re_printf(" (0)"); else if (REGNODE_TYPE(op) == BRANCH && REGNODE_TYPE(OP(next)) != BRANCH ) - Perl_re_printf( aTHX_ " (FAIL)"); + re_printf(" (FAIL)"); else - Perl_re_printf( aTHX_ " (%" IVdf ")", (IV)(next - start)); - Perl_re_printf( aTHX_ "\n"); + re_printf(" (%" IVdf ")", (IV)(next - start)); + re_printf("\n"); } after_print: @@ -243,23 +243,23 @@ Perl_dumpuntil(pTHX_ const regexp *r, co for (word_idx= 0; word_idx < (I32)trie->wordcount; word_idx++) { SV ** const elem_ptr = av_fetch_simple(trie_words, word_idx, 0); - Perl_re_indentf( aTHX_ "%s ", - indent+3, - elem_ptr - ? pv_pretty(sv, SvPV_nolen_const(*elem_ptr), - SvCUR(*elem_ptr), PL_dump_re_max_len, - PL_colors[0], PL_colors[1], - (SvUTF8(*elem_ptr) - ? PERL_PV_ESCAPE_UNI - : 0) - | PERL_PV_PRETTY_ELLIPSES - | PERL_PV_PRETTY_LTGT - ) - : "???" + re_indentf("%s ", + indent+3, + elem_ptr + ? pv_pretty(sv, SvPV_nolen_const(*elem_ptr), + SvCUR(*elem_ptr), PL_dump_re_max_len, + PL_colors[0], PL_colors[1], + (SvUTF8(*elem_ptr) + ? PERL_PV_ESCAPE_UNI + : 0) + | PERL_PV_PRETTY_ELLIPSES + | PERL_PV_PRETTY_LTGT + ) + : "???" ); if (trie->jump) { U16 dist = trie->jump[word_idx+1]; - Perl_re_printf( aTHX_ "(%" UVuf ")\n", + re_printf("(%" UVuf ")\n", (UV)((dist ? this_trie + dist : next) - start)); if (dist) { if (!nextbranch) @@ -269,7 +269,7 @@ Perl_dumpuntil(pTHX_ const regexp *r, co if (nextbranch && REGNODE_TYPE(OP(nextbranch))==BRANCH) nextbranch = regnext((regnode *)nextbranch); } else { - Perl_re_printf( aTHX_ "\n"); + re_printf("\n"); } } if (last && next > last) @@ -301,7 +301,7 @@ Perl_dumpuntil(pTHX_ const regexp *r, co } CLEAR_OPTSTART; #ifdef DEBUG_DUMPUNTIL - Perl_re_printf( aTHX_ "--- %d\n", (int)indent); + re_printf("--- %d\n", (int)indent); #endif return node; } @@ -315,6 +315,8 @@ Perl_dumpuntil(pTHX_ const regexp *r, co static void S_regdump_intflags(pTHX_ const char *lead, const U32 flags) { + PERL_ARGS_ASSERT_REGDUMP_INTFLAGS; + int bit; int set = 0; @@ -323,21 +325,23 @@ S_regdump_intflags(pTHX_ const char *lea for (bit = 0; bit < REG_INTFLAGS_NAME_SIZE; bit++) { if (flags & (1 << bit)) { if (!set++ && lead) - Perl_re_printf( aTHX_ "%s", lead); - Perl_re_printf( aTHX_ "%s ", PL_reg_intflags_name[bit]); + re_printf("%s", lead); + re_printf("%s ", PL_reg_intflags_name[bit]); } } if (lead) { if (set) - Perl_re_printf( aTHX_ "\n"); + re_printf("\n"); else - Perl_re_printf( aTHX_ "%s[none-set]\n", lead); + re_printf("%s[none-set]\n", lead); } } static void S_regdump_extflags(pTHX_ const char *lead, const U32 flags) { + PERL_ARGS_ASSERT_REGDUMP_EXTFLAGS; + int bit; int set = 0; regex_charset cs; @@ -350,37 +354,37 @@ S_regdump_extflags(pTHX_ const char *lea continue; } if (!set++ && lead) - Perl_re_printf( aTHX_ "%s", lead); - Perl_re_printf( aTHX_ "%s ", PL_reg_extflags_name[bit]); + re_printf("%s", lead); + re_printf("%s ", PL_reg_extflags_name[bit]); } } if ((cs = get_regex_charset(flags)) != REGEX_DEPENDS_CHARSET) { if (!set++ && lead) { - Perl_re_printf( aTHX_ "%s", lead); + re_printf("%s", lead); } switch (cs) { case REGEX_UNICODE_CHARSET: - Perl_re_printf( aTHX_ "UNICODE"); + re_printf("UNICODE"); break; case REGEX_LOCALE_CHARSET: - Perl_re_printf( aTHX_ "LOCALE"); + re_printf("LOCALE"); break; case REGEX_ASCII_RESTRICTED_CHARSET: - Perl_re_printf( aTHX_ "ASCII-RESTRICTED"); + re_printf("ASCII-RESTRICTED"); break; case REGEX_ASCII_MORE_RESTRICTED_CHARSET: - Perl_re_printf( aTHX_ "ASCII-MORE_RESTRICTED"); + re_printf("ASCII-MORE_RESTRICTED"); break; default: - Perl_re_printf( aTHX_ "UNKNOWN CHARACTER SET"); + re_printf("UNKNOWN CHARACTER SET"); break; } } if (lead) { if (set) - Perl_re_printf( aTHX_ "\n"); + re_printf("\n"); else - Perl_re_printf( aTHX_ "%s[none-set]\n", lead); + re_printf("%s[none-set]\n", lead); } } #endif @@ -388,6 +392,8 @@ S_regdump_extflags(pTHX_ const char *lea void Perl_regdump(pTHX_ const regexp *r) { + PERL_ARGS_ASSERT_REGDUMP; + #ifdef DEBUGGING int i; SV * const sv = sv_newmortal(); @@ -406,7 +412,7 @@ Perl_regdump(pTHX_ const regexp *r) SvPVX_const(r->substrs->data[i].substr), RE_SV_DUMPLEN(r->substrs->data[i].substr), PL_dump_re_max_len); - Perl_re_printf( aTHX_ + re_printf( "%s %s%s at %" IVdf "..%" UVuf " ", i ? "floating" : "anchored", s, @@ -419,7 +425,7 @@ Perl_regdump(pTHX_ const regexp *r) SvPVX_const(r->substrs->data[i].utf8_substr), RE_SV_DUMPLEN(r->substrs->data[i].utf8_substr), 30); - Perl_re_printf( aTHX_ + re_printf( "%s utf8 %s%s at %" IVdf "..%" UVuf " ", i ? "floating" : "anchored", s, @@ -430,51 +436,51 @@ Perl_regdump(pTHX_ const regexp *r) } if (r->check_substr || r->check_utf8) - Perl_re_printf( aTHX_ + re_printf( (const char *) ( r->check_substr == r->substrs->data[1].substr && r->check_utf8 == r->substrs->data[1].utf8_substr ? "(checking floating" : "(checking anchored")); if (r->intflags & PREGf_NOSCAN) - Perl_re_printf( aTHX_ " noscan"); + re_printf(" noscan"); if (r->extflags & RXf_CHECK_ALL) - Perl_re_printf( aTHX_ " isall"); + re_printf(" isall"); if (r->check_substr || r->check_utf8) - Perl_re_printf( aTHX_ ") "); + re_printf(") "); if (ri->regstclass) { regprop(r, sv, ri->regstclass, NULL, NULL); - Perl_re_printf( aTHX_ "stclass %s ", SvPVX_const(sv)); + re_printf("stclass %s ", SvPVX_const(sv)); } if (r->intflags & PREGf_ANCH) { - Perl_re_printf( aTHX_ "anchored"); + re_printf("anchored"); if (r->intflags & PREGf_ANCH_MBOL) - Perl_re_printf( aTHX_ "(MBOL)"); + re_printf("(MBOL)"); if (r->intflags & PREGf_ANCH_SBOL) - Perl_re_printf( aTHX_ "(SBOL)"); + re_printf("(SBOL)"); if (r->intflags & PREGf_ANCH_GPOS) - Perl_re_printf( aTHX_ "(GPOS)"); - Perl_re_printf( aTHX_ " "); + re_printf("(GPOS)"); + re_printf(" "); } if (r->intflags & PREGf_GPOS_SEEN) - Perl_re_printf( aTHX_ "GPOS:%" UVuf " ", (UV)r->gofs); + re_printf("GPOS:%" UVuf " ", (UV)r->gofs); if (r->intflags & PREGf_SKIP) - Perl_re_printf( aTHX_ "plus "); + re_printf("plus "); if (r->intflags & PREGf_IMPLICIT) - Perl_re_printf( aTHX_ "implicit "); - Perl_re_printf( aTHX_ "minlen %" IVdf " ", (IV)r->minlen); + re_printf("implicit "); + re_printf("minlen %" IVdf " ", (IV)r->minlen); if (r->extflags & RXf_EVAL_SEEN) - Perl_re_printf( aTHX_ "with eval "); - Perl_re_printf( aTHX_ "\n"); + re_printf("with eval "); + re_printf("\n"); DEBUG_FLAGS_r({ regdump_extflags("r->extflags: ", r->extflags); regdump_intflags("r->intflags: ", r->intflags); }); #else - PERL_ARGS_ASSERT_REGDUMP; PERL_UNUSED_CONTEXT; PERL_UNUSED_ARG(r); #endif /* DEBUGGING */ + } /* Should be synchronized with ANYOF_ #defines in regcomp.h */ @@ -531,14 +537,14 @@ static const char * const anyofs[] = { void Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o, const regmatch_info *reginfo, const RExC_state_t *pRExC_state) { + PERL_ARGS_ASSERT_REGPROP; + #ifdef DEBUGGING U8 k; const U8 op = OP(o); RXi_GET_DECL(prog, progi); DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_REGPROP; - SvPVCLEAR(sv); if (op > REGNODE_MAX) { /* regnode.type is unsigned */ @@ -701,8 +707,13 @@ Perl_regprop(pTHX_ const regexp *prog, S else { const char *s = reginfo->strbeg + ln; sv_catpvf(sv, ": "); - Perl_pv_pretty( aTHX_ sv, s, RXp_OFFS_END(prog,n) - RXp_OFFS_START(prog,n), 32, 0, 0, - PERL_PV_ESCAPE_UNI_DETECT|PERL_PV_PRETTY_NOCLEAR|PERL_PV_PRETTY_ELLIPSES|PERL_PV_PRETTY_QUOTE ); + pv_pretty(sv, s, + RXp_OFFS_END(prog,n) - RXp_OFFS_START(prog,n), + 32, 0, 0, + PERL_PV_ESCAPE_UNI_DETECT + |PERL_PV_PRETTY_NOCLEAR + |PERL_PV_PRETTY_ELLIPSES + |PERL_PV_PRETTY_QUOTE ); } } } else if (k == GOSUB) { @@ -783,25 +794,25 @@ Perl_regprop(pTHX_ const regexp *prog, S if (start < NUM_ANYOF_CODE_POINTS) { if (end < NUM_ANYOF_CODE_POINTS) { bitmap_range_not_in_bitmap - = _add_range_to_invlist(bitmap_range_not_in_bitmap, + = add_range_to_invlist_(bitmap_range_not_in_bitmap, start, end); } else { bitmap_range_not_in_bitmap - = _add_range_to_invlist(bitmap_range_not_in_bitmap, + = add_range_to_invlist_(bitmap_range_not_in_bitmap, start, NUM_ANYOF_CODE_POINTS); start = NUM_ANYOF_CODE_POINTS; } } if (start >= NUM_ANYOF_CODE_POINTS) { - nonbitmap_invlist = _add_range_to_invlist(nonbitmap_invlist, + nonbitmap_invlist = add_range_to_invlist_(nonbitmap_invlist, ANYOFRbase(o), ANYOFRbase(o) + ANYOFRdelta(o)); } } else if (ANYOF_MATCHES_ALL_OUTSIDE_BITMAP(o)) { - nonbitmap_invlist = _add_range_to_invlist(nonbitmap_invlist, + nonbitmap_invlist = add_range_to_invlist_(nonbitmap_invlist, NUM_ANYOF_CODE_POINTS, UV_MAX); } @@ -816,11 +827,11 @@ Perl_regprop(pTHX_ const regexp *prog, S * resolved when this call was done; or much more likely because * there are matches that require UTF-8 to be valid, and so aren't * in the bitmap (or ANYOFR). This is teased apart later */ - _invlist_intersection(nonbitmap_invlist, + invlist_intersection_(nonbitmap_invlist, PL_InBitmap, &bitmap_range_not_in_bitmap); /* Leave just the things that don't fit into the bitmap */ - _invlist_subtract(nonbitmap_invlist, + invlist_subtract_(nonbitmap_invlist, PL_InBitmap, &nonbitmap_invlist); } @@ -882,14 +893,14 @@ Perl_regprop(pTHX_ const regexp *prog, S * everything above the lower display should also match, but * there is no indication of that. Add this range so the code * below will add it to the display */ - _invlist_union_complement_2nd(nonbitmap_invlist, + invlist_union_complement_2nd_(nonbitmap_invlist, PL_InBitmap, &nonbitmap_invlist); } } /* And, finally, add the above-the-bitmap stuff */ - if (nonbitmap_invlist && _invlist_len(nonbitmap_invlist)) { + if (nonbitmap_invlist && invlist_len_(nonbitmap_invlist)) { SV* contents; /* See if truncation size is overridden */ @@ -907,8 +918,8 @@ Perl_regprop(pTHX_ const regexp *prog, S * there are unresolved items, where the inversion has to be * delayed until runtime */ if (inverted && ! unresolved) { - _invlist_invert(nonbitmap_invlist); - _invlist_subtract(nonbitmap_invlist, PL_InBitmap, &nonbitmap_invlist); + invlist_invert_(nonbitmap_invlist); + invlist_subtract_(nonbitmap_invlist, PL_InBitmap, &nonbitmap_invlist); } contents = invlist_contents(nonbitmap_invlist, @@ -946,7 +957,7 @@ Perl_regprop(pTHX_ const regexp *prog, S if (op == ANYOFHs) { sv_catpvf(sv, " (Leading UTF-8 bytes = %s", - _byte_dump_string((U8 *) ((struct regnode_anyofhs *) o)->string, + byte_dump_string_((U8 *) ((struct regnode_anyofhs *) o)->string, FLAGS(o), 1)); } else if (REGNODE_TYPE(op) != ANYOF) { @@ -977,7 +988,7 @@ Perl_regprop(pTHX_ const regexp *prog, S sv_catpvf(sv, "[%s", PL_colors[0]); if (op == NANYOFM) { - _invlist_invert(cp_list); + invlist_invert_(cp_list); } put_charclass_bitmap_innards(sv, NULL, cp_list, NULL, NULL, 0, true); @@ -1057,7 +1068,7 @@ Perl_regprop(pTHX_ const regexp *prog, S #ifdef DEBUGGING -STATIC void +static void S_put_code_point(pTHX_ SV *sv, UV c) { PERL_ARGS_ASSERT_PUT_CODE_POINT; @@ -1082,9 +1093,11 @@ S_put_code_point(pTHX_ SV *sv, UV c) } } -STATIC void +static void S_put_range(pTHX_ SV *sv, UV start, const UV end, const bool allow_literals) { + PERL_ARGS_ASSERT_PUT_RANGE; + /* Appends to 'sv' a displayable version of the range of code points from * 'start' to 'end'. Mnemonics (like '\r') are used for the few controls * that have them, when they occur at the beginning or end of the range. @@ -1100,8 +1113,6 @@ S_put_range(pTHX_ SV *sv, UV start, cons assert(start <= end); - PERL_ARGS_ASSERT_PUT_RANGE; - while (start <= end) { UV this_end; const char * format; @@ -1264,17 +1275,17 @@ S_put_range(pTHX_ SV *sv, UV start, cons } } -STATIC void +static void S_put_charclass_bitmap_innards_invlist(pTHX_ SV *sv, SV* invlist) { + PERL_ARGS_ASSERT_PUT_CHARCLASS_BITMAP_INNARDS_INVLIST; + /* Concatenate onto the PV in 'sv' a displayable form of the inversion list * 'invlist' */ UV start, end; bool allow_literals = true; - PERL_ARGS_ASSERT_PUT_CHARCLASS_BITMAP_INNARDS_INVLIST; - /* Generally, it is more readable if printable characters are output as * literals, but if a range (nearly) spans all of them, it's best to output * it as a single range. This code will use a single range if all but 2 @@ -1319,7 +1330,7 @@ S_put_charclass_bitmap_innards_invlist(p return; } -STATIC SV* +static SV* S_put_charclass_bitmap_innards_common(pTHX_ SV* invlist, /* The bitmap */ SV* posixes, /* Under /l, things like [:word:], \S */ @@ -1329,6 +1340,8 @@ S_put_charclass_bitmap_innards_common(pT const bool invert /* Is the result to be inverted? */ ) { + PERL_ARGS_ASSERT_PUT_CHARCLASS_BITMAP_INNARDS_COMMON; + /* Create and return an SV containing a displayable version of the bitmap * and associated information determined by the input parameters. If the * output would have been only the inversion indicator '^', NULL is instead @@ -1336,8 +1349,6 @@ S_put_charclass_bitmap_innards_common(pT SV * output; - PERL_ARGS_ASSERT_PUT_CHARCLASS_BITMAP_INNARDS_COMMON; - if (invert) { output = newSVpvs("^"); } @@ -1353,17 +1364,17 @@ S_put_charclass_bitmap_innards_common(pT sv_catsv(output, posixes); } - if (only_utf8 && _invlist_len(only_utf8)) { + if (only_utf8 && invlist_len_(only_utf8)) { sv_catpvf(output, "%s{utf8}%s", PL_colors[1], PL_colors[0]); put_charclass_bitmap_innards_invlist(output, only_utf8); } - if (not_utf8 && _invlist_len(not_utf8)) { + if (not_utf8 && invlist_len_(not_utf8)) { sv_catpvf(output, "%s{not utf8}%s", PL_colors[1], PL_colors[0]); put_charclass_bitmap_innards_invlist(output, not_utf8); } - if (only_utf8_locale && _invlist_len(only_utf8_locale)) { + if (only_utf8_locale && invlist_len_(only_utf8_locale)) { sv_catpvf(output, "%s{utf8 locale}%s", PL_colors[1], PL_colors[0]); put_charclass_bitmap_innards_invlist(output, only_utf8_locale); @@ -1376,7 +1387,7 @@ S_put_charclass_bitmap_innards_common(pT UV start, end; SV* above_bitmap = NULL; - _invlist_subtract(only_utf8_locale, PL_InBitmap, &above_bitmap); + invlist_subtract_(only_utf8_locale, PL_InBitmap, &above_bitmap); invlist_iterinit(above_bitmap); while (invlist_iternext(above_bitmap, &start, &end)) { @@ -1398,7 +1409,7 @@ S_put_charclass_bitmap_innards_common(pT return output; } -STATIC U8 +static U8 S_put_charclass_bitmap_innards(pTHX_ SV *sv, char *bitmap, SV *nonbitmap_invlist, @@ -1407,6 +1418,8 @@ S_put_charclass_bitmap_innards(pTHX_ SV const U8 flags, const bool force_as_is_display) { + PERL_ARGS_ASSERT_PUT_CHARCLASS_BITMAP_INNARDS; + /* Appends to 'sv' a displayable version of the innards of the bracketed * character class defined by the other arguments: * 'bitmap' points to the bitmap, or NULL if to ignore that. @@ -1467,8 +1480,6 @@ S_put_charclass_bitmap_innards(pTHX_ SV * as that is generally easier to understand */ const int bias = 5; - PERL_ARGS_ASSERT_PUT_CHARCLASS_BITMAP_INNARDS; - /* Start off with whatever code points are passed in. (We clone, so we * don't change the caller's list) */ if (nonbitmap_invlist) { @@ -1476,7 +1487,7 @@ S_put_charclass_bitmap_innards(pTHX_ SV invlist = invlist_clone(nonbitmap_invlist, NULL); } else { /* Worst case size is every other code point is matched */ - invlist = _new_invlist(NUM_ANYOF_CODE_POINTS / 2); + invlist = new_invlist_(NUM_ANYOF_CODE_POINTS / 2); } if (flags) { @@ -1486,8 +1497,8 @@ S_put_charclass_bitmap_innards(pTHX_ SV * nonbitmap list are precisely the ones that match only when the * target is UTF-8 (they should all be non-ASCII). */ if (flags & ANYOF_HAS_EXTRA_RUNTIME_MATCHES) { - _invlist_intersection(invlist, PL_UpperLatin1, &only_utf8); - _invlist_subtract(invlist, only_utf8, &invlist); + invlist_intersection_(invlist, PL_UpperLatin1, &only_utf8); + invlist_subtract_(invlist, only_utf8, &invlist); } /* And this flag for matching all non-ASCII 0xFF and below */ @@ -1528,7 +1539,7 @@ S_put_charclass_bitmap_innards(pTHX_ SV i < NUM_ANYOF_CODE_POINTS && BITMAP_TEST(bitmap, i); i++) { /* empty */ } - invlist = _add_range_to_invlist(invlist, start, i-1); + invlist = add_range_to_invlist_(invlist, start, i-1); } } } @@ -1538,10 +1549,10 @@ S_put_charclass_bitmap_innards(pTHX_ SV * This could happen if the code that populates these misses some * duplication. */ if (only_utf8) { - _invlist_subtract(only_utf8, invlist, &only_utf8); + invlist_subtract_(only_utf8, invlist, &only_utf8); } if (not_utf8) { - _invlist_subtract(not_utf8, invlist, ¬_utf8); + invlist_subtract_(not_utf8, invlist, ¬_utf8); } if (only_utf8_locale_invlist) { @@ -1550,7 +1561,7 @@ S_put_charclass_bitmap_innards(pTHX_ SV * modifying it */ only_utf8_locale = invlist_clone(only_utf8_locale_invlist, NULL); - _invlist_subtract(only_utf8_locale, invlist, &only_utf8_locale); + invlist_subtract_(only_utf8_locale, invlist, &only_utf8_locale); /* And, it can get really weird for us to try outputting an inverted * form of this list when it has things above the bitmap, so don't even @@ -1600,15 +1611,15 @@ S_put_charclass_bitmap_innards(pTHX_ SV /* For the unconditional inversion list, we have to add in all the * conditional code points, so that when inverted, they will be gone * from it */ - _invlist_union(only_utf8, invlist, &invlist); - _invlist_union(not_utf8, invlist, &invlist); - _invlist_union(only_utf8_locale, invlist, &invlist); - _invlist_invert(invlist); - _invlist_intersection(invlist, PL_InBitmap, &invlist); + invlist_union_(only_utf8, invlist, &invlist); + invlist_union_(not_utf8, invlist, &invlist); + invlist_union_(only_utf8_locale, invlist, &invlist); + invlist_invert_(invlist); + invlist_intersection_(invlist, PL_InBitmap, &invlist); if (only_utf8) { - _invlist_invert(only_utf8); - _invlist_intersection(only_utf8, PL_UpperLatin1, &only_utf8); + invlist_invert_(only_utf8); + invlist_intersection_(only_utf8, PL_UpperLatin1, &only_utf8); } else if (not_utf8) { @@ -1620,8 +1631,8 @@ S_put_charclass_bitmap_innards(pTHX_ SV } if (only_utf8_locale) { - _invlist_invert(only_utf8_locale); - _invlist_intersection(only_utf8_locale, + invlist_invert_(only_utf8_locale); + invlist_intersection_(only_utf8_locale, PL_InBitmap, &only_utf8_locale); } Index: gnu/usr.bin/perl/regcomp_internal.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regcomp_internal.h,v diff -u -p -a -u -p -r1.1.1.3 regcomp_internal.h --- gnu/usr.bin/perl/regcomp_internal.h 26 Dec 2025 22:12:28 -0000 1.1.1.3 +++ gnu/usr.bin/perl/regcomp_internal.h 16 Nov 2026 00:57:39 -0000 @@ -1,8 +1,5 @@ -#ifndef REGCOMP_INTERNAL_H -#define REGCOMP_INTERNAL_H -#ifndef STATIC -#define STATIC static -#endif +#ifndef PERL_REGCOMP_INTERNAL_H +#define PERL_REGCOMP_INTERNAL_H #ifndef RE_OPTIMIZE_CURLYX_TO_CURLYM #define RE_OPTIMIZE_CURLYX_TO_CURLYM 1 #endif @@ -53,7 +50,16 @@ struct RExC_state_t { regnode *emit_start; /* Start of emitted-code area */ regnode_offset emit; /* Code-emit pointer */ I32 naughty; /* How bad is this pattern? */ - I32 sawback; /* Did we see \1, ...? */ + bool sawback; /* Did we see \1, ...? */ + + bool utf8; /* whether the pattern is utf8 or not */ + bool orig_utf8; /* whether the pattern was originally in utf8 */ + /* XXX use this for future optimisation of case + * where pattern must be upgraded to utf8. */ + bool uni_semantics; /* If a d charset modifier should use unicode + rules, even if the pattern is not in + utf8 */ + SSize_t size; /* Number of regnode equivalents in pattern */ Size_t sets_depth; /* Counts recursion depth of already- @@ -127,24 +133,15 @@ struct RExC_state_t { accept */ I32 seen_zerolen; regnode *end_op; /* END node in program */ - I32 utf8; /* whether the pattern is utf8 or not */ - I32 orig_utf8; /* whether the pattern was originally in utf8 */ - /* XXX use this for future optimisation of case - * where pattern must be upgraded to utf8. */ - I32 uni_semantics; /* If a d charset modifier should use unicode - rules, even if the pattern is not in - utf8 */ - + bool in_lookaround; + bool contains_locale; + bool recode_x_to_native; + bool in_multi_char_class; I32 recurse_count; /* Number of recurse regops we have generated */ regnode **recurse; /* Recurse regops */ U8 *study_chunk_recursed; /* bitmap of which subs we have moved through */ U32 study_chunk_recursed_bytes; /* bytes in bitmap */ - I32 in_lookaround; - I32 contains_locale; - I32 override_recoding; - I32 recode_x_to_native; - I32 in_multi_char_class; int code_index; /* next code_blocks[] slot */ struct reg_code_blocks *code_blocks;/* positions of literal (?{}) within pattern */ @@ -152,13 +149,13 @@ struct RExC_state_t { scan_frame *frame_head; scan_frame *frame_last; U32 frame_count; - AV *warn_text; - HV *unlexed_names; - SV *runtime_code_qr; /* qr with the runtime code blocks */ bool seen_d_op; bool strict; bool study_started; bool in_script_run; + AV *warn_text; + HV *unlexed_names; + SV *runtime_code_qr; /* qr with the runtime code blocks */ bool use_BRANCHJ; bool sWARN_EXPERIMENTAL__VLB; bool sWARN_EXPERIMENTAL__REGEX_SETS; @@ -171,12 +168,12 @@ struct RExC_state_t { * See GH Issue #21558 and also ba6e2c38aafc23cf114f3ba0d0ff3baead34328b */ #if defined(DEBUGGING) || !defined(USE_DYNAMIC_LOADING) - const char *lastparse; I32 lastnum; - U32 study_chunk_recursed_count; + const char *lastparse; AV *paren_name_list; /* idx -> name */ SV *mysv1; SV *mysv2; + U32 study_chunk_recursed_count; #endif }; @@ -279,6 +276,14 @@ struct RExC_state_t { * output during the parse process. */ +/* RExC_parse_advance(count) + * + * Increment RExC_parse to point at the next codepoint, when we *know* that the + * correct byte count is in the passed parameter */ +#define RExC_parse_advance(count) STMT_START { \ + RExC_parse += count; \ +} STMT_END + /* RExC_parse_incf(flag) * * Increment RExC_parse to point at the next codepoint, while doing @@ -498,7 +503,7 @@ struct RExC_state_t { STMT_START { \ if (DEPENDS_SEMANTICS) { \ set_regex_charset(&RExC_flags, REGEX_UNICODE_CHARSET); \ - RExC_uni_semantics = 1; \ + RExC_uni_semantics = true; \ if (RExC_seen_d_op && LIKELY(! IN_PARENS_PASS)) { \ /* No need to restart the parse if we haven't seen \ * anything that differs between /u and /d, and no need \ @@ -557,10 +562,10 @@ struct RExC_state_t { #define namedclass_to_classnum(class) ((int) ((class) / 2)) #define classnum_to_namedclass(classnum) ((classnum) * 2) -#define _invlist_union_complement_2nd(a, b, output) \ - _invlist_union_maybe_complement_2nd(a, b, TRUE, output) -#define _invlist_intersection_complement_2nd(a, b, output) \ - _invlist_intersection_maybe_complement_2nd(a, b, TRUE, output) +#define invlist_union_complement_2nd_(a, b, output) \ + invlist_union_maybe_complement_2nd_(a, b, TRUE, output) +#define invlist_intersection_complement_2nd_(a, b, output) \ + invlist_intersection_maybe_complement_2nd_(a, b, TRUE, output) /* We add a marker if we are deferring expansion of a property that is both * 1) potentially user-defined; and @@ -741,7 +746,7 @@ static const scan_data_t zero_scan_data -#define UTF cBOOL(RExC_utf8) +#define UTF RExC_utf8 /* The enums for all these are ordered so things work out correctly */ #define LOC (get_regex_charset(RExC_flags) == REGEX_LOCALE_CHARSET) @@ -856,10 +861,10 @@ static const scan_data_t zero_scan_data ? eI - sI /* Length before the <--HERE */ \ : ((xI_offset(xC) >= 0) \ ? xI_offset(xC) \ - : (croak("panic: %s: %d: negative offset: %" \ - IVdf " trying to output message for " \ + : (croak("panic: %s: %d: negative offset: " \ + " %td trying to output message for " \ " pattern %.*s", \ - __FILE__, __LINE__, (IV) xI_offset(xC), \ + __FILE__, __LINE__, xI_offset(xC), \ ((int) (eC - sC)), sC), 0)), \ sI), /* The input pattern printed up to the <--HERE */ \ UTF8fARG(UTF, \ @@ -875,7 +880,7 @@ static const scan_data_t zero_scan_data * arg. Show regex, up to a maximum length. If it's too long, chop and add * "...". */ -#define _FAIL(code) STMT_START { \ +#define FAIL_(code) STMT_START { \ const char *ellipses = ""; \ IV len = RExC_precomp_end - RExC_precomp; \ \ @@ -887,15 +892,15 @@ static const scan_data_t zero_scan_data code; \ } STMT_END -#define FAIL(msg) _FAIL( \ +#define FAIL(msg) FAIL_( \ croak("%s in regex m/%" UTF8f "%s/", \ msg, UTF8fARG(UTF, len, RExC_precomp), ellipses)) -#define FAIL2(msg,arg) _FAIL( \ +#define FAIL2(msg,arg) FAIL_( \ croak(msg " in regex m/%" UTF8f "%s/", \ arg, UTF8fARG(UTF, len, RExC_precomp), ellipses)) -#define FAIL3(msg,arg1,arg2) _FAIL( \ +#define FAIL3(msg,arg1,arg2) FAIL_( \ croak(msg " in regex m/%" UTF8f "%s/", \ arg1, arg2, UTF8fARG(UTF, len, RExC_precomp), ellipses)) @@ -962,7 +967,7 @@ static const scan_data_t zero_scan_data } STMT_END /* 'warns' is the output of the packWARNx macro used in 'code' */ -#define _WARN_HELPER(loc, warns, code) \ +#define WARN_HELPER_(loc, warns, code) \ STMT_START { \ if (! RExC_copy_start_in_constructed) { \ croak("panic! %s: %d: Tried to warn when none" \ @@ -977,7 +982,7 @@ static const scan_data_t zero_scan_data /* m is not necessarily a "literal string", in this macro */ #define warn_non_literal_string(loc, packed_warn, m) \ - _WARN_HELPER(loc, packed_warn, \ + WARN_HELPER_(loc, packed_warn, \ Perl_warner(aTHX_ packed_warn, \ "%s" REPORT_LOCATION, \ m, REPORT_LOCATION_ARGS(loc))) @@ -992,84 +997,84 @@ static const scan_data_t zero_scan_data my_strlcpy(format, m, format_size); \ my_strlcat(format, REPORT_LOCATION, format_size); \ SAVEFREEPV(format); \ - _WARN_HELPER(loc, packwarn, \ + WARN_HELPER_(loc, packwarn, \ Perl_ck_warner(aTHX_ packwarn, \ format, \ a1, REPORT_LOCATION_ARGS(loc))); \ } STMT_END #define ckWARNreg(loc,m) \ - _WARN_HELPER(loc, packWARN(WARN_REGEXP), \ + WARN_HELPER_(loc, packWARN(WARN_REGEXP), \ Perl_ck_warner(aTHX_ packWARN(WARN_REGEXP), \ m REPORT_LOCATION, \ REPORT_LOCATION_ARGS(loc))) #define vWARN(loc, m) \ - _WARN_HELPER(loc, packWARN(WARN_REGEXP), \ + WARN_HELPER_(loc, packWARN(WARN_REGEXP), \ Perl_warner(aTHX_ packWARN(WARN_REGEXP), \ m REPORT_LOCATION, \ REPORT_LOCATION_ARGS(loc))) \ #define vWARN_dep(loc,category,m) \ - _WARN_HELPER(loc, packWARN(category), \ + WARN_HELPER_(loc, packWARN(category), \ Perl_warner(aTHX_ packWARN(category), \ m REPORT_LOCATION, \ REPORT_LOCATION_ARGS(loc))) #define ckWARNdep(loc,category,m) \ - _WARN_HELPER(loc, packWARN(category), \ + WARN_HELPER_(loc, packWARN(category), \ Perl_ck_warner_d(aTHX_ packWARN(category), \ m REPORT_LOCATION, \ REPORT_LOCATION_ARGS(loc))) #define ckWARNregdep(loc,category,m) \ - _WARN_HELPER(loc, packWARN2(category, WARN_REGEXP), \ + WARN_HELPER_(loc, packWARN2(category, WARN_REGEXP), \ Perl_ck_warner_d(aTHX_ packWARN2(category, \ WARN_REGEXP), \ m REPORT_LOCATION, \ REPORT_LOCATION_ARGS(loc))) #define ckWARN2reg_d(loc,m, a1) \ - _WARN_HELPER(loc, packWARN(WARN_REGEXP), \ + WARN_HELPER_(loc, packWARN(WARN_REGEXP), \ Perl_ck_warner_d(aTHX_ packWARN(WARN_REGEXP), \ m REPORT_LOCATION, \ a1, REPORT_LOCATION_ARGS(loc))) #define ckWARN2reg(loc, m, a1) \ - _WARN_HELPER(loc, packWARN(WARN_REGEXP), \ + WARN_HELPER_(loc, packWARN(WARN_REGEXP), \ Perl_ck_warner(aTHX_ packWARN(WARN_REGEXP), \ m REPORT_LOCATION, \ a1, REPORT_LOCATION_ARGS(loc))) #define vWARN3(loc, m, a1, a2) \ - _WARN_HELPER(loc, packWARN(WARN_REGEXP), \ + WARN_HELPER_(loc, packWARN(WARN_REGEXP), \ Perl_warner(aTHX_ packWARN(WARN_REGEXP), \ m REPORT_LOCATION, \ a1, a2, REPORT_LOCATION_ARGS(loc))) #define ckWARN3reg(loc, m, a1, a2) \ - _WARN_HELPER(loc, packWARN(WARN_REGEXP), \ + WARN_HELPER_(loc, packWARN(WARN_REGEXP), \ Perl_ck_warner(aTHX_ packWARN(WARN_REGEXP), \ m REPORT_LOCATION, \ a1, a2, \ REPORT_LOCATION_ARGS(loc))) #define vWARN4(loc, m, a1, a2, a3) \ - _WARN_HELPER(loc, packWARN(WARN_REGEXP), \ + WARN_HELPER_(loc, packWARN(WARN_REGEXP), \ Perl_warner(aTHX_ packWARN(WARN_REGEXP), \ m REPORT_LOCATION, \ a1, a2, a3, \ REPORT_LOCATION_ARGS(loc))) #define ckWARN4reg(loc, m, a1, a2, a3) \ - _WARN_HELPER(loc, packWARN(WARN_REGEXP), \ + WARN_HELPER_(loc, packWARN(WARN_REGEXP), \ Perl_ck_warner(aTHX_ packWARN(WARN_REGEXP), \ m REPORT_LOCATION, \ a1, a2, a3, \ REPORT_LOCATION_ARGS(loc))) #define vWARN5(loc, m, a1, a2, a3, a4) \ - _WARN_HELPER(loc, packWARN(WARN_REGEXP), \ + WARN_HELPER_(loc, packWARN(WARN_REGEXP), \ Perl_warner(aTHX_ packWARN(WARN_REGEXP), \ m REPORT_LOCATION, \ a1, a2, a3, a4, \ @@ -1079,7 +1084,7 @@ static const scan_data_t zero_scan_data STMT_START { \ if (! RExC_warned_ ## class) { /* warn once per compilation */ \ RExC_warned_ ## class = 1; \ - _WARN_HELPER(loc, packWARN(class), \ + WARN_HELPER_(loc, packWARN(class), \ Perl_ck_warner_d(aTHX_ packWARN(class), \ m REPORT_LOCATION, \ REPORT_LOCATION_ARGS(loc)));\ @@ -1090,7 +1095,7 @@ static const scan_data_t zero_scan_data STMT_START { \ if (! RExC_warned_ ## class) { /* warn once per compilation */ \ RExC_warned_ ## class = 1; \ - _WARN_HELPER(loc, packWARN(class), \ + WARN_HELPER_(loc, packWARN(class), \ Perl_ck_warner_d(aTHX_ packWARN(class), \ m REPORT_LOCATION, \ arg, REPORT_LOCATION_ARGS(loc)));\ @@ -1100,7 +1105,7 @@ static const scan_data_t zero_scan_data /* Convert between a pointer to a node and its offset from the beginning of the * program */ #define REGNODE_p(offset) (RExC_emit_start + (offset)) -#define REGNODE_OFFSET(node) (__ASSERT_((node) >= RExC_emit_start) \ +#define REGNODE_OFFSET(node) (assert((node) >= RExC_emit_start), \ (SSize_t) ((node) - RExC_emit_start)) #define ProgLen(ri) ri->proglen @@ -1206,6 +1211,6 @@ static const scan_data_t zero_scan_data node = dumpuntil(r,start,(b),(e),last,sv,indent+1,depth+1); #define REGNODE_STEP_OVER(ret,t1,t2) \ - NEXT_OFF(REGNODE_p(ret)) = ((sizeof(t1)+sizeof(t2))/sizeof(regnode)) + NEXT_OFF_set(REGNODE_p(ret), ((sizeof(t1)+sizeof(t2))/sizeof(regnode))); -#endif /* REGCOMP_INTERNAL_H */ +#endif /* PERL_REGCOMP_INTERNAL_H */ Index: gnu/usr.bin/perl/regcomp_invlist.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regcomp_invlist.c,v diff -u -p -a -u -p -r1.1.1.3 regcomp_invlist.c --- gnu/usr.bin/perl/regcomp_invlist.c 26 Dec 2025 22:12:25 -0000 1.1.1.3 +++ gnu/usr.bin/perl/regcomp_invlist.c 16 Nov 2026 00:57:39 -0000 @@ -64,7 +64,7 @@ Perl_populate_invlist_from_bitmap(pTHX_ i++; } - *invlist = _add_range_to_invlist(*invlist, + *invlist = add_range_to_invlist_(*invlist, start + offset, i + offset - 1); } @@ -133,8 +133,10 @@ Perl_populate_invlist_from_bitmap(pTHX_ #ifndef PERL_IN_XSUB_RE PERL_STATIC_INLINE UV* -S__invlist_array_init(SV* const invlist, const bool will_have_0) +S_invlist_array_init_(SV* const invlist, const bool will_have_0) { + PERL_ARGS_ASSERT_INVLIST_ARRAY_INIT_; + /* Returns a pointer to the first element in the inversion list's array. * This is called upon initialization of an inversion list. Where the * array begins depends on whether the list has the code point U+0000 in it @@ -146,10 +148,8 @@ S__invlist_array_init(SV* const invlist, bool* offset = get_invlist_offset_addr(invlist); UV* zero_addr = (UV *) SvPVX(invlist); - PERL_ARGS_ASSERT__INVLIST_ARRAY_INIT; - /* Must be empty */ - assert(! _invlist_len(invlist)); + assert(! invlist_len_(invlist)); *zero_addr = 0; @@ -158,15 +158,17 @@ S__invlist_array_init(SV* const invlist, return zero_addr + *offset; } -STATIC void +static void S_invlist_replace_list_destroys_src(pTHX_ SV * dest, SV * src) { + PERL_ARGS_ASSERT_INVLIST_REPLACE_LIST_DESTROYS_SRC; + /* Replaces the inversion list in 'dest' with the one from 'src'. It * steals the list from 'src', so 'src' is made to have a NULL list. This * is similar to what SvSetMagicSV() would do, if it were implemented on * inversion lists, though this routine avoids a copy */ - const UV src_len = _invlist_len(src); + const UV src_len = invlist_len_(src); const bool src_offset = *get_invlist_offset_addr(src); const STRLEN src_byte_len = SvLEN(src); char * array = SvPVX(src); @@ -175,8 +177,6 @@ S_invlist_replace_list_destroys_src(pTHX const int oldtainted = TAINT_get; #endif - PERL_ARGS_ASSERT_INVLIST_REPLACE_LIST_DESTROYS_SRC; - assert(is_invlist(src)); assert(is_invlist(dest)); assert(! invlist_is_iterating(src)); @@ -209,9 +209,10 @@ S_invlist_replace_list_destroys_src(pTHX PERL_STATIC_INLINE IV* S_get_invlist_previous_index_addr(SV* invlist) { + PERL_ARGS_ASSERT_GET_INVLIST_PREVIOUS_INDEX_ADDR; + /* Return the address of the IV that is reserved to hold the cached index * */ - PERL_ARGS_ASSERT_GET_INVLIST_PREVIOUS_INDEX_ADDR; assert(is_invlist(invlist)); @@ -221,21 +222,21 @@ S_get_invlist_previous_index_addr(SV* in PERL_STATIC_INLINE IV S_invlist_previous_index(SV* const invlist) { - /* Returns cached index of previous search */ - PERL_ARGS_ASSERT_INVLIST_PREVIOUS_INDEX; + /* Returns cached index of previous search */ + return *get_invlist_previous_index_addr(invlist); } PERL_STATIC_INLINE void S_invlist_set_previous_index(SV* const invlist, const IV index) { - /* Caches for later retrieval */ - PERL_ARGS_ASSERT_INVLIST_SET_PREVIOUS_INDEX; - assert(index == 0 || index < (int) _invlist_len(invlist)); + /* Caches for later retrieval */ + + assert(index == 0 || index < (int) invlist_len_(invlist)); *get_invlist_previous_index_addr(invlist) = index; } @@ -243,17 +244,43 @@ S_invlist_set_previous_index(SV* const i PERL_STATIC_INLINE void S_invlist_trim(SV* invlist) { + PERL_ARGS_ASSERT_INVLIST_TRIM; + /* Free the not currently-being-used space in an inversion list */ /* But don't free up the space needed for the 0 UV that is always at the - * beginning of the list, nor the trailing NUL */ - const UV min_size = TO_INTERNAL_SIZE(1) + 1; + * beginning of the list, nor the trailing NUL. The smallest possible + * allocation size may or may not be larger than this, depending upon + * the malloc implementation in use. */ - PERL_ARGS_ASSERT_INVLIST_TRIM; + const STRLEN min_size = MAX(PERL_STRLEN_NEW_MIN, TO_INTERNAL_SIZE(1) + 1); assert(is_invlist(invlist)); - SvPV_renew(invlist, MAX(min_size, SvCUR(invlist) + 1)); + /* Notes: + * SvCUR(invlist) can be 0, often is min_size or larger + * + * It's very common for SvLEN(invlist) to be equal to: + * (TO_INTERNAL_SIZE(1) + 1) + * ...or the minimum allocation size if larger + * SvCUR(invlist) + 2 + * SvCUR(invlist) + "a few" + */ + + const STRLEN realistic_size = expected_size( + MAX( min_size, SvCUR(invlist) + 1) ); + + /* It's not clear what proportion of invlists are short lived, with + * the malloc() overhead of resizing is more relevant than the + * memory briefly saved, versus long lived invlists where memory + * savings are definitely desirable and malloc() overhead matters less. + * + * The 4*PTRSIZE below is an arbitrary fudge-factor added to + * attempt to strike a balance. + */ + if ( SvLEN(invlist) > realistic_size + 4*PTRSIZE ) { + SvPV_renew(invlist, realistic_size); + } } PERL_STATIC_INLINE void @@ -270,21 +297,21 @@ S_invlist_clear(pTHX_ SV* invlist) /* PERL_STATIC_INLINE UV S_invlist_max(const SV* const invlist) { + PERL_ARGS_ASSERT_INVLIST_MAX; + /* Returns the maximum number of elements storable in the inversion list's * array, without having to realloc() */ - PERL_ARGS_ASSERT_INVLIST_MAX; - assert(is_invlist(invlist)); /* Assumes worst case, in which the 0 element is not counted in the * inversion list, so subtracts 1 for that */ - return SvLEN(invlist) == 0 /* This happens under _new_invlist_C_array */ + return SvLEN(invlist) == 0 /* This happens under new_invlist_C_array_ */ ? FROM_INTERNAL_SIZE(SvCUR(invlist)) - 1 : FROM_INTERNAL_SIZE(SvLEN(invlist)) - 1; } -STATIC void +static void S_initialize_invlist_guts(pTHX_ SV* invlist, const Size_t initial_size) { PERL_ARGS_ASSERT_INITIALIZE_INVLIST_GUTS; @@ -302,8 +329,10 @@ S_initialize_invlist_guts(pTHX_ SV* invl } SV* -Perl__new_invlist(pTHX_ IV initial_size) +Perl_new_invlist_(pTHX_ IV initial_size) { + PERL_ARGS_ASSERT_NEW_INVLIST_; + /* Return a pointer to a newly constructed inversion list, with enough * space to store 'initial_size' elements. If that number is negative, a @@ -322,8 +351,10 @@ Perl__new_invlist(pTHX_ IV initial_size) } SV* -Perl__new_invlist_C_array(pTHX_ const UV* const list) +Perl_new_invlist_C_array_(pTHX_ const UV* const list) { + PERL_ARGS_ASSERT_NEW_INVLIST_C_ARRAY_; + /* Return a pointer to a newly constructed inversion list, initialized to * point to , which has to be in the exact correct inversion list * form, including internal fields. Thus this is a dangerous routine that @@ -347,8 +378,6 @@ Perl__new_invlist_C_array(pTHX_ const UV SV* invlist = newSV_type(SVt_INVLIST); - PERL_ARGS_ASSERT__NEW_INVLIST_C_ARRAY; - if (version_id != INVLIST_VERSION_ID) { croak("panic: Incorrect version for previously generated inversion list"); } @@ -357,8 +386,8 @@ Perl__new_invlist_C_array(pTHX_ const UV * of the list proper, so start it just after them */ SvPV_set(invlist, (char *) (list + HEADER_LENGTH)); - SvLEN_set(invlist, 0); /* Means we own the contents, and the system - shouldn't touch it */ + assert(SvLEN(invlist) == 0); /* Means we own the contents, and the system + shouldn't touch it */ *(get_invlist_offset_addr(invlist)) = offset; @@ -378,24 +407,24 @@ Perl__new_invlist_C_array(pTHX_ const UV return invlist; } -STATIC void -S__append_range_to_invlist(pTHX_ SV* const invlist, +static void +S_append_range_to_invlist_(pTHX_ SV* const invlist, const UV start, const UV end) { + PERL_ARGS_ASSERT_APPEND_RANGE_TO_INVLIST_; + /* Subject to change or removal. Append the range from 'start' to 'end' at * the end of the inversion list. The range must be above any existing * ones. */ UV* array; UV max = invlist_max(invlist); - UV len = _invlist_len(invlist); + UV len = invlist_len_(invlist); bool offset; - PERL_ARGS_ASSERT__APPEND_RANGE_TO_INVLIST; - if (len == 0) { /* Empty lists must be initialized */ offset = start != 0; - array = _invlist_array_init(invlist, ! offset); + array = invlist_array_init_(invlist, ! offset); } else { /* Here, the existing list is non-empty. The current max entry in the @@ -467,8 +496,10 @@ S__append_range_to_invlist(pTHX_ SV* con } SSize_t -Perl__invlist_search(SV* const invlist, const UV cp) +Perl_invlist_search_(SV* const invlist, const UV cp) { + PERL_ARGS_ASSERT_INVLIST_SEARCH_; + /* Searches the inversion list for the entry that contains the input code * point . If is not in the list, -1 is returned. Otherwise, the * return value is the index into the list's array of the range that @@ -478,12 +509,10 @@ Perl__invlist_search(SV* const invlist, IV low = 0; IV mid; - IV high = _invlist_len(invlist); + IV high = invlist_len_(invlist); const IV highest_element = high - 1; const UV* array; - PERL_ARGS_ASSERT__INVLIST_SEARCH; - /* If list is empty, return failure. */ if (UNLIKELY(high == 0)) { return -1; @@ -560,9 +589,11 @@ Perl__invlist_search(SV* const invlist, } void -Perl__invlist_union_maybe_complement_2nd(pTHX_ SV* const a, SV* const b, +Perl_invlist_union_maybe_complement_2nd_(pTHX_ SV* const a, SV* const b, const bool complement_b, SV** output) { + PERL_ARGS_ASSERT_INVLIST_UNION_MAYBE_COMPLEMENT_2ND_; + /* Take the union of two inversion lists and point '*output' to it. On * input, '*output' MUST POINT TO NULL OR TO AN SV* INVERSION LIST (possibly * even 'a' or 'b'). If to an inversion list, the contents of the original @@ -601,11 +632,10 @@ Perl__invlist_union_maybe_complement_2nd * inputs are in their sets. */ UV count = 0; - PERL_ARGS_ASSERT__INVLIST_UNION_MAYBE_COMPLEMENT_2ND; assert(a != b); assert(*output == NULL || is_invlist(*output)); - len_b = _invlist_len(b); + len_b = invlist_len_(b); if (len_b == 0) { /* Here, 'b' is empty, hence it's complement is all possible code @@ -613,7 +643,7 @@ Perl__invlist_union_maybe_complement_2nd * everything, and we need not even look at 'a'. It's easiest to * create a new inversion list that matches everything. */ if (complement_b) { - SV* everything = _add_range_to_invlist(NULL, 0, UV_MAX); + SV* everything = add_range_to_invlist_(NULL, 0, UV_MAX); if (*output == NULL) { /* If the output didn't exist, just point it at the new list */ @@ -631,9 +661,9 @@ Perl__invlist_union_maybe_complement_2nd * the union will come entirely from 'a'. If 'a' is NULL or empty, the * output will be empty */ - if (a == NULL || _invlist_len(a) == 0) { + if (a == NULL || invlist_len_(a) == 0) { if (*output == NULL) { - *output = _new_invlist(0); + *output = new_invlist_(0); } else { invlist_clear(*output); @@ -665,7 +695,7 @@ Perl__invlist_union_maybe_complement_2nd /* Here 'b' is not empty. See about 'a' */ - if (a == NULL || ((len_a = _invlist_len(a)) == 0)) { + if (a == NULL || ((len_a = invlist_len_(a)) == 0)) { /* Here, 'a' is empty (and b is not). That means the union will come * entirely from 'b'. If '*output' is NULL, we can directly return a @@ -675,7 +705,7 @@ Perl__invlist_union_maybe_complement_2nd SV ** dest = (*output == NULL) ? output : &u; *dest = invlist_clone(b, NULL); if (complement_b) { - _invlist_invert(*dest); + invlist_invert_(*dest); } if (dest == &u) { @@ -711,10 +741,10 @@ Perl__invlist_union_maybe_complement_2nd /* Size the union for the worst case: that the sets are completely * disjoint */ - u = _new_invlist(len_a + len_b); + u = new_invlist_(len_a + len_b); /* Will contain U+0000 if either component does */ - array_u = _invlist_array_init(u, ( len_a > 0 && array_a[0] == 0) + array_u = invlist_array_init_(u, ( len_a > 0 && array_a[0] == 0) || (len_b > 0 && array_b[0] == 0)); /* Go through each input list item by item, stopping when have exhausted @@ -815,7 +845,7 @@ Perl__invlist_union_maybe_complement_2nd /* Set the result to the final length, which can change the pointer to * array_u, so re-find it. (Note that it is unlikely that this will * change, as we are shrinking the space, not enlarging it) */ - if (len_u != _invlist_len(u)) { + if (len_u != invlist_len_(u)) { invlist_set_len(u, len_u, *get_invlist_offset_addr(u)); invlist_trim(u); array_u = invlist_array(u); @@ -838,9 +868,11 @@ Perl__invlist_union_maybe_complement_2nd } void -Perl__invlist_intersection_maybe_complement_2nd(pTHX_ SV* const a, SV* const b, +Perl_invlist_intersection_maybe_complement_2nd_(pTHX_ SV* const a, SV* const b, const bool complement_b, SV** i) { + PERL_ARGS_ASSERT_INVLIST_INTERSECTION_MAYBE_COMPLEMENT_2ND_; + /* Take the intersection of two inversion lists and point '*i' to it. On * input, '*i' MUST POINT TO NULL OR TO AN SV* INVERSION LIST (possibly * even 'a' or 'b'). If to an inversion list, the contents of the original @@ -879,13 +911,12 @@ Perl__invlist_intersection_maybe_complem * Only when it is 2 are we in the intersection. */ UV count = 0; - PERL_ARGS_ASSERT__INVLIST_INTERSECTION_MAYBE_COMPLEMENT_2ND; assert(a != b); assert(*i == NULL || is_invlist(*i)); /* Special case if either one is empty */ - len_a = (a == NULL) ? 0 : _invlist_len(a); - if ((len_a == 0) || ((len_b = _invlist_len(b)) == 0)) { + len_a = (a == NULL) ? 0 : invlist_len_(a); + if ((len_a == 0) || ((len_b = invlist_len_(b)) == 0)) { if (len_a != 0 && complement_b) { /* Here, 'a' is not empty, therefore from the enclosing 'if', 'b' @@ -911,7 +942,7 @@ Perl__invlist_intersection_maybe_complem /* Here, 'a' or 'b' is empty and not using the complement of 'b'. The * intersection must be empty */ if (*i == NULL) { - *i = _new_invlist(0); + *i = new_invlist_(0); return; } @@ -944,10 +975,10 @@ Perl__invlist_intersection_maybe_complem /* Size the intersection for the worst case: that the intersection ends up * fragmenting everything to be completely disjoint */ - r = _new_invlist(len_a + len_b); + r = new_invlist_(len_a + len_b); /* Will contain U+0000 iff both components do */ - array_r = _invlist_array_init(r, len_a > 0 && array_a[0] == 0 + array_r = invlist_array_init_(r, len_a > 0 && array_a[0] == 0 && len_b > 0 && array_b[0] == 0); /* Go through each list item by item, stopping when have exhausted one of @@ -1049,7 +1080,7 @@ Perl__invlist_intersection_maybe_complem /* Set the result to the final length, which can change the pointer to * array_r, so re-find it. (Note that it is unlikely that this will * change, as we are shrinking the space, not enlarging it) */ - if (len_r != _invlist_len(r)) { + if (len_r != invlist_len_(r)) { invlist_set_len(r, len_r, *get_invlist_offset_addr(r)); invlist_trim(r); array_r = invlist_array(r); @@ -1076,8 +1107,10 @@ Perl__invlist_intersection_maybe_complem } SV* -Perl__add_range_to_invlist(pTHX_ SV* invlist, UV start, UV end) +Perl_add_range_to_invlist_(pTHX_ SV* invlist, UV start, UV end) { + PERL_ARGS_ASSERT_ADD_RANGE_TO_INVLIST_; + /* Add the range from 'start' to 'end' inclusive to the inversion list's * set. A pointer to the inversion list is returned. This may actually be * a new list, in which case the passed in one has been destroyed. The @@ -1101,15 +1134,15 @@ Perl__add_range_to_invlist(pTHX_ SV* inv /* This range becomes the whole inversion list if none already existed */ if (invlist == NULL) { - invlist = _new_invlist(2); - _append_range_to_invlist(invlist, start, end); + invlist = new_invlist_(2); + append_range_to_invlist_(invlist, start, end); return invlist; } /* Likewise, if the inversion list is currently empty */ - len = _invlist_len(invlist); + len = invlist_len_(invlist); if (len == 0) { - _append_range_to_invlist(invlist, start, end); + append_range_to_invlist_(invlist, start, end); return invlist; } @@ -1122,12 +1155,12 @@ Perl__add_range_to_invlist(pTHX_ SV* inv /* If the whole range is higher, we can just append it */ if (start > cur_highest) { - _append_range_to_invlist(invlist, start, end); + append_range_to_invlist_(invlist, start, end); return invlist; } /* Otherwise, add the portion that is higher ... */ - _append_range_to_invlist(invlist, cur_highest + 1, end); + append_range_to_invlist_(invlist, cur_highest + 1, end); /* ... and continue on below to handle the rest. As a result of the * above append, we know that the index of the end of the range is the @@ -1154,10 +1187,10 @@ Perl__add_range_to_invlist(pTHX_ SV* inv if (UNLIKELY(start == 0)) { SV* range_invlist; - range_invlist = _new_invlist(2); - _append_range_to_invlist(range_invlist, start, end); + range_invlist = new_invlist_(2); + append_range_to_invlist_(range_invlist, start, end); - _invlist_union(invlist, range_invlist, &invlist); + invlist_union_(invlist, range_invlist, &invlist); SvREFCNT_dec_NN(range_invlist); @@ -1183,7 +1216,7 @@ Perl__add_range_to_invlist(pTHX_ SV* inv * Find where in the list it should go. This finds i_s, such that: * invlist[i_s] <= start < array[i_s+1] */ - i_s = _invlist_search(invlist, start); + i_s = invlist_search_(invlist, start); } /* At this point, any extending before the beginning of the inversion list @@ -1198,7 +1231,7 @@ Perl__add_range_to_invlist(pTHX_ SV* inv if (i_e == 0) { i_e = (start == end) ? i_s - : _invlist_search(invlist, end); + : invlist_search_(invlist, end); } /* Here generally invlist[i_e] <= end < array[i_e+1]. But if invlist[i_e] @@ -1336,9 +1369,11 @@ Perl__add_range_to_invlist(pTHX_ SV* inv } SV* -Perl__setup_canned_invlist(pTHX_ const STRLEN size, const UV element0, +Perl_setup_canned_invlist_(pTHX_ const STRLEN size, const UV element0, UV** other_elements_ptr) { + PERL_ARGS_ASSERT_SETUP_CANNED_INVLIST_; + /* Create and return an inversion list whose contents are to be populated * by the caller. The caller gives the number of elements (in 'size') and * the very first element ('element0'). This function will set @@ -1351,11 +1386,9 @@ Perl__setup_canned_invlist(pTHX_ const S * (The first element needs to be passed in, as the underlying code does * things differently depending on whether it is zero or non-zero) */ - SV* invlist = _new_invlist(size); + SV* invlist = new_invlist_(size); bool offset; - PERL_ARGS_ASSERT__SETUP_CANNED_INVLIST; - invlist = add_cp_to_invlist(invlist, element0); offset = *get_invlist_offset_addr(invlist); @@ -1368,19 +1401,19 @@ Perl__setup_canned_invlist(pTHX_ const S #ifndef PERL_IN_XSUB_RE void -Perl__invlist_invert(pTHX_ SV* const invlist) +Perl_invlist_invert_(pTHX_ SV* const invlist) { + PERL_ARGS_ASSERT_INVLIST_INVERT_; + /* Complement the input inversion list. This adds a 0 if the list didn't * have a zero; removes it otherwise. As described above, the data * structure is set up so that this is very efficient */ - PERL_ARGS_ASSERT__INVLIST_INVERT; - assert(! invlist_is_iterating(invlist)); /* The inverse of matching nothing is matching everything */ - if (_invlist_len(invlist) == 0) { - _append_range_to_invlist(invlist, 0, UV_MAX); + if (invlist_len_(invlist) == 0) { + append_range_to_invlist_(invlist, 0, UV_MAX); return; } @@ -1390,17 +1423,17 @@ Perl__invlist_invert(pTHX_ SV* const inv SV* Perl_invlist_clone(pTHX_ SV* const invlist, SV* new_invlist) { + PERL_ARGS_ASSERT_INVLIST_CLONE; + /* Return a new inversion list that is a copy of the input one, which is * unchanged. The new list will not be mortal even if the old one was. */ - const STRLEN nominal_length = _invlist_len(invlist); + const STRLEN nominal_length = invlist_len_(invlist); const STRLEN physical_length = SvCUR(invlist); const bool offset = *(get_invlist_offset_addr(invlist)); - PERL_ARGS_ASSERT_INVLIST_CLONE; - if (new_invlist == NULL) { - new_invlist = _new_invlist(nominal_length); + new_invlist = new_invlist_(nominal_length); } else { sv_upgrade(new_invlist, SVt_INVLIST); @@ -1419,9 +1452,11 @@ Perl_invlist_clone(pTHX_ SV* const invli #ifndef PERL_IN_XSUB_RE void -Perl__invlist_dump(pTHX_ PerlIO *file, I32 level, +Perl_invlist_dump_(pTHX_ PerlIO *file, I32 level, const char * const indent, SV* const invlist) { + PERL_ARGS_ASSERT_INVLIST_DUMP_; + /* Designed to be called only by do_sv_dump(). Dumps out the ranges of the * inversion list 'invlist' to 'file' at 'level' Each line is prefixed by * the string 'indent'. The output looks like this: @@ -1439,10 +1474,8 @@ Perl__invlist_dump(pTHX_ PerlIO *file, I UV start, end; STRLEN count = 0; - PERL_ARGS_ASSERT__INVLIST_DUMP; - if (invlist_is_iterating(invlist)) { - Perl_dump_indent(aTHX_ level, file, + dump_indent(level, file, "%sCan't dump inversion list because is in middle of iterating\n", indent); return; @@ -1451,17 +1484,17 @@ Perl__invlist_dump(pTHX_ PerlIO *file, I invlist_iterinit(invlist); while (invlist_iternext(invlist, &start, &end)) { if (end == UV_MAX) { - Perl_dump_indent(aTHX_ level, file, + dump_indent(level, file, "%s[%" UVuf "] 0x%04" UVXf " .. INFTY\n", indent, (UV)count, start); } else if (end != start) { - Perl_dump_indent(aTHX_ level, file, + dump_indent(level, file, "%s[%" UVuf "] 0x%04" UVXf " .. 0x%04" UVXf "\n", indent, (UV)count, start, end); } else { - Perl_dump_indent(aTHX_ level, file, "%s[%" UVuf "] 0x%04" UVXf "\n", + dump_indent(level, file, "%s[%" UVuf "] 0x%04" UVXf "\n", indent, (UV)count, start); } count += 2; @@ -1470,21 +1503,21 @@ Perl__invlist_dump(pTHX_ PerlIO *file, I #endif -#if defined(PERL_ARGS_ASSERT__INVLISTEQ) && !defined(PERL_IN_XSUB_RE) +#if defined(PERL_ARGS_ASSERT_INVLISTEQ_) && !defined(PERL_IN_XSUB_RE) bool -Perl__invlistEQ(pTHX_ SV* const a, SV* const b, const bool complement_b) +Perl_invlistEQ_(pTHX_ SV* const a, SV* const b, const bool complement_b) { + PERL_ARGS_ASSERT_INVLISTEQ_; + /* Return a boolean as to if the two passed in inversion lists are * identical. The final argument, if true, says to take the complement of * the second inversion list before doing the comparison */ - const UV len_a = _invlist_len(a); - UV len_b = _invlist_len(b); + const UV len_a = invlist_len_(a); + UV len_b = invlist_len_(b); const UV* array_a = NULL; const UV* array_b = NULL; - - PERL_ARGS_ASSERT__INVLISTEQ; /* This code avoids accessing the arrays unless it knows the length is * non-zero */ Index: gnu/usr.bin/perl/regcomp_study.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regcomp_study.c,v diff -u -p -a -u -p -r1.3 regcomp_study.c --- gnu/usr.bin/perl/regcomp_study.c 23 Jul 2026 04:23:45 -0000 1.3 +++ gnu/usr.bin/perl/regcomp_study.c 16 Nov 2026 00:57:39 -0000 @@ -24,8 +24,8 @@ SAVEFREEPV(and_withp) -STATIC void -S_unwind_scan_frames(pTHX_ const void *p) +static void +S_unwind_scan_frames(pTHX_ void *p) { PERL_ARGS_ASSERT_UNWIND_SCAN_FRAMES; scan_frame *f= (scan_frame *)p; @@ -39,7 +39,7 @@ S_unwind_scan_frames(pTHX_ const void *p /* Follow the next-chain of the current node and optimize away all the NOTHINGs from it. */ -STATIC void +static void S_rck_elide_nothing(pTHX_ regnode *node) { PERL_ARGS_ASSERT_RCK_ELIDE_NOTHING; @@ -67,7 +67,7 @@ S_rck_elide_nothing(pTHX_ regnode *node) if (REGNODE_OFF_BY_ARG(OP(node))) ARG1u(node) = off; else - NEXT_OFF(node) = off; + NEXT_OFF_set(node, off); } return; } @@ -81,16 +81,16 @@ S_rck_elide_nothing(pTHX_ regnode *node) * Returns the invlist as a new SV*; it is the caller's responsibility to * call SvREFCNT_dec() when done with it. */ -STATIC SV* +static SV* S_make_exactf_invlist(pTHX_ RExC_state_t *pRExC_state, regnode *node) { + PERL_ARGS_ASSERT_MAKE_EXACTF_INVLIST; + const U8 * s = (U8*)STRING(node); SSize_t bytelen = STR_LEN(node); UV uc; /* Start out big enough for 2 separate code points */ - SV* invlist = _new_invlist(4); - - PERL_ARGS_ASSERT_MAKE_EXACTF_INVLIST; + SV* invlist = new_invlist_(4); if (! UTF) { uc = *s; @@ -104,14 +104,14 @@ S_make_exactf_invlist(pTHX_ RExC_state_t * plus several other things; and making sure we have all the * possibilities is hard. */ if (is_MULTI_CHAR_FOLD_latin1_safe(s, s + bytelen)) { - invlist = _add_range_to_invlist(invlist, 0, UV_MAX); + invlist = add_range_to_invlist_(invlist, 0, UV_MAX); } else { /* Any Latin1 range character can potentially match any * other depending on the locale, and in Turkic locales, 'I' and * 'i' can match U+130 and U+131 */ if (OP(node) == EXACTFL) { - _invlist_union(invlist, PL_Latin1, &invlist); + invlist_union_(invlist, PL_Latin1, &invlist); if (isALPHA_FOLD_EQ(uc, 'I')) { invlist = add_cp_to_invlist(invlist, LATIN_SMALL_LETTER_DOTLESS_I); @@ -190,7 +190,7 @@ S_make_exactf_invlist(pTHX_ RExC_state_t * multi-char fold */ if (is_MULTI_CHAR_FOLD_utf8_safe(s, e)) { - invlist = _add_range_to_invlist(invlist, 0, UV_MAX); + invlist = add_range_to_invlist_(invlist, 0, UV_MAX); } else { /* Single char fold */ unsigned int k; @@ -203,7 +203,7 @@ S_make_exactf_invlist(pTHX_ RExC_state_t /* ... plus all the things that fold to it, which are found in * PL_utf8_foldclosures */ - folds_count = _inverse_folds(fc, &first_fold, + folds_count = inverse_folds_(fc, &first_fold, &remaining_folds); for (k = 0; k < folds_count; k++) { UV c = (k == 0) ? first_fold : remaining_folds[k-1]; @@ -252,13 +252,13 @@ void Perl_scan_commit(pTHX_ const RExC_state_t *pRExC_state, scan_data_t *data, SSize_t *minlenp, int is_inf) { + PERL_ARGS_ASSERT_SCAN_COMMIT; + const STRLEN l = CHR_SVLEN(data->last_found); SV * const longest_sv = data->substrs[data->cur_is_floating].str; const STRLEN old_l = CHR_SVLEN(longest_sv); DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_SCAN_COMMIT; - if ((l >= old_l) && ((l > old_l) || (data->flags & SF_BEFORE_EOL))) { const U8 i = data->cur_is_floating; SvSetMagicSV(longest_sv, data->last_found); @@ -300,23 +300,25 @@ Perl_scan_commit(pTHX_ const RExC_state_ /* An SSC is just a regnode_charclass_posix with an extra field: the inversion * list that describes which code points it matches */ -STATIC void +static void S_ssc_anything(pTHX_ regnode_ssc *ssc) { - /* Set the SSC 'ssc' to match an empty string or any code point */ - PERL_ARGS_ASSERT_SSC_ANYTHING; + /* Set the SSC 'ssc' to match an empty string or any code point */ + assert(is_ANYOF_SYNTHETIC(ssc)); /* mortalize so won't leak */ - ssc->invlist = sv_2mortal(_add_range_to_invlist(NULL, 0, UV_MAX)); + ssc->invlist = sv_2mortal(add_range_to_invlist_(NULL, 0, UV_MAX)); ANYOF_FLAGS(ssc) |= SSC_MATCHES_EMPTY_STRING; /* Plus matches empty */ } -STATIC int +static int S_ssc_is_anything(const regnode_ssc *ssc) { + PERL_ARGS_ASSERT_SSC_IS_ANYTHING; + /* Returns true if the SSC 'ssc' can match the empty string and any code * point; false otherwise. Thus, this is used to see if using 'ssc' buys * us anything: if the function returns true, 'ssc' hasn't been restricted @@ -325,8 +327,6 @@ S_ssc_is_anything(const regnode_ssc *ssc UV start = 0, end = 0; /* Initialize due to messages from dumb compiler */ bool ret; - PERL_ARGS_ASSERT_SSC_IS_ANYTHING; - assert(is_ANYOF_SYNTHETIC(ssc)); if (! (ANYOF_FLAGS(ssc) & SSC_MATCHES_EMPTY_STRING)) { @@ -361,11 +361,11 @@ S_ssc_is_anything(const regnode_ssc *ssc void Perl_ssc_init(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc) { + PERL_ARGS_ASSERT_SSC_INIT; + /* Initializes the SSC 'ssc'. This includes setting it to match an empty * string, any code point, or any posix class under locale */ - PERL_ARGS_ASSERT_SSC_INIT; - Zero(ssc, 1, regnode_ssc); set_ANYOF_SYNTHETIC(ssc); ARG1u_SET(ssc, ANYOF_MATCHES_ALL_OUTSIDE_BITMAP_VALUE); @@ -386,10 +386,12 @@ Perl_ssc_init(pTHX_ const RExC_state_t * } } -STATIC int +static int S_ssc_is_cp_posixl_init(const RExC_state_t *pRExC_state, const regnode_ssc *ssc) { + PERL_ARGS_ASSERT_SSC_IS_CP_POSIXL_INIT; + /* Returns true if the SSC 'ssc' is in its initial state with regard only * to the list of code points matched, and locale posix classes; hence does * not check its flags) */ @@ -397,8 +399,6 @@ S_ssc_is_cp_posixl_init(const RExC_state UV start = 0, end = 0; /* Initialize due to messages from dumb compiler */ bool ret; - PERL_ARGS_ASSERT_SSC_IS_CP_POSIXL_INIT; - assert(is_ANYOF_SYNTHETIC(ssc)); invlist_iterinit(ssc->invlist); @@ -420,10 +420,12 @@ S_ssc_is_cp_posixl_init(const RExC_state } -STATIC SV* +static SV* S_get_ANYOF_cp_list_for_ssc(pTHX_ const RExC_state_t *pRExC_state, const regnode_charclass* const node) { + PERL_ARGS_ASSERT_GET_ANYOF_CP_LIST_FOR_SSC; + /* Returns a mortal inversion list defining which code points are matched * by 'node', which is of ANYOF-ish type . Handles complementing the * result if appropriate. If some code points aren't knowable at this @@ -437,12 +439,10 @@ S_get_ANYOF_cp_list_for_ssc(pTHX_ const ? ANYOF_FLAGS(node) : 0; - PERL_ARGS_ASSERT_GET_ANYOF_CP_LIST_FOR_SSC; - /* Look at the data structure created by S_set_ANYOF_arg() */ if (ANYOF_MATCHES_ALL_OUTSIDE_BITMAP(node)) { - invlist = sv_2mortal(_new_invlist(1)); - invlist = _add_range_to_invlist(invlist, NUM_ANYOF_CODE_POINTS, UV_MAX); + invlist = sv_2mortal(new_invlist_(1)); + invlist = add_range_to_invlist_(invlist, NUM_ANYOF_CODE_POINTS, UV_MAX); } else if (ANYOF_HAS_AUX(node)) { const U32 n = ARG1u(node); @@ -454,8 +454,8 @@ S_get_ANYOF_cp_list_for_ssc(pTHX_ const /* Here there are things that won't be known until runtime -- we * have to assume it could be anything */ - invlist = sv_2mortal(_new_invlist(1)); - return _add_range_to_invlist(invlist, 0, UV_MAX); + invlist = sv_2mortal(new_invlist_(1)); + return add_range_to_invlist_(invlist, 0, UV_MAX); } else if (ary[INVLIST_INDEX]) { @@ -472,7 +472,7 @@ S_get_ANYOF_cp_list_for_ssc(pTHX_ const } if (! invlist) { - invlist = sv_2mortal(_new_invlist(0)); + invlist = sv_2mortal(new_invlist_(0)); } /* An ANYOF node contains a bitmap for the first NUM_ANYOF_CODE_POINTS @@ -486,7 +486,7 @@ S_get_ANYOF_cp_list_for_ssc(pTHX_ const * have to do this here before we add the unconditionally matched code * points */ if (flags & ANYOF_INVERT) { - _invlist_intersection_complement_2nd(invlist, + invlist_intersection_complement_2nd_(invlist, PL_UpperLatin1, &invlist); } @@ -502,7 +502,7 @@ S_get_ANYOF_cp_list_for_ssc(pTHX_ const { /* empty */ } - invlist = _add_range_to_invlist(invlist, start, i-1); + invlist = add_range_to_invlist_(invlist, start, i-1); new_node_has_latin1 = true; } } @@ -516,39 +516,39 @@ S_get_ANYOF_cp_list_for_ssc(pTHX_ const && OP(node) == ANYOFD && (flags & ANYOFD_NON_UTF8_MATCHES_ALL_NON_ASCII__shared)) { - _invlist_union(invlist, PL_UpperLatin1, &invlist); + invlist_union_(invlist, PL_UpperLatin1, &invlist); } /* Similarly for these */ if (ANYOF_MATCHES_ALL_OUTSIDE_BITMAP(node)) { - _invlist_union_complement_2nd(invlist, PL_InBitmap, &invlist); + invlist_union_complement_2nd_(invlist, PL_InBitmap, &invlist); } if (flags & ANYOF_INVERT) { - _invlist_invert(invlist); + invlist_invert_(invlist); } else if (flags & ANYOFL_FOLD) { if (new_node_has_latin1) { /* These folds are potential in Turkic locales */ - if (_invlist_contains_cp(invlist, 'i')) { + if (invlist_contains_cp_(invlist, 'i')) { invlist = add_cp_to_invlist(invlist, LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE); } - if (_invlist_contains_cp(invlist, 'I')) { + if (invlist_contains_cp_(invlist, 'I')) { invlist = add_cp_to_invlist(invlist, LATIN_SMALL_LETTER_DOTLESS_I); } /* Under /li, any 0-255 could fold to any other 0-255, depending on * the locale. We can skip this if there are no 0-255 at all. */ - _invlist_union(invlist, PL_Latin1, &invlist); + invlist_union_(invlist, PL_Latin1, &invlist); } else { - if (_invlist_contains_cp(invlist, LATIN_SMALL_LETTER_DOTLESS_I)) { + if (invlist_contains_cp_(invlist, LATIN_SMALL_LETTER_DOTLESS_I)) { invlist = add_cp_to_invlist(invlist, 'I'); } - if (_invlist_contains_cp(invlist, + if (invlist_contains_cp_(invlist, LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE)) { invlist = add_cp_to_invlist(invlist, 'i'); @@ -560,7 +560,7 @@ S_get_ANYOF_cp_list_for_ssc(pTHX_ const * deferred until after the non-UTF-8 locale ones are taken care of just * above, or it leads to wrong results under ANYOF_INVERT */ if (only_utf8_locale_invlist) { - _invlist_union_maybe_complement_2nd(invlist, + invlist_union_maybe_complement_2nd_(invlist, only_utf8_locale_invlist, flags & ANYOF_INVERT, &invlist); @@ -572,10 +572,12 @@ S_get_ANYOF_cp_list_for_ssc(pTHX_ const /* 'AND' a given class with another one. Can create false positives. 'ssc' * should not be inverted. */ -STATIC void +static void S_ssc_and(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc, const regnode_charclass *and_with) { + PERL_ARGS_ASSERT_SSC_AND; + /* Accumulate into SSC 'ssc' its 'AND' with 'and_with', which is either * another SSC or a regular ANYOF class. Can create false positives. */ @@ -585,8 +587,6 @@ S_ssc_and(pTHX_ const RExC_state_t *pREx : 0; U8 anded_flags; - PERL_ARGS_ASSERT_SSC_AND; - assert(is_ANYOF_SYNTHETIC(ssc)); /* 'and_with' is used as-is if it too is an SSC; otherwise have to extract @@ -755,10 +755,12 @@ S_ssc_and(pTHX_ const RExC_state_t *pREx } } -STATIC void +static void S_ssc_or(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc, const regnode_charclass *or_with) { + PERL_ARGS_ASSERT_SSC_OR; + /* Accumulate into SSC 'ssc' its 'OR' with 'or_with', which is either * another SSC or a regular ANYOF class. Can create false positives if * 'or_with' is to be inverted. */ @@ -769,8 +771,6 @@ S_ssc_or(pTHX_ const RExC_state_t *pRExC ? ANYOF_FLAGS(or_with) : 0; - PERL_ARGS_ASSERT_SSC_OR; - assert(is_ANYOF_SYNTHETIC(ssc)); /* 'or_with' is used as-is if it too is an SSC; otherwise have to extract @@ -838,20 +838,20 @@ S_ssc_or(pTHX_ const RExC_state_t *pRExC ); } -STATIC void +static void S_ssc_union(pTHX_ regnode_ssc *ssc, SV* const invlist, const bool invert2nd) { PERL_ARGS_ASSERT_SSC_UNION; assert(is_ANYOF_SYNTHETIC(ssc)); - _invlist_union_maybe_complement_2nd(ssc->invlist, + invlist_union_maybe_complement_2nd_(ssc->invlist, invlist, invert2nd, &ssc->invlist); } -STATIC void +static void S_ssc_intersection(pTHX_ regnode_ssc *ssc, SV* const invlist, const bool invert2nd) @@ -860,30 +860,30 @@ S_ssc_intersection(pTHX_ regnode_ssc *ss assert(is_ANYOF_SYNTHETIC(ssc)); - _invlist_intersection_maybe_complement_2nd(ssc->invlist, + invlist_intersection_maybe_complement_2nd_(ssc->invlist, invlist, invert2nd, &ssc->invlist); } -STATIC void +static void S_ssc_add_range(pTHX_ regnode_ssc *ssc, const UV start, const UV end) { PERL_ARGS_ASSERT_SSC_ADD_RANGE; assert(is_ANYOF_SYNTHETIC(ssc)); - ssc->invlist = _add_range_to_invlist(ssc->invlist, start, end); + ssc->invlist = add_range_to_invlist_(ssc->invlist, start, end); } -STATIC void +static void S_ssc_cp_and(pTHX_ regnode_ssc *ssc, const UV cp) { - /* AND just the single code point 'cp' into the SSC 'ssc' */ + PERL_ARGS_ASSERT_SSC_CP_AND; - SV* cp_list = _new_invlist(2); + /* AND just the single code point 'cp' into the SSC 'ssc' */ - PERL_ARGS_ASSERT_SSC_CP_AND; + SV* cp_list = new_invlist_(2); assert(is_ANYOF_SYNTHETIC(ssc)); @@ -894,12 +894,13 @@ S_ssc_cp_and(pTHX_ regnode_ssc *ssc, con SvREFCNT_dec_NN(cp_list); } -STATIC void +static void S_ssc_clear_locale(regnode_ssc *ssc) { - /* Set the SSC 'ssc' to not match any locale things */ PERL_ARGS_ASSERT_SSC_CLEAR_LOCALE; + /* Set the SSC 'ssc' to not match any locale things */ + assert(is_ANYOF_SYNTHETIC(ssc)); ANYOF_POSIXL_ZERO(ssc); @@ -1059,6 +1060,8 @@ Perl_join_exact(pTHX_ RExC_state_t *pREx UV *min_subtract, bool *unfolded_multi_char, U32 flags, regnode *val, U32 depth) { + PERL_ARGS_ASSERT_JOIN_EXACT; + /* Merge several consecutive EXACTish nodes into one. */ regnode *n = regnext(scan); @@ -1073,7 +1076,6 @@ Perl_join_exact(pTHX_ RExC_state_t *pREx PERL_UNUSED_ARG(depth); #endif - PERL_ARGS_ASSERT_JOIN_EXACT; #ifndef EXPERIMENTAL_INPLACESCAN PERL_UNUSED_ARG(flags); PERL_UNUSED_ARG(val); @@ -1095,7 +1097,7 @@ Perl_join_exact(pTHX_ RExC_state_t *pREx stringok = 0; if (REGNODE_TYPE(OP(n)) == NOTHING) { DEBUG_PEEP("skip:", n, depth, 0); - NEXT_OFF(scan) += NEXT_OFF(n); + NEXT_OFF_set(scan, NEXT_OFF(scan) + NEXT_OFF(n)); next = n + NODE_STEP_REGNODE; #ifdef DEBUGGING if (stringok) @@ -1219,7 +1221,7 @@ Perl_join_exact(pTHX_ RExC_state_t *pREx #endif next = REGNODE_AFTER_varies(n); - NEXT_OFF(scan) += NEXT_OFF(n); + NEXT_OFF_set(scan, NEXT_OFF(scan) + NEXT_OFF(n)); assert( ( STR_LEN(scan) + STR_LEN(n) ) < 256 ); setSTR_LEN(scan, (U8)(STR_LEN(scan) + STR_LEN(n))); /* Now we can overwrite *n : */ @@ -1238,7 +1240,7 @@ Perl_join_exact(pTHX_ RExC_state_t *pREx ARG1u_SET(n, val - n); } else { - NEXT_OFF(n) = val - n; + NEXT_OFF_set(n, val - n); } stopnow = 1; } @@ -1311,7 +1313,7 @@ Perl_join_exact(pTHX_ RExC_state_t *pREx } else { STRLEN len; - _toFOLD_utf8_flags(s, s_end, d, &len, FOLD_FLAGS_FULL); + toFOLD_utf8_flags_(s, s_end, d, &len, FOLD_FLAGS_FULL); d += len; } s += s_len; @@ -1454,7 +1456,7 @@ Perl_join_exact(pTHX_ RExC_state_t *pREx while (n <= stop) { OP(n) = OPTIMIZED; FLAGS(n) = 0; - NEXT_OFF(n) = 0; + NEXT_OFF_set(n, 0); n++; } #endif @@ -1489,6 +1491,8 @@ Perl_study_chunk(pTHX_ a higher caller is holding a ptr to them. */ ) { + PERL_ARGS_ASSERT_STUDY_CHUNK; + /* vars about the regnodes we are working with */ regnode *scan = *scanp; /* the current opcode we are inspecting */ regnode *next = NULL; /* the next opcode beyond scan, tmp var */ @@ -1526,7 +1530,6 @@ Perl_study_chunk(pTHX_ DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_STUDY_CHUNK; RExC_study_started = 1; Zero(&data_fake, 1, scan_data_t); @@ -1542,7 +1545,7 @@ Perl_study_chunk(pTHX_ ); DEBUG_OPTIMISE_MORE_r( { - Perl_re_indentf( aTHX_ "study_chunk stopparen = %ld recursed_count = %lu " + re_indentf("study_chunk stopparen = %ld recursed_count = %lu " "depth = %lu recursed_depth = %lu scan = %p last = %p", depth, (long)stopparen, (unsigned long)RExC_study_chunk_recursed_count, @@ -1555,16 +1558,16 @@ Perl_study_chunk(pTHX_ for ( j = 0 ; j < recursed_depth ; j++ ) { for ( i = 0 ; i < (U32)RExC_total_parens ; i++ ) { if (PAREN_TEST(j, i) && (!j || !PAREN_TEST(j - 1, i))) { - Perl_re_printf( aTHX_ " %d",(int)i); + re_printf(" %d",(int)i); break; } } if ( j + 1 < recursed_depth ) { - Perl_re_printf( aTHX_ ","); + re_printf(","); } } } - Perl_re_printf( aTHX_ "\n"); + re_printf("\n"); } ); while ( scan && OP(scan) != END && scan < last ){ @@ -1854,7 +1857,7 @@ Perl_study_chunk(pTHX_ DEBUG_TRIE_COMPILE_r({ regprop(RExC_rx, RExC_mysv, tail, NULL, pRExC_state); - Perl_re_indentf( aTHX_ "%s %" UVuf ":%s\n", + re_indentf("%s %" UVuf ":%s\n", depth+1, "Looking for TRIE'able sequences. Tail node is ", (UV) REGNODE_OFFSET(tail), @@ -1950,20 +1953,20 @@ Perl_study_chunk(pTHX_ DEBUG_TRIE_COMPILE_r({ regprop(RExC_rx, RExC_mysv, cur, NULL, pRExC_state); - Perl_re_indentf( aTHX_ "- %d:%s (%d)", + re_indentf("- %d:%s (%d)", depth+1, REG_NODE_NUM(cur), SvPV_nolen_const( RExC_mysv ), REG_NODE_NUM(cur) ); regprop(RExC_rx, RExC_mysv, noper, NULL, pRExC_state); - Perl_re_printf( aTHX_ " -> %d:%s", + re_printf(" -> %d:%s", REG_NODE_NUM(noper), SvPV_nolen_const(RExC_mysv)); if ( noper_next ) { regprop(RExC_rx, RExC_mysv, noper_next, NULL, pRExC_state); - Perl_re_printf( aTHX_ "\t=> %d:%s\t", + re_printf("\t=> %d:%s\t", REG_NODE_NUM(noper_next), SvPV_nolen_const(RExC_mysv)); } - Perl_re_printf( aTHX_ "(First == %d,Last == %d,Cur == %d,tt == %s,ntt == %s,nntt == %s)\n", + re_printf("(First == %d,Last == %d,Cur == %d,tt == %s,ntt == %s,nntt == %s)\n", REG_NODE_NUM(first), REG_NODE_NUM(prev), REG_NODE_NUM(cur), REGNODE_NAME(trietype), REGNODE_NAME(noper_trietype), REGNODE_NAME(noper_next_trietype) ); @@ -2059,9 +2062,9 @@ Perl_study_chunk(pTHX_ } /* loop over branches */ DEBUG_TRIE_COMPILE_r({ regprop(RExC_rx, RExC_mysv, cur, NULL, pRExC_state); - Perl_re_indentf( aTHX_ "- %s (%d) ", + re_indentf("- %s (%d) ", depth+1, SvPV_nolen_const( RExC_mysv ), REG_NODE_NUM(cur)); - Perl_re_printf( aTHX_ "(First == %d, Last == %d, Cur == %d, tt == %s)\n", + re_printf("(First == %d, Last == %d, Cur == %d, tt == %s)\n", REG_NODE_NUM(first), REG_NODE_NUM(prev), REG_NODE_NUM(cur), REGNODE_NAME(trietype) ); @@ -2101,13 +2104,14 @@ Perl_study_chunk(pTHX_ * turn it into a plain NOTHING op. */ DEBUG_TRIE_COMPILE_r({ regprop(RExC_rx, RExC_mysv, cur, NULL, pRExC_state); - Perl_re_indentf( aTHX_ "- %s (%d) \n", + re_indentf("- %s (%d) \n", depth+1, SvPV_nolen_const( RExC_mysv ), REG_NODE_NUM(cur)); }); OP(startbranch)= NOTHING; - NEXT_OFF(startbranch)= tail - startbranch; + NEXT_OFF_set(startbranch, + tail - startbranch); for ( opt = startbranch + 1; opt < tail ; opt++ ) OP(opt)= OPTIMIZED; } @@ -2572,8 +2576,8 @@ Perl_study_chunk(pTHX_ && maxcount <= REG_INFTY/3) /* Complement check for big count */ { - _WARN_HELPER(RExC_precomp_end, packWARN(WARN_REGEXP), - Perl_ck_warner(aTHX_ packWARN(WARN_REGEXP), + WARN_HELPER_(RExC_precomp_end, packWARN(WARN_REGEXP), + ck_warner(packWARN(WARN_REGEXP), "Quantifier unexpected on zero-length expression " "in regex m/%" UTF8f "/", UTF8fARG(UTF, RExC_precomp_end - RExC_precomp, @@ -2653,11 +2657,11 @@ Perl_study_chunk(pTHX_ #ifdef DEBUGGING OP(nxt1 + 1) = OPTIMIZED; /* was count. */ - NEXT_OFF(nxt1+ 1) = 0; /* just for consistency. */ - NEXT_OFF(nxt2) = 0; /* just for consistency with CURLY. */ + NEXT_OFF_set(nxt1 + 1, 0); /* just for consistency. */ + NEXT_OFF_set(nxt2, 0); /* just for consistency with CURLY. */ OP(nxt) = OPTIMIZED; /* was CLOSE. */ OP(nxt + 1) = OPTIMIZED; /* was count. */ - NEXT_OFF(nxt+ 1) = 0; /* just for consistency. */ + NEXT_OFF_set(nxt + 1, 0); /* just for consistency. */ #endif } nogo: @@ -2711,8 +2715,8 @@ Perl_study_chunk(pTHX_ #ifdef DEBUGGING OP(nxt1 + 1) = OPTIMIZED; /* was count. */ OP(nxt + 1) = OPTIMIZED; /* was count. */ - NEXT_OFF(nxt1 + 1) = 0; /* just for consistency. */ - NEXT_OFF(nxt + 1) = 0; /* just for consistency. */ + NEXT_OFF_set(nxt1 + 1, 0); /* just for consistency. */ + NEXT_OFF_set(nxt + 1, 0); /* just for consistency. */ #endif #if 0 while ( nxt1 && (OP(nxt1) != WHILEM)) { @@ -2721,7 +2725,7 @@ Perl_study_chunk(pTHX_ if (REGNODE_OFF_BY_ARG(OP(nxt1))) ARG1u_SET(nxt1, nxt2 - nxt1); else if (nxt2 - nxt1 < U16_MAX) - NEXT_OFF(nxt1) = nxt2 - nxt1; + NEXT_OFF_set(nxt1, nxt2 - nxt1); else OP(nxt) = NOTHING; /* Cannot beautify */ } @@ -2828,14 +2832,14 @@ Perl_study_chunk(pTHX_ /* It is counted once already... */ data->pos_min += minnext * (mincount - counted); #if 0 - Perl_re_printf( aTHX_ "counted = %" UVuf " deltanext = %" UVuf + re_printf("counted = %" UVuf " deltanext = %" UVuf " OPTIMIZE_INFTY = %" UVuf " minnext = %" UVuf " maxcount = %" UVuf " mincount = %" UVuf " data->pos_delta = %" UVuf "\n", (UV)counted, (UV)deltanext, (UV)OPTIMIZE_INFTY, (UV)minnext, (UV)maxcount, (UV)mincount, (UV)data->pos_delta); if (deltanext != OPTIMIZE_INFTY) - Perl_re_printf( aTHX_ "LHS = %" UVuf " RHS = %" UVuf "\n", + re_printf("LHS = %" UVuf " RHS = %" UVuf "\n", (UV)(-counted * deltanext + (minnext + deltanext) * maxcount - minnext * mincount), (UV)(OPTIMIZE_INFTY - data->pos_delta)); #endif @@ -2965,7 +2969,7 @@ Perl_study_chunk(pTHX_ case REG_ANY: { - SV* REG_ANY_invlist = _new_invlist(2); + SV* REG_ANY_invlist = new_invlist_(2); REG_ANY_invlist = add_cp_to_invlist(REG_ANY_invlist, '\n'); if (flags & SCF_DO_STCLASS_OR) { @@ -3041,7 +3045,7 @@ Perl_study_chunk(pTHX_ { SV* cp_list = NULL; - cp_list = _add_range_to_invlist(cp_list, + cp_list = add_range_to_invlist_(cp_list, ANYOFRbase(scan), ANYOFRbase(scan) + ANYOFRdelta(scan)); @@ -3072,7 +3076,7 @@ Perl_study_chunk(pTHX_ } /* No individual code points can now match */ data->start_class->invlist - = sv_2mortal(_new_invlist(0)); + = sv_2mortal(new_invlist_(0)); } else { int complement = namedclass + ((invert) ? -1 : 1); @@ -3118,7 +3122,7 @@ Perl_study_chunk(pTHX_ * invert, we want to get rid of all of them so that the * inversion will match all */ if (OP(scan) == NPOSIXD) { - _invlist_subtract(my_invlist, PL_UpperLatin1, + invlist_subtract_(my_invlist, PL_UpperLatin1, &my_invlist); } @@ -3218,7 +3222,7 @@ Perl_study_chunk(pTHX_ * matches to avoid breakage for those not using this * extension) */ if (deltanext) { - NEXT_OFF(scan) = deltanext; + NEXT_OFF_set(scan, deltanext); if ( /* See a CLOSE op inside this lookbehind? */ cur_last_close_op != *(data_fake.last_close_opp) @@ -3334,7 +3338,7 @@ Perl_study_chunk(pTHX_ } if (deltanext) { - NEXT_OFF(scan) = deltanext; + NEXT_OFF_set(scan, deltanext); } FLAGS(scan) = (U8)*minnextp + deltanext; } Index: gnu/usr.bin/perl/regcomp_trie.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regcomp_trie.c,v diff -u -p -a -u -p -r1.1.1.3 regcomp_trie.c --- gnu/usr.bin/perl/regcomp_trie.c 26 Dec 2025 22:12:26 -0000 1.1.1.3 +++ gnu/usr.bin/perl/regcomp_trie.c 16 Nov 2026 00:57:39 -0000 @@ -47,25 +47,25 @@ Used for debugging make_trie(). */ -STATIC void -S_dump_trie(pTHX_ const struct _reg_trie_data *trie, HV *widecharmap, +static void +S_dump_trie(pTHX_ const struct reg_trie_data_ *trie, HV *widecharmap, AV *revcharmap, U32 depth) { + PERL_ARGS_ASSERT_DUMP_TRIE; + U32 state; SV *sv = sv_newmortal(); int colwidth = widecharmap ? 6 : 4; U16 word; DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_DUMP_TRIE; - - Perl_re_indentf( aTHX_ "Char : %-6s%-6s%-4s ", + re_indentf("Char : %-6s%-6s%-4s ", depth+1, "Match","Base","Ofs" ); for( state = 0 ; state < trie->uniquecharcount ; state++ ) { SV ** const tmp = av_fetch_simple( revcharmap, state, 0); if ( tmp ) { - Perl_re_printf( aTHX_ "%*s", + re_printf("%*s", colwidth, pv_pretty(sv, SvPV_nolen_const(*tmp), SvCUR(*tmp), colwidth, PL_colors[0], PL_colors[1], @@ -75,25 +75,25 @@ S_dump_trie(pTHX_ const struct _reg_trie ); } } - Perl_re_printf( aTHX_ "\n"); - Perl_re_indentf( aTHX_ "State|-----------------------", depth+1); + re_printf("\n"); + re_indentf("State|-----------------------", depth+1); for( state = 0 ; state < trie->uniquecharcount ; state++ ) - Perl_re_printf( aTHX_ "%.*s", colwidth, "--------"); - Perl_re_printf( aTHX_ "\n"); + re_printf("%.*s", colwidth, "--------"); + re_printf("\n"); for( state = 1 ; state < trie->statecount ; state++ ) { const U32 base = trie->states[ state ].trans.base; - Perl_re_indentf( aTHX_ "#%4" UVXf "|", depth+1, (UV)state); + re_indentf("#%4" UVXf "|", depth+1, (UV)state); if ( trie->states[ state ].wordnum ) { - Perl_re_printf( aTHX_ " W%4X", trie->states[ state ].wordnum ); + re_printf(" W%4X", trie->states[ state ].wordnum ); } else { - Perl_re_printf( aTHX_ "%6s", "" ); + re_printf("%6s", "" ); } - Perl_re_printf( aTHX_ " @%4" UVXf " ", (UV)base ); + re_printf(" @%4" UVXf " ", (UV)base ); if ( base ) { U32 ofs = 0; @@ -104,7 +104,7 @@ S_dump_trie(pTHX_ const struct _reg_trie != state)) ofs++; - Perl_re_printf( aTHX_ "+%2" UVXf "[ ", (UV)ofs); + re_printf("+%2" UVXf "[ ", (UV)ofs); for ( ofs = 0 ; ofs < trie->uniquecharcount ; ofs++ ) { if ( ( base + ofs >= trie->uniquecharcount ) @@ -113,27 +113,27 @@ S_dump_trie(pTHX_ const struct _reg_trie && trie->trans[ base + ofs - trie->uniquecharcount ].check == state ) { - Perl_re_printf( aTHX_ "%*" UVXf, colwidth, + re_printf("%*" UVXf, colwidth, (UV)trie->trans[ base + ofs - trie->uniquecharcount ].next ); } else { - Perl_re_printf( aTHX_ "%*s", colwidth," ." ); + re_printf("%*s", colwidth," ." ); } } - Perl_re_printf( aTHX_ "]"); + re_printf("]"); } - Perl_re_printf( aTHX_ "\n" ); + re_printf("\n" ); } - Perl_re_indentf( aTHX_ "word_info N:(prev,len)=", + re_indentf("word_info N:(prev,len)=", depth); for (word = 1; word <= trie->wordcount; word++) { - Perl_re_printf( aTHX_ " %d:(%d,%d)", + re_printf(" %d:(%d,%d)", (int)word, (int)(trie->wordinfo[word].prev), (int)(trie->wordinfo[word].len)); } - Perl_re_printf( aTHX_ "\n" ); + re_printf("\n" ); } /* Dumps a fully constructed but uncompressed trie in list form. @@ -141,33 +141,33 @@ S_dump_trie(pTHX_ const struct _reg_trie possible chars (trie->uniquecharcount) is very high. Used for debugging make_trie(). */ -STATIC void -S_dump_trie_interim_list(pTHX_ const struct _reg_trie_data *trie, +static void +S_dump_trie_interim_list(pTHX_ const struct reg_trie_data_ *trie, HV *widecharmap, AV *revcharmap, U32 next_alloc, U32 depth) { + PERL_ARGS_ASSERT_DUMP_TRIE_INTERIM_LIST; + U32 state; SV *sv = sv_newmortal(); int colwidth = widecharmap ? 6 : 4; DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_DUMP_TRIE_INTERIM_LIST; - /* print out the table precompression. */ - Perl_re_indentf( aTHX_ "State :Word | Transition Data\n", + re_indentf("State :Word | Transition Data\n", depth+1 ); - Perl_re_indentf( aTHX_ "%s", + re_indentf("%s", depth+1, "------:-----+-----------------\n" ); for( state = 1; state < next_alloc; state++ ) { U16 charid; - Perl_re_indentf( aTHX_ " %4" UVXf " :", + re_indentf(" %4" UVXf " :", depth+1, (UV)state ); if ( ! trie->states[ state ].wordnum ) { - Perl_re_printf( aTHX_ "%5s| ",""); + re_printf("%5s| ",""); } else { - Perl_re_printf( aTHX_ "W%4x| ", + re_printf("W%4x| ", trie->states[ state ].wordnum ); } @@ -175,7 +175,7 @@ S_dump_trie_interim_list(pTHX_ const str SV ** const tmp = av_fetch_simple( revcharmap, TRIE_LIST_ITEM(state, charid).forid, 0); if ( tmp ) { - Perl_re_printf( aTHX_ "%*s:%3X=%4" UVXf " | ", + re_printf("%*s:%3X=%4" UVXf " | ", colwidth, pv_pretty(sv, SvPV_nolen_const(*tmp), SvCUR(*tmp), colwidth, @@ -187,11 +187,11 @@ S_dump_trie_interim_list(pTHX_ const str (UV)TRIE_LIST_ITEM(state, charid).newstate ); if (!(charid % 10)) - Perl_re_printf( aTHX_ "\n%*s| ", + re_printf("\n%*s| ", (int)((depth * 2) + 14), ""); } } - Perl_re_printf( aTHX_ "\n"); + re_printf("\n"); } } @@ -201,32 +201,34 @@ S_dump_trie_interim_list(pTHX_ const str twists to facilitate compression later. Used for debugging make_trie(). */ -STATIC void -S_dump_trie_interim_table(pTHX_ const struct _reg_trie_data *trie, +static void +S_dump_trie_interim_table(pTHX_ const struct reg_trie_data_ *trie, HV *widecharmap, AV *revcharmap, U32 next_alloc, U32 depth) { + PERL_ARGS_ASSERT_DUMP_TRIE_INTERIM_TABLE; + U32 state; U16 charid; SV *sv = sv_newmortal(); int colwidth = widecharmap ? 6 : 4; DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_DUMP_TRIE_INTERIM_TABLE; - /* print out the table precompression so that we can do a visual check that they are identical. */ - Perl_re_indentf( aTHX_ "Char : ", depth+1 ); + re_indentf("Char : ", depth+1 ); for( charid = 0 ; charid < trie->uniquecharcount ; charid++ ) { SV ** const tmp = av_fetch_simple( revcharmap, charid, 0); if ( tmp ) { - Perl_re_printf( aTHX_ "%*s", + STRLEN n; + const char *s = SvPV_const(*tmp, n); + re_printf("%*s", colwidth, - pv_pretty(sv, SvPV_nolen_const(*tmp), SvCUR(*tmp), colwidth, + pv_pretty(sv, s, n, colwidth, PL_colors[0], PL_colors[1], (SvUTF8(*tmp) ? PERL_PV_ESCAPE_UNI : 0) | PERL_PV_ESCAPE_FIRSTCHAR @@ -235,33 +237,33 @@ S_dump_trie_interim_table(pTHX_ const st } } - Perl_re_printf( aTHX_ "\n"); - Perl_re_indentf( aTHX_ "State+-", depth+1 ); + re_printf("\n"); + re_indentf("State+-", depth+1 ); for( charid = 0; charid < trie->uniquecharcount; charid++ ) { - Perl_re_printf( aTHX_ "%.*s", colwidth,"--------"); + re_printf("%.*s", colwidth,"--------"); } - Perl_re_printf( aTHX_ "\n" ); + re_printf("\n" ); for( state = 1; state < next_alloc; state += trie->uniquecharcount ) { - Perl_re_indentf( aTHX_ "%4" UVXf " : ", + re_indentf("%4" UVXf " : ", depth+1, (UV)TRIE_NODENUM( state ) ); for( charid = 0 ; charid < trie->uniquecharcount ; charid++ ) { UV v = (UV)SAFE_TRIE_NODENUM( trie->trans[ state + charid ].next ); if (v) - Perl_re_printf( aTHX_ "%*" UVXf, colwidth, v ); + re_printf("%*" UVXf, colwidth, v ); else - Perl_re_printf( aTHX_ "%*s", colwidth, "." ); + re_printf("%*s", colwidth, "." ); } if ( ! trie->states[ TRIE_NODENUM( state ) ].wordnum ) { - Perl_re_printf( aTHX_ " (%4" UVXf ")\n", + re_printf(" (%4" UVXf ")\n", (UV)trie->trans[ state ].check ); } else { - Perl_re_printf( aTHX_ " (%4" UVXf ") W%4X\n", + re_printf(" (%4" UVXf ") W%4X\n", (UV)trie->trans[ state ].check, trie->states[ TRIE_NODENUM( state ) ].wordnum ); } @@ -412,7 +414,7 @@ is the recommended Unicode-aware way of if ( UTF ) { \ /* if it is UTF then it is either already folded, or does not need \ * folding */ \ - uvc = valid_utf8_to_uvchr( (const U8*) uc, &len); \ + uvc = valid_utf8_to_uv( (const U8*) uc, &len); \ } \ else if (folder == PL_fold_latin1) { \ /* This folder implies Unicode rules, which in the range expressible \ @@ -477,7 +479,8 @@ is the recommended Unicode-aware way of trie->j_after_paren = (U16 *) PerlMemShared_calloc( word_count + 1, \ sizeof(U16) ); \ } \ - trie->jump[curword] = (U16)(noper_next - convert); \ + assert(inRANGE(noper_next - convert, 0, U16_MAX)); \ + trie->jump[curword] = noper_next - convert; \ U16 set_before_paren; \ U16 set_after_paren; \ if (OP(cur) == BRANCH) { \ @@ -521,7 +524,7 @@ is the recommended Unicode-aware way of * and its folded variant, and for the first byte of a variant codepoint, * if any */ -STATIC void +static void S_trie_bitmap_set_folded(pTHX_ RExC_state_t *pRExC_state, reg_trie_data *trie, U8 ch, const U8 * folder) { @@ -550,6 +553,8 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC regnode *first, regnode *last, regnode *tail, U32 word_count, U32 flags, U32 depth) { + PERL_ARGS_ASSERT_MAKE_TRIE; + /* first pass, loop through and scan words */ reg_trie_data *trie; HV *widecharmap = NULL; @@ -583,11 +588,9 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC SV *re_trie_maxbuff; DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_MAKE_TRIE; #ifndef DEBUGGING PERL_UNUSED_ARG(depth); #endif - switch (flags) { case EXACT: case EXACT_REQ8: case EXACTL: break; case EXACTFAA: @@ -620,7 +623,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC sv_setiv(re_trie_maxbuff, RE_TRIE_MAXBUF_INIT); } DEBUG_TRIE_COMPILE_r({ - Perl_re_indentf( aTHX_ + re_indentf( "make_trie start == %d, first == %d, last == %d, tail == %d depth = %d\n", depth+1, REG_NODE_NUM(startbranch), REG_NODE_NUM(first), @@ -844,7 +847,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC ? ARG1b(lastbranch) : ARG2b(lastbranch); /* BRANCHJ */ DEBUG_TRIE_COMPILE_r( - Perl_re_indentf( aTHX_ + re_indentf( "TRIE(%s): W:%d C:%d Uq:%d Min:%d Max:%d\n", depth+1, ( widecharmap ? "UTF8" : "NATIVE" ), (int)word_count, @@ -894,7 +897,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC STRLEN transcount = 1; - DEBUG_TRIE_COMPILE_MORE_r( Perl_re_indentf( aTHX_ "Compiling trie using list compiler\n", + DEBUG_TRIE_COMPILE_MORE_r( re_indentf("Compiling trie using list compiler\n", depth+1)); trie->states = (reg_trie_state *) @@ -1015,7 +1018,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC /* DEBUG_TRIE_COMPILE_MORE_r( - Perl_re_printf( aTHX_ "tp: %d zp: %d ",tp,zp) + re_printf("tp: %d zp: %d ",tp,zp) ); */ @@ -1077,7 +1080,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC } /* DEBUG_TRIE_COMPILE_MORE_r( - Perl_re_printf( aTHX_ " base: %d\n",base); + re_printf(" base: %d\n",base); ); */ trie->states[ state ].trans.base = base; @@ -1120,7 +1123,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC we have to use TRIE_NODENUM() to convert. */ - DEBUG_TRIE_COMPILE_MORE_r( Perl_re_indentf( aTHX_ "Compiling trie using table compiler\n", + DEBUG_TRIE_COMPILE_MORE_r( re_indentf("Compiling trie using table compiler\n", depth+1)); trie->trans = (reg_trie_trans *) @@ -1325,7 +1328,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC PerlMemShared_realloc( trie->states, laststate * sizeof(reg_trie_state) ); DEBUG_TRIE_COMPILE_MORE_r( - Perl_re_indentf( aTHX_ "Alloc: %d Orig: %" IVdf " elements, Final:%" IVdf ". Savings of %%%5.2f\n", + re_indentf("Alloc: %d Orig: %" IVdf " elements, Final:%" IVdf ". Savings of %%%5.2f\n", depth+1, (int)( ( TRIE_CHARCOUNT(trie) + 1 ) * trie->uniquecharcount + 1 ), @@ -1337,7 +1340,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC } /* end table compress */ } DEBUG_TRIE_COMPILE_MORE_r( - Perl_re_indentf( aTHX_ "Statecount:%" UVxf " Lasttrans:%" UVxf "\n", + re_indentf("Statecount:%" UVxf " Lasttrans:%" UVxf "\n", depth+1, (UV)trie->statecount, (UV)trie->lasttrans) @@ -1368,7 +1371,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC /* Find the node we are going to overwrite */ if ( first != startbranch || OP( last ) == BRANCH ) { /* branch sub-chain */ - NEXT_OFF( first ) = (U16)(last - first); + NEXT_OFF_set(first, last - first); /* whole branch chain */ } /* But first we check to see if there is a common prefix we can @@ -1413,7 +1416,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC /* clear the bitmap */ Zero(trie->bitmap, ANYOF_BITMAP_SIZE, char); DEBUG_OPTIMISE_r( - Perl_re_indentf( aTHX_ "New Start State = %" UVuf " Class: [", + re_indentf("New Start State = %" UVuf " Class: [", depth+1, (UV)state)); if (first_ofs >= 0) { @@ -1422,13 +1425,13 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC S_trie_bitmap_set_folded(aTHX_ pRExC_state, trie, *ch, folder); DEBUG_OPTIMISE_r( - Perl_re_printf( aTHX_ "%s", (char*)ch) + re_printf("%s", (char*)ch) ); } } /* store the current firstchar in the bitmap */ S_trie_bitmap_set_folded(aTHX_ pRExC_state, trie, *ch, folder); - DEBUG_OPTIMISE_r(Perl_re_printf( aTHX_ "%s", ch)); + DEBUG_OPTIMISE_r(re_printf("%s", ch)); } first_ofs = ofs; } @@ -1442,7 +1445,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC char *ch = SvPV( *tmp, len ); DEBUG_OPTIMISE_r({ SV *sv = sv_newmortal(); - Perl_re_indentf( aTHX_ "Prefix State: %" UVuf " Ofs: %" UVuf " Char: '%s'\n", + re_indentf("Prefix State: %" UVuf " Ofs: %" UVuf " Char: '%s'\n", depth+1, (UV)state, (UV)first_ofs, pv_pretty(sv, SvPV_nolen_const(*tmp), SvCUR(*tmp), 6, @@ -1464,7 +1467,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC } else { #ifdef DEBUGGING if (state > 1) - DEBUG_OPTIMISE_r(Perl_re_printf( aTHX_ "]\n")); + DEBUG_OPTIMISE_r(re_printf("]\n")); #endif break; } @@ -1472,8 +1475,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC trie->prefixlen = (state-1); if (str) { regnode *n = REGNODE_AFTER(convert); - assert( n - convert <= U16_MAX ); - NEXT_OFF(convert) = n - convert; + NEXT_OFF_set(convert, n - convert); trie->startstate = state; trie->minlen -= (state - 1); trie->maxlen -= (state - 1); @@ -1503,7 +1505,7 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC if (trie->maxlen) { convert = n; } else { - NEXT_OFF(convert) = (U16)(tail - convert); + NEXT_OFF_set(convert, tail - convert); DEBUG_r(optimize= n); } } @@ -1511,13 +1513,15 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC if (!jumper) jumper = last; if ( trie->maxlen ) { - NEXT_OFF( convert ) = (U16)(tail - convert); + NEXT_OFF_set( convert, tail - convert); ARG1u_SET( convert, data_slot ); /* Store the offset to the first unabsorbed branch in jump[0], which is otherwise unused by the jump logic. We use this when dumping a trie and during optimisation. */ - if (trie->jump) + if (trie->jump) { + assert(inRANGE(nextbranch - convert, 0, U16_MAX)); trie->jump[0] = (U16)(nextbranch - convert); + } /* If the start state is not accepting (meaning there is no empty string/NOTHING) * and there is a bitmap @@ -1611,6 +1615,8 @@ Perl_make_trie(pTHX_ RExC_state_t *pRExC regnode * Perl_construct_ahocorasick_from_trie(pTHX_ RExC_state_t *pRExC_state, regnode *source, U32 depth) { + PERL_ARGS_ASSERT_CONSTRUCT_AHOCORASICK_FROM_TRIE; + /* The Trie is constructed and compressed now so we can build a fail array if * it's needed @@ -1650,12 +1656,10 @@ Perl_construct_ahocorasick_from_trie(pTH regnode *stclass; DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_CONSTRUCT_AHOCORASICK_FROM_TRIE; PERL_UNUSED_CONTEXT; #ifndef DEBUGGING PERL_UNUSED_ARG(depth); #endif - if ( OP(source) == TRIE ) { tregnode_TRIE *op = (tregnode_TRIE *) PerlMemShared_calloc(1, sizeof(tregnode_TRIE)); @@ -1723,13 +1727,13 @@ Perl_construct_ahocorasick_from_trie(pTH */ fail[ 0 ] = fail[ 1 ] = 0; DEBUG_TRIE_COMPILE_r({ - Perl_re_indentf( aTHX_ "Stclass Failtable (%" UVuf " states): 0", + re_indentf("Stclass Failtable (%" UVuf " states): 0", depth, (UV)numstates ); for( q_read = 1; q_read < numstates; q_read++ ) { - Perl_re_printf( aTHX_ ", %" UVuf, (UV)fail[q_read]); + re_printf(", %" UVuf, (UV)fail[q_read]); } - Perl_re_printf( aTHX_ "\n"); + re_printf("\n"); }); Safefree(q); /*RExC_seen |= REG_TRIEDFA_SEEN;*/ Index: gnu/usr.bin/perl/regen.pl =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regen.pl,v diff -u -p -a -u -p -r1.1.1.10 regen.pl --- gnu/usr.bin/perl/regen.pl 28 Jan 2025 01:04:21 -0000 1.1.1.10 +++ gnu/usr.bin/perl/regen.pl 16 Nov 2026 00:57:39 -0000 @@ -21,8 +21,8 @@ foreach my $pl (map {chomp; "regen/$_"} and die "@command failed: $?" } +# embed.pl must be kept last, as other scripts may affect it. __END__ -embed.pl feature.pl mg_vtable.pl miniperlmain.pl @@ -34,3 +34,4 @@ scope_types.pl tidy_embed.pl warnings.pl locale.pl +embed.pl Index: gnu/usr.bin/perl/regexec.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regexec.c,v diff -u -p -a -u -p -r1.33 regexec.c --- gnu/usr.bin/perl/regexec.c 15 Aug 2026 01:09:26 -0000 1.33 +++ gnu/usr.bin/perl/regexec.c 16 Nov 2026 00:57:39 -0000 @@ -91,8 +91,7 @@ static const char b_utf8_locale_required #define CHECK_AND_WARN_NON_UTF8_CTYPE_LOCALE_IN_BOUND \ STMT_START { \ if (! IN_UTF8_CTYPE_LOCALE) { \ - Perl_ck_warner(aTHX_ packWARN(WARN_LOCALE), \ - b_utf8_locale_required); \ + ck_warner(packWARN(WARN_LOCALE), b_utf8_locale_required); \ } \ } STMT_END @@ -102,8 +101,7 @@ static const char sets_utf8_locale_requi #define CHECK_AND_WARN_NON_UTF8_CTYPE_LOCALE_IN_SETS(n) \ STMT_START { \ if (! IN_UTF8_CTYPE_LOCALE && (FLAGS(n) & ANYOFL_UTF8_LOCALE_REQD)){\ - Perl_ck_warner(aTHX_ packWARN(WARN_LOCALE), \ - sets_utf8_locale_required); \ + ck_warner(packWARN(WARN_LOCALE), sets_utf8_locale_required); \ } \ } STMT_END @@ -115,15 +113,11 @@ static const char non_utf8_target_but_ut #endif #define NON_UTF8_TARGET_BUT_UTF8_REQUIRED(target) STMT_START { \ - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "%s", \ + DEBUG_EXECUTE_r(re_printf("%s", \ non_utf8_target_but_utf8_required)); \ goto target; \ } STMT_END -#ifndef STATIC -#define STATIC static -#endif - /* * Forwards. */ @@ -226,9 +220,11 @@ static regmatch_state * S_push_slab(pTHX /* REGCP_FRAME_ELEMS are not part of the REGCP_OTHER_ELEMS and * are needed for the regexp context stack bookkeeping. */ -STATIC CHECKPOINT +static CHECKPOINT S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen comma_pDEPTH) { + PERL_ARGS_ASSERT_REGCPPUSH; + const int retval = PL_savestack_ix; /* Number of bytes about to be stored in the stack */ const SSize_t paren_bytes_to_push = sizeof(*RXp_OFFSp(rex)) * (maxopenparen - parenfloor); @@ -240,8 +236,6 @@ S_regcppush(pTHX_ const regexp *rex, I32 DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_REGCPPUSH; - if (paren_elems_to_push < 0) croak("panic: paren_elems_to_push, %i < 0, maxopenparen: %i parenfloor: %i", (int)paren_elems_to_push, (int)maxopenparen, @@ -256,11 +250,11 @@ S_regcppush(pTHX_ const regexp *rex, I32 DEBUG_BUFFERS_r( if ((int)maxopenparen > (int)parenfloor) - Perl_re_exec_indentf( aTHX_ - "rex = 0x%" UVxf " offs = 0x%" UVxf ": saving capture indices:\n", - depth, - PTR2UV(rex), - PTR2UV(RXp_OFFSp(rex)) + re_exec_indentf("rex = 0x%" UVxf " offs = 0x%" UVxf ": saving" + " capture indices:\n", + depth, + PTR2UV(rex), + PTR2UV(RXp_OFFSp(rex)) ); ); @@ -274,14 +268,14 @@ S_regcppush(pTHX_ const regexp *rex, I32 DEBUG_BUFFERS_r({ I32 p; for (p = parenfloor + 1; p <= (I32)maxopenparen; p++) { - Perl_re_exec_indentf(aTHX_ - " \\%" UVuf " %" IVdf " (%" IVdf ") .. %" IVdf " (regcppush)\n", - depth, - (UV)p, - (IV)RXp_OFFSp(rex)[p].start, - (IV)RXp_OFFSp(rex)[p].start_tmp, - (IV)RXp_OFFSp(rex)[p].end - ); + re_exec_indentf(" \\%" UVuf " %" IVdf " (%" IVdf ") .. %" IVdf + " (regcppush)\n", + depth, + (UV)p, + (IV)RXp_OFFSp(rex)[p].start, + (IV)RXp_OFFSp(rex)[p].start_tmp, + (IV)RXp_OFFSp(rex)[p].end + ); } }); @@ -293,34 +287,50 @@ S_regcppush(pTHX_ const regexp *rex, I32 DEBUG_BUFFERS_r({ - Perl_re_exec_indentf(aTHX_ + re_exec_indentf( "finished regcppush returning %" IVdf " cur: %" IVdf "\n", depth, retval, PL_savestack_ix); }); + DEBUG_STATE_r( + re_exec_indentf( + "savestack: regcppush filled in range [%" IVdf "..%" IVdf ")\n", + depth, (IV)retval, (IV)PL_savestack_ix + ) + ); + return retval; } /* These are needed since we do not localize EVAL nodes: */ #define REGCP_SET(cp) \ DEBUG_STATE_r( \ - Perl_re_exec_indentf( aTHX_ \ - "Setting an EVAL scope, savestack = %" IVdf ",\n", \ + re_exec_indentf( \ + "savestack: snapping ix=%" IVdf "\n", \ depth, (IV)PL_savestack_ix \ ) \ ); \ cp = PL_savestack_ix +/* REGCP_UNWIND(cp): unwind savestack back to marked index, + * but without restoring regcppush()ed data (leave_scope() treats + * SAVEt_REGCONTEXT as a NOOP). + * + * Note that the stack is normally only unwound on failure and + * backtracking. Successful matches involve accumulating many savestack + * entries which are all freed in *one go* during the final exit from + * S_regmatch(). + */ + #define REGCP_UNWIND(cp) \ DEBUG_STATE_r( \ - if (cp != PL_savestack_ix) \ - Perl_re_exec_indentf( aTHX_ \ - "Clearing an EVAL scope, savestack = %" \ - IVdf "..%" IVdf "\n", \ - depth, (IV)(cp), (IV)PL_savestack_ix \ - ) \ + re_exec_indentf( \ + "savestack: freeing in range [%" \ + IVdf "..%" IVdf ")\n", \ + depth, (IV)(cp), (IV)PL_savestack_ix \ + ) \ ); \ - regcpblow(cp) + LEAVE_SCOPE(cp) /* set the start and end positions of capture ix */ #define CLOSE_ANY_CAPTURE(rex, ix, s, e) \ @@ -332,7 +342,7 @@ S_regcppush(pTHX_ const regexp *rex, I32 if (ix > RXp_LASTPAREN(rex)) \ RXp_LASTPAREN(rex) = (ix); \ RXp_LASTCLOSEPAREN(rex) = (ix); \ - DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ \ + DEBUG_BUFFERS_r(re_exec_indentf( \ "CLOSE: rex = 0x%" UVxf " offs = 0x%" UVxf ": \\%" UVuf ": set %" IVdf " .. %" IVdf " max: %" UVuf "\n", \ depth, \ PTR2UV(rex), \ @@ -349,11 +359,12 @@ S_regcppush(pTHX_ const regexp *rex, I32 * line 4003 or so of regcomp.c where we parse OPEN parens * of various types. */ PERL_STATIC_INLINE void -S_unwind_paren(pTHX_ regexp *rex, U32 lp, U32 lcp comma_pDEPTH) { +S_unwind_paren(pTHX_ regexp *rex, U32 lp, U32 lcp comma_pDEPTH) +{ PERL_ARGS_ASSERT_UNWIND_PAREN; U32 n; DECLARE_AND_GET_RE_DEBUG_FLAGS; - DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ + DEBUG_BUFFERS_r(re_exec_indentf( "UNWIND_PAREN: rex = 0x%" UVxf " offs = 0x%" UVxf ": invalidate (%" UVuf " .. %" UVuf ") set lcp: %" UVuf "\n", depth, @@ -372,13 +383,14 @@ S_unwind_paren(pTHX_ regexp *rex, U32 lp #define UNWIND_PAREN(lp,lcp) unwind_paren(rex,lp,lcp) PERL_STATIC_INLINE void -S_capture_clear(pTHX_ regexp *rex, U16 from_ix, U16 to_ix, const char *str comma_pDEPTH) { +S_capture_clear(pTHX_ regexp *rex, U16 from_ix, U16 to_ix, const char *str comma_pDEPTH) +{ PERL_ARGS_ASSERT_CAPTURE_CLEAR; PERL_UNUSED_ARG(str); /* only used for debugging */ U16 my_ix; DECLARE_AND_GET_RE_DEBUG_FLAGS; for ( my_ix = from_ix; my_ix <= to_ix; my_ix++ ) { - DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ + DEBUG_BUFFERS_r(re_exec_indentf( "CAPTURE_CLEAR %s \\%" IVdf ": " "%" IVdf "(%" IVdf ") .. %" IVdf " => " @@ -398,20 +410,23 @@ S_capture_clear(pTHX_ regexp *rex, U16 f #define CAPTURE_CLEAR(from_ix, to_ix, str) \ if (from_ix) capture_clear(rex,from_ix, to_ix, str) -STATIC void +static void S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p comma_pDEPTH) { + PERL_ARGS_ASSERT_REGCPPOP; + UV i; U32 paren; - DECLARE_AND_GET_RE_DEBUG_FLAGS; +#ifdef DEBUGGING + I32 orig_ix = PL_savestack_ix; +#endif - PERL_ARGS_ASSERT_REGCPPOP; + DECLARE_AND_GET_RE_DEBUG_FLAGS; DEBUG_BUFFERS_r({ - Perl_re_exec_indentf(aTHX_ - "starting regcppop at %" IVdf "\n", - depth, PL_savestack_ix); + re_exec_indentf("starting regcppop at %" IVdf "\n", + depth, PL_savestack_ix); }); /* Pop REGCP_OTHER_ELEMS before the parentheses loop starts. */ @@ -426,7 +441,7 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxop /* Now restore the parentheses context. */ DEBUG_BUFFERS_r( if (i || RXp_LASTPAREN(rex) + 1 <= rex->nparens) - Perl_re_exec_indentf( aTHX_ + re_exec_indentf( "rex = 0x%" UVxf " offs = 0x%" UVxf ": restoring capture indices to:\n", depth, PTR2UV(rex), @@ -453,7 +468,7 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxop DEBUG_BUFFERS_r( for (; paren <= *maxopenparen_p; ++paren) { - Perl_re_exec_indentf(aTHX_ + re_exec_indentf( " \\%" UVuf " %" IVdf "(%" IVdf ") .. %" IVdf " %s (regcppop)\n", depth, (UV)paren, @@ -478,7 +493,7 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxop RXp_OFFSp(rex)[i].start = -1; } RXp_OFFSp(rex)[i].end = -1; - DEBUG_BUFFERS_r( Perl_re_exec_indentf( aTHX_ + DEBUG_BUFFERS_r( re_exec_indentf( " \\%" UVuf ": %s ..-1 undeffing (regcppop)\n", depth, (UV)i, @@ -487,31 +502,51 @@ S_regcppop(pTHX_ regexp *rex, U32 *maxop } #endif DEBUG_BUFFERS_r({ - Perl_re_exec_indentf(aTHX_ - "finished regcppop at %" IVdf "\n", - depth, PL_savestack_ix); + re_exec_indentf("finished regcppop at %" IVdf "\n", + depth, PL_savestack_ix); }); + + DEBUG_STATE_r( + re_exec_indentf( + "savestack: regcppop freed in range [%" IVdf "..%" IVdf ")\n", + depth, (IV)(PL_savestack_ix), (IV)orig_ix + ) + ); + } /* restore the parens and associated vars at savestack position ix, * but without popping the stack */ -STATIC void +static void S_regcp_restore(pTHX_ regexp *rex, I32 ix, U32 *maxopenparen_p comma_pDEPTH) { - I32 tmpix = PL_savestack_ix; PERL_ARGS_ASSERT_REGCP_RESTORE; + DECLARE_AND_GET_RE_DEBUG_FLAGS; + I32 tmpix = PL_savestack_ix; + + DEBUG_STATE_r( + re_exec_indentf( + "savestack: regcp_restore: ix was %" IVdf "\n", + depth, (IV)PL_savestack_ix); + ); PL_savestack_ix = ix; regcppop(rex, maxopenparen_p); PL_savestack_ix = tmpix; + DEBUG_STATE_r( + re_exec_indentf( + "savestack: regcp_restore: reset ix=%" IVdf "\n", + depth, (IV)PL_savestack_ix); + ); } -#define regcpblow(cp) LEAVE_SCOPE(cp) /* Ignores regcppush()ed data. */ -STATIC bool +static bool S_isFOO_lc(pTHX_ const U8 classnum, const U8 character) { + PERL_ARGS_ASSERT_ISFOO_LC; + /* Returns a boolean as to whether or not 'character' is a member of the * Posix character class given by 'classnum' that should be equivalent to a * value in the typedef 'char_class_number_'. @@ -560,6 +595,8 @@ S_isFOO_lc(pTHX_ const U8 classnum, cons PERL_STATIC_INLINE I32 S_foldEQ_latin1_s2_folded(pTHX_ const char *s1, const char *s2, I32 len) { + PERL_ARGS_ASSERT_FOLDEQ_LATIN1_S2_FOLDED; + /* Compare non-UTF-8 using Unicode (Latin1) semantics. s2 must already be * folded. Works on all folds representable without UTF-8, except for * LATIN_SMALL_LETTER_SHARP_S, and does not check for this. Nor does it @@ -571,8 +608,6 @@ S_foldEQ_latin1_s2_folded(pTHX_ const ch const U8 *a = (const U8 *)s1; const U8 *b = (const U8 *)s2; - PERL_ARGS_ASSERT_FOLDEQ_LATIN1_S2_FOLDED; - assert(len >= 0); while (len--) { @@ -585,9 +620,11 @@ S_foldEQ_latin1_s2_folded(pTHX_ const ch return 1; } -STATIC bool +static bool S_isFOO_utf8_lc(pTHX_ const U8 classnum, const U8* character, const U8* e) { + PERL_ARGS_ASSERT_ISFOO_UTF8_LC; + /* Returns a boolean as to whether or not the (well-formed) UTF-8-encoded * 'character' is a member of the Posix character class given by 'classnum' * that should be equivalent to a value in the typedef @@ -599,8 +636,6 @@ S_isFOO_utf8_lc(pTHX_ const U8 classnum, * requires an inversion list, and use the Unicode macro otherwise. */ - PERL_ARGS_ASSERT_ISFOO_UTF8_LC; - if (UTF8_IS_INVARIANT(*character)) { return isFOO_lc(classnum, *character); } @@ -617,32 +652,24 @@ S_isFOO_utf8_lc(pTHX_ const U8 classnum, case CC_ENUM_XDIGIT_: return is_XDIGIT_high(character); case CC_ENUM_VERTSPACE_: return is_VERTWS_high(character); default: - return _invlist_contains_cp(PL_XPosix_ptrs[classnum], + return invlist_contains_cp_(PL_XPosix_ptrs[classnum], utf8_to_uv_or_die(character, e, NULL)); } NOT_REACHED; /* NOTREACHED */ } -STATIC U8 * +static U8 * S_find_span_end(U8 * s, const U8 * send, const U8 span_byte) { + PERL_ARGS_ASSERT_FIND_SPAN_END; + /* Returns the position of the first byte in the sequence between 's' and * 'send-1' inclusive that isn't 'span_byte'; returns 'send' if none found. * */ - PERL_ARGS_ASSERT_FIND_SPAN_END; - - assert(send >= s); - - if ((STRLEN) (send - s) >= PERL_WORDSIZE - + PERL_WORDSIZE * PERL_IS_SUBWORD_ADDR(s) - - (PTR2nat(s) & PERL_WORD_BOUNDARY_MASK)) - { - PERL_UINTMAX_T span_word; - - /* Process per-byte until reach word boundary. XXX This loop could be - * eliminated if we knew that this platform had fast unaligned reads */ - while (PTR2nat(s) & PERL_WORD_BOUNDARY_MASK) { + const U8 * const per_byte_end = WORTH_PER_WORD_LOOP_BINMODE(s, send, 1); + if (per_byte_end) { + while (s < per_byte_end ) { if (*s != span_byte) { return s; } @@ -650,7 +677,7 @@ S_find_span_end(U8 * s, const U8 * send, } /* Create a word filled with the bytes we are spanning */ - span_word = PERL_COUNT_MULTIPLIER * span_byte; + PERL_UINTMAX_T span_word = PERL_COUNT_MULTIPLIER * span_byte; /* Process per-word as long as we have at least a full word left */ do { @@ -661,15 +688,9 @@ S_find_span_end(U8 * s, const U8 * send, continue; } - /* Here, at least one byte in the word isn't 'span_byte'. */ - -#ifdef EBCDIC - - break; - -#else - - /* This xor leaves 1 bits only in those non-matching bytes */ + /* Here, at least one byte in the word isn't 'span_byte'. + * + * This xor leaves 1 bits only in those non-matching bytes */ span_word ^= * (PERL_UINTMAX_T *) s; /* Make sure the upper bit of each non-matching byte is set. This @@ -679,10 +700,7 @@ S_find_span_end(U8 * s, const U8 * send, span_word |= span_word << 4; /* That reduces the problem to what this function solves */ - return s + variant_byte_number(span_word); - -#endif - + return s + first_upper_bit_set_byte_number(span_word); } while (s + PERL_WORDSIZE <= send); } @@ -697,36 +715,28 @@ S_find_span_end(U8 * s, const U8 * send, return s; } -STATIC U8 * +static U8 * S_find_next_masked(U8 * s, const U8 * send, const U8 byte, const U8 mask) { + PERL_ARGS_ASSERT_FIND_NEXT_MASKED; + assert((byte & mask) == byte); + /* Returns the position of the first byte in the sequence between 's' * and 'send-1' inclusive that when ANDed with 'mask' yields 'byte'; * returns 'send' if none found. It uses word-level operations instead of * byte to speed up the process */ - PERL_ARGS_ASSERT_FIND_NEXT_MASKED; - - assert(send >= s); - assert((byte & mask) == byte); - -#ifndef EBCDIC - - if ((STRLEN) (send - s) >= PERL_WORDSIZE - + PERL_WORDSIZE * PERL_IS_SUBWORD_ADDR(s) - - (PTR2nat(s) & PERL_WORD_BOUNDARY_MASK)) - { - PERL_UINTMAX_T word, mask_word; - - while (PTR2nat(s) & PERL_WORD_BOUNDARY_MASK) { + const U8 * const per_byte_end = WORTH_PER_WORD_LOOP(s, send, 1); + if (per_byte_end) { + while (s < per_byte_end ) { if (((*s) & mask) == byte) { return s; } s++; } - word = PERL_COUNT_MULTIPLIER * byte; - mask_word = PERL_COUNT_MULTIPLIER * mask; + PERL_UINTMAX_T word = PERL_COUNT_MULTIPLIER * byte; + PERL_UINTMAX_T mask_word = PERL_COUNT_MULTIPLIER * mask; do { PERL_UINTMAX_T masked = (* (PERL_UINTMAX_T *) s) & mask_word; @@ -763,8 +773,6 @@ S_find_next_masked(U8 * s, const U8 * se } while (s + PERL_WORDSIZE <= send); } -#endif - while (s < send) { if (((*s) & mask) == byte) { return s; @@ -775,35 +783,29 @@ S_find_next_masked(U8 * s, const U8 * se return s; } -STATIC U8 * +static U8 * S_find_span_end_mask(U8 * s, const U8 * send, const U8 span_byte, const U8 mask) { + PERL_ARGS_ASSERT_FIND_SPAN_END_MASK; + assert((span_byte & mask) == span_byte); + /* Returns the position of the first byte in the sequence between 's' and * 'send-1' inclusive that when ANDed with 'mask' isn't 'span_byte'. * 'span_byte' should have been ANDed with 'mask' in the call of this * function. Returns 'send' if none found. Works like find_span_end(), * except for the AND */ - PERL_ARGS_ASSERT_FIND_SPAN_END_MASK; - - assert(send >= s); - assert((span_byte & mask) == span_byte); - - if ((STRLEN) (send - s) >= PERL_WORDSIZE - + PERL_WORDSIZE * PERL_IS_SUBWORD_ADDR(s) - - (PTR2nat(s) & PERL_WORD_BOUNDARY_MASK)) - { - PERL_UINTMAX_T span_word, mask_word; - - while (PTR2nat(s) & PERL_WORD_BOUNDARY_MASK) { + const U8 * const per_byte_end = WORTH_PER_WORD_LOOP_BINMODE(s, send, 1); + if (per_byte_end) { + while (s < per_byte_end ) { if (((*s) & mask) != span_byte) { return s; } s++; } - span_word = PERL_COUNT_MULTIPLIER * span_byte; - mask_word = PERL_COUNT_MULTIPLIER * mask; + PERL_UINTMAX_T span_word = PERL_COUNT_MULTIPLIER * span_byte; + PERL_UINTMAX_T mask_word = PERL_COUNT_MULTIPLIER * mask; do { PERL_UINTMAX_T masked = (* (PERL_UINTMAX_T *) s) & mask_word; @@ -813,20 +815,11 @@ S_find_span_end_mask(U8 * s, const U8 * continue; } -#ifdef EBCDIC - - break; - -#else - masked ^= span_word; masked |= masked << 1; masked |= masked << 2; masked |= masked << 4; - return s + variant_byte_number(masked); - -#endif - + return s + first_upper_bit_set_byte_number(masked); } while (s + PERL_WORDSIZE <= send); } @@ -852,7 +845,8 @@ I32 Perl_pregexec(pTHX_ REGEXP * const prog, char* stringarg, char *strend, char *strbeg, SSize_t minend, SV *screamer, U32 nosave) /* stringarg: the point in the string at which to begin matching */ -/* strend: pointer to null at end of string */ +/* strend: pointer to byte one beyond end of string, or to 'strbeg' if + string is empty */ /* strbeg: real beginning of string */ /* minend: end of match must be >= minend bytes after stringarg. */ /* screamer: SV being matched: only used for utf8 flag, pos() etc; string @@ -882,7 +876,8 @@ Perl_pregexec(pTHX_ REGEXP * const prog, * the SV itself. * strbeg: real beginning of string * strpos: the point in the string at which to begin matching - * strend: pointer to the byte following the last char of the string + * strend: pointer to the byte following the last char of the string, or to + * 'strpos' if there is nothing left to match. * flags currently unused; set to 0 * data: currently unused; set to NULL * @@ -943,6 +938,8 @@ Perl_re_intuit_start(pTHX_ const U32 flags, re_scream_pos_data *data) { + PERL_ARGS_ASSERT_RE_INTUIT_START; + struct regexp *const prog = ReANY(rx); SSize_t start_shift = prog->check_offset_min; /* Should be nonnegative! */ @@ -957,15 +954,14 @@ Perl_re_intuit_start(pTHX_ char *check_at = NULL; /* check substr found at this pos */ const I32 multiline = prog->extflags & RXf_PMf_MULTILINE; RXi_GET_DECL(prog,progi); - regmatch_info reginfo_buf; /* create some info to pass to find_byclass */ + /* create some info to pass to find_byclass */ + regmatch_info reginfo_buf __attribute__uninitialized__; regmatch_info *const reginfo = ®info_buf; DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_RE_INTUIT_START; PERL_UNUSED_ARG(flags); PERL_UNUSED_ARG(data); - - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( "Intuit: trying to determine minimum start position...\n")); /* for now, assume that all substr offsets are positive. If at some point @@ -996,7 +992,7 @@ Perl_re_intuit_start(pTHX_ * to quickly reject some cases that can't match, but will reject * them later after doing full char arithmetic */ if (prog->minlen > strend - strpos) { - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " String too short...\n")); goto fail; } @@ -1010,6 +1006,9 @@ Perl_re_intuit_start(pTHX_ reginfo->intuit = 1; /* not actually used within intuit, but zero for safety anyway */ reginfo->poscache_maxiter = 0; + reginfo->prog = NULL; + reginfo->sv = NULL; + reginfo->warned = false; if (utf8_target) { if ((!prog->anchored_utf8 && prog->anchored_substr) @@ -1034,7 +1033,7 @@ Perl_re_intuit_start(pTHX_ if (!sv) continue; - Perl_re_printf( aTHX_ + re_printf( " substrs[%d]: min = %" IVdf " max = %" IVdf " end shift = %" IVdf " useful = %" IVdf " utf8 = %d [%s]\n", i, @@ -1074,7 +1073,7 @@ Perl_re_intuit_start(pTHX_ if ( strpos != strbeg && (prog->intflags & PREGf_ANCH_SBOL)) { - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " Not at start...\n")); goto fail; } @@ -1094,7 +1093,7 @@ Perl_re_intuit_start(pTHX_ SSize_t slen = SvCUR(check); char *s = HOP3c(strpos, prog->check_offset_min, strend); - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " Looking for check substr at fixed offset %" IVdf "...\n", (IV)prog->check_offset_min)); @@ -1108,7 +1107,7 @@ Perl_re_intuit_start(pTHX_ || strend - s < slen - 1 || (strend - s == slen && strend[-1] != '\n'))) { - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " String too long...\n")); goto fail_finish; } @@ -1119,7 +1118,7 @@ Perl_re_intuit_start(pTHX_ || *SvPVX_const(check) != *s || (slen > 1 && (memNE(SvPVX_const(check), s, slen))))) { - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " String not equal...\n")); goto fail_finish; } @@ -1170,7 +1169,7 @@ Perl_re_intuit_start(pTHX_ U8* end_point; DEBUG_OPTIMISE_MORE_r({ - Perl_re_printf( aTHX_ + re_printf( " At restart: rx_origin = %" IVdf " Check offset min: %" IVdf " Start shift: %" IVdf " End shift %" IVdf " Real end Shift: %" IVdf "\n", @@ -1207,7 +1206,7 @@ Perl_re_intuit_start(pTHX_ SSize_t targ_len = (char*)end_point - anchor; if (check_len > targ_len) { - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( "Target string too short to match required substring...\n")); goto fail_finish; } @@ -1231,7 +1230,7 @@ Perl_re_intuit_start(pTHX_ check_at = fbm_instr( start_point, end_point, check, multiline ? FBMrf_MULTILINE : 0); - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " doing 'check' fbm scan, [%" IVdf "..%" IVdf "] gave %" IVdf "\n", (IV)((char*)start_point - strbeg), (IV)((char*)end_point - strbeg), @@ -1244,7 +1243,7 @@ Perl_re_intuit_start(pTHX_ DEBUG_EXECUTE_r({ RE_PV_QUOTED_DECL(quoted, utf8_target, PERL_DEBUG_PAD_ZERO(0), SvPVX_const(check), RE_SV_DUMPLEN(check), 30); - Perl_re_printf( aTHX_ " %s %s substr %s%s%s", + re_printf(" %s %s substr %s%s%s", (check_at ? "Found" : "Did not find"), (check == (utf8_target ? prog->anchored_utf8 : prog->anchored_substr) ? "anchored" : "floating"), @@ -1263,7 +1262,7 @@ Perl_re_intuit_start(pTHX_ if (check_at - rx_origin > prog->check_offset_max) rx_origin = HOP3c(check_at, -prog->check_offset_max, rx_origin); /* Finish the diagnostic message */ - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( "%ld (rx_origin now %" IVdf ")...\n", (long)(check_at - strbeg), (IV)(rx_origin - strbeg) @@ -1384,7 +1383,7 @@ Perl_re_intuit_start(pTHX_ to = strend; if (from > to) { s = NULL; - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " skipping 'other' fbm scan: %" IVdf " > %" IVdf "\n", (IV)(from - strbeg), (IV)(to - strbeg) @@ -1397,7 +1396,7 @@ Perl_re_intuit_start(pTHX_ must, multiline ? FBMrf_MULTILINE : 0 ); - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " doing 'other' fbm scan, [%" IVdf "..%" IVdf "] gave %" IVdf "\n", (IV)(from - strbeg), (IV)(to - strbeg), @@ -1409,7 +1408,7 @@ Perl_re_intuit_start(pTHX_ DEBUG_EXECUTE_r({ RE_PV_QUOTED_DECL(quoted, utf8_target, PERL_DEBUG_PAD_ZERO(0), SvPVX_const(must), RE_SV_DUMPLEN(must), 30); - Perl_re_printf( aTHX_ " %s %s substr %s%s", + re_printf(" %s %s substr %s%s", s ? "Found" : "Contradicts", other_ix ? "floating" : "anchored", quoted, RE_SV_TAIL(must)); @@ -1420,7 +1419,7 @@ Perl_re_intuit_start(pTHX_ /* last1 is latest possible substr location. If we didn't * find it before there, we never will */ if (last >= last1) { - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( "; giving up...\n")); goto fail_finish; } @@ -1433,7 +1432,7 @@ Perl_re_intuit_start(pTHX_ other_ix /* i.e. if other-is-float */ ? HOP3c(rx_origin, 1, strend) : HOP4c(last, 1 - other->min_offset, strbeg, strend); - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( "; about to retry %s at offset %ld (rx_origin now %" IVdf ")...\n", (other_ix ? "floating" : "anchored"), (long)(HOP3c(check_at, 1, strend) - strbeg), @@ -1457,7 +1456,7 @@ Perl_re_intuit_start(pTHX_ rx_origin = HOP3c(s, -other->min_offset, strbeg); other_last = HOP3c(s, 1, strend); } - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " at offset %ld (rx_origin now %" IVdf ")...\n", (long)(s - strbeg), (IV)(rx_origin - strbeg) @@ -1467,7 +1466,7 @@ Perl_re_intuit_start(pTHX_ } else { DEBUG_OPTIMISE_MORE_r( - Perl_re_printf( aTHX_ + re_printf( " Check-only match: offset min:%" IVdf " max:%" IVdf " check_at:%" IVdf " rx_origin:%" IVdf " rx_origin-check_at:%" IVdf " strend:%" IVdf "\n", @@ -1488,7 +1487,7 @@ Perl_re_intuit_start(pTHX_ if (ml_anch && rx_origin != strbeg && rx_origin[-1] != '\n') { char *s; - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " looking for /^/m anchor")); /* we have failed the constraint of a \n before rx_origin. @@ -1508,7 +1507,7 @@ Perl_re_intuit_start(pTHX_ if (s <= rx_origin || ! ( rx_origin = (char *)memchr(rx_origin, '\n', s - rx_origin))) { - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " Did not find /%s^%s/m...\n", PL_colors[0], PL_colors[1])); goto fail_finish; @@ -1525,7 +1524,7 @@ Perl_re_intuit_start(pTHX_ /* Position contradicts check-string; either because * check was anchored (and thus has no wiggle room), * or check was float and rx_origin is above the float range */ - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " Found /%s^%s/m, about to restart lookup for check-string with rx_origin %ld...\n", PL_colors[0], PL_colors[1], (long)(rx_origin - strbeg))); goto restart; @@ -1541,7 +1540,7 @@ Perl_re_intuit_start(pTHX_ * contradict. On the other hand, the float "check" substr * didn't contradict, so just retry the anchored "other" * substr */ - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " Found /%s^%s/m, rescanning for anchored from offset %" IVdf " (rx_origin now %" IVdf ")...\n", PL_colors[0], PL_colors[1], (IV)(rx_origin - strbeg + prog->anchored_offset), @@ -1552,12 +1551,12 @@ Perl_re_intuit_start(pTHX_ /* success: we don't contradict the found floating substring * (and there's no anchored substr). */ - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " Found /%s^%s/m with rx_origin %ld...\n", PL_colors[0], PL_colors[1], (long)(rx_origin - strbeg))); } else { - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " (multiline anchor test skipped)\n")); } @@ -1615,7 +1614,7 @@ Perl_re_intuit_start(pTHX_ else endpos = strend; - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " looking for class: start_shift: %" IVdf " check_at: %" IVdf " rx_origin: %" IVdf " endpos: %" IVdf "\n", (IV)start_shift, (IV)(check_at - strbeg), @@ -1625,11 +1624,11 @@ Perl_re_intuit_start(pTHX_ reginfo); if (!s) { if (endpos == strend) { - DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r( re_printf( " Could not match STCLASS...\n") ); goto fail; } - DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r( re_printf( " This position contradicts STCLASS...\n") ); if ((prog->intflags & PREGf_ANCH) && !ml_anch && !(prog->intflags & PREGf_IMPLICIT)) @@ -1650,7 +1649,7 @@ Perl_re_intuit_start(pTHX_ * an extra anchored search may get done, but in * practice the extra fbm_instr() is likely to * get skipped anyway. */ - DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r( re_printf( " about to retry anchored at offset %ld (rx_origin now %" IVdf ")...\n", (long)(other_last - strbeg), (IV)(rx_origin - strbeg) @@ -1671,7 +1670,7 @@ Perl_re_intuit_start(pTHX_ * but since we goto a block of code that's going to * search for the next \n if any, its safe here */ rx_origin++; - DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r( re_printf( " about to look for /%s^%s/m starting at rx_origin %ld...\n", PL_colors[0], PL_colors[1], (long)(rx_origin - strbeg)) ); @@ -1695,11 +1694,11 @@ Perl_re_intuit_start(pTHX_ * It's conservative: it errs on the side of doing 'goto restart', * where there is code that does a proper char-based test */ if (rx_origin + start_shift + end_shift > strend) { - DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r( re_printf( " Could not match STCLASS...\n") ); goto fail; } - DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r( re_printf( " about to look for %s substr starting at offset %ld (rx_origin now %" IVdf ")...\n", (prog->substrs->check_ix ? "floating" : "anchored"), (long)(rx_origin + start_shift - strbeg), @@ -1711,13 +1710,13 @@ Perl_re_intuit_start(pTHX_ /* Success !!! */ if (rx_origin != s) { - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " By STCLASS: moving %ld --> %ld\n", (long)(rx_origin - strbeg), (long)(s - strbeg)) ); } else { - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( " Does not contradict STCLASS...\n"); ); } @@ -1729,7 +1728,7 @@ Perl_re_intuit_start(pTHX_ /* Fixed substring is found far enough so that the match cannot start at strpos. */ - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " try at offset...\n")); + DEBUG_EXECUTE_r(re_printf(" try at offset...\n")); ++BmUSEFUL(utf8_target ? prog->check_utf8 : prog->check_substr); /* hooray/5 */ } else { @@ -1749,7 +1748,7 @@ Perl_re_intuit_start(pTHX_ ))) { /* If flags & SOMETHING - do not do it many times on the same match */ - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ " ... Disabling check substring...\n")); + DEBUG_EXECUTE_r(re_printf(" ... Disabling check substring...\n")); /* XXX Does the destruction order has to change with utf8_target? */ SvREFCNT_dec(utf8_target ? prog->check_utf8 : prog->check_substr); SvREFCNT_dec(utf8_target ? prog->check_substr : prog->check_utf8); @@ -1763,7 +1762,7 @@ Perl_re_intuit_start(pTHX_ } } - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( "Intuit: %sSuccessfully guessed:%s match at offset %ld\n", PL_colors[4], PL_colors[5], (long)(rx_origin - strbeg)) ); @@ -1773,7 +1772,7 @@ Perl_re_intuit_start(pTHX_ if (prog->check_substr || prog->check_utf8) /* could be removed already */ BmUSEFUL(utf8_target ? prog->check_utf8 : prog->check_substr) += 5; /* hooray */ fail: - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "%sMatch rejected by optimizer%s\n", + DEBUG_EXECUTE_r(re_printf("%sMatch rejected by optimizer%s\n", PL_colors[4], PL_colors[5])); return NULL; } @@ -1828,7 +1827,7 @@ STMT_START { uscan += len; \ len = 0; \ } else { \ - uvc = _toFOLD_utf8_flags( (const U8*) uc, uc_end, foldbuf, \ + uvc = toFOLD_utf8_flags_( (const U8*) uc, uc_end, foldbuf, \ &foldlen, flags); \ len = UTF8_SAFE_SKIP(uc, uc_end); \ skiplen = UVCHR_SKIP( uvc ); \ @@ -1853,7 +1852,7 @@ STMT_START { len = 0; \ } else { \ len = 1; \ - uvc = _to_fold_latin1( (U8) *uc, foldbuf, &foldlen, flags); \ + uvc = to_fold_latin1_( (U8) *uc, foldbuf, &foldlen, flags); \ skiplen = UVCHR_SKIP( uvc ); \ foldlen -= skiplen; \ uscan = foldbuf + skiplen; \ @@ -2084,8 +2083,7 @@ STMT_START { } \ else { /* Back-up to the start of the previous character */ \ U8 * const r = reghop3((U8*)s, -1, (U8*)reginfo->strbeg); \ - tmp = utf8n_to_uvchr(r, (U8*) reginfo->strend - r, \ - 0, UTF8_ALLOW_DEFAULT); \ + tmp = utf8_to_uv_or_die(r, (U8*) reginfo->strend, 0); \ } \ tmp = TEST_UV(tmp); \ REXEC_FBC_UTF8_SCAN(/* advances s while s < strend */ \ @@ -2188,37 +2186,38 @@ STMT_START { #ifdef DEBUGGING static IV -S_get_break_val_cp_checked(SV* const invlist, const UV cp_in) { - IV cp_out = _invlist_search(invlist, cp_in); +S_get_break_val_cp_checked(SV* const invlist, const UV cp_in) +{ + IV cp_out = invlist_search_(invlist, cp_in); assert(cp_out >= 0); return cp_out; } -# define _generic_GET_BREAK_VAL_CP_CHECKED(invlist, invmap, cp) \ +# define generic_GET_BREAK_VAL_CP_CHECKED_(invlist, invmap, cp) \ invmap[S_get_break_val_cp_checked(invlist, cp)] #else -# define _generic_GET_BREAK_VAL_CP_CHECKED(invlist, invmap, cp) \ - invmap[_invlist_search(invlist, cp)] +# define generic_GET_BREAK_VAL_CP_CHECKED_(invlist, invmap, cp) \ + invmap[invlist_search_(invlist, cp)] #endif /* Takes a pointer to an inversion list, a pointer to its corresponding * inversion map, and a code point, and returns the code point's value * according to the two arrays. It assumes that all code points have a value. * This is used as the base macro for macros for particular properties */ -#define _generic_GET_BREAK_VAL_CP(invlist, invmap, cp) \ - _generic_GET_BREAK_VAL_CP_CHECKED(invlist, invmap, cp) +#define generic_GET_BREAK_VAL_CP_(invlist, invmap, cp) \ + generic_GET_BREAK_VAL_CP_CHECKED_(invlist, invmap, cp) /* Same as above, but takes begin, end ptrs to a UTF-8 encoded string instead * of a code point, returning the value for the first code point in the string. * And it takes the particular macro name that finds the desired value given a * code point. Merely convert the UTF-8 to code point and call the cp macro */ -#define _generic_GET_BREAK_VAL_UTF8(cp_macro, pos, strend) \ - (__ASSERT_(pos < strend) \ +#define generic_GET_BREAK_VAL_UTF8_(cp_macro, pos, strend) \ + (assert(pos < strend), \ /* Note assumes is valid UTF-8 */ \ (cp_macro(utf8_to_uv_or_die((pos), (strend), NULL)))) /* Returns the GCB value for the input code point */ #define getGCB_VAL_CP(cp) \ - _generic_GET_BREAK_VAL_CP( \ + generic_GET_BREAK_VAL_CP_( \ PL_GCB_invlist, \ _Perl_GCB_invmap, \ (cp)) @@ -2226,11 +2225,11 @@ S_get_break_val_cp_checked(SV* const inv /* Returns the GCB value for the first code point in the UTF-8 encoded string * bounded by pos and strend */ #define getGCB_VAL_UTF8(pos, strend) \ - _generic_GET_BREAK_VAL_UTF8(getGCB_VAL_CP, pos, strend) + generic_GET_BREAK_VAL_UTF8_(getGCB_VAL_CP, pos, strend) /* Returns the LB value for the input code point */ #define getLB_VAL_CP(cp) \ - _generic_GET_BREAK_VAL_CP( \ + generic_GET_BREAK_VAL_CP_( \ PL_LB_invlist, \ _Perl_LB_invmap, \ (cp)) @@ -2238,12 +2237,12 @@ S_get_break_val_cp_checked(SV* const inv /* Returns the LB value for the first code point in the UTF-8 encoded string * bounded by pos and strend */ #define getLB_VAL_UTF8(pos, strend) \ - _generic_GET_BREAK_VAL_UTF8(getLB_VAL_CP, pos, strend) + generic_GET_BREAK_VAL_UTF8_(getLB_VAL_CP, pos, strend) /* Returns the SB value for the input code point */ #define getSB_VAL_CP(cp) \ - _generic_GET_BREAK_VAL_CP( \ + generic_GET_BREAK_VAL_CP_( \ PL_SB_invlist, \ _Perl_SB_invmap, \ (cp)) @@ -2251,11 +2250,11 @@ S_get_break_val_cp_checked(SV* const inv /* Returns the SB value for the first code point in the UTF-8 encoded string * bounded by pos and strend */ #define getSB_VAL_UTF8(pos, strend) \ - _generic_GET_BREAK_VAL_UTF8(getSB_VAL_CP, pos, strend) + generic_GET_BREAK_VAL_UTF8_(getSB_VAL_CP, pos, strend) /* Returns the WB value for the input code point */ #define getWB_VAL_CP(cp) \ - _generic_GET_BREAK_VAL_CP( \ + generic_GET_BREAK_VAL_CP_( \ PL_WB_invlist, \ _Perl_WB_invmap, \ (cp)) @@ -2263,16 +2262,17 @@ S_get_break_val_cp_checked(SV* const inv /* Returns the WB value for the first code point in the UTF-8 encoded string * bounded by pos and strend */ #define getWB_VAL_UTF8(pos, strend) \ - _generic_GET_BREAK_VAL_UTF8(getWB_VAL_CP, pos, strend) + generic_GET_BREAK_VAL_UTF8_(getWB_VAL_CP, pos, strend) /* We know what class REx starts with. Try to find this position... */ /* if reginfo->intuit, its a dryrun */ /* annoyingly all the vars in this routine have different names from their counterparts in regmatch. /grrr */ -STATIC char * +static char * S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, const char *strend, regmatch_info *reginfo) { + PERL_ARGS_ASSERT_FIND_BYCLASS; /* true if x+ need not match at just the 1st pos of run of x's */ const I32 doevery = (prog->intflags & PREGf_SKIP) == 0; @@ -2305,8 +2305,6 @@ S_find_byclass(pTHX_ regexp * prog, cons RXi_GET_DECL(prog,progi); - PERL_ARGS_ASSERT_FIND_BYCLASS; - /* We know what class it must start with. The case statements below have * encoded the OP, and the UTF8ness of the target ('t8' for is UTF-8; 'tb' * for it isn't; 'b' stands for byte), and the UTF8ness of the pattern @@ -2408,7 +2406,7 @@ S_find_byclass(pTHX_ regexp * prog, cons anyofh_list = GET_ANYOFH_INVLIST(prog, c); REXEC_FBC_UTF8_CLASS_SCAN( ( (U8) NATIVE_UTF8_TO_I8(*s) >= ANYOF_FLAGS(c) - && _invlist_contains_cp(anyofh_list, + && invlist_contains_cp_(anyofh_list, utf8_to_uv_or_die((U8 *) s, (U8 *) strend, NULL)))); @@ -2422,7 +2420,7 @@ S_find_byclass(pTHX_ regexp * prog, cons anyofh_list = GET_ANYOFH_INVLIST(prog, c); REXEC_FBC_FIND_NEXT_UTF8_BYTE_SCAN(first_byte, - _invlist_contains_cp(anyofh_list, + invlist_contains_cp_(anyofh_list, utf8_to_uv_or_die((U8 *) s, (U8 *) strend, NULL))); @@ -2450,7 +2448,7 @@ S_find_byclass(pTHX_ regexp * prog, cons ( inRANGE(NATIVE_UTF8_TO_I8(*s), LOWEST_ANYOF_HRx_BYTE(ANYOF_FLAGS(c)), HIGHEST_ANYOF_HRx_BYTE(ANYOF_FLAGS(c))) - && _invlist_contains_cp(anyofh_list, + && invlist_contains_cp_(anyofh_list, utf8_to_uv_or_die((U8 *) s, (U8 *) strend, NULL)))); @@ -2463,7 +2461,7 @@ S_find_byclass(pTHX_ regexp * prog, cons ((struct regnode_anyofhs *) c)->string, /* Note FLAGS is the string length in this regnode */ ((struct regnode_anyofhs *) c)->string + FLAGS(c), - _invlist_contains_cp(anyofh_list, + invlist_contains_cp_(anyofh_list, utf8_to_uv_or_die((U8 *) s, (U8 *) strend, NULL))); @@ -3211,7 +3209,7 @@ S_find_byclass(pTHX_ regexp * prog, cons switch (classnum) { default: REXEC_FBC_UTF8_CLASS_SCAN( - to_complement ^ cBOOL(_invlist_contains_cp( + to_complement ^ cBOOL(invlist_contains_cp_( PL_XPosix_ptrs[classnum], utf8_to_uv_or_die((U8 *) s, (U8 *) strend, @@ -3265,29 +3263,40 @@ S_find_byclass(pTHX_ regexp * prog, cons const char *real_start = s; #endif STRLEN maxlen = trie->maxlen; - SV *sv_points; U8 **points; /* map of where we were in the input string when reading a given char. For ASCII this is unnecessary overhead as the relationship is always 1:1, but for Unicode, especially case folded Unicode this is not true. */ + + /* For a shorter maxlen, points are stored in a stack buffer. */ + /* The choice of STACK_POINTS_MAX here is rather arbitrary. + * When building perl and running test_harness, maxlen rarely + * goes above 8, but presumbaly there are good business cases + * where a somewhat larger value is common. */ + enum { STACK_POINTS_MAX = 32 }; + U8 *points_stack[STACK_POINTS_MAX]; + /* Otherwise, a more costly heap allocation is used. */ + bool used_heap = false; + U8 foldbuf[ UTF8_MAXBYTES_CASE + 1 ]; U8 *bitmap = NULL; - + U8 **points_heap = NULL; DECLARE_AND_GET_RE_DEBUG_FLAGS; - /* We can't just allocate points here. We need to wrap it in - * an SV so it gets freed properly if there is a croak while - * running the match */ - ENTER; - SAVETMPS; - sv_points = newSV(maxlen * sizeof(U8 *)); - SvCUR_set(sv_points, - maxlen * sizeof(U8 *)); - SvPOK_on(sv_points); - sv_2mortal(sv_points); - points = (U8**)SvPV_nolen(sv_points ); + if (maxlen <= STACK_POINTS_MAX) { + points = points_stack; + } else { + used_heap = true; + /* In case of a die event, the allocation will be freed + as the savestack is unwound. */ + ENTER; + Newx(points_heap, maxlen, U8*); + SAVEFREEPV(points_heap); + points = points_heap; + } + if ( trie_type != trie_utf8_fold && (trie->bitmap || OP(c)==AHOCORASICKC) ) { @@ -3340,7 +3349,7 @@ S_find_byclass(pTHX_ regexp * prog, cons dump_exec_pos( (char *)uc, c, strend, real_start, (char *)uc, utf8_target, 0 ); - Perl_re_printf( aTHX_ + re_printf( " Scanning for legal start char...\n"); } ); @@ -3381,13 +3390,13 @@ S_find_byclass(pTHX_ regexp * prog, cons DEBUG_TRIE_EXECUTE_r({ dump_exec_pos( (char *)uc, c, strend, real_start, s, utf8_target, 0); - Perl_re_printf( aTHX_ + re_printf( "%sAHOC: Chid:0x%-2" UVXf " CP:0x%-4" UVXf " ", PL_colors[4], (UV)charid, uvc); if (isPRINT_A(uvc)) - Perl_re_printf( aTHX_ "'%c' ", (int)uvc ); + re_printf("'%c' ", (int)uvc ); else - Perl_re_printf( aTHX_ " " ); /* four spaces to match "'x' " */ + re_printf(" " ); /* four spaces to match "'x' " */ }); } else { @@ -3406,7 +3415,7 @@ S_find_byclass(pTHX_ regexp * prog, cons if (failed) dump_exec_pos((char *)uc, c, strend, real_start, s, utf8_target, 0 ); - Perl_re_printf( aTHX_ + re_printf( "%s%sSt:0x%-4" UVXf " W:0x%-2" UVXf, PL_colors[4], failed ? "AHOC: Fail transition to " : "", @@ -3425,7 +3434,7 @@ S_find_byclass(pTHX_ regexp * prog, cons failed = false; state = tmp; DEBUG_TRIE_EXECUTE_r( - Perl_re_printf( aTHX_ " - good -> St:%#-6" UVxf "%s\n", + re_printf(" - good -> St:%#-6" UVxf "%s\n", (UV)state, PL_colors[5])); break; } @@ -3433,14 +3442,14 @@ S_find_byclass(pTHX_ regexp * prog, cons failed = true; state = aho->fail[state]; DEBUG_TRIE_EXECUTE_r( - Perl_re_printf( aTHX_ " - fail -> St:%#-6" UVxf "%s\n", + re_printf(" - fail -> St:%#-6" UVxf "%s\n", (UV)state,PL_colors[5])); } } else { /* we must be accepting here */ DEBUG_TRIE_EXECUTE_r( - Perl_re_printf( aTHX_ " - accepting\n")); + re_printf(" - accepting\n")); failed = true; break; } @@ -3464,33 +3473,35 @@ S_find_byclass(pTHX_ regexp * prog, cons if (leftmost) { s = (char*)leftmost; DEBUG_TRIE_EXECUTE_r({ - Perl_re_printf( aTHX_ "Matches word #%" UVxf + re_printf("Matches word #%" UVxf " at position %" IVdf ". Trying full" " pattern...\n", (UV)accepted_word, (IV)(s - real_start) ); }); if (reginfo->intuit || regtry(reginfo, &s)) { - FREETMPS; - LEAVE; + if (used_heap) { + LEAVE; + } goto got_it; } if (s < reginfo->strend) { s = HOPc(s,1); } DEBUG_TRIE_EXECUTE_r({ - Perl_re_printf( aTHX_ + re_printf( "Pattern failed. Looking for new start" " point...\n"); }); } else { DEBUG_TRIE_EXECUTE_r( - Perl_re_printf( aTHX_ "No match.\n")); + re_printf("No match.\n")); break; } } - FREETMPS; - LEAVE; + if (used_heap) { + LEAVE; + } } break; @@ -3508,7 +3519,7 @@ S_find_byclass(pTHX_ regexp * prog, cons croak("panic: unknown regstclass %d", (int)OP(c)); } /* End of switch on node type */ - return 0; + return NULL; got_it: return s; @@ -3537,7 +3548,7 @@ S_reg_set_capture_string(pTHX_ REGEXP * if (flags & REXEC_COPY_STR) { #ifdef PERL_ANY_COW if (SvCANCOW(sv)) { - DEBUG_C(Perl_re_printf( aTHX_ + DEBUG_C(re_printf( "Copy on write: regexp capture, type %d\n", (int) SvTYPE(sv))); /* Create a new COW SV to share the match string and store @@ -3686,7 +3697,8 @@ I32 Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, char *strbeg, SSize_t minend, SV *sv, void *data, U32 flags) /* stringarg: the point in the string at which to begin matching */ -/* strend: pointer to null at end of string */ +/* strend: pointer to byte one beyond end of string, or to 'strbeg' if + string is empty */ /* strbeg: real beginning of string */ /* minend: end of match must be >= minend bytes after stringarg. */ /* sv: SV being matched: only used for utf8 flag, pos() etc; string @@ -3696,6 +3708,8 @@ Perl_regexec_flags(pTHX_ REGEXP * const /* flags: For optimizations. See REXEC_* in regexp.h */ { + PERL_ARGS_ASSERT_REGEXEC_FLAGS; + struct regexp *const prog = ReANY(rx); char *s; regnode *c; @@ -3705,15 +3719,14 @@ Perl_regexec_flags(pTHX_ REGEXP * const const bool utf8_target = cBOOL(DO_UTF8(sv)); I32 multiline; RXi_GET_DECL(prog,progi); - regmatch_info reginfo_buf; /* create some info to pass to regtry etc */ + /* create some info to pass to regtry etc */ + regmatch_info reginfo_buf __attribute__uninitialized__; regmatch_info *const reginfo = ®info_buf; regexp_paren_pair *swap = NULL; I32 oldsave; DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_REGEXEC_FLAGS; PERL_UNUSED_ARG(data); - /* Be paranoid... */ if (prog == NULL) { croak("NULL regexp parameter"); @@ -3744,7 +3757,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const ? strbeg + MgBYTEPOS(mg, sv, strbeg, strend-strbeg) : strbeg; /* pos() not defined; use start of string */ - DEBUG_GPOS_r(Perl_re_printf( aTHX_ + DEBUG_GPOS_r(re_printf( "GPOS ganch set to strbeg[%" IVdf "]\n", (IV)(reginfo->ganch - strbeg))); /* in the presence of \G, we may need to start looking earlier in @@ -3763,7 +3776,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const if (!startpos || ((flags & REXEC_FAIL_ON_UNDERFLOW) && startpos < stringarg)) { - DEBUG_GPOS_r(Perl_re_printf( aTHX_ + DEBUG_GPOS_r(re_printf( "fail: ganch-gofs before earliest possible start\n")); return 0; } @@ -3782,7 +3795,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const minlen = prog->minlen; if ((startpos + minlen) > strend || startpos < strbeg) { - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( "Regex match can't succeed, so not even tried\n")); return 0; } @@ -3817,7 +3830,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const { /* this should only be possible under \G */ assert(prog->intflags & PREGf_GPOS_SEEN); - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( "matched, but failing for REXEC_FAIL_ON_UNDERFLOW\n")); goto phooey; } @@ -3843,7 +3856,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const multiline = prog->extflags & RXf_PMf_MULTILINE; if (strend - s < (minlen + ((prog->check_offset_min < 0) ? prog->check_offset_min : 0))) { - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( "String too short [regexec_flags]...\n")); goto phooey; } @@ -3865,15 +3878,16 @@ Perl_regexec_flags(pTHX_ REGEXP * const /* see how far we have to get to not match where we matched before */ reginfo->till = stringarg + minend; + /* zero for safety */ + reginfo->info_aux = NULL; + if (prog->extflags & RXf_EVAL_SEEN && SvPADTMP(sv)) { /* SAVEFREESV, not sv_mortalcopy, as this SV must last until after S_cleanup_regmatch_info_aux has executed (registered by SAVEDESTRUCTOR_X below). S_cleanup_regmatch_info_aux modifies magic belonging to this SV. - Not newSVsv, either, as it does not COW. */ - reginfo->sv = newSV_type(SVt_NULL); - SvSetSV_nosteal(reginfo->sv, sv); + reginfo->sv = newSVsv_flags(sv, SV_GMAGIC|SV_NOSTEAL|SV_DO_COW_SVSETSV); SAVEFREESV(reginfo->sv); } @@ -3939,7 +3953,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const /* avoid leak if we die, or clean up anyway if match completes */ SAVEFREEPV(swap); Newxz(RXp_OFFSp(prog), (prog->nparens + 1), regexp_paren_pair); - DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ + DEBUG_BUFFERS_r(re_exec_indentf( "rex = 0x%" UVxf " saving offs: orig = 0x%" UVxf " new = 0x%" UVxf "\n", 0, PTR2UV(prog), @@ -4053,7 +4067,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const ); } DEBUG_EXECUTE_r(if (!did_match) - Perl_re_printf( aTHX_ + re_printf( "Did not find anchored character...\n") ); } @@ -4157,7 +4171,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const DEBUG_EXECUTE_r(if (!did_match) { RE_PV_QUOTED_DECL(quoted, utf8_target, PERL_DEBUG_PAD_ZERO(0), SvPVX_const(must), RE_SV_DUMPLEN(must), 30); - Perl_re_printf( aTHX_ "Did not find %s substr %s%s...\n", + re_printf("Did not find %s substr %s%s...\n", ((must == prog->anchored_substr || must == prog->anchored_utf8) ? "anchored" : "floating"), quoted, RE_SV_TAIL(must)); @@ -4177,7 +4191,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const { RE_PV_QUOTED_DECL(quoted,utf8_target,PERL_DEBUG_PAD_ZERO(1), s,strend-s,PL_dump_re_max_len); - Perl_re_printf( aTHX_ + re_printf( "Matching stclass %.*s against %s (%d bytes)\n", (int)SvCUR(prop), SvPVX_const(prop), quoted, (int)(strend - s)); @@ -4185,7 +4199,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const }); if (find_byclass(prog, c, s, strend, reginfo)) goto got_it; - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "Contradicts stclass... [regexec_flags]\n")); + DEBUG_EXECUTE_r(re_printf("Contradicts stclass... [regexec_flags]\n")); } else { dontbother = 0; @@ -4224,14 +4238,14 @@ Perl_regexec_flags(pTHX_ REGEXP * const * the \n. */ char *checkpos= strend - len; DEBUG_OPTIMISE_r( - Perl_re_printf( aTHX_ + re_printf( "%sChecking for float_real.%s\n", PL_colors[4], PL_colors[5])); if (checkpos + 1 < strbeg) { /* can't match, even if we remove the trailing \n * string is too short to match */ DEBUG_EXECUTE_r( - Perl_re_printf( aTHX_ + re_printf( "%sString shorter than required trailing substring, cannot match.%s\n", PL_colors[4], PL_colors[5])); goto phooey; @@ -4243,7 +4257,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const /* cant match, string is too short when the "\n" is * included */ DEBUG_EXECUTE_r( - Perl_re_printf( aTHX_ + re_printf( "%sString does not contain required trailing substring, cannot match.%s\n", PL_colors[4], PL_colors[5])); goto phooey; @@ -4254,7 +4268,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const last = checkpos; } else { DEBUG_EXECUTE_r( - Perl_re_printf( aTHX_ + re_printf( "%sString does not contain required trailing substring, cannot match.%s\n", PL_colors[4], PL_colors[5])); goto phooey; @@ -4278,7 +4292,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const * pretty sure it is not anymore, so I have removed the comment * and replaced it with this one. Yves */ DEBUG_EXECUTE_r( - Perl_re_printf( aTHX_ + re_printf( "%sString does not contain required substring, cannot match.%s\n", PL_colors[4], PL_colors[5] )); @@ -4318,7 +4332,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const { /* this should only be possible under \G */ assert(prog->intflags & PREGf_GPOS_SEEN); - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( "matched, but failing for REXEC_FAIL_ON_UNDERFLOW\n")); goto phooey; } @@ -4341,7 +4355,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const return 1; phooey: - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "%sMatch failed%s\n", + DEBUG_EXECUTE_r(re_printf("%sMatch failed%s\n", PL_colors[4], PL_colors[5])); if (swap) { @@ -4350,7 +4364,7 @@ Perl_regexec_flags(pTHX_ REGEXP * const * shortly, restore the old captures by copying 'swap's original * data to the new offs buffer */ - DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ + DEBUG_BUFFERS_r(re_exec_indentf( "rex = 0x%" UVxf " rolling back offs: 0x%" UVxf " will be freed; restoring data to =0x%" UVxf "\n", 0, PTR2UV(prog), @@ -4399,21 +4413,17 @@ S_set_reg_curpm(pTHX_ REGEXP *rx, regmat used to detect when this has happened. */ -STATIC bool /* 0 failure, 1 success */ +static bool /* 0 failure, 1 success */ S_regtry(pTHX_ regmatch_info *reginfo, char **startposp) { - CHECKPOINT lastcp; + PERL_ARGS_ASSERT_REGTRY; + REGEXP *const rx = reginfo->prog; regexp *const prog = ReANY(rx); SSize_t result; -#ifdef DEBUGGING - U32 depth = 0; /* used by REGCP_SET */ -#endif RXi_GET_DECL(prog,progi); DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_REGTRY; - reginfo->cutpoint = NULL; RXp_OFFSp(prog)[0].start = *startposp - reginfo->strbeg; @@ -4452,7 +4462,6 @@ S_regtry(pTHX_ regmatch_info *reginfo, c } } #endif - REGCP_SET(lastcp); result = regmatch(reginfo, *startposp, progi->program + 1); if (result != -1) { RXp_OFFSp(prog)[0].end = result; @@ -4460,7 +4469,6 @@ S_regtry(pTHX_ regmatch_info *reginfo, c } if (reginfo->cutpoint) *startposp= reginfo->cutpoint; - REGCP_UNWIND(lastcp); return 0; } @@ -4475,10 +4483,11 @@ S_regtry(pTHX_ regmatch_info *reginfo, c int Perl_re_exec_indentf(pTHX_ const char *fmt, U32 depth, ...) { + PERL_ARGS_ASSERT_RE_EXEC_INDENTF; + va_list ap; int result; PerlIO *f= Perl_debug_log; - PERL_ARGS_ASSERT_RE_EXEC_INDENTF; va_start(ap, depth); PerlIO_printf(f, "%*s|%4" UVuf "| %*s", REPORT_CODE_OFF, "", (UV)depth, INDENT_CHARS(depth), "" ); result = PerlIO_vprintf(f, fmt, ap); @@ -4489,7 +4498,7 @@ Perl_re_exec_indentf(pTHX_ const char *f /* grab a new slab and return the first slot in it */ -STATIC regmatch_state * +static regmatch_state * S_push_slab(pTHX) { regmatch_slab *s = PL_regmatch_slab->next; @@ -4505,14 +4514,14 @@ S_push_slab(pTHX) #ifdef DEBUGGING -STATIC void +static void S_debug_start_match(pTHX_ const REGEXP *prog, const bool utf8_target, const char *start, const char *end, const char *blurb) { - const bool utf8_pat = RX_UTF8(prog) ? 1 : 0; - PERL_ARGS_ASSERT_DEBUG_START_MATCH; + const bool utf8_pat = RX_UTF8(prog) ? 1 : 0; + if (!PL_colorset) reginitcolors(); { @@ -4522,12 +4531,12 @@ S_debug_start_match(pTHX_ const REGEXP * RE_PV_QUOTED_DECL(s1, utf8_target, PERL_DEBUG_PAD_ZERO(1), start, end - start, PL_dump_re_max_len); - Perl_re_printf( aTHX_ + re_printf( "%s%s REx%s %s against %s\n", PL_colors[4], blurb, PL_colors[5], s0, s1); if (utf8_target || utf8_pat) - Perl_re_printf( aTHX_ "UTF-8 %s%s%s...\n", + re_printf("UTF-8 %s%s%s...\n", utf8_pat ? "pattern" : "", utf8_pat && utf8_target ? " and " : "", utf8_target ? "string" : "" @@ -4535,7 +4544,7 @@ S_debug_start_match(pTHX_ const REGEXP * } } -STATIC void +static void S_dump_exec_pos(pTHX_ const char *locinput, const regnode *scan, const char *loc_regeol, @@ -4545,6 +4554,8 @@ S_dump_exec_pos(pTHX_ const char *locinp const U32 depth ) { + PERL_ARGS_ASSERT_DUMP_EXEC_POS; + const int docolor = *PL_colors[0] || *PL_colors[2] || *PL_colors[4]; const int taill = (docolor ? 10 : 7); /* 3 chars for "> <" */ int l = (loc_regeol - locinput) > taill ? taill : (loc_regeol - locinput); @@ -4558,8 +4569,6 @@ S_dump_exec_pos(pTHX_ const char *locinp ? (5 + taill) - l : locinput - loc_bostr; int pref0_len; - PERL_ARGS_ASSERT_DUMP_EXEC_POS; - if (utf8_target) { while (UTF8_IS_CONTINUATION(*(U8*)(locinput - pref_len))) { pref_len++; @@ -4592,7 +4601,7 @@ S_dump_exec_pos(pTHX_ const char *locinp locinput, loc_regeol - locinput, 10, 0, 1); const STRLEN tlen = len0 + len1 + len2; - Perl_re_printf( aTHX_ + re_printf( "%4" IVdf " <%.*s%.*s%s%.*s>%*s|%4" UVuf "| ", (IV)(locinput - loc_bostr), len0, s0, @@ -4616,16 +4625,16 @@ S_dump_exec_pos(pTHX_ const char *locinp * Returns the index of the leftmost defined buffer with the given name * or 0 if non of the buffers matched. */ -STATIC I32 +static I32 S_reg_check_named_buff_matched(const regexp *rex, const regnode *scan) { + PERL_ARGS_ASSERT_REG_CHECK_NAMED_BUFF_MATCHED; + I32 n; RXi_GET_DECL(rex,rexi); SV *sv_dat= MUTABLE_SV(rexi->data->data[ ARG1u( scan ) ]); I32 *nums = (I32*)SvPVX(sv_dat); - PERL_ARGS_ASSERT_REG_CHECK_NAMED_BUFF_MATCHED; - for ( n = 0; n < SvIVX(sv_dat); n++ ) { if ((I32)RXp_LASTPAREN(rex) >= nums[n] && RXp_OFFS_END(rex,nums[n]) != -1) @@ -4783,7 +4792,7 @@ S_setup_EXACTISH_ST(pTHX_ const regnode * pattern to be folded, which the input isn't required to * be in this case. So, just fold the single character, * and the result will be in the expected form. */ - _to_uni_fold_flags(multi_fold_from, mod_pat, &pat_len, + to_uni_fold_flags_(multi_fold_from, mod_pat, &pat_len, FOLD_FLAGS_FULL); pat = mod_pat; } @@ -4828,7 +4837,7 @@ S_setup_EXACTISH_ST(pTHX_ const regnode utf8_pat = false; } else { /* Code point above 255, or needs special handling */ - _to_utf8_fold_flags(pat, pat + pat_len, + to_utf8_fold_flags_(pat, pat + pat_len, mod_pat, &pat_len, FOLD_FLAGS_FULL|FOLD_FLAGS_LOCALE); pat = mod_pat; @@ -4842,7 +4851,7 @@ S_setup_EXACTISH_ST(pTHX_ const regnode { /* We may have to canonicalize a multi-char fold, as in the UTF-8 * case */ - _to_uni_fold_flags(multi_fold_from, mod_pat, &pat_len, + to_uni_fold_flags_(multi_fold_from, mod_pat, &pat_len, FOLD_FLAGS_FULL); pat = mod_pat; } @@ -4940,7 +4949,7 @@ S_setup_EXACTISH_ST(pTHX_ const regnode * case. We set 'multi_fold_from' to the single folded-from character, * which is handled in an extra iteration below */ if (utf8_pat) { - folded = valid_utf8_to_uvchr(pat, NULL); + folded = valid_utf8_to_uv(pat, NULL); multi_fold_from = what_MULTI_CHAR_FOLD_utf8_safe(pat, pat + pat_len); } @@ -4990,7 +4999,7 @@ S_setup_EXACTISH_ST(pTHX_ const regnode redo_multi: /* Look up what code points (besides itself) fold to 'folded'; * e.g., [ 'K', KELVIN_SIGN ] both fold to 'k'. */ - folds_to_count = _inverse_folds(folded, &first_fold_from, + folds_to_count = inverse_folds_(folded, &first_fold_from, &remaining_fold_froms); } @@ -5049,8 +5058,8 @@ S_setup_EXACTISH_ST(pTHX_ const regnode /* Add this character to the list of possible matches */ if (utf8_target) { - uv_to_utf8(matches[(U8) m->count], fold_from); - lengths[m->count] = UVCHR_SKIP(fold_from); + uv_to_utf8(matches[ (PERL_UINT_FAST8_T) m->count ], fold_from); + lengths[ (PERL_UINT_FAST8_T) m->count ] = UVCHR_SKIP(fold_from); m->count++; } else { /* Non-UTF8 target: no code point above 255 can appear in it @@ -5059,17 +5068,17 @@ S_setup_EXACTISH_ST(pTHX_ const regnode continue; } - matches[m->count][0] = fold_from; - lengths[m->count] = 1; + matches[ (PERL_UINT_FAST8_T) m->count ][0] = fold_from; + lengths[ (PERL_UINT_FAST8_T) m->count ] = 1; m->count++; } /* Update min and mlengths */ - if (m->min_length > lengths[m->count-1]) { - m->min_length = lengths[m->count-1]; + if (m->min_length > lengths[ (PERL_UINT_FAST8_T) m->count - 1 ]) { + m->min_length = lengths[ (PERL_UINT_FAST8_T) m->count - 1 ]; } - if (m->max_length < lengths[m->count-1]) { + if (m->max_length < lengths[ (PERL_UINT_FAST8_T) m->count - 1 ]) { index_of_longest = m->count - 1; m->max_length = lengths[index_of_longest]; } @@ -5241,7 +5250,7 @@ S_test_EXACTISH_ST(const char * loc, return (input32 & info.mask32) == info.anded32; } -STATIC bool +static bool S_isGCB(pTHX_ const GCB_enum before, const GCB_enum after, const U8 * const strbeg, const U8 * const curpos, const bool utf8_target) { PERL_ARGS_ASSERT_ISGCB; @@ -5277,16 +5286,16 @@ S_isGCB(pTHX_ const GCB_enum before, con * This translates to, we can have any number of Linker and * Extend characters in a row, immediately preceded by a * Consonant, as long as there is at least one Linker. */ - Size_t linker_count; - linker_count = isGCB_InCB_Linker(prev); - do { - prev = backup_one_GCB(strbeg, &prev_pos, utf8_target); + bool has_linker; + has_linker = false; + while (isGCB_InCB_Linker(prev) || isGCB_InCB_Extend(prev)) { if (isGCB_InCB_Linker(prev)) { - linker_count++; + has_linker = true; } - } while (isGCB_InCB_Linker(prev) || isGCB_InCB_Extend(prev)); + prev = backup_one_GCB(strbeg, &prev_pos, utf8_target); + } - matched = linker_count > 0 && isGCB_InCB_Consonant(prev); + matched = has_linker && isGCB_InCB_Consonant(prev); break; case GCB_various_then_RI_v_RI: ; @@ -5340,7 +5349,7 @@ S_isGCB(pTHX_ const GCB_enum before, con matched = false; #ifdef DEBUGGING - Perl_re_printf( aTHX_ + re_printf( "\nUnhandled GCB pair: GCB_table[%d, %d] = %d\n", before, after, GCB_table[before][after]); //assert(0); @@ -5366,13 +5375,13 @@ S_isGCB(pTHX_ const GCB_enum before, con break */ } -STATIC GCB_enum +static GCB_enum S_backup_one_GCB(pTHX_ const U8 * const strbeg, U8 ** curpos, const bool utf8_target) { - GCB_enum gcb; - PERL_ARGS_ASSERT_BACKUP_ONE_GCB; + GCB_enum gcb; + if (*curpos < strbeg) { return GCB_EDGE; } @@ -5422,7 +5431,7 @@ S_backup_one_GCB(pTHX_ const U8 * const #define backup_one_LB_but_over_CM_ZWJ(begin, cur, utf8) \ backup_one_LB_(begin, cur, utf8, true) -STATIC bool +static bool S_isLB(pTHX_ LB_enum before, LB_enum after, const U8 * const strbeg, @@ -5482,8 +5491,11 @@ S_isLB(pTHX_ LB_enum before, * the base character of the combining sequence they are part of * breaks with that character. Backup to find that that base * character */ - prev = backup_one_LB_but_over_CM_ZWJ(strbeg, &prev_pos, - utf8_target); + while ( isLB_CM(prev) + || isLB_ZWJ(prev)) + { + prev = backup_one_LB(strbeg, &prev_pos, utf8_target); + } /* Here, 'prev' is the base character. If the CM/ZWJ attaches to * it, then it inherits the behavior of 'prev'. If it @@ -5504,8 +5516,7 @@ S_isLB(pTHX_ LB_enum before, || isLB_CM(prev) || isLB_ZWJ(prev)) { - prev = backup_one_LB_but_over_CM_ZWJ(strbeg, - &prev_pos, utf8_target); + prev = backup_one_LB(strbeg, &prev_pos, utf8_target); } matched = isLB_OP(prev); @@ -5518,8 +5529,7 @@ S_isLB(pTHX_ LB_enum before, || isLB_CM(prev) || isLB_ZWJ(prev)) { - prev = backup_one_LB_but_over_CM_ZWJ(strbeg, - &prev_pos, utf8_target); + prev = backup_one_LB(strbeg, &prev_pos, utf8_target); } matched = isLB_QU(prev); @@ -5598,19 +5608,18 @@ S_isLB(pTHX_ LB_enum before, || isLB_CM(prev) || isLB_ZWJ(prev)) { - prev = backup_one_LB_but_over_CM_ZWJ(strbeg, - &prev_pos, utf8_target); + prev = backup_one_LB(strbeg, &prev_pos, utf8_target); } matched = isLB_CL(prev) || isLB_CP(prev); break; - case LB_various_then_HY_or_U2010_v_AL: + case LB_various_then_HY_or_HH_v_AL_or_HL: /* LB20a Do not break after a word-initial hyphen. * ( sot | BK | CR | LF | NL | SP | ZW | CB | GL ) - * ( HY | [\x{2010} ] ) - * × AL */ + * ( HY | HH ] ) + * × AL | HL */ prev = backup_one_LB_but_over_CM_ZWJ(strbeg, &prev_pos, utf8_target); matched = ( isLB_EDGE(prev) @@ -5632,16 +5641,16 @@ S_isLB(pTHX_ LB_enum before, || isLB_CM(prev) || isLB_ZWJ(prev)) { - prev = backup_one_LB_but_over_CM_ZWJ(strbeg, - &prev_pos, utf8_target); + prev = backup_one_LB(strbeg, &prev_pos, utf8_target); } matched = isLB_B2(prev); break; - case LB_HL_then_HY_or_BA_sans_EA_v_nonHL: - /* LB21a Don't break after Hebrew + HY. - * HL (HY | [ BA - $EastAsian ]) × [^HL] */ + case LB_HL_then_HY_or_HH_v_nonHL: + /* LB21a Do not break after the hyphen in Hebrew + Hyphen + + * non-Hebrew. + * HL (HY | HH ) × [^HL] */ matched = isLB_HL(backup_one_LB_but_over_CM_ZWJ(strbeg, &prev_pos, utf8_target)); break; @@ -5716,7 +5725,7 @@ S_isLB(pTHX_ LB_enum before, matched = false; #ifdef DEBUGGING - Perl_re_printf(aTHX_ + re_printf( "\nUnhandled LB pair: LB_table[%d, %d] = %d\n", before, after, LB_table[before][after]); //assert(0); @@ -5742,14 +5751,13 @@ S_isLB(pTHX_ LB_enum before, break */ } -STATIC LB_enum +static LB_enum S_advance_one_LB(pTHX_ U8 ** curpos, const U8 * const strend, const bool utf8_target) { + PERL_ARGS_ASSERT_ADVANCE_ONE_LB; LB_enum lb; - PERL_ARGS_ASSERT_ADVANCE_ONE_LB; - if (*curpos >= strend) { return LB_EDGE; } @@ -5772,7 +5780,7 @@ S_advance_one_LB(pTHX_ U8 ** curpos, con return lb; } -STATIC LB_enum +static LB_enum S_backup_one_LB_(pTHX_ const U8 * const strbeg, U8 ** curpos, const bool utf8_target, @@ -5781,6 +5789,7 @@ S_backup_one_LB_(pTHX_ const U8 * const PERL_ARGS_ASSERT_BACKUP_ONE_LB_; LB_enum isLB_scratch; /* Used by generated isLB_foo() macros */ + bool skipped_combining = false; if (*curpos < strbeg) { return LB_EDGE; @@ -5811,7 +5820,9 @@ S_backup_one_LB_(pTHX_ const U8 * const *curpos = (U8 *) strbeg; return LB_EDGE; } - } while (skip_CM_ZWJ && (isLB_CM(lb) || isLB_ZWJ(lb))); + } while ( skip_CM_ZWJ + && (isLB_CM(lb) || isLB_ZWJ(lb)) + && (skipped_combining = true)); } else { do { @@ -5821,13 +5832,23 @@ S_backup_one_LB_(pTHX_ const U8 * const } (*curpos)--; lb = getLB_VAL_CP(*(*curpos - 1)); - } while (skip_CM_ZWJ && (isLB_CM(lb) || isLB_ZWJ(lb))); + } while ( skip_CM_ZWJ + && (isLB_CM(lb) || isLB_ZWJ(lb)) + && (skipped_combining = true)); + } + + /* Rule LB10 says that combining marks (including ZWJ) do not attach to + * certain preceding character, such as SPACE. And that in those + * circumstanceds, the mark is to be treated as if it were instead an + * alphabetic. */ + if (skipped_combining && ! LB_CM_ATTACHES_TO(lb)) { + lb = LB_Alphabetic; } return lb; } -STATIC bool +static bool S_isSB(pTHX_ SB_enum before, SB_enum after, const U8 * const strbeg, @@ -5835,6 +5856,8 @@ S_isSB(pTHX_ SB_enum before, const U8 * const strend, const bool utf8_target) { + PERL_ARGS_ASSERT_ISSB; + /* returns a boolean indicating if there is a Sentence Boundary Break * between the inputs. See https://www.unicode.org/reports/tr29/ */ @@ -5842,8 +5865,6 @@ S_isSB(pTHX_ SB_enum before, bool has_para_sep = false; bool has_sp = false; - PERL_ARGS_ASSERT_ISSB; - /* Break at the start and end of text. SB1. sot ÷ SB2. ÷ eot @@ -6022,13 +6043,13 @@ S_isSB(pTHX_ SB_enum before, return false; } -STATIC SB_enum +static SB_enum S_advance_one_SB(pTHX_ U8 ** curpos, const U8 * const strend, const bool utf8_target) { - SB_enum sb; - PERL_ARGS_ASSERT_ADVANCE_ONE_SB; + SB_enum sb; + if (*curpos >= strend) { return SB_EDGE; } @@ -6055,13 +6076,13 @@ S_advance_one_SB(pTHX_ U8 ** curpos, con return sb; } -STATIC SB_enum +static SB_enum S_backup_one_SB(pTHX_ const U8 * const strbeg, U8 ** curpos, const bool utf8_target) { - SB_enum sb; - PERL_ARGS_ASSERT_BACKUP_ONE_SB; + SB_enum sb; + if (*curpos < strbeg) { return SB_EDGE; } @@ -6108,7 +6129,7 @@ S_backup_one_SB(pTHX_ const U8 * const s #define advance_one_WB_but_over_Extend_FO(cur, end, utf8) \ advance_one_WB_(cur, end, utf8, true) -STATIC bool +static bool S_isWB(pTHX_ WB_enum previous, WB_enum before, WB_enum after, @@ -6249,7 +6270,7 @@ S_isWB(pTHX_ WB_enum previous, matched = false; #ifdef DEBUGGING - Perl_re_printf(aTHX_ + re_printf( "\nUnhandled WB pair: WB_table[%d, %d] = %d\n", before, after, WB_table[before][after]); //assert(0); @@ -6261,7 +6282,8 @@ S_isWB(pTHX_ WB_enum previous, /* Here 'matched' is true if the DFA matched the input. If so, * [index+1] contains the value to return */ if (matched) { - return WB_dfa_table[index+1]; + assert(index+1u < C_ARRAY_LENGTH(WB_dfa_table)); + return WB_dfa_table[index+1u]; } /* Here, it didn't match. In [index+2] is stored the index into the @@ -6275,7 +6297,7 @@ S_isWB(pTHX_ WB_enum previous, break */ } -STATIC WB_enum +static WB_enum S_advance_one_WB_(pTHX_ U8 ** curpos, const U8 * const strend, const bool utf8_target, @@ -6315,7 +6337,7 @@ S_advance_one_WB_(pTHX_ U8 ** curpos, return wb; } -STATIC WB_enum +static WB_enum S_backup_one_WB_but_over_Extend_FO(pTHX_ WB_enum * previous, const U8 * const strbeg, U8 ** curpos, @@ -6465,7 +6487,7 @@ S_backup_one_WB_but_over_Extend_FO(pTHX_ #define DEBUG_STATE_pp(pp) \ DEBUG_STATE_r({ \ DUMP_EXEC_POS(locinput, scan, utf8_target,depth); \ - Perl_re_printf( aTHX_ \ + re_printf(\ "%*s" pp " %s%s%s%s%s\n", \ INDENT_CHARS(depth), "", \ REGNODE_NAME(st->resume_state), \ @@ -6620,9 +6642,11 @@ bounds of our window into the string. */ /* returns -1 on failure, $+[0] on success */ -STATIC SSize_t +static SSize_t S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) { + PERL_ARGS_ASSERT_REGMATCH; + const bool utf8_target = reginfo->is_utf8_target; const U32 uniflags = UTF8_ALLOW_DEFAULT; REGEXP *rex_sv = reginfo->prog; @@ -6656,7 +6680,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, /* mark_state piggy backs on the yes_state logic so that when we unwind the stack on success we can update the mark_state as we go */ regmatch_state *mark_state = NULL; /* last mark state we have seen */ - regmatch_state *cur_eval = NULL; /* most recent EVAL_AB state */ + regmatch_state *cur_eval = NULL; /* most recent EVAL_postponed_A state */ struct regmatch_state *cur_curlyx = NULL; /* most recent curlyx */ U32 state_num; bool no_final = 0; /* prevent failure from backtracking? */ @@ -6668,7 +6692,6 @@ S_regmatch(pTHX_ regmatch_info *reginfo, during a successful match */ U32 lastopen = 0; /* last open we saw */ bool has_cutgroup = RXp_HAS_CUTGROUP(rex) ? 1 : 0; - SV* const oreplsv = GvSVn(PL_replgv); /* these three flags are set by various ops to signal information to * the very next op. They have a useful lifetime of exactly one loop * iteration, and are not preserved or restored by state pushes/pops @@ -6693,7 +6716,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char_class_number_ classnum; bool is_utf8_pat = reginfo->is_utf8_pat; bool match = false; - I32 orig_savestack_ix = PL_savestack_ix; + I32 orig_savestack_ix; U8 * script_run_begin = NULL; char *match_end= NULL; /* where a match MUST end to be considered successful */ bool is_accepted = false; /* have we hit an ACCEPT opcode? */ @@ -6711,15 +6734,10 @@ S_regmatch(pTHX_ regmatch_info *reginfo, DECLARE_AND_GET_RE_DEBUG_FLAGS; #endif - /* protect against undef(*^R) */ - SAVEFREESV(SvREFCNT_inc_simple_NN(oreplsv)); - /* shut up 'may be used uninitialized' compiler warnings for dMULTICALL */ multicall_oldcatch = 0; PERL_UNUSED_VAR(multicall_cop); - PERL_ARGS_ASSERT_REGMATCH; - st = PL_regmatch_state; /* Note that nextbyte is a byte even in UTF */ @@ -6728,9 +6746,11 @@ S_regmatch(pTHX_ regmatch_info *reginfo, DEBUG_OPTIMISE_r( DEBUG_EXECUTE_r({ DUMP_EXEC_POS( locinput, scan, utf8_target, depth ); - Perl_re_printf( aTHX_ "regmatch start\n" ); + re_printf("regmatch start\n" ); })); + REGCP_SET(orig_savestack_ix); + while (scan != NULL) { next = scan + NEXT_OFF(scan); if (next == scan) @@ -6745,7 +6765,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, DUMP_EXEC_POS( locinput, scan, utf8_target, depth ); regprop(rex, prop, scan, reginfo, NULL); - Perl_re_printf( aTHX_ + re_printf( "%*s%" IVdf ":%s(%" IVdf ")\n", INDENT_CHARS(depth), "", (IV)(scan - rexi->program), @@ -6838,7 +6858,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, && ! ANYOF_BITMAP_TEST(scan, nextbyte)) { DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "%sTRIE: failed to match trie start class...%s\n", + re_exec_indentf("%sTRIE: failed to match trie start class...%s\n", depth, PL_colors[4], PL_colors[5]) ); sayNO_SILENT; @@ -6926,14 +6946,14 @@ S_regmatch(pTHX_ regmatch_info *reginfo, { if (trie->states[ state ].wordnum) { DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "%sTRIE: matched empty string...%s\n", + re_exec_indentf("%sTRIE: matched empty string...%s\n", depth, PL_colors[4], PL_colors[5]) ); if (!trie->jump) break; } else { DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "%sTRIE: failed to match trie start class...%s\n", + re_exec_indentf("%sTRIE: failed to match trie start class...%s\n", depth, PL_colors[4], PL_colors[5]) ); sayNO_SILENT; @@ -7017,14 +7037,14 @@ S_regmatch(pTHX_ regmatch_info *reginfo, } DEBUG_TRIE_EXECUTE_r( DUMP_EXEC_POS( (char *)uc, scan, utf8_target, depth ); - Perl_re_printf( aTHX_ + re_printf( "%sTRIE: Chid:0x%-2" UVXf " CP:0x%-4" UVXf " ", PL_colors[4], (UV)charid, uvc); if (isPRINT_A(uvc)) - Perl_re_printf( aTHX_ "'%c' ", (int)uvc ); + re_printf("'%c' ", (int)uvc ); else - Perl_re_printf( aTHX_ " " ); /* four spaces to match "'x' " */ - Perl_re_printf( aTHX_ + re_printf(" " ); /* four spaces to match "'x' " */ + re_printf( "St:0x%-4" UVXf " W:0x%-2" UVXf " - %s -> St: 0x%-4" UVXf "%s\n", (UV)old_state, (UV)wordnum, state ? "good" : charid ? "fail" : "last", @@ -7048,7 +7068,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, } DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "%sTRIE: got %" IVdf " possible matches%s\n", + re_exec_indentf("%sTRIE: got %" IVdf " possible matches%s\n", depth, PL_colors[4], (IV)ST.accepted, PL_colors[5] ); ); @@ -7078,7 +7098,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, } if (!--ST.accepted) { DEBUG_EXECUTE_r({ - Perl_re_exec_indentf( aTHX_ "%sTRIE failed...%s\n", + re_exec_indentf("%sTRIE failed...%s\n", depth, PL_colors[4], PL_colors[5] ); @@ -7135,10 +7155,10 @@ S_regmatch(pTHX_ regmatch_info *reginfo, while (chars) { if (utf8_target) { - /* XXX This assumes the length is well-formed, as - * does the UTF8SKIP below */ - uvc = utf8n_to_uvchr((U8*)uc, UTF8_MAXLEN, &len, - uniflags); + (void) utf8_to_uv_flags((U8*)uc, uc + UTF8_MAXLEN, + &uvc, &len, + ( uniflags|UTF8_DIE_IF_MALFORMED + |UTF8_NO_CONFIDENCE_IN_CURLEN_)); uc += len; } else { @@ -7150,8 +7170,9 @@ S_regmatch(pTHX_ regmatch_info *reginfo, while (foldlen) { if (!--chars) break; - uvc = utf8n_to_uvchr(uscan, foldlen, &len, - uniflags); + (void) utf8_to_uv_flags((U8*)uscan, + uscan + foldlen, &uvc, &len, + uniflags|UTF8_DIE_IF_MALFORMED); uscan += len; foldlen -= len; } @@ -7176,7 +7197,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, DEBUG_EXECUTE_r({ - Perl_re_exec_indentf( aTHX_ "%sTRIE: matched word #%d, continuing%s\n", + re_exec_indentf("%sTRIE: matched word #%d, continuing%s\n", depth, PL_colors[4], ST.nextword, @@ -7201,7 +7222,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, ? av_fetch(trie_words, ST.nextword - 1, 0) : NULL; SV *sv= tmp ? sv_newmortal() : NULL; - Perl_re_exec_indentf( aTHX_ "%sTRIE: only one match left, short-circuiting: #%d <%s>%s\n", + re_exec_indentf("%sTRIE: only one match left, short-circuiting: #%d <%s>%s\n", depth, PL_colors[4], ST.nextword, tmp ? pv_pretty(sv, SvPV_nolen_const(*tmp), SvCUR(*tmp), 0, @@ -7781,7 +7802,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, || NEXTCHR_IS_EOS || ANYOF_FLAGS(scan) > NATIVE_UTF8_TO_I8(*locinput) || ! (anyofh_list = GET_ANYOFH_INVLIST(rex, scan)) - || ! _invlist_contains_cp(anyofh_list, + || ! invlist_contains_cp_(anyofh_list, utf8_to_uv_or_die((U8 *) locinput, (U8 *) loceol, NULL))) @@ -7796,7 +7817,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, || NEXTCHR_IS_EOS || ANYOF_FLAGS(scan) != (U8) *locinput || ! (anyofh_list = GET_ANYOFH_INVLIST(rex, scan)) - || ! _invlist_contains_cp(anyofh_list, + || ! invlist_contains_cp_(anyofh_list, utf8_to_uv_or_die((U8 *) locinput, (U8 *) loceol, NULL))) @@ -7826,7 +7847,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, LOWEST_ANYOF_HRx_BYTE(ANYOF_FLAGS(scan)), HIGHEST_ANYOF_HRx_BYTE(ANYOF_FLAGS(scan))) || ! (anyofh_list = GET_ANYOFH_INVLIST(rex, scan)) - || ! _invlist_contains_cp(anyofh_list, + || ! invlist_contains_cp_(anyofh_list, utf8_to_uv_or_die((U8 *) locinput, (U8 *) loceol, NULL))) @@ -7842,7 +7863,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, || loceol - locinput < FLAGS(scan) || memNE(locinput, ((struct regnode_anyofhs *) scan)->string, FLAGS(scan)) || ! (anyofh_list = GET_ANYOFH_INVLIST(rex, scan)) - || ! _invlist_contains_cp(anyofh_list, + || ! invlist_contains_cp_(anyofh_list, utf8_to_uv_or_die((U8 *) locinput, (U8 *) loceol, NULL))) @@ -8029,7 +8050,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, switch (classnum) { default: if (! (to_complement - ^ cBOOL(_invlist_contains_cp( + ^ cBOOL(invlist_contains_cp_( PL_XPosix_ptrs[classnum], utf8_to_uv_or_die((U8 *) locinput, (U8 *) reginfo->strend, @@ -8356,7 +8377,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, DEBUG_r({ DECLARE_AND_GET_RE_DEBUG_FLAGS; DEBUG_STACK_r({ - Perl_re_exec_indentf( aTHX_ + re_exec_indentf( "entering GOSUB, prev_recurse_locinput = %p recurse_locinput[%d]=%p\n", depth, ST.prev_recurse_locinput, arg, rex->recurse_locinput[arg] ); @@ -8517,7 +8538,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, } nop = nop->op_next; - DEBUG_STATE_r( Perl_re_printf( aTHX_ + DEBUG_STATE_r( re_printf( " re EVAL PL_op = 0x%" UVxf "\n", PTR2UV(nop)) ); RXp_OFFSp(rex)[0].end = locinput - reginfo->strbeg; @@ -8703,22 +8724,25 @@ S_regmatch(pTHX_ regmatch_info *reginfo, ST.prev_eval = cur_eval; cur_eval = st; /* now continue from first node in postoned RE */ - PUSH_YES_STATE_GOTO(EVAL_postponed_AB, startpoint, locinput, + PUSH_YES_STATE_GOTO(EVAL_postponed_A, startpoint, locinput, loceol, script_run_begin); NOT_REACHED; /* NOTREACHED */ } - case EVAL_postponed_AB: /* cleanup after a successful (??{A})B */ + case EVAL_postponed_A: /* cleanup the A part after a + successful (??{A})B */ + case EVAL_postponed_B: /* cleanup the B part after a + successful (??{A})B */ /* note: this is called twice; first after popping B, then A */ DEBUG_STACK_r({ - Perl_re_exec_indentf( aTHX_ "EVAL_AB cur_eval = %p prev_eval = %p\n", + re_exec_indentf("EVAL_postponed_A/B cur_eval = %p prev_eval = %p\n", depth, cur_eval, ST.prev_eval); }); #define SET_RECURSE_LOCINPUT(STR,VAL) \ if ( cur_eval && CUR_EVAL.close_paren ) { \ DEBUG_STACK_r({ \ - Perl_re_exec_indentf( aTHX_ STR " \ + re_exec_indentf(STR " \ GOSUB%d ce = %p recurse_locinput = %p\n", \ depth, \ CUR_EVAL.close_paren - 1, \ @@ -8728,25 +8752,13 @@ S_regmatch(pTHX_ regmatch_info *reginfo, rex->recurse_locinput[CUR_EVAL.close_paren - 1] = VAL; \ } - SET_RECURSE_LOCINPUT("EVAL_AB[before]", CUR_EVAL.prev_recurse_locinput); + SET_RECURSE_LOCINPUT("EVAL_postponed_A/B[before]", CUR_EVAL.prev_recurse_locinput); rex_sv = ST.prev_rex; is_utf8_pat = reginfo->is_utf8_pat = cBOOL(RX_UTF8(rex_sv)); S_set_reg_curpm(aTHX_ rex_sv, reginfo); rex = ReANY(rex_sv); rexi = RXi_GET(rex); - { - /* preserve $^R across LEAVE's. See Bug 121070. */ - SV *save_sv= GvSV(PL_replgv); - SV *replsv; - SvREFCNT_inc(save_sv); - regcpblow(ST.cp); /* LEAVE in disguise */ - /* don't move this initialization up */ - replsv = GvSV(PL_replgv); - sv_setsv(replsv, save_sv); - SvSETMAGIC(replsv); - SvREFCNT_dec(save_sv); - } cur_eval = ST.prev_eval; cur_curlyx = ST.prev_curlyx; @@ -8755,7 +8767,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, if ( nochange_depth ) nochange_depth--; - SET_RECURSE_LOCINPUT("EVAL_AB[after]", cur_eval->locinput); + SET_RECURSE_LOCINPUT("EVAL_postponed_A/B[after]", cur_eval->locinput); sayYES; @@ -8764,10 +8776,11 @@ S_regmatch(pTHX_ regmatch_info *reginfo, regcppop(rex, &maxopenparen); sayNO; - case EVAL_postponed_AB_fail: /* unsuccessfully ran A or B in (??{A})B */ + case EVAL_postponed_A_fail: /* unsuccessfully ran A in (??{A})B */ + case EVAL_postponed_B_fail: /* unsuccessfully ran B in (??{A})B */ /* note: this is called twice; first after popping B, then A */ DEBUG_STACK_r({ - Perl_re_exec_indentf( aTHX_ "EVAL_AB_fail cur_eval = %p prev_eval = %p\n", + re_exec_indentf("EVAL_AB_fail cur_eval = %p prev_eval = %p\n", depth, cur_eval, ST.prev_eval); }); @@ -8798,7 +8811,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, RXp_OFFSp(rex)[n].start_tmp = locinput - reginfo->strbeg; if (n > maxopenparen) maxopenparen = n; - DEBUG_BUFFERS_r(Perl_re_exec_indentf( aTHX_ + DEBUG_BUFFERS_r(re_exec_indentf( "OPEN: rex = 0x%" UVxf " offs = 0x%" UVxf ": \\%" UVuf ": set %" IVdf " tmp; maxopenparen = %" UVuf "\n", depth, PTR2UV(rex), @@ -9007,7 +9020,7 @@ NULL ST.prev_curlyx= cur_curlyx; cur_curlyx = st; - ST.cp = PL_savestack_ix; + REGCP_SET(ST.cp); /* these fields contain the state of the current curly. * they are accessed by subsequent WHILEMs */ @@ -9030,7 +9043,7 @@ NULL NOT_REACHED; /* NOTREACHED */ case CURLYX_end_fail: /* just failed to match all of A*B */ - regcpblow(ST.cp); + REGCP_UNWIND(ST.cp); /* LEAVE in disguise */ cur_curlyx = ST.prev_curlyx; sayNO; NOT_REACHED; /* NOTREACHED */ @@ -9059,7 +9072,7 @@ NULL ST.cache_offset = 0; ST.cache_mask = 0; - DEBUG_EXECUTE_r( Perl_re_exec_indentf( aTHX_ "WHILEM: matched %ld out of %d..%d\n", + DEBUG_EXECUTE_r( re_exec_indentf("WHILEM: matched %ld out of %d..%d\n", depth, (long)n, min, max) ); @@ -9077,7 +9090,7 @@ NULL /* If degenerate A matches "", assume A done. */ if (locinput == cur_curlyx->u.curlyx.lastloc) { - DEBUG_EXECUTE_r( Perl_re_exec_indentf( aTHX_ "WHILEM: empty match detected, trying continuation...\n", + DEBUG_EXECUTE_r( re_exec_indentf("WHILEM: empty match detected, trying continuation...\n", depth) ); goto do_whilem_B_max; @@ -9150,7 +9163,7 @@ NULL reginfo->poscache_size = size; Newxz(aux->poscache, size, char); } - DEBUG_EXECUTE_r( Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r( re_printf( "%sWHILEM: Detected a super-linear match, switching on caching%s...\n", PL_colors[4], PL_colors[5]) ); @@ -9166,7 +9179,7 @@ NULL mask = 1 << (offset % 8); offset /= 8; if (reginfo->info_aux->poscache[offset] & mask) { - DEBUG_EXECUTE_r( Perl_re_exec_indentf( aTHX_ "WHILEM: (cache) already tried at this position...\n", + DEBUG_EXECUTE_r( re_exec_indentf("WHILEM: (cache) already tried at this position...\n", depth) ); cur_curlyx->u.curlyx.count--; @@ -9230,7 +9243,7 @@ NULL case WHILEM_A_max_fail: /* just failed to match A in a maximal match */ REGCP_UNWIND(ST.lastcp); regcppop(rex, &maxopenparen); /* Restore some previous $s? */ - DEBUG_EXECUTE_r(Perl_re_exec_indentf( aTHX_ "WHILEM: failed, trying continuation...\n", + DEBUG_EXECUTE_r(re_exec_indentf("WHILEM: failed, trying continuation...\n", depth) ); @@ -9251,7 +9264,7 @@ NULL CACHEsayNO; } - DEBUG_EXECUTE_r(Perl_re_exec_indentf( aTHX_ "WHILEM: B min fail: trying longer...\n", depth) + DEBUG_EXECUTE_r(re_exec_indentf("WHILEM: B min fail: trying longer...\n", depth) ); /* Try grabbing another A and see if it helps. */ cur_curlyx->u.curlyx.lastloc = locinput; @@ -9335,7 +9348,7 @@ NULL /* no more branches? */ if (!scan || (OP(scan) != BRANCH && OP(scan) != BRANCHJ)) { DEBUG_EXECUTE_r({ - Perl_re_exec_indentf( aTHX_ "%sBRANCH failed...%s\n", + re_exec_indentf("%sBRANCH failed...%s\n", depth, PL_colors[4], PL_colors[5] ); @@ -9409,7 +9422,7 @@ NULL ST.count = ST.minmod ? ARG1i(ST.me) : ARG2i(ST.me); } DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "CURLYM now matched %" IVdf " times, len = %" IVdf "...\n", + re_exec_indentf("CURLYM now matched %" IVdf " times, len = %" IVdf "...\n", depth, (IV) ST.count, (IV)ST.alen) ); @@ -9462,7 +9475,7 @@ NULL } DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "CURLYM trying tail with matches = %" IVdf "...\n", + re_exec_indentf("CURLYM trying tail with matches = %" IVdf "...\n", depth, (IV)ST.count) ); if (! NEXTCHR_IS_EOS && ST.Binfo.count >= 0) { @@ -9473,7 +9486,7 @@ NULL || ! S_test_EXACTISH_ST(locinput, ST.Binfo)) { DEBUG_OPTIMISE_r( - Perl_re_exec_indentf( aTHX_ + re_exec_indentf( "CURLYM Fast bail next target = 0x%X anded == 0x%X" " mask = 0x%X\n", depth, @@ -9886,20 +9899,20 @@ NULL st->u.eval.prev_eval = cur_eval; cur_eval = CUR_EVAL.prev_eval; DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "END: EVAL trying tail ... (cur_eval = %p)\n", + re_exec_indentf("END: EVAL trying tail ... (cur_eval = %p)\n", depth, cur_eval);); if ( nochange_depth ) nochange_depth--; SET_RECURSE_LOCINPUT("FAKE-END[after]", cur_eval->locinput); - PUSH_YES_STATE_GOTO(EVAL_postponed_AB, /* match B */ + PUSH_YES_STATE_GOTO(EVAL_postponed_B, /* match B */ st->u.eval.prev_eval->u.eval.B, locinput, loceol, script_run_begin); } if (locinput < reginfo->till) { - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ + DEBUG_EXECUTE_r(re_printf( "%sEND: Match possible, but length = %ld is smaller than requested = %ld, failing!%s\n", PL_colors[4], (long)(locinput - startpos), @@ -9916,7 +9929,7 @@ NULL if (match_end && locinput != match_end) { DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ + re_exec_indentf( "%sLOOKBEHIND_END: subpattern failed...%s\n", depth, PL_colors[4], PL_colors[5])); sayNO; /* Variable length match didn't line up */ @@ -9926,7 +9939,7 @@ NULL case SUCCEED: /* successful SUSPEND/CURLYM and *lookahead* IFMATCH/UNLESSM*/ DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ + re_exec_indentf( "%sSUCCEED: subpattern success...%s\n", depth, PL_colors[4], PL_colors[5])); sayYES; /* Success! */ @@ -10109,7 +10122,7 @@ NULL sv_commit = ST.mark_name; DEBUG_EXECUTE_r({ - Perl_re_exec_indentf( aTHX_ "%sMARKPOINT: next fail: setting cutpoint to mark:%" SVf "...%s\n", + re_exec_indentf("%sMARKPOINT: next fail: setting cutpoint to mark:%" SVf "...%s\n", depth, PL_colors[4], SVfARG(sv_commit), PL_colors[5]); }); @@ -10224,7 +10237,7 @@ NULL slab = slab->prev; cur = SLAB_LAST(slab); } - Perl_re_exec_indentf( aTHX_ "%4s #%-3d %-10s %s\n", + re_exec_indentf("%4s #%-3d %-10s %s\n", depth, i ? " " : "push", depth - i, REGNODE_NAME(cur->resume_state), @@ -10309,30 +10322,31 @@ NULL goto reenter_switch; } - DEBUG_EXECUTE_r(Perl_re_printf( aTHX_ "%sMatch successful!%s\n", + DEBUG_EXECUTE_r(re_printf("%sMatch successful!%s\n", PL_colors[4], PL_colors[5])); - if (reginfo->info_aux_eval) { - /* each successfully executed (?{...}) block does the equivalent of - * local $^R = do {...} - * When popping the save stack, all these locals would be undone; - * bypass this by setting the outermost saved $^R to the latest - * value */ - /* I don't know if this is needed or works properly now. - * see code related to PL_replgv elsewhere in this file. - * Yves + if (reginfo->info_aux_eval && orig_savestack_ix < PL_savestack_ix) { + /* After exiting a match, $^R should still hold the value of the + * latest (?{...}). E.g. + * /(?{42})/ and print $^R; + * will print 42. However, each successfully executed (?{...}) + * block does the equivalent of 'local $^R = ...'. In addition, + * there may be an explicit 'local $^R' or similar code. When + * popping the savestack at the end, all these locals would be + * undone. Avoid this issue by making a copy of the final value + * just *before* the final savestack unwind. After the unwind, + * we set $^R to that value. + * This temporary copy is stored in the aux_eval struct so that + * it will get freed even if we die during savestack unwind. */ - if (oreplsv != GvSV(PL_replgv)) { - sv_setsv(oreplsv, GvSV(PL_replgv)); - SvSETMAGIC(oreplsv); - } + reginfo->info_aux_eval->final_replsv = newSVsv(GvSV(PL_replgv)); } result = 1; goto final_exit; no: DEBUG_EXECUTE_r( - Perl_re_exec_indentf( aTHX_ "%sfailed...%s\n", + re_exec_indentf("%sfailed...%s\n", depth, PL_colors[4], PL_colors[5]) ); @@ -10390,12 +10404,25 @@ NULL if (last_pushed_cv) { dSP; - /* see "Some notes about MULTICALL" above */ + /* see "Some notes about MULTICALL" above, especially how + * the POP_MULTICALL does the equivalent of the LEAVE_SCOPE + * for us, so no need to do it explicitly. */ POP_MULTICALL; PERL_UNUSED_VAR(SP); } - else - LEAVE_SCOPE(orig_savestack_ix); + else { + REGCP_UNWIND(orig_savestack_ix); + } + + if ( reginfo->info_aux_eval + && reginfo->info_aux_eval->final_replsv) + { + /* '/(?{42})/; print $^R' should print 42; now that the + * savestack has been popped, set the final value */ + SV *replsv = GvSV(PL_replgv); + sv_setsv(replsv, reginfo->info_aux_eval->final_replsv); + SvSETMAGIC(replsv); + } assert(!result || locinput - reginfo->strbeg >= 0); return result ? locinput - reginfo->strbeg : -1; @@ -10417,10 +10444,12 @@ NULL * max - maximum number of things to match. * depth - (for debugging) backtracking depth. */ -STATIC I32 +static I32 S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, char * loceol, regmatch_info *const reginfo, I32 max comma_pDEPTH) { + PERL_ARGS_ASSERT_REGREPEAT; + char *scan; /* Pointer to current position in target string */ I32 c; char *this_eol = loceol; /* potentially adjusted version. */ @@ -10429,8 +10458,6 @@ S_regrepeat(pTHX_ regexp *prog, char **s unsigned int to_complement = 0; /* Invert the result? */ char_class_number_ classnum; - PERL_ARGS_ASSERT_REGREPEAT; - /* This routine is structured so that we switch on the input OP. Each OP * case: statement contains a loop to repeatedly apply the OP, advancing * the input until it fails, or reaches the end of the input, or until it @@ -10468,6 +10495,7 @@ S_regrepeat(pTHX_ regexp *prog, char **s switch (with_t_UTF8ness(OP(p), utf8_target)) { SV * anyofh_list; + Size_t advance; case REG_ANY_t8: while (scan < this_eol && hardcount < max && *scan != '\n') { @@ -10750,12 +10778,12 @@ S_regrepeat(pTHX_ regexp *prog, char **s while ( hardcount < max && scan < this_eol && NATIVE_UTF8_TO_I8(*scan) >= ANYOF_FLAGS(p) - && _invlist_contains_cp(anyofh_list, + && invlist_contains_cp_(anyofh_list, utf8_to_uv_or_die((U8 *) scan, (U8 *) this_eol, - NULL))) + &advance))) { - scan += UTF8SKIP(scan); + scan += advance; hardcount++; } break; @@ -10766,12 +10794,12 @@ S_regrepeat(pTHX_ regexp *prog, char **s while ( hardcount < max && scan < this_eol && (U8) *scan == ANYOF_FLAGS(p) - && _invlist_contains_cp(anyofh_list, + && invlist_contains_cp_(anyofh_list, utf8_to_uv_or_die((U8 *) scan, (U8 *) this_eol, - NULL))) + &advance))) { - scan += UTF8SKIP(scan); + scan += advance; hardcount++; } break; @@ -10796,12 +10824,12 @@ S_regrepeat(pTHX_ regexp *prog, char **s LOWEST_ANYOF_HRx_BYTE(ANYOF_FLAGS(p)), HIGHEST_ANYOF_HRx_BYTE(ANYOF_FLAGS(p))) && NATIVE_UTF8_TO_I8(*scan) >= ANYOF_FLAGS(p) - && _invlist_contains_cp(anyofh_list, + && invlist_contains_cp_(anyofh_list, utf8_to_uv_or_die((U8 *) scan, (U8 *) this_eol, - NULL))) + &advance))) { - scan += UTF8SKIP(scan); + scan += advance; hardcount++; } break; @@ -10811,12 +10839,12 @@ S_regrepeat(pTHX_ regexp *prog, char **s while ( hardcount < max && scan + FLAGS(p) < this_eol && memEQ(scan, ((struct regnode_anyofhs *) p)->string, FLAGS(p)) - && _invlist_contains_cp(anyofh_list, + && invlist_contains_cp_(anyofh_list, utf8_to_uv_or_die((U8 *) scan, (U8 *) this_eol, - NULL))) + &advance))) { - scan += UTF8SKIP(scan); + scan += advance; hardcount++; } break; @@ -10827,10 +10855,10 @@ S_regrepeat(pTHX_ regexp *prog, char **s && NATIVE_UTF8_TO_I8(*scan) >= ANYOF_FLAGS(p) && withinCOUNT(utf8_to_uv_or_die((U8 *) scan, (U8 *) this_eol, - NULL), + &advance), ANYOFRbase(p), ANYOFRdelta(p))) { - scan += UTF8SKIP(scan); + scan += advance; hardcount++; } break; @@ -10851,10 +10879,10 @@ S_regrepeat(pTHX_ regexp *prog, char **s && (U8) *scan == ANYOF_FLAGS(p) && withinCOUNT(utf8_to_uv_or_die((U8 *) scan, (U8 *) this_eol, - NULL), + &advance), ANYOFRbase(p), ANYOFRdelta(p))) { - scan += UTF8SKIP(scan); + scan += advance; hardcount++; } break; @@ -10964,7 +10992,7 @@ S_regrepeat(pTHX_ regexp *prog, char **s default: while ( hardcount < max && scan < this_eol && to_complement - ^ cBOOL(_invlist_contains_cp(PL_XPosix_ptrs[classnum], + ^ cBOOL(invlist_contains_cp_(PL_XPosix_ptrs[classnum], utf8_to_uv_or_die((U8 *) scan, (U8 *) this_eol, NULL)))) { scan += UTF8SKIP(scan); @@ -11070,7 +11098,7 @@ S_regrepeat(pTHX_ regexp *prog, char **s DEBUG_EXECUTE_r({ SV * const prop = sv_newmortal(); regprop(prog, prop, p, reginfo, NULL); - Perl_re_exec_indentf( aTHX_ + re_exec_indentf( "%s can match %" IVdf " times out of %" IVdf "...\n", depth, SvPVX_const(prop),(IV)c,(IV)max); }); @@ -11095,17 +11123,17 @@ S_regrepeat(pTHX_ regexp *prog, char **s */ -STATIC bool +static bool S_reginclass(pTHX_ regexp * const prog, const regnode * const n, const U8* const p, const U8* const p_end, const bool utf8_target) { + PERL_ARGS_ASSERT_REGINCLASS; + const char flags = (inRANGE(OP(n), ANYOFH, ANYOFHs)) ? 0 : ANYOF_FLAGS(n); bool match = false; UV c = *p; - PERL_ARGS_ASSERT_REGINCLASS; - /* If c is not already the code point, get it. Note that * UTF8_IS_INVARIANT() works even if not in UTF-8 */ if (! UTF8_IS_INVARIANT(c) && utf8_target) { @@ -11222,7 +11250,7 @@ S_reginclass(pTHX_ regexp * const prog, &only_utf8_locale, NULL); if (definition) { /* Most likely is the outside-the-bitmap inversion list. */ - if (_invlist_contains_cp(definition, c)) { + if (invlist_contains_cp_(definition, c)) { match = true; } else /* Failing that, hardcode the two tests for a Turkic @@ -11233,13 +11261,13 @@ S_reginclass(pTHX_ regexp * const prog, /* Turkish locales have these hard-coded rules * overriding normal ones */ if (*p == 'i') { - if (_invlist_contains_cp(definition, + if (invlist_contains_cp_(definition, LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE)) { match = true; } } - else if (_invlist_contains_cp(definition, + else if (invlist_contains_cp_(definition, LATIN_SMALL_LETTER_DOTLESS_I)) { match = true; @@ -11251,7 +11279,7 @@ S_reginclass(pTHX_ regexp * const prog, && UNLIKELY(IN_UTF8_CTYPE_LOCALE) && ! match) { - match = _invlist_contains_cp(only_utf8_locale, c); + match = invlist_contains_cp_(only_utf8_locale, c); } } @@ -11296,7 +11324,7 @@ S_reginclass(pTHX_ regexp * const prog, && OP(n) != ANYOFD && ckWARN_d(WARN_NON_UNICODE)) { - Perl_warner(aTHX_ packWARN(WARN_NON_UNICODE), + warner(packWARN(WARN_NON_UNICODE), "Matched non-Unicode code point 0x%04" UVXf " against Unicode property; may not be portable", c); } } @@ -11311,15 +11339,15 @@ S_reginclass(pTHX_ regexp * const prog, return (flags & ANYOF_INVERT) ^ match; } -STATIC U8 * +static U8 * S_reghop3(U8 *s, SSize_t off, const U8* lim) { + PERL_ARGS_ASSERT_REGHOP3; + /* return the position 'off' UTF-8 characters away from 's', forward if * 'off' >= 0, backwards if negative. But don't go outside of position * 'lim', which better be < s if off < 0 */ - PERL_ARGS_ASSERT_REGHOP3; - if (off >= 0) { while (off-- && s < lim) { /* XXX could check well-formedness here */ @@ -11348,7 +11376,7 @@ S_reghop3(U8 *s, SSize_t off, const U8* /* like reghop3, but returns NULL on overrun, rather than returning last * char pos */ -STATIC U8 * +static U8 * S_reghopmaybe3(U8* s, SSize_t off, const U8* const lim) { PERL_ARGS_ASSERT_REGHOPMAYBE3; @@ -11489,6 +11517,8 @@ S_setup_eval_state(pTHX_ regmatch_info * RXp_SUBOFFSET(rex) = 0; RXp_SUBCOFFSET(rex) = 0; RXp_SUBLEN(rex) = reginfo->strend - reginfo->strbeg; + + eval_state->final_replsv = NULL; /* the final value of $^R. */ } @@ -11539,6 +11569,7 @@ S_cleanup_regmatch_info_aux(pTHX_ void * PM_SETRE(eval_state->old_op, eval_state->old_op_val); SvREFCNT_dec(old_rx); } + SvREFCNT_dec(eval_state->final_replsv); } PL_regmatch_state = aux->old_regmatch_state; @@ -11560,16 +11591,16 @@ S_cleanup_regmatch_info_aux(pTHX_ void * } -STATIC void +static void S_to_utf8_substr(pTHX_ regexp *prog) { + PERL_ARGS_ASSERT_TO_UTF8_SUBSTR; + /* Converts substr fields in prog from bytes to UTF-8, calling fbm_compile * on the converted value */ int i = 1; - PERL_ARGS_ASSERT_TO_UTF8_SUBSTR; - do { if (prog->substrs->data[i].substr && !prog->substrs->data[i].utf8_substr) { @@ -11594,16 +11625,16 @@ S_to_utf8_substr(pTHX_ regexp *prog) } while (i--); } -STATIC bool +static bool S_to_byte_substr(pTHX_ regexp *prog) { + PERL_ARGS_ASSERT_TO_BYTE_SUBSTR; + /* Converts substr fields in prog from UTF-8 to bytes, calling fbm_compile * on the converted value; returns false if can't be converted. */ int i = 1; - PERL_ARGS_ASSERT_TO_BYTE_SUBSTR; - do { if (prog->substrs->data[i].utf8_substr && !prog->substrs->data[i].substr) { @@ -11635,6 +11666,8 @@ S_to_byte_substr(pTHX_ regexp *prog) bool Perl_is_grapheme(pTHX_ const U8 * strbeg, const U8 * s, const U8 * strend, const UV cp) { + PERL_ARGS_ASSERT_IS_GRAPHEME; + /* Temporary helper function for toke.c. Verify that the code point 'cp' * is a stand-alone grapheme. The UTF-8 for 'cp' begins at position 's' in * the larger string bounded by 'strbeg' and 'strend'. @@ -11648,10 +11681,8 @@ Perl_is_grapheme(pTHX_ const U8 * strbeg GCB_enum cp_gcb_val, prev_cp_gcb_val, next_cp_gcb_val; const U8 * prev_cp_start; - PERL_ARGS_ASSERT_IS_GRAPHEME; - if ( UNLIKELY(UNICODE_IS_SUPER(cp)) - || UNLIKELY(UNICODE_IS_NONCHAR(cp))) + || UNLIKELY(UNICODE_IS_NONCHAR_GIVEN_NOT_SUPER(cp))) { /* These are considered graphemes */ return true; @@ -11659,7 +11690,7 @@ Perl_is_grapheme(pTHX_ const U8 * strbeg /* Otherwise, unassigned code points are forbidden */ if (UNLIKELY(! ELEMENT_RANGE_MATCHES_INVLIST( - _invlist_search(PL_Assigned_invlist, cp)))) + invlist_search_(PL_Assigned_invlist, cp)))) { return false; } @@ -11745,6 +11776,8 @@ it are from the Inherited or Common scri bool Perl_isSCRIPT_RUN(pTHX_ const U8 * s, const U8 * send, const bool utf8_target) { + PERL_ARGS_ASSERT_ISSCRIPT_RUN; + /* Basically, it looks at each character in the sequence to see if the * above conditions are met; if not it fails. It uses an inversion map to * find the enum corresponding to the script of each character. But this @@ -11757,9 +11790,27 @@ Perl_isSCRIPT_RUN(pTHX_ const U8 * s, co * parallel, table that gives the number of entries in each aux table. * These are all defined in charclass_invlists.inc */ - /* XXX Here are the additional things UTS 39 says could be done: + /* XXX Here are the additional things UTS 39 (17.0 + * https://unicode.org/reports/tr39/#Optional_Detection ) says could be + * done: * - * Forbid sequences of the same nonspacing mark + * Check for unlikely sequences of combining marks: + * Forbid sequences of the same nonspacing mark. + * Forbid sequences of more than 4 nonspacing marks (gc=Mn or gc=Me). + * Forbid sequences of base character + nonspacing mark that look the + * same as or confusingly similar to the base character alone + * (because the nonspacing mark overlays a portion of the base + * character). An example is U+0069 LOWERCASE LETTER I + U+0307 + * COMBINING DOT ABOVE. + * Add support for detecting two distinct sequences that have identical + * representations. The current data files only handle cases where a + * single code point is confusable with another code point or + * sequence. It does not handle cases like shri: + * The characters U+0BB6 TAMIL LETTER SHA and U+0BB8 TAMIL LETTER SA + * are normally quite distinct. However, they can both be used in the + * representation of the Tamil word shri. On some very common + * platforms, some sequences result in exactly the same visual + * appearance: * * Check to see that all the characters are in the sets of exemplar * characters for at least one language in the Unicode Common Locale Data @@ -11785,10 +11836,6 @@ Perl_isSCRIPT_RUN(pTHX_ const U8 * s, co bool retval = true; SCX_enum * ret_script = NULL; - assert(send >= s); - - PERL_ARGS_ASSERT_ISSCRIPT_RUN; - /* All code points in 0..255 are either Common or Latin, so must be a * script run. We can return immediately unless we need to know which * script it is. */ @@ -11843,7 +11890,7 @@ Perl_isSCRIPT_RUN(pTHX_ const U8 * s, co /* Here, isn't an ASCII digit. Find the code point of the character */ if (! UTF8_IS_INVARIANT(*s)) { Size_t len; - cp = valid_utf8_to_uvchr((U8 *) s, &len); + cp = valid_utf8_to_uv((U8 *) s, &len); s += len; } else { @@ -11873,7 +11920,7 @@ Perl_isSCRIPT_RUN(pTHX_ const U8 * s, co } else { script_of_char = _Perl_SCX_invmap[ - _invlist_search(PL_SCX_invlist, cp)]; + invlist_search_(PL_SCX_invlist, cp)]; } /* We arbitrarily accept a single unassigned character, but not in @@ -12094,7 +12141,7 @@ Perl_isSCRIPT_RUN(pTHX_ const U8 * s, co } else { /* Need to look up if this character is a digit or not */ SSize_t index_of_zero_of_char; - index_of_zero_of_char = _invlist_search(decimals_invlist, cp); + index_of_zero_of_char = invlist_search_(decimals_invlist, cp); if ( UNLIKELY(index_of_zero_of_char < 0) || ! ELEMENT_RANGE_MATCHES_INVLIST(index_of_zero_of_char)) { @@ -12199,11 +12246,11 @@ SV* Perl_reg_named_buff_fetch(pTHX_ REGEXP * const r, SV * const namesv, const U32 flags) { + PERL_ARGS_ASSERT_REG_NAMED_BUFF_FETCH; + SV *ret; struct regexp *const rx = ReANY(r); - PERL_ARGS_ASSERT_REG_NAMED_BUFF_FETCH; - if (rx && RXp_PAREN_NAMES(rx)) { HE *he_str = hv_fetch_ent( RXp_PAREN_NAMES(rx), namesv, 0, 0 ); if (he_str) { @@ -12216,7 +12263,7 @@ Perl_reg_named_buff_fetch(pTHX_ REGEXP * && RXp_OFFS_VALID(rx,nums[i])) { ret = newSVpvs(""); - Perl_reg_numbered_buff_fetch_flags(aTHX_ r, nums[i], ret, REG_FETCH_ABSOLUTE); + reg_numbered_buff_fetch_flags(r, nums[i], ret, REG_FETCH_ABSOLUTE); if (!retarray) return ret; } else { @@ -12237,10 +12284,10 @@ bool Perl_reg_named_buff_exists(pTHX_ REGEXP * const r, SV * const key, const U32 flags) { - struct regexp *const rx = ReANY(r); - PERL_ARGS_ASSERT_REG_NAMED_BUFF_EXISTS; + struct regexp *const rx = ReANY(r); + if (rx && RXp_PAREN_NAMES(rx)) { if (flags & RXapif_ALL) { return hv_exists_ent(RXp_PAREN_NAMES(rx), key, 0); @@ -12261,10 +12308,10 @@ Perl_reg_named_buff_exists(pTHX_ REGEXP SV* Perl_reg_named_buff_firstkey(pTHX_ REGEXP * const r, const U32 flags) { - struct regexp *const rx = ReANY(r); - PERL_ARGS_ASSERT_REG_NAMED_BUFF_FIRSTKEY; + struct regexp *const rx = ReANY(r); + if ( rx && RXp_PAREN_NAMES(rx) ) { (void)hv_iterinit(RXp_PAREN_NAMES(rx)); @@ -12277,11 +12324,11 @@ Perl_reg_named_buff_firstkey(pTHX_ REGEX SV* Perl_reg_named_buff_nextkey(pTHX_ REGEXP * const r, const U32 flags) { + PERL_ARGS_ASSERT_REG_NAMED_BUFF_NEXTKEY; + struct regexp *const rx = ReANY(r); DECLARE_AND_GET_RE_DEBUG_FLAGS; - PERL_ARGS_ASSERT_REG_NAMED_BUFF_NEXTKEY; - if (rx && RXp_PAREN_NAMES(rx)) { HV *hv = RXp_PAREN_NAMES(rx); HE *temphe; @@ -12309,13 +12356,13 @@ Perl_reg_named_buff_nextkey(pTHX_ REGEXP SV* Perl_reg_named_buff_scalar(pTHX_ REGEXP * const r, const U32 flags) { + PERL_ARGS_ASSERT_REG_NAMED_BUFF_SCALAR; + SV *ret; AV *av; SSize_t length; struct regexp *const rx = ReANY(r); - PERL_ARGS_ASSERT_REG_NAMED_BUFF_SCALAR; - if (rx && RXp_PAREN_NAMES(rx)) { if (flags & (RXapif_ALL | RXapif_REGNAMES_COUNT)) { return newSViv(HvTOTALKEYS(RXp_PAREN_NAMES(rx))); @@ -12337,11 +12384,11 @@ Perl_reg_named_buff_scalar(pTHX_ REGEXP SV* Perl_reg_named_buff_all(pTHX_ REGEXP * const r, const U32 flags) { + PERL_ARGS_ASSERT_REG_NAMED_BUFF_ALL; + struct regexp *const rx = ReANY(r); AV *av = newAV(); - PERL_ARGS_ASSERT_REG_NAMED_BUFF_ALL; - if (rx && RXp_PAREN_NAMES(rx)) { HV *hv= RXp_PAREN_NAMES(rx); HE *temphe; @@ -12373,7 +12420,7 @@ Perl_reg_numbered_buff_fetch(pTHX_ REGEX SV * const sv) { PERL_ARGS_ASSERT_REG_NUMBERED_BUFF_FETCH; - Perl_reg_numbered_buff_fetch_flags(aTHX_ re, paren, sv, 0); + reg_numbered_buff_fetch_flags(re, paren, sv, 0); } #ifndef PERL_IN_XSUB_RE @@ -12382,6 +12429,8 @@ void Perl_reg_numbered_buff_fetch_flags(pTHX_ REGEXP * const re, const I32 paren, SV * const sv, U32 flags) { + PERL_ARGS_ASSERT_REG_NUMBERED_BUFF_FETCH_FLAGS; + struct regexp *const rx = ReANY(re); char *s = NULL; SSize_t i,t = 0; @@ -12389,8 +12438,6 @@ Perl_reg_numbered_buff_fetch_flags(pTHX_ I32 n = paren; I32 logical_nparens = rx->logical_nparens ? rx->logical_nparens : rx->nparens; - PERL_ARGS_ASSERT_REG_NUMBERED_BUFF_FETCH_FLAGS; - if ( n == RX_BUFF_IDX_CARET_PREMATCH || n == RX_BUFF_IDX_CARET_FULLMATCH || n == RX_BUFF_IDX_CARET_POSTMATCH @@ -12517,12 +12564,12 @@ I32 Perl_reg_numbered_buff_length(pTHX_ REGEXP * const r, const SV * const sv, const I32 paren) { + PERL_ARGS_ASSERT_REG_NUMBERED_BUFF_LENGTH; + struct regexp *const rx = ReANY(r); I32 i,j; I32 s1, t1; I32 logical_nparens = rx->logical_nparens ? rx->logical_nparens : rx->nparens; - - PERL_ARGS_ASSERT_REG_NUMBERED_BUFF_LENGTH; if ( paren == RX_BUFF_IDX_CARET_PREMATCH || paren == RX_BUFF_IDX_CARET_FULLMATCH Index: gnu/usr.bin/perl/regexp.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regexp.h,v diff -u -p -a -u -p -r1.22 regexp.h --- gnu/usr.bin/perl/regexp.h 15 Aug 2026 01:09:27 -0000 1.22 +++ gnu/usr.bin/perl/regexp.h 16 Nov 2026 00:57:39 -0000 @@ -92,12 +92,12 @@ typedef struct regexp_paren_pair { } regexp_paren_pair; # if defined(PERL_IN_REGCOMP_ANY) || defined(PERL_IN_UTF8_C) -# define _invlist_union(a, b, output) _invlist_union_maybe_complement_2nd(a, b, FALSE, output) -# define _invlist_intersection(a, b, output) _invlist_intersection_maybe_complement_2nd(a, b, FALSE, output) +# define invlist_union_(a, b, output) invlist_union_maybe_complement_2nd_(a, b, FALSE, output) +# define invlist_intersection_(a, b, output) invlist_intersection_maybe_complement_2nd_(a, b, FALSE, output) /* Subtracting b from a leaves in a everything that was there that isn't in b, * that is the intersection of a with b's complement */ -# define _invlist_subtract(a, b, output) _invlist_intersection_maybe_complement_2nd(a, b, TRUE, output) +# define invlist_subtract_(a, b, output) invlist_intersection_maybe_complement_2nd_(a, b, TRUE, output) # endif /* record the position of a (?{...}) within a pattern */ @@ -139,7 +139,7 @@ typedef struct regexp { /*---------------------------------------------------------------------- * Fields required for compatibility with SV types */ - _XPV_HEAD; + XPV_HEAD_; /*---------------------------------------------------------------------- * Operational fields @@ -484,7 +484,7 @@ and check for NULL. /* Currently the regex flags occupy a single 32-bit word. Not all bits are * currently used. The lower bits are shared with their corresponding PMf flag - * bits, up to but not including _RXf_PMf_SHIFT_NEXT. The unused bits + * bits, up to but not including RXf_PMf_SHIFT_NEXT_. The unused bits * immediately follow; finally the used RXf-only (unshared) bits, so that the * highest bit in the word is used. This gathers all the unused bits as a pool * in the middle, like so: 11111111111111110000001111111111 @@ -495,7 +495,7 @@ and check for NULL. * breaking binary compatibility. * * To add shared bits, do so in op_reg_common.h. This should change - * _RXf_PMf_SHIFT_NEXT so that things won't compile. Then come to regexp.h and + * RXf_PMf_SHIFT_NEXT_ so that things won't compile. Then come to regexp.h and * op.h and adjust the constant adders in the definitions of RXf_BASE_SHIFT and * Pmf_BASE_SHIFT down by the number of shared bits you added. That's it. * Things should be binary compatible. But if either of these gets to having @@ -515,7 +515,7 @@ and check for NULL. * For the regexp bits, PL_reg_extflags_name[] in regnodes.h has a comment * giving which bits are used/unused */ -# define RXf_BASE_SHIFT (_RXf_PMf_SHIFT_NEXT + 2) +# define RXf_BASE_SHIFT (RXf_PMf_SHIFT_NEXT_ + 2) /* What we have seen */ # define RXf_NO_INPLACE_SUBST (1U<<(RXf_BASE_SHIFT+2)) @@ -741,16 +741,16 @@ and check for NULL. # define ReREFCNT_inc(re) \ ({ \ /* This is here to generate a casting warning if incorrect. */ \ - REGEXP *const _rerefcnt_inc = (re); \ - assert(SvTYPE(_rerefcnt_inc) == SVt_REGEXP); \ - SvREFCNT_inc(_rerefcnt_inc); \ - _rerefcnt_inc; \ + REGEXP *const rerefcnt_inc_ = (re); \ + assert(SvTYPE(rerefcnt_inc_) == SVt_REGEXP); \ + SvREFCNT_inc(rerefcnt_inc_); \ + rerefcnt_inc_; \ }) # define ReREFCNT_dec(re) \ ({ \ /* This is here to generate a casting warning if incorrect. */ \ - REGEXP *const _rerefcnt_dec = (re); \ - SvREFCNT_dec(_rerefcnt_dec); \ + REGEXP *const rerefcnt_dec_ = (re); \ + SvREFCNT_dec(rerefcnt_dec_); \ }) #else # define ReREFCNT_dec(re) SvREFCNT_dec(re) @@ -791,6 +791,7 @@ typedef struct { SV *sv; /* $_ during (?{}) */ MAGIC *pos_magic; /* pos() magic attached to $_ */ SSize_t pos; /* the original value of pos() in pos_magic */ + SV *final_replsv; /* the final value of $^R. */ U8 pos_flags; /* flags to be restored; currently only MGf_BYTES*/ } regmatch_info_aux_eval; Index: gnu/usr.bin/perl/regexp_constants.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regexp_constants.h,v diff -u -p -a -u -p -r1.1.1.1 regexp_constants.h --- gnu/usr.bin/perl/regexp_constants.h 26 Dec 2025 22:12:29 -0000 1.1.1.1 +++ gnu/usr.bin/perl/regexp_constants.h 16 Nov 2026 00:57:39 -0000 @@ -29,59 +29,59 @@ #define MAX_FOLD_FROMS 3 /* Generated from: - * b7f46fc1010fd83f5a678b268a23fef0142a18d0ab2a142edd0bb03328e667c3 lib/Unicode/UCD.pm - * 764f420cedfc8b43d9fec251c957a5d55fc45d40f6573f162990ed1dce7e36e0 lib/unicore/ArabicShaping.txt - * b8f32554c6f658821fb0ee742d21c5b1f2086b9bf13071fed04894b022f93d67 lib/unicore/BidiBrackets.txt - * d7afdadd1bbd66f5a663ac0e8f7958f18fd9491fc0bc59ec5877cb82db71db7d lib/unicore/BidiMirroring.txt - * f3907b395d410f1b97342292ca6bc83dd12eb4b205f2a0c48efdef99e517d7b0 lib/unicore/Blocks.txt - * 6f1f9c588eb4a5c718d9e8f93b782685e5c7fec872cf05e8e6878053599e09bb lib/unicore/CaseFolding.txt - * 89e83cf9cc8bef6c1f8bf77e42cf6f0341dfa42e66261f4dbe9b492e7a23c8ee lib/unicore/CompositionExclusions.txt - * 60caa81b99a4dfb0bc5d38440d323073e3f356f46f9ca7869da848cd0715408b lib/unicore/DAge.txt - * 39d35161f2954497f69e08bdb9e701493f476a3d30222de20028feda36c1dabd lib/unicore/DCoreProperties.txt - * 4d4c03892dea9146d674b686e495df2d55a28d071ac474041d73518f887abddc lib/unicore/DNormalizationProps.txt - * 43adc76c0686a42cb370764eb8cfe2b2a45b10b855e5572a2db4a0eecce15d5b lib/unicore/EastAsianWidth.txt - * 628929adae97427348337003e39d29da7b55acdddfac21e06d3dacad92237834 lib/unicore/EquivalentUnifiedIdeograph.txt - * 329612f2aea8672379d93202ca6fcd948b4f08062d4fc43ee31c7061c66ed279 lib/unicore/HangulSyllableType.txt - * c6108ca140e054b55a5b0378e7ebed8b1ef0e846251f6195361bc9af8ffc61b1 lib/unicore/IdStatus.txt - * c7e57f71176fb3035e0c85e4d9f30b08374588b2bd16e729efbc7e49c7c9438f lib/unicore/IdType.txt - * cbb9e2193e26c9b3d595a8f0ff4fd2ad956482309143ceb4ce5469c19f14feba lib/unicore/IndicPositionalCategory.txt - * 615f1b92ba7ec76e18c5b5c05d2e1836e4b98bc791eb9e27946c7621fc047ae7 lib/unicore/IndicSyllabicCategory.txt - * e0f42a73ec3bf9fa4bc404ea0a2921675c73742905dacbe439675fe8c9b2359f lib/unicore/Jamo.txt - * e97e4259d0d20fab150b9c7b4b28abfae5cd78ca97e7f4ac6ed20d685d5f4a7c lib/unicore/LineBreak.txt - * 9953f0fcebf5ea8091c5c581e4df0e43f20d2533c84ccca7987a9bb819a896a8 lib/unicore/NameAliases.txt - * 4ff660cb922480cd5aab9a689b1a6905d0a54575baf9967d0f1e00ac866f04dd lib/unicore/NamedSequences.txt - * d811971453e7075e1ad56fb1b301eece5aa80757b81f6156e74a1bfb3ae5ceb1 lib/unicore/NormTest.txt - * 53d614508e2a0b2305a8aa21cd60d993de9326cdf65993660dfcce4503548583 lib/unicore/PropList.txt - * 440fd3e5460b9bfe31da67b6f923992e1989d31fe2ed91e091c4b8f8e2620bf9 lib/unicore/PropValueAliases.txt - * 33a9f2266ad6b8e8de05c0ea3dfac411ac62cf8839ff1c94057471e4c5f6a2b3 lib/unicore/PropertyAliases.txt - * 049117ce26b9769fe2749b06eef51a50a89faef4a97764dd2d81daa715980700 lib/unicore/ScriptExtensions.txt - * 9e88f0a677df47311106340be8ede2ecdacd9c1c931831218d2be6d5508e0039 lib/unicore/Scripts.txt - * 8d5de354eef79f2395a54c9c7dcebbaf3d30fc962d0f85611ea97aa973a0c451 lib/unicore/SpecialCasing.txt - * ff58e5823bd095166564a006e47d111130813dcf8bf234ef79fa51a870edb48f lib/unicore/UnicodeData.txt - * b71d2d4b57b4f751a40658e9ddb1ddc8aa0a9220bf37890d9a825e30e0612ddc lib/unicore/Unikemet.txt - * 24ac1474554eb55c85ace5c16d551535a8c52cdc2f4c13cf68c3839214339bbe lib/unicore/VerticalOrientation.txt - * ee2b9354d270ac061b29f09662cafea06341d77e704b8cc6bd72aaeeda363cb5 lib/unicore/auxiliary/GCBTest.txt - * c29360bd6f7132811d701d29069541e827eb44bfc4c8fbde8c370d6982689dc1 lib/unicore/auxiliary/GraphemeBreakProperty.txt - * 910759a611a479f37df4f535d2e64d7589be3c5ac5f7491cf1fb4fa4cdb211e9 lib/unicore/auxiliary/LBTest.txt - * 0aef84034ee1789eb71021454fac384e83080b05922272d63cf297f4bf08150e lib/unicore/auxiliary/SBTest.txt - * 20aab5eca3842c7a27cc6756d74488a4a5f744c8dca2948ec1128f26a60d1f79 lib/unicore/auxiliary/SentenceBreakProperty.txt - * ad985d5721f3fa6b45495663dfe44180f2f68976100dee0ea7451ef1a8f838e8 lib/unicore/auxiliary/WBTest.txt - * 476464e71a4b7b779b8ba7c5671f4338fea77da8e6b6b05fb82b3fdd14603779 lib/unicore/auxiliary/WordBreakProperty.txt - * f1365a5173eee18e1f98b240cdc492e84a25f1ce7e0c9d1094eb29c41a22696a lib/unicore/emoji/emoji.txt - * 71ed943a49c58568d8d92e80ecc2ba2f06e62aee9c8ebb0e6e8bd2c3ed8b180e lib/unicore/extracted/DBidiClass.txt - * 1ed4d4791c0e34fcad4dfcb5dd4c4122e16428241b75452f05d780ffa661f89d lib/unicore/extracted/DBinaryProperties.txt - * 52064d588c98c623b2373905e6a449eb520f900113954bcd212e94ef0810b471 lib/unicore/extracted/DCombiningClass.txt - * 29f8bff31296bab424e8d728e2a3c0a3240c5a67dadf47fa7092ec0585ad91b6 lib/unicore/extracted/DDecompositionType.txt - * 372e34de237e5a644ce8379a0d02b91a1f584f04d4fb240ea6ccc87c5767f926 lib/unicore/extracted/DEastAsianWidth.txt - * 7676ab755a41ef82108460238569e60ad65c191ddafe61b36c6765ec1353f293 lib/unicore/extracted/DGeneralCategory.txt - * ab2c98db3f945f14f7fe8ab1c80e5c77734cecfd1f34a443ffa283c51fd4c9d7 lib/unicore/extracted/DJoinGroup.txt - * 6bd08b97da66b70ccfdab105a352de2984e02625239ec5695422c99b33d854f0 lib/unicore/extracted/DJoinType.txt - * 4be1c18e7b121d951018065b453bb05083f624c8f905ce8be7c0f354c9097c95 lib/unicore/extracted/DLineBreak.txt - * 786833e0a3f5ec0c0cd0940e4c15f730f3a92163f354ecd7dede28a70c0fa892 lib/unicore/extracted/DNumType.txt - * 00b43cc5c9b86a834f82389c4537f103e652821387daa556f0bd220f6c23007e lib/unicore/extracted/DNumValues.txt - * 308c29a8d4df1761b0ea5a6a93fbe8649a80b7863d2848be6dc2d65238348e13 lib/unicore/mktables - * 63f771c327e92574fbd77919586079c38f669058a5e6b67ccec385ef8fcde882 lib/unicore/version + * 198105a1b3637a4bc7240628bae2f65f6d0c31df2cee4f0242c2561421ea2e75 lib/Unicode/UCD.pm + * 39afa01e680e27d0fd10b67a9b27be13fbaa3d0efecfb5be45991de9a0d267d0 lib/unicore/ArabicShaping.txt + * dadbaf38a0d0246e5b805bf8725cb81b7c621f93d030595635f5ba2c2f179428 lib/unicore/BidiBrackets.txt + * a2f16fb873ab4fcdf3221cb1a8a85a134ddd6ed03603181823ff5206af3741ce lib/unicore/BidiMirroring.txt + * c0edefaf1a19771e830a82735472716af6bf3c3975f6c2a23ffbe2580fbbcb15 lib/unicore/Blocks.txt + * ff8d8fefbf123574205085d6714c36149eb946d717a0c585c27f0f4ef58c4183 lib/unicore/CaseFolding.txt + * 5e6e9c8f8e76561da04cb1703a9306c63707be2ed8ff2eb12cd3a942368a6f72 lib/unicore/CompositionExclusions.txt + * f8ecdf768bdc210f201abd271d9bc587825618a86a7046a8146cc816393f1998 lib/unicore/DAge.txt + * 24c7fed1195c482faaefd5c1e7eb821c5ee1fb6de07ecdbaa64b56a99da22c08 lib/unicore/DCoreProperties.txt + * 71fd6a206a2c0cdd41feb6b7f656aa31091db45e9cedc926985d718397f9e488 lib/unicore/DNormalizationProps.txt + * ea7ce50f3444a050333448dffef1cadd9325af55cbb764b4a2280faf52170a33 lib/unicore/EastAsianWidth.txt + * 38619c05a17e771554000fe604afee92e10eb49e0616ecf0c87af3c1eb0f4320 lib/unicore/EquivalentUnifiedIdeograph.txt + * 5a57450afde0d082bc5026f7458649eac3b615490cc7e3d916b0367f1593c0e3 lib/unicore/HangulSyllableType.txt + * 617228a16da13850bf8af28b6cd08f5e9b6595d2eb60404fe6eee2c85b4e4a35 lib/unicore/IdStatus.txt + * 924ac63faa97ed73420d6ac48d08279d90968c7da0502ab701e08bfbb9683c22 lib/unicore/IdType.txt + * 68cedc29a7e57f984d90fe2c7712f2e6d0c717e253db219607daea8997d6c480 lib/unicore/IndicPositionalCategory.txt + * 3fc122f4cf58b0c19268d5f810263b04ab4e1e67743386ec0e0ada9c76aec5be lib/unicore/IndicSyllabicCategory.txt + * 17bb07f5e37f995351ddcef393c04464a9e3891ed0c0bd56a03a5c5e400a6326 lib/unicore/Jamo.txt + * e6a18fa91f8f6a6f8e534b1d3f128c21ada45bfe152eb6b1bcc5e15fd8ac92e6 lib/unicore/LineBreak.txt + * 793f6f1e4d15fd90f05ae66460191dc4d75d1fea90136a25f30dd6a4cb950eac lib/unicore/NameAliases.txt + * 360dac27d5abafdcd8c03a8597f47acf92e8ebf7f6ee28020c173ed8b2ed0cc5 lib/unicore/NamedSequences.txt + * 5019ffd530751a741900c849c0e010332f142a3612234639bd200b82138a87db lib/unicore/NormTest.txt + * 130dcddcaadaf071008bdfce1e7743e04fdfbc910886f017d9f9ac931d8c64dd lib/unicore/PropList.txt + * 670d2bebb48649c04fabfbf033308073dcff47946324a8033237254c048b3b01 lib/unicore/PropValueAliases.txt + * 4441f573caf952ffece1d7c892e7715bd7136dfc26f96eb6f268bf1e474715fb lib/unicore/PropertyAliases.txt + * ec2107e58825a1586acee8e0911ce18260394ac8b87e535ca325f1ccbeb06bc6 lib/unicore/ScriptExtensions.txt + * 9f5e50d3abaee7d6ce09480f325c706f485ae3240912527e651954d2d6b035bf lib/unicore/Scripts.txt + * efc25faf19de21b92c1194c111c932e03d2a5eaf18194e33f1156e96de4c9588 lib/unicore/SpecialCasing.txt + * 2e1efc1dcb59c575eedf5ccae60f95229f706ee6d031835247d843c11d96470c lib/unicore/UnicodeData.txt + * 76a3081265e6eb673873f9c93d6f36062e82c7ed027c5c1a592accfbe48c20a5 lib/unicore/Unikemet.txt + * dcef09c3fb24d356b042569c328ec341efc5b53447700d799f2fb4834c3cd3cd lib/unicore/VerticalOrientation.txt + * e2d134d2c52919bace503ebb6a551c1855fe1a1faec18478c78fff254a1793ec lib/unicore/auxiliary/GCBTest.txt + * d6b51d1d2ae5c33b451b7ed994b48f1f4dc62b2272a5831e7fd418514a6bae89 lib/unicore/auxiliary/GraphemeBreakProperty.txt + * e69884e0dde6a8724873f885d68c52dc14518abf9ae4ca9e2283b8773db3b752 lib/unicore/auxiliary/LBTest.txt + * 12cb47d028ded0c1cb8a28558f95479cbcd24559c46977015c82f3b50a1cc6e4 lib/unicore/auxiliary/SBTest.txt + * 871c0c985ad95125e25b302414065a10839d068970bceb383ecec138f22a0a18 lib/unicore/auxiliary/SentenceBreakProperty.txt + * 1de23a75f37904abc7d206239ee8d34f8fdf0fb4ab32a7174dfbabbde25419b2 lib/unicore/auxiliary/WBTest.txt + * 72274cac1e6b919507db35655c3e175aa27274668a1ece95c28d2069f2ad9852 lib/unicore/auxiliary/WordBreakProperty.txt + * 2cb2bb9455cda83e8481541ecf5b6dfda66a3bb89efa3fa7c5297eccf607b72b lib/unicore/emoji/emoji.txt + * 4867b4b7f0731ed1bfcd34cc6251211ff1542541fce0734b6fbda139ee80b3a4 lib/unicore/extracted/DBidiClass.txt + * 13dd09d35a9377e33eb388a01e6581d4bfec6b2685316078c341982fa444071a lib/unicore/extracted/DBinaryProperties.txt + * 191463abfbd202703c6fd6776a92a23ac44ec65e0476a7f95aa91ca492cef29b lib/unicore/extracted/DCombiningClass.txt + * f44e5ceaf40edc1fe06ea0404e8bebc7d356dcc38aac076543b6874008a06e3e lib/unicore/extracted/DDecompositionType.txt + * 0b5523a2217cb318d20b329a05d31eec5af5686ba09d263b85bb75a28989a3a8 lib/unicore/extracted/DEastAsianWidth.txt + * d62e5bab70ca74f099343f71224fa051cb1fdd61a1ab45c0488c44cfc0b6102e lib/unicore/extracted/DGeneralCategory.txt + * bb67e0c00b88acfa5be633967b66b23326844a86e49c6fde7b57960d3af66cae lib/unicore/extracted/DJoinGroup.txt + * f39ebe974825d6736aee15582250307aa532b2cfab3caf3f86bd23fddc9c5c4d lib/unicore/extracted/DJoinType.txt + * dad3ef492d198d6f1dde4922b175f7371a27dfe62fce489f3e04807015a4c682 lib/unicore/extracted/DLineBreak.txt + * 7c83684d3336b698381745b78a971c3e1242cb3fcac58604469086c19b6edcee lib/unicore/extracted/DNumType.txt + * 139b976bdc288be01c80f018523da769cf2845109b5a7f0f8a432db64bfedcfa lib/unicore/extracted/DNumValues.txt + * e3ac360c03d18779fea6d6497fbbe53798135da55e3764d3c9f90a79bbf7e8b5 lib/unicore/mktables + * 8c30575264b2772c7a69c5bb6069a28f0e0a7a0df735871bde2d99ee674316ac lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl - * c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl - * 6f140fe16685fe5d0e81e2984af81342aff5eaba309991002eaca94d032b2ecc regen/mk_invlists.pl + * c4f76f4ba54f533e6b3c6197d2733a4f83f7bbf3c01e6d83b8950e291a3fe36a regen/mk_PL_charclass.pl + * 20a6e3d507a66f4594586485568134873485b08e23383f3dc4e6b3047569267b regen/mk_invlists.pl * ex: set ro ft=c: */ Index: gnu/usr.bin/perl/reginline.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/reginline.h,v diff -u -p -a -u -p -r1.1.1.2 reginline.h --- gnu/usr.bin/perl/reginline.h 26 Dec 2025 22:12:27 -0000 1.1.1.2 +++ gnu/usr.bin/perl/reginline.h 16 Nov 2026 00:57:39 -0000 @@ -8,10 +8,12 @@ PERL_STATIC_INLINE regnode * Perl_regnext(pTHX_ const regnode *p) { + PERL_ARGS_ASSERT_REGNEXT; + I32 offset; if (!p) - return(NULL); + return NULL; if (OP(p) > REGNODE_MAX) { /* regnode.type is unsigned */ croak("Corrupted regexp opcode %d > %d", @@ -20,7 +22,7 @@ Perl_regnext(pTHX_ const regnode *p) offset = (REGNODE_OFF_BY_ARG(OP(p)) ? ARG1u(p) : NEXT_OFF(p)); if (offset == 0) - return(NULL); + return NULL; return(regnode *)(p+offset); } @@ -34,6 +36,8 @@ PERL_STATIC_INLINE regnode * Perl_regnode_after(pTHX_ const regnode *p, const bool varies) { + PERL_ARGS_ASSERT_REGNODE_AFTER; + assert(p); const U8 op = OP(p); assert(op < REGNODE_MAX); @@ -49,6 +53,8 @@ PERL_STATIC_INLINE bool Perl_check_regnode_after(pTHX_ const regnode *p, const STRLEN extra) { + PERL_ARGS_ASSERT_CHECK_REGNODE_AFTER; + const regnode *nextoper = regnode_after((regnode *)p,FALSE); const regnode *other = REGNODE_AFTER_PLUS(p, extra); if (nextoper != other) { Index: gnu/usr.bin/perl/regnodes.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/regnodes.h,v diff -u -p -a -u -p -r1.8 regnodes.h --- gnu/usr.bin/perl/regnodes.h 26 Dec 2025 22:14:13 -0000 1.8 +++ gnu/usr.bin/perl/regnodes.h 16 Nov 2026 00:57:39 -0000 @@ -128,7 +128,7 @@ typedef struct regnode /* Regops and State definitions */ #define REGNODE_MAX 111 -#define REGMATCH_STATE_MAX 153 +#define REGMATCH_STATE_MAX 155 /* -- For regexec.c to switch on target being utf8 (t8) or not (tb, b='byte'); */ #define with_t_UTF8ness(op, t_utf8) (((op) << 1) + (cBOOL(t_utf8))) @@ -1285,317 +1285,330 @@ typedef struct regnode #define EVAL_B_fail_t8_pb 462 /* 0x1ce */ #define EVAL_B_fail_t8_p8 463 /* 0x1cf */ -#define EVAL_postponed_AB 116 /* 0x74 state for EVAL */ -#define EVAL_postponed_AB_tb 232 /* 0x0e8 */ -#define EVAL_postponed_AB_t8 233 /* 0x0e9 */ -#define EVAL_postponed_AB_tb_pb 464 /* 0x1d0 */ -#define EVAL_postponed_AB_tb_p8 465 /* 0x1d1 */ -#define EVAL_postponed_AB_t8_pb 466 /* 0x1d2 */ -#define EVAL_postponed_AB_t8_p8 467 /* 0x1d3 */ - -#define EVAL_postponed_AB_fail 117 /* 0x75 state for EVAL */ -#define EVAL_postponed_AB_fail_tb 234 /* 0x0ea */ -#define EVAL_postponed_AB_fail_t8 235 /* 0x0eb */ -#define EVAL_postponed_AB_fail_tb_pb 468 /* 0x1d4 */ -#define EVAL_postponed_AB_fail_tb_p8 469 /* 0x1d5 */ -#define EVAL_postponed_AB_fail_t8_pb 470 /* 0x1d6 */ -#define EVAL_postponed_AB_fail_t8_p8 471 /* 0x1d7 */ - -#define CURLYX_end 118 /* 0x76 state for CURLYX */ -#define CURLYX_end_tb 236 /* 0x0ec */ -#define CURLYX_end_t8 237 /* 0x0ed */ -#define CURLYX_end_tb_pb 472 /* 0x1d8 */ -#define CURLYX_end_tb_p8 473 /* 0x1d9 */ -#define CURLYX_end_t8_pb 474 /* 0x1da */ -#define CURLYX_end_t8_p8 475 /* 0x1db */ - -#define CURLYX_end_fail 119 /* 0x77 state for CURLYX */ -#define CURLYX_end_fail_tb 238 /* 0x0ee */ -#define CURLYX_end_fail_t8 239 /* 0x0ef */ -#define CURLYX_end_fail_tb_pb 476 /* 0x1dc */ -#define CURLYX_end_fail_tb_p8 477 /* 0x1dd */ -#define CURLYX_end_fail_t8_pb 478 /* 0x1de */ -#define CURLYX_end_fail_t8_p8 479 /* 0x1df */ - -#define WHILEM_A_pre 120 /* 0x78 state for WHILEM */ -#define WHILEM_A_pre_tb 240 /* 0x0f0 */ -#define WHILEM_A_pre_t8 241 /* 0x0f1 */ -#define WHILEM_A_pre_tb_pb 480 /* 0x1e0 */ -#define WHILEM_A_pre_tb_p8 481 /* 0x1e1 */ -#define WHILEM_A_pre_t8_pb 482 /* 0x1e2 */ -#define WHILEM_A_pre_t8_p8 483 /* 0x1e3 */ - -#define WHILEM_A_pre_fail 121 /* 0x79 state for WHILEM */ -#define WHILEM_A_pre_fail_tb 242 /* 0x0f2 */ -#define WHILEM_A_pre_fail_t8 243 /* 0x0f3 */ -#define WHILEM_A_pre_fail_tb_pb 484 /* 0x1e4 */ -#define WHILEM_A_pre_fail_tb_p8 485 /* 0x1e5 */ -#define WHILEM_A_pre_fail_t8_pb 486 /* 0x1e6 */ -#define WHILEM_A_pre_fail_t8_p8 487 /* 0x1e7 */ - -#define WHILEM_A_min 122 /* 0x7a state for WHILEM */ -#define WHILEM_A_min_tb 244 /* 0x0f4 */ -#define WHILEM_A_min_t8 245 /* 0x0f5 */ -#define WHILEM_A_min_tb_pb 488 /* 0x1e8 */ -#define WHILEM_A_min_tb_p8 489 /* 0x1e9 */ -#define WHILEM_A_min_t8_pb 490 /* 0x1ea */ -#define WHILEM_A_min_t8_p8 491 /* 0x1eb */ - -#define WHILEM_A_min_fail 123 /* 0x7b state for WHILEM */ -#define WHILEM_A_min_fail_tb 246 /* 0x0f6 */ -#define WHILEM_A_min_fail_t8 247 /* 0x0f7 */ -#define WHILEM_A_min_fail_tb_pb 492 /* 0x1ec */ -#define WHILEM_A_min_fail_tb_p8 493 /* 0x1ed */ -#define WHILEM_A_min_fail_t8_pb 494 /* 0x1ee */ -#define WHILEM_A_min_fail_t8_p8 495 /* 0x1ef */ - -#define WHILEM_A_max 124 /* 0x7c state for WHILEM */ -#define WHILEM_A_max_tb 248 /* 0x0f8 */ -#define WHILEM_A_max_t8 249 /* 0x0f9 */ -#define WHILEM_A_max_tb_pb 496 /* 0x1f0 */ -#define WHILEM_A_max_tb_p8 497 /* 0x1f1 */ -#define WHILEM_A_max_t8_pb 498 /* 0x1f2 */ -#define WHILEM_A_max_t8_p8 499 /* 0x1f3 */ - -#define WHILEM_A_max_fail 125 /* 0x7d state for WHILEM */ -#define WHILEM_A_max_fail_tb 250 /* 0x0fa */ -#define WHILEM_A_max_fail_t8 251 /* 0x0fb */ -#define WHILEM_A_max_fail_tb_pb 500 /* 0x1f4 */ -#define WHILEM_A_max_fail_tb_p8 501 /* 0x1f5 */ -#define WHILEM_A_max_fail_t8_pb 502 /* 0x1f6 */ -#define WHILEM_A_max_fail_t8_p8 503 /* 0x1f7 */ - -#define WHILEM_B_min 126 /* 0x7e state for WHILEM */ -#define WHILEM_B_min_tb 252 /* 0x0fc */ -#define WHILEM_B_min_t8 253 /* 0x0fd */ -#define WHILEM_B_min_tb_pb 504 /* 0x1f8 */ -#define WHILEM_B_min_tb_p8 505 /* 0x1f9 */ -#define WHILEM_B_min_t8_pb 506 /* 0x1fa */ -#define WHILEM_B_min_t8_p8 507 /* 0x1fb */ - -#define WHILEM_B_min_fail 127 /* 0x7f state for WHILEM */ -#define WHILEM_B_min_fail_tb 254 /* 0x0fe */ -#define WHILEM_B_min_fail_t8 255 /* 0x0ff */ -#define WHILEM_B_min_fail_tb_pb 508 /* 0x1fc */ -#define WHILEM_B_min_fail_tb_p8 509 /* 0x1fd */ -#define WHILEM_B_min_fail_t8_pb 510 /* 0x1fe */ -#define WHILEM_B_min_fail_t8_p8 511 /* 0x1ff */ - -#define WHILEM_B_max 128 /* 0x80 state for WHILEM */ -#define WHILEM_B_max_tb 256 /* 0x100 */ -#define WHILEM_B_max_t8 257 /* 0x101 */ -#define WHILEM_B_max_tb_pb 512 /* 0x200 */ -#define WHILEM_B_max_tb_p8 513 /* 0x201 */ -#define WHILEM_B_max_t8_pb 514 /* 0x202 */ -#define WHILEM_B_max_t8_p8 515 /* 0x203 */ - -#define WHILEM_B_max_fail 129 /* 0x81 state for WHILEM */ -#define WHILEM_B_max_fail_tb 258 /* 0x102 */ -#define WHILEM_B_max_fail_t8 259 /* 0x103 */ -#define WHILEM_B_max_fail_tb_pb 516 /* 0x204 */ -#define WHILEM_B_max_fail_tb_p8 517 /* 0x205 */ -#define WHILEM_B_max_fail_t8_pb 518 /* 0x206 */ -#define WHILEM_B_max_fail_t8_p8 519 /* 0x207 */ - -#define BRANCH_next 130 /* 0x82 state for BRANCH */ -#define BRANCH_next_tb 260 /* 0x104 */ -#define BRANCH_next_t8 261 /* 0x105 */ -#define BRANCH_next_tb_pb 520 /* 0x208 */ -#define BRANCH_next_tb_p8 521 /* 0x209 */ -#define BRANCH_next_t8_pb 522 /* 0x20a */ -#define BRANCH_next_t8_p8 523 /* 0x20b */ - -#define BRANCH_next_fail 131 /* 0x83 state for BRANCH */ -#define BRANCH_next_fail_tb 262 /* 0x106 */ -#define BRANCH_next_fail_t8 263 /* 0x107 */ -#define BRANCH_next_fail_tb_pb 524 /* 0x20c */ -#define BRANCH_next_fail_tb_p8 525 /* 0x20d */ -#define BRANCH_next_fail_t8_pb 526 /* 0x20e */ -#define BRANCH_next_fail_t8_p8 527 /* 0x20f */ - -#define CURLYM_A 132 /* 0x84 state for CURLYM */ -#define CURLYM_A_tb 264 /* 0x108 */ -#define CURLYM_A_t8 265 /* 0x109 */ -#define CURLYM_A_tb_pb 528 /* 0x210 */ -#define CURLYM_A_tb_p8 529 /* 0x211 */ -#define CURLYM_A_t8_pb 530 /* 0x212 */ -#define CURLYM_A_t8_p8 531 /* 0x213 */ - -#define CURLYM_A_fail 133 /* 0x85 state for CURLYM */ -#define CURLYM_A_fail_tb 266 /* 0x10a */ -#define CURLYM_A_fail_t8 267 /* 0x10b */ -#define CURLYM_A_fail_tb_pb 532 /* 0x214 */ -#define CURLYM_A_fail_tb_p8 533 /* 0x215 */ -#define CURLYM_A_fail_t8_pb 534 /* 0x216 */ -#define CURLYM_A_fail_t8_p8 535 /* 0x217 */ - -#define CURLYM_B 134 /* 0x86 state for CURLYM */ -#define CURLYM_B_tb 268 /* 0x10c */ -#define CURLYM_B_t8 269 /* 0x10d */ -#define CURLYM_B_tb_pb 536 /* 0x218 */ -#define CURLYM_B_tb_p8 537 /* 0x219 */ -#define CURLYM_B_t8_pb 538 /* 0x21a */ -#define CURLYM_B_t8_p8 539 /* 0x21b */ - -#define CURLYM_B_fail 135 /* 0x87 state for CURLYM */ -#define CURLYM_B_fail_tb 270 /* 0x10e */ -#define CURLYM_B_fail_t8 271 /* 0x10f */ -#define CURLYM_B_fail_tb_pb 540 /* 0x21c */ -#define CURLYM_B_fail_tb_p8 541 /* 0x21d */ -#define CURLYM_B_fail_t8_pb 542 /* 0x21e */ -#define CURLYM_B_fail_t8_p8 543 /* 0x21f */ - -#define IFMATCH_A 136 /* 0x88 state for IFMATCH */ -#define IFMATCH_A_tb 272 /* 0x110 */ -#define IFMATCH_A_t8 273 /* 0x111 */ -#define IFMATCH_A_tb_pb 544 /* 0x220 */ -#define IFMATCH_A_tb_p8 545 /* 0x221 */ -#define IFMATCH_A_t8_pb 546 /* 0x222 */ -#define IFMATCH_A_t8_p8 547 /* 0x223 */ - -#define IFMATCH_A_fail 137 /* 0x89 state for IFMATCH */ -#define IFMATCH_A_fail_tb 274 /* 0x112 */ -#define IFMATCH_A_fail_t8 275 /* 0x113 */ -#define IFMATCH_A_fail_tb_pb 548 /* 0x224 */ -#define IFMATCH_A_fail_tb_p8 549 /* 0x225 */ -#define IFMATCH_A_fail_t8_pb 550 /* 0x226 */ -#define IFMATCH_A_fail_t8_p8 551 /* 0x227 */ - -#define CURLY_B_min 138 /* 0x8a state for CURLY */ -#define CURLY_B_min_tb 276 /* 0x114 */ -#define CURLY_B_min_t8 277 /* 0x115 */ -#define CURLY_B_min_tb_pb 552 /* 0x228 */ -#define CURLY_B_min_tb_p8 553 /* 0x229 */ -#define CURLY_B_min_t8_pb 554 /* 0x22a */ -#define CURLY_B_min_t8_p8 555 /* 0x22b */ - -#define CURLY_B_min_fail 139 /* 0x8b state for CURLY */ -#define CURLY_B_min_fail_tb 278 /* 0x116 */ -#define CURLY_B_min_fail_t8 279 /* 0x117 */ -#define CURLY_B_min_fail_tb_pb 556 /* 0x22c */ -#define CURLY_B_min_fail_tb_p8 557 /* 0x22d */ -#define CURLY_B_min_fail_t8_pb 558 /* 0x22e */ -#define CURLY_B_min_fail_t8_p8 559 /* 0x22f */ - -#define CURLY_B_max 140 /* 0x8c state for CURLY */ -#define CURLY_B_max_tb 280 /* 0x118 */ -#define CURLY_B_max_t8 281 /* 0x119 */ -#define CURLY_B_max_tb_pb 560 /* 0x230 */ -#define CURLY_B_max_tb_p8 561 /* 0x231 */ -#define CURLY_B_max_t8_pb 562 /* 0x232 */ -#define CURLY_B_max_t8_p8 563 /* 0x233 */ - -#define CURLY_B_max_fail 141 /* 0x8d state for CURLY */ -#define CURLY_B_max_fail_tb 282 /* 0x11a */ -#define CURLY_B_max_fail_t8 283 /* 0x11b */ -#define CURLY_B_max_fail_tb_pb 564 /* 0x234 */ -#define CURLY_B_max_fail_tb_p8 565 /* 0x235 */ -#define CURLY_B_max_fail_t8_pb 566 /* 0x236 */ -#define CURLY_B_max_fail_t8_p8 567 /* 0x237 */ - -#define COMMIT_next 142 /* 0x8e state for COMMIT */ -#define COMMIT_next_tb 284 /* 0x11c */ -#define COMMIT_next_t8 285 /* 0x11d */ -#define COMMIT_next_tb_pb 568 /* 0x238 */ -#define COMMIT_next_tb_p8 569 /* 0x239 */ -#define COMMIT_next_t8_pb 570 /* 0x23a */ -#define COMMIT_next_t8_p8 571 /* 0x23b */ - -#define COMMIT_next_fail 143 /* 0x8f state for COMMIT */ -#define COMMIT_next_fail_tb 286 /* 0x11e */ -#define COMMIT_next_fail_t8 287 /* 0x11f */ -#define COMMIT_next_fail_tb_pb 572 /* 0x23c */ -#define COMMIT_next_fail_tb_p8 573 /* 0x23d */ -#define COMMIT_next_fail_t8_pb 574 /* 0x23e */ -#define COMMIT_next_fail_t8_p8 575 /* 0x23f */ - -#define MARKPOINT_next 144 /* 0x90 state for MARKPOINT */ -#define MARKPOINT_next_tb 288 /* 0x120 */ -#define MARKPOINT_next_t8 289 /* 0x121 */ -#define MARKPOINT_next_tb_pb 576 /* 0x240 */ -#define MARKPOINT_next_tb_p8 577 /* 0x241 */ -#define MARKPOINT_next_t8_pb 578 /* 0x242 */ -#define MARKPOINT_next_t8_p8 579 /* 0x243 */ - -#define MARKPOINT_next_fail 145 /* 0x91 state for MARKPOINT */ -#define MARKPOINT_next_fail_tb 290 /* 0x122 */ -#define MARKPOINT_next_fail_t8 291 /* 0x123 */ -#define MARKPOINT_next_fail_tb_pb 580 /* 0x244 */ -#define MARKPOINT_next_fail_tb_p8 581 /* 0x245 */ -#define MARKPOINT_next_fail_t8_pb 582 /* 0x246 */ -#define MARKPOINT_next_fail_t8_p8 583 /* 0x247 */ - -#define SKIP_next 146 /* 0x92 state for SKIP */ -#define SKIP_next_tb 292 /* 0x124 */ -#define SKIP_next_t8 293 /* 0x125 */ -#define SKIP_next_tb_pb 584 /* 0x248 */ -#define SKIP_next_tb_p8 585 /* 0x249 */ -#define SKIP_next_t8_pb 586 /* 0x24a */ -#define SKIP_next_t8_p8 587 /* 0x24b */ - -#define SKIP_next_fail 147 /* 0x93 state for SKIP */ -#define SKIP_next_fail_tb 294 /* 0x126 */ -#define SKIP_next_fail_t8 295 /* 0x127 */ -#define SKIP_next_fail_tb_pb 588 /* 0x24c */ -#define SKIP_next_fail_tb_p8 589 /* 0x24d */ -#define SKIP_next_fail_t8_pb 590 /* 0x24e */ -#define SKIP_next_fail_t8_p8 591 /* 0x24f */ - -#define CUTGROUP_next 148 /* 0x94 state for CUTGROUP */ -#define CUTGROUP_next_tb 296 /* 0x128 */ -#define CUTGROUP_next_t8 297 /* 0x129 */ -#define CUTGROUP_next_tb_pb 592 /* 0x250 */ -#define CUTGROUP_next_tb_p8 593 /* 0x251 */ -#define CUTGROUP_next_t8_pb 594 /* 0x252 */ -#define CUTGROUP_next_t8_p8 595 /* 0x253 */ - -#define CUTGROUP_next_fail 149 /* 0x95 state for CUTGROUP */ -#define CUTGROUP_next_fail_tb 298 /* 0x12a */ -#define CUTGROUP_next_fail_t8 299 /* 0x12b */ -#define CUTGROUP_next_fail_tb_pb 596 /* 0x254 */ -#define CUTGROUP_next_fail_tb_p8 597 /* 0x255 */ -#define CUTGROUP_next_fail_t8_pb 598 /* 0x256 */ -#define CUTGROUP_next_fail_t8_p8 599 /* 0x257 */ - -#define KEEPS_next 150 /* 0x96 state for KEEPS */ -#define KEEPS_next_tb 300 /* 0x12c */ -#define KEEPS_next_t8 301 /* 0x12d */ -#define KEEPS_next_tb_pb 600 /* 0x258 */ -#define KEEPS_next_tb_p8 601 /* 0x259 */ -#define KEEPS_next_t8_pb 602 /* 0x25a */ -#define KEEPS_next_t8_p8 603 /* 0x25b */ - -#define KEEPS_next_fail 151 /* 0x97 state for KEEPS */ -#define KEEPS_next_fail_tb 302 /* 0x12e */ -#define KEEPS_next_fail_t8 303 /* 0x12f */ -#define KEEPS_next_fail_tb_pb 604 /* 0x25c */ -#define KEEPS_next_fail_tb_p8 605 /* 0x25d */ -#define KEEPS_next_fail_t8_pb 606 /* 0x25e */ -#define KEEPS_next_fail_t8_p8 607 /* 0x25f */ - -#define REF_next 152 /* 0x98 state for REF */ -#define REF_next_tb 304 /* 0x130 */ -#define REF_next_t8 305 /* 0x131 */ -#define REF_next_tb_pb 608 /* 0x260 */ -#define REF_next_tb_p8 609 /* 0x261 */ -#define REF_next_t8_pb 610 /* 0x262 */ -#define REF_next_t8_p8 611 /* 0x263 */ - -#define REF_next_fail 153 /* 0x99 state for REF */ -#define REF_next_fail_tb 306 /* 0x132 */ -#define REF_next_fail_t8 307 /* 0x133 */ -#define REF_next_fail_tb_pb 612 /* 0x264 */ -#define REF_next_fail_tb_p8 613 /* 0x265 */ -#define REF_next_fail_t8_pb 614 /* 0x266 */ -#define REF_next_fail_t8_p8 615 /* 0x267 */ +#define EVAL_postponed_A 116 /* 0x74 state for EVAL */ +#define EVAL_postponed_A_tb 232 /* 0x0e8 */ +#define EVAL_postponed_A_t8 233 /* 0x0e9 */ +#define EVAL_postponed_A_tb_pb 464 /* 0x1d0 */ +#define EVAL_postponed_A_tb_p8 465 /* 0x1d1 */ +#define EVAL_postponed_A_t8_pb 466 /* 0x1d2 */ +#define EVAL_postponed_A_t8_p8 467 /* 0x1d3 */ + +#define EVAL_postponed_A_fail 117 /* 0x75 state for EVAL */ +#define EVAL_postponed_A_fail_tb 234 /* 0x0ea */ +#define EVAL_postponed_A_fail_t8 235 /* 0x0eb */ +#define EVAL_postponed_A_fail_tb_pb 468 /* 0x1d4 */ +#define EVAL_postponed_A_fail_tb_p8 469 /* 0x1d5 */ +#define EVAL_postponed_A_fail_t8_pb 470 /* 0x1d6 */ +#define EVAL_postponed_A_fail_t8_p8 471 /* 0x1d7 */ + +#define EVAL_postponed_B 118 /* 0x76 state for EVAL */ +#define EVAL_postponed_B_tb 236 /* 0x0ec */ +#define EVAL_postponed_B_t8 237 /* 0x0ed */ +#define EVAL_postponed_B_tb_pb 472 /* 0x1d8 */ +#define EVAL_postponed_B_tb_p8 473 /* 0x1d9 */ +#define EVAL_postponed_B_t8_pb 474 /* 0x1da */ +#define EVAL_postponed_B_t8_p8 475 /* 0x1db */ + +#define EVAL_postponed_B_fail 119 /* 0x77 state for EVAL */ +#define EVAL_postponed_B_fail_tb 238 /* 0x0ee */ +#define EVAL_postponed_B_fail_t8 239 /* 0x0ef */ +#define EVAL_postponed_B_fail_tb_pb 476 /* 0x1dc */ +#define EVAL_postponed_B_fail_tb_p8 477 /* 0x1dd */ +#define EVAL_postponed_B_fail_t8_pb 478 /* 0x1de */ +#define EVAL_postponed_B_fail_t8_p8 479 /* 0x1df */ + +#define CURLYX_end 120 /* 0x78 state for CURLYX */ +#define CURLYX_end_tb 240 /* 0x0f0 */ +#define CURLYX_end_t8 241 /* 0x0f1 */ +#define CURLYX_end_tb_pb 480 /* 0x1e0 */ +#define CURLYX_end_tb_p8 481 /* 0x1e1 */ +#define CURLYX_end_t8_pb 482 /* 0x1e2 */ +#define CURLYX_end_t8_p8 483 /* 0x1e3 */ + +#define CURLYX_end_fail 121 /* 0x79 state for CURLYX */ +#define CURLYX_end_fail_tb 242 /* 0x0f2 */ +#define CURLYX_end_fail_t8 243 /* 0x0f3 */ +#define CURLYX_end_fail_tb_pb 484 /* 0x1e4 */ +#define CURLYX_end_fail_tb_p8 485 /* 0x1e5 */ +#define CURLYX_end_fail_t8_pb 486 /* 0x1e6 */ +#define CURLYX_end_fail_t8_p8 487 /* 0x1e7 */ + +#define WHILEM_A_pre 122 /* 0x7a state for WHILEM */ +#define WHILEM_A_pre_tb 244 /* 0x0f4 */ +#define WHILEM_A_pre_t8 245 /* 0x0f5 */ +#define WHILEM_A_pre_tb_pb 488 /* 0x1e8 */ +#define WHILEM_A_pre_tb_p8 489 /* 0x1e9 */ +#define WHILEM_A_pre_t8_pb 490 /* 0x1ea */ +#define WHILEM_A_pre_t8_p8 491 /* 0x1eb */ + +#define WHILEM_A_pre_fail 123 /* 0x7b state for WHILEM */ +#define WHILEM_A_pre_fail_tb 246 /* 0x0f6 */ +#define WHILEM_A_pre_fail_t8 247 /* 0x0f7 */ +#define WHILEM_A_pre_fail_tb_pb 492 /* 0x1ec */ +#define WHILEM_A_pre_fail_tb_p8 493 /* 0x1ed */ +#define WHILEM_A_pre_fail_t8_pb 494 /* 0x1ee */ +#define WHILEM_A_pre_fail_t8_p8 495 /* 0x1ef */ + +#define WHILEM_A_min 124 /* 0x7c state for WHILEM */ +#define WHILEM_A_min_tb 248 /* 0x0f8 */ +#define WHILEM_A_min_t8 249 /* 0x0f9 */ +#define WHILEM_A_min_tb_pb 496 /* 0x1f0 */ +#define WHILEM_A_min_tb_p8 497 /* 0x1f1 */ +#define WHILEM_A_min_t8_pb 498 /* 0x1f2 */ +#define WHILEM_A_min_t8_p8 499 /* 0x1f3 */ + +#define WHILEM_A_min_fail 125 /* 0x7d state for WHILEM */ +#define WHILEM_A_min_fail_tb 250 /* 0x0fa */ +#define WHILEM_A_min_fail_t8 251 /* 0x0fb */ +#define WHILEM_A_min_fail_tb_pb 500 /* 0x1f4 */ +#define WHILEM_A_min_fail_tb_p8 501 /* 0x1f5 */ +#define WHILEM_A_min_fail_t8_pb 502 /* 0x1f6 */ +#define WHILEM_A_min_fail_t8_p8 503 /* 0x1f7 */ + +#define WHILEM_A_max 126 /* 0x7e state for WHILEM */ +#define WHILEM_A_max_tb 252 /* 0x0fc */ +#define WHILEM_A_max_t8 253 /* 0x0fd */ +#define WHILEM_A_max_tb_pb 504 /* 0x1f8 */ +#define WHILEM_A_max_tb_p8 505 /* 0x1f9 */ +#define WHILEM_A_max_t8_pb 506 /* 0x1fa */ +#define WHILEM_A_max_t8_p8 507 /* 0x1fb */ + +#define WHILEM_A_max_fail 127 /* 0x7f state for WHILEM */ +#define WHILEM_A_max_fail_tb 254 /* 0x0fe */ +#define WHILEM_A_max_fail_t8 255 /* 0x0ff */ +#define WHILEM_A_max_fail_tb_pb 508 /* 0x1fc */ +#define WHILEM_A_max_fail_tb_p8 509 /* 0x1fd */ +#define WHILEM_A_max_fail_t8_pb 510 /* 0x1fe */ +#define WHILEM_A_max_fail_t8_p8 511 /* 0x1ff */ + +#define WHILEM_B_min 128 /* 0x80 state for WHILEM */ +#define WHILEM_B_min_tb 256 /* 0x100 */ +#define WHILEM_B_min_t8 257 /* 0x101 */ +#define WHILEM_B_min_tb_pb 512 /* 0x200 */ +#define WHILEM_B_min_tb_p8 513 /* 0x201 */ +#define WHILEM_B_min_t8_pb 514 /* 0x202 */ +#define WHILEM_B_min_t8_p8 515 /* 0x203 */ + +#define WHILEM_B_min_fail 129 /* 0x81 state for WHILEM */ +#define WHILEM_B_min_fail_tb 258 /* 0x102 */ +#define WHILEM_B_min_fail_t8 259 /* 0x103 */ +#define WHILEM_B_min_fail_tb_pb 516 /* 0x204 */ +#define WHILEM_B_min_fail_tb_p8 517 /* 0x205 */ +#define WHILEM_B_min_fail_t8_pb 518 /* 0x206 */ +#define WHILEM_B_min_fail_t8_p8 519 /* 0x207 */ + +#define WHILEM_B_max 130 /* 0x82 state for WHILEM */ +#define WHILEM_B_max_tb 260 /* 0x104 */ +#define WHILEM_B_max_t8 261 /* 0x105 */ +#define WHILEM_B_max_tb_pb 520 /* 0x208 */ +#define WHILEM_B_max_tb_p8 521 /* 0x209 */ +#define WHILEM_B_max_t8_pb 522 /* 0x20a */ +#define WHILEM_B_max_t8_p8 523 /* 0x20b */ + +#define WHILEM_B_max_fail 131 /* 0x83 state for WHILEM */ +#define WHILEM_B_max_fail_tb 262 /* 0x106 */ +#define WHILEM_B_max_fail_t8 263 /* 0x107 */ +#define WHILEM_B_max_fail_tb_pb 524 /* 0x20c */ +#define WHILEM_B_max_fail_tb_p8 525 /* 0x20d */ +#define WHILEM_B_max_fail_t8_pb 526 /* 0x20e */ +#define WHILEM_B_max_fail_t8_p8 527 /* 0x20f */ + +#define BRANCH_next 132 /* 0x84 state for BRANCH */ +#define BRANCH_next_tb 264 /* 0x108 */ +#define BRANCH_next_t8 265 /* 0x109 */ +#define BRANCH_next_tb_pb 528 /* 0x210 */ +#define BRANCH_next_tb_p8 529 /* 0x211 */ +#define BRANCH_next_t8_pb 530 /* 0x212 */ +#define BRANCH_next_t8_p8 531 /* 0x213 */ + +#define BRANCH_next_fail 133 /* 0x85 state for BRANCH */ +#define BRANCH_next_fail_tb 266 /* 0x10a */ +#define BRANCH_next_fail_t8 267 /* 0x10b */ +#define BRANCH_next_fail_tb_pb 532 /* 0x214 */ +#define BRANCH_next_fail_tb_p8 533 /* 0x215 */ +#define BRANCH_next_fail_t8_pb 534 /* 0x216 */ +#define BRANCH_next_fail_t8_p8 535 /* 0x217 */ + +#define CURLYM_A 134 /* 0x86 state for CURLYM */ +#define CURLYM_A_tb 268 /* 0x10c */ +#define CURLYM_A_t8 269 /* 0x10d */ +#define CURLYM_A_tb_pb 536 /* 0x218 */ +#define CURLYM_A_tb_p8 537 /* 0x219 */ +#define CURLYM_A_t8_pb 538 /* 0x21a */ +#define CURLYM_A_t8_p8 539 /* 0x21b */ + +#define CURLYM_A_fail 135 /* 0x87 state for CURLYM */ +#define CURLYM_A_fail_tb 270 /* 0x10e */ +#define CURLYM_A_fail_t8 271 /* 0x10f */ +#define CURLYM_A_fail_tb_pb 540 /* 0x21c */ +#define CURLYM_A_fail_tb_p8 541 /* 0x21d */ +#define CURLYM_A_fail_t8_pb 542 /* 0x21e */ +#define CURLYM_A_fail_t8_p8 543 /* 0x21f */ + +#define CURLYM_B 136 /* 0x88 state for CURLYM */ +#define CURLYM_B_tb 272 /* 0x110 */ +#define CURLYM_B_t8 273 /* 0x111 */ +#define CURLYM_B_tb_pb 544 /* 0x220 */ +#define CURLYM_B_tb_p8 545 /* 0x221 */ +#define CURLYM_B_t8_pb 546 /* 0x222 */ +#define CURLYM_B_t8_p8 547 /* 0x223 */ + +#define CURLYM_B_fail 137 /* 0x89 state for CURLYM */ +#define CURLYM_B_fail_tb 274 /* 0x112 */ +#define CURLYM_B_fail_t8 275 /* 0x113 */ +#define CURLYM_B_fail_tb_pb 548 /* 0x224 */ +#define CURLYM_B_fail_tb_p8 549 /* 0x225 */ +#define CURLYM_B_fail_t8_pb 550 /* 0x226 */ +#define CURLYM_B_fail_t8_p8 551 /* 0x227 */ + +#define IFMATCH_A 138 /* 0x8a state for IFMATCH */ +#define IFMATCH_A_tb 276 /* 0x114 */ +#define IFMATCH_A_t8 277 /* 0x115 */ +#define IFMATCH_A_tb_pb 552 /* 0x228 */ +#define IFMATCH_A_tb_p8 553 /* 0x229 */ +#define IFMATCH_A_t8_pb 554 /* 0x22a */ +#define IFMATCH_A_t8_p8 555 /* 0x22b */ + +#define IFMATCH_A_fail 139 /* 0x8b state for IFMATCH */ +#define IFMATCH_A_fail_tb 278 /* 0x116 */ +#define IFMATCH_A_fail_t8 279 /* 0x117 */ +#define IFMATCH_A_fail_tb_pb 556 /* 0x22c */ +#define IFMATCH_A_fail_tb_p8 557 /* 0x22d */ +#define IFMATCH_A_fail_t8_pb 558 /* 0x22e */ +#define IFMATCH_A_fail_t8_p8 559 /* 0x22f */ + +#define CURLY_B_min 140 /* 0x8c state for CURLY */ +#define CURLY_B_min_tb 280 /* 0x118 */ +#define CURLY_B_min_t8 281 /* 0x119 */ +#define CURLY_B_min_tb_pb 560 /* 0x230 */ +#define CURLY_B_min_tb_p8 561 /* 0x231 */ +#define CURLY_B_min_t8_pb 562 /* 0x232 */ +#define CURLY_B_min_t8_p8 563 /* 0x233 */ + +#define CURLY_B_min_fail 141 /* 0x8d state for CURLY */ +#define CURLY_B_min_fail_tb 282 /* 0x11a */ +#define CURLY_B_min_fail_t8 283 /* 0x11b */ +#define CURLY_B_min_fail_tb_pb 564 /* 0x234 */ +#define CURLY_B_min_fail_tb_p8 565 /* 0x235 */ +#define CURLY_B_min_fail_t8_pb 566 /* 0x236 */ +#define CURLY_B_min_fail_t8_p8 567 /* 0x237 */ + +#define CURLY_B_max 142 /* 0x8e state for CURLY */ +#define CURLY_B_max_tb 284 /* 0x11c */ +#define CURLY_B_max_t8 285 /* 0x11d */ +#define CURLY_B_max_tb_pb 568 /* 0x238 */ +#define CURLY_B_max_tb_p8 569 /* 0x239 */ +#define CURLY_B_max_t8_pb 570 /* 0x23a */ +#define CURLY_B_max_t8_p8 571 /* 0x23b */ + +#define CURLY_B_max_fail 143 /* 0x8f state for CURLY */ +#define CURLY_B_max_fail_tb 286 /* 0x11e */ +#define CURLY_B_max_fail_t8 287 /* 0x11f */ +#define CURLY_B_max_fail_tb_pb 572 /* 0x23c */ +#define CURLY_B_max_fail_tb_p8 573 /* 0x23d */ +#define CURLY_B_max_fail_t8_pb 574 /* 0x23e */ +#define CURLY_B_max_fail_t8_p8 575 /* 0x23f */ + +#define COMMIT_next 144 /* 0x90 state for COMMIT */ +#define COMMIT_next_tb 288 /* 0x120 */ +#define COMMIT_next_t8 289 /* 0x121 */ +#define COMMIT_next_tb_pb 576 /* 0x240 */ +#define COMMIT_next_tb_p8 577 /* 0x241 */ +#define COMMIT_next_t8_pb 578 /* 0x242 */ +#define COMMIT_next_t8_p8 579 /* 0x243 */ + +#define COMMIT_next_fail 145 /* 0x91 state for COMMIT */ +#define COMMIT_next_fail_tb 290 /* 0x122 */ +#define COMMIT_next_fail_t8 291 /* 0x123 */ +#define COMMIT_next_fail_tb_pb 580 /* 0x244 */ +#define COMMIT_next_fail_tb_p8 581 /* 0x245 */ +#define COMMIT_next_fail_t8_pb 582 /* 0x246 */ +#define COMMIT_next_fail_t8_p8 583 /* 0x247 */ + +#define MARKPOINT_next 146 /* 0x92 state for MARKPOINT */ +#define MARKPOINT_next_tb 292 /* 0x124 */ +#define MARKPOINT_next_t8 293 /* 0x125 */ +#define MARKPOINT_next_tb_pb 584 /* 0x248 */ +#define MARKPOINT_next_tb_p8 585 /* 0x249 */ +#define MARKPOINT_next_t8_pb 586 /* 0x24a */ +#define MARKPOINT_next_t8_p8 587 /* 0x24b */ + +#define MARKPOINT_next_fail 147 /* 0x93 state for MARKPOINT */ +#define MARKPOINT_next_fail_tb 294 /* 0x126 */ +#define MARKPOINT_next_fail_t8 295 /* 0x127 */ +#define MARKPOINT_next_fail_tb_pb 588 /* 0x24c */ +#define MARKPOINT_next_fail_tb_p8 589 /* 0x24d */ +#define MARKPOINT_next_fail_t8_pb 590 /* 0x24e */ +#define MARKPOINT_next_fail_t8_p8 591 /* 0x24f */ + +#define SKIP_next 148 /* 0x94 state for SKIP */ +#define SKIP_next_tb 296 /* 0x128 */ +#define SKIP_next_t8 297 /* 0x129 */ +#define SKIP_next_tb_pb 592 /* 0x250 */ +#define SKIP_next_tb_p8 593 /* 0x251 */ +#define SKIP_next_t8_pb 594 /* 0x252 */ +#define SKIP_next_t8_p8 595 /* 0x253 */ + +#define SKIP_next_fail 149 /* 0x95 state for SKIP */ +#define SKIP_next_fail_tb 298 /* 0x12a */ +#define SKIP_next_fail_t8 299 /* 0x12b */ +#define SKIP_next_fail_tb_pb 596 /* 0x254 */ +#define SKIP_next_fail_tb_p8 597 /* 0x255 */ +#define SKIP_next_fail_t8_pb 598 /* 0x256 */ +#define SKIP_next_fail_t8_p8 599 /* 0x257 */ + +#define CUTGROUP_next 150 /* 0x96 state for CUTGROUP */ +#define CUTGROUP_next_tb 300 /* 0x12c */ +#define CUTGROUP_next_t8 301 /* 0x12d */ +#define CUTGROUP_next_tb_pb 600 /* 0x258 */ +#define CUTGROUP_next_tb_p8 601 /* 0x259 */ +#define CUTGROUP_next_t8_pb 602 /* 0x25a */ +#define CUTGROUP_next_t8_p8 603 /* 0x25b */ + +#define CUTGROUP_next_fail 151 /* 0x97 state for CUTGROUP */ +#define CUTGROUP_next_fail_tb 302 /* 0x12e */ +#define CUTGROUP_next_fail_t8 303 /* 0x12f */ +#define CUTGROUP_next_fail_tb_pb 604 /* 0x25c */ +#define CUTGROUP_next_fail_tb_p8 605 /* 0x25d */ +#define CUTGROUP_next_fail_t8_pb 606 /* 0x25e */ +#define CUTGROUP_next_fail_t8_p8 607 /* 0x25f */ + +#define KEEPS_next 152 /* 0x98 state for KEEPS */ +#define KEEPS_next_tb 304 /* 0x130 */ +#define KEEPS_next_t8 305 /* 0x131 */ +#define KEEPS_next_tb_pb 608 /* 0x260 */ +#define KEEPS_next_tb_p8 609 /* 0x261 */ +#define KEEPS_next_t8_pb 610 /* 0x262 */ +#define KEEPS_next_t8_p8 611 /* 0x263 */ + +#define KEEPS_next_fail 153 /* 0x99 state for KEEPS */ +#define KEEPS_next_fail_tb 306 /* 0x132 */ +#define KEEPS_next_fail_t8 307 /* 0x133 */ +#define KEEPS_next_fail_tb_pb 612 /* 0x264 */ +#define KEEPS_next_fail_tb_p8 613 /* 0x265 */ +#define KEEPS_next_fail_t8_pb 614 /* 0x266 */ +#define KEEPS_next_fail_t8_p8 615 /* 0x267 */ + +#define REF_next 154 /* 0x9a state for REF */ +#define REF_next_tb 308 /* 0x134 */ +#define REF_next_t8 309 /* 0x135 */ +#define REF_next_tb_pb 616 /* 0x268 */ +#define REF_next_tb_p8 617 /* 0x269 */ +#define REF_next_t8_pb 618 /* 0x26a */ +#define REF_next_t8_p8 619 /* 0x26b */ + +#define REF_next_fail 155 /* 0x9b state for REF */ +#define REF_next_fail_tb 310 /* 0x136 */ +#define REF_next_fail_t8 311 /* 0x137 */ +#define REF_next_fail_tb_pb 620 /* 0x26c */ +#define REF_next_fail_tb_p8 621 /* 0x26d */ +#define REF_next_fail_t8_pb 622 /* 0x26e */ +#define REF_next_fail_t8_p8 623 /* 0x26f */ /* PL_regnode_name[] - Opcode/state names in string form, for debugging */ -#ifndef DOINIT -EXTCONST char * PL_regnode_name[]; -#else -EXTCONST char * const PL_regnode_name[] = { +EXTCONST char * const PL_regnode_name[] INIT( { "END", /* 0000 */ "SUCCEED", /* 0x01 */ "SBOL", /* 0x02 */ @@ -1713,54 +1726,52 @@ EXTCONST char * const PL_regnode_name[] "TRIE_next_fail", /* REGNODE_MAX +0x02 */ "EVAL_B", /* REGNODE_MAX +0x03 */ "EVAL_B_fail", /* REGNODE_MAX +0x04 */ - "EVAL_postponed_AB", /* REGNODE_MAX +0x05 */ - "EVAL_postponed_AB_fail", /* REGNODE_MAX +0x06 */ - "CURLYX_end", /* REGNODE_MAX +0x07 */ - "CURLYX_end_fail", /* REGNODE_MAX +0x08 */ - "WHILEM_A_pre", /* REGNODE_MAX +0x09 */ - "WHILEM_A_pre_fail", /* REGNODE_MAX +0x0a */ - "WHILEM_A_min", /* REGNODE_MAX +0x0b */ - "WHILEM_A_min_fail", /* REGNODE_MAX +0x0c */ - "WHILEM_A_max", /* REGNODE_MAX +0x0d */ - "WHILEM_A_max_fail", /* REGNODE_MAX +0x0e */ - "WHILEM_B_min", /* REGNODE_MAX +0x0f */ - "WHILEM_B_min_fail", /* REGNODE_MAX +0x10 */ - "WHILEM_B_max", /* REGNODE_MAX +0x11 */ - "WHILEM_B_max_fail", /* REGNODE_MAX +0x12 */ - "BRANCH_next", /* REGNODE_MAX +0x13 */ - "BRANCH_next_fail", /* REGNODE_MAX +0x14 */ - "CURLYM_A", /* REGNODE_MAX +0x15 */ - "CURLYM_A_fail", /* REGNODE_MAX +0x16 */ - "CURLYM_B", /* REGNODE_MAX +0x17 */ - "CURLYM_B_fail", /* REGNODE_MAX +0x18 */ - "IFMATCH_A", /* REGNODE_MAX +0x19 */ - "IFMATCH_A_fail", /* REGNODE_MAX +0x1a */ - "CURLY_B_min", /* REGNODE_MAX +0x1b */ - "CURLY_B_min_fail", /* REGNODE_MAX +0x1c */ - "CURLY_B_max", /* REGNODE_MAX +0x1d */ - "CURLY_B_max_fail", /* REGNODE_MAX +0x1e */ - "COMMIT_next", /* REGNODE_MAX +0x1f */ - "COMMIT_next_fail", /* REGNODE_MAX +0x20 */ - "MARKPOINT_next", /* REGNODE_MAX +0x21 */ - "MARKPOINT_next_fail", /* REGNODE_MAX +0x22 */ - "SKIP_next", /* REGNODE_MAX +0x23 */ - "SKIP_next_fail", /* REGNODE_MAX +0x24 */ - "CUTGROUP_next", /* REGNODE_MAX +0x25 */ - "CUTGROUP_next_fail", /* REGNODE_MAX +0x26 */ - "KEEPS_next", /* REGNODE_MAX +0x27 */ - "KEEPS_next_fail", /* REGNODE_MAX +0x28 */ - "REF_next", /* REGNODE_MAX +0x29 */ - "REF_next_fail", /* REGNODE_MAX +0x2a */ -}; -#endif /* DOINIT */ + "EVAL_postponed_A", /* REGNODE_MAX +0x05 */ + "EVAL_postponed_A_fail", /* REGNODE_MAX +0x06 */ + "EVAL_postponed_B", /* REGNODE_MAX +0x07 */ + "EVAL_postponed_B_fail", /* REGNODE_MAX +0x08 */ + "CURLYX_end", /* REGNODE_MAX +0x09 */ + "CURLYX_end_fail", /* REGNODE_MAX +0x0a */ + "WHILEM_A_pre", /* REGNODE_MAX +0x0b */ + "WHILEM_A_pre_fail", /* REGNODE_MAX +0x0c */ + "WHILEM_A_min", /* REGNODE_MAX +0x0d */ + "WHILEM_A_min_fail", /* REGNODE_MAX +0x0e */ + "WHILEM_A_max", /* REGNODE_MAX +0x0f */ + "WHILEM_A_max_fail", /* REGNODE_MAX +0x10 */ + "WHILEM_B_min", /* REGNODE_MAX +0x11 */ + "WHILEM_B_min_fail", /* REGNODE_MAX +0x12 */ + "WHILEM_B_max", /* REGNODE_MAX +0x13 */ + "WHILEM_B_max_fail", /* REGNODE_MAX +0x14 */ + "BRANCH_next", /* REGNODE_MAX +0x15 */ + "BRANCH_next_fail", /* REGNODE_MAX +0x16 */ + "CURLYM_A", /* REGNODE_MAX +0x17 */ + "CURLYM_A_fail", /* REGNODE_MAX +0x18 */ + "CURLYM_B", /* REGNODE_MAX +0x19 */ + "CURLYM_B_fail", /* REGNODE_MAX +0x1a */ + "IFMATCH_A", /* REGNODE_MAX +0x1b */ + "IFMATCH_A_fail", /* REGNODE_MAX +0x1c */ + "CURLY_B_min", /* REGNODE_MAX +0x1d */ + "CURLY_B_min_fail", /* REGNODE_MAX +0x1e */ + "CURLY_B_max", /* REGNODE_MAX +0x1f */ + "CURLY_B_max_fail", /* REGNODE_MAX +0x20 */ + "COMMIT_next", /* REGNODE_MAX +0x21 */ + "COMMIT_next_fail", /* REGNODE_MAX +0x22 */ + "MARKPOINT_next", /* REGNODE_MAX +0x23 */ + "MARKPOINT_next_fail", /* REGNODE_MAX +0x24 */ + "SKIP_next", /* REGNODE_MAX +0x25 */ + "SKIP_next_fail", /* REGNODE_MAX +0x26 */ + "CUTGROUP_next", /* REGNODE_MAX +0x27 */ + "CUTGROUP_next_fail", /* REGNODE_MAX +0x28 */ + "KEEPS_next", /* REGNODE_MAX +0x29 */ + "KEEPS_next_fail", /* REGNODE_MAX +0x2a */ + "REF_next", /* REGNODE_MAX +0x2b */ + "REF_next_fail", /* REGNODE_MAX +0x2c */ +}); /* PL_regnode_info[] - Opcode/state names in string form, for debugging */ -#ifndef DOINIT -EXTCONST struct regnode_meta PL_regnode_info[]; -#else -EXTCONST struct regnode_meta PL_regnode_info[] = { +EXTCONST struct regnode_meta PL_regnode_info[] INIT( { { /* #0 op END */ .type = END, @@ -2574,280 +2585,290 @@ EXTCONST struct regnode_meta PL_regnode_ .off_by_arg = 0 }, { - /* #116 state EVAL_postponed_AB */ + /* #116 state EVAL_postponed_A */ .type = EVAL, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #117 state EVAL_postponed_AB_fail */ + /* #117 state EVAL_postponed_A_fail */ .type = EVAL, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #118 state CURLYX_end */ + /* #118 state EVAL_postponed_B */ + .type = EVAL, + .arg_len = 0, + .arg_len_varies = 0, + .off_by_arg = 0 + }, + { + /* #119 state EVAL_postponed_B_fail */ + .type = EVAL, + .arg_len = 0, + .arg_len_varies = 0, + .off_by_arg = 0 + }, + { + /* #120 state CURLYX_end */ .type = CURLYX, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #119 state CURLYX_end_fail */ + /* #121 state CURLYX_end_fail */ .type = CURLYX, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #120 state WHILEM_A_pre */ + /* #122 state WHILEM_A_pre */ .type = WHILEM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #121 state WHILEM_A_pre_fail */ + /* #123 state WHILEM_A_pre_fail */ .type = WHILEM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #122 state WHILEM_A_min */ + /* #124 state WHILEM_A_min */ .type = WHILEM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #123 state WHILEM_A_min_fail */ + /* #125 state WHILEM_A_min_fail */ .type = WHILEM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #124 state WHILEM_A_max */ + /* #126 state WHILEM_A_max */ .type = WHILEM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #125 state WHILEM_A_max_fail */ + /* #127 state WHILEM_A_max_fail */ .type = WHILEM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #126 state WHILEM_B_min */ + /* #128 state WHILEM_B_min */ .type = WHILEM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #127 state WHILEM_B_min_fail */ + /* #129 state WHILEM_B_min_fail */ .type = WHILEM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #128 state WHILEM_B_max */ + /* #130 state WHILEM_B_max */ .type = WHILEM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #129 state WHILEM_B_max_fail */ + /* #131 state WHILEM_B_max_fail */ .type = WHILEM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #130 state BRANCH_next */ + /* #132 state BRANCH_next */ .type = BRANCH, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #131 state BRANCH_next_fail */ + /* #133 state BRANCH_next_fail */ .type = BRANCH, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #132 state CURLYM_A */ + /* #134 state CURLYM_A */ .type = CURLYM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #133 state CURLYM_A_fail */ + /* #135 state CURLYM_A_fail */ .type = CURLYM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #134 state CURLYM_B */ + /* #136 state CURLYM_B */ .type = CURLYM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #135 state CURLYM_B_fail */ + /* #137 state CURLYM_B_fail */ .type = CURLYM, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #136 state IFMATCH_A */ + /* #138 state IFMATCH_A */ .type = IFMATCH, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #137 state IFMATCH_A_fail */ + /* #139 state IFMATCH_A_fail */ .type = IFMATCH, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #138 state CURLY_B_min */ + /* #140 state CURLY_B_min */ .type = CURLY, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #139 state CURLY_B_min_fail */ + /* #141 state CURLY_B_min_fail */ .type = CURLY, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #140 state CURLY_B_max */ + /* #142 state CURLY_B_max */ .type = CURLY, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #141 state CURLY_B_max_fail */ + /* #143 state CURLY_B_max_fail */ .type = CURLY, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #142 state COMMIT_next */ + /* #144 state COMMIT_next */ .type = COMMIT, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #143 state COMMIT_next_fail */ + /* #145 state COMMIT_next_fail */ .type = COMMIT, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #144 state MARKPOINT_next */ + /* #146 state MARKPOINT_next */ .type = MARKPOINT, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #145 state MARKPOINT_next_fail */ + /* #147 state MARKPOINT_next_fail */ .type = MARKPOINT, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #146 state SKIP_next */ + /* #148 state SKIP_next */ .type = SKIP, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #147 state SKIP_next_fail */ + /* #149 state SKIP_next_fail */ .type = SKIP, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #148 state CUTGROUP_next */ + /* #150 state CUTGROUP_next */ .type = CUTGROUP, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #149 state CUTGROUP_next_fail */ + /* #151 state CUTGROUP_next_fail */ .type = CUTGROUP, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #150 state KEEPS_next */ + /* #152 state KEEPS_next */ .type = KEEPS, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #151 state KEEPS_next_fail */ + /* #153 state KEEPS_next_fail */ .type = KEEPS, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #152 state REF_next */ + /* #154 state REF_next */ .type = REF, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 }, { - /* #153 state REF_next_fail */ + /* #155 state REF_next_fail */ .type = REF, .arg_len = 0, .arg_len_varies = 0, .off_by_arg = 0 } -}; -#endif /* DOINIT */ +}); /* PL_reg_extflags_name[] - Opcode/state names in string form, for debugging */ -#ifndef DOINIT -EXTCONST char * PL_reg_extflags_name[]; -#else -EXTCONST char * const PL_reg_extflags_name[] = { +EXTCONST char * const PL_reg_extflags_name[] INIT( { /* Bits in extflags defined: 11111111111111110000111111111111 */ "MULTILINE", /* 0x00000001 */ "SINGLELINE", /* 0x00000002 */ @@ -2881,8 +2902,7 @@ EXTCONST char * const PL_reg_extflags_na "SKIPWHITE", /* 0x20000000 */ "WHITE", /* 0x40000000 */ "NULL", /* 0x80000000 */ -}; -#endif /* DOINIT */ +}); #ifdef DEBUGGING # define REG_EXTFLAGS_NAME_SIZE 32 @@ -2890,10 +2910,7 @@ EXTCONST char * const PL_reg_extflags_na /* PL_reg_intflags_name[] - Opcode/state names in string form, for debugging */ -#ifndef DOINIT -EXTCONST char * PL_reg_intflags_name[]; -#else -EXTCONST char * const PL_reg_intflags_name[] = { +EXTCONST char * const PL_reg_intflags_name[] INIT( { "SKIP", /* (1<< 0) - 0x00000001 - PREGf_SKIP */ "IMPLICIT", /* (1<< 1) - 0x00000002 - PREGf_IMPLICIT - Converted .* to ^.* */ "NAUGHTY", /* (1<< 2) - 0x00000004 - PREGf_NAUGHTY - how exponential is this pattern? */ @@ -2909,8 +2926,7 @@ EXTCONST char * const PL_reg_intflags_na "ANCH_GPOS", /* (1<<12) - 0x00001000 - PREGf_ANCH_GPOS */ "RECURSE_SEEN", /* (1<<13) - 0x00002000 - PREGf_RECURSE_SEEN */ "PESSIMIZE_SEEN", /* (1<<14) - 0x00004000 - PREGf_PESSIMIZE_SEEN */ -}; -#endif /* DOINIT */ +}); #ifdef DEBUGGING # define REG_INTFLAGS_NAME_SIZE 15 @@ -2919,61 +2935,34 @@ EXTCONST char * const PL_reg_intflags_na /* The following have no fixed length. U8 so we can do strchr() on it. */ #define REGNODE_VARIES(node) (PL_varies_bitmask[(node) >> 3] & (1 << ((node) & 7))) -#ifndef DOINIT -EXTCONST U8 PL_varies[] __attribute__deprecated__; -#else -EXTCONST U8 PL_varies[] __attribute__deprecated__ = { - CLUMP, BRANCH, STAR, PLUS, CURLY, CURLYN, CURLYM, CURLYX, WHILEM, REF, +EXTCONST U8 PL_varies[] __attribute__deprecated__ +INIT({ CLUMP, BRANCH, STAR, PLUS, CURLY, CURLYN, CURLYM, CURLYX, WHILEM, REF, REFF, REFFL, REFFU, REFFA, REFN, REFFN, REFFLN, REFFUN, REFFAN, BRANCHJ, SUSPEND, IFTHEN, - 0 -}; -#endif /* DOINIT */ - -#ifndef DOINIT -EXTCONST U8 PL_varies_bitmask[]; -#else -EXTCONST U8 PL_varies_bitmask[] = { - 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0xC0, 0x1F, 0xFE, 0x97, 0x01, 0x00, 0x00 -}; -#endif /* DOINIT */ + 0 }); + +EXTCONST U8 PL_varies_bitmask[] INIT({ 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0xC0, 0x1F, 0xFE, 0x97, 0x01, 0x00, 0x00 }); /* The following always have a length of 1. U8 we can do strchr() on it. */ /* (Note that length 1 means "one character" under UTF8, not "one octet".) */ #define REGNODE_SIMPLE(node) (PL_simple_bitmask[(node) >> 3] & (1 << ((node) & 7))) -#ifndef DOINIT -EXTCONST U8 PL_simple[] __attribute__deprecated__; -#else -EXTCONST U8 PL_simple[] __attribute__deprecated__ = { - REG_ANY, SANY, ANYOF, ANYOFD, ANYOFL, ANYOFPOSIXL, ANYOFH, ANYOFHb, +EXTCONST U8 PL_simple[] __attribute__deprecated__ +INIT({ REG_ANY, SANY, ANYOF, ANYOFD, ANYOFL, ANYOFPOSIXL, ANYOFH, ANYOFHb, ANYOFHr, ANYOFHs, ANYOFR, ANYOFRb, ANYOFHbbm, ANYOFM, NANYOFM, POSIXD, POSIXL, POSIXU, POSIXA, NPOSIXD, NPOSIXL, NPOSIXU, NPOSIXA, REGEX_SET, - 0 -}; -#endif /* DOINIT */ - -#ifndef DOINIT -EXTCONST U8 PL_simple_bitmask[]; -#else -EXTCONST U8 PL_simple_bitmask[] = { - 0x00, 0x00, 0xFF, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80 -}; -#endif /* DOINIT */ + 0 }); + +EXTCONST U8 PL_simple_bitmask[] INIT({ 0x00, 0x00, 0xFF, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80 }); /* Is 'op', known to be of type EXACT, folding? */ -#define isEXACTFish(op) (__ASSERT_(REGNODE_TYPE(op) == EXACT) (PL_EXACTFish_bitmask & (1U << (op - EXACT)))) +#define isEXACTFish(op) (assert(REGNODE_TYPE(op) == EXACT), (PL_EXACTFish_bitmask & (1U << (op - EXACT)))) /* Do only UTF-8 target strings match 'op', known to be of type EXACT? */ -#define isEXACT_REQ8(op) (__ASSERT_(REGNODE_TYPE(op) == EXACT) (PL_EXACT_REQ8_bitmask & (1U << (op - EXACT)))) +#define isEXACT_REQ8(op) (assert(REGNODE_TYPE(op) == EXACT), (PL_EXACT_REQ8_bitmask & (1U << (op - EXACT)))) -#ifndef DOINIT -EXTCONST U32 PL_EXACTFish_bitmask; -EXTCONST U32 PL_EXACT_REQ8_bitmask; -#else -EXTCONST U32 PL_EXACTFish_bitmask = 0x33F8; -EXTCONST U32 PL_EXACT_REQ8_bitmask = 0x1E00; -#endif /* DOINIT */ +EXTCONST U32 PL_EXACTFish_bitmask INIT(0x33F8); +EXTCONST U32 PL_EXACT_REQ8_bitmask INIT(0x1E00); #endif /* defined(PERL_CORE) || defined(PERL_EXT_RE_BUILD) */ Index: gnu/usr.bin/perl/run.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/run.c,v diff -u -p -a -u -p -r1.15 run.c --- gnu/usr.bin/perl/run.c 28 Jan 2025 01:06:10 -0000 1.15 +++ gnu/usr.bin/perl/run.c 16 Nov 2026 00:57:39 -0000 @@ -36,6 +36,8 @@ int Perl_runops_standard(pTHX) { + PERL_ARGS_ASSERT_RUNOPS_STANDARD; + OP *op = PL_op; PERL_DTRACE_PROBE_OP(op); while ((PL_op = op = op->op_ppaddr(aTHX))) { @@ -56,6 +58,8 @@ Perl_runops_standard(pTHX) int Perl_runops_wrap(pTHX) { + PERL_ARGS_ASSERT_RUNOPS_WRAP; + /* runops loops assume a ref-counted stack. If we have been called via a * wrapper (pp_wrap or xs_wrap) with the top half of the stack not * reference-counted, or with a non-real stack, temporarily convert it Index: gnu/usr.bin/perl/sbox32_hash.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/sbox32_hash.h,v diff -u -p -a -u -p -r1.1.1.3 sbox32_hash.h --- gnu/usr.bin/perl/sbox32_hash.h 14 May 2024 19:36:29 -0000 1.1.1.3 +++ gnu/usr.bin/perl/sbox32_hash.h 16 Nov 2026 00:57:39 -0000 @@ -27,7 +27,7 @@ #define SBOX32_WARN2(pat,v0,v1) #endif -#ifndef PERL_SEEN_HV_FUNC_H_ +#ifndef PERL_HV_FUNC_H_ #if !defined(U32) #include #define U32 uint32_t @@ -110,1282 +110,1282 @@ #if SBOX32_MAX_LEN > 256 #error "SBOX32_MAX_LEN is set too high!" #elif SBOX32_MAX_LEN == 256 -#define case_256_SBOX32(hash,state,key) _SBOX32_CASE(256,hash,state,key) +#define case_256_SBOX32(hash,state,key) SBOX32_CASE_(256,hash,state,key) #else #define case_256_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 255 -#define case_255_SBOX32(hash,state,key) _SBOX32_CASE(255,hash,state,key) +#define case_255_SBOX32(hash,state,key) SBOX32_CASE_(255,hash,state,key) #else #define case_255_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 254 -#define case_254_SBOX32(hash,state,key) _SBOX32_CASE(254,hash,state,key) +#define case_254_SBOX32(hash,state,key) SBOX32_CASE_(254,hash,state,key) #else #define case_254_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 253 -#define case_253_SBOX32(hash,state,key) _SBOX32_CASE(253,hash,state,key) +#define case_253_SBOX32(hash,state,key) SBOX32_CASE_(253,hash,state,key) #else #define case_253_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 252 -#define case_252_SBOX32(hash,state,key) _SBOX32_CASE(252,hash,state,key) +#define case_252_SBOX32(hash,state,key) SBOX32_CASE_(252,hash,state,key) #else #define case_252_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 251 -#define case_251_SBOX32(hash,state,key) _SBOX32_CASE(251,hash,state,key) +#define case_251_SBOX32(hash,state,key) SBOX32_CASE_(251,hash,state,key) #else #define case_251_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 250 -#define case_250_SBOX32(hash,state,key) _SBOX32_CASE(250,hash,state,key) +#define case_250_SBOX32(hash,state,key) SBOX32_CASE_(250,hash,state,key) #else #define case_250_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 249 -#define case_249_SBOX32(hash,state,key) _SBOX32_CASE(249,hash,state,key) +#define case_249_SBOX32(hash,state,key) SBOX32_CASE_(249,hash,state,key) #else #define case_249_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 248 -#define case_248_SBOX32(hash,state,key) _SBOX32_CASE(248,hash,state,key) +#define case_248_SBOX32(hash,state,key) SBOX32_CASE_(248,hash,state,key) #else #define case_248_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 247 -#define case_247_SBOX32(hash,state,key) _SBOX32_CASE(247,hash,state,key) +#define case_247_SBOX32(hash,state,key) SBOX32_CASE_(247,hash,state,key) #else #define case_247_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 246 -#define case_246_SBOX32(hash,state,key) _SBOX32_CASE(246,hash,state,key) +#define case_246_SBOX32(hash,state,key) SBOX32_CASE_(246,hash,state,key) #else #define case_246_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 245 -#define case_245_SBOX32(hash,state,key) _SBOX32_CASE(245,hash,state,key) +#define case_245_SBOX32(hash,state,key) SBOX32_CASE_(245,hash,state,key) #else #define case_245_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 244 -#define case_244_SBOX32(hash,state,key) _SBOX32_CASE(244,hash,state,key) +#define case_244_SBOX32(hash,state,key) SBOX32_CASE_(244,hash,state,key) #else #define case_244_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 243 -#define case_243_SBOX32(hash,state,key) _SBOX32_CASE(243,hash,state,key) +#define case_243_SBOX32(hash,state,key) SBOX32_CASE_(243,hash,state,key) #else #define case_243_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 242 -#define case_242_SBOX32(hash,state,key) _SBOX32_CASE(242,hash,state,key) +#define case_242_SBOX32(hash,state,key) SBOX32_CASE_(242,hash,state,key) #else #define case_242_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 241 -#define case_241_SBOX32(hash,state,key) _SBOX32_CASE(241,hash,state,key) +#define case_241_SBOX32(hash,state,key) SBOX32_CASE_(241,hash,state,key) #else #define case_241_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 240 -#define case_240_SBOX32(hash,state,key) _SBOX32_CASE(240,hash,state,key) +#define case_240_SBOX32(hash,state,key) SBOX32_CASE_(240,hash,state,key) #else #define case_240_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 239 -#define case_239_SBOX32(hash,state,key) _SBOX32_CASE(239,hash,state,key) +#define case_239_SBOX32(hash,state,key) SBOX32_CASE_(239,hash,state,key) #else #define case_239_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 238 -#define case_238_SBOX32(hash,state,key) _SBOX32_CASE(238,hash,state,key) +#define case_238_SBOX32(hash,state,key) SBOX32_CASE_(238,hash,state,key) #else #define case_238_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 237 -#define case_237_SBOX32(hash,state,key) _SBOX32_CASE(237,hash,state,key) +#define case_237_SBOX32(hash,state,key) SBOX32_CASE_(237,hash,state,key) #else #define case_237_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 236 -#define case_236_SBOX32(hash,state,key) _SBOX32_CASE(236,hash,state,key) +#define case_236_SBOX32(hash,state,key) SBOX32_CASE_(236,hash,state,key) #else #define case_236_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 235 -#define case_235_SBOX32(hash,state,key) _SBOX32_CASE(235,hash,state,key) +#define case_235_SBOX32(hash,state,key) SBOX32_CASE_(235,hash,state,key) #else #define case_235_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 234 -#define case_234_SBOX32(hash,state,key) _SBOX32_CASE(234,hash,state,key) +#define case_234_SBOX32(hash,state,key) SBOX32_CASE_(234,hash,state,key) #else #define case_234_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 233 -#define case_233_SBOX32(hash,state,key) _SBOX32_CASE(233,hash,state,key) +#define case_233_SBOX32(hash,state,key) SBOX32_CASE_(233,hash,state,key) #else #define case_233_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 232 -#define case_232_SBOX32(hash,state,key) _SBOX32_CASE(232,hash,state,key) +#define case_232_SBOX32(hash,state,key) SBOX32_CASE_(232,hash,state,key) #else #define case_232_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 231 -#define case_231_SBOX32(hash,state,key) _SBOX32_CASE(231,hash,state,key) +#define case_231_SBOX32(hash,state,key) SBOX32_CASE_(231,hash,state,key) #else #define case_231_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 230 -#define case_230_SBOX32(hash,state,key) _SBOX32_CASE(230,hash,state,key) +#define case_230_SBOX32(hash,state,key) SBOX32_CASE_(230,hash,state,key) #else #define case_230_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 229 -#define case_229_SBOX32(hash,state,key) _SBOX32_CASE(229,hash,state,key) +#define case_229_SBOX32(hash,state,key) SBOX32_CASE_(229,hash,state,key) #else #define case_229_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 228 -#define case_228_SBOX32(hash,state,key) _SBOX32_CASE(228,hash,state,key) +#define case_228_SBOX32(hash,state,key) SBOX32_CASE_(228,hash,state,key) #else #define case_228_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 227 -#define case_227_SBOX32(hash,state,key) _SBOX32_CASE(227,hash,state,key) +#define case_227_SBOX32(hash,state,key) SBOX32_CASE_(227,hash,state,key) #else #define case_227_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 226 -#define case_226_SBOX32(hash,state,key) _SBOX32_CASE(226,hash,state,key) +#define case_226_SBOX32(hash,state,key) SBOX32_CASE_(226,hash,state,key) #else #define case_226_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 225 -#define case_225_SBOX32(hash,state,key) _SBOX32_CASE(225,hash,state,key) +#define case_225_SBOX32(hash,state,key) SBOX32_CASE_(225,hash,state,key) #else #define case_225_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 224 -#define case_224_SBOX32(hash,state,key) _SBOX32_CASE(224,hash,state,key) +#define case_224_SBOX32(hash,state,key) SBOX32_CASE_(224,hash,state,key) #else #define case_224_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 223 -#define case_223_SBOX32(hash,state,key) _SBOX32_CASE(223,hash,state,key) +#define case_223_SBOX32(hash,state,key) SBOX32_CASE_(223,hash,state,key) #else #define case_223_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 222 -#define case_222_SBOX32(hash,state,key) _SBOX32_CASE(222,hash,state,key) +#define case_222_SBOX32(hash,state,key) SBOX32_CASE_(222,hash,state,key) #else #define case_222_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 221 -#define case_221_SBOX32(hash,state,key) _SBOX32_CASE(221,hash,state,key) +#define case_221_SBOX32(hash,state,key) SBOX32_CASE_(221,hash,state,key) #else #define case_221_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 220 -#define case_220_SBOX32(hash,state,key) _SBOX32_CASE(220,hash,state,key) +#define case_220_SBOX32(hash,state,key) SBOX32_CASE_(220,hash,state,key) #else #define case_220_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 219 -#define case_219_SBOX32(hash,state,key) _SBOX32_CASE(219,hash,state,key) +#define case_219_SBOX32(hash,state,key) SBOX32_CASE_(219,hash,state,key) #else #define case_219_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 218 -#define case_218_SBOX32(hash,state,key) _SBOX32_CASE(218,hash,state,key) +#define case_218_SBOX32(hash,state,key) SBOX32_CASE_(218,hash,state,key) #else #define case_218_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 217 -#define case_217_SBOX32(hash,state,key) _SBOX32_CASE(217,hash,state,key) +#define case_217_SBOX32(hash,state,key) SBOX32_CASE_(217,hash,state,key) #else #define case_217_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 216 -#define case_216_SBOX32(hash,state,key) _SBOX32_CASE(216,hash,state,key) +#define case_216_SBOX32(hash,state,key) SBOX32_CASE_(216,hash,state,key) #else #define case_216_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 215 -#define case_215_SBOX32(hash,state,key) _SBOX32_CASE(215,hash,state,key) +#define case_215_SBOX32(hash,state,key) SBOX32_CASE_(215,hash,state,key) #else #define case_215_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 214 -#define case_214_SBOX32(hash,state,key) _SBOX32_CASE(214,hash,state,key) +#define case_214_SBOX32(hash,state,key) SBOX32_CASE_(214,hash,state,key) #else #define case_214_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 213 -#define case_213_SBOX32(hash,state,key) _SBOX32_CASE(213,hash,state,key) +#define case_213_SBOX32(hash,state,key) SBOX32_CASE_(213,hash,state,key) #else #define case_213_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 212 -#define case_212_SBOX32(hash,state,key) _SBOX32_CASE(212,hash,state,key) +#define case_212_SBOX32(hash,state,key) SBOX32_CASE_(212,hash,state,key) #else #define case_212_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 211 -#define case_211_SBOX32(hash,state,key) _SBOX32_CASE(211,hash,state,key) +#define case_211_SBOX32(hash,state,key) SBOX32_CASE_(211,hash,state,key) #else #define case_211_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 210 -#define case_210_SBOX32(hash,state,key) _SBOX32_CASE(210,hash,state,key) +#define case_210_SBOX32(hash,state,key) SBOX32_CASE_(210,hash,state,key) #else #define case_210_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 209 -#define case_209_SBOX32(hash,state,key) _SBOX32_CASE(209,hash,state,key) +#define case_209_SBOX32(hash,state,key) SBOX32_CASE_(209,hash,state,key) #else #define case_209_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 208 -#define case_208_SBOX32(hash,state,key) _SBOX32_CASE(208,hash,state,key) +#define case_208_SBOX32(hash,state,key) SBOX32_CASE_(208,hash,state,key) #else #define case_208_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 207 -#define case_207_SBOX32(hash,state,key) _SBOX32_CASE(207,hash,state,key) +#define case_207_SBOX32(hash,state,key) SBOX32_CASE_(207,hash,state,key) #else #define case_207_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 206 -#define case_206_SBOX32(hash,state,key) _SBOX32_CASE(206,hash,state,key) +#define case_206_SBOX32(hash,state,key) SBOX32_CASE_(206,hash,state,key) #else #define case_206_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 205 -#define case_205_SBOX32(hash,state,key) _SBOX32_CASE(205,hash,state,key) +#define case_205_SBOX32(hash,state,key) SBOX32_CASE_(205,hash,state,key) #else #define case_205_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 204 -#define case_204_SBOX32(hash,state,key) _SBOX32_CASE(204,hash,state,key) +#define case_204_SBOX32(hash,state,key) SBOX32_CASE_(204,hash,state,key) #else #define case_204_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 203 -#define case_203_SBOX32(hash,state,key) _SBOX32_CASE(203,hash,state,key) +#define case_203_SBOX32(hash,state,key) SBOX32_CASE_(203,hash,state,key) #else #define case_203_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 202 -#define case_202_SBOX32(hash,state,key) _SBOX32_CASE(202,hash,state,key) +#define case_202_SBOX32(hash,state,key) SBOX32_CASE_(202,hash,state,key) #else #define case_202_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 201 -#define case_201_SBOX32(hash,state,key) _SBOX32_CASE(201,hash,state,key) +#define case_201_SBOX32(hash,state,key) SBOX32_CASE_(201,hash,state,key) #else #define case_201_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 200 -#define case_200_SBOX32(hash,state,key) _SBOX32_CASE(200,hash,state,key) +#define case_200_SBOX32(hash,state,key) SBOX32_CASE_(200,hash,state,key) #else #define case_200_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 199 -#define case_199_SBOX32(hash,state,key) _SBOX32_CASE(199,hash,state,key) +#define case_199_SBOX32(hash,state,key) SBOX32_CASE_(199,hash,state,key) #else #define case_199_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 198 -#define case_198_SBOX32(hash,state,key) _SBOX32_CASE(198,hash,state,key) +#define case_198_SBOX32(hash,state,key) SBOX32_CASE_(198,hash,state,key) #else #define case_198_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 197 -#define case_197_SBOX32(hash,state,key) _SBOX32_CASE(197,hash,state,key) +#define case_197_SBOX32(hash,state,key) SBOX32_CASE_(197,hash,state,key) #else #define case_197_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 196 -#define case_196_SBOX32(hash,state,key) _SBOX32_CASE(196,hash,state,key) +#define case_196_SBOX32(hash,state,key) SBOX32_CASE_(196,hash,state,key) #else #define case_196_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 195 -#define case_195_SBOX32(hash,state,key) _SBOX32_CASE(195,hash,state,key) +#define case_195_SBOX32(hash,state,key) SBOX32_CASE_(195,hash,state,key) #else #define case_195_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 194 -#define case_194_SBOX32(hash,state,key) _SBOX32_CASE(194,hash,state,key) +#define case_194_SBOX32(hash,state,key) SBOX32_CASE_(194,hash,state,key) #else #define case_194_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 193 -#define case_193_SBOX32(hash,state,key) _SBOX32_CASE(193,hash,state,key) +#define case_193_SBOX32(hash,state,key) SBOX32_CASE_(193,hash,state,key) #else #define case_193_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 192 -#define case_192_SBOX32(hash,state,key) _SBOX32_CASE(192,hash,state,key) +#define case_192_SBOX32(hash,state,key) SBOX32_CASE_(192,hash,state,key) #else #define case_192_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 191 -#define case_191_SBOX32(hash,state,key) _SBOX32_CASE(191,hash,state,key) +#define case_191_SBOX32(hash,state,key) SBOX32_CASE_(191,hash,state,key) #else #define case_191_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 190 -#define case_190_SBOX32(hash,state,key) _SBOX32_CASE(190,hash,state,key) +#define case_190_SBOX32(hash,state,key) SBOX32_CASE_(190,hash,state,key) #else #define case_190_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 189 -#define case_189_SBOX32(hash,state,key) _SBOX32_CASE(189,hash,state,key) +#define case_189_SBOX32(hash,state,key) SBOX32_CASE_(189,hash,state,key) #else #define case_189_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 188 -#define case_188_SBOX32(hash,state,key) _SBOX32_CASE(188,hash,state,key) +#define case_188_SBOX32(hash,state,key) SBOX32_CASE_(188,hash,state,key) #else #define case_188_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 187 -#define case_187_SBOX32(hash,state,key) _SBOX32_CASE(187,hash,state,key) +#define case_187_SBOX32(hash,state,key) SBOX32_CASE_(187,hash,state,key) #else #define case_187_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 186 -#define case_186_SBOX32(hash,state,key) _SBOX32_CASE(186,hash,state,key) +#define case_186_SBOX32(hash,state,key) SBOX32_CASE_(186,hash,state,key) #else #define case_186_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 185 -#define case_185_SBOX32(hash,state,key) _SBOX32_CASE(185,hash,state,key) +#define case_185_SBOX32(hash,state,key) SBOX32_CASE_(185,hash,state,key) #else #define case_185_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 184 -#define case_184_SBOX32(hash,state,key) _SBOX32_CASE(184,hash,state,key) +#define case_184_SBOX32(hash,state,key) SBOX32_CASE_(184,hash,state,key) #else #define case_184_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 183 -#define case_183_SBOX32(hash,state,key) _SBOX32_CASE(183,hash,state,key) +#define case_183_SBOX32(hash,state,key) SBOX32_CASE_(183,hash,state,key) #else #define case_183_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 182 -#define case_182_SBOX32(hash,state,key) _SBOX32_CASE(182,hash,state,key) +#define case_182_SBOX32(hash,state,key) SBOX32_CASE_(182,hash,state,key) #else #define case_182_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 181 -#define case_181_SBOX32(hash,state,key) _SBOX32_CASE(181,hash,state,key) +#define case_181_SBOX32(hash,state,key) SBOX32_CASE_(181,hash,state,key) #else #define case_181_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 180 -#define case_180_SBOX32(hash,state,key) _SBOX32_CASE(180,hash,state,key) +#define case_180_SBOX32(hash,state,key) SBOX32_CASE_(180,hash,state,key) #else #define case_180_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 179 -#define case_179_SBOX32(hash,state,key) _SBOX32_CASE(179,hash,state,key) +#define case_179_SBOX32(hash,state,key) SBOX32_CASE_(179,hash,state,key) #else #define case_179_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 178 -#define case_178_SBOX32(hash,state,key) _SBOX32_CASE(178,hash,state,key) +#define case_178_SBOX32(hash,state,key) SBOX32_CASE_(178,hash,state,key) #else #define case_178_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 177 -#define case_177_SBOX32(hash,state,key) _SBOX32_CASE(177,hash,state,key) +#define case_177_SBOX32(hash,state,key) SBOX32_CASE_(177,hash,state,key) #else #define case_177_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 176 -#define case_176_SBOX32(hash,state,key) _SBOX32_CASE(176,hash,state,key) +#define case_176_SBOX32(hash,state,key) SBOX32_CASE_(176,hash,state,key) #else #define case_176_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 175 -#define case_175_SBOX32(hash,state,key) _SBOX32_CASE(175,hash,state,key) +#define case_175_SBOX32(hash,state,key) SBOX32_CASE_(175,hash,state,key) #else #define case_175_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 174 -#define case_174_SBOX32(hash,state,key) _SBOX32_CASE(174,hash,state,key) +#define case_174_SBOX32(hash,state,key) SBOX32_CASE_(174,hash,state,key) #else #define case_174_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 173 -#define case_173_SBOX32(hash,state,key) _SBOX32_CASE(173,hash,state,key) +#define case_173_SBOX32(hash,state,key) SBOX32_CASE_(173,hash,state,key) #else #define case_173_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 172 -#define case_172_SBOX32(hash,state,key) _SBOX32_CASE(172,hash,state,key) +#define case_172_SBOX32(hash,state,key) SBOX32_CASE_(172,hash,state,key) #else #define case_172_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 171 -#define case_171_SBOX32(hash,state,key) _SBOX32_CASE(171,hash,state,key) +#define case_171_SBOX32(hash,state,key) SBOX32_CASE_(171,hash,state,key) #else #define case_171_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 170 -#define case_170_SBOX32(hash,state,key) _SBOX32_CASE(170,hash,state,key) +#define case_170_SBOX32(hash,state,key) SBOX32_CASE_(170,hash,state,key) #else #define case_170_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 169 -#define case_169_SBOX32(hash,state,key) _SBOX32_CASE(169,hash,state,key) +#define case_169_SBOX32(hash,state,key) SBOX32_CASE_(169,hash,state,key) #else #define case_169_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 168 -#define case_168_SBOX32(hash,state,key) _SBOX32_CASE(168,hash,state,key) +#define case_168_SBOX32(hash,state,key) SBOX32_CASE_(168,hash,state,key) #else #define case_168_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 167 -#define case_167_SBOX32(hash,state,key) _SBOX32_CASE(167,hash,state,key) +#define case_167_SBOX32(hash,state,key) SBOX32_CASE_(167,hash,state,key) #else #define case_167_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 166 -#define case_166_SBOX32(hash,state,key) _SBOX32_CASE(166,hash,state,key) +#define case_166_SBOX32(hash,state,key) SBOX32_CASE_(166,hash,state,key) #else #define case_166_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 165 -#define case_165_SBOX32(hash,state,key) _SBOX32_CASE(165,hash,state,key) +#define case_165_SBOX32(hash,state,key) SBOX32_CASE_(165,hash,state,key) #else #define case_165_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 164 -#define case_164_SBOX32(hash,state,key) _SBOX32_CASE(164,hash,state,key) +#define case_164_SBOX32(hash,state,key) SBOX32_CASE_(164,hash,state,key) #else #define case_164_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 163 -#define case_163_SBOX32(hash,state,key) _SBOX32_CASE(163,hash,state,key) +#define case_163_SBOX32(hash,state,key) SBOX32_CASE_(163,hash,state,key) #else #define case_163_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 162 -#define case_162_SBOX32(hash,state,key) _SBOX32_CASE(162,hash,state,key) +#define case_162_SBOX32(hash,state,key) SBOX32_CASE_(162,hash,state,key) #else #define case_162_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 161 -#define case_161_SBOX32(hash,state,key) _SBOX32_CASE(161,hash,state,key) +#define case_161_SBOX32(hash,state,key) SBOX32_CASE_(161,hash,state,key) #else #define case_161_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 160 -#define case_160_SBOX32(hash,state,key) _SBOX32_CASE(160,hash,state,key) +#define case_160_SBOX32(hash,state,key) SBOX32_CASE_(160,hash,state,key) #else #define case_160_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 159 -#define case_159_SBOX32(hash,state,key) _SBOX32_CASE(159,hash,state,key) +#define case_159_SBOX32(hash,state,key) SBOX32_CASE_(159,hash,state,key) #else #define case_159_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 158 -#define case_158_SBOX32(hash,state,key) _SBOX32_CASE(158,hash,state,key) +#define case_158_SBOX32(hash,state,key) SBOX32_CASE_(158,hash,state,key) #else #define case_158_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 157 -#define case_157_SBOX32(hash,state,key) _SBOX32_CASE(157,hash,state,key) +#define case_157_SBOX32(hash,state,key) SBOX32_CASE_(157,hash,state,key) #else #define case_157_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 156 -#define case_156_SBOX32(hash,state,key) _SBOX32_CASE(156,hash,state,key) +#define case_156_SBOX32(hash,state,key) SBOX32_CASE_(156,hash,state,key) #else #define case_156_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 155 -#define case_155_SBOX32(hash,state,key) _SBOX32_CASE(155,hash,state,key) +#define case_155_SBOX32(hash,state,key) SBOX32_CASE_(155,hash,state,key) #else #define case_155_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 154 -#define case_154_SBOX32(hash,state,key) _SBOX32_CASE(154,hash,state,key) +#define case_154_SBOX32(hash,state,key) SBOX32_CASE_(154,hash,state,key) #else #define case_154_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 153 -#define case_153_SBOX32(hash,state,key) _SBOX32_CASE(153,hash,state,key) +#define case_153_SBOX32(hash,state,key) SBOX32_CASE_(153,hash,state,key) #else #define case_153_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 152 -#define case_152_SBOX32(hash,state,key) _SBOX32_CASE(152,hash,state,key) +#define case_152_SBOX32(hash,state,key) SBOX32_CASE_(152,hash,state,key) #else #define case_152_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 151 -#define case_151_SBOX32(hash,state,key) _SBOX32_CASE(151,hash,state,key) +#define case_151_SBOX32(hash,state,key) SBOX32_CASE_(151,hash,state,key) #else #define case_151_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 150 -#define case_150_SBOX32(hash,state,key) _SBOX32_CASE(150,hash,state,key) +#define case_150_SBOX32(hash,state,key) SBOX32_CASE_(150,hash,state,key) #else #define case_150_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 149 -#define case_149_SBOX32(hash,state,key) _SBOX32_CASE(149,hash,state,key) +#define case_149_SBOX32(hash,state,key) SBOX32_CASE_(149,hash,state,key) #else #define case_149_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 148 -#define case_148_SBOX32(hash,state,key) _SBOX32_CASE(148,hash,state,key) +#define case_148_SBOX32(hash,state,key) SBOX32_CASE_(148,hash,state,key) #else #define case_148_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 147 -#define case_147_SBOX32(hash,state,key) _SBOX32_CASE(147,hash,state,key) +#define case_147_SBOX32(hash,state,key) SBOX32_CASE_(147,hash,state,key) #else #define case_147_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 146 -#define case_146_SBOX32(hash,state,key) _SBOX32_CASE(146,hash,state,key) +#define case_146_SBOX32(hash,state,key) SBOX32_CASE_(146,hash,state,key) #else #define case_146_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 145 -#define case_145_SBOX32(hash,state,key) _SBOX32_CASE(145,hash,state,key) +#define case_145_SBOX32(hash,state,key) SBOX32_CASE_(145,hash,state,key) #else #define case_145_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 144 -#define case_144_SBOX32(hash,state,key) _SBOX32_CASE(144,hash,state,key) +#define case_144_SBOX32(hash,state,key) SBOX32_CASE_(144,hash,state,key) #else #define case_144_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 143 -#define case_143_SBOX32(hash,state,key) _SBOX32_CASE(143,hash,state,key) +#define case_143_SBOX32(hash,state,key) SBOX32_CASE_(143,hash,state,key) #else #define case_143_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 142 -#define case_142_SBOX32(hash,state,key) _SBOX32_CASE(142,hash,state,key) +#define case_142_SBOX32(hash,state,key) SBOX32_CASE_(142,hash,state,key) #else #define case_142_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 141 -#define case_141_SBOX32(hash,state,key) _SBOX32_CASE(141,hash,state,key) +#define case_141_SBOX32(hash,state,key) SBOX32_CASE_(141,hash,state,key) #else #define case_141_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 140 -#define case_140_SBOX32(hash,state,key) _SBOX32_CASE(140,hash,state,key) +#define case_140_SBOX32(hash,state,key) SBOX32_CASE_(140,hash,state,key) #else #define case_140_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 139 -#define case_139_SBOX32(hash,state,key) _SBOX32_CASE(139,hash,state,key) +#define case_139_SBOX32(hash,state,key) SBOX32_CASE_(139,hash,state,key) #else #define case_139_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 138 -#define case_138_SBOX32(hash,state,key) _SBOX32_CASE(138,hash,state,key) +#define case_138_SBOX32(hash,state,key) SBOX32_CASE_(138,hash,state,key) #else #define case_138_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 137 -#define case_137_SBOX32(hash,state,key) _SBOX32_CASE(137,hash,state,key) +#define case_137_SBOX32(hash,state,key) SBOX32_CASE_(137,hash,state,key) #else #define case_137_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 136 -#define case_136_SBOX32(hash,state,key) _SBOX32_CASE(136,hash,state,key) +#define case_136_SBOX32(hash,state,key) SBOX32_CASE_(136,hash,state,key) #else #define case_136_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 135 -#define case_135_SBOX32(hash,state,key) _SBOX32_CASE(135,hash,state,key) +#define case_135_SBOX32(hash,state,key) SBOX32_CASE_(135,hash,state,key) #else #define case_135_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 134 -#define case_134_SBOX32(hash,state,key) _SBOX32_CASE(134,hash,state,key) +#define case_134_SBOX32(hash,state,key) SBOX32_CASE_(134,hash,state,key) #else #define case_134_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 133 -#define case_133_SBOX32(hash,state,key) _SBOX32_CASE(133,hash,state,key) +#define case_133_SBOX32(hash,state,key) SBOX32_CASE_(133,hash,state,key) #else #define case_133_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 132 -#define case_132_SBOX32(hash,state,key) _SBOX32_CASE(132,hash,state,key) +#define case_132_SBOX32(hash,state,key) SBOX32_CASE_(132,hash,state,key) #else #define case_132_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 131 -#define case_131_SBOX32(hash,state,key) _SBOX32_CASE(131,hash,state,key) +#define case_131_SBOX32(hash,state,key) SBOX32_CASE_(131,hash,state,key) #else #define case_131_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 130 -#define case_130_SBOX32(hash,state,key) _SBOX32_CASE(130,hash,state,key) +#define case_130_SBOX32(hash,state,key) SBOX32_CASE_(130,hash,state,key) #else #define case_130_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 129 -#define case_129_SBOX32(hash,state,key) _SBOX32_CASE(129,hash,state,key) +#define case_129_SBOX32(hash,state,key) SBOX32_CASE_(129,hash,state,key) #else #define case_129_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 128 -#define case_128_SBOX32(hash,state,key) _SBOX32_CASE(128,hash,state,key) +#define case_128_SBOX32(hash,state,key) SBOX32_CASE_(128,hash,state,key) #else #define case_128_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 127 -#define case_127_SBOX32(hash,state,key) _SBOX32_CASE(127,hash,state,key) +#define case_127_SBOX32(hash,state,key) SBOX32_CASE_(127,hash,state,key) #else #define case_127_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 126 -#define case_126_SBOX32(hash,state,key) _SBOX32_CASE(126,hash,state,key) +#define case_126_SBOX32(hash,state,key) SBOX32_CASE_(126,hash,state,key) #else #define case_126_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 125 -#define case_125_SBOX32(hash,state,key) _SBOX32_CASE(125,hash,state,key) +#define case_125_SBOX32(hash,state,key) SBOX32_CASE_(125,hash,state,key) #else #define case_125_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 124 -#define case_124_SBOX32(hash,state,key) _SBOX32_CASE(124,hash,state,key) +#define case_124_SBOX32(hash,state,key) SBOX32_CASE_(124,hash,state,key) #else #define case_124_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 123 -#define case_123_SBOX32(hash,state,key) _SBOX32_CASE(123,hash,state,key) +#define case_123_SBOX32(hash,state,key) SBOX32_CASE_(123,hash,state,key) #else #define case_123_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 122 -#define case_122_SBOX32(hash,state,key) _SBOX32_CASE(122,hash,state,key) +#define case_122_SBOX32(hash,state,key) SBOX32_CASE_(122,hash,state,key) #else #define case_122_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 121 -#define case_121_SBOX32(hash,state,key) _SBOX32_CASE(121,hash,state,key) +#define case_121_SBOX32(hash,state,key) SBOX32_CASE_(121,hash,state,key) #else #define case_121_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 120 -#define case_120_SBOX32(hash,state,key) _SBOX32_CASE(120,hash,state,key) +#define case_120_SBOX32(hash,state,key) SBOX32_CASE_(120,hash,state,key) #else #define case_120_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 119 -#define case_119_SBOX32(hash,state,key) _SBOX32_CASE(119,hash,state,key) +#define case_119_SBOX32(hash,state,key) SBOX32_CASE_(119,hash,state,key) #else #define case_119_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 118 -#define case_118_SBOX32(hash,state,key) _SBOX32_CASE(118,hash,state,key) +#define case_118_SBOX32(hash,state,key) SBOX32_CASE_(118,hash,state,key) #else #define case_118_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 117 -#define case_117_SBOX32(hash,state,key) _SBOX32_CASE(117,hash,state,key) +#define case_117_SBOX32(hash,state,key) SBOX32_CASE_(117,hash,state,key) #else #define case_117_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 116 -#define case_116_SBOX32(hash,state,key) _SBOX32_CASE(116,hash,state,key) +#define case_116_SBOX32(hash,state,key) SBOX32_CASE_(116,hash,state,key) #else #define case_116_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 115 -#define case_115_SBOX32(hash,state,key) _SBOX32_CASE(115,hash,state,key) +#define case_115_SBOX32(hash,state,key) SBOX32_CASE_(115,hash,state,key) #else #define case_115_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 114 -#define case_114_SBOX32(hash,state,key) _SBOX32_CASE(114,hash,state,key) +#define case_114_SBOX32(hash,state,key) SBOX32_CASE_(114,hash,state,key) #else #define case_114_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 113 -#define case_113_SBOX32(hash,state,key) _SBOX32_CASE(113,hash,state,key) +#define case_113_SBOX32(hash,state,key) SBOX32_CASE_(113,hash,state,key) #else #define case_113_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 112 -#define case_112_SBOX32(hash,state,key) _SBOX32_CASE(112,hash,state,key) +#define case_112_SBOX32(hash,state,key) SBOX32_CASE_(112,hash,state,key) #else #define case_112_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 111 -#define case_111_SBOX32(hash,state,key) _SBOX32_CASE(111,hash,state,key) +#define case_111_SBOX32(hash,state,key) SBOX32_CASE_(111,hash,state,key) #else #define case_111_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 110 -#define case_110_SBOX32(hash,state,key) _SBOX32_CASE(110,hash,state,key) +#define case_110_SBOX32(hash,state,key) SBOX32_CASE_(110,hash,state,key) #else #define case_110_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 109 -#define case_109_SBOX32(hash,state,key) _SBOX32_CASE(109,hash,state,key) +#define case_109_SBOX32(hash,state,key) SBOX32_CASE_(109,hash,state,key) #else #define case_109_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 108 -#define case_108_SBOX32(hash,state,key) _SBOX32_CASE(108,hash,state,key) +#define case_108_SBOX32(hash,state,key) SBOX32_CASE_(108,hash,state,key) #else #define case_108_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 107 -#define case_107_SBOX32(hash,state,key) _SBOX32_CASE(107,hash,state,key) +#define case_107_SBOX32(hash,state,key) SBOX32_CASE_(107,hash,state,key) #else #define case_107_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 106 -#define case_106_SBOX32(hash,state,key) _SBOX32_CASE(106,hash,state,key) +#define case_106_SBOX32(hash,state,key) SBOX32_CASE_(106,hash,state,key) #else #define case_106_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 105 -#define case_105_SBOX32(hash,state,key) _SBOX32_CASE(105,hash,state,key) +#define case_105_SBOX32(hash,state,key) SBOX32_CASE_(105,hash,state,key) #else #define case_105_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 104 -#define case_104_SBOX32(hash,state,key) _SBOX32_CASE(104,hash,state,key) +#define case_104_SBOX32(hash,state,key) SBOX32_CASE_(104,hash,state,key) #else #define case_104_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 103 -#define case_103_SBOX32(hash,state,key) _SBOX32_CASE(103,hash,state,key) +#define case_103_SBOX32(hash,state,key) SBOX32_CASE_(103,hash,state,key) #else #define case_103_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 102 -#define case_102_SBOX32(hash,state,key) _SBOX32_CASE(102,hash,state,key) +#define case_102_SBOX32(hash,state,key) SBOX32_CASE_(102,hash,state,key) #else #define case_102_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 101 -#define case_101_SBOX32(hash,state,key) _SBOX32_CASE(101,hash,state,key) +#define case_101_SBOX32(hash,state,key) SBOX32_CASE_(101,hash,state,key) #else #define case_101_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 100 -#define case_100_SBOX32(hash,state,key) _SBOX32_CASE(100,hash,state,key) +#define case_100_SBOX32(hash,state,key) SBOX32_CASE_(100,hash,state,key) #else #define case_100_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 99 -#define case_99_SBOX32(hash,state,key) _SBOX32_CASE(99,hash,state,key) +#define case_99_SBOX32(hash,state,key) SBOX32_CASE_(99,hash,state,key) #else #define case_99_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 98 -#define case_98_SBOX32(hash,state,key) _SBOX32_CASE(98,hash,state,key) +#define case_98_SBOX32(hash,state,key) SBOX32_CASE_(98,hash,state,key) #else #define case_98_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 97 -#define case_97_SBOX32(hash,state,key) _SBOX32_CASE(97,hash,state,key) +#define case_97_SBOX32(hash,state,key) SBOX32_CASE_(97,hash,state,key) #else #define case_97_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 96 -#define case_96_SBOX32(hash,state,key) _SBOX32_CASE(96,hash,state,key) +#define case_96_SBOX32(hash,state,key) SBOX32_CASE_(96,hash,state,key) #else #define case_96_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 95 -#define case_95_SBOX32(hash,state,key) _SBOX32_CASE(95,hash,state,key) +#define case_95_SBOX32(hash,state,key) SBOX32_CASE_(95,hash,state,key) #else #define case_95_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 94 -#define case_94_SBOX32(hash,state,key) _SBOX32_CASE(94,hash,state,key) +#define case_94_SBOX32(hash,state,key) SBOX32_CASE_(94,hash,state,key) #else #define case_94_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 93 -#define case_93_SBOX32(hash,state,key) _SBOX32_CASE(93,hash,state,key) +#define case_93_SBOX32(hash,state,key) SBOX32_CASE_(93,hash,state,key) #else #define case_93_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 92 -#define case_92_SBOX32(hash,state,key) _SBOX32_CASE(92,hash,state,key) +#define case_92_SBOX32(hash,state,key) SBOX32_CASE_(92,hash,state,key) #else #define case_92_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 91 -#define case_91_SBOX32(hash,state,key) _SBOX32_CASE(91,hash,state,key) +#define case_91_SBOX32(hash,state,key) SBOX32_CASE_(91,hash,state,key) #else #define case_91_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 90 -#define case_90_SBOX32(hash,state,key) _SBOX32_CASE(90,hash,state,key) +#define case_90_SBOX32(hash,state,key) SBOX32_CASE_(90,hash,state,key) #else #define case_90_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 89 -#define case_89_SBOX32(hash,state,key) _SBOX32_CASE(89,hash,state,key) +#define case_89_SBOX32(hash,state,key) SBOX32_CASE_(89,hash,state,key) #else #define case_89_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 88 -#define case_88_SBOX32(hash,state,key) _SBOX32_CASE(88,hash,state,key) +#define case_88_SBOX32(hash,state,key) SBOX32_CASE_(88,hash,state,key) #else #define case_88_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 87 -#define case_87_SBOX32(hash,state,key) _SBOX32_CASE(87,hash,state,key) +#define case_87_SBOX32(hash,state,key) SBOX32_CASE_(87,hash,state,key) #else #define case_87_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 86 -#define case_86_SBOX32(hash,state,key) _SBOX32_CASE(86,hash,state,key) +#define case_86_SBOX32(hash,state,key) SBOX32_CASE_(86,hash,state,key) #else #define case_86_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 85 -#define case_85_SBOX32(hash,state,key) _SBOX32_CASE(85,hash,state,key) +#define case_85_SBOX32(hash,state,key) SBOX32_CASE_(85,hash,state,key) #else #define case_85_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 84 -#define case_84_SBOX32(hash,state,key) _SBOX32_CASE(84,hash,state,key) +#define case_84_SBOX32(hash,state,key) SBOX32_CASE_(84,hash,state,key) #else #define case_84_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 83 -#define case_83_SBOX32(hash,state,key) _SBOX32_CASE(83,hash,state,key) +#define case_83_SBOX32(hash,state,key) SBOX32_CASE_(83,hash,state,key) #else #define case_83_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 82 -#define case_82_SBOX32(hash,state,key) _SBOX32_CASE(82,hash,state,key) +#define case_82_SBOX32(hash,state,key) SBOX32_CASE_(82,hash,state,key) #else #define case_82_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 81 -#define case_81_SBOX32(hash,state,key) _SBOX32_CASE(81,hash,state,key) +#define case_81_SBOX32(hash,state,key) SBOX32_CASE_(81,hash,state,key) #else #define case_81_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 80 -#define case_80_SBOX32(hash,state,key) _SBOX32_CASE(80,hash,state,key) +#define case_80_SBOX32(hash,state,key) SBOX32_CASE_(80,hash,state,key) #else #define case_80_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 79 -#define case_79_SBOX32(hash,state,key) _SBOX32_CASE(79,hash,state,key) +#define case_79_SBOX32(hash,state,key) SBOX32_CASE_(79,hash,state,key) #else #define case_79_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 78 -#define case_78_SBOX32(hash,state,key) _SBOX32_CASE(78,hash,state,key) +#define case_78_SBOX32(hash,state,key) SBOX32_CASE_(78,hash,state,key) #else #define case_78_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 77 -#define case_77_SBOX32(hash,state,key) _SBOX32_CASE(77,hash,state,key) +#define case_77_SBOX32(hash,state,key) SBOX32_CASE_(77,hash,state,key) #else #define case_77_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 76 -#define case_76_SBOX32(hash,state,key) _SBOX32_CASE(76,hash,state,key) +#define case_76_SBOX32(hash,state,key) SBOX32_CASE_(76,hash,state,key) #else #define case_76_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 75 -#define case_75_SBOX32(hash,state,key) _SBOX32_CASE(75,hash,state,key) +#define case_75_SBOX32(hash,state,key) SBOX32_CASE_(75,hash,state,key) #else #define case_75_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 74 -#define case_74_SBOX32(hash,state,key) _SBOX32_CASE(74,hash,state,key) +#define case_74_SBOX32(hash,state,key) SBOX32_CASE_(74,hash,state,key) #else #define case_74_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 73 -#define case_73_SBOX32(hash,state,key) _SBOX32_CASE(73,hash,state,key) +#define case_73_SBOX32(hash,state,key) SBOX32_CASE_(73,hash,state,key) #else #define case_73_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 72 -#define case_72_SBOX32(hash,state,key) _SBOX32_CASE(72,hash,state,key) +#define case_72_SBOX32(hash,state,key) SBOX32_CASE_(72,hash,state,key) #else #define case_72_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 71 -#define case_71_SBOX32(hash,state,key) _SBOX32_CASE(71,hash,state,key) +#define case_71_SBOX32(hash,state,key) SBOX32_CASE_(71,hash,state,key) #else #define case_71_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 70 -#define case_70_SBOX32(hash,state,key) _SBOX32_CASE(70,hash,state,key) +#define case_70_SBOX32(hash,state,key) SBOX32_CASE_(70,hash,state,key) #else #define case_70_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 69 -#define case_69_SBOX32(hash,state,key) _SBOX32_CASE(69,hash,state,key) +#define case_69_SBOX32(hash,state,key) SBOX32_CASE_(69,hash,state,key) #else #define case_69_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 68 -#define case_68_SBOX32(hash,state,key) _SBOX32_CASE(68,hash,state,key) +#define case_68_SBOX32(hash,state,key) SBOX32_CASE_(68,hash,state,key) #else #define case_68_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 67 -#define case_67_SBOX32(hash,state,key) _SBOX32_CASE(67,hash,state,key) +#define case_67_SBOX32(hash,state,key) SBOX32_CASE_(67,hash,state,key) #else #define case_67_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 66 -#define case_66_SBOX32(hash,state,key) _SBOX32_CASE(66,hash,state,key) +#define case_66_SBOX32(hash,state,key) SBOX32_CASE_(66,hash,state,key) #else #define case_66_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 65 -#define case_65_SBOX32(hash,state,key) _SBOX32_CASE(65,hash,state,key) +#define case_65_SBOX32(hash,state,key) SBOX32_CASE_(65,hash,state,key) #else #define case_65_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 64 -#define case_64_SBOX32(hash,state,key) _SBOX32_CASE(64,hash,state,key) +#define case_64_SBOX32(hash,state,key) SBOX32_CASE_(64,hash,state,key) #else #define case_64_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 63 -#define case_63_SBOX32(hash,state,key) _SBOX32_CASE(63,hash,state,key) +#define case_63_SBOX32(hash,state,key) SBOX32_CASE_(63,hash,state,key) #else #define case_63_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 62 -#define case_62_SBOX32(hash,state,key) _SBOX32_CASE(62,hash,state,key) +#define case_62_SBOX32(hash,state,key) SBOX32_CASE_(62,hash,state,key) #else #define case_62_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 61 -#define case_61_SBOX32(hash,state,key) _SBOX32_CASE(61,hash,state,key) +#define case_61_SBOX32(hash,state,key) SBOX32_CASE_(61,hash,state,key) #else #define case_61_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 60 -#define case_60_SBOX32(hash,state,key) _SBOX32_CASE(60,hash,state,key) +#define case_60_SBOX32(hash,state,key) SBOX32_CASE_(60,hash,state,key) #else #define case_60_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 59 -#define case_59_SBOX32(hash,state,key) _SBOX32_CASE(59,hash,state,key) +#define case_59_SBOX32(hash,state,key) SBOX32_CASE_(59,hash,state,key) #else #define case_59_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 58 -#define case_58_SBOX32(hash,state,key) _SBOX32_CASE(58,hash,state,key) +#define case_58_SBOX32(hash,state,key) SBOX32_CASE_(58,hash,state,key) #else #define case_58_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 57 -#define case_57_SBOX32(hash,state,key) _SBOX32_CASE(57,hash,state,key) +#define case_57_SBOX32(hash,state,key) SBOX32_CASE_(57,hash,state,key) #else #define case_57_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 56 -#define case_56_SBOX32(hash,state,key) _SBOX32_CASE(56,hash,state,key) +#define case_56_SBOX32(hash,state,key) SBOX32_CASE_(56,hash,state,key) #else #define case_56_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 55 -#define case_55_SBOX32(hash,state,key) _SBOX32_CASE(55,hash,state,key) +#define case_55_SBOX32(hash,state,key) SBOX32_CASE_(55,hash,state,key) #else #define case_55_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 54 -#define case_54_SBOX32(hash,state,key) _SBOX32_CASE(54,hash,state,key) +#define case_54_SBOX32(hash,state,key) SBOX32_CASE_(54,hash,state,key) #else #define case_54_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 53 -#define case_53_SBOX32(hash,state,key) _SBOX32_CASE(53,hash,state,key) +#define case_53_SBOX32(hash,state,key) SBOX32_CASE_(53,hash,state,key) #else #define case_53_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 52 -#define case_52_SBOX32(hash,state,key) _SBOX32_CASE(52,hash,state,key) +#define case_52_SBOX32(hash,state,key) SBOX32_CASE_(52,hash,state,key) #else #define case_52_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 51 -#define case_51_SBOX32(hash,state,key) _SBOX32_CASE(51,hash,state,key) +#define case_51_SBOX32(hash,state,key) SBOX32_CASE_(51,hash,state,key) #else #define case_51_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 50 -#define case_50_SBOX32(hash,state,key) _SBOX32_CASE(50,hash,state,key) +#define case_50_SBOX32(hash,state,key) SBOX32_CASE_(50,hash,state,key) #else #define case_50_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 49 -#define case_49_SBOX32(hash,state,key) _SBOX32_CASE(49,hash,state,key) +#define case_49_SBOX32(hash,state,key) SBOX32_CASE_(49,hash,state,key) #else #define case_49_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 48 -#define case_48_SBOX32(hash,state,key) _SBOX32_CASE(48,hash,state,key) +#define case_48_SBOX32(hash,state,key) SBOX32_CASE_(48,hash,state,key) #else #define case_48_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 47 -#define case_47_SBOX32(hash,state,key) _SBOX32_CASE(47,hash,state,key) +#define case_47_SBOX32(hash,state,key) SBOX32_CASE_(47,hash,state,key) #else #define case_47_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 46 -#define case_46_SBOX32(hash,state,key) _SBOX32_CASE(46,hash,state,key) +#define case_46_SBOX32(hash,state,key) SBOX32_CASE_(46,hash,state,key) #else #define case_46_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 45 -#define case_45_SBOX32(hash,state,key) _SBOX32_CASE(45,hash,state,key) +#define case_45_SBOX32(hash,state,key) SBOX32_CASE_(45,hash,state,key) #else #define case_45_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 44 -#define case_44_SBOX32(hash,state,key) _SBOX32_CASE(44,hash,state,key) +#define case_44_SBOX32(hash,state,key) SBOX32_CASE_(44,hash,state,key) #else #define case_44_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 43 -#define case_43_SBOX32(hash,state,key) _SBOX32_CASE(43,hash,state,key) +#define case_43_SBOX32(hash,state,key) SBOX32_CASE_(43,hash,state,key) #else #define case_43_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 42 -#define case_42_SBOX32(hash,state,key) _SBOX32_CASE(42,hash,state,key) +#define case_42_SBOX32(hash,state,key) SBOX32_CASE_(42,hash,state,key) #else #define case_42_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 41 -#define case_41_SBOX32(hash,state,key) _SBOX32_CASE(41,hash,state,key) +#define case_41_SBOX32(hash,state,key) SBOX32_CASE_(41,hash,state,key) #else #define case_41_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 40 -#define case_40_SBOX32(hash,state,key) _SBOX32_CASE(40,hash,state,key) +#define case_40_SBOX32(hash,state,key) SBOX32_CASE_(40,hash,state,key) #else #define case_40_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 39 -#define case_39_SBOX32(hash,state,key) _SBOX32_CASE(39,hash,state,key) +#define case_39_SBOX32(hash,state,key) SBOX32_CASE_(39,hash,state,key) #else #define case_39_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 38 -#define case_38_SBOX32(hash,state,key) _SBOX32_CASE(38,hash,state,key) +#define case_38_SBOX32(hash,state,key) SBOX32_CASE_(38,hash,state,key) #else #define case_38_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 37 -#define case_37_SBOX32(hash,state,key) _SBOX32_CASE(37,hash,state,key) +#define case_37_SBOX32(hash,state,key) SBOX32_CASE_(37,hash,state,key) #else #define case_37_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 36 -#define case_36_SBOX32(hash,state,key) _SBOX32_CASE(36,hash,state,key) +#define case_36_SBOX32(hash,state,key) SBOX32_CASE_(36,hash,state,key) #else #define case_36_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 35 -#define case_35_SBOX32(hash,state,key) _SBOX32_CASE(35,hash,state,key) +#define case_35_SBOX32(hash,state,key) SBOX32_CASE_(35,hash,state,key) #else #define case_35_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 34 -#define case_34_SBOX32(hash,state,key) _SBOX32_CASE(34,hash,state,key) +#define case_34_SBOX32(hash,state,key) SBOX32_CASE_(34,hash,state,key) #else #define case_34_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 33 -#define case_33_SBOX32(hash,state,key) _SBOX32_CASE(33,hash,state,key) +#define case_33_SBOX32(hash,state,key) SBOX32_CASE_(33,hash,state,key) #else #define case_33_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 32 -#define case_32_SBOX32(hash,state,key) _SBOX32_CASE(32,hash,state,key) +#define case_32_SBOX32(hash,state,key) SBOX32_CASE_(32,hash,state,key) #else #define case_32_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 31 -#define case_31_SBOX32(hash,state,key) _SBOX32_CASE(31,hash,state,key) +#define case_31_SBOX32(hash,state,key) SBOX32_CASE_(31,hash,state,key) #else #define case_31_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 30 -#define case_30_SBOX32(hash,state,key) _SBOX32_CASE(30,hash,state,key) +#define case_30_SBOX32(hash,state,key) SBOX32_CASE_(30,hash,state,key) #else #define case_30_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 29 -#define case_29_SBOX32(hash,state,key) _SBOX32_CASE(29,hash,state,key) +#define case_29_SBOX32(hash,state,key) SBOX32_CASE_(29,hash,state,key) #else #define case_29_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 28 -#define case_28_SBOX32(hash,state,key) _SBOX32_CASE(28,hash,state,key) +#define case_28_SBOX32(hash,state,key) SBOX32_CASE_(28,hash,state,key) #else #define case_28_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 27 -#define case_27_SBOX32(hash,state,key) _SBOX32_CASE(27,hash,state,key) +#define case_27_SBOX32(hash,state,key) SBOX32_CASE_(27,hash,state,key) #else #define case_27_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 26 -#define case_26_SBOX32(hash,state,key) _SBOX32_CASE(26,hash,state,key) +#define case_26_SBOX32(hash,state,key) SBOX32_CASE_(26,hash,state,key) #else #define case_26_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 25 -#define case_25_SBOX32(hash,state,key) _SBOX32_CASE(25,hash,state,key) +#define case_25_SBOX32(hash,state,key) SBOX32_CASE_(25,hash,state,key) #else #define case_25_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 24 -#define case_24_SBOX32(hash,state,key) _SBOX32_CASE(24,hash,state,key) +#define case_24_SBOX32(hash,state,key) SBOX32_CASE_(24,hash,state,key) #else #define case_24_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 23 -#define case_23_SBOX32(hash,state,key) _SBOX32_CASE(23,hash,state,key) +#define case_23_SBOX32(hash,state,key) SBOX32_CASE_(23,hash,state,key) #else #define case_23_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 22 -#define case_22_SBOX32(hash,state,key) _SBOX32_CASE(22,hash,state,key) +#define case_22_SBOX32(hash,state,key) SBOX32_CASE_(22,hash,state,key) #else #define case_22_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 21 -#define case_21_SBOX32(hash,state,key) _SBOX32_CASE(21,hash,state,key) +#define case_21_SBOX32(hash,state,key) SBOX32_CASE_(21,hash,state,key) #else #define case_21_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 20 -#define case_20_SBOX32(hash,state,key) _SBOX32_CASE(20,hash,state,key) +#define case_20_SBOX32(hash,state,key) SBOX32_CASE_(20,hash,state,key) #else #define case_20_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 19 -#define case_19_SBOX32(hash,state,key) _SBOX32_CASE(19,hash,state,key) +#define case_19_SBOX32(hash,state,key) SBOX32_CASE_(19,hash,state,key) #else #define case_19_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 18 -#define case_18_SBOX32(hash,state,key) _SBOX32_CASE(18,hash,state,key) +#define case_18_SBOX32(hash,state,key) SBOX32_CASE_(18,hash,state,key) #else #define case_18_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 17 -#define case_17_SBOX32(hash,state,key) _SBOX32_CASE(17,hash,state,key) +#define case_17_SBOX32(hash,state,key) SBOX32_CASE_(17,hash,state,key) #else #define case_17_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 16 -#define case_16_SBOX32(hash,state,key) _SBOX32_CASE(16,hash,state,key) +#define case_16_SBOX32(hash,state,key) SBOX32_CASE_(16,hash,state,key) #else #define case_16_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 15 -#define case_15_SBOX32(hash,state,key) _SBOX32_CASE(15,hash,state,key) +#define case_15_SBOX32(hash,state,key) SBOX32_CASE_(15,hash,state,key) #else #define case_15_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 14 -#define case_14_SBOX32(hash,state,key) _SBOX32_CASE(14,hash,state,key) +#define case_14_SBOX32(hash,state,key) SBOX32_CASE_(14,hash,state,key) #else #define case_14_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 13 -#define case_13_SBOX32(hash,state,key) _SBOX32_CASE(13,hash,state,key) +#define case_13_SBOX32(hash,state,key) SBOX32_CASE_(13,hash,state,key) #else #define case_13_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 12 -#define case_12_SBOX32(hash,state,key) _SBOX32_CASE(12,hash,state,key) +#define case_12_SBOX32(hash,state,key) SBOX32_CASE_(12,hash,state,key) #else #define case_12_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 11 -#define case_11_SBOX32(hash,state,key) _SBOX32_CASE(11,hash,state,key) +#define case_11_SBOX32(hash,state,key) SBOX32_CASE_(11,hash,state,key) #else #define case_11_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 10 -#define case_10_SBOX32(hash,state,key) _SBOX32_CASE(10,hash,state,key) +#define case_10_SBOX32(hash,state,key) SBOX32_CASE_(10,hash,state,key) #else #define case_10_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 9 -#define case_9_SBOX32(hash,state,key) _SBOX32_CASE(9,hash,state,key) +#define case_9_SBOX32(hash,state,key) SBOX32_CASE_(9,hash,state,key) #else #define case_9_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 8 -#define case_8_SBOX32(hash,state,key) _SBOX32_CASE(8,hash,state,key) +#define case_8_SBOX32(hash,state,key) SBOX32_CASE_(8,hash,state,key) #else #define case_8_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 7 -#define case_7_SBOX32(hash,state,key) _SBOX32_CASE(7,hash,state,key) +#define case_7_SBOX32(hash,state,key) SBOX32_CASE_(7,hash,state,key) #else #define case_7_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 6 -#define case_6_SBOX32(hash,state,key) _SBOX32_CASE(6,hash,state,key) +#define case_6_SBOX32(hash,state,key) SBOX32_CASE_(6,hash,state,key) #else #define case_6_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 5 -#define case_5_SBOX32(hash,state,key) _SBOX32_CASE(5,hash,state,key) +#define case_5_SBOX32(hash,state,key) SBOX32_CASE_(5,hash,state,key) #else #define case_5_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 4 -#define case_4_SBOX32(hash,state,key) _SBOX32_CASE(4,hash,state,key) +#define case_4_SBOX32(hash,state,key) SBOX32_CASE_(4,hash,state,key) #else #define case_4_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 3 -#define case_3_SBOX32(hash,state,key) _SBOX32_CASE(3,hash,state,key) +#define case_3_SBOX32(hash,state,key) SBOX32_CASE_(3,hash,state,key) #else #define case_3_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 2 -#define case_2_SBOX32(hash,state,key) _SBOX32_CASE(2,hash,state,key) +#define case_2_SBOX32(hash,state,key) SBOX32_CASE_(2,hash,state,key) #else #define case_2_SBOX32(hash,state,key) /**/ #endif #if SBOX32_MAX_LEN >= 1 -#define case_1_SBOX32(hash,state,key) _SBOX32_CASE(1,hash,state,key) +#define case_1_SBOX32(hash,state,key) SBOX32_CASE_(1,hash,state,key) #else #define case_1_SBOX32(hash,state,key) /**/ #endif @@ -1400,7 +1400,7 @@ #define SBOX32_CHURN_ROUNDS 128 #endif -#define _SBOX32_CASE(len,hash,state,key) \ +#define SBOX32_CASE_(len,hash,state,key) \ /* FALLTHROUGH */ \ case len: hash ^= state[ 1 + ( 256 * ( len - 1 ) ) + key[ len - 1 ] ]; @@ -1733,4 +1733,260 @@ SBOX32_STATIC_INLINE U32 sbox32_hash128( return sbox32_hash_with_state((U8*)state,key,key_len); } +#undef case_100_SBOX32 +#undef case_101_SBOX32 +#undef case_102_SBOX32 +#undef case_103_SBOX32 +#undef case_104_SBOX32 +#undef case_105_SBOX32 +#undef case_106_SBOX32 +#undef case_107_SBOX32 +#undef case_108_SBOX32 +#undef case_109_SBOX32 +#undef case_10_SBOX32 +#undef case_110_SBOX32 +#undef case_111_SBOX32 +#undef case_112_SBOX32 +#undef case_113_SBOX32 +#undef case_114_SBOX32 +#undef case_115_SBOX32 +#undef case_116_SBOX32 +#undef case_117_SBOX32 +#undef case_118_SBOX32 +#undef case_119_SBOX32 +#undef case_11_SBOX32 +#undef case_120_SBOX32 +#undef case_121_SBOX32 +#undef case_122_SBOX32 +#undef case_123_SBOX32 +#undef case_124_SBOX32 +#undef case_125_SBOX32 +#undef case_126_SBOX32 +#undef case_127_SBOX32 +#undef case_128_SBOX32 +#undef case_129_SBOX32 +#undef case_12_SBOX32 +#undef case_130_SBOX32 +#undef case_131_SBOX32 +#undef case_132_SBOX32 +#undef case_133_SBOX32 +#undef case_134_SBOX32 +#undef case_135_SBOX32 +#undef case_136_SBOX32 +#undef case_137_SBOX32 +#undef case_138_SBOX32 +#undef case_139_SBOX32 +#undef case_13_SBOX32 +#undef case_140_SBOX32 +#undef case_141_SBOX32 +#undef case_142_SBOX32 +#undef case_143_SBOX32 +#undef case_144_SBOX32 +#undef case_145_SBOX32 +#undef case_146_SBOX32 +#undef case_147_SBOX32 +#undef case_148_SBOX32 +#undef case_149_SBOX32 +#undef case_14_SBOX32 +#undef case_150_SBOX32 +#undef case_151_SBOX32 +#undef case_152_SBOX32 +#undef case_153_SBOX32 +#undef case_154_SBOX32 +#undef case_155_SBOX32 +#undef case_156_SBOX32 +#undef case_157_SBOX32 +#undef case_158_SBOX32 +#undef case_159_SBOX32 +#undef case_15_SBOX32 +#undef case_160_SBOX32 +#undef case_161_SBOX32 +#undef case_162_SBOX32 +#undef case_163_SBOX32 +#undef case_164_SBOX32 +#undef case_165_SBOX32 +#undef case_166_SBOX32 +#undef case_167_SBOX32 +#undef case_168_SBOX32 +#undef case_169_SBOX32 +#undef case_16_SBOX32 +#undef case_170_SBOX32 +#undef case_171_SBOX32 +#undef case_172_SBOX32 +#undef case_173_SBOX32 +#undef case_174_SBOX32 +#undef case_175_SBOX32 +#undef case_176_SBOX32 +#undef case_177_SBOX32 +#undef case_178_SBOX32 +#undef case_179_SBOX32 +#undef case_17_SBOX32 +#undef case_180_SBOX32 +#undef case_181_SBOX32 +#undef case_182_SBOX32 +#undef case_183_SBOX32 +#undef case_184_SBOX32 +#undef case_185_SBOX32 +#undef case_186_SBOX32 +#undef case_187_SBOX32 +#undef case_188_SBOX32 +#undef case_189_SBOX32 +#undef case_18_SBOX32 +#undef case_190_SBOX32 +#undef case_191_SBOX32 +#undef case_192_SBOX32 +#undef case_193_SBOX32 +#undef case_194_SBOX32 +#undef case_195_SBOX32 +#undef case_196_SBOX32 +#undef case_197_SBOX32 +#undef case_198_SBOX32 +#undef case_199_SBOX32 +#undef case_19_SBOX32 +#undef case_1_SBOX32 +#undef case_200_SBOX32 +#undef case_201_SBOX32 +#undef case_202_SBOX32 +#undef case_203_SBOX32 +#undef case_204_SBOX32 +#undef case_205_SBOX32 +#undef case_206_SBOX32 +#undef case_207_SBOX32 +#undef case_208_SBOX32 +#undef case_209_SBOX32 +#undef case_20_SBOX32 +#undef case_210_SBOX32 +#undef case_211_SBOX32 +#undef case_212_SBOX32 +#undef case_213_SBOX32 +#undef case_214_SBOX32 +#undef case_215_SBOX32 +#undef case_216_SBOX32 +#undef case_217_SBOX32 +#undef case_218_SBOX32 +#undef case_219_SBOX32 +#undef case_21_SBOX32 +#undef case_220_SBOX32 +#undef case_221_SBOX32 +#undef case_222_SBOX32 +#undef case_223_SBOX32 +#undef case_224_SBOX32 +#undef case_225_SBOX32 +#undef case_226_SBOX32 +#undef case_227_SBOX32 +#undef case_228_SBOX32 +#undef case_229_SBOX32 +#undef case_22_SBOX32 +#undef case_230_SBOX32 +#undef case_231_SBOX32 +#undef case_232_SBOX32 +#undef case_233_SBOX32 +#undef case_234_SBOX32 +#undef case_235_SBOX32 +#undef case_236_SBOX32 +#undef case_237_SBOX32 +#undef case_238_SBOX32 +#undef case_239_SBOX32 +#undef case_23_SBOX32 +#undef case_240_SBOX32 +#undef case_241_SBOX32 +#undef case_242_SBOX32 +#undef case_243_SBOX32 +#undef case_244_SBOX32 +#undef case_245_SBOX32 +#undef case_246_SBOX32 +#undef case_247_SBOX32 +#undef case_248_SBOX32 +#undef case_249_SBOX32 +#undef case_24_SBOX32 +#undef case_250_SBOX32 +#undef case_251_SBOX32 +#undef case_252_SBOX32 +#undef case_253_SBOX32 +#undef case_254_SBOX32 +#undef case_255_SBOX32 +#undef case_256_SBOX32 +#undef case_25_SBOX32 +#undef case_26_SBOX32 +#undef case_27_SBOX32 +#undef case_28_SBOX32 +#undef case_29_SBOX32 +#undef case_2_SBOX32 +#undef case_30_SBOX32 +#undef case_31_SBOX32 +#undef case_32_SBOX32 +#undef case_33_SBOX32 +#undef case_34_SBOX32 +#undef case_35_SBOX32 +#undef case_36_SBOX32 +#undef case_37_SBOX32 +#undef case_38_SBOX32 +#undef case_39_SBOX32 +#undef case_3_SBOX32 +#undef case_40_SBOX32 +#undef case_41_SBOX32 +#undef case_42_SBOX32 +#undef case_43_SBOX32 +#undef case_44_SBOX32 +#undef case_45_SBOX32 +#undef case_46_SBOX32 +#undef case_47_SBOX32 +#undef case_48_SBOX32 +#undef case_49_SBOX32 +#undef case_4_SBOX32 +#undef case_50_SBOX32 +#undef case_51_SBOX32 +#undef case_52_SBOX32 +#undef case_53_SBOX32 +#undef case_54_SBOX32 +#undef case_55_SBOX32 +#undef case_56_SBOX32 +#undef case_57_SBOX32 +#undef case_58_SBOX32 +#undef case_59_SBOX32 +#undef case_5_SBOX32 +#undef case_60_SBOX32 +#undef case_61_SBOX32 +#undef case_62_SBOX32 +#undef case_63_SBOX32 +#undef case_64_SBOX32 +#undef case_65_SBOX32 +#undef case_66_SBOX32 +#undef case_67_SBOX32 +#undef case_68_SBOX32 +#undef case_69_SBOX32 +#undef case_6_SBOX32 +#undef case_70_SBOX32 +#undef case_71_SBOX32 +#undef case_72_SBOX32 +#undef case_73_SBOX32 +#undef case_74_SBOX32 +#undef case_75_SBOX32 +#undef case_76_SBOX32 +#undef case_77_SBOX32 +#undef case_78_SBOX32 +#undef case_79_SBOX32 +#undef case_7_SBOX32 +#undef case_80_SBOX32 +#undef case_81_SBOX32 +#undef case_82_SBOX32 +#undef case_83_SBOX32 +#undef case_84_SBOX32 +#undef case_85_SBOX32 +#undef case_86_SBOX32 +#undef case_87_SBOX32 +#undef case_88_SBOX32 +#undef case_89_SBOX32 +#undef case_8_SBOX32 +#undef case_90_SBOX32 +#undef case_91_SBOX32 +#undef case_92_SBOX32 +#undef case_93_SBOX32 +#undef case_94_SBOX32 +#undef case_95_SBOX32 +#undef case_96_SBOX32 +#undef case_97_SBOX32 +#undef case_98_SBOX32 +#undef case_99_SBOX32 +#undef case_9_SBOX32 #endif Index: gnu/usr.bin/perl/scope.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/scope.c,v diff -u -p -a -u -p -r1.24 scope.c --- gnu/usr.bin/perl/scope.c 26 Dec 2025 22:14:13 -0000 1.24 +++ gnu/usr.bin/perl/scope.c 16 Nov 2026 00:57:39 -0000 @@ -30,11 +30,11 @@ SV** Perl_stack_grow(pTHX_ SV **sp, SV **p, SSize_t n) { + PERL_ARGS_ASSERT_STACK_GROW; + SSize_t extra; SSize_t current = (p - PL_stack_base); - PERL_ARGS_ASSERT_STACK_GROW; - if (UNLIKELY(n < 0)) croak( "panic: stack_grow() negative count (%" IVdf ")", (IV)n); @@ -73,6 +73,8 @@ Perl_stack_grow(pTHX_ SV **sp, SV **p, S PERL_SI * Perl_new_stackinfo(pTHX_ I32 stitems, I32 cxitems) { + PERL_ARGS_ASSERT_NEW_STACKINFO; + return new_stackinfo_flags(stitems, cxitems, 0); } @@ -83,6 +85,8 @@ Perl_new_stackinfo(pTHX_ I32 stitems, I3 PERL_SI * Perl_new_stackinfo_flags(pTHX_ I32 stitems, I32 cxitems, UV flags) { + PERL_ARGS_ASSERT_NEW_STACKINFO_FLAGS; + PERL_SI *si; Newx(si, 1, PERL_SI); si->si_stack = newAV(); @@ -110,6 +114,8 @@ Perl_new_stackinfo_flags(pTHX_ I32 stite I32 Perl_cxinc(pTHX) { + PERL_ARGS_ASSERT_CXINC; + const IV old_max = cxstack_max; const IV new_max = GROW(cxstack_max); Renew(cxstack, new_max + 1, PERL_CONTEXT); @@ -132,6 +138,8 @@ Implements L> void Perl_push_scope(pTHX) { + PERL_ARGS_ASSERT_PUSH_SCOPE; + if (UNLIKELY(PL_scopestack_ix == PL_scopestack_max)) { const IV new_max = GROW(PL_scopestack_max); Renew(PL_scopestack, new_max, I32); @@ -159,6 +167,8 @@ Implements L> void Perl_pop_scope(pTHX) { + PERL_ARGS_ASSERT_POP_SCOPE; + const I32 oldsave = PL_scopestack[--PL_scopestack_ix]; LEAVE_SCOPE(oldsave); } @@ -166,6 +176,8 @@ Perl_pop_scope(pTHX) Stack_off_t * Perl_markstack_grow(pTHX) { + PERL_ARGS_ASSERT_MARKSTACK_GROW; + const I32 oldmax = PL_markstack_max - PL_markstack; const I32 newmax = GROW(oldmax); @@ -181,13 +193,17 @@ Perl_markstack_grow(pTHX) void Perl_savestack_grow(pTHX) { + PERL_ARGS_ASSERT_SAVESTACK_GROW; + const I32 by = PL_savestack_max - PL_savestack_ix; - Perl_savestack_grow_cnt(aTHX_ by); + savestack_grow_cnt(by); } void Perl_savestack_grow_cnt(pTHX_ I32 need) { + PERL_ARGS_ASSERT_SAVESTACK_GROW_CNT; + /* NOTE: PL_savestack_max and PL_savestack_ix are I32. * * This makes sense when you consider that having I32_MAX items on @@ -244,6 +260,8 @@ Perl_savestack_grow_cnt(pTHX_ I32 need) SSize_t Perl_tmps_grow_p(pTHX_ SSize_t ix) { + PERL_ARGS_ASSERT_TMPS_GROW_P; + SSize_t extend_to = ix; #ifndef STRESS_REALLOC SSize_t grow_size = PL_tmps_max < 512 ? 128 : PL_tmps_max / 2; @@ -262,6 +280,8 @@ Perl_tmps_grow_p(pTHX_ SSize_t ix) void Perl_free_tmps(pTHX) { + PERL_ARGS_ASSERT_FREE_TMPS; + /* XXX should tmps_floor live in cxstack? */ const SSize_t myfloor = PL_tmps_floor; while (PL_tmps_ix > myfloor) { /* clean up after last statement */ @@ -277,7 +297,10 @@ Perl_free_tmps(pTHX) } /* -=for apidoc save_scalar_at +=for apidoc save_scalar_at +=for apidoc_flag SAVEf_KEEPOLDELEM +=for apidoc_flag SAVEf_SETMAGIC + A helper function for localizing the SV referenced by C<*sptr>. @@ -291,20 +314,17 @@ magic will be processed on the new scala skipped. The latter typically means that assignment will soon follow (I, S>), and that will handle the magic. -=for apidoc Amnh ||SAVEf_KEEPOLDELEM -=for apidoc Amnh ||SAVEf_SETMAGIC - =cut */ -STATIC SV * +static SV * S_save_scalar_at(pTHX_ SV **sptr, const U32 flags) { + PERL_ARGS_ASSERT_SAVE_SCALAR_AT; + SV * osv; SV *sv; - PERL_ARGS_ASSERT_SAVE_SCALAR_AT; - osv = *sptr; if (flags & SAVEf_KEEPOLDELEM) sv = osv; @@ -320,6 +340,8 @@ S_save_scalar_at(pTHX_ SV **sptr, const void Perl_save_pushptrptr(pTHX_ void *const ptr1, void *const ptr2, const int type) { + PERL_ARGS_ASSERT_SAVE_PUSHPTRPTR; + dSS_ADD; SS_ADD_PTR(ptr1); SS_ADD_PTR(ptr2); @@ -330,10 +352,10 @@ Perl_save_pushptrptr(pTHX_ void *const p SV * Perl_save_scalar(pTHX_ GV *gv) { - SV ** const sptr = &GvSVn(gv); - PERL_ARGS_ASSERT_SAVE_SCALAR; + SV ** const sptr = &GvSVn(gv); + if (UNLIKELY(SvGMAGICAL(*sptr))) { PL_localizing = 1; (void)mg_get(*sptr); @@ -377,7 +399,8 @@ or be prematurely freed. =cut */ void -Perl_save_rcpv(pTHX_ char **prcpv) { +Perl_save_rcpv(pTHX_ char **prcpv) +{ PERL_ARGS_ASSERT_SAVE_RCPV; save_pushptrptr(prcpv, rcpv_copy(*prcpv), SAVEt_RCPV); } @@ -393,7 +416,8 @@ on the argument when the current pseudo =cut */ void -Perl_save_freercpv(pTHX_ char *rcpv) { +Perl_save_freercpv(pTHX_ char *rcpv) +{ PERL_ARGS_ASSERT_SAVE_FREERCPV; save_pushptr(rcpv, SAVEt_FREERCPV); } @@ -456,10 +480,10 @@ Set the SvFLAGS specified by mask to the void Perl_save_set_svflags(pTHX_ SV* sv, U32 mask, U32 val) { - dSS_ADD; - PERL_ARGS_ASSERT_SAVE_SET_SVFLAGS; + dSS_ADD; + SS_ADD_PTR(sv); SS_ADD_INT(mask); SS_ADD_INT(val); @@ -529,11 +553,11 @@ Perl_save_gp(pTHX_ GV *gv, I32 empty) AV * Perl_save_ary(pTHX_ GV *gv) { + PERL_ARGS_ASSERT_SAVE_ARY; + AV * const oav = GvAVn(gv); AV *av; - PERL_ARGS_ASSERT_SAVE_ARY; - if (UNLIKELY(!AvREAL(oav) && AvREIFY(oav))) av_reify(oav); save_pushptrptr(SvREFCNT_inc_simple_NN(gv), oav, SAVEt_AV); @@ -548,10 +572,10 @@ Perl_save_ary(pTHX_ GV *gv) HV * Perl_save_hash(pTHX_ GV *gv) { - HV *ohv, *hv; - PERL_ARGS_ASSERT_SAVE_HASH; + HV *ohv, *hv; + save_pushptrptr( SvREFCNT_inc_simple_NN(gv), (ohv = GvHVn(gv)), SAVEt_HV ); @@ -566,10 +590,10 @@ Perl_save_hash(pTHX_ GV *gv) void Perl_save_item(pTHX_ SV *item) { - SV * const sv = newSVsv(item); - PERL_ARGS_ASSERT_SAVE_ITEM; + SV * const sv = newSVsv(item); + save_pushptrptr(item, /* remember the pointer */ sv, /* remember the value */ SAVEt_ITEM); @@ -578,10 +602,10 @@ Perl_save_item(pTHX_ SV *item) void Perl_save_bool(pTHX_ bool *boolp) { - dSS_ADD; - PERL_ARGS_ASSERT_SAVE_BOOL; + dSS_ADD; + SS_ADD_PTR(boolp); SS_ADD_UV(SAVEt_BOOL | (*boolp << 8)); SS_ADD_END(2); @@ -590,6 +614,8 @@ Perl_save_bool(pTHX_ bool *boolp) void Perl_save_pushi32ptr(pTHX_ const I32 i, void *const ptr, const int type) { + PERL_ARGS_ASSERT_SAVE_PUSHI32PTR; + dSS_ADD; SS_ADD_INT(i); @@ -601,13 +627,13 @@ Perl_save_pushi32ptr(pTHX_ const I32 i, void Perl_save_int(pTHX_ int *intp) { + PERL_ARGS_ASSERT_SAVE_INT; + const int i = *intp; UV type = ((UV)((UV)i << SAVE_TIGHT_SHIFT) | SAVEt_INT_SMALL); int size = 2; dSS_ADD; - PERL_ARGS_ASSERT_SAVE_INT; - if (UNLIKELY((int)(type >> SAVE_TIGHT_SHIFT) != i)) { SS_ADD_INT(i); type = SAVEt_INT; @@ -621,10 +647,10 @@ Perl_save_int(pTHX_ int *intp) void Perl_save_I8(pTHX_ I8 *bytep) { - dSS_ADD; - PERL_ARGS_ASSERT_SAVE_I8; + dSS_ADD; + SS_ADD_PTR(bytep); SS_ADD_UV(SAVEt_I8 | ((UV)*bytep << 8)); SS_ADD_END(2); @@ -633,10 +659,10 @@ Perl_save_I8(pTHX_ I8 *bytep) void Perl_save_I16(pTHX_ I16 *intp) { - dSS_ADD; - PERL_ARGS_ASSERT_SAVE_I16; + dSS_ADD; + SS_ADD_PTR(intp); SS_ADD_UV(SAVEt_I16 | ((UV)*intp << 8)); SS_ADD_END(2); @@ -645,13 +671,13 @@ Perl_save_I16(pTHX_ I16 *intp) void Perl_save_I32(pTHX_ I32 *intp) { + PERL_ARGS_ASSERT_SAVE_I32; + const I32 i = *intp; UV type = ((I32)((U32)i << SAVE_TIGHT_SHIFT) | SAVEt_I32_SMALL); int size = 2; dSS_ADD; - PERL_ARGS_ASSERT_SAVE_I32; - if (UNLIKELY((I32)(type >> SAVE_TIGHT_SHIFT) != i)) { SS_ADD_INT(i); type = SAVEt_I32; @@ -665,13 +691,13 @@ Perl_save_I32(pTHX_ I32 *intp) void Perl_save_strlen(pTHX_ STRLEN *ptr) { + PERL_ARGS_ASSERT_SAVE_STRLEN; + const IV i = *ptr; UV type = ((I32)((U32)i << SAVE_TIGHT_SHIFT) | SAVEt_STRLEN_SMALL); int size = 2; dSS_ADD; - PERL_ARGS_ASSERT_SAVE_STRLEN; - if (UNLIKELY((I32)(type >> SAVE_TIGHT_SHIFT) != i)) { SS_ADD_IV(*ptr); type = SAVEt_STRLEN; @@ -742,6 +768,8 @@ Implements C. void Perl_save_padsv_and_mortalize(pTHX_ PADOFFSET off) { + PERL_ARGS_ASSERT_SAVE_PADSV_AND_MORTALIZE; + dSS_ADD; ASSERT_CURPAD_ACTIVE("save_padsv"); @@ -785,6 +813,8 @@ C. void Perl_save_pushptr(pTHX_ void *const ptr, const int type) { + PERL_ARGS_ASSERT_SAVE_PUSHPTR; + dSS_ADD; SS_ADD_PTR(ptr); SS_ADD_UV(type); @@ -794,11 +824,11 @@ Perl_save_pushptr(pTHX_ void *const ptr, void Perl_save_clearsv(pTHX_ SV **svp) { + PERL_ARGS_ASSERT_SAVE_CLEARSV; + const UV offset = svp - PL_curpad; const UV offset_shifted = offset << SAVE_TIGHT_SHIFT; - PERL_ARGS_ASSERT_SAVE_CLEARSV; - ASSERT_CURPAD_ACTIVE("save_clearsv"); assert(*svp); SvPADSTALE_off(*svp); /* mark lexical as active */ @@ -823,6 +853,43 @@ Perl_save_delete(pTHX_ HV *hv, char *key } /* +=for apidoc save_padsv + +Saves the value in the pad at the given index to be restored on scope exit. +Before this value is restored back in, whatever is currently there has its +reference count decremented by one. + +=cut +*/ + +void +Perl_save_padsv(pTHX_ PADOFFSET padix) +{ + PERL_ARGS_ASSERT_SAVE_PADSV; + + const UV padix_shifted = padix << SAVE_TIGHT_SHIFT; + if (UNLIKELY((padix_shifted >> SAVE_TIGHT_SHIFT) != (UV)padix)) { + croak("panic: pad offset %" UVuf " out of range", + (UV)padix); + } + + { + dSS_ADD; + SV *cursv = PL_curpad[padix]; + + if (cursv) { + SS_ADD_PTR(SvREFCNT_inc(cursv)); + SS_ADD_UV(padix_shifted | SAVEt_PADSV); + SS_ADD_END(2); + } + else { + SS_ADD_UV(padix_shifted | SAVEt_PADSV_NULL); + SS_ADD_END(1); + } + } +} + +/* =for apidoc_section $callback =for apidoc save_hdelete @@ -834,12 +901,12 @@ Implements C. void Perl_save_hdelete(pTHX_ HV *hv, SV *keysv) { + PERL_ARGS_ASSERT_SAVE_HDELETE; + STRLEN len; I32 klen; const char *key; - PERL_ARGS_ASSERT_SAVE_HDELETE; - key = SvPV_const(keysv, len); klen = SvUTF8(keysv) ? -(I32)len : (I32)len; SvREFCNT_inc_simple_void_NN(hv); @@ -858,10 +925,10 @@ Implements C. void Perl_save_adelete(pTHX_ AV *av, SSize_t key) { - dSS_ADD; - PERL_ARGS_ASSERT_SAVE_ADELETE; + dSS_ADD; + SvREFCNT_inc_void(av); SS_ADD_UV(key); SS_ADD_PTR(av); @@ -872,9 +939,10 @@ Perl_save_adelete(pTHX_ AV *av, SSize_t void Perl_save_destructor(pTHX_ DESTRUCTORFUNC_NOCONTEXT_t f, void* p) { - dSS_ADD; PERL_ARGS_ASSERT_SAVE_DESTRUCTOR; + dSS_ADD; + SS_ADD_DPTR(f); SS_ADD_PTR(p); SS_ADD_UV(SAVEt_DESTRUCTOR); @@ -884,6 +952,8 @@ Perl_save_destructor(pTHX_ DESTRUCTORFUN void Perl_save_destructor_x(pTHX_ DESTRUCTORFUNC_t f, void* p) { + PERL_ARGS_ASSERT_SAVE_DESTRUCTOR_X; + dSS_ADD; SS_ADD_DXPTR(f); @@ -904,6 +974,8 @@ Implements C. void Perl_save_hints(pTHX) { + PERL_ARGS_ASSERT_SAVE_HINTS; + COPHH *save_cophh = cophh_copy(CopHINTHASH_get(&PL_compiling)); if (PL_hints & HINT_LOCALIZE_HH) { HV *oldhh = GvHV(PL_hintgv); @@ -927,6 +999,8 @@ static void S_save_pushptri32ptr(pTHX_ void *const ptr1, const I32 i, void *const ptr2, const int type) { + PERL_ARGS_ASSERT_SAVE_PUSHPTRI32PTR; + dSS_ADD; SS_ADD_PTR(ptr1); SS_ADD_INT(i); @@ -939,6 +1013,8 @@ S_save_pushptri32ptr(pTHX_ void *const p =for apidoc_section $callback =for apidoc save_aelem =for apidoc_item save_aelem_flags +=for apidoc_flag SAVEf_KEEPOLDELEM +=for apidoc_flag SAVEf_SETMAGIC These each arrange for the value of the array element C to be restored at the end of the enclosing I. @@ -961,11 +1037,11 @@ void Perl_save_aelem_flags(pTHX_ AV *av, SSize_t idx, SV **sptr, const U32 flags) { + PERL_ARGS_ASSERT_SAVE_AELEM_FLAGS; + dSS_ADD; SV *sv; - PERL_ARGS_ASSERT_SAVE_AELEM_FLAGS; - SvGETMAGIC(*sptr); SS_ADD_PTR(SvREFCNT_inc_simple(av)); SS_ADD_IV(idx); @@ -1013,10 +1089,10 @@ is set in in C. void Perl_save_helem_flags(pTHX_ HV *hv, SV *key, SV **sptr, const U32 flags) { - SV *sv; - PERL_ARGS_ASSERT_SAVE_HELEM_FLAGS; + SV *sv; + SvGETMAGIC(*sptr); { dSS_ADD; @@ -1052,6 +1128,8 @@ Perl_save_svref(pTHX_ SV **sptr) void Perl_savetmps(pTHX) { + PERL_ARGS_ASSERT_SAVETMPS; + dSS_ADD; SS_ADD_IV(PL_tmps_floor); PL_tmps_floor = PL_tmps_ix; @@ -1072,6 +1150,8 @@ function. SSize_t Perl_save_alloc(pTHX_ SSize_t size, I32 pad) { + PERL_ARGS_ASSERT_SAVE_ALLOC; + const SSize_t start = pad + ((char*)&PL_savestack[PL_savestack_ix] - (char*)PL_savestack); const UV elems = 1 + ((size + pad - 1) / sizeof(*PL_savestack)); @@ -1103,13 +1183,15 @@ Implements C which you shou void Perl_leave_scope(pTHX_ I32 base) { + PERL_ARGS_ASSERT_LEAVE_SCOPE; + /* Localise the effects of the TAINT_NOT inside the loop. */ bool was = TAINT_get; if (UNLIKELY(base < -1)) croak("panic: corrupt saved stack index %ld", (long) base); - DEBUG_l(Perl_deb(aTHX_ "savestack: releasing items %ld -> %ld\n", - (long)PL_savestack_ix, (long)base)); + DEBUG_l(deb("savestack: releasing items %ld -> %ld\n", + (long)PL_savestack_ix, (long)base)); while (PL_savestack_ix > base) { UV uv; U8 type; @@ -1440,8 +1522,20 @@ Perl_leave_scope(pTHX_ I32 base) if (SvTYPE(sv) == SVt_PVHV && HvHasAUX(sv)) Perl_hv_kill_backrefs(aTHX_ MUTABLE_HV(sv)); - else if(SvOOK(sv)) - sv_backoff(sv); + else if(SvOOK(sv)) { + /* Inlined sv_backoff() - the buffer contents are + * defunct and there's no need to copy them. All that + * is needed is resetting SvLEN and the SvPVX pointer. */ + assert(SvTYPE(sv) != SVt_PVHV); /* the branch above */ + assert(SvTYPE(sv) != SVt_PVAV); + + STRLEN delta; + SvOOK_offset(sv, delta); + + SvLEN_set(sv, SvLEN(sv) + delta); + SvPV_set(sv, SvPVX(sv) - delta); + SvFLAGS(sv) &= ~SVf_OOK; + } if (SvMAGICAL(sv)) { /* note that backrefs (either in HvAUX or magic) @@ -1514,6 +1608,22 @@ Perl_leave_scope(pTHX_ I32 base) break; } + case SAVEt_PADSV_NULL: + case SAVEt_PADSV: + { + SV **padentry = &PAD_SVl(uv >> SAVE_TIGHT_SHIFT); + + SvREFCNT_dec(*padentry); + + if (type == SAVEt_PADSV_NULL) + *padentry = NULL; + else { + *padentry = ap[0].any_sv; + SvREFCNT_dec(ap[0].any_sv); + } + } + break; + case SAVEt_DELETE: a0 = ap[0]; a1 = ap[1]; a2 = ap[2]; /* hv_delete could die, so free the key and SvREFCNT_dec the @@ -1876,16 +1986,19 @@ Perl_cx_dump(pTHX_ PERL_CONTEXT *cx) /* =for apidoc_section $callback -=for apidoc mortal_destructor_sv +=for apidoc mortal_destructor_sv +=for apidoc_item m||MORTALDESTRUCTOR_SV + +These are synonymous. -This function arranges for either a Perl code reference, or a C function +They each arrange for either a Perl code reference, or a C function reference to be called at the B. The C argument determines the type of function that will be called. If it is C it is assumed to be a reference to a CV and will arrange for the coderef to be called. If it is not SvROK() then it is assumed to be a C which is C whose value is a pointer -to a C function of type C created using C. +to a C function of type C created using C>. Either way the C parameter will be provided to the callback as a parameter, although the rules for doing so differ between the Perl and C mode. Normally this function is only used directly for the Perl case @@ -1909,9 +2022,12 @@ block>. If you are looking for a mechani end of the B you should look at L> instead of this function. -=for apidoc mortal_svfunc_x +=for apidoc mortal_svfunc_x +=for apidoc_item m||MORTALSVFUNC_X -This function arranges for a C function reference to be called at the +These are synonymous. + +They each arrange for a C function reference to be called at the B with the arguments provided. It is a wrapper around C which ensures that the latter function is called appropriately. @@ -1932,7 +2048,8 @@ should not be called directly and has no */ void -Perl_mortal_destructor_sv(pTHX_ SV *coderef, SV *args) { +Perl_mortal_destructor_sv(pTHX_ SV *coderef, SV *args) +{ PERL_ARGS_ASSERT_MORTAL_DESTRUCTOR_SV; assert( (SvROK(coderef) && SvTYPE(SvRV(coderef)) == SVt_PVCV) /* perl coderef */ @@ -1946,7 +2063,8 @@ Perl_mortal_destructor_sv(pTHX_ SV *code void -Perl_mortal_svfunc_x(pTHX_ SVFUNC_t f, SV *sv) { +Perl_mortal_svfunc_x(pTHX_ SVFUNC_t f, SV *sv) +{ PERL_ARGS_ASSERT_MORTAL_SVFUNC_X; SV *sviv = newSViv(PTR2IV(f)); mortal_destructor_sv(sviv,sv); @@ -1954,7 +2072,8 @@ Perl_mortal_svfunc_x(pTHX_ SVFUNC_t f, S int -Perl_magic_freedestruct(pTHX_ SV* sv, MAGIC* mg) { +Perl_magic_freedestruct(pTHX_ SV* sv, MAGIC* mg) +{ PERL_ARGS_ASSERT_MAGIC_FREEDESTRUCT; dSP; union { Index: gnu/usr.bin/perl/scope.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/scope.h,v diff -u -p -a -u -p -r1.23 scope.h --- gnu/usr.bin/perl/scope.h 26 Dec 2025 22:14:13 -0000 1.23 +++ gnu/usr.bin/perl/scope.h 16 Nov 2026 00:57:39 -0000 @@ -157,12 +157,12 @@ scope has the given name. C must b if (PL_savestack_ix > old) leave_scope(old); \ } STMT_END +/* N.B. These are documented in pad.h */ #define SAVEI8(i) save_I8((I8*)&(i)) #define SAVEI16(i) save_I16((I16*)&(i)) #define SAVEI32(i) save_I32((I32*)&(i)) #define SAVEINT(i) save_int((int*)&(i)) #define SAVEIV(i) save_iv((IV*)&(i)) -#define SAVELONG(l) save_long((long*)&(l)) #define SAVESTRLEN(l) Perl_save_strlen(aTHX_ (STRLEN*)&(l)) #define SAVEBOOL(b) save_bool(&(b)) #define SAVESPTR(s) save_sptr((SV**)&(s)) @@ -250,7 +250,7 @@ scope has the given name. C must b CopFILE_debug((c),"SAVECOPFILE_FREE",0); \ } STMT_END #else -# /* XXX not refcounted */ + /* XXX not refcounted */ # define SAVECOPSTASH_FREE(c) SAVESPTR(CopSTASH(c)) # define SAVECOPFILE(c) SAVESPTR(CopFILEGV(c)) # define SAVECOPFILE_FREE(c) SAVEGENERICSV(CopFILEGV(c)) @@ -304,10 +304,10 @@ casts it to a pointer of that C. # define save_freeop(op) \ STMT_START { \ - OP * const _o = (OP *)(op); \ - assert(!_o->op_savefree); \ - _o->op_savefree = 1; \ - save_pushptr((void *)(_o), SAVEt_FREEOP); \ + OP * const o_ = (OP *)(op); \ + assert(!o_->op_savefree); \ + o_->op_savefree = 1; \ + save_pushptr((void *)(o_), SAVEt_FREEOP); \ } STMT_END #define save_freepv(pv) save_pushptr((void *)(pv), SAVEt_FREEPV) Index: gnu/usr.bin/perl/scope_types.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/scope_types.h,v diff -u -p -a -u -p -r1.1.1.2 scope_types.h --- gnu/usr.bin/perl/scope_types.h 26 Dec 2025 22:12:27 -0000 1.1.1.2 +++ gnu/usr.bin/perl/scope_types.h 16 Nov 2026 00:57:39 -0000 @@ -19,76 +19,79 @@ #define SAVEt_CLEARPADRANGE 1 #define SAVEt_CLEARSV 2 #define SAVEt_REGCONTEXT 3 +#define SAVEt_PADSV_NULL 4 /* one arg */ -#define SAVEt_TMPSFLOOR 4 -#define SAVEt_BOOL 5 -#define SAVEt_COMPILE_WARNINGS 6 -#define SAVEt_CURCOP_WARNINGS 7 -#define SAVEt_COMPPAD 8 -#define SAVEt_FREECOPHH 9 -#define SAVEt_FREEOP 10 -#define SAVEt_FREEPV 11 -#define SAVEt_FREESV 12 -#define SAVEt_I16 13 -#define SAVEt_I32_SMALL 14 -#define SAVEt_I8 15 -#define SAVEt_INT_SMALL 16 -#define SAVEt_MORTALIZESV 17 -#define SAVEt_NSTAB 18 -#define SAVEt_OP 19 -#define SAVEt_PARSER 20 -#define SAVEt_STACK_POS 21 -#define SAVEt_READONLY_OFF 22 -#define SAVEt_FREEPADNAME 23 -#define SAVEt_STRLEN_SMALL 24 -#define SAVEt_FREERCPV 25 -#define SAVEt_FREE_REXC_STATE 26 +#define SAVEt_TMPSFLOOR 5 +#define SAVEt_BOOL 6 +#define SAVEt_COMPILE_WARNINGS 7 +#define SAVEt_CURCOP_WARNINGS 8 +#define SAVEt_COMPPAD 9 +#define SAVEt_FREECOPHH 10 +#define SAVEt_FREEOP 11 +#define SAVEt_FREEPV 12 +#define SAVEt_FREESV 13 +#define SAVEt_I16 14 +#define SAVEt_I32_SMALL 15 +#define SAVEt_I8 16 +#define SAVEt_INT_SMALL 17 +#define SAVEt_MORTALIZESV 18 +#define SAVEt_NSTAB 19 +#define SAVEt_OP 20 +#define SAVEt_PARSER 21 +#define SAVEt_STACK_POS 22 +#define SAVEt_READONLY_OFF 23 +#define SAVEt_FREEPADNAME 24 +#define SAVEt_STRLEN_SMALL 25 +#define SAVEt_FREERCPV 26 +#define SAVEt_FREE_REXC_STATE 27 +#define SAVEt_PADSV 28 /* two args */ -#define SAVEt_AV 27 -#define SAVEt_DESTRUCTOR 28 -#define SAVEt_DESTRUCTOR_X 29 -#define SAVEt_GENERIC_PVREF 30 -#define SAVEt_GENERIC_SVREF 31 -#define SAVEt_GP 32 -#define SAVEt_GVSV 33 -#define SAVEt_HINTS 34 -#define SAVEt_HPTR 35 -#define SAVEt_HV 36 -#define SAVEt_I32 37 -#define SAVEt_INT 38 -#define SAVEt_ITEM 39 -#define SAVEt_IV 40 -#define SAVEt_PPTR 41 -#define SAVEt_SAVESWITCHSTACK 42 -#define SAVEt_SHARED_PVREF 43 -#define SAVEt_SPTR 44 -#define SAVEt_STRLEN 45 -#define SAVEt_SV 46 -#define SAVEt_SVREF 47 -#define SAVEt_VPTR 48 -#define SAVEt_ADELETE 49 -#define SAVEt_APTR 50 -#define SAVEt_RCPV 51 +#define SAVEt_AV 29 +#define SAVEt_DESTRUCTOR 30 +#define SAVEt_DESTRUCTOR_X 31 +#define SAVEt_GENERIC_PVREF 32 +#define SAVEt_GENERIC_SVREF 33 +#define SAVEt_GP 34 +#define SAVEt_GVSV 35 +#define SAVEt_HINTS 36 +#define SAVEt_HPTR 37 +#define SAVEt_HV 38 +#define SAVEt_I32 39 +#define SAVEt_INT 40 +#define SAVEt_ITEM 41 +#define SAVEt_IV 42 +#define SAVEt_PPTR 43 +#define SAVEt_SAVESWITCHSTACK 44 +#define SAVEt_SHARED_PVREF 45 +#define SAVEt_SPTR 46 +#define SAVEt_STRLEN 47 +#define SAVEt_SV 48 +#define SAVEt_SVREF 49 +#define SAVEt_VPTR 50 +#define SAVEt_ADELETE 51 +#define SAVEt_APTR 52 +#define SAVEt_RCPV 53 /* three args */ -#define SAVEt_HELEM 52 -#define SAVEt_PADSV_AND_MORTALIZE 53 -#define SAVEt_SET_SVFLAGS 54 -#define SAVEt_GVSLOT 55 -#define SAVEt_AELEM 56 -#define SAVEt_DELETE 57 -#define SAVEt_HINTS_HH 58 +#define SAVEt_HELEM 54 +#define SAVEt_PADSV_AND_MORTALIZE 55 +#define SAVEt_SET_SVFLAGS 56 +#define SAVEt_GVSLOT 57 +#define SAVEt_AELEM 58 +#define SAVEt_DELETE 59 +#define SAVEt_HINTS_HH 60 static const U8 leave_scope_arg_counts[] = { 0, /* SAVEt_ALLOC */ 0, /* SAVEt_CLEARPADRANGE */ 0, /* SAVEt_CLEARSV */ 0, /* SAVEt_REGCONTEXT */ + 0, /* SAVEt_PADSV_NULL */ 1, /* SAVEt_TMPSFLOOR */ 1, /* SAVEt_BOOL */ 1, /* SAVEt_COMPILE_WARNINGS */ @@ -112,6 +115,7 @@ static const U8 leave_scope_arg_counts[] 1, /* SAVEt_STRLEN_SMALL */ 1, /* SAVEt_FREERCPV */ 1, /* SAVEt_FREE_REXC_STATE */ + 1, /* SAVEt_PADSV */ 2, /* SAVEt_AV */ 2, /* SAVEt_DESTRUCTOR */ 2, /* SAVEt_DESTRUCTOR_X */ @@ -146,6 +150,6 @@ static const U8 leave_scope_arg_counts[] 3 /* SAVEt_HINTS_HH */ }; -#define MAX_SAVEt 58 +#define MAX_SAVEt 60 /* ex: set ro ft=c: */ Index: gnu/usr.bin/perl/shlib_version =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/shlib_version,v diff -u -p -a -u -p -r1.31 shlib_version --- gnu/usr.bin/perl/shlib_version 19 Aug 2026 00:19:00 -0000 1.31 +++ gnu/usr.bin/perl/shlib_version 16 Nov 2026 00:57:39 -0000 @@ -1,2 +1,2 @@ -major=27 -minor=1 +major=28 +minor=0 Index: gnu/usr.bin/perl/sv.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/sv.c,v diff -u -p -a -u -p -r1.35 sv.c --- gnu/usr.bin/perl/sv.c 26 Dec 2025 22:14:13 -0000 1.35 +++ gnu/usr.bin/perl/sv.c 16 Nov 2026 00:57:39 -0000 @@ -272,6 +272,8 @@ Public API: SV* Perl_more_sv(pTHX) { + PERL_ARGS_ASSERT_MORE_SV; + SV* sv; char *chunk; /* must use New here to match call to */ Newx(chunk,PERL_ARENA_SIZE,char); /* Safefree() in sv_free_arenas() */ @@ -292,7 +294,7 @@ Perl_more_sv(pTHX) plant_SV(p); \ } STMT_END -STATIC void +static void S_del_sv(pTHX_ SV *p) { PERL_ARGS_ASSERT_DEL_SV; @@ -328,7 +330,8 @@ S_del_sv(pTHX_ SV *p) /* =for apidoc_section $SV -=for apidoc sv_add_arena +=for apidoc sv_add_arena +=for_apidoc_flag SVf_FAKE Given a chunk of memory, link it to the head of the list of arenas, and split it into a list of free SVs. @@ -339,12 +342,12 @@ and split it into a list of free SVs. static void S_sv_add_arena(pTHX_ char *const ptr, const U32 size, const U32 flags) { + PERL_ARGS_ASSERT_SV_ADD_ARENA; + SV *const sva = MUTABLE_SV(ptr); SV* sv; SV* svend; - PERL_ARGS_ASSERT_SV_ADD_ARENA; - /* The first SV in an arena isn't an SV. */ SvANY(sva) = (void *) PL_sv_arenaroot; /* ptr to next arena */ SvREFCNT(sva) = size / sizeof(SV); /* number of SV slots */ @@ -375,14 +378,14 @@ S_sv_add_arena(pTHX_ char *const ptr, co /* visit(): call the named function for each non-free SV in the arenas * whose flags field matches the flags/mask args. */ -STATIC SSize_t +static SSize_t S_visit(pTHX_ SVFUNC_t f, const U32 flags, const U32 mask) { + PERL_ARGS_ASSERT_VISIT; + SV* sva; I32 visited = 0; - PERL_ARGS_ASSERT_VISIT; - for (sva = PL_sv_arenaroot; sva; sva = MUTABLE_SV(SvANY(sva))) { const SV * const svend = &sva[SvREFCNT(sva)]; SV* sv; @@ -424,6 +427,8 @@ Dump the contents of all SVs not yet fre void Perl_sv_report_used(pTHX) { + PERL_ARGS_ASSERT_SV_REPORT_USED; + #ifdef DEBUGGING visit(do_report_used, 0, 0); #else @@ -522,7 +527,8 @@ do_clean_named_io_objs(pTHX_ SV *const s /* Void wrapper to pass to visit() */ static void -do_curse(pTHX_ SV * const sv) { +do_curse(pTHX_ SV * const sv) +{ if ((PL_stderrgv && GvGP(PL_stderrgv) && (SV*)GvIO(PL_stderrgv) == sv) || (PL_defoutgv && GvGP(PL_defoutgv) && (SV*)GvIO(PL_defoutgv) == sv)) return; @@ -540,6 +546,8 @@ Attempt to destroy all objects not yet f void Perl_sv_clean_objs(pTHX) { + PERL_ARGS_ASSERT_SV_CLEAN_OBJS; + GV *olddef, *olderr; PL_in_clean_objs = TRUE; visit(do_clean_objs, SVf_ROK, SVf_ROK); @@ -590,6 +598,8 @@ SVs which are in complex self-referentia SSize_t Perl_sv_clean_all(pTHX) { + PERL_ARGS_ASSERT_SV_CLEAN_ALL; + SSize_t cleaned; PL_in_clean_all = TRUE; cleaned = visit(do_clean_all, 0,0); @@ -614,6 +624,8 @@ S_do_sv_mark_arenas(pTHX_ SV *const sv) void Perl_sv_mark_arenas(pTHX) { + PERL_ARGS_ASSERT_SV_MARK_ARENAS; + visit(S_do_sv_mark_arenas, 0, 0); } @@ -642,6 +654,8 @@ S_do_sv_sweep_arenas(pTHX_ SV *const sv) void Perl_sv_sweep_arenas(pTHX) { + PERL_ARGS_ASSERT_SV_SWEEP_ARENAS; + visit(S_do_sv_sweep_arenas, 0, 0); } @@ -697,6 +711,8 @@ heads and bodies within the arenas must void Perl_sv_free_arenas(pTHX) { + PERL_ARGS_ASSERT_SV_FREE_ARENAS; + SV* sva; SV* svanext; unsigned int i; @@ -856,10 +872,24 @@ available in hv.c. Similarly SVt_IV is r void * -Perl_more_bodies (pTHX_ const svtype sv_type, const size_t body_size, - const size_t arena_size) +Perl_more_bodies (pTHX_ const svtype sv_type) { + PERL_ARGS_ASSERT_MORE_BODIES; + void ** const root = &PL_body_roots[sv_type]; + + const struct body_details *type_details = + (sv_type > SVt_IV) + ? bodies_by_type + sv_type + : (sv_type == SVt_NULL) + ? NULL + : &fake_hv_with_aux + ; + + const size_t body_size = (type_details) ? type_details->body_size + : sizeof(HE); + const size_t arena_size = (type_details) ? type_details->arena_size + : PERL_ARENA_SIZE; struct arena_desc *adesc; struct arena_set *aroot = (struct arena_set *) PL_body_arenas; unsigned int curr; @@ -959,6 +989,8 @@ C>. void Perl_sv_upgrade(pTHX_ SV *const sv, svtype new_type) { + PERL_ARGS_ASSERT_SV_UPGRADE; + void* old_body; void* new_body; const svtype old_type = SvTYPE(sv); @@ -967,8 +999,6 @@ Perl_sv_upgrade(pTHX_ SV *const sv, svty = bodies_by_type + old_type; SV *referent = NULL; - PERL_ARGS_ASSERT_SV_UPGRADE; - if (old_type == new_type) return; @@ -1245,7 +1275,7 @@ Perl_sv_upgrade(pTHX_ SV *const sv, svty SvOBJECT_on(io); /* Clear the stashcache because a new IO could overrule a package name */ - DEBUG_o(Perl_deb(aTHX_ "sv_upgrade clearing PL_stashcache\n")); + DEBUG_o(deb("sv_upgrade clearing PL_stashcache\n")); hv_clear(PL_stashcache); SvSTASH_set(io, HvREFCNT_inc(GvHV(iogv))); @@ -1279,19 +1309,20 @@ Perl_sv_upgrade(pTHX_ SV *const sv, svty } struct xpvhv_aux* -Perl_hv_auxalloc(pTHX_ HV *hv) { +Perl_hv_auxalloc(pTHX_ HV *hv) +{ + PERL_ARGS_ASSERT_HV_AUXALLOC; + const struct body_details *old_type_details = bodies_by_type + SVt_PVHV; void *old_body; void *new_body; - PERL_ARGS_ASSERT_HV_AUXALLOC; - assert(SvTYPE(hv) == SVt_PVHV); assert(!HvHasAUX(hv)); #ifdef PURIFY new_body = new_NOARENAZ(&fake_hv_with_aux); #else - new_body_from_arena(new_body, HVAUX_ARENA_ROOT_IX, fake_hv_with_aux); + new_body_from_arena(new_body, HVAUX_ARENA_ROOT_IX); #endif old_body = SvANY(hv); @@ -1325,16 +1356,18 @@ wrapper instead. /* prior to 5.000 stable, this function returned the new OOK-less SvFLAGS prior to 5.23.4 this function always returned 0 + prior to 5.43.x, the contents of the string buffer were always copied + down to the start of the buffer. Now, this only happens if SvOK(sv) */ void Perl_sv_backoff(SV *const sv) { + PERL_ARGS_ASSERT_SV_BACKOFF; + STRLEN delta; const char * const s = SvPVX_const(sv); - PERL_ARGS_ASSERT_SV_BACKOFF; - assert(SvOOK(sv)); assert(SvTYPE(sv) != SVt_PVHV); assert(SvTYPE(sv) != SVt_PVAV); @@ -1344,7 +1377,11 @@ Perl_sv_backoff(SV *const sv) SvLEN_set(sv, SvLEN(sv) + delta); SvPV_set(sv, SvPVX(sv) - delta); SvFLAGS(sv) &= ~SVf_OOK; - Move(s, SvPVX(sv), SvCUR(sv)+1, char); + + /* Don't copy a buffer if the contents are already defunct. */ + if (SvOK(sv)) + Move(s, SvPVX(sv), SvCUR(sv)+1, char); + return; } @@ -1367,10 +1404,10 @@ Use the C wrapper instead. char * Perl_sv_grow(pTHX_ SV *const sv, STRLEN newlen) { - char *s; - PERL_ARGS_ASSERT_SV_GROW; + char *s; + if (SvROK(sv)) sv_unref(sv); if (SvTYPE(sv) < SVt_PV) { @@ -1414,11 +1451,15 @@ Perl_sv_grow(pTHX_ SV *const sv, STRLEN #ifndef PERL_UNWARANTED_CHUMMINESS_WITH_MALLOC /* Don't round up on the first allocation, as odds are pretty good that - * the initial request is accurate as to what is really needed */ + * the initial request is accurate as to what is really needed. + * However, do reflect our best understanding of the allocation size + * likely to result, so that SvLEN is as accurate as possible. */ if (SvLEN(sv)) { STRLEN rounded = PERL_STRLEN_ROUNDUP(newlen); if (rounded > newlen) newlen = rounded; + } else { + newlen = expected_size(newlen); } #endif if (SvLEN(sv) && s) { @@ -1458,10 +1499,10 @@ just assigns a char buffer and returns a char * Perl_sv_grow_fresh(pTHX_ SV *const sv, STRLEN newlen) { - char *s; - PERL_ARGS_ASSERT_SV_GROW_FRESH; + char *s; + assert(SvTYPE(sv) >= SVt_PV && SvTYPE(sv) <= SVt_PVMG); assert(!SvROK(sv)); assert(!SvOOK(sv)); @@ -1485,12 +1526,13 @@ Perl_sv_grow_fresh(pTHX_ SV *const sv, S if (newlen < PERL_STRLEN_NEW_MIN) newlen = PERL_STRLEN_NEW_MIN; - s = (char*)safemalloc(newlen); - SvPV_set(sv, s); - /* No PERL_UNWARANTED_CHUMMINESS_WITH_MALLOC here, since many strings */ /* will never be grown once set. Let the real sv_grow worry about that. */ SvLEN_set(sv, newlen); + + s = (char*)safemalloc(newlen); + SvPV_set(sv, s); + return s; } @@ -1747,12 +1789,13 @@ Perl_sv_setrv_inc_mg(pTHX_ SV *const sv, * The return value may be != tmpbuf. */ -STATIC const char * -S_sv_display(pTHX_ SV *const sv, char *tmpbuf, STRLEN tmpbuf_size) { - const char *pv; - +static const char * +S_sv_display(pTHX_ SV *const sv, char *tmpbuf, STRLEN tmpbuf_size) +{ PERL_ARGS_ASSERT_SV_DISPLAY; + const char *pv; + if (DO_UTF8(sv)) { SV *dsv = newSVpvs_flags("", SVs_TEMP); pv = sv_uni_display(dsv, sv, 32, UNI_DISPLAY_ISPRINT); @@ -1816,14 +1859,14 @@ S_sv_display(pTHX_ SV *const sv, char *t * printable version of the offending string */ -STATIC void +static void S_not_a_number(pTHX_ SV *const sv) { + PERL_ARGS_ASSERT_NOT_A_NUMBER; + char tmpbuf[64]; const char *pv; - PERL_ARGS_ASSERT_NOT_A_NUMBER; - pv = sv_display(sv, tmpbuf, sizeof(tmpbuf)); if (PL_op) @@ -1837,13 +1880,14 @@ S_not_a_number(pTHX_ SV *const sv) "Argument \"%s\" isn't numeric", pv); } -STATIC void -S_not_incrementable(pTHX_ SV *const sv) { +static void +S_not_incrementable(pTHX_ SV *const sv) +{ + PERL_ARGS_ASSERT_NOT_INCREMENTABLE; + char tmpbuf[64]; const char *pv; - PERL_ARGS_ASSERT_NOT_INCREMENTABLE; - pv = sv_display(sv, tmpbuf, sizeof(tmpbuf)); warner(packWARN(WARN_NUMERIC), @@ -1864,12 +1908,12 @@ ignored. I32 Perl_looks_like_number(pTHX_ SV *const sv) { + PERL_ARGS_ASSERT_LOOKS_LIKE_NUMBER; + const char *sbegin; STRLEN len; int numtype; - PERL_ARGS_ASSERT_LOOKS_LIKE_NUMBER; - if (SvPOK(sv) || SvPOKp(sv)) { sbegin = SvPV_nomg_const(sv, len); } @@ -1879,7 +1923,7 @@ Perl_looks_like_number(pTHX_ SV *const s return ((numtype & IS_NUMBER_TRAILING)) ? 0 : numtype; } -STATIC bool +static bool S_glob_2number(pTHX_ GV * const gv) { PERL_ARGS_ASSERT_GLOB_2NUMBER; @@ -1981,7 +2025,7 @@ S_glob_2number(pTHX_ GV * const gv) /* sv_2iuv_non_preserve(): private routine for use by sv_2iv() and sv_2uv() */ /* For sv_2nv these three cases are "SvNOK and don't bother casting" */ -STATIC int +static int S_sv_2iuv_non_preserve(pTHX_ SV *const sv # ifdef DEBUGGING , I32 numtype @@ -2075,7 +2119,7 @@ S_sv_setnv(pTHX_ SV* sv, int numtype) STATIC_ASSERT_DECL(MAX_UV_PRESERVED_IN_NV <= (UV)IV_MAX); #endif -STATIC bool +static bool S_sv_2iuv_common(pTHX_ SV *const sv) { PERL_ARGS_ASSERT_SV_2IUV_COMMON; @@ -2341,7 +2385,9 @@ S_sv_2iuv_common(pTHX_ SV *const sv) } /* -=for apidoc sv_2iv_flags +=for apidoc sv_2iv_flags +=for apidoc_flag SV_SKIP_OVERLOAD +=for apidoc_flag SV_GMAGIC Return the integer value of an SV, doing any necessary string conversion. If C has the C bit set, does an C first. @@ -2438,13 +2484,12 @@ Perl_sv_2iv_flags(pTHX_ SV *const sv, co /* =for apidoc sv_2uv_flags +=for apidoc_flag SV_GMAGIC Return the unsigned integer value of an SV, doing any necessary string conversion. If C has the C bit set, does an C first. Normally used via the C and C macros. -=for apidoc Amnh||SV_GMAGIC - =cut */ @@ -2741,27 +2786,48 @@ Perl_sv_2nv_flags(pTHX_ SV *const sv, co } /* -=for apidoc sv_2num +=for apidoc sv_2num_flags +=for apidoc_item sv_2num Return an SV with the numeric value of the source SV, doing any necessary reference or overload conversion. The caller is expected to have handled get-magic already. +For sv_2num_flags() you can set the following flags: + +=over + +=item * + +C - avoid any numeric context overloading. + +=item * + +C - use numeric context overloading even if +disabled in hints by C. + +=back + =cut */ SV * -Perl_sv_2num(pTHX_ SV *const sv) +Perl_sv_2num_flags(pTHX_ SV *const sv, int flags) { - PERL_ARGS_ASSERT_SV_2NUM; + PERL_ARGS_ASSERT_SV_2NUM_FLAGS; + + assert((flags & ~(SV_SKIP_OVERLOAD|SV_FORCE_OVERLOAD)) == 0); if (!SvROK(sv)) return sv; - if (SvAMAGIC(sv)) { - SV * const tmpsv = AMG_CALLunary(sv, numer_amg); + if (SvAMAGIC(sv) && !(flags & SV_SKIP_OVERLOAD)) { + STATIC_ASSERT_STMT(AMGf_force_overload == SV_FORCE_OVERLOAD); + SV * const tmpsv = + AMG_CALLunary_flags(sv, numer_amg, + (flags & SV_FORCE_OVERLOAD)); TAINT_IF(tmpsv && SvTAINTED(tmpsv)); if (tmpsv && (!SvROK(tmpsv) || (SvRV(tmpsv) != SvRV(sv)))) - return sv_2num(tmpsv); + return sv_2num_flags(tmpsv, flags); } return sv_2mortal(newSVuv(PTR2UV(SvRV(sv)))); } @@ -2815,13 +2881,13 @@ It is used internally by sv_2pv_flags() char * Perl_uiv_2buf(char *const buf, const IV iv, UV uv, const int is_uv, char **const peob) { + PERL_ARGS_ASSERT_UIV_2BUF; + char *ptr = buf + TYPE_CHARS(UV); char * const ebuf = ptr; U16 *word_ptr; U16 const *word_table; - PERL_ARGS_ASSERT_UIV_2BUF; - /* ptr has to be properly aligned, because we will cast it to U16* */ assert(PTR2nat(ptr) % 2 == 0); /* we are going to read/write two bytes at a time */ @@ -2869,8 +2935,9 @@ Perl_uiv_2buf(char *const buf, const IV * XXX for "Inf", "-Inf", and "NaN", we could have three read-only * shared string constants we point to, instead of generating a new * string for each instance. */ -STATIC size_t -S_infnan_2pv(NV nv, char* buffer, size_t maxlen, char plus) { +static size_t +S_infnan_2pv(NV nv, char* buffer, size_t maxlen, char plus) +{ char* s = buffer; assert(maxlen >= 4); if (Perl_isinf(nv)) { @@ -2906,6 +2973,7 @@ S_infnan_2pv(NV nv, char* buffer, size_t /* =for apidoc sv_2pv =for apidoc_item sv_2pv_flags +=for apidoc_flag SV_GMAGIC These implement the various forms of the L> macros. The macros are the preferred interface. @@ -2917,19 +2985,17 @@ The forms differ in that plain C processes 'get' magic if and only if C contains C. -=for apidoc Amnh||SV_GMAGIC - =cut */ char * Perl_sv_2pv_flags(pTHX_ SV *const sv, STRLEN *const lp, const U32 flags) { + PERL_ARGS_ASSERT_SV_2PV_FLAGS; + char *s; bool done_gmagic = FALSE; - PERL_ARGS_ASSERT_SV_2PV_FLAGS; - assert (SvTYPE(sv) != SVt_PVAV && SvTYPE(sv) != SVt_PVHV && SvTYPE(sv) != SVt_PVFM); if (SvGMAGICAL(sv) && (flags & SV_GMAGIC)) { @@ -3255,11 +3321,11 @@ C) or doesn't (if that bit is cle void Perl_sv_copypv_flags(pTHX_ SV *const dsv, SV *const ssv, const I32 flags) { + PERL_ARGS_ASSERT_SV_COPYPV_FLAGS; + STRLEN len; const char *s; - PERL_ARGS_ASSERT_SV_COPYPV_FLAGS; - s = SvPV_flags_const(ssv,len,(flags & SV_GMAGIC)); sv_setpvn(dsv,s,len); if (SvUTF8(ssv)) @@ -3271,6 +3337,7 @@ Perl_sv_copypv_flags(pTHX_ SV *const dsv /* =for apidoc sv_2pvbyte =for apidoc_item sv_2pvbyte_flags +=for apidoc_flag SV_GMAGIC These implement the various forms of the L> macros. The macros are the preferred interface. @@ -3284,8 +3351,6 @@ The forms differ in that plain C processes 'get' magic if and only if C contains C. -=for apidoc Amnh||SV_GMAGIC - =cut */ @@ -3415,6 +3480,8 @@ Perl_sv_2bool_flags(pTHX_ SV *sv, I32 fl =for apidoc_item sv_utf8_upgrade_flags =for apidoc_item sv_utf8_upgrade_flags_grow =for apidoc_item sv_utf8_upgrade_nomg +=for apidoc_flag SV_GMAGIC +=for apidoc_flag SV_FORCE_UTF8_UPGRADE These convert the PV of an SV to its UTF-8-encoded form. The SV is forced to string form if it is not already. @@ -3440,9 +3507,6 @@ Encode extension for that. The C flag is now ignored. -=for apidoc Amnh||SV_GMAGIC| -=for apidoc Amnh||SV_FORCE_UTF8_UPGRADE| - =cut If the routine itself changes the string, it adds a trailing C. Such a @@ -3691,6 +3755,9 @@ Perl_sv_utf8_encode(pTHX_ SV *const sv) if (SvREADONLY(sv)) { sv_force_normal_flags(sv, 0); } + if (SvIsCOW(sv)) { + S_sv_uncow(aTHX_ sv, 0); + } (void) sv_utf8_upgrade(sv); SvUTF8_off(sv); } @@ -3758,6 +3825,9 @@ Perl_sv_utf8_decode(pTHX_ SV *const sv) =for apidoc_item sv_setsv_flags =for apidoc_item sv_setsv_mg =for apidoc_item sv_setsv_nomg +=for apidoc_flag SV_NOSTEAL +=for apidoc_flag SV_GMAGIC +=for apidoc_flag SV_SMAGIC These copy the contents of the source SV C into the destination SV C. C may be destroyed if it is mortal, so don't use these functions if @@ -3784,19 +3854,17 @@ C>. C is the primary function for copying scalars, and most other copy-ish functions and macros use it underneath. -=for apidoc Amnh||SV_NOSTEAL - =cut */ static void S_glob_assign_glob(pTHX_ SV *const dsv, SV *const ssv, const int dtype) { + PERL_ARGS_ASSERT_GLOB_ASSIGN_GLOB; + I32 mro_changes = 0; /* 1 = method, 2 = isa, 3 = recursive isa */ HV *old_stash = NULL; - PERL_ARGS_ASSERT_GLOB_ASSIGN_GLOB; - if (dtype != SVt_PVGV && !isGV_with_GP(dsv)) { const char * const name = GvNAME(ssv); const STRLEN len = GvNAMELEN(ssv); @@ -3917,8 +3985,7 @@ S_glob_assign_glob(pTHX_ SV *const dsv, } else if(mro_changes) mro_method_changed_in(GvSTASH(dsv)); if (GvIO(dsv) && dtype == SVt_PVGV) { - DEBUG_o(Perl_deb(aTHX_ - "glob_assign_glob clearing PL_stashcache\n")); + DEBUG_o(deb("glob_assign_glob clearing PL_stashcache\n")); /* It's a cache. It will rebuild itself quite happily. It's a lot of effort to work out exactly which key (or keys) might be invalidated by the creation of the this file handle. @@ -3931,6 +3998,8 @@ S_glob_assign_glob(pTHX_ SV *const dsv, void Perl_gv_setref(pTHX_ SV *const dsv, SV *const ssv) { + PERL_ARGS_ASSERT_GV_SETREF; + SV * const sref = SvRV(ssv); SV *dref; const int intro = GvINTRO(dsv); @@ -3938,8 +4007,6 @@ Perl_gv_setref(pTHX_ SV *const dsv, SV * U8 import_flag = 0; const U32 stype = SvTYPE(sref); - PERL_ARGS_ASSERT_GV_SETREF; - if (intro) { GvINTRO_off(dsv); /* one-shot flag */ GvLINE(dsv) = CopLINE(PL_curcop); @@ -4015,13 +4082,11 @@ Perl_gv_setref(pTHX_ SV *const dsv, SV * report_redefined_cv( sv_2mortal( stash - ? Perl_newSVpvf(aTHX_ - "%" HEKf "::%" HEKf, - HEKfARG(HvNAME_HEK(stash)), - HEKfARG(GvENAME_HEK(MUTABLE_GV(dsv)))) - : Perl_newSVpvf(aTHX_ - "%" HEKf, - HEKfARG(GvENAME_HEK(MUTABLE_GV(dsv)))) + ? newSVpvf("%" HEKf "::%" HEKf, + HEKfARG(HvNAME_HEK(stash)), + HEKfARG(GvENAME_HEK(MUTABLE_GV(dsv)))) + : newSVpvf("%" HEKf, + HEKfARG(GvENAME_HEK(MUTABLE_GV(dsv)))) ), cv, CvCONST((const CV *)sref) ? &new_const_sv : NULL @@ -4124,10 +4189,10 @@ Perl_gv_setref(pTHX_ SV *const dsv, SV * magic_clearisa do it for us, as it already has the logic for dealing with globs vs arrays of globs. */ assert(mg); - Perl_magic_clearisa(aTHX_ NULL, mg); + magic_clearisa(NULL, mg); } else if (stype == SVt_PVIO) { - DEBUG_o(Perl_deb(aTHX_ "gv_setref clearing PL_stashcache\n")); + DEBUG_o(deb("gv_setref clearing PL_stashcache\n")); /* It's a cache. It will rebuild itself quite happily. It's a lot of effort to work out exactly which key (or keys) might be invalidated by the creation of the this file handle. @@ -4155,10 +4220,11 @@ Perl_gv_setref(pTHX_ SV *const dsv, SV * void Perl_sv_buf_to_ro(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_BUF_TO_RO; + struct perl_memory_debug_header * const header = (struct perl_memory_debug_header *)(SvPVX(sv)-PERL_MEMORY_DEBUG_HEADER_SIZE); const MEM_SIZE len = header->size; - PERL_ARGS_ASSERT_SV_BUF_TO_RO; # ifdef PERL_TRACK_MEMPOOL if (!header->readonly) header->readonly = 1; # endif @@ -4170,10 +4236,11 @@ Perl_sv_buf_to_ro(pTHX_ SV *sv) static void S_sv_buf_to_rw(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_BUF_TO_RW; + struct perl_memory_debug_header * const header = (struct perl_memory_debug_header *)(SvPVX(sv)-PERL_MEMORY_DEBUG_HEADER_SIZE); const MEM_SIZE len = header->size; - PERL_ARGS_ASSERT_SV_BUF_TO_RW; if (mprotect(header, len, PROT_READ|PROT_WRITE)) warn("mprotect for COW string %p %lu failed with %d", header, len, errno); @@ -4205,6 +4272,28 @@ S_sv_buf_to_rw(pTHX_ SV *sv) && len /* and really is a string */ \ ) +/* The test in this macro was also extracted from Perl_sv_setsv_flags so + * that it could be used elsewhere. */ +#ifdef PERL_COPY_ON_WRITE +#define S_SvPV_shared_hkey_or_CoWable(ssv, dsv, sflags, cur, len) \ + (sflags & SVf_IsCOW \ + ? (!len || \ + ( (CHECK_COWBUF_THRESHOLD(cur,len) || SvLEN(dsv) < cur+1) \ + /* If this is a regular (non-hek) COW, only so */ \ + /* many COW "copies" are possible. */ \ + && CowREFCNT(ssv) != SV_COW_REFCNT_MAX )) \ + : ( (sflags & CAN_COW_MASK) == CAN_COW_FLAGS \ + && !(SvFLAGS(dsv) & SVf_BREAK) \ + && CHECK_COW_THRESHOLD(cur,len) && cur+1 < len \ + && (CHECK_COWBUF_THRESHOLD(cur,len) || SvLEN(dsv) < cur+1) \ + )) +#else +#define S_SvPV_shared_hkey_or_CoWable(ssv, dsv, sflags, cur, len) \ + ( sflags & SVf_IsCOW \ + && !(SvFLAGS(dsv) & SVf_BREAK) \ + ) +#endif + /* Perl_sv_can_swipe_pv_buf was originally created for pp_reverse. */ bool Perl_sv_can_swipe_pv_buf(pTHX_ SV *sv) @@ -4217,13 +4306,13 @@ Perl_sv_can_swipe_pv_buf(pTHX_ SV *sv) void Perl_sv_setsv_flags(pTHX_ SV *dsv, SV* ssv, const I32 flags) { + PERL_ARGS_ASSERT_SV_SETSV_FLAGS; + U32 sflags; int dtype; svtype stype; unsigned int both_type; - PERL_ARGS_ASSERT_SV_SETSV_FLAGS; - if (UNLIKELY( ssv == dsv )) return; @@ -4306,25 +4395,19 @@ Perl_sv_setsv_flags(pTHX_ SV *dsv, SV* s /* Should preserve some dsv flags - at least SVs_TEMP, */ /* so cannot just set SvFLAGS(dsv) = new_dflags */ /* First clear the flags that we do want to clobber */ - (void)SvOK_off(dsv); - SvFLAGS(dsv) &= ~SVTYPEMASK; + SvFLAGS(dsv) &= ~(SVTYPEMASK|SVf_OK|SVf_IVisUV); /* Now set the new flags */ SvFLAGS(dsv) |= new_dflags; SvREFCNT_dec(old_rv); return; } -/* -#if NVSIZE <= IVSIZE - both_type = (stype | dtype); -#endif -*/ + if (UNLIKELY(both_type == SVTYPEMASK)) { croak_sv_setsv_flags(dsv, ssv); NOT_REACHED; } - SV_CHECK_THINKFIRST_COW_DROP(dsv); dtype = SvTYPE(dsv); /* THINKFIRST may have changed type */ @@ -4616,9 +4699,9 @@ Perl_sv_setsv_flags(pTHX_ SV *dsv, SV* s * */ - /* Whichever path we take through the next code, we want this true, - and doing it now facilitates the COW check. */ - (void)SvPOK_only(dsv); + (void)SvOK_off(dsv); + SvFLAGS(dsv) |= sflags & + (SVf_POK|SVp_POK|SVf_IOK|SVp_IOK|SVf_IVisUV|SVf_NOK|SVp_NOK|SVf_UTF8); if ( !(flags & SV_NOSTEAL) && S_SvPV_can_swipe_buf(ssv, sflags, cur, len) ) { /* Passes the swipe test. */ @@ -4629,7 +4712,11 @@ Perl_sv_setsv_flags(pTHX_ SV *dsv, SV* s SvCUR_set(dsv, SvCUR(ssv)); SvTEMP_off(dsv); - (void)SvOK_off(ssv); /* NOTE: nukes most SvFLAGS on ssv */ + + assert(!SvOOK(ssv)); /* According to S_SvPV_can_swipe_buf() */ + /* NOTE: nukes most SvFLAGS on ssv */ + SvFLAGS(ssv) &= ~(SVf_OK|SVf_IVisUV|SVf_UTF8); + SvPV_set(ssv, NULL); SvLEN_set(ssv, 0); SvCUR_set(ssv, 0); @@ -4647,25 +4734,8 @@ Perl_sv_setsv_flags(pTHX_ SV *dsv, SV* s SvCUR_set(dsv, cur); SvFLAGS(dsv) |= (SVf_IsCOW|SVppv_STATIC); } - else if (flags & SV_COW_SHARED_HASH_KEYS - && -#ifdef PERL_COPY_ON_WRITE - (sflags & SVf_IsCOW - ? (!len || - ( (CHECK_COWBUF_THRESHOLD(cur,len) || SvLEN(dsv) < cur+1) - /* If this is a regular (non-hek) COW, only so - many COW "copies" are possible. */ - && CowREFCNT(ssv) != SV_COW_REFCNT_MAX )) - : ( (sflags & CAN_COW_MASK) == CAN_COW_FLAGS - && !(SvFLAGS(dsv) & SVf_BREAK) - && CHECK_COW_THRESHOLD(cur,len) && cur+1 < len - && (CHECK_COWBUF_THRESHOLD(cur,len) || SvLEN(dsv) < cur+1) - )) -#else - sflags & SVf_IsCOW - && !(SvFLAGS(dsv) & SVf_BREAK) -#endif - ) { + else if ((flags & SV_COW_SHARED_HASH_KEYS) && + S_SvPV_shared_hkey_or_CoWable(ssv, dsv, sflags, cur, len)){ /* Either it's a shared hash key, or it's suitable for copy-on-write. */ #ifdef DEBUGGING @@ -4724,22 +4794,20 @@ Perl_sv_setsv_flags(pTHX_ SV *dsv, SV* s affected by the numeric locale, hence we can cache the stringification. Currently that's +Inf, -Inf and NaN, but conceivably we might extend this to -9 .. +9 (excluding -0). - So mark destination the same: */ - SvFLAGS(dsv) &= ~SVf_POK; + So confirm the destination doesn't have SVf_POK set. */ + assert(!(SvFLAGS(dsv) & SVf_POK)); } } if (sflags & SVp_IOK) { SvIV_set(dsv, SvIVX(ssv)); - if (sflags & SVf_IVisUV) - SvIsUV_on(dsv); if ((sflags & SVf_IOK) && !(sflags & SVf_POK)) { /* Source was SVf_IOK|SVp_IOK|SVp_POK but not SVf_POK, meaning - a value set as an integer and later stringified. So mark - destination the same: */ - SvFLAGS(dsv) &= ~SVf_POK; + a value set as an integer and later stringified. So confirm + the destination doesn't have SVf_POK set. */ + assert(!(SvFLAGS(dsv) & SVf_POK)); } } - SvFLAGS(dsv) |= sflags & (SVf_IOK|SVp_IOK|SVf_NOK|SVp_NOK|SVf_UTF8); + { const char *vstr_pv; STRLEN vstr_len; @@ -4771,81 +4839,537 @@ Perl_sv_setsv_flags(pTHX_ SV *dsv, SV* s SvTAINT(dsv); } +/* A helper for newSVsv_flags_NN, which does the heavy lifting for + * newSVsv_flags and sv_mortalcopy_flags. This helper function implements + * the swipe/COW/copy operation on pOK SVs. + * The code should heavily track the equivalent code in Perl_sv_setsv_flags, + * and some more detailed comments can be found there. However, this code has + * a number of specific divergences: + * * "dsv" is a newly minted SV, so no need to handle existing buffers + * * similarly, no need to check for the OOK hack + * * The SVppv_STATIC case is not handled here, as it (at time of writing) + * only applies to SVt_PVNVs and the hottest "dsv" path is for SVt_PVs. + * The missing case is implemented in S_newSVsv_flags_NN_PVxx. + * This function is marked for inlining, also to benefit the hot SVt_PV case. + * + * [%] numbers are a rough percentage of calls to this function, as + * measured by a gcov build running the test harness. They are presented + * only for general information and will not be representative of all + * workloads or applications. + */ +PERL_STATIC_FORCE_INLINE SV* +S_newSVsv_flags_NN_POK(pTHX_ SV* dsv, SV* ssv, const I32 flags) +{ + /* SvLEN, SvCUR, SvPVX for dsv are all uninitialized at this point */ -/* -=for apidoc sv_set_undef + const U32 sflags = SvFLAGS(ssv); + const STRLEN cur = SvCUR(ssv); + const STRLEN len = SvLEN(ssv); + + assert(!SvIsCOW_static(ssv)); /* SVppv_STATIC: see newSVsv_flags_NN_PVxx */ + + if (!(flags & SV_NOSTEAL) && + UNLIKELY(S_SvPV_can_swipe_buf(ssv, sflags, cur, len)) ) { + /* [ <1% ] */ + /* Passes the swipe test. */ + char * buf = SvPVX_mutable(ssv); + SvLEN_set(dsv, len); + SvCUR_set(dsv, cur); + SvPV_set(dsv, buf); + + assert(!SvOOK(ssv)); /* According to S_SvPV_can_swipe_buf() */ + /* (void)SvOK_off(ssv); but without the superfluous SvOOK_off(ssv)) */ + SvFLAGS(ssv) &= ~(SVf_OK|SVf_IVisUV|SVf_UTF8|SVs_TEMP); + + SvPV_set(ssv, NULL); + SvLEN_set(ssv, 0); + SvCUR_set(ssv, 0); + return dsv; + } -Equivalent to C, but more efficient. -Doesn't handle set magic. + /* S_SvPV_shared_hkey_or_CoWable() needs an accurate SvLEN(dsv) */ + SvLEN_set(dsv, 0); -The perl equivalent is C<$sv = undef;>. Note that it doesn't free any string -buffer, unlike C. + ASSUME(!(SvFLAGS(dsv) & SVf_BREAK)); -Introduced in perl 5.25.12. + if ((flags & SV_COW_SHARED_HASH_KEYS) && + S_SvPV_shared_hkey_or_CoWable(ssv, dsv, sflags, cur, len) + ) { /* [ 47% ] */ + /* Either it's a shared hash key, or it's suitable for + copy-on-write. */ +#ifdef DEBUGGING + if (DEBUG_C_TEST) { + PerlIO_printf(Perl_debug_log, "Copy on write: ssv --> dsv\n"); + sv_dump(ssv); + sv_dump(dsv); + } +#endif +#ifdef PERL_ANY_COW + if (!(sflags & SVf_IsCOW)) { + SvIsCOW_on(ssv); + CowREFCNT(ssv) = 0; + } -=cut -*/ + if (LIKELY(len)) { /* [ 43% ] */ + if (sflags & SVf_IsCOW) { + sv_buf_to_rw(ssv); + } + CowREFCNT(ssv)++; + SvPV_set(dsv, SvPVX_mutable(ssv)); + sv_buf_to_ro(ssv); + } else +#endif + { /* [ 4%] */ + /* SvIsCOW_shared_hash */ + DEBUG_C(PerlIO_printf(Perl_debug_log, + "Copy on write: Sharing hash\n")); + SvPV_set(dsv, + HEK_KEY(share_hek_hek(SvSHARED_HEK_FROM_PV(SvPVX_const(ssv))))); + } + SvLEN_set(dsv, len); + SvIsCOW_on(dsv); + } else { /* [ 52% ] */ + /* Failed the swipe test, and we cannot do copy-on-write either. + Have to copy the string. */ -void -Perl_sv_set_undef(pTHX_ SV *sv) -{ - U32 type = SvTYPE(sv); +#ifdef DEBUGGING + /* Perl_sv_grow_fresh asserts that cur == 0 + * but doesn't actually need it to. */ + SvCUR_set(dsv, 0); +#endif + char * dsvpvx = sv_grow_fresh(dsv, cur + 1); + + ASSUME(SvPVX_const(ssv) != SvPVX(dsv)); + *(dsvpvx + cur) = 0; + Copy(SvPVX_const(ssv),dsvpvx,cur,char); + } + SvCUR_set(dsv, cur); + return dsv; +} - PERL_ARGS_ASSERT_SV_SET_UNDEF; +/* S_newSVsv_flags_NN_PVxx mainly handles source SV types above SVt_PV + * for Perl_newSVsv_flags_NN. This function may get inlined, even + * though it might be preferable if it didn't. + * + * Notes: It is the caller's responsibility to check GET magic. + * Perl_sv_setsv_flags essentially ignores magic, except for + * taint and vstring magic, which are also handled here. + * + * All SV body structs must be initialized by the end of this + * function. Even if SvFLAGS(ssv) indicates that a struct member + * is not valid in `ssv`, it turns out that some code does + * actually store values without setting the associated `OK` flags + * and reads values for which the associated `OK` flags are unset. + * + * [%] numbers are a rough percentage of calls to this function, as + * measured by a gcov build running the test harness. They are presented + * only for general information and will not be representative of all + * workloads or applications. + */ - /* shortcut, NULL, IV, RV */ +static SV* +S_newSVsv_flags_NN_PVxx(pTHX_ SV* dsv, SV* ssv, const I32 flags) +{ + assert(ssv); + assert(dsv); - if (type <= SVt_IV) { - assert(!SvGMAGICAL(sv)); - if (SvREADONLY(sv)) { - /* does undeffing PL_sv_undef count as modifying a read-only - * variable? Some XS code does this */ - if (sv == &PL_sv_undef) - return; - croak_no_modify(); - } + svtype stype = SvTYPE(ssv); + U32 sflags = SvFLAGS(ssv); - if (SvROK(sv)) { - if (SvWEAKREF(sv)) - sv_unref_flags(sv, 0); - else { - SV *rv = SvRV(sv); - SvFLAGS(sv) = type; /* quickly turn off all flags */ - SvREFCNT_dec_NN(rv); - return; + /* Only an SV head has been allocated */ + assert(SvTYPE(dsv) == SVt_NULL); + assert(!SvANY(dsv)); + + switch(stype) { + case SVt_PV: /* [ <0.1% ] */ + { + SvANY(dsv) = new_XPV(); + SV* svrv = NULL; + if (SvROK(ssv) ) { + svrv = SvREFCNT_inc(SvRV(ssv)); + SvFLAGS(dsv) = SVt_PV|SVf_ROK; + } else { + assert(!SvPOK(ssv)); + SvFLAGS(dsv) = SVt_PV; + } + SvRV_set(dsv, svrv); + SvCUR_set(dsv, 0); + SvLEN_set(dsv, 0); + return dsv; } - } - SvFLAGS(sv) = type; /* quickly turn off all flags */ - return; + case SVt_PVIV: /* [ 9% ] */ + SvANY(dsv) = new_XPVIV(); + SvFLAGS(dsv) = SVt_PVIV; + break; + case SVt_PVNV: /* [ 15 %] */ + SvANY(dsv) = new_XPVNV(); + SvFLAGS(dsv) = SVt_PVNV; + SvNV_set(dsv, 0.0); /* IV and PV are initialized below */ + break; + case SVt_PVMG: /* [ 71% ] */ + if (flags & SV_GMAGIC && SvGMAGICAL(ssv)) + goto call_sv_setsv_flags; + + SvANY(dsv) = new_XPVMG(); + SvFLAGS(dsv) = SVt_PVMG; + SvMAGIC(dsv) = NULL; + SvSTASH(dsv) = NULL; + SvNV_set(dsv, 0.0); /* IV and PV are initialized below */ + break; + default: /* [ 4% ] */ + if (flags & SV_GMAGIC && SvGMAGICAL(ssv)) { /* [ 3.5% ] */ + call_sv_setsv_flags: + /* Avoid dsv being leaked if SvGETMAGIC croaks. */ + EXTEND_MORTAL(1); + PL_tmps_stack[++PL_tmps_ix] = dsv; + SSize_t orig_ix = PL_tmps_ix; + + SvGETMAGIC(ssv); + /* If we made it, disarm the leak guard */ + if (LIKELY(PL_tmps_ix == orig_ix)) + PL_tmps_ix--; + else + PL_tmps_stack[orig_ix] = &PL_sv_undef; + } + sv_setsv_flags(dsv, ssv, flags & ~SV_GMAGIC); + return dsv; + case SVt_INVLIST: /* [ <<< 0.1% ] */ + invlist_clone(ssv, dsv); + return dsv; + /* The following cases seem relatively rare, so have been kept out of + * Perl_newSVsv_flags_NN. */ + case SVt_IV: /* [ 0.1% ] */ + SET_SVANY_FOR_BODYLESS_IV(dsv); + if (SvROK(ssv) ) { /* SVprv_WEAKREF */ +#if defined (DEBUGGING) || defined (PERL_DEBUG_COW) + dsv->sv_u.svu_rv = SvREFCNT_inc(SvRV(ssv)); +#else + dsv->sv_u.svu_rv = SvREFCNT_inc( ssv->sv_u.svu_rv ); +#endif + SvFLAGS(dsv) = SVt_IV|SVf_ROK; + } else { + assert(!SvOK(ssv)); + SvFLAGS(dsv) = SVt_IV; + } + return dsv; + case SVt_NV: /* [ <<< 1% ] */ + assert(!SvOK(ssv)); +#if NVSIZE <= IVSIZE + SET_SVANY_FOR_BODYLESS_NV(dsv); + SvFLAGS(dsv) = SVt_NV; +#else + SvANY(dsv) = new_XNV(); + SvFLAGS(dsv) = SVt_NV; + SvNV_set(dsv, 0.0); +#endif + return dsv; } + assert(SvTYPE(dsv) == SVt_PVIV || SvTYPE(dsv) == SVt_PVNV || SvTYPE(dsv) == SVt_PVMG); - if (SvIS_FREED(sv)) - croak("panic: attempt to undefine a freed scalar %p", - (void *)sv); - - SV_CHECK_THINKFIRST_COW_DROP(sv); - - if (isGV_with_GP(sv)) - ck_warner(packWARN(WARN_MISC), - "Undefined value assigned to typeglob"); - else - SvOK_off(sv); -} - -/* -=for apidoc sv_set_true + /* [ 92.5% of calls to this function made it here. ] */ -Equivalent to C, but may be made more -efficient in the future. Doesn't handle set magic. + /* This is the only place we set dsv's flags, with the exception + of SVf_IsCOW, which can't be on for S_newSVsv_flags_NN_POK */ + SvFLAGS(dsv) |= sflags & ( + SVf_IOK|SVp_IOK|SVf_IVisUV|SVf_NOK|SVp_NOK + |SVf_ROK|SVf_POK|SVp_POK|SVf_UTF8|SVppv_STATIC + ); -The perl equivalent is C<$sv = !0;>. + SvPV_set(dsv, NULL); + SvCUR_set(dsv, 0); + SvLEN_set(dsv, 0); -Introduced in perl 5.35.11. + switch(sflags & (SVp_IOK|SVp_NOK|SVf_ROK|SVp_POK|SVf_FAKE|SVppv_STATIC)) { + case SVp_IOK: /* [ 50% ]*/ + SvIV_set(dsv, SvIVX(ssv)); + return dsv; + case SVp_POK|SVp_IOK|SVp_NOK: /* [ 3% ] */ + ASSUME(SvTYPE(dsv) != SVt_PVIV); + SvNV_set(dsv, SvNVX(ssv)); + /* FALLTHROUGH */ + case SVp_POK|SVp_IOK: /* [ 7% ] */ + SvIV_set(dsv, SvIVX(ssv)); + break; + case SVp_POK: /* [ 28% ] */ + SvIV_set(dsv, 0); /* Initializing for code that blindly reads IV */ + break; + case SVp_POK|SVp_IOK|SVp_NOK|SVppv_STATIC: /* [ 6.5% ]*/ + /* e.g. PL_sv_yes, PL_sv_no */ + ASSUME(!(SvFLAGS(dsv) & SVf_BREAK)); + ASSUME(SvTYPE(dsv) >= SVt_PVNV); + SvFLAGS(dsv) |= SVf_IsCOW; -=cut -*/ + SvPV_set(dsv, SvPVX(ssv)); + SvCUR_set(dsv, SvCUR(ssv)); -void + SvIV_set(dsv, SvIVX(ssv)); + SvNV_set(dsv, SvNVX(ssv)); + return dsv; + case SVp_POK|SVp_NOK: /* [ 3% ]*/ + SvIV_set(dsv, 0); /* Initializing for code that blindly reads IV */ + SvNV_set(dsv, SvNVX(ssv)); + break; + case SVf_ROK: /* [ 3% ]*/ + /* Another corner case here. SVf_IVisUV and SVprv_WEAKREF + * have the same underlying value. We do not want to + * propagate the latter. */ + SvFLAGS(dsv) &= ~SVprv_WEAKREF; + SvRV_set(dsv, SvREFCNT_inc(SvRV(ssv))); + return dsv; + default: /* [ 2% ]*/ + SvIV_set(dsv, 0); /* Initializing for code that blindly reads IV */ + if(!SvOK(ssv)) /* [ ~2% ]*/ + return dsv; + /* Some cases seem so rare that we may as well let + * sv_setsv_flags deal with them. For example: + * SVp_IOK|SVp_NOK + * + * Some cases are (currently) not naturally occurring: + * SVp_POK|SVppv_STATIC + * SVp_POK|SVp_IOK|SVppv_STATIC + * SVp_POK|SVp_NOK|SVppv_STATIC + * + * Other cases are also rare but also trickier to handle, + * so keeps this function smaller to not even try. */ + sv_setsv_flags(dsv,ssv,flags); + return dsv; + case SVp_NOK: /* [ << 1% ]*/ + ASSUME(SvTYPE(dsv) != SVt_PVIV); + SvIV_set(dsv, 0); /* Initializing for code that blindly reads IV */ + SvNV_set(dsv, SvNVX(ssv)); + return dsv; + } + assert(SVp_POK); /* All other cases should have returned */ + + S_newSVsv_flags_NN_POK(aTHX_ dsv, ssv, flags); + + if ( (sflags & (SVf_NOK|SVf_IOK)) && !(sflags & SVf_POK) ) { + /* ssv was assigned a numerical value that was later + * stringified, where the value isn't affected by the + * numeric locale and therefore its stringification can + * be cached. See the original checks in Perl_sv_setsv_flags + * for more information. The main point is that the + * SVf_POK should not have been set on dsv either and so + * we assert that here. */ + assert(!(SvFLAGS(dsv) & SVf_POK)); + } + + { + const char *vstr_pv; + STRLEN vstr_len; + if ((vstr_pv = SvVSTRING(ssv, vstr_len))) { /* [ <<< 1% ] */ + sv_magic(dsv, NULL, PERL_MAGIC_vstring, vstr_pv, vstr_len); + SvRMAGICAL_on(dsv); + } + } + if (SvTAINTED(ssv)) /* [ <<< 1% ] */ + SvTAINT(dsv); + return dsv; +} + +/* +=for apidoc newSVsv_flags_NN +=for apidoc_flag SVs_TEMP +=for apidoc_flag SV_NOSTEAL + +This creates a new SV which contains the values of the original SV. + +It does the bulk of the work for C and C. +Less common cases are passed to C. + +This function accepts the same flags as C, with the single +addition of C, which toggles the treatment of a freed source SV: + * Not present: emulate C by emitting a warning and + returning NULL. + * Present: emulate C behaviour: C. + +=cut +*/ + + /* Note: If a PVIV/PVNV/PVMG is only IOK, NOK, ROK, it is _mostly_ + * possible to create just a headless SV to store that value. + * Some parts of core (Perl_amagic_call in gv.c specifically) do + * assume - and possibly CPAN might - that SvTYPE(dsv) == SvTYPE(ssv) + * though, which is why the code below does not try that type + * simplification. Perhaps this might be worth revisiting in the future. + * -- April 2025. */ +/* + * [%] numbers are a rough percentage of calls to this function, as + * measured by a gcov build running the test harness. They are presented + * only for general information and will not be representative of all + * workloads or applications. +*/ + +SV * +Perl_newSVsv_flags_NN(pTHX_ SV *const old, I32 flags) +{ + PERL_ARGS_ASSERT_NEWSVSV_FLAGS_NN; + SV *dsv; + new_SV(dsv); + + /* new_SV includes default initialization of SvFLAGS and SvANY. + * However, the SVt_IV cases in the switch below are both very common + * and very simple. If we initialize for those cases, a decent compiler + * will hopefully elide new_SVs defaults so no extra work is done. + * For all other cases, SvANY and SvFLAGS will be overwritten anyway. */ + SET_SVANY_FOR_BODYLESS_IV(dsv); + SvFLAGS(dsv) = SVt_IV|SVf_IOK|SVp_IOK; + + const U32 sflags = SvFLAGS(old); + + /* These are the hottest and simplest cases */ + switch( sflags & (SVTYPEMASK|SVf_IOK|SVf_IVisUV|SVf_ROK|SVf_NOK|SVf_POK) ) { + case SVt_IV|SVf_IOK: /* [ 31% ] */ + assert(SvANY(dsv)); + assert(SvFLAGS(dsv) == (SVt_IV|SVf_IOK|SVp_IOK) ); + + assert( &(old->sv_u.svu_iv) + == &(((XPVIV*) SvANY(old))->xiv_iv)); + assert( &(dsv->sv_u.svu_iv) + == &(((XPVIV*) SvANY(dsv))->xiv_iv)); + dsv->sv_u.svu_iv = old->sv_u.svu_iv; + break; + case SVt_IV|SVf_ROK: /* [ 11% ] */ + assert(SvANY(dsv)); + SvFLAGS(dsv) = SVt_IV|SVf_ROK; +#if defined (DEBUGGING) || defined (PERL_DEBUG_COW) + dsv->sv_u.svu_rv = SvREFCNT_inc_NN(SvRV(old)); +#else + dsv->sv_u.svu_rv = SvREFCNT_inc_NN( old->sv_u.svu_rv ); +#endif + break; + case SVt_PV|SVf_POK: /* [ 33% ] */ + SvANY(dsv) = new_XPV(); + SvFLAGS(dsv) = SVt_PV|SVf_POK|SVp_POK|(sflags & SVf_UTF8); + return S_newSVsv_flags_NN_POK(aTHX_ dsv, old, flags); + case SVt_NV|SVf_NOK: /* [ < 1% ] - but won't be in float-heavy code! */ +#if NVSIZE <= IVSIZE + SET_SVANY_FOR_BODYLESS_NV(dsv); +#else + SvANY(dsv) = new_XNV(); +#endif + SvFLAGS(dsv) = SVt_NV|SVf_NOK|SVp_NOK; +#if NVSIZE <= IVSIZE + assert( &(old->sv_u.svu_nv) + == &(((XPVNV*) SvANY(old))->xnv_u.xnv_nv)); + assert( &(dsv->sv_u.svu_nv) + == &(((XPVNV*) SvANY(dsv))->xnv_u.xnv_nv)); + dsv->sv_u.svu_nv = old->sv_u.svu_nv; +#else + SvNV_set(dsv, SvNVX(old)); +#endif + break; + default: /* [ 24% ] */ + SvANY(dsv) = NULL; + goto second_switch; + } + return dsv; + + second_switch: + + /* Try again for SVt_NULL, the SVf_IVisUV case, and SVt_LAST, + * then send everything else to S_newSVsv_flags_NN_PVxx. */ + switch( sflags & (SVTYPEMASK|SVf_IOK|SVf_IVisUV|SVf_ROK|SVf_NOK|SVf_POK) ) { + case SVt_NULL: /* [4%] */ + SvFLAGS(dsv) = SVt_NULL; + break; + case SVt_IV|SVf_IOK|SVf_IVisUV: /* [<1%] */ + SET_SVANY_FOR_BODYLESS_IV(dsv); + dsv->sv_u.svu_uv = old->sv_u.svu_uv; + SvFLAGS(dsv) = SVt_IV|SVf_IOK|SVp_IOK|SVf_IVisUV; + break; + case SVt_LAST: /* [0%] */ + /* Note: sv_mortalcopy_flags sets the SVs_TEMP flag, newSVsv_flags does not. */ + if (!(flags & SVs_TEMP)) { /* This is newSVsv_flags' traditional behaviour */ + del_SV(dsv); + ck_warner_d(packWARN(WARN_INTERNAL), "semi-panic: attempt to dup freed string"); + return NULL; + } + /* sv_mortalcopy_flags traditionally had no special handling. */ + /* FALLTHROUGH */ + default: /* [ 20% ] */ + SvANY(dsv) = NULL; + SvFLAGS(dsv) = SVt_NULL; + return S_newSVsv_flags_NN_PVxx(aTHX_ dsv, old, flags); + } + + return dsv; +} + +/* +=for apidoc sv_set_undef + +Equivalent to C, but more efficient. +Doesn't handle set magic. + +The perl equivalent is C<$sv = undef;>. Note that it doesn't free any string +buffer, unlike C. + +Introduced in perl 5.25.12. + +=cut +*/ + +void +Perl_sv_set_undef(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_SV_SET_UNDEF; + + U32 type = SvTYPE(sv); + + /* shortcut, NULL, IV, RV */ + + if (type <= SVt_IV) { + assert(!SvGMAGICAL(sv)); + if (SvREADONLY(sv)) { + /* does undeffing PL_sv_undef count as modifying a read-only + * variable? Some XS code does this */ + if (sv == &PL_sv_undef) + return; + croak_no_modify(); + } + + if (SvROK(sv)) { + if (SvWEAKREF(sv)) + sv_unref_flags(sv, 0); + else { + SV *rv = SvRV(sv); + SvFLAGS(sv) = type; /* quickly turn off all flags */ + SvREFCNT_dec_NN(rv); + return; + } + } + SvFLAGS(sv) = type; /* quickly turn off all flags */ + return; + } + + if (SvIS_FREED(sv)) + croak("panic: attempt to undefine a freed scalar %p", + (void *)sv); + + SV_CHECK_THINKFIRST_COW_DROP(sv); + + if (isGV_with_GP(sv)) + ck_warner(packWARN(WARN_MISC), + "Undefined value assigned to typeglob"); + else + SvOK_off(sv); +} + +/* +=for apidoc sv_set_true + +Equivalent to C, but may be made more +efficient in the future. Doesn't handle set magic. + +The perl equivalent is C<$sv = !0;>. + +Introduced in perl 5.35.11. + +=cut +*/ + +void Perl_sv_set_true(pTHX_ SV *sv) { PERL_ARGS_ASSERT_SV_SET_TRUE; @@ -4907,6 +5431,8 @@ Perl_sv_setsv_mg(pTHX_ SV *const dsv, SV SV * Perl_sv_setsv_cow(pTHX_ SV *dsv, SV *ssv) { + PERL_ARGS_ASSERT_SV_SETSV_COW; + STRLEN cur = SvCUR(ssv); STRLEN len = SvLEN(ssv); char *new_pv; @@ -4915,7 +5441,6 @@ Perl_sv_setsv_cow(pTHX_ SV *dsv, SV *ssv const bool already = cBOOL(SvIsCOW(ssv)); #endif - PERL_ARGS_ASSERT_SV_SETSV_COW; #ifdef DEBUGGING if (DEBUG_C_TEST) { PerlIO_printf(Perl_debug_log, "Fast copy on write: %p -> %p\n", @@ -5002,10 +5527,10 @@ formed and ready to use, just like any o char * Perl_sv_setpv_bufsize(pTHX_ SV *const sv, const STRLEN cur, const STRLEN len) { - char *pv; - PERL_ARGS_ASSERT_SV_SETPV_BUFSIZE; + char *pv; + SV_CHECK_THINKFIRST_COW_DROP(sv); SvUPGRADE(sv, SVt_PV); pv = SvGROW(sv, len + 1); @@ -5059,10 +5584,10 @@ SVt_PVNV, or SVt_PVMG. void Perl_sv_setpvn(pTHX_ SV *const sv, const char *const ptr, const STRLEN len) { - char *dptr; - PERL_ARGS_ASSERT_SV_SETPVN; + char *dptr; + SV_CHECK_THINKFIRST_COW_DROP(sv); if (isGV_with_GP(sv)) croak_no_modify(); @@ -5100,9 +5625,10 @@ Perl_sv_setpvn_mg(pTHX_ SV *const sv, co void Perl_sv_setpvn_fresh(pTHX_ SV *const sv, const char *const ptr, const STRLEN len) { + PERL_ARGS_ASSERT_SV_SETPVN_FRESH; + char *dptr; - PERL_ARGS_ASSERT_SV_SETPVN_FRESH; assert(SvTYPE(sv) >= SVt_PV && SvTYPE(sv) <= SVt_PVMG); assert(!SvTHINKFIRST(sv)); assert(!isGV_with_GP(sv)); @@ -5126,10 +5652,10 @@ Perl_sv_setpvn_fresh(pTHX_ SV *const sv, void Perl_sv_setpv(pTHX_ SV *const sv, const char *const ptr) { - STRLEN len; - PERL_ARGS_ASSERT_SV_SETPV; + STRLEN len; + SV_CHECK_THINKFIRST_COW_DROP(sv); if (!ptr) { (void)SvOK_off(sv); @@ -5204,6 +5730,8 @@ Perl_sv_sethek(pTHX_ SV *const sv, const =for apidoc sv_usepvn =for apidoc_item sv_usepvn_flags =for apidoc_item sv_usepvn_mg +=for apidoc_flag SV_SMAGIC +=for apidoc_flag SV_HAS_TRAILING_NUL These tell an SV to use C for its string value. Normally SVs have their string stored inside the SV, but these tell the SV to use an @@ -5233,19 +5761,16 @@ magic is skipped. C is merely C with C set to C, so 'set' magic is performed. -=for apidoc Amnh||SV_SMAGIC -=for apidoc Amnh||SV_HAS_TRAILING_NUL - =cut */ void Perl_sv_usepvn_flags(pTHX_ SV *const sv, char *ptr, const STRLEN len, const U32 flags) { - STRLEN allocate; - PERL_ARGS_ASSERT_SV_USEPVN_FLAGS; + STRLEN allocate; + SV_CHECK_THINKFIRST_COW_DROP(sv); SvUPGRADE(sv, SVt_PV); if (!ptr) { @@ -5387,6 +5912,7 @@ S_sv_uncow(pTHX_ SV * const sv, const U3 =for apidoc sv_force_normal =for apidoc_item sv_force_normal_flags +=for apidoc_flag SV_COW_DROP_PV Undo various types of fakery on an SV, where fakery means "more than" a string: @@ -5427,8 +5953,6 @@ Other than what was mentioned above, the This is because C merely calls C with C set to 0. -=for apidoc Amnh||SV_COW_DROP_PV - =cut */ @@ -5532,6 +6056,8 @@ C works from the right. void Perl_sv_chop(pTHX_ SV *const sv, const char *const ptr) { + PERL_ARGS_ASSERT_SV_CHOP; + STRLEN delta; STRLEN old_delta; U8 *p; @@ -5541,8 +6067,6 @@ Perl_sv_chop(pTHX_ SV *const sv, const c #endif STRLEN max_delta; - PERL_ARGS_ASSERT_SV_CHOP; - if (!ptr || !SvPOKp(sv)) return; delta = ptr - SvPVX_const(sv); @@ -5628,6 +6152,8 @@ Perl_sv_chop(pTHX_ SV *const sv, const c =for apidoc_item sv_catpvs_flags =for apidoc_item sv_catpvs_mg =for apidoc_item sv_catpvs_nomg +=for apidoc_flag SV_CATUTF8 +=for apidoc_flag SV_CATBYTES These each concatenate a string onto the end of the string which is in C. They differ in how the catenated string is specified and in the handling of @@ -5662,19 +6188,17 @@ if C indicates that C is enc For all other forms, the string appended is assumed to be valid UTF-8 if and only if the C has the UTF-8 status set. -=for apidoc Amnh||SV_CATUTF8 -=for apidoc Amnh||SV_CATBYTES - =cut */ void Perl_sv_catpvn_flags(pTHX_ SV *const dsv, const char *sstr, const STRLEN slen, const I32 flags) { + PERL_ARGS_ASSERT_SV_CATPVN_FLAGS; + STRLEN dlen; const char * const dstr = SvPV_force_flags(dsv, dlen, flags); - PERL_ARGS_ASSERT_SV_CATPVN_FLAGS; assert((flags & (SV_CATBYTES|SV_CATUTF8)) != (SV_CATBYTES|SV_CATUTF8)); if (!(flags & SV_CATBYTES) || !SvUTF8(dsv)) { @@ -5762,12 +6286,12 @@ Perl_sv_catsv_flags(pTHX_ SV *const dsv, void Perl_sv_catpv(pTHX_ SV *const dsv, const char *sstr) { + PERL_ARGS_ASSERT_SV_CATPV; + STRLEN len; STRLEN tlen; char *junk; - PERL_ARGS_ASSERT_SV_CATPV; - if (!sstr) return; junk = SvPV_force(dsv, tlen); @@ -5817,12 +6341,18 @@ modules supporting older perls. SV * Perl_newSV(pTHX_ const STRLEN len) { + PERL_ARGS_ASSERT_NEWSV; + SV *sv; - if (!len) - new_SV(sv); - else { - sv = newSV_type(SVt_PV); + new_SV(sv); + if (len) { + SvFLAGS(sv) = SVt_PV; + SvANY(sv) = new_XPV(); + + SvCUR_set(sv, 0); + SvLEN_set(sv, 0); + sv_grow_fresh(sv, len + 1); } return sv; @@ -5843,8 +6373,15 @@ The reference count for the new SV is se SV * Perl_newSVpvz(pTHX_ const STRLEN len) { + PERL_ARGS_ASSERT_NEWSVPVZ; + SV *sv = newSV_type(SVt_PV); sv_grow_fresh(sv, len + 1); + + /* Some ASSUMEs which may help the compiler avoid unnecessary work */ + ASSUME(SvCUR(sv) == 0); + ASSUME(SvFLAGS(sv) == SVt_PV); + ASSUME(!TAINT_get); (void) sv_setpv_freshbuf(sv); return sv; @@ -5873,10 +6410,10 @@ MAGIC * Perl_sv_magicext(pTHX_ SV *const sv, SV *const obj, const int how, const MGVTBL *const vtable, const char *const name, const I32 namlen) { - MAGIC* mg; - PERL_ARGS_ASSERT_SV_MAGICEXT; + MAGIC* mg; + SvUPGRADE(sv, SVt_PVMG); Newxz(mg, 1, MAGIC); mg->mg_moremagic = SvMAGIC(sv); @@ -5975,13 +6512,13 @@ void Perl_sv_magic(pTHX_ SV *const sv, SV *const obj, const int how, const char *const name, const I32 namlen) { + PERL_ARGS_ASSERT_SV_MAGIC; + const MGVTBL *vtable; MAGIC* mg; unsigned int flags; unsigned int vtable_index; - PERL_ARGS_ASSERT_SV_MAGIC; - if (how < 0 || (unsigned)how >= C_ARRAY_LENGTH(PL_magic_data) || ((flags = PL_magic_data[how]), (vtable_index = flags & PERL_MAGIC_VTABLE_MASK) @@ -6044,19 +6581,7 @@ S_sv_unmagicext_flags(pTHX_ SV *const sv const MGVTBL* const virt = mg->mg_virtual; if (mg->mg_type == type && (!flags || virt == vtbl)) { *mgp = mg->mg_moremagic; - if (virt && virt->svt_free) - virt->svt_free(aTHX_ sv, mg); - if (mg->mg_ptr && mg->mg_type != PERL_MAGIC_regex_global) { - if (mg->mg_len > 0) - Safefree(mg->mg_ptr); - else if (mg->mg_len == HEf_SVKEY) - SvREFCNT_dec(MUTABLE_SV(mg->mg_ptr)); - else if (mg->mg_type == PERL_MAGIC_utf8) - Safefree(mg->mg_ptr); - } - if (mg->mg_flags & MGf_REFCOUNTED) - SvREFCNT_dec(mg->mg_obj); - Safefree(mg); + mg_free_struct(sv, mg); } else mgp = &mg->mg_moremagic; @@ -6117,10 +6642,10 @@ on already-weak references. SV * Perl_sv_rvweaken(pTHX_ SV *const sv) { - SV *tsv; - PERL_ARGS_ASSERT_SV_RVWEAKEN; + SV *tsv; + if (!SvOK(sv)) /* let undefs pass */ return sv; if (!SvROK(sv)) @@ -6151,10 +6676,10 @@ Silently ignores C and warns on n SV * Perl_sv_rvunweaken(pTHX_ SV *const sv) { - SV *tsv; - PERL_ARGS_ASSERT_SV_RVUNWEAKEN; + SV *tsv; + if (!SvOK(sv)) /* let undefs pass */ return sv; if (!SvROK(sv)) @@ -6169,7 +6694,7 @@ Perl_sv_rvunweaken(pTHX_ SV *const sv) SvWEAKREF_off(sv); SvROK_on(sv); SvREFCNT_inc_NN(tsv); - Perl_sv_del_backref(aTHX_ tsv, sv); + sv_del_backref(tsv, sv); return sv; } @@ -6193,10 +6718,10 @@ C SV * Perl_sv_get_backrefs(SV *const sv) { - SV *backrefs= NULL; - PERL_ARGS_ASSERT_SV_GET_BACKREFS; + SV *backrefs= NULL; + /* find slot to store array or singleton backref */ if (SvTYPE(sv) == SVt_PVHV) { @@ -6242,12 +6767,12 @@ Perl_sv_get_backrefs(SV *const sv) void Perl_sv_add_backref(pTHX_ SV *const tsv, SV *const sv) { + PERL_ARGS_ASSERT_SV_ADD_BACKREF; + SV **svp; AV *av = NULL; MAGIC *mg = NULL; - PERL_ARGS_ASSERT_SV_ADD_BACKREF; - /* find slot to store array or singleton backref */ if (SvTYPE(tsv) == SVt_PVHV) { @@ -6302,10 +6827,10 @@ Perl_sv_add_backref(pTHX_ SV *const tsv, void Perl_sv_del_backref(pTHX_ SV *const tsv, SV *const sv) { - SV **svp = NULL; - PERL_ARGS_ASSERT_SV_DEL_BACKREF; + SV **svp = NULL; + if (SvTYPE(tsv) == SVt_PVHV) { if (HvHasAUX(tsv)) svp = (SV**)Perl_hv_backreferences_p(aTHX_ MUTABLE_HV(tsv)); @@ -6419,12 +6944,12 @@ Perl_sv_del_backref(pTHX_ SV *const tsv, void Perl_sv_kill_backrefs(pTHX_ SV *const sv, AV *const av) { + PERL_ARGS_ASSERT_SV_KILL_BACKREFS; + SV **svp; SV **last; bool is_array; - PERL_ARGS_ASSERT_SV_KILL_BACKREFS; - if (!av) return; @@ -6525,6 +7050,8 @@ C. void Perl_sv_insert_flags(pTHX_ SV *const bigstr, const STRLEN offset, const STRLEN len, const char *little, const STRLEN littlelen, const U32 flags) { + PERL_ARGS_ASSERT_SV_INSERT_FLAGS; + char *big; char *mid; char *midend; @@ -6532,8 +7059,6 @@ Perl_sv_insert_flags(pTHX_ SV *const big SSize_t i; /* better be sizeof(STRLEN) or bad things happen */ STRLEN curlen; - PERL_ARGS_ASSERT_SV_INSERT_FLAGS; - SvPV_force_flags(bigstr, curlen, flags); (void)SvPOK_only_UTF8(bigstr); @@ -6630,10 +7155,10 @@ time you'll want to use C or o void Perl_sv_replace(pTHX_ SV *const sv, SV *const nsv) { - const U32 refcnt = SvREFCNT(sv); - PERL_ARGS_ASSERT_SV_REPLACE; + const U32 refcnt = SvREFCNT(sv); + SV_CHECK_THINKFIRST_COW_DROP(sv); if (SvREFCNT(nsv) != 1) { croak("panic: reference miscount on nsv in sv_replace()" @@ -6675,14 +7200,14 @@ Perl_sv_replace(pTHX_ SV *const sv, SV * * If that CV will outlive us, make it anonymous (i.e. fix up its CvGV * field) */ -STATIC void +static void S_anonymise_cv_maybe(pTHX_ GV *gv, CV* cv) { + PERL_ARGS_ASSERT_ANONYMISE_CV_MAYBE; + SV *gvname; GV *anongv; - PERL_ARGS_ASSERT_ANONYMISE_CV_MAYBE; - /* be assertive! */ assert(SvREFCNT(gv) == 0); assert(isGV(gv) && isGV_with_GP(gv)); @@ -6727,14 +7252,14 @@ you'll want to call C inst void Perl_sv_clear(pTHX_ SV *const orig_sv) { + PERL_ARGS_ASSERT_SV_CLEAR; + SV* iter_sv = NULL; SV* next_sv = NULL; SV *sv = orig_sv; STRLEN hash_index = 0; /* initialise to make Coverity et al happy. Not strictly necessary */ - PERL_ARGS_ASSERT_SV_CLEAR; - /* within this loop, sv is the SV currently being freed, and * iter_sv is the most recent AV or whatever that's being iterated * over to provide more SVs */ @@ -6851,10 +7376,8 @@ Perl_sv_clear(pTHX_ SV *const orig_sv) && (hek = HvNAME_HEK((HV*)sv))) { if (PL_stashcache) { - DEBUG_o(Perl_deb(aTHX_ - "sv_clear clearing PL_stashcache for '%" HEKf - "'\n", - HEKfARG(hek))); + DEBUG_o(deb("sv_clear clearing PL_stashcache for '%" + HEKf "'\n", HEKfARG(hek))); (void)hv_deletehek(PL_stashcache, hek, G_DISCARD); } @@ -7170,7 +7693,8 @@ Perl_sv_clear(pTHX_ SV *const orig_sv) sv does not have to be ROK. */ static bool -S_curse(pTHX_ SV * const sv, const bool check_refcnt) { +S_curse(pTHX_ SV * const sv, const bool check_refcnt) +{ PERL_ARGS_ASSERT_CURSE; assert(SvOBJECT(sv)); @@ -7188,7 +7712,7 @@ S_curse(pTHX_ SV * const sv, const bool assert (HvHasAUX(stash)); - DEBUG_o( Perl_deb(aTHX_ "Looking for DESTROY method for %s\n", + DEBUG_o( deb("Looking for DESTROY method for %s\n", HvNAME(stash)) ); /* don't make this an initialization above the assert, since it needs @@ -7196,7 +7720,7 @@ S_curse(pTHX_ SV * const sv, const bool meta = HvMROMETA(stash); if (meta->destroy_gen && meta->destroy_gen == PL_sub_generation) { destructor = meta->destroy; - DEBUG_o( Perl_deb(aTHX_ "Using cached DESTROY method %p for %s\n", + DEBUG_o( deb("Using cached DESTROY method %p for %s\n", (void *)destructor, HvNAME(stash)) ); } else { @@ -7220,11 +7744,11 @@ S_curse(pTHX_ SV * const sv, const bool meta->destroy_gen = PL_sub_generation; meta->destroy = destructor; - DEBUG_o( Perl_deb(aTHX_ "Set cached DESTROY method %p for %s\n", - (void *)destructor, HvNAME(stash)) ); + DEBUG_o( deb("Set cached DESTROY method %p for %s\n", + (void *)destructor, HvNAME(stash)) ); } else { - DEBUG_o( Perl_deb(aTHX_ "Not caching AUTOLOAD for DESTROY method for %s\n", + DEBUG_o( deb("Not caching AUTOLOAD for DESTROY method for %s\n", HvNAME(stash)) ); } } @@ -7305,7 +7829,9 @@ instead. SV * Perl_sv_newref(pTHX_ SV *const sv) { + PERL_ARGS_ASSERT_SV_NEWREF; PERL_UNUSED_CONTEXT; + if (sv) (SvREFCNT(sv))++; return sv; @@ -7325,6 +7851,8 @@ Normally called via a wrapper macro C slot. STRLEN Perl_sv_len(pTHX_ SV *const sv) { + PERL_ARGS_ASSERT_SV_LEN; + STRLEN len; if (!sv) @@ -7450,6 +7979,8 @@ C skips any magic. STRLEN Perl_sv_len_utf8(pTHX_ SV *const sv) { + PERL_ARGS_ASSERT_SV_LEN_UTF8; + if (!sv) return 0; @@ -7460,11 +7991,11 @@ Perl_sv_len_utf8(pTHX_ SV *const sv) STRLEN Perl_sv_len_utf8_nomg(pTHX_ SV * const sv) { + PERL_ARGS_ASSERT_SV_LEN_UTF8_NOMG; + STRLEN len; const U8 *s = (U8*)SvPV_nomg_const(sv, len); - PERL_ARGS_ASSERT_SV_LEN_UTF8_NOMG; - if (PL_utf8cache && SvUTF8(sv)) { STRLEN ulen; MAGIC *mg = SvMAGICAL(sv) ? mg_find(sv, PERL_MAGIC_utf8) : NULL; @@ -7477,22 +8008,21 @@ Perl_sv_len_utf8_nomg(pTHX_ SV * const s The longer value is stored in the first pair. */ STRLEN *cache = (STRLEN *) mg->mg_ptr; - ulen = cache[0] + Perl_utf8_length(aTHX_ s + cache[1], - s + len); + ulen = cache[0] + utf8_length(s + cache[1], s + len); } if (PL_utf8cache < 0) { - const STRLEN real = Perl_utf8_length(aTHX_ s, s + len); + const STRLEN real = utf8_length(s, s + len); assert_uft8_cache_coherent("sv_len_utf8", ulen, real, sv); } } else { - ulen = Perl_utf8_length(aTHX_ s, s + len); + ulen = utf8_length(s, s + len); utf8_mg_len_cache_update(sv, &mg, ulen); } return ulen; } - return SvUTF8(sv) ? Perl_utf8_length(aTHX_ s, s + len) : len; + return SvUTF8(sv) ? utf8_length(s, s + len) : len; } /* Walk forwards to find the byte corresponding to the passed in UTF-8 @@ -7502,11 +8032,11 @@ S_sv_pos_u2b_forwards(const U8 *const st STRLEN *const uoffset_p, bool *const at_end, bool* canonical_position) { + PERL_ARGS_ASSERT_SV_POS_U2B_FORWARDS; + const U8 *s = start; STRLEN uoffset = *uoffset_p; - PERL_ARGS_ASSERT_SV_POS_U2B_FORWARDS; - SSize_t overshoot; s = utf8_hop_forward_overshoot(s, uoffset, send, &overshoot); if (s >= send) { @@ -7527,10 +8057,10 @@ static STRLEN S_sv_pos_u2b_midway(const U8 *const start, const U8 *send, STRLEN uoffset, const STRLEN uend) { - STRLEN backw = uend - uoffset; - PERL_ARGS_ASSERT_SV_POS_U2B_MIDWAY; + STRLEN backw = uend - uoffset; + if (uoffset < 2 * backw) { /* The assumption is that the average size of a character is 2 bytes, * so going forwards is twice the speed of going backwards (that's @@ -7562,13 +8092,13 @@ S_sv_pos_u2b_cached(pTHX_ SV *const sv, const U8 *const send, STRLEN uoffset, STRLEN uoffset0, STRLEN boffset0) { + PERL_ARGS_ASSERT_SV_POS_U2B_CACHED; + STRLEN boffset = 0; /* Actually always set, but let's keep gcc happy. */ bool found = FALSE; bool at_end = FALSE; bool canonical_position = FALSE; - PERL_ARGS_ASSERT_SV_POS_U2B_CACHED; - assert (uoffset >= uoffset0); if (!uoffset) @@ -7673,6 +8203,7 @@ S_sv_pos_u2b_cached(pTHX_ SV *const sv, =for apidoc sv_pos_u2b =for apidoc_item sv_pos_u2b_flags +=for apidoc_flag PERL_MAGIC_utf8 These each find out how many bytes are occupied by the first so-many UTF-8-encoded characters in the PV of C. The character count is passed by @@ -7702,8 +8233,6 @@ C. Both functions use and update C. -=for apidoc Amnh||PERL_MAGIC_utf8 - =cut */ @@ -7718,12 +8247,12 @@ STRLEN Perl_sv_pos_u2b_flags(pTHX_ SV *const sv, STRLEN uoffset, STRLEN *const lenp, U32 flags) { + PERL_ARGS_ASSERT_SV_POS_U2B_FLAGS; + const U8 *start; STRLEN len; STRLEN boffset; - PERL_ARGS_ASSERT_SV_POS_U2B_FLAGS; - start = (U8*)SvPV_flags(sv, len, flags); if (len) { const U8 * const send = start + len; @@ -7819,10 +8348,10 @@ static void S_utf8_mg_pos_cache_update(pTHX_ SV *const sv, MAGIC **const mgp, const STRLEN byte, const STRLEN utf8, const STRLEN blen) { - STRLEN *cache; - PERL_ARGS_ASSERT_UTF8_MG_POS_CACHE_UPDATE; + STRLEN *cache; + if (SvREADONLY(sv)) return; @@ -7939,11 +8468,11 @@ static STRLEN S_sv_pos_b2u_midway(pTHX_ const U8 *const s, const U8 *const target, const U8 *end, STRLEN endu) { + PERL_ARGS_ASSERT_SV_POS_B2U_MIDWAY; + const STRLEN forw = target - s; STRLEN backw = end - target; - PERL_ARGS_ASSERT_SV_POS_B2U_MIDWAY; - if (forw < 2 * backw) { return utf8_length(s, target); } @@ -7959,6 +8488,7 @@ S_sv_pos_b2u_midway(pTHX_ const U8 *cons =for apidoc sv_pos_b2u =for apidoc_item sv_pos_b2u_flags +=for apidoc_flag PERL_MAGIC_utf8 These each count the number of UTF-8 encoded characters in the PV of C. The entire PV is not necessarily looked at, just the first so-many bytes. @@ -7988,8 +8518,6 @@ C. Both functions use and update C. -=for apidoc Amnh||PERL_MAGIC_utf8 - =cut */ @@ -8002,6 +8530,8 @@ Both functions use and update C> is in effect, the comparison is -byte-by-byte; otherwise character-by-character. Each will coerce its args to -strings if necessary. +These each return a boolean indicating if the strings in the two SVs are +equal, coercing the SV arguments to strings if necessary. If +S> is in effect, the comparison is byte-by-byte; otherwise +character-by-character. + +C and C always perform 'get' magic; they effectively +behave like the Perl code S>. The other two forms only +perform 'get' magic only when the C parameter has the C bit +set. + +The differences between the C forms and the plain C forms are: + +=over 4 -They differ only in that C always processes get magic, while -C processes get magic only when the C parameter has the -C bit set. +=item overloading -These functions do not handle operator overloading. For versions that do, -see instead C> or C>. +The plain C forms do not handle overloading; the C forms check for +and handle C overloading, unless the call is to C with the +C bit set in C. If such overloading does not exist +or the flag is set, then regular string comparison will be used instead, just +as in the plain C forms. + +=item treatment of a NULL SV parameter + +The plain C forms treat each NULL SV parameter as a zero length string; +the C forms treat them as C + +=back =cut */ @@ -8145,6 +8694,8 @@ see instead C> or C is the more general form, having a C argument that -affects its behavior in two ways. It coerces its args to strings if necessary, -treating a C argument as C. It correctly handles the UTF8 flag. - -If C has the C bit set, 'get' magic will be handled. - -If flags does not have the C bit set, an attempt to use -C overloading will be made. If such overloading does not exist or the -flag is set, then regular string comparison will be used instead. - -C merely calls C with C set to just -C. This function basically behaves like the Perl code -S>. - -=for apidoc Amnh||SV_SKIP_OVERLOAD - -=cut -*/ - bool Perl_sv_streq_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) { @@ -8248,23 +8773,180 @@ Perl_sv_streq_flags(pTHX_ SV *sv1, SV *s } /* +=for apidoc sv_numcmp_common +=for apidoc_flag SV_FORCE_OVERLOAD +=for apidoc_flag SV_GMAGIC +=for apidoc_flag SV_SKIP_OVERLOAD + +Handles the common parts of the L, sv_numne, +sv_numlt, sv_numle, sv_numge, sv_numgt, sv_numcmp APIs. + +C should be the C<*_amg> constant for the operator being +handled, such as C for numeric equality. + +C takes the same flags as the numeric comparison APIs. + +This includes: + +=over + +=item * + +treating possible NULL C<*sv1> and C<*sv2> arguments as undef. + +=item * + +calling get magic + +=item * + +handling the pain of overloading, including numericizing the SVs if +there is no numeric overload, but there is a numeric "0+" overload. + +=back + +If there is operator overloading this function will populate +C<*result> with the SV returned by the overloading and return true. +The caller will need to convert this to an integer for sv_numcmp() or +to bool for the rest of the APIs. + +If there is no operator overloading, this function will return true. +Before returning it will convert C<*sv1> and C<*sv2> to numbers if +they are references so do_cmp() can be used safely. + +=cut +*/ + +PERL_STATIC_INLINE bool +S_sv_numcmp_common(pTHX_ SV **sv1, SV **sv2, const U32 flags, + int method, SV **result) +{ + PERL_ARGS_ASSERT_SV_NUMCMP_COMMON; + + if(flags & SV_GMAGIC) { + if(*sv1) + SvGETMAGIC(*sv1); + if(*sv2 && (!*sv1 || *sv1 != *sv2)) + SvGETMAGIC(*sv2); + } + + /* Treat NULL as undef */ + if(!*sv1) + *sv1 = &PL_sv_undef; + if(!*sv2) + *sv2 = &PL_sv_undef; + + if (SvAMAGIC(*sv1) || SvAMAGIC(*sv2)) { + STATIC_ASSERT_STMT(AMGf_force_overload == SV_FORCE_OVERLOAD); + if (!(flags & SV_SKIP_OVERLOAD) + || (flags & SV_FORCE_OVERLOAD)) { + int amg_flags = AMGf_force_scalar + | (flags & AMGf_force_overload); + if ((*result = amagic_call(*sv1, *sv2, method, amg_flags))) + return true; + } + + /* Normally handled by try_amagic_bin + This will do the normal RV to UV conversion + with SV_SKIP_OVERLOAD. + */ + if (SvROK(*sv1)) + *sv1 = sv_2num_flags(*sv1, flags & SV_SKIP_OVERLOAD); + if (SvROK(*sv2)) + *sv2 = sv_2num_flags(*sv2, flags & SV_SKIP_OVERLOAD); + } + + return false; +} + +/* =for apidoc sv_numeq =for apidoc_item sv_numeq_flags +=for apidoc_item sv_numne +=for apidoc_item sv_numne_flags +=for apidoc_item sv_numge +=for apidoc_item sv_numge_flags +=for apidoc_item sv_numgt +=for apidoc_item sv_numgt_flags +=for apidoc_item sv_numle +=for apidoc_item sv_numle_flags +=for apidoc_item sv_numlt +=for apidoc_item sv_numlt_flags +=for apidoc_flag SV_FORCE_OVERLOAD +=for apidoc_flag SV_GMAGIC +=for apidoc_flag SV_SKIP_OVERLOAD + +These return a boolean that is the result of the corresponding numeric +comparison: + +=over + +=item C, C + +Numeric equality, the same as S>. + +=item C, C + +Numeric inequality, the same as S>. + +=item C, C -These each return a boolean indicating whether the numbers in the two SV -arguments are identical. Those arguments will be coerced to numbers if -necessary. A C SV is treated as C. - -In C, if C has the C bit set, 'get' magic is -handled. - -And unless C has the C bit set, an attempt to use -C<==> overloading will be made. If such overloading does not exist or the flag -is set, then regular numerical comparison will be used instead. +Numeric less than or equal, the same as S= $sv2>>. -C merely calls C with just the C bit set. -This function basically behaves like the Perl code C<$sv1 == $sv2>. +=item C, C + +Numeric less than, the same as S $sv2>>. + +=item C, C + +Numeric greater than or equal, the same as S= $sv2>>. + +=item C, C + +Numeric greater than, the same as S $sv2>>. + +=back + +Beware that in the presence of overloading the comparisons might not +have their normal properties, eg. C< sv_numeq(sv1, sv2) > might be +different to C< !sv_numne(sv1, sv2) >. + +The non-C<_flags> suffix versions of these functions always perform +get magic and handle the appropriate type of overloading. See +L for details. Be aware that like the builtin operators, +C will disable overloading. + +These each return a boolean indicating if the numbers in the two SV +arguments satisfy the given relationship, coercing them to numbers if +necessary, basically behaving like the Perl code. + +A NULL SV is treated as C. + +The C<_flags> variants of these functions accept these flags: + +=over + +=item C + +Perform 'get' magic on both C amd C if this flag is set, +otherwise 'get' magic is ignored. + +=item C + +Skip any operator or numeric overloading implemented for this type and +operator. Be aware that for overloaded values this will compare the +addresses of the references, as for the usual numeric comparison of +non-overloaded references. + +=item C + +Force overloading on even in the context of C. + +=back + +If neither overload flag is set overloading is honored unless C has disabled it. =cut */ @@ -8274,27 +8956,169 @@ Perl_sv_numeq_flags(pTHX_ SV *sv1, SV *s { PERL_ARGS_ASSERT_SV_NUMEQ_FLAGS; - if(flags & SV_GMAGIC) { - if(sv1) - SvGETMAGIC(sv1); - if(sv2) - SvGETMAGIC(sv2); - } + SV *result; + if (UNLIKELY(sv_numcmp_common(&sv1, &sv2, flags, eq_amg, &result))) + return SvTRUE(result); - /* Treat NULL as undef */ - if(!sv1) - sv1 = &PL_sv_undef; - if(!sv2) - sv2 = &PL_sv_undef; + return do_ncmp(sv1, sv2) == 0; +} - if(!(flags & SV_SKIP_OVERLOAD) && - (SvAMAGIC(sv1) || SvAMAGIC(sv2))) { - SV *ret = amagic_call(sv1, sv2, eq_amg, 0); - if(ret) - return SvTRUE(ret); +bool +Perl_sv_numne_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) +{ + PERL_ARGS_ASSERT_SV_NUMNE_FLAGS; + + SV *result; + if (UNLIKELY(sv_numcmp_common(&sv1, &sv2, flags, ne_amg, &result))) + return SvTRUE(result); + + return do_ncmp(sv1, sv2) != 0; +} + +bool +Perl_sv_numle_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) +{ + PERL_ARGS_ASSERT_SV_NUMLE_FLAGS; + + SV *result; + if (UNLIKELY(sv_numcmp_common(&sv1, &sv2, flags, le_amg, &result))) + return SvTRUE(result); + + return do_ncmp(sv1, sv2) <= 0; +} + +bool +Perl_sv_numlt_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) +{ + PERL_ARGS_ASSERT_SV_NUMLT_FLAGS; + + SV *result; + if (UNLIKELY(sv_numcmp_common(&sv1, &sv2, flags, lt_amg, &result))) + return SvTRUE(result); + + return do_ncmp(sv1, sv2) < 0; +} + +bool +Perl_sv_numge_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) +{ + PERL_ARGS_ASSERT_SV_NUMGE_FLAGS; + + SV *result; + if (UNLIKELY(sv_numcmp_common(&sv1, &sv2, flags, ge_amg, &result))) + return SvTRUE(result); + + I32 cmp = do_ncmp(sv1, sv2); + + return cmp != 2 && cmp >= 0; +} + +bool +Perl_sv_numgt_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) +{ + PERL_ARGS_ASSERT_SV_NUMGT_FLAGS; + + SV *result; + if (UNLIKELY(sv_numcmp_common(&sv1, &sv2, flags, gt_amg, &result))) + return SvTRUE(result); + + I32 cmp = do_ncmp(sv1, sv2); + + return cmp != 2 && cmp > 0; +} + +/* +=for apidoc sv_numcmp +=for apidoc_item sv_numcmp_flags +=for apidoc_flag SV_FORCE_OVERLOAD +=for apidoc_flag SV_GMAGIC +=for apidoc_flag SV_SKIP_OVERLOAD + +This returns an integer indicating the ordering of the two SV +arguments, coercing them to numbers if necessary, basically behaving +like the Perl code S $sv2 >>. + +A NULL SV is treated as C. + +This will return one of the following values: + +=over + +=item * + +C<1> - C is numerically greater than C + +=item * + +C<0> - C and C are numerically equal. + +=item * + +C<-1> - C is numerically less than C + +=item * + +C<2> - C and C are not numerically comparable, probably +because one of them is C, though overloads can extend that. + +=back + +C always performs 'get' magic. + + accepts these flags: + +=over + +=item * + +C - Perform 'get' magic on both C amd C if this +flag is set, otherwise 'get' magic is ignored. + +=item * + +C - If this is set any C<< <=> >> or numeric +overloading implemented for this type is ignored. Be aware that for +overloaded values this will compare the addresses of the references, +as for the usual numeric comparison of non-overloaded references. + +=item * + +C - Force overloading on even in the context of +C. + +=back + +If neither overload flag is set overloading is honored unless C has disabled it. + +=cut +*/ + +#define SANE_ORDERING_RESULT(val) \ + ((val) < 0 ? -1 : (val) > 0 ? 1 : 0) + +I32 +Perl_sv_numcmp_flags(pTHX_ SV *sv1, SV *sv2, const U32 flags) +{ + PERL_ARGS_ASSERT_SV_NUMCMP_FLAGS; + + SV *result; + if (UNLIKELY(sv_numcmp_common(&sv1, &sv2, flags, ncmp_amg, &result))) { + /* Similar to what sort() does in amagic_ncmp() */ + if (SvIOK(result) && !SvIsUV(result)) { + IV i = SvIVX(result); + return SANE_ORDERING_RESULT(i); + } + else if (!SvOK(result)) { + return 2; + } + else { + NV nv = SvNV(result); + return SANE_ORDERING_RESULT(nv); + } } - return do_ncmp(sv1, sv2) == 0; + return do_ncmp(sv1, sv2); } /* @@ -8318,6 +9142,8 @@ See also C>. I32 Perl_sv_cmp(pTHX_ SV *const sv1, SV *const sv2) { + PERL_ARGS_ASSERT_SV_CMP; + return sv_cmp_flags(sv1, sv2, SV_GMAGIC); } @@ -8325,6 +9151,8 @@ I32 Perl_sv_cmp_flags(pTHX_ SV *const sv1, SV *const sv2, const U32 flags) { + PERL_ARGS_ASSERT_SV_CMP_FLAGS; + STRLEN cur1, cur2; const char *pv1, *pv2; I32 cmp; @@ -8549,6 +9377,8 @@ See also C>. I32 Perl_sv_cmp_locale(pTHX_ SV *const sv1, SV *const sv2) { + PERL_ARGS_ASSERT_SV_CMP_LOCALE; + return sv_cmp_locale_flags(sv1, sv2, SV_GMAGIC); } @@ -8556,6 +9386,8 @@ I32 Perl_sv_cmp_locale_flags(pTHX_ SV *const sv1, SV *const sv2, const U32 flags) { + PERL_ARGS_ASSERT_SV_CMP_LOCALE_FLAGS; + #ifdef USE_LOCALE_COLLATE char *pv1, *pv2; @@ -8623,6 +9455,7 @@ Perl_sv_cmp_locale_flags(pTHX_ SV *const /* =for apidoc sv_collxfrm =for apidoc_item sv_collxfrm_flags +=for apidoc_flag SV_GMAGIC These each add Collate Transform magic to an SV if it doesn't already have it. @@ -8641,10 +9474,10 @@ Otherwise, the two forms behave identica char * Perl_sv_collxfrm_flags(pTHX_ SV *const sv, STRLEN *const nxp, const I32 flags) { - MAGIC *mg; - PERL_ARGS_ASSERT_SV_COLLXFRM_FLAGS; + MAGIC *mg; + mg = SvMAGICAL(sv) ? mg_find(sv, PERL_MAGIC_collxfrm) : (MAGIC *) NULL; /* If we don't have collation magic on 'sv', or the locale has changed @@ -8691,7 +9524,7 @@ Perl_sv_collxfrm_flags(pTHX_ SV *const s static char * S_sv_gets_append_to_utf8(pTHX_ SV *const sv, PerlIO *const fp, SSize_t append) { - SV * const tsv = newSV_type(SVt_NULL); + SV * const tsv = newSV_type(SVt_PV); ENTER; SAVEFREESV(tsv); sv_gets(tsv, fp, 0); @@ -8833,6 +9666,8 @@ in the SV (typically, C is a char * Perl_sv_gets(pTHX_ SV *const sv, PerlIO *const fp, SSize_t append) { + PERL_ARGS_ASSERT_SV_GETS; + const char *rsptr; STRLEN rslen; STDCHAR rslast; @@ -8841,8 +9676,6 @@ Perl_sv_gets(pTHX_ SV *const sv, PerlIO int i = 0; int rspara = 0; - PERL_ARGS_ASSERT_SV_GETS; - if (SvTHINKFIRST(sv)) sv_force_normal_flags(sv, append ? 0 : SV_COW_DROP_PV); /* XXX. If you make this PVIV, then copy on write can copy scalars read @@ -9289,6 +10122,8 @@ any magic. void Perl_sv_inc(pTHX_ SV *const sv) { + PERL_ARGS_ASSERT_SV_INC; + if (!sv) return; SvGETMAGIC(sv); @@ -9298,6 +10133,8 @@ Perl_sv_inc(pTHX_ SV *const sv) void Perl_sv_inc_nomg(pTHX_ SV *const sv) { + PERL_ARGS_ASSERT_SV_INC_NOMG; + char *d; int flags; @@ -9474,6 +10311,8 @@ C handles 'get' magic; C= PL_tmps_max)) \ - ix = tmps_grow_p(ix); \ - PL_tmps_stack[ix] = (AnSv); \ - } STMT_END +PERL_STATIC_INLINE void +S_push_extend_mortal(pTHX_ SV *const sv) +{ + SSize_t ix = ++PL_tmps_ix; + if (UNLIKELY(ix >= PL_tmps_max)) + ix = tmps_grow_p(ix); + PL_tmps_stack[ix] = sv; +} +#define push_extend_mortal(sv) S_push_extend_mortal(aTHX_ sv) /* =for apidoc sv_mortalcopy =for apidoc_item sv_mortalcopy_flags These each create a new SV which is a copy of the original SV (using -C>). The new SV is marked as mortal. It will be destroyed -"soon", either by an -explicit call to C, or by an implicit call at places such as -statement boundaries. See also C> and C>. +C>). The new SV is marked as mortal. It will be +destroyed "soon", either by an explicit call to C, or by an +implicit call at places such as statement boundaries. +See also C> and C>. The two forms are identical, except C has an extra C parameter, the contents of which are passed along to @@ -9627,23 +10469,27 @@ C>. =cut */ -/* Make a string that will exist for the duration of the expression +/* Make an SV that will exist for the duration of the expression * evaluation. Actually, it may have to last longer than that, but * hopefully we won't free it until it has been assigned to a * permanent location. */ SV * -Perl_sv_mortalcopy_flags(pTHX_ SV *const oldstr, U32 flags) +Perl_sv_mortalcopy_flags(pTHX_ SV *const old, U32 flags) { - SV *sv; + PERL_ARGS_ASSERT_SV_MORTALCOPY_FLAGS; - if (flags & SV_GMAGIC) - SvGETMAGIC(oldstr); /* before new_SV, in case it dies */ - new_SV(sv); - sv_setsv_flags(sv,oldstr,flags & ~SV_GMAGIC); - PUSH_EXTEND_MORTAL__SV_C(sv); - SvTEMP_on(sv); - return sv; + SV *dsv; + + if (!old) { + new_SV(dsv); + } else { + dsv = newSVsv_flags_NN(old, flags); + } + + push_extend_mortal(dsv); + SvTEMP_on(dsv); + return dsv; } /* @@ -9660,17 +10506,21 @@ See also C> and C (C<\0>) characters) into it. The reference count for the @@ -9687,14 +10537,14 @@ C is a convenience wrap #define newSVpvn_utf8(s, len, u) \ newSVpvn_flags((s), (len), (u) ? SVf_UTF8 : 0) -=for apidoc Amnh||SVs_TEMP - =cut */ SV * Perl_newSVpvn_flags(pTHX_ const char *const s, const STRLEN len, const U32 flags) { + PERL_ARGS_ASSERT_NEWSVPVN_FLAGS; + SV *sv; /* All the flags we don't support must be zero. @@ -9714,7 +10564,7 @@ Perl_newSVpvn_flags(pTHX_ const char *co SvFLAGS(sv) |= flags; if(flags & SVs_TEMP){ - PUSH_EXTEND_MORTAL__SV_C(sv); + push_extend_mortal(sv); } return sv; @@ -9735,12 +10585,14 @@ C> and C, (which means if you use thi C characters and has to have a terminating C byte). This function can cause reliability issues if you are likely to pass in -empty strings that are not null terminated, because it will run +empty strings that are not NUL terminated, because it will run strlen on the string and potentially run past valid memory. Using L is a safer alternative for non C terminated strings. @@ -9768,6 +10620,8 @@ to call C use C instea SV * Perl_newSVpv(pTHX_ const char *const s, const STRLEN len) { + PERL_ARGS_ASSERT_NEWSVPV; + SV *sv = newSV_type(SVt_PV); sv_setpvn_fresh(sv, s, len || s == NULL ? len : strlen(s)); return sv; @@ -9789,6 +10643,8 @@ undefined. SV * Perl_newSVpvn(pTHX_ const char *const s, const STRLEN len) { + PERL_ARGS_ASSERT_NEWSVPVN; + SV *sv = newSV_type(SVt_PV); sv_setpvn_fresh(sv, s, len); return sv; @@ -9809,11 +10665,13 @@ This is more efficient than using sv_2mo SV * Perl_newSVhek_mortal(pTHX_ const HEK *const hek) { + PERL_ARGS_ASSERT_NEWSVHEK_MORTAL; + SV * const sv = newSVhek(hek); assert(sv); assert(!SvIMMORTAL(sv)); - PUSH_EXTEND_MORTAL__SV_C(sv); + push_extend_mortal(sv); SvTEMP_on(sv); return sv; } @@ -9831,54 +10689,47 @@ SV if C is NULL. SV * Perl_newSVhek(pTHX_ const HEK *const hek) { - if (!hek) { - SV *sv; + PERL_ARGS_ASSERT_NEWSVHEK; - new_SV(sv); - return sv; - } - - if (HEK_LEN(hek) == HEf_SVKEY) { - return newSVsv(*(SV**)HEK_KEY(hek)); - } else { - const int flags = HEK_FLAGS(hek); - if (flags & HVhek_WASUTF8) { - /* Trouble :-) - Andreas would like keys he put in as utf8 to come back as utf8 - */ - STRLEN utf8_len = HEK_LEN(hek); - SV * const sv = newSV_type(SVt_PV); - char *as_utf8 = (char *)bytes_to_utf8 ((U8*)HEK_KEY(hek), &utf8_len); - /* bytes_to_utf8() allocates a new string, which we can repurpose: */ - sv_usepvn_flags(sv, as_utf8, utf8_len, SV_HAS_TRAILING_NUL); - SvUTF8_on (sv); - return sv; - } else if (flags & HVhek_NOTSHARED) { - /* A hash that isn't using shared hash keys has to have - the flag in every key so that we know not to try to call - share_hek_hek on it. */ + SV *sv = newSV_type(SVt_PV); - SV * const sv = newSVpvn (HEK_KEY(hek), HEK_LEN(hek)); - if (HEK_UTF8(hek)) + if (LIKELY(hek)) { + if (HEK_LEN(hek) != HEf_SVKEY) { + const int flags = HEK_FLAGS(hek); + if (LIKELY(!(flags & (HVhek_WASUTF8|HVhek_NOTSHARED)))) { + /* This will be overwhelmingly the most common case. */ + /* Inline most of newSVpvn_share(), because share_hek_hek() is far + more efficient than sharepvn(). */ + SvFLAGS(sv) = SVt_PV | SVf_POK | SVp_POK | SVf_IsCOW | + (HEK_UTF8(hek) ? SVf_UTF8 : 0); + SvCUR_set(sv, HEK_LEN(hek)); + SvPV_set(sv, (char *)HEK_KEY(share_hek_hek(hek))); + assert(SvLEN(sv) == 0); /* SVt_PV should be initialized with this value */ + return sv; + } else if (flags & HVhek_WASUTF8) { + /* Trouble :-) + Andreas would like keys he put in as utf8 to come back as utf8 + */ + STRLEN utf8_len = HEK_LEN(hek); + char *as_utf8 = (char *)bytes_to_utf8 ((U8*)HEK_KEY(hek), &utf8_len); + /* bytes_to_utf8() allocates a new string, which we can repurpose: */ + sv_usepvn_flags(sv, as_utf8, utf8_len, SV_HAS_TRAILING_NUL); SvUTF8_on (sv); - return sv; - } - /* This will be overwhelmingly the most common case. */ - { - /* Inline most of newSVpvn_share(), because share_hek_hek() is far - more efficient than sharepvn(). */ - SV *sv = newSV_type(SVt_PV); - - SvPV_set(sv, (char *)HEK_KEY(share_hek_hek(hek))); - SvCUR_set(sv, HEK_LEN(hek)); - SvLEN_set(sv, 0); - SvIsCOW_on(sv); - SvPOK_on(sv); - if (HEK_UTF8(hek)) - SvUTF8_on(sv); + return sv; + } else { + assert(flags & HVhek_NOTSHARED); + sv_setpvn_fresh(sv,HEK_KEY(hek),HEK_LEN(hek)); + if (HEK_UTF8(hek)) + SvUTF8_on (sv); + return sv; + } + } else { + /* (HEK_LEN(hek) == HEf_SVKEY) is comparatively more rare nowadays */ + sv_setsv_flags(sv, *(SV**)HEK_KEY(hek), SV_GMAGIC|SV_NOSTEAL); return sv; } } + return sv; } /* @@ -9900,33 +10751,22 @@ C and hash lookup SV * Perl_newSVpvn_share(pTHX_ const char *src, I32 len, U32 hash) { - SV *sv; - bool is_utf8 = FALSE; + PERL_ARGS_ASSERT_NEWSVPVN_SHARE; - if (len < 0) { - len = -len; - Size_t size_t_len = len; - /* See the note in hv.c:hv_fetch() --jhi */ - if (! utf8_to_bytes_temp_pv((const U8**)&src, &size_t_len)) { - is_utf8 = true; - } - else { - hash = 0; - len = size_t_len; - } + if (!hash) { + PERL_HASH(hash, src, abs(len)); } - if (!hash) - PERL_HASH(hash, src, len); - sv = newSV_type(SVt_PV); + + HEK *hek = share_hek(src, len, hash); + SV *sv = newSV_type(SVt_PV); + /* The logic for this is inlined in S_mro_get_linear_isa_dfs(), so if it changes here, update it there too. */ - SvPV_set(sv, sharepvn(src, is_utf8?-len:len, hash)); - SvCUR_set(sv, len); - SvLEN_set(sv, 0); - SvIsCOW_on(sv); - SvPOK_on(sv); - if (is_utf8) - SvUTF8_on(sv); + SvFLAGS(sv) |= SVf_POK | SVp_POK | SVf_IsCOW | + (HEK_UTF8(hek) ? SVf_UTF8 : 0); + SvCUR_set(sv, HEK_LEN(hek)); + assert(SvLEN(sv) ==0); + SvPV_set(sv, HEK_KEY(hek)); return sv; } @@ -9942,6 +10782,8 @@ string/length pair. SV * Perl_newSVpv_share(pTHX_ const char *src, U32 hash) { + PERL_ARGS_ASSERT_NEWSVPV_SHARE; + return newSVpvn_share(src, strlen(src), hash); } @@ -9955,12 +10797,12 @@ Perl_newSVpv_share(pTHX_ const char *src SV * Perl_newSVpvf_nocontext(const char *const pat, ...) { + PERL_ARGS_ASSERT_NEWSVPVF_NOCONTEXT; + dTHX; SV *sv; va_list args; - PERL_ARGS_ASSERT_NEWSVPVF_NOCONTEXT; - va_start(args, pat); sv = vnewSVpvf(pat, &args); va_end(args); @@ -9969,18 +10811,17 @@ Perl_newSVpvf_nocontext(const char *cons #endif /* -=for apidoc newSVpvf +=for apidoc newSVpvf +=for apidoc_item newSVpvf_nocontext +=for apidoc_item vnewSVpvf -Creates a new SV and initializes it with the string formatted like +These each create a new SV and initialize it with the string formatted like C. -=for apidoc newSVpvf_nocontext -Like C> but does not take a thread context (C) parameter, -so is used in situations where the caller doesn't already have the thread -context. +__PLAIN_vs_NOCONTEXT_wording__(newSVpvf) -=for apidoc vnewSVpvf -Like C> but the arguments are an encapsulated argument list. +The arguments to C are specified as a C. The arguments to +the remaining forms are specified as a sprintf-style list of arguments. =cut */ @@ -9988,11 +10829,11 @@ Like C> but the arguments a SV * Perl_newSVpvf(pTHX_ const char *const pat, ...) { + PERL_ARGS_ASSERT_NEWSVPVF; + SV *sv; va_list args; - PERL_ARGS_ASSERT_NEWSVPVF; - va_start(args, pat); sv = vnewSVpvf(pat, &args); va_end(args); @@ -10027,6 +10868,8 @@ The reference count for the SV is set to SV * Perl_newSVnv(pTHX_ const NV n) { + PERL_ARGS_ASSERT_NEWSVNV; + SV *sv = newSV_type(SVt_NV); (void)SvNOK_on(sv); @@ -10048,6 +10891,8 @@ SV is set to 1. SV * Perl_newSViv(pTHX_ const IV i) { + PERL_ARGS_ASSERT_NEWSVIV; + SV *sv = newSV_type(SVt_IV); (void)SvIOK_on(sv); @@ -10069,6 +10914,8 @@ The reference count for the SV is set to SV * Perl_newSVuv(pTHX_ const UV u) { + PERL_ARGS_ASSERT_NEWSVUV; + SV *sv; /* Inlining ONLY the small relevant subset of sv_setuv here @@ -10109,9 +10956,7 @@ SV * Perl_newSVbool(pTHX_ bool bool_val) { PERL_ARGS_ASSERT_NEWSVBOOL; - SV *sv = newSVsv(bool_val ? &PL_sv_yes : &PL_sv_no); - - return sv; + return (bool_val ? newSV_true() : newSV_false()); } /* @@ -10125,7 +10970,18 @@ SV * Perl_newSV_true(pTHX) { PERL_ARGS_ASSERT_NEWSV_TRUE; - SV *sv = newSVsv(&PL_sv_yes); + + /* Equivalent to: SV *sv = newSVsv(&PL_sv_yes); */ + SV *sv; + new_SV(sv); + SvFLAGS(sv) = SVt_PVNV|SVf_IOK|SVp_IOK|SVf_NOK|SVp_NOK + |SVf_POK|SVp_POK|SVf_IsCOW|SVppv_STATIC; + SvPV_set(sv, (char*)PL_Yes); + SvANY(sv) = new_XPVNV(); + SvCUR_set(sv, 1); + SvLEN_set(sv, 0); + SvIV_set(sv, 1); + SvNV_set(sv, 1); return sv; } @@ -10142,7 +10998,18 @@ SV * Perl_newSV_false(pTHX) { PERL_ARGS_ASSERT_NEWSV_FALSE; - SV *sv = newSVsv(&PL_sv_no); + + /* Equivalent to: SV *sv = newSVsv(&PL_sv_no); */ + SV *sv; + new_SV(sv); + SvFLAGS(sv) = SVt_PVNV|SVf_IOK|SVp_IOK|SVf_NOK|SVp_NOK + |SVf_POK|SVp_POK|SVf_IsCOW|SVppv_STATIC; + SvPV_set(sv, (char*)PL_No); + SvANY(sv) = new_XPVNV(); + SvCUR_set(sv, 0); + SvLEN_set(sv, 0); + SvIV_set(sv, 0); + SvNV_set(sv, 0); return sv; } @@ -10154,43 +11021,9 @@ Perl_newSV_false(pTHX) SV * Perl_newRV(pTHX_ SV *const sv) { - PERL_ARGS_ASSERT_NEWRV; - - return newRV_noinc(SvREFCNT_inc_simple_NN(sv)); -} - -/* -=for apidoc newSVsv -=for apidoc_item newSVsv_flags -=for apidoc_item newSVsv_nomg - -These create a new SV which is an exact duplicate of the original SV -(using C.) - -They differ only in that C performs 'get' magic; C skips -any magic; and C allows you to explicitly set a C -parameter. - -=cut -*/ - -SV * -Perl_newSVsv_flags(pTHX_ SV *const old, I32 flags) -{ - SV *sv; + PERL_ARGS_ASSERT_NEWRV; - if (!old) - return NULL; - if (SvIS_FREED(old)) { - ck_warner_d(packWARN(WARN_INTERNAL), "semi-panic: attempt to dup freed string"); - return NULL; - } - /* Do this here, otherwise we leak the new SV if this croaks. */ - if (flags & SV_GMAGIC) - SvGETMAGIC(old); - new_SV(sv); - sv_setsv_flags(sv, old, flags & ~SV_GMAGIC); - return sv; + return newRV_noinc(SvREFCNT_inc_simple_NN(sv)); } /* @@ -10213,6 +11046,8 @@ Perl_sv_reset(pTHX_ const char *s, HV *c void Perl_sv_resetpvn(pTHX_ const char *s, STRLEN len, HV * const stash) { + PERL_ARGS_ASSERT_SV_RESETPVN; + char todo[PERL_UCHAR_MAX+1]; const char *send; @@ -10304,11 +11139,11 @@ C if C is an RV. IO* Perl_sv_2io(pTHX_ SV *const sv) { + PERL_ARGS_ASSERT_SV_2IO; + IO* io; GV* gv; - PERL_ARGS_ASSERT_SV_2IO; - switch (SvTYPE(sv)) { case SVt_PVIO: io = MUTABLE_IO(sv); @@ -10361,11 +11196,11 @@ The flags in C are passed to C is true and the SV is blessed, the string is the class name, otherwise it is the type of the SV, "SCALAR", "ARRAY" etc. =cut @@ -10681,6 +11518,8 @@ will return false. int Perl_sv_isobject(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_ISOBJECT; + if (!sv) return 0; SvGETMAGIC(sv); @@ -10709,10 +11548,10 @@ directly on the actual object type. int Perl_sv_isa(pTHX_ SV *sv, const char *const name) { - const char *hvname; - PERL_ARGS_ASSERT_SV_ISA; + const char *hvname; + if (!sv) return 0; SvGETMAGIC(sv); @@ -10743,10 +11582,10 @@ newRV_inc() and newRV_noinc() for creati SV* Perl_newSVrv(pTHX_ SV *const rv, const char *const classname) { - SV *sv; - PERL_ARGS_ASSERT_NEWSVRV; + SV *sv; + new_SV(sv); SV_CHECK_THINKFIRST_COW_DROP(rv); @@ -10755,10 +11594,11 @@ Perl_newSVrv(pTHX_ SV *const rv, const c const U32 refcnt = SvREFCNT(rv); SvREFCNT(rv) = 0; sv_clear(rv); - SvFLAGS(rv) = 0; + SvFLAGS(rv) = SVt_IV; SvREFCNT(rv) = refcnt; - sv_upgrade(rv, SVt_IV); + SET_SVANY_FOR_BODYLESS_IV(rv); + SvIV_set(rv, 0); } else if (SvROK(rv)) { SvREFCNT_dec(SvRV(rv)); } else { @@ -10779,8 +11619,9 @@ Perl_newSVrv(pTHX_ SV *const rv, const c SV * Perl_newSVavdefelem(pTHX_ AV *av, SSize_t ix, bool extendible) { - SV * const lv = newSV_type(SVt_PVLV); PERL_ARGS_ASSERT_NEWSVAVDEFELEM; + + SV * const lv = newSV_type(SVt_PVLV); LvTYPE(lv) = 'y'; sv_magic(lv, NULL, PERL_MAGIC_defelem, NULL, 0); LvTARG(lv) = SvREFCNT_inc_simple_NN(av); @@ -10885,16 +11726,24 @@ Perl_sv_setref_nv(pTHX_ SV *const rv, co } /* -=for apidoc sv_setref_pvn +=for apidoc sv_setref_pvn +=for apidoc_item sv_setref_pvs + +These each copy a string into a new SV, optionally blessing the SV. +The C argument will be upgraded to an RV. That RV will be modified to +point to the new SV. +The C argument indicates the package for the blessing. +Set C to C to avoid the blessing. +The new SV will have a reference count of 1, and the RV will be returned. -Copies a string into a new SV, optionally blessing the SV. The length of the -string must be specified with C. The C argument will be upgraded to -an RV. That RV will be modified to point to the new SV. The C -argument indicates the package for the blessing. Set C to -C to avoid the blessing. The new SV will have a reference count -of 1, and the RV will be returned. +The forms differ only in how the source string is specified. -Note that C copies the pointer while this copies the string. +C takes a C string literal enclosed in double quotes. + +In C, C is the length of the string parameter C in +bytes. Hence the latter may contain embedded NUL characters. + +Note that C> copies the pointer while these copy the string. =cut */ @@ -10922,11 +11771,11 @@ of the SV is unaffected. SV* Perl_sv_bless(pTHX_ SV *const sv, HV *const stash) { + PERL_ARGS_ASSERT_SV_BLESS; + SV *tmpRef; HV *oldstash = NULL; - PERL_ARGS_ASSERT_SV_BLESS; - SvGETMAGIC(sv); if (!SvROK(sv)) croak("Can't bless non-reference value"); @@ -10964,12 +11813,12 @@ Perl_sv_bless(pTHX_ SV *const sv, HV *co PERL_STATIC_INLINE void S_sv_unglob(pTHX_ SV *const sv, U32 flags) { + PERL_ARGS_ASSERT_SV_UNGLOB; + void *xpvmg; HV *stash; SV * const temp = flags & SV_COW_DROP_PV ? NULL : sv_newmortal(); - PERL_ARGS_ASSERT_SV_UNGLOB; - assert(SvTYPE(sv) == SVt_PVGV || SvTYPE(sv) == SVt_PVLV); SvFAKE_off(sv); if (!(flags & SV_COW_DROP_PV)) @@ -11017,6 +11866,7 @@ S_sv_unglob(pTHX_ SV *const sv, U32 flag /* =for apidoc sv_unref =for apidoc_item sv_unref_flags +=for apidoc_flag SV_IMMEDIATE_UNREF These each unset the RV status of the SV, and decrement the reference count of whatever was being referenced by the RV. This can almost be thought of @@ -11035,18 +11885,16 @@ identically. See C>. -=for apidoc Amnh||SV_IMMEDIATE_UNREF - =cut */ void Perl_sv_unref_flags(pTHX_ SV *const ref, const U32 flags) { - SV* const target = SvRV(ref); - PERL_ARGS_ASSERT_SV_UNREF_FLAGS; + SV* const target = SvRV(ref); + if (SvWEAKREF(ref)) { sv_del_backref(target, ref); SvWEAKREF_off(ref); @@ -11116,11 +11964,11 @@ Perl_sv_tainted(pTHX_ SV *const sv) void Perl_sv_setpvf_nocontext(SV *const sv, const char *const pat, ...) { + PERL_ARGS_ASSERT_SV_SETPVF_NOCONTEXT; + dTHX; va_list args; - PERL_ARGS_ASSERT_SV_SETPVF_NOCONTEXT; - va_start(args, pat); sv_vsetpvf(sv, pat, &args); va_end(args); @@ -11134,11 +11982,11 @@ Perl_sv_setpvf_nocontext(SV *const sv, c void Perl_sv_setpvf_mg_nocontext(SV *const sv, const char *const pat, ...) { + PERL_ARGS_ASSERT_SV_SETPVF_MG_NOCONTEXT; + dTHX; va_list args; - PERL_ARGS_ASSERT_SV_SETPVF_MG_NOCONTEXT; - va_start(args, pat); sv_vsetpvf_mg(sv, pat, &args); va_end(args); @@ -11150,20 +11998,60 @@ Perl_sv_setpvf_mg_nocontext(SV *const sv =for apidoc_item sv_setpvf_mg =for apidoc_item sv_setpvf_mg_nocontext =for apidoc_item sv_setpvf_nocontext +=for apidoc_item sv_vsetpvf +=for apidoc_item sv_vsetpvf_mg +=for apidoc_item sv_vsetpvfn + +These each set C to the result of formatting their arguments using +C as the C-like pattern. They assume that C has the same +UTF8ness as C. It's the caller's responsibility to ensure that this is +so. + +The forms differ in how their arguments are specified and in the handling of +magic. + +C is the most general, and all the other forms are implemented by +eventually calling it. It does not handle magic; the forms whose name contains +C<_mg> additionally handle 'set' magic after calling it. -These work like C> but copy the text into the SV instead of -appending it. +It has two sets of argument lists, only one of which is used in any given call. +The first set, C, is a pointer to a C of pointers to C +strings. If it is NULL, the other list, C, is used; it is an array +of pointers to SV's. C gives how many there are in the list. -The differences between these are: +See L> for details on how the formatting is done. Some +platforms support extensions to the standard C99 definition of this function. +None of those are supported by Perl. For example, neither C<'> (to get digit +grouping), nor C (to get alternate digits) are supported. -C and C perform 'set' magic; C -and C skip all magic. +Also, argument reordering (using format specifiers like C<%2$d> or C<%*2$d>) is +supported only when using the C array of SVs; an exception is raised if +C is not NULL and C contains the C<$> reordering specifier. -C and C do not take a thread -context (C) parameter, so are used in situations where the caller -doesn't already have the thread context. +S> is supposed to be set when running with taint checks +enabled if the results are untrustworthy (often due to the use of locales). +However, this is not currently implemented. This argument is not used. -B +C gives the length in bytes of C. Currently, the pattern must be +NUL-terminated anyway. + +When using the C array, if any of the SVs in it have their UTF-8 flag +set, C will be converted to be so too, as necessary. + +None of the remaining forms use the C array, meaning argument +reordering is not possible with them. The arguments are generally considered +to be the same UTF8ness as the destination C, though certain Perl +extensions to the standard set of %formats can override this (see +L and adjacent sections). + +__PLAIN_vs_NOCONTEXT_wording__(sv_setpvf) + +__PLAIN_vs_NOCONTEXT_wording__(sv_setpvf_mg) + +The forms whose name contains C use a C, the +other forms use C-style arguments. + +There are no other differences between the forms. =cut */ @@ -11171,33 +12059,15 @@ B> but copy the text into the SV instead of -appending it. - -They differ only in that C performs 'set' magic; -C skips all magic. - -They are usually used via their frontends, C> and -C>. - -B - -=cut -*/ - void Perl_sv_vsetpvf(pTHX_ SV *const sv, const char *const pat, va_list *const args) { @@ -11209,10 +12079,10 @@ Perl_sv_vsetpvf(pTHX_ SV *const sv, cons void Perl_sv_setpvf_mg(pTHX_ SV *const sv, const char *const pat, ...) { - va_list args; - PERL_ARGS_ASSERT_SV_SETPVF_MG; + va_list args; + va_start(args, pat); sv_vsetpvf_mg(sv, pat, &args); va_end(args); @@ -11237,11 +12107,11 @@ Perl_sv_vsetpvf_mg(pTHX_ SV *const sv, c void Perl_sv_catpvf_nocontext(SV *const sv, const char *const pat, ...) { + PERL_ARGS_ASSERT_SV_CATPVF_NOCONTEXT; + dTHX; va_list args; - PERL_ARGS_ASSERT_SV_CATPVF_NOCONTEXT; - va_start(args, pat); sv_vcatpvfn_flags(sv, pat, strlen(pat), &args, NULL, 0, NULL, SV_GMAGIC|SV_SMAGIC); va_end(args); @@ -11255,11 +12125,11 @@ Perl_sv_catpvf_nocontext(SV *const sv, c void Perl_sv_catpvf_mg_nocontext(SV *const sv, const char *const pat, ...) { + PERL_ARGS_ASSERT_SV_CATPVF_MG_NOCONTEXT; + dTHX; va_list args; - PERL_ARGS_ASSERT_SV_CATPVF_MG_NOCONTEXT; - va_start(args, pat); sv_vcatpvfn_flags(sv, pat, strlen(pat), &args, NULL, 0, NULL, SV_GMAGIC|SV_SMAGIC); SvSETMAGIC(sv); @@ -11294,7 +12164,7 @@ C is the most general implemented by eventually calling it. It has two sets of argument lists, only one of which is used in any given call. -The first set, C, is an encapsulated argument list of pointers to C +The first set, C, is a pointer to a C of pointers to C strings. If it is NULL, the other list, C, is used; it is an array of pointers to SV's. C gives how many there are in the list. @@ -11333,11 +12203,11 @@ to be the same UTF8ness as the destinati extensions to the standard set of %formats can override this (see L and adjacent sections). -The forms whose name contains C<_no_context> do not take a thread -context (C) parameter, so are used in situations where the caller -doesn't already have the thread context. +__PLAIN_vs_NOCONTEXT_wording__(sv_catpvf) -The forms whose name contains C use an encapsulated argument list, the +__PLAIN_vs_NOCONTEXT_wording__(sv_catpvf_mg) + +The forms whose name contains C use a C, the other forms use C-style arguments. There are no other differences between the forms. @@ -11348,10 +12218,10 @@ There are no other differences between t void Perl_sv_catpvf(pTHX_ SV *const sv, const char *const pat, ...) { - va_list args; - PERL_ARGS_ASSERT_SV_CATPVF; + va_list args; + va_start(args, pat); sv_vcatpvfn_flags(sv, pat, strlen(pat), &args, NULL, 0, NULL, SV_GMAGIC|SV_SMAGIC); va_end(args); @@ -11368,10 +12238,10 @@ Perl_sv_vcatpvf(pTHX_ SV *const sv, cons void Perl_sv_catpvf_mg(pTHX_ SV *const sv, const char *const pat, ...) { - va_list args; - PERL_ARGS_ASSERT_SV_CATPVF_MG; + va_list args; + va_start(args, pat); sv_vcatpvfn_flags(sv, pat, strlen(pat), &args, NULL, 0, NULL, SV_GMAGIC|SV_SMAGIC); SvSETMAGIC(sv); @@ -11387,20 +12257,6 @@ Perl_sv_vcatpvf_mg(pTHX_ SV *const sv, c SvSETMAGIC(sv); } -/* -=for apidoc sv_vsetpvfn - -Works like C but copies the text into the SV instead of -appending it. - -B - -Usually used via one of its frontends L> and -L>. - -=cut -*/ - void Perl_sv_vsetpvfn(pTHX_ SV *const sv, const char *const pat, const STRLEN patlen, va_list *const args, SV **const svargs, const Size_t sv_count, bool *const maybe_tainted) @@ -11440,8 +12296,9 @@ S_sv_catpvn_simple(pTHX_ SV *const sv, c * arguments should be &PL_sv_no; an undefined value would yield * inappropriate "use of uninit" warnings [perl #71000]. */ -STATIC void -S_warn_vcatpvfn_missing_argument(pTHX) { +static void +S_warn_vcatpvfn_missing_argument(pTHX) +{ ck_warner(packWARN(WARN_MISSING), "Missing argument in %s", PL_op ? OP_DESC(PL_op) : "sv_vcatpvfn()"); } @@ -11512,13 +12369,13 @@ S_sprintf_arg_num_val(pTHX_ va_list *con * than 1G, which seems reasonable. */ -STATIC STRLEN +static STRLEN S_expect_number(pTHX_ const char **const pattern) { - STRLEN var; - PERL_ARGS_ASSERT_EXPECT_NUMBER; + STRLEN var; + assert(inRANGE(**pattern, '1', '9')); var = *(*pattern)++ - '0'; @@ -11537,14 +12394,14 @@ S_expect_number(pTHX_ const char **const * Returns NULL if not convertible. */ -STATIC char * +static char * S_F0convert(NV nv, char *const endbuf, STRLEN *const len) { + PERL_ARGS_ASSERT_F0CONVERT; + const int neg = nv < 0; UV uv; - PERL_ARGS_ASSERT_F0CONVERT; - assert(!Perl_isinfnan(nv)); if (neg) nv = -nv; @@ -11554,7 +12411,7 @@ S_F0convert(NV nv, char *const endbuf, S if (uv != nv) { nv += 0.5; uv = (UV)nv; - if (uv & 1 && uv == nv) + if (isODD(uv) && uv == nv) uv--; /* Round to even */ } do { @@ -11596,8 +12453,8 @@ Perl_sv_vcatpvfn(pTHX_ SV *const sv, con /* Work around breakage in OTS$CVT_FLOAT_T_X */ # define VCATPVFN_NV_TO_FV(nv,fv) \ STMT_START { \ - double _dv = nv; \ - fv = Perl_isnan(_dv) ? LDBL_QNAN : _dv; \ + double dv_ = nv; \ + fv = Perl_isnan(_dv) ? LDBL_QNAN : dv_; \ } STMT_END # else # define VCATPVFN_NV_TO_FV(nv,fv) (fv)=(nv) @@ -11673,7 +12530,7 @@ Perl_sv_vcatpvfn(pTHX_ SV *const sv, con * extraction sanity checked. On the second round the actual output * (the extraction of the hexadecimal values) takes place. * Sanity failures cause fatal failures during both rounds. */ -STATIC U8* +static U8* S_hextract(pTHX_ const NV nv, int* exponent, bool *subnormal, U8* vhex, U8* vend) { @@ -12281,6 +13138,8 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const s va_list *const args, SV **const svargs, const Size_t sv_count, bool *const maybe_tainted, const U32 flags) { + PERL_ARGS_ASSERT_SV_VCATPVFN_FLAGS; + const char *fmtstart; /* character following the current '%' */ const char *q; /* current position within format */ const char *patend; @@ -12301,9 +13160,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const s bool in_lc_numeric = FALSE; SV *tmp_sv = NULL; - PERL_ARGS_ASSERT_SV_VCATPVFN_FLAGS; PERL_UNUSED_ARG(maybe_tainted); - if (flags & SV_GMAGIC) SvGETMAGIC(sv); @@ -13090,8 +13947,7 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const s if (!veclen) goto done_valid_conversion; if (vec_utf8) - uv = utf8n_to_uvchr(vecstr, veclen, &ulen, - UTF8_ALLOW_ANYUV); + (void) utf8_to_uv(vecstr, vecstr + veclen, &uv, &ulen); else { uv = *vecstr; ulen = 1; @@ -13953,10 +14809,10 @@ ptr_table_* functions. yy_parser * Perl_parser_dup(pTHX_ const yy_parser *const proto, CLONE_PARAMS *const param) { - yy_parser *parser; - PERL_ARGS_ASSERT_PARSER_DUP; + yy_parser *parser; + if (!proto) return NULL; @@ -14058,9 +14914,10 @@ Duplicate a file handle, returning a poi PerlIO * Perl_fp_dup(pTHX_ PerlIO *const fp, const char type, CLONE_PARAMS *const param) { + PERL_ARGS_ASSERT_FP_DUP; + PerlIO *ret; - PERL_ARGS_ASSERT_FP_DUP; PERL_UNUSED_ARG(type); if (!fp) @@ -14093,11 +14950,11 @@ Duplicate a directory handle, returning DIR * Perl_dirp_dup(pTHX_ DIR *const dp, CLONE_PARAMS *const param) { - DIR *ret; - PERL_UNUSED_CONTEXT; PERL_ARGS_ASSERT_DIRP_DUP; + DIR *ret; + if (!dp) return (DIR*)NULL; @@ -14135,10 +14992,10 @@ Duplicate a typeglob, returning a pointe GP * Perl_gp_dup(pTHX_ GP *const gp, CLONE_PARAMS *const param) { - GP *ret; - PERL_ARGS_ASSERT_GP_DUP; + GP *ret; + if (!gp) return (GP*)NULL; /* look for it in the table first */ @@ -14179,11 +15036,11 @@ Duplicate a chain of magic, returning a MAGIC * Perl_mg_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *const param) { + PERL_ARGS_ASSERT_MG_DUP; + MAGIC *mgret = NULL; MAGIC **mgprev_p = &mgret; - PERL_ARGS_ASSERT_MG_DUP; - for (; mg; mg = mg->mg_moremagic) { MAGIC *nmg; @@ -14262,6 +15119,8 @@ Create a new pointer-mapping table PTR_TBL_t * Perl_ptr_table_new(pTHX) { + PERL_ARGS_ASSERT_PTR_TABLE_NEW; + PTR_TBL_t *tbl; PERL_UNUSED_CONTEXT; @@ -14280,14 +15139,14 @@ Perl_ptr_table_new(pTHX) /* map an existing pointer using a table */ -STATIC PTR_TBL_ENT_t * +static PTR_TBL_ENT_t * S_ptr_table_find(PTR_TBL_t *const tbl, const void *const sv) { + PERL_ARGS_ASSERT_PTR_TABLE_FIND; + PTR_TBL_ENT_t *tblent; const UV hash = PTR_TABLE_HASH(sv); - PERL_ARGS_ASSERT_PTR_TABLE_FIND; - tblent = tbl->tbl_ary[hash & tbl->tbl_max]; for (; tblent; tblent = tblent->next) { if (tblent->oldval == sv) @@ -14308,11 +15167,11 @@ NULL if not found. void * Perl_ptr_table_fetch(pTHX_ PTR_TBL_t *const tbl, const void *const sv) { - PTR_TBL_ENT_t const *const tblent = ptr_table_find(tbl, sv); - PERL_ARGS_ASSERT_PTR_TABLE_FETCH; PERL_UNUSED_CONTEXT; + PTR_TBL_ENT_t const *const tblent = ptr_table_find(tbl, sv); + return tblent ? tblent->newval : NULL; } @@ -14331,11 +15190,11 @@ in thread cloning. void Perl_ptr_table_store(pTHX_ PTR_TBL_t *const tbl, const void *const oldsv, void *const newsv) { - PTR_TBL_ENT_t *tblent = ptr_table_find(tbl, oldsv); - PERL_ARGS_ASSERT_PTR_TABLE_STORE; PERL_UNUSED_CONTEXT; + PTR_TBL_ENT_t *tblent = ptr_table_find(tbl, oldsv); + if (tblent) { tblent->newval = newsv; } else { @@ -14374,14 +15233,14 @@ Double the hash bucket size of an existi void Perl_ptr_table_split(pTHX_ PTR_TBL_t *const tbl) { + PERL_ARGS_ASSERT_PTR_TABLE_SPLIT; + PTR_TBL_ENT_t **ary = tbl->tbl_ary; const UV oldsize = tbl->tbl_max + 1; UV newsize = oldsize * 2; UV i; - PERL_ARGS_ASSERT_PTR_TABLE_SPLIT; PERL_UNUSED_CONTEXT; - Renew(ary, newsize, PTR_TBL_ENT_t*); Zero(&ary[oldsize], newsize-oldsize, PTR_TBL_ENT_t*); tbl->tbl_max = --newsize; @@ -14417,6 +15276,8 @@ Clear and free a ptr table void Perl_ptr_table_free(pTHX_ PTR_TBL_t *const tbl) { + PERL_ARGS_ASSERT_PTR_TABLE_FREE; + struct ptr_tbl_arena *arena; PERL_UNUSED_CONTEXT; @@ -14589,10 +15450,10 @@ S_sv_dup_hvaux(pTHX_ const SV *const ssv static SV * S_sv_dup_common(pTHX_ const SV *const ssv, CLONE_PARAMS *const param) { - SV *dsv; - PERL_ARGS_ASSERT_SV_DUP_COMMON; + SV *dsv; + if (SvIS_FREED(ssv)) { #ifdef DEBUG_LEAKING_SCALARS_ABORT abort(); @@ -14680,7 +15541,7 @@ S_sv_dup_common(pTHX_ const SV *const ss case SVt_IV: SET_SVANY_FOR_BODYLESS_IV(dsv); if(SvROK(ssv)) { - Perl_rvpv_dup(aTHX_ dsv, ssv, param); + rvpv_dup(dsv, ssv, param); } else { SvIV_set(dsv, SvIVX(ssv)); } @@ -14713,7 +15574,7 @@ S_sv_dup_common(pTHX_ const SV *const ss #ifdef PURIFY new_body = new_NOARENA(sv_type_details); #else - new_body_from_arena(new_body, HVAUX_ARENA_ROOT_IX, fake_hv_with_aux); + new_body_from_arena(new_body, HVAUX_ARENA_ROOT_IX); #endif goto have_body; } @@ -14761,7 +15622,7 @@ S_sv_dup_common(pTHX_ const SV *const ss && !isGV_with_GP(dsv) && !isREGEXP(dsv) && !(sv_type == SVt_PVIO && !(IoFLAGS(dsv) & IOf_FAKE_DIRP))) - Perl_rvpv_dup(aTHX_ dsv, ssv, param); + rvpv_dup(dsv, ssv, param); /* The Copy above means that all the source (unduplicated) pointers are now in the destination. We can check the flags and the @@ -14968,6 +15829,35 @@ S_sv_dup_common(pTHX_ const SV *const ss return dsv; } +/* +=for apidoc sv_dup +=for apidoc_item sv_dup_inc + +In spite of their generic names, these are very specialized functions mainly +for use when cloning an interpreter instance. You are probably looking for +L. Generally speaking you will only want to use these in +either a C magic handler, or a C method. + +They duplicate an SV of any type (not just a plain SV, but including AV, HV +I.), returning a pointer to the cloned object. The cloning process uses a +lookup table, so that if a particular source SV address has already been duped, +that duped SV is returned rather than creating a second duplicate. + +The difference is that the new SV under C will not have its reference count incremented +(potentially causing it to be zero), unlike under C. This is only +desirable when cloning a non-owning pointer. Thus, you almost always want to use +the C form. + +C has type S>. This is mostly for internal core use +when duplicating something more complicated than an SV (code in common is +used). Your code may inherit this parameter, which you merely pass on, but you +can initialize it by using C. Don't forget to +free it when done, via C>. Its only member that is +public is C, all which are documented in L. + +=cut + */ + SV * Perl_sv_dup_inc(pTHX_ const SV *const ssv, CLONE_PARAMS *const param) { @@ -14978,9 +15868,10 @@ Perl_sv_dup_inc(pTHX_ const SV *const ss SV * Perl_sv_dup(pTHX_ const SV *const ssv, CLONE_PARAMS *const param) { - SV *dsv = ssv ? sv_dup_common(ssv, param) : NULL; PERL_ARGS_ASSERT_SV_DUP; + SV *dsv = ssv ? sv_dup_common(ssv, param) : NULL; + /* Track every SV that (at least initially) had a reference count of 0. We need to do this by holding an actual reference to it in this array. If we attempt to cheat, turn AvREAL_off(), and store only pointers @@ -15008,10 +15899,10 @@ Perl_sv_dup(pTHX_ const SV *const ssv, C PERL_CONTEXT * Perl_cx_dup(pTHX_ PERL_CONTEXT *cxs, I32 ix, I32 max, CLONE_PARAMS* param) { - PERL_CONTEXT *ncxs; - PERL_ARGS_ASSERT_CX_DUP; + PERL_CONTEXT *ncxs; + if (!cxs) return (PERL_CONTEXT*)NULL; @@ -15128,10 +16019,10 @@ Duplicate a stack info structure, return PERL_SI * Perl_si_dup(pTHX_ PERL_SI *si, CLONE_PARAMS* param) { - PERL_SI *nsi; - PERL_ARGS_ASSERT_SI_DUP; + PERL_SI *nsi; + if (!si) return (PERL_SI*)NULL; @@ -15192,10 +16083,10 @@ Perl_si_dup(pTHX_ PERL_SI *si, CLONE_PAR void * Perl_any_dup(pTHX_ void *v, const PerlInterpreter *proto_perl) { - void *ret; - PERL_ARGS_ASSERT_ANY_DUP; + void *ret; + if (!v) return (void*)NULL; @@ -15225,6 +16116,8 @@ Duplicate the save stack, returning a po ANY * Perl_ss_dup(pTHX_ PerlInterpreter *proto_perl, CLONE_PARAMS* param) { + PERL_ARGS_ASSERT_SS_DUP; + ANY * const ss = proto_perl->Isavestack; const I32 max = proto_perl->Isavestack_max + SS_MAXPUSH; I32 ix = proto_perl->Isavestack_ix; @@ -15244,8 +16137,6 @@ Perl_ss_dup(pTHX_ PerlInterpreter *proto void (*dptr) (void*); void (*dxptr) (pTHX_ void*); - PERL_ARGS_ASSERT_SS_DUP; - Newx(nss, max, ANY); while (ix > 0) { @@ -15256,6 +16147,7 @@ Perl_ss_dup(pTHX_ PerlInterpreter *proto switch (type) { case SAVEt_CLEARSV: case SAVEt_CLEARPADRANGE: + case SAVEt_PADSV_NULL: break; case SAVEt_HELEM: /* hash element */ case SAVEt_SV: /* scalar reference */ @@ -15270,6 +16162,7 @@ Perl_ss_dup(pTHX_ PerlInterpreter *proto break; /* FALLTHROUGH */ case SAVEt_FREESV: + case SAVEt_PADSV: case SAVEt_MORTALIZESV: case SAVEt_READONLY_OFF: sv = (const SV *)POPPTR(ss,ix); @@ -15556,7 +16449,10 @@ do_mark_cloneable_stash(pTHX_ SV *const /* -=for apidoc perl_clone +=for apidoc perl_clone +=for apidoc_flag CLONEf_COPY_STACKS +=for apidoc_flag CLONEf_KEEP_PTR_TABLE +=for apidoc_flag CLONEf_CLONE_HOST Create and return a new interpreter by cloning the current one. @@ -15598,10 +16494,10 @@ perl_clone_host(PerlInterpreter* proto_p PerlInterpreter * perl_clone(PerlInterpreter *proto_perl, UV flags) { -#ifdef PERL_IMPLICIT_SYS - PERL_ARGS_ASSERT_PERL_CLONE; +#ifdef PERL_IMPLICIT_SYS + /* perlhost.h so we need to call into it to clone the host, CPerlHost should have a c interface, sky */ @@ -15630,6 +16526,8 @@ perl_clone_using(PerlInterpreter *proto_ const struct IPerlDir** ipD, const struct IPerlSock** ipS, const struct IPerlProc** ipP) { + PERL_ARGS_ASSERT_PERL_CLONE_USING; + /* XXX many of the string copies here can be optimized if they're * constants; they need to be allocated as common memory and just * their pointers copied. */ @@ -15640,7 +16538,6 @@ perl_clone_using(PerlInterpreter *proto_ PerlInterpreter * const my_perl = (PerlInterpreter*)((*ipM)->pMalloc)(ipM, sizeof(PerlInterpreter)); - PERL_ARGS_ASSERT_PERL_CLONE_USING; #else /* !PERL_IMPLICIT_SYS */ IV i; CLONE_PARAMS clone_params; @@ -15916,7 +16813,7 @@ perl_clone_using(PerlInterpreter *proto_ * PERL_SET_CONTEXT(proto_perl); * breaks too many other things */ - Perl_reentrant_init(aTHX); + reentrant_init(); #endif /* create SV map for pointer relocation */ @@ -16429,12 +17326,12 @@ S_unreferenced_to_tmp_stack(pTHX_ AV *co void Perl_clone_params_del(CLONE_PARAMS *param) { + PERL_ARGS_ASSERT_CLONE_PARAMS_DEL; + PerlInterpreter *const was = PERL_GET_THX; PerlInterpreter *const to = param->new_perl; dTHXa(to); - PERL_ARGS_ASSERT_CLONE_PARAMS_DEL; - if (was != to) { PERL_SET_THX(to); } @@ -16453,6 +17350,8 @@ Perl_clone_params_del(CLONE_PARAMS *para CLONE_PARAMS * Perl_clone_params_new(PerlInterpreter *const from, PerlInterpreter *const to) { + PERL_ARGS_ASSERT_CLONE_PARAMS_NEW; + /* Need to play this game, as newAV() can call safesysmalloc(), and that does a dTHX; to get the context from thread local storage. FIXME - under PERL_CORE Newx(), Safefree() and friends should expand to @@ -16460,8 +17359,6 @@ Perl_clone_params_new(PerlInterpreter *c PerlInterpreter *const was = PERL_GET_THX; CLONE_PARAMS *param; - PERL_ARGS_ASSERT_CLONE_PARAMS_NEW; - if (was != to) { PERL_SET_THX(to); } @@ -16487,6 +17384,7 @@ Perl_clone_params_new(PerlInterpreter *c void Perl_init_constants(pTHX) { + PERL_ARGS_ASSERT_INIT_CONSTANTS; SvREFCNT(&PL_sv_undef) = SvREFCNT_IMMORTAL; SvFLAGS(&PL_sv_undef) = SVf_READONLY|SVf_PROTECT|SVt_NULL; @@ -16585,8 +17483,7 @@ Perl_sv_recode_to_utf8(pTHX_ SV *sv, SV PUSHSTACK; SAVETMPS; if (SvPADTMP(nsv)) { - nsv = sv_newmortal(); - SvSetSV_nosteal(nsv, sv); + nsv = sv_mortalcopy_flags(sv, SV_GMAGIC|SV_NOSTEAL|SV_DO_COW_SVSETSV); } save_re_context(); PUSHMARK(sp); @@ -16650,10 +17547,10 @@ bool Perl_sv_cat_decode(pTHX_ SV *dsv, SV *encoding, SV *ssv, int *offset, char *tstr, int tlen) { - bool ret = FALSE; - PERL_ARGS_ASSERT_SV_CAT_DECODE; + bool ret = FALSE; + if (SvPOK(ssv) && SvPOK(dsv) && SvROK(encoding)) { SV *offsv; dSP; @@ -16696,14 +17593,14 @@ Perl_sv_cat_decode(pTHX_ SV *dsv, SV *en /* Look for an entry in the hash whose value has the same SV as val; * If so, return a mortal copy of the key. */ -STATIC SV* +static SV* S_find_hash_subscript(pTHX_ const HV *const hv, const SV *const val) { + PERL_ARGS_ASSERT_FIND_HASH_SUBSCRIPT; + HE **array; I32 i; - PERL_ARGS_ASSERT_FIND_HASH_SUBSCRIPT; - if (!hv || SvMAGICAL(hv) || !HvTOTALKEYS(hv) || (HvTOTALKEYS(hv) > FUV_MAX_SEARCH_SIZE)) return NULL; @@ -16726,7 +17623,7 @@ S_find_hash_subscript(pTHX_ const HV *co /* Look for an entry in the array whose value has the same SV as val; * If so, return the index, otherwise return -1. */ -STATIC SSize_t +static SSize_t S_find_array_subscript(pTHX_ const AV *const av, const SV *const val) { PERL_ARGS_ASSERT_FIND_ARRAY_SUBSCRIPT; @@ -16761,10 +17658,12 @@ SV* Perl_varname(pTHX_ const GV *const gv, const char gvtype, PADOFFSET targ, const SV *const keyname, SSize_t aindex, int subscript_type) { + PERL_ARGS_ASSERT_VARNAME; + SV * const name = sv_newmortal(); if (gv && isGV(gv)) { - char buffer[2]; + char buffer[3]; buffer[0] = gvtype; buffer[1] = 0; @@ -16772,13 +17671,24 @@ Perl_varname(pTHX_ const GV *const gv, c gv_fullname4(name, gv, buffer, 0); - if ((unsigned int)SvPVX(name)[1] <= 26) { - buffer[0] = '^'; - buffer[1] = SvPVX(name)[1] + 'A' - 1; + U8 first_char = SvPVX(name)[1]; + if (first_char <= 31) { /* Swap the 1 unprintable control character for the 2 byte pretty - version - ie substr($name, 1, 1) = $buffer; */ - sv_insert(name, 1, 1, buffer, 2); + version - i.e., substr($name, 1, 1) = $buffer; + wrap in { } if the name is longer than 2 character */ + if (SvCUR(name) > 2) { + buffer[0] = '{'; + buffer[1] = '^'; + buffer[2] = toCTRL(first_char); + sv_insert(name, 1, 1, buffer, 3); + sv_catpvs(name, "}"); + } + else { + buffer[0] = '^'; + buffer[1] = toCTRL(first_char); + sv_insert(name, 1, 1, buffer, 2); + } } } else { @@ -16844,16 +17754,16 @@ C/C points to the =cut */ -STATIC SV * +static SV * S_find_uninit_var(pTHX_ const OP *const obase, const SV *const uninit_sv, bool match, const char **desc_p) { + PERL_ARGS_ASSERT_FIND_UNINIT_VAR; + SV *sv; const GV *gv; const OP *o, *o2, *kid; - PERL_ARGS_ASSERT_FIND_UNINIT_VAR; - if (!obase || (match && (!uninit_sv || uninit_sv == &PL_sv_undef || uninit_sv == &PL_sv_placeholder))) return NULL; @@ -17488,6 +18398,8 @@ S_find_uninit_var(pTHX_ const OP *const case OP_SYSOPEN: case OP_SYSSEEK: case OP_SPLICE: /* scalar splice(@x, $i, 0) ==> undef */ + case OP_REFADDR: + case OP_REFTYPE: match = 1; goto do_op; @@ -17549,7 +18461,7 @@ S_find_uninit_var(pTHX_ const OP *const if (sv) { const char *name = OP_NAME(obase); Perl_sv_insert_flags(aTHX_ sv, 0, 0, STR_WITH_LEN("("), 0); - Perl_sv_insert_flags(aTHX_ sv, 0, 0, name, strlen(name), 0); + sv_insert_flags(sv, 0, 0, name, strlen(name), 0); sv_catpvs_nomg(sv, ")"); } return sv; @@ -17629,6 +18541,8 @@ Print appropriate "Use of uninitialized void Perl_report_uninit(pTHX_ const SV *uninit_sv) { + PERL_ARGS_ASSERT_REPORT_UNINIT; + const char *desc = NULL; SV* varname = NULL; @@ -17670,8 +18584,11 @@ Perl_report_uninit(pTHX_ const SV *unini * The main aim is to keep Perl_sv_setsv_flags as slim as possible and this * includes keeping the call sites for this function small. */ -void S_croak_sv_setsv_flags(pTHX_ SV * const dsv, SV * const ssv) +void +S_croak_sv_setsv_flags(pTHX_ SV * const dsv, SV * const ssv) { + PERL_ARGS_ASSERT_CROAK_SV_SETSV_FLAGS; + OP *op = PL_op; if (SvIS_FREED(dsv)) { croak("panic: attempt to copy value %" SVf Index: gnu/usr.bin/perl/sv.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/sv.h,v diff -u -p -a -u -p -r1.27 sv.h --- gnu/usr.bin/perl/sv.h 26 Dec 2025 22:14:13 -0000 1.27 +++ gnu/usr.bin/perl/sv.h 16 Nov 2026 00:57:39 -0000 @@ -205,33 +205,33 @@ typedef struct hek HEK; /* Using C's structural equivalence to help emulate C++ inheritance here... */ /* start with 2 sv-head building blocks */ -#define _SV_HEAD(ptrtype) \ +#define SV_HEAD_(ptrtype) \ ptrtype sv_any; /* pointer to body */ \ U32 sv_refcnt; /* how many references to us */ \ U32 sv_flags /* what we are */ #if NVSIZE <= IVSIZE -# define _NV_BODYLESS_UNION NV svu_nv; +# define NV_BODYLESS_UNION_ NV svu_nv; #else -# define _NV_BODYLESS_UNION +# define NV_BODYLESS_UNION_ #endif -#define _SV_HEAD_UNION \ +#define SV_HEAD_UNION_ \ union { \ char* svu_pv; /* pointer to malloced string */ \ IV svu_iv; \ UV svu_uv; \ - _NV_BODYLESS_UNION \ + NV_BODYLESS_UNION_ \ SV* svu_rv; /* pointer to another SV */ \ SV** svu_array; \ HE** svu_hash; \ GP* svu_gp; \ PerlIO *svu_fp; \ } sv_u \ - _SV_HEAD_DEBUG + SV_HEAD_DEBUG_ #ifdef DEBUG_LEAKING_SCALARS -#define _SV_HEAD_DEBUG ;\ +#define SV_HEAD_DEBUG_ ;\ PERL_BITFIELD32 sv_debug_optype:9; /* the type of OP that allocated us */ \ PERL_BITFIELD32 sv_debug_inpad:1; /* was allocated in a pad for an OP */ \ PERL_BITFIELD32 sv_debug_line:16; /* the line where we were allocated */ \ @@ -239,56 +239,56 @@ typedef struct hek HEK; char * sv_debug_file; /* the file where we were allocated */ \ SV * sv_debug_parent /* what we were cloned from (ithreads)*/ #else -#define _SV_HEAD_DEBUG +#define SV_HEAD_DEBUG_ #endif struct STRUCT_SV { /* struct sv { */ - _SV_HEAD(void*); - _SV_HEAD_UNION; + SV_HEAD_(void*); + SV_HEAD_UNION_; }; struct gv { - _SV_HEAD(XPVGV*); /* pointer to xpvgv body */ - _SV_HEAD_UNION; + SV_HEAD_(XPVGV*); /* pointer to xpvgv body */ + SV_HEAD_UNION_; }; struct cv { - _SV_HEAD(XPVCV*); /* pointer to xpvcv body */ - _SV_HEAD_UNION; + SV_HEAD_(XPVCV*); /* pointer to xpvcv body */ + SV_HEAD_UNION_; }; struct av { - _SV_HEAD(XPVAV*); /* pointer to xpvav body */ - _SV_HEAD_UNION; + SV_HEAD_(XPVAV*); /* pointer to xpvav body */ + SV_HEAD_UNION_; }; struct hv { - _SV_HEAD(XPVHV*); /* pointer to xpvhv body */ - _SV_HEAD_UNION; + SV_HEAD_(XPVHV*); /* pointer to xpvhv body */ + SV_HEAD_UNION_; }; struct io { - _SV_HEAD(XPVIO*); /* pointer to xpvio body */ - _SV_HEAD_UNION; + SV_HEAD_(XPVIO*); /* pointer to xpvio body */ + SV_HEAD_UNION_; }; struct p5rx { - _SV_HEAD(struct regexp*); /* pointer to regexp body */ - _SV_HEAD_UNION; + SV_HEAD_(struct regexp*); /* pointer to regexp body */ + SV_HEAD_UNION_; }; struct invlist { - _SV_HEAD(XINVLIST*); /* pointer to xpvinvlist body */ - _SV_HEAD_UNION; + SV_HEAD_(XINVLIST*); /* pointer to xpvinvlist body */ + SV_HEAD_UNION_; }; struct object { - _SV_HEAD(XPVOBJ*); /* pointer to xobject body */ - _SV_HEAD_UNION; + SV_HEAD_(XPVOBJ*); /* pointer to xobject body */ + SV_HEAD_UNION_; }; -#undef _SV_HEAD -#undef _SV_HEAD_UNION /* ensure no pollution */ +#undef SV_HEAD_ +#undef SV_HEAD_UNION_ /* ensure no pollution */ /* =for apidoc_section $SV @@ -438,10 +438,6 @@ These guys don't need the curly blocks #define SVp_SCREAM 0x00008000 /* currently unused on plain scalars */ #define SVphv_CLONEABLE SVp_SCREAM /* PVHV (stashes) clone its objects */ #define SVpgv_GP SVp_SCREAM /* GV has a valid GP */ -#define SVprv_PCS_IMPORTED SVp_SCREAM /* RV is a proxy for a constant - subroutine in another package. Set the - GvIMPORTED_CV_on() if it needs to be - expanded to a real GV */ /* SVf_PROTECT is what SVf_READONLY should have been: i.e. modifying * this SV is completely illegal. However, SVf_READONLY (via @@ -475,6 +471,10 @@ These guys don't need the curly blocks */ #define SVf_OOK 0x02000000 /* has valid offset value */ #define SVphv_HasAUX SVf_OOK /* PVHV has an additional hv_aux struct */ +#define SVprv_PCS_IMPORTED SVf_OOK /* RV is a "proxy constant subroutine", + referring to a sub in another package. + Set the GvIMPORTED_CV_on() if it needs + to be expanded to a real GV */ #define SVf_BREAK 0x04000000 /* refcnt is artificially low - used by SVs in final arena cleanup. Set in S_regtry on PL_reg_curpm, so that @@ -538,9 +538,9 @@ These guys don't need the curly blocks #define SVprv_WEAKREF 0x80000000 /* Weak reference */ /* pad name vars only */ -#define _XPV_HEAD \ +#define XPV_HEAD_ \ HV* xmg_stash; /* class package */ \ - union _xmgu xmg_u; \ + union xmgu_ xmg_u; \ STRLEN xpv_cur; /* length of svu_pv as a C string */ \ union { \ STRLEN xpvlenu_len; /* allocated size */ \ @@ -549,14 +549,14 @@ These guys don't need the curly blocks #define xpv_len xpv_len_u.xpvlenu_len -union _xnvu { +union xnvu_ { NV xnv_nv; /* numeric value, if any */ HV * xgv_stash; line_t xnv_lines; /* used internally by S_scan_subst() */ bool xnv_bm_tail; /* an SvVALID (BM) SV has an implicit "\n" */ }; -union _xivu { +union xivu_ { IV xivu_iv; /* integer value */ UV xivu_uv; HEK * xivu_namehek; /* xpvlv, xpvgv: GvNAME */ @@ -564,46 +564,46 @@ union _xivu { }; -union _xmgu { +union xmgu_ { MAGIC* xmg_magic; /* linked list of magicalness */ STRLEN xmg_hash_index; /* used while freeing hash entries */ }; struct xpv { - _XPV_HEAD; + XPV_HEAD_; }; struct xpviv { - _XPV_HEAD; - union _xivu xiv_u; + XPV_HEAD_; + union xivu_ xiv_u; }; #define xiv_iv xiv_u.xivu_iv struct xpvuv { - _XPV_HEAD; - union _xivu xuv_u; + XPV_HEAD_; + union xivu_ xuv_u; }; #define xuv_uv xuv_u.xivu_uv struct xpvnv { - _XPV_HEAD; - union _xivu xiv_u; - union _xnvu xnv_u; + XPV_HEAD_; + union xivu_ xiv_u; + union xnvu_ xnv_u; }; /* This structure must match the beginning of struct xpvhv in hv.h. */ struct xpvmg { - _XPV_HEAD; - union _xivu xiv_u; - union _xnvu xnv_u; + XPV_HEAD_; + union xivu_ xiv_u; + union xnvu_ xnv_u; }; struct xpvlv { - _XPV_HEAD; - union _xivu xiv_u; - union _xnvu xnv_u; + XPV_HEAD_; + union xivu_ xiv_u; + union xnvu_ xnv_u; union { STRLEN xlvu_targoff; SSize_t xlvu_stargoff; @@ -619,7 +619,7 @@ struct xpvlv { #define xlv_targoff xlv_targoff_u.xlvu_targoff struct xpvinvlist { - _XPV_HEAD; + XPV_HEAD_; IV prev_index; /* caches result of previous invlist_search() */ STRLEN iterator; /* Stores where we are in iterating */ bool is_offset; /* The data structure for all inversion lists @@ -633,14 +633,14 @@ struct xpvinvlist { /* This structure works in 2 ways - regular scalar, or GV with GP */ struct xpvgv { - _XPV_HEAD; - union _xivu xiv_u; - union _xnvu xnv_u; + XPV_HEAD_; + union xivu_ xiv_u; + union xnvu_ xnv_u; }; typedef U32 cv_flags_t; -#define _XPVCV_COMMON \ +#define XPVCV_COMMON_ \ HV * xcv_stash; \ union { \ OP * xcv_start; \ @@ -669,14 +669,14 @@ typedef U32 cv_flags_t; /* This structure must match XPVCV in cv.h */ struct xpvfm { - _XPV_HEAD; - _XPVCV_COMMON; + XPV_HEAD_; + XPVCV_COMMON_; }; struct xpvio { - _XPV_HEAD; - union _xivu xiv_u; + XPV_HEAD_; + union xivu_ xiv_u; /* ifp and ofp are normally the same, but sockets need separate streams */ PerlIO * xio_ofp; /* Cray addresses everything by word boundaries (64 bits) and @@ -720,7 +720,7 @@ struct xpvio { struct xobject { HV* xmg_stash; - union _xmgu xmg_u; + union xmgu_ xmg_u; SSize_t xobject_maxfield; SSize_t xobject_iter_sv_at; /* this is only used by Perl_sv_clear() */ SV** xobject_fields; @@ -890,12 +890,14 @@ Dereferences an RV to return the SV. Returns the raw value in the SV's IV slot, without checks or conversions. Only use when you are sure C is true. See also C>. -=for apidoc Am|UV|SvUVX|SV* sv -Returns the raw value in the SV's UV slot, without checks or conversions. -Only use when you are sure C is true. See also C>. +=for apidoc Am|UV|SvUVX|SV* sv +=for apidoc_item Dm|UV|SvUVXx|SV* sv -=for apidoc AmD|UV|SvUVXx|SV* sv -This is an unnecessary synonym for L +These each return the raw value in the SV's UV slot, without checks or +conversions. Only use when you are sure C is true. See also +C>. + +C is is an unnecessary synonym for C. =for apidoc Am|NV|SvNVX|SV* sv Returns the raw value in the SV's NV slot, without checks or conversions. @@ -993,6 +995,8 @@ Set the size of the string buffer for th #define SvNIOK_off(sv) (SvFLAGS(sv) &= ~(SVf_IOK|SVf_NOK| \ SVp_IOK|SVp_NOK|SVf_IVisUV)) +#define assert_scalar_or_IO_(sv) \ + assert_((SvTYPE(sv) <= SVt_PVMG) || (SvTYPE(sv) == SVt_PVIO)) #define assert_not_ROK(sv) assert_(!SvROK(sv) || !SvRV(sv)) #define assert_not_glob(sv) assert_(!isGV_with_GP(sv)) @@ -1045,7 +1049,7 @@ Set the size of the string buffer for th #define BOOL_INTERNALS_sv_isbool_false(sv) (SvIsCOW_static(sv) && \ (SvPVX_const(sv) == PL_No)) -#define SvIsUV(sv) (SvFLAGS(sv) & SVf_IVisUV) +#define SvIsUV(sv) ((SvFLAGS(sv) & SVf_IVisUV) != 0) #define SvIsUV_on(sv) (SvFLAGS(sv) |= SVf_IVisUV) #define SvIsUV_off(sv) (SvFLAGS(sv) &= ~SVf_IVisUV) @@ -1112,8 +1116,17 @@ Returns the vstring magic, or NULL if no #define SvVSTRING_mg(sv) (SvMAGICAL(sv) \ ? mg_find(sv,PERL_MAGIC_vstring) : NULL) -#define SvOOK(sv) (SvFLAGS(sv) & SVf_OOK) -#define SvOOK_on(sv) (SvFLAGS(sv) |= SVf_OOK) +/* The SVf_OOK flag is only meaningful on regular scalars when ROK is off, and + * in two other legacy conditions. Older modules might still use the SvOOK + * macro to test for SVphv_HasAUX, and in some circumstances IoTOP_GV() ends + * up using it despite being an SVt_PVIO. So we accept those cases as well. + */ +#define SvOOK(sv) ((SvTYPE(sv) <= SVt_PVMG || /* regular scalars */ \ + SvTYPE(sv) == SVt_PVHV || /* hashes */ \ + SvTYPE(sv) == SVt_PVIO) && /* IOs */ \ + ((SvFLAGS(sv) & (SVf_ROK|SVf_OOK)) == SVf_OOK)) +#define SvOOK_on(sv) (assert_scalar_or_IO_(sv) assert_not_ROK(sv) \ + SvFLAGS(sv) |= SVf_OOK) /* @@ -1121,6 +1134,39 @@ Returns the vstring magic, or NULL if no Remove any string offset. +=for apidoc Am|U32|SvMAGICAL|SV* sv +Returns a U32 value indicating whether the SV has "magical" behavior +attached. + +This includes any GET, SET, or RANDOM magic but it does not encompass +overload functionality (also referred to as I). For that, +the separate C macro should be used I checking for +GET magic. + +=for apidoc Am|U32|SvGMAGICAL|SV* sv +Returns a U32 value indicating whether the SV has GET magic assigned. + +This is typically used prior to retrieving a value from an SV, normally +via C. + +GET magic could modify the value being retrieved, substitute it for a +different value, derive it on the fly, or invoke some other behaviour. + +=for apidoc Am|U32|SvSMAGICAL|SV* sv +Returns a U32 value indicating whether the SV has SET magic assigned. + +This is typically used immediately after assigning a value to the SV, +normally via C. + +SET magic could influence how or where a value is stored, transform the +stored value, or trigger post-assignment functionality. + +=for apidoc Am|U32|SvRMAGICAL|SV* sv +Returns a U32 value indicating whether the SV has RANDOM magic assigned. + +This is a catch-all category for magic that is not GET, SET, or ACTIVE +magic. Refer to L for some examples of other magical methods. + =cut */ @@ -1156,6 +1202,8 @@ Remove any string offset. Returns a boolean as to whether C has overloading (active magic) enabled or not. +Note: A GET magic check should be performed prior to an active magic check. + =cut */ @@ -1321,25 +1369,25 @@ object type. Exposed to perl code via In #if defined (DEBUGGING) && defined(PERL_USE_GCC_BRACE_GROUPS) -# define SvTAIL(sv) ({ const SV *const _svtail = (const SV *)(sv); \ - assert(SvTYPE(_svtail) != SVt_PVAV); \ - assert(SvTYPE(_svtail) != SVt_PVHV); \ - assert(!(SvFLAGS(_svtail) & (SVf_NOK|SVp_NOK))); \ - assert(SvVALID(_svtail)); \ - ((XPVNV*)SvANY(_svtail))->xnv_u.xnv_bm_tail; \ +# define SvTAIL(sv) ({ const SV *const svtail_ = (const SV *)(sv); \ + assert(SvTYPE(svtail_) != SVt_PVAV); \ + assert(SvTYPE(svtail_) != SVt_PVHV); \ + assert(!(SvFLAGS(svtail_) & (SVf_NOK|SVp_NOK))); \ + assert(SvVALID(svtail_)); \ + ((XPVNV*)SvANY(svtail_))->xnv_u.xnv_bm_tail; \ }) #else -# define SvTAIL(_svtail) (((XPVNV*)SvANY(_svtail))->xnv_u.xnv_bm_tail) +# define SvTAIL(svtail_) (((XPVNV*)SvANY(svtail_))->xnv_u.xnv_bm_tail) #endif /* Does the SV have a Boyer-Moore table attached as magic? * 'VALID' is a poor name, but is kept for historical reasons. */ -#define SvVALID(_svvalid) ( \ - SvPOKp(_svvalid) \ - && SvSMAGICAL(_svvalid) \ - && SvMAGIC(_svvalid) \ - && (SvMAGIC(_svvalid)->mg_type == PERL_MAGIC_bm \ - || mg_find(_svvalid, PERL_MAGIC_bm)) \ +#define SvVALID(svvalid_) ( \ + SvPOKp(svvalid_) \ + && SvSMAGICAL(svvalid_) \ + && SvMAGIC(svvalid_) \ + && (SvMAGIC(svvalid_)->mg_type == PERL_MAGIC_bm \ + || mg_find(svvalid_, PERL_MAGIC_bm)) \ ) #define SvRVx(sv) SvRV(sv) @@ -1350,11 +1398,11 @@ object type. Exposed to perl code via In # define SvIVX(sv) (0 + ((XPVIV*) SvANY(sv))->xiv_iv) # define SvUVX(sv) (0 + ((XPVUV*) SvANY(sv))->xuv_uv) # define SvNVX(sv) (-0.0 + ((XPVNV*) SvANY(sv))->xnv_u.xnv_nv) -# define SvRV(sv) (0 + (sv)->sv_u.svu_rv) -# define SvRV_const(sv) (0 + (sv)->sv_u.svu_rv) +# define SvRV_const(sv) ((SV *)(sv)->sv_u.svu_rv) +# define SvRV(sv) SvRV_const(sv) /* Don't test the core XS code yet. */ # if defined (PERL_CORE) && PERL_DEBUG_COW > 1 -# define SvPVX(sv) (0 + (assert_(!SvREADONLY(sv)) (sv)->sv_u.svu_pv)) +# define SvPVX(sv) (assert_(!SvREADONLY(sv)) (char *)(sv)->sv_u.svu_pv) # else # define SvPVX(sv) SvPVX_mutable(sv) # endif @@ -1362,8 +1410,8 @@ object type. Exposed to perl code via In # define SvLEN(sv) (0 + ((XPV*) SvANY(sv))->xpv_len) # define SvEND(sv) ((sv)->sv_u.svu_pv + ((XPV*)SvANY(sv))->xpv_cur) -# define SvMAGIC(sv) (0 + *(assert_(SvTYPE(sv) >= SVt_PVMG) &((XPVMG*) SvANY(sv))->xmg_u.xmg_magic)) -# define SvSTASH(sv) (0 + *(assert_(SvTYPE(sv) >= SVt_PVMG) &((XPVMG*) SvANY(sv))->xmg_stash)) +# define SvMAGIC(sv) (assert_(SvTYPE(sv) >= SVt_PVMG) (MAGIC *)((XPVMG *)SvANY(sv))->xmg_u.xmg_magic) +# define SvSTASH(sv) (assert_(SvTYPE(sv) >= SVt_PVMG) (HV *)((XPVMG *)SvANY(sv))->xmg_stash) #else /* Below is not PERL_DEBUG_COW */ # ifdef PERL_CORE # define SvLEN(sv) (0 + ((XPV*) SvANY(sv))->xpv_len) @@ -1375,75 +1423,75 @@ object type. Exposed to perl code via In # if defined (DEBUGGING) && defined(PERL_USE_GCC_BRACE_GROUPS) /* These get expanded inside other macros that already use a variable _sv */ # define SvPVX(sv) \ - (*({ SV *const _svpvx = MUTABLE_SV(sv); \ - assert(PL_valid_types_PVX[SvTYPE(_svpvx) & SVt_MASK]); \ - assert(!isGV_with_GP(_svpvx)); \ - assert(!(SvTYPE(_svpvx) == SVt_PVIO \ - && !(IoFLAGS(_svpvx) & IOf_FAKE_DIRP))); \ - &((_svpvx)->sv_u.svu_pv); \ + (*({ SV *const svpvx_ = MUTABLE_SV(sv); \ + assert(PL_valid_types_PVX[SvTYPE(svpvx_) & SVt_MASK]); \ + assert(!isGV_with_GP(svpvx_)); \ + assert(!(SvTYPE(svpvx_) == SVt_PVIO \ + && !(IoFLAGS(svpvx_) & IOf_FAKE_DIRP))); \ + &((svpvx_)->sv_u.svu_pv); \ })) # ifdef PERL_CORE # define SvCUR(sv) \ - ({ const SV *const _svcur = (const SV *)(sv); \ - assert(PL_valid_types_PVX[SvTYPE(_svcur) & SVt_MASK]); \ - assert(!isGV_with_GP(_svcur)); \ - assert(!(SvTYPE(_svcur) == SVt_PVIO \ - && !(IoFLAGS(_svcur) & IOf_FAKE_DIRP))); \ - (((XPV*) MUTABLE_PTR(SvANY(_svcur)))->xpv_cur); \ + ({ const SV *const svcur_ = (const SV *)(sv); \ + assert(PL_valid_types_PVX[SvTYPE(svcur_) & SVt_MASK]); \ + assert(!isGV_with_GP(svcur_)); \ + assert(!(SvTYPE(svcur_) == SVt_PVIO \ + && !(IoFLAGS(svcur_) & IOf_FAKE_DIRP))); \ + (((XPV*) MUTABLE_PTR(SvANY(svcur_)))->xpv_cur); \ }) # else # define SvCUR(sv) \ - (*({ const SV *const _svcur = (const SV *)(sv); \ - assert(PL_valid_types_PVX[SvTYPE(_svcur) & SVt_MASK]); \ - assert(!isGV_with_GP(_svcur)); \ - assert(!(SvTYPE(_svcur) == SVt_PVIO \ - && !(IoFLAGS(_svcur) & IOf_FAKE_DIRP))); \ - &(((XPV*) MUTABLE_PTR(SvANY(_svcur)))->xpv_cur); \ + (*({ const SV *const svcur_ = (const SV *)(sv); \ + assert(PL_valid_types_PVX[SvTYPE(svcur_) & SVt_MASK]); \ + assert(!isGV_with_GP(svcur_)); \ + assert(!(SvTYPE(svcur_) == SVt_PVIO \ + && !(IoFLAGS(svcur_) & IOf_FAKE_DIRP))); \ + &(((XPV*) MUTABLE_PTR(SvANY(svcur_)))->xpv_cur); \ })) # endif # define SvIVX(sv) \ - (*({ const SV *const _svivx = (const SV *)(sv); \ - assert(PL_valid_types_IVX[SvTYPE(_svivx) & SVt_MASK]); \ - assert(!isGV_with_GP(_svivx)); \ - &(((XPVIV*) MUTABLE_PTR(SvANY(_svivx)))->xiv_iv); \ + (*({ const SV *const svivx_ = (const SV *)(sv); \ + assert(PL_valid_types_IVX[SvTYPE(svivx_) & SVt_MASK]); \ + assert(!isGV_with_GP(svivx_)); \ + &(((XPVIV*) MUTABLE_PTR(SvANY(svivx_)))->xiv_iv); \ })) # define SvUVX(sv) \ - (*({ const SV *const _svuvx = (const SV *)(sv); \ - assert(PL_valid_types_IVX[SvTYPE(_svuvx) & SVt_MASK]); \ - assert(!isGV_with_GP(_svuvx)); \ - &(((XPVUV*) MUTABLE_PTR(SvANY(_svuvx)))->xuv_uv); \ + (*({ const SV *const svuvx_ = (const SV *)(sv); \ + assert(PL_valid_types_IVX[SvTYPE(svuvx_) & SVt_MASK]); \ + assert(!isGV_with_GP(svuvx_)); \ + &(((XPVUV*) MUTABLE_PTR(SvANY(svuvx_)))->xuv_uv); \ })) # define SvNVX(sv) \ - (*({ const SV *const _svnvx = (const SV *)(sv); \ - assert(PL_valid_types_NVX[SvTYPE(_svnvx) & SVt_MASK]); \ - assert(!isGV_with_GP(_svnvx)); \ - &(((XPVNV*) MUTABLE_PTR(SvANY(_svnvx)))->xnv_u.xnv_nv); \ + (*({ const SV *const svnvx_ = (const SV *)(sv); \ + assert(PL_valid_types_NVX[SvTYPE(svnvx_) & SVt_MASK]); \ + assert(!isGV_with_GP(svnvx_)); \ + &(((XPVNV*) MUTABLE_PTR(SvANY(svnvx_)))->xnv_u.xnv_nv); \ })) # define SvRV(sv) \ - (*({ SV *const _svrv = MUTABLE_SV(sv); \ - assert(PL_valid_types_RV[SvTYPE(_svrv) & SVt_MASK]); \ - assert(!isGV_with_GP(_svrv)); \ - assert(!(SvTYPE(_svrv) == SVt_PVIO \ - && !(IoFLAGS(_svrv) & IOf_FAKE_DIRP))); \ - &((_svrv)->sv_u.svu_rv); \ + (*({ SV *const svrv_ = MUTABLE_SV(sv); \ + assert(PL_valid_types_RV[SvTYPE(svrv_) & SVt_MASK]); \ + assert(!isGV_with_GP(svrv_)); \ + assert(!(SvTYPE(svrv_) == SVt_PVIO \ + && !(IoFLAGS(svrv_) & IOf_FAKE_DIRP))); \ + &((svrv_)->sv_u.svu_rv); \ })) # define SvRV_const(sv) \ - ({ const SV *const _svrv = (const SV *)(sv); \ - assert(PL_valid_types_RV[SvTYPE(_svrv) & SVt_MASK]); \ - assert(!isGV_with_GP(_svrv)); \ - assert(!(SvTYPE(_svrv) == SVt_PVIO \ - && !(IoFLAGS(_svrv) & IOf_FAKE_DIRP))); \ - (_svrv)->sv_u.svu_rv; \ + ({ const SV *const svrv_ = (const SV *)(sv); \ + assert(PL_valid_types_RV[SvTYPE(svrv_) & SVt_MASK]); \ + assert(!isGV_with_GP(svrv_)); \ + assert(!(SvTYPE(svrv_) == SVt_PVIO \ + && !(IoFLAGS(svrv_) & IOf_FAKE_DIRP))); \ + (svrv_)->sv_u.svu_rv; \ }) # define SvMAGIC(sv) \ - (*({ const SV *const _svmagic = (const SV *)(sv); \ - assert(SvTYPE(_svmagic) >= SVt_PVMG); \ - &(((XPVMG*) MUTABLE_PTR(SvANY(_svmagic)))->xmg_u.xmg_magic); \ + (*({ const SV *const svmagic_ = (const SV *)(sv); \ + assert(SvTYPE(svmagic_) >= SVt_PVMG); \ + &(((XPVMG*) MUTABLE_PTR(SvANY(svmagic_)))->xmg_u.xmg_magic); \ })) # define SvSTASH(sv) \ - (*({ const SV *const _svstash = (const SV *)(sv); \ - assert(SvTYPE(_svstash) >= SVt_PVMG); \ - &(((XPVMG*) MUTABLE_PTR(SvANY(_svstash)))->xmg_stash); \ + (*({ const SV *const svstash_ = (const SV *)(sv); \ + assert(SvTYPE(svstash_) >= SVt_PVMG); \ + &(((XPVMG*) MUTABLE_PTR(SvANY(svstash_)))->xmg_stash); \ })) # else /* Below is not DEBUGGING or can't use brace groups */ # define SvPVX(sv) ((sv)->sv_u.svu_pv) @@ -1452,7 +1500,7 @@ object type. Exposed to perl code via In # define SvUVX(sv) ((XPVUV*) SvANY(sv))->xuv_uv # define SvNVX(sv) ((XPVNV*) SvANY(sv))->xnv_u.xnv_nv # define SvRV(sv) ((sv)->sv_u.svu_rv) -# define SvRV_const(sv) (0 + (sv)->sv_u.svu_rv) +# define SvRV_const(sv) ((SV *)(sv)->sv_u.svu_rv) # define SvMAGIC(sv) ((XPVMG*) SvANY(sv))->xmg_u.xmg_magic # define SvSTASH(sv) ((XPVMG*) SvANY(sv))->xmg_stash # endif @@ -1590,9 +1638,22 @@ L> befo =cut */ -#define SvPV_shrink_to_cur(sv) STMT_START { \ - const STRLEN _lEnGtH = SvCUR(sv) + 1; \ - SvPV_renew(sv, _lEnGtH); \ +/* Notes: Ensure the buffer is big enough to be COWed in the future, so + + 1 for the trailing null byte + 1 for the COW count. + * The `expected_size` call will, at worst, ensure that the buffer size + * is no smaller than the expected minimim allocation and that the given + * size is rounded up to the closest PTRSIZE boundary. Depending on + * per-malloc implementation, it might return the exact size that would + * be allocated for the specified lEnGtH_. If the return value from + * `expected_size` is not smaller than the current buffer allocation, + * there is no point in calling SvPV_renew. +*/ + +#define SvPV_shrink_to_cur(sv) STMT_START { \ + const STRLEN lEnGtH_ = SvCUR(sv) + 2; \ + const STRLEN eXpEcT_ = expected_size(lEnGtH_); \ + if (SvLEN(sv) > eXpEcT_) \ + SvPV_renew(sv, eXpEcT_); \ } STMT_END /* @@ -1639,11 +1700,11 @@ only be used as part of a larger operati #if defined (DEBUGGING) && defined(PERL_USE_GCC_BRACE_GROUPS) # define BmUSEFUL(sv) \ - (*({ SV *const _bmuseful = MUTABLE_SV(sv); \ - assert(SvTYPE(_bmuseful) >= SVt_PVIV); \ - assert(SvVALID(_bmuseful)); \ - assert(!SvIOK(_bmuseful)); \ - &(((XPVIV*) SvANY(_bmuseful))->xiv_u.xivu_iv); \ + (*({ SV *const bmuseful_ = MUTABLE_SV(sv); \ + assert(SvTYPE(bmuseful_) >= SVt_PVIV); \ + assert(SvVALID(bmuseful_)); \ + assert(!SvIOK(bmuseful_)); \ + &(((XPVIV*) SvANY(bmuseful_))->xiv_u.xivu_iv); \ })) #else # define BmUSEFUL(sv) ((XPVIV*) SvANY(sv))->xiv_u.xivu_iv @@ -1721,6 +1782,9 @@ inputs such as locale settings. C instead. + =cut */ @@ -1942,16 +2006,8 @@ typedef enum { SvPVbyte_pure_type_ } PL_SvPVtype; -START_EXTERN_C - -/* When this code was written, embed.fnc could not handle function pointer - * parameters; perhaps it still can't */ -#ifndef PERL_NO_INLINE_FUNCTIONS -PERL_STATIC_INLINE char* -Perl_SvPV_helper(pTHX_ SV *const sv, STRLEN *const lp, const U32 flags, const PL_SvPVtype type, char * (*non_trivial)(pTHX_ SV *, STRLEN * const, const U32), const bool or_null, const U32 return_flags); -#endif - -END_EXTERN_C +typedef char * (*Perl_SvPV_helper_non_trivial_t)(pTHX_ SV *, STRLEN * const, + const U32); /* This test is "is there a cached PV that we can use directly?" * We can if @@ -2139,6 +2195,7 @@ Returns the hash for C created by C< #define SV_SKIP_OVERLOAD (1 << 13) /* 0x2000 - 8192 */ #define SV_CATBYTES (1 << 14) /* 0x4000 - 16384 */ #define SV_CATUTF8 (1 << 15) /* 0x8000 - 32768 */ +#define SV_FORCE_OVERLOAD (1 << 16) /* 0x10000 - 65536 */ /* sv_regex_global_pos_*() should count in bytes, not chars */ #define SV_POSBYTES SV_CATBYTES @@ -2209,10 +2266,32 @@ immediately written again. sv_force_normal_flags(sv, 0) -/* all these 'functions' are now just macros */ +/* all these 'functions' are now just macros + * +=for apidoc sv_pv + +Use the C macro instead +=cut +*/ #define sv_pv(sv) SvPV_nolen(sv) + +/* +=for apidoc sv_pvutf8 + +Use the C macro instead + +=cut +*/ #define sv_pvutf8(sv) SvPVutf8_nolen(sv) + +/* +=for apidoc sv_pvbyte + +Use C instead. + +=cut +*/ #define sv_pvbyte(sv) SvPVbyte_nolen(sv) #define sv_pvn_force_nomg(sv, lp) sv_pvn_force_flags(sv, lp, 0) @@ -2242,14 +2321,46 @@ immediately written again. #define sv_catsv_nomg(dsv, ssv) sv_catsv_flags(dsv, ssv, 0) #define sv_catsv_mg(dsv, ssv) sv_catsv_flags(dsv, ssv, SV_GMAGIC|SV_SMAGIC) #define sv_catpvn(dsv, sstr, slen) sv_catpvn_flags(dsv, sstr, slen, SV_GMAGIC) -#define sv_catpvn_mg(dsv, sstr, slen) sv_catpvn_flags(dsv, sstr, slen, SV_GMAGIC|SV_SMAGIC); +#define sv_catpvn_mg(dsv, sstr, slen) sv_catpvn_flags(dsv, sstr, slen, SV_GMAGIC|SV_SMAGIC) #define sv_copypv(dsv, ssv) sv_copypv_flags(dsv, ssv, SV_GMAGIC) #define sv_copypv_nomg(dsv, ssv) sv_copypv_flags(dsv, ssv, 0) #define sv_2pv(sv, lp) sv_2pv_flags(sv, lp, SV_GMAGIC) + +/* +=for apidoc sv_2pv_nolen + +Like C, but doesn't return the length too. You should usually +use the macro wrapper C instead. + +=cut +*/ #define sv_2pv_nolen(sv) sv_2pv(sv, 0) #define sv_2pvbyte(sv, lp) sv_2pvbyte_flags(sv, lp, SV_GMAGIC) + +/* +=for apidoc sv_2pvbyte_nolen + +Return a pointer to the byte-encoded representation of the SV. +May cause the SV to be downgraded from UTF-8 as a side-effect. + +Usually accessed via the C macro. + +=cut +*/ #define sv_2pvbyte_nolen(sv) sv_2pvbyte(sv, 0) #define sv_2pvutf8(sv, lp) sv_2pvutf8_flags(sv, lp, SV_GMAGIC) + +/* +=for apidoc sv_2pvutf8_nolen + +Return a pointer to the UTF-8-encoded representation of the SV. +May cause the SV to be upgraded to UTF-8 as a side-effect. + +Usually accessed via the C macro. + +=cut +*/ +#define sv_2num(sv) sv_2num_flags(sv, 0) #define sv_2pvutf8_nolen(sv) sv_2pvutf8(sv, 0) #define sv_2pv_nomg(sv, lp) sv_2pv_flags(sv, lp, 0) #define sv_pvn_force(sv, lp) sv_pvn_force_flags(sv, lp, SV_GMAGIC) @@ -2261,6 +2372,12 @@ immediately written again. #define sv_cmp(sv1, sv2) sv_cmp_flags(sv1, sv2, SV_GMAGIC) #define sv_cmp_locale(sv1, sv2) sv_cmp_locale_flags(sv1, sv2, SV_GMAGIC) #define sv_numeq(sv1, sv2) sv_numeq_flags(sv1, sv2, SV_GMAGIC) +#define sv_numne(sv1, sv2) sv_numne_flags(sv1, sv2, SV_GMAGIC) +#define sv_numle(sv1, sv2) sv_numle_flags(sv1, sv2, SV_GMAGIC) +#define sv_numlt(sv1, sv2) sv_numlt_flags(sv1, sv2, SV_GMAGIC) +#define sv_numge(sv1, sv2) sv_numge_flags(sv1, sv2, SV_GMAGIC) +#define sv_numgt(sv1, sv2) sv_numgt_flags(sv1, sv2, SV_GMAGIC) +#define sv_numcmp(sv1, sv2) sv_numcmp_flags(sv1, sv2, SV_GMAGIC) #define sv_streq(sv1, sv2) sv_streq_flags(sv1, sv2, SV_GMAGIC) #define sv_collxfrm(sv, nxp) sv_collxfrm_flags(sv, nxp, SV_GMAGIC) #define sv_2bool(sv) sv_2bool_flags(sv, SV_GMAGIC) @@ -2299,6 +2416,10 @@ immediately written again. #define sv_catpvn_nomg_maybeutf8(dsv, sstr, len, is_utf8) \ sv_catpvn_flags(dsv, sstr, len, (is_utf8)?SV_CATUTF8:SV_CATBYTES) +#if defined(PERL_CORE) +#define sv_2num(sv) sv_2num_flags(sv, 0) +#endif + #if defined(PERL_CORE) || defined(PERL_EXT) # define sv_or_pv_len_utf8(sv, pv, bytelen) \ (SvGAMAGIC(sv) \ @@ -2390,7 +2511,11 @@ that already have a PV buffer allocated, #define SvUNLOCK(sv) PL_unlockhook(aTHX_ sv) #define SvDESTROYABLE(sv) PL_destroyhook(aTHX_ sv) -#define SvSETMAGIC(x) STMT_START { if (UNLIKELY(SvSMAGICAL(x))) mg_set(x); } STMT_END +#define SvSETMAGIC(x) \ + STMT_START { \ + SV * sv_svsetmagic_ = MUTABLE_SV(x); \ + if (UNLIKELY(SvSMAGICAL(sv_svsetmagic_))) mg_set(sv_svsetmagic_); \ + } STMT_END #define SvSetSV_and(dst,src,finally) \ STMT_START { \ @@ -2603,19 +2728,19 @@ Evaluates C more than once. Sets C< # define SvOOK_offset(sv, offset) STMT_START { \ STATIC_ASSERT_STMT(sizeof(offset) == sizeof(STRLEN)); \ if (SvOOK(sv)) { \ - const U8 *_crash = (U8*)SvPVX_const(sv); \ - (offset) = *--_crash; \ + const U8 *crash_ = (U8*)SvPVX_const(sv); \ + (offset) = *--crash_; \ if (!(offset)) { \ - _crash -= sizeof(STRLEN); \ - Copy(_crash, (U8 *)&(offset), sizeof(STRLEN), U8); \ + crash_ -= sizeof(STRLEN); \ + Copy(crash_, (U8 *)&(offset), sizeof(STRLEN), U8); \ } \ { \ /* Validate the preceding buffer's sentinels to \ verify that no-one is using it. */ \ - const U8 *const _bonk = (U8*)SvPVX_const(sv) - (offset);\ - while (_crash > _bonk) { \ - --_crash; \ - assert (*_crash == (U8)PTR2UV(_crash)); \ + const U8 *const bonk_ = (U8*)SvPVX_const(sv) - (offset);\ + while (crash_ > bonk_) { \ + --crash_; \ + assert (*crash_ == (U8)PTR2UV(crash_)); \ } \ } \ } else { \ Index: gnu/usr.bin/perl/sv_inline.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/sv_inline.h,v diff -u -p -a -u -p -r1.1.1.4 sv_inline.h --- gnu/usr.bin/perl/sv_inline.h 26 Dec 2025 22:12:27 -0000 1.1.1.4 +++ gnu/usr.bin/perl/sv_inline.h 16 Nov 2026 00:57:39 -0000 @@ -63,14 +63,12 @@ ++PL_sv_count; \ } STMT_END -/* Perl_more_sv lives in sv.c, we don't want to inline it. - * but the function declaration seems to be needed. */ -SV* Perl_more_sv(pTHX); - /* new_SV(): return a new, empty SV head */ PERL_STATIC_INLINE SV* Perl_new_sv(pTHX_ const char *file, int line, const char *func) { + PERL_ARGS_ASSERT_NEW_SV; + SV* sv; #if !defined(DEBUG_LEAKING_SCALARS) || \ (!defined(DEBUGGING) && !defined(PERL_MEM_LOG)) @@ -180,6 +178,14 @@ ALIGNED_TYPE(XPVOBJ); STRUCT_OFFSET(type, last_member) \ + sizeof (((type*)SvANY((const SV *)0))->last_member) +static const struct body_details fake_hv_with_aux = + /* The SVt_IV arena is used for (larger) PVHV bodies. */ + { sizeof(ALIGNED_TYPE_NAME(XPVHV_WITH_AUX)), + copy_length(XPVHV, xhv_max), + 0, + SVt_PVHV, TRUE, NONV, HASARENA, + FIT_ARENA(0, sizeof(ALIGNED_TYPE_NAME(XPVHV_WITH_AUX))) }; + static const struct body_details bodies_by_type[] = { /* HEs use this offset for their arena. */ { 0, 0, 0, SVt_NULL, FALSE, NONV, NOARENA, 0 }, @@ -299,6 +305,8 @@ static const struct body_details bodies_ #if !(NVSIZE <= IVSIZE) # define new_XNV() safemalloc(sizeof(XPVNV)) #endif +#define new_XPV() safemalloc(sizeof(XPV)) +#define new_XPVIV() safemalloc(sizeof(XPVIV)) #define new_XPVNV() safemalloc(sizeof(XPVNV)) #define new_XPVMG() safemalloc(sizeof(XPVMG)) @@ -309,6 +317,8 @@ static const struct body_details bodies_ #if !(NVSIZE <= IVSIZE) # define new_XNV() new_body_allocated(SVt_NV) #endif +#define new_XPV() new_body_allocated(SVt_PV) +#define new_XPVIV() new_body_allocated(SVt_PVIV) #define new_XPVNV() new_body_allocated(SVt_PVNV) #define new_XPVMG() new_body_allocated(SVt_PVMG) @@ -328,13 +338,11 @@ static const struct body_details bodies_ #ifndef PURIFY /* grab a new thing from the arena's free list, allocating more if necessary. */ -#define new_body_from_arena(xpv, root_index, type_meta) \ +#define new_body_from_arena(xpv, root_index) \ STMT_START { \ void ** const r3wt = &PL_body_roots[root_index]; \ xpv = (PTR_TBL_ENT_t*) (*((void **)(r3wt)) \ - ? *((void **)(r3wt)) : Perl_more_bodies(aTHX_ root_index, \ - type_meta.body_size,\ - type_meta.arena_size)); \ + ? *((void **)(r3wt)) : Perl_more_bodies(aTHX_ root_index)); \ *(r3wt) = *(void**)(xpv); \ } STMT_END @@ -342,7 +350,7 @@ PERL_STATIC_INLINE void * S_new_body(pTHX_ const svtype sv_type) { void *xpv; - new_body_from_arena(xpv, sv_type, bodies_by_type[sv_type]); + new_body_from_arena(xpv, sv_type); return xpv; } @@ -351,14 +359,6 @@ S_new_body(pTHX_ const svtype sv_type) static const struct body_details fake_rv = { 0, 0, 0, SVt_IV, FALSE, NONV, NOARENA, 0 }; -static const struct body_details fake_hv_with_aux = - /* The SVt_IV arena is used for (larger) PVHV bodies. */ - { sizeof(ALIGNED_TYPE_NAME(XPVHV_WITH_AUX)), - copy_length(XPVHV, xhv_max), - 0, - SVt_PVHV, TRUE, NONV, HASARENA, - FIT_ARENA(0, sizeof(ALIGNED_TYPE_NAME(XPVHV_WITH_AUX))) }; - /* =for apidoc newSV_type @@ -371,6 +371,8 @@ is set to 1. PERL_STATIC_INLINE SV * Perl_newSV_type(pTHX_ const svtype type) { + PERL_ARGS_ASSERT_NEWSV_TYPE; + SV *sv; void* new_body; const struct body_details *type_details; @@ -500,7 +502,7 @@ Perl_newSV_type(pTHX_ const svtype type) SvOBJECT_on(io); /* Clear the stashcache because a new IO could overrule a package name */ - DEBUG_o(Perl_deb(aTHX_ "sv_upgrade clearing PL_stashcache\n")); + DEBUG_o(deb("sv_upgrade clearing PL_stashcache\n")); hv_clear(PL_stashcache); SvSTASH_set(io, MUTABLE_HV(SvREFCNT_inc(GvHV(iogv)))); @@ -537,6 +539,8 @@ at some point in the future.) PERL_STATIC_INLINE SV * Perl_newSV_type_mortal(pTHX_ const svtype type) { + PERL_ARGS_ASSERT_NEWSV_TYPE_MORTAL; + SV *sv = newSV_type(type); SSize_t ix = ++PL_tmps_ix; if (UNLIKELY(ix >= PL_tmps_max)) @@ -664,6 +668,8 @@ Perl_SvTRUE_common(pTHX_ SV * sv, const PERL_STATIC_INLINE SV * Perl_SvREFCNT_inc(SV *sv) { + PERL_ARGS_ASSERT_SVREFCNT_INC; + if (LIKELY(sv != NULL)) SvREFCNT(sv)++; return sv; @@ -681,6 +687,8 @@ Perl_SvREFCNT_inc_NN(SV *sv) PERL_STATIC_INLINE void Perl_SvREFCNT_inc_void(SV *sv) { + PERL_ARGS_ASSERT_SVREFCNT_INC_VOID; + if (LIKELY(sv != NULL)) SvREFCNT(sv)++; } @@ -688,6 +696,8 @@ Perl_SvREFCNT_inc_void(SV *sv) PERL_STATIC_INLINE void Perl_SvREFCNT_dec(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SVREFCNT_DEC; + if (LIKELY(sv != NULL)) { U32 rc = SvREFCNT(sv); if (LIKELY(rc > 1)) @@ -709,10 +719,10 @@ Perl_SvREFCNT_dec_ret_NULL(pTHX_ SV *sv) PERL_STATIC_INLINE void Perl_SvREFCNT_dec_NN(pTHX_ SV *sv) { - U32 rc = SvREFCNT(sv); - PERL_ARGS_ASSERT_SVREFCNT_DEC_NN; + U32 rc = SvREFCNT(sv); + if (LIKELY(rc > 1)) SvREFCNT(sv) = rc - 1; else @@ -815,7 +825,8 @@ guaranteed to evaluate C only once. */ PERL_STATIC_INLINE IV -Perl_SvIV(pTHX_ SV *sv) { +Perl_SvIV(pTHX_ SV *sv) +{ PERL_ARGS_ASSERT_SVIV; if (SvIOK_nog(sv)) @@ -824,7 +835,8 @@ Perl_SvIV(pTHX_ SV *sv) { } PERL_STATIC_INLINE UV -Perl_SvUV(pTHX_ SV *sv) { +Perl_SvUV(pTHX_ SV *sv) +{ PERL_ARGS_ASSERT_SVUV; if (SvUOK_nog(sv)) @@ -833,7 +845,8 @@ Perl_SvUV(pTHX_ SV *sv) { } PERL_STATIC_INLINE NV -Perl_SvNV(pTHX_ SV *sv) { +Perl_SvNV(pTHX_ SV *sv) +{ PERL_ARGS_ASSERT_SVNV; if (SvNOK_nog(sv)) @@ -842,7 +855,8 @@ Perl_SvNV(pTHX_ SV *sv) { } PERL_STATIC_INLINE IV -Perl_SvIV_nomg(pTHX_ SV *sv) { +Perl_SvIV_nomg(pTHX_ SV *sv) +{ PERL_ARGS_ASSERT_SVIV_NOMG; if (SvIOK(sv)) @@ -851,7 +865,8 @@ Perl_SvIV_nomg(pTHX_ SV *sv) { } PERL_STATIC_INLINE UV -Perl_SvUV_nomg(pTHX_ SV *sv) { +Perl_SvUV_nomg(pTHX_ SV *sv) +{ PERL_ARGS_ASSERT_SVUV_NOMG; if (SvUOK(sv)) @@ -860,7 +875,8 @@ Perl_SvUV_nomg(pTHX_ SV *sv) { } PERL_STATIC_INLINE NV -Perl_SvNV_nomg(pTHX_ SV *sv) { +Perl_SvNV_nomg(pTHX_ SV *sv) +{ PERL_ARGS_ASSERT_SVNV_NOMG; if (SvNOK(sv)) @@ -885,10 +901,11 @@ S_sv_or_pv_pos_u2b(pTHX_ SV *sv, const c PERL_STATIC_INLINE char * Perl_sv_pvutf8n_force_wrapper(pTHX_ SV * const sv, STRLEN * const lp, const U32 dummy) { + PERL_ARGS_ASSERT_SV_PVUTF8N_FORCE_WRAPPER; + /* This is just so can be passed to Perl_SvPV_helper() as a function * pointer with the same signature as all the other such pointers, and * having hence an unused parameter */ - PERL_ARGS_ASSERT_SV_PVUTF8N_FORCE_WRAPPER; PERL_UNUSED_ARG(dummy); return sv_pvutf8n_force(sv, lp); @@ -897,10 +914,11 @@ Perl_sv_pvutf8n_force_wrapper(pTHX_ SV * PERL_STATIC_INLINE char * Perl_sv_pvbyten_force_wrapper(pTHX_ SV * const sv, STRLEN * const lp, const U32 dummy) { + PERL_ARGS_ASSERT_SV_PVBYTEN_FORCE_WRAPPER; + /* This is just so can be passed to Perl_SvPV_helper() as a function * pointer with the same signature as all the other such pointers, and * having hence an unused parameter */ - PERL_ARGS_ASSERT_SV_PVBYTEN_FORCE_WRAPPER; PERL_UNUSED_ARG(dummy); return sv_pvbyten_force(sv, lp); @@ -917,6 +935,8 @@ Perl_SvPV_helper(pTHX_ const U32 return_flags ) { + PERL_ARGS_ASSERT_SVPV_HELPER; + /* 'type' should be known at compile time, so this is reduced to a single * conditional at runtime */ if ( (type == SvPVbyte_type_ && SvPOK_byte_nog(sv)) @@ -973,10 +993,10 @@ SV is B incremented. PERL_STATIC_INLINE SV * Perl_newRV_noinc(pTHX_ SV *const tmpRef) { - SV *sv = newSV_type(SVt_IV); - PERL_ARGS_ASSERT_NEWRV_NOINC; + SV *sv = newSV_type(SVt_IV); + SvTEMP_off(tmpRef); /* inlined, simplified sv_setrv_noinc(sv, tmpRef); */ @@ -1001,6 +1021,32 @@ Perl_sv_setpv_freshbuf(pTHX_ SV *const s functions use it */ SvTAINT(sv); return SvPVX(sv); +} + +/* +=for apidoc newSVsv +=for apidoc_item newSVsv_flags +=for apidoc_item newSVsv_nomg + +These create a new SV which is an exact duplicate of the original SV +(using C.) + +They differ only in that C performs 'get' magic; C skips +any magic; and C allows you to explicitly set a C +parameter. + +=cut +*/ + +PERL_STATIC_INLINE SV * +Perl_newSVsv_flags(pTHX_ SV *const old, I32 flags) +{ + PERL_ARGS_ASSERT_NEWSVSV_FLAGS; + + if (!old) + return NULL; + + return newSVsv_flags_NN(old, flags); } /* Index: gnu/usr.bin/perl/taint.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/taint.c,v diff -u -p -a -u -p -r1.22 taint.c --- gnu/usr.bin/perl/taint.c 26 Dec 2025 22:14:13 -0000 1.22 +++ gnu/usr.bin/perl/taint.c 16 Nov 2026 00:57:40 -0000 @@ -34,13 +34,14 @@ Implements the L macro, w void Perl_taint_proper(pTHX_ const char *f, const char *const s) { + PERL_ARGS_ASSERT_TAINT_PROPER; + /* Don't use directly; instead use TAINT_PROPER * * Output a tainting violation, croaking unless we're just to warn. * '_proper' is just to throw you off the scent */ #if defined(HAS_SETEUID) && defined(DEBUGGING) - PERL_ARGS_ASSERT_TAINT_PROPER; { const Uid_t uid = PerlProc_getuid(); @@ -97,6 +98,8 @@ Implements the L macro, whic void Perl_taint_env(pTHX) { + PERL_ARGS_ASSERT_TAINT_ENV; + /* Don't use directly; instead use TAINT_ENV */ SV** svp; Index: gnu/usr.bin/perl/thread.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/thread.h,v diff -u -p -a -u -p -r1.6 thread.h --- gnu/usr.bin/perl/thread.h 26 Dec 2025 22:14:13 -0000 1.6 +++ gnu/usr.bin/perl/thread.h 16 Nov 2026 00:57:40 -0000 @@ -20,11 +20,11 @@ # ifdef OLD_PTHREADS_API /* Here be dragons. */ # define DETACH(t) \ STMT_START { \ - int _eC_; \ - if ((_eC_ = pthread_detach(&(t)->self))) { \ + int eC_; \ + if ((eC_ = pthread_detach(&(t)->self))) { \ MUTEX_UNLOCK(&(t)->mutex); \ Perl_croak_nocontext("panic: DETACH (%d) [%s:%d]", \ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ } \ } STMT_END @@ -179,19 +179,19 @@ /* Temporary workaround, true bug is deeper. --jhi 1999-02-25 */ # define MUTEX_INIT(m) \ STMT_START { \ - int _eC_; \ + int eC_; \ Zero((m), 1, perl_mutex); \ - if ((_eC_ = pthread_mutex_init((m), pthread_mutexattr_default)))\ + if ((eC_ = pthread_mutex_init((m), pthread_mutexattr_default)))\ Perl_croak_nocontext("panic: MUTEX_INIT (%d) [%s:%d]", \ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ } STMT_END # else # define MUTEX_INIT(m) \ STMT_START { \ - int _eC_; \ - if ((_eC_ = pthread_mutex_init((m), pthread_mutexattr_default))) \ + int eC_; \ + if ((eC_ = pthread_mutex_init((m), pthread_mutexattr_default))) \ Perl_croak_nocontext("panic: MUTEX_INIT (%d) [%s:%d]", \ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ } STMT_END # endif @@ -206,33 +206,33 @@ # define MUTEX_LOCK(m) \ STMT_START { \ dSAVE_ERRNO; \ - int _eC_; \ - if ((_eC_ = perl_pthread_mutex_lock((m)))) \ + int eC_; \ + if ((eC_ = perl_pthread_mutex_lock((m)))) \ Perl_croak_nocontext("panic: MUTEX_LOCK (%d) [%s:%d]",\ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ RESTORE_ERRNO; \ } STMT_END # define MUTEX_UNLOCK(m) \ STMT_START { \ dSAVE_ERRNO; /* Shouldn't be necessary as panics if fails */\ - int _eC_; \ - if ((_eC_ = perl_pthread_mutex_unlock((m)))) { \ + int eC_; \ + if ((eC_ = perl_pthread_mutex_unlock((m)))) { \ Perl_croak_nocontext( \ "panic: MUTEX_UNLOCK (%d) [%s:%d]", \ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ } \ RESTORE_ERRNO; \ } STMT_END # define MUTEX_DESTROY(m) \ STMT_START { \ - int _eC_; \ - if ((_eC_ = pthread_mutex_destroy((m)))) { \ + int eC_; \ + if ((eC_ = pthread_mutex_destroy((m)))) { \ dTHX; \ if (PL_phase != PERL_PHASE_DESTRUCT) { \ Perl_croak_nocontext("panic: MUTEX_DESTROY (%d) [%s:%d]", \ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ } \ } \ } STMT_END @@ -241,44 +241,44 @@ #ifndef COND_INIT # define COND_INIT(c) \ STMT_START { \ - int _eC_; \ - if ((_eC_ = pthread_cond_init((c), pthread_condattr_default))) \ + int eC_; \ + if ((eC_ = pthread_cond_init((c), pthread_condattr_default))) \ Perl_croak_nocontext("panic: COND_INIT (%d) [%s:%d]", \ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ } STMT_END # define COND_SIGNAL(c) \ STMT_START { \ - int _eC_; \ - if ((_eC_ = pthread_cond_signal((c)))) \ + int eC_; \ + if ((eC_ = pthread_cond_signal((c)))) \ Perl_croak_nocontext("panic: COND_SIGNAL (%d) [%s:%d]", \ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ } STMT_END # define COND_BROADCAST(c) \ STMT_START { \ - int _eC_; \ - if ((_eC_ = pthread_cond_broadcast((c)))) \ + int eC_; \ + if ((eC_ = pthread_cond_broadcast((c)))) \ Perl_croak_nocontext("panic: COND_BROADCAST (%d) [%s:%d]", \ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ } STMT_END # define COND_WAIT(c, m) \ STMT_START { \ - int _eC_; \ - if ((_eC_ = pthread_cond_wait((c), (m)))) \ + int eC_; \ + if ((eC_ = pthread_cond_wait((c), (m)))) \ Perl_croak_nocontext("panic: COND_WAIT (%d) [%s:%d]", \ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ } STMT_END # define COND_DESTROY(c) \ STMT_START { \ - int _eC_; \ - if ((_eC_ = pthread_cond_destroy((c)))) { \ + int eC_; \ + if ((eC_ = pthread_cond_destroy((c)))) { \ dTHX; \ if (PL_phase != PERL_PHASE_DESTRUCT) { \ Perl_croak_nocontext("panic: COND_DESTROY (%d) [%s:%d]", \ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ } \ } \ } STMT_END @@ -357,11 +357,11 @@ #ifndef DETACH # define DETACH(t) \ STMT_START { \ - int _eC_; \ - if ((_eC_ = pthread_detach((t)->self))) { \ + int eC_; \ + if ((eC_ = pthread_detach((t)->self))) { \ MUTEX_UNLOCK(&(t)->mutex); \ Perl_croak_nocontext("panic: DETACH (%d) [%s:%d]", \ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ } \ } STMT_END #endif /* DETACH */ @@ -369,10 +369,10 @@ #ifndef JOIN # define JOIN(t, avp) \ STMT_START { \ - int _eC_; \ - if ((_eC_ = pthread_join((t)->self, (void**)(avp)))) \ + int eC_; \ + if ((eC_ = pthread_join((t)->self, (void**)(avp)))) \ Perl_croak_nocontext("panic: pthread_join (%d) [%s:%d]", \ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ } STMT_END #endif /* JOIN */ @@ -410,11 +410,11 @@ extern PERL_THREAD_LOCAL void *PL_curren # define PERL_SET_CONTEXT(t) \ STMT_START { \ - int _eC_; \ - if ((_eC_ = pthread_setspecific(PL_thr_key, \ + int eC_; \ + if ((eC_ = pthread_setspecific(PL_thr_key, \ PL_current_context = (void *)(t)))) \ Perl_croak_nocontext("panic: pthread_setspecific (%d) [%s:%d]", \ - _eC_, __FILE__, __LINE__); \ + eC_, __FILE__, __LINE__); \ PERL_SET_NON_tTHX_CONTEXT(t); \ } STMT_END @@ -435,12 +435,6 @@ extern PERL_THREAD_LOCAL void *PL_curren # define PERL_SET_CONTEXT(t) Perl_set_context((void*)t) # endif /* PERL_SET_CONTEXT */ #endif /* PERL_THREAD_LOCAL */ - -#ifndef INIT_THREADS -# ifdef NEED_PTHREAD_INIT -# define INIT_THREADS pthread_init() -# endif -#endif #ifndef ALLOC_THREAD_KEY # define ALLOC_THREAD_KEY \ Index: gnu/usr.bin/perl/time64.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/time64.c,v diff -u -p -a -u -p -r1.6 time64.c --- gnu/usr.bin/perl/time64.c 14 May 2024 19:38:54 -0000 1.6 +++ gnu/usr.bin/perl/time64.c 16 Nov 2026 00:57:40 -0000 @@ -210,7 +210,8 @@ static int S_check_tm(const struct TM *t assert(tm->tm_yday >= 0); assert(tm->tm_yday <= length_of_year[IS_LEAP(tm->tm_year)]); -#ifdef HAS_TM_TM_GMTOFF +#if defined(HAS_TM_TM_GMTOFF) && ! defined(__MVS__) + /* z/OS appears to not use this, always set to 0 or 0x500010DBE8 */ assert(tm->tm_gmtoff >= -24 * 60 * 60); assert(tm->tm_gmtoff <= 24 * 60 * 60); #endif Index: gnu/usr.bin/perl/toke.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/toke.c,v diff -u -p -a -u -p -r1.30 toke.c --- gnu/usr.bin/perl/toke.c 26 Dec 2025 22:14:13 -0000 1.30 +++ gnu/usr.bin/perl/toke.c 16 Nov 2026 00:57:40 -0000 @@ -101,6 +101,12 @@ static const char ident_var_zero_multi_d #define XFAKEEOF 0x40 #define XFAKEBRACK 0x80 +#define FROM_DOLLAR 1 +#define FROM_SNAIL 2 +#define FROM_PERCENT 3 +#define FROM_IDENT 4 +#define FROM_INTERDEPENDMAYBE 5 + #ifdef USE_UTF8_SCRIPTS # define UTF cBOOL(!IN_BYTES) #else @@ -167,6 +173,16 @@ static const char ident_var_zero_multi_d */ #define YYL_RETRY (-1) +/* Bits in the flags parameter of various functions */ +#define CHECK_KEYWORD (1 << 0) +#define ALLOW_PACKAGE (1 << 1) +#define CHECK_DOLLAR (1 << 2) +#define IDFIRST_ONLY (1 << 3) +#define STOP_AT_FIRST_NON_DIGIT (1 << 4) +#define CHECK_ONLY (1 << 5) +#define CHECK_UNARY (1 << 6) +#define IDCONT_first_OK (1 << 7) + #ifdef DEBUGGING static const char* const lex_state_names[] = { "KNOWNEXT", @@ -238,7 +254,7 @@ static const char* const lex_state_names #define TERM(retval) return (CLINE, PL_expect = XOPERATOR, PL_bufptr = s, REPORT(retval)) #define PHASERBLOCK(f) return (pl_yylval.ival=f, PL_expect = XBLOCK, PL_bufptr = s, REPORT((int)PHASER)) #define POSTDEREF(f) return (PL_bufptr = s, S_postderef(aTHX_ REPORT(f),s[1])) -#define LOOPX(f) return (PL_bufptr = force_word(s,BAREWORD,TRUE,FALSE), \ +#define LOOPX(f) return (PL_bufptr = force_word(s, BAREWORD, CHECK_KEYWORD), \ pl_yylval.ival=f, \ PL_expect = PL_nexttoke ? XOPERATOR : XTERM, \ REPORT((int)LOOPEX)) @@ -426,6 +442,7 @@ static struct debug_tokens { DEBUG_TOKEN (NONE, ANDOP), DEBUG_TOKEN (NONE, ARROW), DEBUG_TOKEN (OPNUM, ASSIGNOP), + DEBUG_TOKEN (OPVAL, ATTRLIST), DEBUG_TOKEN (OPNUM, BITANDOP), DEBUG_TOKEN (OPNUM, BITOROP), DEBUG_TOKEN (OPNUM, BLKLSTOP), @@ -526,6 +543,7 @@ static struct debug_tokens { DEBUG_TOKEN (NONE, PREDEC), DEBUG_TOKEN (NONE, PREINC), DEBUG_TOKEN (OPVAL, PRIVATEREF), + DEBUG_TOKEN (OPVAL, PROTOTYPE), DEBUG_TOKEN (OPVAL, QWLIST), DEBUG_TOKEN (NONE, REFGEN), DEBUG_TOKEN (OPNUM, SHIFTOP), @@ -544,7 +562,7 @@ static struct debug_tokens { /* dump the returned token in rv, plus any optional arg in pl_yylval */ -STATIC int +static int S_tokereport(pTHX_ I32 rv, const YYSTYPE* lvalp) { PERL_ARGS_ASSERT_TOKEREPORT; @@ -563,7 +581,7 @@ S_tokereport(pTHX_ I32 rv, const YYSTYPE } } if (name) - Perl_sv_catpv(aTHX_ report, name); + sv_catpv(report, name); else if (isGRAPH(rv)) { sv_catpvf(report, "'%c'", (char)rv); @@ -609,13 +627,13 @@ S_tokereport(pTHX_ I32 rv, const YYSTYPE /* print the buffer with suitable escapes */ -STATIC void +static void S_printbuf(pTHX_ const char *const fmt, const char *const s) { - SV* const tmp = newSVpvs(""); - PERL_ARGS_ASSERT_PRINTBUF; + SV* const tmp = newSVpvs(""); + GCC_DIAG_IGNORE_STMT(-Wformat-nonliteral); /* fmt checked by caller */ PerlIO_printf(Perl_debug_log, fmt, pv_display(tmp, s, strlen(s), 0, 60)); GCC_DIAG_RESTORE_STMT; @@ -631,9 +649,11 @@ S_printbuf(pTHX_ const char *const fmt, * parsed and turns it into an ASSIGNOP if it finds one. */ -STATIC int +static int S_ao(pTHX_ int toketype) { + PERL_ARGS_ASSERT_AO; + if (*PL_bufptr == '=') { PL_bufptr++; @@ -666,9 +686,11 @@ S_ao(pTHX_ int toketype) #define POP_OLDBUFPTR TRUE -STATIC void +static void S_warn_expect_operator(pTHX_ const char *const what, char *s, I32 pop_oldbufptr) { + PERL_ARGS_ASSERT_WARN_EXPECT_OPERATOR; + if (PL_expect != XOPERATOR) return; @@ -684,8 +706,6 @@ S_warn_expect_operator(pTHX_ const char what ) ); - PERL_ARGS_ASSERT_WARN_EXPECT_OPERATOR; - if (!s) s = oldbp; else @@ -700,23 +720,23 @@ S_warn_expect_operator(pTHX_ const char } else if (PL_oldoldbufptr) { /* yyerror (via yywarn) would do this itself, so we should too */ - const char *t; - for (t = PL_oldoldbufptr; - t < PL_bufptr && isSPACE(*t); - t += UTF ? UTF8SKIP(t) : 1) - { - NOOP; + const char *t = PL_oldoldbufptr; + while (t < PL_bufptr && isSPACE(*t)) { + t++; } + /* see if we can identify the cause of the warning */ - if (isIDFIRST_lazy_if_safe(t,PL_bufend,UTF)) - { - const char *t_start= t; - for ( ; - (isWORDCHAR_lazy_if_safe(t, PL_bufend, UTF) || *t == ':'); - t += UTF ? UTF8SKIP(t) : 1) - { - NOOP; - } + Size_t advance; + if ((advance = isIDFIRST_lazy_if_safe(t, PL_bufend, UTF))) { + const char *t_start = t; + do { + t += advance; + } + while ( (advance = (*t == ':')) + || (advance = isWORDCHAR_lazy_if_safe((U8 *) t, + (U8 *) PL_bufend, + UTF))); + if (t < PL_bufptr && isSPACE(*t)) { has_more = TRUE; sv_catpvf( message, @@ -729,7 +749,7 @@ S_warn_expect_operator(pTHX_ const char const char *t= oldbp; assert(s >= oldbp); while (t < s && isSPACE(*t)) { - t += UTF ? UTF8SKIP(t) : 1; + t++; } sv_catpvf(message, @@ -750,9 +770,11 @@ S_warn_expect_operator(pTHX_ const char * This is fatal. */ -STATIC void +static void S_missingterm(pTHX_ char *s, STRLEN len) { + PERL_ARGS_ASSERT_MISSINGTERM; + char tmpbuf[UTF8_MAXBYTES + 1]; char q; bool uni = FALSE; @@ -791,8 +813,9 @@ S_missingterm(pTHX_ char *s, STRLEN len) " anywhere before EOF", q, UTF8fARG(uni, len, s), q); } -STATIC char * -S_scan_terminated(pTHX_ char *s, I32 ival) { +static char * +S_scan_terminated(pTHX_ char *s, I32 ival) +{ s = scan_str(s,FALSE,FALSE,FALSE,NULL); if (!s) missingterm(NULL, 0); @@ -804,7 +827,7 @@ S_scan_terminated(pTHX_ char *s, I32 iva #include "feature.h" -STATIC void +static void S_yyerror_non_ascii_message(pTHX_ const U8 * const s) { PERL_ARGS_ASSERT_YYERROR_NON_ASCII_MESSAGE; @@ -819,7 +842,7 @@ S_yyerror_non_ascii_message(pTHX_ const # define is_ascii_string_loc(s, len, ep) \ is_utf8_invariant_string_loc(s, len, ep) #else -STATIC bool +static bool S_is_ascii_string_loc(const U8 * const s0, STRLEN len, const U8 ** ep) { const U8 * s = s0; @@ -878,6 +901,8 @@ used by perl internally, so extensions s void Perl_lex_start(pTHX_ SV *line, PerlIO *rsfp, U32 flags) { + PERL_ARGS_ASSERT_LEX_START; + const char *s = NULL; yy_parser *parser, *oparser; @@ -1000,8 +1025,9 @@ Perl_parser_free(pTHX_ const yy_parser void Perl_parser_free_nexttoke_ops(pTHX_ yy_parser *parser, OPSLAB *slab) { - I32 nexttoke = parser->nexttoke; PERL_ARGS_ASSERT_PARSER_FREE_NEXTTOKE_OPS; + + I32 nexttoke = parser->nexttoke; while (nexttoke--) { if (S_is_opval_token(parser->nexttype[nexttoke] & 0xffff) && parser->nextval[nexttoke].opval @@ -1015,7 +1041,7 @@ Perl_parser_free_nexttoke_ops(pTHX_ yy_ /* -=for apidoc AmnxUN|SV *|PL_parser-Elinestr +=for apidoc AmnxUN|SV *|PL_parser->linestr Buffer scalar containing the chunk currently under consideration of the text currently being lexed. This is always a plain string scalar (for @@ -1042,7 +1068,7 @@ lexing position is pointed to by Lbufend +=for apidoc AmnxUN|char *|PL_parser->bufend Direct pointer to the end of the chunk of text currently being lexed, the end of the lexer buffer. This is equal to Clinestr) @@ -1050,7 +1076,7 @@ end of the lexer buffer. This is equal always located at the end of the buffer, and does not count as part of the buffer's contents. -=for apidoc AmnxUN|char *|PL_parser-Ebufptr +=for apidoc AmnxUN|char *|PL_parser->bufptr Points to the current position of lexing inside the lexer buffer. Characters around this point may be freely examined, within @@ -1068,7 +1094,7 @@ Interpretation of the buffer's octets ca using the slightly higher-level functions L and L. -=for apidoc AmnxUN|char *|PL_parser-Elinestart +=for apidoc AmnxUN|char *|PL_parser->linestart Points to the start of the current line inside the lexer buffer. This is useful for indicating at which column an error occurred, and @@ -1106,6 +1132,8 @@ instead of implementing the logic yourse bool Perl_lex_bufutf8(pTHX) { + PERL_ARGS_ASSERT_LEX_BUFUTF8; + return UTF; } @@ -1129,6 +1157,8 @@ into the buffer. char * Perl_lex_grow_linestr(pTHX_ STRLEN len) { + PERL_ARGS_ASSERT_LEX_GROW_LINESTR; + SV *linestr; char *buf; STRLEN bufend_pos, bufptr_pos, oldbufptr_pos, oldoldbufptr_pos; @@ -1177,6 +1207,7 @@ Perl_lex_grow_linestr(pTHX_ STRLEN len) =for apidoc_item lex_stuff_pvn =for apidoc_item lex_stuff_pvs =for apidoc_item lex_stuff_sv +=for apidoc_flag LEX_STUFF_UTF8 These each insert characters into the lexer buffer (Llinestr>), @@ -1205,16 +1236,15 @@ according to whether or not C has it In all three forms, the characters are recoded for the lexer buffer, according to how the buffer is currently being interpreted (L). -=for apidoc Amnh||LEX_STUFF_UTF8 - =cut */ void Perl_lex_stuff_pvn(pTHX_ const char *pv, STRLEN len, U32 flags) { - char *bufptr; PERL_ARGS_ASSERT_LEX_STUFF_PVN; + + char *bufptr; if (flags & ~(LEX_STUFF_UTF8)) croak("Lexing code internal error (%s)", "lex_stuff_pvn"); if (UTF) { @@ -1292,9 +1322,10 @@ Perl_lex_stuff_pv(pTHX_ const char *pv, void Perl_lex_stuff_sv(pTHX_ SV *sv, U32 flags) { + PERL_ARGS_ASSERT_LEX_STUFF_SV; + char *pv; STRLEN len; - PERL_ARGS_ASSERT_LEX_STUFF_SV; if (flags) croak("Lexing code internal error (%s)", "lex_stuff_sv"); pv = SvPV(sv, len); @@ -1318,9 +1349,10 @@ L. void Perl_lex_unstuff(pTHX_ char *ptr) { + PERL_ARGS_ASSERT_LEX_UNSTUFF; + char *buf, *bufend; STRLEN unstuff_len; - PERL_ARGS_ASSERT_LEX_UNSTUFF; buf = PL_parser->bufptr; if (ptr < buf) croak("Lexing code internal error (%s)", "lex_unstuff"); @@ -1353,8 +1385,9 @@ L. void Perl_lex_read_to(pTHX_ char *ptr) { - char *s; PERL_ARGS_ASSERT_LEX_READ_TO; + + char *s; s = PL_parser->bufptr; if (ptr < s || ptr > PL_parser->bufend) croak("Lexing code internal error (%s)", "lex_read_to"); @@ -1389,9 +1422,10 @@ multi-line tokens growing the buffer wit void Perl_lex_discard_to(pTHX_ char *ptr) { + PERL_ARGS_ASSERT_LEX_DISCARD_TO; + char *buf; STRLEN discard_len; - PERL_ARGS_ASSERT_LEX_DISCARD_TO; buf = SvPVX(PL_parser->linestr); if (ptr < buf) croak("Lexing code internal error (%s)", "lex_discard_to"); @@ -1423,6 +1457,8 @@ Perl_lex_discard_to(pTHX_ char *ptr) void Perl_notify_parser_that_encoding_changed(pTHX) { + PERL_ARGS_ASSERT_NOTIFY_PARSER_THAT_ENCODING_CHANGED; + /* Called when $^H is changed to indicate that HINT_UTF8 or * HINT_ASCII_ENCODING has changed from off to on. At compile time, this * has the effect of entering a 'use utf8' or 'use source::encoding' @@ -1440,7 +1476,8 @@ Perl_notify_parser_that_encoding_changed } /* -=for apidoc lex_next_chunk +=for apidoc lex_next_chunk +=for apidoc_flag LEX_KEEP_PREVIOUS Reads in the next chunk of text to be lexed, appending it to Llinestr>. This should be called when lexing code has @@ -1458,8 +1495,6 @@ consumed, then it will not be discarded Returns true if some new text was added to the buffer, or false if the buffer has reached the end of the input text. -=for apidoc Amnh||LEX_KEEP_PREVIOUS - =cut */ @@ -1469,6 +1504,8 @@ buffer has reached the end of the input bool Perl_lex_next_chunk(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_LEX_NEXT_CHUNK; + SV *linestr; char *buf; STRLEN old_bufend_pos, new_bufend_pos; @@ -1610,6 +1647,8 @@ is encountered, an exception is generate I32 Perl_lex_peek_unichar(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_LEX_PEEK_UNICHAR; + char *s, *bufend; if (flags & ~(LEX_KEEP_PREVIOUS)) croak("Lexing code internal error (%s)", "lex_peek_unichar"); @@ -1673,6 +1712,8 @@ is encountered, an exception is generate I32 Perl_lex_read_unichar(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_LEX_READ_UNICHAR; + I32 c; if (flags & ~(LEX_KEEP_PREVIOUS)) croak("Lexing code internal error (%s)", "lex_read_unichar"); @@ -1711,6 +1752,8 @@ chunk will not be discarded. void Perl_lex_read_space(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_LEX_READ_SPACE; + char *s, *bufend; const bool can_incline = !(flags & LEX_NO_INCLINE); bool need_incline = 0; @@ -1784,6 +1827,8 @@ Note that C is a valid C an bool Perl_validate_proto(pTHX_ SV *name, SV *proto, bool warn, bool curstash) { + PERL_ARGS_ASSERT_VALIDATE_PROTO; + STRLEN len, origlen; char *p; bool bad_proto = FALSE; @@ -1795,8 +1840,6 @@ Perl_validate_proto(pTHX_ SV *name, SV * bool underscore = FALSE; bool bad_proto_after_underscore = FALSE; - PERL_ARGS_ASSERT_VALIDATE_PROTO; - if (!proto) return TRUE; @@ -1882,19 +1925,17 @@ Perl_validate_proto(pTHX_ SV *name, SV * * If so, it sets the current line number and file to the values in the comment. */ -STATIC void +static void S_incline(pTHX_ const char *s, const char *end) { + PERL_ARGS_ASSERT_INCLINE; + const char *t; const char *n; const char *e; line_t line_num; UV uv; - PERL_ARGS_ASSERT_INCLINE; - - assert(end >= s); - COPLINE_INC_WITH_HERELINES; if (!PL_rsfp && !PL_parser->filtered && PL_lex_state == LEX_NORMAL && s+1 == PL_bufend && *s == ';') { @@ -1907,7 +1948,7 @@ S_incline(pTHX_ const char *s, const cha while (SPACE_OR_TAB(*s)) s++; if (memBEGINs(s, (STRLEN) (end - s), "line")) - s += sizeof("line") - 1; + s += STRLENs("line"); else return; if (SPACE_OR_TAB(*s)) @@ -1960,7 +2001,7 @@ S_incline(pTHX_ const char *s, const cha char *tmpbuf2; GV *gv2; - if (tmplen2 + 2 <= sizeof smallbuf) + if (tmplen2 + 2 <= C_ARRAY_LENGTH(smallbuf)) tmpbuf2 = smallbuf; else Newx(tmpbuf2, tmplen2 + 2, char); @@ -2006,9 +2047,11 @@ S_incline(pTHX_ const char *s, const cha CopLINE_set(PL_curcop, line_num); } -STATIC void +static void S_update_debugger_info(pTHX_ SV *orig_sv, const char *const buf, STRLEN len) { + PERL_ARGS_ASSERT_UPDATE_DEBUGGER_INFO; + AV *av = CopFILEAVx(PL_curcop); if (av) { SV * sv; @@ -2069,7 +2112,7 @@ Perl_skipspace_flags(pTHX_ char *s, U32 } /* - * S_check_uni + * S_check_unary * Check the unary operators to ensure there's no ambiguity in how they're * used. An ambiguous piece of code would be: * rand + 5 @@ -2077,9 +2120,11 @@ Perl_skipspace_flags(pTHX_ char *s, U32 * the +5 is its argument. */ -STATIC void -S_check_uni(pTHX) +static void +S_check_unary(pTHX) { + PERL_ARGS_ASSERT_CHECK_UNARY; + const char *s; if (PL_oldoldbufptr != PL_last_uni) @@ -2087,8 +2132,10 @@ S_check_uni(pTHX) while (isSPACE(*PL_last_uni)) PL_last_uni++; s = PL_last_uni; - while (isWORDCHAR_lazy_if_safe(s, PL_bufend, UTF) || *s == '-') - s += UTF ? UTF8SKIP(s) : 1; + Size_t advance; + while ( (advance = isWORDCHAR_lazy_if_safe(s, PL_bufend, UTF)) + || (advance = (*s == '-'))) + s += advance; if (s < PL_bufptr && memchr(s, '(', PL_bufptr - s)) return; @@ -2123,7 +2170,7 @@ S_check_uni(pTHX) * - else it's a list operator */ -STATIC I32 +static I32 S_lop(pTHX_ enum yytokentype t, I32 f, U8 x, char *s) { PERL_ARGS_ASSERT_LOP; @@ -2158,9 +2205,11 @@ S_lop(pTHX_ enum yytokentype t, I32 f, U * the lexer handles the token correctly. */ -STATIC void +static void S_force_next(pTHX_ I32 type) { + PERL_ARGS_ASSERT_FORCE_NEXT; + #ifdef DEBUGGING if (DEBUG_T_TEST) { PerlIO_printf(Perl_debug_log, "### forced token:\n"); @@ -2215,6 +2264,8 @@ S_postderef(pTHX_ int const funny, char void Perl_yyunlex(pTHX) { + PERL_ARGS_ASSERT_YYUNLEX; + int yyc = PL_parser->yychar; if (yyc != YYEMPTY) { if (yyc) { @@ -2233,7 +2284,7 @@ Perl_yyunlex(pTHX) } } -STATIC SV * +static SV * S_newSV_maybe_utf8(pTHX_ const char *const start, STRLEN len) { SV * const sv = newSVpvn_utf8(start, len, @@ -2261,26 +2312,29 @@ S_newSV_maybe_utf8(pTHX_ const char *con * use, etc. do this) */ -STATIC char * -S_force_word(pTHX_ char *start, int token, int check_keyword, int allow_pack) +static char * +S_force_word(pTHX_ char *start, int token, U32 flags) { + PERL_ARGS_ASSERT_FORCE_WORD; + char *s; STRLEN len; - - PERL_ARGS_ASSERT_FORCE_WORD; + const bool check_keyword = flags & CHECK_KEYWORD; + const bool allow_pack = flags & ALLOW_PACKAGE; start = skipspace(start); s = start; if ( isIDFIRST_lazy_if_safe(s, PL_bufend, UTF) || (allow_pack && *s == ':' && s[1] == ':') ) { - s = scan_word(s, PL_tokenbuf, sizeof PL_tokenbuf, allow_pack, &len); + s = scan_word(s, PL_tokenbuf, C_ARRAY_LENGTH(PL_tokenbuf), + allow_pack, &len); if (check_keyword) { char *s2 = PL_tokenbuf; STRLEN len2 = len; if (allow_pack && memBEGINPs(s2, len, "CORE::")) { - s2 += sizeof("CORE::") - 1; - len2 -= sizeof("CORE::") - 1; + s2 += STRLENs("CORE::"); + len2 -= STRLENs("CORE::"); } if (keyword(s2, len2, 0)) return start; @@ -2311,7 +2365,7 @@ S_force_word(pTHX_ char *start, int toke * Creates the symbol if it didn't already exist (via gv_fetchpv()). */ -STATIC void +static void S_force_ident(pTHX_ const char *s, int kind) { PERL_ARGS_ASSERT_FORCE_IDENT; @@ -2342,6 +2396,8 @@ S_force_ident(pTHX_ const char *s, int k static void S_force_ident_maybe_lex(pTHX_ char pit) { + PERL_ARGS_ASSERT_FORCE_IDENT_MAYBE_LEX; + NEXTVAL_NEXTTOKE.ival = pit; force_next('p'); } @@ -2349,6 +2405,8 @@ S_force_ident_maybe_lex(pTHX_ char pit) NV Perl_str_to_version(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_STR_TO_VERSION; + NV retval = 0.0; NV nshift = 1.0; STRLEN len; @@ -2356,8 +2414,6 @@ Perl_str_to_version(pTHX_ SV *sv) const U8 * const end = start + len; const bool utf = cBOOL(SvUTF8(sv)); - PERL_ARGS_ASSERT_STR_TO_VERSION; - while (start < end) { STRLEN skip; UV n; @@ -2382,21 +2438,21 @@ Perl_str_to_version(pTHX_ SV *sv) * must use an alternative parsing method). */ -STATIC char * +static char * S_force_version(pTHX_ char *s, int guessing) { + PERL_ARGS_ASSERT_FORCE_VERSION; + OP *version = NULL; char *d; - PERL_ARGS_ASSERT_FORCE_VERSION; - s = skipspace(s); d = s; if (*d == 'v') d++; if (isDIGIT(*d)) { - while (isDIGIT(*d) || *d == '_' || *d == '.') + while (isDIGIT_or_UNDERSCORE(*d) || *d == '.') d++; if (*d == ';' || isSPACE(*d) || *d == '{' || *d == '}' || !*d) { SV *ver; @@ -2426,14 +2482,14 @@ S_force_version(pTHX_ char *s, int guess * Forces the next token to be a version number using strict syntax rules. */ -STATIC char * +static char * S_force_strict_version(pTHX_ char *s) { + PERL_ARGS_ASSERT_FORCE_STRICT_VERSION; + OP *version = NULL; const char *errstr = NULL; - PERL_ARGS_ASSERT_FORCE_STRICT_VERSION; - while (isSPACE(*s)) /* leading whitespace */ s++; @@ -2465,16 +2521,16 @@ S_force_strict_version(pTHX_ char *s) * unchanged, and a new SV containing the modified input is returned. */ -STATIC SV * +static SV * S_tokeq(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_TOKEQ; + char *s; char *send; char *d; SV *pv = sv; - PERL_ARGS_ASSERT_TOKEQ; - assert (SvPOK(sv)); assert (SvLEN(sv)); assert (!SvIsCOW(sv)); @@ -2535,9 +2591,11 @@ S_tokeq(pTHX_ SV *sv) * call to S_sublex_push(). */ -STATIC I32 +static I32 S_sublex_start(pTHX) { + PERL_ARGS_ASSERT_SUBLEX_START; + const I32 op_type = pl_yylval.ival; if (op_type == OP_NULL) { @@ -2587,9 +2645,11 @@ S_sublex_start(pTHX) * Sets PL_lex_state to LEX_INTERPCONCAT. */ -STATIC I32 +static I32 S_sublex_push(pTHX) { + PERL_ARGS_ASSERT_SUBLEX_PUSH; + LEXSHARED *shared; const bool is_heredoc = PL_multi_close == '<'; ENTER; @@ -2690,9 +2750,11 @@ S_sublex_push(pTHX) * Restores lexer state after a S_sublex_push. */ -STATIC I32 +static I32 S_sublex_done(pTHX) { + PERL_ARGS_ASSERT_SUBLEX_DONE; + if (!PL_lex_starts++) { SV * const sv = newSVpvs(""); if (SvUTF8(PL_linestr)) @@ -2765,6 +2827,8 @@ HV * Perl_load_charnames(pTHX_ SV * char_name, const char * context, const STRLEN context_len, const char ** error_msg) { + PERL_ARGS_ASSERT_LOAD_CHARNAMES; + /* Load the official _charnames module if not already there. The * parameters are just to give info for any error messages generated: * char_name a name to look up which is the reason for loading this @@ -2779,8 +2843,6 @@ Perl_load_charnames(pTHX_ SV * char_name SV **cvp; SV * res; - PERL_ARGS_ASSERT_LOAD_CHARNAMES; - /* This loop is executed 1 1/2 times. On the first time through, if it * isn't already loaded, try loading it, and iterate just once to see if it * worked. */ @@ -2796,7 +2858,7 @@ Perl_load_charnames(pTHX_ SV * char_name } if (i == 0) { - Perl_load_module(aTHX_ + load_module( 0, newSVpvs("_charnames"), @@ -2819,17 +2881,17 @@ Perl_load_charnames(pTHX_ SV * char_name return NULL; } -STATIC SV* +static SV* S_get_and_check_backslash_N_name_wrapper(pTHX_ const char* s, const char* const e) { + PERL_ARGS_ASSERT_GET_AND_CHECK_BACKSLASH_N_NAME_WRAPPER; + /* This justs wraps get_and_check_backslash_N_name() to output any error * message it returns. */ const char * error_msg = NULL; SV * result; - PERL_ARGS_ASSERT_GET_AND_CHECK_BACKSLASH_N_NAME_WRAPPER; - /* charnames doesn't work well if there have been errors found */ if (PL_error_count > 0) { return NULL; @@ -2850,6 +2912,9 @@ Perl_get_and_check_backslash_N_name(pTHX const bool is_utf8, const char ** error_msg) { + PERL_ARGS_ASSERT_GET_AND_CHECK_BACKSLASH_N_NAME; + assert(s > (char *) 3); + /* points to first character of interior of \N{}, to one beyond the * interior, hence to the "}". Finds what the name resolves to, returning * an SV* containing it; NULL if no valid one found. @@ -2870,12 +2935,6 @@ Perl_get_and_check_backslash_N_name(pTHX const char* context = s - 3; STRLEN context_len = e - context + 1; /* include all of \N{...} */ - - PERL_ARGS_ASSERT_GET_AND_CHECK_BACKSLASH_N_NAME; - - assert(e >= s); - assert(s > (char *) 3); - while (s < e && isBLANK(*s)) { s++; } @@ -2926,7 +2985,7 @@ Perl_get_and_check_backslash_N_name(pTHX /* Here, it isn't Perl's charname handler. We can't rely on a * user-supplied handler to validate the input name. For non-ut8 input, * look to see that the first character is legal. Then loop through the - * rest checking that each is a continuation */ + * rest checking that each is a charname continuation */ /* This code makes the reasonable assumption that the only Latin1-range * characters that begin a character name alias are alphabetic, otherwise @@ -2963,14 +3022,15 @@ Perl_get_and_check_backslash_N_name(pTHX s += 2; } else { - if (! _invlist_contains_cp(PL_utf8_charname_begin, + Size_t advance; + if (! invlist_contains_cp_(PL_utf8_charname_begin, utf8_to_uv_or_die((const U8 *) s, (const U8 *) e, - NULL))) + &advance))) { goto bad_charname; } - s += UTF8SKIP(s); + s += advance; } while (s < e) { @@ -2991,14 +3051,15 @@ Perl_get_and_check_backslash_N_name(pTHX s += 2; } else { - if (! _invlist_contains_cp(PL_utf8_charname_continue, + Size_t advance; + if (! invlist_contains_cp_(PL_utf8_charname_continue, utf8_to_uv_or_die((const U8 *) s, (const U8 *) e, - NULL))) + &advance))) { goto bad_charname; } - s += UTF8SKIP(s); + s += advance; } } } @@ -3152,9 +3213,11 @@ Perl_get_and_check_backslash_N_name(pTHX */ -STATIC char * +static char * S_scan_const(pTHX_ char *start) { + PERL_ARGS_ASSERT_SCAN_CONST; + const char * const send = PL_bufend;/* end of the constant */ SV *sv = newSV(send - start); /* sv for the constant. See note below on sizing. */ @@ -3206,8 +3269,6 @@ S_scan_const(pTHX_ char *start) platform-specific like \x65 */ #endif - PERL_ARGS_ASSERT_SCAN_CONST; - assert(PL_lex_inwhat != OP_TRANSR); /* Protect sv from errors and fatal warnings. */ @@ -3324,8 +3385,8 @@ S_scan_const(pTHX_ char *start) /* We know the utf8 is valid, because we just constructed * it ourselves in previous loop iterations */ min_ptr = (char*) utf8_hop( (U8*) max_ptr, -1); - range_min = valid_utf8_to_uvchr( (U8*) min_ptr, NULL); - range_max = valid_utf8_to_uvchr( (U8*) max_ptr, NULL); + range_min = valid_utf8_to_uv( (U8*) min_ptr, NULL); + range_max = valid_utf8_to_uv( (U8*) max_ptr, NULL); /* This compensates for not all code setting * 'has_above_latin1', so that we don't skip stuff that @@ -3696,10 +3757,7 @@ S_scan_const(pTHX_ char *start) * (@foo, @::foo, @'foo, @{foo}, @$foo, @+, @-) */ else if (*s == '@' && s[1]) { - if (UTF - ? isIDFIRST_utf8_safe(s+1, send) - : isWORDCHAR_A(s[1])) - { + if (isDIGIT_A(s[1]) || isIDFIRST_lazy_if_safe(s+1, send, UTF)) { break; } if (memCHRs(":'{$", s[1])) @@ -4082,9 +4140,11 @@ S_scan_const(pTHX_ char *start) } else /* Here is \N{NAME} but not \N{U+...}. */ if (! (res = get_and_check_backslash_N_name_wrapper(s, e))) - { /* Failed. We should die eventually, but for now use a NUL - to keep parsing */ - *d++ = '\0'; + { /* Failed. We used to keep parsing, but error conditions here + * can sometimes result in scope problems, which later manifest + * as the incorrect pad being operated upon. (See GH#16930.) + * Safest to just abort now. */ + yyquit(); } else { /* Successfully evaluated the name */ STRLEN len; @@ -4092,9 +4152,9 @@ S_scan_const(pTHX_ char *start) if (PL_lex_inpat) { if (! len) { /* The name resolved to an empty string */ - const char empty_N[] = "\\N{_}"; - Copy(empty_N, d, sizeof(empty_N) - 1, char); - d += sizeof(empty_N) - 1; + const char * const empty_N = "\\N{_}"; + Copy(empty_N, d, strlen(empty_N), char); + d += strlen(empty_N); } else { /* In order to not lose information for the regex @@ -4112,9 +4172,8 @@ S_scan_const(pTHX_ char *start) * through the string. Each character takes up * 2 hex digits plus either a trailing dot or * the "}" */ - const char initial_text[] = "\\N{U+"; - const STRLEN initial_len = sizeof(initial_text) - - 1; + const char * const initial_text = "\\N{U+"; + const STRLEN initial_len = strlen(initial_text); d = off + SvGROW(sv, off + 3 * len @@ -4128,7 +4187,7 @@ S_scan_const(pTHX_ char *start) char hex_string[4]; int len = my_snprintf(hex_string, - sizeof(hex_string), + C_ARRAY_LENGTH(hex_string), "%02X.", /* The regex compiler is @@ -4136,7 +4195,7 @@ S_scan_const(pTHX_ char *start) * native */ NATIVE_TO_LATIN1(*str)); PERL_MY_SNPRINTF_POST_GUARD(len, - sizeof(hex_string)); + C_ARRAY_LENGTH(hex_string)); Copy(hex_string, d, 3, char); d += 3; str++; @@ -4156,14 +4215,15 @@ S_scan_const(pTHX_ char *start) char hex_string[2 * UTF8_MAXBYTES + 5]; /* Get the first character of the result. */ - U32 uv = utf8n_to_uvchr((U8 *) str, - len, - &char_length, - UTF8_ALLOW_ANYUV); + U32 uv = utf8_to_uv_or_die( + (const U8 *) str, + (const U8 *) str_end, + &char_length); /* Convert first code point to Unicode hex, * including the boiler plate before it. */ output_length = - my_snprintf(hex_string, sizeof(hex_string), + my_snprintf(hex_string, + C_ARRAY_LENGTH(hex_string), "\\N{U+%X", (unsigned int) NATIVE_TO_UNI(uv)); @@ -4180,13 +4240,13 @@ S_scan_const(pTHX_ char *start) * its Unicode code point in hex */ while ((str += char_length) < str_end) { const STRLEN off = d - SvPVX_const(sv); - U32 uv = utf8n_to_uvchr((U8 *) str, - str_end - str, - &char_length, - UTF8_ALLOW_ANYUV); + U32 uv = utf8_to_uv_or_die( + (const U8 *) str, + (const U8 *) str_end, + &char_length); output_length = my_snprintf(hex_string, - sizeof(hex_string), + C_ARRAY_LENGTH(hex_string), ".%X", (unsigned int) NATIVE_TO_UNI(uv)); @@ -4422,9 +4482,7 @@ S_scan_const(pTHX_ char *start) } /* shrink the sv if we allocated more than we used */ - if (SvCUR(sv) + 5 < SvLEN(sv)) { - SvPV_shrink_to_cur(sv); - } + SvPV_shrink_to_cur(sv); /* return the substring (via pl_yylval) only if we parsed anything */ if (s > start) { @@ -4465,6 +4523,33 @@ S_scan_const(pTHX_ char *start) return s; } +static bool +S_is_existing_identifier(pTHX_ char *s, Size_t len, char sigil, bool is_utf8) +{ + PERL_ARGS_ASSERT_IS_EXISTING_IDENTIFIER; + + /* This returns a boolean indicating if a string represents an identifier + * known to the program. 'sigil' is the character indicating the type of + * the identifier to look for. (though '%' is currently not specially + * handled.) The string from 's + 1' to (s + len) is looked at. s[0] is + * ignored, but must exist; the function overwrites it temporarily, + * restoring it before returning */ + + char save_sigil = s[0]; + s[0] = sigil; + PADOFFSET slot = pad_findmy_pv(s, 0); + s[0] = save_sigil; + + return slot != NOT_IN_PAD + || gv_fetchpvn_flags(s + 1, len - 1, + (is_utf8) ? SVf_UTF8 : 0, + (sigil == '@') + ? SVt_PVAV + : (sigil == '&') + ? SVt_PVCV + : SVt_PV); +} + /* S_intuit_more * Returns TRUE if there's more to the expression (e.g., a subscript), * FALSE otherwise. @@ -4487,8 +4572,12 @@ S_scan_const(pTHX_ char *start) /* This is the one truly awful dwimmer necessary to conflate C and sed. */ -STATIC int -S_intuit_more(pTHX_ char *s, char *e) +static int +S_intuit_more(pTHX_ char *s, char *e, + U8 caller_context, /* Who's calling us? basically an enum */ + char * caller_s, /* If non-NULL, the name of the identifier + that resulted in this call */ + Size_t caller_length) /* And the length of that name */ { PERL_ARGS_ASSERT_INTUIT_MORE; @@ -4496,7 +4585,14 @@ S_intuit_more(pTHX_ char *s, char *e) * 'scariness', and lack of comments. khw has gone through and done some * cleanup, while finding various instances of problematic behavior. * Rather than change this base-level function immediately, khw has added - * commentary to those areas. */ + * commentary to those areas. + * + * khw: $0 in square brackets is never going to mean the expansion of $0. + * How could that help in calculating a subscript? And one would never + * want to match any one of the characters in this call to the program. + * No, $0 is going to want to mean this a charclass that matches dollar + * and digit0. But, code outside this function chooses the value of the + * variable $0. I think this should be special cased. */ /* If recursed within brackets, there is more to the expression */ if (PL_lex_brackets) @@ -4547,19 +4643,70 @@ S_intuit_more(pTHX_ char *s, char *e) /* Here is '[': maybe we have a character class. Examine the guts */ s++; - /* '^' implies a character class; An empty '[]' isn't legal, but it does - * mean there isn't more to come */ + /* '^' implies a character class; An empty '[]' isn't legal, and it means + * there isn't more to come */ if (s[0] == ']' || s[0] == '^') return FALSE; + bool under_strict_vars = PL_hints & HINT_STRICT_VARS; + + /* If the input is of the form '$foo[...', and there is a $foo scalar and + * no @foo array, then '...' is more likely to be a character class. + * (Under 'strict vars', we know at compile time all the accessible + * variables, so in that case it MUST be a character class.) If the + * situation is reversed, it is more likely to be (or must be) a + * subscript. */ + if (caller_context == FROM_DOLLAR) { + assert (caller_s); + + /* See if there is a known scalar for the input identifier */ + bool has_scalar = is_existing_identifier(caller_s, caller_length, + '$', UTF); + + /* Repeat to see if there is a known array of the given name */ + bool has_array = is_existing_identifier(caller_s, caller_length, + '@', UTF); + + unsigned int count = has_scalar + has_array; + + /* Under strict, we need some variable to be declared. */ + if (under_strict_vars) { + + /* If none are, is an error. Return false to stop useless further + * parsing. */ + if (count == 0) { + return false; + } + + /* When just one variable is declared, the construct has to match + * what the variable is. If it is an array, this must be a + * subscript which needs further processing; otherwise it is a + * character class needing nothing further. */ + if (count == 1) { + return has_array; + } + + /* Here have both an array and a scalar with the same name. Drop + * down to use the heuristics to try to intuit which is meant */ + } + } + /* Find matching ']'. khw: This means any s[1] below is guaranteed to * exist */ const char * const send = (char *) memchr(s, ']', e - s); if (! send) /* has to be an expression */ return TRUE; + /* Below here, the heuristics start. One idea from alh is, given 'use + * 5.43.x', that for all digits, that if we have to resort to heuristics, + * we instead raise an error with an explanation of how to make it + * unambiguous: ${foo}[123] */ + /* If the construct consists entirely of one or two digits, call it a - * subscript. */ + * subscript. + * + * khw: No one writes 03 to mean 3. Any string of digits beginning with + * '0' is likely to be a charclass, including length 2 ones. */ if (isDIGIT(s[0]) && send - s <= 2 && (send - s == 1 || (isDIGIT(s[1])))) { return TRUE; } @@ -4594,6 +4741,13 @@ S_intuit_more(pTHX_ char *s, char *e) Zero(seen, 256, char); /* Examine each character in the construct */ + /* That this knows nothing of UTF-8 can lead to opposite results if the + * text is encoded in UTF-8 or not; another relic of the Unicode Bug. + * Suppose a string consists of various un-repeated code points between + * 0x128 and 0x255. When encoded in UTF-8 their start bytes will all be + * \xC2 or \xC3. The heuristics below will count those as repeated bytes, + * and thus lean more towards this being a character class than when not + * in UTF-8. */ bool first_time = true; for (; s < send; s++, first_time = false) { unsigned char prev_un_char = un_char; @@ -4607,23 +4761,76 @@ S_intuit_more(pTHX_ char *s, char *e) * indicates it is a subscript */ weight -= seen[un_char] * 10; - /* Following one of these characters, we look to see if there is an + /* Following one of these sigils, we look to see if there is an * identifier already found in the program by that name. If so, - * strongly suspect this isn't a character class */ + * strongly suspect this isn't a character class + * + * khw: But under 'strict' if the identifier doesn't exist, it + * has to be a charclass + * + * khw: [...$0...] is never going to mean the name of the program; + * it's always going to be a charclass. $1 could mean either, but + * as the number increases, the more likely to be a charclass, as + * the chance of there being a pattern with that many capture + * groups goes rapidly down. + * + * khw: Using \w here misses the possibility of lots of other + * syntaxes of variables, like $::foo or ${foo}, that scan_ident + * looks for. + * + */ if (isWORDCHAR_lazy_if_safe(s+1, PL_bufend, UTF)) { - int len; - char tmpbuf[sizeof PL_tokenbuf * 4]; - scan_ident(s, tmpbuf, sizeof tmpbuf, FALSE); - len = (int)strlen(tmpbuf); + Size_t len; + + /* khw: where did the magic number 4 come from?. This buffer + * was 4 times as large as tokenbuf in 1997, and had not + * changed since the code was first added */ + char tmpbuf[ C_ARRAY_LENGTH(PL_tokenbuf) * 4 ]; + + if (! scan_ident(s, tmpbuf, C_ARRAY_END(tmpbuf), CHECK_ONLY)) + { + /* An illegal identifier means this can't be a subscript; + * it's an error or it could be a charclass */ + return false; + } + + len = strlen(tmpbuf); + + /* khw: This only looks at global variables; lexicals came + * later, and this hasn't been updated. Ouch!! */ if ( len > 1 && gv_fetchpvn_flags(tmpbuf, len, UTF ? SVf_UTF8 : 0, SVt_PV)) + { weight -= 100; - else /* Not a multi-char identifier already known in the - program; is somewhat likely to be a subscript */ + + /* khw: Below we keep track of repeated characters; People + * rarely say qr/[aba]/, as the second a is pointless. + * (Some do it though as a mnemonic that is meaningful to + * them.) But generally, repeated characters make things + * more likely to be a charclass. But here, this an + * identifier so likely a subscript. Its spelling should + * be irrelevant to the repeated characters test. So, we + * should advance past it. Suppose it is a hash element, + * like $subscripts{$which}. We should advance past the + * braces and key */ + } + else { + /* Not a multi-char identifier already known in the + * program; is somewhat likely to be a subscript. + * + * khw: Our test suite contains several constructs like + * [$A-Z]. Excluding length 1 identifiers in the + * conditional above means such are much less likely to be + * mistaken for subscripts. I would argue that if the next + * character is a '-' followed by an alpha, that would make + * it much more likely to be a charclass. It would only + * make sense to be an expression if that alpha string is a + * bareword with meaning; something like [$A-ord] */ weight -= 10; + } } else if ( s[0] == '$' && s[1] @@ -4640,13 +4847,51 @@ S_intuit_more(pTHX_ char *s, char *e) } break; + /* khw: [:blank:] strongly indicates a charclass */ + /* khw: Z-A definitely subscript + * Z-Z likely subscript + * "x - z" with blanks very likely subscript + * \N without { must be subscript + * \R must be subscript + * \? must be subscript for things like \d, but not \a. + */ + + case '\\': if (s[1]) { - if (memCHRs("wds]", s[1])) + if (memCHRs("wds]", s[1])) { weight += 100; /* \w \d \s => strongly charclass */ - /* khw: Why not \W \D \S \h \v, etc as well? */ - else if (seen[(U8)'\''] || seen[(U8)'"']) - weight += 1; /* \' => mildly charclass */ + /* khw: \] can't happen, as any ']' is beyond our search. + * Why not \W \D \S \h \v, etc as well? Should they have + * the same weights as \w \d \s or should all or some be + * in the 'abcfnrtvx' below? */ + } else if (seen[(U8)'\''] || seen[(U8)'"']) { + weight += 1; + /* khw: This is problematic. Enough so, that I misread + * it, and added a wrong comment about what it does in + * 57ae1f3a8e669082e3d5ec6a8cdffbdc39d87bee. Note that it + * doesn't look at the current character. What it + * actually does is: if any quote has been seen in the + * parse, don't do the rest of the else's below, but for + * every subsequent backslashed character encountered + * (except \0 \w \s \d), increment the weight to lean a + * bit more towards being a charclass. That means that + * every backslash sequence following the first occurrence + * of a quote increments the weight regardless of what the + * sequence is. Again, \0 \w \d and \s are not controlled + * by this else, so they change the weight by a lot more. + * But what makes them so special that they aren't subject + * to this. Any why does having a quote change the + * behavior from then on. And why only backslashed + * sequences get this treatment? This code has been + * unchanged since this function was added in 1993. I + * don't get it. Instead, it does seem to me that it is + * especially unlikely to repeat a quote in a charclass, + * but that having just a single quote is indicative of a + * charclass, and having pairs of quotes is indicative of + * a subscript. Similarly for things that could indicate + * nesting of braces or parens. */ + } else if (memCHRs("abcfnrtvx", s[1])) weight += 40; /* \n, etc => charclass */ /* khw: Why not \e etc as well? */ @@ -4655,6 +4900,19 @@ S_intuit_more(pTHX_ char *s, char *e) while (s[1] && isDIGIT(s[1])) s++; } + + /* khw: There are lots more possible escape sequences. Some, + * like \A,\z have no special meaning to charclasses, so might + * indicate a subscript, but I don't know what they would be + * doing there either. Some have been added to the language + * after this code was written, but no one thought to, or + * could wade through this function, to add them. Things like + * \p{} for properties, \N and \N{}, for example. + * + * It's problematic that \a is treated as plain 'a' for + * purposes of the 'seen' array. Whatever is matched by these + * backslashed sequences should not be added to 'seen'. That + * includes the backslash. */ } else /* \ followed by NUL strongly indicates character class */ weight += 100; @@ -4700,7 +4958,25 @@ S_intuit_more(pTHX_ char *s, char *e) && isALPHA(s[1])) { /* Here it's \W (that isn't [$@&] ) followed immediately by two - * alphas in a row. Accumulate all the consecutive alphas */ + * alphas in a row. Accumulate all the consecutive alphas. + * + * khw: The code below was changed in 2015 by + * 56f81afc0f2d331537f38e6f12b86a850187cb8a to solve a + * buffer overrun. Prior to that commit, the code copied all + * the consecutive alphas to a temporary. The problem was + * that temporary's size could be exceeded, and the temporary + * wasn't even needed (at least by 2015). The called + * keyword() function doesn't need a copy. It takes a pointer + * to the first character and a length, hence it can operate + * on the original source text. It is intended to catch cases + * like $a[ord]. If it does match a keyword, we don't want + * the spelling of that keyword to affect the seen[] array. + * But if it isn't a keyword we do want to fall back to the + * normal behavior. And the 2015 commit removed that. It + * absorbs every bareword regardless, defeating the intent of + * the algorithm implementing the heuristics. That not many + * bugs have surfaced since indicates this whole thing doesn't + * get applied very much */ char *d = s; while (isALPHA(s[0])) s++; @@ -4710,7 +4986,12 @@ S_intuit_more(pTHX_ char *s, char *e) if (keyword(d, s - d, 0)) weight -= 150; - /* khw: Should those alphas be marked as seen? */ + /* khw: Barewords could also be subroutine calls, and these + * would also indicate a subscript. Like [green] where + * 'green' has been declared, for example, in 'use constant' + * Or maybe it should just call intuit_method() which checks + * for keyword, subs, and methods. + * */ } /* Consecutive chars like [...12...] and [...ab...] are presumed @@ -4725,23 +5006,36 @@ S_intuit_more(pTHX_ char *s, char *e) /* But repeating a character inside a character class does nothing, * like [aba], so less likely that someone makes such a class, more * likely that it is a subscript; the more repeats, the less - * likely. */ + * likely. + * + * khw: I think this changes the weight too rapidly. Each time + * through the loop compounds the previous times. Instead, it + * would be better to have a separate loop after all the rest that + * changes the weight once based on how many times each character + * gets repeated */ weight -= seen[un_char]; break; } /* End of switch */ /* khw: 'seen' is declared as a char. This ++ can cause it to wrap. * This gives different results with compilers for which a plain 'char' - * is actually unsigned, versus those where it is signed. I believe it - * is undefined behavior to wrap a 'signed'. I think it should be - * instead declared an unsigned int to make the chances of wrapping - * essentially zero. + * is actually unsigned, versus those where it is signed. The C99 + * standard allows a compiler to raise a signal when a 'signed' char + * is incremented outside its permissible range. I think 'seen' + * should be instead declared an unsigned, and a conditional added + * to prevent wrapping. * * And I believe that extra backslashes are different from other - * repeated characters. */ + * repeated characters. There may be others, like I have mentioned + * quotes and paired delimiters */ seen[un_char]++; } /* End of loop through each character of the construct */ + /* khw: People on #irc have suggested things that I think boil down to: + * under 'use 5.43.x', output a warning like existing warnings for + * similar situations "Ambiguous use of [], resolved as ..." Perhaps + * suppress the message if all (or maybe almost all) the evidence points + * to the same outcome. This would involve two weight variables */ if (weight >= 0) /* probably a character class */ return FALSE; @@ -4769,11 +5063,16 @@ S_intuit_more(pTHX_ char *s, char *e) * => */ -STATIC int +static int S_intuit_method(pTHX_ char *start, SV *ioname, CV *cv) { + PERL_ARGS_ASSERT_INTUIT_METHOD; + + if (!FEATURE_INDIRECT_IS_ENABLED) + return 0; + char *s = start + (*start == '$'); - char tmpbuf[sizeof PL_tokenbuf]; + char tmpbuf[C_ARRAY_LENGTH(PL_tokenbuf)]; STRLEN len; GV* indirgv; /* Mustn't actually add anything to a symbol table. @@ -4783,11 +5082,6 @@ S_intuit_method(pTHX_ char *start, SV *i GV * const gv = ioname ? gv_fetchsv(ioname, GV_NOADD_NOINIT, SVt_PVCV) : NULL; - PERL_ARGS_ASSERT_INTUIT_METHOD; - - if (!FEATURE_INDIRECT_IS_ENABLED) - return 0; - if (gv && SvTYPE(gv) == SVt_PVGV && GvIO(gv)) return 0; if (cv && SvPOK(cv)) { @@ -4813,7 +5107,7 @@ S_intuit_method(pTHX_ char *start, SV *i return *s == '(' ? METHCALL : METHCALL0; } - s = scan_word(s, tmpbuf, sizeof tmpbuf, TRUE, &len); + s = scan_word(s, tmpbuf, C_ARRAY_LENGTH(tmpbuf), TRUE, &len); /* start is the beginning of the possible filehandle/object, * and s is the end of it * tmpbuf is a copy of it (but with single quotes as double colons) @@ -4869,6 +5163,8 @@ S_intuit_method(pTHX_ char *start, SV *i SV * Perl_filter_add(pTHX_ filter_t funcp, SV *datasv) { + PERL_ARGS_ASSERT_FILTER_ADD; + if (!funcp) return NULL; @@ -4944,10 +5240,10 @@ Delete most recently added instance of t void Perl_filter_del(pTHX_ filter_t funcp) { - SV *datasv; - PERL_ARGS_ASSERT_FILTER_DEL; + SV *datasv; + #ifdef DEBUGGING DEBUG_P(PerlIO_printf(Perl_debug_log, "filter_del func %p", FPTR2DPTR(void*, funcp))); @@ -4971,6 +5267,8 @@ Perl_filter_del(pTHX_ filter_t funcp) I32 Perl_filter_read(pTHX_ int idx, SV *buf_sv, int maxlen) { + PERL_ARGS_ASSERT_FILTER_READ; + filter_t funcp; I32 ret; SV *datasv = NULL; @@ -4979,8 +5277,6 @@ Perl_filter_read(pTHX_ int idx, SV *buf_ check the value here. */ unsigned int correct_length = maxlen < 0 ? PERL_INT_MAX : maxlen; - PERL_ARGS_ASSERT_FILTER_READ; - if (!PL_parser || !PL_rsfp_filters) return -1; if (idx > AvFILLp(PL_rsfp_filters)) { /* Any more filters? */ @@ -5087,7 +5383,7 @@ Perl_filter_read(pTHX_ int idx, SV *buf_ return ret; } -STATIC char * +static char * S_filter_gets(pTHX_ SV *sv, STRLEN append) { PERL_ARGS_ASSERT_FILTER_GETS; @@ -5104,13 +5400,13 @@ S_filter_gets(pTHX_ SV *sv, STRLEN appen return (sv_gets(sv, PL_rsfp, append)); } -STATIC HV * +static HV * S_find_in_my_stash(pTHX_ const char *pkgname, STRLEN len) { - GV *gv; - PERL_ARGS_ASSERT_FIND_IN_MY_STASH; + GV *gv; + if (memEQs(pkgname, len, "__PACKAGE__")) return PL_curstash; @@ -5135,8 +5431,9 @@ S_find_in_my_stash(pTHX_ const char *pkg } -STATIC char * -S_tokenize_use(pTHX_ int is_use, char *s) { +static char * +S_tokenize_use(pTHX_ int is_use, char *s) +{ PERL_ARGS_ASSERT_TOKENIZE_USE; if (PL_expect != XSTATE) @@ -5153,12 +5450,12 @@ S_tokenize_use(pTHX_ int is_use, char *s force_next(BAREWORD); } else if (*s == 'v') { - s = force_word(s,BAREWORD,FALSE,TRUE); + s = force_word(s, BAREWORD, ALLOW_PACKAGE); s = force_version(s, FALSE); } } else { - s = force_word(s,BAREWORD,FALSE,TRUE); + s = force_word(s, BAREWORD, ALLOW_PACKAGE); s = force_version(s, FALSE); } pl_yylval.ival = is_use; @@ -5173,7 +5470,7 @@ S_tokenize_use(pTHX_ int is_use, char *s #endif #define word_takes_any_delimiter(p,l) S_word_takes_any_delimiter(p,l) -STATIC bool +static bool S_word_takes_any_delimiter(char *p, STRLEN len) { return (len == 1 && memCHRs("msyq", p[0])) @@ -5193,10 +5490,11 @@ S_check_scalar_slice(pTHX_ char *s) { return; } - while ( isWORDCHAR_lazy_if_safe(s, PL_bufend, UTF) - || (*s && memCHRs(" \t$#+-'\"", *s))) + Size_t advance; + while ( (advance = isWORDCHAR_lazy_if_safe(s, PL_bufend, UTF)) + || (advance = (*s && memCHRs(" \t$#+-'\"", *s)))) { - s += UTF ? UTF8SKIP(s) : 1; + s += advance; } if (*s == '}' || *s == ']') pl_yylval.ival = OPpSLICEWARNING; @@ -5235,13 +5533,21 @@ yyl_sigvar(pTHX_ char *s) U8 sigil; s = skipspace(s); + + bool is_named = false; + if(*s == ':') { + is_named = true; + s++; + s = skipspace(s); + } + sigil = *s++; PL_bufptr = s; /* for error reporting */ switch (sigil) { case '$': case '@': case '%': - /* spot stuff that looks like an prototype */ + /* spot stuff that looks like a prototype */ if (memCHRs("$:@%&*;\\[]", *s)) { yyerror("Illegal character following sigil in a subroutine signature"); break; @@ -5251,17 +5557,24 @@ yyl_sigvar(pTHX_ char *s) yyerror("'#' not allowed immediately following a sigil in a subroutine signature"); break; } + if (is_named && sigil != '$') { + yyerror("A named signature parameter must start with '$'"); + break; + } s = skipspace(s); if (isIDFIRST_lazy_if_safe(s, PL_bufend, UTF)) { char *dest = PL_tokenbuf + 1; /* read var name, including sigil, into PL_tokenbuf */ PL_tokenbuf[0] = sigil; - parse_ident(&s, &dest, dest + sizeof(PL_tokenbuf) - 1, - 0, cBOOL(UTF), FALSE); - *dest = '\0'; + s = parse_ident(s, PL_bufend, &dest, C_ARRAY_END(PL_tokenbuf), + cBOOL(UTF), NULL, 0); assert(PL_tokenbuf[1]); /* we have a variable name */ } else { + if (is_named) { + yyerror("Named parameters must actually have a name"); + break; + } *PL_tokenbuf = 0; PL_in_my = 0; } @@ -5323,7 +5636,10 @@ yyl_sigvar(pTHX_ char *s) default: PL_in_my = 0; - yyerror("A signature parameter must start with '$', '@' or '%'"); + if(is_named) + yyerror("A named signature parameter must start with '$'"); + else + yyerror("A signature parameter must start with '$', '@' or '%'"); /* very crude error recovery: skip to likely next signature * element */ while (*s && *s != '$' && *s != '@' && *s != '%' && *s != ')') @@ -5331,6 +5647,12 @@ yyl_sigvar(pTHX_ char *s) break; } + if (!PL_parser->error_count && is_named) { + assert(sigil == '$'); + force_next(PERLY_DOLLAR); + TOKEN (PERLY_COLON); + } + switch (sigil) { case ',': TOKEN (PERLY_COMMA); case '$': TOKEN (PERLY_DOLLAR); @@ -5359,8 +5681,7 @@ yyl_dollar(pTHX_ char *s) || memCHRs("{$:+-@", s[2]))) { PL_tokenbuf[0] = '@'; - s = scan_ident(s + 1, PL_tokenbuf + 1, - sizeof PL_tokenbuf - 1, FALSE); + s = scan_ident(s + 1, PL_tokenbuf + 1, C_ARRAY_END(PL_tokenbuf), 0); S_warn_expect_operator(aTHX_ "Array length", s, POP_OLDBUFPTR); if (!PL_tokenbuf[1]) PREREF(DOLSHARP); @@ -5370,7 +5691,7 @@ yyl_dollar(pTHX_ char *s) } PL_tokenbuf[0] = '$'; - s = scan_ident(s, PL_tokenbuf + 1, sizeof PL_tokenbuf - 1, FALSE); + s = scan_ident(s, PL_tokenbuf + 1, C_ARRAY_END(PL_tokenbuf), 0); S_warn_expect_operator(aTHX_ "Scalar", s, POP_OLDBUFPTR); if (!PL_tokenbuf[1]) { if (s == PL_bufend) @@ -5378,152 +5699,157 @@ yyl_dollar(pTHX_ char *s) PREREF(PERLY_DOLLAR); } + const char tmp = *s; + if (PL_lex_state == LEX_NORMAL || PL_lex_brackets) + s = skipspace(s); + + if ( (PL_expect != XREF || PL_oldoldbufptr == PL_last_lop) + && intuit_more(s, PL_bufend, FROM_DOLLAR, + PL_tokenbuf, strlen(PL_tokenbuf))) { - const char tmp = *s; - if (PL_lex_state == LEX_NORMAL || PL_lex_brackets) - s = skipspace(s); + if (*s == '[') { + PL_tokenbuf[0] = '@'; + if (ckWARN(WARN_SYNTAX)) { + char *t = s+1; - if ( (PL_expect != XREF || PL_oldoldbufptr == PL_last_lop) - && intuit_more(s, PL_bufend)) { - if (*s == '[') { - PL_tokenbuf[0] = '@'; - if (ckWARN(WARN_SYNTAX)) { - char *t = s+1; - - while ( t < PL_bufend ) { - if (isSPACE(*t)) { - do { t += UTF ? UTF8SKIP(t) : 1; } while (t < PL_bufend && isSPACE(*t)); - /* consumed one or more space chars */ - } else if (*t == '$' || *t == '@') { - /* could be more than one '$' like $$ref or @$ref */ - do { t++; } while (t < PL_bufend && *t == '$'); - - /* could be an abigail style identifier like $ foo */ - while (t < PL_bufend && *t == ' ') t++; - - /* strip off the name of the var */ - while (isWORDCHAR_lazy_if_safe(t, PL_bufend, UTF)) - t += UTF ? UTF8SKIP(t) : 1; - /* consumed a varname */ - } else if (isDIGIT(*t)) { - /* deal with hex constants like 0x11 */ - if (t[0] == '0' && t[1] == 'x') { - t += 2; - while (t < PL_bufend && isXDIGIT(*t)) t++; - } else { - /* deal with decimal/octal constants like 1 and 0123 */ + while ( t < PL_bufend ) { + if (isSPACE(*t)) { + do { t++; } while (t < PL_bufend && isSPACE(*t)); + /* consumed one or more space chars */ + } else if (*t == '$' || *t == '@') { + /* could be more than one '$' like $$ref or @$ref */ + do { t++; } while (t < PL_bufend && *t == '$'); + + /* could be an abigail style identifier like $ foo */ + while (t < PL_bufend && *t == ' ') t++; + + /* strip off the name of the var */ + Size_t advance; + while ((advance = (isWORDCHAR_lazy_if_safe(t, + PL_bufend, + UTF)))) + t += advance; + /* consumed a varname */ + } else if (isDIGIT(*t)) { + /* deal with hex constants like 0x11 */ + if (t[0] == '0' && t[1] == 'x') { + t += 2; + while (t < PL_bufend && isXDIGIT(*t)) t++; + } else { + /* deal with decimal/octal constants like 1 and + * 0123 */ + do { t++; } while (isDIGIT(*t)); + if (t 1) { + if (*(d+1) == '\\') { + --len, ++d; + } + else if (isSPACE(*(d+1))) { + warner(packWARN(WARN_QW), + "Possible attempt to escape whitespace in qw() list"); + ++warned_escape; + } + } } } else { @@ -5876,7 +6211,7 @@ yyl_hyphen(pTHX_ char *s) s++; if (memBEGINs(s, (STRLEN) (PL_bufend - s), "=>")) { - s = force_word(PL_bufptr,BAREWORD,FALSE,FALSE); + s = force_word(PL_bufptr, BAREWORD, 0); DEBUG_T( { printbuf("### Saw unary minus before =>, forcing word %s\n", s); } ); OPERATOR(PERLY_MINUS); /* unary minus */ } @@ -5958,7 +6293,7 @@ yyl_hyphen(pTHX_ char *s) TOKEN(ARROW); } if (isIDFIRST_lazy_if_safe(s, PL_bufend, UTF)) { - s = force_word(s,METHCALL0,FALSE,TRUE); + s = force_word(s, METHCALL0, ALLOW_PACKAGE); TOKEN(ARROW); } else if (*s == '$') @@ -5980,7 +6315,7 @@ yyl_hyphen(pTHX_ char *s) } else { if (isSPACE(*s) || !isSPACE(*PL_bufptr)) - check_uni(); + check_unary(); OPERATOR(PERLY_MINUS); /* unary minus */ } } @@ -6009,7 +6344,7 @@ yyl_plus(pTHX_ char *s) } else { if (isSPACE(*s) || !isSPACE(*PL_bufptr)) - check_uni(); + check_unary(); OPERATOR(PERLY_PLUS); } } @@ -6021,7 +6356,7 @@ yyl_star(pTHX_ char *s) POSTDEREF(PERLY_STAR); if (PL_expect != XOPERATOR) { - s = scan_ident(s, PL_tokenbuf, sizeof PL_tokenbuf, TRUE); + s = scan_ident(s, PL_tokenbuf, C_ARRAY_END(PL_tokenbuf), CHECK_UNARY); PL_expect = XOPERATOR; force_ident(PL_tokenbuf, PERLY_STAR); if (!*PL_tokenbuf) @@ -6069,13 +6404,15 @@ yyl_percent(pTHX_ char *s) POSTDEREF(PERLY_PERCENT_SIGN); PL_tokenbuf[0] = '%'; - s = scan_ident(s, PL_tokenbuf + 1, sizeof PL_tokenbuf - 1, FALSE); + s = scan_ident(s, PL_tokenbuf + 1, C_ARRAY_END(PL_tokenbuf), 0); pl_yylval.ival = 0; if (!PL_tokenbuf[1]) { PREREF(PERLY_PERCENT_SIGN); } if ( (PL_expect != XREF || PL_oldoldbufptr == PL_last_lop) - && intuit_more(s, PL_bufend)) { + && intuit_more(s, PL_bufend, FROM_PERCENT, + PL_tokenbuf, strlen(PL_tokenbuf))) + { if (*s == '[') PL_tokenbuf[0] = '@'; } @@ -6149,7 +6486,8 @@ yyl_colon(pTHX_ char *s) I32 tmp; SV *sv; STRLEN len; - char *d = scan_word(s, PL_tokenbuf, sizeof PL_tokenbuf, FALSE, &len); + char *d = scan_word(s, PL_tokenbuf, C_ARRAY_LENGTH(PL_tokenbuf), + FALSE, &len); if (isLOWER(*s) && (tmp = keyword(PL_tokenbuf, len, 0))) { if (tmp < 0) tmp = -tmp; switch (tmp) { @@ -6232,7 +6570,7 @@ yyl_colon(pTHX_ char *s) } if (attrs) { NEXTVAL_NEXTTOKE.opval = attrs; - force_next(THING); + force_next(ATTRLIST); } TOKEN(COLONATTR); } @@ -6328,13 +6666,13 @@ yyl_leftcurly(pTHX_ char *s, const U8 fo } if (d < PL_bufend && isIDFIRST_lazy_if_safe(d, PL_bufend, UTF)) { STRLEN len; - d = scan_word(d, PL_tokenbuf + 1, sizeof PL_tokenbuf - 1, + d = scan_word(d, PL_tokenbuf + 1, C_ARRAY_LENGTH(PL_tokenbuf) - 1, FALSE, &len); while (d < PL_bufend && SPACE_OR_TAB(*d)) d++; if (*d == '}') { const char minus = (PL_tokenbuf[0] == '-'); - s = force_word(s + minus, BAREWORD, FALSE, TRUE); + s = force_word(s + minus, BAREWORD, ALLOW_PACKAGE); if (minus) force_next(PERLY_MINUS); } @@ -6398,6 +6736,7 @@ yyl_leftcurly(pTHX_ char *s, const U8 fo * GSAR 97-07-21 */ t = s; + Size_t advance; if (*s == '\'' || *s == '"' || *s == '`') { /* common case: get past first string, handling escapes */ for (t++; t < PL_bufend && *t != *s;) @@ -6446,20 +6785,24 @@ yyl_leftcurly(pTHX_ char *s, const U8 fo } t++; } - else + else { /* skip plain q word */ while ( t < PL_bufend - && isWORDCHAR_lazy_if_safe(t, PL_bufend, UTF)) + && (advance = isWORDCHAR_lazy_if_safe(t, + PL_bufend, + UTF))) { - t += UTF ? UTF8SKIP(t) : 1; + t += advance; } + } } - else if (isWORDCHAR_lazy_if_safe(t, PL_bufend, UTF)) { - t += UTF ? UTF8SKIP(t) : 1; + else if ((advance = isWORDCHAR_lazy_if_safe(t, PL_bufend, UTF))) { + t += advance; while ( t < PL_bufend - && isWORDCHAR_lazy_if_safe(t, PL_bufend, UTF)) + && (advance = isWORDCHAR_lazy_if_safe(t, PL_bufend, + UTF))) { - t += UTF ? UTF8SKIP(t) : 1; + t += advance; } } while (t < PL_bufend && isSPACE(*t)) @@ -6598,7 +6941,8 @@ yyl_ampersand(pTHX_ char *s) } PL_tokenbuf[0] = '&'; - s = scan_ident(s - 1, PL_tokenbuf + 1, sizeof PL_tokenbuf - 1, TRUE); + s = scan_ident(s - 1, PL_tokenbuf + 1, C_ARRAY_END(PL_tokenbuf), + CHECK_UNARY); pl_yylval.ival = (OPpENTERSUB_AMPER<<8); if (PL_tokenbuf[1]) @@ -6683,7 +7027,7 @@ yyl_snail(pTHX_ char *s) if (PL_expect == XPOSTDEREF) POSTDEREF(PERLY_SNAIL); PL_tokenbuf[0] = '@'; - s = scan_ident(s, PL_tokenbuf + 1, sizeof PL_tokenbuf - 1, FALSE); + s = scan_ident(s, PL_tokenbuf + 1, C_ARRAY_END(PL_tokenbuf), 0); S_warn_expect_operator(aTHX_ "Array", s, POP_OLDBUFPTR); pl_yylval.ival = 0; if (!PL_tokenbuf[1]) { @@ -6692,7 +7036,8 @@ yyl_snail(pTHX_ char *s) if (PL_lex_state == LEX_NORMAL || PL_lex_brackets) s = skipspace(s); if ( (PL_expect != XREF || PL_oldoldbufptr == PL_last_lop) - && intuit_more(s, PL_bufend)) + && intuit_more(s, PL_bufend, FROM_SNAIL, + PL_tokenbuf, strlen(PL_tokenbuf))) { if (*s == '{') PL_tokenbuf[0] = '%'; @@ -6736,7 +7081,7 @@ yyl_slash(pTHX_ char *s) || memNE(PL_last_uni, "study", 5) || isWORDCHAR_lazy_if_safe(PL_last_uni+5, PL_bufend, UTF) )) - check_uni(); + check_unary(); s = scan_pat(s,OP_MATCH); TERM(sublex_start()); } @@ -6827,7 +7172,7 @@ yyl_leftpointy(pTHX_ char *s) if (PL_expect != XOPERATOR) { if (s[1] != '<' && !memchr(s,'>', PL_bufend - s)) - check_uni(); + check_unary(); if (s[1] == '<' && s[2] != '>') s = scan_heredoc(s); else @@ -7038,7 +7383,7 @@ yyl_croak_unrecognised(pTHX_ char *s) while (d > SvPVX(PL_linestr) && d[-1] && d[-1] != '\n') --d; } - len = UTF ? Perl_utf8_length(aTHX_ (U8 *) d, (U8 *) s) : (STRLEN) (s - d); + len = UTF ? utf8_length((U8 *) d, (U8 *) s) : (STRLEN) (s - d); if (len > UNRECOGNIZED_PRECEDE_COUNT) { d = UTF ? (char *) utf8_hop_back((U8 *) s, -UNRECOGNIZED_PRECEDE_COUNT, (U8 *)d) : s - UNRECOGNIZED_PRECEDE_COUNT; } @@ -7059,9 +7404,9 @@ yyl_require(pTHX_ char *s, I32 orig_keyw || (s = force_version(s, TRUE), *s == 'v')) { *PL_tokenbuf = '\0'; - s = force_word(s,BAREWORD,TRUE,TRUE); + s = force_word(s, BAREWORD, CHECK_KEYWORD | ALLOW_PACKAGE); if (isIDFIRST_lazy_if_safe(PL_tokenbuf, - PL_tokenbuf + sizeof(PL_tokenbuf), + C_ARRAY_END(PL_tokenbuf), UTF)) { gv_stashpvn(PL_tokenbuf, strlen(PL_tokenbuf), @@ -7141,7 +7486,8 @@ yyl_foreach(pTHX_ char *s) /* skip optional package name, as in "for my abc $x (..)" */ if (UNLIKELY(isIDFIRST_lazy_if_safe(p, PL_bufend, UTF))) { STRLEN len; - p = scan_word(p, PL_tokenbuf, sizeof PL_tokenbuf, TRUE, &len); + p = scan_word(p, PL_tokenbuf, C_ARRAY_LENGTH(PL_tokenbuf), + TRUE, &len); p = skipspace(p); paren_is_valid = FALSE; } @@ -7170,7 +7516,7 @@ yyl_do(pTHX_ char *s, I32 orig_keyword) char *d; STRLEN len; *PL_tokenbuf = '&'; - d = scan_word(s, PL_tokenbuf + 1, sizeof PL_tokenbuf - 1, + d = scan_word(s, PL_tokenbuf + 1, C_ARRAY_LENGTH(PL_tokenbuf) - 1, 1, &len); if (len && memNEs(PL_tokenbuf+1, len, "CORE") && !keyword(PL_tokenbuf + 1, len, 0)) { @@ -7190,23 +7536,44 @@ yyl_do(pTHX_ char *s, I32 orig_keyword) OPERATOR(KW_DO); } +static const char * +declarator_name(I32 k) +{ + switch (k) { + case KEY_my: return "my"; + case KEY_state: return "state"; + case KEY_our: return "our"; + case KEY_field: return "field"; + case KEY_catch: return "catch"; + default: return "???"; + } +} + static int yyl_my(pTHX_ char *s, I32 my) { + assert(my == KEY_my || my == KEY_state || my == KEY_our); if (PL_in_my) { PL_bufptr = s; - yyerror(form( - "Can't redeclare \"%s\" in \"%s\"", - my == KEY_my ? "my" : - my == KEY_state ? "state" : "our", - PL_in_my == KEY_my ? "my" : - PL_in_my == KEY_state ? "state" : "our")); + if (PL_in_my == KEY_catch) { + yyerror(form( + "Can't redeclare catch variable as \"%s\"", + declarator_name(my) + )); + } else { + assert(PL_in_my == KEY_my || PL_in_my == KEY_state || PL_in_my == KEY_our); + yyerror(form( + "Can't redeclare \"%s\" in \"%s\"", + declarator_name(my), + declarator_name(PL_in_my) + )); + } } PL_in_my = (U16)my; s = skipspace(s); if (isIDFIRST_lazy_if_safe(s, PL_bufend, UTF)) { STRLEN len; - s = scan_word(s, PL_tokenbuf, sizeof PL_tokenbuf, TRUE, &len); + s = scan_word(s, PL_tokenbuf, C_ARRAY_LENGTH(PL_tokenbuf), TRUE, &len); if (memEQs(PL_tokenbuf, len, "sub")) /* my sub ... */ return yyl_sub(aTHX_ s, my); @@ -7218,8 +7585,9 @@ yyl_my(pTHX_ char *s, I32 my) char tmpbuf[1024]; int i; PL_bufptr = s; - i = my_snprintf(tmpbuf, sizeof(tmpbuf), "No such class %.1000s", PL_tokenbuf); - PERL_MY_SNPRINTF_POST_GUARD(i, sizeof(tmpbuf)); + i = my_snprintf(tmpbuf, C_ARRAY_LENGTH(tmpbuf), + "No such class %.1000s", PL_tokenbuf); + PERL_MY_SNPRINTF_POST_GUARD(i, C_ARRAY_LENGTH(tmpbuf)); yyerror_pv(tmpbuf, UTF ? SVf_UTF8 : 0); } } @@ -7354,8 +7722,8 @@ yyl_fake_eof(pTHX_ U32 fake_eof, bool bo #ifdef ALTERNATE_SHEBANG else { static char const as[] = ALTERNATE_SHEBANG; - if (*s == as[0] && strnEQ(s, as, sizeof(as) - 1)) - d = s + (sizeof(as) - 1); + if (*s == as[0] && strnEQ(s, as, C_ARRAY_LENGTH(as) - 1)) + d = s + (C_ARRAY_LENGTH(as) - 1); } #endif /* ALTERNATE_SHEBANG */ } @@ -7680,7 +8048,7 @@ yyl_just_a_word(pTHX_ char *s, STRLEN le if ((*s == '\'' && FEATURE_APOS_AS_NAME_SEP_IS_ENABLED) || (*s == ':' && s[1] == ':')) { STRLEN morelen; - s = scan_word(s, PL_tokenbuf + len, sizeof PL_tokenbuf - len, + s = scan_word(s, PL_tokenbuf + len, C_ARRAY_LENGTH(PL_tokenbuf) - len, TRUE, &morelen); if (no_op_error) { S_warn_expect_operator(aTHX_ "Bareword",s,FALSE); @@ -7915,7 +8283,7 @@ yyl_word_or_keyword(pTHX_ char *s, STRLE case KEY___LINE__: FUN0OP(newSVOP(OP_CONST, OPpCONST_TOKEN_LINE<<8, - Perl_newSVpvf(aTHX_ "%" LINE_Tf, CopLINE(PL_curcop)))); + newSVpvf("%" LINE_Tf, CopLINE(PL_curcop)))); case KEY___PACKAGE__: FUN0OP(newSVOP(OP_CONST, OPpCONST_TOKEN_PACKAGE<<8, @@ -8008,7 +8376,7 @@ yyl_word_or_keyword(pTHX_ char *s, STRLE case KEY_class: ck_warner_d(packWARN(WARN_EXPERIMENTAL__CLASS), "class is experimental"); - s = force_word(s,BAREWORD,FALSE,TRUE); + s = force_word(s, BAREWORD, ALLOW_PACKAGE); s = skipspace(s); s = force_strict_version(s); PL_expect = XATTRBLOCK; @@ -8432,7 +8800,8 @@ yyl_word_or_keyword(pTHX_ char *s, STRLE s = skipspace(s); if (isIDFIRST_lazy_if_safe(s, PL_bufend, UTF)) { const char *t; - char *d = scan_word(s, PL_tokenbuf, sizeof PL_tokenbuf, FALSE, &len); + char *d = scan_word(s, PL_tokenbuf, C_ARRAY_LENGTH(PL_tokenbuf), + FALSE, &len); for (t=d; isSPACE(*t);) t++; if ( *t && memCHRs("|&*+-=!?:.", *t) && ckWARN_d(WARN_PRECEDENCE) @@ -8487,7 +8856,7 @@ yyl_word_or_keyword(pTHX_ char *s, STRLE LOP(OP_PACK,XTERM); case KEY_package: - s = force_word(s,BAREWORD,FALSE,TRUE); + s = force_word(s, BAREWORD, ALLOW_PACKAGE); s = skipspace(s); s = force_strict_version(s); PREBLOCK(KW_PACKAGE); @@ -8670,7 +9039,7 @@ yyl_word_or_keyword(pTHX_ char *s, STRLE checkcomma(s,PL_tokenbuf,"subroutine name"); s = skipspace(s); PL_expect = XTERM; - s = force_word(s,BAREWORD,TRUE,TRUE); + s = force_word(s, BAREWORD, CHECK_KEYWORD | ALLOW_PACKAGE); LOP(OP_SORT,XREF); case KEY_split: @@ -8846,7 +9215,7 @@ yyl_word_or_keyword(pTHX_ char *s, STRLE } Mop(OP_REPEAT); } - check_uni(); + check_unary(); return yyl_just_a_word(aTHX_ s, len, orig_keyword, c); case KEY_xor: @@ -8865,7 +9234,7 @@ yyl_key_core(pTHX_ char *s, STRLEN len, STRLEN olen = len; char *d = s; s += 2; - s = scan_word(s, PL_tokenbuf, sizeof PL_tokenbuf, FALSE, &len); + s = scan_word(s, PL_tokenbuf, C_ARRAY_LENGTH(PL_tokenbuf), FALSE, &len); if ((*s == ':' && s[1] == ':') || (!(key = keyword(PL_tokenbuf, len, 1)) && *s == '\'' && FEATURE_APOS_AS_NAME_SEP_IS_ENABLED)) @@ -8945,7 +9314,7 @@ yyl_keylookup(pTHX_ char *s, GV *gv) c.gv = gv; PL_bufptr = s; - s = scan_word(s, PL_tokenbuf, sizeof PL_tokenbuf, FALSE, &len); + s = scan_word(s, PL_tokenbuf, C_ARRAY_LENGTH(PL_tokenbuf), FALSE, &len); /* Some keywords can be followed by any delimiter, including ':' */ anydelim = word_takes_any_delimiter(PL_tokenbuf, len); @@ -9029,7 +9398,7 @@ yyl_keylookup(pTHX_ char *s, GV *gv) /* Check for lexical sub */ if (PL_expect != XOPERATOR) { - char tmpbuf[sizeof PL_tokenbuf + 1]; + char tmpbuf[C_ARRAY_LENGTH(PL_tokenbuf) + 1]; *tmpbuf = '&'; Copy(PL_tokenbuf, tmpbuf+1, len, char); c.off = pad_findmy_pvn(tmpbuf, len+1, 0); @@ -9102,7 +9471,7 @@ yyl_try(pTHX_ char *s) STRLEN len; /* Copy the longest sequence of isPLUGINFIX() chars into PL_tokenbuf */ - while(s_end < PL_bufend && d < PL_tokenbuf+sizeof(PL_tokenbuf)-1 && isPLUGINFIX(*s_end)) + while(s_end < PL_bufend && d < C_ARRAY_END(PL_tokenbuf)-1 && isPLUGINFIX(*s_end)) *d++ = *s_end++; *d = '\0'; @@ -9511,7 +9880,7 @@ yyl_try(pTHX_ char *s) case 'v': if (isDIGIT(s[1]) && PL_expect != XOPERATOR) { char *start = s + 2; - while (isDIGIT(*start) || *start == '_') + while (isDIGIT_or_UNDERSCORE(*start)) start++; if (*start == '.' && isDIGIT(start[1])) { s = scan_num(s, &pl_yylval); @@ -9638,6 +10007,8 @@ yyl_try(pTHX_ char *s) int Perl_yylex(pTHX) { + PERL_ARGS_ASSERT_YYLEX; + char *s = PL_bufptr; if (UNLIKELY(PL_parser->recheck_charset_validity)) { @@ -9755,7 +10126,8 @@ Perl_yylex(pTHX) return yylex(); case LEX_INTERPENDMAYBE: - if (intuit_more(PL_bufptr, PL_bufend)) { + if (intuit_more(PL_bufptr, PL_bufend, FROM_INTERDEPENDMAYBE, NULL, 0)) + { PL_lex_state = LEX_INTERPNORMAL; /* false alarm, more expr */ break; } @@ -9886,29 +10258,28 @@ Perl_yylex(pTHX) return yyl_sigvar(aTHX_ s); } - { - /* yyl_try() and its callees might consult PL_parser->saw_infix_sigil. - On its return, we then need to set it to indicate whether the token - we just encountered was an infix operator that (if we hadn't been - expecting an operator) have been a sigil. - */ - bool expected_operator = (PL_expect == XOPERATOR); - int ret = yyl_try(aTHX_ s); - switch (pl_yylval.ival) { - case OP_BIT_AND: - case OP_MODULO: - case OP_MULTIPLY: - case OP_NBIT_AND: - if (expected_operator) { - PL_parser->saw_infix_sigil = 1; - break; - } - /* FALLTHROUGH */ - default: - PL_parser->saw_infix_sigil = 0; + /* yyl_try() and its callees might consult PL_parser->saw_infix_sigil. + On its return, we then need to set it to indicate whether the token we + just encountered was an infix operator that (if we hadn't been expecting + an operator) have been a sigil. + */ + bool expected_operator = (PL_expect == XOPERATOR); + int ret = yyl_try(aTHX_ s); + switch (pl_yylval.ival) { + case OP_BIT_AND: + case OP_MODULO: + case OP_MULTIPLY: + case OP_NBIT_AND: + if (expected_operator) { + PL_parser->saw_infix_sigil = 1; + break; } - return ret; + /* FALLTHROUGH */ + default: + PL_parser->saw_infix_sigil = 0; } + + return ret; } @@ -9938,6 +10309,8 @@ Perl_yylex(pTHX) static int S_pending_ident(pTHX) { + PERL_ARGS_ASSERT_PENDING_IDENT; + PADOFFSET tmp = 0; const char pit = (char)pl_yylval.ival; const STRLEN tokenbuf_len = strlen(PL_tokenbuf); @@ -9980,25 +10353,7 @@ S_pending_ident(pTHX) GCC_DIAG_RESTORE_STMT; } - if (PL_in_my == KEY_sigvar) { - /* A signature 'padop' needs in addition, an op_first to - * point to a child sigdefelem, and an extra field to hold - * the signature index. We can achieve both by using an - * UNOP_AUX and (ab)using the op_aux field to hold the - * index. If we ever need more fields, use a real malloced - * aux strut instead. - */ - assert(PL_parser->signature); - /* We don't yet know the argindex but subsignature_append_*() - * will fill it in - */ - o = newUNOP_AUX(OP_ARGELEM, 0, NULL, NULL); - o->op_private |= ( PL_tokenbuf[0] == '$' ? OPpARGELEM_SV - : PL_tokenbuf[0] == '@' ? OPpARGELEM_AV - : OPpARGELEM_HV); - } - else - o = newOP(OP_PADANY, 0); + o = newOP(OP_PADANY, 0); o->op_targ = allocmy(PL_tokenbuf, tokenbuf_len, UTF ? SVf_UTF8 : 0); if (PL_in_my == KEY_sigvar) @@ -10082,7 +10437,7 @@ S_pending_ident(pTHX) return BAREWORD; } -STATIC void +static void S_checkcomma(pTHX_ const char *s, const char *name, const char *what) { PERL_ARGS_ASSERT_CHECKCOMMA; @@ -10114,11 +10469,10 @@ S_checkcomma(pTHX_ const char *s, const s++; while (s < PL_bufend && isSPACE(*s)) s++; - if (isIDFIRST_lazy_if_safe(s, PL_bufend, UTF)) { + + if ((isIDFIRST_lazy_if_safe(s, PL_bufend, UTF))) { const char * const w = s; - s += UTF ? UTF8SKIP(s) : 1; - while (isWORDCHAR_lazy_if_safe(s, PL_bufend, UTF)) - s += UTF ? UTF8SKIP(s) : 1; + s = parse_ident_no_copy(s, PL_bufend, cBOOL(UTF), NULL, IDFIRST_ONLY); while (s < PL_bufend && isSPACE(*s)) s++; if (*s == ',') { @@ -10153,11 +10507,13 @@ S_checkcomma(pTHX_ const char *s, const If error_msg is not NULL, *error_msg will be set to any error encountered. Otherwise yyerror() will be used to output it */ -STATIC SV * +static SV * S_new_constant(pTHX_ const char *s, STRLEN len, const char *key, STRLEN keylen, SV *sv, SV *pv, const char *type, STRLEN typelen, const char ** error_msg) { + PERL_ARGS_ASSERT_NEW_CONSTANT; + dSP; HV * table = GvHV(PL_hintgv); /* ^H */ SV *res; @@ -10168,7 +10524,6 @@ S_new_constant(pTHX_ const char *s, STRL const char * optional_colon = ":"; /* Only some messages have a colon */ char *msg; - PERL_ARGS_ASSERT_NEW_CONSTANT; /* We assume that this is true: */ assert(type || s); @@ -10261,58 +10616,303 @@ S_new_constant(pTHX_ const char *s, STRL return SvREFCNT_inc_simple_NN(sv); } -PERL_STATIC_INLINE void -S_parse_ident(pTHX_ char **s, char **d, char * const e, int allow_package, - bool is_utf8, bool check_dollar) +static char * +S_parse_ident(pTHX_ const char *s, const char * const s_end, + char **d, char * const e, + bool is_utf8, HV** failure_details, U32 flags) { PERL_ARGS_ASSERT_PARSE_IDENT; - while (*s < PL_bufend) { - if (*d >= e) - croak("%s", ident_too_long); - if (is_utf8 && isIDFIRST_utf8_safe(*s, PL_bufend)) { - /* The UTF-8 case must come first, otherwise things - * like c\N{COMBINING TILDE} would start failing, as the - * isWORDCHAR_A case below would gobble the 'c' up. - */ + /* This function parses the string pointed to by '*s' (whose upper bound + * is 's_end') looking for an identifier. It stops at the first character + * that isn't in one of the types of identifiers looked for, which are: + * + * 1) A normal identifier whose first character matches IDFIRST followed + * by any number of characters which match IDCONT. + * 2) An identifier that begins with an ASCII digit followed by any number + * of ASCII \w characters. As a special case of this, it can + * optionally stop parsing at the first non-digit, returning just the + * initial digits. */ + bool stop_at_first_non_digit = flags & STOP_AT_FIRST_NON_DIGIT; + + /* This type of identifier can be completely prohibited, so that + * anything that doesn't match type 1) is not considered to be an + * identifier. */ + const bool idfirst_only = flags & IDFIRST_ONLY; + assert((stop_at_first_non_digit && idfirst_only) == 0); + + /* The function copies the identifier into the destination starting at *d + * (whose upper bound is 'e') and advances *d to point to just beyond the + * end of the identifier, setting **d to a NUL character. The reason it + * needs to copy is that it may convert apostrophe package separators into + * double colons. + * + * Upon success, it returns the position in s just beyond where the + * identifier ends in the input. If no identifier was found, the return + * will be the the input 's' unchanged. + * + * If the identifier is empty (s_end == s), *d is set to the NUL + * character; otherwise if the identifier is illegal, the function croaks + * unless this flag is passed in: */ + const bool check_only = flags & CHECK_ONLY; + + /* In this case NULL is returned instead of croaking, and the contents + * of '*d' are undefined. + * + * The possible reasons for failure are: + * 1) There is not enough room for the entire source identifier to be + * copied + * 2) 'stop_at_first_non_digit' is in effect and the identifier name has + * leading zeros + * 3) The identifier contains a character that is illegal in names. + * (These are rare, fewer than 200 in all of Unicode.) + * + * When 'allow_package' is non-zero, the function parses a full package + * variable path. Each iteration of the loop below picks up one segment + * of the path. If the apostrophe is allowed as a package separator, it + * is converted to "::", so later code doesn't have to concern itself with + * this possibility. */ + const bool allow_package = flags & ALLOW_PACKAGE; + + /* 'check_dollar' is used to look for and stop parsing before the dollar + * in things like Foo::$bar */ + const bool check_dollar = flags & CHECK_DOLLAR; + + /* There is a use case for calling this function in the middle of having + * parsed a portion of an identifier. Therefore it should be able to + * accept the first character being an IDCont, and not necessarily an + * IDFIRST. The 'IDCONT_first_OK' flag is used to indicate this */ + + /* When a normally fatal error occurs, and the 'failure_details' parameter + * is set, the function, instead of dieing, returns what would be the + * croak message and the position in the source string where it was + * encountered. This variable holds the message text internally. */ + const char * error; + + /* This causes the CHECK_ONLY flag to also be set. */ + if (failure_details) { + flags |= CHECK_ONLY; + } + + /* However, the error position this function knows about is in the + * destination, normalized, string and a caller looking to mark where an + * error occurred, will want to use the source to report it. This variable + * is changed whenever a length change occurs, so that upon return, we can + * convert to the source position. */ + SSize_t position_offset = 0; + const char * const s0 = s; /* First byte, for any error message */ + const char * d0 = *d; + + while (s < s_end) { + + /* For non-UTF8, variables that match ASCII \w are a superset of + * variables that start with IDFIRST, so we have to look at the + * Unicode definition only when UTF-8 is in effect. We have to check + * for the subset before checking for the superset. */ + Size_t advance; + if ( (is_utf8 || idfirst_only) + && (advance = (flags & IDCONT_first_OK) + ? isIDCONT_lazy_if_safe((U8 *) s, (U8 *) s_end, + is_utf8) + : isIDFIRST_lazy_if_safe(s, s_end, is_utf8))) + { + const char *this_start = s; + s += advance; + + /* Find the end of the identifier by accumulating characters until + * find a non-identifier character */ + while (s < s_end) { + + /* Fail if the character is one of those few that look like + * they could be in a name, but are forbidden because of + * Section 5 of Unicode UAX #31 "Unicode Identifiers and + * Syntax". */ + advance = is_WORD_BUT_NONCONT_safe(s, s_end, is_utf8); + if (advance) { + UV cp = valid_utf8_to_uv((U8 *) s, NULL); + const char *error_pos = s + advance; + + /* Display the whole name */ + do { + s += advance; + } + while ((advance = isWORDCHAR_lazy_if_safe(s, s_end, + is_utf8))); + error = form("\\x{%04" UVXf "} is a \\w char that isn't" + " valid in a name; marked by <-- HERE" + " after %" UTF8f "<-- HERE %" UTF8f, + cp, + UTF8fARG(is_utf8, error_pos - s0, s0), + UTF8fARG(is_utf8, s - error_pos, error_pos)); + goto found_error; + } + else { + advance = isIDCONT_lazy_if_safe((const U8*) s, + (const U8*) s_end, + is_utf8); + if (advance == 0) { /* Not an identifier character */ + break; + } + } + + s += advance; + } + + /* Here we have found the end of the identifier */ + Size_t this_length = s - this_start; + + if (*d + this_length >= e) { + goto too_long; + } + + /* And copy the whole thing in one operation */ + Copy(this_start, *d, this_length, char); + *d += this_length; + } + else if (stop_at_first_non_digit && isDIGIT_A(*s)) { + bool is_zero = *s == '0'; + char *digit_start= *d; + + /* Stop at the first non-digit */ + do { + *(*d)++ = *s++; + + if (*d >= e) { + goto too_long; + } + } while (isDIGIT_A(*s)); + + /* Leading zeros are not permitted */ + if (is_zero && *d - digit_start > 1) { + error = ident_var_zero_multi_digit; + goto found_error; + } - char *t = *s + UTF8SKIP(*s); - while (isIDCONT_utf8_safe((const U8*) t, (const U8*) PL_bufend)) { - t += UTF8SKIP(t); - } - if (*d + (t - *s) > e) - croak("%s", ident_too_long); - Copy(*s, *d, t - *s, char); - *d += t - *s; - *s = t; + /* This option only applies to the first component in a + * multi-component package variable name. So quit the loop before + * trying to find a package separator */ + break; } - else if ( isWORDCHAR_A(**s) ) { + else if (! idfirst_only && isWORDCHAR_A(*s) ) { + + /* This is the superset; it accepts \w+, including an initial + * digit */ do { - *(*d)++ = *(*s)++; - } while (isWORDCHAR_A(**s) && *d < e); + *(*d)++ = *s++; + + if (*d >= e) { + goto too_long; + } + } while (isWORDCHAR_A(*s)); } else if ( allow_package - && **s == '\'' - && FEATURE_APOS_AS_NAME_SEP_IS_ENABLED - && isIDFIRST_lazy_if_safe((*s)+1, PL_bufend, is_utf8)) + && ( ( *s == '\'' + && FEATURE_APOS_AS_NAME_SEP_IS_ENABLED + && isIDFIRST_lazy_if_safe(s+1, s_end, is_utf8)) + /* Below we convert the apostrophe to "::" */ + || ( *s == ':' && s[1] == ':' + /* Disallow things like Foo::$bar. For the + * curious, this is the code path that triggers + * the "Bad name after" warning when looking for + * barewords. */ + && !(check_dollar && s[2] == '$')))) { + if (*d >= e - 2) { + goto too_long; + } + *(*d)++ = ':'; *(*d)++ = ':'; - (*s)++; - } - else if (allow_package && **s == ':' && (*s)[1] == ':' - /* Disallow things like Foo::$bar. For the curious, this is - * the code path that triggers the "Bad name after" warning - * when looking for barewords. - */ - && !(check_dollar && (*s)[2] == '$')) { - *(*d)++ = *(*s)++; - *(*d)++ = *(*s)++; + s += (*s == ':') ? 2 : 1; + + /* This option only applies to the first component in a + * multi-component package variable name. For example, in + * "SWISH::3::", the '3' is not the first component, and so the + * option needs to be turned off before the next loop iteration + * parses it. */ + stop_at_first_non_digit = false; } - else + else /* None of the above means have come to the end of any + identifier*/ break; } - return; + + **d = '\0'; + + /* Cast away const, because many of our callers don't have it; this + * function declares it as const so as to indicate that it doesn't change + * it, and that it can be called using a const parameter */ + return (char *) s; + + too_long: + error = ident_too_long; + /* FALLTHROUGH */ + + found_error: + if (failure_details) { + + SV * msg_sv = newSVpv(error, 0); + SV * position_sv = newSVuv(*d - d0 - position_offset); + HV * details = (HV *) newSV_type_mortal(SVt_PVHV); + + (void) hv_stores(details, PARSE_IDENT_ERROR_TEXT, msg_sv); + (void) hv_stores(details, PARSE_IDENT_ERROR_POSITION, position_sv); + + *failure_details = details; + } + + if (check_only) { + return NULL; + } + + croak("%" UTF8f, UTF8fARG(is_utf8, strlen(error), error)); +} + +PERL_STATIC_INLINE char * +S_parse_ident_no_copy(pTHX_ const char *s, const char * const s_end, + bool is_utf8, HV ** failure_details, U32 flags) +{ + PERL_ARGS_ASSERT_PARSE_IDENT_NO_COPY; + + /* This just wraps parse_ident for functions that call it and don't need + * the actual identifier string returned. For example, they might just + * want to test if the input is valid. */ + + char scratch[ PERL_IDENTIFIER_LENGTH ]; + char * dest = scratch; + + return parse_ident(s, s_end, &dest, C_ARRAY_END(scratch), is_utf8, + failure_details, flags); +} + +/* +=for apidoc parse_ident_msg + +Parse the string pointed to by '*s' (whose upper bound is 's_end') looking for +a normal identifier whose first character matches \p{XID_Start} followed by any +number of characters which match \p{XID_Continue}. + +It returns a pointer to the first character in 's' beyond the next such +identifier, or NULL if a serious error was found in the parsed string. +Currently the only such serious error is that the identifier is too long for +the perl interpreter to handle (the maximum is guaranteed to be at least 255 +characters). + +If 'error_detail' is not NULL, when a serious error is found, it creates a +mortal hash containing details of the error, as follows: + +=cut +*/ + +char * +Perl_parse_ident_msg(pTHX_ const char *s, const char *end, + bool is_utf8, HV ** error_detail, U32 flags) +{ + PERL_ARGS_ASSERT_PARSE_IDENT_MSG; + assert(flags == 0); /* Reserved for future use */ + + return parse_ident_no_copy(s, end, is_utf8, error_detail, + (IDFIRST_ONLY | flags)); } char * @@ -10324,60 +10924,77 @@ Perl_scan_word(pTHX_ char *s, char *dest char * const e = d + destlen - 3; /* two-character token, ending NUL */ bool is_utf8 = cBOOL(UTF); - parse_ident(&s, &d, e, allow_package, is_utf8, TRUE); - *d = '\0'; + s = parse_ident(s, PL_bufend, &d, e, is_utf8, NULL, + (CHECK_DOLLAR | ((allow_package) ? ALLOW_PACKAGE : 0))); *slp = d - dest; return s; } -/* scan s and extract an identifier ($var) from it if possible - * into dest. - * XXX: This function has subtle implications on parsing, and - * changing how it behaves can cause a variable to change from - * being a run time rv2sv call or a compile time binding to a - * specific variable name. +/* scan 's' and extract an identifier ($var) from it into 'dest' if possible. + * + * Unlike S_parse_ident which looks for the more usual types of identifiers + * (and which this calls if needed), this looks for every possible identifier + * type, such as punctuation ones. + * + * It returns a pointer into the input buffer pointing to just after all the + * bytes this function consumed; or croaks if an invalid identifier is found. + * + * XXX: This function normally has subtle implications on parsing, and + * changing how it behaves can cause a variable to change from being a run + * time rv2sv call or a compile time binding to a specific variable name. + * + * However, it can be called with the CHECK_ONLY flag which keeps it from + * making any changes besides populating the memory 'dest' points to. If the + * identifier is illegal, it returns NULL instead of croaking. + * + * And use the CHECK_UNARY flag to cause this to look for ambiguities with + * unary operators. This is silently overriden if CHECK_ONLY is also + * specified. */ -STATIC char * -S_scan_ident(pTHX_ char *s, char *dest, STRLEN destlen, I32 ck_uni) +static char * +S_scan_ident(pTHX_ char *s, char *dest, char *dest_end, U32 flags) { + PERL_ARGS_ASSERT_SCAN_IDENT; + I32 herelines = PL_parser->herelines; - SSize_t bracket = -1; + +#define NO_BRACE -1 + SSize_t bracket = NO_BRACE; + char funny = *s++; char *d = dest; - char * const e = d + destlen - 3; /* two-character token, ending NUL */ + char * const e = dest_end - 3; /* two-character token, ending NUL */ bool is_utf8 = cBOOL(UTF); line_t orig_copline = 0, tmp_copline = 0; - PERL_ARGS_ASSERT_SCAN_IDENT; + /* Leave the flag in its position, so can pass this on without needing to + * anything extra */ + const U32 check_only = flags & CHECK_ONLY; + + const bool chk_unary = ! check_only && (flags & CHECK_UNARY); if (isSPACE(*s) || !*s) s = skipspace(s); - if (isDIGIT(*s)) { /* handle $0 and $1 $2 and $10 and etc */ - bool is_zero= *s == '0' ? TRUE : FALSE; - char *digit_start= d; - *d++ = *s++; - while (s < PL_bufend && isDIGIT(*s)) { - if (d >= e) - croak("%s", ident_too_long); - *d++ = *s++; - } - if (is_zero && d - digit_start > 1) - croak(ident_var_zero_multi_digit); - } - else { /* See if it is a "normal" identifier */ - parse_ident(&s, &d, e, 1, is_utf8, FALSE); + + /* See if it is a "normal" identifier */ + s = parse_ident(s, PL_bufend, &d, e, is_utf8, NULL, + (ALLOW_PACKAGE | STOP_AT_FIRST_NON_DIGIT | check_only)); + if (s == NULL) { + return NULL; } - *d = '\0'; + d = dest; if (*d) { - /* Either a digit variable, or parse_ident() found an identifier + + /* Here parse_ident() found a digit variable or an identifier (anything valid as a bareword), so job done and return. */ - if (PL_lex_state != LEX_NORMAL) + if (! check_only && PL_lex_state != LEX_NORMAL) PL_lex_state = LEX_INTERPENDMAYBE; return s; } - /* Here, it is not a run-of-the-mill identifier name */ + /* Here, it is not a run-of-the-mill identifier name; maybe not an + * identifier at all. Note *d is a NUL */ if (*s == '$' && s[1] && ( isIDFIRST_lazy_if_safe(s+1, PL_bufend, is_utf8) @@ -10391,9 +11008,13 @@ S_scan_ident(pTHX_ char *s, char *dest, Using ' as a leading package separator isn't allowed. :: is. */ return s; } - /* Handle the opening { of @{...}, &{...}, *{...}, %{...}, ${...} */ + + /* Handle the opening { of @{...}, &{...}, *{...}, %{...}, ${...} + * Skip to the first non-space past the brace */ if (*s == '{') { + /* 'bracket' becomes the offset from the beginning of this chunk */ bracket = s - SvPVX(PL_linestr); + s++; orig_copline = CopLINE(PL_curcop); if (s < PL_bufend && isSPACE(*s)) { @@ -10401,113 +11022,147 @@ S_scan_ident(pTHX_ char *s, char *dest, } } - - /* Extract the first character of the variable name from 's' and - * copy it, null terminated into 'd'. Note that this does not - * involve checking for just IDFIRST characters, as it allows the - * '^' for ${^FOO} type variable names, and it allows all the - * characters that are legal in a single character variable name. + /* Here, 's' points to the next "interesting" character. + * Extract the first character of the potential variable name from 's' and + * copy it, NUL terminated, into 'd'. Note that this does not involve + * checking for just IDFIRST characters, as it allows the '^' for ${^FOO} + * type variable names, and it allows all the characters that are legal in + * a single character variable name. * * The legal ones are any of: * a) all ASCII characters except: * 1) control and space-type ones, like NUL, SOH, \t, and SPACE; * 2) '{' * The final case currently doesn't get this far in the program, so we - * don't test for it. If that were to change, it would be ok to allow it. + * don't test for it. If that were to change, it would be ok to allow + * it. * b) When not under Unicode rules, any upper Latin1 character * c) Otherwise, when unicode rules are used, all XIDS characters. * - * Because all ASCII characters have the same representation whether - * encoded in UTF-8 or not, we can use the foo_A macros below and '\0' and - * '{' without knowing if is UTF-8 or not. */ - - if ((s <= PL_bufend - ((is_utf8) - ? UTF8SKIP(s) - : 1)) - && ( - isGRAPH_A(*s) - || - ( is_utf8 - ? isIDFIRST_utf8_safe(s, PL_bufend) - : (isGRAPH_L1(*s) - && LIKELY((U8) *s != LATIN1_TO_NATIVE(0xAD)) - ) - ) - ) - ){ - if (is_utf8) { - const STRLEN skip = UTF8SKIP(s); - STRLEN i; - d[skip] = '\0'; - for ( i = 0; i < skip; i++ ) - d[i] = *s++; - } - else { - *d = *s++; - d[1] = '\0'; - } + * Because all ASCII characters have the same representation whether + * encoded in UTF-8 or not, we can use the foo_A macros below and '\0' and + * '{' without knowing if is UTF-8 or not. */ + STRLEN advance = 1; + if ( s < PL_bufend + && ( isGRAPH_A(*s) + || (is_utf8 ? (advance = isIDFIRST_utf8_safe(s, PL_bufend)) + : (isGRAPH_L1(*s) && LIKELY((U8) *s != SHY_NATIVE))))) + { + STRLEN i; + d[advance] = '\0'; + for ( i = 0; i < advance; i++ ) + d[i] = *s++; } - /* special case to handle ${10}, ${11} the same way we handle ${1} etc */ + /* 'd' has not been advanced, but if 's' pointed to a legal identifier + * character, it has been advanced to the next character, and the + * character it previously pointed to has been copied to where 'd' + * continues to point to. + * + * If that copied character is a digit, it means we have something like + * ${10}, ${1547}, etc. Handle those the same way we handle $1, etc */ if (isDIGIT(*d)) { - bool is_zero= *d == '0' ? TRUE : FALSE; - char *digit_start= d; - while (s < PL_bufend && isDIGIT(*s)) { - d++; - if (d >= e) - croak("%s", ident_too_long); - *d= *s++; + assert(bracket != NO_BRACE); + s = parse_ident(s - 1, PL_bufend, &d, e, is_utf8, NULL, + STOP_AT_FIRST_NON_DIGIT | check_only); + if (s == NULL) { + return NULL; } - if (is_zero && d - digit_start >= 1) /* d points at the last digit */ - croak(ident_var_zero_multi_digit); - d[1] = '\0'; - } - /* Convert $^F, ${^F} and the ^F of ${^FOO} to control characters */ - else if (*d == '^' && *s && isCONTROLVAR(*s)) { + /* The code below is expecting d to point to the final digit */ + d--; + } + else /* Convert $^F, ${^F} and the ^F of ${^FOO} to control characters */ + if (*d == '^' && *s && isCONTROLVAR(*s)) { *d = toCTRL(*s); s++; } - /* Warn about ambiguous code after unary operators if {...} notation isn't - used. There's no difference in ambiguity; it's merely a heuristic - about when not to warn. */ - else if (ck_uni && bracket == -1) - check_uni(); + else /* Warn about ambiguous code after unary operators if {...} notation + isn't used. There's no difference in ambiguity; it's merely a + heuristic about when not to warn. */ + if (chk_unary && bracket == -1) { + check_unary(); + } + + /* Here, 's' points to the next "interesting" character to be parsed. And + * *d points to the first byte of the final so-far parsed and copied + * character. This is one of four things: + * 1) The only byte of the final character of an all-digit numeric + * variable inside braces. e.g. if the input is ${ 123 }, '123' has + * been copied to 'dest', and 'd' points to the '3'. We don't know + * yet if there is a closing brace. + * 2) A control character + * 3) The first (or only) byte of some other identifier + * 4) *d is NUL for anything else. + */ - if (bracket != -1) { - bool skip; - char *s2; - /* If we were processing {...} notation then... */ - if (isIDFIRST_lazy_if_safe(d, e, is_utf8) - || (!isPRINT(*d) /* isCNTRL(d), plus all non-ASCII */ - && isWORDCHAR(*s)) - ) { - /* note we have to check for a normal identifier first, - * as it handles utf8 symbols, and only after that has - * been ruled out can we look at the caret words */ - if (isIDFIRST_lazy_if_safe(d, e, is_utf8) ) { - /* if it starts as a valid identifier, assume that it is one. - (the later check for } being at the expected point will trap - cases where this doesn't pan out.) */ - d += is_utf8 ? UTF8SKIP(d) : 1; - parse_ident(&s, &d, e, 1, is_utf8, TRUE); - *d = '\0'; + if (bracket == NO_BRACE) { + if ( ! check_only + && PL_lex_state == LEX_INTERPNORMAL + && ! PL_lex_brackets + && ! intuit_more(s, PL_bufend, FROM_IDENT, NULL, 0)) + PL_lex_state = LEX_INTERPEND; + } + else { /* Found a '{' */ + + /* Handle the interior of braces. First look to see if the character + * pointed to by 'd' is legal as the start of an identifier. */ + Size_t advance = isIDFIRST_lazy_if_safe(d, e, is_utf8); + + /* If it isn't a normal identifier, it could be a control-character + * one. Those have to be followed by a \w character. */ + if (advance || ( ! isPRINT(*d) /* isCNTRL(d), plus all non-ASCII */ + && isWORDCHAR(*s))) + { + /* Prefer a normal identifier, as UTF-8 strings could erroneously + * be conflated with a control character identifier. */ + if (advance) { + + /* Now parse the normal identifier. But note, we already have + * parsed and copied the first character of it. That means we + * are jumping into the middle; so tell that to parse_ident. + * */ + d += advance; + s = parse_ident(s, PL_bufend, &d, e, is_utf8, NULL, + ( ALLOW_PACKAGE + | CHECK_DOLLAR + | IDCONT_first_OK + | check_only)); } else { /* caret word: ${^Foo} ${^CAPTURE[0]} */ + + /* Now parse the control character identifier. Again, we have + * already copied the first character. This routine is + * sufficiently chummy with parse_ident to know that when we + * say the string isn't UTF-8, it will do the right thing in + * looking only for ASCII \w characters as identifier + * continuations */ d++; - while (isWORDCHAR(*s) && d < e) { - *d++ = *s++; - } - if (d >= e) - croak("%s", ident_too_long); - *d = '\0'; + s = parse_ident(s, PL_bufend, &d, e, + false, /* Don't allow UTF-8 */ + NULL, + IDCONT_first_OK); } + + if (s == NULL) { /* Can't be NULL unless is check_only */ + return NULL; + } + tmp_copline = CopLINE(PL_curcop); if (s < PL_bufend && isSPACE(*s)) { s = skipspace(s); } - if ((*s == '[' || (*s == '{' && strNE(dest, "sub")))) { + + if (*s == '[' || (*s == '{' && strNE(dest, "sub"))) { + + /* In this branch, 's' is not changed further. If only + * checking validity, return now before any state changes */ + if (check_only) { + return s; + } + /* ${foo[0]} and ${foo{bar}} and ${^CAPTURE[0]} notation. */ + if (ckWARN(WARN_AMBIGUOUS) && keyword(dest, d - dest, 0)) { const char * const brack = (const char *) @@ -10529,6 +11184,9 @@ S_scan_ident(pTHX_ char *s, char *dest, if ( !tmp_copline ) tmp_copline = CopLINE(PL_curcop); + + char *s2; + bool skip; if ((skip = s < PL_bufend && isSPACE(*s))) { /* Avoid incrementing line numbers or resetting PL_linestart, in case we have to back up. */ @@ -10539,13 +11197,35 @@ S_scan_ident(pTHX_ char *s, char *dest, else s2 = s; - /* Expect to find a closing } after consuming any trailing whitespace. - */ - if (*s2 == '}') { - /* Now increment line numbers if applicable. */ + /* Expect to find a closing '}' after consuming any trailing + * whitespace. */ + if (*s2 != '}') { + /* Didn't find the closing '}' at the point we expected, so + * restore the state such that the next thing to process is the + * opening '{' and let the parser handle it */ + s = SvPVX(PL_linestr) + bracket; + + /* The final change to 's' has just been made. If only validity + * checking, return before making any state changes */ + if (check_only) { + return s; + } + CopLINE_set(PL_curcop, orig_copline); + PL_parser->herelines = herelines; + *dest = '\0'; + PL_parser->sub_no_recover = TRUE; + } + else { /* Now increment line numbers if applicable. */ if (skip) s = skipspace(s); s++; + + /* The final change to 's' has just been made. If only validity + * checking, return before making any state changes */ + if (check_only) { + return s; + } + if (PL_lex_state == LEX_INTERPNORMAL && !PL_lex_brackets) { PL_lex_state = LEX_INTERPEND; PL_expect = XREF; @@ -10570,25 +11250,14 @@ S_scan_ident(pTHX_ char *s, char *dest, } } } - else { - /* Didn't find the closing } at the point we expected, so restore - state such that the next thing to process is the opening { and */ - s = SvPVX(PL_linestr) + bracket; /* let the parser handle it */ - CopLINE_set(PL_curcop, orig_copline); - PL_parser->herelines = herelines; - *dest = '\0'; - PL_parser->sub_no_recover = TRUE; - } } - else if ( PL_lex_state == LEX_INTERPNORMAL - && !PL_lex_brackets - && !intuit_more(s, PL_bufend)) - PL_lex_state = LEX_INTERPEND; + return s; } static bool -S_pmflag(pTHX_ const char* const valid_flags, U32 * pmfl, char** s, char* charset, unsigned int * x_mod_count) { +S_pmflag(pTHX_ const char* const valid_flags, U32 * pmfl, char** s, char* charset, unsigned int * x_mod_count) +{ /* Adds, subtracts to/from 'pmfl' based on the next regex modifier flag * found in the parse starting at 's', based on the subset that are valid @@ -10684,9 +11353,11 @@ S_pmflag(pTHX_ const char* const valid_f return TRUE; } -STATIC char * +static char * S_scan_pat(pTHX_ char *start, I32 type) { + PERL_ARGS_ASSERT_SCAN_PAT; + PMOP *pm; char *s; const char * const valid_flags = @@ -10694,8 +11365,6 @@ S_scan_pat(pTHX_ char *start, I32 type) char charset = '\0'; /* character set modifier */ unsigned int x_mod_count = 0; - PERL_ARGS_ASSERT_SCAN_PAT; - s = scan_str(start,TRUE,FALSE, (PL_in_eval & EVAL_RE_REPARSING), NULL); if (!s) croak("Search pattern not terminated"); @@ -10755,14 +11424,21 @@ S_scan_pat(pTHX_ char *start, I32 type) "Use of /c modifier is meaningless without /g" ); } + if (x_mod_count > 1 && FEATURE_ENHANCED_XX_IS_ENABLED) { + ck_warner_d(packWARN(WARN_EXPERIMENTAL__ENHANCED_XX), + "enhanced_xx is experimental"); + } + PL_lex_op = (OP*)pm; pl_yylval.ival = OP_MATCH; return s; } -STATIC char * +static char * S_scan_subst(pTHX_ char *start) { + PERL_ARGS_ASSERT_SCAN_SUBST; + char *s; PMOP *pm; I32 first_start; @@ -10773,8 +11449,6 @@ S_scan_subst(pTHX_ char *start) unsigned int x_mod_count = 0; char *t; - PERL_ARGS_ASSERT_SCAN_SUBST; - pl_yylval.ival = OP_NULL; s = scan_str(start, TRUE, FALSE, FALSE, &t); @@ -10813,6 +11487,11 @@ S_scan_subst(pTHX_ char *start) ck_warner(packWARN(WARN_REGEXP), "Use of /c modifier is meaningless in s///" ); } + if (x_mod_count > 1 && FEATURE_ENHANCED_XX_IS_ENABLED) { + ck_warner_d(packWARN(WARN_EXPERIMENTAL__ENHANCED_XX), + "enhanced_xx is experimental"); + } + if (es) { SV * const repl = newSVpvs(""); @@ -10837,7 +11516,7 @@ S_scan_subst(pTHX_ char *start) /* the IVX field indicates that the replacement string is a s///e; * the NVX field indicates how many src code lines the replacement * spreads over */ - sv_upgrade(PL_parser->lex_sub_repl, SVt_PVNV); + SvUPGRADE(PL_parser->lex_sub_repl, SVt_PVNV); ((XPVNV*)SvANY(PL_parser->lex_sub_repl))->xnv_u.xnv_lines = linediff; ((XPVIV*)SvANY(PL_parser->lex_sub_repl))->xiv_u.xivu_eval_seen = cBOOL(es); @@ -10848,9 +11527,11 @@ S_scan_subst(pTHX_ char *start) return s; } -STATIC char * +static char * S_scan_trans(pTHX_ char *start) { + PERL_ARGS_ASSERT_SCAN_TRANS; + char* s; OP *o; U8 squash; @@ -10859,8 +11540,6 @@ S_scan_trans(pTHX_ char *start) bool nondestruct = 0; char *t; - PERL_ARGS_ASSERT_SCAN_TRANS; - pl_yylval.ival = OP_NULL; s = scan_str(start,FALSE,FALSE,FALSE,&t); @@ -10933,9 +11612,11 @@ S_scan_trans(pTHX_ char *start) Otherwise it is treated as an eval. */ -STATIC char * +static char * S_scan_heredoc(pTHX_ char *s) { + PERL_ARGS_ASSERT_SCAN_HEREDOC; + I32 op_type = OP_SCALAR; I32 len; SV *tmpstr; @@ -10950,11 +11631,9 @@ S_scan_heredoc(pTHX_ char *s) const line_t origline = CopLINE(PL_curcop); LEXSHARED *shared = PL_parser->lex_shared; - PERL_ARGS_ASSERT_SCAN_HEREDOC; - s += 2; d = PL_tokenbuf + 1; - e = PL_tokenbuf + sizeof PL_tokenbuf - 1; + e = C_ARRAY_END(PL_tokenbuf); *PL_tokenbuf = '\n'; peek = s; @@ -10987,8 +11666,9 @@ S_scan_heredoc(pTHX_ char *s) peek = s; - while (isWORDCHAR_lazy_if_safe(peek, PL_bufend, UTF)) { - peek += UTF ? UTF8SKIP(peek) : 1; + Size_t advance; + while ((advance = isWORDCHAR_lazy_if_safe(peek, PL_bufend, UTF))) { + peek += advance; } len = (peek - s >= e - d) ? (e - d) : (peek - s); @@ -10997,7 +11677,7 @@ S_scan_heredoc(pTHX_ char *s) d += len; } - if (d >= PL_tokenbuf + sizeof PL_tokenbuf - 1) + if (d >= C_ARRAY_END(PL_tokenbuf) - 1) croak("Delimiter for here document is too long"); *d++ = '\n'; @@ -11348,9 +12028,7 @@ S_scan_heredoc(pTHX_ char *s) SvREFCNT_dec_NN(newstr); } - if (SvCUR(tmpstr) + 5 < SvLEN(tmpstr)) { - SvPV_shrink_to_cur(tmpstr); - } + SvPV_shrink_to_cur(tmpstr); if (!IN_BYTES) { if (UTF && is_utf8_string((U8*)SvPVX_const(tmpstr), SvCUR(tmpstr))) @@ -11366,7 +12044,7 @@ S_scan_heredoc(pTHX_ char *s) Safefree(indent); SvREFCNT_dec(tmpstr); CopLINE_set(PL_curcop, origline); - missingterm(PL_tokenbuf + 1, sizeof(PL_tokenbuf) - 1); + missingterm(PL_tokenbuf + 1, C_ARRAY_LENGTH(PL_tokenbuf) - 1); } @@ -11388,17 +12066,17 @@ S_scan_heredoc(pTHX_ char *s) */ -STATIC char * +static char * S_scan_inputsymbol(pTHX_ char *start) { + PERL_ARGS_ASSERT_SCAN_INPUTSYMBOL; + char *s = start; /* current position in buffer */ char *end; I32 len; bool nomagicopen = FALSE; char *d = PL_tokenbuf; /* start of temp holding space */ - const char * const e = PL_tokenbuf + sizeof PL_tokenbuf; /* end of temp holding space */ - - PERL_ARGS_ASSERT_SCAN_INPUTSYMBOL; + const char * const e = C_ARRAY_END(PL_tokenbuf); /* end of temp holding space */ end = (char *) memchr(s, '\n', PL_bufend - s); if (!end) @@ -11416,7 +12094,7 @@ S_scan_inputsymbol(pTHX_ char *start) or if it didn't end, or if we see a newline */ - if (len >= (I32)sizeof PL_tokenbuf) + if (len >= (I32) C_ARRAY_LENGTH(PL_tokenbuf)) croak("Excessively long <> operator"); if (s >= end) croak("Unterminated <> operator"); @@ -11433,10 +12111,7 @@ S_scan_inputsymbol(pTHX_ char *start) if (*d == '$' && d[1]) d++; /* allow or */ - while (isWORDCHAR_lazy_if_safe(d, e, UTF) || *d == ':' - || (*d == '\'' && FEATURE_APOS_AS_NAME_SEP_IS_ENABLED)) { - d += UTF ? UTF8SKIP(d) : 1; - } + d = parse_ident_no_copy(d, e, cBOOL(UTF), NULL, ALLOW_PACKAGE); /* If we've tried to read what we allow filehandles to look like, and there's still text left, then it must be a glob() and not a getline. @@ -11534,6 +12209,12 @@ S_scan_inputsymbol(pTHX_ char *start) return s; } +/* In the function below, it's quite likely that the calls to memEQ() will have + * 'len' == 1. So create a new macro that adds a conditional to skip the libc + * call. */ +#define memEQ_1(a, b, len) \ + (assert(len >= 1), (*(a) == *(b)) && ( (LIKELY((len) <= 1) \ + || memEQ((a)+1, (b)+1, (len)-1)))) /* scan_str takes: @@ -11583,15 +12264,17 @@ S_scan_inputsymbol(pTHX_ char *start) On success, the SV with the resulting string is put into lex_stuff or, if that is already non-NULL, into lex_repl. The second case occurs only when parsing the RHS of the special constructs s/// and tr/// (y///). + For convenience, the terminating delimiter character is stuffed into SvIVX of the SV. */ - char * Perl_scan_str(pTHX_ char *start, int keep_bracketed_quoted, int keep_delims, int re_reparse, char **delimp ) { + PERL_ARGS_ASSERT_SCAN_STR; + SV *sv; /* scalar value: string */ char *s = start; /* current position in the buffer */ char *to; /* current position in the sv's data */ @@ -11608,7 +12291,6 @@ Perl_scan_str(pTHX_ char *start, int kee const char * non_grapheme_msg = "Use of unassigned code point or" " non-standalone grapheme for a delimiter" " is not allowed"; - PERL_ARGS_ASSERT_SCAN_STR; /* skip space before the delimiter */ if (isSPACE(*s)) { /* skipspace can change the buffer 's' is in, so @@ -11705,7 +12387,7 @@ Perl_scan_str(pTHX_ char *start, int kee } close_delim_code = (UTF) - ? valid_utf8_to_uvchr((U8 *) close_delim_str, NULL) + ? valid_utf8_to_uv((U8 *) close_delim_str, NULL) : * (U8 *) close_delim_str; } else { /* Here, the delimiter isn't paired, hence the close is the same as @@ -11744,9 +12426,11 @@ Perl_scan_str(pTHX_ char *start, int kee s += delim_byte_len; for (;;) { /* extend sv if need be */ - SvGROW(sv, SvCUR(sv) + (PL_bufend - s) + 1); + + STRLEN sv_len = SvCUR(sv); + char * pv = SvGROW(sv, sv_len + (PL_bufend - s) + 1); /* set 'to' to the next character in the sv's string */ - to = SvPVX(sv)+SvCUR(sv); + to = pv + sv_len; /* read until we run out of string, or we find the closing delimiter */ while (s < PL_bufend) { @@ -11764,10 +12448,10 @@ Perl_scan_str(pTHX_ char *start, int kee * discard those that escape the closing delimiter, just * discard this one */ if ( ! keep_bracketed_quoted - && ( memEQ(s + 1, open_delim_str, delim_byte_len) + && ( memEQ_1(s + 1, open_delim_str, delim_byte_len) || ( PL_multi_open == PL_multi_close && re_reparse && s[1] == '\\') - || memEQ(s + 1, close_delim_str, delim_byte_len))) + || memEQ_1(s + 1, close_delim_str, delim_byte_len))) { s++; } @@ -11775,7 +12459,7 @@ Perl_scan_str(pTHX_ char *start, int kee *to++ = *s++; } else if ( s < PL_bufend - (delim_byte_len - 1) - && memEQ(s, close_delim_str, delim_byte_len) + && memEQ_1(s, close_delim_str, delim_byte_len) && --brackets <= 0) { /* Found unescaped closing delimiter, unnested if we care about @@ -11804,7 +12488,7 @@ Perl_scan_str(pTHX_ char *start, int kee /* No nesting if open eq close */ else if ( PL_multi_open != PL_multi_close && s < PL_bufend - (delim_byte_len - 1) - && memEQ(s, open_delim_str, delim_byte_len)) + && memEQ_1(s, open_delim_str, delim_byte_len)) { brackets++; } @@ -11877,10 +12561,7 @@ Perl_scan_str(pTHX_ char *start, int kee PL_parser->herelines = herelines; /* if we allocated too much space, give some back */ - if (SvCUR(sv) + 5 < SvLEN(sv)) { - SvLEN_set(sv, SvCUR(sv) + 1); - SvPV_shrink_to_cur(sv); - } + SvPV_shrink_to_cur(sv); /* decide whether this is the first or second quoted string we've read for this op @@ -11900,14 +12581,26 @@ Perl_scan_str(pTHX_ char *start, int kee returns: pointer to new position in buffer side-effects: builds ops for the constant in pl_yylval.op - Read a number in any of the formats that Perl accepts: + Read a number in any of the formats that Perl accepts (where \x stands for a + hexadecimal character [0-9A-Fa-f]): + + 0b [0-1] (_* [0-1] )* binary integers + 0o? [0-7] (_* [0-7] )* octal integers + \d (_* \d )* decimal integers + 0x \x (_* \x )* hexadecimal integers + + And decimal or hex floats + |-----------| |--------------| + \d (_* \d )* ( \. ( \d (_* \d )* )? )? ( [Ee] [-+]? ( \d (_* \d )* ) )? + \. \d (_* \d ) ( [Ee] [-+]? ( \d (_* \d)* ) )? + 0x\x (_* \x )* ( \. ( \x (_* \x )* )? )? ( [Pp] [-+]? ( \d (_* \d )* ) ) + |______| |______________________| |_____________________________| + + Hex floats require an exponent; the fractional part is optional. Decimal + floats require either or both the fractional part and the exponent part. - \d(_?\d)*(\.(\d(_?\d)*)?)?[Ee][\+\-]?(\d(_?\d)*) 12 12.34 12. - \.\d(_?\d)*[Ee][\+\-]?(\d(_?\d)*) .34 - 0b[01](_?[01])* binary integers - 0o?[0-7](_?[0-7])* octal integers - 0x[0-9A-Fa-f](_?[0-9A-Fa-f])* hexadecimal integers - 0x[0-9A-Fa-f](_?[0-9A-Fa-f])*(?:\.\d*)?p[+-]?[0-9]+ hexadecimal floats + Any number of underscores may separate any two digits, but multiple + sequential underscores are warned about. Like most scan_ routines, it uses the PL_tokenbuf buffer to hold the thing it reads. @@ -11920,24 +12613,66 @@ Perl_scan_str(pTHX_ char *start, int kee char * Perl_scan_num(pTHX_ const char *start, YYSTYPE* lvalp) { + PERL_ARGS_ASSERT_SCAN_NUM; + const char *s = start; /* current position in buffer */ char *d; /* destination in temp buffer */ char *e; /* end of temp buffer */ NV nv; /* number read, as a double */ SV *sv = NULL; /* place to put the converted number */ bool floatit; /* boolean: int or float? */ - const char *lastub = NULL; /* position of last underbar */ static const char* const number_too_long = "Number too long"; bool warned_about_underscore = 0; - I32 shift; /* shift per digit for hex/oct/bin, hoisted here for fp */ -#define WARN_ABOUT_UNDERSCORE() \ - do { \ - if (!warned_about_underscore) { \ - warned_about_underscore = 1; \ - ck_warner(packWARN(WARN_SYNTAX), \ + I32 shift = 0; /* shift per digit for hex/oct/bin, hoisted here for fp */ + +#define WARN_ABOUT_UNDERSCORE() \ + STMT_START { \ + if (!warned_about_underscore) { \ + warned_about_underscore = 1; \ + ck_warner(packWARN(WARN_SYNTAX), \ "Misplaced _ in number"); \ - } \ - } while(0) + } \ + } STMT_END + +/* Call this when we're not expecting an underscore, but are willing to + * tolerate one if found, but raising a warning about it. It absorbs any + * adjacent underscores up to PL_bufend, advancing 's' to point to the byte + * after the final underscore */ +#define SUFFER_AN_UNDERSCORE_HERE(s) \ + STMT_START { \ + if (*(s) == '_') { \ + WARN_ABOUT_UNDERSCORE(); \ + \ + /* Absorb any adjacent underscores */ \ + do { \ + (s)++; \ + } while ((s) < PL_bufend && *(s) == '_'); \ + } \ + } STMT_END + +/* Call this when we're not expecting an underscore in the previous byte + * position, but are willing to tolerate one if found, but raising a warning + * about it. */ +#define SUFFER_AN_UNDERSCORE_JUST_BEFORE_HERE(s) \ + STMT_START { \ + if (*((s) - 1) == '_') { \ + WARN_ABOUT_UNDERSCORE(); \ + } \ + } STMT_END + +/* Call this when we have an underscore, and a single one is fine. Tolerate + * adjacent subsequent ones, but raise a warning if any are found. It + * advances 's' to point to the byte after the final underscore */ +#define HANDLE_UNDERSCORE(s) \ + STMT_START { \ + assert(*(s) == '_'); \ + (s)++; \ + \ + /* Any underscore adjacent to this one is \ + * wrong */ \ + SUFFER_AN_UNDERSCORE_HERE(s); \ + } STMT_END + /* Hexadecimal floating point. * * In many places (where we have quads and NV is IEEE 754 double) @@ -11948,7 +12683,6 @@ Perl_scan_num(pTHX_ const char *start, Y * which will probably mean horrible loss of precision due to * multiple fp operations. */ bool hexfp = FALSE; - int total_bits = 0; int significant_bits = 0; #if NVSIZE == 8 && defined(HAS_QUAD) && defined(Uquad_t) # define HEXFP_UQUAD @@ -11959,12 +12693,8 @@ Perl_scan_num(pTHX_ const char *start, Y NV hexfp_nv = 0.0; #endif int hexfp_exp = 0; - UV high_non_zero = 0; /* highest digit */ - int non_zero_integer_digits = 0; bool new_octal = FALSE; /* octal with "0o" prefix */ - PERL_ARGS_ASSERT_SCAN_NUM; - /* Make sure "int" is wide enough to hold exponent of NV. We use "int" (rather than I32 etc.) to be compatible with ldexp() */ STATIC_ASSERT_STMT((INT_MIN / 10) < NV_MIN_EXP); @@ -11972,331 +12702,315 @@ Perl_scan_num(pTHX_ const char *start, Y /* We use the first character to decide what type of number this is */ - switch (*s) { - default: - croak("panic: scan_num, *s=%d", *s); + if (*s == 'v') { + vstring: + sv = newSV(5); /* preallocate storage space */ + ENTER_with_name("scan_vstring"); + SAVEFREESV(sv); + s = scan_vstring(s, PL_bufend, sv); + SvREFCNT_inc_simple_void_NN(sv); + LEAVE_with_name("scan_vstring"); + } + else if (*s == '0') { - /* if it starts with a 0, it could be an octal number, a decimal in - 0.13 disguise, or a hexadecimal number, or a binary number. */ - case '0': - { - /* variables: - u holds the "number so far" - overflowed was the number more than we can hold? - - Shift is used when we add a digit. It also serves as an "are - we in octal/hex/binary?" indicator to disallow hex characters - when in octal mode. - */ - NV n = 0.0; - UV u = 0; - bool overflowed = FALSE; - bool just_zero = TRUE; /* just plain 0 or binary number? */ - bool has_digs = FALSE; - static const NV nvshift[5] = { 1.0, 2.0, 4.0, 8.0, 16.0 }; - static const char* const bases[5] = - { "", "binary", "", "octal", "hexadecimal" }; - static const char* const Bases[5] = - { "", "Binary", "", "Octal", "Hexadecimal" }; - static const char* const maxima[5] = - { "", - "0b11111111111111111111111111111111", - "", - "037777777777", - "0xffffffff" }; - - /* check for hex */ - if (isALPHA_FOLD_EQ(s[1], 'x')) { - shift = 4; - s += 2; - just_zero = FALSE; - } else if (isALPHA_FOLD_EQ(s[1], 'b')) { - shift = 1; - s += 2; - just_zero = FALSE; - } - /* check for a decimal in disguise */ - else if (s[1] == '.' || isALPHA_FOLD_EQ(s[1], 'e')) - goto decimal; - /* so it must be octal */ - else { - shift = 3; + /* if it starts with a 0, it could be an octal number, a decimal in + 0.13 disguise, or a hexadecimal number, or a binary number. + * + * variables: + * u holds the "number so far" + * overflowed was the number more than we can hold? + + * Shift is used when we add a digit. It also serves as an "are + * we in octal/hex/binary?" indicator to disallow hex characters + * when in octal mode. + */ + NV n = 0.0; + UV u = 0; + bool overflowed = FALSE; + bool just_zero = TRUE; /* just plain 0 or binary number? */ + bool has_digs = FALSE; + static const NV nvshift[5] = { 1.0, 2.0, 4.0, 8.0, 16.0 }; + static const char* const bases[5] = + { "", "binary", "", "octal", "hexadecimal" }; + + /* check for hex */ + if (isALPHA_FOLD_EQ(s[1], 'x')) { + shift = 4; + s += 2; + just_zero = FALSE; + } else if (isALPHA_FOLD_EQ(s[1], 'b')) { + shift = 1; + s += 2; + just_zero = FALSE; + } + /* check for a decimal in disguise */ + else if (s[1] == '.' || isALPHA_FOLD_EQ(s[1], 'e')) + goto decimal; + /* so it must be octal */ + else { + shift = 3; + s++; + if (isALPHA_FOLD_EQ(*s, 'o')) { s++; - if (isALPHA_FOLD_EQ(*s, 'o')) { - s++; - just_zero = FALSE; - new_octal = TRUE; - } + just_zero = FALSE; + new_octal = TRUE; } + } - if (*s == '_') { - WARN_ABOUT_UNDERSCORE(); - lastub = s++; - } + SUFFER_AN_UNDERSCORE_HERE(s); - /* read the rest of the number */ - for (;;) { - /* x is used in the overflow test, - b is the digit we're adding on. */ - UV x, b; + /* read the rest of the number */ + for (;;) { + /* x is used in the overflow test, + b is the digit we're adding on. */ + UV x, b; - switch (*s) { + switch (*s) { - /* if we don't mention it, we're done */ - default: - goto out; + /* if we don't mention it, we're done */ + default: + goto out; - /* _ are ignored -- but warned about if consecutive */ - case '_': - if (lastub && s == lastub + 1) - WARN_ABOUT_UNDERSCORE(); - lastub = s++; - break; + /* _ are ignored -- but warned about if consecutive */ + case '_': + HANDLE_UNDERSCORE(s); + break; - /* 8 and 9 are not octal */ - case '8': case '9': - if (shift == 3) - yyerror(form("Illegal octal digit '%c'", *s)); - /* FALLTHROUGH */ - - /* octal digits */ - case '2': case '3': case '4': - case '5': case '6': case '7': - if (shift == 1) - yyerror(form("Illegal binary digit '%c'", *s)); - /* FALLTHROUGH */ - - case '0': case '1': - b = *s++ & 15; /* ASCII digit -> value of digit */ - goto digit; - - /* hex digits */ - case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': - case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': - /* make sure they said 0x */ - if (shift != 4) - goto out; - b = (*s++ & 7) + 9; - - /* Prepare to put the digit we have onto the end - of the number so far. We check for overflows. - */ - - digit: - just_zero = FALSE; - has_digs = TRUE; - if (!overflowed) { - assert(shift >= 0); - x = u << shift; /* make room for the digit */ - - total_bits += shift; - - if ((x >> shift) != u - && !(PL_hints & HINT_NEW_BINARY)) { - overflowed = TRUE; - n = (NV) u; - ck_warner_d(packWARN(WARN_OVERFLOW), - "Integer overflow in %s number", - bases[shift]); - } else - u = x | b; /* add the digit to the end */ - } - if (overflowed) { - n *= nvshift[shift]; - /* If an NV has not enough bits in its - * mantissa to represent an UV this summing of - * small low-order numbers is a waste of time - * (because the NV cannot preserve the - * low-order bits anyway): we could just - * remember when did we overflow and in the - * end just multiply n by the right - * amount. */ - n += (NV) b; - } - - if (high_non_zero == 0 && b > 0) - high_non_zero = b; - - if (high_non_zero) - non_zero_integer_digits++; - - /* this could be hexfp, but peek ahead - * to avoid matching ".." */ - if (UNLIKELY(HEXFP_PEEK(s))) { - goto out; - } + /* 8 and 9 are not octal */ + case '8': case '9': + if (shift == 3) + yyerror(form("Illegal octal digit '%c'", *s)); + /* FALLTHROUGH */ + + /* octal digits */ + case '2': case '3': case '4': + case '5': case '6': case '7': + if (shift == 1) + yyerror(form("Illegal binary digit '%c'", *s)); + /* FALLTHROUGH */ + + case '0': case '1': + b = *s++ & 15; /* ASCII digit -> value of digit */ + goto digit; + + /* hex digits */ + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': + case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': + /* make sure they said 0x */ + if (shift != 4) + goto out; + b = (*s++ & 7) + 9; - break; + /* Prepare to put the digit we have onto the end + of the number so far. We check for overflows. + */ + + digit: + just_zero = FALSE; + has_digs = TRUE; + if (!overflowed) { + assert(shift >= 0); + x = u << shift; /* make room for the digit */ + + if ((x >> shift) != u + && !(PL_hints & HINT_NEW_BINARY)) { + overflowed = TRUE; + n = (NV) u; + ck_warner_d(packWARN(WARN_OVERFLOW), + "Integer overflow in %s number", + bases[shift]); + } else + u = x | b; /* add the digit to the end */ + } + if (overflowed) { + n *= nvshift[shift]; + /* If an NV has not enough bits in its + * mantissa to represent an UV this summing of + * small low-order numbers is a waste of time + * (because the NV cannot preserve the + * low-order bits anyway): we could just + * remember when did we overflow and in the + * end just multiply n by the right + * amount. */ + n += (NV) b; + significant_bits += shift; + } + + /* this could be hexfp, but peek ahead + * to avoid matching ".." */ + if (UNLIKELY(HEXFP_PEEK(s))) { + goto out; } + + break; } + } - /* if we get here, we had success: make a scalar value from - the number. - */ - out: - - /* final misplaced underbar check */ - if (s[-1] == '_') - WARN_ABOUT_UNDERSCORE(); - - if (UNLIKELY(HEXFP_PEEK(s))) { - /* Do sloppy (on the underbars) but quick detection - * (and value construction) for hexfp, the decimal - * detection will shortly be more thorough with the - * underbar checks. */ - const char* h = s; - significant_bits = non_zero_integer_digits * shift; + /* if we get here, we had success: make a scalar value from + the number. + */ + out: + + /* final misplaced underbar check */ + SUFFER_AN_UNDERSCORE_JUST_BEFORE_HERE(s); + + if (UNLIKELY(HEXFP_PEEK(s))) { + /* Do sloppy (on the underbars) but quick detection + * (and value construction) for hexfp, the decimal + * detection will shortly be more thorough with the + * underbar checks. */ + const char* h = s; + if (u != 0) + significant_bits += msbit_pos(u) + 1; #ifdef HEXFP_UQUAD - hexfp_uquad = u; + hexfp_uquad = overflowed ? (Uquad_t)n : u; #else /* HEXFP_NV */ - hexfp_nv = u; + hexfp_nv = overflowed ? n : (NV)u; #endif - /* Ignore the leading zero bits of - * the high (first) non-zero digit. */ - if (high_non_zero) { - if (high_non_zero < 0x8) - significant_bits--; - if (high_non_zero < 0x4) - significant_bits--; - if (high_non_zero < 0x2) - significant_bits--; - } - - if (*h == '.') { + if (*h == '.') { #ifdef HEXFP_NV - NV nv_mult = 1.0; + NV nv_mult = 1.0; #endif - bool accumulate = TRUE; - U8 b = 0; /* silence compiler warning */ - int lim = 1 << shift; - for (h++; ((isXDIGIT(*h) && (b = XDIGIT_VALUE(*h)) < lim) || - *h == '_'); h++) { - if (isXDIGIT(*h)) { - significant_bits += shift; + bool accumulate = TRUE; + U8 b = 0; /* silence compiler warning */ + int lim = 1 << shift; + for (h++; + ( ( isXDIGIT(*h) + && (b = XDIGIT_VALUE(*h)) < lim) + || *h == '_'); + h++) + { + if (isXDIGIT(*h)) { + significant_bits += shift; #ifdef HEXFP_UQUAD - if (accumulate) { - if (significant_bits < NV_MANT_DIG) { - /* We are in the long "run" of xdigits, - * accumulate the full four bits. */ - assert(shift >= 0); - hexfp_uquad <<= shift; - hexfp_uquad |= b; - hexfp_frac_bits += shift; - } else if (significant_bits - shift < NV_MANT_DIG) { - /* We are at a hexdigit either at, - * or straddling, the edge of mantissa. - * We will try grabbing as many as - * possible bits. */ - int tail = - significant_bits - NV_MANT_DIG; - if (tail <= 0) - tail += shift; - assert(tail >= 0); - hexfp_uquad <<= tail; - assert((shift - tail) >= 0); - hexfp_uquad |= b >> (shift - tail); - hexfp_frac_bits += tail; - - /* Ignore the trailing zero bits - * of the last non-zero xdigit. - * - * The assumption here is that if - * one has input of e.g. the xdigit - * eight (0x8), there is only one - * bit being input, not the full - * four bits. Conversely, if one - * specifies a zero xdigit, the - * assumption is that one really - * wants all those bits to be zero. */ - if (b) { - if ((b & 0x1) == 0x0) { - significant_bits--; - if ((b & 0x2) == 0x0) { + if (accumulate) { + if (significant_bits < NV_MANT_DIG) { + /* We are in the long "run" of xdigits, + * accumulate the full four bits. */ + assert(shift >= 0); + hexfp_uquad <<= shift; + hexfp_uquad |= b; + hexfp_frac_bits += shift; + } else if ( significant_bits - shift + < NV_MANT_DIG) + { + /* We are at a hexdigit either at, + * or straddling, the edge of mantissa. + * We will try grabbing as many as + * possible bits. */ + int tail = + significant_bits - NV_MANT_DIG; + if (tail <= 0) + tail += shift; + assert(tail >= 0); + hexfp_uquad <<= tail; + assert((shift - tail) >= 0); + hexfp_uquad |= b >> (shift - tail); + hexfp_frac_bits += tail; + + /* Ignore the trailing zero bits + * of the last non-zero xdigit. + * + * The assumption here is that if + * one has input of e.g. the xdigit + * eight (0x8), there is only one + * bit being input, not the full + * four bits. Conversely, if one + * specifies a zero xdigit, the + * assumption is that one really + * wants all those bits to be zero. */ + if (b) { + if ((b & 0x1) == 0x0) { significant_bits--; - if ((b & 0x4) == 0x0) { + if ((b & 0x2) == 0x0) { significant_bits--; + if ((b & 0x4) == 0x0) { + significant_bits--; + } } } } - } - accumulate = FALSE; + accumulate = FALSE; + } + } else { + /* Keep skipping the xdigits, and + * accumulating the significant bits, + * but do not shift the uquad + * (which would catastrophically drop + * high-order bits) or accumulate the + * xdigits anymore. */ } - } else { - /* Keep skipping the xdigits, and - * accumulating the significant bits, - * but do not shift the uquad - * (which would catastrophically drop - * high-order bits) or accumulate the - * xdigits anymore. */ - } #else /* HEXFP_NV */ - if (accumulate) { - nv_mult /= nvshift[shift]; - if (nv_mult > 0.0) - hexfp_nv += b * nv_mult; - else - accumulate = FALSE; - } + if (accumulate) { + nv_mult /= nvshift[shift]; + if (nv_mult > 0.0) + hexfp_nv += b * nv_mult; + else + accumulate = FALSE; + } #endif + } + if (significant_bits >= NV_MANT_DIG) + accumulate = FALSE; } - if (significant_bits >= NV_MANT_DIG) - accumulate = FALSE; } - } - if ((total_bits > 0 || significant_bits > 0) && - isALPHA_FOLD_EQ(*h, 'p')) { - bool negexp = FALSE; - h++; - if (*h == '+') - h++; - else if (*h == '-') { - negexp = TRUE; + if ( (has_digs || significant_bits > 0) + && isALPHA_FOLD_EQ(*h, 'p')) + { + bool negexp = FALSE; h++; - } - if (isDIGIT(*h)) { - while (isDIGIT(*h) || *h == '_') { - if (isDIGIT(*h)) { - hexfp_exp *= 10; - hexfp_exp += *h - '0'; + if (*h == '+') + h++; + else if (*h == '-') { + negexp = TRUE; + h++; + } + if (isDIGIT(*h)) { + while (isDIGIT_or_UNDERSCORE(*h)) { + if (isDIGIT(*h)) { + hexfp_exp *= 10; + hexfp_exp += *h - '0'; #ifdef NV_MIN_EXP - if (negexp - && -hexfp_exp < NV_MIN_EXP - 1) { - /* NOTE: this means that the exponent - * underflow warning happens for - * the IEEE 754 subnormals (denormals), - * because DBL_MIN_EXP etc are the lowest - * possible binary (or, rather, DBL_RADIX-base) - * exponent for normals, not subnormals. - * - * This may or may not be a good thing. */ - ck_warner(packWARN(WARN_OVERFLOW), - "Hexadecimal float: exponent underflow"); - break; - } + if (negexp + && -hexfp_exp < NV_MIN_EXP - 1) { + /* NOTE: this means that the exponent + * underflow warning happens for the + * IEEE 754 subnormals (denormals), + * because DBL_MIN_EXP etc are the + * lowest possible binary (or, rather, + * DBL_RADIX-base) exponent for + * normals, not subnormals. + * + * This may or may not be a good + * thing. */ + ck_warner(packWARN(WARN_OVERFLOW), + "Hexadecimal float: exponent underflow"); + break; + } #endif #ifdef NV_MAX_EXP - if (!negexp - && hexfp_exp > NV_MAX_EXP - 1) { - ck_warner(packWARN(WARN_OVERFLOW), - "Hexadecimal float: exponent overflow"); - break; - } + if (!negexp + && hexfp_exp > NV_MAX_EXP - 1) { + ck_warner(packWARN(WARN_OVERFLOW), + "Hexadecimal float: exponent overflow"); + break; + } #endif + } + h++; } - h++; - } - if (negexp) - hexfp_exp = -hexfp_exp; + if (negexp) + hexfp_exp = -hexfp_exp; #ifdef HEXFP_UQUAD - hexfp_exp -= hexfp_frac_bits; + hexfp_exp -= hexfp_frac_bits; #endif - hexfp = TRUE; - goto decimal; + hexfp = TRUE; + goto decimal; + } } } - } if (!just_zero && !has_digs) { /* 0x, 0o or 0b with no digits, treat it as an error. @@ -12315,40 +13029,31 @@ Perl_scan_num(pTHX_ const char *start, Y if (overflowed) { if (n > 4294967295.0) - ck_warner(packWARN(WARN_PORTABLE), - "%s number > %s non-portable", - Bases[shift], - new_octal ? "0o37777777777" : maxima[shift]); + output_non_portable(1 << shift); sv = newSVnv(n); } else { #if UVSIZE > 4 if (u > 0xffffffff) - ck_warner(packWARN(WARN_PORTABLE), - "%s number > %s non-portable", - Bases[shift], - new_octal ? "0o37777777777" : maxima[shift]); + output_non_portable(1 << shift); #endif sv = newSVuv(u); } - if (just_zero && (PL_hints & HINT_NEW_INTEGER)) - sv = new_constant(start, s - start, "integer", - sv, NULL, NULL, 0, NULL); - else if (PL_hints & HINT_NEW_BINARY) - sv = new_constant(start, s - start, "binary", - sv, NULL, NULL, 0, NULL); - } - break; - - /* - handle decimal numbers. - we're also sent here when we read a 0 as the first digit - */ - case '1': case '2': case '3': case '4': case '5': - case '6': case '7': case '8': case '9': case '.': + if (just_zero && (PL_hints & HINT_NEW_INTEGER)) + sv = new_constant(start, s - start, "integer", + sv, NULL, NULL, 0, NULL); + else if (PL_hints & HINT_NEW_BINARY) + sv = new_constant(start, s - start, "binary", + sv, NULL, NULL, 0, NULL); + } + else if (isDIGIT_A(*s) || *s == '.') { decimal: + + /* handle decimal numbers. + we're also sent here when we read a 0 as the first digit + */ d = PL_tokenbuf; - e = PL_tokenbuf + sizeof PL_tokenbuf - 6; /* room for various punctuation */ + e = C_ARRAY_END(PL_tokenbuf) - 6; /* room for various punctuation */ floatit = FALSE; if (hexfp) { floatit = TRUE; @@ -12376,17 +13081,14 @@ Perl_scan_num(pTHX_ const char *start, Y } /* read next group of digits and _ and copy into d */ - while (isDIGIT(*s) - || *s == '_' + while ( isDIGIT_or_UNDERSCORE(*s) || UNLIKELY(hexfp && isXDIGIT(*s))) { /* skip underscores, checking for misplaced ones if -w is on */ if (*s == '_') { - if (lastub && s == lastub + 1) - WARN_ABOUT_UNDERSCORE(); - lastub = s++; + HANDLE_UNDERSCORE(s); } else { /* check for end of fixed-length buffer */ @@ -12398,8 +13100,9 @@ Perl_scan_num(pTHX_ const char *start, Y } /* final misplaced underbar check */ - if (lastub && s == lastub + 1) - WARN_ABOUT_UNDERSCORE(); + if (s > start) { /* Can get here without advancing s */ + SUFFER_AN_UNDERSCORE_JUST_BEFORE_HERE(s); + } /* read a decimal portion if there is one. avoid 3..5 being interpreted as the number 3. followed @@ -12409,32 +13112,25 @@ Perl_scan_num(pTHX_ const char *start, Y floatit = TRUE; *d++ = *s++; - if (*s == '_') { - WARN_ABOUT_UNDERSCORE(); - lastub = s; - } + SUFFER_AN_UNDERSCORE_HERE(s); /* copy, ignoring underbars, until we run out of digits. */ - for (; isDIGIT(*s) - || *s == '_' - || UNLIKELY(hexfp && isXDIGIT(*s)); - s++) + while ( isDIGIT_or_UNDERSCORE(*s) + || UNLIKELY(hexfp && isXDIGIT(*s))) { /* fixed length buffer check */ if (d >= e) croak("%s", number_too_long); if (*s == '_') { - if (lastub && s == lastub + 1) - WARN_ABOUT_UNDERSCORE(); - lastub = s; + HANDLE_UNDERSCORE(s); } else - *d++ = *s; + *d++ = *s++; } - /* fractional part ending in underbar? */ - if (s[-1] == '_') - WARN_ABOUT_UNDERSCORE(); + + SUFFER_AN_UNDERSCORE_JUST_BEFORE_HERE(s); + if (*s == '.' && isDIGIT(s[1])) { /* oops, it's really a v-string, but without the "v" */ s = start; @@ -12465,37 +13161,30 @@ Perl_scan_num(pTHX_ const char *start, Y /* stray preinitial _ */ - if (*s == '_') { - WARN_ABOUT_UNDERSCORE(); - lastub = s++; - } + SUFFER_AN_UNDERSCORE_HERE(s); /* allow positive or negative exponent */ if (*s == '+' || *s == '-') *d++ = *s++; /* stray initial _ */ - if (*s == '_') { - WARN_ABOUT_UNDERSCORE(); - lastub = s++; - } + SUFFER_AN_UNDERSCORE_HERE(s); /* read digits of exponent */ - while (isDIGIT(*s) || *s == '_') { + while (isDIGIT_or_UNDERSCORE(*s)) { if (isDIGIT(*s)) { ++exp_digits; if (d >= e) croak("%s", number_too_long); *d++ = *s++; } - else { - if (((lastub && s == lastub + 1) - || (!isDIGIT(s[1]) && s[1] != '_'))) - WARN_ABOUT_UNDERSCORE(); - lastub = s++; + else { /* Must be an underscore */ + HANDLE_UNDERSCORE(s); } } + SUFFER_AN_UNDERSCORE_JUST_BEFORE_HERE(s); + if (!exp_digits) { /* no exponent digits, the [eEpP] could be for something else, * though in practice we don't get here for p since that's preparsed @@ -12563,18 +13252,9 @@ Perl_scan_num(pTHX_ const char *start, Y sv = S_new_constant(aTHX_ PL_tokenbuf, d - PL_tokenbuf, key, keylen, sv, NULL, NULL, 0, NULL); } - break; - - /* if it starts with a v, it could be a v-string */ - case 'v': - vstring: - sv = newSV(5); /* preallocate storage space */ - ENTER_with_name("scan_vstring"); - SAVEFREESV(sv); - s = scan_vstring(s, PL_bufend, sv); - SvREFCNT_inc_simple_void_NN(sv); - LEAVE_with_name("scan_vstring"); - break; + } + else { + croak("panic: scan_num, *s=%c", *s); } /* make the op for the constant and return */ @@ -12587,15 +13267,15 @@ Perl_scan_num(pTHX_ const char *start, Y return (char *)s; } -STATIC char * +static char * S_scan_formline(pTHX_ char *s) { + PERL_ARGS_ASSERT_SCAN_FORMLINE; + SV * const stuff = newSVpvs(""); bool needargs = FALSE; bool eofmt = FALSE; - PERL_ARGS_ASSERT_SCAN_FORMLINE; - while (!needargs) { char *eol; if (*s == '.') { @@ -12703,6 +13383,8 @@ the function; I32 Perl_start_subparse(pTHX_ I32 is_format, U32 flags) { + PERL_ARGS_ASSERT_START_SUBPARSE; + const I32 oldsavestack_ix = PL_savestack_ix; CV* const outsidecv = PL_compcv; bool is_method = flags & CVf_IsMETHOD; @@ -12733,7 +13415,7 @@ Perl_start_subparse(pTHX_ I32 is_format, * Otherwise does nothing and returns false */ -STATIC bool +static bool S_apply_builtin_cv_attribute(pTHX_ CV *cv, OP *o) { assert(o->op_type == OP_CONST); @@ -12881,6 +13563,8 @@ Perl_abort_execution(pTHX_ SV* msg_sv, c void Perl_yyquit(pTHX) { + PERL_ARGS_ASSERT_YYQUIT; + /* Called, after at least one error has been found, to abort the parse now, * instead of trying to forge ahead */ @@ -12906,6 +13590,8 @@ Perl_yyerror_pv(pTHX_ const char *const int Perl_yyerror_pvn(pTHX_ const char *const s, STRLEN len, U32 flags) { + PERL_ARGS_ASSERT_YYERROR_PVN; + const char *context = NULL; int contlen = -1; SV *msg; @@ -12968,7 +13654,11 @@ Perl_yyerror_pvn(pTHX_ const char *const (PL_parser->preambling == NOLINE ? CopLINE(PL_curcop) : PL_parser->preambling)); - if (context) + + /* Some syntax errors in an eval to result in a context being set + * but contlen being < 0. See GH#16945 for an example. In this + * situation, don't try to include context in the error message. */ + if (context && contlen > 0) sv_catpvf(msg, "near \"%" UTF8f "\"\n", UTF8fARG(UTF, contlen, context)); else @@ -12987,26 +13677,26 @@ Perl_yyerror_pvn(pTHX_ const char *const ck_warner_d(packWARN(WARN_SYNTAX), "%" SVf, SVfARG(msg)); } else { - qerror(msg); + defer_error(msg); } } /* if there was no message then this is a yyquit(), which is actualy handled - * by qerror() with a NULL argument */ + * by defer_error() with a NULL argument */ if (s == NULL) - qerror(NULL); + defer_error(NULL); PL_in_my = 0; PL_in_my_stash = NULL; return 0; } -STATIC char* +static char* S_swallow_bom(pTHX_ U8 *s) { - const STRLEN slen = SvCUR(PL_linestr); - PERL_ARGS_ASSERT_SWALLOW_BOM; + const STRLEN slen = SvCUR(PL_linestr); + switch (s[0]) { case 0xFF: if (s[1] == 0xFE) { @@ -13049,7 +13739,7 @@ S_swallow_bom(pTHX_ U8 *s) #ifdef DEBUGGING if (DEBUG_p_TEST || DEBUG_T_TEST) PerlIO_printf(Perl_debug_log, "UTF-8 script encoding (BOM)\n"); #endif - s += sizeof(BOM_UTF8) - 1; /* UTF-8 */ + s += C_ARRAY_LENGTH(BOM_UTF8) - 1; /* UTF-8 */ } break; } @@ -13108,6 +13798,8 @@ S_swallow_bom(pTHX_ U8 *s) static I32 S_utf16_textfilter(pTHX_ int idx, SV *sv, int maxlen) { + PERL_ARGS_ASSERT_UTF16_TEXTFILTER; + SV *const filter = FILTER_DATA(idx); /* We re-use this each time round, throwing the contents away before we return. */ @@ -13117,8 +13809,6 @@ S_utf16_textfilter(pTHX_ int idx, SV *sv const bool reverse = cBOOL(IoLINES(filter)); I32 retval; - PERL_ARGS_ASSERT_UTF16_TEXTFILTER; - /* As we're automatically added, at the lowest level, and hence only called from this file, we can be sure that we're not called in block mode. Hence don't bother writing code to deal with block mode. */ @@ -13235,10 +13925,10 @@ S_utf16_textfilter(pTHX_ int idx, SV *sv static U8 * S_add_utf16_textfilter(pTHX_ U8 *const s, bool reversed) { - SV *filter = filter_add(S_utf16_textfilter, NULL); - PERL_ARGS_ASSERT_ADD_UTF16_TEXTFILTER; + SV *filter = filter_add(S_utf16_textfilter, NULL); + IoTOP_GV(filter) = MUTABLE_GV(newSVpvn((char *)s, PL_bufend - (char*)s)); SvPVCLEAR(filter); IoLINES(filter) = reversed; @@ -13283,13 +13973,13 @@ sv_2mortal. char * Perl_scan_vstring(pTHX_ const char *s, const char *const e, SV *sv) { + PERL_ARGS_ASSERT_SCAN_VSTRING; + const char *pos = s; const char *start = s; - PERL_ARGS_ASSERT_SCAN_VSTRING; - if (*pos == 'v') pos++; /* get past 'v' */ - while (pos < e && (isDIGIT(*pos) || *pos == '_')) + while (pos < e && isDIGIT_or_UNDERSCORE(*pos)) pos++; if ( *pos != '.') { /* this may not be a v-string if followed by => */ @@ -13340,7 +14030,7 @@ Perl_scan_vstring(pTHX_ const char *s, c s = pos; break; } - while (pos < e && (isDIGIT(*pos) || *pos == '_')) + while (pos < e && isDIGIT_or_UNDERSCORE(*pos)) pos++; } SvPOK_on(sv); @@ -13499,7 +14189,7 @@ S_parse_recdescent(pTHX_ int gramtype, I SAVEI8(PL_lex_fakeeof); PL_lex_fakeeof = (U8)fakeeof; if(yyparse(gramtype) && !PL_parser->error_count) - qerror(Perl_mess(aTHX_ "Parse error")); + defer_error(mess("Parse error")); } #define parse_recdescent_for_op(g,p) S_parse_recdescent_for_op(aTHX_ g,p) @@ -13526,14 +14216,16 @@ S_parse_expr(pTHX_ I32 fakeeof, U32 flag exprop = parse_recdescent_for_op(GRAMEXPR, fakeeof); if (!exprop && !(flags & PARSE_OPTIONAL)) { if (!PL_parser->error_count) - qerror(Perl_mess(aTHX_ "Parse error")); + defer_error(mess("Parse error")); exprop = newOP(OP_NULL, 0); } return exprop; } /* -=for apidoc parse_arithexpr +=for apidoc parse_arithexpr +=for apidoc_flag PARSE_OPTIONAL + Parse a Perl arithmetic expression. This may contain operators of precedence down to the bit shift operators. The expression must be followed (and thus @@ -13555,8 +14247,6 @@ normally resulting in a single exception which covers all the compilation errors that occurred. Some compilation errors, however, will throw an exception immediately. -=for apidoc Amnh||PARSE_OPTIONAL - =cut */ @@ -13564,6 +14254,8 @@ errors, however, will throw an exception OP * Perl_parse_arithexpr(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_PARSE_ARITHEXPR; + return parse_expr(LEX_FAKEEOF_COMPARE, flags); } @@ -13596,6 +14288,8 @@ errors, however, will throw an exception OP * Perl_parse_termexpr(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_PARSE_TERMEXPR; + return parse_expr(LEX_FAKEEOF_COMMA, flags); } @@ -13628,6 +14322,8 @@ errors, however, will throw an exception OP * Perl_parse_listexpr(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_PARSE_LISTEXPR; + return parse_expr(LEX_FAKEEOF_LOWLOGIC, flags); } @@ -13661,6 +14357,8 @@ errors, however, will throw an exception OP * Perl_parse_fullexpr(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_PARSE_FULLEXPR; + return parse_expr(LEX_FAKEEOF_NONEXPR, flags); } @@ -13695,6 +14393,8 @@ be zero. OP * Perl_parse_block(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_PARSE_BLOCK; + if (flags) croak("Parsing code internal error (%s)", "parse_block"); return parse_recdescent_for_op(GRAMBLOCK, LEX_FAKEEOF_NEVER); @@ -13733,6 +14433,8 @@ be zero. OP * Perl_parse_barestmt(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_PARSE_BARESTMT; + if (flags) croak("Parsing code internal error (%s)", "parse_barestmt"); return parse_recdescent_for_op(GRAMBARESTMT, LEX_FAKEEOF_NEVER); @@ -13761,6 +14463,8 @@ level of parsing which covers all the co SV * Perl_parse_label(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_PARSE_LABEL; + if (flags & ~PARSE_OPTIONAL) croak("Parsing code internal error (%s)", "parse_label"); if (PL_nexttoke) { @@ -13782,7 +14486,8 @@ Perl_parse_label(pTHX_ U32 flags) t = s = PL_bufptr; if (!isIDFIRST_lazy_if_safe(s, PL_bufend, UTF)) goto no_label; - t = scan_word(s, PL_tokenbuf, sizeof PL_tokenbuf, FALSE, &wlen); + t = scan_word(s, PL_tokenbuf, C_ARRAY_LENGTH(PL_tokenbuf), + FALSE, &wlen); if (word_takes_any_delimiter(s, wlen)) goto no_label; bufptr_pos = s - SvPVX(PL_linestr); @@ -13801,7 +14506,7 @@ Perl_parse_label(pTHX_ U32 flags) if (flags & PARSE_OPTIONAL) { return NULL; } else { - qerror(Perl_mess(aTHX_ "Parse error")); + defer_error(mess("Parse error")); return newSVpvs("x"); } } @@ -13838,6 +14543,8 @@ be zero. OP * Perl_parse_fullstmt(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_PARSE_FULLSTMT; + if (flags) croak("Parsing code internal error (%s)", "parse_fullstmt"); return parse_recdescent_for_op(GRAMFULLSTMT, LEX_FAKEEOF_NEVER); @@ -13876,6 +14583,8 @@ be zero. OP * Perl_parse_stmtseq(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_PARSE_STMTSEQ; + OP *stmtseqop; I32 c; if (flags) @@ -13883,7 +14592,7 @@ Perl_parse_stmtseq(pTHX_ U32 flags) stmtseqop = parse_recdescent_for_op(GRAMSTMTSEQ, LEX_FAKEEOF_CLOSING); c = lex_peek_unichar(0); if (c != -1 && c != /*{*/'}') - qerror(Perl_mess(aTHX_ "Parse error")); + defer_error(mess("Parse error")); return stmtseqop; } @@ -13914,21 +14623,49 @@ be zero. OP * Perl_parse_subsignature(pTHX_ U32 flags) { + PERL_ARGS_ASSERT_PARSE_SUBSIGNATURE; + if (flags) croak("Parsing code internal error (%s)", "parse_subsignature"); + /* sub signatures might be empty, but perly.y can't cope with the + * ambiguity of an empty construction. We'll detect it manually and do + * something suitable in that case. */ + lex_read_space(0); + if (lex_peek_unichar(0) == ')') { + /* pretend we saw an empty signature and do the same steps perly.y + * would have performed. */ + subsignature_start(); + OP *sigops = subsignature_finish(); + CvSIGNATURE_on(PL_compcv); + return sigops; + } return parse_recdescent_for_op(GRAMSUBSIGNATURE, LEX_FAKEEOF_NONEXPR); } /* -=for apidoc valid_identifier_pve - -Returns true if the string given by C until C would be considered -valid as a Perl identifier. That is, it must begin with a character matching -C, followed by characters all matching C. An empty -string (i.e. when C is C) will return false. - -If C contains the C bit, then the string is presumed to be -encoded in UTF-8, and suitable Unicode character test functions will be used. +=for apidoc valid_identifier_pvn +=for apidoc_item valid_identifier_pve +=for apidoc_item valid_identifier_sv + +These each return true if the string given by their parameters would be +considered valid as a Perl identifier. That is, for non-UTF-8 strings, it must +begin with a character matching C>, followed by characters all +matching C>. For UTF-8 strings, the characters must match +C> and C>, respectively. + +An empty string will return false. + +They differ only in how the string is specified. + +In C, the string is extracted from C using +C>, without performing "get" magic. The string is considered to be encoded in UTF-8 if and only if C is marked as being UTF-8. + +In the other two functions, the first byte of the string is pointed to by +C. In C its length is given by C. +In C the final byte of the string is the one before +C. If C contains the C bit, then the string is presumed +to be encoded in UTF-8, and suitable Unicode character test functions will be +used. =cut */ @@ -13941,50 +14678,10 @@ Perl_valid_identifier_pve(pTHX_ const ch if(end <= s) return false; - if(flags & SVf_UTF8) { - if(!isIDFIRST_utf8_safe((U8 *)s, (U8 *)end)) - return false; - - while(s < end) { - s += UTF8SKIP((U8 *)s); - if(s == end) - break; - if(!isIDCONT_utf8_safe((U8 *)s, (U8 *)end)) - return false; - } - return true; - } - else { - if(!isIDFIRST(s[0])) - return false; - - while(s < end) { - s += 1; - if(s == end) - break; - if(!isIDCONT(s[0])) - return false; - } - return true; - } - - return false; + return end == parse_ident_no_copy(s, end, cBOOL(flags & SVf_UTF8), + NULL, IDFIRST_ONLY); } -/* -=for apidoc valid_identifier_pvn - -Returns true if the string given by C whose length is C would be -considered valid as a Perl identifier. That is, it must begin with a -character matching C, followed by characters all matching -C. An empty string (i.e. when C is zero) will return false. - -If C contains the C bit, then the string is presumed to be -encoded in UTF-8, and suitable Unicode character test functions will be used. - -=cut -*/ - bool Perl_valid_identifier_pvn(pTHX_ const char *s, STRLEN len, U32 flags) { @@ -13992,18 +14689,6 @@ Perl_valid_identifier_pvn(pTHX_ const ch return valid_identifier_pve(s, s + len, flags); } - -/* -=for apidoc valid_identifier_sv - -Returns true if the given SV contains a non-empty string whose characters -match accoding to C. Returns false if given NULL, an -undefined SV, or a SV that does not contain a non-empty string. - -Does not invoke C magic on the SV beforehand. - -=cut -*/ bool Perl_valid_identifier_sv(pTHX_ SV *sv) Index: gnu/usr.bin/perl/uni_keywords.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/uni_keywords.h,v diff -u -p -a -u -p -r1.1.1.7 uni_keywords.h --- gnu/usr.bin/perl/uni_keywords.h 26 Dec 2025 22:12:26 -0000 1.1.1.7 +++ gnu/usr.bin/perl/uni_keywords.h 16 Nov 2026 00:57:40 -0000 @@ -13,154 +13,157 @@ generator script: regen/mk_invlists.pl split strategy: squeeze srand: 1785235451 -rows: 7784 +rows: 7906 seed: 1348825711 -full length of keys: 109729 -blob length: 8963 -ref length: 62272 -data size: 71235 (%64.92) +full length of keys: 111582 +blob length: 9132 +ref length: 63248 +data size: 72380 (%64.87) */ -STATIC const unsigned char mph_blob[] = +static const unsigned char mph_blob[] = "l&cwlmcmocradlmaghbahexahomarmiavstbatkbhksbuhdcakmcanschamchrscp" "mncprtcwucyrldsrtgonggrekgujrgukhhluwhmngzljtkawikitskndakrailaoo" - "latnlisumedfmteimymrnarbnewaoryaosgeougrpcmphlpphnxqaacrjngrunrsa" - "mrsgnwtagstamltavttfngtglgtibttodrtutgwchoxpeoxsuxyiiizanbzyyyzzz" - "zcntrlcwcfcwkcfcwtgarayzpgcb=h2vfjlxxnushu3040nv=90oriyapatwsprin" - "tqmarktailetakrivssupfsipdfcarianccc=12318491vre=yeschakmacwcmsml" - "sqrgothicgrexthyphen3.26.3415161miaototoarmndiakgonmhanokhmrlinam" - "roonkooogamolckonaoorkhphliplrdprtiqaairohgshawsogotnsavaiibehgaf" - "hahrehbunkhojkilydiannfdqcnv=3//5nv=7olonalpatsynrejangsb=stangsa" - "todhriebg2.13.04.06.07.08.09.052avestanccc=22e=truedeseretdt=none" - "wideelbasanelymaicextpictgrbashanunoohst=lvtadlambuhiddogralimbuo" - "ghamosagerunicbatakeemnoonseenshinzainkannadakayahlilinearamandai" - "cmarchennfkcqc-1/2/645/217/2olchikiosmanyahmnpkalilananbatsarbshr" - "dsyrczinhsharadashavianstermuaatagalogtaithamtaiviettibetanuideou" - "nknownage=10.0age=v1armenianbalinesebassavahbpt=opene=falsecompex" - "duployanextendergujaratigurmukhihiraganahatrankaithilepchalyciant" - "eluguwanchoyezidijamoextbgamalkhaphkiratraimahajaninfkdqcnv=1/31/" - "12erlwordlinbmercnshuscx=talupecialstagbanwatifinaghugariticvithk" - "uqipfabhaiksuki2435nuktacirclemedialea=narrowmoticonsbengaliincbi" - "ncjkexgranthainheritedinkanamakasarmultaninoblockphagspasiddhamso" - "yombosunuwaruabtirhutaiscjkexlamadhkhudawadinabataeannewtailue160" - "0032000olditalicoldpermicoldturkicolduyghurpalmyrenepaucinhausama" - "ritanthaanawb=mixidstartbasiclatinboxdrawingccc=ccc1chorasmianstr" - "okesdeprecateddivesakuruorizspacebugineseingeorgiajamoextajavanes" - "ebinduiskanathinyehkharoshthiiscarrowsnagmundarioldpersianphoenic" - "iansaurashtraolettermallformssoftdottedwarangcitialetternewlineer" - "lspaceblk=cjkextdoverlaycyprominoandominotilesfractionisolatedgur" - "ungkhemapfb=linkerisarabicisspaceisvertfarsiyehswashkafkehnomirro" - "rlinefeednextlinemedefaidrinnfcqc=maybepahawhhmongkthiscript=mlym" - "sorasompengerandsubsylotinagriebasegazyisyllablesbidicontrolbidim" - "irroredblk=kanaucasextahesssymbolsambiguousgraphemebasegunjalagon" - "diompatjamooldsogdianvisargayiradicalsisposixsyriacwawjoiningtype" - "kehnorotatebothh3jvmasaramgondiathalphanummendekikakui1.0.111e-01" - ".250e-01.429e-01.500e+00.562e-02.563e-02.667e-01.875e-01nv=2.500e" - "-013.125e-02.333e-01.750e-01nv=4.167e-01.688e-02.000e-02nv=5.833e" - "-01nv=6.250e-02nv=8.333e-02oldhungarianphaistosdiscplayingcardspr" - "esentin=14tulutigalariwsegspacexidcontinueegeannumbersblock=cjkex" - "blockelementscaseignorablunassignedreekextendedvoweljamoincyrilli" - "cinethiopickatakanaextiscsymbolsinmyanmarnandinagariavagrahatonem" - "arkipaextensionsiscasedletterisgeorgiajoincontrolismyanmarisothei" - "sxposixblankjg=africanfehdalathrishknottedhehreversedpe=nonjoinin" - "glb=breaknonstarterwordjoinerowsurrogatesayannumeralsisctechnical" - "-5.000e-01patternsyntax5.26.1verticalformsncientsymbolsbc=rightto" - "leftblk=arabichanreadingemojicomponentgc=othereekandcoptichighsur" - "rogateslphabeticpfkhmersymbolsnonjoineriscyrillicisethiopicmahjon" - "gtileskashmiriyehrohingyayehstraightwawyehwithtail=dualjoining=jo" - "incausing=leftjoining=transparentbeforeexclamationinseparableinse" - "perableviramafinalnfcquickchecknumerictype=epresentin=v1psalterpa" - "hlaviquotationmarkdoublequotesinglequoteany_foldsquotemetaasciihe" - "xdigitarabicletterotherneutralblk=georgianblk=myanmardoubleabovek" - "anavoicingontrolpictureseastasianwidth=letternumbergraphemeextend" - "eadingjamoimperialaramaicoverstruckpurekillerdecimalnumberenclosi" - "ngmarkfinalsemkathverticaltail=rightjoininghebrewletterinfixnumer" - "icmeroiticcursiveiscpictographsnfdquickcheck36numericvalue=4oldno" - "rtharabianoldsoutharabian=extendnumletglueafterzwjzanabazarsquare" - "blk=cyrillicblk=ethiopicblock=arabicnotreorderedcypriotsyllabaryl" - "ineseparatorhalfandfullformshighpusurrogatestrailingjamoidsunaryo" - "peratorcompatformsgxiradicalsinlatinextendeddphoneticextsupdevana" - "gariextaislatinextendedisusupplementnonspacingmarklllajg=malayala" - "mnnnamemtawktoviknumeralsaksaraprebaseprefixnumericinearbideogram" - "siscmathsymbolsanfkcquickchecknumericvalue=1/numericvalue=5/8nume" - "ricvalue=70numericvalue=80numericvalue=9sentenceterminaltangutcom" - "ponentseuropeannumberanadiansyllabicscaucasianalbanianiotasubscri" - "ptemojipresentationgmodifiersymbolspaceseparatornotapplicableidco" - "mpatmathstartidsbinaryoperatorbraillepatternscurrencysymbolsindic" - "siyaqnumbersleftandrightnumberjoinervedicextensionsdashpunctuatio" - "ndiacriticalsexthangulsyllableslowercaseletteropenpunctuationhamz" - "aonhehgoalbethfivehethjg=manichaeankaphqophreshyodhqaphtethkhitan" - "smallscriptcarriagereturncomplexcontextmandatorybreakpostfixnumer" - "icetterlikesymbolszwspacenfkdquickchecknumericvalue=3/2regionalin" - "dicatorscriptextensions=mallformvariantsttonsignwritingboundaryne" - "utralcommonseparatorblk=latinextendedblock=cyrillicextcopticepact" - "numberstitlecaseletter=uppercaseletteridstrinaryoperatorinitialpu" - "nctuationlinearbsyllabaryiscmathsymbolsbbopomofoextendedclosepunc" - "tuationfinalpunctuation1supplementyriacsupplementalephgimelsadhez" - "ayinlaphzhainadditionalcontingentbreaknumericvalue=6ornamentaldin" - "gbatsparagraphseparatorpatternwhitespaceruminumeralsymbolssegment" - "separatorbamumsupplementdiacriticalssuptamilsupplementblock=kanae" - "mojimodifierbaselchemicalsymbolsindicconjunctbreakgeminationmarkv" - "oweldependenthanifirohingyapadalethlamedhsamekhtwentyyudhhe=close" - "parenthesisodifiertonelettersottomansiyaqnumbersatermarrowsawordb" - "reak=mi_perl_charname_beanatolianhieroglyphstangutsupplementblock" - "=latinextendedconnectorpunctuationextendedpictographicombininghal" - "fmarksneralpunctuationvisualorderleftmodifyingletterregistershift" - "erinscriptionalpahlavitaixuanjingsymbolscherokeesupplementmallkan" - "aextensiondhamedhhundred0000000000000000nyiakengpuachuehmongtermi" - "nalpunctuationverticalorientation=europeanterminatorfirststrongis" - "olateattachedbelowleftchangeswhencasefoldedchangeswhencasemappedc" - "hangeswhenlowercasedchangeswhentitlecasedchangeswhenuppercasedgra" - "phemeclusterbreak=identifiertype=notncientgreeknumbersountingrodn" - "umeralsmeroitichieroglyphsantillationmarkinvisiblestackerreorderi" - "ngkillersyllablemodifiervowelindependentinscriptionalparthianinsu" - "pplementalarrowsbnclosedalphanumsuphanguljamoextendedamongoliansu" - "pplementsundanesesupplementissupplementalarrowscaksarastartlogica" - "lorderexceptionnoncharactercodepointsinhalaarchaicnumbersvo=trans" - "formedrotatedyijinghexagramsymbolsoverridearabicnumberbidipairedb" - "rackettypeblock=ethiopicblock=georgiablock=myanmarmathoperatorsfo" - "ntdiacriticalsforsymbolsarlydynasticcuneiformidcompatmathcontinue" - "insc=consonantprefixedglagoliticsupplementburushaskiyehbarreeline" - "break=breakmodifiercombiningmarknumericvalue=2.5.125e-03.750e-02." - "250e-03bc=lefttorightembeddingpopdirectionalformatblhanguljamoext" - "endedbhangulcompatibilityjamoobsoletecompatibilityformsradicalssu" - "pplementsubjoinedjoininggroup=africanqafsentencebreak=shorthandfo" - "rmatcontrolsznamennymusicalnotationhighprivateusesurrogatesstatus" - "=allowedinclusioncompatideographssupommonindicnumberformsiscellan" - "eoustechnicalinpc=topandbottomandleftbrahmijoiningnumberheadlette" - "rpacingmodifierletterstransportandmapsymbolshanifirohingyakinnaya" - "joininggroup=malayalamfolds_to_multi_charmeeteimayekextensionsdev" - "anagariextendedachangeswhennfkccasefoldeddefaultignorablecodepoin" - "tfullcompositionexclusionlimitedusebyzantinemusicalsymbolsgyptian" - "hieroglyphsextaplaceholderwithstackerometricshapesextendedsupersc" - "riptsandsubscriptscanonicalcombiningclass=27halfwidthandfullwidth" - "formsrecommendeduncommonuseinarabicpresentationformsbombiningmark" - "sforsymbolsprependedconcatenationmarkis_in_multi_char_foldeuropea" - "nseparatorblk=supplementalcanonicalcombiningclass=128nclosedcjkle" - "ttersandmonthsstatus=restrictedymbolsandpictographsextanojoiningg" - "rouptehmarbutagoalopticalcharacterrecognitionbidiclass=lefttorigh" - "tbidiclass=righttoleftatarprecedingrephatakanaphoneticextensionss" - "upplementaryprivateuseareaacanonicalcombiningclass=ccc1succeeding" - "rephalphabeticpresentationformsancientgreekmusicalnotationconditi" - "onaljapanesestarteriscellaneoussymbolsandarrowsdecompositiontype=" - "nonhangulsyllabletype=lvtinitialpostfixedryprivateuseareabegyptia" - "nhieroglyphsextendedavariationselectorssupplementjoininggroup=man" - "ichaeanthamedhpopdirectionalisolatenclosedideographicsupplementat" - "hematicalalphanumericsymbolsgeneralcategory=otheideographicdescri" - "ptioncharactersincjkunifiedideographsextensnclosedalphanumericsup" - "plementiscjkunifiedideographsextensuneiformnumbersandpunctuationy" - "mbolsandpictographsextendedaaboveleftiscellaneousmathematicalsymb" - "olsablk=cjkunifiedideographsextensbelowrightideographicsymbolsand" - "punctuationmathematicalalphabeticsymbolsdoublebelowombiningdiacri" - "ticalmarksextendedindicpositionalcategory=topandinmiscellaneousma" - "thematicalsymbolsbgyptianhieroglyphformatcontrolsblock=cjkunified" - "ideographsextensindicsyllabiccategory=consonantiscellaneoussymbol" - "sandpictographsombiningdiacriticalmarksforsymbolsymbolsforlegacyc" - "omputingsupplement_perl_problematic_locale_foldeds_compatibilityi" - "deographssupplement=bottomandrighttransformeduprightombiningdiacr" - "iticalmarkssupplementblock=supplementalmathematicaloperatorsattac" - "hedaboverightisunifiedcanadianaboriginalsyllabicsextendeda"; -/* mph_blob length: 8963 */ + "latnlisumedfmercmteimymrnarbnewaoryaosgeougrpcmphlpphnxqaacrjngru" + "nrsamrsgnwtagstamltavttfngtglgtibttodrtolstutgwchoxpeoxsuxyiiizan" + "bzyyyzzzzcntrlcwcfcwkcfcwtgarayzpgcb=b2h2vfjlxxnushu3040nv=90oriy" + "apatwsprintqmarktailetakrivssupfsipdfcarianccc=12318491vre=yescha" + "kmacwcmsmlsqrgothicgrext3.26.3415161miaototoarmndiakgonmhanokhmrl" + "inamroonkooogamolckonaoorkhphliplrdprtiqaairohgshawsidtsogotnsava" + "iibehgafhahrehbunkhojkilydiannfdqcnv=3//5nv=7olonalpatsynrejangsb" + "=stangsatodhriebg2.13.04.06.07.08.09.052avestanccc=22e=truedesere" + "tdt=nonewideelbasanelymaicextpictgrbashanunoohst=lvtadlambuhiddog" + "ralimbuoghamosagerunictaiyobatakeemseenshinzainkannadakayahliline" + "aramandaicmarchennfkcqc-1/2/645/217/2olchikiosmanyahmnpkalilananb" + "atsarbshrdsyrczinhshaviansideticstermuaatagalogtaithamtaiviettibe" + "tanuideounknownage=10.0age=v1armenianbalinesebassavahbpt=opene=fa" + "lsecompexduployanextendergujaratigurmukhihiraganahatrankaithilepc" + "halycianteluguwanchoyezidijamoextbgamalkhaphkehcorkiratraimahajan" + "infkdqcnv=1/31/12erlwordlinbmlymnshuscx=talupecialstagbanwatifina" + "ghugariticvithkuqipfaberiaerfebhaiksuki2435nuktacirclemedialea=na" + "rrowmoticonsbengaliincbincjkexgranthainheritedinkanamakasarmultan" + "inoblockphagspasiddhamsoyombosunuwaruabtirhutaiscjkexlamadhkhudaw" + "adinabataeannewtailue1600032000olditalicoldpermicoldturkicolduygh" + "urpalmyrenepaucinhausamaritanthaanawb=mixidstartbasiclatinboxdraw" + "ingccc=ccc1chorasmianstrokesdeprecateddivesakuruorizspacebuginese" + "ingeorgiajamoextajavanesebinduiskanathinyehkharoshthiiscarrowsnag" + "mundarioldpersianphoeniciansaurashtraolettermallformssoftdottedto" + "longsikiwarangcitialetterwb=newlineerlspaceblk=cjkextdoverlaycypr" + "ominoandominotilesfractionisolatedgurungkhemapfb=linkerisarabicis" + "spaceisvertfarsiyehswashkafkehnomirrorlinefeednextlinemedefaidrin" + "nfcqc=maybepahawhhmongkthiscript=tayosorasompengerandsubsylotinag" + "riebasegazyisyllablesbidicontrolbidimirroredblk=kanaucasextahesss" + "ymbolsgraphemebasegunjalagondiompatjamooldsogdianvisargayiradical" + "sisposixsyriacwawjoiningtypekehnorotatebreakbothbkh3jvmasaramgond" + "iathalphanummendekikakui1.0.111e-01.250e-01.429e-01.500e+00.562e-" + "02.563e-02.667e-01.875e-01nv=2.500e-013.125e-02.333e-01.750e-01nv" + "=4.167e-01.688e-02.000e-02nv=5.833e-01nv=6.250e-02nv=8.333e-02old" + "hungarianphaistosdiscplayingcardspresentin=14tulutigalariwsegspac" + "exidcontinueegeannumbersblock=cjkexblockelementscaseignorablunass" + "ignedreekextendedvoweljamoincyrillicinethiopictakanaextinmyanmarn" + "andinagariavagrahatonemarkipaextensionsiscasedletterisgeorgiajoin" + "controlismyanmarisotheisxposixblankjg=africanfehdalathrishknotted" + "hehreversedpe=nonjoiningbreakafternonstarterwordjoinerowsurrogate" + "sayannumeralsisctechnical-5.000e-01patternsyntax5.26.1verticalfor" + "msncientsymbolsbc=righttoleftblk=arabichanreadingemojicomponentgc" + "=othereekandcoptichighsurrogateslphabeticpfnonjoineriscyrillicise" + "thiopickhmersymbolsmahjongtileskashmiriyehrohingyayehstraightwawy" + "ehwithtail=dualjoining=joincausing=leftjoining=transparentbreakbe" + "foreexclamationinseparableinseperableviramafinalnfcquickchecknume" + "rictype=epresentin=v1psalterpahlaviquotationmarkdoublequotesingle" + "quoteany_foldsquotemetaasciihexdigitarabicletterotherneutralblk=g" + "eorgianblk=myanmardoubleabovekanavoicingontrolpictureseastasianwi" + "dth=letternumbergraphemeextendeadingjamoimperialaramaicoverstruck" + "purekillerdecimalnumberenclosingmarkfinalsemkathverticaltail=righ" + "tjoininghebrewletterinfixnumericmeroiticcursiveiscpictographsnfdq" + "uickcheck36numericvalue=4oldnortharabianoldsoutharabian=extendnum" + "letglueafterzwjzanabazarsquareblk=cyrillicblk=ethiopicblock=arabi" + "cnotreorderedcypriotsyllabarylineseparatorhalfandfullformshighpus" + "urrogatestrailingjamoidsunaryoperatorcompatformsgxiradicalsinlati" + "nextendeddphoneticextsupdevanagariextaislatinextendedisusupplemen" + "tiscsymbolssupnonspacingmarklllajg=malayalamnnnamemtawktoviknumer" + "alslb=aksaraprebaseprefixnumericinearbideogramsiscmathsymbolsanfk" + "cquickchecknumericvalue=1/numericvalue=5/8numericvalue=70numericv" + "alue=80numericvalue=9sentenceterminaleuropeannumberanadiansyllabi" + "cscaucasianalbanianiotasubscriptemojipresentationmodifiersymbolsp" + "aceseparatornotapplicableidcompatmathstartidsbinaryoperatorbraill" + "epatternscurrencysymbolsindicsiyaqnumbersleftandrightnumberjoiner" + "vedicextensionsdashpunctuationdiacriticalsexthangulsyllableslower" + "caseletteropenpunctuationhamzaonhehgoalbethfivehethjg=manichaeank" + "aphqophreshyodhqaphtethkhitansmallscriptcarriagereturncomplexcont" + "extmandatorybreakpostfixnumericetterlikesymbolszwspacenfkdquickch" + "ecknumericvalue=3/2regionalindicatorscriptextensions=mallformvari" + "antsttonsignwritingboundaryneutralcommonseparatorblk=latinextende" + "dblock=cyrillicextcopticepactnumberstitlecaseletter=uppercaselett" + "eridstrinaryoperatorinitialpunctuationlinearbsyllabaryiscmathsymb" + "olsbbopomofoextendedclosepunctuationfinalpunctuation1supplementyr" + "iacsupplementalephgimelsadhezayinlaphzhainadditionalcontingentbre" + "aknumericvalue=6ornamentaldingbatsparagraphseparatorpatternwhites" + "paceruminumeralsymbolssegmentseparatorbamumsupplementdiacriticals" + "suptamilsupplementblock=kanaemojimodifierbaselchemicalsymbolsindi" + "cconjunctbreakgeminationmarkvoweldependentsharadasupplementhanifi" + "rohingyapadalethlamedhsamekhtwentyyudhhe=closeparenthesisodifiert" + "onelettersottomansiyaqnumbersatermarrowsawordbreak=mi_perl_charna" + "me_beanatolianhieroglyphstangutsupplementblock=latinextendedconne" + "ctorpunctuationextendedpictographicombininghalfmarksneralpunctuat" + "ionvisualorderleftmodifyingletterregistershifterinscriptionalpahl" + "avitaixuanjingsymbolscherokeesupplementmallkanaextensiondhamedhhu" + "ndredunambiguoushyphen0000000000000000nyiakengpuachuehmongtermina" + "lpunctuationverticalorientation=europeanterminatorfirststrongisol" + "ateattachedbelowleftchangeswhencasefoldedchangeswhencasemappedcha" + "ngeswhenlowercasedchangeswhentitlecasedchangeswhenuppercasedgraph" + "emeclusterbreak=identifiertype=notncientgreeknumbersountingrodnum" + "eralsmeroitichieroglyphsantillationmarkinvisiblestackerreordering" + "killersyllablemodifiervowelindependentinscriptionalparthianinsupp" + "lementalarrowsbnclosedalphanumsuphanguljamoextendedamongoliansupp" + "lementsundanesesupplementissupplementalarrowscthinnoonlinebreak=a" + "ksaralogicalorderexceptionnoncharactercodepointsinhalaarchaicnumb" + "ersvo=transformedrotatedyijinghexagramsymbolsword_but_noncontover" + "ridearabicnumberbidipairedbrackettypeblock=ethiopicblock=georgiab" + "lock=myanmarmathoperatorsfontdiacriticalsforsymbolsarlydynasticcu" + "neiformidcompatmathcontinueinsc=consonantprefixedglagoliticsupple" + "mentburushaskiyehbarreebreaksymbolsmodifiercombiningmark=numericv" + "alue=2.5.125e-03.750e-02.250e-03bc=lefttorightembeddingpopdirecti" + "onalformatblhanguljamoextendedbhangulcompatibilityjamoobsoletecom" + "patibilityformsradicalssupplementsubjoinedjoininggroup=africanqaf" + "sentencebreak=shorthandformatcontrolsznamennymusicalnotationhighp" + "rivateusesurrogatesstatus=allowedinclusioncompatideographssupommo" + "nindicnumberformsiscellaneoustechnicalinpc=topandbottomandleftbra" + "hmijoiningnumberheadletterpacingmodifierletterstransportandmapsym" + "bolshanifirohingyakinnayajoininggroup=malayalamfolds_to_multi_cha" + "rmeeteimayekextensionsdevanagariextendedachangeswhennfkccasefolde" + "ddefaultignorablecodepointfullcompositionexclusionlimitedusebyzan" + "tinemusicalsymbolsgyptianhieroglyphsextaplaceholderwithstackermet" + "ricshapesextendedsuperscriptsandsubscriptscanonicalcombiningclass" + "=27halfwidthandfullwidthformsrecommendeduncommonuseinarabicpresen" + "tationformsbombiningmarksforsymbolsprependedconcatenationmarkis_i" + "n_multi_char_foldeuropeanseparatorblk=supplementalcanonicalcombin" + "ingclass=128nclosedcjklettersandmonthsstatus=restrictedymbolsandp" + "ictographsextanojoininggrouptehmarbutagoalopticalcharacterrecogni" + "tionbidiclass=lefttorightbidiclass=righttoleftatarprecedingrephak" + "atakanaphoneticextensionstangutcomponentssupplementaryprivateusea" + "reaacanonicalcombiningclass=ccc1succeedingrephalphabeticpresentat" + "ionformsancientgreekmusicalnotationlb=conditionaljapanesestarteri" + "scellaneoussymbolsandarrowsdecompositiontype=nonhangulsyllabletyp" + "e=lvtphoneticextensionssupplementinitialpostfixedryprivateusearea" + "begyptianhieroglyphsextendedavariationselectorssupplementjoiningg" + "roup=manichaeanthamedhpopdirectionalisolatenclosedideographicsupp" + "lementathematicalalphanumericsymbolsgeneralcategory=otheideograph" + "icdescriptioncharactersincjkunifiedideographsextensinclosedalphan" + "umericsupplementmiscellaneoussymbolssupplementiscjkunifiedideogra" + "phsextensiuneiformnumbersandpunctuationymbolsandpictographsextend" + "edaaboveleftiscellaneousmathematicalsymbolsablk=cjkunifiedideogra" + "phsextensibelowrightideographicsymbolsandpunctuationmathematicala" + "lphabeticsymbolsdoublebelowombiningdiacriticalmarksextendedindicp" + "ositionalcategory=topandiscellaneousmathematicalsymbolsbgyptianhi" + "eroglyphformatcontrolsblock=cjkunifiedideographsextensiindicsylla" + "biccategory=consonantiscellaneoussymbolsandpictographsombiningdia" + "criticalmarksforsymbolsymbolsforlegacycomputingsupplement_perl_pr" + "oblematic_locale_foldeds_compatibilityideographssupplement=bottom" + "andrighttransformeduprightombiningdiacriticalmarkssupplementblock" + "=supplementalmathematicaloperatorsattachedaboverightisunifiedcana" + "dianaboriginalsyllabicsextendeda"; +/* mph_blob length: 9132 */ struct mph_struct { U16 seed2; @@ -172,7797 +175,7919 @@ struct mph_struct { }; #define MPH_RSHIFT 8 -#define MPH_BUCKETS 7784 +#define MPH_BUCKETS 7906 -STATIC const U32 MPH_SEED1 = 0x5065726f; -STATIC const U32 MPH_FNV32_PRIME = 0x01000193; +static const U32 MPH_SEED1 = 0x5065726f; +static const U32 MPH_FNV32_PRIME = 0x01000193; /* The comments give the input key for the row it is in */ -STATIC const struct mph_struct mph_table[MPH_BUCKETS] = { - { 0, 135, 312, 2, 2, UNI_RI } /* isri */, - { 1, 135, 4669, 2, 18, UNI_COPTICEPACTNUMBERS } /* iscopticepactnumbers */, - { 0, 135, 1965, 2, 8, UNI_UCASEXTA } /* isucasexta */, - { 8, 135, 197, 2, 4, UNI_SGNW } /* issgnw */, - { 4, 323, 1057, 2, 8, UNI_JAMOEXTB } /* injamoextb */, - { 0, 6431, 163, 10, 2, UNI_LB__SG } /* linebreak=sg */, - { 1, 265, 0, 2, 0, UNI_CASEDLETTER } /* lc */, - { 2, 2394, 1270, 6, 7, UNI_INMULTANI } /* block=multani */, - { 5, 2394, 5383, 6, 18, UNI_HALFMARKS } /* block=combininghalfmarks */, - { 0, 6372, 1315, 3, 7, UNI_SC__TIRH } /* sc=tirhuta */, - { 1, 1245, 0, 4, 0, UNI_THAI } /* thai */, - { 2, 7979, 5182, 23, 6, UNI_JG__MANICHAEANTWENTY } /* joininggroup=manichaeantwenty */, - { 0, 8088, 5352, 20, 12, UNI_PO } /* generalcategory=otherpunctuation */, - { 1, 4557, 126, 17, 3, UNI_LAO } /* scriptextensions=lao */, - { 2, 2080, 2654, 10, 3, -UNI_KEHNOROTATE } /* kehnorotate=n */, - { 0, 2785, 0, 3, 0, UNI_bc_values_index } /* bc= */, - { 1, 7847, 650, 18, 4, UNI_EA__F } /* decompositiontype=wide */, - { 3, 2, 6, 2, 2, UNI_CWCM } /* cwcm */, - { 0, 6372, 502, 3, 4, UNI_SOGO } /* sc=sogo */, - { 0, 1509, 0, 10, 0, UNI_DIAK } /* divesakuru */, - { 2, 1441, 5930, 3, 9, UNI_WB__EB } /* wb=emodifier */, - { 0, 316, 631, 5, 2, UNI__PERL_PATWS } /* patws=t */, - { 1, 2471, 1061, 10, 4, UNI_ETHIOPICEXTB } /* inethiopicextb */, - { 1, 2564, 5081, 3, 5, UNI_GRBASE } /* isgrbase */, - { 2, 6370, 1200, 14, 6, UNI_INSC__CONSONANTMEDIAL } /* insc=consonantmedial */, - { 0, 6229, 645, 21, 5, UNI_BPT__N } /* bidipairedbrackettype=none */, - { 1, 358, 2668, 3, 2, UNI_CCC__B } /* ccc=b */, - { 2, 32, 373, 2, 2, UNI_VS } /* vs=y */, - { 1, 1471, 2440, 3, 7, UNI_GREEKEXT } /* ingreekext */, - { 1, 323, 377, 2, 6, UNI_INCHAKMA } /* inchakma */, - { 0, 4557, 1880, 16, 5, UNI_MLYM } /* scriptextensions=mlym */, - { 2, 6372, 1628, 3, 10, UNI_SAUR } /* sc=saurashtra */, - { 3, 323, 6707, 2, 23, UNI_ZNAMENNYMUSIC } /* inznamennymusicalnotation */, - { 2, 6277, 2492, 7, 10, UNI_MISCSYMBOLS } /* block=miscsymbols */, - { 0, 6372, 1408, 3, 9, UNI_PALM } /* sc=palmyrene */, - { 7, 2394, 5148, 6, 14, UNI_INHANIFIROHINGYA } /* block=hanifirohingya */, - { 0, 2238, 1364, 4, 2, UNI_NV__400 } /* nv=400 */, - { 0, 6372, 2878, 3, 5, UNI_KHMR } /* sc=khmer */, - { 3, 3098, 645, 5, 2, -UNI_EPRES } /* epres=n */, - { 2, 2666, 3860, 3, 13, UNI_LB__AP } /* lb=aksaraprebase */, - { 0, 1848, 0, 11, 0, UNI_NFCQC__M } /* nfcqc=maybe */, - { 2, 8140, 5361, 28, 4, UNI_CJKEXTE } /* incjkunifiedideographsextensione */, - { 0, 1874, 2919, 7, 4, UNI_SC__MAHJ } /* script=mahj */, - { 3, 8596, 3314, 31, 4, UNI_INSC__CONSONANTDEAD } /* indicsyllabiccategory=consonantdead */, - { 9, 8596, 1189, 22, 5, UNI_INSC__NUKTA } /* indicsyllabiccategory=nukta */, - { 0, 2584, 7819, 3, 19, UNI_MISCSYMBOLS } /* ismiscellaneoussymbols */, - { 1, 4557, 815, 17, 7, UNI_OSMA } /* scriptextensions=osmanya */, - { 0, 3696, 631, 4, 2, UNI_IDSU } /* idsu=t */, - { 1, 6372, 1598, 3, 10, UNI_NAGM } /* sc=nagmundari */, - { 3, 1322, 4206, 3, 14, UNI_CURRENCYSYMBOLS } /* iscurrencysymbols */, - { 2, 1126, 1298, 4, 4, UNI_SOYO } /* scx=soyo */, - { 0, 1696, 6188, 4, 6, UNI_YIJING } /* blk=yijing */, - { 1, 2069, 2999, 11, 12, UNI_JT__L } /* joiningtype=leftjoining */, - { 2, 2069, 630, 10, 3, UNI_JT__T } /* joiningtype=t */, - { 0, 1126, 458, 4, 3, UNI_NKO } /* scx=nko */, - { 2, 2394, 5014, 6, 8, UNI_BAMUMSUP } /* block=bamumsup */, - { 5, 6647, 2622, 13, 3, UNI_JG__FEH } /* joininggroup=feh */, - { 2, 323, 1083, 2, 8, UNI_INMAHAJANI } /* inmahajani */, - { 0, 1945, 631, 5, 5, UNI_BIDIM } /* bidim=true */, - { 9, 3599, 8396, 12, 29, UNI_ARABICMATH } /* block=arabicmathematicalalphabeticsymbols */, - { 0, 6372, 876, 3, 7, UNI_SC__TGLG } /* sc=tagalog */, - { 9, 4321, 630, 8, 3, UNI_XPOSIXLOWER } /* lowercase=t */, - { 0, 2201, 0, 4, 0, UNI_NV__2 } /* nv=2 */, - { 0, 482, 0, 4, 0, UNI_MIAO } /* plrd */, - { 0, 135, 2573, 2, 5, UNI_JOINC } /* isjoinc */, - { 1, 924, 3974, 5, 2, UNI_AGE__7 } /* age=v70 */, - { 1, 8088, 387, 16, 2, UNI_SM } /* generalcategory=sm */, - { 0, 4557, 458, 17, 4, UNI_NKO } /* scriptextensions=nkoo */, - { 1, 4913, 5549, 14, 4, UNI_NV__60000 } /* numericvalue=60000 */, - { 0, 6264, 7187, 8, 16, UNI_GEOMETRICSHAPESEXT } /* block=geometricshapesext */, - { 0, 451, 5290, 3, 19, UNI_INANATOLIANHIEROGLYPHS } /* inanatolianhieroglyphs */, - { 0, 2666, 8037, 3, 11, UNI_LB__ID } /* lb=ideographic */, - { 2, 33, 6891, 1, 21, UNI_MODIFIERLETTERS } /* spacingmodifierletters */, - { 5, 135, 6392, 2, 10, UNI_GLAG } /* isglagolitic */, - { 1, 7233, 302, 24, 2, UNI_CCC__30 } /* canonicalcombiningclass=30 */, - { 0, 5260, 0, 10, 0, UNI_wb_values_index } /* wordbreak= */, - { 0, 135, 6715, 2, 5, UNI_MUSIC } /* ismusic */, - { 3, 1126, 5289, 4, 20, UNI_HLUW } /* scx=anatolianhieroglyphs */, - { 0, 2394, 2481, 6, 8, UNI_INKATAKANA } /* block=katakana */, - { 1, 6431, 291, 10, 2, UNI_LB__VF } /* linebreak=vf */, - { 2, 1696, 999, 4, 8, UNI_INGURMUKHI } /* blk=gurmukhi */, - { 2, 8095, 6544, 9, 6, UNI_CF } /* category=format */, - { 1, 1696, 6620, 7, 18, UNI_CJKRADICALSSUP } /* blk=cjkradicalssupplement */, - { 0, 323, 1027, 2, 6, UNI_INLEPCHA } /* inlepcha */, - { 1, 4557, 1408, 17, 4, UNI_PALM } /* scriptextensions=palm */, - { 1, 671, 0, 2, 0, UNI_PI } /* pi */, - { 1, 3073, 6280, 11, 4, UNI_NFCQC__M } /* nfcquickcheck=m */, - { 0, 1499, 631, 3, 2, UNI_DEP } /* dep=t */, - { 2, 135, 4785, 2, 16, UNI_BOPOMOFOEXT } /* isbopomofoextended */, - { 0, 6372, 1291, 3, 4, UNI_SIDD } /* sc=sidd */, - { 25, 1696, 1435, 4, 6, UNI_INTHAANA } /* blk=thaana */, - { 0, 2394, 2481, 6, 11, UNI_KATAKANAEXT } /* block=katakanaext */, - { 1, 7309, 0, 24, 0, UNI_ARABICPFB } /* arabicpresentationformsb */, - { 0, 2584, 8058, 3, 30, UNI_MATHALPHANUM } /* ismathematicalalphanumericsymbols */, - { 0, 1696, 890, 4, 7, UNI_INTAIVIET } /* blk=taiviet */, - { 0, 3491, 804, 13, 4, UNI_NV__17_SLASH_2 } /* numericvalue=17/2 */, - { 0, 1696, 6602, 7, 18, UNI_CJKCOMPATFORMS } /* blk=cjkcompatibilityforms */, - { 0, 1126, 654, 4, 4, UNI_ELBA } /* scx=elba */, - { 4, 135, 2878, 2, 5, UNI_KHMR } /* iskhmer */, - { 0, 7847, 7233, 21, 5, UNI_DT__NONCANON } /* decompositiontype=noncanon */, - { 1, 4557, 249, 17, 4, UNI_ZANB } /* scriptextensions=zanb */, - { 1, 135, 1859, 2, 11, UNI_HMNG } /* ispahawhhmong */, - { 2, 7420, 873, 8, 3, UNI_SUPPUAA } /* blk=suppuaa */, - { 9, 8095, 558, 9, 2, UNI_LO } /* category=lo */, - { 5, 4097, 373, 17, 4, UNI_EPRES } /* emojipresentation=yes */, - { 2, 285, 577, 2, 2, UNI_S } /* gc=s */, - { 1, 5069, 631, 13, 2, UNI_EMOD } /* emojimodifier=t */, - { 4, 1126, 6392, 4, 4, UNI_GLAG } /* scx=glag */, - { 1, 3778, 4832, 6, 12, UNI_LATIN1 } /* islatin1supplement */, - { 1, 8088, 2387, 16, 6, UNI_N } /* generalcategory=number */, - { 0, 6372, 110, 3, 4, UNI_KAWI } /* sc=kawi */, - { 2, 924, 304, 6, 2, UNI_AGE__14 } /* age=v140 */, - { 2, 4321, 631, 5, 5, UNI_XPOSIXLOWER } /* lower=true */, - { 1, 135, 2819, 2, 14, UNI_ECOMP } /* isemojicomponent */, - { 1, 3945, 798, 14, 2, UNI_NV__5_SLASH_6 } /* numericvalue=5/6 */, - { 0, 6647, 4869, 13, 3, UNI_JG__SAD } /* joininggroup=sad */, - { 2, 135, 4115, 2, 4, UNI_MODI } /* ismodi */, - { 1, 30, 6911, 1, 16, UNI_TRANSPORTANDMAP } /* istransportandmap */, - { 0, 2394, 890, 6, 7, UNI_INTAIVIET } /* block=taiviet */, - { 1, 1696, 1399, 4, 9, UNI_INOLDUYGHUR } /* blk=olduyghur */, - { 2, 135, 358, 2, 2, UNI_XPOSIXCNTRL } /* iscc */, - { 1, 21, 7143, 1, 22, UNI_EGYPTIANHIEROGLYPHSEXTA } /* egyptianhieroglyphsexta */, - { 0, 30, 1992, 1, 13, UNI_GRBASE } /* isgraphemebase */, - { 2, 3178, 631, 13, 5, UNI_POSIXXDIGIT } /* asciihexdigit=true */, - { 0, 358, 605, 5, 2, UNI_CCC__107 } /* ccc=107 */, - { 1, 323, 8693, 2, 35, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* insymbolsforlegacycomputingsupplement */, - { 1, 7233, 7461, 25, 2, UNI_CCC__AL } /* canonicalcombiningclass=228 */, - { 0, 135, 1435, 2, 4, UNI_THAA } /* isthaa */, - { 1, 1993, 962, 11, 3, -UNI_GRBASE } /* graphemebase=f */, - { 2, 323, 2292, 2, 2, UNI_IN__8 } /* in=8 */, - { 2, 334, 3292, 3, 9, UNI_NL } /* letternumber */, - { 0, 135, 3185, 2, 6, UNI_XPOSIXXDIGIT } /* isxdigit */, - { 1, 815, 0, 4, 0, UNI_OSMA } /* osma */, - { 0, 1696, 4190, 4, 7, UNI_BRAI } /* blk=braille */, - { 1, 1874, 1298, 7, 4, UNI_SOYO } /* script=soyo */, - { 1, 4557, 150, 17, 4, UNI_NARB } /* scriptextensions=narb */, - { 3, 2612, 6934, 3, 21, UNI_JG__HANIFIROHINGYAKINNAYA } /* jg=hanifirohingyakinnaya */, - { 4, 1126, 74, 4, 4, UNI_CYRL } /* scx=cyrl */, - { 1, 924, 2179, 5, 2, UNI_AGE__6_DOT_3 } /* age=v63 */, - { 5, 2833, 265, 3, 2, UNI_CASEDLETTER } /* gc=lc */, - { 0, 1276, 1391, 3, 8, UNI_INOLDTURKIC } /* inoldturkic */, - { 0, 30, 4686, 1, 16, UNI_TITLE } /* istitlecaseletter */, - { 10, 18, 939, 1, 7, UNI_BALI } /* balinese */, - { 0, 1934, 373, 11, 2, UNI_BIDIC } /* bidicontrol=y */, - { 0, 2785, 346, 3, 3, UNI_BC__FSI } /* bc=fsi */, - { 0, 5260, 3548, 10, 12, UNI_WB__EB } /* wordbreak=glueafterzwj */, - { 2, 3227, 2718, 5, 12, UNI_MISCTECHNICAL } /* blk=misctechnical */, - { 0, 4557, 2511, 17, 11, UNI_NAND } /* scriptextensions=nandinagari */, - { 1, 434, 1207, 2, 3, -UNI_DIA } /* dia=n */, - { 1, 6104, 963, 21, 6, -UNI_LOE } /* logicalorderexception=false */, - { 0, 135, 1608, 2, 10, UNI_XPEO } /* isoldpersian */, - { 0, 135, 474, 2, 4, UNI_ORKH } /* isorkh */, - { 0, 2666, 591, 3, 2, UNI_EBASE } /* lb=eb */, - { 0, 3930, 5549, 14, 16, UNI_NV__10000000000000000 } /* numericvalue=10000000000000000 */, - { 0, 6370, 7176, 14, 11, UNI_INSC__CONSONANTWITHSTACKER } /* insc=consonantwithstacker */, - { 1, 8324, 5526, 24, 10, UNI_CJKEXTD } /* blk=cjkunifiedideographsextensiond */, - { 1, 563, 963, 6, 2, -UNI_PATSYN } /* patsyn=f */, - { 2, 1499, 963, 3, 6, -UNI_DEP } /* dep=false */, - { 8, 30, 4686, 1, 6, UNI_TITLE } /* istitle */, - { 5, 1447, 373, 7, 2, UNI_IDS } /* idstart=y */, - { 2, 7585, 5642, 10, 18, UNI_BC__FSI } /* bidiclass=firststrongisolate */, - { 1, 1874, 146, 7, 4, UNI_SC__MYMR } /* script=mymr */, - { 3, 1874, 4414, 7, 17, UNI_KITS } /* script=khitansmallscript */, - { 18, 4557, 3764, 17, 10, UNI_DEVA } /* scriptextensions=devanagari */, - { 29, 2461, 1703, 10, 4, UNI_CYRILLICEXTD } /* incyrillicextd */, - { 4, 6372, 1664, 3, 4, UNI_WARA } /* sc=wara */, - { 0, 6670, 4702, 13, 6, UNI_SB__UP } /* sentencebreak=upper */, - { 2, 8596, 2835, 21, 6, UNI_INSC__OTHER } /* indicsyllabiccategory=other */, - { 3, 2290, 2732, 4, 8, UNI_NV__4_SLASH_5 } /* nv=8.000e-01 */, - { 1, 1126, 55, 4, 4, UNI_CHAM } /* scx=cham */, - { 0, 3736, 4888, 8, 10, UNI_LATINEXTADDITIONAL } /* latinextadditional */, - { 0, 306, 416, 3, 2, UNI_NV__41 } /* nv=41 */, - { 1, 4557, 510, 17, 3, UNI_VAI } /* scriptextensions=vai */, - { 1, 1810, 4701, 10, 2, UNI_kehnomirror_values_index } /* kehnomirror= */, - { 0, 7697, 366, 28, 1, UNI_CCC__18 } /* canonicalcombiningclass=ccc18 */, - { 13, 1874, 1859, 7, 11, UNI_HMNG } /* script=pahawhhmong */, - { 21, 5803, 1499, 15, 10, UNI_DEP } /* identifiertype=deprecated */, - { 0, 869, 645, 4, 3, -UNI_TERM } /* term=no */, - { 10, 358, 361, 3, 3, UNI_CCC__12 } /* ccc=12 */, - { 1, 6467, 5549, 14, 7, UNI_NV__20000000 } /* numericvalue=20000000 */, - { 3, 6372, 1149, 3, 8, UNI_SC__TFNG } /* sc=tifinagh */, - { 0, 135, 1464, 2, 10, UNI_BOXDRAWING } /* isboxdrawing */, - { 1, 358, 120, 4, 2, UNI_CCC__DA } /* ccc=da */, - { 0, 2394, 6912, 6, 22, UNI_TRANSPORTANDMAP } /* block=transportandmapsymbols */, - { 1, 30, 5308, 1, 7, UNI_TANG } /* istangut */, - { 0, 2394, 422, 6, 4, UNI_INMIAO } /* block=miao */, - { 0, 1097, 1367, 5, 3, UNI_NV__1_SLASH_320 } /* nv=1/320 */, - { 3, 3587, 2444, 12, 8, UNI_ETHIOPICEXT } /* blk=ethiopicextended */, - { 0, 883, 0, 7, 0, UNI_LANA } /* taitham */, - { 0, 323, 5827, 2, 5, UNI_INGREEK } /* ingreek */, - { 0, 7061, 631, 25, 2, UNI_DI } /* defaultignorablecodepoint=t */, - { 0, 1447, 373, 4, 2, UNI_IDST } /* idst=y */, - { 1, 2584, 2492, 3, 10, UNI_MISCSYMBOLS } /* ismiscsymbols */, - { 1, 323, 331, 2, 5, UNI_INTAILE } /* intaile */, - { 0, 8088, 0, 16, 2, UNI_CASEDLETTER } /* generalcategory=l& */, - { 0, 2345, 603, 3, 3, UNI_IN__6 } /* in=6.0 */, - { 2, 1149, 0, 8, 0, UNI_TFNG } /* tifinagh */, - { 0, 30, 6933, 1, 5, UNI_HAN } /* ishani */, - { 1, 135, 4980, 2, 4, UNI_RUMI } /* isrumi */, - { 0, 1696, 6801, 4, 16, UNI_INDICNUMBERFORMS } /* blk=indicnumberforms */, - { 0, 1874, 557, 7, 6, UNI_SC__ONAO } /* script=olonal */, - { 2, 1126, 4379, 3, 11, UNI_MANI } /* scx=manichaean */, - { 0, 8197, 4111, 28, 4, UNI_CJKEXTG } /* iscjkunifiedideographsextensiong */, - { 0, 245, 0, 4, 0, UNI_YI } /* yiii */, - { 2, 2026, 0, 10, 0, UNI_SOGO } /* oldsogdian */, - { 4, 4377, 4398, 13, 4, UNI_JG__MANICHAEANRESH } /* jg=manichaeanresh */, - { 0, 4557, 173, 17, 4, UNI_PHLP } /* scriptextensions=phlp */, - { 0, 16, 1476, 1, 4, UNI_XPOSIXCNTRL } /* gc=cc */, - { 1, 135, 704, 2, 4, UNI_DOGR } /* isdogr */, - { 0, 343, 5990, 3, 7, UNI_SUPARROWSB } /* suparrowsb */, - { 3, 2612, 6667, 3, 3, UNI_JG__QAF } /* jg=qaf */, - { 1, 135, 1375, 2, 4, UNI_ITAL } /* isital */, - { 4, 6372, 158, 3, 4, UNI_SC__ORYA } /* sc=orya */, - { 0, 358, 3062, 4, 6, UNI_CCC__9 } /* ccc=virama */, - { 0, 1696, 5383, 4, 18, UNI_HALFMARKS } /* blk=combininghalfmarks */, - { 30, 2584, 759, 3, 3, UNI_MAKA } /* ismaka */, - { 0, 1874, 861, 7, 7, UNI_SC__SHAW } /* script=shavian */, - { 1, 3178, 373, 13, 2, UNI_POSIXXDIGIT } /* asciihexdigit=y */, - { 2, 6670, 638, 14, 2, UNI_SB__SE } /* sentencebreak=se */, - { 1, 3945, 1364, 14, 3, UNI_NV__5000 } /* numericvalue=5000 */, - { 2, 4652, 4793, 14, 9, UNI_CYRILLICEXTC } /* block=cyrillicextendedc */, - { 1, 1696, 1885, 4, 11, UNI_INSORASOMPENG } /* blk=sorasompeng */, - { 0, 1234, 1061, 5, 4, UNI_CJKEXTB } /* incjkextb */, - { 1, 323, 4639, 2, 14, UNI_LATINEXTB } /* inlatinextendedb */, - { 0, 8088, 8609, 7, 10, UNI_C } /* generalcategory=c */, - { 1, 4557, 1390, 17, 9, UNI_ORKH } /* scriptextensions=oldturkic */, - { 1, 8197, 0, 22, 0, UNI_CJK } /* iscjkunifiedideographs */, - { 0, 1874, 1264, 8, 6, UNI_MAKA } /* script=makasar */, - { 0, 1305, 0, 7, 0, UNI_SUNU } /* sunuwar */, - { 4, 1566, 762, 4, 5, UNI_KALI } /* iskayahli */, - { 1, 1696, 1965, 4, 7, UNI_UCASEXT } /* blk=ucasext */, - { 0, 1126, 1051, 4, 6, UNI_YEZI } /* scx=yezidi */, - { 3, 1696, 1592, 4, 6, UNI_ARROWS } /* blk=arrows */, - { 5, 170, 645, 3, 3, -UNI_PCM } /* pcm=no */, - { 4, 135, 4937, 2, 8, UNI_DINGBATS } /* isdingbats */, - { 2, 2201, 2732, 4, 8, UNI_NV__1_SLASH_5 } /* nv=2.000e-01 */, - { 0, 2833, 1977, 3, 6, UNI_S } /* gc=symbol */, - { 0, 6229, 5813, 17, 6, UNI_BPT__N } /* bidipairedbrackettype=n */, - { 1, 8088, 4276, 16, 15, UNI_PD } /* generalcategory=dashpunctuation */, - { 5, 30, 1724, 1, 7, UNI_DOMINO } /* indomino */, - { 0, 1500, 4572, 4, 2, UNI_epres_values_index } /* epres= */, - { 1, 2394, 32, 6, 2, UNI_INVS } /* block=vs */, - { 0, 1234, 8761, 5, 33, UNI_CJKCOMPATIDEOGRAPHSSUP } /* incjkcompatibilityideographssupplement */, - { 0, 323, 8108, 2, 32, UNI_INIDC } /* inideographicdescriptioncharacters */, - { 1, 135, 2350, 2, 12, UNI_TUTG } /* istulutigalari */, - { 1, 6372, 4620, 3, 6, UNI_SC__ZYYY } /* sc=common */, - { 0, 7979, 4410, 23, 4, UNI_JG__MANICHAEANTETH } /* joininggroup=manichaeanteth */, - { 0, 323, 1141, 2, 8, UNI_INTAGBANWA } /* intagbanwa */, - { 4, 135, 185, 2, 4, UNI_RJNG } /* isrjng */, - { 0, 3491, 1363, 13, 4, UNI_NV__6000 } /* numericvalue=6000 */, - { 0, 6372, 35, 3, 4, UNI_BATK } /* sc=batk */, - { 0, 1874, 6053, 7, 4, UNI_SUND } /* script=sund */, - { 0, 135, 563, 2, 6, UNI_PATSYN } /* ispatsyn */, - { 1, 3734, 4666, 7, 4, UNI_LATINEXTC } /* inlatinextc */, - { 2, 217, 16, 3, 1, UNI_TGLG } /* tglg */, - { 2, 5976, 4741, 12, 13, UNI_SUPPUNCTUATION } /* insupplementalpunctuation */, - { 41, 4557, 654, 17, 7, UNI_ELBA } /* scriptextensions=elbasan */, - { 5, 135, 3520, 2, 15, UNI_SARB } /* isoldsoutharabian */, - { 0, 6372, 3764, 3, 4, UNI_SC__DEVA } /* sc=deva */, - { 1, 8108, 0, 32, 0, UNI_INIDC } /* ideographicdescriptioncharacters */, - { 0, 4557, 331, 17, 5, UNI_TALE } /* scriptextensions=taile */, - { 0, 4557, 59, 17, 4, UNI_CHRS } /* scriptextensions=chrs */, - { 1, 3930, 366, 15, 1, UNI_NV__1_SLASH_8 } /* numericvalue=1/8 */, - { 0, 8088, 1938, 16, 7, UNI_XPOSIXCNTRL } /* generalcategory=control */, - { 0, 5276, 0, 2, 0, UNI_CASEDLETTER } /* l_ */, - { 3, 4718, 963, 18, 2, -UNI_IDST } /* idstrinaryoperator=f */, - { 3, 1126, 1960, 3, 5, UNI_KANA } /* scx=kana */, - { 1, 110, 0, 4, 0, UNI_KAWI } /* kawi */, - { 1, 4557, 6034, 17, 9, UNI_MONG } /* scriptextensions=mongolian */, - { 2, 1126, 4190, 4, 4, UNI_BRAI } /* scx=brai */, - { 0, 1874, 3423, 7, 6, UNI_SC__HEBR } /* script=hebrew */, - { 0, 1126, 1417, 4, 9, UNI_PAUC } /* scx=paucinhau */, - { 1, 4703, 962, 8, 3, -UNI_XPOSIXUPPER } /* uppercase=f */, - { 2, 2833, 138, 3, 2, UNI_ME } /* gc=me */, - { 0, 135, 6188, 2, 6, UNI_YIJING } /* isyijing */, - { 0, 7036, 963, 25, 6, -UNI_CWKCF } /* changeswhennfkccasefolded=false */, - { 0, 1441, 3541, 5, 7, UNI_WB__MB } /* wb=midnumlet */, - { 6, 3491, 804, 13, 2, UNI_NV__17 } /* numericvalue=17 */, - { 1, 7233, 2175, 25, 2, UNI_CCC__202 } /* canonicalcombiningclass=202 */, - { 0, 4557, 2350, 17, 12, UNI_TUTG } /* scriptextensions=tulutigalari */, - { 0, 788, 645, 6, 3, UNI_NFKCQC__N } /* nfkcqc=no */, - { 6, 4970, 372, 9, 3, UNI_XPOSIXSPACE } /* whitespace=y */, - { 2, 4557, 442, 17, 3, UNI_HAN } /* scriptextensions=han */, - { 1, 8468, 6849, 24, 13, UNI_INPC__BOTTOMANDLEFT } /* indicpositionalcategory=bottomandleft */, - { 1, 1498, 373, 2, 2, UNI_SD } /* sd=y */, - { 3, 1126, 4414, 4, 17, UNI_KITS } /* scx=khitansmallscript */, - { 8, 7233, 2802, 23, 3, UNI_CCC__AR } /* canonicalcombiningclass=ar */, - { 5, 285, 645, 2, 2, UNI_N } /* gc=n */, - { 3, 2599, 1993, 8, 5, UNI_XPOSIXGRAPH } /* isxposixgraph */, - { 2, 0, 831, 1, 3, UNI_LANA } /* lana */, - { 1, 6372, 177, 3, 4, UNI_PHNX } /* sc=phnx */, - { 1, 2394, 7923, 6, 19, UNI_INEGYPTIANHIEROGLYPHS } /* block=egyptianhieroglyphs */, - { 0, 434, 631, 3, 5, UNI_DIA } /* dia=true */, - { 0, 2394, 1715, 7, 10, UNI_INCYPROMINOAN } /* block=cyprominoan */, - { 2, 135, 1015, 2, 6, UNI_HATR } /* ishatran */, - { 26, 135, 1291, 2, 4, UNI_SIDD } /* issidd */, - { 0, 1097, 5549, 4, 12, UNI_NV__1000000000000 } /* nv=1000000000000 */, - { 2, 5325, 4487, 7, 16, UNI_LETTERLIKESYMBOLS } /* block=letterlikesymbols */, - { 4, 7036, 645, 25, 2, -UNI_CWKCF } /* changeswhennfkccasefolded=n */, - { 0, 358, 2809, 4, 4, UNI_CCC__6 } /* ccc=hanr */, - { 2, 2266, 1104, 4, 3, UNI_NV__5_SLASH_12 } /* nv=5/12 */, - { 3, 1474, 804, 7, 2, UNI_CCC__17 } /* ccc=ccc17 */, - { 0, 1126, 205, 4, 4, UNI_TAML } /* scx=taml */, - { 2, 2080, 372, 10, 2, UNI_kehnorotate_values_index } /* kehnorotate= */, - { 6, 2833, 327, 3, 4, UNI_M } /* gc=mark */, - { 0, 6372, 90, 3, 4, UNI_SC__GUJR } /* sc=gujr */, - { 3, 2394, 1277, 6, 7, UNI_NB } /* block=noblock */, - { 5, 4557, 1381, 17, 9, UNI_PERM } /* scriptextensions=oldpermic */, - { 2, 945, 962, 4, 3, -UNI_EBASE } /* ebase=f */, - { 1, 135, 1372, 2, 9, UNI_ITAL } /* isolditalic */, - { 1, 135, 529, 2, 4, UNI_KHOJ } /* iskhoj */, - { 0, 2345, 596, 3, 2, UNI_IN__13 } /* in=13 */, - { 1, 4524, 5549, 14, 4, UNI_NV__30000 } /* numericvalue=30000 */, - { 0, 8088, 0, 16, 0, UNI_gc_values_index } /* generalcategory= */, - { 0, 1230, 645, 4, 5, UNI_INCB__NONE } /* incb=none */, - { 0, 7739, 0, 27, 0, UNI_ALPHABETICPF } /* alphabeticpresentationforms */, - { 0, 8095, 3293, 12, 8, UNI_NO } /* category=othernumber */, - { 2, 5014, 0, 5, 0, UNI_BAMU } /* bamum */, - { 3, 6647, 750, 13, 3, UNI_JG__AIN } /* joininggroup=ain */, - { 1, 323, 4980, 2, 18, UNI_RUMI } /* inruminumeralsymbols */, - { 0, 6431, 1984, 10, 9, UNI_LB__AI } /* linebreak=ambiguous */, - { 1, 135, 4173, 2, 17, UNI_IDSB } /* isidsbinaryoperator */, - { 4, 1696, 2060, 4, 6, UNI_INSYRIAC } /* blk=syriac */, - { 9, 6838, 0, 17, 0, UNI_INPC__TOPANDBOTTOM } /* inpc=topandbottom */, - { 0, 7739, 645, 10, 2, -UNI_XPOSIXALPHA } /* alphabetic=n */, - { 0, 1696, 8364, 4, 18, UNI_IDEOGRAPHICSYMBOLS } /* blk=ideographicsymbols */, - { 8, 6372, 47, 3, 4, UNI_SC__CAKM } /* sc=cakm */, - { 3, 358, 556, 4, 1, UNI_CCC__7 } /* ccc=7 */, - { 1, 358, 370, 4, 2, UNI_CCC__9 } /* ccc=vr */, - { 0, 1696, 4220, 4, 17, UNI_INDICSIYAQNUMBERS } /* blk=indicsiyaqnumbers */, - { 4, 6446, 645, 21, 2, -UNI_MCM } /* modifiercombiningmark=n */, - { 1, 323, 2538, 2, 13, UNI_IPAEXT } /* inipaextensions */, - { 0, 5930, 0, 4, 0, UNI_EMOD } /* emod */, - { 0, 1874, 3325, 7, 15, UNI_ARMI } /* script=imperialaramaic */, - { 0, 1126, 67, 4, 4, UNI_CPRT } /* scx=cprt */, - { 10, 8095, 1477, 8, 3, UNI_XPOSIXCNTRL } /* category=cc */, - { 0, 8095, 119, 9, 2, UNI_XPOSIXDIGIT } /* category=nd */, - { 8, 1126, 1315, 4, 4, UNI_TIRH } /* scx=tirh */, - { 3, 6104, 631, 21, 2, UNI_LOE } /* logicalorderexception=t */, - { 2, 135, 5955, 2, 21, UNI_PRTI } /* isinscriptionalparthian */, - { 2, 1075, 0, 8, 0, UNI_KRAI } /* kiratrai */, - { 0, 4321, 962, 8, 7, -UNI_XPOSIXLOWER } /* lowercase=false */, - { 7, 3098, 631, 5, 5, UNI_EPRES } /* epres=true */, - { 12, 6431, 6, 10, 2, UNI_LB__CM } /* linebreak=cm */, - { 3, 983, 4701, 7, 2, UNI_ext_values_index } /* extender= */, - { 7, 6647, 1825, 13, 2, UNI_JG__FE } /* joininggroup=fe */, - { 0, 4913, 6499, 14, 8, UNI_NV__1_SLASH_160 } /* numericvalue=6.250e-03 */, - { 0, 1097, 413, 5, 1, UNI_NV__1_SLASH_6 } /* nv=1/6 */, - { 1, 3301, 373, 14, 4, UNI_GREXT } /* graphemeextend=yes */, - { 1, 8468, 1208, 23, 3, UNI_INPC__NA } /* indicpositionalcategory=na */, - { 1, 2394, 6188, 6, 6, UNI_YIJING } /* block=yijing */, - { 1, 1234, 1977, 5, 7, UNI_CJKSYMBOLS } /* incjksymbols */, - { 13, 30, 4753, 1, 17, UNI_LINEARBSYLLABARY } /* inlinearbsyllabary */, - { 3, 575, 33, 3, 2, UNI_SB__ST } /* sb=st */, - { 6, 4173, 373, 4, 2, UNI_IDSB } /* idsb=y */, - { 0, 401, 963, 3, 6, -UNI_EXT } /* ext=false */, - { 1, 1874, 486, 7, 4, UNI_PRTI } /* script=prti */, - { 1, 404, 963, 6, 6, -UNI_HYPHEN } /* hyphen=false */, - { 1, 266, 631, 4, 5, UNI_CWCF } /* cwcf=true */, - { 0, 8095, 1977, 9, 6, UNI_S } /* category=symbol */, - { 0, 1781, 4574, 3, 16, UNI_SMALLFORMS } /* issmallformvariants */, - { 1, 2909, 7463, 3, 26, UNI_ENCLOSEDCJK } /* isenclosedcjklettersandmonths */, - { 1, 1696, 2043, 4, 10, UNI_YIRADICALS } /* blk=yiradicals */, - { 1, 7420, 8639, 7, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* blk=supsymbolsandpictographs */, - { 1, 323, 5014, 2, 15, UNI_BAMUMSUP } /* inbamumsupplement */, - { 6, 2394, 6577, 9, 13, UNI_CJKCOMPAT } /* block=cjkcompatibility */, - { 0, 1993, 372, 11, 5, UNI_GRBASE } /* graphemebase=yes */, - { 6, 3183, 644, 7, 3, -UNI_XPOSIXXDIGIT } /* hexdigit=n */, - { 15, 2201, 1101, 4, 2, UNI_NV__2_SLASH_3 } /* nv=2/3 */, - { 2, 2394, 5501, 7, 10, UNI_CHEROKEESUP } /* block=cherokeesup */, - { 1, 323, 201, 2, 4, UNI_TAGS } /* intags */, - { 2, 1126, 781, 4, 4, UNI_MARC } /* scx=marc */, - { 0, 2394, 8500, 6, 33, UNI_MISCMATHSYMBOLSB } /* block=miscellaneousmathematicalsymbolsb */, - { 0, 3040, 5518, 3, 11, UNI_SMALLKANAEXT } /* insmallkanaext */, - { 1, 135, 19, 2, 4, UNI_POSIXXDIGIT } /* isahex */, - { 2, 4557, 3230, 16, 8, UNI_MYMR } /* scriptextensions=myanmar */, - { 0, 135, 2819, 2, 5, UNI_EMOJI } /* isemoji */, - { 1, 2836, 0, 5, 0, UNI_C } /* other */, - { 0, 5677, 288, 21, 1, UNI_cwcf_values_index } /* changeswhencasefolded= */, - { 3, 6838, 8794, 4, 7, UNI_INPC__BOTTOM } /* inpc=bottom */, - { 3, 2394, 1141, 6, 8, UNI_INTAGBANWA } /* block=tagbanwa */, - { 1, 1236, 6620, 3, 18, UNI_CJKRADICALSSUP } /* cjkradicalssupplement */, - { 9, 3099, 3974, 11, 2, UNI_IN__7 } /* presentin=v70 */, - { 1, 6370, 1561, 5, 5, UNI_INSC__BINDU } /* insc=bindu */, - { 1, 1322, 3260, 3, 14, UNI_CONTROLPICTURES } /* iscontrolpictures */, - { 0, 1859, 0, 11, 0, UNI_HMNG } /* pahawhhmong */, - { 0, 5, 782, 1, 3, UNI_MARC } /* marc */, - { 0, 1126, 4115, 4, 4, UNI_MODI } /* scx=modi */, - { 1, 2394, 3736, 6, 14, UNI_LATINEXTD } /* block=latinextendedd */, - { 0, 306, 415, 3, 2, UNI_NV__34 } /* nv=34 */, - { 5, 135, 6146, 2, 7, UNI_SINH } /* issinhala */, - { 5, 135, 969, 2, 2, UNI_CO } /* isco */, - { 0, 2394, 4205, 6, 15, UNI_CURRENCYSYMBOLS } /* block=currencysymbols */, - { 1, 135, 7120, 2, 23, UNI_BYZANTINEMUSIC } /* isbyzantinemusicalsymbols */, - { 3, 1446, 963, 4, 2, -UNI_XIDS } /* xids=f */, - { 8, 2502, 8292, 3, 32, UNI_MISCMATHSYMBOLSA } /* inmiscellaneousmathematicalsymbolsa */, - { 2, 135, 142, 2, 4, UNI_MTEI } /* ismtei */, - { 2, 1874, 458, 7, 3, UNI_SC__NKO } /* script=nko */, - { 0, 323, 2240, 2, 2, UNI_IN__4 } /* in=4 */, - { 1, 1536, 6040, 7, 6, UNI_GEORGIANSUP } /* ingeorgiansup */, - { 0, 3696, 373, 16, 4, UNI_IDSU } /* idsunaryoperator=yes */, - { 2, 1097, 419, 5, 2, UNI_NV__1_SLASH_16 } /* nv=1/16 */, - { 2, 426, 0, 4, 0, UNI_TOTO } /* toto */, - { 8, 7697, 2348, 27, 2, UNI_CCC__14 } /* canonicalcombiningclass=ccc14 */, - { 7, 1874, 661, 7, 7, UNI_ELYM } /* script=elymaic */, - { 0, 5309, 0, 9, 0, UNI_TANGUTSUP } /* tangutsup */, - { 8, 1126, 1157, 4, 8, UNI_UGAR } /* scx=ugaritic */, - { 16, 54, 3218, 2, 9, UNI_SC__GEOR } /* sc=georgian */, - { 1, 358, 628, 5, 2, UNI_CCC__122 } /* ccc=122 */, - { 0, 5069, 4700, 11, 3, UNI_emod_values_index } /* emojimodifier= */, - { 4, 261, 0, 5, 0, UNI_XPOSIXCNTRL } /* cntrl */, - { 3, 6372, 1114, 3, 4, UNI_SC__LINB } /* sc=linb */, - { 0, 117, 0, 2, 0, UNI_SK } /* sk */, - { 0, 1126, 486, 4, 4, UNI_PRTI } /* scx=prti */, - { 0, 5, 759, 1, 3, UNI_MAKA } /* maka */, - { 1, 3930, 5549, 14, 8, UNI_NV__100000000 } /* numericvalue=100000000 */, - { 10, 1447, 645, 3, 2, -UNI_IDS } /* ids=n */, - { 0, 5761, 631, 21, 2, UNI_CWU } /* changeswhenuppercased=t */, - { 0, 2666, 404, 3, 2, UNI_LB__HY } /* lb=hy */, - { 2, 2740, 0, 13, 0, UNI_PATSYN } /* patternsyntax */, - { 0, 1447, 644, 6, 2, UNI_ids_values_index } /* idstart= */, - { 1, 2473, 4644, 8, 9, UNI_ETHIOPICEXTB } /* ethiopicextendedb */, - { 3, 135, 506, 2, 4, UNI_TNSA } /* istnsa */, - { 0, 2345, 2257, 4, 3, UNI_IN__12 } /* in=12.0 */, - { 16, 5782, 690, 20, 4, UNI_LB__H3 } /* graphemeclusterbreak=lvt */, - { 0, 8095, 645, 8, 2, UNI_N } /* category=n */, - { 4, 8142, 4543, 26, 4, UNI_CJKEXTA } /* cjkunifiedideographsextensiona */, - { 1, 1696, 2759, 4, 13, UNI_VERTICALFORMS } /* blk=verticalforms */, - { 2, 1523, 962, 4, 7, -UNI_XPOSIXSPACE } /* space=false */, - { 1, 1874, 158, 7, 4, UNI_SC__ORYA } /* script=orya */, - { 1, 6127, 0, 5, 0, UNI__PERL_NCHAR } /* nchar */, - { 10, 135, 2481, 2, 11, UNI_KATAKANAEXT } /* iskatakanaext */, - { 6, 30, 5856, 1, 20, UNI_MERO } /* ismeroitichieroglyphs */, - { 3, 2371, 372, 10, 3, UNI_XIDC } /* xidcontinue=y */, - { 15, 2394, 5839, 7, 10, UNI_COUNTINGROD } /* block=countingrod */, - { 0, 3040, 1134, 3, 7, UNI_SPECIALS } /* inspecials */, - { 2, 1874, 126, 7, 4, UNI_LAO } /* script=laoo */, - { 1, 135, 1628, 2, 10, UNI_SAUR } /* issaurashtra */, - { 1, 1126, 185, 4, 4, UNI_RJNG } /* scx=rjng */, - { 0, 1696, 1021, 4, 6, UNI_INKAITHI } /* blk=kaithi */, - { 1, 2394, 3764, 6, 14, UNI_DEVANAGARIEXTA } /* block=devanagariexta */, - { 3, 4635, 213, 11, 2, UNI_LATINEXTF } /* blk=latinextf */, - { 0, 4557, 486, 17, 4, UNI_PRTI } /* scriptextensions=prti */, - { 0, 1126, 197, 4, 4, UNI_SGNW } /* scx=sgnw */, - { 2, 1446, 644, 7, 4, -UNI_XIDS } /* xidstart=no */, - { 2, 3098, 645, 5, 3, -UNI_EPRES } /* epres=no */, - { 3, 434, 373, 3, 4, UNI_DIA } /* dia=yes */, - { 8, 1696, 0, 11, 0, UNI_CJKEXTD } /* blk=cjkextd */, - { 0, 768, 1215, 3, 8, UNI_EMOTICONS } /* inemoticons */, - { 3, 135, 4280, 2, 11, UNI_P } /* ispunctuation */, - { 5, 6670, 320, 14, 2, UNI_SB__SP } /* sentencebreak=sp */, - { 1, 3491, 302, 13, 2, UNI_NV__30 } /* numericvalue=30 */, - { 0, 3491, 416, 13, 2, UNI_NV__41 } /* numericvalue=41 */, - { 0, 1874, 1482, 7, 10, UNI_CHRS } /* script=chorasmian */, - { 0, 1126, 1664, 4, 4, UNI_WARA } /* scx=wara */, - { 7, 331, 0, 5, 0, UNI_TALE } /* taile */, - { 0, 5782, 3535, 20, 3, UNI_GCB__EX } /* graphemeclusterbreak=ex */, - { 1, 8596, 7176, 31, 11, UNI_INSC__CONSONANTWITHSTACKER } /* indicsyllabiccategory=consonantwithstacker */, - { 0, 1126, 221, 4, 4, UNI_TIBT } /* scx=tibt */, - { 0, 0, 2694, 1, 12, UNI_LOWSURROGATES } /* lowsurrogates */, - { 0, 5, 2920, 1, 3, UNI_MAHJ } /* mahj */, - { 3, 6431, 295, 10, 2, UNI_LB__XX } /* linebreak=xx */, - { 1, 312, 373, 2, 2, UNI_RI } /* ri=y */, - { 0, 3099, 416, 11, 2, UNI_IN__4_DOT_1 } /* presentin=v41 */, - { 0, 135, 2387, 2, 6, UNI_N } /* isnumber */, - { 3, 1696, 5955, 4, 21, UNI_ININSCRIPTIONALPARTHIAN } /* blk=inscriptionalparthian */, - { 0, 3098, 373, 5, 4, UNI_EPRES } /* epres=yes */, - { 1, 7233, 4084, 24, 13, UNI_CCC__IS } /* canonicalcombiningclass=iotasubscript */, - { 4, 6431, 38, 11, 1, UNI_LB__BK } /* linebreak=bk */, - { 0, 751, 0, 9, 0, UNI_INKANNADA } /* inkannada */, - { 4, 323, 6146, 2, 21, UNI_SINHALAARCHAICNUMBERS } /* insinhalaarchaicnumbers */, - { 46, 8596, 6862, 22, 19, UNI_INSC__BRAHMIJOININGNUMBER } /* indicsyllabiccategory=brahmijoiningnumber */, - { 6, 2071, 8365, 3, 31, UNI_IDEOGRAPHICSYMBOLS } /* inideographicsymbolsandpunctuation */, - { 0, 1322, 2017, 3, 9, UNI_COMPATJAMO } /* iscompatjamo */, - { 13, 2394, 4754, 6, 16, UNI_LINEARBSYLLABARY } /* block=linearbsyllabary */, - { 4, 2069, 3093, 7, 5, UNI_jt_values_index } /* joiningtype= */, - { 1, 3599, 3903, 11, 5, UNI_ARABICMATH } /* block=arabicmath */, - { 9, 1234, 8761, 5, 23, UNI_CJKCOMPATIDEOGRAPHS } /* incjkcompatibilityideographs */, - { 4, 2785, 4970, 3, 10, UNI_BC__WS } /* bc=whitespace */, - { 0, 3796, 873, 4, 3, UNI_SUPPUAA } /* suppuaa */, - { 0, 680, 0, 7, 0, UNI_HANO } /* hanunoo */, - { 0, 135, 3809, 2, 11, UNI_MC } /* isspacingmark */, - { 1, 3227, 1589, 5, 9, UNI_MISCARROWS } /* blk=miscarrows */, - { 1, 6838, 3751, 3, 13, UNI_PHONETICEXTSUP } /* inphoneticextsup */, - { 3, 1664, 0, 4, 0, UNI_WARA } /* wara */, - { 1, 1027, 0, 4, 0, UNI_LEPC } /* lepc */, - { 0, 4557, 2005, 17, 12, UNI_GONG } /* scriptextensions=gunjalagondi */, - { 4, 1874, 173, 7, 4, UNI_SC__PHLP } /* script=phlp */, - { 2, 135, 3219, 2, 8, UNI_GEOR } /* isgeorgian */, - { 4, 6372, 1528, 3, 4, UNI_SC__BUGI } /* sc=bugi */, - { 7, 135, 6125, 2, 21, UNI__PERL_NCHAR } /* isnoncharactercodepoint */, - { 0, 924, 3989, 5, 2, UNI_AGE__8 } /* age=v80 */, - { 0, 1459, 4793, 5, 9, UNI_LATINEXTC } /* latinextendedc */, - { 1, 135, 3827, 2, 9, UNI_MLYM } /* ismalayalam */, - { 1, 6127, 373, 5, 2, UNI__PERL_NCHAR } /* nchar=y */, - { 0, 2785, 3191, 3, 12, UNI_BC__AL } /* bc=arabicletter */, - { 0, 3587, 1215, 5, 8, UNI_EMOTICONS } /* blk=emoticons */, - { 0, 1126, 4219, 4, 4, UNI_SIND } /* scx=sind */, - { 0, 3040, 4844, 3, 8, UNI_SYRIACSUP } /* insyriacsup */, - { 2, 4963, 2654, 16, 3, -UNI__PERL_PATWS } /* patternwhitespace=n */, - { 4, 323, 4927, 2, 18, UNI_ORNAMENTALDINGBATS } /* inornamentaldingbats */, - { 1, 323, 4190, 2, 15, UNI_BRAI } /* inbraillepatterns */, - { 0, 1126, 98, 4, 4, UNI_HLUW } /* scx=hluw */, - { 3, 2338, 555, 9, 2, UNI_IN__7 } /* presentin=7 */, - { 0, 4557, 815, 17, 4, UNI_OSMA } /* scriptextensions=osma */, - { 8, 135, 146, 2, 4, UNI_MYMR } /* ismymr */, - { 0, 6372, 1141, 3, 8, UNI_SC__TAGB } /* sc=tagbanwa */, - { 0, 6552, 0, 19, 0, UNI_JAMOEXTB } /* hanguljamoextendedb */, - { 3, 306, 2144, 3, 9, UNI_NV__1_SLASH_8 } /* nv=1.250e-01 */, - { 0, 323, 2853, 2, 14, UNI_HIGHSURROGATES } /* inhighsurrogates */, - { 8, 306, 2138, 3, 2, UNI_NV__11 } /* nv=11 */, - { 0, 135, 99, 2, 2, UNI_UPPERCASELETTER } /* islu */, - { 2, 135, 1725, 2, 6, UNI_DOMINO } /* isdomino */, - { 0, 6372, 278, 3, 4, UNI_SC__GARA } /* sc=gara */, - { 0, 3961, 2161, 14, 8, UNI_NV__15_SLASH_2 } /* numericvalue=7.500e+00 */, - { 0, 7233, 0, 26, 0, UNI_CCC__27 } /* canonicalcombiningclass=27 */, - { 1, 135, 1248, 2, 9, UNI_QAAI } /* isinherited */, - { 1, 1322, 4051, 3, 16, UNI_UCAS } /* iscanadiansyllabics */, - { 0, 3086, 645, 11, 5, UNI_NV__NAN } /* numerictype=none */, - { 0, 4687, 0, 9, 0, UNI_TITLE } /* titlecase */, - { 18, 30, 1140, 1, 9, UNI_TAGB } /* istagbanwa */, - { 5, 1091, 645, 6, 2, UNI_NFKDQC__N } /* nfkdqc=n */, - { 3, 1322, 8436, 3, 32, UNI_DIACRITICALSEXT } /* iscombiningdiacriticalmarksextended */, - { 5, 5069, 631, 13, 5, UNI_EMOD } /* emojimodifier=true */, - { 9, 32, 0, 2, 0, UNI_VS } /* vs */, - { 0, 2394, 331, 6, 5, UNI_INTAILE } /* block=taile */, - { 0, 358, 302, 4, 2, UNI_CCC__30 } /* ccc=30 */, - { 0, 3227, 1061, 11, 4, UNI_MYANMAREXTB } /* blk=myanmarextb */, - { 1, 1934, 963, 5, 6, -UNI_BIDIC } /* bidic=false */, - { 5, 6372, 1157, 3, 8, UNI_UGAR } /* sc=ugaritic */, - { 4, 1696, 3178, 4, 5, UNI_ASCII } /* blk=ascii */, - { 2, 5698, 288, 21, 1, UNI_cwcm_values_index } /* changeswhencasemapped= */, - { 2, 6647, 4390, 13, 4, UNI_JG__KAPH } /* joininggroup=kaph */, - { 0, 553, 5549, 4, 5, UNI_NV__700000 } /* nv=700000 */, - { 1, 2502, 7819, 3, 19, UNI_MISCSYMBOLS } /* inmiscellaneoussymbols */, - { 0, 3904, 0, 10, 0, UNI_SM } /* mathsymbol */, - { 2, 8037, 360, 10, 2, UNI_ideo_values_index } /* ideographic= */, - { 33, 541, 645, 5, 3, UNI_DT__CAN } /* nfdqc=no */, - { 1, 4510, 373, 14, 4, UNI_DT__NONE } /* nfkdquickcheck=yes */, - { 6, 7585, 455, 11, 2, UNI_BC__LRO } /* bidiclass=lro */, - { 0, 2394, 426, 6, 4, UNI_INTOTO } /* block=toto */, - { 5, 170, 0, 3, 0, UNI_PCM } /* pcm */, - { 2, 1566, 3723, 5, 3, UNI_KANGXI } /* iskangxi */, - { 1, 1696, 529, 4, 6, UNI_INKHOJKI } /* blk=khojki */, - { 1, 1545, 0, 8, 0, UNI_JAMOEXTA } /* jamoexta */, - { 9, 1696, 5482, 4, 18, UNI_TAIXUANJING } /* blk=taixuanjingsymbols */, - { 1, 135, 311, 2, 5, UNI_ORYA } /* isoriya */, - { 8, 1773, 3903, 7, 5, UNI_ARABICMATH } /* isarabicmath */, - { 1, 2345, 410, 3, 3, UNI_IN__3_DOT_2 } /* in=3.2 */, - { 2, 1126, 938, 4, 4, UNI_BALI } /* scx=bali */, - { 0, 8596, 3350, 22, 10, UNI_INSC__PUREKILLER } /* indicsyllabiccategory=purekiller */, - { 1, 3491, 0, 14, 0, UNI_NV__4 } /* numericvalue=4 */, - { 0, 4849, 5253, 12, 7, UNI_SUPARROWSA } /* supplementalarrowsa */, - { 1, 3476, 373, 13, 2, UNI_NFDQC__Y } /* nfdquickcheck=y */, - { 0, 297, 0, 5, 0, UNI_NSHU } /* nushu */, - { 2, 1126, 47, 4, 4, UNI_CAKM } /* scx=cakm */, - { 0, 768, 7143, 3, 22, UNI_EGYPTIANHIEROGLYPHSEXTA } /* inegyptianhieroglyphsexta */, - { 0, 1696, 1039, 4, 6, UNI_INTELUGU } /* blk=telugu */, - { 2, 6372, 1122, 3, 4, UNI_NSHU } /* sc=nshu */, - { 28, 2819, 645, 5, 2, -UNI_EMOJI } /* emoji=n */, - { 0, 5260, 1959, 8, 4, UNI_WB__KA } /* wordbreak=ka */, - { 0, 135, 245, 2, 2, UNI_YI } /* isyi */, - { 3, 1110, 0, 4, 0, UNI_XPOSIXWORD } /* word */, - { 6, 135, 6392, 2, 13, UNI_GLAGOLITICSUP } /* isglagoliticsup */, - { 0, 4557, 1598, 17, 4, UNI_NAGM } /* scriptextensions=nagm */, - { 0, 2909, 0, 10, 0, UNI_ETHI } /* isethiopic */, - { 1, 6372, 781, 3, 4, UNI_MARC } /* sc=marc */, - { 2, 5, 7819, 1, 28, UNI_MISCARROWS } /* miscellaneoussymbolsandarrows */, - { 1, 1459, 4832, 4, 12, UNI_LATIN1 } /* latin1supplement */, - { 0, 563, 631, 6, 5, UNI_PATSYN } /* patsyn=true */, - { 0, 8095, 3288, 8, 7, UNI_L } /* category=letter */, - { 4, 4557, 1157, 17, 4, UNI_UGAR } /* scriptextensions=ugar */, - { 1, 2909, 1549, 10, 4, UNI_ETHIOPICEXTA } /* isethiopicexta */, - { 0, 4540, 631, 17, 2, UNI_RI } /* regionalindicator=t */, - { 0, 2564, 7187, 4, 21, UNI_GEOMETRICSHAPESEXT } /* isgeometricshapesextended */, - { 1, 6277, 6817, 7, 21, UNI_MISCTECHNICAL } /* block=miscellaneoustechnical */, - { 8, 323, 1965, 2, 4, UNI_UCAS } /* inucas */, - { 3, 1126, 1245, 4, 4, UNI_THAI } /* scx=thai */, - { 7, 2394, 774, 6, 7, UNI_INMANDAIC } /* block=mandaic */, - { 0, 135, 1298, 2, 4, UNI_SOYO } /* issoyo */, - { 0, 1499, 373, 10, 2, UNI_DEP } /* deprecated=y */, - { 4, 135, 1381, 2, 9, UNI_PERM } /* isoldpermic */, - { 6, 4557, 1399, 17, 9, UNI_OUGR } /* scriptextensions=olduyghur */, - { 1, 1696, 774, 4, 7, UNI_INMANDAIC } /* blk=mandaic */, - { 0, 1126, 253, 4, 4, UNI_ZYYY } /* scx=zyyy */, - { 1, 1236, 81, 5, 2, UNI_CJKEXTG } /* cjkextg */, - { 0, 1874, 94, 7, 4, UNI_SC__GUKH } /* script=gukh */, - { 0, 1474, 302, 8, 2, UNI_CCC__130 } /* ccc=ccc130 */, - { 0, 2461, 6025, 10, 9, UNI_CYRILLICEXTA } /* incyrillicextendeda */, - { 4, 135, 3125, 2, 13, UNI_QMARK } /* isquotationmark */, - { 3, 1773, 24, 3, 3, UNI_AHOM } /* isahom */, - { 0, 6250, 7463, 7, 10, UNI_ENCLOSEDCJK } /* block=enclosedcjk */, - { 5, 1874, 1353, 7, 9, UNI_TALU } /* script=newtailue */, - { 1, 3227, 8501, 5, 32, UNI_MISCMATHSYMBOLSB } /* blk=miscellaneousmathematicalsymbolsb */, - { 1, 6372, 189, 3, 4, UNI_SC__RUNR } /* sc=runr */, - { 0, 5260, 2481, 10, 8, UNI_WB__KA } /* wordbreak=katakana */, - { 0, 5102, 5264, 13, 6, UNI_incb_values_index } /* indicconjunctbreak= */, - { 0, 2069, 7882, 7, 6, UNI_JT__L } /* joiningtype=l */, - { 3, 2394, 1027, 6, 6, UNI_INLEPCHA } /* block=lepcha */, - { 1, 7847, 2759, 18, 8, UNI_DT__VERT } /* decompositiontype=vertical */, - { 0, 983, 963, 8, 2, -UNI_EXT } /* extender=f */, - { 0, 1126, 729, 4, 5, UNI_BATK } /* scx=batak */, - { 2, 119, 0, 2, 0, UNI_XPOSIXDIGIT } /* nd */, - { 3, 563, 0, 6, 0, UNI_PATSYN } /* patsyn */, - { 0, 6372, 930, 3, 8, UNI_SC__ARMN } /* sc=armenian */, - { 0, 6372, 654, 3, 4, UNI_SC__ELBA } /* sc=elba */, - { 1, 2909, 666, 8, 5, UNI_ETHIOPICEXT } /* isethiopicext */, - { 10, 1441, 1674, 3, 7, UNI_WB__LE } /* wb=aletter */, - { 0, 1322, 6620, 5, 11, UNI_CJKRADICALSSUP } /* iscjkradicalssup */, - { 1, 624, 302, 5, 1, UNI_CCC__23 } /* ccc=23 */, - { 12, 1126, 3590, 3, 9, UNI_ETHI } /* scx=ethiopic */, - { 4, 4635, 768, 5, 6, UNI_INLINEARA } /* blk=lineara */, - { 1, 3476, 2397, 11, 3, UNI_nfdqc_values_index } /* nfdquickcheck= */, - { 3, 2045, 373, 7, 2, UNI_RADICAL } /* radical=y */, - { 6, 1874, 1384, 7, 4, UNI_SC__PERM } /* script=perm */, - { 12, 1441, 543, 3, 2, UNI_WB__DQ } /* wb=dq */, - { 1, 2371, 372, 10, 5, UNI_XIDC } /* xidcontinue=yes */, - { 0, 3764, 0, 4, 0, UNI_DEVA } /* deva */, - { 5, 135, 458, 2, 3, UNI_NKO } /* isnko */, - { 1, 1284, 0, 4, 0, UNI_PHAG } /* phag */, - { 2, 3491, 2731, 13, 9, UNI_NV__1_SLASH_2 } /* numericvalue=5.000e-01 */, - { 2, 108, 2975, 2, 12, UNI_JT__D } /* jt=dualjoining */, - { 0, 4557, 1270, 17, 4, UNI_MULT } /* scriptextensions=mult */, - { 2, 3301, 645, 14, 2, -UNI_GREXT } /* graphemeextend=n */, - { 0, 8088, 4115, 16, 14, UNI_SK } /* generalcategory=modifiersymbol */, - { 0, 1126, 4067, 4, 17, UNI_AGHB } /* scx=caucasianalbanian */, - { 0, 358, 730, 4, 3, UNI_CCC__214 } /* ccc=ata */, - { 0, 6372, 438, 3, 4, UNI_SC__GONM } /* sc=gonm */, - { 0, 8693, 0, 35, 0, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* symbolsforlegacycomputingsupplement */, - { 0, 323, 3423, 2, 6, UNI_INHEBREW } /* inhebrew */, - { 0, 1097, 5549, 4, 10, UNI_NV__10000000000 } /* nv=10000000000 */, - { 2, 4173, 645, 4, 3, -UNI_IDSB } /* idsb=no */, - { 0, 558, 630, 2, 3, UNI_LOE } /* loe=t */, - { 1, 916, 2257, 4, 3, UNI_AGE__2 } /* age=2.0 */, - { 3, 6053, 0, 12, 0, UNI_SUNDANESESUP } /* sundanesesup */, - { 0, 2669, 19, 2, 2, UNI_BRAH } /* brah */, - { 0, 624, 415, 5, 2, UNI_CCC__DA } /* ccc=234 */, - { 25, 3491, 2152, 13, 9, UNI_NV__1_SLASH_7 } /* numericvalue=1.429e-01 */, - { 3, 2394, 6777, 9, 16, UNI_CJKCOMPATIDEOGRAPHS } /* block=cjkcompatideographs */, - { 0, 1696, 2919, 4, 7, UNI_MAHJONG } /* blk=mahjong */, - { 2, 1810, 373, 11, 2, UNI_KEHNOMIRROR } /* kehnomirror=y */, - { 0, 1126, 2847, 4, 6, UNI_COPT } /* scx=coptic */, - { 0, 3301, 288, 14, 1, UNI_grext_values_index } /* graphemeextend= */, - { 0, 2833, 1647, 3, 2, UNI_LOWERCASELETTER } /* gc=ll */, - { 0, 2394, 5229, 6, 19, UNI_OTTOMANSIYAQNUMBERS } /* block=ottomansiyaqnumbers */, - { 0, 8596, 2530, 22, 8, UNI_INSC__TONEMARK } /* indicsyllabiccategory=tonemark */, - { 4, 2666, 1197, 3, 2, UNI_LB__CL } /* lb=cl */, - { 0, 7606, 6520, 20, 10, UNI_BC__RLE } /* bidiclass=righttoleftembedding */, - { 1, 2338, 606, 10, 3, UNI_IN__7 } /* presentin=7.0 */, - { 0, 6104, 5619, 17, 5, UNI_loe_values_index } /* logicalorderexception= */, - { 0, 135, 6392, 2, 20, UNI_GLAGOLITICSUP } /* isglagoliticsupplement */, - { 2, 6104, 5468, 16, 5, UNI_LOE } /* logicalorderexception */, - { 3, 451, 2382, 3, 12, UNI_AEGEANNUMBERS } /* inaegeannumbers */, - { 1, 6250, 1549, 14, 4, UNI_ETHIOPICEXTA } /* block=ethiopicexta */, - { 0, 82, 0, 4, 0, UNI_GONG } /* gong */, - { 0, 2345, 612, 3, 3, UNI_IN__9 } /* in=9.0 */, - { 0, 6372, 146, 3, 4, UNI_SC__MYMR } /* sc=mymr */, - { 3, 2394, 7017, 6, 18, UNI_DEVANAGARIEXT } /* block=devanagariextended */, - { 0, 3365, 0, 5, 0, UNI_XPOSIXALNUM } /* alnum */, - { 2, 2238, 413, 4, 1, UNI_NV__46 } /* nv=46 */, - { 2, 2371, 962, 10, 7, -UNI_XIDC } /* xidcontinue=false */, - { 0, 3696, 963, 16, 2, -UNI_IDSU } /* idsunaryoperator=f */, - { 1, 135, 1122, 2, 4, UNI_NSHU } /* isnshu */, - { 1, 1126, 4785, 4, 8, UNI_BOPO } /* scx=bopomofo */, - { 4, 2372, 373, 3, 4, UNI_IDC } /* idc=yes */, - { 3, 3099, 418, 11, 2, UNI_IN__5_DOT_1 } /* presentin=v51 */, - { 6, 5364, 373, 20, 2, UNI_EXTPICT } /* extendedpictographic=y */, - { 0, 643, 1200, 3, 6, UNI_DT__MED } /* dt=medial */, - { 6, 2666, 3860, 3, 6, UNI_LB__AK } /* lb=aksara */, - { 0, 1874, 11, 7, 4, UNI_SC__ADLM } /* script=adlm */, - { 1, 1126, 15, 4, 4, UNI_AGHB } /* scx=aghb */, - { 8, 6647, 4410, 13, 4, UNI_JG__TETH } /* joininggroup=teth */, - { 0, 4557, 1284, 17, 4, UNI_PHAG } /* scriptextensions=phag */, - { 7, 4524, 6483, 14, 8, UNI_NV__1_SLASH_320 } /* numericvalue=3.125e-03 */, - { 2, 135, 1039, 2, 6, UNI_TELU } /* istelugu */, - { 0, 2473, 6400, 6, 12, UNI_ETHIOPICSUP } /* ethiopicsupplement */, - { 0, 8088, 8609, 7, 11, UNI_CO } /* generalcategory=co */, - { 1, 954, 4801, 4, 5, UNI_BPT__C } /* bpt=close */, - { 0, 7979, 4398, 23, 4, UNI_JG__MANICHAEANRESH } /* joininggroup=manichaeanresh */, - { 10, 7585, 561, 10, 2, UNI_BC__AL } /* bidiclass=al */, - { 1, 1628, 0, 10, 0, UNI_SAUR } /* saurashtra */, - { 1, 4557, 7923, 17, 19, UNI_EGYP } /* scriptextensions=egyptianhieroglyphs */, - { 0, 3930, 1364, 14, 2, UNI_NV__100 } /* numericvalue=100 */, - { 0, 2394, 1176, 6, 9, UNI_INBHAIKSUKI } /* block=bhaiksuki */, - { 0, 4557, 3560, 17, 15, UNI_ZANB } /* scriptextensions=zanabazarsquare */, - { 1, 3423, 0, 6, 0, UNI_HEBR } /* hebrew */, - { 3, 3575, 4793, 12, 9, UNI_CYRILLICEXTC } /* blk=cyrillicextendedc */, - { 0, 135, 1344, 2, 9, UNI_NBAT } /* isnabataean */, - { 8, 1126, 1714, 4, 11, UNI_CPMN } /* scx=cyprominoan */, - { 1, 7585, 6209, 21, 8, UNI_BC__LRO } /* bidiclass=lefttorightoverride */, - { 0, 1744, 7559, 3, 26, UNI_OCR } /* isopticalcharacterrecognition */, - { 0, 8197, 4348, 28, 4, UNI_CJKEXTH } /* iscjkunifiedideographsextensionh */, - { 0, 4097, 631, 17, 5, UNI_EPRES } /* emojipresentation=true */, - { 3, 643, 1736, 3, 3, UNI_DT__FRA } /* dt=fra */, - { 0, 6372, 39, 3, 4, UNI_BHKS } /* sc=bhks */, - { 1, 8861, 4741, 16, 13, UNI_SUPPUNCTUATION } /* block=supplementalpunctuation */, - { 5, 135, 450, 2, 4, UNI_LINA } /* islina */, - { 3, 1441, 3138, 3, 11, UNI_WB__DQ } /* wb=doublequote */, - { 1, 4913, 2185, 14, 8, UNI_NV__2_SLASH_3 } /* numericvalue=6.667e-01 */, - { 1, 135, 2538, 2, 6, UNI_IPAEXT } /* isipaext */, - { 0, 3099, 1364, 12, 2, UNI_IN__10 } /* presentin=v100 */, - { 3, 5719, 645, 21, 2, -UNI_CWL } /* changeswhenlowercased=n */, - { 1, 675, 2654, 5, 3, -UNI_GRBASE } /* grbase=n */, - { 0, 6647, 3391, 13, 7, UNI_JG__SEMKATH } /* joininggroup=semkath */, - { 0, 1696, 278, 4, 5, UNI_INGARAY } /* blk=garay */, - { 0, 0, 0, 1, 0, UNI_L } /* l */, - { 0, 466, 0, 4, 0, UNI_OLCK } /* olck */, - { 0, 33, 4574, 1, 16, UNI_SMALLFORMS } /* smallformvariants */, - { 12, 323, 8029, 2, 22, UNI_ENCLOSEDIDEOGRAPHICSUP } /* inenclosedideographicsup */, - { 1, 7585, 375, 10, 2, UNI_BC__ES } /* bidiclass=es */, - { 4, 6146, 0, 21, 0, UNI_SINHALAARCHAICNUMBERS } /* sinhalaarchaicnumbers */, - { 2, 7585, 3203, 10, 12, UNI_BC__ON } /* bidiclass=otherneutral */, - { 0, 1773, 1173, 8, 3, UNI_ARABICPFA } /* isarabicpfa */, - { 0, 1696, 401, 7, 4, UNI_CJKEXTH } /* blk=cjkexth */, - { 8, 1874, 5500, 7, 8, UNI_SC__CHER } /* script=cherokee */, - { 7, 1126, 1083, 4, 8, UNI_MAHJ } /* scx=mahajani */, - { 1, 8088, 238, 16, 2, UNI_PE } /* generalcategory=pe */, - { 4, 2394, 297, 6, 5, UNI_INNUSHU } /* block=nushu */, - { 5, 2899, 3741, 10, 9, UNI_CYRILLICEXTD } /* iscyrillicextendedd */, - { 1, 1528, 0, 4, 0, UNI_BUGI } /* bugi */, - { 0, 2069, 6841, 4, 3, UNI_JOINC } /* joinc=t */, - { 0, 1322, 8761, 5, 23, UNI_CJKCOMPATIDEOGRAPHS } /* iscjkcompatibilityideographs */, - { 4, 3696, 3700, 4, 12, UNI_IDSU } /* idsunaryoperator */, - { 1, 3904, 963, 4, 6, -UNI_MATH } /* math=false */, - { 10, 5803, 6594, 15, 8, UNI_IDENTIFIERTYPE__OBSOLETE } /* identifiertype=obsolete */, - { 2, 4635, 0, 18, 0, UNI_LATINEXTB } /* blk=latinextendedb */, - { 3, 4557, 2305, 17, 4, UNI_HUNG } /* scriptextensions=hung */, - { 1, 8037, 963, 11, 6, -UNI_IDEO } /* ideographic=false */, - { 0, 1934, 0, 5, 0, UNI_BIDIC } /* bidic */, - { 1, 1696, 6188, 4, 21, UNI_YIJING } /* blk=yijinghexagramsymbols */, - { 0, 8145, 963, 16, 6, -UNI_UIDEO } /* unifiedideograph=false */, - { 7, 1126, 1305, 4, 4, UNI_SUNU } /* scx=sunu */, - { 3, 2080, 630, 10, 3, UNI_KEHNOROTATE } /* kehnorotate=t */, - { 2, 2612, 5148, 3, 16, UNI_JG__HANIFIROHINGYAPA } /* jg=hanifirohingyapa */, - { 1, 6370, 3068, 14, 5, UNI_INSC__CONSONANTFINAL } /* insc=consonantfinal */, - { 1, 4173, 0, 17, 0, UNI_IDSB } /* idsbinaryoperator */, - { 3, 2666, 1523, 3, 5, UNI_LB__SP } /* lb=space */, - { 6, 643, 4736, 3, 4, UNI_DT__INIT } /* dt=init */, - { 4, 2819, 963, 14, 6, -UNI_ECOMP } /* emojicomponent=false */, - { 1, 6015, 0, 10, 0, UNI_JAMO } /* hanguljamo */, - { 3, 4557, 535, 17, 4, UNI_LYDI } /* scriptextensions=lydi */, - { 2, 2338, 6482, 10, 3, UNI_IN__5_DOT_1 } /* presentin=5.1 */, - { 1, 2612, 4373, 3, 4, UNI_JG__HETH } /* jg=heth */, - { 13, 323, 5500, 2, 18, UNI_CHEROKEESUP } /* incherokeesupplement */, - { 8, 15, 3502, 2, 3, UNI_AGE__4 } /* age=4 */, - { 3, 1446, 963, 4, 6, -UNI_XIDS } /* xids=false */, - { 4, 2, 7333, 1, 23, UNI_DIACRITICALSFORSYMBOLS } /* combiningmarksforsymbols */, - { 0, 969, 0, 6, 0, UNI_COMPEX } /* compex */, - { 1, 3373, 3379, 6, 7, UNI_ME } /* enclosingmark */, - { 0, 3099, 1368, 11, 2, UNI_IN__2 } /* presentin=v20 */, - { 2, 6372, 233, 3, 4, UNI_WCHO } /* sc=wcho */, - { 1, 266, 373, 4, 4, UNI_CWCF } /* cwcf=yes */, - { 0, 323, 1859, 2, 11, UNI_INPAHAWHHMONG } /* inpahawhhmong */, - { 7, 1126, 1775, 4, 6, UNI_ARAB } /* scx=arabic */, - { 2, 6350, 372, 19, 3, UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=y */, - { 0, 5782, 9, 21, 2, UNI_LB__CR } /* graphemeclusterbreak=cr */, - { 1, 135, 336, 2, 4, UNI_TAKR } /* istakr */, - { 3, 1446, 6841, 3, 3, UNI_XIDC } /* xidc=t */, - { 0, 1126, 63, 4, 4, UNI_CPMN } /* scx=cpmn */, - { 0, 3904, 631, 4, 5, UNI_MATH } /* math=true */, - { 0, 1126, 442, 4, 4, UNI_HANO } /* scx=hano */, - { 10, 6264, 2440, 7, 7, UNI_GREEKEXT } /* block=greekext */, - { 0, 2612, 6660, 3, 10, UNI_JG__AFRICANQAF } /* jg=africanqaf */, - { 4, 4557, 3590, 16, 9, UNI_ETHI } /* scriptextensions=ethiopic */, - { 0, 2055, 321, 5, 5, UNI_POSIXPRINT } /* posixprint */, - { 3, 2584, 455, 3, 2, UNI_MRO } /* ismro */, - { 9, 2666, 53, 3, 2, UNI_LB__NS } /* lb=ns */, - { 0, 1441, 6544, 3, 6, UNI_WB__FO } /* wb=format */, - { 0, 1696, 1715, 5, 10, UNI_INCYPROMINOAN } /* blk=cyprominoan */, - { 5, 2317, 218, 3, 3, UNI_TGLG } /* istglg */, - { 2, 6370, 6881, 14, 10, UNI_INSC__CONSONANTHEADLETTER } /* insc=consonantheadletter */, - { 1, 5260, 3535, 9, 7, UNI_WB__EXTEND } /* wordbreak=extend */, - { 9, 4557, 2302, 17, 12, UNI_HUNG } /* scriptextensions=oldhungarian */, - { 1, 3778, 128, 4, 2, UNI_LAO } /* islaoo */, - { 4, 2612, 7530, 3, 14, UNI_JG__NOJOININGGROUP } /* jg=nojoininggroup */, - { 0, 1977, 0, 6, 0, UNI_S } /* symbol */, - { 2, 4557, 217, 17, 4, UNI_TGLG } /* scriptextensions=tglg */, - { 14, 266, 0, 4, 0, UNI_CWCF } /* cwcf */, - { 1, 8029, 0, 22, 0, UNI_ENCLOSEDIDEOGRAPHICSUP } /* enclosedideographicsup */, - { 0, 135, 130, 2, 4, UNI_LATN } /* islatn */, - { 0, 1126, 1390, 4, 9, UNI_ORKH } /* scx=oldturkic */, - { 0, 1874, 1051, 7, 4, UNI_SC__YEZI } /* script=yezi */, - { 0, 916, 2753, 4, 3, UNI_AGE__5_DOT_2 } /* age=5.2 */, - { 0, 1126, 1509, 4, 10, UNI_DIAK } /* scx=divesakuru */, - { 5, 1874, 1245, 7, 4, UNI_SC__THAI } /* script=thai */, - { 0, 2394, 377, 6, 6, UNI_INCHAKMA } /* block=chakma */, - { 0, 135, 2060, 2, 6, UNI_SYRC } /* issyriac */, - { 0, 1874, 1176, 7, 9, UNI_BHKS } /* script=bhaiksuki */, - { 0, 2394, 1223, 6, 7, UNI_INBENGALI } /* block=bengali */, - { 1, 7847, 7208, 18, 5, UNI_DT__SUP } /* decompositiontype=super */, - { 3, 32, 631, 2, 2, UNI_VS } /* vs=t */, - { 1, 2372, 963, 3, 6, -UNI_IDC } /* idc=false */, - { 14, 546, 551, 4, 2, UNI_NV__3_SLASH_5 } /* nv=3/5 */, - { 0, 8095, 2055, 9, 2, UNI_PO } /* category=po */, - { 3, 916, 6482, 5, 3, UNI_AGE__15_DOT_1 } /* age=15.1 */, - { 1, 135, 490, 2, 4, UNI_QAAI } /* isqaai */, - { 17, 285, 927, 3, 2, UNI_GCB__V } /* gcb=v */, - { 6, 6372, 850, 3, 4, UNI_SC__QAAI } /* sc=zinh */, - { 0, 5803, 7110, 15, 10, UNI_IDENTIFIERTYPE__LIMITEDUSE } /* identifiertype=limiteduse */, - { 0, 2909, 7143, 3, 22, UNI_EGYPTIANHIEROGLYPHSEXTA } /* isegyptianhieroglyphsexta */, - { 0, 2371, 3501, 9, 3, UNI_xidc_values_index } /* xidcontinue= */, - { 7, 8140, 4348, 28, 4, UNI_CJKEXTH } /* incjkunifiedideographsextensionh */, - { 4, 3736, 81, 7, 2, UNI_LATINEXTG } /* latinextg */, - { 1, 1126, 861, 4, 7, UNI_SHAW } /* scx=shavian */, - { 0, 323, 1579, 2, 10, UNI_INKHAROSHTHI } /* inkharoshthi */, - { 4, 1446, 631, 8, 2, UNI_XIDS } /* xidstart=t */, - { 8, 1126, 173, 4, 4, UNI_PHLP } /* scx=phlp */, - { 0, 135, 1528, 2, 8, UNI_BUGI } /* isbuginese */, - { 0, 2394, 8108, 6, 32, UNI_INIDC } /* block=ideographicdescriptioncharacters */, - { 0, 1499, 0, 3, 0, UNI_DEP } /* dep */, - { 0, 4557, 4190, 17, 4, UNI_BRAI } /* scriptextensions=brai */, - { 1, 3734, 2694, 3, 12, UNI_LOWSURROGATES } /* inlowsurrogates */, - { 1, 7697, 1185, 27, 2, UNI_CCC__24 } /* canonicalcombiningclass=ccc24 */, - { 0, 3040, 7506, 3, 24, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* insymbolsandpictographsexta */, - { 2, 1874, 709, 7, 5, UNI_SC__LIMB } /* script=limbu */, - { 2, 1696, 1270, 4, 7, UNI_INMULTANI } /* blk=multani */, - { 15, 2601, 321, 6, 5, UNI_XPOSIXPRINT } /* xposixprint */, - { 5, 135, 6730, 2, 24, UNI_HIGHPUSURROGATES } /* ishighprivateusesurrogates */, - { 1, 2394, 6188, 6, 21, UNI_YIJING } /* block=yijinghexagramsymbols */, - { 2, 0, 3793, 1, 13, UNI_LISUSUP } /* lisusupplement */, - { 0, 5782, 1920, 21, 3, UNI_WB__EB } /* graphemeclusterbreak=gaz */, - { 0, 3976, 2161, 14, 8, UNI_NV__17_SLASH_2 } /* numericvalue=8.500e+00 */, - { 5, 1874, 2878, 7, 5, UNI_KHMR } /* script=khmer */, - { 0, 1639, 0, 6, 0, UNI_L } /* letter */, - { 0, 5827, 0, 5, 0, UNI_GREK } /* greek */, - { 11, 2394, 1045, 6, 6, UNI_INWANCHO } /* block=wancho */, - { 0, 1773, 1061, 8, 4, UNI_ARABICEXTB } /* isarabicextb */, - { 1, 30, 4320, 1, 10, UNI_XPOSIXLOWER } /* islowercase */, - { 0, 1696, 1664, 4, 10, UNI_INWARANGCITI } /* blk=warangciti */, - { 0, 1126, 1291, 4, 7, UNI_SIDD } /* scx=siddham */, - { 0, 2201, 304, 4, 1, UNI_NV__24 } /* nv=24 */, - { 5, 6372, 1223, 3, 7, UNI_SC__BENG } /* sc=bengali */, - { 0, 6431, 864, 10, 2, UNI_LB__VI } /* linebreak=vi */, - { 1, 323, 8920, 2, 42, UNI_UCASEXT } /* inunifiedcanadianaboriginalsyllabicsextended */, - { 4, 4849, 7906, 11, 17, UNI_SUPPUAB } /* supplementaryprivateuseareab */, - { 1, 2394, 6053, 6, 19, UNI_SUNDANESESUP } /* block=sundanesesupplement */, - { 2, 1126, 1241, 4, 4, UNI_GRAN } /* scx=gran */, - { 17, 5069, 962, 16, 3, -UNI_EBASE } /* emojimodifierbase=f */, - { 10, 4557, 1344, 17, 9, UNI_NBAT } /* scriptextensions=nabataean */, - { 8, 7233, 2348, 25, 2, UNI_CCC__214 } /* canonicalcombiningclass=214 */, - { 6, 4557, 98, 17, 4, UNI_HLUW } /* scriptextensions=hluw */, - { 0, 916, 0, 8, 0, UNI_AGE__10 } /* age=10.0 */, - { 6, 4156, 644, 16, 2, UNI_idcompatmathstart_values_index } /* idcompatmathstart= */, - { 0, 1874, 1598, 7, 10, UNI_NAGM } /* script=nagmundari */, - { 2, 1446, 0, 8, 0, UNI_XIDS } /* xidstart */, - { 5, 19, 631, 4, 5, UNI_POSIXXDIGIT } /* ahex=true */, - { 0, 6372, 854, 3, 7, UNI_SC__SHRD } /* sc=sharada */, - { 4, 349, 0, 2, 0, UNI_PD } /* pd */, - { 5, 2666, 3029, 3, 11, UNI_LB__EX } /* lb=exclamation */, - { 2, 4173, 963, 4, 2, -UNI_IDSB } /* idsb=f */, - { 0, 7090, 5620, 17, 4, UNI_ce_values_index } /* compositionexclusion= */, - { 0, 323, 4785, 2, 8, UNI_INBOPOMOFO } /* inbopomofo */, - { 3, 1696, 3750, 4, 14, UNI_PHONETICEXTSUP } /* blk=phoneticextsup */, - { 1, 135, 5044, 2, 8, UNI_TAMILSUP } /* istamilsup */, - { 1, 4377, 5176, 13, 6, UNI_JG__MANICHAEANSAMEKH } /* jg=manichaeansamekh */, - { 1, 4005, 963, 16, 6, -UNI_STERM } /* sentenceterminal=false */, - { 3, 8596, 4249, 22, 12, UNI_INSC__NUMBERJOINER } /* indicsyllabiccategory=numberjoiner */, - { 1, 114, 0, 4, 0, UNI_KITS } /* kits */, - { 1, 358, 2809, 4, 10, UNI_CCC__6 } /* ccc=hanreading */, - { 0, 8037, 0, 11, 0, UNI_IDEO } /* ideographic */, - { 11, 1498, 963, 2, 6, -UNI_SD } /* sd=false */, - { 0, 1126, 1752, 4, 4, UNI_GURU } /* scx=guru */, - { 8, 2345, 606, 3, 3, UNI_IN__7 } /* in=7.0 */, - { 2, 2045, 963, 7, 6, -UNI_RADICAL } /* radical=false */, - { 0, 2833, 261, 3, 2, UNI_CN } /* gc=cn */, - { 0, 721, 2347, 3, 3, UNI_AGE__14 } /* age=14 */, - { 2, 135, 2511, 2, 11, UNI_NAND } /* isnandinagari */, - { 17, 1934, 645, 11, 3, -UNI_BIDIC } /* bidicontrol=no */, - { 1, 1126, 5500, 4, 4, UNI_CHER } /* scx=cher */, - { 1, 1874, 1528, 7, 4, UNI_SC__BUGI } /* script=bugi */, - { 19, 4173, 963, 17, 2, -UNI_IDSB } /* idsbinaryoperator=f */, - { 0, 2666, 290, 4, 1, UNI_LB__B2 } /* lb=b2 */, - { 0, 8088, 4129, 16, 14, UNI_ZS } /* generalcategory=spaceseparator */, - { 4, 3961, 1104, 14, 3, UNI_NV__7_SLASH_12 } /* numericvalue=7/12 */, - { 0, 1441, 591, 3, 2, UNI_WB__EB } /* wb=eb */, - { 1, 8861, 1645, 7, 9, UNI_SMALLFORMS } /* block=smallforms */, - { 17, 8867, 0, 33, 0, UNI_SUPMATHOPERATORS } /* supplementalmathematicaloperators */, - { 0, 3904, 963, 4, 2, -UNI_MATH } /* math=f */, - { 0, 3736, 0, 14, 0, UNI_LATINEXTD } /* latinextendedd */, - { 8, 1126, 1880, 3, 5, UNI_MLYM } /* scx=mlym */, - { 0, 2394, 585, 6, 6, UNI_INTODHRI } /* block=todhri */, - { 1, 30, 7016, 1, 5, UNI_DEVA } /* isdeva */, - { 0, 7086, 0, 24, 0, UNI_COMPEX } /* fullcompositionexclusion */, - { 4, 323, 6913, 3, 14, UNI_TRANSPORTANDMAP } /* intransportandmap */, - { 0, 4703, 631, 5, 2, UNI_XPOSIXUPPER } /* upper=t */, - { 1, 323, 585, 2, 6, UNI_INTODHRI } /* intodhri */, - { 0, 5604, 229, 20, 2, UNI_VO__TU } /* verticalorientation=tu */, - { 1, 969, 373, 6, 4, UNI_COMPEX } /* compex=yes */, - { 0, 323, 548, 2, 2, UNI_IN__3 } /* in=3 */, - { 1, 3599, 4664, 10, 6, UNI_ARABICEXTC } /* block=arabicextc */, - { 2, 2394, 2099, 6, 12, UNI_INMASARAMGONDI } /* block=masaramgondi */, - { 9, 3219, 0, 8, 0, UNI_GEOR } /* georgian */, - { 2, 6372, 193, 3, 4, UNI_SC__SAMR } /* sc=samr */, - { 0, 1091, 360, 5, 2, UNI_nfkdqc_values_index } /* nfkdqc= */, - { 0, 3098, 963, 5, 6, -UNI_EPRES } /* epres=false */, - { 2, 1744, 559, 4, 4, UNI_ONAO } /* isolonal */, - { 1, 2394, 1298, 6, 7, UNI_INSOYOMBO } /* block=soyombo */, - { 2, 6431, 135, 10, 2, UNI_LB__IS } /* linebreak=is */, - { 0, 323, 1553, 2, 8, UNI_INJAVANESE } /* injavanese */, - { 0, 5029, 0, 15, 0, UNI_DIACRITICALSSUP } /* diacriticalssup */, - { 2, 1126, 51, 4, 4, UNI_CANS } /* scx=cans */, - { 0, 3274, 17, 15, 1, UNI_EA__H } /* eastasianwidth=h */, - { 0, 709, 0, 5, 0, UNI_LIMB } /* limbu */, - { 5, 3778, 4666, 7, 4, UNI_LATINEXTC } /* islatinextc */, - { 1, 383, 631, 4, 2, UNI_CWCM } /* cwcm=t */, - { 1, 1781, 5518, 3, 17, UNI_SMALLKANAEXT } /* issmallkanaextension */, - { 0, 71, 963, 3, 2, -UNI_CWU } /* cwu=f */, - { 2, 6431, 288, 9, 3, UNI_LB__H2 } /* linebreak=h2 */, - { 4, 7847, 4736, 18, 4, UNI_DT__INIT } /* decompositiontype=init */, - { 2, 7356, 631, 26, 2, UNI_PCM } /* prependedconcatenationmark=t */, - { 0, 1781, 1645, 3, 9, UNI_SMALLFORMS } /* issmallforms */, - { 0, 323, 2240, 2, 4, UNI_IN__4_DOT_1 } /* in=4.1 */, - { 1, 2394, 4051, 7, 16, UNI_UCAS } /* block=canadiansyllabics */, - { 5, 8324, 1741, 30, 4, UNI_CJKEXTI } /* blk=cjkunifiedideographsextensioni */, - { 0, 1236, 6777, 3, 19, UNI_CJKCOMPATIDEOGRAPHSSUP } /* cjkcompatideographssup */, - { 1, 2473, 2444, 8, 8, UNI_ETHIOPICEXT } /* ethiopicextended */, - { 12, 2799, 2772, 5, 13, UNI_ANCIENTSYMBOLS } /* blk=ancientsymbols */, - { 10, 30, 1498, 1, 4, UNI_DEP } /* isdep */, - { 4, 2069, 3410, 11, 13, UNI_JT__R } /* joiningtype=rightjoining */, - { 4, 575, 334, 3, 2, UNI_SB__LE } /* sb=le */, - { 2, 4557, 1752, 17, 4, UNI_GURU } /* scriptextensions=guru */, - { 2, 7847, 3712, 18, 6, UNI_DT__COM } /* decompositiontype=compat */, - { 1, 135, 3423, 2, 4, UNI_HEBR } /* ishebr */, - { 1, 2394, 1061, 9, 4, UNI_CJKEXTB } /* block=cjkextb */, - { 1, 6372, 51, 3, 4, UNI_CANS } /* sc=cans */, - { 0, 2045, 645, 7, 3, -UNI_RADICAL } /* radical=no */, - { 2, 135, 4658, 2, 12, UNI_CYRILLICEXTC } /* iscyrillicextc */, - { 0, 2612, 3843, 3, 3, UNI_JG__TAW } /* jg=taw */, - { 0, 1126, 59, 4, 4, UNI_CHRS } /* scx=chrs */, - { 2, 2394, 4927, 6, 18, UNI_ORNAMENTALDINGBATS } /* block=ornamentaldingbats */, - { 4, 8088, 3186, 16, 5, UNI_XPOSIXDIGIT } /* generalcategory=digit */, - { 3, 4557, 729, 17, 5, UNI_BATK } /* scriptextensions=batak */, - { 2, 3961, 0, 15, 0, UNI_NV__70 } /* numericvalue=70 */, - { 0, 1126, 781, 4, 7, UNI_MARC } /* scx=marchen */, - { 3, 1904, 0, 11, 0, UNI_SYLO } /* sylotinagri */, - { 0, 1934, 631, 11, 2, UNI_BIDIC } /* bidicontrol=t */, - { 0, 30, 4275, 1, 16, UNI_PD } /* isdashpunctuation */, - { 1, 2473, 1549, 8, 4, UNI_ETHIOPICEXTA } /* ethiopicexta */, - { 0, 1441, 3086, 3, 7, UNI_WB__NU } /* wb=numeric */, - { 4, 323, 1837, 2, 11, UNI_INMEDEFAIDRIN } /* inmedefaidrin */, - { 4, 2599, 4321, 8, 5, UNI_XPOSIXLOWER } /* isxposixlower */, - { 0, 7307, 8396, 8, 29, UNI_ARABICMATH } /* inarabicmathematicalalphabeticsymbols */, - { 1, 4557, 1223, 17, 7, UNI_BENG } /* scriptextensions=bengali */, - { 0, 135, 7766, 2, 27, UNI_ANCIENTGREEKMUSIC } /* isancientgreekmusicalnotation */, - { 0, 2612, 4390, 3, 4, UNI_JG__KAPH } /* jg=kaph */, - { 0, 6264, 6040, 11, 13, UNI_GEORGIANSUP } /* block=georgiansupplement */, - { 1, 7307, 1764, 9, 2, UNI_ARABICPFB } /* inarabicpfb */, - { 0, 8088, 2494, 16, 2, UNI__PERL_SURROGATE } /* generalcategory=cs */, - { 5, 6053, 0, 19, 0, UNI_SUNDANESESUP } /* sundanesesupplement */, - { 1, 3125, 373, 13, 2, UNI_QMARK } /* quotationmark=y */, - { 1, 2463, 6400, 6, 5, UNI_CYRILLICSUP } /* cyrillicsup */, - { 0, 3599, 6400, 10, 12, UNI_ARABICSUP } /* block=arabicsupplement */, - { 2, 1938, 3266, 7, 8, UNI_CONTROLPICTURES } /* controlpictures */, - { 0, 1874, 3764, 7, 10, UNI_SC__DEVA } /* script=devanagari */, - { 4, 7420, 4280, 7, 11, UNI_SUPPUNCTUATION } /* blk=suppunctuation */, - { 8, 1126, 5148, 4, 14, UNI_ROHG } /* scx=hanifirohingya */, - { 0, 8088, 4321, 16, 15, UNI_LOWERCASELETTER } /* generalcategory=lowercaseletter */, - { 10, 6838, 5417, 5, 15, UNI_LOE } /* inpc=visualorderleft */, - { 3, 1874, 35, 7, 4, UNI_BATK } /* script=batk */, - { 6, 1696, 8761, 7, 23, UNI_CJKCOMPATIDEOGRAPHS } /* blk=cjkcompatibilityideographs */, - { 0, 1874, 1837, 7, 11, UNI_MEDF } /* script=medefaidrin */, - { 4, 3824, 0, 16, 0, UNI_JG__MALAYALAMNNNA } /* jg=malayalamnnna */, - { 6, 1322, 4666, 5, 4, UNI_CJKEXTC } /* iscjkextc */, - { 0, 5803, 6128, 18, 9, UNI_IDENTIFIERTYPE__NOTCHARACTER } /* identifiertype=notcharacter */, - { 16, 2612, 1572, 3, 7, UNI_JG__THINYEH } /* jg=thinyeh */, - { 6, 2584, 782, 3, 3, UNI_MARC } /* ismarc */, - { 0, 135, 4380, 2, 10, UNI_MANI } /* ismanichaean */, - { 2, 5782, 3535, 20, 7, UNI_GCB__EX } /* graphemeclusterbreak=extend */, - { 6, 1874, 1114, 7, 4, UNI_SC__LINB } /* script=linb */, - { 2, 2584, 2920, 3, 6, UNI_MAHJONG } /* ismahjong */, - { 6, 1874, 23, 7, 4, UNI_AHOM } /* script=ahom */, - { 2, 5364, 645, 20, 3, -UNI_EXTPICT } /* extendedpictographic=no */, - { 0, 1775, 1061, 6, 4, UNI_ARABICEXTB } /* arabicextb */, - { 8, 3575, 6400, 10, 12, UNI_CYRILLICSUP } /* blk=cyrillicsupplement */, - { 2, 323, 2847, 2, 6, UNI_INCOPTIC } /* incoptic */, - { 1, 7233, 368, 24, 2, UNI_CCC__91 } /* canonicalcombiningclass=91 */, - { 1, 8468, 8794, 23, 7, UNI_INPC__BOTTOM } /* indicpositionalcategory=bottom */, - { 0, 2005, 0, 12, 0, UNI_GONG } /* gunjalagondi */, - { 0, 135, 5148, 2, 14, UNI_ROHG } /* ishanifirohingya */, - { 16, 4557, 422, 17, 4, UNI_MIAO } /* scriptextensions=miao */, - { 0, 3930, 1367, 15, 2, UNI_NV__1_SLASH_32 } /* numericvalue=1/32 */, - { 9, 7436, 605, 25, 2, UNI_CCC__107 } /* canonicalcombiningclass=107 */, - { 1, 54, 3218, 2, 5, UNI_SC__GEOR } /* sc=geor */, - { 1, 3734, 635, 13, 3, UNI_LATINEXTE } /* inlatinextendede */, - { 0, 1126, 245, 4, 4, UNI_YI } /* scx=yiii */, - { 0, 924, 2147, 5, 2, UNI_AGE__5 } /* age=v50 */, - { 8, 8145, 645, 16, 2, -UNI_UIDEO } /* unifiedideograph=n */, - { 12, 2833, 0, 3, 2, UNI_CASEDLETTER } /* gc=l& */, - { 8, 99, 0, 2, 0, UNI_UPPERCASELETTER } /* lu */, - { 0, 7233, 2809, 24, 10, UNI_CCC__6 } /* canonicalcombiningclass=hanreading */, - { 3, 1126, 2350, 4, 12, UNI_TUTG } /* scx=tulutigalari */, - { 3, 2394, 8, 6, 3, UNI_OCR } /* block=ocr */, - { 5, 2394, 201, 6, 4, UNI_TAGS } /* block=tags */, - { 9, 1773, 8396, 8, 29, UNI_ARABICMATH } /* isarabicmathematicalalphabeticsymbols */, - { 1, 1126, 1141, 4, 4, UNI_TAGB } /* scx=tagb */, - { 3, 2819, 631, 14, 2, UNI_ECOMP } /* emojicomponent=t */, - { 1, 6372, 2122, 3, 12, UNI_MEND } /* sc=mendekikakui */, - { 3, 2394, 5978, 6, 19, UNI_SUPARROWSB } /* block=supplementalarrowsb */, - { 0, 4927, 564, 15, 3, UNI_ORNAMENTALDINGBATS } /* ornamentaldingbats */, - { 0, 2666, 4503, 3, 7, UNI_LB__ZW } /* lb=zwspace */, - { 6, 1696, 6996, 4, 21, UNI_MEETEIMAYEKEXT } /* blk=meeteimayekextensions */, - { 2, 358, 6508, 2, 3, UNI_CCC__L } /* ccc=l */, - { 0, 8037, 6841, 10, 3, UNI_IDEO } /* ideographic=t */, - { 0, 1522, 0, 2, 0, UNI_ZS } /* zs */, - { 0, 1474, 7257, 7, 2, UNI_CCC__27 } /* ccc=ccc27 */, - { 0, 969, 1128, 5, 3, UNI_COMPEX } /* compex=t */, - { 2, 3599, 7740, 7, 26, UNI_ALPHABETICPF } /* block=alphabeticpresentationforms */, - { 0, 135, 4970, 2, 10, UNI_XPOSIXSPACE } /* iswhitespace */, - { 3, 2612, 2642, 3, 3, UNI_JG__HEH } /* jg=heh */, - { 2, 3930, 419, 15, 2, UNI_NV__1_SLASH_16 } /* numericvalue=1/16 */, - { 2, 4557, 1248, 17, 9, UNI_QAAI } /* scriptextensions=inherited */, - { 0, 7585, 0, 10, 0, UNI_bc_values_index } /* bidiclass= */, - { 5, 2201, 0, 12, 0, UNI_NV__1_SLASH_4 } /* nv=2.500e-01 */, - { 1, 8596, 6636, 29, 11, UNI_INSC__CONSONANTSUBJOINED } /* indicsyllabiccategory=consonantsubjoined */, - { 8, 4785, 0, 4, 0, UNI_BOPO } /* bopo */, - { 4, 7307, 4644, 8, 9, UNI_ARABICEXTB } /* inarabicextendedb */, - { 8, 2418, 962, 12, 3, -UNI_CI } /* caseignorable=f */, - { 0, 3491, 1185, 13, 2, UNI_NV__24 } /* numericvalue=24 */, - { 2, 6647, 7530, 13, 14, UNI_JG__NOJOININGGROUP } /* joininggroup=nojoininggroup */, - { 0, 1566, 3796, 6, 10, UNI_KANASUP } /* iskanasupplement */, - { 2, 1126, 535, 4, 4, UNI_LYDI } /* scx=lydi */, - { 5, 2394, 724, 6, 5, UNI_INRUNIC } /* block=runic */, - { 0, 4557, 1870, 17, 4, UNI_KTHI } /* scriptextensions=kthi */, - { 0, 1441, 65, 3, 2, UNI_WB__MN } /* wb=mn */, - { 1, 1773, 2867, 3, 11, UNI_ALPHABETICPF } /* isalphabeticpf */, - { 2, 8095, 2387, 9, 6, UNI_N } /* category=number */, - { 5, 2502, 6898, 3, 14, UNI_MODIFIERLETTERS } /* inmodifierletters */, - { 3, 1714, 0, 11, 0, UNI_CPMN } /* cyprominoan */, - { 13, 1126, 237, 4, 4, UNI_XPEO } /* scx=xpeo */, - { 0, 3696, 963, 4, 2, -UNI_IDSU } /* idsu=f */, - { 6, 158, 160, 2, 2, UNI_ORYA } /* orya */, - { 0, 5260, 295, 10, 2, UNI_WB__XX } /* wordbreak=xx */, - { 7, 316, 963, 5, 2, -UNI__PERL_PATWS } /* patws=f */, - { 0, 19, 1128, 3, 2, UNI_ahex_values_index } /* ahex= */, - { 4, 1126, 3520, 4, 15, UNI_SARB } /* scx=oldsoutharabian */, - { 0, 2666, 4459, 3, 14, UNI_LB__BK } /* lb=mandatorybreak */, - { 8, 7233, 2138, 24, 2, UNI_CCC__11 } /* canonicalcombiningclass=11 */, - { 7, 323, 876, 2, 7, UNI_INTAGALOG } /* intagalog */, - { 1, 6372, 846, 3, 4, UNI_SC__SYRC } /* sc=syrc */, - { 1, 4067, 0, 17, 0, UNI_AGHB } /* caucasianalbanian */, - { 0, 135, 1639, 2, 6, UNI_L } /* isletter */, - { 0, 135, 3186, 2, 5, UNI_XPOSIXDIGIT } /* isdigit */, - { 3, 3274, 3, 15, 1, UNI_EA__W } /* eastasianwidth=w */, - { 14, 1447, 963, 3, 6, -UNI_IDS } /* ids=false */, - { 4, 2785, 5623, 2, 19, UNI_BC__ET } /* bc=europeanterminator */, - { 9, 7233, 8283, 24, 9, UNI_CCC__AL } /* canonicalcombiningclass=aboveleft */, - { 2, 2666, 108, 3, 2, UNI_GCB__T } /* lb=jt */, - { 1, 8500, 3465, 4, 11, UNI_MISCPICTOGRAPHS } /* miscpictographs */, - { 0, 135, 1664, 2, 4, UNI_WARA } /* iswara */, - { 0, 818, 0, 3, 0, UNI_ANY } /* any */, - { 2, 2461, 7669, 10, 13, UNI_CYRILLICSUP } /* incyrillicsupplementary */, - { 0, 6372, 506, 3, 4, UNI_TNSA } /* sc=tnsa */, - { 4, 3227, 2492, 5, 10, UNI_MISCSYMBOLS } /* blk=miscsymbols */, - { 0, 1874, 1335, 7, 9, UNI_SC__SIND } /* script=khudawadi */, - { 0, 8088, 64, 16, 1, UNI_P } /* generalcategory=p */, - { 0, 954, 958, 4, 4, UNI_BPT__O } /* bpt=open */, - { 0, 1126, 1752, 4, 11, UNI_GUKH } /* scx=gurungkhema */, - { 1, 1957, 3723, 7, 11, UNI_KANGXI } /* blk=kangxiradicals */, - { 0, 5260, 1674, 10, 7, UNI_WB__LE } /* wordbreak=aletter */, - { 3, 135, 569, 2, 6, UNI_RJNG } /* isrejang */, - { 0, 8095, 327, 9, 4, UNI_M } /* category=mark */, - { 0, 1696, 4306, 4, 6, UNI_INHANGUL } /* blk=hangul */, - { 1, 6370, 6636, 12, 11, UNI_INSC__CONSONANTSUBJOINED } /* insc=consonantsubjoined */, - { 0, 8095, 170, 9, 2, UNI_PC } /* category=pc */, - { 0, 5740, 963, 21, 6, -UNI_CWT } /* changeswhentitlecased=false */, - { 3, 4557, 114, 17, 4, UNI_KITS } /* scriptextensions=kits */, - { 7, 1696, 5148, 4, 14, UNI_INHANIFIROHINGYA } /* blk=hanifirohingya */, - { 1, 5069, 372, 16, 5, UNI_EBASE } /* emojimodifierbase=yes */, - { 1, 6912, 0, 22, 0, UNI_TRANSPORTANDMAP } /* transportandmapsymbols */, - { 9, 6996, 0, 14, 0, UNI_MEETEIMAYEKEXT } /* meeteimayekext */, - { 2, 6647, 2795, 14, 3, UNI_JG__ALEF } /* joininggroup=alef */, - { 0, 4557, 1426, 17, 9, UNI_SAMR } /* scriptextensions=samaritan */, - { 0, 3215, 2440, 5, 12, UNI_GREEKEXT } /* blk=greekextended */, - { 0, 1499, 645, 10, 3, -UNI_DEP } /* deprecated=no */, - { 6, 1126, 1039, 4, 4, UNI_TELU } /* scx=telu */, - { 0, 869, 631, 4, 5, UNI_TERM } /* term=true */, - { 2, 1126, 1263, 4, 4, UNI_MAKA } /* scx=maka */, - { 0, 859, 0, 4, 0, UNI_DASH } /* dash */, - { 1, 7697, 7461, 27, 2, UNI_CCC__28 } /* canonicalcombiningclass=ccc28 */, - { 0, 6372, 27, 3, 4, UNI_ARMI } /* sc=armi */, - { 0, 2461, 3796, 10, 10, UNI_CYRILLICSUP } /* incyrillicsupplement */, - { 1, 0, 3886, 1, 15, UNI_LINEARBIDEOGRAMS } /* linearbideograms */, - { 0, 170, 963, 3, 6, -UNI_PCM } /* pcm=false */, - { 9, 8596, 2890, 22, 9, UNI_INSC__NONJOINER } /* indicsyllabiccategory=nonjoiner */, - { 0, 1696, 8436, 5, 32, UNI_DIACRITICALSEXT } /* blk=combiningdiacriticalmarksextended */, - { 0, 2372, 0, 3, 0, UNI_IDC } /* idc */, - { 1, 2666, 1648, 3, 2, UNI_LB__LF } /* lb=lf */, - { 2, 1322, 5741, 3, 20, UNI_CWT } /* ischangeswhentitlecased */, - { 0, 2053, 4280, 7, 5, UNI_POSIXPUNCT } /* isposixpunct */, - { 0, 1126, 213, 4, 4, UNI_TFNG } /* scx=tfng */, - { 1, 326, 631, 5, 5, UNI_QMARK } /* qmark=true */, - { 3, 4557, 446, 17, 4, UNI_KHMR } /* scriptextensions=khmr */, - { 1, 8095, 268, 9, 2, UNI_CF } /* category=cf */, - { 7, 2666, 1984, 3, 9, UNI_LB__AI } /* lb=ambiguous */, - { 8, 1696, 7558, 4, 27, UNI_OCR } /* blk=opticalcharacterrecognition */, - { 0, 2833, 387, 3, 2, UNI_SM } /* gc=sm */, - { 8, 8088, 2696, 16, 9, UNI__PERL_SURROGATE } /* generalcategory=surrogate */, - { 7, 1276, 809, 3, 6, UNI_OLCK } /* inolchiki */, - { 0, 575, 6544, 3, 6, UNI_SB__FO } /* sb=format */, - { 4, 753, 526, 3, 3, UNI_KANBUN } /* kanbun */, - { 3, 6431, 1698, 8, 4, UNI_LB__CJ } /* linebreak=cj */, - { 0, 5, 2111, 1, 11, UNI_MATHALPHANUM } /* mathalphanum */, - { 1, 2502, 2706, 3, 12, UNI_MAYANNUMERALS } /* inmayannumerals */, - { 2, 5782, 261, 21, 2, UNI_GCB__CN } /* graphemeclusterbreak=cn */, - { 0, 30, 679, 1, 8, UNI_HANO } /* ishanunoo */, - { 1, 135, 1033, 2, 4, UNI_LYCI } /* islyci */, - { 3, 2819, 373, 14, 4, UNI_ECOMP } /* emojicomponent=yes */, - { 2, 1097, 0, 6, 0, UNI_NV__1_SLASH_3 } /* nv=1/3 */, - { 0, 135, 383, 2, 4, UNI_CWCM } /* iscwcm */, - { 0, 8564, 5526, 26, 10, UNI_CJKEXTD } /* block=cjkunifiedideographsextensiond */, - { 0, 4504, 2654, 5, 3, -UNI_XPOSIXSPACE } /* wspace=n */, - { 3, 135, 7739, 2, 10, UNI_XPOSIXALPHA } /* isalphabetic */, - { 8, 1874, 4190, 7, 4, UNI_BRAI } /* script=brai */, - { 4, 358, 6508, 2, 6, UNI_CCC__L } /* ccc=left */, - { 5, 1696, 4379, 3, 11, UNI_INMANICHAEAN } /* blk=manichaean */, - { 2, 1126, 2005, 4, 12, UNI_GONG } /* scx=gunjalagondi */, - { 0, 2833, 3360, 3, 13, UNI_XPOSIXDIGIT } /* gc=decimalnumber */, - { 2, 6229, 3093, 17, 5, UNI_bpt_values_index } /* bidipairedbrackettype= */, - { 9, 266, 963, 4, 2, -UNI_CWCF } /* cwcf=f */, - { 0, 2612, 3398, 3, 12, UNI_JG__VERTICALTAIL } /* jg=verticaltail */, - { 0, 7233, 1368, 24, 2, UNI_CCC__20 } /* canonicalcombiningclass=20 */, - { 0, 135, 5573, 2, 3, UNI_PUA } /* ispua */, - { 0, 1553, 1556, 3, 5, UNI_JAVA } /* javanese */, - { 4, 3178, 0, 5, 0, UNI_ASCII } /* ascii */, - { 1, 1126, 134, 4, 4, UNI_LISU } /* scx=lisu */, - { 0, 5260, 390, 10, 2, UNI_WB__SQ } /* wordbreak=sq */, - { 4, 4005, 373, 16, 2, UNI_STERM } /* sentenceterminal=y */, - { 1, 668, 963, 7, 6, -UNI_EXTPICT } /* extpict=false */, - { 0, 7233, 1279, 24, 2, UNI_CCC__BL } /* canonicalcombiningclass=bl */, - { 1, 323, 1045, 2, 6, UNI_INWANCHO } /* inwancho */, - { 8, 323, 55, 2, 4, UNI_INCHAM } /* incham */, - { 10, 1126, 815, 4, 4, UNI_OSMA } /* scx=osma */, - { 1, 1126, 494, 4, 4, UNI_ROHG } /* scx=rohg */, - { 9, 7233, 2668, 23, 2, UNI_CCC__B } /* canonicalcombiningclass=b */, - { 1, 5, 0, 2, 0, UNI_MC } /* mc */, - { 0, 135, 1775, 2, 6, UNI_ARAB } /* isarabic */, - { 10, 53, 644, 1, 6, UNI_NV__NAN } /* nt=none */, - { 0, 4557, 221, 17, 4, UNI_TIBT } /* scriptextensions=tibt */, - { 0, 6647, 238, 13, 2, UNI_JG__PE } /* joininggroup=pe */, - { 11, 4291, 631, 9, 5, UNI_DIA } /* diacritic=true */, - { 9, 2553, 373, 5, 2, UNI_CASED } /* cased=y */, - { 1, 2564, 7187, 4, 16, UNI_GEOMETRICSHAPESEXT } /* isgeometricshapesext */, - { 0, 1781, 0, 3, 0, UNI_S } /* iss */, - { 0, 1874, 1141, 7, 8, UNI_SC__TAGB } /* script=tagbanwa */, - { 17, 2819, 644, 13, 4, -UNI_ECOMP } /* emojicomponent=no */, - { 0, 624, 413, 6, 1, UNI_CCC__R } /* ccc=226 */, - { 0, 5325, 3886, 7, 15, UNI_LINEARBIDEOGRAMS } /* block=linearbideograms */, - { 1, 5, 782, 1, 6, UNI_MARC } /* marchen */, - { 0, 1874, 1315, 7, 7, UNI_SC__TIRH } /* script=tirhuta */, - { 9, 2394, 7129, 6, 14, UNI_MUSIC } /* block=musicalsymbols */, - { 0, 1696, 6996, 4, 14, UNI_MEETEIMAYEKEXT } /* blk=meeteimayekext */, - { 2, 2418, 372, 12, 2, UNI_ci_values_index } /* caseignorable= */, - { 8, 1523, 962, 4, 3, -UNI_XPOSIXSPACE } /* space=f */, - { 0, 6372, 1837, 3, 11, UNI_MEDF } /* sc=medefaidrin */, - { 0, 1474, 2223, 7, 2, UNI_CCC__33 } /* ccc=ccc33 */, - { 6, 2463, 6025, 8, 9, UNI_CYRILLICEXTA } /* cyrillicextendeda */, - { 1, 4557, 4021, 17, 6, UNI_TANG } /* scriptextensions=tangut */, - { 1, 4557, 1664, 17, 10, UNI_WARA } /* scriptextensions=warangciti */, - { 0, 4377, 5542, 13, 7, UNI_JG__MANICHAEANHUNDRED } /* jg=manichaeanhundred */, - { 0, 2394, 0, 6, 0, UNI_blk_values_index } /* block= */, - { 0, 3587, 655, 5, 6, UNI_INELBASAN } /* blk=elbasan */, - { 0, 3106, 309, 4, 2, UNI_IN__9 } /* in=v90 */, - { 5, 6146, 0, 7, 0, UNI_SINH } /* sinhala */, - { 4, 2338, 417, 10, 2, UNI_IN__15 } /* presentin=15 */, - { 0, 4557, 3826, 16, 10, UNI_MLYM } /* scriptextensions=malayalam */, - { 3, 5698, 645, 21, 3, -UNI_CWCM } /* changeswhencasemapped=no */, - { 5, 1279, 1019, 2, 3, UNI_XPOSIXBLANK } /* blank */, - { 1, 5325, 1703, 11, 4, UNI_LATINEXTD } /* block=latinextd */, - { 3, 8088, 268, 16, 2, UNI_CF } /* generalcategory=cf */, - { 0, 135, 2371, 2, 11, UNI_XIDC } /* isxidcontinue */, - { 4, 1781, 8254, 3, 29, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* issymbolsandpictographsextendeda */, - { 0, 3491, 2192, 13, 9, UNI_NV__3_SLASH_16 } /* numericvalue=1.875e-01 */, - { 9, 661, 0, 4, 0, UNI_ELYM } /* elym */, - { 2, 2394, 55, 6, 4, UNI_INCHAM } /* block=cham */, - { 1, 3215, 7187, 6, 21, UNI_GEOMETRICSHAPESEXT } /* blk=geometricshapesextended */, - { 1, 54, 4379, 2, 11, UNI_SC__MANI } /* sc=manichaean */, - { 1, 3599, 5821, 7, 18, UNI_ANCIENTGREEKNUMBERS } /* block=ancientgreeknumbers */, - { 0, 5260, 2362, 10, 9, UNI_WB__WSEGSPACE } /* wordbreak=wsegspace */, - { 8, 8609, 0, 10, 0, UNI_C } /* category=c */, - { 2, 135, 7951, 2, 18, UNI_INVS } /* isvariationselectors */, - { 0, 1035, 288, 2, 1, UNI_ci_values_index } /* ci= */, - { 16, 5, 8058, 1, 30, UNI_MATHALPHANUM } /* mathematicalalphanumericsymbols */, - { 1, 1126, 181, 4, 4, UNI_COPT } /* scx=qaac */, - { 1, 6647, 3843, 13, 3, UNI_JG__TAW } /* joininggroup=taw */, - { 1, 16, 6508, 1, 3, UNI_L } /* gc=l */, - { 5, 6277, 4666, 13, 4, UNI_MYANMAREXTC } /* block=myanmarextc */, - { 0, 399, 373, 5, 4, UNI_GREXT } /* grext=yes */, - { 16, 5740, 373, 21, 4, UNI_CWT } /* changeswhentitlecased=yes */, - { 0, 2833, 208, 3, 2, UNI_TITLE } /* gc=lt */, - { 9, 8142, 4814, 26, 4, UNI_CJKEXTF } /* cjkunifiedideographsextensionf */, - { 6, 0, 3793, 1, 6, UNI_LISUSUP } /* lisusup */, - { 0, 1097, 5549, 4, 5, UNI_NV__100000 } /* nv=100000 */, - { 1, 3778, 16, 15, 1, UNI_LATINEXTG } /* islatinextendedg */, - { 0, 6372, 2481, 3, 8, UNI_SC__KANA } /* sc=katakana */, - { 3, 6431, 3557, 10, 3, UNI_LB__ZWJ } /* linebreak=zwj */, - { 4, 6167, 8820, 3, 7, UNI_VO__U } /* vo=upright */, - { 0, 2553, 0, 5, 0, UNI_CASED } /* cased */, - { 5, 135, 4718, 2, 18, UNI_IDST } /* isidstrinaryoperator */, - { 0, 2833, 2387, 3, 6, UNI_N } /* gc=number */, - { 10, 4557, 938, 17, 8, UNI_BALI } /* scriptextensions=balinese */, - { 11, 1775, 3903, 5, 5, UNI_ARABICMATH } /* arabicmath */, - { 0, 5698, 373, 21, 4, UNI_CWCM } /* changeswhencasemapped=yes */, - { 0, 2394, 4980, 6, 4, UNI_RUMI } /* block=rumi */, - { 2, 2394, 6801, 6, 16, UNI_INDICNUMBERFORMS } /* block=indicnumberforms */, - { 2, 1696, 1549, 7, 4, UNI_CJKEXTA } /* blk=cjkexta */, - { 2, 1696, 2481, 4, 11, UNI_KATAKANAEXT } /* blk=katakanaext */, - { 2, 5585, 373, 19, 4, UNI_TERM } /* terminalpunctuation=yes */, - { 0, 2394, 5044, 6, 15, UNI_TAMILSUP } /* block=tamilsupplement */, - { 2, 3930, 2732, 14, 8, UNI_NV__1_SLASH_10 } /* numericvalue=1.000e-01 */, - { 0, 2371, 962, 10, 3, -UNI_XIDC } /* xidcontinue=f */, - { 0, 3961, 1364, 14, 3, UNI_NV__7000 } /* numericvalue=7000 */, - { 5, 358, 8283, 4, 9, UNI_CCC__AL } /* ccc=aboveleft */, - { 1, 323, 126, 2, 3, UNI_INLAO } /* inlao */, - { 0, 3599, 5086, 7, 16, UNI_ALCHEMICAL } /* block=alchemicalsymbols */, - { 1, 8468, 8794, 23, 15, UNI_INPC__BOTTOMANDRIGHT } /* indicpositionalcategory=bottomandright */, - { 2, 1945, 373, 5, 2, UNI_BIDIM } /* bidim=y */, - { 2, 8088, 6544, 16, 6, UNI_CF } /* generalcategory=format */, - { 0, 1696, 975, 4, 8, UNI_INDUPLOYAN } /* blk=duployan */, - { 0, 1781, 4006, 3, 15, UNI_STERM } /* issentenceterminal */, - { 2, 954, 644, 2, 3, UNI_BPT__N } /* bpt=n */, - { 1, 788, 373, 6, 2, UNI_NFKCQC__Y } /* nfkcqc=y */, - { 2, 323, 7120, 2, 23, UNI_BYZANTINEMUSIC } /* inbyzantinemusicalsymbols */, - { 1, 358, 1279, 4, 2, UNI_CCC__BL } /* ccc=bl */, - { 0, 323, 6996, 2, 14, UNI_MEETEIMAYEKEXT } /* inmeeteimayekext */, - { 2, 8918, 6137, 5, 4, UNI_ANY } /* isunicode */, - { 0, 643, 3068, 3, 5, UNI_DT__FIN } /* dt=final */, - { 1, 1874, 181, 7, 4, UNI_SC__COPT } /* script=qaac */, - { 0, 323, 535, 2, 6, UNI_INLYDIAN } /* inlydian */, - { 2, 1291, 0, 4, 0, UNI_SIDD } /* sidd */, - { 8, 306, 1186, 3, 2, UNI_NV__43 } /* nv=43 */, - { 3, 2071, 3326, 3, 14, UNI_INIMPERIALARAMAIC } /* inimperialaramaic */, - { 1, 8596, 0, 22, 0, UNI_insc_values_index } /* indicsyllabiccategory= */, - { 8, 6372, 3111, 3, 14, UNI_SC__PHLP } /* sc=psalterpahlavi */, - { 1, 1447, 644, 3, 4, -UNI_IDST } /* idst=no */, - { 4, 1696, 1291, 4, 7, UNI_INSIDDHAM } /* blk=siddham */, - { 5, 2394, 8225, 7, 15, UNI_CUNEIFORMNUMBERS } /* block=cuneiformnumbers */, - { 0, 4557, 569, 17, 6, UNI_RJNG } /* scriptextensions=rejang */, - { 4, 1696, 5500, 4, 8, UNI_INCHEROKEE } /* blk=cherokee */, - { 4, 135, 1298, 2, 7, UNI_SOYO } /* issoyombo */, - { 18, 7979, 682, 23, 3, UNI_JG__MANICHAEANNUN } /* joininggroup=manichaeannun */, - { 1, 323, 1608, 2, 10, UNI_INOLDPERSIAN } /* inoldpersian */, - { 5, 54, 1880, 2, 5, UNI_SC__MLYM } /* sc=mlym */, - { 4, 1322, 3712, 5, 11, UNI_CJKCOMPATFORMS } /* iscjkcompatforms */, - { 5, 6370, 5939, 5, 16, UNI_INSC__VOWELINDEPENDENT } /* insc=vowelindependent */, - { 0, 4557, 4620, 17, 6, UNI_ZYYY } /* scriptextensions=common */, - { 0, 323, 5392, 2, 9, UNI_HALFMARKS } /* inhalfmarks */, - { 5, 6372, 59, 3, 4, UNI_CHRS } /* sc=chrs */, - { 0, 1126, 4021, 4, 6, UNI_TANG } /* scx=tangut */, - { 0, 30, 1724, 1, 12, UNI_DOMINO } /* indominotiles */, - { 6, 285, 2835, 3, 6, UNI_GCB__XX } /* gcb=other */, - { 0, 7697, 415, 27, 2, UNI_CCC__34 } /* canonicalcombiningclass=ccc34 */, - { 1, 1126, 90, 4, 4, UNI_GUJR } /* scx=gujr */, - { 8, 1696, 4306, 4, 15, UNI_INHANGUL } /* blk=hangulsyllables */, - { 4, 1957, 1061, 8, 4, UNI_KANAEXTB } /* blk=kanaextb */, - { 5, 6431, 6093, 10, 11, UNI_LB__AS } /* linebreak=aksarastart */, - { 8, 904, 645, 5, 3, -UNI_UIDEO } /* uideo=no */, - { 0, 1696, 426, 4, 4, UNI_INTOTO } /* blk=toto */, - { 0, 4557, 2122, 17, 4, UNI_MEND } /* scriptextensions=mend */, - { 0, 1874, 446, 7, 4, UNI_KHMR } /* script=khmr */, - { 8, 709, 0, 4, 0, UNI_LIMB } /* limb */, - { 0, 3930, 309, 14, 1, UNI_NV__19 } /* numericvalue=19 */, - { 1, 1126, 1027, 4, 6, UNI_LEPC } /* scx=lepcha */, - { 2, 1126, 11, 4, 4, UNI_ADLM } /* scx=adlm */, - { 0, 6350, 962, 19, 3, -UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=f */, - { 4, 4321, 4700, 3, 3, UNI_lower_values_index } /* lower= */, - { 1, 5059, 7644, 7, 25, UNI_KATAKANAEXT } /* block=katakanaphoneticextensions */, - { 1, 7847, 1744, 18, 3, UNI_DT__ISO } /* decompositiontype=iso */, - { 1, 1874, 122, 7, 4, UNI_KRAI } /* script=krai */, - { 3, 323, 5482, 2, 18, UNI_TAIXUANJING } /* intaixuanjingsymbols */, - { 0, 2394, 930, 6, 8, UNI_INARMENIAN } /* block=armenian */, - { 1, 135, 4156, 2, 17, UNI_IDCOMPATMATHSTART } /* isidcompatmathstart */, - { 0, 6370, 2452, 5, 5, UNI_INSC__VOWEL } /* insc=vowel */, - { 0, 558, 2654, 2, 3, -UNI_LOE } /* loe=n */, - { 1, 135, 482, 2, 4, UNI_MIAO } /* isplrd */, - { 0, 4970, 0, 10, 0, UNI_XPOSIXSPACE } /* whitespace */, - { 0, 285, 735, 4, 2, UNI_WB__EB } /* gcb=em */, - { 0, 1874, 1248, 7, 9, UNI_SC__QAAI } /* script=inherited */, - { 0, 4557, 86, 17, 4, UNI_GREK } /* scriptextensions=grek */, - { 9, 30, 4290, 1, 16, UNI_DIACRITICALSEXT } /* indiacriticalsext */, - { 0, 135, 1291, 2, 7, UNI_SIDD } /* issiddham */, - { 20, 1126, 434, 4, 4, UNI_DIAK } /* scx=diak */, - { 0, 135, 8029, 2, 22, UNI_ENCLOSEDIDEOGRAPHICSUP } /* isenclosedideographicsup */, - { 3, 3778, 0, 7, 0, UNI_LATN } /* islatin */, - { 0, 1322, 6796, 3, 21, UNI_INDICNUMBERFORMS } /* iscommonindicnumberforms */, - { 15, 7420, 1896, 7, 8, UNI_SUPERANDSUB } /* blk=superandsub */, - { 2, 2504, 4666, 7, 4, UNI_MYANMAREXTC } /* myanmarextc */, - { 1, 1874, 78, 7, 4, UNI_DSRT } /* script=dsrt */, - { 0, 358, 1187, 4, 2, UNI_CCC__35 } /* ccc=35 */, - { 13, 1874, 854, 7, 7, UNI_SC__SHRD } /* script=sharada */, - { 5, 6372, 11, 3, 4, UNI_SC__ADLM } /* sc=adlm */, - { 0, 4557, 138, 17, 4, UNI_MEDF } /* scriptextensions=medf */, - { 5, 1126, 150, 4, 4, UNI_NARB } /* scx=narb */, - { 2, 2394, 4291, 6, 12, UNI_DIACRITICALS } /* block=diacriticals */, - { 5, 546, 2230, 4, 8, UNI_NV__3_SLASH_8 } /* nv=3.750e-01 */, - { 0, 2833, 0, 3, 0, UNI_gc_values_index } /* gc= */, - { 0, 904, 645, 5, 2, -UNI_UIDEO } /* uideo=n */, - { 2, 135, 5761, 2, 21, UNI_CWU } /* ischangeswhenuppercased */, - { 0, 945, 630, 4, 3, UNI_EBASE } /* ebase=t */, - { 0, 1874, 1141, 7, 4, UNI_SC__TAGB } /* script=tagb */, - { 1, 7847, 2669, 20, 5, UNI_DT__NB } /* decompositiontype=nobreak */, - { 0, 2394, 704, 6, 5, UNI_INDOGRA } /* block=dogra */, - { 1, 3930, 5549, 14, 12, UNI_NV__1000000000000 } /* numericvalue=1000000000000 */, - { 0, 7436, 1367, 25, 2, UNI_CCC__132 } /* canonicalcombiningclass=132 */, - { 0, 8140, 6773, 27, 5, UNI_CJKEXTC } /* incjkunifiedideographsextensionc */, - { 0, 2055, 4280, 5, 5, UNI_POSIXPUNCT } /* posixpunct */, - { 4, 3491, 309, 13, 1, UNI_NV__9 } /* numericvalue=9 */, - { 0, 6277, 0, 13, 0, UNI_INMYANMAR } /* block=myanmar */, - { 0, 2053, 321, 7, 5, UNI_POSIXPRINT } /* isposixprint */, - { 6, 2833, 6897, 3, 14, UNI_LM } /* gc=modifierletter */, - { 9, 1126, 462, 4, 4, UNI_OGAM } /* scx=ogam */, - { 8, 135, 3447, 2, 15, UNI_MERC } /* ismeroiticcursive */, - { 0, 1126, 838, 4, 4, UNI_SARB } /* scx=sarb */, - { 0, 4557, 1375, 17, 4, UNI_ITAL } /* scriptextensions=ital */, - { 1, 4504, 0, 6, 0, UNI_XPOSIXSPACE } /* wspace */, - { 12, 1126, 2029, 4, 4, UNI_SOGD } /* scx=sogd */, - { 0, 1206, 3, 3, 1, UNI_EA__W } /* ea=w */, - { 11, 7979, 4874, 23, 5, UNI_JG__MANICHAEANZAYIN } /* joininggroup=manichaeanzayin */, - { 1, 1696, 1464, 4, 10, UNI_BOXDRAWING } /* blk=boxdrawing */, - { 0, 1696, 1353, 4, 9, UNI_INNEWTAILUE } /* blk=newtailue */, - { 1, 6277, 7819, 7, 19, UNI_MISCSYMBOLS } /* block=miscellaneoussymbols */, - { 4, 2238, 0, 4, 0, UNI_NV__4 } /* nv=4 */, - { 0, 916, 594, 5, 3, UNI_AGE__12_DOT_1 } /* age=12.1 */, - { 1, 358, 366, 4, 2, UNI_CCC__84 } /* ccc=84 */, - { 1, 6647, 3826, 12, 14, UNI_JG__MALAYALAMNNNA } /* joininggroup=malayalamnnna */, - { 1, 8095, 2553, 9, 11, UNI_CASEDLETTER } /* category=casedletter */, - { 8, 1097, 1367, 5, 2, UNI_NV__1_SLASH_32 } /* nv=1/32 */, - { 3, 5260, 9, 10, 2, UNI_LB__CR } /* wordbreak=cr */, - { 0, 1126, 1141, 4, 8, UNI_TAGB } /* scx=tagbanwa */, - { 1, 8095, 3639, 9, 13, UNI_ZL } /* category=lineseparator */, - { 13, 54, 1960, 2, 5, UNI_SC__KANA } /* sc=kana */, - { 1, 2338, 600, 11, 3, UNI_IN__14 } /* presentin=14.0 */, - { 2, 323, 2538, 2, 6, UNI_IPAEXT } /* inipaext */, - { 1, 2584, 8880, 3, 20, UNI_MATHOPERATORS } /* ismathematicaloperators */, - { 1, 721, 2280, 3, 4, UNI_AGE__6_DOT_2 } /* age=6.2 */, - { 2, 1957, 7644, 5, 25, UNI_KATAKANAEXT } /* blk=katakanaphoneticextensions */, - { 2, 585, 0, 6, 0, UNI_TODR } /* todhri */, - { 2, 1536, 5401, 4, 16, UNI_INPUNCTUATION } /* ingeneralpunctuation */, - { 0, 4557, 1284, 17, 7, UNI_PHAG } /* scriptextensions=phagspa */, - { 1, 5677, 631, 21, 2, UNI_CWCF } /* changeswhencasefolded=t */, - { 0, 1007, 0, 4, 0, UNI_HIRA } /* hira */, - { 0, 135, 8920, 2, 34, UNI_UCAS } /* isunifiedcanadianaboriginalsyllabics */, - { 13, 7233, 7627, 24, 4, UNI_CCC__216 } /* canonicalcombiningclass=atar */, - { 2, 221, 1317, 2, 2, UNI_TIRH } /* tirh */, - { 3, 575, 36, 3, 2, UNI_SB__AT } /* sb=at */, - { 0, 3215, 6040, 9, 6, UNI_GEORGIANSUP } /* blk=georgiansup */, - { 12, 1141, 0, 4, 0, UNI_TAGB } /* tagb */, - { 24, 2387, 0, 6, 0, UNI_N } /* number */, - { 0, 1696, 5014, 4, 5, UNI_INBAMUM } /* blk=bamum */, - { 0, 3086, 434, 12, 2, UNI_NT__DI } /* numerictype=di */, - { 0, 1097, 801, 4, 3, UNI_NV__15_SLASH_2 } /* nv=15/2 */, - { 9, 6104, 631, 21, 5, UNI_LOE } /* logicalorderexception=true */, - { 1, 2394, 1464, 6, 10, UNI_BOXDRAWING } /* block=boxdrawing */, - { 2, 3106, 1368, 5, 2, UNI_IN__12 } /* in=v120 */, - { 0, 1696, 8920, 4, 42, UNI_UCASEXT } /* blk=unifiedcanadianaboriginalsyllabicsextended */, - { 0, 3491, 3958, 13, 3, UNI_NV__5_SLASH_8 } /* numericvalue=5/8 */, - { 7, 3491, 5549, 14, 5, UNI_NV__400000 } /* numericvalue=400000 */, - { 1, 135, 110, 2, 4, UNI_KAWI } /* iskawi */, - { 6, 4557, 6053, 17, 9, UNI_SUND } /* scriptextensions=sundanese */, - { 1, 4321, 630, 8, 6, UNI_XPOSIXLOWER } /* lowercase=true */, - { 0, 624, 304, 5, 2, UNI_CCC__IS } /* ccc=240 */, - { 8, 444, 0, 2, 0, UNI_NO } /* no */, - { 0, 2833, 2553, 3, 11, UNI_CASEDLETTER } /* gc=casedletter */, - { 8, 7979, 238, 23, 2, UNI_JG__MANICHAEANPE } /* joininggroup=manichaeanpe */, - { 4, 1874, 753, 7, 7, UNI_SC__KNDA } /* script=kannada */, - { 2, 2785, 408, 3, 2, UNI_BC__EN } /* bc=en */, - { 33, 1033, 0, 4, 0, UNI_LYCI } /* lyci */, - { 2, 323, 8142, 2, 20, UNI_CJK } /* incjkunifiedideographs */, - { 0, 983, 373, 8, 2, UNI_EXT } /* extender=y */, - { 10, 6431, 2674, 10, 10, UNI_LB__NS } /* linebreak=nonstarter */, - { 1, 135, 486, 2, 4, UNI_PRTI } /* isprti */, - { 10, 7585, 1744, 21, 7, UNI_BC__LRI } /* bidiclass=lefttorightisolate */, - { 1, 2, 963, 3, 6, -UNI_CWL } /* cwl=false */, - { 0, 2666, 4473, 3, 14, UNI_LB__PO } /* lb=postfixnumeric */, - { 8, 54, 4638, 2, 6, UNI_SC__LATN } /* sc=latin */, - { 35, 2573, 373, 5, 4, UNI_JOINC } /* joinc=yes */, - { 10, 7923, 6693, 18, 14, UNI_EGYPTIANHIEROGLYPHFORMATCONTROLS } /* egyptianhieroglyphformatcontrols */, - { 0, 2055, 1993, 5, 5, UNI_POSIXGRAPH } /* posixgraph */, - { 8, 1874, 846, 7, 4, UNI_SC__SYRC } /* script=syrc */, - { 0, 5260, 1915, 10, 8, UNI_WB__EB } /* wordbreak=ebasegaz */, - { 1, 1696, 1033, 4, 6, UNI_INLYCIAN } /* blk=lycian */, - { 0, 2394, 4261, 6, 15, UNI_VEDICEXT } /* block=vedicextensions */, - { 0, 1114, 0, 4, 0, UNI_LINB } /* linb */, - { 8, 323, 6552, 2, 19, UNI_JAMOEXTB } /* inhanguljamoextendedb */, - { 43, 6372, 5148, 3, 4, UNI_SC__HAN } /* sc=hani */, - { 0, 3106, 1367, 4, 2, UNI_IN__3_DOT_2 } /* in=v32 */, - { 0, 135, 876, 2, 7, UNI_TGLG } /* istagalog */, - { 0, 575, 638, 3, 2, UNI_SB__SE } /* sb=se */, - { 0, 30, 5499, 1, 19, UNI_CHEROKEESUP } /* ischerokeesupplement */, - { 0, 6955, 819, 22, 3, UNI_JG__MALAYALAMNYA } /* joininggroup=malayalamnya */, - { 0, 4557, 1885, 17, 11, UNI_SORA } /* scriptextensions=sorasompeng */, - { 10, 1874, 434, 7, 4, UNI_DIAK } /* script=diak */, - { 4, 4557, 1007, 17, 8, UNI_HIRA } /* scriptextensions=hiragana */, - { 0, 7420, 4574, 5, 16, UNI_SMALLFORMS } /* blk=smallformvariants */, - { 5, 135, 1881, 2, 4, UNI_MLYM } /* ismlym */, - { 1, 535, 0, 4, 0, UNI_LYDI } /* lydi */, - { 15, 8088, 54, 16, 2, UNI_SC } /* generalcategory=sc */, - { 1, 1459, 4832, 4, 2, UNI_LATIN1 } /* latin1 */, - { 1, 687, 1925, 7, 8, UNI_LB__H3 } /* hst=lvtsyllable */, - { 10, 3274, 3208, 15, 7, UNI_EA__N } /* eastasianwidth=neutral */, - { 11, 352, 0, 4, 0, UNI_CARI } /* cari */, - { 1, 6431, 315, 10, 2, UNI_LB__AP } /* linebreak=ap */, - { 0, 4557, 154, 17, 4, UNI_NEWA } /* scriptextensions=newa */, - { 0, 3491, 2292, 12, 10, UNI_NV__1_SLASH_12 } /* numericvalue=8.333e-02 */, - { 0, 1474, 628, 8, 2, UNI_CCC__122 } /* ccc=ccc122 */, - { 0, 1810, 963, 11, 2, -UNI_KEHNOMIRROR } /* kehnomirror=f */, - { 3, 2394, 8920, 6, 42, UNI_UCASEXT } /* block=unifiedcanadianaboriginalsyllabicsextended */, - { 0, 6372, 4594, 3, 11, UNI_SGNW } /* sc=signwriting */, - { 0, 687, 0, 4, 0, UNI_hst_values_index } /* hst= */, - { 3, 4557, 2802, 16, 7, UNI_ARAB } /* scriptextensions=arabic */, - { 0, 954, 0, 4, 0, UNI_bpt_values_index } /* bpt= */, - { 1, 6670, 9, 14, 2, UNI_LB__CR } /* sentencebreak=cr */, - { 0, 4306, 0, 6, 0, UNI_HANG } /* hangul */, - { 5, 6838, 2999, 4, 5, UNI_INPC__LEFT } /* inpc=left */, - { 16, 2302, 0, 12, 0, UNI_HUNG } /* oldhungarian */, - { 2, 8324, 4814, 30, 4, UNI_CJKEXTF } /* blk=cjkunifiedideographsextensionf */, - { 0, 1874, 154, 7, 4, UNI_NEWA } /* script=newa */, - { 0, 2, 645, 3, 3, -UNI_CWL } /* cwl=no */, - { 13, 2394, 5289, 6, 20, UNI_INANATOLIANHIEROGLYPHS } /* block=anatolianhieroglyphs */, - { 53, 5044, 0, 5, 0, UNI_TAML } /* tamil */, - { 0, 2461, 1061, 10, 4, UNI_CYRILLICEXTB } /* incyrillicextb */, - { 0, 6264, 3740, 13, 9, UNI_GEORGIANEXT } /* block=georgianextended */, - { 0, 1126, 1618, 4, 10, UNI_PHNX } /* scx=phoenician */, - { 0, 6372, 1390, 3, 9, UNI_SC__ORKH } /* sc=oldturkic */, - { 0, 3778, 2694, 3, 12, UNI_LOWSURROGATES } /* islowsurrogates */, - { 0, 1696, 4115, 4, 4, UNI_INMODI } /* blk=modi */, - { 0, 661, 0, 7, 0, UNI_ELYM } /* elymaic */, - { 0, 8596, 1561, 22, 5, UNI_INSC__BINDU } /* indicsyllabiccategory=bindu */, - { 0, 502, 1656, 2, 8, UNI_SD } /* softdotted */, - { 0, 1874, 5148, 7, 4, UNI_SC__HAN } /* script=hani */, - { 12, 6372, 1051, 3, 4, UNI_SC__YEZI } /* sc=yezi */, - { 0, 1126, 189, 4, 4, UNI_RUNR } /* scx=runr */, - { 1, 4557, 654, 17, 4, UNI_ELBA } /* scriptextensions=elba */, - { 10, 1322, 5839, 3, 18, UNI_COUNTINGROD } /* iscountingrodnumerals */, - { 1, 2394, 1545, 6, 8, UNI_JAMOEXTA } /* block=jamoexta */, - { 1, 1441, 698, 3, 2, UNI_WB__MB } /* wb=mb */, - { 14, 8792, 3086, 3, 7, UNI_NT__NU } /* nt=numeric */, - { 1, 323, 1752, 2, 11, UNI_INGURUNGKHEMA } /* ingurungkhema */, - { 0, 2452, 2787, 2, 2, UNI_VO__R } /* vo=r */, - { 2, 1230, 7333, 3, 23, UNI_DIACRITICALSFORSYMBOLS } /* incombiningmarksforsymbols */, - { 0, 8088, 3643, 16, 9, UNI_Z } /* generalcategory=separator */, - { 3, 7847, 1736, 18, 8, UNI_DT__FRA } /* decompositiontype=fraction */, - { 1, 6372, 1435, 3, 4, UNI_SC__THAA } /* sc=thaa */, - { 1, 135, 237, 2, 4, UNI_XPEO } /* isxpeo */, - { 1, 3575, 0, 12, 0, UNI_INCYRILLIC } /* blk=cyrillic */, - { 1, 135, 261, 2, 5, UNI_XPOSIXCNTRL } /* iscntrl */, - { 0, 924, 417, 5, 3, UNI_AGE__15_DOT_1 } /* age=v151 */, - { 4, 108, 3011, 2, 12, UNI_JT__T } /* jt=transparent */, - { 0, 1126, 393, 4, 6, UNI_GOTH } /* scx=gothic */, - { 0, 323, 2280, 2, 4, UNI_IN__6_DOT_2 } /* in=6.2 */, - { 0, 1773, 6025, 8, 9, UNI_ARABICEXTA } /* isarabicextendeda */, - { 1, 699, 0, 5, 0, UNI_BUHD } /* buhid */, - { 0, 506, 0, 4, 0, UNI_TNSA } /* tnsa */, - { 6, 358, 919, 3, 3, UNI_CCC__10 } /* ccc=10 */, - { 11, 8596, 2452, 22, 5, UNI_INSC__VOWEL } /* indicsyllabiccategory=vowel */, - { 7, 924, 1368, 6, 2, UNI_AGE__12 } /* age=v120 */, - { 0, 8197, 5361, 28, 4, UNI_CJKEXTE } /* iscjkunifiedideographsextensione */, - { 0, 1230, 5839, 3, 18, UNI_COUNTINGROD } /* incountingrodnumerals */, - { 0, 3587, 4644, 12, 9, UNI_ETHIOPICEXTB } /* blk=ethiopicextendedb */, - { 0, 135, 27, 2, 4, UNI_ARMI } /* isarmi */, - { 0, 434, 373, 2, 4, UNI_DI } /* di=yes */, - { 0, 4557, 0, 17, 0, UNI_scx_values_index } /* scriptextensions= */, - { 0, 1126, 999, 4, 8, UNI_GURU } /* scx=gurmukhi */, - { 4, 2394, 8375, 9, 21, UNI_CJKSYMBOLS } /* block=cjksymbolsandpunctuation */, - { 0, 2394, 458, 6, 3, UNI_INNKO } /* block=nko */, - { 1, 4557, 4306, 17, 4, UNI_HANG } /* scriptextensions=hang */, - { 0, 655, 6760, 2, 3, UNI_LB__AL } /* lb=al */, - { 0, 6372, 2305, 3, 4, UNI_SC__HUNG } /* sc=hung */, - { 5, 7979, 4859, 23, 5, UNI_JG__MANICHAEANALEPH } /* joininggroup=manichaeanaleph */, - { 7, 1447, 963, 4, 6, -UNI_IDST } /* idst=false */, - { 8, 1126, 297, 4, 5, UNI_NSHU } /* scx=nushu */, - { 0, 7585, 408, 10, 2, UNI_BC__EN } /* bidiclass=en */, - { 0, 1874, 67, 7, 4, UNI_SC__CPRT } /* script=cprt */, - { 0, 1536, 7187, 4, 21, UNI_GEOMETRICSHAPESEXT } /* ingeometricshapesextended */, - { 1, 6370, 4249, 5, 12, UNI_INSC__NUMBERJOINER } /* insc=numberjoiner */, - { 0, 6372, 1381, 3, 9, UNI_SC__PERM } /* sc=oldpermic */, - { 2, 1874, 233, 7, 4, UNI_WCHO } /* script=wcho */, - { 0, 6670, 54, 14, 2, UNI_SB__SC } /* sentencebreak=sc */, - { 5, 1874, 5500, 7, 4, UNI_SC__CHER } /* script=cher */, - { 0, 312, 963, 2, 6, -UNI_RI } /* ri=false */, - { 3, 6431, 3029, 10, 11, UNI_LB__EX } /* linebreak=exclamation */, - { 1, 1446, 645, 4, 3, -UNI_XIDS } /* xids=no */, - { 0, 1126, 1335, 4, 9, UNI_SIND } /* scx=khudawadi */, - { 2, 1447, 963, 4, 2, -UNI_IDST } /* idst=f */, - { 3, 6264, 5401, 8, 16, UNI_INPUNCTUATION } /* block=generalpunctuation */, - { 0, 4635, 1750, 15, 3, UNI_LATINEXTG } /* blk=latinextendedg */, - { 1, 2338, 609, 10, 3, UNI_IN__8 } /* presentin=8.0 */, - { 3, 1126, 938, 4, 8, UNI_BALI } /* scx=balinese */, - { 0, 6370, 7725, 14, 15, UNI_INSC__CONSONANTSUCCEEDINGREPHA } /* insc=consonantsucceedingrepha */, - { 2, 2080, 372, 10, 3, UNI_KEHNOROTATE } /* kehnorotate=y */, - { 1, 1234, 3712, 5, 6, UNI_CJKCOMPAT } /* incjkcompat */, - { 8, 8861, 4280, 9, 11, UNI_SUPPUNCTUATION } /* block=suppunctuation */, - { 1, 1874, 4379, 6, 5, UNI_SC__MANI } /* script=mani */, - { 0, 1696, 352, 4, 6, UNI_INCARIAN } /* blk=carian */, - { 0, 5782, 4540, 21, 17, UNI_RI } /* graphemeclusterbreak=regionalindicator */, - { 1, 2394, 6715, 6, 5, UNI_MUSIC } /* block=music */, - { 5, 1126, 834, 4, 4, UNI_NBAT } /* scx=nbat */, - { 0, 4377, 4007, 12, 4, UNI_JG__MANICHAEANTEN } /* jg=manichaeanten */, - { 0, 6372, 1335, 3, 9, UNI_SC__SIND } /* sc=khudawadi */, - { 0, 2612, 4879, 4, 4, UNI_JG__ALAPH } /* jg=alaph */, - { 2, 3734, 1549, 7, 4, UNI_LATINEXTA } /* inlatinexta */, - { 0, 5740, 645, 21, 3, -UNI_CWT } /* changeswhentitlecased=no */, - { 0, 4557, 352, 17, 4, UNI_CARI } /* scriptextensions=cari */, - { 0, 1115, 1455, 3, 9, UNI_ASCII } /* inbasiclatin */, - { 24, 4635, 2694, 5, 12, UNI_LOWSURROGATES } /* blk=lowsurrogates */, - { 0, 135, 6104, 2, 21, UNI_LOE } /* islogicalorderexception */, - { 52, 135, 8693, 2, 35, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* issymbolsforlegacycomputingsupplement */, - { 0, 6670, 297, 14, 2, UNI_SB__NU } /* sentencebreak=nu */, - { 0, 306, 2147, 3, 2, UNI_NV__50 } /* nv=50 */, - { 3, 135, 8500, 2, 33, UNI_MISCMATHSYMBOLSB } /* ismiscellaneousmathematicalsymbolsb */, - { 0, 458, 0, 3, 0, UNI_NKO } /* nko */, - { 1, 1874, 2060, 7, 6, UNI_SC__SYRC } /* script=syriac */, - { 2, 2418, 372, 12, 3, UNI_CI } /* caseignorable=y */, - { 2, 6250, 8533, 7, 31, UNI_EGYPTIANHIEROGLYPHFORMATCONTROLS } /* block=egyptianhieroglyphformatcontrols */, - { 17, 1126, 890, 4, 7, UNI_TAVT } /* scx=taiviet */, - { 10, 261, 0, 2, 0, UNI_CN } /* cn */, - { 0, 4380, 0, 4, 0, UNI_MANI } /* mani */, - { 2, 42, 4702, 2, 3, UNI_SB__UP } /* sb=up */, - { 0, 135, 275, 2, 3, UNI_CWT } /* iscwt */, - { 0, 323, 6734, 2, 10, UNI_PUA } /* inprivateuse */, - { 3, 135, 352, 2, 6, UNI_CARI } /* iscarian */, - { 9, 1230, 3260, 3, 14, UNI_CONTROLPICTURES } /* incontrolpictures */, - { 0, 2394, 1592, 6, 6, UNI_ARROWS } /* block=arrows */, - { 0, 1474, 1366, 8, 2, UNI_CCC__103 } /* ccc=ccc103 */, - { 1, 2238, 2251, 5, 7, UNI_NV__3_SLASH_64 } /* nv=4.688e-02 */, - { 1, 285, 690, 3, 2, UNI_GCB__L } /* gcb=l */, - { 8, 7233, 3244, 24, 5, UNI_CCC__A } /* canonicalcombiningclass=above */, - { 0, 1781, 851, 3, 3, UNI_SINH } /* issinh */, - { 3, 924, 1362, 5, 3, UNI_AGE__16 } /* age=v160 */, - { 11, 7233, 365, 24, 2, UNI_CCC__18 } /* canonicalcombiningclass=18 */, - { 13, 135, 1284, 2, 7, UNI_PHAG } /* isphagspa */, - { 1, 1696, 2326, 4, 12, UNI_PLAYINGCARDS } /* blk=playingcards */, - { 1, 6127, 645, 5, 2, -UNI__PERL_NCHAR } /* nchar=n */, - { 0, 2394, 5500, 6, 8, UNI_INCHEROKEE } /* block=cherokee */, - { 0, 6372, 822, 3, 4, UNI_HMNP } /* sc=hmnp */, - { 2, 135, 7208, 2, 25, UNI_SUPERANDSUB } /* issuperscriptsandsubscripts */, - { 11, 1874, 63, 7, 4, UNI_SC__CPMN } /* script=cpmn */, - { 0, 7585, 6217, 10, 12, UNI_BC__AN } /* bidiclass=arabicnumber */, - { 0, 3491, 417, 13, 2, UNI_NV__15 } /* numericvalue=15 */, - { 24, 6372, 126, 3, 3, UNI_LAO } /* sc=lao */, - { 0, 6372, 166, 3, 4, UNI_SC__OUGR } /* sc=ougr */, - { 2, 2394, 7951, 6, 28, UNI_VSSUP } /* block=variationselectorssupplement */, - { 1, 1206, 0, 3, 0, UNI_ea_values_index } /* ea= */, - { 0, 6372, 1375, 3, 4, UNI_ITAL } /* sc=ital */, - { 0, 1126, 158, 4, 4, UNI_ORYA } /* scx=orya */, - { 0, 1126, 3218, 3, 5, UNI_GEOR } /* scx=geor */, - { 2, 4557, 1223, 17, 4, UNI_BENG } /* scriptextensions=beng */, - { 1, 1126, 1118, 4, 4, UNI_MERC } /* scx=merc */, - { 2, 6370, 0, 5, 0, UNI_insc_values_index } /* insc= */, - { 0, 2463, 1061, 8, 4, UNI_CYRILLICEXTB } /* cyrillicextb */, - { 0, 1236, 0, 3, 0, UNI_CJK } /* cjk */, - { 1, 1538, 0, 4, 0, UNI_GEOR } /* geor */, - { 3, 2564, 7187, 4, 13, UNI_GEOMETRICSHAPES } /* isgeometricshapes */, - { 13, 2394, 8693, 6, 35, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* block=symbolsforlegacycomputingsupplement */, - { 1, 6431, 2068, 10, 2, UNI_LB__WJ } /* linebreak=wj */, - { 10, 2785, 6532, 3, 3, UNI_BC__PDI } /* bc=pdi */, - { 0, 2394, 2538, 6, 6, UNI_IPAEXT } /* block=ipaext */, - { 1, 1874, 470, 7, 4, UNI_SC__ONAO } /* script=onao */, - { 8, 6072, 1896, 5, 8, UNI_SUPERANDSUB } /* issuperandsub */, - { 2, 760, 0, 7, 0, UNI_KALI } /* kayahli */, - { 2, 4557, 185, 17, 4, UNI_RJNG } /* scriptextensions=rjng */, - { 1, 135, 1165, 2, 4, UNI_VITH } /* isvith */, - { 1, 5698, 963, 21, 2, -UNI_CWCM } /* changeswhencasemapped=f */, - { 0, 6372, 719, 3, 5, UNI_SC__OSGE } /* sc=osage */, - { 6, 6372, 486, 3, 4, UNI_PRTI } /* sc=prti */, - { 7, 1474, 2138, 7, 2, UNI_CCC__11 } /* ccc=ccc11 */, - { 1, 8095, 2882, 13, 7, UNI_SO } /* category=othersymbol */, - { 2, 3098, 631, 5, 2, UNI_EPRES } /* epres=t */, - { 0, 4557, 1885, 17, 4, UNI_SORA } /* scriptextensions=sora */, - { 5, 2599, 1688, 4, 8, UNI_XPOSIXSPACE } /* isxperlspace */, - { 0, 1126, 352, 4, 6, UNI_CARI } /* scx=carian */, - { 3, 4321, 373, 5, 4, UNI_XPOSIXLOWER } /* lower=yes */, - { 0, 2345, 417, 3, 2, UNI_IN__15 } /* in=15 */, - { 35, 135, 3289, 2, 12, UNI_NL } /* isletternumber */, - { 0, 8095, 99, 9, 2, UNI_UPPERCASELETTER } /* category=lu */, - { 2, 135, 1447, 2, 3, UNI_IDS } /* isids */, - { 4, 2266, 798, 4, 2, UNI_NV__5_SLASH_6 } /* nv=5/6 */, - { 0, 7233, 8425, 24, 11, UNI_CCC__DB } /* canonicalcombiningclass=doublebelow */, - { 0, 326, 963, 5, 6, -UNI_QMARK } /* qmark=false */, - { 0, 135, 5014, 2, 15, UNI_BAMUMSUP } /* isbamumsupplement */, - { 9, 2471, 0, 10, 0, UNI_INETHIOPIC } /* inethiopic */, - { 1, 1773, 6400, 6, 12, UNI_ARABICSUP } /* isarabicsupplement */, - { 2, 2290, 0, 4, 0, UNI_NV__8 } /* nv=8 */, - { 18, 6372, 4754, 3, 7, UNI_SC__LINB } /* sc=linearb */, - { 0, 6372, 1553, 3, 4, UNI_SC__JAVA } /* sc=java */, - { 1, 7233, 304, 25, 2, UNI_CCC__IS } /* canonicalcombiningclass=240 */, - { 1, 6446, 1698, 20, 2, UNI_mcm_values_index } /* modifiercombiningmark= */, - { 9, 6838, 4237, 11, 12, UNI_INPC__TOPANDLEFTANDRIGHT } /* inpc=topandleftandright */, - { 0, 2394, 3505, 6, 15, UNI_NARB } /* block=oldnortharabian */, - { 12, 6350, 0, 20, 0, UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue */, - { 3, 323, 154, 2, 4, UNI_INNEWA } /* innewa */, - { 8, 6372, 466, 3, 4, UNI_OLCK } /* sc=olck */, - { 0, 306, 803, 3, 2, UNI_NV__21 } /* nv=21 */, - { 12, 1097, 3959, 4, 2, UNI_NV__1_SLASH_8 } /* nv=1/8 */, - { 2, 1696, 331, 4, 5, UNI_INTAILE } /* blk=taile */, - { 0, 916, 595, 5, 2, UNI_IN__1_DOT_1 } /* age=1.1 */, - { 3, 8088, 133, 16, 2, UNI_NL } /* generalcategory=nl */, - { 2, 4913, 2145, 14, 8, UNI_NV__5_SLASH_8 } /* numericvalue=6.250e-01 */, - { 0, 675, 2654, 5, 4, -UNI_GRBASE } /* grbase=no */, - { 0, 64, 1688, 1, 8, UNI_POSIXSPACE } /* perlspace */, - { 2, 4557, 1165, 17, 8, UNI_VITH } /* scriptextensions=vithkuqi */, - { 9, 135, 6127, 2, 5, UNI__PERL_NCHAR } /* isnchar */, - { 3, 1126, 1628, 4, 10, UNI_SAUR } /* scx=saurashtra */, - { 0, 2114, 373, 5, 2, UNI_XPOSIXALPHA } /* alpha=y */, - { 5, 135, 2029, 2, 7, UNI_SOGD } /* issogdian */, - { 1, 3227, 3462, 5, 14, UNI_MISCPICTOGRAPHS } /* blk=miscpictographs */, - { 1, 135, 1447, 2, 7, UNI_IDS } /* isidstart */, - { 6, 2601, 1019, 8, 3, UNI_XPOSIXBLANK } /* xposixblank */, - { 0, 170, 0, 2, 0, UNI_PC } /* pc */, - { 8, 8468, 4237, 30, 12, UNI_INPC__TOPANDLEFTANDRIGHT } /* indicpositionalcategory=topandleftandright */, - { 0, 2612, 1794, 3, 8, UNI_JG__FARSIYEH } /* jg=farsiyeh */, - { 0, 6647, 1572, 13, 7, UNI_JG__THINYEH } /* joininggroup=thinyeh */, - { 0, 306, 3489, 3, 2, UNI_NV__36 } /* nv=36 */, - { 0, 2394, 2878, 6, 12, UNI_KHMERSYMBOLS } /* block=khmersymbols */, - { 10, 2785, 4998, 3, 16, UNI_BC__S } /* bc=segmentseparator */, - { 6, 4703, 0, 5, 0, UNI_XPOSIXUPPER } /* upper */, - { 6, 7233, 2155, 24, 2, UNI_CCC__29 } /* canonicalcombiningclass=29 */, - { 4, 553, 3959, 4, 2, UNI_NV__7_SLASH_8 } /* nv=7/8 */, - { 3, 6372, 0, 3, 0, UNI_sc_values_index } /* sc= */, - { 4, 21, 5997, 1, 15, UNI_ENCLOSEDALPHANUM } /* enclosedalphanum */, - { 32, 4557, 4306, 17, 6, UNI_HANG } /* scriptextensions=hangul */, - { 0, 3227, 2706, 5, 12, UNI_MAYANNUMERALS } /* blk=mayannumerals */, - { 2, 2432, 0, 8, 0, UNI_ASSIGNED } /* assigned */, - { 5, 278, 0, 4, 0, UNI_GARA } /* gara */, - { 8, 558, 962, 2, 3, -UNI_LOE } /* loe=f */, - { 7, 4557, 1263, 17, 7, UNI_MAKA } /* scriptextensions=makasar */, - { 8, 5069, 645, 13, 2, -UNI_EMOD } /* emojimodifier=n */, - { 3, 5604, 631, 19, 3, UNI_VO__TR } /* verticalorientation=tr */, - { 4, 1291, 0, 7, 0, UNI_SIDD } /* siddham */, - { 0, 6372, 173, 3, 4, UNI_SC__PHLP } /* sc=phlp */, - { 0, 6372, 393, 3, 6, UNI_SC__GOTH } /* sc=gothic */, - { 0, 2909, 8168, 3, 29, UNI_ENCLOSEDALPHANUMSUP } /* isenclosedalphanumericsupplement */, - { 0, 2612, 3097, 2, 2, UNI_JG__E } /* jg=e */, - { 8, 135, 2026, 2, 10, UNI_SOGO } /* isoldsogdian */, - { 2, 2045, 645, 7, 2, -UNI_RADICAL } /* radical=n */, - { 2, 1874, 826, 7, 4, UNI_SC__KALI } /* script=kali */, - { 0, 135, 114, 2, 4, UNI_KITS } /* iskits */, - { 0, 1474, 1368, 7, 2, UNI_CCC__20 } /* ccc=ccc20 */, - { 1, 2394, 946, 6, 8, UNI_INBASSAVAH } /* block=bassavah */, - { 0, 6431, 9, 10, 2, UNI_LB__CR } /* linebreak=cr */, - { 4, 2394, 8436, 7, 24, UNI_DIACRITICALS } /* block=combiningdiacriticalmarks */, - { 0, 4173, 631, 4, 5, UNI_IDSB } /* idsb=true */, - { 5, 6431, 297, 10, 2, UNI_LB__NU } /* linebreak=nu */, - { 2, 1874, 815, 7, 7, UNI_OSMA } /* script=osmanya */, - { 7, 5, 6817, 1, 21, UNI_MISCTECHNICAL } /* miscellaneoustechnical */, - { 3, 1874, 1270, 7, 7, UNI_SC__MULT } /* script=multani */, - { 3, 4557, 854, 17, 7, UNI_SHRD } /* scriptextensions=sharada */, - { 0, 3086, 636, 12, 2, UNI_XPOSIXDIGIT } /* numerictype=de */, - { 1, 352, 0, 6, 0, UNI_CARI } /* carian */, - { 1, 6372, 1426, 3, 9, UNI_SC__SAMR } /* sc=samaritan */, - { 5, 1945, 963, 12, 2, -UNI_BIDIM } /* bidimirrored=f */, - { 4, 4557, 1608, 17, 10, UNI_XPEO } /* scriptextensions=oldpersian */, - { 1, 1126, 1176, 4, 9, UNI_BHKS } /* scx=bhaiksuki */, - { 8, 135, 930, 2, 8, UNI_ARMN } /* isarmenian */, - { 10, 1536, 981, 8, 5, UNI_GEORGIANEXT } /* ingeorgianext */, - { 2, 323, 4785, 2, 11, UNI_BOPOMOFOEXT } /* inbopomofoext */, - { 2, 135, 4817, 2, 16, UNI_PF } /* isfinalpunctuation */, - { 0, 71, 373, 3, 2, UNI_CWU } /* cwu=y */, - { 0, 7697, 419, 27, 2, UNI_CCC__16 } /* canonicalcombiningclass=ccc16 */, - { 1, 1126, 336, 4, 5, UNI_TAKR } /* scx=takri */, - { 4, 1696, 1075, 4, 8, UNI_INKIRATRAI } /* blk=kiratrai */, - { 0, 3778, 1703, 7, 4, UNI_LATINEXTD } /* islatinextd */, - { 0, 7233, 191, 24, 2, UNI_CCC__0 } /* canonicalcombiningclass=nr */, - { 1, 135, 3623, 2, 7, UNI_CPRT } /* iscypriot */, - { 0, 1696, 510, 4, 3, UNI_INVAI } /* blk=vai */, - { 0, 643, 4736, 3, 7, UNI_DT__INIT } /* dt=initial */, - { 0, 643, 138, 3, 3, UNI_DT__MED } /* dt=med */, - { 9, 323, 4190, 2, 7, UNI_BRAI } /* inbraille */, - { 0, 1874, 43, 7, 4, UNI_SC__BUHD } /* script=buhd */, - { 0, 434, 631, 3, 2, UNI_DIA } /* dia=t */, - { 1, 5364, 963, 20, 2, -UNI_EXTPICT } /* extendedpictographic=f */, - { 0, 1874, 331, 7, 5, UNI_SC__TALE } /* script=taile */, - { 1, 5325, 139, 17, 3, UNI_LATINEXTF } /* block=latinextendedf */, - { 1, 5229, 0, 19, 0, UNI_OTTOMANSIYAQNUMBERS } /* ottomansiyaqnumbers */, - { 1, 5930, 645, 4, 2, -UNI_EMOD } /* emod=n */, - { 1, 3040, 4574, 3, 16, UNI_SMALLFORMS } /* insmallformvariants */, - { 0, 3106, 2138, 4, 2, UNI_IN__1_DOT_1 } /* in=v11 */, - { 1, 8596, 5939, 22, 16, UNI_INSC__VOWELINDEPENDENT } /* indicsyllabiccategory=vowelindependent */, - { 1, 383, 963, 4, 6, -UNI_CWCM } /* cwcm=false */, - { 3, 5585, 631, 19, 2, UNI_TERM } /* terminalpunctuation=t */, - { 1, 2584, 3901, 3, 15, UNI_MISCMATHSYMBOLSA } /* ismiscmathsymbolsa */, - { 1, 2471, 4644, 10, 9, UNI_ETHIOPICEXTB } /* inethiopicextendedb */, - { 2, 4557, 1417, 17, 4, UNI_PAUC } /* scriptextensions=pauc */, - { 0, 2, 631, 3, 5, UNI_CWL } /* cwl=true */, - { 8, 135, 1885, 2, 4, UNI_SORA } /* issora */, - { 6, 4557, 352, 17, 6, UNI_CARI } /* scriptextensions=carian */, - { 1, 6647, 20, 13, 2, UNI_JG__HE } /* joininggroup=he */, - { 3, 4635, 1703, 9, 4, UNI_LATINEXTD } /* blk=latinextd */, - { 8, 0, 1060, 1, 2, UNI_LOE } /* loe */, - { 5, 1966, 7068, 4, 9, UNI_CI } /* caseignorable */, - { 3, 5, 373, 3, 2, UNI_MCM } /* mcm=y */, - { 0, 30, 7355, 1, 27, UNI_PCM } /* isprependedconcatenationmark */, - { 1, 4557, 1033, 17, 6, UNI_LYCI } /* scriptextensions=lycian */, - { 1, 2338, 2257, 10, 3, UNI_IN__2 } /* presentin=2.0 */, - { 1, 1696, 1335, 4, 9, UNI_INKHUDAWADI } /* blk=khudawadi */, - { 3, 20, 963, 3, 6, -UNI_XPOSIXXDIGIT } /* hex=false */, - { 1, 3734, 4487, 3, 16, UNI_LETTERLIKESYMBOLS } /* inletterlikesymbols */, - { 9, 323, 1399, 2, 9, UNI_INOLDUYGHUR } /* inolduyghur */, - { 2, 3491, 1367, 13, 2, UNI_NV__32 } /* numericvalue=32 */, - { 1, 2394, 6053, 6, 9, UNI_INSUNDANESE } /* block=sundanese */, - { 3, 6372, 68, 4, 3, UNI_SC__CPRT } /* sc=cprt */, - { 0, 1696, 3668, 4, 16, UNI_HIGHPUSURROGATES } /* blk=highpusurrogates */, - { 5, 1126, 1270, 4, 4, UNI_MULT } /* scx=mult */, - { 1, 7036, 631, 25, 5, UNI_CWKCF } /* changeswhennfkccasefolded=true */, - { 0, 1126, 1628, 4, 4, UNI_SAUR } /* scx=saur */, - { 9, 2394, 6707, 6, 23, UNI_ZNAMENNYMUSIC } /* block=znamennymusicalnotation */, - { 9, 3491, 302, 14, 1, UNI_NV__43 } /* numericvalue=43 */, - { 0, 6670, 3535, 13, 3, UNI_SB__EX } /* sentencebreak=ex */, - { 1, 4557, 430, 17, 4, UNI_ARMN } /* scriptextensions=armn */, - { 7, 1447, 373, 3, 4, UNI_IDS } /* ids=yes */, - { 2, 8609, 6455, 10, 12, UNI_M } /* category=combiningmark */, - { 5, 6072, 8639, 5, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* issupsymbolsandpictographs */, - { 0, 2394, 680, 6, 7, UNI_INHANUNOO } /* block=hanunoo */, - { 36, 2394, 5462, 6, 20, UNI_ININSCRIPTIONALPAHLAVI } /* block=inscriptionalpahlavi */, - { 10, 2785, 5642, 3, 18, UNI_BC__FSI } /* bc=firststrongisolate */, - { 3, 135, 4306, 2, 4, UNI_HANG } /* ishang */, - { 0, 323, 2280, 2, 2, UNI_IN__6 } /* in=6 */, - { 0, 6670, 868, 14, 5, UNI_SB__ST } /* sentencebreak=sterm */, - { 0, 1957, 4644, 8, 9, UNI_KANAEXTB } /* blk=kanaextendedb */, - { 1, 7233, 5133, 24, 2, UNI_CCC__8 } /* canonicalcombiningclass=kv */, - { 3, 3125, 631, 13, 2, UNI_QMARK } /* quotationmark=t */, - { 13, 6372, 6341, 3, 9, UNI_XSUX } /* sc=cuneiform */, - { 4, 4557, 3111, 17, 14, UNI_PHLP } /* scriptextensions=psalterpahlavi */, - { 0, 1322, 1701, 3, 6, UNI_CJKEXTD } /* iscjkextd */, - { 1, 651, 360, 2, 2, UNI_idc_values_index } /* idc= */, - { 9, 968, 645, 5, 3, -UNI_ECOMP } /* ecomp=no */, - { 0, 3930, 5549, 14, 9, UNI_NV__1000000000 } /* numericvalue=1000000000 */, - { 3, 969, 955, 2, 2, UNI_COPT } /* copt */, - { 4, 2394, 1033, 6, 6, UNI_INLYCIAN } /* block=lycian */, - { 8, 6372, 6034, 3, 9, UNI_SC__MONG } /* sc=mongolian */, - { 40, 4557, 6862, 17, 6, UNI_BRAH } /* scriptextensions=brahmi */, - { 2, 135, 1263, 2, 7, UNI_MAKA } /* ismakasar */, - { 1, 2, 8225, 1, 15, UNI_CUNEIFORMNUMBERS } /* cuneiformnumbers */, - { 24, 323, 3827, 2, 9, UNI_INMALAYALAM } /* inmalayalam */, - { 1, 3106, 418, 4, 2, UNI_IN__5_DOT_1 } /* in=v51 */, - { 12, 3106, 1363, 4, 2, UNI_IN__6 } /* in=v60 */, - { 2, 3587, 666, 10, 5, UNI_ETHIOPICEXT } /* blk=ethiopicext */, - { 0, 1322, 1973, 3, 11, UNI_CHESSSYMBOLS } /* ischesssymbols */, - { 0, 2394, 1965, 6, 7, UNI_UCASEXT } /* block=ucasext */, - { 12, 7868, 4143, 19, 13, UNI_HST__NA } /* hangulsyllabletype=notapplicable */, - { 2, 1848, 373, 5, 4, UNI_NFCQC__Y } /* nfcqc=yes */, - { 1, 2833, 3293, 6, 8, UNI_NO } /* gc=othernumber */, - { 2, 1322, 1977, 5, 7, UNI_CJKSYMBOLS } /* iscjksymbols */, - { 0, 1934, 963, 11, 6, -UNI_BIDIC } /* bidicontrol=false */, - { 0, 6250, 6400, 12, 5, UNI_ETHIOPICSUP } /* block=ethiopicsup */, - { 1, 5677, 963, 21, 6, -UNI_CWCF } /* changeswhencasefolded=false */, - { 0, 6372, 753, 3, 7, UNI_SC__KNDA } /* sc=kannada */, - { 0, 2502, 1549, 9, 4, UNI_MYANMAREXTA } /* inmyanmarexta */, - { 1, 2666, 6093, 3, 11, UNI_LB__AS } /* lb=aksarastart */, - { 2, 1874, 724, 7, 5, UNI_SC__RUNR } /* script=runic */, - { 0, 135, 4021, 2, 16, UNI_TANGUTCOMPONENTS } /* istangutcomponents */, - { 0, 5604, 4702, 19, 2, UNI_VO__U } /* verticalorientation=u */, - { 13, 2394, 7651, 6, 28, UNI_PHONETICEXTSUP } /* block=phoneticextensionssupplement */, - { 4, 4377, 3840, 13, 3, UNI_JG__MANICHAEANMEM } /* jg=manichaeanmem */, - { 2, 2338, 2268, 9, 2, UNI_IN__5 } /* presentin=5 */, - { 12, 1874, 494, 7, 4, UNI_SC__ROHG } /* script=rohg */, - { 2, 1696, 5839, 5, 18, UNI_COUNTINGROD } /* blk=countingrodnumerals */, - { 3, 2305, 0, 4, 0, UNI_HUNG } /* hung */, - { 0, 4557, 617, 17, 7, UNI_AVST } /* scriptextensions=avestan */, - { 1, 3778, 536, 3, 3, UNI_LYDI } /* islydi */, - { 1, 2601, 3185, 6, 6, UNI_XPOSIXXDIGIT } /* xposixxdigit */, - { 3, 2345, 150, 3, 2, UNI_IN__NA } /* in=na */, - { 0, 1441, 295, 3, 2, UNI_WB__XX } /* wb=xx */, - { 1, 306, 804, 3, 2, UNI_NV__17 } /* nv=17 */, - { 0, 4557, 822, 17, 4, UNI_HMNP } /* scriptextensions=hmnp */, - { 0, 135, 983, 2, 8, UNI_EXT } /* isextender */, - { 10, 2833, 238, 3, 2, UNI_PE } /* gc=pe */, - { 0, 2394, 5482, 6, 11, UNI_TAIXUANJING } /* block=taixuanjing */, - { 4, 323, 1015, 2, 6, UNI_INHATRAN } /* inhatran */, - { 11, 1696, 1454, 4, 10, UNI_ASCII } /* blk=basiclatin */, - { 1, 1874, 177, 7, 4, UNI_PHNX } /* script=phnx */, - { 2, 1441, 297, 3, 2, UNI_WB__NU } /* wb=nu */, - { 0, 1874, 498, 7, 4, UNI_SC__SHAW } /* script=shaw */, - { 1, 5782, 1915, 21, 5, UNI_WB__EB } /* graphemeclusterbreak=ebase */, - { 1, 2338, 612, 10, 3, UNI_IN__9 } /* presentin=9.0 */, - { 4, 557, 0, 6, 0, UNI_ONAO } /* olonal */, - { 10, 4557, 253, 17, 4, UNI_ZYYY } /* scriptextensions=zyyy */, - { 7, 358, 1367, 4, 2, UNI_CCC__32 } /* ccc=32 */, - { 0, 1126, 3578, 3, 9, UNI_CYRL } /* scx=cyrillic */, - { 4, 904, 373, 5, 4, UNI_UIDEO } /* uideo=yes */, - { 16, 924, 420, 5, 2, UNI_AGE__6_DOT_1 } /* age=v61 */, - { 8, 4321, 963, 5, 6, -UNI_XPOSIXLOWER } /* lower=false */, - { 18, 2266, 5549, 4, 5, UNI_NV__500000 } /* nv=500000 */, - { 9, 1035, 645, 2, 2, -UNI_CI } /* ci=n */, - { 0, 3916, 645, 14, 2, UNI_NFKCQC__N } /* nfkcquickcheck=n */, - { 0, 3930, 1362, 15, 3, UNI_NV__1_SLASH_160 } /* numericvalue=1/160 */, - { 3, 6034, 0, 19, 0, UNI_MONGOLIANSUP } /* mongoliansupplement */, - { 0, 4557, 2847, 17, 4, UNI_COPT } /* scriptextensions=copt */, - { 1, 7036, 631, 25, 2, UNI_CWKCF } /* changeswhennfkccasefolded=t */, - { 1, 1885, 0, 4, 0, UNI_SORA } /* sora */, - { 9, 3491, 2147, 13, 2, UNI_NV__50 } /* numericvalue=50 */, - { 1, 135, 270, 2, 5, UNI_CWKCF } /* iscwkcf */, - { 6, 5978, 54, 17, 2, UNI_SUPARROWSC } /* supplementalarrowsc */, - { 0, 7739, 963, 10, 6, -UNI_XPOSIXALPHA } /* alphabetic=false */, - { 3, 1810, 963, 11, 6, -UNI_KEHNOMIRROR } /* kehnomirror=false */, - { 5, 7847, 138, 18, 3, UNI_DT__MED } /* decompositiontype=med */, - { 9, 478, 0, 4, 0, UNI_PHLI } /* phli */, - { 1, 135, 6446, 2, 21, UNI_MCM } /* ismodifiercombiningmark */, - { 0, 6372, 253, 3, 4, UNI_SC__ZYYY } /* sc=zyyy */, - { 2, 1965, 0, 7, 0, UNI_UCASEXT } /* ucasext */, - { 4, 4557, 999, 17, 8, UNI_GURU } /* scriptextensions=gurmukhi */, - { 0, 1696, 7651, 4, 18, UNI_PHONETICEXT } /* blk=phoneticextensions */, - { 1, 4557, 1165, 17, 4, UNI_VITH } /* scriptextensions=vith */, - { 0, 451, 5821, 3, 18, UNI_ANCIENTGREEKNUMBERS } /* inancientgreeknumbers */, - { 1, 1874, 15, 7, 4, UNI_SC__AGHB } /* script=aghb */, - { 1, 1126, 502, 4, 4, UNI_SOGO } /* scx=sogo */, - { 0, 1035, 645, 2, 3, -UNI_CI } /* ci=no */, - { 0, 4913, 0, 14, 0, UNI_NV__6 } /* numericvalue=6 */, - { 4, 7951, 4701, 16, 2, UNI_vs_values_index } /* variationselector= */, - { 0, 3599, 7747, 10, 20, UNI_ARABICPFA } /* block=arabicpresentationformsa */, - { 11, 916, 596, 4, 4, UNI_AGE__13 } /* age=13.0 */, - { 3, 4557, 5500, 17, 8, UNI_CHER } /* scriptextensions=cherokee */, - { 3, 2833, 3904, 3, 10, UNI_SM } /* gc=mathsymbol */, - { 2, 968, 631, 5, 2, UNI_ECOMP } /* ecomp=t */, - { 4, 1696, 5500, 4, 11, UNI_CHEROKEESUP } /* blk=cherokeesup */, - { 0, 1934, 373, 5, 2, UNI_BIDIC } /* bidic=y */, - { 11, 7233, 2347, 23, 3, UNI_CCC__14 } /* canonicalcombiningclass=14 */, - { 0, 7979, 5170, 23, 6, UNI_JG__MANICHAEANLAMEDH } /* joininggroup=manichaeanlamedh */, - { 3, 8468, 2795, 30, 4, UNI_INPC__TOPANDLEFT } /* indicpositionalcategory=topandleft */, - { 0, 4097, 963, 17, 2, -UNI_EPRES } /* emojipresentation=f */, - { 8, 2481, 0, 8, 0, UNI_KANA } /* katakana */, - { 1, 2114, 645, 5, 2, -UNI_XPOSIXALPHA } /* alpha=n */, - { 54, 5069, 630, 16, 3, UNI_EBASE } /* emojimodifierbase=t */, - { 0, 170, 963, 3, 2, -UNI_PCM } /* pcm=f */, - { 5, 1126, 425, 5, 3, UNI_TOTO } /* scx=toto */, - { 0, 1126, 3447, 4, 4, UNI_MERO } /* scx=mero */, - { 19, 1934, 631, 5, 5, UNI_BIDIC } /* bidic=true */, - { 0, 135, 5044, 2, 15, UNI_TAMILSUP } /* istamilsupplement */, - { 0, 4635, 4832, 8, 5, UNI_LATIN1 } /* blk=latin1sup */, - { 0, 7951, 631, 17, 2, UNI_VS } /* variationselector=t */, - { 10, 826, 0, 4, 0, UNI_KALI } /* kali */, - { 4, 2899, 7669, 10, 13, UNI_CYRILLICSUP } /* iscyrillicsupplementary */, - { 0, 1654, 963, 10, 6, -UNI_SD } /* softdotted=false */, - { 0, 4703, 373, 5, 4, UNI_XPOSIXUPPER } /* upper=yes */, - { 9, 30, 5308, 1, 10, UNI_TANGUTSUP } /* istangutsup */, - { 4, 3227, 4770, 5, 15, UNI_MISCMATHSYMBOLSB } /* blk=miscmathsymbolsb */, - { 0, 5364, 963, 20, 6, -UNI_EXTPICT } /* extendedpictographic=false */, - { 1, 1236, 2489, 3, 4, UNI_CJKEXTI } /* cjkexti */, - { 1, 7979, 2328, 23, 4, UNI_JG__MANICHAEANAYIN } /* joininggroup=manichaeanayin */, - { 2, 5260, 3557, 10, 3, UNI_LB__ZWJ } /* wordbreak=zwj */, - { 6, 1874, 114, 7, 4, UNI_KITS } /* script=kits */, - { 1, 7979, 4365, 23, 4, UNI_JG__MANICHAEANBETH } /* joininggroup=manichaeanbeth */, - { 0, 1934, 963, 5, 2, -UNI_BIDIC } /* bidic=f */, - { 0, 3930, 5549, 14, 6, UNI_NV__1000000 } /* numericvalue=1000000 */, - { 2, 1696, 6734, 4, 10, UNI_PUA } /* blk=privateuse */, - { 3, 6862, 0, 6, 0, UNI_BRAH } /* brahmi */, - { 2, 323, 4306, 2, 15, UNI_INHANGUL } /* inhangulsyllables */, - { 2, 1874, 1870, 7, 4, UNI_SC__KTHI } /* script=kthi */, - { 6, 3778, 3886, 3, 15, UNI_LINEARBIDEOGRAMS } /* islinearbideograms */, - { 16, 3696, 963, 4, 6, -UNI_IDSU } /* idsu=false */, - { 5, 2799, 1173, 10, 3, UNI_ARABICPFA } /* blk=arabicpfa */, - { 1, 323, 6053, 2, 9, UNI_INSUNDANESE } /* insundanese */, - { 1, 2394, 1492, 9, 7, UNI_CJKSTROKES } /* block=cjkstrokes */, - { 8, 358, 803, 4, 2, UNI_CCC__21 } /* ccc=21 */, - { 1, 21, 644, 2, 2, UNI_ext_values_index } /* ext= */, - { 21, 108, 2987, 2, 12, UNI_JT__C } /* jt=joincausing */, - { 5, 4913, 5549, 14, 5, UNI_NV__600000 } /* numericvalue=600000 */, - { 10, 323, 1305, 2, 7, UNI_INSUNUWAR } /* insunuwar */, - { 2, 4156, 963, 17, 2, -UNI_IDCOMPATMATHSTART } /* idcompatmathstart=f */, - { 4, 1592, 0, 6, 0, UNI_ARROWS } /* arrows */, - { 0, 687, 2452, 4, 9, UNI_HST__V } /* hst=voweljamo */, - { 5, 323, 5483, 3, 10, UNI_TAIXUANJING } /* intaixuanjing */, - { 1, 1454, 0, 10, 0, UNI_ASCII } /* basiclatin */, - { 1, 2278, 6499, 4, 8, UNI_NV__1_SLASH_160 } /* nv=6.250e-03 */, - { 0, 6670, 4702, 13, 3, UNI_SB__UP } /* sentencebreak=up */, - { 20, 643, 969, 3, 3, UNI_DT__COM } /* dt=com */, - { 6, 2612, 7544, 3, 10, UNI_JG__TEHMARBUTA } /* jg=tehmarbuta */, - { 11, 7307, 1549, 8, 4, UNI_ARABICEXTA } /* inarabicexta */, - { 2, 3930, 1367, 15, 3, UNI_NV__1_SLASH_320 } /* numericvalue=1/320 */, - { 0, 1934, 373, 11, 4, UNI_BIDIC } /* bidicontrol=yes */, - { 1, 4557, 6392, 17, 4, UNI_GLAG } /* scriptextensions=glag */, - { 16, 1874, 3520, 7, 15, UNI_SARB } /* script=oldsoutharabian */, - { 0, 2833, 5352, 7, 12, UNI_PO } /* gc=otherpunctuation */, - { 32, 7847, 3068, 18, 5, UNI_DT__FIN } /* decompositiontype=final */, - { 0, 6467, 2732, 14, 8, UNI_NV__1_SLASH_5 } /* numericvalue=2.000e-01 */, - { 1, 3274, 7271, 15, 9, UNI_EA__F } /* eastasianwidth=fullwidth */, - { 2, 135, 4754, 2, 7, UNI_LINB } /* islinearb */, - { 64, 135, 719, 2, 5, UNI_OSGE } /* isosage */, - { 16, 8564, 1741, 32, 4, UNI_CJKEXTI } /* block=cjkunifiedideographsextensioni */, - { 0, 1696, 6341, 4, 9, UNI_INCUNEIFORM } /* blk=cuneiform */, - { 3, 135, 661, 2, 4, UNI_ELYM } /* iselym */, - { 5, 266, 963, 4, 6, -UNI_CWCF } /* cwcf=false */, - { 2, 2394, 4021, 6, 6, UNI_INTANGUT } /* block=tangut */, - { 0, 33, 7506, 1, 24, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* symbolsandpictographsexta */, - { 1, 1874, 704, 7, 4, UNI_SC__DOGR } /* script=dogr */, - { 1, 643, 7208, 3, 5, UNI_DT__SUP } /* dt=super */, - { 14191, 3991, 2242, 14, 8, UNI_NV__11_SLASH_12 } /* numericvalue=9.167e-01 */, - { 3, 768, 5997, 3, 18, UNI_ENCLOSEDALPHANUMSUP } /* inenclosedalphanumsup */, - { 1, 3491, 6490, 13, 9, UNI_NV__3_SLASH_80 } /* numericvalue=3.750e-02 */, - { 0, 2833, 3373, 3, 13, UNI_ME } /* gc=enclosingmark */, - { 3, 1474, 2155, 8, 2, UNI_CCC__129 } /* ccc=ccc129 */, - { 0, 1934, 963, 11, 2, -UNI_BIDIC } /* bidicontrol=f */, - { 2, 7356, 963, 26, 2, -UNI_PCM } /* prependedconcatenationmark=f */, - { 7, 924, 920, 6, 2, UNI_AGE__11 } /* age=v110 */, - { 1, 1126, 1553, 4, 8, UNI_JAVA } /* scx=javanese */, - { 2, 4377, 5170, 13, 6, UNI_JG__MANICHAEANLAMEDH } /* jg=manichaeanlamedh */, - { 8, 2394, 4980, 6, 18, UNI_RUMI } /* block=ruminumeralsymbols */, - { 6, 1696, 6777, 7, 19, UNI_CJKCOMPATIDEOGRAPHSSUP } /* blk=cjkcompatideographssup */, - { 8, 2666, 286, 3, 2, UNI_LB__CB } /* lb=cb */, - { 0, 3599, 1763, 12, 3, UNI_ARABICPFB } /* block=arabicpfb */, - { 8, 2819, 0, 5, 0, UNI_EMOJI } /* emoji */, - { 0, 8596, 5432, 22, 15, UNI_INSC__MODIFYINGLETTER } /* indicsyllabiccategory=modifyingletter */, - { 3, 575, 9, 3, 2, UNI_LB__CR } /* sb=cr */, - { 0, 135, 5978, 2, 19, UNI_SUPARROWSB } /* issupplementalarrowsb */, - { 6, 1097, 5549, 4, 16, UNI_NV__10000000000000000 } /* nv=10000000000000000 */, - { 0, 2612, 4883, 3, 5, UNI_JG__ZHAIN } /* jg=zhain */, - { 8, 341, 0, 5, 0, UNI_VSSUP } /* vssup */, - { 1, 4635, 4832, 8, 2, UNI_LATIN1 } /* blk=latin1 */, - { 1, 7233, 8354, 24, 10, UNI_CCC__BR } /* canonicalcombiningclass=belowright */, - { 0, 868, 373, 5, 2, UNI_STERM } /* sterm=y */, - { 5, 1126, 1248, 4, 9, UNI_QAAI } /* scx=inherited */, - { 0, 2345, 2753, 3, 3, UNI_IN__5_DOT_2 } /* in=5.2 */, - { 3, 1654, 645, 10, 2, -UNI_SD } /* softdotted=n */, - { 1, 2612, 4351, 3, 14, UNI_JG__HAMZAONHEHGOAL } /* jg=hamzaonhehgoal */, - { 1, 1696, 2405, 4, 13, UNI_BLOCKELEMENTS } /* blk=blockelements */, - { 0, 3734, 768, 3, 6, UNI_INLINEARA } /* inlineara */, - { 0, 2463, 3741, 8, 9, UNI_CYRILLICEXTD } /* cyrillicextendedd */, - { 0, 3491, 2155, 13, 2, UNI_NV__29 } /* numericvalue=29 */, - { 1, 1474, 3489, 7, 2, UNI_CCC__36 } /* ccc=ccc36 */, - { 0, 1696, 3750, 4, 11, UNI_PHONETICEXT } /* blk=phoneticext */, - { 1, 135, 257, 2, 4, UNI_ZZZZ } /* iszzzz */, - { 0, 6250, 6329, 7, 21, UNI_EARLYDYNASTICCUNEIFORM } /* block=earlydynasticcuneiform */, - { 0, 4557, 35, 17, 4, UNI_BATK } /* scriptextensions=batk */, - { 4, 6053, 0, 9, 0, UNI_SUND } /* sundanese */, - { 1, 2338, 919, 9, 3, UNI_IN__10 } /* presentin=10 */, - { 0, 5325, 1549, 11, 4, UNI_LATINEXTA } /* block=latinexta */, - { 0, 404, 373, 6, 4, UNI_HYPHEN } /* hyphen=yes */, - { 0, 1126, 719, 4, 5, UNI_OSGE } /* scx=osage */, - { 1, 6647, 2066, 13, 3, UNI_JG__WAW } /* joininggroup=waw */, - { 2, 135, 1810, 2, 11, UNI_KEHNOMIRROR } /* iskehnomirror */, - { 0, 2833, 4129, 3, 14, UNI_ZS } /* gc=spaceseparator */, - { 11, 2278, 5549, 4, 4, UNI_NV__60000 } /* nv=60000 */, - { 0, 2394, 7208, 6, 25, UNI_SUPERANDSUB } /* block=superscriptsandsubscripts */, - { 0, 2394, 6307, 6, 22, UNI_DIACRITICALSFORSYMBOLS } /* block=diacriticalsforsymbols */, - { 0, 0, 0, 2, 0, UNI_CASEDLETTER } /* l& */, - { 0, 1126, 830, 4, 4, UNI_LANA } /* scx=lana */, - { 3, 4156, 963, 17, 6, -UNI_IDCOMPATMATHSTART } /* idcompatmathstart=false */, - { 0, 1696, 2099, 4, 12, UNI_INMASARAMGONDI } /* blk=masaramgondi */, - { 2, 5059, 3846, 8, 14, UNI_KAKTOVIKNUMERALS } /* block=kaktoviknumerals */, - { 2, 306, 3988, 2, 3, UNI_NV__80 } /* nv=80 */, - { 0, 3575, 1549, 12, 4, UNI_CYRILLICEXTA } /* blk=cyrillicexta */, - { 1, 2290, 1364, 4, 2, UNI_NV__800 } /* nv=800 */, - { 1, 285, 7356, 4, 7, UNI_GCB__PP } /* gcb=prepend */, - { 1, 4557, 15, 17, 4, UNI_AGHB } /* scriptextensions=aghb */, - { 1, 5069, 963, 13, 6, -UNI_EMOD } /* emojimodifier=false */, - { 0, 1874, 1305, 7, 7, UNI_SC__SUNU } /* script=sunuwar */, - { 12, 5260, 2557, 12, 7, UNI_WB__ML } /* wordbreak=midletter */, - { 9, 4377, 682, 13, 3, UNI_JG__MANICHAEANNUN } /* jg=manichaeannun */, - { 1, 1097, 3989, 5, 2, UNI_NV__1_SLASH_80 } /* nv=1/80 */, - { 0, 135, 6801, 2, 16, UNI_INDICNUMBERFORMS } /* isindicnumberforms */, - { 2, 3575, 6025, 12, 9, UNI_CYRILLICEXTA } /* blk=cyrillicextendeda */, - { 5, 1874, 1291, 7, 7, UNI_SIDD } /* script=siddham */, - { 3, 1126, 946, 4, 4, UNI_BASS } /* scx=bass */, - { 1, 3734, 3886, 3, 15, UNI_LINEARBIDEOGRAMS } /* inlinearbideograms */, - { 10, 4557, 478, 17, 4, UNI_PHLI } /* scriptextensions=phli */, - { 0, 6372, 1417, 3, 9, UNI_PAUC } /* sc=paucinhau */, - { 1, 7233, 302, 25, 2, UNI_CCC__A } /* canonicalcombiningclass=230 */, - { 0, 1874, 0, 11, 0, UNI_SC__MLYM } /* script=mlym */, - { 0, 1696, 1752, 4, 11, UNI_INGURUNGKHEMA } /* blk=gurungkhema */, - { 1, 6277, 2718, 7, 12, UNI_MISCTECHNICAL } /* block=misctechnical */, - { 1, 358, 5660, 4, 13, UNI_CCC__202 } /* ccc=attachedbelow */, - { 12, 1126, 1381, 4, 9, UNI_PERM } /* scx=oldpermic */, - { 4, 5260, 2787, 9, 3, UNI_RI } /* wordbreak=ri */, - { 1, 401, 631, 3, 2, UNI_EXT } /* ext=t */, - { 0, 7233, 8900, 24, 18, UNI_CCC__216 } /* canonicalcombiningclass=attachedaboveright */, - { 1, 6372, 5289, 3, 20, UNI_HLUW } /* sc=anatolianhieroglyphs */, - { 0, 5260, 133, 10, 2, UNI_WB__NL } /* wordbreak=nl */, - { 0, 53, 0, 1, 0, UNI_N } /* n */, - { 0, 2666, 3051, 3, 11, UNI_LB__IN } /* lb=inseperable */, - { 1, 135, 694, 2, 5, UNI_ADLM } /* isadlam */, - { 1, 6264, 7187, 8, 21, UNI_GEOMETRICSHAPESEXT } /* block=geometricshapesextended */, - { 0, 2599, 4703, 8, 5, UNI_XPOSIXUPPER } /* isxposixupper */, - { 0, 8468, 0, 27, 0, UNI_INPC__TOP } /* indicpositionalcategory=top */, - { 4, 2345, 6482, 4, 3, UNI_IN__15_DOT_1 } /* in=15.1 */, - { 36, 4291, 360, 8, 2, UNI_dia_values_index } /* diacritic= */, - { 0, 1474, 365, 8, 2, UNI_CCC__118 } /* ccc=ccc118 */, - { 1, 5740, 373, 21, 2, UNI_CWT } /* changeswhentitlecased=y */, - { 0, 954, 1477, 3, 2, UNI_BPT__C } /* bpt=c */, - { 2, 6372, 1270, 3, 4, UNI_SC__MULT } /* sc=mult */, - { 0, 2055, 2114, 5, 5, UNI_POSIXALPHA } /* posixalpha */, - { 0, 1126, 1426, 4, 9, UNI_SAMR } /* scx=samaritan */, - { 0, 1234, 0, 5, 0, UNI_CJK } /* incjk */, - { 12, 2819, 963, 14, 2, -UNI_ECOMP } /* emojicomponent=f */, - { 11, 2463, 0, 8, 0, UNI_CYRL } /* cyrillic */, - { 0, 6372, 3423, 3, 6, UNI_SC__HEBR } /* sc=hebrew */, - { 9, 4557, 8927, 17, 18, UNI_CANS } /* scriptextensions=canadianaboriginal */, - { 1, 6431, 18, 10, 2, UNI_LB__BA } /* linebreak=ba */, - { 3, 4504, 962, 5, 7, -UNI_XPOSIXSPACE } /* wspace=false */, - { 0, 8596, 5891, 22, 16, UNI_INSC__INVISIBLESTACKER } /* indicsyllabiccategory=invisiblestacker */, - { 0, 1441, 2557, 5, 7, UNI_WB__ML } /* wb=midletter */, - { 0, 1696, 1628, 4, 10, UNI_INSAURASHTRA } /* blk=saurashtra */, - { 0, 15, 6478, 2, 3, UNI_AGE__2 } /* age=2 */, - { 9, 2, 6796, 1, 21, UNI_INDICNUMBERFORMS } /* commonindicnumberforms */, - { 0, 434, 963, 2, 2, -UNI_DI } /* di=f */, - { 36, 2799, 6400, 8, 5, UNI_ARABICSUP } /* blk=arabicsup */, - { 1, 6431, 4336, 10, 15, UNI_LB__OP } /* linebreak=openpunctuation */, - { 5, 323, 1435, 2, 6, UNI_INTHAANA } /* inthaana */, - { 8, 8037, 963, 11, 2, -UNI_IDEO } /* ideographic=f */, - { 16, 3734, 4888, 15, 10, UNI_LATINEXTADDITIONAL } /* inlatinextendedadditional */, - { 1, 7979, 5542, 23, 7, UNI_JG__MANICHAEANHUNDRED } /* joininggroup=manichaeanhundred */, - { 8, 135, 1553, 2, 8, UNI_JAVA } /* isjavanese */, - { 1, 1279, 1698, 4, 9, UNI_CJKEXTD } /* block=cjkextd */, - { 8, 541, 1851, 3, 3, UNI_nfdqc_values_index } /* nfdqc= */, - { 1, 2394, 6392, 6, 10, UNI_INGLAGOLITIC } /* block=glagolitic */, - { 0, 30, 42, 1, 5, UNI_BUHD } /* isbuhd */, - { 6, 8792, 297, 3, 2, UNI_NT__NU } /* nt=nu */, - { 0, 1126, 5044, 4, 5, UNI_TAML } /* scx=tamil */, - { 12, 1775, 0, 6, 0, UNI_ARAB } /* arabic */, - { 15, 1696, 6074, 4, 19, UNI_SUPARROWSC } /* blk=supplementalarrowsc */, - { 0, 1874, 455, 8, 2, UNI_MRO } /* script=mro */, - { 1, 4557, 1021, 17, 6, UNI_KTHI } /* scriptextensions=kaithi */, - { 11, 0, 4487, 1, 16, UNI_LETTERLIKESYMBOLS } /* letterlikesymbols */, - { 2, 2666, 297, 3, 2, UNI_LB__NU } /* lb=nu */, - { 1, 2502, 5211, 3, 18, UNI_MODIFIERTONELETTERS } /* inmodifiertoneletters */, - { 1, 8145, 373, 16, 2, UNI_UIDEO } /* unifiedideograph=y */, - { 6, 4557, 2511, 17, 4, UNI_NAND } /* scriptextensions=nand */, - { 9, 2666, 909, 3, 7, UNI_LB__XX } /* lb=unknown */, - { 0, 3491, 1099, 12, 4, UNI_NV__1_SLASH_3 } /* numericvalue=1/3 */, - { 0, 4097, 645, 17, 3, -UNI_EPRES } /* emojipresentation=no */, - { 38, 4557, 1384, 17, 4, UNI_PERM } /* scriptextensions=perm */, - { 0, 2833, 65, 3, 2, UNI_MN } /* gc=mn */, - { 6, 6372, 4115, 3, 4, UNI_SC__MODI } /* sc=modi */, - { 14, 579, 0, 6, 0, UNI_TNSA } /* tangsa */, - { 1, 7086, 5620, 21, 4, UNI_compex_values_index } /* fullcompositionexclusion= */, - { 1, 6372, 1752, 3, 4, UNI_SC__GURU } /* sc=guru */, - { 1, 1126, 1122, 4, 4, UNI_NSHU } /* scx=nshu */, - { 1, 1126, 1007, 4, 8, UNI_HIRA } /* scx=hiragana */, - { 0, 3125, 373, 13, 4, UNI_QMARK } /* quotationmark=yes */, - { 2, 1126, 1165, 4, 8, UNI_VITH } /* scx=vithkuqi */, - { 0, 2696, 0, 9, 0, UNI__PERL_SURROGATE } /* surrogate */, - { 0, 768, 6329, 3, 21, UNI_EARLYDYNASTICCUNEIFORM } /* inearlydynasticcuneiform */, - { 0, 3476, 645, 13, 2, UNI_DT__CAN } /* nfdquickcheck=n */, - { 0, 4652, 7669, 14, 13, UNI_CYRILLICSUP } /* block=cyrillicsupplementary */, - { 0, 4557, 130, 17, 4, UNI_LATN } /* scriptextensions=latn */, - { 0, 869, 631, 4, 2, UNI_TERM } /* term=t */, - { 0, 1126, 854, 4, 7, UNI_SHRD } /* scx=sharada */, - { 1, 285, 631, 3, 2, UNI_GCB__T } /* gcb=t */, - { 11, 4669, 2387, 11, 7, UNI_COPTICEPACTNUMBERS } /* copticepactnumbers */, - { 2, 7420, 4590, 6, 15, UNI_SUTTONSIGNWRITING } /* blk=suttonsignwriting */, - { 0, 1654, 288, 10, 1, UNI_sd_values_index } /* softdotted= */, - { 0, 3930, 3989, 15, 2, UNI_NV__1_SLASH_80 } /* numericvalue=1/80 */, - { 12, 8140, 4814, 28, 4, UNI_CJKEXTF } /* incjkunifiedideographsextensionf */, - { 6, 51, 0, 4, 0, UNI_CANS } /* cans */, - { 9, 6072, 4280, 5, 11, UNI_SUPPUNCTUATION } /* issuppunctuation */, - { 1, 1206, 0, 9, 0, UNI_EA__NA } /* ea=narrow */, - { 0, 7233, 135, 24, 2, UNI_CCC__IS } /* canonicalcombiningclass=is */, - { 0, 8088, 265, 16, 2, UNI_CASEDLETTER } /* generalcategory=lc */, - { 3, 1874, 1083, 7, 8, UNI_SC__MAHJ } /* script=mahajani */, - { 2, 7585, 449, 10, 3, UNI_BC__RLI } /* bidiclass=rli */, - { 9, 1474, 365, 7, 2, UNI_CCC__18 } /* ccc=ccc18 */, - { 25, 1322, 6577, 5, 13, UNI_CJKCOMPAT } /* iscjkcompatibility */, - { 8, 1441, 3535, 2, 3, UNI_WB__EX } /* wb=ex */, - { 0, 4291, 373, 9, 4, UNI_DIA } /* diacritic=yes */, - { 1, 285, 387, 4, 2, UNI_GCB__SM } /* gcb=sm */, - { 0, 2, 962, 1, 7, -UNI_CE } /* ce=false */, - { 0, 868, 645, 5, 3, -UNI_STERM } /* sterm=no */, - { 2, 2, 644, 2, 4, -UNI_CWT } /* cwt=no */, - { 0, 2612, 20, 3, 2, UNI_JG__HE } /* jg=he */, - { 5, 18, 7121, 1, 22, UNI_BYZANTINEMUSIC } /* byzantinemusicalsymbols */, - { 4, 5698, 963, 21, 6, -UNI_CWCM } /* changeswhencasemapped=false */, - { 3, 2372, 372, 9, 3, UNI_IDC } /* idcontinue=y */, - { 8, 135, 7951, 2, 28, UNI_VSSUP } /* isvariationselectorssupplement */, - { 3, 2238, 0, 12, 0, UNI_NV__5_SLASH_12 } /* nv=4.167e-01 */, - { 0, 4785, 0, 16, 0, UNI_BOPOMOFOEXT } /* bopomofoextended */, - { 8, 1696, 6796, 5, 21, UNI_INDICNUMBERFORMS } /* blk=commonindicnumberforms */, - { 1, 563, 373, 6, 4, UNI_PATSYN } /* patsyn=yes */, - { 0, 6431, 108, 10, 2, UNI_GCB__T } /* linebreak=jt */, - { 9, 1536, 3740, 9, 9, UNI_GEORGIANEXT } /* ingeorgianextended */, - { 0, 33, 1645, 1, 9, UNI_SMALLFORMS } /* smallforms */, - { 2, 5740, 631, 21, 5, UNI_CWT } /* changeswhentitlecased=true */, - { 10, 6372, 114, 3, 4, UNI_KITS } /* sc=kits */, - { 4, 6372, 704, 3, 4, UNI_SC__DOGR } /* sc=dogr */, - { 1, 1874, 197, 7, 4, UNI_SGNW } /* script=sgnw */, - { 0, 7420, 6086, 7, 7, UNI_SUPARROWSC } /* blk=suparrowsc */, - { 0, 4524, 2161, 14, 8, UNI_NV__7_SLASH_2 } /* numericvalue=3.500e+00 */, - { 0, 2, 372, 1, 5, UNI_CE } /* ce=yes */, - { 0, 2836, 4280, 5, 11, UNI_PO } /* otherpunctuation */, - { 8, 1462, 0, 12, 0, UNI_BOXDRAWING } /* inboxdrawing */, - { 1, 1097, 0, 4, 0, UNI_NV__1 } /* nv=1 */, - { 4, 968, 373, 5, 4, UNI_ECOMP } /* ecomp=yes */, - { 4, 2799, 3903, 9, 5, UNI_ARABICMATH } /* blk=arabicmath */, - { 0, 3099, 364, 11, 2, UNI_IN__3_DOT_1 } /* presentin=v31 */, - { 0, 6372, 185, 3, 4, UNI_RJNG } /* sc=rjng */, - { 9, 135, 4785, 2, 11, UNI_BOPOMOFOEXT } /* isbopomofoext */, - { 0, 1696, 2302, 4, 12, UNI_INOLDHUNGARIAN } /* blk=oldhungarian */, - { 2, 7233, 1187, 24, 2, UNI_CCC__35 } /* canonicalcombiningclass=35 */, - { 3, 668, 644, 6, 3, -UNI_EXTPICT } /* extpict=n */, - { 2, 1126, 474, 4, 4, UNI_ORKH } /* scx=orkh */, - { 1, 3125, 631, 13, 5, UNI_QMARK } /* quotationmark=true */, - { 13, 3599, 4644, 12, 9, UNI_ARABICEXTB } /* block=arabicextendedb */, - { 0, 7697, 412, 27, 2, UNI_CCC__26 } /* canonicalcombiningclass=ccc26 */, - { 0, 53, 35, 1, 3, UNI_NBAT } /* nbat */, - { 0, 4557, 1039, 17, 6, UNI_TELU } /* scriptextensions=telugu */, - { 4, 5260, 3541, 12, 7, UNI_WB__MB } /* wordbreak=midnumlet */, - { 0, 2909, 7463, 3, 10, UNI_ENCLOSEDCJK } /* isenclosedcjk */, - { 5, 8095, 345, 9, 2, UNI_PF } /* category=pf */, - { 6, 237, 1688, 2, 8, UNI_XPOSIXSPACE } /* xperlspace */, - { 1, 6104, 645, 21, 2, -UNI_LOE } /* logicalorderexception=n */, - { 0, 1728, 5231, 4, 17, UNI_OTTOMANSIYAQNUMBERS } /* inottomansiyaqnumbers */, - { 0, 4557, 181, 17, 4, UNI_COPT } /* scriptextensions=qaac */, - { 2, 2053, 3751, 3, 13, UNI_PHONETICEXTSUP } /* isphoneticextsup */, - { 8, 1259, 3796, 4, 10, UNI_KANASUP } /* kanasupplement */, - { 10, 2612, 6422, 3, 9, UNI_JG__YEHBARREE } /* jg=yehbarree */, - { 18, 3099, 1368, 12, 2, UNI_IN__12 } /* presentin=v120 */, - { 15, 5059, 526, 9, 3, UNI_KANBUN } /* block=kanbun */, - { 5, 135, 661, 2, 7, UNI_ELYM } /* iselymaic */, - { 0, 4754, 0, 7, 0, UNI_LINB } /* linearb */, - { 0, 2666, 3125, 3, 9, UNI_LB__QU } /* lb=quotation */, - { 0, 6277, 8627, 7, 33, UNI_MISCPICTOGRAPHS } /* block=miscellaneoussymbolsandpictographs */, - { 0, 7309, 193, 22, 2, UNI_ARABICPFA } /* arabicpresentationformsa */, - { 8, 2418, 2654, 12, 4, -UNI_CI } /* caseignorable=no */, - { 8, 2055, 261, 5, 5, UNI_POSIXCNTRL } /* posixcntrl */, - { 2, 6372, 709, 3, 4, UNI_SC__LIMB } /* sc=limb */, - { 9, 1874, 2802, 6, 5, UNI_SC__ARAB } /* script=arab */, - { 1, 8145, 0, 16, 0, UNI_UIDEO } /* unifiedideograph */, - { 0, 135, 15, 2, 4, UNI_AGHB } /* isaghb */, - { 1, 5740, 0, 21, 0, UNI_CWT } /* changeswhentitlecased */, - { 2, 2394, 3712, 9, 6, UNI_CJKCOMPAT } /* block=cjkcompat */, - { 0, 8095, 117, 9, 2, UNI_SK } /* category=sk */, - { 0, 2394, 5392, 6, 9, UNI_HALFMARKS } /* block=halfmarks */, - { 0, 1126, 5857, 4, 19, UNI_MERO } /* scx=meroitichieroglyphs */, - { 0, 6372, 4219, 3, 4, UNI_SC__SIND } /* sc=sind */, - { 0, 6372, 1270, 3, 7, UNI_SC__MULT } /* sc=multani */, - { 0, 1874, 166, 7, 4, UNI_SC__OUGR } /* script=ougr */, - { 0, 6372, 6053, 3, 9, UNI_SUND } /* sc=sundanese */, - { 8, 2785, 375, 3, 2, UNI_BC__ES } /* bc=es */, - { 1, 721, 361, 3, 3, UNI_AGE__12 } /* age=12 */, - { 7, 2553, 963, 5, 6, -UNI_CASED } /* cased=false */, - { 1, 2394, 8029, 6, 29, UNI_ENCLOSEDIDEOGRAPHICSUP } /* block=enclosedideographicsupplement */, - { 1, 2394, 5044, 6, 8, UNI_TAMILSUP } /* block=tamilsup */, - { 0, 1566, 4644, 6, 9, UNI_KANAEXTB } /* iskanaextendedb */, - { 0, 3736, 139, 11, 3, UNI_LATINEXTF } /* latinextendedf */, - { 1, 32, 631, 2, 5, UNI_VS } /* vs=true */, - { 0, 135, 268, 2, 2, UNI_CF } /* iscf */, - { 1, 8095, 6734, 9, 10, UNI_CO } /* category=privateuse */, - { 4, 1474, 2155, 7, 2, UNI_CCC__29 } /* ccc=ccc29 */, - { 8, 1874, 466, 7, 4, UNI_OLCK } /* script=olck */, - { 0, 30, 6706, 1, 24, UNI_ZNAMENNYMUSIC } /* isznamennymusicalnotation */, - { 13, 71, 373, 3, 4, UNI_CWU } /* cwu=yes */, - { 9, 1523, 630, 4, 3, UNI_XPOSIXSPACE } /* space=t */, - { 0, 5, 2920, 1, 6, UNI_MAHJONG } /* mahjong */, - { 4, 7233, 1189, 24, 5, UNI_CCC__7 } /* canonicalcombiningclass=nukta */, - { 8, 358, 5668, 4, 5, UNI_CCC__B } /* ccc=below */, - { 6, 1696, 724, 4, 5, UNI_INRUNIC } /* blk=runic */, - { 1, 768, 655, 3, 6, UNI_INELBASAN } /* inelbasan */, - { 1, 2666, 193, 3, 2, UNI_LB__SA } /* lb=sa */, - { 0, 323, 4669, 2, 18, UNI_COPTICEPACTNUMBERS } /* incopticepactnumbers */, - { 7, 4557, 1528, 17, 4, UNI_BUGI } /* scriptextensions=bugi */, - { 13, 1874, 8927, 7, 18, UNI_CANS } /* script=canadianaboriginal */, - { 4, 6372, 82, 3, 4, UNI_SC__GONG } /* sc=gong */, - { 49, 3491, 2268, 12, 10, UNI_NV__7_SLASH_12 } /* numericvalue=5.833e-01 */, - { 0, 3824, 755, 12, 3, UNI_JG__MALAYALAMNNA } /* jg=malayalamnna */, - { 0, 3274, 645, 14, 2, UNI_EA__N } /* eastasianwidth=n */, - { 0, 285, 3288, 2, 13, UNI_NL } /* gc=letternumber */, - { 7, 2069, 2975, 11, 12, UNI_JT__D } /* joiningtype=dualjoining */, - { 0, 1441, 3535, 2, 7, UNI_WB__EXTEND } /* wb=extend */, - { 0, 2666, 4898, 3, 15, UNI_LB__CB } /* lb=contingentbreak */, - { 0, 5761, 373, 21, 2, UNI_CWU } /* changeswhenuppercased=y */, - { 48, 20, 1128, 2, 2, UNI_hex_values_index } /* hex= */, - { 10, 1236, 8761, 3, 23, UNI_CJKCOMPATIDEOGRAPHS } /* cjkcompatibilityideographs */, - { 0, 2394, 815, 6, 7, UNI_INOSMANYA } /* block=osmanya */, - { 8, 1874, 55, 7, 4, UNI_CHAM } /* script=cham */, - { 0, 20, 645, 3, 3, -UNI_XPOSIXXDIGIT } /* hex=no */, - { 1, 2055, 0, 2, 0, UNI_PO } /* po */, - { 0, 5782, 3557, 21, 3, UNI_LB__ZWJ } /* graphemeclusterbreak=zwj */, - { 11, 1696, 341, 4, 5, UNI_VSSUP } /* blk=vssup */, - { 2, 42, 5194, 2, 6, UNI_SB__CL } /* sb=close */, - { 24, 8095, 4321, 9, 15, UNI_LOWERCASELETTER } /* category=lowercaseletter */, - { 17, 2372, 630, 9, 3, UNI_IDC } /* idcontinue=t */, - { 0, 2553, 645, 5, 3, -UNI_CASED } /* cased=no */, - { 4, 2461, 0, 10, 0, UNI_INCYRILLIC } /* incyrillic */, - { 1, 968, 0, 5, 0, UNI_ECOMP } /* ecomp */, - { 1, 1810, 0, 11, 0, UNI_KEHNOMIRROR } /* kehnomirror */, - { 2, 135, 166, 2, 4, UNI_OUGR } /* isougr */, - { 3, 5, 8627, 1, 33, UNI_MISCPICTOGRAPHS } /* miscellaneoussymbolsandpictographs */, - { 0, 6955, 145, 14, 2, UNI_JG__MIM } /* joininggroup=mim */, - { 7, 8142, 4348, 26, 4, UNI_CJKEXTH } /* cjkunifiedideographsextensionh */, - { 3, 6647, 696, 13, 3, UNI_JG__LAM } /* joininggroup=lam */, - { 4, 233, 0, 4, 0, UNI_WCHO } /* wcho */, - { 8, 2538, 0, 6, 0, UNI_IPAEXT } /* ipaext */, - { 10, 2899, 1549, 10, 4, UNI_CYRILLICEXTA } /* iscyrillicexta */, - { 14, 563, 645, 6, 3, -UNI_PATSYN } /* patsyn=no */, - { 6, 7847, 1790, 18, 4, UNI_DT__VERT } /* decompositiontype=vert */, - { 0, 1126, 1204, 5, 3, UNI_TALE } /* scx=tale */, - { 0, 2394, 510, 6, 3, UNI_INVAI } /* block=vai */, - { 10, 4173, 373, 4, 4, UNI_IDSB } /* idsb=yes */, - { 1, 1538, 6040, 5, 13, UNI_GEORGIANSUP } /* georgiansupplement */, - { 0, 1230, 6374, 4, 10, UNI_INCB__CONSONANT } /* incb=consonant */, - { 2, 2394, 991, 6, 8, UNI_INGUJARATI } /* block=gujarati */, - { 11, 2584, 6025, 9, 9, UNI_MYANMAREXTA } /* ismyanmarextendeda */, - { 0, 1781, 6054, 3, 8, UNI_SUND } /* issundanese */, - { 2, 1553, 0, 4, 0, UNI_JAVA } /* java */, - { 3, 1322, 1492, 5, 7, UNI_CJKSTROKES } /* iscjkstrokes */, - { 7, 6167, 44, 3, 1, UNI_VO__U } /* vo=u */, - { 10, 3040, 4844, 3, 15, UNI_SYRIACSUP } /* insyriacsupplement */, - { 0, 1126, 1223, 4, 7, UNI_BENG } /* scx=bengali */, - { 0, 323, 1965, 2, 8, UNI_UCASEXTA } /* inucasexta */, - { 7, 323, 760, 2, 7, UNI_KALI } /* inkayahli */, - { 0, 1441, 2787, 2, 3, UNI_RI } /* wb=ri */, - { 1, 377, 0, 6, 0, UNI_CAKM } /* chakma */, - { 65, 6264, 7187, 8, 13, UNI_GEOMETRICSHAPES } /* block=geometricshapes */, - { 1, 2, 2654, 1, 3, -UNI_CE } /* ce=n */, - { 0, 4557, 1027, 17, 6, UNI_LEPC } /* scriptextensions=lepcha */, - { 0, 3764, 0, 10, 0, UNI_DEVA } /* devanagari */, - { 0, 6670, 295, 14, 2, UNI_SB__XX } /* sentencebreak=xx */, - { 0, 5761, 645, 21, 2, -UNI_CWU } /* changeswhenuppercased=n */, - { 12, 7585, 2668, 9, 2, UNI_BC__B } /* bidiclass=b */, - { 0, 2378, 8921, 3, 33, UNI_UCAS } /* inunifiedcanadianaboriginalsyllabics */, - { 0, 323, 890, 2, 7, UNI_INTAIVIET } /* intaiviet */, - { 8, 323, 1965, 2, 7, UNI_UCASEXT } /* inucasext */, - { 1, 1866, 0, 4, 0, UNI_MONG } /* mong */, - { 1, 20, 373, 3, 2, UNI_XPOSIXXDIGIT } /* hex=y */, - { 16, 135, 241, 2, 4, UNI_XSUX } /* isxsux */, - { 2, 2394, 7669, 6, 28, UNI_SUPPUAA } /* block=supplementaryprivateuseareaa */, - { 2, 1126, 5014, 4, 4, UNI_BAMU } /* scx=bamu */, - { 13, 2394, 1305, 6, 7, UNI_INSUNUWAR } /* block=sunuwar */, - { 0, 8197, 7582, 28, 4, UNI_CJKEXTB } /* iscjkunifiedideographsextensionb */, - { 0, 6372, 535, 3, 6, UNI_SC__LYDI } /* sc=lydian */, - { 2, 6647, 4351, 13, 14, UNI_JG__HAMZAONHEHGOAL } /* joininggroup=hamzaonhehgoal */, - { 15, 5, 4116, 1, 13, UNI_SK } /* modifiersymbol */, - { 1, 1126, 1015, 4, 4, UNI_HATR } /* scx=hatr */, - { 0, 1696, 1390, 4, 9, UNI_INOLDTURKIC } /* blk=oldturkic */, - { 4, 1279, 3217, 4, 10, UNI_INGEORGIAN } /* block=georgian */, - { 0, 2, 5501, 1, 10, UNI_CHEROKEESUP } /* cherokeesup */, - { 0, 4321, 372, 8, 2, UNI_lower_values_index } /* lowercase= */, - { 17, 8088, 5344, 16, 20, UNI_PC } /* generalcategory=connectorpunctuation */, - { 8, 3373, 7465, 3, 24, UNI_ENCLOSEDCJK } /* enclosedcjklettersandmonths */, - { 0, 6431, 1915, 10, 5, UNI_EBASE } /* linebreak=ebase */, - { 2, 3178, 963, 13, 2, -UNI_POSIXXDIGIT } /* asciihexdigit=f */, - { 0, 323, 297, 2, 5, UNI_INNUSHU } /* innushu */, - { 1, 6372, 1165, 3, 8, UNI_VITH } /* sc=vithkuqi */, - { 2, 135, 5392, 2, 9, UNI_HALFMARKS } /* ishalfmarks */, - { 16, 6372, 1045, 3, 6, UNI_WCHO } /* sc=wancho */, - { 4, 868, 373, 5, 4, UNI_STERM } /* sterm=yes */, - { 0, 1039, 0, 6, 0, UNI_TELU } /* telugu */, - { 10, 3734, 1750, 13, 3, UNI_LATINEXTG } /* inlatinextendedg */, - { 2, 6467, 1362, 14, 5, UNI_NV__216000 } /* numericvalue=216000 */, - { 0, 2612, 2066, 3, 3, UNI_JG__WAW } /* jg=waw */, - { 0, 7436, 0, 25, 0, UNI_CCC__1 } /* canonicalcombiningclass=1 */, - { 0, 8088, 645, 15, 2, UNI_N } /* generalcategory=n */, - { 2, 1234, 81, 7, 2, UNI_CJKEXTG } /* incjkextg */, - { 0, 2345, 594, 3, 3, UNI_IN__2_DOT_1 } /* in=2.1 */, - { 2, 1322, 6777, 5, 19, UNI_CJKCOMPATIDEOGRAPHSSUP } /* iscjkcompatideographssup */, - { 2, 2394, 2302, 6, 12, UNI_INOLDHUNGARIAN } /* block=oldhungarian */, - { 24, 4557, 162, 17, 4, UNI_OSGE } /* scriptextensions=osge */, - { 10, 2394, 4937, 6, 8, UNI_DINGBATS } /* block=dingbats */, - { 0, 5260, 735, 10, 2, UNI_WB__EB } /* wordbreak=em */, - { 12, 954, 644, 2, 6, UNI_BPT__N } /* bpt=none */, - { 2, 1874, 217, 7, 4, UNI_SC__TGLG } /* script=tglg */, - { 0, 2593, 2881, 5, 8, UNI_SO } /* isothersymbol */, - { 0, 1126, 193, 4, 4, UNI_SAMR } /* scx=samr */, - { 4, 1091, 373, 6, 4, UNI_DT__NONE } /* nfkdqc=yes */, - { 2, 2394, 401, 9, 4, UNI_CJKEXTH } /* block=cjkexth */, - { 4, 1126, 709, 4, 5, UNI_LIMB } /* scx=limbu */, - { 0, 135, 1435, 2, 6, UNI_THAA } /* isthaana */, - { 1, 1126, 352, 4, 4, UNI_CARI } /* scx=cari */, - { 1, 135, 3098, 2, 5, UNI_EPRES } /* isepres */, - { 0, 135, 6734, 2, 10, UNI_CO } /* isprivateuse */, - { 18, 358, 10, 4, 1, UNI_CCC__R } /* ccc=r */, - { 7, 1257, 1549, 6, 4, UNI_KANAEXTA } /* inkanaexta */, - { 8, 8596, 2522, 22, 8, UNI_INSC__AVAGRAHA } /* indicsyllabiccategory=avagraha */, - { 1, 6372, 1715, 4, 10, UNI_SC__CPMN } /* sc=cyprominoan */, - { 1, 2599, 2114, 8, 5, UNI_XPOSIXALPHA } /* isxposixalpha */, - { 1, 135, 636, 2, 7, UNI_DSRT } /* isdeseret */, - { 2, 1810, 373, 11, 4, UNI_KEHNOMIRROR } /* kehnomirror=yes */, - { 0, 1126, 636, 4, 7, UNI_DSRT } /* scx=deseret */, - { 0, 2394, 1083, 6, 8, UNI_INMAHAJANI } /* block=mahajani */, - { 2, 2573, 963, 11, 6, -UNI_JOINC } /* joincontrol=false */, - { 8, 808, 0, 7, 0, UNI_OLCK } /* olchiki */, - { 4, 1083, 0, 8, 0, UNI_MAHJ } /* mahajani */, - { 10, 135, 3806, 2, 14, UNI_MN } /* isnonspacingmark */, - { 4, 6372, 7923, 3, 4, UNI_EGYP } /* sc=egyp */, - { 4, 6431, 3557, 10, 2, UNI_LB__ZW } /* linebreak=zw */, - { 2, 1126, 2302, 4, 12, UNI_HUNG } /* scx=oldhungarian */, - { 11, 7585, 2494, 10, 2, UNI_BC__CS } /* bidiclass=cs */, - { 16, 1126, 0, 4, 0, UNI_scx_values_index } /* scx= */, - { 1, 1446, 360, 3, 2, UNI_xidc_values_index } /* xidc= */, - { 44, 135, 1664, 2, 10, UNI_WARA } /* iswarangciti */, - { 3, 1945, 373, 12, 4, UNI_BIDIM } /* bidimirrored=yes */, - { 0, 3040, 5518, 3, 17, UNI_SMALLKANAEXT } /* insmallkanaextension */, - { 0, 6392, 0, 20, 0, UNI_GLAGOLITICSUP } /* glagoliticsupplement */, - { 8, 6350, 962, 19, 7, -UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=false */, - { 2, 643, 1151, 3, 3, UNI_DT__FIN } /* dt=fin */, - { 1, 7847, 3569, 18, 6, UNI_DT__SQR } /* decompositiontype=square */, - { 0, 687, 0, 6, 0, UNI_LB__H2 } /* hst=lv */, - { 1, 2371, 645, 4, 2, -UNI_XIDC } /* xidc=n */, - { 1, 1230, 2017, 3, 9, UNI_COMPATJAMO } /* incompatjamo */, - { 1, 7585, 6530, 10, 20, UNI_BC__PDF } /* bidiclass=popdirectionalformat */, - { 2, 4291, 0, 12, 0, UNI_DIACRITICALS } /* diacriticals */, - { 4, 7233, 596, 24, 2, UNI_CCC__13 } /* canonicalcombiningclass=13 */, - { 4, 2833, 4687, 3, 15, UNI_TITLE } /* gc=titlecaseletter */, - { 0, 2666, 2097, 3, 2, UNI_HST__V } /* lb=jv */, - { 0, 2045, 2974, 6, 2, UNI_radical_values_index } /* radical= */, - { 1, 5719, 0, 21, 0, UNI_CWL } /* changeswhenlowercased */, - { 0, 1126, 422, 4, 4, UNI_MIAO } /* scx=miao */, - { 6, 3227, 4793, 11, 9, UNI_MYANMAREXTC } /* blk=myanmarextendedc */, - { 9, 6707, 0, 13, 0, UNI_ZNAMENNYMUSIC } /* znamennymusic */, - { 2, 1126, 767, 4, 7, UNI_LINA } /* scx=lineara */, - { 11, 924, 302, 5, 2, UNI_AGE__3 } /* age=v30 */, - { 2, 1157, 0, 8, 0, UNI_UGAR } /* ugaritic */, - { 13, 323, 724, 2, 5, UNI_INRUNIC } /* inrunic */, - { 0, 94, 0, 4, 0, UNI_GUKH } /* gukh */, - { 6, 135, 4129, 2, 14, UNI_ZS } /* isspaceseparator */, - { 3, 1874, 130, 7, 4, UNI_SC__LATN } /* script=latn */, - { 6, 6372, 4785, 3, 4, UNI_SC__BOPO } /* sc=bopo */, - { 0, 8088, 5276, 16, 2, UNI_CASEDLETTER } /* generalcategory=l_ */, - { 0, 6372, 4021, 3, 6, UNI_SC__TANG } /* sc=tangut */, - { 0, 1474, 304, 8, 1, UNI_CCC__14 } /* ccc=ccc14 */, - { 1, 1498, 963, 2, 2, -UNI_SD } /* sd=f */, - { 0, 1523, 645, 5, 3, -UNI_XPOSIXSPACE } /* space=no */, - { 15, 3099, 2171, 11, 2, UNI_IN__6_DOT_2 } /* presentin=v62 */, - { 7, 316, 373, 5, 4, UNI__PERL_PATWS } /* patws=yes */, - { 1, 135, 5014, 2, 5, UNI_BAMU } /* isbamum */, - { 3, 8088, 261, 16, 5, UNI_XPOSIXCNTRL } /* generalcategory=cntrl */, - { 0, 1126, 311, 4, 5, UNI_ORYA } /* scx=oriya */, - { 3, 5148, 0, 14, 0, UNI_ROHG } /* hanifirohingya */, - { 0, 6647, 737, 13, 4, UNI_JG__NOON } /* joininggroup=noon */, - { 5, 135, 181, 2, 4, UNI_COPT } /* isqaac */, - { 4, 306, 2731, 3, 9, UNI_NV__1_SLASH_2 } /* nv=5.000e-01 */, - { 0, 8095, 238, 9, 2, UNI_PE } /* category=pe */, - { 0, 3806, 0, 14, 0, UNI_MN } /* nonspacingmark */, - { 1, 2394, 3712, 9, 11, UNI_CJKCOMPATFORMS } /* block=cjkcompatforms */, - { 1, 6250, 7463, 7, 26, UNI_ENCLOSEDCJK } /* block=enclosedcjklettersandmonths */, - { 0, 8500, 0, 33, 0, UNI_MISCMATHSYMBOLSB } /* miscellaneousmathematicalsymbolsb */, - { 5, 1499, 645, 10, 2, -UNI_DEP } /* deprecated=n */, - { 0, 1696, 6392, 4, 10, UNI_INGLAGOLITIC } /* blk=glagolitic */, - { 9, 135, 1051, 2, 6, UNI_YEZI } /* isyezidi */, - { 8, 3930, 2177, 14, 8, UNI_NV__1_SLASH_64 } /* numericvalue=1.563e-02 */, - { 4, 8364, 0, 32, 0, UNI_IDEOGRAPHICSYMBOLS } /* ideographicsymbolsandpunctuation */, - { 0, 6370, 5218, 5, 10, UNI_INSC__TONELETTER } /* insc=toneletter */, - { 2, 4557, 830, 17, 4, UNI_LANA } /* scriptextensions=lana */, - { 2, 1126, 5955, 4, 21, UNI_PRTI } /* scx=inscriptionalparthian */, - { 7, 1126, 450, 4, 4, UNI_LINA } /* scx=lina */, - { 2, 5677, 963, 21, 2, -UNI_CWCF } /* changeswhencasefolded=f */, - { 12, 4557, 1263, 17, 4, UNI_MAKA } /* scriptextensions=maka */, - { 12, 4652, 1703, 14, 4, UNI_CYRILLICEXTD } /* block=cyrillicextd */, - { 0, 1126, 579, 4, 4, UNI_TANG } /* scx=tang */, - { 1, 135, 1039, 2, 4, UNI_TELU } /* istelu */, - { 0, 5761, 963, 21, 6, -UNI_CWU } /* changeswhenuppercased=false */, - { 1, 358, 303, 4, 1, UNI_CCC__0 } /* ccc=0 */, - { 16, 6372, 1033, 3, 4, UNI_SC__LYCI } /* sc=lyci */, - { 2, 312, 645, 2, 3, -UNI_RI } /* ri=no */, - { 0, 1322, 8827, 3, 34, UNI_DIACRITICALSSUP } /* iscombiningdiacriticalmarkssupplement */, - { 0, 770, 288, 2, 2, UNI_EA__H } /* ea=h */, - { 0, 6647, 6667, 13, 3, UNI_JG__QAF } /* joininggroup=qaf */, - { 0, 2584, 4116, 3, 13, UNI_SK } /* ismodifiersymbol */, - { 3, 135, 4703, 2, 5, UNI_XPOSIXUPPER } /* isupper */, - { 0, 2833, 2494, 3, 2, UNI__PERL_SURROGATE } /* gc=cs */, - { 0, 8037, 631, 11, 5, UNI_IDEO } /* ideographic=true */, - { 8, 4718, 4701, 17, 2, UNI_idst_values_index } /* idstrinaryoperator= */, - { 7, 6431, 1821, 10, 8, UNI_LB__LF } /* linebreak=linefeed */, - { 3, 2114, 645, 5, 3, -UNI_XPOSIXALPHA } /* alpha=no */, - { 0, 3073, 1853, 13, 6, UNI_NFCQC__M } /* nfcquickcheck=maybe */, - { 0, 8564, 7582, 32, 4, UNI_CJKEXTB } /* block=cjkunifiedideographsextensionb */, - { 0, 1566, 526, 5, 3, UNI_KANBUN } /* iskanbun */, - { 1, 2612, 517, 3, 3, UNI_JG__GAF } /* jg=gaf */, - { 3, 358, 7461, 4, 2, UNI_CCC__28 } /* ccc=28 */, - { 0, 6372, 1298, 3, 4, UNI_SOYO } /* sc=soyo */, - { 4, 323, 336, 2, 5, UNI_INTAKRI } /* intakri */, - { 1, 905, 0, 4, 0, UNI_IDEO } /* ideo */, - { 3, 135, 1384, 2, 4, UNI_PERM } /* isperm */, - { 1, 23, 0, 4, 0, UNI_AHOM } /* ahom */, - { 0, 3106, 920, 5, 2, UNI_IN__11 } /* in=v110 */, - { 5, 2740, 645, 13, 2, -UNI_PATSYN } /* patternsyntax=n */, - { 0, 2492, 0, 4, 0, UNI__PERL_SURROGATE } /* iscs */, - { 3, 2612, 2625, 3, 10, UNI_JG__DALATHRISH } /* jg=dalathrish */, - { 1, 6372, 4306, 3, 4, UNI_SC__HANG } /* sc=hang */, - { 0, 6912, 0, 15, 0, UNI_TRANSPORTANDMAP } /* transportandmap */, - { 4, 1097, 551, 4, 2, UNI_NV__1_SLASH_5 } /* nv=1/5 */, - { 0, 2666, 312, 3, 2, UNI_RI } /* lb=ri */, - { 0, 1696, 2511, 4, 11, UNI_INNANDINAGARI } /* blk=nandinagari */, - { 6, 2833, 54, 3, 2, UNI_SC } /* gc=sc */, - { 1, 6838, 8795, 11, 14, UNI_INPC__TOPANDBOTTOMANDRIGHT } /* inpc=topandbottomandright */, - { 3, 6507, 6209, 14, 8, UNI_BC__LRO } /* bc=lefttorightoverride */, - { 3, 3491, 627, 12, 3, UNI_NV__22 } /* numericvalue=22 */, - { 6, 4557, 51, 17, 4, UNI_CANS } /* scriptextensions=cans */, - { 10, 7233, 290, 25, 1, UNI_CCC__22 } /* canonicalcombiningclass=22 */, - { 1, 4261, 0, 8, 0, UNI_VEDICEXT } /* vedicext */, - { 0, 1915, 0, 5, 0, UNI_EBASE } /* ebase */, - { 0, 2666, 3435, 3, 12, UNI_LB__IS } /* lb=infixnumeric */, - { 0, 4557, 2099, 17, 12, UNI_GONM } /* scriptextensions=masaramgondi */, - { 8, 1773, 7747, 6, 20, UNI_ARABICPFA } /* isarabicpresentationformsa */, - { 13, 1696, 8693, 4, 35, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* blk=symbolsforlegacycomputingsupplement */, - { 0, 1874, 1372, 7, 9, UNI_ITAL } /* script=olditalic */, - { 16, 6431, 323, 10, 2, UNI_LB__IN } /* linebreak=in */, - { 19, 135, 1417, 2, 9, UNI_PAUC } /* ispaucinhau */, - { 0, 135, 54, 2, 2, UNI_SC } /* issc */, - { 0, 7868, 926, 17, 3, UNI_HST__V } /* hangulsyllabletype=v */, - { 7, 1408, 0, 9, 0, UNI_PALM } /* palmyrene */, - { 0, 6277, 8292, 7, 32, UNI_MISCMATHSYMBOLSA } /* block=miscellaneousmathematicalsymbolsa */, - { 9, 2573, 963, 11, 2, -UNI_JOINC } /* joincontrol=f */, - { 2, 138, 0, 2, 0, UNI_ME } /* me */, - { 4, 1874, 1118, 7, 4, UNI_MERC } /* script=merc */, - { 2, 1057, 0, 8, 0, UNI_JAMOEXTB } /* jamoextb */, - { 0, 323, 3447, 2, 15, UNI_INMEROITICCURSIVE } /* inmeroiticcursive */, - { 0, 4703, 645, 5, 2, -UNI_XPOSIXUPPER } /* upper=n */, - { 8, 1126, 2481, 4, 8, UNI_KANA } /* scx=katakana */, - { 16, 1381, 0, 9, 0, UNI_PERM } /* oldpermic */, - { 0, 434, 373, 3, 2, UNI_DIA } /* dia=y */, - { 2, 753, 0, 7, 0, UNI_KNDA } /* kannada */, - { 1, 624, 304, 6, 1, UNI_CCC__L } /* ccc=224 */, - { 2, 6072, 8639, 14, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* issupplementalsymbolsandpictographs */, - { 19, 1126, 1165, 4, 4, UNI_VITH } /* scx=vith */, - { 1, 306, 364, 3, 2, UNI_NV__31 } /* nv=31 */, - { 0, 1097, 304, 5, 2, UNI_NV__1_SLASH_40 } /* nv=1/40 */, - { 8, 916, 603, 4, 3, UNI_AGE__6 } /* age=6.0 */, - { 9, 1441, 1880, 2, 3, UNI_WB__ML } /* wb=ml */, - { 1, 8498, 0, 35, 0, UNI_MISCMATHSYMBOLSB } /* inmiscellaneousmathematicalsymbolsb */, - { 4, 2463, 4793, 8, 9, UNI_CYRILLICEXTC } /* cyrillicextendedc */, - { 0, 2394, 7558, 6, 27, UNI_OCR } /* block=opticalcharacterrecognition */, - { 7, 2599, 3365, 8, 5, UNI_XPOSIXALNUM } /* isxposixalnum */, - { 8, 1474, 364, 7, 2, UNI_CCC__31 } /* ccc=ccc31 */, - { 0, 6372, 3325, 3, 15, UNI_ARMI } /* sc=imperialaramaic */, - { 0, 1447, 631, 7, 5, UNI_IDS } /* idstart=true */, - { 3, 2394, 134, 6, 4, UNI_INLISU } /* block=lisu */, - { 7, 1874, 4306, 7, 4, UNI_SC__HANG } /* script=hang */, - { 0, 1696, 1904, 4, 11, UNI_INSYLOTINAGRI } /* blk=sylotinagri */, - { 0, 2394, 4785, 6, 16, UNI_BOPOMOFOEXT } /* block=bopomofoextended */, - { 0, 6372, 446, 3, 4, UNI_KHMR } /* sc=khmr */, - { 0, 3491, 2162, 13, 3, UNI_NV__500 } /* numericvalue=500 */, - { 0, 5325, 213, 13, 2, UNI_LATINEXTF } /* block=latinextf */, - { 1, 135, 278, 2, 4, UNI_GARA } /* isgara */, - { 2, 1874, 4190, 7, 7, UNI_BRAI } /* script=braille */, - { 1, 916, 600, 4, 3, UNI_AGE__4 } /* age=4.0 */, - { 6, 1538, 981, 6, 5, UNI_GEORGIANEXT } /* georgianext */, - { 0, 1126, 1027, 4, 4, UNI_LEPC } /* scx=lepc */, - { 0, 2394, 393, 6, 6, UNI_INGOTHIC } /* block=gothic */, - { 0, 6372, 213, 3, 4, UNI_SC__TFNG } /* sc=tfng */, - { 6, 4557, 2060, 17, 6, UNI_SYRC } /* scriptextensions=syriac */, - { 2, 1904, 0, 4, 0, UNI_SYLO } /* sylo */, - { 0, 2584, 2111, 3, 11, UNI_MATHALPHANUM } /* ismathalphanum */, - { 3, 4557, 636, 17, 7, UNI_DSRT } /* scriptextensions=deseret */, - { 0, 1206, 7259, 3, 9, UNI_EA__H } /* ea=halfwidth */, - { 3, 1696, 930, 4, 8, UNI_INARMENIAN } /* blk=armenian */, - { 11, 1446, 631, 4, 5, UNI_XIDS } /* xids=true */, - { 5, 8095, 1443, 8, 2, UNI_M } /* category=m */, - { 0, 2612, 1802, 3, 8, UNI_JG__SWASHKAF } /* jg=swashkaf */, - { 18, 3178, 373, 13, 4, UNI_POSIXXDIGIT } /* asciihexdigit=yes */, - { 0, 2785, 3203, 3, 12, UNI_BC__ON } /* bc=otherneutral */, - { 9, 2612, 1807, 3, 3, UNI_JG__KAF } /* jg=kaf */, - { 0, 6277, 1549, 13, 4, UNI_MYANMAREXTA } /* block=myanmarexta */, - { 0, 5, 0, 3, 0, UNI_MCM } /* mcm */, - { 0, 8142, 5526, 20, 10, UNI_CJKEXTD } /* cjkunifiedideographsextensiond */, - { 1, 383, 645, 4, 2, -UNI_CWCM } /* cwcm=n */, - { 1, 225, 227, 2, 2, UNI_TODR } /* todr */, - { 0, 2345, 596, 3, 4, UNI_IN__13 } /* in=13.0 */, - { 2, 2471, 6400, 8, 12, UNI_ETHIOPICSUP } /* inethiopicsupplement */, - { 1, 1848, 645, 5, 2, UNI_COMPEX } /* nfcqc=n */, - { 0, 1725, 0, 6, 0, UNI_DOMINO } /* domino */, - { 4, 30, 117, 1, 5, UNI_KNDA } /* isknda */, - { 1, 5585, 631, 19, 5, UNI_TERM } /* terminalpunctuation=true */, - { 75, 2338, 2280, 9, 4, UNI_IN__6_DOT_2 } /* presentin=6.2 */, - { 0, 1696, 7129, 4, 14, UNI_MUSIC } /* blk=musicalsymbols */, - { 0, 7585, 6509, 9, 21, UNI_BC__LRE } /* bidiclass=lefttorightembedding */, - { 1, 135, 106, 2, 2, UNI_ZL } /* iszl */, - { 1, 4557, 1435, 17, 4, UNI_THAA } /* scriptextensions=thaa */, - { 0, 6372, 815, 3, 4, UNI_OSMA } /* sc=osma */, - { 3, 1126, 1033, 4, 6, UNI_LYCI } /* scx=lycian */, - { 0, 3491, 1187, 13, 2, UNI_NV__35 } /* numericvalue=35 */, - { 1, 135, 5585, 2, 19, UNI_TERM } /* isterminalpunctuation */, - { 15, 1696, 81, 9, 2, UNI_CJKEXTG } /* blk=cjkextg */, - { 0, 2833, 119, 3, 2, UNI_XPOSIXDIGIT } /* gc=nd */, - { 1, 135, 2430, 2, 10, UNI_CN } /* isunassigned */, - { 0, 1874, 694, 7, 5, UNI_SC__ADLM } /* script=adlam */, - { 0, 2584, 2100, 3, 11, UNI_GONM } /* ismasaramgondi */, - { 2, 4557, 1509, 17, 10, UNI_DIAK } /* scriptextensions=divesakuru */, - { 1, 4557, 134, 17, 4, UNI_LISU } /* scriptextensions=lisu */, - { 0, 6372, 1618, 3, 10, UNI_PHNX } /* sc=phoenician */, - { 5, 3491, 304, 14, 1, UNI_NV__44 } /* numericvalue=44 */, - { 16, 7697, 605, 28, 2, UNI_CCC__107 } /* canonicalcombiningclass=ccc107 */, - { 0, 6372, 729, 3, 5, UNI_BATK } /* sc=batak */, - { 4, 135, 8037, 2, 11, UNI_IDEO } /* isideographic */, - { 4, 1126, 122, 4, 4, UNI_KRAI } /* scx=krai */, - { 1, 135, 4703, 2, 15, UNI_UPPERCASELETTER } /* isuppercaseletter */, - { 0, 135, 4291, 2, 9, UNI_DIA } /* isdiacritic */, - { 1, 510, 0, 3, 0, UNI_VAI } /* vai */, - { 1, 285, 5930, 4, 9, UNI_WB__EB } /* gcb=emodifier */, - { 5, 8095, 4817, 9, 16, UNI_PF } /* category=finalpunctuation */, - { 0, 4557, 3623, 17, 7, UNI_CPRT } /* scriptextensions=cypriot */, - { 0, 2599, 4280, 8, 5, UNI_XPOSIXPUNCT } /* isxposixpunct */, - { 0, 1696, 311, 4, 5, UNI_INORIYA } /* blk=oriya */, - { 0, 1696, 154, 4, 4, UNI_INNEWA } /* blk=newa */, - { 12, 6372, 6996, 3, 11, UNI_MTEI } /* sc=meeteimayek */, - { 1, 6647, 1794, 13, 8, UNI_JG__FARSIYEH } /* joininggroup=farsiyeh */, - { 36, 3652, 5396, 4, 5, UNI_HALFMARKS } /* halfmarks */, - { 12, 8596, 2688, 22, 6, UNI_LB__ZWJ } /* indicsyllabiccategory=joiner */, - { 19, 6372, 249, 3, 4, UNI_ZANB } /* sc=zanb */, - { 1, 1126, 3826, 3, 10, UNI_MLYM } /* scx=malayalam */, - { 3, 2394, 4306, 6, 6, UNI_INHANGUL } /* block=hangul */, - { 0, 5272, 3160, 6, 9, UNI__PERL_ANY_FOLDS } /* _perl_any_folds */, - { 0, 6372, 78, 3, 4, UNI_DSRT } /* sc=dsrt */, - { 0, 2371, 645, 4, 3, -UNI_XIDC } /* xidc=no */, - { 0, 2833, 4205, 3, 14, UNI_SC } /* gc=currencysymbol */, - { 0, 4557, 1353, 17, 9, UNI_TALU } /* scriptextensions=newtailue */, - { 0, 1126, 1021, 4, 6, UNI_KTHI } /* scx=kaithi */, - { 18, 6372, 336, 3, 5, UNI_SC__TAKR } /* sc=takri */, - { 0, 6250, 4644, 14, 9, UNI_ETHIOPICEXTB } /* block=ethiopicextendedb */, - { 2, 7847, 4420, 18, 5, UNI_DT__SML } /* decompositiontype=small */, - { 10, 1322, 2489, 5, 4, UNI_CJKEXTI } /* iscjkexti */, - { 2, 393, 0, 4, 0, UNI_GOTH } /* goth */, - { 0, 3796, 4741, 10, 13, UNI_SUPPUNCTUATION } /* supplementalpunctuation */, - { 3, 4557, 535, 17, 6, UNI_LYDI } /* scriptextensions=lydian */, - { 0, 3796, 1312, 4, 3, UNI_SUPPUAB } /* suppuab */, - { 0, 1566, 1549, 6, 4, UNI_KANAEXTA } /* iskanaexta */, - { 0, 4557, 1114, 17, 4, UNI_LINB } /* scriptextensions=linb */, - { 1, 1097, 5549, 4, 8, UNI_NV__100000000 } /* nv=100000000 */, - { 2, 1126, 470, 4, 4, UNI_ONAO } /* scx=onao */, - { 0, 6372, 1176, 3, 9, UNI_BHKS } /* sc=bhaiksuki */, - { 0, 30, 967, 1, 6, UNI_ECOMP } /* isecomp */, - { 3, 558, 0, 2, 0, UNI_LO } /* lo */, - { 1, 358, 6548, 4, 4, UNI_WB__EB } /* ccc=atbl */, - { 0, 6647, 3097, 12, 2, UNI_JG__E } /* joininggroup=e */, - { 0, 3930, 801, 14, 3, UNI_NV__15_SLASH_2 } /* numericvalue=15/2 */, - { 1, 8861, 4574, 7, 16, UNI_SMALLFORMS } /* block=smallformvariants */, - { 2, 358, 1367, 5, 2, UNI_CCC__132 } /* ccc=132 */, - { 0, 2338, 627, 9, 2, UNI_IN__2 } /* presentin=2 */, - { 3, 7847, 7233, 21, 9, UNI_DT__NONCANON } /* decompositiontype=noncanonical */, - { 0, 8088, 1647, 16, 2, UNI_LOWERCASELETTER } /* generalcategory=ll */, - { 1, 6015, 0, 19, 0, UNI_JAMOEXTA } /* hanguljamoextendeda */, - { 18, 7090, 963, 20, 2, -UNI_CE } /* compositionexclusion=f */, - { 4, 6372, 808, 3, 7, UNI_OLCK } /* sc=olchiki */, - { 2, 4557, 5857, 17, 19, UNI_MERO } /* scriptextensions=meroitichieroglyphs */, - { 1, 4557, 808, 17, 7, UNI_OLCK } /* scriptextensions=olchiki */, - { 1, 306, 361, 2, 3, UNI_NV__12 } /* nv=12 */, - { 2, 1957, 3796, 8, 10, UNI_KANASUP } /* blk=kanasupplement */, - { 2, 1696, 1608, 4, 10, UNI_INOLDPERSIAN } /* blk=oldpersian */, - { 1, 969, 645, 6, 2, -UNI_COMPEX } /* compex=n */, - { 2, 1441, 1915, 3, 5, UNI_WB__EB } /* wb=ebase */, - { 0, 7697, 1367, 27, 2, UNI_CCC__32 } /* canonicalcombiningclass=ccc32 */, - { 0, 7233, 7589, 18, 10, UNI_CCC__L } /* canonicalcombiningclass=left */, - { 0, 2666, 1915, 3, 5, UNI_EBASE } /* lb=ebase */, - { 3, 1279, 6682, 4, 25, UNI_SHORTHANDFORMATCONTROLS } /* block=shorthandformatcontrols */, - { 1, 7585, 4970, 10, 10, UNI_BC__WS } /* bidiclass=whitespace */, - { 0, 2666, 38, 4, 1, UNI_LB__BK } /* lb=bk */, - { 0, 135, 2573, 2, 11, UNI_JOINC } /* isjoincontrol */, - { 0, 7420, 6891, 5, 21, UNI_MODIFIERLETTERS } /* blk=spacingmodifierletters */, - { 0, 323, 8879, 2, 21, UNI_MATHOPERATORS } /* inmathematicaloperators */, - { 1, 6507, 2815, 19, 4, UNI_BC__LRE } /* bc=lefttorightembedding */, - { 0, 4557, 506, 17, 4, UNI_TNSA } /* scriptextensions=tnsa */, - { 0, 8088, 4702, 15, 16, UNI_UPPERCASELETTER } /* generalcategory=uppercaseletter */, - { 1, 2504, 1549, 7, 4, UNI_MYANMAREXTA } /* myanmarexta */, - { 0, 1696, 3652, 4, 16, UNI_HALFANDFULLFORMS } /* blk=halfandfullforms */, - { 4, 3930, 1364, 14, 3, UNI_NV__1000 } /* numericvalue=1000 */, - { 0, 3086, 297, 12, 2, UNI_NT__NU } /* numerictype=nu */, - { 1, 7979, 4402, 23, 4, UNI_JG__MANICHAEANYODH } /* joininggroup=manichaeanyodh */, - { 15, 394, 3293, 3, 8, UNI_NO } /* othernumber */, - { 0, 1696, 2538, 4, 6, UNI_IPAEXT } /* blk=ipaext */, - { 0, 7979, 646, 22, 4, UNI_JG__MANICHAEANONE } /* joininggroup=manichaeanone */, - { 1, 8140, 4543, 28, 4, UNI_CJKEXTA } /* incjkunifiedideographsextensiona */, - { 1, 323, 6015, 2, 10, UNI_JAMO } /* inhanguljamo */, - { 1, 2612, 745, 3, 4, UNI_JG__SHIN } /* jg=shin */, - { 1, 4097, 5615, 9, 9, UNI_epres_values_index } /* emojipresentation= */, - { 1, 19, 645, 4, 3, -UNI_POSIXXDIGIT } /* ahex=no */, - { 0, 108, 631, 2, 2, UNI_JT__T } /* jt=t */, - { 6, 3106, 416, 4, 2, UNI_IN__4_DOT_1 } /* in=v41 */, - { 12, 2053, 1688, 3, 8, UNI_POSIXSPACE } /* isperlspace */, - { 0, 3274, 150, 15, 2, UNI_EA__NA } /* eastasianwidth=na */, - { 5, 5719, 373, 21, 2, UNI_CWL } /* changeswhenlowercased=y */, - { 0, 1298, 0, 7, 0, UNI_SOYO } /* soyombo */, - { 0, 6370, 3314, 14, 4, UNI_INSC__CONSONANTDEAD } /* insc=consonantdead */, - { 0, 968, 373, 5, 2, UNI_ECOMP } /* ecomp=y */, - { 0, 1696, 0, 7, 0, UNI_CJK } /* blk=cjk */, - { 0, 7061, 0, 25, 0, UNI_DI } /* defaultignorablecodepoint */, - { 1, 2394, 1435, 6, 6, UNI_INTHAANA } /* block=thaana */, - { 8, 6431, 218, 10, 2, UNI_LB__GL } /* linebreak=gl */, - { 0, 4557, 5148, 17, 14, UNI_ROHG } /* scriptextensions=hanifirohingya */, - { 1, 8095, 4801, 9, 16, UNI_PE } /* category=closepunctuation */, - { 4, 1446, 373, 8, 4, UNI_XIDS } /* xidstart=yes */, - { 2, 1126, 1579, 4, 10, UNI_KHAR } /* scx=kharoshthi */, - { 0, 3945, 1104, 14, 3, UNI_NV__5_SLASH_12 } /* numericvalue=5/12 */, - { 0, 1126, 43, 4, 4, UNI_BUHD } /* scx=buhd */, - { 1, 1696, 8660, 5, 34, UNI_DIACRITICALSFORSYMBOLS } /* blk=combiningdiacriticalmarksforsymbols */, - { 0, 2278, 0, 4, 0, UNI_NV__6 } /* nv=6 */, - { 3, 30, 1597, 1, 11, UNI_NAGM } /* isnagmundari */, - { 3, 404, 631, 6, 5, UNI_HYPHEN } /* hyphen=true */, - { 1, 1696, 4669, 4, 18, UNI_COPTICEPACTNUMBERS } /* blk=copticepactnumbers */, - { 8, 1874, 102, 7, 4, UNI_HMNG } /* script=hmng */, - { 1, 312, 645, 2, 2, -UNI_RI } /* ri=n */, - { 4, 430, 0, 4, 0, UNI_ARMN } /* armn */, - { 0, 1874, 3447, 7, 15, UNI_MERC } /* script=meroiticcursive */, - { 1, 2345, 2213, 3, 3, UNI_IN__3_DOT_1 } /* in=3.1 */, - { 2, 2666, 3873, 3, 13, UNI_LB__PR } /* lb=prefixnumeric */, - { 1, 1696, 5839, 5, 10, UNI_COUNTINGROD } /* blk=countingrod */, - { 12, 2394, 8761, 9, 23, UNI_CJKCOMPATIDEOGRAPHS } /* block=cjkcompatibilityideographs */, - { 0, 1775, 8396, 6, 29, UNI_ARABICMATH } /* arabicmathematicalalphabeticsymbols */, - { 4, 2799, 4793, 10, 9, UNI_ARABICEXTC } /* blk=arabicextendedc */, - { 1, 30, 7668, 1, 29, UNI_SUPPUAA } /* issupplementaryprivateuseareaa */, - { 6, 2909, 1061, 10, 4, UNI_ETHIOPICEXTB } /* isethiopicextb */, - { 0, 4557, 39, 17, 4, UNI_BHKS } /* scriptextensions=bhks */, - { 5, 2740, 373, 13, 2, UNI_PATSYN } /* patternsyntax=y */, - { 7, 7436, 302, 25, 2, UNI_CCC__130 } /* canonicalcombiningclass=130 */, - { 9, 1874, 510, 7, 4, UNI_VAI } /* script=vaii */, - { 16, 6372, 1417, 3, 4, UNI_PAUC } /* sc=pauc */, - { 6, 2405, 0, 13, 0, UNI_BLOCKELEMENTS } /* blockelements */, - { 0, 434, 288, 2, 1, UNI_di_values_index } /* di= */, - { 3, 4963, 2654, 16, 4, -UNI__PERL_PATWS } /* patternwhitespace=no */, - { 1, 135, 3643, 2, 9, UNI_Z } /* isseparator */, - { 5, 1474, 2223, 8, 2, UNI_WB__EB } /* ccc=ccc133 */, - { 3, 1236, 1061, 3, 4, UNI_CJKEXTB } /* cjkextb */, - { 1, 5069, 372, 16, 2, UNI_ebase_values_index } /* emojimodifierbase= */, - { 1, 553, 5549, 4, 4, UNI_NV__70000 } /* nv=70000 */, - { 10, 6431, 293, 10, 2, UNI_GCB__L } /* linebreak=jl */, - { 0, 1874, 1241, 7, 4, UNI_SC__GRAN } /* script=gran */, - { 17, 135, 585, 2, 6, UNI_TODR } /* istodhri */, - { 0, 2612, 2615, 3, 10, UNI_JG__AFRICANFEH } /* jg=africanfeh */, - { 1, 1021, 0, 6, 0, UNI_KTHI } /* kaithi */, - { 2, 30, 7765, 1, 18, UNI_ANCIENTGREEKMUSIC } /* isancientgreekmusic */, - { 0, 1874, 162, 7, 4, UNI_SC__OSGE } /* script=osge */, - { 7, 575, 3086, 3, 7, UNI_SB__NU } /* sb=numeric */, - { 0, 6372, 1435, 3, 6, UNI_SC__THAA } /* sc=thaana */, - { 3, 1696, 1284, 4, 7, UNI_INPHAGSPA } /* blk=phagspa */, - { 0, 1696, 2372, 4, 3, UNI_INIDC } /* blk=idc */, - { 0, 2899, 0, 10, 0, UNI_CYRL } /* iscyrillic */, - { 1, 1744, 3507, 4, 13, UNI_NARB } /* isoldnortharabian */, - { 0, 4377, 4394, 13, 4, UNI_JG__MANICHAEANQOPH } /* jg=manichaeanqoph */, - { 4, 3274, 2614, 14, 2, UNI_EA__A } /* eastasianwidth=a */, - { 0, 1696, 2473, 4, 8, UNI_INETHIOPIC } /* blk=ethiopic */, - { 0, 3587, 7463, 5, 10, UNI_ENCLOSEDCJK } /* blk=enclosedcjk */, - { 0, 2833, 6454, 3, 13, UNI_M } /* gc=combiningmark */, - { 4, 1874, 4594, 7, 11, UNI_SGNW } /* script=signwriting */, - { 2, 135, 1545, 2, 8, UNI_JAMOEXTA } /* isjamoexta */, - { 1, 8095, 2835, 8, 6, UNI_C } /* category=other */, - { 0, 3491, 1103, 13, 4, UNI_NV__1_SLASH_12 } /* numericvalue=1/12 */, - { 0, 135, 278, 2, 5, UNI_GARA } /* isgaray */, - { 16, 553, 1104, 4, 3, UNI_NV__7_SLASH_12 } /* nv=7/12 */, - { 0, 6372, 86, 3, 4, UNI_SC__GREK } /* sc=grek */, - { 8, 1993, 630, 11, 6, UNI_GRBASE } /* graphemebase=true */, - { 23, 1384, 0, 4, 0, UNI_PERM } /* perm */, - { 0, 1874, 2029, 7, 7, UNI_SC__SOGD } /* script=sogdian */, - { 2, 8088, 2553, 16, 11, UNI_CASEDLETTER } /* generalcategory=casedletter */, - { 1, 7086, 373, 24, 4, UNI_COMPEX } /* fullcompositionexclusion=yes */, - { 0, 1126, 529, 4, 4, UNI_KHOJ } /* scx=khoj */, - { 0, 1696, 7120, 4, 14, UNI_BYZANTINEMUSIC } /* blk=byzantinemusic */, - { 8, 4557, 1039, 17, 4, UNI_TELU } /* scriptextensions=telu */, - { 0, 4557, 3447, 17, 4, UNI_MERO } /* scriptextensions=mero */, - { 1, 1441, 1648, 3, 2, UNI_LB__LF } /* wb=lf */, - { 0, 3696, 0, 4, 0, UNI_IDSU } /* idsu */, - { 0, 135, 1408, 2, 4, UNI_PALM } /* ispalm */, - { 16, 6370, 5447, 5, 15, UNI_INSC__REGISTERSHIFTER } /* insc=registershifter */, - { 0, 3106, 302, 4, 2, UNI_IN__3 } /* in=v30 */, - { 1, 1499, 373, 3, 4, UNI_DEP } /* dep=yes */, - { 0, 30, 1222, 1, 5, UNI_BENG } /* isbeng */, - { 0, 316, 4572, 4, 2, UNI_patws_values_index } /* patws= */, - { 0, 1696, 1509, 4, 10, UNI_INDIVESAKURU } /* blk=divesakuru */, - { 0, 2833, 3186, 3, 5, UNI_XPOSIXDIGIT } /* gc=digit */, - { 9, 1097, 5549, 4, 7, UNI_NV__10000000 } /* nv=10000000 */, - { 1, 3587, 1549, 12, 4, UNI_ETHIOPICEXTA } /* blk=ethiopicexta */, - { 8, 275, 963, 3, 2, -UNI_CWT } /* cwt=f */, - { 0, 3491, 2203, 12, 10, UNI_NV__1_SLASH_4 } /* numericvalue=2.500e-01 */, - { 1, 5272, 1447, 6, 7, UNI__PERL_IDSTART } /* _perl_idstart */, - { 3, 3599, 618, 7, 6, UNI_INAVESTAN } /* block=avestan */, - { 0, 30, 1653, 1, 3, UNI_SO } /* isso */, - { 9, 3976, 1364, 14, 2, UNI_NV__800 } /* numericvalue=800 */, - { 0, 6277, 4770, 7, 15, UNI_MISCMATHSYMBOLSB } /* block=miscmathsymbolsb */, - { 0, 2833, 558, 3, 2, UNI_LO } /* gc=lo */, - { 1, 1230, 4068, 3, 16, UNI_INCAUCASIANALBANIAN } /* incaucasianalbanian */, - { 40, 1126, 753, 4, 7, UNI_KNDA } /* scx=kannada */, - { 6, 1874, 3447, 7, 4, UNI_SC__MERO } /* script=mero */, - { 4, 2371, 0, 4, 0, UNI_XIDC } /* xidc */, - { 0, 1781, 5273, 7, 4, UNI_XPOSIXSPACE } /* isspaceperl */, - { 17, 3824, 1176, 12, 3, UNI_JG__MALAYALAMBHA } /* jg=malayalambha */, - { 1, 6372, 774, 3, 7, UNI_SC__MAND } /* sc=mandaic */, - { 0, 2573, 373, 11, 2, UNI_JOINC } /* joincontrol=y */, - { 48, 323, 1904, 2, 11, UNI_INSYLOTINAGRI } /* insylotinagri */, - { 8, 1126, 102, 4, 4, UNI_HMNG } /* scx=hmng */, - { 14, 5585, 963, 19, 2, -UNI_TERM } /* terminalpunctuation=f */, - { 0, 135, 1305, 2, 4, UNI_SUNU } /* issunu */, - { 0, 1874, 1752, 7, 11, UNI_SC__GUKH } /* script=gurungkhema */, - { 0, 6647, 5188, 13, 4, UNI_JG__YUDH } /* joininggroup=yudh */, - { 1, 2122, 0, 12, 0, UNI_MEND } /* mendekikakui */, - { 0, 135, 822, 2, 4, UNI_HMNP } /* ishmnp */, - { 0, 3125, 963, 13, 6, -UNI_QMARK } /* quotationmark=false */, - { 5, 6250, 1061, 14, 4, UNI_ETHIOPICEXTB } /* block=ethiopicextb */, - { 11, 1848, 373, 5, 2, UNI_NFCQC__Y } /* nfcqc=y */, - { 5, 2394, 3652, 6, 16, UNI_HALFANDFULLFORMS } /* block=halfandfullforms */, - { 0, 2666, 566, 3, 2, UNI_LB__SY } /* lb=sy */, - { 3, 2394, 2122, 6, 12, UNI_INMENDEKIKAKUI } /* block=mendekikakui */, - { 0, 983, 0, 8, 0, UNI_EXT } /* extender */, - { 0, 306, 800, 3, 2, UNI_NV__45 } /* nv=45 */, - { 2, 3099, 615, 11, 2, UNI_IN__5_DOT_2 } /* presentin=v52 */, - { 13, 1097, 2177, 4, 8, UNI_NV__1_SLASH_64 } /* nv=1.563e-02 */, - { 1, 135, 1509, 2, 10, UNI_DIAK } /* isdivesakuru */, - { 0, 4557, 1528, 17, 8, UNI_BUGI } /* scriptextensions=buginese */, - { 10, 4557, 1015, 17, 6, UNI_HATR } /* scriptextensions=hatran */, - { 12, 6072, 5990, 5, 7, UNI_SUPARROWSB } /* issuparrowsb */, - { 12, 1126, 1664, 4, 10, UNI_WARA } /* scx=warangciti */, - { 4, 4557, 205, 17, 4, UNI_TAML } /* scriptextensions=taml */, - { 3, 135, 4414, 2, 17, UNI_KITS } /* iskhitansmallscript */, - { 1, 1696, 4280, 4, 11, UNI_INPUNCTUATION } /* blk=punctuation */, - { 0, 2666, 4801, 3, 16, UNI_LB__CL } /* lb=closepunctuation */, - { 0, 43, 0, 4, 0, UNI_BUHD } /* buhd */, - { 61, 6370, 2530, 5, 8, UNI_INSC__TONEMARK } /* insc=tonemark */, - { 0, 2799, 2382, 5, 12, UNI_AEGEANNUMBERS } /* blk=aegeannumbers */, - { 33, 135, 4261, 2, 8, UNI_VEDICEXT } /* isvedicext */, - { 3, 2593, 5352, 6, 12, UNI_PO } /* isotherpunctuation */, - { 1, 2666, 295, 3, 2, UNI_LB__XX } /* lb=xx */, - { 2, 4557, 1372, 17, 9, UNI_ITAL } /* scriptextensions=olditalic */, - { 0, 4557, 4379, 16, 5, UNI_MANI } /* scriptextensions=mani */, - { 0, 1773, 4793, 8, 9, UNI_ARABICEXTC } /* isarabicextendedc */, - { 0, 5930, 373, 4, 2, UNI_EMOD } /* emod=y */, - { 0, 8095, 1938, 9, 7, UNI_XPOSIXCNTRL } /* category=control */, - { 4, 8468, 4237, 24, 12, UNI_INPC__LEFTANDRIGHT } /* indicpositionalcategory=leftandright */, - { 0, 2394, 2878, 6, 5, UNI_INKHMER } /* block=khmer */, - { 1, 6372, 3505, 3, 15, UNI_NARB } /* sc=oldnortharabian */, - { 4, 4557, 1291, 17, 4, UNI_SIDD } /* scriptextensions=sidd */, - { 9, 3125, 963, 13, 2, -UNI_QMARK } /* quotationmark=f */, - { 1, 135, 4785, 2, 4, UNI_BOPO } /* isbopo */, - { 32, 3106, 304, 5, 2, UNI_IN__14 } /* in=v140 */, - { 1, 358, 419, 4, 2, UNI_CCC__16 } /* ccc=16 */, - { 0, 2575, 6797, 4, 20, UNI_INDICNUMBERFORMS } /* incommonindicnumberforms */, - { 2, 102, 0, 4, 0, UNI_HMNG } /* hmng */, - { 0, 2666, 2684, 3, 10, UNI_LB__WJ } /* lb=wordjoiner */, - { 1, 3491, 2732, 14, 8, UNI_NV__2_SLASH_5 } /* numericvalue=4.000e-01 */, - { 5, 135, 5, 2, 3, UNI_MCM } /* ismcm */, - { 0, 1696, 617, 4, 7, UNI_INAVESTAN } /* blk=avestan */, - { 0, 135, 162, 2, 4, UNI_OSGE } /* isosge */, - { 14, 4173, 645, 17, 3, -UNI_IDSB } /* idsbinaryoperator=no */, - { 0, 135, 808, 2, 7, UNI_OLCK } /* isolchiki */, - { 10, 2394, 4291, 6, 15, UNI_DIACRITICALSEXT } /* block=diacriticalsext */, - { 2, 643, 7233, 3, 9, UNI_DT__CAN } /* dt=canonical */, - { 8, 2799, 4664, 8, 6, UNI_ARABICEXTC } /* blk=arabicextc */, - { 0, 1236, 1977, 3, 7, UNI_CJKSYMBOLS } /* cjksymbols */, - { 3, 358, 0, 4, 0, UNI_ccc_values_index } /* ccc= */, - { 1, 1874, 704, 7, 5, UNI_SC__DOGR } /* script=dogra */, - { 3, 7847, 0, 18, 0, UNI_dt_values_index } /* decompositiontype= */, - { 0, 1126, 393, 4, 4, UNI_GOTH } /* scx=goth */, - { 1, 5740, 631, 21, 2, UNI_CWT } /* changeswhentitlecased=t */, - { 4, 7868, 150, 19, 2, UNI_HST__NA } /* hangulsyllabletype=na */, - { 16, 1696, 3712, 7, 6, UNI_CJKCOMPAT } /* blk=cjkcompat */, - { 0, 675, 372, 5, 5, UNI_GRBASE } /* grbase=yes */, - { 1, 2899, 6025, 10, 9, UNI_CYRILLICEXTA } /* iscyrillicextendeda */, - { 5, 6372, 694, 3, 5, UNI_SC__ADLM } /* sc=adlam */, - { 1, 5260, 65, 10, 2, UNI_WB__MN } /* wordbreak=mn */, - { 0, 4557, 579, 17, 6, UNI_TNSA } /* scriptextensions=tangsa */, - { 51, 6431, 404, 10, 2, UNI_LB__HY } /* linebreak=hy */, - { 0, 4635, 636, 16, 2, UNI_LATINEXTE } /* blk=latinextendede */, - { 8, 1773, 1763, 8, 3, UNI_ARABICPFB } /* isarabicpfb */, - { 6, 6372, 1482, 3, 10, UNI_CHRS } /* sc=chorasmian */, - { 1, 135, 2759, 2, 13, UNI_VERTICALFORMS } /* isverticalforms */, - { 0, 3824, 571, 12, 2, UNI_JG__MALAYALAMJA } /* jg=malayalamja */, - { 3, 4557, 245, 17, 2, UNI_YI } /* scriptextensions=yi */, - { 0, 2819, 373, 5, 4, UNI_EMOJI } /* emoji=yes */, - { 3, 916, 6482, 4, 3, UNI_AGE__5_DOT_1 } /* age=5.1 */, - { 15, 7233, 1956, 24, 2, UNI_CCC__DB } /* canonicalcombiningclass=db */, - { 1, 1257, 4644, 6, 9, UNI_KANAEXTB } /* inkanaextendedb */, - { 0, 6372, 478, 3, 4, UNI_PHLI } /* sc=phli */, - { 1, 4963, 962, 16, 7, -UNI__PERL_PATWS } /* patternwhitespace=false */, - { 0, 8145, 631, 16, 5, UNI_UIDEO } /* unifiedideograph=true */, - { 0, 1441, 1649, 3, 2, UNI_WB__FO } /* wb=fo */, - { 5, 2394, 6290, 6, 13, UNI_MATHOPERATORS } /* block=mathoperators */, - { 2, 2338, 150, 10, 2, UNI_IN__NA } /* presentin=na */, - { 9, 1874, 876, 7, 7, UNI_SC__TGLG } /* script=tagalog */, - { 0, 6370, 7165, 14, 11, UNI_INSC__CONSONANTPLACEHOLDER } /* insc=consonantplaceholder */, - { 0, 323, 7766, 2, 17, UNI_ANCIENTGREEKMUSIC } /* inancientgreekmusic */, - { 0, 1696, 5014, 4, 8, UNI_BAMUMSUP } /* blk=bamumsup */, - { 16, 3734, 81, 9, 2, UNI_LATINEXTG } /* inlatinextg */, - { 2, 4718, 645, 18, 3, -UNI_IDST } /* idstrinaryoperator=no */, - { 3, 1874, 1284, 7, 4, UNI_SC__PHAG } /* script=phag */, - { 0, 6277, 4644, 13, 9, UNI_MYANMAREXTB } /* block=myanmarextendedb */, - { 3, 1696, 6707, 4, 13, UNI_ZNAMENNYMUSIC } /* blk=znamennymusic */, - { 4, 983, 645, 8, 3, -UNI_EXT } /* extender=no */, - { 1, 15, 4002, 2, 3, UNI_AGE__9 } /* age=9 */, - { 0, 135, 494, 2, 4, UNI_ROHG } /* isrohg */, - { 1, 6372, 434, 3, 4, UNI_DIAK } /* sc=diak */, - { 2, 1126, 1284, 4, 4, UNI_PHAG } /* scx=phag */, - { 0, 135, 2405, 2, 13, UNI_BLOCKELEMENTS } /* isblockelements */, - { 0, 3930, 304, 15, 1, UNI_NV__1_SLASH_4 } /* numericvalue=1/4 */, - { 2, 2394, 1549, 9, 4, UNI_CJKEXTA } /* block=cjkexta */, - { 0, 4377, 3843, 13, 3, UNI_JG__MANICHAEANTAW } /* jg=manichaeantaw */, - { 0, 3106, 1364, 5, 2, UNI_IN__10 } /* in=v100 */, - { 5, 579, 0, 4, 0, UNI_TANG } /* tang */, - { 0, 2394, 1165, 6, 8, UNI_INVITHKUQI } /* block=vithkuqi */, - { 0, 135, 4291, 2, 15, UNI_DIACRITICALSEXT } /* isdiacriticalsext */, - { 1, 1874, 579, 7, 4, UNI_SC__TANG } /* script=tang */, - { 13, 135, 1259, 2, 4, UNI_KANA } /* iskana */, - { 0, 71, 645, 3, 3, -UNI_CWU } /* cwu=no */, - { 0, 4557, 529, 17, 4, UNI_KHOJ } /* scriptextensions=khoj */, - { 16, 4557, 78, 17, 4, UNI_DSRT } /* scriptextensions=dsrt */, - { 14, 135, 1075, 2, 8, UNI_KRAI } /* iskiratrai */, - { 28, 135, 6996, 2, 11, UNI_MTEI } /* ismeeteimayek */, - { 2, 135, 1315, 2, 7, UNI_TIRH } /* istirhuta */, - { 1, 1417, 0, 9, 0, UNI_PAUC } /* paucinhau */, - { 0, 2504, 4644, 7, 9, UNI_MYANMAREXTB } /* myanmarextendedb */, - { 2, 4557, 4754, 17, 7, UNI_LINB } /* scriptextensions=linearb */, - { 0, 3491, 596, 13, 2, UNI_NV__13 } /* numericvalue=13 */, - { 0, 1696, 2314, 4, 12, UNI_PHAISTOS } /* blk=phaistosdisc */, - { 13, 1945, 963, 5, 2, -UNI_BIDIM } /* bidim=f */, - { 1, 135, 2696, 2, 9, UNI__PERL_SURROGATE } /* issurrogate */, - { 1, 5059, 3796, 10, 10, UNI_KANASUP } /* block=kanasupplement */, - { 0, 30, 4339, 1, 12, UNI_INPUNCTUATION } /* inpunctuation */, - { 10, 1126, 930, 4, 8, UNI_ARMN } /* scx=armenian */, - { 0, 5148, 0, 4, 0, UNI_HAN } /* hani */, - { 0, 4524, 304, 15, 1, UNI_NV__3_SLASH_4 } /* numericvalue=3/4 */, - { 4, 1874, 822, 7, 4, UNI_HMNP } /* script=hmnp */, - { 17, 558, 372, 2, 2, UNI_loe_values_index } /* loe= */, - { 0, 4703, 0, 15, 0, UNI_UPPERCASELETTER } /* uppercaseletter */, - { 0, 1230, 5839, 3, 10, UNI_COUNTINGROD } /* incountingrod */, - { 0, 2799, 5086, 5, 16, UNI_ALCHEMICAL } /* blk=alchemicalsymbols */, - { 16, 1696, 1007, 4, 8, UNI_INHIRAGANA } /* blk=hiragana */, - { 6, 135, 897, 2, 7, UNI_TIBT } /* istibetan */, - { 20, 1474, 596, 7, 2, UNI_CCC__13 } /* ccc=ccc13 */, - { 11, 1435, 0, 4, 0, UNI_THAA } /* thaa */, - { 0, 2833, 283, 3, 2, UNI_ZP } /* gc=zp */, - { 9, 668, 631, 7, 2, UNI_EXTPICT } /* extpict=t */, - { 0, 2785, 4945, 3, 18, UNI_BC__B } /* bc=paragraphseparator */, - { 0, 135, 753, 2, 7, UNI_KNDA } /* iskannada */, - { 0, 336, 0, 5, 0, UNI_TAKR } /* takri */, - { 0, 7868, 3315, 20, 10, UNI_GCB__L } /* hangulsyllabletype=leadingjamo */, - { 8, 2593, 3293, 5, 8, UNI_NO } /* isothernumber */, - { 2, 1459, 1061, 5, 4, UNI_LATINEXTB } /* latinextb */, - { 10, 1126, 709, 4, 4, UNI_LIMB } /* scx=limb */, - { 0, 546, 3959, 4, 2, UNI_NV__3_SLASH_8 } /* nv=3/8 */, - { 0, 323, 3750, 2, 11, UNI_PHONETICEXT } /* inphoneticext */, - { 0, 323, 7682, 2, 14, UNI_PUA } /* inprivateusearea */, - { 0, 4097, 631, 17, 2, UNI_EPRES } /* emojipresentation=t */, - { 15, 2394, 3668, 6, 16, UNI_HIGHPUSURROGATES } /* block=highpusurrogates */, - { 0, 1206, 150, 3, 2, UNI_EA__NA } /* ea=na */, - { 0, 2666, 218, 3, 2, UNI_LB__GL } /* lb=gl */, - { 7, 2612, 1070, 3, 5, UNI_JG__KHAPH } /* jg=khaph */, - { 1, 2372, 631, 3, 2, UNI_IDC } /* idc=t */, - { 0, 6431, 958, 10, 2, UNI_LB__OP } /* linebreak=op */, - { 0, 1874, 830, 7, 4, UNI_LANA } /* script=lana */, - { 1, 1446, 373, 8, 2, UNI_XIDS } /* xidstart=y */, - { 0, 3325, 0, 15, 0, UNI_ARMI } /* imperialaramaic */, - { 1, 6372, 838, 3, 4, UNI_SARB } /* sc=sarb */, - { 0, 8792, 636, 3, 2, UNI_XPOSIXDIGIT } /* nt=de */, - { 3, 1993, 2654, 11, 4, -UNI_GRBASE } /* graphemebase=no */, - { 1, 1874, 4067, 7, 17, UNI_SC__AGHB } /* script=caucasianalbanian */, - { 0, 1696, 7766, 4, 27, UNI_ANCIENTGREEKMUSIC } /* blk=ancientgreekmusicalnotation */, - { 1, 2394, 5827, 6, 5, UNI_INGREEK } /* block=greek */, - { 17, 2394, 8364, 6, 32, UNI_IDEOGRAPHICSYMBOLS } /* block=ideographicsymbolsandpunctuation */, - { 1, 5059, 6025, 10, 9, UNI_KANAEXTA } /* block=kanaextendeda */, - { 4, 6372, 4785, 3, 8, UNI_SC__BOPO } /* sc=bopomofo */, - { 0, 4557, 4067, 17, 17, UNI_AGHB } /* scriptextensions=caucasianalbanian */, - { 0, 2909, 6400, 8, 12, UNI_ETHIOPICSUP } /* isethiopicsupplement */, - { 0, 285, 3809, 4, 11, UNI_GCB__SM } /* gcb=spacingmark */, - { 3, 770, 2614, 2, 2, UNI_EA__A } /* ea=a */, - { 2, 1696, 3764, 4, 14, UNI_DEVANAGARIEXTA } /* blk=devanagariexta */, - { 2, 8609, 0, 11, 0, UNI_CO } /* category=co */, - { 0, 2201, 5549, 4, 7, UNI_NV__20000000 } /* nv=20000000 */, - { 6, 323, 6707, 2, 13, UNI_ZNAMENNYMUSIC } /* inznamennymusic */, - { 6, 6372, 43, 3, 4, UNI_SC__BUHD } /* sc=buhd */, - { 1, 4524, 2222, 14, 8, UNI_NV__1_SLASH_3 } /* numericvalue=3.333e-01 */, - { 0, 1230, 8225, 3, 15, UNI_CUNEIFORMNUMBERS } /* incuneiformnumbers */, - { 0, 1696, 1057, 4, 4, UNI_JAMO } /* blk=jamo */, - { 1, 2785, 8009, 3, 21, UNI_BC__PDI } /* bc=popdirectionalisolate */, - { 1, 1696, 5044, 4, 8, UNI_TAMILSUP } /* blk=tamilsup */, - { 0, 2819, 373, 5, 2, UNI_EMOJI } /* emoji=y */, - { 17, 1696, 5501, 5, 17, UNI_CHEROKEESUP } /* blk=cherokeesupplement */, - { 18, 5677, 0, 21, 0, UNI_CWCF } /* changeswhencasefolded */, - { 0, 2099, 0, 12, 0, UNI_GONM } /* masaramgondi */, - { 0, 1234, 6577, 5, 13, UNI_CJKCOMPAT } /* incjkcompatibility */, - { 0, 2394, 1007, 6, 8, UNI_INHIRAGANA } /* block=hiragana */, - { 9, 5383, 0, 18, 0, UNI_HALFMARKS } /* combininghalfmarks */, - { 0, 4557, 930, 17, 8, UNI_ARMN } /* scriptextensions=armenian */, - { 0, 306, 7256, 2, 3, UNI_NV__27 } /* nv=27 */, - { 1, 5782, 4637, 19, 3, UNI_GCB__L } /* graphemeclusterbreak=l */, - { 0, 4557, 1033, 17, 4, UNI_LYCI } /* scriptextensions=lyci */, - { 1, 1696, 704, 4, 5, UNI_INDOGRA } /* blk=dogra */, - { 6, 1696, 3712, 7, 11, UNI_CJKCOMPATFORMS } /* blk=cjkcompatforms */, - { 10, 323, 3764, 2, 13, UNI_DEVANAGARIEXT } /* indevanagariext */, - { 4, 2612, 7991, 2, 18, UNI_JG__MANICHAEANTHAMEDH } /* jg=manichaeanthamedh */, - { 20, 446, 0, 4, 0, UNI_KHMR } /* khmr */, - { 0, 575, 320, 3, 2, UNI_SB__SP } /* sb=sp */, - { 1, 2238, 2161, 4, 8, UNI_NV__9_SLASH_2 } /* nv=4.500e+00 */, - { 9, 6670, 2999, 13, 3, UNI_SB__LE } /* sentencebreak=le */, - { 4, 8861, 873, 10, 3, UNI_SUPPUAA } /* block=suppuaa */, - { 3, 1874, 1165, 7, 8, UNI_VITH } /* script=vithkuqi */, - { 0, 2, 2654, 1, 4, -UNI_CE } /* ce=no */, - { 16, 6372, 3764, 3, 10, UNI_SC__DEVA } /* sc=devanagari */, - { 0, 1126, 1051, 4, 4, UNI_YEZI } /* scx=yezi */, - { 25, 2564, 6040, 7, 6, UNI_GEORGIANSUP } /* isgeorgiansup */, - { 18, 135, 31, 2, 4, UNI_AVST } /* isavst */, - { 5, 1130, 0, 4, 0, UNI_TALU } /* talu */, - { 0, 7233, 5668, 24, 9, UNI_CCC__BL } /* canonicalcombiningclass=belowleft */, - { 0, 1441, 133, 3, 2, UNI_WB__NL } /* wb=nl */, - { 0, 916, 2134, 5, 3, UNI_AGE__11 } /* age=11.0 */, - { 2, 306, 1363, 3, 3, UNI_NV__600 } /* nv=600 */, - { 0, 5260, 543, 10, 2, UNI_WB__DQ } /* wordbreak=dq */, - { 1, 5260, 591, 10, 3, UNI_WB__EB } /* wordbreak=ebg */, - { 1, 358, 365, 5, 2, UNI_CCC__118 } /* ccc=118 */, - { 14, 323, 311, 2, 5, UNI_INORIYA } /* inoriya */, - { 1, 4504, 630, 5, 3, UNI_XPOSIXSPACE } /* wspace=t */, - { 1, 975, 0, 4, 0, UNI_DUPL } /* dupl */, - { 22, 1696, 1277, 4, 7, UNI_NB } /* blk=noblock */, - { 1, 1441, 735, 3, 2, UNI_WB__EB } /* wb=em */, - { 0, 285, 295, 4, 2, UNI_GCB__XX } /* gcb=xx */, - { 1, 135, 4261, 2, 15, UNI_VEDICEXT } /* isvedicextensions */, - { 0, 7697, 628, 28, 2, UNI_CCC__122 } /* canonicalcombiningclass=ccc122 */, - { 0, 1696, 7017, 4, 19, UNI_DEVANAGARIEXTA } /* blk=devanagariextendeda */, - { 2, 1474, 628, 7, 2, UNI_CCC__22 } /* ccc=ccc22 */, - { 1, 135, 510, 2, 4, UNI_VAI } /* isvaii */, - { 1, 4540, 4701, 16, 2, UNI_ri_values_index } /* regionalindicator= */, - { 58892, 135, 4173, 2, 4, UNI_IDSB } /* isidsb */, - { 0, 2317, 5483, 3, 17, UNI_TAIXUANJING } /* istaixuanjingsymbols */, - { 5, 4557, 1482, 17, 10, UNI_CHRS } /* scriptextensions=chorasmian */, - { 3, 323, 6996, 2, 11, UNI_INMEETEIMAYEK } /* inmeeteimayek */, - { 0, 135, 1245, 2, 4, UNI_THAI } /* isthai */, - { 0, 1523, 372, 4, 3, UNI_XPOSIXSPACE } /* space=y */, - { 0, 323, 8693, 2, 25, UNI_SYMBOLSFORLEGACYCOMPUTING } /* insymbolsforlegacycomputing */, - { 1, 3930, 1368, 15, 2, UNI_NV__1_SLASH_20 } /* numericvalue=1/20 */, - { 14, 6372, 724, 3, 5, UNI_SC__RUNR } /* sc=runic */, - { 4, 4557, 278, 17, 4, UNI_GARA } /* scriptextensions=gara */, - { 3, 546, 366, 4, 1, UNI_NV__38 } /* nv=38 */, - { 3, 2278, 2162, 5, 7, UNI_NV__13_SLASH_2 } /* nv=6.500e+00 */, - { 1, 1126, 4594, 4, 11, UNI_SGNW } /* scx=signwriting */, - { 1, 859, 373, 4, 2, UNI_DASH } /* dash=y */, - { 10, 8596, 5907, 22, 16, UNI_LB__VF } /* indicsyllabiccategory=reorderingkiller */, - { 5, 1874, 209, 7, 4, UNI_TAVT } /* script=tavt */, - { 6, 462, 0, 4, 0, UNI_OGAM } /* ogam */, - { 5, 3183, 963, 8, 6, -UNI_XPOSIXXDIGIT } /* hexdigit=false */, - { 0, 7697, 920, 27, 2, UNI_CCC__10 } /* canonicalcombiningclass=ccc10 */, - { 0, 4557, 4379, 16, 11, UNI_MANI } /* scriptextensions=manichaean */, - { 0, 2785, 3590, 2, 3, UNI_BC__ET } /* bc=et */, - { 0, 3106, 2171, 4, 2, UNI_IN__6_DOT_2 } /* in=v62 */, - { 1, 4557, 1027, 17, 4, UNI_LEPC } /* scriptextensions=lepc */, - { 4, 3778, 213, 9, 2, UNI_LATINEXTF } /* islatinextf */, - { 8, 1810, 631, 11, 5, UNI_KEHNOMIRROR } /* kehnomirror=true */, - { 0, 1051, 0, 4, 0, UNI_YEZI } /* yezi */, - { 1, 502, 0, 2, 0, UNI_SO } /* so */, - { 2, 1696, 1223, 4, 7, UNI_INBENGALI } /* blk=bengali */, - { 0, 2394, 1509, 6, 10, UNI_INDIVESAKURU } /* block=divesakuru */, - { 25, 719, 0, 5, 0, UNI_OSGE } /* osage */, - { 4, 7697, 803, 27, 2, UNI_CCC__21 } /* canonicalcombiningclass=ccc21 */, - { 0, 86, 0, 4, 0, UNI_GREK } /* grek */, - { 3, 135, 2481, 2, 8, UNI_KANA } /* iskatakana */, - { 0, 7307, 0, 26, 0, UNI_ARABICPFB } /* inarabicpresentationformsb */, - { 0, 6372, 229, 3, 4, UNI_SC__TUTG } /* sc=tutg */, - { 2, 1126, 661, 4, 4, UNI_ELYM } /* scx=elym */, - { 0, 1126, 1315, 4, 7, UNI_TIRH } /* scx=tirhuta */, - { 0, 1696, 7951, 4, 18, UNI_INVS } /* blk=variationselectors */, - { 36, 7420, 855, 5, 6, UNI_SC__SHRD } /* blk=sharada */, - { 1, 2853, 0, 14, 0, UNI_HIGHSURROGATES } /* highsurrogates */, - { 9, 4635, 4832, 8, 12, UNI_LATIN1 } /* blk=latin1supplement */, - { 0, 1696, 55, 4, 4, UNI_INCHAM } /* blk=cham */, - { 1, 5260, 2835, 9, 6, UNI_WB__XX } /* wordbreak=other */, - { 1, 563, 645, 6, 2, -UNI_PATSYN } /* patsyn=n */, - { 0, 2899, 1703, 10, 4, UNI_CYRILLICEXTD } /* iscyrillicextd */, - { 0, 2290, 2222, 4, 8, UNI_NV__5_SLASH_6 } /* nv=8.333e-01 */, - { 0, 8861, 5990, 9, 7, UNI_SUPARROWSB } /* block=suparrowsb */, - { 0, 1498, 631, 2, 5, UNI_SD } /* sd=true */, - { 15, 4377, 4369, 13, 4, UNI_JG__MANICHAEANFIVE } /* jg=manichaeanfive */, - { 0, 6188, 0, 21, 0, UNI_YIJING } /* yijinghexagramsymbols */, - { 1, 3491, 794, 13, 4, UNI_NV___MINUS_1_SLASH_2 } /* numericvalue=-1/2 */, - { 2, 1696, 6577, 7, 13, UNI_CJKCOMPAT } /* blk=cjkcompatibility */, - { 1, 6431, 7793, 10, 26, UNI_LB__CJ } /* linebreak=conditionaljapanesestarter */, - { 2, 2666, 2095, 3, 2, UNI_LB__H3 } /* lb=h3 */, - { 0, 643, 3712, 3, 6, UNI_DT__COM } /* dt=compat */, - { 0, 306, 367, 3, 2, UNI_NV__49 } /* nv=49 */, - { 0, 1775, 1549, 6, 4, UNI_ARABICEXTA } /* arabicexta */, - { 0, 323, 7208, 2, 25, UNI_SUPERANDSUB } /* insuperscriptsandsubscripts */, - { 0, 6250, 5997, 7, 18, UNI_ENCLOSEDALPHANUMSUP } /* block=enclosedalphanumsup */, - { 1, 7090, 645, 20, 3, -UNI_CE } /* compositionexclusion=no */, - { 2, 2473, 1061, 8, 4, UNI_ETHIOPICEXTB } /* ethiopicextb */, - { 0, 1696, 4205, 4, 15, UNI_CURRENCYSYMBOLS } /* blk=currencysymbols */, - { 0, 1126, 815, 4, 7, UNI_OSMA } /* scx=osmanya */, - { 0, 1441, 3557, 3, 3, UNI_LB__ZWJ } /* wb=zwj */, - { 3, 7307, 964, 9, 2, UNI_ARABICPFA } /* inarabicpfa */, - { 1, 4703, 630, 8, 6, UNI_XPOSIXUPPER } /* uppercase=true */, - { 1, 3491, 805, 13, 3, UNI_NV__7_SLASH_2 } /* numericvalue=7/2 */, - { 4, 323, 2919, 2, 12, UNI_MAHJONG } /* inmahjongtiles */, - { 16, 1696, 946, 4, 8, UNI_INBASSAVAH } /* blk=bassavah */, - { 1, 6670, 3086, 14, 7, UNI_SB__NU } /* sentencebreak=numeric */, - { 6, 323, 1598, 2, 10, UNI_INNAGMUNDARI } /* innagmundari */, - { 2, 1696, 4754, 4, 16, UNI_LINEARBSYLLABARY } /* blk=linearbsyllabary */, - { 0, 1126, 6146, 4, 7, UNI_SINH } /* scx=sinhala */, - { 1, 1874, 2847, 7, 4, UNI_SC__COPT } /* script=copt */, - { 1, 135, 7923, 2, 4, UNI_EGYP } /* isegyp */, - { 1, 135, 909, 2, 7, UNI_ZZZZ } /* isunknown */, - { 23, 2819, 288, 5, 1, UNI_emoji_values_index } /* emoji= */, - { 0, 20, 1128, 2, 3, UNI_XPOSIXXDIGIT } /* hex=t */, - { 1, 7233, 5660, 24, 13, UNI_CCC__202 } /* canonicalcombiningclass=attachedbelow */, - { 11, 108, 2999, 2, 12, UNI_JT__L } /* jt=leftjoining */, - { 53132, 135, 1885, 2, 11, UNI_SORA } /* issorasompeng */, - { 41, 4540, 373, 17, 4, UNI_RI } /* regionalindicator=yes */, - { 8, 1874, 782, 8, 6, UNI_MARC } /* script=marchen */, - { 0, 323, 1482, 2, 10, UNI_INCHORASMIAN } /* inchorasmian */, - { 0, 323, 6074, 2, 19, UNI_SUPARROWSC } /* insupplementalarrowsc */, - { 0, 1322, 213, 7, 2, UNI_CJKEXTF } /* iscjkextf */, - { 57, 8088, 1522, 16, 2, UNI_ZS } /* generalcategory=zs */, - { 2, 2394, 579, 6, 6, UNI_INTANGSA } /* block=tangsa */, - { 2, 135, 138, 2, 2, UNI_ME } /* isme */, - { 1, 1874, 450, 7, 4, UNI_SC__LINA } /* script=lina */, - { 3, 2553, 631, 5, 5, UNI_CASED } /* cased=true */, - { 0, 2502, 4666, 9, 4, UNI_MYANMAREXTC } /* inmyanmarextc */, - { 0, 4557, 1045, 17, 6, UNI_WCHO } /* scriptextensions=wancho */, - { 0, 7847, 1208, 17, 4, UNI_DT__NAR } /* decompositiontype=nar */, - { 0, 2394, 7766, 6, 27, UNI_ANCIENTGREEKMUSIC } /* block=ancientgreekmusicalnotation */, - { 4, 3668, 0, 16, 0, UNI_HIGHPUSURROGATES } /* highpusurrogates */, - { 9, 3930, 2185, 14, 8, UNI_NV__1_SLASH_6 } /* numericvalue=1.667e-01 */, - { 3, 323, 4115, 2, 4, UNI_INMODI } /* inmodi */, - { 1, 8088, 106, 16, 1, UNI_Z } /* generalcategory=z */, - { 1, 327, 0, 4, 0, UNI_M } /* mark */, - { 4, 4557, 55, 17, 4, UNI_CHAM } /* scriptextensions=cham */, - { 3, 2394, 2405, 6, 13, UNI_BLOCKELEMENTS } /* block=blockelements */, - { 0, 8861, 855, 7, 6, UNI_SC__SHRD } /* block=sharada */, - { 8, 2338, 2240, 9, 4, UNI_IN__4_DOT_1 } /* presentin=4.1 */, - { 2, 1781, 1134, 3, 7, UNI_SPECIALS } /* isspecials */, - { 8, 7233, 2280, 23, 2, UNI_CCC__6 } /* canonicalcombiningclass=6 */, - { 0, 2238, 2732, 4, 8, UNI_NV__2_SLASH_5 } /* nv=4.000e-01 */, - { 2, 108, 2655, 2, 11, UNI_JT__U } /* jt=nonjoining */, - { 0, 2584, 0, 3, 0, UNI_M } /* ism */, - { 0, 197, 0, 4, 0, UNI_SGNW } /* sgnw */, - { 0, 323, 8693, 2, 28, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* insymbolsforlegacycomputingsup */, - { 1, 1126, 6146, 4, 4, UNI_SINH } /* scx=sinh */, - { 13, 5, 2492, 1, 10, UNI_MISCSYMBOLS } /* miscsymbols */, - { 0, 624, 419, 5, 2, UNI_CCC__216 } /* ccc=216 */, - { 0, 2201, 1364, 4, 3, UNI_NV__2000 } /* nv=2000 */, - { 8, 2601, 4321, 6, 5, UNI_XPOSIXLOWER } /* xposixlower */, - { 10, 4557, 938, 17, 4, UNI_BALI } /* scriptextensions=bali */, - { 4, 6372, 2847, 3, 6, UNI_SC__COPT } /* sc=coptic */, - { 0, 1773, 7740, 3, 26, UNI_ALPHABETICPF } /* isalphabeticpresentationforms */, - { 0, 2201, 2260, 6, 6, UNI_NV__1_SLASH_40 } /* nv=2.500e-02 */, - { 0, 7420, 5518, 5, 11, UNI_SMALLKANAEXT } /* blk=smallkanaext */, - { 1, 4524, 1368, 15, 2, UNI_NV__3_SLASH_20 } /* numericvalue=3/20 */, - { 7, 7420, 1134, 5, 7, UNI_SPECIALS } /* blk=specials */, - { 0, 283, 0, 2, 0, UNI_ZP } /* zp */, - { 0, 6372, 2099, 3, 12, UNI_SC__GONM } /* sc=masaramgondi */, - { 1, 306, 417, 3, 2, UNI_NV__15 } /* nv=15 */, - { 1, 306, 5549, 4, 5, UNI_NV__900000 } /* nv=900000 */, - { 17, 6370, 3062, 5, 6, UNI_INSC__VIRAMA } /* insc=virama */, - { 3, 4557, 897, 17, 7, UNI_TIBT } /* scriptextensions=tibetan */, - { 0, 6370, 139, 20, 2, UNI_INSC__CONSONANTPREFIXED } /* insc=consonantprefixed */, - { 0, 3505, 0, 15, 0, UNI_NARB } /* oldnortharabian */, - { 23, 4156, 373, 17, 4, UNI_IDCOMPATMATHSTART } /* idcompatmathstart=yes */, - { 1, 1874, 5827, 7, 5, UNI_SC__GREK } /* script=greek */, - { 0, 4635, 1061, 9, 4, UNI_LATINEXTB } /* blk=latinextb */, - { 16, 323, 2878, 2, 12, UNI_KHMERSYMBOLS } /* inkhmersymbols */, - { 5, 6647, 1807, 13, 3, UNI_JG__KAF } /* joininggroup=kaf */, - { 2, 4703, 2654, 8, 4, -UNI_XPOSIXUPPER } /* uppercase=no */, - { 1, 854, 0, 7, 0, UNI_SHRD } /* sharada */, - { 3, 3904, 0, 4, 0, UNI_MATH } /* math */, - { 4, 1126, 6053, 4, 4, UNI_SUND } /* scx=sund */, - { 8, 1234, 6620, 5, 18, UNI_CJKRADICALSSUP } /* incjkradicalssupplement */, - { 2, 6277, 8058, 7, 30, UNI_MATHALPHANUM } /* block=mathematicalalphanumericsymbols */, - { 8, 4635, 4487, 5, 16, UNI_LETTERLIKESYMBOLS } /* blk=letterlikesymbols */, - { 0, 135, 8029, 2, 29, UNI_ENCLOSEDIDEOGRAPHICSUP } /* isenclosedideographicsupplement */, - { 13, 7233, 0, 24, 0, UNI_ccc_values_index } /* canonicalcombiningclass= */, - { 1, 6372, 2511, 3, 11, UNI_SC__NAND } /* sc=nandinagari */, - { 0, 135, 1866, 2, 4, UNI_MONG } /* ismong */, - { 1, 8088, 99, 16, 2, UNI_UPPERCASELETTER } /* generalcategory=lu */, - { 9, 4524, 3959, 14, 2, UNI_NV__3_SLASH_8 } /* numericvalue=3/8 */, - { 1, 651, 688, 2, 3, UNI_idst_values_index } /* idst= */, - { 1, 47, 0, 4, 0, UNI_CAKM } /* cakm */, - { 0, 1562, 705, 3, 4, UNI_INDOGRA } /* indogra */, - { 33, 383, 288, 4, 1, UNI_cwcm_values_index } /* cwcm= */, - { 0, 4718, 645, 18, 2, -UNI_IDST } /* idstrinaryoperator=n */, - { 0, 4703, 2654, 8, 3, -UNI_XPOSIXUPPER } /* uppercase=n */, - { 0, 1874, 2511, 7, 4, UNI_SC__NAND } /* script=nand */, - { 0, 1126, 4190, 4, 7, UNI_BRAI } /* scx=braille */, - { 7, 5272, 7382, 6, 21, UNI__PERL_IS_IN_MULTI_CHAR_FOLD } /* _perl_is_in_multi_char_fold */, - { 0, 3491, 303, 13, 1, UNI_NV__0 } /* numericvalue=0 */, - { 1, 1654, 373, 10, 4, UNI_SD } /* softdotted=yes */, - { 3, 1696, 393, 4, 6, UNI_INGOTHIC } /* blk=gothic */, - { 10, 4557, 1904, 17, 4, UNI_SYLO } /* scriptextensions=sylo */, - { 32, 7233, 419, 24, 2, UNI_CCC__16 } /* canonicalcombiningclass=16 */, - { 8, 404, 963, 6, 2, -UNI_HYPHEN } /* hyphen=f */, - { 1, 5955, 0, 21, 0, UNI_PRTI } /* inscriptionalparthian */, - { 0, 20, 0, 3, 0, UNI_XPOSIXXDIGIT } /* hex */, - { 1, 8927, 0, 18, 0, UNI_CANS } /* canadianaboriginal */, - { 6, 33, 5518, 1, 11, UNI_SMALLKANAEXT } /* smallkanaext */, - { 1, 6372, 1263, 3, 7, UNI_MAKA } /* sc=makasar */, - { 1, 3575, 6400, 10, 5, UNI_CYRILLICSUP } /* blk=cyrillicsup */, - { 3, 1874, 617, 7, 7, UNI_SC__AVST } /* script=avestan */, - { 1, 7847, 6303, 18, 4, UNI_DT__FONT } /* decompositiontype=font */, - { 0, 6372, 1291, 3, 7, UNI_SIDD } /* sc=siddham */, - { 20, 1126, 808, 4, 7, UNI_OLCK } /* scx=olchiki */, - { 30, 1696, 2029, 4, 7, UNI_INSOGDIAN } /* blk=sogdian */, - { 3, 5, 143, 1, 3, UNI_MTEI } /* mtei */, - { 6, 1874, 529, 7, 6, UNI_SC__KHOJ } /* script=khojki */, - { 3, 4557, 311, 17, 5, UNI_ORYA } /* scriptextensions=oriya */, - { 0, 2394, 1664, 6, 10, UNI_INWARANGCITI } /* block=warangciti */, - { 0, 30, 4066, 1, 18, UNI_AGHB } /* iscaucasianalbanian */, - { 4, 8088, 577, 15, 2, UNI_S } /* generalcategory=s */, - { 14, 6370, 2890, 5, 9, UNI_INSC__NONJOINER } /* insc=nonjoiner */, - { 2, 1696, 2847, 4, 6, UNI_INCOPTIC } /* blk=coptic */, - { 7, 2372, 372, 9, 5, UNI_IDC } /* idcontinue=yes */, - { 0, 4336, 0, 15, 0, UNI_PS } /* openpunctuation */, - { 0, 1126, 454, 4, 3, UNI_MRO } /* scx=mro */, - { 3, 6370, 5876, 6, 15, UNI_INSC__CANTILLATIONMARK } /* insc=cantillationmark */, - { 7, 2338, 594, 11, 3, UNI_IN__12_DOT_1 } /* presentin=12.1 */, - { 17, 6372, 661, 3, 7, UNI_ELYM } /* sc=elymaic */, - { 17, 5260, 591, 10, 2, UNI_WB__EB } /* wordbreak=eb */, - { 19, 358, 191, 4, 2, UNI_CCC__0 } /* ccc=nr */, - { 0, 6372, 442, 3, 3, UNI_SC__HAN } /* sc=han */, - { 1, 7307, 4664, 6, 6, UNI_ARABICEXTC } /* inarabicextc */, - { 7, 2612, 2931, 3, 11, UNI_JG__KASHMIRIYEH } /* jg=kashmiriyeh */, - { 0, 5857, 0, 19, 0, UNI_MERO } /* meroitichieroglyphs */, - { 8, 404, 373, 6, 2, UNI_HYPHEN } /* hyphen=y */, - { 15, 135, 2919, 2, 4, UNI_MAHJ } /* ismahj */, - { 1, 2394, 110, 6, 4, UNI_INKAWI } /* block=kawi */, - { 1, 3476, 645, 13, 3, UNI_DT__CAN } /* nfdquickcheck=no */, - { 0, 2055, 1110, 5, 4, UNI_POSIXWORD } /* posixword */, - { 1, 6372, 297, 3, 5, UNI_NSHU } /* sc=nushu */, - { 1, 8792, 434, 3, 2, UNI_NT__DI } /* nt=di */, - { 5, 4652, 0, 18, 0, UNI_CYRILLICEXTC } /* block=cyrillicextc */, - { 0, 1447, 631, 7, 2, UNI_IDS } /* idstart=t */, - { 0, 7739, 963, 10, 2, -UNI_XPOSIXALPHA } /* alphabetic=f */, - { 0, 2, 5839, 1, 18, UNI_COUNTINGROD } /* countingrodnumerals */, - { 20, 323, 5500, 2, 8, UNI_INCHEROKEE } /* incherokee */, - { 0, 1126, 2919, 4, 4, UNI_MAHJ } /* scx=mahj */, - { 2, 4276, 0, 15, 0, UNI_PD } /* dashpunctuation */, - { 12, 7585, 83, 10, 2, UNI_BC__ON } /* bidiclass=on */, - { 1, 2114, 0, 5, 0, UNI_XPOSIXALPHA } /* alpha */, - { 0, 8468, 2787, 23, 6, UNI_INPC__RIGHT } /* indicpositionalcategory=right */, - { 0, 1126, 110, 4, 4, UNI_KAWI } /* scx=kawi */, - { 4, 1696, 7669, 4, 28, UNI_SUPPUAA } /* blk=supplementaryprivateuseareaa */, - { 0, 1874, 782, 8, 3, UNI_MARC } /* script=marc */, - { 0, 2278, 2141, 8, 4, UNI_NV__5_SLASH_8 } /* nv=6.250e-01 */, - { 0, 6431, 5194, 9, 17, UNI_LB__CP } /* linebreak=closeparenthesis */, - { 12, 1696, 1426, 4, 9, UNI_INSAMARITAN } /* blk=samaritan */, - { 16, 323, 6806, 2, 11, UNI_NUMBERFORMS } /* innumberforms */, - { 12, 2666, 4336, 3, 15, UNI_LB__OP } /* lb=openpunctuation */, - { 2, 1126, 1866, 4, 4, UNI_MONG } /* scx=mong */, - { 2, 1874, 975, 7, 8, UNI_SC__DUPL } /* script=duployan */, - { 13, 1696, 2350, 4, 12, UNI_INTULUTIGALARI } /* blk=tulutigalari */, - { 11, 8564, 83, 33, 3, UNI_CJKEXTG } /* block=cjkunifiedideographsextensiong */, - { 8, 1874, 336, 7, 4, UNI_SC__TAKR } /* script=takr */, - { 9, 164, 5401, 2, 16, UNI_INPUNCTUATION } /* generalpunctuation */, - { 16, 358, 7256, 3, 3, UNI_CCC__27 } /* ccc=27 */, - { 3, 2473, 0, 4, 0, UNI_ETHI } /* ethi */, - { 0, 5260, 1649, 10, 2, UNI_WB__FO } /* wordbreak=fo */, - { 0, 135, 1270, 2, 7, UNI_MULT } /* ismultani */, - { 0, 1322, 8436, 3, 24, UNI_DIACRITICALS } /* iscombiningdiacriticalmarks */, - { 0, 2612, 4869, 3, 3, UNI_JG__SAD } /* jg=sad */, - { 2, 6372, 760, 3, 7, UNI_SC__KALI } /* sc=kayahli */, - { 19, 6167, 1505, 17, 4, UNI_VO__TR } /* vo=transformedrotated */, - { 2, 6072, 6290, 5, 13, UNI_SUPMATHOPERATORS } /* issupmathoperators */, - { 0, 1874, 2100, 8, 11, UNI_SC__GONM } /* script=masaramgondi */, - { 1, 6372, 1015, 3, 6, UNI_HATR } /* sc=hatran */, - { 1, 5803, 6754, 10, 7, UNI_identifierstatus_values_index } /* identifierstatus= */, - { 9, 19, 1128, 3, 3, UNI_POSIXXDIGIT } /* ahex=t */, - { 2, 5, 7819, 1, 19, UNI_MISCSYMBOLS } /* miscellaneoussymbols */, - { 1, 6372, 352, 3, 6, UNI_SC__CARI } /* sc=carian */, - { 0, 1126, 774, 4, 7, UNI_MAND } /* scx=mandaic */, - { 9, 2564, 439, 3, 3, UNI_GONM } /* isgonm */, - { 0, 3491, 7256, 12, 3, UNI_NV__27 } /* numericvalue=27 */, - { 1, 1696, 3260, 5, 14, UNI_CONTROLPICTURES } /* blk=controlpictures */, - { 4, 624, 302, 5, 2, UNI_CCC__A } /* ccc=230 */, - { 1, 6647, 1802, 13, 8, UNI_JG__SWASHKAF } /* joininggroup=swashkaf */, - { 1, 1696, 6392, 4, 13, UNI_GLAGOLITICSUP } /* blk=glagoliticsup */, - { 0, 1696, 5014, 4, 15, UNI_BAMUMSUP } /* blk=bamumsupplement */, - { 4, 1696, 5044, 4, 5, UNI_INTAMIL } /* blk=tamil */, - { 0, 751, 7644, 3, 25, UNI_KATAKANAEXT } /* inkatakanaphoneticextensions */, - { 1, 2053, 0, 3, 0, UNI_P } /* isp */, - { 2, 5930, 373, 4, 4, UNI_EMOD } /* emod=yes */, - { 4, 1696, 7682, 4, 14, UNI_PUA } /* blk=privateusearea */, - { 2, 6372, 74, 3, 4, UNI_SC__CYRL } /* sc=cyrl */, - { 1, 71, 963, 3, 6, -UNI_CWU } /* cwu=false */, - { 0, 4557, 724, 17, 5, UNI_RUNR } /* scriptextensions=runic */, - { 0, 8142, 0, 20, 0, UNI_CJK } /* cjkunifiedideographs */, - { 1, 6996, 0, 21, 0, UNI_MEETEIMAYEKEXT } /* meeteimayekextensions */, - { 0, 1538, 6040, 5, 6, UNI_GEORGIANSUP } /* georgiansup */, - { 0, 4557, 434, 17, 4, UNI_DIAK } /* scriptextensions=diak */, - { 3, 8498, 4773, 6, 12, UNI_MISCMATHSYMBOLSB } /* inmiscmathsymbolsb */, - { 8, 1126, 714, 4, 5, UNI_OGAM } /* scx=ogham */, - { 0, 8088, 6903, 19, 8, UNI_LO } /* generalcategory=otherletter */, - { 0, 751, 3846, 4, 14, UNI_KAKTOVIKNUMERALS } /* inkaktoviknumerals */, - { 3, 5604, 6169, 19, 19, UNI_VO__TR } /* verticalorientation=transformedrotated */, - { 9, 1126, 2878, 4, 5, UNI_KHMR } /* scx=khmer */, - { 17, 4557, 143, 18, 3, UNI_MTEI } /* scriptextensions=mtei */, - { 3, 6431, 404, 10, 6, UNI_LB__HY } /* linebreak=hyphen */, - { 2, 4557, 6996, 17, 11, UNI_MTEI } /* scriptextensions=meeteimayek */, - { 4, 1773, 5086, 3, 9, UNI_ALCHEMICAL } /* isalchemical */, - { 0, 2345, 2731, 3, 3, UNI_IN__5 } /* in=5.0 */, - { 1, 768, 8168, 3, 20, UNI_ENCLOSEDALPHANUM } /* inenclosedalphanumerics */, - { 0, 4291, 645, 9, 2, -UNI_DIA } /* diacritic=n */, - { 2, 65, 0, 2, 0, UNI_MN } /* mn */, - { 1, 30, 4320, 1, 16, UNI_LOWERCASELETTER } /* islowercaseletter */, - { 5, 4635, 3793, 5, 6, UNI_LISUSUP } /* blk=lisusup */, - { 9, 1474, 415, 7, 2, UNI_CCC__34 } /* ccc=ccc34 */, - { 1, 4557, 1837, 17, 11, UNI_MEDF } /* scriptextensions=medefaidrin */, - { 0, 2666, 320, 3, 2, UNI_LB__SP } /* lb=sp */, - { 1, 323, 1157, 2, 8, UNI_INUGARITIC } /* inugaritic */, - { 0, 358, 135, 4, 2, UNI_CCC__IS } /* ccc=is */, - { 0, 6167, 6181, 3, 7, UNI_VO__R } /* vo=rotated */, - { 1, 2338, 361, 9, 3, UNI_IN__12 } /* presentin=12 */, - { 2, 2394, 1015, 6, 6, UNI_INHATRAN } /* block=hatran */, - { 0, 2833, 4280, 3, 5, UNI_P } /* gc=punct */, - { 32, 2833, 4337, 4, 14, UNI_PS } /* gc=openpunctuation */, - { 0, 5325, 4666, 11, 4, UNI_LATINEXTC } /* block=latinextc */, - { 0, 285, 3535, 3, 7, UNI_GCB__EX } /* gcb=extend */, - { 3, 20, 373, 3, 4, UNI_XPOSIXXDIGIT } /* hex=yes */, - { 6, 323, 5857, 2, 19, UNI_SC__MERO } /* inmeroitichieroglyphs */, - { 2, 1696, 1837, 4, 11, UNI_INMEDEFAIDRIN } /* blk=medefaidrin */, - { 0, 2394, 4115, 6, 4, UNI_INMODI } /* block=modi */, - { 8, 5383, 8835, 9, 26, UNI_DIACRITICALSSUP } /* combiningdiacriticalmarkssupplement */, - { 1, 1447, 963, 3, 2, -UNI_IDS } /* ids=f */, - { 0, 2551, 0, 13, 0, UNI_CASEDLETTER } /* iscasedletter */, - { 16, 1279, 4656, 2, 14, UNI_CYRILLICEXTC } /* blk=cyrillicextc */, - { 0, 323, 6034, 2, 19, UNI_MONGOLIANSUP } /* inmongoliansupplement */, - { 1, 135, 326, 2, 5, UNI_QMARK } /* isqmark */, - { 1, 5272, 316, 6, 5, UNI__PERL_PATWS } /* _perl_patws */, - { 7, 383, 373, 4, 4, UNI_CWCM } /* cwcm=yes */, - { 6, 3215, 7187, 6, 16, UNI_GEOMETRICSHAPESEXT } /* blk=geometricshapesext */, - { 1, 6372, 975, 3, 4, UNI_SC__DUPL } /* sc=dupl */, - { 0, 135, 3696, 2, 4, UNI_IDSU } /* isidsu */, - { 0, 135, 4639, 2, 14, UNI_LATINEXTB } /* islatinextendedb */, - { 3, 3930, 798, 14, 3, UNI_NV__1_SLASH_64 } /* numericvalue=1/64 */, - { 1, 8088, 1477, 15, 3, UNI_XPOSIXCNTRL } /* generalcategory=cc */, - { 3, 2833, 6734, 3, 10, UNI_CO } /* gc=privateuse */, - { 0, 6372, 257, 3, 4, UNI_ZZZZ } /* sc=zzzz */, - { 0, 4321, 0, 9, 0, UNI_XPOSIXLOWER } /* lowercase */, - { 13, 1523, 630, 4, 6, UNI_XPOSIXSPACE } /* space=true */, - { 1, 1874, 1528, 7, 8, UNI_SC__BUGI } /* script=buginese */, - { 1, 135, 404, 2, 6, UNI_HYPHEN } /* ishyphen */, - { 0, 1259, 4644, 4, 9, UNI_KANAEXTB } /* kanaextendedb */, - { 0, 7233, 1367, 25, 2, UNI_CCC__AR } /* canonicalcombiningclass=232 */, - { 2, 3178, 631, 13, 2, UNI_POSIXXDIGIT } /* asciihexdigit=t */, - { 16916, 2833, 0, 8, 0, UNI_C } /* gc=other */, - { 9, 8468, 3340, 24, 10, UNI_INPC__OVERSTRUCK } /* indicpositionalcategory=overstruck */, - { 0, 2612, 1065, 3, 5, UNI_JG__GAMAL } /* jg=gamal */, - { 0, 399, 631, 5, 2, UNI_GREXT } /* grext=t */, - { 4, 4557, 1664, 17, 4, UNI_WARA } /* scriptextensions=wara */, - { 2, 643, 7423, 2, 4, UNI_DT__SUP } /* dt=sup */, - { 8, 1874, 311, 7, 5, UNI_SC__ORYA } /* script=oriya */, - { 1, 7847, 1151, 18, 3, UNI_DT__FIN } /* decompositiontype=fin */, - { 1, 2201, 2161, 4, 8, UNI_NV__5_SLASH_2 } /* nv=2.500e+00 */, - { 4, 546, 5549, 4, 4, UNI_NV__30000 } /* nv=30000 */, - { 2, 1696, 4051, 5, 16, UNI_UCAS } /* blk=canadiansyllabics */, - { 0, 4524, 366, 14, 1, UNI_NV__38 } /* numericvalue=38 */, - { 15, 1234, 2489, 5, 4, UNI_CJKEXTI } /* incjkexti */, - { 28, 4291, 1968, 11, 4, UNI_DIACRITICALSEXT } /* diacriticalsext */, - { 2, 1874, 636, 7, 7, UNI_DSRT } /* script=deseret */, - { 1, 2394, 1039, 6, 6, UNI_INTELUGU } /* block=telugu */, - { 0, 3491, 367, 13, 2, UNI_NV__49 } /* numericvalue=49 */, - { 0, 2564, 5401, 4, 16, UNI_INPUNCTUATION } /* isgeneralpunctuation */, - { 3, 135, 510, 2, 3, UNI_VAI } /* isvai */, - { 9, 6372, 714, 3, 5, UNI_OGAM } /* sc=ogham */, - { 0, 1874, 760, 7, 7, UNI_SC__KALI } /* script=kayahli */, - { 5, 2, 373, 3, 4, UNI_CWL } /* cwl=yes */, - { 0, 7585, 577, 9, 2, UNI_BC__S } /* bidiclass=s */, - { 17, 4963, 372, 16, 3, UNI__PERL_PATWS } /* patternwhitespace=y */, - { 3, 1241, 0, 7, 0, UNI_GRAN } /* grantha */, - { 4, 1498, 373, 2, 4, UNI_SD } /* sd=yes */, - { 15, 1696, 1923, 4, 11, UNI_YISYLLABLES } /* blk=yisyllables */, - { 2, 6250, 0, 14, 0, UNI_INETHIOPIC } /* block=ethiopic */, - { 5, 323, 4021, 2, 16, UNI_TANGUTCOMPONENTS } /* intangutcomponents */, - { 1, 285, 591, 4, 3, UNI_WB__EB } /* gcb=ebg */, - { 0, 1696, 1579, 4, 10, UNI_INKHAROSHTHI } /* blk=kharoshthi */, - { 4, 7682, 0, 14, 0, UNI_PUA } /* privateusearea */, - { 0, 135, 5383, 2, 18, UNI_HALFMARKS } /* iscombininghalfmarks */, - { 16, 4557, 462, 17, 4, UNI_OGAM } /* scriptextensions=ogam */, - { 1, 1126, 114, 4, 4, UNI_KITS } /* scx=kits */, - { 0, 135, 3904, 2, 10, UNI_SM } /* ismathsymbol */, - { 21, 6372, 2005, 3, 12, UNI_SC__GONG } /* sc=gunjalagondi */, - { 0, 2394, 6053, 6, 12, UNI_SUNDANESESUP } /* block=sundanesesup */, - { 7, 306, 794, 3, 4, UNI_NV___MINUS_1_SLASH_2 } /* nv=-1/2 */, - { 1, 1696, 4980, 4, 18, UNI_RUMI } /* blk=ruminumeralsymbols */, - { 18, 643, 1194, 3, 6, UNI_DT__ENC } /* dt=circle */, - { 3, 4524, 798, 14, 3, UNI_NV__3_SLASH_64 } /* numericvalue=3/64 */, - { 8, 924, 304, 5, 2, UNI_AGE__4 } /* age=v40 */, - { 5, 135, 1647, 2, 2, UNI_LOWERCASELETTER } /* isll */, - { 2, 3778, 1060, 3, 2, UNI_LOE } /* isloe */, - { 0, 7420, 5253, 16, 7, UNI_SUPARROWSA } /* blk=supplementalarrowsa */, - { 16, 209, 0, 4, 0, UNI_TAVT } /* tavt */, - { 7, 4963, 962, 16, 3, -UNI__PERL_PATWS } /* patternwhitespace=f */, - { 10, 1097, 1368, 5, 2, UNI_NV__1_SLASH_20 } /* nv=1/20 */, - { 0, 1126, 1435, 4, 6, UNI_THAA } /* scx=thaana */, - { 3, 4557, 1598, 17, 10, UNI_NAGM } /* scriptextensions=nagmundari */, - { 0, 1696, 6053, 4, 19, UNI_SUNDANESESUP } /* blk=sundanesesupplement */, - { 1, 546, 1368, 5, 2, UNI_NV__3_SLASH_20 } /* nv=3/20 */, - { 20, 2394, 213, 11, 2, UNI_CJKEXTF } /* block=cjkextf */, - { 1, 5, 2718, 1, 12, UNI_MISCTECHNICAL } /* misctechnical */, - { 1, 2394, 1417, 6, 9, UNI_INPAUCINHAU } /* block=paucinhau */, - { 0, 323, 7651, 2, 28, UNI_PHONETICEXTSUP } /* inphoneticextensionssupplement */, - { 1, 2612, 4869, 3, 5, UNI_JG__SADHE } /* jg=sadhe */, - { 0, 6372, 2511, 3, 4, UNI_SC__NAND } /* sc=nand */, - { 5, 6372, 331, 3, 5, UNI_SC__TALE } /* sc=taile */, - { 0, 1874, 4638, 6, 6, UNI_SC__LATN } /* script=latin */, - { 2, 667, 0, 2, 0, UNI_CE } /* ce */, - { 1, 6125, 8792, 19, 3, UNI_nchar_values_index } /* noncharactercodepoint= */, - { 0, 643, 3373, 3, 3, UNI_DT__ENC } /* dt=enc */, - { 3, 8095, 4687, 9, 15, UNI_TITLE } /* category=titlecaseletter */, - { 12, 1126, 946, 4, 8, UNI_BASS } /* scx=bassavah */, - { 56, 30, 1597, 1, 5, UNI_NAGM } /* isnagm */, - { 1, 3734, 3793, 3, 6, UNI_LISUSUP } /* inlisusup */, - { 29, 558, 630, 2, 6, UNI_LOE } /* loe=true */, - { 4, 8596, 5923, 22, 16, UNI_INSC__SYLLABLEMODIFIER } /* indicsyllabiccategory=syllablemodifier */, - { 8, 6277, 2920, 7, 11, UNI_MAHJONG } /* block=mahjongtiles */, - { 9, 285, 591, 4, 2, UNI_WB__EB } /* gcb=eb */, - { 0, 643, 650, 3, 4, UNI_EA__F } /* dt=wide */, - { 4, 2909, 5997, 3, 18, UNI_ENCLOSEDALPHANUMSUP } /* isenclosedalphanumsup */, - { 0, 3073, 645, 13, 3, UNI_COMPEX } /* nfcquickcheck=no */, - { 0, 323, 2326, 2, 12, UNI_PLAYINGCARDS } /* inplayingcards */, - { 8, 2819, 8792, 12, 3, UNI_ecomp_values_index } /* emojicomponent= */, - { 1, 44, 278, 1, 3, UNI_UGAR } /* ugar */, - { 1, 1230, 8660, 3, 34, UNI_DIACRITICALSFORSYMBOLS } /* incombiningdiacriticalmarksforsymbols */, - { 0, 2394, 4280, 6, 11, UNI_INPUNCTUATION } /* block=punctuation */, - { 15, 1498, 631, 2, 2, UNI_SD } /* sd=t */, - { 0, 135, 6392, 2, 4, UNI_GLAG } /* isglag */, - { 1, 1441, 3535, 2, 13, UNI_WB__EX } /* wb=extendnumlet */, - { 2, 1874, 1015, 7, 4, UNI_HATR } /* script=hatr */, - { 1, 1934, 373, 5, 4, UNI_BIDIC } /* bidic=yes */, - { 2, 323, 1263, 2, 7, UNI_INMAKASAR } /* inmakasar */, - { 5, 6838, 4237, 5, 12, UNI_INPC__LEFTANDRIGHT } /* inpc=leftandright */, - { 0, 323, 510, 2, 3, UNI_INVAI } /* invai */, - { 1, 7606, 558, 11, 2, UNI_BC__RLO } /* bidiclass=rlo */, - { 12, 8095, 3111, 9, 2, UNI_PS } /* category=ps */, - { 34, 110, 3846, 2, 14, UNI_KAKTOVIKNUMERALS } /* kaktoviknumerals */, - { 0, 312, 631, 2, 2, UNI_RI } /* ri=t */, - { 0, 2278, 5549, 4, 5, UNI_NV__600000 } /* nv=600000 */, - { 17, 135, 1454, 2, 10, UNI_ASCII } /* isbasiclatin */, - { 0, 7585, 2787, 9, 12, UNI_BC__R } /* bidiclass=righttoleft */, - { 33, 306, 1364, 4, 2, UNI_NV__900 } /* nv=900 */, - { 3, 4557, 2920, 18, 3, UNI_MAHJ } /* scriptextensions=mahj */, - { 2, 575, 1649, 3, 2, UNI_SB__FO } /* sb=fo */, - { 0, 7086, 645, 24, 2, -UNI_COMPEX } /* fullcompositionexclusion=n */, - { 0, 8140, 5526, 22, 10, UNI_CJKEXTD } /* incjkunifiedideographsextensiond */, - { 1, 6372, 5462, 3, 20, UNI_PHLI } /* sc=inscriptionalpahlavi */, - { 0, 5803, 7061, 15, 16, UNI_IDENTIFIERTYPE__DEFAULTIGNORABLE } /* identifiertype=defaultignorable */, - { 4, 2394, 3764, 6, 13, UNI_DEVANAGARIEXT } /* block=devanagariext */, - { 4, 1874, 2302, 7, 12, UNI_SC__HUNG } /* script=oldhungarian */, - { 4, 6372, 1344, 3, 9, UNI_NBAT } /* sc=nabataean */, - { 8, 546, 6491, 4, 8, UNI_NV__3_SLASH_80 } /* nv=3.750e-02 */, - { 2, 2584, 4666, 9, 4, UNI_MYANMAREXTC } /* ismyanmarextc */, - { 1, 2238, 5549, 4, 5, UNI_NV__400000 } /* nv=400000 */, - { 2, 135, 5344, 2, 20, UNI_PC } /* isconnectorpunctuation */, - { 2, 8468, 6842, 23, 20, UNI_INPC__TOPANDBOTTOMANDLEFT } /* indicpositionalcategory=topandbottomandleft */, - { 25, 6372, 1223, 3, 4, UNI_SC__BENG } /* sc=beng */, - { 12, 2599, 0, 13, 0, UNI_XPOSIXBLANK } /* isxposixblank */, - { 2, 7233, 365, 25, 2, UNI_CCC__BL } /* canonicalcombiningclass=218 */, - { 2, 5585, 963, 19, 6, -UNI_TERM } /* terminalpunctuation=false */, - { 0, 4913, 2732, 14, 8, UNI_NV__3_SLASH_5 } /* numericvalue=6.000e-01 */, - { 6, 2069, 4702, 11, 2, UNI_JT__U } /* joiningtype=u */, - { 0, 3215, 981, 10, 5, UNI_GEORGIANEXT } /* blk=georgianext */, - { 0, 2601, 3185, 5, 6, UNI_XPOSIXDIGIT } /* xposixdigit */, - { 0, 1696, 422, 4, 4, UNI_INMIAO } /* blk=miao */, - { 8, 6431, 2097, 10, 2, UNI_HST__V } /* linebreak=jv */, - { 2, 546, 0, 4, 0, UNI_NV__3 } /* nv=3 */, - { 2, 2819, 963, 5, 2, -UNI_EMOJI } /* emoji=f */, - { 16, 1696, 8827, 5, 34, UNI_DIACRITICALSSUP } /* blk=combiningdiacriticalmarkssupplement */, - { 0, 725, 6137, 3, 4, UNI_ANY } /* unicode */, - { 19, 27, 0, 4, 0, UNI_ARMI } /* armi */, - { 1, 306, 7461, 3, 2, UNI_NV__28 } /* nv=28 */, - { 54, 2666, 3040, 3, 11, UNI_LB__IN } /* lb=inseparable */, - { 0, 2785, 1744, 14, 7, UNI_BC__RLI } /* bc=righttoleftisolate */, - { 13, 2573, 963, 5, 6, -UNI_JOINC } /* joinc=false */, - { 0, 1126, 1435, 4, 4, UNI_THAA } /* scx=thaa */, - { 1, 7979, 4007, 22, 4, UNI_JG__MANICHAEANTEN } /* joininggroup=manichaeanten */, - { 1, 2394, 3423, 6, 6, UNI_INHEBREW } /* block=hebrew */, - { 0, 4557, 1435, 17, 6, UNI_THAA } /* scriptextensions=thaana */, - { 8, 905, 631, 4, 2, UNI_IDEO } /* ideo=t */, - { 2, 2666, 3557, 3, 2, UNI_LB__ZW } /* lb=zw */, - { 6, 4557, 5044, 17, 5, UNI_TAML } /* scriptextensions=tamil */, - { 0, 8088, 2835, 15, 6, UNI_C } /* generalcategory=other */, - { 2, 135, 158, 2, 4, UNI_ORYA } /* isorya */, - { 24, 1126, 1870, 4, 4, UNI_KTHI } /* scx=kthi */, - { 2, 135, 251, 2, 2, UNI_NB } /* isnb */, - { 12, 5325, 4832, 10, 2, UNI_LATIN1 } /* block=latin1 */, - { 4, 3930, 2161, 14, 8, UNI_NV__3_SLASH_2 } /* numericvalue=1.500e+00 */, - { 0, 7233, 8908, 24, 10, UNI_CCC__AR } /* canonicalcombiningclass=aboveright */, - { 5, 563, 373, 6, 2, UNI_PATSYN } /* patsyn=y */, - { 2, 1696, 6862, 4, 6, UNI_INBRAHMI } /* blk=brahmi */, - { 1, 4635, 135, 5, 3, UNI_INLISU } /* blk=lisu */, - { 0, 7951, 645, 17, 2, -UNI_VS } /* variationselector=n */, - { 0, 6431, 0, 10, 0, UNI_lb_values_index } /* linebreak= */, - { 8, 7086, 963, 24, 6, -UNI_COMPEX } /* fullcompositionexclusion=false */, - { 3, 21, 8168, 1, 29, UNI_ENCLOSEDALPHANUMSUP } /* enclosedalphanumericsupplement */, - { 1, 1874, 6996, 7, 11, UNI_MTEI } /* script=meeteimayek */, - { 1, 3073, 645, 13, 2, UNI_COMPEX } /* nfcquickcheck=n */, - { 2, 1126, 3230, 3, 8, UNI_MYMR } /* scx=myanmar */, - { 1, 2394, 2314, 6, 12, UNI_PHAISTOS } /* block=phaistosdisc */, - { 0, 2053, 4703, 7, 5, UNI_POSIXUPPER } /* isposixupper */, - { 27, 2418, 962, 12, 7, -UNI_CI } /* caseignorable=false */, - { 3, 6647, 2635, 13, 10, UNI_JG__KNOTTEDHEH } /* joininggroup=knottedheh */, - { 1, 135, 834, 2, 4, UNI_NBAT } /* isnbat */, - { 40, 7436, 290, 26, 1, UNI_CCC__122 } /* canonicalcombiningclass=122 */, - { 4, 3301, 963, 14, 6, -UNI_GREXT } /* graphemeextend=false */, - { 0, 5069, 0, 13, 0, UNI_EMOD } /* emojimodifier */, - { 0, 8095, 1647, 9, 2, UNI_LOWERCASELETTER } /* category=ll */, - { 1, 7233, 2223, 24, 2, UNI_CCC__33 } /* canonicalcombiningclass=33 */, - { 1, 6125, 963, 21, 6, -UNI__PERL_NCHAR } /* noncharactercodepoint=false */, - { 30, 2371, 0, 11, 0, UNI_XIDC } /* xidcontinue */, - { 0, 7420, 5253, 7, 7, UNI_SUPARROWSA } /* blk=suparrowsa */, - { 4, 323, 110, 2, 4, UNI_INKAWI } /* inkawi */, - { 1, 1874, 1904, 7, 11, UNI_SC__SYLO } /* script=sylotinagri */, - { 2, 326, 1698, 4, 2, UNI_qmark_values_index } /* qmark= */, - { 0, 916, 0, 6, 0, UNI_AGE__10 } /* age=10 */, - { 0, 270, 0, 5, 0, UNI_CWKCF } /* cwkcf */, - { 0, 1126, 680, 4, 7, UNI_HANO } /* scx=hanunoo */, - { 0, 7061, 963, 25, 6, -UNI_DI } /* defaultignorablecodepoint=false */, - { 0, 5930, 963, 4, 6, -UNI_EMOD } /* emod=false */, - { 0, 1696, 3505, 4, 15, UNI_NARB } /* blk=oldnortharabian */, - { 1, 1696, 7651, 4, 28, UNI_PHONETICEXTSUP } /* blk=phoneticextensionssupplement */, - { 3, 241, 0, 4, 0, UNI_XSUX } /* xsux */, - { 2, 1126, 209, 4, 4, UNI_TAVT } /* scx=tavt */, - { 0, 4557, 377, 17, 6, UNI_CAKM } /* scriptextensions=chakma */, - { 0, 5782, 631, 20, 2, UNI_GCB__T } /* graphemeclusterbreak=t */, - { 2, 133, 0, 2, 0, UNI_NL } /* nl */, - { 0, 1126, 1263, 4, 7, UNI_MAKA } /* scx=makasar */, - { 0, 904, 373, 5, 2, UNI_UIDEO } /* uideo=y */, - { 12, 1874, 1885, 7, 4, UNI_SORA } /* script=sora */, - { 8, 450, 0, 4, 0, UNI_LINA } /* lina */, - { 25, 2666, 163, 3, 2, UNI_LB__SG } /* lb=sg */, - { 0, 135, 1241, 2, 4, UNI_GRAN } /* isgran */, - { 0, 2394, 2060, 6, 6, UNI_INSYRIAC } /* block=syriac */, - { 20, 2, 963, 3, 2, -UNI_CWL } /* cwl=f */, - { 0, 8728, 1449, 33, 5, UNI__PERL_PROBLEMATIC_LOCALE_FOLDEDS_START } /* _perl_problematic_locale_foldeds_start */, - { 0, 2080, 0, 11, 0, UNI_KEHNOROTATE } /* kehnorotate */, - { 0, 2799, 7747, 8, 20, UNI_ARABICPFA } /* blk=arabicpresentationformsa */, - { 0, 968, 963, 5, 2, -UNI_ECOMP } /* ecomp=f */, - { 1, 2394, 861, 6, 7, UNI_SC__SHAW } /* block=shavian */, - { 1, 6372, 826, 3, 4, UNI_SC__KALI } /* sc=kali */, - { 1, 6264, 981, 12, 5, UNI_GEORGIANEXT } /* block=georgianext */, - { 5, 7697, 309, 28, 1, UNI_CCC__19 } /* canonicalcombiningclass=ccc19 */, - { 1, 3696, 645, 16, 2, -UNI_IDSU } /* idsunaryoperator=n */, - { 4, 3301, 963, 14, 2, -UNI_GREXT } /* graphemeextend=f */, - { 16, 135, 6053, 2, 19, UNI_SUNDANESESUP } /* issundanesesupplement */, - { 0, 278, 0, 5, 0, UNI_GARA } /* garay */, - { 0, 323, 2919, 2, 7, UNI_MAHJONG } /* inmahjong */, - { 0, 1126, 6862, 4, 4, UNI_BRAH } /* scx=brah */, - { 0, 4005, 963, 16, 2, -UNI_STERM } /* sentenceterminal=f */, - { 0, 2599, 1110, 8, 4, UNI_XPOSIXWORD } /* isxposixword */, - { 0, 7697, 368, 27, 2, UNI_CCC__91 } /* canonicalcombiningclass=ccc91 */, - { 0, 751, 1076, 3, 7, UNI_INKIRATRAI } /* inkiratrai */, - { 20, 2473, 6400, 6, 5, UNI_ETHIOPICSUP } /* ethiopicsup */, - { 0, 5059, 1549, 10, 4, UNI_KANAEXTA } /* block=kanaexta */, - { 11, 8324, 5361, 30, 4, UNI_CJKEXTE } /* blk=cjkunifiedideographsextensione */, - { 10, 3930, 5549, 14, 5, UNI_NV__100000 } /* numericvalue=100000 */, - { 3, 1874, 297, 7, 5, UNI_NSHU } /* script=nushu */, - { 1, 2314, 1322, 9, 3, UNI_PHAISTOS } /* phaistosdisc */, - { 2, 3904, 373, 4, 2, UNI_MATH } /* math=y */, - { 0, 1934, 2974, 10, 2, UNI_bidic_values_index } /* bidicontrol= */, - { 3, 563, 963, 6, 6, -UNI_PATSYN } /* patsyn=false */, - { 0, 8095, 577, 8, 2, UNI_S } /* category=s */, - { 1, 6372, 1859, 3, 11, UNI_HMNG } /* sc=pahawhhmong */, - { 0, 1126, 1241, 4, 7, UNI_GRAN } /* scx=grantha */, - { 1, 323, 7923, 2, 19, UNI_INEGYPTIANHIEROGLYPHS } /* inegyptianhieroglyphs */, - { 3, 1654, 631, 10, 2, UNI_SD } /* softdotted=t */, - { 1, 6647, 3398, 13, 12, UNI_JG__VERTICALTAIL } /* joininggroup=verticaltail */, - { 0, 1045, 0, 6, 0, UNI_WCHO } /* wancho */, - { 7, 4557, 5955, 17, 21, UNI_PRTI } /* scriptextensions=inscriptionalparthian */, - { 10, 2394, 0, 9, 0, UNI_CJK } /* block=cjk */, - { 0, 768, 7463, 3, 10, UNI_ENCLOSEDCJK } /* inenclosedcjk */, - { 3, 2, 373, 3, 2, UNI_CWL } /* cwl=y */, - { 0, 2666, 3062, 3, 11, UNI_LB__VF } /* lb=viramafinal */, - { 2, 6372, 482, 3, 4, UNI_MIAO } /* sc=plrd */, - { 3, 2819, 963, 5, 6, -UNI_EMOJI } /* emoji=false */, - { 2, 2612, 4365, 3, 4, UNI_JG__BETH } /* jg=beth */, - { 0, 323, 1007, 2, 8, UNI_INHIRAGANA } /* inhiragana */, - { 0, 2584, 4793, 9, 9, UNI_MYANMAREXTC } /* ismyanmarextendedc */, - { 2, 916, 150, 4, 2, UNI_IN__NA } /* age=na */, - { 1, 323, 251, 2, 2, UNI_NB } /* innb */, - { 20, 6446, 645, 21, 3, -UNI_MCM } /* modifiercombiningmark=no */, - { 8, 6372, 975, 3, 8, UNI_SC__DUPL } /* sc=duployan */, - { 1, 8861, 6147, 7, 20, UNI_SINHALAARCHAICNUMBERS } /* block=sinhalaarchaicnumbers */, - { 3, 2799, 5821, 5, 18, UNI_ANCIENTGREEKNUMBERS } /* blk=ancientgreeknumbers */, - { 3, 323, 6188, 2, 21, UNI_YIJING } /* inyijinghexagramsymbols */, - { 0, 30, 6619, 1, 8, UNI_RADICAL } /* isradical */, - { 0, 7585, 0, 11, 0, UNI_BC__L } /* bidiclass=l */, - { 0, 323, 7739, 2, 27, UNI_ALPHABETICPF } /* inalphabeticpresentationforms */, - { 2, 8037, 373, 11, 4, UNI_IDEO } /* ideographic=yes */, - { 0, 7436, 1366, 25, 2, UNI_CCC__103 } /* canonicalcombiningclass=103 */, - { 1, 434, 645, 2, 3, -UNI_DI } /* di=no */, - { 4, 1126, 1223, 4, 4, UNI_BENG } /* scx=beng */, - { 0, 1781, 6891, 3, 21, UNI_MODIFIERLETTERS } /* isspacingmodifierletters */, - { 1, 323, 1298, 2, 7, UNI_INSOYOMBO } /* insoyombo */, - { 1, 5930, 631, 4, 2, UNI_EMOD } /* emod=t */, - { 4, 323, 2481, 2, 11, UNI_KATAKANAEXT } /* inkatakanaext */, - { 0, 6277, 7819, 7, 28, UNI_MISCARROWS } /* block=miscellaneoussymbolsandarrows */, - { 0, 2394, 1057, 6, 8, UNI_JAMOEXTB } /* block=jamoextb */, - { 1, 2394, 729, 6, 5, UNI_INBATAK } /* block=batak */, - { 0, 7420, 1645, 5, 9, UNI_SMALLFORMS } /* blk=smallforms */, - { 0, 323, 1284, 2, 7, UNI_INPHAGSPA } /* inphagspa */, - { 0, 4970, 630, 9, 3, UNI_XPOSIXSPACE } /* whitespace=t */, - { 0, 2394, 6796, 7, 21, UNI_INDICNUMBERFORMS } /* block=commonindicnumberforms */, - { 1, 1874, 1149, 7, 8, UNI_SC__TFNG } /* script=tifinagh */, - { 1, 1279, 3826, 5, 10, UNI_INMALAYALAM } /* block=malayalam */, - { 0, 1566, 1061, 6, 4, UNI_KANAEXTB } /* iskanaextb */, - { 2, 1126, 2122, 4, 4, UNI_MEND } /* scx=mend */, - { 6, 675, 962, 5, 3, -UNI_GRBASE } /* grbase=f */, - { 9, 358, 596, 4, 2, UNI_CCC__13 } /* ccc=13 */, - { 1, 343, 5253, 3, 7, UNI_SUPARROWSA } /* suparrowsa */, - { 1, 6372, 535, 3, 4, UNI_SC__LYDI } /* sc=lydi */, - { 7, 675, 962, 5, 7, -UNI_GRBASE } /* grbase=false */, - { 9, 6372, 7923, 3, 19, UNI_EGYP } /* sc=egyptianhieroglyphs */, - { 0, 4652, 4644, 14, 9, UNI_CYRILLICEXTB } /* block=cyrillicextendedb */, - { 14, 1126, 466, 4, 4, UNI_OLCK } /* scx=olck */, - { 4, 135, 430, 2, 4, UNI_ARMN } /* isarmn */, - { 1, 30, 5308, 1, 17, UNI_TANGUTSUP } /* istangutsupplement */, - { 4, 135, 1522, 2, 2, UNI_ZS } /* iszs */, - { 0, 108, 3410, 2, 13, UNI_JT__R } /* jt=rightjoining */, - { 1, 6372, 454, 3, 4, UNI_MRO } /* sc=mroo */, - { 16, 2666, 124, 3, 2, UNI_LB__AI } /* lb=ai */, - { 1, 434, 0, 2, 0, UNI_DI } /* di */, - { 0, 1234, 2443, 4, 5, UNI_CJKEXTE } /* incjkexte */, - { 2, 2080, 2654, 10, 4, -UNI_KEHNOROTATE } /* kehnorotate=no */, - { 20, 6372, 31, 3, 4, UNI_SC__AVST } /* sc=avst */, - { 5, 4557, 466, 17, 4, UNI_OLCK } /* scriptextensions=olck */, - { 41, 3734, 6025, 7, 9, UNI_LATINEXTA } /* inlatinextendeda */, - { 0, 1696, 7120, 4, 23, UNI_BYZANTINEMUSIC } /* blk=byzantinemusicalsymbols */, - { 0, 2666, 3086, 3, 7, UNI_LB__NU } /* lb=numeric */, - { 1, 1696, 32, 4, 2, UNI_INVS } /* blk=vs */, - { 0, 21, 644, 2, 3, -UNI_EXT } /* ext=n */, - { 3, 1126, 1372, 4, 9, UNI_ITAL } /* scx=olditalic */, - { 0, 135, 3301, 2, 14, UNI_GREXT } /* isgraphemeextend */, - { 9, 2394, 1618, 6, 10, UNI_INPHOENICIAN } /* block=phoenician */, - { 4, 358, 1707, 4, 2, UNI_CCC__1 } /* ccc=ov */, - { 1, 2394, 1482, 6, 10, UNI_INCHORASMIAN } /* block=chorasmian */, - { 16, 323, 1315, 2, 7, UNI_INTIRHUTA } /* intirhuta */, - { 1, 4377, 4864, 13, 5, UNI_JG__MANICHAEANGIMEL } /* jg=manichaeangimel */, - { 0, 5976, 1312, 6, 3, UNI_SUPPUAB } /* insuppuab */, - { 17, 1874, 438, 7, 4, UNI_SC__GONM } /* script=gonm */, - { 5, 8324, 0, 24, 0, UNI_CJK } /* blk=cjkunifiedideographs */, - { 0, 494, 0, 4, 0, UNI_ROHG } /* rohg */, - { 0, 135, 815, 2, 7, UNI_OSMA } /* isosmanya */, - { 0, 3696, 631, 4, 5, UNI_IDSU } /* idsu=true */, - { 0, 4557, 102, 17, 4, UNI_HMNG } /* scriptextensions=hmng */, - { 2, 8564, 0, 26, 0, UNI_CJK } /* block=cjkunifiedideographs */, - { 0, 1126, 5014, 4, 5, UNI_BAMU } /* scx=bamum */, - { 0, 5604, 8809, 20, 18, UNI_VO__TU } /* verticalorientation=transformedupright */, - { 1, 6372, 897, 3, 7, UNI_SC__TIBT } /* sc=tibetan */, - { 18, 7036, 373, 25, 4, UNI_CWKCF } /* changeswhennfkccasefolded=yes */, - { 3, 5500, 0, 4, 0, UNI_CHER } /* cher */, - { 4, 1874, 1223, 7, 7, UNI_SC__BENG } /* script=bengali */, - { 17, 8088, 690, 15, 2, UNI_L } /* generalcategory=l */, - { 1, 2584, 7130, 3, 13, UNI_MUSIC } /* ismusicalsymbols */, - { 1, 1091, 373, 6, 2, UNI_DT__NONE } /* nfkdqc=y */, - { 1, 3734, 1061, 7, 4, UNI_LATINEXTB } /* inlatinextb */, - { 0, 4557, 661, 17, 4, UNI_ELYM } /* scriptextensions=elym */, - { 1, 3491, 0, 13, 0, UNI_nv_values_index } /* numericvalue= */, - { 1, 4557, 110, 17, 4, UNI_KAWI } /* scriptextensions=kawi */, - { 5, 1696, 110, 4, 4, UNI_INKAWI } /* blk=kawi */, - { 7, 33, 8254, 1, 29, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* symbolsandpictographsextendeda */, - { 0, 2394, 5857, 6, 19, UNI_SC__MERO } /* block=meroitichieroglyphs */, - { 0, 16, 2440, 1, 12, UNI_GREEKEXT } /* greekextended */, - { 7, 135, 1579, 2, 4, UNI_KHAR } /* iskhar */, - { 6, 6670, 6544, 14, 6, UNI_SB__FO } /* sentencebreak=format */, - { 13, 1126, 331, 4, 5, UNI_TALE } /* scx=taile */, - { 1, 643, 0, 3, 0, UNI_dt_values_index } /* dt= */, - { 1, 3930, 309, 15, 1, UNI_NV__1_SLASH_9 } /* numericvalue=1/9 */, - { 1, 2584, 8292, 3, 32, UNI_MISCMATHSYMBOLSA } /* ismiscellaneousmathematicalsymbolsa */, - { 9, 30, 6911, 1, 23, UNI_TRANSPORTANDMAP } /* istransportandmapsymbols */, - { 10, 5102, 645, 18, 5, UNI_INCB__NONE } /* indicconjunctbreak=none */, - { 1, 7086, 373, 24, 2, UNI_COMPEX } /* fullcompositionexclusion=y */, - { 0, 323, 8, 2, 3, UNI_OCR } /* inocr */, - { 0, 1874, 1579, 7, 4, UNI_KHAR } /* script=khar */, - { 9, 2372, 645, 3, 2, -UNI_IDC } /* idc=n */, - { 34, 4557, 2847, 17, 6, UNI_COPT } /* scriptextensions=coptic */, - { 0, 6372, 1007, 3, 4, UNI_SC__HIRA } /* sc=hira */, - { 0, 3623, 0, 7, 0, UNI_CPRT } /* cypriot */, - { 4, 788, 1850, 3, 9, UNI_NFCQC__M } /* nfkcqc=maybe */, - { 0, 1945, 288, 12, 1, UNI_bidim_values_index } /* bidimirrored= */, - { 0, 3491, 419, 13, 2, UNI_NV__16 } /* numericvalue=16 */, - { 8, 2785, 5427, 3, 3, UNI_BC__RLE } /* bc=rle */, - { 1, 5976, 4590, 4, 15, UNI_SUTTONSIGNWRITING } /* insuttonsignwriting */, - { 2, 3227, 6025, 11, 9, UNI_MYANMAREXTA } /* blk=myanmarextendeda */, - { 0, 6571, 0, 23, 0, UNI_COMPATJAMO } /* hangulcompatibilityjamo */, - { 2, 6647, 2645, 13, 10, UNI_JG__REVERSEDPE } /* joininggroup=reversedpe */, - { 2, 1499, 288, 10, 1, UNI_dep_values_index } /* deprecated= */, - { 0, 5930, 645, 4, 3, -UNI_EMOD } /* emod=no */, - { 0, 2833, 3111, 3, 2, UNI_PS } /* gc=ps */, - { 2, 7356, 0, 26, 0, UNI_PCM } /* prependedconcatenationmark */, - { 4, 869, 645, 4, 2, -UNI_TERM } /* term=n */, - { 0, 135, 32, 2, 2, UNI_VS } /* isvs */, - { 0, 135, 2326, 2, 12, UNI_PLAYINGCARDS } /* isplayingcards */, - { 0, 4173, 631, 17, 5, UNI_IDSB } /* idsbinaryoperator=true */, - { 0, 5482, 0, 11, 0, UNI_TAIXUANJING } /* taixuanjing */, - { 0, 323, 6034, 2, 12, UNI_MONGOLIANSUP } /* inmongoliansup */, - { 0, 1752, 0, 4, 0, UNI_GURU } /* guru */, - { 0, 30, 2321, 1, 3, UNI_DI } /* isdi */, - { 0, 2394, 1965, 6, 8, UNI_UCASEXTA } /* block=ucasexta */, - { 0, 135, 1592, 2, 6, UNI_ARROWS } /* isarrows */, - { 8, 8095, 3904, 9, 10, UNI_SM } /* category=mathsymbol */, - { 0, 1566, 7644, 3, 25, UNI_KATAKANAEXT } /* iskatakanaphoneticextensions */, - { 16, 3099, 1363, 11, 2, UNI_IN__6 } /* presentin=v60 */, - { 0, 285, 3557, 4, 3, UNI_LB__ZWJ } /* gcb=zwj */, - { 50, 32, 645, 2, 3, -UNI_VS } /* vs=no */, - { 0, 2612, 737, 3, 4, UNI_JG__NOON } /* jg=noon */, - { 0, 2394, 2511, 6, 11, UNI_INNANDINAGARI } /* block=nandinagari */, - { 0, 3098, 373, 5, 2, UNI_EPRES } /* epres=y */, - { 1, 1474, 419, 7, 2, UNI_CCC__16 } /* ccc=ccc16 */, - { 24, 1322, 52, 3, 3, UNI_CANS } /* iscans */, - { 6, 6372, 1870, 3, 4, UNI_SC__KTHI } /* sc=kthi */, - { 0, 1206, 7271, 3, 9, UNI_EA__F } /* ea=fullwidth */, - { 12, 1874, 1435, 7, 4, UNI_SC__THAA } /* script=thaa */, - { 0, 1126, 535, 4, 6, UNI_LYDI } /* scx=lydian */, - { 2, 323, 1923, 2, 11, UNI_YISYLLABLES } /* inyisyllables */, - { 0, 3587, 8533, 5, 31, UNI_EGYPTIANHIEROGLYPHFORMATCONTROLS } /* blk=egyptianhieroglyphformatcontrols */, - { 2, 7868, 630, 17, 3, UNI_GCB__T } /* hangulsyllabletype=t */, - { 1, 687, 0, 7, 0, UNI_LB__H3 } /* hst=lvt */, - { 0, 924, 1367, 5, 2, UNI_AGE__3_DOT_2 } /* age=v32 */, - { 6, 2266, 1364, 4, 3, UNI_NV__5000 } /* nv=5000 */, - { 1, 7739, 645, 10, 3, -UNI_XPOSIXALPHA } /* alphabetic=no */, - { 0, 135, 0, 2, 2, UNI_CASEDLETTER } /* isl& */, - { 1, 4557, 3578, 16, 9, UNI_CYRL } /* scriptextensions=cyrillic */, - { 1, 399, 0, 5, 0, UNI_GREXT } /* grext */, - { 9, 1270, 0, 4, 0, UNI_MULT } /* mult */, - { 0, 326, 645, 5, 3, -UNI_QMARK } /* qmark=no */, - { 16, 323, 919, 2, 3, UNI_IN__10 } /* in=10 */, - { 6, 135, 890, 2, 7, UNI_TAVT } /* istaiviet */, - { 9, 2909, 4644, 10, 9, UNI_ETHIOPICEXTB } /* isethiopicextendedb */, - { 0, 3991, 1364, 14, 2, UNI_NV__900 } /* numericvalue=900 */, - { 2, 4557, 498, 17, 4, UNI_SHAW } /* scriptextensions=shaw */, - { 2, 5976, 8639, 5, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* insupsymbolsandpictographs */, - { 0, 3916, 645, 14, 3, UNI_NFKCQC__N } /* nfkcquickcheck=no */, - { 0, 6431, 3062, 10, 6, UNI_LB__VI } /* linebreak=virama */, - { 4, 358, 2280, 3, 2, UNI_CCC__6 } /* ccc=6 */, - { 1, 770, 963, 2, 2, UNI_EA__F } /* ea=f */, - { 0, 7847, 969, 18, 3, UNI_DT__COM } /* decompositiontype=com */, - { 2, 135, 2114, 2, 5, UNI_XPOSIXALPHA } /* isalpha */, - { 1, 54, 2802, 2, 7, UNI_SC__ARAB } /* sc=arabic */, - { 0, 1483, 1521, 3, 7, UNI_XPOSIXBLANK } /* horizspace */, - { 2, 1027, 0, 6, 0, UNI_LEPC } /* lepcha */, - { 7, 7036, 0, 25, 0, UNI_CWKCF } /* changeswhennfkccasefolded */, - { 0, 5069, 2654, 16, 3, -UNI_EBASE } /* emojimodifierbase=n */, - { 0, 2612, 819, 3, 3, UNI_JG__NYA } /* jg=nya */, - { 1, 1126, 35, 4, 4, UNI_BATK } /* scx=batk */, - { 0, 3491, 2280, 12, 10, UNI_NV__1_SLASH_16 } /* numericvalue=6.250e-02 */, - { 8, 2833, 4817, 3, 16, UNI_PF } /* gc=finalpunctuation */, - { 0, 1097, 556, 5, 1, UNI_NV__1_SLASH_7 } /* nv=1/7 */, - { 0, 5260, 1681, 10, 7, UNI_WB__NL } /* wordbreak=newline */, - { 0, 4557, 4115, 17, 4, UNI_MODI } /* scriptextensions=modi */, - { 0, 5782, 3809, 21, 11, UNI_GCB__SM } /* graphemeclusterbreak=spacingmark */, - { 0, 323, 8920, 2, 43, UNI_UCASEXTA } /* inunifiedcanadianaboriginalsyllabicsextendeda */, - { 0, 2833, 2696, 3, 9, UNI__PERL_SURROGATE } /* gc=surrogate */, - { 1, 4156, 644, 16, 4, -UNI_IDCOMPATMATHSTART } /* idcompatmathstart=no */, - { 1, 2394, 767, 6, 7, UNI_INLINEARA } /* block=lineara */, - { 0, 2785, 6217, 3, 12, UNI_BC__AN } /* bc=arabicnumber */, - { 0, 2394, 1965, 6, 4, UNI_UCAS } /* block=ucas */, - { 0, 643, 6303, 3, 4, UNI_DT__FONT } /* dt=font */, - { 0, 2502, 4644, 9, 9, UNI_MYANMAREXTB } /* inmyanmarextendedb */, - { 1, 451, 5086, 3, 9, UNI_ALCHEMICAL } /* inalchemical */, - { 0, 1279, 8865, 2, 35, UNI_SUPMATHOPERATORS } /* blk=supplementalmathematicaloperators */, - { 66, 3491, 1368, 13, 2, UNI_NV__20 } /* numericvalue=20 */, - { 0, 34, 202, 1, 3, UNI_TAGS } /* tags */, - { 0, 1035, 373, 2, 2, UNI_CI } /* ci=y */, - { 0, 7233, 1185, 24, 2, UNI_CCC__24 } /* canonicalcombiningclass=24 */, - { 0, 6372, 1241, 3, 4, UNI_SC__GRAN } /* sc=gran */, - { 1, 558, 372, 2, 3, UNI_LOE } /* loe=y */, - { 1, 5782, 176, 21, 2, UNI_GCB__PP } /* graphemeclusterbreak=pp */, - { 107, 323, 6684, 2, 23, UNI_SHORTHANDFORMATCONTROLS } /* inshorthandformatcontrols */, - { 0, 6127, 631, 5, 5, UNI__PERL_NCHAR } /* nchar=true */, - { 3, 2473, 0, 8, 0, UNI_ETHI } /* ethiopic */, - { 0, 323, 4021, 2, 6, UNI_INTANGUT } /* intangut */, - { 15, 2666, 404, 3, 6, UNI_LB__HY } /* lb=hyphen */, - { 0, 1957, 343, 8, 3, UNI_KANASUP } /* blk=kanasup */, - { 2, 859, 645, 4, 3, -UNI_DASH } /* dash=no */, - { 0, 275, 631, 3, 5, UNI_CWT } /* cwt=true */, - { 0, 6507, 87, 4, 2, UNI_BC__LRE } /* bc=lre */, - { 1, 135, 729, 2, 5, UNI_BATK } /* isbatak */, - { 3, 6431, 1977, 15, 7, UNI_LB__SY } /* linebreak=breaksymbols */, - { 2, 1696, 1618, 4, 10, UNI_INPHOENICIAN } /* blk=phoenician */, - { 0, 306, 1363, 3, 4, UNI_NV__6000 } /* nv=6000 */, - { 0, 2278, 2185, 4, 8, UNI_NV__2_SLASH_3 } /* nv=6.667e-01 */, - { 1, 2394, 661, 6, 7, UNI_INELYMAIC } /* block=elymaic */, - { 0, 3991, 1364, 14, 3, UNI_NV__9000 } /* numericvalue=9000 */, - { 0, 6446, 631, 21, 5, UNI_MCM } /* modifiercombiningmark=true */, - { 0, 1408, 0, 4, 0, UNI_PALM } /* palm */, - { 1, 2080, 962, 10, 7, -UNI_KEHNOROTATE } /* kehnorotate=false */, - { 0, 868, 645, 5, 2, -UNI_STERM } /* sterm=n */, - { 0, 6125, 631, 21, 2, UNI__PERL_NCHAR } /* noncharactercodepoint=t */, - { 0, 434, 631, 2, 5, UNI_DI } /* di=true */, - { 35, 6647, 749, 13, 4, UNI_JG__ZAIN } /* joininggroup=zain */, - { 0, 5325, 635, 17, 3, UNI_LATINEXTE } /* block=latinextendede */, - { 0, 306, 2223, 3, 2, UNI_NV__33 } /* nv=33 */, - { 0, 4557, 760, 17, 7, UNI_KALI } /* scriptextensions=kayahli */, - { 10, 135, 671, 2, 2, UNI_PI } /* ispi */, - { 0, 5260, 6544, 10, 6, UNI_WB__FO } /* wordbreak=format */, - { 0, 4557, 890, 17, 7, UNI_TAVT } /* scriptextensions=taiviet */, - { 0, 6647, 737, 20, 4, UNI_JG__AFRICANNOON } /* joininggroup=africannoon */, - { 0, 6372, 6392, 3, 10, UNI_SC__GLAG } /* sc=glagolitic */, - { 10, 924, 803, 5, 2, UNI_AGE__2_DOT_1 } /* age=v21 */, - { 9, 2394, 3750, 6, 11, UNI_PHONETICEXT } /* block=phoneticext */, - { 11, 1874, 3230, 6, 8, UNI_SC__MYMR } /* script=myanmar */, - { 0, 1126, 654, 4, 7, UNI_ELBA } /* scx=elbasan */, - { 1, 7697, 417, 27, 2, UNI_CCC__15 } /* canonicalcombiningclass=ccc15 */, - { 4, 4557, 82, 17, 4, UNI_GONG } /* scriptextensions=gong */, - { 36, 1126, 154, 4, 4, UNI_NEWA } /* scx=newa */, - { 0, 306, 2162, 3, 3, UNI_NV__500 } /* nv=500 */, - { 0, 5059, 343, 10, 3, UNI_KANASUP } /* block=kanasup */, - { 1, 4557, 1298, 17, 4, UNI_SOYO } /* scriptextensions=soyo */, - { 2, 5, 631, 3, 5, UNI_MCM } /* mcm=true */, - { 3, 6372, 450, 3, 4, UNI_SC__LINA } /* sc=lina */, - { 12, 135, 6290, 2, 13, UNI_MATHOPERATORS } /* ismathoperators */, - { 2, 924, 309, 5, 2, UNI_AGE__9 } /* age=v90 */, - { 0, 1957, 526, 7, 3, UNI_KANBUN } /* blk=kanbun */, - { 0, 6955, 10, 22, 2, UNI_JG__MALAYALAMRA } /* joininggroup=malayalamra */, - { 4, 6372, 946, 3, 4, UNI_BASS } /* sc=bass */, - { 17, 1874, 458, 7, 4, UNI_SC__NKO } /* script=nkoo */, - { 41, 6277, 3462, 7, 14, UNI_MISCPICTOGRAPHS } /* block=miscpictographs */, - { 5, 2372, 963, 10, 2, -UNI_IDC } /* idcontinue=f */, - { 6, 323, 1039, 2, 6, UNI_INTELUGU } /* intelugu */, - { 2, 2666, 735, 3, 2, UNI_EMOD } /* lb=em */, - { 3, 2473, 6025, 8, 9, UNI_ETHIOPICEXTA } /* ethiopicextendeda */, - { 0, 20, 645, 3, 2, -UNI_XPOSIXXDIGIT } /* hex=n */, - { 4, 1696, 557, 4, 6, UNI_INOLONAL } /* blk=olonal */, - { 58, 2345, 594, 4, 3, UNI_IN__12_DOT_1 } /* in=12.1 */, - { 1, 221, 0, 4, 0, UNI_TIBT } /* tibt */, - { 10, 135, 6053, 2, 4, UNI_SUND } /* issund */, - { 0, 2338, 2292, 9, 2, UNI_IN__8 } /* presentin=8 */, - { 1, 8142, 7582, 26, 4, UNI_CJKEXTB } /* cjkunifiedideographsextensionb */, - { 0, 655, 5802, 2, 3, UNI_LB__ID } /* lb=id */, - { 0, 1441, 98, 3, 2, UNI_LB__HL } /* wb=hl */, - { 3, 1696, 2853, 4, 14, UNI_HIGHSURROGATES } /* blk=highsurrogates */, - { 3, 1874, 1291, 7, 4, UNI_SIDD } /* script=sidd */, - { 0, 4557, 1129, 16, 5, UNI_TALU } /* scriptextensions=talu */, - { 7, 2, 44, 2, 1, UNI_CWU } /* cwu */, - { 32, 1874, 510, 7, 3, UNI_VAI } /* script=vai */, - { 2, 4557, 3505, 17, 15, UNI_NARB } /* scriptextensions=oldnortharabian */, - { 0, 8468, 6842, 23, 13, UNI_INPC__TOPANDBOTTOM } /* indicpositionalcategory=topandbottom */, - { 1, 1725, 0, 11, 0, UNI_DOMINO } /* dominotiles */, - { 2, 2394, 2848, 7, 5, UNI_INCOPTIC } /* block=coptic */, - { 9, 2394, 3178, 6, 5, UNI_ASCII } /* block=ascii */, - { 0, 5364, 360, 19, 2, UNI_extpict_values_index } /* extendedpictographic= */, - { 5, 2055, 4321, 5, 5, UNI_POSIXLOWER } /* posixlower */, - { 0, 4524, 556, 14, 1, UNI_NV__37 } /* numericvalue=37 */, - { 1, 1696, 983, 7, 4, UNI_CJKEXTE } /* blk=cjkexte */, - { 0, 2338, 603, 10, 3, UNI_IN__6 } /* presentin=6.0 */, - { 4, 4635, 81, 11, 2, UNI_LATINEXTG } /* blk=latinextg */, - { 1, 323, 2005, 2, 12, UNI_INGUNJALAGONDI } /* ingunjalagondi */, - { 5, 5740, 963, 21, 2, -UNI_CWT } /* changeswhentitlecased=f */, - { 5, 8861, 4844, 7, 8, UNI_SYRIACSUP } /* block=syriacsup */, - { 17, 2666, 2674, 3, 10, UNI_LB__NS } /* lb=nonstarter */, - { 7, 30, 7867, 1, 7, UNI_INHANGUL } /* inhangul */, - { 0, 2394, 3623, 6, 16, UNI_CYPRIOTSYLLABARY } /* block=cypriotsyllabary */, - { 10, 3491, 413, 14, 1, UNI_NV__46 } /* numericvalue=46 */, - { 4, 6341, 0, 9, 0, UNI_XSUX } /* cuneiform */, - { 0, 2394, 6015, 6, 10, UNI_JAMO } /* block=hanguljamo */, - { 5, 8088, 4205, 16, 14, UNI_SC } /* generalcategory=currencysymbol */, - { 32, 323, 999, 2, 8, UNI_INGURMUKHI } /* ingurmukhi */, - { 0, 135, 5289, 2, 20, UNI_HLUW } /* isanatolianhieroglyphs */, - { 1, 2833, 5276, 3, 2, UNI_CASEDLETTER } /* gc=l_ */, - { 1, 2394, 3750, 6, 14, UNI_PHONETICEXTSUP } /* block=phoneticextsup */, - { 0, 7979, 3840, 23, 3, UNI_JG__MANICHAEANMEM } /* joininggroup=manichaeanmem */, - { 1, 38, 7644, 1, 25, UNI_KATAKANAEXT } /* katakanaphoneticextensions */, - { 0, 4557, 1157, 17, 8, UNI_UGAR } /* scriptextensions=ugaritic */, - { 0, 1126, 446, 4, 4, UNI_KHMR } /* scx=khmr */, - { 1, 2053, 261, 7, 5, UNI_POSIXCNTRL } /* isposixcntrl */, - { 3, 2053, 1523, 7, 5, UNI_POSIXSPACE } /* isposixspace */, - { 0, 2394, 6996, 6, 14, UNI_MEETEIMAYEKEXT } /* block=meeteimayekext */, - { 0, 53, 151, 1, 3, UNI_NARB } /* narb */, - { 0, 3491, 1364, 14, 3, UNI_NV__4000 } /* numericvalue=4000 */, - { 0, 7420, 6147, 5, 20, UNI_SINHALAARCHAICNUMBERS } /* blk=sinhalaarchaicnumbers */, - { 0, 1874, 1027, 7, 4, UNI_LEPC } /* script=lepc */, - { 0, 4557, 975, 17, 4, UNI_DUPL } /* scriptextensions=dupl */, - { 3, 1696, 6034, 4, 19, UNI_MONGOLIANSUP } /* blk=mongoliansupplement */, - { 0, 4, 0, 2, 0, UNI_LM } /* lm */, - { 1, 6229, 5194, 21, 6, UNI_BPT__C } /* bidipairedbrackettype=close */, - { 6, 42, 3535, 2, 7, UNI_SB__EX } /* sb=extend */, - { 0, 2502, 455, 3, 2, UNI_INMRO } /* inmro */, - { 6, 916, 0, 4, 0, UNI_age_values_index } /* age= */, - { 0, 8920, 0, 42, 0, UNI_UCASEXT } /* unifiedcanadianaboriginalsyllabicsextended */, - { 2, 323, 1051, 2, 6, UNI_INYEZIDI } /* inyezidi */, - { 57, 135, 654, 2, 4, UNI_ELBA } /* iselba */, - { 1, 1126, 1553, 4, 4, UNI_JAVA } /* scx=java */, - { 5, 1097, 4537, 4, 3, UNI_NV__13_SLASH_2 } /* nv=13/2 */, - { 7, 4557, 946, 17, 8, UNI_BASS } /* scriptextensions=bassavah */, - { 1, 8088, 138, 16, 2, UNI_ME } /* generalcategory=me */, - { 0, 5930, 631, 4, 5, UNI_EMOD } /* emod=true */, - { 3, 2394, 4190, 6, 7, UNI_BRAI } /* block=braille */, - { 0, 4557, 1241, 17, 7, UNI_GRAN } /* scriptextensions=grantha */, - { 4, 135, 193, 2, 4, UNI_SAMR } /* issamr */, - { 0, 7061, 644, 24, 4, -UNI_DI } /* defaultignorablecodepoint=no */, - { 3, 751, 3723, 5, 3, UNI_KANGXI } /* inkangxi */, - { 3, 135, 774, 2, 7, UNI_MAND } /* ismandaic */, - { 2, 1945, 963, 12, 6, -UNI_BIDIM } /* bidimirrored=false */, - { 0, 1696, 2314, 4, 8, UNI_PHAISTOS } /* blk=phaistos */, - { 0, 2502, 2100, 3, 11, UNI_INMASARAMGONDI } /* inmasaramgondi */, - { 0, 358, 302, 5, 2, UNI_CCC__130 } /* ccc=130 */, - { 3, 1696, 4067, 4, 17, UNI_INCAUCASIANALBANIAN } /* blk=caucasianalbanian */, - { 0, 6372, 311, 3, 5, UNI_SC__ORYA } /* sc=oriya */, - { 0, 6467, 5549, 14, 4, UNI_NV__20000 } /* numericvalue=20000 */, - { 4, 1696, 6015, 4, 19, UNI_JAMOEXTA } /* blk=hanguljamoextendeda */, - { 3, 1126, 458, 4, 4, UNI_NKO } /* scx=nkoo */, - { 0, 2394, 1579, 6, 10, UNI_INKHAROSHTHI } /* block=kharoshthi */, - { 3, 135, 4594, 2, 11, UNI_SGNW } /* issignwriting */, - { 2, 7979, 5164, 23, 6, UNI_JG__MANICHAEANDALETH } /* joininggroup=manichaeandaleth */, - { 37, 4557, 1176, 17, 9, UNI_BHKS } /* scriptextensions=bhaiksuki */, - { 28, 643, 1790, 3, 4, UNI_DT__VERT } /* dt=vert */, - { 3, 569, 0, 6, 0, UNI_RJNG } /* rejang */, - { 5, 458, 0, 4, 0, UNI_NKO } /* nkoo */, - { 6, 4703, 630, 8, 3, UNI_XPOSIXUPPER } /* uppercase=t */, - { 22, 2471, 6400, 8, 5, UNI_ETHIOPICSUP } /* inethiopicsup */, - { 0, 4306, 0, 4, 0, UNI_HANG } /* hang */, - { 1, 323, 6392, 2, 10, UNI_INGLAGOLITIC } /* inglagolitic */, - { 8, 7233, 561, 24, 2, UNI_CCC__AL } /* canonicalcombiningclass=al */, - { 10, 135, 208, 2, 2, UNI_TITLE } /* islt */, - { 0, 306, 919, 2, 3, UNI_NV__10 } /* nv=10 */, - { 1, 2785, 577, 2, 2, UNI_BC__S } /* bc=s */, - { 11, 2819, 631, 5, 5, UNI_EMOJI } /* emoji=true */, - { 0, 2394, 535, 6, 6, UNI_INLYDIAN } /* block=lydian */, - { 0, 1035, 0, 2, 0, UNI_CI } /* ci */, - { 0, 1236, 6620, 3, 11, UNI_CJKRADICALSSUP } /* cjkradicalssup */, - { 4, 135, 1045, 2, 6, UNI_WCHO } /* iswancho */, - { 0, 5803, 7489, 10, 17, UNI_IDENTIFIERSTATUS__RESTRICTED } /* identifierstatus=restricted */, - { 0, 3227, 1549, 11, 4, UNI_MYANMAREXTA } /* blk=myanmarexta */, - { 0, 3824, 10, 12, 2, UNI_JG__MALAYALAMRA } /* jg=malayalamra */, - { 5, 1126, 1579, 4, 4, UNI_KHAR } /* scx=khar */, - { 48, 6167, 8809, 3, 18, UNI_VO__TU } /* vo=transformedupright */, - { 0, 6647, 523, 13, 3, UNI_JG__REH } /* joininggroup=reh */, - { 1, 2418, 2654, 12, 3, -UNI_CI } /* caseignorable=n */, - { 1, 553, 2161, 4, 8, UNI_NV__15_SLASH_2 } /* nv=7.500e+00 */, - { 2, 5364, 373, 20, 4, UNI_EXTPICT } /* extendedpictographic=yes */, - { 2, 8095, 5, 9, 2, UNI_MC } /* category=mc */, - { 1, 358, 364, 4, 2, UNI_CCC__31 } /* ccc=31 */, - { 0, 7036, 373, 25, 2, UNI_CWKCF } /* changeswhennfkccasefolded=y */, - { 11, 553, 1364, 4, 3, UNI_NV__7000 } /* nv=7000 */, - { 2, 1344, 0, 9, 0, UNI_NBAT } /* nabataean */, - { 3, 2819, 0, 14, 0, UNI_ECOMP } /* emojicomponent */, - { 0, 6372, 1608, 3, 10, UNI_XPEO } /* sc=oldpersian */, - { 6, 4005, 645, 16, 3, -UNI_STERM } /* sentenceterminal=no */, - { 1, 170, 373, 3, 4, UNI_PCM } /* pcm=yes */, - { 0, 6507, 0, 4, 0, UNI_BC__L } /* bc=l */, - { 2, 6372, 1284, 3, 4, UNI_SC__PHAG } /* sc=phag */, - { 6, 5272, 2374, 15, 8, UNI__PERL_CHARNAME_CONTINUE } /* _perl_charname_continue */, - { 2, 4220, 4225, 5, 12, UNI_INDICSIYAQNUMBERS } /* indicsiyaqnumbers */, - { 2, 401, 373, 3, 4, UNI_EXT } /* ext=yes */, - { 10, 4540, 0, 17, 0, UNI_RI } /* regionalindicator */, - { 1, 3930, 2282, 14, 8, UNI_NV__1_SLASH_80 } /* numericvalue=1.250e-02 */, - { 2, 1874, 3423, 7, 4, UNI_SC__HEBR } /* script=hebr */, - { 0, 3696, 963, 16, 6, -UNI_IDSU } /* idsunaryoperator=false */, - { 8, 6372, 4414, 3, 17, UNI_KITS } /* sc=khitansmallscript */, - { 0, 135, 999, 2, 8, UNI_GURU } /* isgurmukhi */, - { 6, 2666, 293, 3, 2, UNI_GCB__L } /* lb=jl */, - { 1, 3945, 0, 14, 0, UNI_NV__5 } /* numericvalue=5 */, - { 0, 135, 818, 2, 3, UNI_ANY } /* isany */, - { 0, 1696, 8225, 5, 15, UNI_CUNEIFORMNUMBERS } /* blk=cuneiformnumbers */, - { 3, 285, 690, 3, 4, UNI_LB__H3 } /* gcb=lvt */, - { 3, 7585, 4037, 10, 14, UNI_BC__EN } /* bidiclass=europeannumber */, - { 0, 7233, 628, 25, 2, UNI_CCC__BR } /* canonicalcombiningclass=222 */, - { 1, 5059, 1336, 7, 8, UNI_INKHUDAWADI } /* block=khudawadi */, - { 1, 2819, 645, 5, 3, -UNI_EMOJI } /* emoji=no */, - { 0, 2053, 1409, 3, 8, UNI_PALM } /* ispalmyrene */, - { 0, 451, 2772, 3, 13, UNI_ANCIENTSYMBOLS } /* inancientsymbols */, - { 35, 1874, 1553, 7, 4, UNI_SC__JAVA } /* script=java */, - { 3, 2502, 2492, 3, 10, UNI_MISCSYMBOLS } /* inmiscsymbols */, - { 2, 3073, 2397, 11, 3, UNI_nfcqc_values_index } /* nfcquickcheck= */, - { 0, 135, 2853, 2, 14, UNI_HIGHSURROGATES } /* ishighsurrogates */, - { 1, 4321, 645, 5, 2, -UNI_XPOSIXLOWER } /* lower=n */, - { 16, 1538, 3740, 7, 9, UNI_GEORGIANEXT } /* georgianextended */, - { 0, 135, 7017, 2, 19, UNI_DEVANAGARIEXTA } /* isdevanagariextendeda */, - { 10, 170, 373, 3, 2, UNI_PCM } /* pcm=y */, - { 2, 135, 6806, 2, 11, UNI_NUMBERFORMS } /* isnumberforms */, - { 2, 323, 1344, 2, 9, UNI_INNABATAEAN } /* innabataean */, - { 9, 2326, 844, 9, 3, UNI_PLAYINGCARDS } /* playingcards */, - { 0, 2394, 5500, 6, 18, UNI_CHEROKEESUP } /* block=cherokeesupplement */, - { 1, 8088, 4687, 16, 15, UNI_TITLE } /* generalcategory=titlecaseletter */, - { 8, 4945, 0, 18, 0, UNI_ZP } /* paragraphseparator */, - { 8, 7697, 302, 27, 2, UNI_CCC__30 } /* canonicalcombiningclass=ccc30 */, - { 0, 2740, 1128, 12, 2, UNI_patsyn_values_index } /* patternsyntax= */, - { 4, 5698, 373, 21, 2, UNI_CWCM } /* changeswhencasemapped=y */, - { 0, 4557, 1579, 17, 4, UNI_KHAR } /* scriptextensions=khar */, - { 3, 442, 0, 3, 0, UNI_HAN } /* han */, - { 17, 135, 1837, 2, 11, UNI_MEDF } /* ismedefaidrin */, - { 0, 1696, 8375, 7, 21, UNI_CJKSYMBOLS } /* blk=cjksymbolsandpunctuation */, - { 1, 1322, 0, 5, 0, UNI_CJK } /* iscjk */, - { 1, 5325, 2694, 7, 12, UNI_LOWSURROGATES } /* block=lowsurrogates */, - { 4, 2394, 1021, 6, 6, UNI_INKAITHI } /* block=kaithi */, - { 3, 4097, 963, 17, 6, -UNI_EPRES } /* emojipresentation=false */, - { 3, 19, 645, 4, 2, -UNI_POSIXXDIGIT } /* ahex=n */, - { 36, 135, 6454, 2, 13, UNI_M } /* iscombiningmark */, - { 1, 3824, 3820, 12, 4, UNI_JG__MALAYALAMLLLA } /* jg=malayalamllla */, - { 134, 1700, 0, 7, 0, UNI_CJKEXTD } /* cjkextd */, - { 9, 2394, 2350, 6, 12, UNI_INTULUTIGALARI } /* block=tulutigalari */, - { 1, 3040, 6147, 3, 6, UNI_INSINHALA } /* insinhala */, - { 10, 2345, 600, 4, 3, UNI_IN__14 } /* in=14.0 */, - { 8, 2461, 4644, 10, 9, UNI_CYRILLICEXTB } /* incyrillicextendedb */, - { 2, 7436, 2155, 25, 2, UNI_CCC__129 } /* canonicalcombiningclass=129 */, - { 5, 3904, 373, 4, 4, UNI_MATH } /* math=yes */, - { 0, 4557, 1960, 16, 5, UNI_KANA } /* scriptextensions=kana */, - { 0, 6250, 7143, 7, 22, UNI_EGYPTIANHIEROGLYPHSEXTA } /* block=egyptianhieroglyphsexta */, - { 20, 3491, 1364, 14, 2, UNI_NV__400 } /* numericvalue=400 */, - { 0, 135, 5827, 2, 5, UNI_GREK } /* isgreek */, - { 0, 164, 7187, 2, 13, UNI_GEOMETRICSHAPES } /* geometricshapes */, - { 0, 6372, 2847, 3, 4, UNI_SC__COPT } /* sc=copt */, - { 0, 323, 975, 2, 8, UNI_INDUPLOYAN } /* induployan */, - { 0, 4557, 883, 17, 7, UNI_LANA } /* scriptextensions=taitham */, - { 0, 1874, 842, 7, 4, UNI_SC__SHRD } /* script=shrd */, - { 75, 558, 2654, 2, 4, -UNI_LOE } /* loe=no */, - { 0, 4785, 0, 8, 0, UNI_BOPO } /* bopomofo */, - { 0, 1528, 0, 8, 0, UNI_BUGI } /* buginese */, - { 29, 6431, 286, 10, 2, UNI_LB__CB } /* linebreak=cb */, - { 3, 6104, 373, 21, 2, UNI_LOE } /* logicalorderexception=y */, - { 97, 2878, 2882, 4, 8, UNI_KHMERSYMBOLS } /* khmersymbols */, - { 12, 624, 0, 6, 0, UNI_CCC__22 } /* ccc=22 */, - { 2, 358, 6548, 4, 3, UNI_CCC__202 } /* ccc=atb */, - { 1, 3099, 920, 12, 2, UNI_IN__11 } /* presentin=v110 */, - { 16, 3930, 920, 15, 2, UNI_NV__1_SLASH_10 } /* numericvalue=1/10 */, - { 5, 575, 2374, 4, 8, UNI_SB__SC } /* sb=scontinue */, - { 0, 5500, 0, 18, 0, UNI_CHEROKEESUP } /* cherokeesupplement */, - { 1, 4504, 962, 5, 3, -UNI_XPOSIXSPACE } /* wspace=f */, - { 2, 3696, 631, 16, 5, UNI_IDSU } /* idsunaryoperator=true */, - { 12, 135, 767, 2, 7, UNI_LINA } /* islineara */, - { 0, 575, 295, 3, 2, UNI_SB__XX } /* sb=xx */, - { 1, 1126, 510, 4, 3, UNI_VAI } /* scx=vai */, - { 1, 1165, 0, 8, 0, UNI_VITH } /* vithkuqi */, - { 1, 135, 991, 2, 8, UNI_GUJR } /* isgujarati */, - { 2, 2394, 5014, 6, 15, UNI_BAMUMSUP } /* block=bamumsupplement */, - { 0, 6431, 651, 10, 2, UNI_LB__ID } /* linebreak=id */, - { 0, 2785, 7403, 3, 17, UNI_BC__ES } /* bc=europeanseparator */, - { 0, 2394, 1399, 6, 9, UNI_INOLDUYGHUR } /* block=olduyghur */, - { 6, 1126, 27, 4, 4, UNI_ARMI } /* scx=armi */, - { 0, 6730, 2696, 14, 10, UNI_HIGHPUSURROGATES } /* highprivateusesurrogates */, - { 0, 704, 0, 5, 0, UNI_DOGR } /* dogra */, - { 3, 323, 341, 2, 5, UNI_VSSUP } /* invssup */, - { 1, 135, 1417, 2, 4, UNI_PAUC } /* ispauc */, - { 0, 1874, 1608, 7, 10, UNI_XPEO } /* script=oldpersian */, - { 0, 4190, 0, 4, 0, UNI_BRAI } /* brai */, - { 7, 4557, 118, 17, 4, UNI_KNDA } /* scriptextensions=knda */, - { 1, 4377, 4869, 13, 5, UNI_JG__MANICHAEANSADHE } /* jg=manichaeansadhe */, - { 0, 916, 2430, 4, 10, UNI_IN__NA } /* age=unassigned */, - { 4, 7651, 0, 28, 0, UNI_PHONETICEXTSUP } /* phoneticextensionssupplement */, - { 0, 1126, 1270, 4, 7, UNI_MULT } /* scx=multani */, - { 18, 1566, 343, 6, 3, UNI_KANASUP } /* iskanasup */, - { 8, 1322, 8225, 3, 29, UNI_CUNEIFORMNUMBERS } /* iscuneiformnumbersandpunctuation */, - { 0, 2394, 454, 6, 3, UNI_INMRO } /* block=mro */, - { 3, 270, 645, 5, 3, -UNI_CWKCF } /* cwkcf=no */, - { 0, 8792, 3186, 3, 5, UNI_NT__DI } /* nt=digit */, - { 0, 2833, 4, 3, 2, UNI_LM } /* gc=lm */, +static const struct mph_struct mph_table[MPH_BUCKETS] = { + { 1, 1733, 6484, 4, 20, UNI_GLAGOLITICSUP } /* blk=glagoliticsupplement */, + { 3, 1911, 1144, 6, 5, UNI_TALU } /* script=talu */, + { 3, 2429, 2385, 6, 12, UNI_INTULUTIGALARI } /* block=tulutigalari */, + { 0, 3976, 319, 14, 1, UNI_NV__19 } /* numericvalue=19 */, + { 1, 174, 383, 3, 4, UNI_PCM } /* pcm=yes */, + { 0, 2149, 1231, 4, 3, -UNI_XPOSIXALPHA } /* alpha=n */, + { 0, 135, 3950, 2, 10, UNI_SM } /* ismathsymbol */, + { 0, 1911, 387, 7, 6, UNI_SC__CAKM } /* script=chakma */, + { 3, 4569, 639, 17, 5, UNI_RI } /* regionalindicator=true */, { 1, 135, 20, 2, 3, UNI_XPOSIXXDIGIT } /* ishex */, - { 21, 135, 387, 2, 2, UNI_SM } /* issm */, - { 8, 8095, 2430, 9, 10, UNI_CN } /* category=unassigned */, - { 2, 2666, 7793, 3, 26, UNI_LB__CJ } /* lb=conditionaljapanesestarter */, - { 0, 323, 4291, 2, 12, UNI_DIACRITICALS } /* indiacriticals */, - { 3, 916, 606, 4, 3, UNI_AGE__7 } /* age=7.0 */, - { 0, 6372, 2029, 3, 7, UNI_SC__SOGD } /* sc=sogdian */, - { 1, 2338, 2731, 11, 3, UNI_IN__15 } /* presentin=15.0 */, - { 3, 3587, 7463, 5, 26, UNI_ENCLOSEDCJK } /* blk=enclosedcjklettersandmonths */, - { 2, 7356, 373, 26, 2, UNI_PCM } /* prependedconcatenationmark=y */, - { 2, 4156, 0, 17, 0, UNI_IDCOMPATMATHSTART } /* idcompatmathstart */, - { 4, 7979, 5176, 23, 6, UNI_JG__MANICHAEANSAMEKH } /* joininggroup=manichaeansamekh */, - { 1, 135, 238, 2, 2, UNI_PE } /* ispe */, - { 32, 1945, 373, 12, 2, UNI_BIDIM } /* bidimirrored=y */, - { 26, 1781, 1427, 3, 8, UNI_SAMR } /* issamaritan */, - { 32, 1874, 946, 7, 8, UNI_BASS } /* script=bassavah */, - { 0, 2740, 645, 13, 3, -UNI_PATSYN } /* patternsyntax=no */, - { 0, 1523, 2654, 4, 3, -UNI_XPOSIXSPACE } /* space=n */, - { 1, 2238, 556, 4, 1, UNI_NV__47 } /* nv=47 */, - { 0, 4557, 1618, 17, 10, UNI_PHNX } /* scriptextensions=phoenician */, - { 2, 3099, 2147, 11, 2, UNI_IN__5 } /* presentin=v50 */, - { 0, 1696, 126, 4, 3, UNI_INLAO } /* blk=lao */, - { 0, 859, 645, 4, 2, -UNI_DASH } /* dash=n */, - { 2, 2338, 2430, 10, 10, UNI_IN__NA } /* presentin=unassigned */, - { 1, 1696, 6730, 4, 24, UNI_HIGHPUSURROGATES } /* blk=highprivateusesurrogates */, - { 0, 7420, 8639, 16, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* blk=supplementalsymbolsandpictographs */, - { 5, 490, 0, 4, 0, UNI_QAAI } /* qaai */, - { 0, 7436, 365, 25, 2, UNI_CCC__118 } /* canonicalcombiningclass=118 */, - { 0, 969, 631, 6, 5, UNI_COMPEX } /* compex=true */, - { 1, 3491, 2213, 13, 9, UNI_NV__1_SLASH_32 } /* numericvalue=3.125e-02 */, - { 1, 135, 2122, 2, 12, UNI_MEND } /* ismendekikakui */, - { 6, 687, 1925, 6, 8, UNI_LB__H2 } /* hst=lvsyllable */, - { 43, 135, 134, 2, 4, UNI_LISU } /* islisu */, - { 0, 135, 1870, 2, 4, UNI_KTHI } /* iskthi */, - { 2, 3575, 4644, 12, 9, UNI_CYRILLICEXTB } /* blk=cyrillicextendedb */, - { 50, 4156, 631, 17, 5, UNI_IDCOMPATMATHSTART } /* idcompatmathstart=true */, - { 16, 6467, 1101, 14, 2, UNI_NV__2_SLASH_3 } /* numericvalue=2/3 */, - { 3, 1696, 6307, 4, 22, UNI_DIACRITICALSFORSYMBOLS } /* blk=diacriticalsforsymbols */, - { 5, 1126, 23, 4, 4, UNI_AHOM } /* scx=ahom */, - { 0, 3099, 2147, 12, 2, UNI_IN__15 } /* presentin=v150 */, - { 1, 8088, 261, 16, 2, UNI_CN } /* generalcategory=cn */, - { 24, 4557, 861, 17, 7, UNI_SHAW } /* scriptextensions=shavian */, - { 0, 1126, 585, 4, 6, UNI_TODR } /* scx=todhri */, - { 2, 2394, 883, 6, 7, UNI_INTAITHAM } /* block=taitham */, - { 1, 5976, 5990, 5, 7, UNI_SUPARROWSB } /* insuparrowsb */, - { 2, 1696, 4261, 4, 15, UNI_VEDICEXT } /* blk=vedicextensions */, - { 0, 135, 1446, 2, 4, UNI_XIDS } /* isxids */, - { 2, 5272, 6977, 6, 19, UNI__PERL_FOLDS_TO_MULTI_CHAR } /* _perl_folds_to_multi_char */, - { 0, 2394, 694, 6, 5, UNI_INADLAM } /* block=adlam */, - { 0, 135, 297, 2, 5, UNI_NSHU } /* isnushu */, - { 0, 4557, 3218, 16, 5, UNI_GEOR } /* scriptextensions=geor */, - { 1, 8197, 1741, 28, 4, UNI_CJKEXTI } /* iscjkunifiedideographsextensioni */, - { 1, 1696, 1725, 4, 6, UNI_DOMINO } /* blk=domino */, - { 0, 1696, 1149, 4, 8, UNI_INTIFINAGH } /* blk=tifinagh */, - { 0, 323, 1057, 2, 4, UNI_JAMO } /* injamo */, - { 1, 6370, 7890, 14, 16, UNI_INSC__CONSONANTINITIALPOSTFIXED } /* insc=consonantinitialpostfixed */, - { 0, 1126, 8927, 4, 18, UNI_CANS } /* scx=canadianaboriginal */, - { 2, 358, 2347, 3, 3, UNI_CCC__14 } /* ccc=14 */, - { 0, 6372, 1885, 3, 4, UNI_SORA } /* sc=sora */, - { 10, 2371, 2654, 10, 3, -UNI_XIDC } /* xidcontinue=n */, - { 4, 2799, 1549, 10, 4, UNI_ARABICEXTA } /* blk=arabicexta */, - { 16, 399, 373, 5, 2, UNI_GREXT } /* grext=y */, - { 0, 4557, 2026, 17, 10, UNI_SOGO } /* scriptextensions=oldsogdian */, - { 1, 30, 1222, 1, 8, UNI_BENG } /* isbengali */, - { 2, 5, 963, 3, 2, -UNI_MCM } /* mcm=f */, - { 0, 253, 0, 4, 0, UNI_ZYYY } /* zyyy */, - { 32, 2394, 876, 6, 7, UNI_INTAGALOG } /* block=tagalog */, - { 1, 8324, 7582, 30, 4, UNI_CJKEXTB } /* blk=cjkunifiedideographsextensionb */, - { 0, 5260, 1880, 9, 3, UNI_WB__ML } /* wordbreak=ml */, - { 3, 8088, 345, 16, 2, UNI_PF } /* generalcategory=pf */, - { 4, 3961, 5549, 14, 5, UNI_NV__700000 } /* numericvalue=700000 */, - { 0, 7868, 690, 18, 3, UNI_LB__H2 } /* hangulsyllabletype=lv */, - { 2, 323, 4261, 2, 8, UNI_VEDICEXT } /* invedicext */, - { 3, 3040, 6054, 3, 11, UNI_SUNDANESESUP } /* insundanesesup */, - { 0, 869, 288, 4, 1, UNI_term_values_index } /* term= */, - { 34, 2799, 6025, 10, 9, UNI_ARABICEXTA } /* blk=arabicextendeda */, - { 0, 135, 6034, 2, 19, UNI_MONGOLIANSUP } /* ismongoliansupplement */, - { 1, 6372, 1885, 3, 11, UNI_SORA } /* sc=sorasompeng */, - { 27832, 135, 774, 2, 4, UNI_MAND } /* ismand */, - { 0, 4635, 4793, 9, 9, UNI_LATINEXTC } /* blk=latinextendedc */, - { 1, 434, 645, 3, 3, -UNI_DIA } /* dia=no */, - { 4, 2899, 4793, 10, 9, UNI_CYRILLICEXTC } /* iscyrillicextendedc */, - { 0, 1874, 579, 7, 6, UNI_TNSA } /* script=tangsa */, - { 4, 1696, 2489, 7, 4, UNI_CJKEXTI } /* blk=cjkexti */, - { 9, 2290, 1364, 4, 3, UNI_NV__8000 } /* nv=8000 */, - { 2, 15, 3972, 2, 3, UNI_AGE__7 } /* age=7 */, - { 0, 1390, 0, 9, 0, UNI_ORKH } /* oldturkic */, - { 1, 3178, 644, 12, 4, -UNI_POSIXXDIGIT } /* asciihexdigit=no */, - { 0, 135, 454, 2, 4, UNI_MRO } /* ismroo */, - { 14, 1151, 4741, 3, 13, UNI_PF } /* finalpunctuation */, - { 1, 859, 3287, 3, 2, UNI_dash_values_index } /* dash= */, - { 0, 6372, 1904, 3, 11, UNI_SC__SYLO } /* sc=sylotinagri */, - { 0, 1322, 3712, 5, 6, UNI_CJKCOMPAT } /* iscjkcompat */, - { 1, 6372, 938, 3, 4, UNI_BALI } /* sc=bali */, - { 4, 2394, 8225, 7, 29, UNI_CUNEIFORMNUMBERS } /* block=cuneiformnumbersandpunctuation */, - { 0, 2785, 319, 3, 2, UNI_BC__WS } /* bc=ws */, - { 0, 4377, 5164, 13, 6, UNI_JG__MANICHAEANDALETH } /* jg=manichaeandaleth */, - { 0, 5, 1589, 1, 9, UNI_MISCARROWS } /* miscarrows */, - { 1, 2612, 4358, 3, 7, UNI_JG__HEHGOAL } /* jg=hehgoal */, - { 22, 3734, 0, 11, 0, UNI_LATINEXTE } /* inlatinexte */, - { 3, 3106, 417, 4, 3, UNI_IN__15_DOT_1 } /* in=v151 */, - { 15, 6647, 6934, 13, 21, UNI_JG__HANIFIROHINGYAKINNAYA } /* joininggroup=hanifirohingyakinnaya */, - { 1, 1790, 1523, 4, 5, UNI_VERTSPACE } /* vertspace */, - { 3, 323, 1426, 2, 9, UNI_INSAMARITAN } /* insamaritan */, - { 13, 6838, 2786, 3, 7, UNI_INPC__RIGHT } /* inpc=right */, - { 0, 3099, 803, 11, 2, UNI_IN__2_DOT_1 } /* presentin=v21 */, - { 0, 2338, 2213, 10, 3, UNI_IN__3_DOT_1 } /* presentin=3.1 */, - { 10, 2394, 7333, 7, 23, UNI_DIACRITICALSFORSYMBOLS } /* block=combiningmarksforsymbols */, - { 12, 2394, 4666, 9, 4, UNI_CJKEXTC } /* block=cjkextc */, - { 16, 299, 6686, 2, 21, UNI_SHORTHANDFORMATCONTROLS } /* shorthandformatcontrols */, - { 3, 2201, 5549, 4, 4, UNI_NV__20000 } /* nv=20000 */, - { 1, 1126, 6341, 4, 9, UNI_XSUX } /* scx=cuneiform */, - { 0, 1874, 134, 7, 4, UNI_SC__LISU } /* script=lisu */, - { 4, 2, 372, 1, 2, UNI_ce_values_index } /* ce= */, - { 1, 135, 1007, 2, 4, UNI_HIRA } /* ishira */, - { 8, 4190, 2740, 7, 8, UNI_BRAI } /* braillepatterns */, - { 30, 4557, 709, 17, 4, UNI_LIMB } /* scriptextensions=limb */, - { 129, 3491, 551, 14, 2, UNI_NV__4_SLASH_5 } /* numericvalue=4/5 */, - { 9, 6955, 3820, 22, 4, UNI_JG__MALAYALAMLLLA } /* joininggroup=malayalamllla */, - { 0, 3930, 413, 15, 1, UNI_NV__1_SLASH_6 } /* numericvalue=1/6 */, - { 9, 2394, 8364, 6, 18, UNI_IDEOGRAPHICSYMBOLS } /* block=ideographicsymbols */, - { 5, 4557, 975, 17, 8, UNI_DUPL } /* scriptextensions=duployan */, - { 1, 213, 0, 4, 0, UNI_TFNG } /* tfng */, - { 64, 1874, 47, 7, 4, UNI_SC__CAKM } /* script=cakm */, - { 2, 1874, 245, 7, 2, UNI_SC__YI } /* script=yi */, - { 2, 2833, 5, 3, 2, UNI_MC } /* gc=mc */, - { 1, 3824, 5661, 12, 3, UNI_JG__MALAYALAMTTA } /* jg=malayalamtta */, - { 8, 4557, 774, 17, 7, UNI_MAND } /* scriptextensions=mandaic */, - { 0, 1126, 3560, 4, 15, UNI_ZANB } /* scx=zanabazarsquare */, - { 1, 3491, 2138, 13, 2, UNI_NV__11 } /* numericvalue=11 */, - { 3, 7233, 3489, 24, 2, UNI_CCC__36 } /* canonicalcombiningclass=36 */, - { 8, 6372, 237, 3, 4, UNI_XPEO } /* sc=xpeo */, - { 1, 2601, 4703, 6, 5, UNI_XPOSIXUPPER } /* xposixupper */, - { 0, 343, 4280, 3, 11, UNI_SUPPUNCTUATION } /* suppunctuation */, - { 0, 2338, 2731, 10, 3, UNI_IN__5 } /* presentin=5.0 */, - { 1, 2372, 630, 9, 6, UNI_IDC } /* idcontinue=true */, - { 0, 135, 7086, 2, 24, UNI_COMPEX } /* isfullcompositionexclusion */, - { 8, 7951, 373, 17, 4, UNI_VS } /* variationselector=yes */, - { 1, 2601, 2114, 6, 5, UNI_XPOSIXALPHA } /* xposixalpha */, - { 0, 1874, 1015, 7, 6, UNI_HATR } /* script=hatran */, - { 0, 2819, 631, 14, 5, UNI_ECOMP } /* emojicomponent=true */, - { 0, 135, 3423, 2, 6, UNI_HEBR } /* ishebrew */, - { 0, 8095, 0, 9, 0, UNI_gc_values_index } /* category= */, - { 0, 2350, 0, 12, 0, UNI_TUTG } /* tulutigalari */, - { 25, 3599, 6025, 12, 9, UNI_ARABICEXTA } /* block=arabicextendeda */, - { 7, 6431, 6454, 10, 13, UNI_LB__CM } /* linebreak=combiningmark */, - { 14, 8468, 0, 24, 0, UNI_inpc_values_index } /* indicpositionalcategory= */, - { 1, 1126, 6053, 4, 9, UNI_SUND } /* scx=sundanese */, - { 1, 1874, 4021, 7, 6, UNI_SC__TANG } /* script=tangut */, - { 9, 2833, 4276, 3, 15, UNI_PD } /* gc=dashpunctuation */, - { 1, 6372, 4190, 3, 4, UNI_BRAI } /* sc=brai */, - { 13, 358, 561, 4, 2, UNI_CCC__AL } /* ccc=al */, - { 8, 1696, 5827, 4, 5, UNI_INGREEK } /* blk=greek */, - { 4, 323, 1335, 2, 9, UNI_INKHUDAWADI } /* inkhudawadi */, - { 1, 2290, 5549, 4, 5, UNI_NV__800000 } /* nv=800000 */, - { 2, 135, 229, 2, 4, UNI_TUTG } /* istutg */, - { 4, 285, 3288, 2, 7, UNI_L } /* gc=letter */, - { 2, 6372, 130, 3, 4, UNI_SC__LATN } /* sc=latn */, - { 2, 4524, 1364, 14, 3, UNI_NV__3000 } /* numericvalue=3000 */, - { 0, 1459, 1703, 5, 4, UNI_LATINEXTD } /* latinextd */, - { 5, 2573, 0, 5, 0, UNI_JOINC } /* joinc */, - { 0, 4687, 0, 5, 0, UNI_TITLE } /* title */, - { 1, 2266, 796, 4, 2, UNI_NV__5_SLASH_2 } /* nv=5/2 */, - { 3, 4510, 645, 14, 3, UNI_NFKDQC__N } /* nfkdquickcheck=no */, - { 3, 4540, 963, 17, 2, -UNI_RI } /* regionalindicator=f */, - { 19, 1874, 1075, 7, 8, UNI_KRAI } /* script=kiratrai */, - { 0, 0, 135, 1, 3, UNI_LISU } /* lisu */, - { 1, 7847, 1200, 18, 6, UNI_DT__MED } /* decompositiontype=medial */, - { 0, 2069, 2787, 11, 2, UNI_JT__R } /* joiningtype=r */, - { 0, 7697, 363, 27, 2, UNI_CCC__23 } /* canonicalcombiningclass=ccc23 */, - { 0, 6372, 162, 3, 4, UNI_SC__OSGE } /* sc=osge */, - { 4, 916, 2731, 5, 3, UNI_AGE__15 } /* age=15.0 */, - { 3, 510, 246, 2, 2, UNI_VAI } /* vaii */, - { 0, 4321, 2654, 8, 3, -UNI_XPOSIXLOWER } /* lowercase=n */, - { 8, 358, 309, 4, 1, UNI_CCC__9 } /* ccc=9 */, - { 2, 30, 4219, 1, 18, UNI_INDICSIYAQNUMBERS } /* isindicsiyaqnumbers */, - { 0, 135, 938, 2, 8, UNI_BALI } /* isbalinese */, - { 35, 6372, 3623, 3, 7, UNI_SC__CPRT } /* sc=cypriot */, - { 4, 3778, 4888, 15, 10, UNI_LATINEXTADDITIONAL } /* islatinextendedadditional */, - { 2, 326, 631, 5, 2, UNI_QMARK } /* qmark=t */, - { 0, 4557, 1579, 17, 10, UNI_KHAR } /* scriptextensions=kharoshthi */, - { 10, 6370, 2522, 5, 8, UNI_INSC__AVAGRAHA } /* insc=avagraha */, - { 25, 904, 963, 5, 2, -UNI_UIDEO } /* uideo=f */, - { 0, 306, 2146, 3, 2, UNI_NV__25 } /* nv=25 */, - { 2, 3227, 6817, 5, 21, UNI_MISCTECHNICAL } /* blk=miscellaneoustechnical */, - { 1, 1773, 4664, 6, 6, UNI_ARABICEXTC } /* isarabicextc */, - { 0, 6647, 6412, 13, 19, UNI_JG__BURUSHASKIYEHBARREE } /* joininggroup=burushaskiyehbarree */, - { 3, 8088, 117, 16, 2, UNI_SK } /* generalcategory=sk */, - { 0, 5482, 0, 18, 0, UNI_TAIXUANJING } /* taixuanjingsymbols */, - { 0, 1257, 3796, 6, 10, UNI_KANASUP } /* inkanasupplement */, - { 0, 8861, 4590, 8, 15, UNI_SUTTONSIGNWRITING } /* block=suttonsignwriting */, - { 0, 1322, 7333, 3, 23, UNI_DIACRITICALSFORSYMBOLS } /* iscombiningmarksforsymbols */, - { 0, 1696, 714, 4, 5, UNI_INOGHAM } /* blk=ogham */, - { 1, 3106, 803, 4, 2, UNI_IN__2_DOT_1 } /* in=v21 */, - { 0, 1608, 0, 10, 0, UNI_XPEO } /* oldpersian */, - { 5, 3976, 1364, 14, 3, UNI_NV__8000 } /* numericvalue=8000 */, - { 4, 4557, 946, 17, 4, UNI_BASS } /* scriptextensions=bass */, - { 0, 1965, 0, 4, 0, UNI_UCAS } /* ucas */, - { 1, 1499, 645, 3, 2, -UNI_DEP } /* dep=n */, - { 0, 8095, 6897, 9, 14, UNI_LM } /* category=modifierletter */, - { 1, 135, 189, 2, 4, UNI_RUNR } /* isrunr */, - { 0, 4321, 373, 5, 2, UNI_XPOSIXLOWER } /* lower=y */, - { 1, 4540, 373, 17, 2, UNI_RI } /* regionalindicator=y */, - { 1, 2394, 1075, 6, 8, UNI_INKIRATRAI } /* block=kiratrai */, - { 0, 2394, 1528, 6, 8, UNI_INBUGINESE } /* block=buginese */, - { 0, 323, 861, 2, 7, UNI_SC__SHAW } /* inshavian */, - { 1, 1499, 631, 10, 5, UNI_DEP } /* deprecated=true */, - { 6, 4557, 233, 17, 4, UNI_WCHO } /* scriptextensions=wcho */, - { 0, 135, 266, 2, 4, UNI_CWCF } /* iscwcf */, - { 0, 1441, 1960, 2, 3, UNI_WB__KA } /* wb=ka */, - { 0, 6955, 755, 22, 3, UNI_JG__MALAYALAMNNA } /* joininggroup=malayalamnna */, - { 1, 1874, 883, 7, 7, UNI_LANA } /* script=taitham */, - { 0, 7090, 373, 20, 2, UNI_CE } /* compositionexclusion=y */, - { 0, 4173, 0, 4, 0, UNI_IDSB } /* idsb */, - { 2, 1230, 4051, 3, 16, UNI_UCAS } /* incanadiansyllabics */, - { 0, 3491, 1363, 13, 2, UNI_NV__60 } /* numericvalue=60 */, - { 0, 1126, 876, 4, 7, UNI_TGLG } /* scx=tagalog */, - { 3, 1696, 938, 4, 8, UNI_INBALINESE } /* blk=balinese */, - { 4, 767, 279, 4, 3, UNI_LINA } /* lineara */, - { 2, 2909, 8533, 3, 31, UNI_EGYPTIANHIEROGLYPHFORMATCONTROLS } /* isegyptianhieroglyphformatcontrols */, - { 0, 6372, 1015, 3, 4, UNI_HATR } /* sc=hatr */, - { 20, 306, 2242, 4, 8, UNI_NV__11_SLASH_12 } /* nv=9.167e-01 */, - { 0, 3227, 8880, 5, 20, UNI_MATHOPERATORS } /* blk=mathematicaloperators */, - { 0, 2666, 9, 3, 2, UNI_LB__CR } /* lb=cr */, - { 10, 1696, 1977, 7, 7, UNI_CJKSYMBOLS } /* blk=cjksymbols */, - { 0, 5069, 1917, 14, 3, UNI_EBASE } /* emojimodifierbase */, - { 2, 1447, 963, 7, 2, -UNI_IDS } /* idstart=f */, - { 1, 1279, 4637, 4, 16, UNI_LATINEXTB } /* block=latinextendedb */, - { 0, 1474, 1185, 7, 2, UNI_CCC__24 } /* ccc=ccc24 */, - { 21, 2573, 645, 11, 2, -UNI_JOINC } /* joincontrol=n */, - { 6, 4173, 373, 17, 2, UNI_IDSB } /* idsbinaryoperator=y */, - { 1, 8468, 8795, 30, 14, UNI_INPC__TOPANDBOTTOMANDRIGHT } /* indicpositionalcategory=topandbottomandright */, - { 21, 1126, 1291, 4, 4, UNI_SIDD } /* scx=sidd */, - { 0, 3736, 635, 11, 3, UNI_LATINEXTE } /* latinextendede */, - { 0, 4021, 4027, 6, 10, UNI_TANGUTCOMPONENTS } /* tangutcomponents */, - { 3, 7606, 1744, 21, 7, UNI_BC__RLI } /* bidiclass=righttoleftisolate */, - { 0, 30, 3179, 1, 3, UNI_CI } /* isci */, - { 1, 1126, 909, 4, 7, UNI_ZZZZ } /* scx=unknown */, - { 4, 1874, 257, 7, 4, UNI_ZZZZ } /* script=zzzz */, - { 1, 6647, 819, 13, 3, UNI_JG__NYA } /* joininggroup=nya */, - { 8, 2, 1973, 1, 11, UNI_CHESSSYMBOLS } /* chesssymbols */, - { 0, 2666, 3062, 3, 6, UNI_LB__VI } /* lb=virama */, - { 3, 1696, 5462, 4, 20, UNI_ININSCRIPTIONALPAHLAVI } /* blk=inscriptionalpahlavi */, - { 0, 6229, 957, 21, 5, UNI_BPT__O } /* bidipairedbrackettype=open */, - { 0, 3696, 4701, 15, 2, UNI_idsu_values_index } /* idsunaryoperator= */, - { 0, 358, 5660, 4, 17, UNI_WB__EB } /* ccc=attachedbelowleft */, - { 0, 6647, 3386, 13, 12, UNI_JG__FINALSEMKATH } /* joininggroup=finalsemkath */, - { 0, 3976, 2732, 14, 8, UNI_NV__4_SLASH_5 } /* numericvalue=8.000e-01 */, - { 0, 323, 627, 2, 2, UNI_IN__2 } /* in=2 */, - { 25, 8095, 3360, 9, 13, UNI_XPOSIXDIGIT } /* category=decimalnumber */, - { 0, 8037, 645, 11, 3, -UNI_IDEO } /* ideographic=no */, - { 0, 7697, 362, 27, 2, UNI_CCC__12 } /* canonicalcombiningclass=ccc12 */, - { 0, 1874, 1039, 7, 4, UNI_SC__TELU } /* script=telu */, - { 1, 4321, 962, 8, 3, -UNI_XPOSIXLOWER } /* lowercase=f */, - { 0, 7766, 0, 17, 0, UNI_ANCIENTGREEKMUSIC } /* ancientgreekmusic */, - { 2, 1126, 529, 4, 6, UNI_KHOJ } /* scx=khojki */, - { 2, 1126, 3325, 4, 15, UNI_ARMI } /* scx=imperialaramaic */, - { 1, 2759, 0, 13, 0, UNI_VERTICALFORMS } /* verticalforms */, - { 1, 1126, 579, 4, 6, UNI_TNSA } /* scx=tangsa */, - { 1, 2394, 1426, 6, 9, UNI_INSAMARITAN } /* block=samaritan */, - { 0, 1874, 1417, 7, 9, UNI_PAUC } /* script=paucinhau */, - { 0, 1810, 645, 11, 2, -UNI_KEHNOMIRROR } /* kehnomirror=n */, - { 0, 2345, 600, 3, 3, UNI_IN__4 } /* in=4.0 */, - { 5, 387, 0, 2, 0, UNI_SM } /* sm */, - { 2, 1447, 631, 3, 2, UNI_IDS } /* ids=t */, - { 4, 7868, 0, 20, 0, UNI_GCB__L } /* hangulsyllabletype=l */, - { 25003, 1126, 883, 4, 7, UNI_LANA } /* scx=taitham */, - { 0, 4557, 474, 17, 4, UNI_ORKH } /* scriptextensions=orkh */, - { 164, 1874, 5148, 7, 14, UNI_SC__ROHG } /* script=hanifirohingya */, - { 2, 546, 6483, 4, 8, UNI_NV__1_SLASH_320 } /* nv=3.125e-03 */, - { 6, 8693, 0, 25, 0, UNI_SYMBOLSFORLEGACYCOMPUTING } /* symbolsforlegacycomputing */, - { 0, 323, 7669, 2, 28, UNI_SUPPUAA } /* insupplementaryprivateuseareaa */, - { 1, 2601, 4280, 6, 5, UNI_XPOSIXPUNCT } /* xposixpunct */, - { 10, 5102, 1766, 18, 7, UNI_INCB__LINKER } /* indicconjunctbreak=linker */, - { 3, 4414, 0, 17, 0, UNI_KITS } /* khitansmallscript */, - { 0, 4557, 6392, 17, 10, UNI_GLAG } /* scriptextensions=glagolitic */, - { 33, 7233, 2787, 23, 6, UNI_CCC__R } /* canonicalcombiningclass=right */, - { 9, 2394, 714, 6, 5, UNI_INOGHAM } /* block=ogham */, - { 3, 5260, 1648, 10, 2, UNI_LB__LF } /* wordbreak=lf */, - { 0, 312, 0, 2, 0, UNI_RI } /* ri */, - { 8, 7847, 1208, 17, 7, UNI_DT__NAR } /* decompositiontype=narrow */, - { 1, 4321, 645, 9, 3, -UNI_XPOSIXLOWER } /* lowercase=no */, - { 0, 1696, 1057, 4, 8, UNI_JAMOEXTB } /* blk=jamoextb */, - { 0, 1230, 8827, 3, 34, UNI_DIACRITICALSSUP } /* incombiningdiacriticalmarkssupplement */, - { 0, 306, 0, 5, 0, UNI_NV__90 } /* nv=90 */, - { 12, 2502, 8058, 3, 30, UNI_MATHALPHANUM } /* inmathematicalalphanumericsymbols */, - { 1, 6647, 4869, 13, 5, UNI_JG__SADHE } /* joininggroup=sadhe */, - { 0, 5272, 2696, 6, 9, UNI__PERL_SURROGATE } /* _perl_surrogate */, - { 1, 323, 7259, 2, 26, UNI_HALFANDFULLFORMS } /* inhalfwidthandfullwidthforms */, - { 1, 2345, 2430, 3, 10, UNI_IN__NA } /* in=unassigned */, - { 0, 8792, 3360, 3, 7, UNI_XPOSIXDIGIT } /* nt=decimal */, - { 2, 2799, 8396, 10, 29, UNI_ARABICMATH } /* blk=arabicmathematicalalphabeticsymbols */, - { 12, 1775, 4664, 4, 6, UNI_ARABICEXTC } /* arabicextc */, - { 20, 1874, 6862, 7, 6, UNI_BRAH } /* script=brahmi */, - { 33, 30, 868, 1, 5, UNI_TERM } /* isterm */, - { 5, 285, 645, 2, 3, UNI_NO } /* gc=no */, - { 24, 6431, 3040, 10, 11, UNI_LB__IN } /* linebreak=inseparable */, - { 5, 788, 645, 6, 2, UNI_NFKCQC__N } /* nfkcqc=n */, - { 3, 4557, 245, 17, 4, UNI_YI } /* scriptextensions=yiii */, - { 1, 1874, 5289, 7, 20, UNI_HLUW } /* script=anatolianhieroglyphs */, - { 0, 7420, 6055, 6, 10, UNI_SUNDANESESUP } /* blk=sundanesesup */, - { 0, 6370, 0, 14, 0, UNI_INSC__CONSONANT } /* insc=consonant */, - { 7, 1696, 6034, 4, 9, UNI_INMONGOLIAN } /* blk=mongolian */, - { 2, 135, 8693, 2, 25, UNI_SYMBOLSFORLEGACYCOMPUTING } /* issymbolsforlegacycomputing */, - { 22, 1696, 815, 4, 7, UNI_INOSMANYA } /* blk=osmanya */, - { 0, 7061, 644, 24, 3, -UNI_DI } /* defaultignorablecodepoint=n */, - { 2, 553, 2205, 4, 8, UNI_NV__3_SLASH_4 } /* nv=7.500e-01 */, - { 0, 1874, 815, 7, 4, UNI_OSMA } /* script=osma */, - { 2, 1441, 4540, 3, 17, UNI_RI } /* wb=regionalindicator */, - { 5, 7847, 1901, 18, 3, UNI_DT__SUB } /* decompositiontype=sub */, - { 0, 1126, 2026, 4, 10, UNI_SOGO } /* scx=oldsogdian */, - { 98, 1579, 0, 10, 0, UNI_KHAR } /* kharoshthi */, - { 43, 1236, 1492, 3, 7, UNI_CJKSTROKES } /* cjkstrokes */, - { 0, 135, 434, 2, 3, UNI_DIA } /* isdia */, - { 18, 916, 417, 4, 2, UNI_AGE__15 } /* age=15 */, - { 0, 358, 365, 4, 2, UNI_CCC__18 } /* ccc=18 */, - { 2, 135, 2314, 2, 12, UNI_PHAISTOS } /* isphaistosdisc */, - { 0, 5976, 5253, 14, 7, UNI_SUPARROWSA } /* insupplementalarrowsa */, - { 0, 1775, 4644, 6, 9, UNI_ARABICEXTB } /* arabicextendedb */, - { 4, 624, 2348, 5, 2, UNI_CCC__214 } /* ccc=214 */, - { 0, 2612, 696, 3, 3, UNI_JG__LAM } /* jg=lam */, - { 2, 975, 980, 5, 3, UNI_DUPL } /* duployan */, - { 51, 1874, 991, 7, 8, UNI_SC__GUJR } /* script=gujarati */, - { 2, 4557, 1859, 17, 11, UNI_HMNG } /* scriptextensions=pahawhhmong */, - { 0, 285, 690, 3, 3, UNI_LB__H2 } /* gcb=lv */, - { 1, 7585, 6532, 10, 3, UNI_BC__PDI } /* bidiclass=pdi */, - { 8, 1335, 0, 9, 0, UNI_SIND } /* khudawadi */, - { 0, 323, 719, 2, 5, UNI_INOSAGE } /* inosage */, - { 0, 1744, 1401, 4, 7, UNI_OUGR } /* isolduyghur */, - { 2, 306, 832, 3, 3, UNI_NV__NAN } /* nv=nan */, - { 1, 306, 796, 4, 2, UNI_NV__9_SLASH_2 } /* nv=9/2 */, - { 0, 3930, 304, 15, 2, UNI_NV__1_SLASH_40 } /* numericvalue=1/40 */, - { 0, 6277, 5211, 7, 18, UNI_MODIFIERTONELETTERS } /* block=modifiertoneletters */, - { 8, 4510, 373, 14, 2, UNI_DT__NONE } /* nfkdquickcheck=y */, - { 2, 1696, 808, 4, 7, UNI_OLCK } /* blk=olchiki */, - { 0, 1874, 462, 7, 4, UNI_OGAM } /* script=ogam */, - { 5, 2584, 7819, 3, 28, UNI_MISCARROWS } /* ismiscellaneoussymbolsandarrows */, - { 0, 6431, 3535, 9, 3, UNI_LB__EX } /* linebreak=ex */, - { 0, 3976, 5549, 14, 4, UNI_NV__80000 } /* numericvalue=80000 */, - { 23, 1447, 645, 3, 3, -UNI_IDS } /* ids=no */, - { 6, 320, 1135, 2, 6, UNI_SPECIALS } /* specials */, - { 0, 924, 418, 5, 2, UNI_AGE__5_DOT_1 } /* age=v51 */, - { 2, 1781, 5518, 3, 11, UNI_SMALLKANAEXT } /* issmallkanaext */, - { 0, 3734, 0, 16, 0, UNI_LATINEXTD } /* inlatinextendedd */, - { 0, 2069, 3011, 11, 12, UNI_JT__T } /* joiningtype=transparent */, - { 0, 1259, 0, 4, 0, UNI_KANA } /* kana */, - { 0, 1775, 6400, 4, 12, UNI_ARABICSUP } /* arabicsupplement */, - { 1, 343, 1896, 3, 8, UNI_SUPERANDSUB } /* superandsub */, - { 19, 208, 0, 2, 0, UNI_TITLE } /* lt */, - { 0, 2338, 308, 9, 2, UNI_IN__9 } /* presentin=9 */, - { 8, 44, 905, 1, 4, UNI_UIDEO } /* uideo */, - { 1, 1230, 8225, 3, 29, UNI_CUNEIFORMNUMBERS } /* incuneiformnumbersandpunctuation */, - { 6, 3587, 6400, 10, 5, UNI_ETHIOPICSUP } /* blk=ethiopicsup */, - { 4, 1874, 3590, 6, 5, UNI_SC__ETHI } /* script=ethi */, - { 1, 2394, 4785, 6, 8, UNI_INBOPOMOFO } /* block=bopomofo */, - { 0, 1874, 4785, 7, 4, UNI_SC__BOPO } /* script=bopo */, - { 1, 11, 5086, 1, 16, UNI_ALCHEMICAL } /* alchemicalsymbols */, - { 8, 2612, 749, 3, 4, UNI_JG__ZAIN } /* jg=zain */, - { 5, 6372, 245, 3, 4, UNI_SC__YI } /* sc=yiii */, - { 3, 3930, 795, 14, 3, UNI_NV__11_SLASH_2 } /* numericvalue=11/2 */, - { 1, 1696, 7208, 4, 25, UNI_SUPERANDSUB } /* blk=superscriptsandsubscripts */, - { 0, 285, 1915, 4, 5, UNI_WB__EB } /* gcb=ebase */, - { 2, 2394, 6392, 6, 20, UNI_GLAGOLITICSUP } /* block=glagoliticsupplement */, - { 0, 54, 1129, 2, 5, UNI_TALU } /* sc=talu */, - { 12, 1322, 1250, 3, 3, UNI_CHER } /* ischer */, - { 1, 4504, 372, 5, 2, UNI_wspace_values_index } /* wspace= */, - { 9, 1126, 4620, 4, 6, UNI_ZYYY } /* scx=common */, - { 1, 2833, 671, 3, 2, UNI_PI } /* gc=pi */, - { 1, 2394, 4785, 6, 11, UNI_BOPOMOFOEXT } /* block=bopomofoext */, - { 0, 8095, 3643, 9, 9, UNI_Z } /* category=separator */, - { 0, 1126, 1045, 4, 6, UNI_WCHO } /* scx=wancho */, - { 0, 8145, 645, 16, 3, -UNI_UIDEO } /* unifiedideograph=no */, - { 0, 6372, 1509, 3, 10, UNI_DIAK } /* sc=divesakuru */, - { 19, 323, 6862, 2, 6, UNI_INBRAHMI } /* inbrahmi */, - { 2, 2666, 4784, 3, 2, UNI_LB__BB } /* lb=bb */, - { 0, 108, 1477, 2, 2, UNI_JT__C } /* jt=c */, - { 31, 6431, 4445, 10, 14, UNI_LB__SA } /* linebreak=complexcontext */, - { 128, 6370, 3354, 14, 6, UNI_INSC__CONSONANTKILLER } /* insc=consonantkiller */, - { 7, 323, 3505, 2, 15, UNI_NARB } /* inoldnortharabian */, - { 1, 2053, 1993, 7, 5, UNI_POSIXGRAPH } /* isposixgraph */, - { 0, 1696, 6897, 4, 15, UNI_MODIFIERLETTERS } /* blk=modifierletters */, - { 0, 4718, 0, 18, 0, UNI_IDST } /* idstrinaryoperator */, - { 8, 6127, 963, 5, 6, -UNI__PERL_NCHAR } /* nchar=false */, - { 0, 8861, 5253, 18, 7, UNI_SUPARROWSA } /* block=supplementalarrowsa */, - { 3, 2394, 4669, 6, 18, UNI_COPTICEPACTNUMBERS } /* block=copticepactnumbers */, - { 24, 6372, 680, 3, 7, UNI_SC__HANO } /* sc=hanunoo */, - { 0, 1446, 644, 7, 2, UNI_xids_values_index } /* xidstart= */, - { 2, 3599, 2867, 7, 11, UNI_ALPHABETICPF } /* block=alphabeticpf */, - { 79, 1446, 963, 8, 2, -UNI_XIDS } /* xidstart=f */, - { 38, 2, 68, 1, 3, UNI_CPRT } /* cprt */, - { 0, 4557, 237, 17, 4, UNI_XPEO } /* scriptextensions=xpeo */, - { 0, 5260, 1915, 10, 5, UNI_WB__EB } /* wordbreak=ebase */, - { 0, 945, 372, 4, 3, UNI_EBASE } /* ebase=y */, - { 3, 2666, 3076, 3, 2, UNI_LB__QU } /* lb=qu */, - { 3, 1234, 8375, 5, 21, UNI_CJKSYMBOLS } /* incjksymbolsandpunctuation */, - { 0, 1126, 1033, 4, 4, UNI_LYCI } /* scx=lyci */, - { 1, 6467, 0, 14, 0, UNI_NV__2 } /* numericvalue=2 */, - { 0, 1536, 7187, 4, 16, UNI_GEOMETRICSHAPESEXT } /* ingeometricshapesext */, - { 1, 6431, 2091, 15, 4, UNI_LB__B2 } /* linebreak=breakboth */, - { 0, 135, 462, 2, 4, UNI_OGAM } /* isogam */, - { 0, 3696, 645, 4, 3, -UNI_IDSU } /* idsu=no */, - { 2, 6072, 873, 6, 3, UNI_SUPPUAA } /* issuppuaa */, - { 1, 2053, 7652, 3, 17, UNI_PHONETICEXT } /* isphoneticextensions */, - { 9, 1874, 5462, 7, 20, UNI_PHLI } /* script=inscriptionalpahlavi */, - { 17, 2564, 2840, 3, 13, UNI_INGREEK } /* isgreekandcoptic */, - { 0, 7585, 312, 11, 2, UNI_BC__LRI } /* bidiclass=lri */, - { 0, 135, 4280, 2, 5, UNI_P } /* ispunct */, - { 5, 1874, 714, 7, 5, UNI_OGAM } /* script=ogham */, - { 0, 2899, 1061, 10, 4, UNI_CYRILLICEXTB } /* iscyrillicextb */, - { 1, 529, 0, 6, 0, UNI_KHOJ } /* khojki */, - { 27, 6350, 2654, 19, 4, -UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=no */, - { 9, 2394, 636, 6, 7, UNI_DSRT } /* block=deseret */, - { 164, 135, 6341, 2, 9, UNI_XSUX } /* iscuneiform */, - { 1, 1499, 963, 10, 6, -UNI_DEP } /* deprecated=false */, - { 3, 2317, 332, 3, 4, UNI_TALE } /* istaile */, - { 0, 7233, 919, 23, 3, UNI_CCC__10 } /* canonicalcombiningclass=10 */, - { 1, 323, 2029, 2, 7, UNI_INSOGDIAN } /* insogdian */, - { 3, 3099, 1362, 11, 3, UNI_IN__16 } /* presentin=v160 */, - { 3, 1696, 1973, 5, 11, UNI_CHESSSYMBOLS } /* blk=chesssymbols */, - { 10, 5069, 645, 13, 3, -UNI_EMOD } /* emojimodifier=no */, - { 0, 6431, 3076, 10, 2, UNI_LB__QU } /* linebreak=qu */, - { 0, 2394, 1725, 6, 6, UNI_DOMINO } /* block=domino */, - { 1, 6372, 5044, 3, 5, UNI_SC__TAML } /* sc=tamil */, - { 16, 6955, 5661, 22, 3, UNI_JG__MALAYALAMTTA } /* joininggroup=malayalamtta */, - { 0, 946, 0, 4, 0, UNI_BASS } /* bass */, - { 0, 1375, 0, 4, 0, UNI_ITAL } /* ital */, - { 1, 1051, 0, 6, 0, UNI_YEZI } /* yezidi */, - { 0, 5, 8292, 1, 32, UNI_MISCMATHSYMBOLSA } /* miscellaneousmathematicalsymbolsa */, - { 0, 6372, 98, 3, 4, UNI_HLUW } /* sc=hluw */, - { 1, 6372, 430, 3, 4, UNI_SC__ARMN } /* sc=armn */, - { 10, 399, 963, 5, 2, -UNI_GREXT } /* grext=f */, - { 72, 1499, 373, 3, 2, UNI_DEP } /* dep=y */, - { 1, 1874, 1381, 7, 9, UNI_SC__PERM } /* script=oldpermic */, - { 0, 1874, 4306, 7, 6, UNI_SC__HANG } /* script=hangul */, - { 20, 868, 963, 5, 6, -UNI_STERM } /* sterm=false */, - { 9, 7036, 288, 25, 1, UNI_cwkcf_values_index } /* changeswhennfkccasefolded= */, - { 2, 2371, 645, 11, 3, -UNI_XIDC } /* xidcontinue=no */, - { 4, 8861, 7906, 17, 17, UNI_SUPPUAB } /* block=supplementaryprivateuseareab */, - { 1, 135, 7951, 2, 17, UNI_VS } /* isvariationselector */, - { 3, 4652, 1549, 14, 4, UNI_CYRILLICEXTA } /* block=cyrillicexta */, - { 1, 30, 5499, 1, 12, UNI_CHEROKEESUP } /* ischerokeesup */, - { 1, 2394, 1372, 6, 9, UNI_INOLDITALIC } /* block=olditalic */, - { 0, 135, 2504, 2, 7, UNI_MYMR } /* ismyanmar */, - { 10, 3930, 2205, 14, 8, UNI_NV__3_SLASH_20 } /* numericvalue=1.500e-01 */, - { 0, 6431, 3125, 10, 9, UNI_LB__QU } /* linebreak=quotation */, - { 2, 1435, 0, 6, 0, UNI_THAA } /* thaana */, - { 0, 8596, 5134, 22, 14, UNI_INSC__VOWELDEPENDENT } /* indicsyllabiccategory=voweldependent */, - { 2, 1126, 1114, 4, 4, UNI_LINB } /* scx=linb */, - { 0, 2612, 5188, 3, 4, UNI_JG__YUDH } /* jg=yudh */, - { 3, 4524, 3989, 15, 2, UNI_NV__3_SLASH_80 } /* numericvalue=3/80 */, - { 0, 358, 2146, 4, 2, UNI_CCC__25 } /* ccc=25 */, - { 0, 251, 0, 2, 0, UNI_NB } /* nb */, - { 0, 724, 0, 5, 0, UNI_RUNR } /* runic */, - { 1, 2069, 360, 4, 2, UNI_joinc_values_index } /* joinc= */, - { 8, 8088, 119, 16, 2, UNI_XPOSIXDIGIT } /* generalcategory=nd */, - { 0, 4963, 630, 16, 6, UNI__PERL_PATWS } /* patternwhitespace=true */, - { 1, 6372, 781, 3, 7, UNI_MARC } /* sc=marchen */, - { 5, 6670, 3535, 13, 7, UNI_SB__EX } /* sentencebreak=extend */, - { 2, 7090, 0, 20, 0, UNI_CE } /* compositionexclusion */, - { 5, 1696, 1315, 4, 7, UNI_INTIRHUTA } /* blk=tirhuta */, - { 0, 6446, 631, 21, 2, UNI_MCM } /* modifiercombiningmark=t */, - { 8, 1126, 177, 4, 4, UNI_PHNX } /* scx=phnx */, - { 80, 135, 1353, 2, 9, UNI_TALU } /* isnewtailue */, - { 3, 8564, 5361, 32, 4, UNI_CJKEXTE } /* block=cjkunifiedideographsextensione */, - { 4, 1126, 3423, 4, 6, UNI_HEBR } /* scx=hebrew */, - { 3, 1696, 251, 4, 2, UNI_NB } /* blk=nb */, - { 0, 6431, 133, 10, 2, UNI_LB__NL } /* linebreak=nl */, - { 1, 3961, 2205, 14, 8, UNI_NV__3_SLASH_4 } /* numericvalue=7.500e-01 */, - { 69, 3491, 1367, 14, 5, UNI_NV__432000 } /* numericvalue=432000 */, - { 0, 42, 3535, 2, 3, UNI_SB__EX } /* sb=ex */, - { 65, 1126, 442, 4, 3, UNI_HAN } /* scx=han */, - { 1, 2481, 2485, 4, 7, UNI_KATAKANAEXT } /* katakanaext */, - { 0, 8029, 0, 29, 0, UNI_ENCLOSEDIDEOGRAPHICSUP } /* enclosedideographicsupplement */, - { 7, 2394, 3325, 6, 15, UNI_INIMPERIALARAMAIC } /* block=imperialaramaic */, - { 0, 323, 422, 2, 4, UNI_INMIAO } /* inmiao */, - { 1, 3491, 2146, 13, 2, UNI_NV__25 } /* numericvalue=25 */, - { 0, 6670, 558, 14, 2, UNI_SB__LO } /* sentencebreak=lo */, - { 8, 7233, 803, 24, 2, UNI_CCC__21 } /* canonicalcombiningclass=21 */, - { 8, 624, 1367, 5, 2, UNI_CCC__AR } /* ccc=232 */, - { 10, 3183, 631, 8, 2, UNI_XPOSIXXDIGIT } /* hexdigit=t */, - { 0, 3274, 1208, 14, 7, UNI_EA__NA } /* eastasianwidth=narrow */, - { 1, 3696, 373, 4, 4, UNI_IDSU } /* idsu=yes */, - { 13, 643, 390, 3, 3, UNI_DT__SQR } /* dt=sqr */, - { 5, 1874, 1045, 7, 6, UNI_WCHO } /* script=wancho */, - { 2, 2463, 7669, 8, 13, UNI_CYRILLICSUP } /* cyrillicsupplementary */, - { 4, 323, 5044, 2, 15, UNI_TAMILSUP } /* intamilsupplement */, - { 1, 1874, 1598, 7, 4, UNI_NAGM } /* script=nagm */, - { 11, 1993, 630, 11, 3, UNI_GRBASE } /* graphemebase=t */, - { 1, 266, 645, 4, 3, -UNI_CWCF } /* cwcf=no */, - { 2, 643, 1744, 3, 3, UNI_DT__ISO } /* dt=iso */, - { 0, 3599, 6400, 10, 5, UNI_ARABICSUP } /* block=arabicsup */, - { 0, 5069, 963, 13, 2, -UNI_EMOD } /* emojimodifier=f */, - { 32, 5272, 1530, 17, 3, UNI__PERL_CHARNAME_BEGIN } /* _perl_charname_begin */, - { 1, 7697, 2223, 28, 2, UNI_WB__EB } /* canonicalcombiningclass=ccc133 */, - { 0, 3227, 7819, 5, 28, UNI_MISCARROWS } /* blk=miscellaneoussymbolsandarrows */, - { 0, 3227, 782, 5, 6, UNI_INMARCHEN } /* blk=marchen */, - { 0, 135, 434, 2, 4, UNI_DIAK } /* isdiak */, - { 0, 1874, 506, 7, 4, UNI_TNSA } /* script=tnsa */, - { 28, 6372, 3447, 3, 15, UNI_MERC } /* sc=meroiticcursive */, - { 0, 4970, 962, 9, 7, -UNI_XPOSIXSPACE } /* whitespace=false */, - { 24, 1810, 645, 11, 3, -UNI_KEHNOMIRROR } /* kehnomirror=no */, - { 0, 6670, 1638, 14, 7, UNI_SB__LE } /* sentencebreak=oletter */, - { 1, 135, 3365, 2, 5, UNI_XPOSIXALNUM } /* isalnum */, - { 0, 30, 1627, 1, 11, UNI_INSAURASHTRA } /* insaurashtra */, - { 4, 4980, 0, 18, 0, UNI_RUMI } /* ruminumeralsymbols */, - { 0, 5364, 645, 20, 2, -UNI_EXTPICT } /* extendedpictographic=n */, - { 32, 2878, 0, 5, 0, UNI_KHMR } /* khmer */, - { 4, 916, 410, 4, 3, UNI_AGE__3_DOT_2 } /* age=3.2 */, - { 6, 2338, 0, 12, 0, UNI_IN__14 } /* presentin=14 */, - { 2, 54, 3230, 2, 8, UNI_SC__MYMR } /* sc=myanmar */, - { 113, 7585, 319, 10, 2, UNI_BC__WS } /* bidiclass=ws */, - { 5, 6838, 6855, 8, 7, UNI_INPC__TOPANDLEFT } /* inpc=topandleft */, - { 2, 75, 2044, 1, 9, UNI_YIRADICALS } /* yiradicals */, - { 9, 6372, 699, 3, 5, UNI_SC__BUHD } /* sc=buhid */, - { 6, 135, 7120, 2, 14, UNI_BYZANTINEMUSIC } /* isbyzantinemusic */, - { 10, 170, 288, 3, 1, UNI_pcm_values_index } /* pcm= */, - { 0, 5782, 5930, 21, 9, UNI_WB__EB } /* graphemeclusterbreak=emodifier */, - { 3, 1474, 1367, 7, 2, UNI_CCC__32 } /* ccc=ccc32 */, - { 8, 5325, 0, 15, 0, UNI_LATINEXTE } /* block=latinexte */, - { 36, 558, 372, 2, 5, UNI_LOE } /* loe=yes */, - { 2, 1126, 1131, 5, 3, UNI_TALU } /* scx=talu */, - { 1, 2394, 1051, 6, 6, UNI_INYEZIDI } /* block=yezidi */, - { 0, 4937, 0, 8, 0, UNI_DINGBATS } /* dingbats */, - { 0, 6647, 1971, 13, 3, UNI_JG__TAH } /* joininggroup=tah */, - { 19, 1097, 2169, 4, 8, UNI_NV__1_SLASH_64 } /* nv=1.562e-02 */, - { 0, 2372, 631, 3, 5, UNI_IDC } /* idc=true */, - { 40, 2553, 373, 5, 4, UNI_CASED } /* cased=yes */, - { 0, 18, 37, 2, 2, UNI_BATK } /* batk */, - { 9, 358, 8900, 4, 18, UNI_CCC__216 } /* ccc=attachedaboveright */, - { 29, 2612, 2953, 3, 11, UNI_JG__STRAIGHTWAW } /* jg=straightwaw */, - { 1, 16, 1852, 1, 3, UNI_M } /* gc=m */, - { 5, 1874, 909, 7, 7, UNI_ZZZZ } /* script=unknown */, - { 0, 2666, 2055, 3, 2, UNI_LB__PO } /* lb=po */, - { 0, 2833, 99, 3, 2, UNI_UPPERCASELETTER } /* gc=lu */, - { 3, 3991, 5549, 14, 4, UNI_NV__90000 } /* numericvalue=90000 */, - { 2, 5930, 963, 4, 2, -UNI_EMOD } /* emod=f */, - { 1, 768, 8533, 3, 31, UNI_EGYPTIANHIEROGLYPHFORMATCONTROLS } /* inegyptianhieroglyphformatcontrols */, - { 4, 5698, 0, 21, 0, UNI_CWCM } /* changeswhencasemapped */, - { 8, 4703, 962, 8, 7, -UNI_XPOSIXUPPER } /* uppercase=false */, - { 3, 6277, 1061, 13, 4, UNI_MYANMAREXTB } /* block=myanmarextb */, - { 0, 2290, 5549, 4, 4, UNI_NV__80000 } /* nv=80000 */, - { 0, 135, 3736, 2, 14, UNI_LATINEXTD } /* islatinextendedd */, - { 0, 135, 815, 2, 4, UNI_OSMA } /* isosma */, - { 4, 8142, 4111, 26, 4, UNI_CJKEXTG } /* cjkunifiedideographsextensiong */, - { 2, 675, 630, 5, 3, UNI_GRBASE } /* grbase=t */, - { 0, 30, 1933, 1, 12, UNI_BIDIC } /* isbidicontrol */, - { 25, 343, 6290, 3, 13, UNI_SUPMATHOPERATORS } /* supmathoperators */, - { 3, 3125, 645, 13, 3, -UNI_QMARK } /* quotationmark=no */, - { 7, 4557, 6146, 17, 7, UNI_SINH } /* scriptextensions=sinhala */, - { 9, 1696, 694, 4, 5, UNI_INADLAM } /* blk=adlam */, - { 4, 323, 1033, 2, 6, UNI_INLYCIAN } /* inlycian */, - { 1, 3696, 373, 16, 2, UNI_IDSU } /* idsunaryoperator=y */, - { 0, 7233, 415, 25, 2, UNI_CCC__DA } /* canonicalcombiningclass=234 */, - { 2, 6277, 2920, 7, 6, UNI_MAHJONG } /* block=mahjong */, - { 0, 323, 883, 2, 7, UNI_INTAITHAM } /* intaitham */, - { 9, 6372, 1315, 3, 4, UNI_SC__TIRH } /* sc=tirh */, - { 1, 1696, 1061, 7, 4, UNI_CJKEXTB } /* blk=cjkextb */, - { 3, 4557, 909, 17, 7, UNI_ZZZZ } /* scriptextensions=unknown */, - { 0, 1696, 377, 4, 6, UNI_INCHAKMA } /* blk=chakma */, - { 16, 4510, 2397, 12, 3, UNI_nfkdqc_values_index } /* nfkdquickcheck= */, - { 0, 6431, 735, 10, 2, UNI_EMOD } /* linebreak=em */, - { 2, 135, 336, 2, 5, UNI_TAKR } /* istakri */, - { 2, 1696, 6620, 7, 11, UNI_CJKRADICALSSUP } /* blk=cjkradicalssup */, - { 1, 2394, 278, 6, 5, UNI_INGARAY } /* block=garay */, - { 32, 8088, 2055, 16, 2, UNI_PO } /* generalcategory=po */, - { 5, 7233, 2292, 23, 2, UNI_CCC__8 } /* canonicalcombiningclass=8 */, - { 1, 1441, 3548, 3, 12, UNI_WB__EB } /* wb=glueafterzwj */, - { 12, 1696, 1965, 4, 8, UNI_UCASEXTA } /* blk=ucasexta */, - { 2, 1499, 0, 10, 0, UNI_DEP } /* deprecated */, - { 2, 323, 7558, 2, 27, UNI_OCR } /* inopticalcharacterrecognition */, - { 0, 1230, 1973, 3, 11, UNI_CHESSSYMBOLS } /* inchesssymbols */, - { 4, 6372, 1051, 3, 6, UNI_SC__YEZI } /* sc=yezidi */, - { 0, 135, 6862, 2, 4, UNI_BRAH } /* isbrah */, - { 0, 2612, 6412, 3, 19, UNI_JG__BURUSHASKIYEHBARREE } /* jg=burushaskiyehbarree */, - { 3, 2, 372, 1, 3, UNI_CE } /* ce=y */, - { 1, 954, 957, 3, 2, UNI_BPT__O } /* bpt=o */, - { 2, 4557, 213, 17, 4, UNI_TFNG } /* scriptextensions=tfng */, - { 0, 4557, 1714, 17, 11, UNI_CPMN } /* scriptextensions=cyprominoan */, - { 2, 2909, 6400, 8, 5, UNI_ETHIOPICSUP } /* isethiopicsup */, - { 1, 8861, 8639, 18, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* block=supplementalsymbolsandpictographs */, - { 1, 3930, 5549, 14, 4, UNI_NV__10000 } /* numericvalue=10000 */, - { 1, 92, 644, 1, 2, UNI_jt_values_index } /* jt= */, - { 17, 6277, 2111, 7, 11, UNI_MATHALPHANUM } /* block=mathalphanum */, - { 0, 358, 2223, 5, 2, UNI_WB__EB } /* ccc=133 */, - { 0, 930, 0, 8, 0, UNI_ARMN } /* armenian */, - { 12, 624, 365, 5, 2, UNI_CCC__BL } /* ccc=218 */, - { 0, 6647, 0, 13, 0, UNI_jg_values_index } /* joininggroup= */, - { 0, 1696, 5289, 4, 20, UNI_INANATOLIANHIEROGLYPHS } /* blk=anatolianhieroglyphs */, - { 2, 135, 4380, 2, 4, UNI_MANI } /* ismani */, - { 8, 1126, 1149, 4, 8, UNI_TFNG } /* scx=tifinagh */, - { 0, 7847, 251, 18, 2, UNI_DT__NB } /* decompositiontype=nb */, - { 16, 14, 3286, 2, 3, UNI_math_values_index } /* math= */, - { 0, 135, 3183, 2, 8, UNI_XPOSIXXDIGIT } /* ishexdigit */, - { 4, 1126, 1384, 4, 4, UNI_PERM } /* scx=perm */, - { 2, 2394, 654, 6, 7, UNI_INELBASAN } /* block=elbasan */, - { 0, 7847, 387, 18, 3, UNI_DT__SML } /* decompositiontype=sml */, - { 1, 2045, 631, 7, 5, UNI_RADICAL } /* radical=true */, + { 1, 3245, 404, 5, 5, UNI_INGOTHIC } /* blk=gothic */, + { 0, 2373, 813, 10, 2, UNI_IN__17 } /* presentin=17 */, + { 0, 4586, 843, 17, 4, UNI_NBAT } /* scriptextensions=nbat */, + { 2, 6952, 0, 6, 0, UNI_BRAH } /* brahmi */, + { 1, 3903, 3587, 3, 2, UNI_LB__ZW } /* lb=zw */, + { 1, 135, 2407, 2, 10, UNI_IDC } /* isidcontinue */, + { 3, 7151, 0, 25, 0, UNI_DI } /* defaultignorablecodepoint */, + { 0, 2429, 7647, 6, 27, UNI_OCR } /* block=opticalcharacterrecognition */, + { 1, 5803, 639, 21, 5, UNI_CWT } /* changeswhentitlecased=true */, + { 0, 6442, 638, 19, 3, UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=t */, + { 3, 2301, 807, 4, 2, UNI_NV__5_SLASH_6 } /* nv=5/6 */, + { 4, 1498, 636, 7, 2, UNI_CCC__22 } /* ccc=ccc22 */, + { 1, 6039, 8808, 5, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* insupsymbolsandpictographs */, + { 3, 1141, 870, 4, 7, UNI_SIDT } /* scx=sidetic */, + { 1, 1733, 669, 4, 7, UNI_INELYMAIC } /* blk=elymaic */, + { 0, 577, 0, 6, 0, UNI_RJNG } /* rejang */, + { 0, 333, 2275, 2, 4, UNI_IN__4_DOT_1 } /* in=4.1 */, + { 1, 333, 5429, 2, 18, UNI_HALFMARKS } /* incombininghalfmarks */, + { 1, 8233, 119, 9, 2, UNI_XPOSIXDIGIT } /* category=nd */, + { 0, 3976, 314, 15, 2, UNI_NV__1_SLASH_40 } /* numericvalue=1/40 */, + { 0, 7176, 639, 24, 5, UNI_COMPEX } /* fullcompositionexclusion=true */, + { 5, 2810, 2812, 2, 2, UNI_BC__R } /* bc=r */, + { 1, 4747, 0, 18, 0, UNI_IDST } /* idstrinaryoperator */, + { 0, 2765, 383, 13, 2, UNI_PATSYN } /* patternsyntax=y */, + { 0, 3605, 4673, 12, 9, UNI_CYRILLICEXTB } /* blk=cyrillicextendedb */, + { 0, 135, 1145, 2, 4, UNI_TALU } /* istalu */, + { 0, 54, 3620, 2, 5, UNI_SC__ETHI } /* sc=ethi */, + { 1, 8089, 4730, 16, 2, UNI_vs_values_index } /* variationselector= */, + { 0, 6464, 669, 3, 7, UNI_ELYM } /* sc=elymaic */, + { 2, 7322, 1993, 24, 2, UNI_CCC__DB } /* canonicalcombiningclass=db */, + { 2, 5088, 3889, 8, 14, UNI_KAKTOVIKNUMERALS } /* block=kaktoviknumerals */, + { 0, 4732, 971, 8, 3, -UNI_XPOSIXUPPER } /* uppercase=f */, + { 2, 2508, 1573, 8, 4, UNI_ETHIOPICEXTA } /* ethiopicexta */, + { 5, 7322, 5723, 24, 17, UNI_WB__EB } /* canonicalcombiningclass=attachedbelowleft */, + { 0, 1465, 1952, 3, 5, UNI_WB__EB } /* wb=ebase */, + { 8, 135, 3698, 2, 16, UNI_HIGHPUSURROGATES } /* ishighpusurrogates */, + { 0, 7086, 0, 14, 0, UNI_MEETEIMAYEKEXT } /* meeteimayekext */, + { 4, 135, 134, 2, 4, UNI_LISU } /* islisu */, + { 1, 1498, 2258, 8, 2, UNI_WB__EB } /* ccc=ccc133 */, + { 2, 30, 5919, 1, 3, UNI_ME } /* isme */, + { 1, 3903, 3155, 3, 9, UNI_LB__QU } /* lb=quotation */, + { 0, 8278, 0, 22, 0, UNI_CJK } /* incjkunifiedideographs */, + { 1, 2576, 0, 5, 0, UNI_CASED } /* cased */, + { 0, 1465, 3453, 3, 12, UNI_LB__HL } /* wb=hebrewletter */, + { 20, 5131, 653, 18, 5, UNI_INCB__NONE } /* indicconjunctbreak=none */, + { 2, 2622, 4732, 8, 5, UNI_XPOSIXUPPER } /* isxposixupper */, + { 1, 6464, 565, 3, 6, UNI_SC__ONAO } /* sc=olonal */, + { 1, 98, 0, 4, 0, UNI_HLUW } /* hluw */, + { 0, 8226, 174, 16, 2, UNI_PC } /* generalcategory=pc */, + { 0, 1911, 1269, 7, 4, UNI_SC__THAI } /* script=thai */, + { 18, 135, 662, 2, 7, UNI_ELBA } /* iselbasan */, + { 0, 6464, 470, 3, 4, UNI_OLCK } /* sc=olck */, + { 5, 978, 972, 6, 2, -UNI_COMPEX } /* compex=f */, + { 0, 7957, 1781, 18, 3, UNI_DT__ISO } /* decompositiontype=iso */, + { 0, 1818, 8424, 3, 29, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* issymbolsandpictographsextendeda */, + { 2, 168, 7277, 3, 15, UNI_GEOMETRICSHAPESEXT } /* geometricshapesext */, + { 1, 6180, 5682, 17, 5, UNI_loe_values_index } /* logicalorderexception= */, + { 1, 7674, 459, 11, 2, UNI_BC__LRO } /* bidiclass=lro */, + { 2, 3521, 813, 13, 4, UNI_NV__17_SLASH_2 } /* numericvalue=17/2 */, + { 0, 7742, 6136, 17, 11, UNI_PHONETICEXTSUP } /* phoneticextensionssupplement */, + { 1, 32, 0, 2, 0, UNI_VS } /* vs */, + { 0, 1733, 1377, 4, 9, UNI_INNEWTAILUE } /* blk=newtailue */, + { 5, 1141, 769, 4, 7, UNI_KALI } /* scx=kayahli */, + { 0, 1733, 8395, 5, 15, UNI_CUNEIFORMNUMBERS } /* blk=cuneiformnumbers */, + { 1, 2607, 4822, 9, 9, UNI_MYANMAREXTC } /* ismyanmarextendedc */, + { 0, 5043, 0, 5, 0, UNI_BAMU } /* bamum */, + { 0, 6464, 1450, 3, 9, UNI_SC__SAMR } /* sc=samaritan */, + { 2, 4586, 1789, 17, 4, UNI_GURU } /* scriptextensions=guru */, + { 0, 5824, 972, 21, 2, -UNI_CWU } /* changeswhenuppercased=f */, + { 3, 1471, 972, 3, 6, -UNI_IDS } /* ids=false */, + { 3, 571, 0, 6, 0, UNI_PATSYN } /* patsyn */, + { 0, 7525, 2190, 25, 2, UNI_CCC__129 } /* canonicalcombiningclass=129 */, + { 4, 135, 2630, 2, 5, UNI_XPOSIXBLANK } /* isblank */, + { 1, 2097, 5239, 10, 3, UNI_JT__C } /* joiningtype=c */, + { 0, 1112, 929, 5, 2, UNI_NV__1_SLASH_10 } /* nv=1/10 */, + { 1, 33, 5178, 1, 9, UNI_SHARADASUP } /* sharadasup */, + { 3, 30, 5605, 1, 7, UNI_HYPHEN } /* ishyphen */, + { 3, 2587, 404, 3, 3, UNI_GOTH } /* isgoth */, + { 1, 253, 254, 2, 2, UNI_YI } /* yiii */, + { 2, 2429, 2134, 6, 12, UNI_INMASARAMGONDI } /* block=masaramgondi */, + { 2, 54, 1144, 2, 5, UNI_TALU } /* sc=talu */, + { 0, 1106, 653, 6, 2, UNI_NFKDQC__N } /* nfkdqc=n */, + { 0, 1733, 351, 4, 5, UNI_VSSUP } /* blk=vssup */, + { 1, 4586, 1265, 17, 4, UNI_GRAN } /* scriptextensions=gran */, + { 2, 6164, 6555, 8, 9, UNI_LB__NU } /* linebreak=numeric */, + { 0, 4586, 688, 17, 7, UNI_HANO } /* scriptextensions=hanunoo */, + { 0, 368, 0, 2, 0, UNI_XPOSIXCNTRL } /* cc */, + { 0, 1911, 1552, 7, 4, UNI_SC__BUGI } /* script=bugi */, + { 3, 4553, 1392, 15, 2, UNI_NV__3_SLASH_20 } /* numericvalue=3/20 */, + { 2, 135, 4999, 2, 10, UNI_XPOSIXSPACE } /* iswhitespace */, + { 2, 1733, 577, 4, 6, UNI_INREJANG } /* blk=rejang */, + { 4, 554, 314, 5, 1, UNI_NV__3_SLASH_4 } /* nv=3/4 */, + { 0, 2912, 76, 4, 2, UNI_CYRL } /* iscyrl */, + { 1, 333, 8089, 2, 18, UNI_INVS } /* invariationselectors */, + { 4, 2429, 1269, 6, 4, UNI_INTHAI } /* block=thai */, + { 1, 4664, 643, 15, 3, UNI_LATINEXTE } /* blk=latinextendede */, + { 9, 4732, 382, 8, 2, UNI_upper_values_index } /* uppercase= */, + { 0, 368, 375, 4, 2, UNI_CCC__18 } /* ccc=18 */, + { 3, 977, 653, 5, 3, -UNI_ECOMP } /* ecomp=no */, + { 1, 2380, 2292, 3, 3, UNI_IN__2 } /* in=2.0 */, + { 5, 1346, 4695, 5, 4, UNI_CJKEXTC } /* iscjkextc */, + { 1, 2429, 4814, 6, 16, UNI_BOPOMOFOEXT } /* block=bopomofoextended */, + { 1, 135, 6433, 2, 9, UNI_XSUX } /* iscuneiform */, + { 6, 1733, 8167, 4, 29, UNI_ENCLOSEDIDEOGRAPHICSUP } /* blk=enclosedideographicsupplement */, + { 0, 1254, 653, 4, 5, UNI_INCB__NONE } /* incb=none */, + { 1, 2635, 2668, 3, 10, UNI_JG__REVERSEDPE } /* jg=reversedpe */, + { 0, 8639, 3024, 23, 5, UNI_INPC__LEFT } /* indicpositionalcategory=left */, + { 2, 2380, 0, 5, 0, UNI_IN__14 } /* in=14 */, + { 0, 2157, 0, 4, 0, UNI_MEND } /* mend */, + { 2, 1260, 3742, 3, 6, UNI_CJKCOMPAT } /* cjkcompat */, + { 3, 7509, 4603, 5, 16, UNI_SMALLFORMS } /* blk=smallformvariants */, + { 3, 1254, 6466, 4, 10, UNI_INCB__CONSONANT } /* incb=consonant */, + { 0, 1258, 6867, 5, 16, UNI_CJKCOMPATIDEOGRAPHS } /* incjkcompatideographs */, + { 1, 4406, 4053, 12, 4, UNI_JG__MANICHAEANTEN } /* jg=manichaeanten */, + { 4, 2858, 246, 3, 2, UNI_PE } /* gc=pe */, + { 2, 7978, 0, 20, 0, UNI_GCB__L } /* hangulsyllabletype=l */, + { 7, 4586, 1359, 17, 9, UNI_SIND } /* scriptextensions=khudawadi */, + { 1, 6464, 68, 4, 3, UNI_SC__CPRT } /* sc=cprt */, + { 0, 3976, 1388, 14, 3, UNI_NV__1000 } /* numericvalue=1000 */, + { 3, 1346, 6867, 5, 19, UNI_CJKCOMPATIDEOGRAPHSSUP } /* iscjkcompatideographssup */, + { 1, 30, 4233, 1, 15, UNI_SC } /* iscurrencysymbol */, + { 2, 7322, 635, 23, 3, UNI_CCC__22 } /* canonicalcombiningclass=22 */, + { 4, 2810, 752, 3, 2, UNI_BC__EN } /* bc=en */, + { 1, 5636, 0, 3, 0, UNI_PUA } /* pua */, + { 0, 4539, 2432, 12, 3, UNI_nfkdqc_values_index } /* nfkdquickcheck= */, + { 0, 1141, 1622, 4, 4, UNI_NAGM } /* scx=nagm */, + { 1, 7322, 2637, 23, 2, UNI_CCC__A } /* canonicalcombiningclass=a */, + { 1, 2858, 1671, 3, 2, UNI_LOWERCASELETTER } /* gc=ll */, + { 1, 1141, 1016, 4, 8, UNI_HIRA } /* scx=hiragana */, + { 3, 30, 1621, 1, 5, UNI_NAGM } /* isnagm */, + { 0, 3245, 3826, 12, 10, UNI_GEORGIANSUP } /* blk=georgiansupplement */, + { 0, 2097, 3024, 11, 12, UNI_JT__L } /* joiningtype=leftjoining */, + { 2, 1733, 8336, 4, 30, UNI_MISCSYMBOLSSUP } /* blk=miscellaneoussymbolssupplement */, + { 0, 1971, 653, 5, 3, -UNI_BIDIC } /* bidic=no */, + { 1, 6760, 1673, 14, 2, UNI_SB__FO } /* sentencebreak=fo */, + { 1, 2301, 0, 4, 0, UNI_NV__5 } /* nv=5 */, + { 0, 7210, 0, 23, 0, UNI_BYZANTINEMUSIC } /* byzantinemusicalsymbols */, + { 0, 2236, 1116, 4, 2, UNI_NV__2_SLASH_3 } /* nv=2/3 */, + { 7, 1141, 1377, 4, 9, UNI_TALU } /* scx=newtailue */, + { 2, 1733, 1308, 4, 7, UNI_INPHAGSPA } /* blk=phagspa */, + { 2, 1733, 939, 4, 8, UNI_INARMENIAN } /* blk=armenian */, + { 0, 1483, 1740, 5, 4, UNI_LATINEXTD } /* latinextd */, + { 0, 3617, 7552, 5, 26, UNI_ENCLOSEDCJK } /* blk=enclosedcjklettersandmonths */, + { 1, 30, 7106, 1, 19, UNI_DEVANAGARIEXT } /* isdevanagariextended */, + { 2, 4586, 434, 17, 4, UNI_ARMN } /* scriptextensions=armn */, + { 0, 6342, 7552, 7, 10, UNI_ENCLOSEDCJK } /* block=enclosedcjk */, + { 1, 135, 7348, 2, 26, UNI_HALFANDFULLFORMS } /* ishalfwidthandfullwidthforms */, + { 1, 333, 1368, 2, 9, UNI_INNABATAEAN } /* innabataean */, + { 1, 6164, 1735, 8, 4, UNI_LB__CJ } /* linebreak=cj */, + { 6, 1733, 688, 4, 7, UNI_INHANUNOO } /* blk=hanunoo */, + { 2, 135, 8089, 2, 18, UNI_INVS } /* isvariationselectors */, + { 2, 1733, 55, 4, 4, UNI_INCHAM } /* blk=cham */, + { 0, 316, 374, 3, 2, UNI_NV__31 } /* nv=31 */, + { 1, 1911, 2054, 7, 10, UNI_SOGO } /* script=oldsogdian */, + { 1, 1141, 1368, 4, 9, UNI_NBAT } /* scx=nabataean */, + { 0, 8494, 4843, 30, 4, UNI_CJKEXTF } /* blk=cjkunifiedideographsextensionf */, + { 3, 2429, 1172, 6, 8, UNI_INUGARITIC } /* block=ugaritic */, + { 0, 2373, 608, 11, 3, UNI_IN__14 } /* presentin=14.0 */, + { 6, 6464, 5508, 3, 20, UNI_PHLI } /* sc=inscriptionalpahlavi */, + { 8, 8117, 4394, 23, 4, UNI_JG__MANICHAEANBETH } /* joininggroup=manichaeanbeth */, + { 0, 777, 7552, 3, 10, UNI_ENCLOSEDCJK } /* inenclosedcjk */, + { 0, 6464, 5890, 3, 5, UNI_SC__GREK } /* sc=greek */, + { 3, 2429, 2872, 6, 6, UNI_INCOPTIC } /* block=coptic */, + { 1, 33, 4603, 1, 16, UNI_SMALLFORMS } /* smallformvariants */, + { 4, 333, 9089, 2, 42, UNI_UCASEXT } /* inunifiedcanadianaboriginalsyllabicsextended */, + { 0, 274, 639, 4, 5, UNI_CWCF } /* cwcf=true */, + { 10, 2108, 638, 10, 6, UNI_KEHNOROTATE } /* kehnorotate=true */, + { 15, 1260, 217, 5, 2, UNI_CJKEXTF } /* cjkextf */, + { 1, 368, 313, 4, 1, UNI_CCC__0 } /* ccc=0 */, + { 10, 333, 563, 2, 2, UNI_IN__7 } /* in=7 */, + { 1, 135, 2765, 2, 13, UNI_PATSYN } /* ispatternsyntax */, + { 1, 1258, 81, 7, 2, UNI_CJKEXTG } /* incjkextg */, + { 0, 1141, 1180, 4, 8, UNI_VITH } /* scx=vithkuqi */, + { 7, 3245, 6103, 9, 6, UNI_GEORGIANSUP } /* blk=georgiansup */, + { 1, 135, 1315, 2, 7, UNI_SIDD } /* issiddham */, + { 1, 3903, 8175, 3, 11, UNI_LB__ID } /* lb=ideographic */, + { 14, 1911, 470, 7, 4, UNI_OLCK } /* script=olck */, + { 0, 2525, 4799, 3, 15, UNI_MISCMATHSYMBOLSB } /* inmiscmathsymbolsb */, + { 0, 4732, 971, 8, 7, -UNI_XPOSIXUPPER } /* uppercase=false */, + { 2, 1733, 6018, 4, 21, UNI_ININSCRIPTIONALPARTHIAN } /* blk=inscriptionalparthian */, + { 4, 4732, 653, 5, 3, -UNI_XPOSIXUPPER } /* upper=no */, + { 2, 4747, 972, 18, 6, -UNI_IDST } /* idstrinaryoperator=false */, + { 2, 135, 8061, 2, 28, UNI_EGYPTIANHIEROGLYPHSEXTA } /* isegyptianhieroglyphsextendeda */, + { 5, 20, 1143, 2, 2, UNI_hex_values_index } /* hex= */, + { 1, 135, 438, 2, 3, UNI_DIA } /* isdia */, + { 4, 1141, 2827, 3, 5, UNI_ARAB } /* scx=arab */, + { 2, 135, 939, 2, 8, UNI_ARMN } /* isarmenian */, + { 0, 6137, 0, 19, 0, UNI_SUPARROWSC } /* supplementalarrowsc */, + { 3, 1733, 7734, 4, 26, UNI_KATAKANAEXT } /* blk=katakanaphoneticextensions */, + { 1, 6737, 4402, 13, 4, UNI_JG__HETH } /* joininggroup=heth */, + { 1, 2587, 1009, 3, 7, UNI_GURU } /* isgurmukhi */, + { 2, 8961, 438, 3, 2, UNI_NT__DI } /* nt=di */, + { 0, 1733, 259, 4, 2, UNI_NB } /* blk=nb */, + { 1, 4668, 0, 14, 0, UNI_LATINEXTB } /* latinextendedb */, + { 4, 1733, 8089, 4, 18, UNI_INVS } /* blk=variationselectors */, + { 0, 6464, 6952, 3, 6, UNI_BRAH } /* sc=brahmi */, + { 1, 6464, 5546, 3, 4, UNI_SC__CHER } /* sc=cher */, + { 0, 3950, 383, 4, 2, UNI_MATH } /* math=y */, + { 0, 1294, 0, 7, 0, UNI_MULT } /* multani */, + { 9, 2810, 5705, 3, 18, UNI_BC__FSI } /* bc=firststrongisolate */, + { 0, 1911, 185, 7, 4, UNI_SC__COPT } /* script=qaac */, + { 1, 4350, 653, 5, 2, -UNI_XPOSIXLOWER } /* lower=n */, + { 1, 9096, 568, 15, 3, UNI_CANS } /* canadianaboriginal */, + { 1, 571, 653, 6, 2, -UNI_PATSYN } /* patsyn=n */, + { 1, 2407, 0, 10, 0, UNI_IDC } /* idcontinue */, + { 0, 1346, 6527, 4, 8, UNI_CJKSYMBOLS } /* iscjksymbols */, + { 1, 1911, 984, 7, 4, UNI_SC__DUPL } /* script=dupl */, + { 0, 2498, 1740, 8, 4, UNI_CYRILLICEXTD } /* cyrillicextd */, + { 0, 2, 653, 3, 2, -UNI_CWL } /* cwl=n */, + { 0, 8280, 1778, 26, 4, UNI_CJKEXTI } /* cjkunifiedideographsextensioni */, + { 2, 4022, 1388, 14, 2, UNI_NV__800 } /* numericvalue=800 */, + { 2, 2429, 9048, 6, 21, UNI_MATHOPERATORS } /* block=mathematicaloperators */, + { 3, 4664, 1070, 9, 4, UNI_LATINEXTB } /* blk=latinextb */, + { 3, 316, 809, 3, 2, UNI_NV__45 } /* nv=45 */, + { 8, 2429, 1960, 6, 11, UNI_YISYLLABLES } /* block=yisyllables */, + { 3, 4586, 1315, 17, 7, UNI_SIDD } /* scriptextensions=siddham */, + { 0, 1911, 5335, 7, 20, UNI_HLUW } /* script=anatolianhieroglyphs */, + { 11, 5845, 397, 21, 2, UNI_GCB__SM } /* graphemeclusterbreak=sm */, + { 2, 333, 4966, 2, 8, UNI_DINGBATS } /* indingbats */, + { 1, 6464, 55, 3, 4, UNI_CHAM } /* sc=cham */, + { 4, 5803, 972, 21, 2, -UNI_CWT } /* changeswhentitlecased=f */, + { 0, 2373, 928, 9, 3, UNI_IN__10 } /* presentin=10 */, + { 0, 2429, 1308, 6, 7, UNI_INPHAGSPA } /* block=phagspa */, + { 20, 1470, 652, 7, 4, -UNI_XIDS } /* xidstart=no */, + { 0, 925, 2292, 5, 3, UNI_AGE__12 } /* age=12.0 */, + { 8, 1465, 7734, 3, 8, UNI_WB__KA } /* wb=katakana */, + { 5, 135, 6264, 2, 21, UNI_YIJING } /* isyijinghexagramsymbols */, + { 0, 2429, 4814, 6, 8, UNI_INBOPOMOFO } /* block=bopomofo */, + { 3, 3535, 0, 15, 0, UNI_NARB } /* oldnortharabian */, + { 0, 135, 106, 2, 2, UNI_ZL } /* iszl */, + { 1, 1911, 537, 7, 6, UNI_SC__KHOJ } /* script=khojki */, + { 0, 6164, 98, 10, 2, UNI_LB__HL } /* linebreak=hl */, + { 0, 150, 0, 4, 0, UNI_MYMR } /* mymr */, + { 0, 2429, 6222, 6, 21, UNI_SINHALAARCHAICNUMBERS } /* block=sinhalaarchaicnumbers */, + { 0, 3128, 972, 5, 6, -UNI_EPRES } /* epres=false */, + { 3, 135, 5761, 2, 21, UNI_CWCM } /* ischangeswhencasemapped */, + { 0, 8226, 0, 16, 2, UNI_CASEDLETTER } /* generalcategory=l& */, + { 8, 6464, 644, 3, 7, UNI_DSRT } /* sc=deseret */, + { 1, 4533, 382, 5, 3, UNI_XPOSIXSPACE } /* wspace=y */, + { 0, 4681, 6492, 12, 5, UNI_CYRILLICSUP } /* block=cyrillicsup */, + { 8, 8233, 106, 9, 1, UNI_Z } /* category=z */, + { 4, 0, 0, 1, 0, UNI_L } /* l */, + { 1, 790, 0, 4, 0, UNI_MARC } /* marc */, + { 0, 1339, 0, 7, 0, UNI_TIRH } /* tirhuta */, + { 0, 859, 0, 4, 0, UNI_QAAI } /* zinh */, + { 2, 2525, 4695, 9, 4, UNI_MYANMAREXTC } /* inmyanmarextc */, + { 1, 1847, 383, 11, 2, UNI_KEHNOMIRROR } /* kehnomirror=y */, + { 0, 33, 5564, 1, 11, UNI_SMALLKANAEXT } /* smallkanaext */, + { 0, 293, 2860, 3, 6, UNI_GCB__XX } /* gcb=other */, + { 9, 2635, 6160, 3, 4, UNI_JG__NOON } /* jg=noon */, + { 1, 8233, 6993, 12, 8, UNI_LO } /* category=otherletter */, + { 2, 333, 5438, 2, 9, UNI_HALFMARKS } /* inhalfmarks */, + { 0, 7978, 1962, 21, 8, UNI_LB__H2 } /* hangulsyllabletype=lvsyllable */, + { 1, 1112, 5612, 4, 12, UNI_NV__1000000000000 } /* nv=1000000000000 */, + { 6, 333, 1024, 2, 6, UNI_INHATRAN } /* inhatran */, + { 2, 333, 2349, 2, 8, UNI_PHAISTOS } /* inphaistos */, + { 4, 135, 3852, 2, 11, UNI_MC } /* isspacingmark */, + { 6, 7509, 5299, 7, 7, UNI_SUPARROWSA } /* blk=suparrowsa */, + { 6, 7322, 7550, 25, 2, UNI_CCC__AL } /* canonicalcombiningclass=228 */, + { 1, 2429, 783, 6, 7, UNI_INMANDAIC } /* block=mandaic */, + { 0, 1733, 8607, 5, 32, UNI_DIACRITICALSEXT } /* blk=combiningdiacriticalmarksextended */, + { 2, 4846, 0, 16, 0, UNI_PF } /* finalpunctuation */, + { 0, 4533, 0, 6, 0, UNI_XPOSIXSPACE } /* wspace */, + { 0, 2496, 1573, 10, 4, UNI_CYRILLICEXTA } /* incyrillicexta */, + { 2, 4586, 90, 17, 4, UNI_GUJR } /* scriptextensions=gujr */, + { 0, 2429, 3477, 6, 15, UNI_INMEROITICCURSIVE } /* block=meroiticcursive */, + { 0, 2429, 587, 6, 6, UNI_INTANGSA } /* block=tangsa */, + { 1, 6737, 1839, 13, 8, UNI_JG__SWASHKAF } /* joininggroup=swashkaf */, + { 0, 2429, 4956, 6, 18, UNI_ORNAMENTALDINGBATS } /* block=ornamentaldingbats */, + { 0, 106, 33, 1, 1, UNI_ZS } /* zs */, + { 0, 8226, 3390, 16, 13, UNI_XPOSIXDIGIT } /* generalcategory=decimalnumber */, + { 6, 135, 336, 2, 5, UNI_QMARK } /* isqmark */, + { 12, 3629, 703, 7, 4, UNI_INADLAM } /* block=adlam */, + { 0, 1733, 1922, 4, 11, UNI_INSORASOMPENG } /* blk=sorasompeng */, + { 0, 6164, 124, 10, 2, UNI_LB__AI } /* linebreak=ai */, + { 1, 278, 383, 5, 4, UNI_CWKCF } /* cwkcf=yes */, + { 1, 32, 383, 2, 2, UNI_VS } /* vs=y */, + { 0, 7846, 972, 10, 6, -UNI_XPOSIXALPHA } /* alphabetic=false */, + { 4, 1911, 6116, 7, 4, UNI_SUND } /* script=sund */, + { 5, 7957, 4449, 18, 5, UNI_DT__SML } /* decompositiontype=small */, + { 0, 135, 8246, 2, 32, UNI_INIDC } /* isideographicdescriptioncharacters */, + { 5, 6928, 6939, 5, 13, UNI_INPC__BOTTOMANDLEFT } /* inpc=bottomandleft */, + { 4, 283, 972, 3, 6, -UNI_CWT } /* cwt=false */, + { 4, 2273, 1388, 4, 3, UNI_NV__4000 } /* nv=4000 */, + { 0, 1818, 0, 3, 0, UNI_S } /* iss */, + { 1, 1036, 0, 6, 0, UNI_LEPC } /* lepcha */, + { 3, 1141, 1533, 4, 10, UNI_DIAK } /* scx=divesakuru */, + { 14, 2236, 2196, 4, 8, UNI_NV__5_SLASH_2 } /* nv=2.500e+00 */, + { 1, 5306, 4569, 10, 17, UNI_RI } /* wordbreak=regionalindicator */, + { 2, 368, 1209, 4, 2, UNI_CCC__24 } /* ccc=24 */, + { 2, 333, 9048, 2, 21, UNI_MATHOPERATORS } /* inmathematicaloperators */, + { 27, 7525, 636, 25, 2, UNI_CCC__122 } /* canonicalcombiningclass=122 */, + { 2, 2429, 6382, 6, 13, UNI_MATHOPERATORS } /* block=mathoperators */, + { 1, 3257, 1573, 11, 4, UNI_MYANMAREXTA } /* blk=myanmarexta */, + { 2, 6597, 2840, 19, 4, UNI_BC__LRE } /* bc=lefttorightembedding */, + { 1, 2912, 1573, 10, 4, UNI_CYRILLICEXTA } /* iscyrillicexta */, + { 0, 5, 639, 3, 5, UNI_MCM } /* mcm=true */, + { 1, 1465, 211, 3, 2, UNI_WB__ML } /* wb=ml */, + { 18, 1994, 1360, 5, 8, UNI_INKHUDAWADI } /* blk=khudawadi */, + { 1, 933, 4020, 5, 2, UNI_AGE__7 } /* age=v70 */, + { 4, 7126, 653, 25, 3, -UNI_CWKCF } /* changeswhennfkccasefolded=no */, + { 2, 8226, 2721, 16, 9, UNI__PERL_SURROGATE } /* generalcategory=surrogate */, + { 0, 7151, 383, 25, 2, UNI_DI } /* defaultignorablecodepoint=y */, + { 6, 2406, 2677, 10, 4, -UNI_XIDC } /* xidcontinue=no */, + { 4, 4586, 1180, 17, 8, UNI_VITH } /* scriptextensions=vithkuqi */, + { 0, 54, 2827, 2, 7, UNI_SC__ARAB } /* sc=arabic */, + { 5, 3726, 972, 16, 2, -UNI_IDSU } /* idsunaryoperator=f */, + { 0, 7002, 0, 22, 0, UNI_TRANSPORTANDMAP } /* transportandmapsymbols */, + { 3, 4202, 639, 4, 5, UNI_IDSB } /* idsb=true */, + { 6, 797, 653, 6, 3, UNI_NFKCQC__N } /* nfkcqc=no */, + { 1, 4406, 1081, 14, 3, UNI_JG__MANICHAEANKAPH } /* jg=manichaeankaph */, + { 1, 3521, 420, 13, 2, UNI_NV__41 } /* numericvalue=41 */, + { 1, 3136, 374, 4, 2, UNI_IN__3_DOT_1 } /* in=v31 */, + { 0, 2429, 2784, 6, 13, UNI_VERTICALFORMS } /* block=verticalforms */, + { 2, 2496, 3771, 10, 9, UNI_CYRILLICEXTD } /* incyrillicextendedd */, + { 4, 1141, 537, 4, 4, UNI_KHOJ } /* scx=khoj */, + { 0, 8226, 133, 16, 2, UNI_NL } /* generalcategory=nl */, + { 0, 1346, 2049, 7, 2, UNI_CJKEXTJ } /* iscjkextj */, + { 0, 7180, 972, 20, 6, -UNI_CE } /* compositionexclusion=false */, + { 1, 2810, 4067, 3, 14, UNI_BC__EN } /* bc=europeannumber */, + { 3, 3116, 3216, 12, 5, UNI_NT__DI } /* numerictype=digit */, + { 0, 1258, 8930, 5, 33, UNI_CJKCOMPATIDEOGRAPHSSUP } /* incjkcompatibilityideographssupplement */, + { 0, 9030, 4873, 7, 15, UNI_SYRIACSUP } /* block=syriacsupplement */, + { 3, 2429, 688, 6, 7, UNI_INHANUNOO } /* block=hanunoo */, + { 0, 30, 6796, 1, 24, UNI_ZNAMENNYMUSIC } /* isznamennymusicalnotation */, + { 0, 3698, 0, 16, 0, UNI_HIGHPUSURROGATES } /* highpusurrogates */, + { 2, 583, 1662, 3, 7, UNI_SB__LE } /* sb=oletter */, + { 0, 1911, 587, 7, 4, UNI_SC__TANG } /* script=tang */, + { 2, 729, 2275, 3, 2, UNI_AGE__4 } /* age=4 */, + { 0, 1911, 307, 7, 5, UNI_NSHU } /* script=nushu */, + { 0, 2429, 4309, 6, 11, UNI_INPUNCTUATION } /* block=punctuation */, + { 1, 2429, 899, 6, 7, UNI_INTAIVIET } /* block=taiviet */, + { 0, 1141, 3355, 4, 15, UNI_ARMI } /* scx=imperialaramaic */, + { 2, 6464, 1632, 3, 10, UNI_XPEO } /* sc=oldpersian */, + { 0, 2429, 1652, 6, 10, UNI_INSAURASHTRA } /* block=saurashtra */, + { 2, 135, 126, 2, 3, UNI_LAO } /* islao */, + { 0, 135, 9036, 2, 33, UNI_SUPMATHOPERATORS } /* issupplementalmathematicaloperators */, + { 6, 6164, 303, 10, 2, UNI_GCB__L } /* linebreak=jl */, + { 1, 2858, 273, 3, 2, UNI_CASEDLETTER } /* gc=lc */, + { 0, 663, 6556, 2, 8, UNI_LB__NU } /* lb=numeric */, + { 0, 2429, 5009, 6, 4, UNI_RUMI } /* block=rumi */, + { 1, 368, 312, 5, 2, UNI_CCC__130 } /* ccc=130 */, + { 5, 1812, 3949, 5, 5, UNI_ARABICMATH } /* arabicmath */, + { 4, 1733, 2157, 4, 12, UNI_INMENDEKIKAKUI } /* blk=mendekikakui */, + { 0, 5306, 6634, 10, 6, UNI_WB__FO } /* wordbreak=format */, + { 1, 6464, 1098, 3, 8, UNI_SC__MAHJ } /* sc=mahajani */, + { 2, 1141, 1036, 4, 4, UNI_LEPC } /* scx=lepc */, + { 1, 1044, 383, 2, 2, UNI_CI } /* ci=y */, + { 1, 8233, 273, 9, 2, UNI_CASEDLETTER } /* category=lc */, + { 6, 2429, 6710, 9, 18, UNI_CJKRADICALSSUP } /* block=cjkradicalssupplement */, + { 2, 6896, 0, 11, 0, UNI_NUMBERFORMS } /* numberforms */, + { 0, 2429, 8395, 7, 29, UNI_CUNEIFORMNUMBERS } /* block=cuneiformnumbersandpunctuation */, + { 2, 1733, 1762, 4, 6, UNI_DOMINO } /* blk=domino */, + { 0, 136, 4619, 2, 15, UNI_SUTTONSIGNWRITING } /* suttonsignwriting */, + { 0, 1733, 23, 4, 4, UNI_INAHOM } /* blk=ahom */, + { 3, 4335, 0, 6, 0, UNI_HANG } /* hangul */, + { 1, 5782, 383, 21, 4, UNI_CWL } /* changeswhenlowercased=yes */, + { 1, 6464, 939, 3, 8, UNI_SC__ARMN } /* sc=armenian */, + { 0, 1577, 0, 4, 0, UNI_JAVA } /* java */, + { 2, 278, 639, 5, 2, UNI_CWKCF } /* cwkcf=t */, + { 2, 4586, 462, 17, 3, UNI_NKO } /* scriptextensions=nko */, + { 0, 1733, 3742, 7, 11, UNI_CJKCOMPATFORMS } /* blk=cjkcompatforms */, + { 6, 906, 0, 7, 0, UNI_TIBT } /* tibetan */, + { 0, 333, 346, 2, 5, UNI_INTAKRI } /* intakri */, + { 1, 3304, 658, 15, 4, UNI_EA__W } /* eastasianwidth=wide */, + { 0, 333, 403, 2, 6, UNI_INGOTHIC } /* ingothic */, + { 2, 4681, 7776, 14, 13, UNI_CYRILLICSUP } /* block=cyrillicsupplementary */, + { 4, 1733, 1762, 4, 11, UNI_DOMINO } /* blk=dominotiles */, + { 0, 3521, 2258, 13, 2, UNI_NV__33 } /* numericvalue=33 */, + { 4, 8494, 1778, 30, 4, UNI_CJKEXTI } /* blk=cjkunifiedideographsextensioni */, + { 1, 8226, 2014, 16, 6, UNI_S } /* generalcategory=symbol */, + { 0, 6222, 0, 7, 0, UNI_SINH } /* sinhala */, + { 2, 2635, 1074, 3, 5, UNI_JG__GAMAL } /* jg=gamal */, + { 0, 1141, 707, 4, 5, UNI_BUHD } /* scx=buhid */, + { 2, 2607, 8462, 3, 32, UNI_MISCMATHSYMBOLSA } /* ismiscellaneousmathematicalsymbolsa */, + { 2, 651, 1773, 3, 8, UNI_DT__FRA } /* dt=fraction */, + { 3, 2824, 1573, 10, 4, UNI_ARABICEXTA } /* blk=arabicexta */, + { 8, 1141, 442, 4, 4, UNI_GONM } /* scx=gonm */, + { 6, 2824, 6088, 10, 9, UNI_ARABICEXTA } /* blk=arabicextendeda */, + { 3, 925, 2756, 4, 3, UNI_AGE__5 } /* age=5.0 */, + { 0, 1260, 1573, 3, 4, UNI_CJKEXTA } /* cjkexta */, + { 1, 135, 885, 2, 7, UNI_TGLG } /* istagalog */, + { 3, 1523, 972, 10, 6, -UNI_DEP } /* deprecated=false */, + { 1, 2407, 653, 3, 2, -UNI_IDC } /* idc=n */, + { 4, 3136, 424, 4, 2, UNI_IN__6_DOT_1 } /* in=v61 */, + { 0, 1141, 474, 4, 4, UNI_ONAO } /* scx=onao */, + { 4, 6464, 4335, 3, 6, UNI_SC__HANG } /* sc=hangul */, + { 0, 6222, 0, 4, 0, UNI_SINH } /* sinh */, + { 1, 4586, 1137, 17, 4, UNI_NSHU } /* scriptextensions=nshu */, + { 4, 3808, 1070, 7, 4, UNI_LATINEXTB } /* islatinextb */, + { 0, 135, 8061, 2, 19, UNI_EGYP } /* isegyptianhieroglyphs */, + { 1, 4569, 0, 17, 0, UNI_RI } /* regionalindicator */, + { 2, 6164, 167, 10, 2, UNI_LB__SG } /* linebreak=sg */, + { 0, 507, 696, 2, 3, UNI_idst_values_index } /* idst= */, + { 8, 3208, 0, 5, 0, UNI_ASCII } /* ascii */, + { 0, 1547, 2677, 4, 4, -UNI_XPOSIXSPACE } /* space=no */, + { 0, 1141, 341, 4, 5, UNI_TALE } /* scx=taile */, + { 0, 4586, 5177, 17, 7, UNI_SHRD } /* scriptextensions=sharada */, + { 0, 6464, 1287, 3, 7, UNI_MAKA } /* sc=makasar */, + { 2, 7396, 1188, 8, 3, UNI_ARABICPFA } /* inarabicpfa */, + { 11, 729, 371, 3, 3, UNI_AGE__12 } /* age=12 */, + { 0, 3766, 643, 11, 3, UNI_LATINEXTE } /* latinextendede */, + { 11, 135, 31, 2, 4, UNI_AVST } /* isavst */, + { 1, 108, 3440, 2, 13, UNI_JT__R } /* jt=rightjoining */, + { 2, 2373, 605, 10, 3, UNI_IN__3 } /* presentin=3.0 */, + { 1, 135, 7176, 2, 24, UNI_COMPEX } /* isfullcompositionexclusion */, + { 2, 4664, 4861, 8, 5, UNI_LATIN1 } /* blk=latin1sup */, + { 0, 632, 2210, 5, 2, UNI_CCC__202 } /* ccc=202 */, + { 4, 1346, 8930, 5, 23, UNI_CJKCOMPATIDEOGRAPHS } /* iscjkcompatibilityideographs */, + { 1, 2858, 276, 3, 2, UNI_CF } /* gc=cf */, + { 0, 8233, 397, 9, 2, UNI_SM } /* category=sm */, + { 1, 651, 2784, 3, 8, UNI_DT__VERT } /* dt=vertical */, + { 0, 1141, 5073, 4, 5, UNI_TAML } /* scx=tamil */, + { 3, 1130, 4220, 3, 6, UNI_BRAI } /* inbraille */, + { 4, 2624, 4350, 6, 5, UNI_XPOSIXLOWER } /* xposixlower */, + { 1, 1733, 1405, 4, 9, UNI_INOLDPERMIC } /* blk=oldpermic */, + { 1, 1112, 417, 5, 1, UNI_NV__1_SLASH_6 } /* nv=1/6 */, + { 1, 1733, 32, 4, 2, UNI_INVS } /* blk=vs */, + { 4, 4586, 170, 17, 4, UNI_OUGR } /* scriptextensions=ougr */, + { 1, 8226, 64, 16, 1, UNI_P } /* generalcategory=p */, + { 5, 135, 0, 2, 2, UNI_CASEDLETTER } /* isl& */, + { 0, 3521, 813, 13, 2, UNI_NV__17 } /* numericvalue=17 */, + { 0, 7180, 639, 20, 2, UNI_CE } /* compositionexclusion=t */, + { 0, 3155, 639, 13, 2, UNI_QMARK } /* quotationmark=t */, + { 0, 71, 639, 3, 5, UNI_CWU } /* cwu=true */, + { 1, 8233, 5390, 9, 20, UNI_PC } /* category=connectorpunctuation */, + { 0, 2429, 1090, 6, 8, UNI_INKIRATRAI } /* block=kiratrai */, + { 0, 0, 2719, 1, 12, UNI_LOWSURROGATES } /* lowsurrogates */, + { 0, 7846, 639, 10, 5, UNI_XPOSIXALPHA } /* alphabetic=true */, + { 7, 2407, 971, 9, 3, -UNI_IDC } /* idcontinue=f */, + { 2, 2840, 844, 4, 4, UNI_DINGBATS } /* dingbats */, + { 0, 2429, 5890, 6, 5, UNI_INGREEK } /* block=greek */, + { 1, 2097, 6931, 4, 3, UNI_JOINC } /* joinc=t */, + { 1, 7322, 4114, 24, 13, UNI_CCC__IS } /* canonicalcombiningclass=iotasubscript */, + { 1, 6462, 2422, 5, 6, UNI_INSC__NUMBER } /* insc=number */, + { 0, 2, 3290, 1, 14, UNI_CONTROLPICTURES } /* controlpictures */, + { 1, 683, 2677, 5, 4, -UNI_GRBASE } /* grbase=no */, + { 1, 5371, 3932, 7, 15, UNI_LINEARBIDEOGRAMS } /* block=linearbideograms */, + { 1, 135, 253, 2, 4, UNI_YI } /* isyiii */, + { 0, 984, 0, 8, 0, UNI_DUPL } /* duployan */, + { 0, 2057, 0, 7, 0, UNI_SOGD } /* sogdian */, + { 1, 6369, 8796, 7, 33, UNI_MISCPICTOGRAPHS } /* block=miscellaneoussymbolsandpictographs */, + { 0, 549, 383, 5, 4, UNI_NFDQC__Y } /* nfdqc=yes */, + { 3, 6442, 382, 19, 5, UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=yes */, + { 5, 8233, 291, 9, 2, UNI_ZP } /* category=zp */, + { 0, 2406, 972, 4, 6, -UNI_XIDC } /* xidc=false */, + { 7, 8233, 3669, 9, 13, UNI_ZL } /* category=lineseparator */, + { 1, 1230, 7348, 3, 9, UNI_EA__H } /* ea=halfwidth */, + { 2, 8226, 1501, 15, 3, UNI_XPOSIXCNTRL } /* generalcategory=cc */, + { 0, 6356, 1001, 7, 7, UNI_INGUJARATI } /* block=gujarati */, + { 1, 5648, 653, 19, 3, -UNI_TERM } /* terminalpunctuation=no */, + { 2, 333, 1322, 2, 7, UNI_INSOYOMBO } /* insoyombo */, + { 3, 11, 5336, 1, 19, UNI_HLUW } /* anatolianhieroglyphs */, + { 0, 4406, 690, 13, 3, UNI_JG__MANICHAEANNUN } /* jg=manichaeannun */, + { 1, 7674, 6599, 9, 21, UNI_BC__LRE } /* bidiclass=lefttorightembedding */, + { 2, 5866, 0, 15, 0, UNI_identifiertype_values_index } /* identifiertype= */, + { 0, 571, 2381, 5, 2, UNI_patsyn_values_index } /* patsyn= */, + { 2, 5371, 4917, 19, 10, UNI_LATINEXTADDITIONAL } /* block=latinextendedadditional */, + { 0, 1911, 8061, 7, 19, UNI_EGYP } /* script=egyptianhieroglyphs */, + { 0, 237, 0, 4, 0, UNI_TUTG } /* tutg */, + { 0, 6597, 6300, 13, 9, UNI_BC__LRO } /* bc=lefttorightoverride */, + { 0, 1733, 4309, 4, 11, UNI_INPUNCTUATION } /* blk=punctuation */, + { 0, 1810, 6088, 8, 9, UNI_ARABICEXTA } /* isarabicextendeda */, + { 2, 4586, 458, 17, 3, UNI_MRO } /* scriptextensions=mro */, + { 1, 1911, 67, 7, 4, UNI_SC__CPRT } /* script=cprt */, + { 1, 8233, 4974, 9, 18, UNI_ZP } /* category=paragraphseparator */, + { 2, 7045, 828, 22, 3, UNI_JG__MALAYALAMNYA } /* joininggroup=malayalamnya */, + { 3, 333, 4668, 2, 14, UNI_LATINEXTB } /* inlatinextendedb */, + { 0, 135, 518, 2, 3, UNI_VAI } /* isvai */, + { 2, 455, 5115, 3, 9, UNI_ALCHEMICAL } /* inalchemical */, + { 2, 7674, 876, 10, 2, UNI_BC__CS } /* bidiclass=cs */, + { 1, 166, 0, 4, 0, UNI_OSGE } /* osge */, + { 1, 1498, 813, 7, 2, UNI_CCC__17 } /* ccc=ccc17 */, + { 1, 3991, 0, 16, 0, UNI_NV__5_SLASH_8 } /* numericvalue=5/8 */, + { 0, 135, 5043, 2, 4, UNI_BAMU } /* isbamu */, + { 1, 2858, 3669, 3, 13, UNI_ZL } /* gc=lineseparator */, + { 9, 8765, 2553, 22, 8, UNI_INSC__TONEMARK } /* indicsyllabiccategory=tonemark */, + { 6, 4586, 4408, 16, 5, UNI_MANI } /* scriptextensions=mani */, + { 1, 4022, 0, 15, 0, UNI_NV__80 } /* numericvalue=80 */, + { 0, 3257, 6098, 5, 8, UNI_INMONGOLIAN } /* blk=mongolian */, + { 0, 2844, 296, 5, 1, UNI_emoji_values_index } /* emoji= */, + { 0, 333, 7742, 2, 18, UNI_PHONETICEXT } /* inphoneticextensions */, + { 2, 2406, 2677, 10, 3, -UNI_XIDC } /* xidcontinue=n */, + { 2, 1678, 383, 10, 4, UNI_SD } /* softdotted=yes */, + { 1, 6464, 78, 3, 4, UNI_DSRT } /* sc=dsrt */, + { 4, 6464, 870, 3, 7, UNI_SIDT } /* sc=sidetic */, + { 0, 4305, 639, 4, 5, UNI_DASH } /* dash=true */, + { 0, 1733, 6667, 7, 13, UNI_CJKCOMPAT } /* blk=cjkcompatibility */, + { 0, 1141, 502, 4, 4, UNI_SHAW } /* scx=shaw */, + { 0, 2429, 3794, 6, 14, UNI_DEVANAGARIEXTA } /* block=devanagariexta */, + { 0, 1911, 1896, 7, 11, UNI_HMNG } /* script=pahawhhmong */, + { 2, 6342, 8307, 7, 29, UNI_ENCLOSEDALPHANUMSUP } /* block=enclosedalphanumericsupplement */, + { 1, 8233, 65, 9, 2, UNI_MN } /* category=mn */, + { 1, 4765, 0, 18, 0, UNI_PI } /* initialpunctuation */, + { 1, 2429, 2088, 6, 6, UNI_INSYRIAC } /* block=syriac */, + { 1, 135, 122, 2, 4, UNI_KRAI } /* iskrai */, + { 0, 30, 536, 1, 7, UNI_INKHOJKI } /* inkhojki */, + { 0, 333, 892, 2, 7, UNI_INTAITHAM } /* intaitham */, + { 0, 1141, 11, 4, 4, UNI_ADLM } /* scx=adlm */, + { 4, 1733, 6484, 4, 10, UNI_INGLAGOLITIC } /* blk=glagolitic */, + { 1, 1911, 1603, 7, 10, UNI_KHAR } /* script=kharoshthi */, + { 1, 651, 1166, 3, 3, UNI_DT__FIN } /* dt=fin */, + { 0, 1008, 0, 8, 0, UNI_GURU } /* gurmukhi */, + { 0, 8494, 0, 24, 0, UNI_CJK } /* blk=cjkunifiedideographs */, + { 4, 4586, 1315, 17, 4, UNI_SIDD } /* scriptextensions=sidd */, + { 0, 1488, 1495, 7, 3, UNI_BOXDRAWING } /* boxdrawing */, + { 0, 1733, 6078, 4, 19, UNI_JAMOEXTA } /* blk=hanguljamoextendeda */, + { 1, 135, 2349, 2, 12, UNI_PHAISTOS } /* isphaistosdisc */, + { 1, 42, 4731, 2, 6, UNI_SB__UP } /* sb=upper */, + { 0, 5306, 599, 10, 2, UNI_WB__EB } /* wordbreak=eb */, + { 2, 3605, 6492, 10, 5, UNI_CYRILLICSUP } /* blk=cyrillicsup */, + { 2, 1911, 63, 7, 4, UNI_SC__CPMN } /* script=cpmn */, + { 5, 2340, 0, 4, 0, UNI_HUNG } /* hung */, + { 3, 2081, 4350, 7, 5, UNI_POSIXLOWER } /* isposixlower */, + { 0, 6164, 1858, 10, 8, UNI_LB__LF } /* linebreak=linefeed */, + { 1, 1911, 1054, 7, 6, UNI_WCHO } /* script=wancho */, + { 1, 3617, 7552, 5, 10, UNI_ENCLOSEDCJK } /* blk=enclosedcjk */, + { 0, 4586, 286, 17, 5, UNI_GARA } /* scriptextensions=garay */, + { 0, 135, 446, 2, 4, UNI_HANO } /* ishano */, + { 3, 8233, 3318, 8, 13, UNI_NL } /* category=letternumber */, + { 1, 6356, 6103, 11, 13, UNI_GEORGIANSUP } /* block=georgiansupplement */, + { 0, 3867, 1964, 12, 3, UNI_JG__MALAYALAMLLA } /* jg=malayalamlla */, + { 2, 2635, 1079, 3, 5, UNI_JG__KHAPH } /* jg=khaph */, + { 0, 1141, 1265, 4, 4, UNI_GRAN } /* scx=gran */, + { 0, 1810, 1800, 8, 3, UNI_ARABICPFB } /* isarabicpfb */, + { 0, 368, 2812, 3, 2, UNI_CCC__R } /* ccc=r */, + { 1, 135, 1090, 2, 8, UNI_KRAI } /* iskiratrai */, + { 13, 2373, 635, 9, 2, UNI_IN__2 } /* presentin=2 */, + { 0, 1733, 1265, 4, 7, UNI_INGRANTHA } /* blk=grantha */, + { 3, 1733, 2361, 4, 12, UNI_PLAYINGCARDS } /* blk=playingcards */, + { 3, 32, 972, 2, 6, -UNI_VS } /* vs=false */, + { 2, 8765, 5478, 22, 15, UNI_INSC__MODIFYINGLETTER } /* indicsyllabiccategory=modifyingletter */, + { 0, 2496, 4822, 10, 9, UNI_CYRILLICEXTC } /* incyrillicextendedc */, + { 1, 135, 6203, 2, 5, UNI__PERL_NCHAR } /* isnchar */, + { 9, 2313, 2180, 4, 8, UNI_NV__5_SLASH_8 } /* nv=6.250e-01 */, + { 0, 135, 4814, 2, 4, UNI_BOPO } /* isbopo */, + { 0, 7957, 1773, 18, 8, UNI_DT__FRA } /* decompositiontype=fraction */, + { 0, 1911, 1180, 7, 4, UNI_VITH } /* script=vith */, + { 3, 2922, 1573, 10, 4, UNI_ETHIOPICEXTA } /* isethiopicexta */, + { 2, 676, 652, 6, 2, UNI_extpict_values_index } /* extpict= */, + { 1, 7978, 638, 17, 3, UNI_GCB__T } /* hangulsyllabletype=t */, + { 1, 3521, 376, 14, 1, UNI_NV__48 } /* numericvalue=48 */, + { 0, 3521, 2196, 14, 8, UNI_NV__9_SLASH_2 } /* numericvalue=4.500e+00 */, + { 0, 32, 639, 2, 5, UNI_VS } /* vs=true */, + { 8, 6039, 1336, 6, 3, UNI_SUPPUAB } /* insuppuab */, + { 1, 4586, 5508, 17, 20, UNI_PHLI } /* scriptextensions=inscriptionalpahlavi */, + { 1, 933, 812, 6, 2, UNI_AGE__12_DOT_1 } /* age=v121 */, + { 0, 6164, 296, 9, 3, UNI_LB__B2 } /* linebreak=b2 */, + { 16, 135, 3849, 2, 14, UNI_MN } /* isnonspacingmark */, + { 3, 1346, 3290, 3, 14, UNI_CONTROLPICTURES } /* iscontrolpictures */, + { 0, 5, 2743, 1, 12, UNI_MISCTECHNICAL } /* misctechnical */, + { 4, 2373, 2275, 9, 4, UNI_IN__4_DOT_1 } /* presentin=4.1 */, + { 1, 4007, 5612, 14, 4, UNI_NV__70000 } /* numericvalue=70000 */, + { 0, 1329, 0, 4, 0, UNI_SUNU } /* sunu */, + { 0, 5355, 3826, 6, 10, UNI_TANGUTSUP } /* tangutsupplement */, + { 16, 3129, 812, 12, 2, UNI_IN__12_DOT_1 } /* presentin=v121 */, + { 5, 4586, 341, 17, 5, UNI_TALE } /* scriptextensions=taile */, + { 2, 8226, 4830, 16, 16, UNI_PE } /* generalcategory=closepunctuation */, + { 1, 135, 1054, 2, 6, UNI_WCHO } /* iswancho */, + { 0, 8366, 2680, 29, 3, UNI_CJKEXTJ } /* iscjkunifiedideographsextensionj */, + { 2, 122, 0, 4, 0, UNI_KRAI } /* krai */, + { 0, 2596, 383, 5, 4, UNI_JOINC } /* joinc=yes */, + { 0, 7445, 639, 26, 5, UNI_PCM } /* prependedconcatenationmark=true */, + { 0, 6737, 1074, 13, 5, UNI_JG__GAMAL } /* joininggroup=gamal */, + { 2, 7322, 462, 24, 2, UNI_CCC__7 } /* canonicalcombiningclass=nk */, + { 0, 6464, 362, 3, 6, UNI_SC__CARI } /* sc=carian */, + { 0, 4586, 1024, 17, 6, UNI_HATR } /* scriptextensions=hatran */, + { 1, 5, 459, 1, 2, UNI_MRO } /* mro */, + { 2, 6737, 704, 13, 3, UNI_JG__LAM } /* joininggroup=lam */, + { 2, 135, 4320, 2, 15, UNI_DIACRITICALSEXT } /* isdiacriticalsext */, + { 1, 4185, 1916, 16, 3, UNI_IDCOMPATMATHSTART } /* idcompatmathstart=t */, + { 0, 30, 4143, 1, 5, UNI_INMODI } /* inmodi */, + { 0, 554, 808, 5, 2, UNI_NV__3_SLASH_64 } /* nv=3/64 */, + { 0, 1547, 638, 4, 3, UNI_XPOSIXSPACE } /* space=t */, + { 0, 333, 587, 2, 6, UNI_INTANGSA } /* intangsa */, + { 0, 1141, 669, 4, 7, UNI_ELYM } /* scx=elymaic */, + { 0, 1141, 717, 4, 5, UNI_LIMB } /* scx=limbu */, + { 1, 135, 2465, 2, 10, UNI_CN } /* isunassigned */, + { 1, 322, 639, 2, 2, UNI_RI } /* ri=t */, + { 1, 5845, 1975, 21, 7, UNI_GCB__CN } /* graphemeclusterbreak=control */, + { 12, 7846, 0, 10, 0, UNI_XPOSIXALPHA } /* alphabetic */, + { 4, 3128, 653, 5, 3, -UNI_EPRES } /* epres=no */, + { 5, 1141, 0, 4, 0, UNI_scx_values_index } /* scx= */, + { 1, 135, 4814, 2, 8, UNI_BOPO } /* isbopomofo */, + { 1, 6928, 4266, 5, 12, UNI_INPC__LEFTANDRIGHT } /* inpc=leftandright */, + { 1, 135, 5890, 2, 5, UNI_GREK } /* isgreek */, + { 1, 5782, 639, 21, 2, UNI_CWL } /* changeswhenlowercased=t */, + { 0, 7525, 564, 25, 1, UNI_CCC__17 } /* canonicalcombiningclass=17 */, + { 0, 1911, 4248, 7, 4, UNI_SC__SIND } /* script=sind */, + { 1, 2, 8395, 1, 29, UNI_CUNEIFORMNUMBERS } /* cuneiformnumbersandpunctuation */, + { 2, 3521, 419, 13, 2, UNI_NV__34 } /* numericvalue=34 */, + { 1, 32, 653, 2, 3, -UNI_VS } /* vs=no */, + { 0, 7322, 1211, 24, 2, UNI_CCC__35 } /* canonicalcombiningclass=35 */, + { 0, 3245, 7277, 7, 12, UNI_GEOMETRICSHAPES } /* blk=geometricshapes */, + { 0, 368, 2834, 4, 10, UNI_CCC__6 } /* ccc=hanreading */, + { 0, 8765, 5264, 22, 10, UNI_INSC__TONELETTER } /* indicsyllabiccategory=toneletter */, + { 9, 1911, 114, 7, 4, UNI_KITS } /* script=kits */, + { 4, 1810, 3949, 7, 5, UNI_ARABICMATH } /* isarabicmath */, + { 1, 3808, 0, 11, 0, UNI_LATINEXTE } /* islatinexte */, + { 3, 6824, 0, 10, 0, UNI_CO } /* privateuse */, + { 0, 6464, 1907, 3, 4, UNI_SC__KTHI } /* sc=kthi */, + { 3, 1141, 4335, 4, 6, UNI_HANG } /* scx=hangul */, + { 10, 1733, 5355, 4, 6, UNI_INTANGUT } /* blk=tangut */, + { 0, 1812, 1070, 6, 4, UNI_ARABICEXTB } /* arabicextb */, + { 0, 847, 0, 4, 0, UNI_SARB } /* sarb */, + { 5, 6464, 1048, 3, 6, UNI_SC__TELU } /* sc=telugu */, + { 0, 6464, 2057, 3, 7, UNI_SC__SOGD } /* sc=sogdian */, + { 0, 278, 296, 5, 1, UNI_cwkcf_values_index } /* cwkcf= */, + { 2, 47, 0, 4, 0, UNI_CAKM } /* cakm */, + { 1, 1911, 722, 7, 5, UNI_OGAM } /* script=ogham */, + { 6, 3976, 5612, 14, 6, UNI_NV__1000000 } /* numericvalue=1000000 */, + { 5, 6464, 478, 3, 4, UNI_SC__ORKH } /* sc=orkh */, + { 4, 393, 653, 4, 2, -UNI_CWCM } /* cwcm=n */, + { 4, 3213, 972, 8, 2, -UNI_XPOSIXXDIGIT } /* hexdigit=f */, + { 1, 4586, 1622, 17, 4, UNI_NAGM } /* scriptextensions=nagm */, + { 0, 135, 1982, 2, 5, UNI_BIDIM } /* isbidim */, + { 0, 2, 652, 2, 2, UNI_cwt_values_index } /* cwt= */, + { 6, 1733, 5902, 5, 18, UNI_COUNTINGROD } /* blk=countingrodnumerals */, + { 1, 2429, 707, 6, 5, UNI_INBUHID } /* block=buhid */, + { 8, 7957, 397, 18, 3, UNI_DT__SML } /* decompositiontype=sml */, + { 1, 135, 2534, 2, 4, UNI_NAND } /* isnand */, + { 1, 2361, 0, 12, 0, UNI_PLAYINGCARDS } /* playingcards */, + { 9, 16, 6465, 1, 4, UNI_CO } /* gc=co */, + { 2, 6464, 1441, 3, 9, UNI_PAUC } /* sc=paucinhau */, + { 1, 8117, 5222, 23, 6, UNI_JG__MANICHAEANSAMEKH } /* joininggroup=manichaeansamekh */, + { 0, 6039, 9048, 14, 21, UNI_SUPMATHOPERATORS } /* insupplementalmathematicaloperators */, + { 1, 1254, 6886, 3, 21, UNI_INDICNUMBERFORMS } /* incommonindicnumberforms */, + { 7, 1911, 3141, 7, 14, UNI_SC__PHLP } /* script=psalterpahlavi */, + { 0, 963, 652, 2, 6, UNI_BPT__N } /* bpt=none */, + { 2, 135, 154, 2, 4, UNI_NARB } /* isnarb */, + { 2, 1911, 3477, 7, 4, UNI_SC__MERO } /* script=mero */, + { 9, 2635, 1831, 3, 8, UNI_JG__FARSIYEH } /* jg=farsiyeh */, + { 2, 75, 1961, 1, 10, UNI_YISYLLABLES } /* yisyllables */, + { 0, 3617, 6060, 5, 15, UNI_ENCLOSEDALPHANUM } /* blk=enclosedalphanum */, + { 0, 293, 653, 2, 3, UNI_NO } /* gc=no */, + { 0, 1141, 688, 4, 7, UNI_HANO } /* scx=hanunoo */, + { 0, 1141, 346, 4, 5, UNI_TAKR } /* scx=takri */, + { 0, 2429, 6264, 6, 6, UNI_YIJING } /* block=yijing */, + { 0, 5866, 6204, 18, 9, UNI_IDENTIFIERTYPE__NOTCHARACTER } /* identifiertype=notcharacter */, + { 1, 8280, 83, 27, 3, UNI_CJKEXTG } /* cjkunifiedideographsextensiong */, + { 1, 4586, 1054, 17, 6, UNI_WCHO } /* scriptextensions=wancho */, + { 11, 1287, 1290, 3, 4, UNI_MAKA } /* makasar */, + { 1, 5803, 639, 21, 2, UNI_CWT } /* changeswhentitlecased=t */, + { 3, 2083, 331, 5, 5, UNI_POSIXPRINT } /* posixprint */, + { 2, 632, 1209, 5, 2, UNI_CCC__L } /* ccc=224 */, + { 1, 4350, 653, 5, 3, -UNI_XPOSIXLOWER } /* lower=no */, + { 11, 333, 1577, 2, 8, UNI_INJAVANESE } /* injavanese */, + { 2, 3669, 0, 13, 0, UNI_ZL } /* lineseparator */, + { 2, 2407, 0, 3, 0, UNI_IDC } /* idc */, + { 0, 4202, 383, 4, 4, UNI_IDSB } /* idsb=yes */, + { 4, 6464, 593, 3, 6, UNI_SC__TODR } /* sc=todhri */, + { 1, 1733, 2349, 4, 8, UNI_PHAISTOS } /* blk=phaistos */, + { 4, 6464, 6116, 3, 9, UNI_SUND } /* sc=sundanese */, + { 0, 3304, 972, 14, 2, UNI_EA__F } /* eastasianwidth=f */, + { 1, 1141, 587, 4, 4, UNI_TANG } /* scx=tang */, + { 2, 2576, 639, 5, 2, UNI_CASED } /* cased=t */, + { 0, 2083, 3215, 5, 6, UNI_POSIXXDIGIT } /* posixxdigit */, + { 6, 316, 423, 3, 2, UNI_NV__16 } /* nv=16 */, + { 0, 1733, 2534, 4, 11, UNI_INNANDINAGARI } /* blk=nandinagari */, + { 4, 1141, 1272, 4, 9, UNI_QAAI } /* scx=inherited */, + { 0, 1911, 102, 7, 4, UNI_HMNG } /* script=hmng */, + { 1, 7322, 5731, 24, 9, UNI_CCC__BL } /* canonicalcombiningclass=belowleft */, + { 1, 1733, 5177, 4, 7, UNI_INSHARADA } /* blk=sharada */, + { 2, 3903, 2721, 3, 9, UNI_LB__SG } /* lb=surrogate */, + { 0, 1812, 8567, 6, 29, UNI_ARABICMATH } /* arabicmathematicalalphabeticsymbols */, + { 0, 1733, 1060, 4, 6, UNI_INYEZIDI } /* blk=yezidi */, + { 4, 426, 0, 4, 0, UNI_MIAO } /* miao */, + { 4, 2313, 2757, 4, 8, UNI_NV__3_SLASH_5 } /* nv=6.000e-01 */, + { 0, 1911, 1308, 7, 7, UNI_SC__PHAG } /* script=phagspa */, + { 0, 7804, 2383, 27, 2, UNI_CCC__14 } /* canonicalcombiningclass=ccc14 */, + { 2, 1346, 8829, 3, 34, UNI_DIACRITICALSFORSYMBOLS } /* iscombiningdiacriticalmarksforsymbols */, + { 0, 6135, 0, 21, 0, UNI_SUPARROWSC } /* issupplementalarrowsc */, + { 0, 1141, 1903, 4, 4, UNI_MONG } /* scx=mong */, + { 0, 3129, 2173, 11, 2, UNI_IN__1_DOT_1 } /* presentin=v11 */, + { 2, 316, 4019, 2, 3, UNI_NV__70 } /* nv=70 */, + { 3, 2097, 2812, 11, 2, UNI_JT__R } /* joiningtype=r */, + { 0, 333, 7873, 2, 27, UNI_ANCIENTGREEKMUSIC } /* inancientgreekmusicalnotation */, + { 0, 7776, 0, 28, 0, UNI_SUPPUAA } /* supplementaryprivateuseareaa */, + { 3, 1982, 972, 5, 6, -UNI_BIDIM } /* bidim=false */, + { 1, 1141, 122, 4, 4, UNI_KRAI } /* scx=krai */, + { 0, 651, 1781, 3, 3, UNI_DT__ISO } /* dt=iso */, + { 0, 0, 295, 1, 4, UNI_LB__B2 } /* lb=b2 */, + { 8, 2607, 2146, 3, 11, UNI_MATHALPHANUM } /* ismathalphanum */, + { 1, 135, 27, 2, 4, UNI_ARMI } /* isarmi */, + { 6, 4586, 98, 17, 4, UNI_HLUW } /* scriptextensions=hluw */, + { 22, 6164, 3565, 9, 3, UNI_LB__EX } /* linebreak=ex */, + { 3, 4586, 5043, 17, 4, UNI_BAMU } /* scriptextensions=bamu */, + { 7, 6907, 0, 4, 0, UNI_CE } /* isce */, + { 0, 1733, 430, 4, 4, UNI_INTOTO } /* blk=toto */, + { 0, 1346, 0, 5, 0, UNI_CJK } /* iscjk */, + { 0, 135, 1471, 2, 3, UNI_IDS } /* isids */, + { 0, 779, 972, 2, 2, UNI_EA__F } /* ea=f */, + { 2, 2429, 3780, 6, 14, UNI_PHONETICEXTSUP } /* block=phoneticextsup */, + { 0, 6462, 1224, 14, 6, UNI_INSC__CONSONANTMEDIAL } /* insc=consonantmedial */, + { 1, 1141, 23, 4, 4, UNI_AHOM } /* scx=ahom */, + { 0, 30, 7001, 1, 16, UNI_TRANSPORTANDMAP } /* istransportandmap */, + { 5, 1141, 2157, 4, 12, UNI_MEND } /* scx=mendekikakui */, + { 9, 7322, 1744, 24, 7, UNI_CCC__1 } /* canonicalcombiningclass=overlay */, + { 3, 8765, 6466, 21, 18, UNI_INSC__CONSONANTPREFIXED } /* indicsyllabiccategory=consonantprefixed */, + { 0, 368, 195, 4, 2, UNI_CCC__0 } /* ccc=nr */, + { 2, 1907, 0, 4, 0, UNI_KTHI } /* kthi */, + { 0, 4586, 74, 17, 4, UNI_CYRL } /* scriptextensions=cyrl */, + { 16, 411, 383, 3, 2, UNI_EXT } /* ext=y */, + { 0, 7804, 7346, 27, 2, UNI_CCC__27 } /* canonicalcombiningclass=ccc27 */, + { 3, 3215, 0, 6, 0, UNI_XPOSIXXDIGIT } /* xdigit */, + { 16, 2765, 383, 13, 4, UNI_PATSYN } /* patternsyntax=yes */, + { 2, 1405, 0, 9, 0, UNI_PERM } /* oldpermic */, + { 1, 135, 3208, 2, 5, UNI_ASCII } /* isascii */, + { 0, 1911, 126, 7, 4, UNI_LAO } /* script=laoo */, + { 13, 4127, 639, 17, 2, UNI_EPRES } /* emojipresentation=t */, + { 1, 1465, 599, 3, 2, UNI_WB__EB } /* wb=eb */, + { 1, 1112, 2317, 4, 8, UNI_NV__1_SLASH_80 } /* nv=1.250e-02 */, + { 2, 954, 382, 4, 5, UNI_EBASE } /* ebase=yes */, + { 2, 2810, 5686, 2, 19, UNI_BC__ET } /* bc=europeanterminator */, + { 1, 135, 7210, 2, 14, UNI_BYZANTINEMUSIC } /* isbyzantinemusic */, + { 6, 4406, 2363, 13, 4, UNI_JG__MANICHAEANAYIN } /* jg=manichaeanayin */, + { 0, 3903, 68, 3, 2, UNI_LB__PR } /* lb=pr */, + { 1, 1346, 8930, 5, 33, UNI_CJKCOMPATIDEOGRAPHSSUP } /* iscjkcompatibilityideographssupplement */, + { 2, 955, 0, 8, 0, UNI_BASS } /* bassavah */, + { 0, 6164, 0, 10, 0, UNI_lb_values_index } /* linebreak= */, + { 3, 3903, 3919, 3, 13, UNI_LB__PR } /* lb=prefixnumeric */, + { 7, 2, 638, 1, 6, UNI_CE } /* ce=true */, + { 3, 3726, 639, 16, 2, UNI_IDSU } /* idsunaryoperator=t */, + { 0, 2313, 2196, 4, 8, UNI_NV__13_SLASH_2 } /* nv=6.500e+00 */, + { 0, 1465, 706, 3, 2, UNI_WB__MB } /* wb=mb */, + { 0, 6164, 6555, 8, 4, UNI_LB__NU } /* linebreak=nu */, + { 14, 6464, 2157, 3, 4, UNI_MEND } /* sc=mend */, + { 10, 1733, 2478, 6, 5, UNI_CJKEXTE } /* blk=cjkexte */, + { 1, 1112, 804, 4, 3, UNI_NV__11_SLASH_2 } /* nv=11/2 */, + { 4, 6164, 108, 10, 2, UNI_GCB__T } /* linebreak=jt */, + { 10, 2073, 653, 7, 2, -UNI_RADICAL } /* radical=n */, + { 0, 6464, 177, 3, 4, UNI_SC__PHLP } /* sc=phlp */, + { 2, 2824, 5884, 5, 18, UNI_ANCIENTGREEKNUMBERS } /* blk=ancientgreeknumbers */, + { 1, 3903, 3092, 3, 11, UNI_LB__VF } /* lb=viramafinal */, + { 6, 5993, 296, 4, 1, UNI_emod_values_index } /* emod= */, + { 0, 333, 5009, 2, 18, UNI_RUMI } /* inruminumeralsymbols */, + { 7, 6342, 6492, 12, 5, UNI_ETHIOPICSUP } /* block=ethiopicsup */, + { 1, 2525, 8669, 3, 32, UNI_MISCMATHSYMBOLSB } /* inmiscellaneousmathematicalsymbolsb */, + { 1, 333, 5043, 2, 8, UNI_BAMUMSUP } /* inbamumsup */, + { 11, 1911, 847, 7, 4, UNI_SARB } /* script=sarb */, + { 0, 1911, 518, 7, 4, UNI_VAI } /* script=vaii */, + { 0, 3331, 639, 14, 5, UNI_GREXT } /* graphemeextend=true */, + { 0, 2021, 2677, 11, 3, -UNI_GRBASE } /* graphemebase=n */, + { 0, 5803, 972, 21, 6, -UNI_CWT } /* changeswhentitlecased=false */, + { 2, 1911, 1506, 7, 10, UNI_CHRS } /* script=chorasmian */, + { 4, 1733, 8395, 5, 29, UNI_CUNEIFORMNUMBERS } /* blk=cuneiformnumbersandpunctuation */, + { 0, 1663, 0, 6, 0, UNI_L } /* letter */, + { 6, 6464, 1652, 3, 10, UNI_SAUR } /* sc=saurashtra */, + { 1, 333, 737, 2, 5, UNI_INTAIYO } /* intaiyo */, + { 0, 1141, 1622, 4, 10, UNI_NAGM } /* scx=nagmundari */, + { 0, 4539, 383, 14, 2, UNI_DT__NONE } /* nfkdquickcheck=y */, + { 1, 4586, 1622, 17, 10, UNI_NAGM } /* scriptextensions=nagmundari */, + { 0, 368, 2258, 4, 2, UNI_CCC__33 } /* ccc=33 */, + { 2, 2407, 382, 9, 5, UNI_IDC } /* idcontinue=yes */, + { 0, 4586, 1172, 17, 4, UNI_UGAR } /* scriptextensions=ugar */, + { 0, 6039, 8044, 13, 17, UNI_SUPPUAB } /* insupplementaryprivateuseareab */, + { 3, 30, 586, 1, 5, UNI_TANG } /* istang */, + { 4, 6462, 5954, 5, 16, UNI_INSC__INVISIBLESTACKER } /* insc=invisiblestacker */, + { 7, 1141, 518, 4, 4, UNI_VAI } /* scx=vaii */, + { 1, 5803, 296, 21, 1, UNI_cwt_values_index } /* changeswhentitlecased= */, + { 3, 1733, 1287, 4, 7, UNI_INMAKASAR } /* blk=makasar */, + { 1, 7957, 1234, 19, 5, UNI_DT__NAR } /* decompositiontype=narrow */, + { 1, 3304, 7348, 15, 9, UNI_EA__H } /* eastasianwidth=halfwidth */, + { 4, 4350, 971, 8, 7, -UNI_XPOSIXLOWER } /* lowercase=false */, + { 6, 6928, 8963, 4, 7, UNI_INPC__BOTTOM } /* inpc=bottom */, + { 6, 135, 1133, 2, 4, UNI_MLYM } /* ismlym */, + { 2, 316, 636, 3, 2, UNI_NV__22 } /* nv=22 */, + { 2, 2429, 8829, 7, 34, UNI_DIACRITICALSFORSYMBOLS } /* block=combiningdiacriticalmarksforsymbols */, + { 1, 135, 6097, 2, 9, UNI_MONG } /* ismongolian */, + { 0, 6464, 134, 3, 4, UNI_SC__LISU } /* sc=lisu */, + { 3, 135, 5177, 2, 7, UNI_SHRD } /* issharada */, + { 0, 1733, 885, 4, 7, UNI_INTAGALOG } /* blk=tagalog */, + { 1, 8366, 4572, 28, 4, UNI_CJKEXTA } /* iscjkunifiedideographsextensiona */, + { 8, 1346, 6667, 5, 13, UNI_CJKCOMPAT } /* iscjkcompatibility */, + { 4, 1733, 1603, 4, 10, UNI_INKHAROSHTHI } /* blk=kharoshthi */, + { 0, 4185, 383, 17, 4, UNI_IDCOMPATMATHSTART } /* idcompatmathstart=yes */, + { 3, 278, 972, 5, 2, -UNI_CWKCF } /* cwkcf=f */, + { 0, 2922, 1239, 3, 8, UNI_EMOTICONS } /* isemoticons */, + { 0, 8233, 4, 9, 2, UNI_LM } /* category=lm */, + { 1, 11, 2417, 1, 12, UNI_AEGEANNUMBERS } /* aegeannumbers */, + { 1, 1254, 8607, 3, 24, UNI_DIACRITICALS } /* incombiningdiacriticalmarks */, + { 0, 3257, 4673, 11, 9, UNI_MYANMAREXTB } /* blk=myanmarextendedb */, + { 0, 135, 992, 2, 8, UNI_EXT } /* isextender */, + { 2, 6164, 3578, 10, 4, UNI_LB__GL } /* linebreak=glue */, + { 0, 1141, 1048, 4, 6, UNI_TELU } /* scx=telugu */, + { 6, 135, 174, 2, 2, UNI_PC } /* ispc */, + { 2, 6464, 824, 3, 4, UNI_OSMA } /* sc=osma */, + { 0, 333, 3477, 2, 15, UNI_INMEROITICCURSIVE } /* inmeroiticcursive */, + { 1, 3629, 4673, 12, 9, UNI_ARABICEXTB } /* block=arabicextendedb */, + { 1, 2765, 1143, 12, 2, UNI_patsyn_values_index } /* patternsyntax= */, + { 0, 3867, 957, 12, 3, UNI_JG__MALAYALAMSSA } /* jg=malayalamssa */, + { 7, 1547, 971, 4, 7, -UNI_XPOSIXSPACE } /* space=false */, + { 4, 5371, 0, 15, 0, UNI_LATINEXTE } /* block=latinexte */, + { 0, 514, 0, 4, 0, UNI_TNSA } /* tnsa */, + { 1, 7322, 569, 24, 2, UNI_CCC__AL } /* canonicalcombiningclass=al */, + { 1, 6464, 6952, 3, 4, UNI_BRAH } /* sc=brah */, + { 0, 2506, 4673, 10, 9, UNI_ETHIOPICEXTB } /* inethiopicextendedb */, + { 2, 6369, 4799, 7, 15, UNI_MISCMATHSYMBOLSB } /* block=miscmathsymbolsb */, + { 0, 333, 1308, 2, 7, UNI_INPHAGSPA } /* inphagspa */, + { 17, 4350, 1663, 9, 6, UNI_LOWERCASELETTER } /* lowercaseletter */, + { 6, 6557, 1116, 14, 2, UNI_NV__2_SLASH_3 } /* numericvalue=2/3 */, + { 3, 2624, 3215, 6, 6, UNI_XPOSIXXDIGIT } /* xposixxdigit */, + { 5, 676, 1916, 6, 3, UNI_EXTPICT } /* extpict=t */, + { 1, 3257, 8796, 5, 33, UNI_MISCPICTOGRAPHS } /* blk=miscellaneoussymbolsandpictographs */, + { 0, 878, 296, 4, 1, UNI_term_values_index } /* term= */, + { 11, 5, 653, 3, 3, -UNI_MCM } /* mcm=no */, + { 18, 65, 0, 2, 0, UNI_MN } /* mn */, + { 5, 6464, 1090, 3, 8, UNI_KRAI } /* sc=kiratrai */, + { 4, 3521, 1392, 13, 2, UNI_NV__20 } /* numericvalue=20 */, + { 9, 293, 1672, 4, 2, UNI_LB__LF } /* gcb=lf */, + { 1, 518, 0, 3, 0, UNI_VAI } /* vai */, + { 1, 1733, 4249, 4, 17, UNI_INDICSIYAQNUMBERS } /* blk=indicsiyaqnumbers */, + { 16, 1141, 1060, 4, 6, UNI_YEZI } /* scx=yezidi */, + { 5, 3673, 0, 9, 0, UNI_Z } /* separator */, + { 2, 1112, 5612, 4, 9, UNI_NV__1000000000 } /* nv=1000000000 */, + { 4, 438, 639, 2, 5, UNI_DI } /* di=true */, + { 1, 1141, 1917, 3, 5, UNI_TAYO } /* scx=tayo */, + { 1, 4586, 1008, 17, 8, UNI_GURU } /* scriptextensions=gurmukhi */, + { 1, 6369, 0, 13, 0, UNI_INMYANMAR } /* block=myanmar */, + { 0, 1733, 8000, 4, 28, UNI_PHONETICEXTSUP } /* blk=phoneticextensionssupplement */, + { 3, 5410, 6931, 19, 3, UNI_EXTPICT } /* extendedpictographic=t */, + { 1, 2858, 3950, 3, 10, UNI_SM } /* gc=mathsymbol */, + { 2, 1396, 1417, 3, 6, UNI_ORKH } /* oldturkic */, + { 0, 1141, 1315, 4, 7, UNI_SIDD } /* scx=siddham */, + { 3, 2380, 2465, 3, 10, UNI_IN__NA } /* in=unassigned */, + { 2, 2429, 2478, 8, 5, UNI_CJKEXTE } /* block=cjkexte */, + { 1, 663, 2812, 2, 3, UNI_RI } /* lb=ri */, + { 0, 2824, 0, 10, 0, UNI_INARABIC } /* blk=arabic */, + { 0, 1590, 6088, 6, 9, UNI_KANAEXTA } /* iskanaextendeda */, + { 0, 293, 7445, 4, 7, UNI_GCB__PP } /* gcb=prepend */, + { 3, 8175, 653, 11, 3, -UNI_IDEO } /* ideographic=no */, + { 0, 2380, 6572, 3, 3, UNI_IN__5_DOT_1 } /* in=5.1 */, + { 3, 662, 666, 4, 3, UNI_ELBA } /* elbasan */, + { 3, 3976, 2220, 14, 8, UNI_NV__1_SLASH_6 } /* numericvalue=1.667e-01 */, + { 0, 2429, 1642, 6, 10, UNI_INPHOENICIAN } /* block=phoenician */, + { 0, 7804, 2258, 27, 2, UNI_CCC__33 } /* canonicalcombiningclass=ccc33 */, + { 1, 135, 2, 2, 3, UNI_CWL } /* iscwl */, + { 0, 1141, 1751, 4, 11, UNI_CPMN } /* scx=cyprominoan */, + { 1, 1498, 312, 7, 2, UNI_CCC__30 } /* ccc=ccc30 */, + { 0, 8283, 972, 16, 6, -UNI_UIDEO } /* unifiedideograph=false */, + { 0, 1911, 154, 7, 4, UNI_NARB } /* script=narb */, + { 8, 5, 972, 3, 6, -UNI_MCM } /* mcm=false */, + { 12, 1698, 0, 4, 0, UNI_WARA } /* wara */, + { 1, 3976, 5612, 14, 8, UNI_NV__100000000 } /* numericvalue=100000000 */, + { 0, 333, 8167, 2, 29, UNI_ENCLOSEDIDEOGRAPHICSUP } /* inenclosedideographicsupplement */, + { 0, 333, 644, 2, 7, UNI_DSRT } /* indeseret */, + { 7, 2380, 605, 3, 3, UNI_IN__3 } /* in=3.0 */, + { 11, 2635, 6504, 3, 19, UNI_JG__BURUSHASKIYEHBARREE } /* jg=burushaskiyehbarree */, + { 0, 1891, 2733, 3, 10, UNI_MAYANNUMERALS } /* mayannumerals */, + { 11563, 135, 6222, 2, 21, UNI_SINHALAARCHAICNUMBERS } /* issinhalaarchaicnumbers */, + { 0, 1911, 727, 7, 5, UNI_SC__OSGE } /* script=osage */, + { 1, 2596, 972, 5, 2, -UNI_JOINC } /* joinc=f */, + { 2, 4586, 3453, 17, 4, UNI_HEBR } /* scriptextensions=hebr */, + { 1, 7674, 585, 9, 2, UNI_BC__S } /* bidiclass=s */, + { 4, 8226, 679, 16, 2, UNI_PI } /* generalcategory=pi */, + { 2, 1733, 6710, 7, 18, UNI_CJKRADICALSSUP } /* blk=cjkradicalssupplement */, + { 5, 6464, 233, 3, 4, UNI_TOLS } /* sc=tols */, + { 8, 54, 3620, 2, 9, UNI_SC__ETHI } /* sc=ethiopic */, + { 2, 1141, 5546, 4, 8, UNI_CHER } /* scx=cherokee */, + { 0, 1733, 1652, 4, 10, UNI_INSAURASHTRA } /* blk=saurashtra */, + { 0, 3129, 319, 11, 2, UNI_IN__9 } /* presentin=v90 */, + { 0, 7525, 375, 25, 2, UNI_CCC__118 } /* canonicalcombiningclass=118 */, + { 5, 1141, 2872, 4, 4, UNI_COPT } /* scx=copt */, + { 1, 1141, 6484, 4, 10, UNI_GLAG } /* scx=glagolitic */, + { 0, 1141, 1180, 4, 4, UNI_VITH } /* scx=vith */, + { 0, 8732, 83, 33, 3, UNI_CJKEXTG } /* block=cjkunifiedideographsextensiong */, + { 1, 7674, 87, 11, 2, UNI_BC__LRE } /* bidiclass=lre */, + { 1, 135, 5377, 2, 14, UNI_LATINEXTC } /* islatinextendedc */, + { 11, 6164, 5606, 10, 6, UNI_LB__HY } /* linebreak=hyphen */, + { 3, 2429, 2440, 6, 13, UNI_BLOCKELEMENTS } /* block=blockelements */, + { 1, 498, 0, 4, 0, UNI_ROHG } /* rohg */, + { 5, 2912, 6088, 10, 9, UNI_CYRILLICEXTA } /* iscyrillicextendeda */, + { 0, 8226, 2576, 16, 11, UNI_CASEDLETTER } /* generalcategory=casedletter */, + { 0, 4586, 785, 19, 5, UNI_MAND } /* scriptextensions=mandaic */, + { 4, 2081, 3142, 3, 13, UNI_PHLP } /* ispsalterpahlavi */, + { 2, 4586, 5073, 17, 5, UNI_TAML } /* scriptextensions=tamil */, + { 0, 1911, 776, 7, 7, UNI_SC__LINA } /* script=lineara */, + { 1, 6464, 1247, 3, 7, UNI_SC__BENG } /* sc=bengali */, + { 2, 8089, 972, 17, 6, -UNI_VS } /* variationselector=false */, + { 0, 1994, 6088, 8, 9, UNI_KANAEXTA } /* blk=kanaextendeda */, + { 2, 6464, 126, 3, 4, UNI_LAO } /* sc=laoo */, + { 2, 7804, 375, 28, 2, UNI_CCC__118 } /* canonicalcombiningclass=ccc118 */, + { 0, 2429, 3698, 6, 16, UNI_HIGHPUSURROGATES } /* block=highpusurrogates */, + { 0, 333, 2361, 2, 12, UNI_PLAYINGCARDS } /* inplayingcards */, + { 1, 326, 972, 5, 2, -UNI__PERL_PATWS } /* patws=f */, + { 1, 135, 1960, 2, 11, UNI_YISYLLABLES } /* isyisyllables */, + { 0, 333, 1060, 2, 6, UNI_INYEZIDI } /* inyezidi */, + { 1, 8226, 4765, 16, 18, UNI_PI } /* generalcategory=initialpunctuation */, + { 9, 1911, 1329, 7, 4, UNI_SC__SUNU } /* script=sunu */, + { 19, 2527, 6088, 7, 9, UNI_MYANMAREXTA } /* myanmarextendeda */, + { 17, 1141, 245, 4, 4, UNI_XPEO } /* scx=xpeo */, + { 0, 2429, 5355, 6, 16, UNI_TANGUTSUP } /* block=tangutsupplement */, + { 1, 4586, 644, 17, 7, UNI_DSRT } /* scriptextensions=deseret */, + { 2, 729, 2315, 3, 4, UNI_AGE__6_DOT_2 } /* age=6.2 */, + { 0, 64, 1725, 1, 8, UNI_POSIXSPACE } /* perlspace */, + { 16, 30, 1155, 1, 9, UNI_TAGB } /* istagbanwa */, + { 2, 7322, 5723, 24, 13, UNI_CCC__202 } /* canonicalcombiningclass=attachedbelow */, + { 0, 4051, 972, 16, 6, -UNI_STERM } /* sentenceterminal=false */, + { 19, 1141, 59, 4, 4, UNI_CHRS } /* scx=chrs */, + { 3, 6164, 1866, 10, 8, UNI_LB__NL } /* linebreak=nextline */, + { 9, 7674, 4448, 10, 3, UNI_BC__NSM } /* bidiclass=nsm */, + { 0, 3808, 3823, 3, 13, UNI_LISUSUP } /* islisusupplement */, + { 0, 1258, 8930, 5, 23, UNI_CJKCOMPATIDEOGRAPHS } /* incjkcompatibilityideographs */, + { 1, 336, 972, 5, 2, -UNI_QMARK } /* qmark=f */, + { 3, 549, 653, 5, 3, UNI_DT__CAN } /* nfdqc=no */, + { 0, 1141, 1054, 4, 6, UNI_WCHO } /* scx=wancho */, + { 0, 6201, 652, 20, 4, -UNI__PERL_NCHAR } /* noncharactercodepoint=no */, + { 1, 1911, 4097, 7, 17, UNI_SC__AGHB } /* script=caucasianalbanian */, + { 0, 4022, 1388, 14, 3, UNI_NV__8000 } /* numericvalue=8000 */, + { 2, 135, 7126, 2, 25, UNI_CWKCF } /* ischangeswhennfkccasefolded */, + { 2, 2635, 7619, 3, 14, UNI_JG__NOJOININGGROUP } /* jg=nojoininggroup */, + { 7, 7445, 972, 26, 6, -UNI_PCM } /* prependedconcatenationmark=false */, + { 1, 4586, 3248, 16, 5, UNI_GEOR } /* scriptextensions=geor */, + { 0, 1359, 0, 9, 0, UNI_SIND } /* khudawadi */, + { 0, 7804, 1392, 27, 2, UNI_CCC__20 } /* canonicalcombiningclass=ccc20 */, + { 1, 333, 205, 2, 4, UNI_TAGS } /* intags */, + { 8, 11, 2797, 1, 13, UNI_ANCIENTSYMBOLS } /* ancientsymbols */, + { 3, 42, 3565, 2, 3, UNI_SB__EX } /* sb=ex */, + { 2, 8, 7648, 1, 26, UNI_OCR } /* opticalcharacterrecognition */, + { 2, 368, 423, 4, 2, UNI_CCC__16 } /* ccc=16 */, + { 0, 333, 2002, 2, 8, UNI_UCASEXTA } /* inucasexta */, + { 3, 6464, 3141, 3, 14, UNI_SC__PHLP } /* sc=psalterpahlavi */, + { 2, 2429, 7219, 6, 14, UNI_MUSIC } /* block=musicalsymbols */, + { 5, 1911, 213, 7, 4, UNI_TAVT } /* script=tavt */, + { 1, 4586, 2932, 17, 5, UNI_KHMR } /* scriptextensions=khmer */, + { 0, 135, 1399, 2, 4, UNI_ITAL } /* isital */, + { 1, 6737, 690, 13, 3, UNI_JG__NUN } /* joininggroup=nun */, + { 1, 2429, 426, 6, 4, UNI_INMIAO } /* block=miao */, + { 1, 135, 5648, 2, 19, UNI_TERM } /* isterminalpunctuation */, + { 0, 1465, 1708, 3, 7, UNI_WB__LE } /* wb=aletter */, + { 1, 316, 4034, 2, 3, UNI_NV__80 } /* nv=80 */, + { 11, 19, 653, 4, 3, -UNI_POSIXXDIGIT } /* ahex=no */, + { 2, 1346, 3742, 5, 11, UNI_CJKCOMPATFORMS } /* iscjkcompatforms */, + { 0, 6369, 8337, 7, 29, UNI_MISCSYMBOLSSUP } /* block=miscellaneoussymbolssupplement */, + { 6, 2429, 8000, 6, 28, UNI_PHONETICEXTSUP } /* block=phoneticextensionssupplement */, + { 0, 4202, 639, 4, 2, UNI_IDSB } /* idsb=t */, + { 5, 7674, 8147, 10, 21, UNI_BC__PDI } /* bidiclass=popdirectionalisolate */, + { 3, 8226, 3318, 15, 13, UNI_NL } /* generalcategory=letternumber */, + { 1, 5845, 1957, 21, 3, UNI_WB__EB } /* graphemeclusterbreak=gaz */, + { 3, 2429, 32, 6, 2, UNI_INVS } /* block=vs */, + { 0, 7396, 1070, 8, 4, UNI_ARABICEXTB } /* inarabicextb */, + { 2, 333, 5177, 2, 17, UNI_SHARADASUP } /* insharadasupplement */, + { 5, 1971, 383, 11, 2, UNI_BIDIC } /* bidicontrol=y */, + { 5, 1141, 2534, 4, 4, UNI_NAND } /* scx=nand */, + { 4, 3070, 4873, 3, 15, UNI_SYRIACSUP } /* insyriacsupplement */, + { 9, 6342, 1573, 14, 4, UNI_ETHIOPICEXTA } /* block=ethiopicexta */, + { 0, 8862, 0, 25, 0, UNI_SYMBOLSFORLEGACYCOMPUTING } /* symbolsforlegacycomputing */, + { 1, 1141, 4144, 4, 4, UNI_MODI } /* scx=modi */, + { 4, 6464, 346, 3, 5, UNI_SC__TAKR } /* sc=takri */, + { 0, 1141, 727, 4, 5, UNI_OSGE } /* scx=osage */, + { 4, 7900, 4930, 6, 12, UNI_LB__CB } /* lb=contingentbreak */, + { 8, 4051, 639, 16, 2, UNI_STERM } /* sentenceterminal=t */, + { 1, 135, 6078, 2, 10, UNI_JAMO } /* ishanguljamo */, + { 3, 2858, 138, 3, 2, UNI_ME } /* gc=me */, + { 0, 2635, 2648, 3, 10, UNI_JG__DALATHRISH } /* jg=dalathrish */, + { 0, 8639, 4266, 30, 12, UNI_INPC__TOPANDLEFTANDRIGHT } /* indicpositionalcategory=topandleftandright */, + { 4, 4732, 639, 5, 5, UNI_XPOSIXUPPER } /* upper=true */, + { 0, 4664, 4861, 8, 2, UNI_LATIN1 } /* blk=latin1 */, + { 4, 466, 56, 2, 3, UNI_OGAM } /* ogham */, + { 0, 409, 652, 4, 4, -UNI_GREXT } /* grext=no */, + { 0, 7674, 157, 10, 2, UNI_BC__BN } /* bidiclass=bn */, + { 1, 135, 6222, 2, 4, UNI_SINH } /* issinh */, + { 0, 5606, 972, 6, 6, -UNI_HYPHEN } /* hyphen=false */, + { 0, 8117, 690, 23, 3, UNI_JG__MANICHAEANNUN } /* joininggroup=manichaeannun */, + { 0, 2097, 3000, 11, 12, UNI_JT__D } /* joiningtype=dualjoining */, + { 3, 110, 0, 4, 0, UNI_KAWI } /* kawi */, + { 0, 4623, 0, 11, 0, UNI_SGNW } /* signwriting */, + { 0, 2429, 6137, 6, 19, UNI_SUPARROWSC } /* block=supplementalarrowsc */, + { 4, 1982, 0, 5, 0, UNI_BIDIM } /* bidim */, + { 3, 3962, 6372, 12, 4, UNI_NFCQC__M } /* nfkcquickcheck=m */, + { 0, 2429, 3654, 7, 15, UNI_CYPRIOTSYLLABARY } /* block=cypriotsyllabary */, + { 0, 6464, 831, 3, 4, UNI_HMNP } /* sc=hmnp */, + { 5, 1715, 0, 10, 0, UNI_WB__NL } /* wb=newline */, + { 12, 2844, 383, 14, 4, UNI_ECOMP } /* emojicomponent=yes */, + { 1, 30, 7106, 1, 5, UNI_DEVA } /* isdeva */, + { 7, 4553, 1388, 14, 2, UNI_NV__300 } /* numericvalue=300 */, + { 1, 7322, 2119, 24, 2, UNI_CCC__BR } /* canonicalcombiningclass=br */, + { 0, 913, 6244, 4, 3, UNI_UIDEO } /* uideo=t */, + { 6, 2878, 0, 14, 0, UNI_HIGHSURROGATES } /* highsurrogates */, + { 2, 6464, 362, 3, 4, UNI_SC__CARI } /* sc=cari */, + { 17, 8226, 0, 16, 0, UNI_gc_values_index } /* generalcategory= */, + { 4, 3521, 313, 13, 1, UNI_NV__0 } /* numericvalue=0 */, + { 5, 2380, 319, 3, 1, UNI_IN__9 } /* in=9 */, + { 5, 9030, 5178, 7, 16, UNI_SHARADASUP } /* block=sharadasupplement */, + { 16, 4569, 639, 17, 2, UNI_RI } /* regionalindicator=t */, + { 7, 6464, 4783, 3, 7, UNI_SC__LINB } /* sc=linearb */, + { 5, 1911, 6433, 7, 9, UNI_XSUX } /* script=cuneiform */, + { 2, 5098, 0, 17, 0, UNI_EBASE } /* emojimodifierbase */, + { 3, 212, 0, 2, 0, UNI_TITLE } /* lt */, + { 1, 7180, 639, 20, 5, UNI_CE } /* compositionexclusion=true */, + { 1, 6464, 2033, 3, 12, UNI_SC__GONG } /* sc=gunjalagondi */, + { 0, 1300, 1406, 3, 8, UNI_INOLDPERMIC } /* inoldpermic */, + { 0, 6462, 5149, 5, 14, UNI_INSC__GEMINATIONMARK } /* insc=geminationmark */, + { 4, 6464, 587, 3, 4, UNI_SC__TANG } /* sc=tang */, + { 0, 2429, 1478, 6, 10, UNI_ASCII } /* block=basiclatin */, + { 3, 5, 3947, 1, 15, UNI_MISCMATHSYMBOLSA } /* miscmathsymbolsa */, + { 3, 8233, 212, 9, 2, UNI_TITLE } /* category=lt */, + { 1, 74, 3655, 2, 5, UNI_CPRT } /* cypriot */, + { 4, 30, 2356, 1, 3, UNI_DI } /* isdi */, + { 1, 8278, 1778, 28, 4, UNI_CJKEXTI } /* incjkunifiedideographsextensioni */, + { 0, 494, 0, 4, 0, UNI_QAAI } /* qaai */, + { 0, 3764, 3932, 3, 15, UNI_LINEARBIDEOGRAMS } /* inlinearbideograms */, + { 0, 4586, 1642, 17, 10, UNI_PHNX } /* scriptextensions=phoenician */, + { 13, 1547, 971, 4, 3, -UNI_XPOSIXSPACE } /* space=f */, + { 0, 135, 877, 2, 5, UNI_STERM } /* issterm */, + { 2, 6760, 3072, 14, 3, UNI_SB__SE } /* sentencebreak=sep */, + { 0, 1141, 403, 4, 6, UNI_GOTH } /* scx=gothic */, + { 0, 1812, 4822, 6, 9, UNI_ARABICEXTC } /* arabicextendedc */, + { 8, 4586, 134, 17, 4, UNI_LISU } /* scriptextensions=lisu */, + { 0, 8233, 1501, 8, 3, UNI_XPOSIXCNTRL } /* category=cc */, + { 0, 6464, 27, 3, 4, UNI_ARMI } /* sc=armi */, + { 1, 2429, 955, 6, 8, UNI_INBASSAVAH } /* block=bassavah */, + { 3, 7957, 1773, 18, 3, UNI_DT__FRA } /* decompositiontype=fra */, + { 0, 1141, 2337, 4, 12, UNI_HUNG } /* scx=oldhungarian */, + { 0, 409, 383, 5, 2, UNI_GREXT } /* grext=y */, + { 0, 1016, 0, 8, 0, UNI_HIRA } /* hiragana */, + { 3, 135, 362, 2, 6, UNI_CARI } /* iscarian */, + { 0, 2635, 0, 13, 0, UNI_JG__AFRICANFEH } /* jg=africanfeh */, + { 8, 1911, 225, 7, 4, UNI_SC__TIBT } /* script=tibt */, + { 4, 5782, 972, 21, 2, -UNI_CWL } /* changeswhenlowercased=f */, + { 5, 6464, 9096, 3, 18, UNI_CANS } /* sc=canadianaboriginal */, + { 0, 6464, 1287, 3, 4, UNI_MAKA } /* sc=maka */, + { 7, 3617, 2479, 12, 8, UNI_ETHIOPICEXT } /* blk=ethiopicextended */, + { 1, 126, 132, 2, 2, UNI_LATN } /* latn */, + { 8, 108, 3000, 2, 12, UNI_JT__D } /* jt=dualjoining */, + { 0, 333, 9089, 2, 43, UNI_UCASEXTA } /* inunifiedcanadianaboriginalsyllabicsextendeda */, + { 0, 992, 383, 8, 4, UNI_EXT } /* extender=yes */, + { 0, 6464, 4443, 3, 17, UNI_KITS } /* sc=khitansmallscript */, + { 1, 8862, 0, 28, 0, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* symbolsforlegacycomputingsup */, + { 4, 695, 0, 6, 0, UNI_LB__H2 } /* hst=lv */, + { 0, 189, 84, 2, 2, UNI_RJNG } /* rjng */, + { 3, 6180, 653, 21, 3, -UNI_LOE } /* logicalorderexception=no */, + { 3, 4586, 847, 17, 4, UNI_SARB } /* scriptextensions=sarb */, + { 2, 135, 2002, 2, 4, UNI_UCAS } /* isucas */, + { 0, 5098, 383, 13, 4, UNI_EMOD } /* emojimodifier=yes */, + { 1, 1465, 1997, 2, 3, UNI_WB__KA } /* wb=ka */, + { 8, 6464, 253, 3, 4, UNI_SC__YI } /* sc=yiii */, + { 8, 2525, 5257, 3, 18, UNI_MODIFIERTONELETTERS } /* inmodifiertoneletters */, + { 0, 322, 972, 2, 6, -UNI_RI } /* ri=false */, + { 1, 9030, 6053, 9, 7, UNI_SUPARROWSB } /* block=suparrowsb */, + { 0, 992, 653, 8, 3, -UNI_EXT } /* extender=no */, + { 5, 2429, 1688, 6, 10, UNI_INTOLONGSIKI } /* block=tolongsiki */, + { 4, 1346, 72, 3, 2, UNI_CWU } /* iscwu */, + { 0, 3903, 53, 3, 2, UNI_LB__NS } /* lb=ns */, + { 1, 7674, 0, 10, 0, UNI_bc_values_index } /* bidiclass= */, + { 0, 1911, 899, 7, 7, UNI_TAVT } /* script=taiviet */, + { 0, 1810, 8567, 8, 29, UNI_ARABICMATH } /* isarabicmathematicalalphabeticsymbols */, + { 0, 3213, 1916, 7, 3, UNI_XPOSIXXDIGIT } /* hexdigit=t */, + { 0, 1498, 7346, 7, 2, UNI_CCC__27 } /* ccc=ccc27 */, + { 0, 1733, 2944, 4, 7, UNI_MAHJONG } /* blk=mahjong */, + { 0, 1911, 835, 7, 4, UNI_SC__KALI } /* script=kali */, + { 0, 3521, 7345, 12, 3, UNI_NV__27 } /* numericvalue=27 */, + { 0, 4586, 462, 17, 4, UNI_NKO } /* scriptextensions=nkoo */, + { 1, 1733, 6710, 7, 11, UNI_CJKRADICALSSUP } /* blk=cjkradicalssup */, + { 0, 333, 7210, 2, 14, UNI_BYZANTINEMUSIC } /* inbyzantinemusic */, + { 0, 2635, 246, 3, 2, UNI_JG__PE } /* jg=pe */, + { 15, 933, 314, 6, 2, UNI_AGE__14 } /* age=v140 */, + { 0, 3903, 599, 3, 2, UNI_EBASE } /* lb=eb */, + { 2, 7674, 6620, 10, 20, UNI_BC__PDF } /* bidiclass=popdirectionalformat */, + { 0, 3605, 6088, 12, 9, UNI_CYRILLICEXTA } /* blk=cyrillicextendeda */, + { 0, 5845, 698, 20, 4, UNI_LB__H3 } /* graphemeclusterbreak=lvt */, + { 7, 135, 565, 2, 6, UNI_ONAO } /* isolonal */, + { 26, 5, 6098, 1, 18, UNI_MONGOLIANSUP } /* mongoliansupplement */, + { 0, 3617, 1239, 5, 8, UNI_EMOTICONS } /* blk=emoticons */, + { 1, 1733, 4219, 4, 7, UNI_BRAI } /* blk=braille */, + { 3, 6737, 4898, 13, 3, UNI_JG__SAD } /* joininggroup=sad */, + { 2, 5845, 2812, 20, 3, UNI_RI } /* graphemeclusterbreak=ri */, + { 0, 7957, 1938, 18, 3, UNI_DT__SUB } /* decompositiontype=sub */, + { 0, 6135, 5299, 5, 7, UNI_SUPARROWSA } /* issuparrowsa */, + { 0, 6464, 43, 3, 4, UNI_SC__BUHD } /* sc=buhd */, + { 1, 3903, 1473, 9, 5, UNI_LB__AS } /* lb=aksarastart */, + { 4, 4569, 972, 17, 6, -UNI_RI } /* regionalindicator=false */, + { 2, 7322, 416, 25, 2, UNI_CCC__R } /* canonicalcombiningclass=226 */, + { 0, 3726, 296, 4, 1, UNI_idsu_values_index } /* idsu= */, + { 1, 777, 7552, 3, 26, UNI_ENCLOSEDCJK } /* inenclosedcjklettersandmonths */, + { 1, 135, 783, 2, 4, UNI_MAND } /* ismand */, + { 0, 2407, 3531, 8, 3, UNI_idc_values_index } /* idcontinue= */, + { 0, 1781, 5276, 3, 18, UNI_OTTOMANSIYAQNUMBERS } /* isottomansiyaqnumbers */, + { 5, 632, 375, 5, 2, UNI_CCC__BL } /* ccc=218 */, + { 1, 1733, 8336, 4, 20, UNI_MISCSYMBOLS } /* blk=miscellaneoussymbols */, + { 0, 1498, 312, 8, 2, UNI_CCC__130 } /* ccc=ccc130 */, + { 1, 3129, 1386, 11, 3, UNI_IN__16 } /* presentin=v160 */, + { 3, 316, 5612, 4, 5, UNI_NV__900000 } /* nv=900000 */, + { 2, 7348, 0, 26, 0, UNI_HALFANDFULLFORMS } /* halfwidthandfullwidthforms */, + { 1, 7322, 0, 24, 0, UNI_ccc_values_index } /* canonicalcombiningclass= */, + { 9, 4586, 7086, 17, 11, UNI_MTEI } /* scriptextensions=meeteimayek */, + { 5, 933, 2214, 5, 2, UNI_AGE__6_DOT_3 } /* age=v63 */, + { 1, 1733, 1896, 4, 11, UNI_INPAHAWHHMONG } /* blk=pahawhhmong */, + { 0, 119, 0, 2, 0, UNI_XPOSIXDIGIT } /* nd */, + { 0, 4586, 5546, 17, 8, UNI_CHER } /* scriptextensions=cherokee */, + { 18, 1465, 2860, 2, 6, UNI_WB__XX } /* wb=other */, + { 4, 669, 0, 7, 0, UNI_ELYM } /* elymaic */, + { 0, 2429, 1054, 6, 6, UNI_INWANCHO } /* block=wancho */, + { 0, 135, 1471, 2, 4, UNI_IDST } /* isidst */, + { 1, 1230, 0, 9, 0, UNI_EA__NA } /* ea=narrow */, + { 1, 1982, 639, 5, 5, UNI_BIDIM } /* bidim=true */, + { 0, 1130, 4220, 3, 14, UNI_BRAI } /* inbraillepatterns */, + { 2, 2099, 6020, 4, 19, UNI_ININSCRIPTIONALPARTHIAN } /* ininscriptionalparthian */, + { 22, 1911, 74, 7, 4, UNI_SC__CYRL } /* script=cyrl */, + { 0, 64, 0, 1, 0, UNI_P } /* p */, + { 4, 6201, 383, 21, 2, UNI__PERL_NCHAR } /* noncharactercodepoint=y */, + { 7, 1911, 1247, 7, 7, UNI_SC__BENG } /* script=bengali */, + { 1, 1733, 2010, 5, 11, UNI_CHESSSYMBOLS } /* blk=chesssymbols */, + { 0, 368, 3274, 4, 5, UNI_CCC__A } /* ccc=above */, + { 10, 353, 6053, 3, 7, UNI_SUPARROWSB } /* suparrowsb */, + { 0, 8233, 2576, 9, 11, UNI_CASEDLETTER } /* category=casedletter */, + { 0, 2844, 383, 5, 4, UNI_EMOJI } /* emoji=yes */, + { 1, 336, 383, 5, 2, UNI_QMARK } /* qmark=y */, + { 0, 7674, 6300, 20, 9, UNI_BC__LRO } /* bidiclass=lefttorightoverride */, + { 1, 1885, 653, 5, 2, UNI_COMPEX } /* nfcqc=n */, + { 0, 2429, 3550, 6, 15, UNI_SARB } /* block=oldsoutharabian */, + { 1, 135, 7760, 2, 26, UNI_TANGUTCOMPONENTSSUP } /* istangutcomponentssupplement */, + { 0, 6039, 5299, 5, 7, UNI_SUPARROWSA } /* insuparrowsa */, + { 1, 135, 2149, 2, 5, UNI_XPOSIXALPHA } /* isalpha */, + { 6, 6464, 1408, 3, 4, UNI_SC__PERM } /* sc=perm */, + { 0, 2002, 0, 8, 0, UNI_UCASEXTA } /* ucasexta */, + { 1, 7804, 636, 28, 2, UNI_CCC__122 } /* canonicalcombiningclass=ccc122 */, + { 4, 333, 7107, 2, 19, UNI_DEVANAGARIEXTA } /* indevanagariextendeda */, + { 0, 326, 972, 5, 6, -UNI__PERL_PATWS } /* patws=false */, + { 8, 4586, 1172, 17, 8, UNI_UGAR } /* scriptextensions=ugaritic */, + { 3, 1523, 653, 3, 2, -UNI_DEP } /* dep=n */, + { 16, 5371, 1787, 17, 3, UNI_LATINEXTG } /* block=latinextendedg */, + { 9, 5306, 2860, 9, 6, UNI_WB__XX } /* wordbreak=other */, + { 0, 6464, 984, 3, 8, UNI_SC__DUPL } /* sc=duployan */, + { 16, 3962, 653, 14, 3, UNI_NFKCQC__N } /* nfkcquickcheck=no */, + { 4, 8961, 3216, 3, 5, UNI_NT__DI } /* nt=digit */, + { 0, 3257, 8462, 5, 32, UNI_MISCMATHSYMBOLSA } /* blk=miscellaneousmathematicalsymbolsa */, + { 1, 322, 383, 2, 4, UNI_RI } /* ri=yes */, + { 0, 712, 0, 5, 0, UNI_DOGR } /* dogra */, + { 8, 6464, 4623, 3, 11, UNI_SGNW } /* sc=signwriting */, + { 0, 3903, 3081, 3, 11, UNI_LB__IN } /* lb=inseperable */, + { 0, 6760, 585, 13, 3, UNI_SB__ST } /* sentencebreak=st */, + { 15, 7804, 2190, 27, 2, UNI_CCC__29 } /* canonicalcombiningclass=ccc29 */, + { 3, 3521, 2285, 14, 8, UNI_NV__3_SLASH_64 } /* numericvalue=4.688e-02 */, + { 6, 2429, 5355, 6, 9, UNI_TANGUTSUP } /* block=tangutsup */, + { 4, 6464, 1315, 3, 7, UNI_SIDD } /* sc=siddham */, + { 10, 8226, 4144, 16, 14, UNI_SK } /* generalcategory=modifiersymbol */, + { 0, 4127, 972, 17, 2, -UNI_EPRES } /* emojipresentation=f */, + { 5, 135, 1172, 2, 4, UNI_UGAR } /* isugar */, + { 0, 2429, 870, 6, 7, UNI_INSIDETIC } /* block=sidetic */, + { 4, 4664, 0, 18, 0, UNI_LATINEXTB } /* blk=latinextendedb */, + { 0, 5306, 0, 10, 0, UNI_wb_values_index } /* wordbreak= */, + { 1, 2081, 178, 3, 3, UNI_PHLP } /* isphlp */, + { 0, 1733, 1488, 4, 10, UNI_BOXDRAWING } /* blk=boxdrawing */, + { 1, 1911, 257, 7, 4, UNI_ZANB } /* script=zanb */, + { 10, 2624, 3395, 6, 5, UNI_XPOSIXALNUM } /* xposixalnum */, + { 0, 5306, 3179, 10, 11, UNI_WB__SQ } /* wordbreak=singlequote */, + { 0, 274, 653, 4, 2, -UNI_CWCF } /* cwcf=n */, + { 1, 3950, 0, 4, 0, UNI_MATH } /* math */, + { 10, 6464, 189, 3, 4, UNI_RJNG } /* sc=rjng */, + { 2, 632, 2258, 5, 2, UNI_CCC__DB } /* ccc=233 */, + { 2, 4586, 427, 18, 3, UNI_MIAO } /* scriptextensions=miao */, + { 6, 2325, 2196, 4, 8, UNI_NV__17_SLASH_2 } /* nv=8.500e+00 */, + { 0, 2810, 5473, 3, 3, UNI_BC__RLE } /* bc=rle */, + { 17, 4681, 1070, 14, 4, UNI_CYRILLICEXTB } /* block=cyrillicextb */, + { 0, 32, 352, 1, 4, UNI_VSSUP } /* vssup */, + { 1, 7322, 0, 26, 0, UNI_CCC__27 } /* canonicalcombiningclass=27 */, + { 15, 1315, 0, 4, 0, UNI_SIDD } /* sidd */, + { 1, 925, 620, 4, 3, UNI_AGE__9 } /* age=9.0 */, + { 2, 135, 717, 2, 5, UNI_LIMB } /* islimbu */, + { 0, 3070, 1149, 3, 7, UNI_SPECIALS } /* inspecials */, + { 0, 333, 6484, 2, 10, UNI_INGLAGOLITIC } /* inglagolitic */, + { 0, 1812, 6492, 4, 5, UNI_ARABICSUP } /* arabicsup */, + { 0, 3136, 2182, 4, 2, UNI_IN__5 } /* in=v50 */, + { 0, 2587, 1266, 3, 6, UNI_GRAN } /* isgrantha */, + { 1, 8233, 3950, 9, 10, UNI_SM } /* category=mathsymbol */, + { 0, 1911, 86, 7, 4, UNI_SC__GREK } /* script=grek */, + { 7, 333, 7210, 2, 23, UNI_BYZANTINEMUSIC } /* inbyzantinemusicalsymbols */, + { 0, 651, 978, 3, 3, UNI_DT__COM } /* dt=com */, + { 0, 3794, 0, 13, 0, UNI_DEVANAGARIEXT } /* devanagariext */, + { 9, 1911, 4667, 6, 6, UNI_SC__LATN } /* script=latin */, + { 0, 1911, 688, 7, 7, UNI_SC__HANO } /* script=hanunoo */, + { 1, 30, 4304, 1, 5, UNI_DASH } /* isdash */, + { 1, 1911, 0, 7, 0, UNI_sc_values_index } /* script= */, + { 3, 2429, 9089, 6, 43, UNI_UCASEXTA } /* block=unifiedcanadianaboriginalsyllabicsextendeda */, + { 0, 135, 1603, 2, 4, UNI_KHAR } /* iskhar */, + { 7, 7674, 5705, 10, 18, UNI_BC__FSI } /* bidiclass=firststrongisolate */, + { 2, 4586, 4887, 17, 4, UNI_TALE } /* scriptextensions=tale */, + { 4, 2624, 2021, 6, 5, UNI_XPOSIXGRAPH } /* xposixgraph */, + { 7, 2810, 356, 3, 3, UNI_BC__FSI } /* bc=fsi */, + { 0, 1911, 3550, 7, 15, UNI_SARB } /* script=oldsoutharabian */, + { 0, 2313, 0, 4, 0, UNI_NV__6 } /* nv=6 */, + { 7, 3245, 2034, 5, 11, UNI_INGUNJALAGONDI } /* blk=gunjalagondi */, + { 4, 6180, 383, 21, 2, UNI_LOE } /* logicalorderexception=y */, + { 0, 5306, 706, 10, 2, UNI_WB__MB } /* wordbreak=mb */, + { 14, 6737, 758, 13, 4, UNI_JG__ZAIN } /* joininggroup=zain */, + { 3, 992, 639, 8, 5, UNI_EXT } /* extender=true */, + { 0, 1471, 639, 3, 2, UNI_IDS } /* ids=t */, + { 1, 7086, 0, 11, 0, UNI_MTEI } /* meeteimayek */, + { 2, 316, 419, 3, 2, UNI_NV__34 } /* nv=34 */, + { 1, 2607, 4695, 9, 4, UNI_MYANMAREXTC } /* ismyanmarextc */, + { 2, 1733, 707, 4, 5, UNI_INBUHID } /* blk=buhid */, + { 0, 3129, 2182, 11, 2, UNI_IN__5 } /* presentin=v50 */, + { 0, 7957, 259, 18, 2, UNI_DT__NB } /* decompositiontype=nb */, + { 8, 4586, 1129, 17, 4, UNI_LINB } /* scriptextensions=linb */, + { 8, 333, 1414, 2, 9, UNI_INOLDTURKIC } /* inoldturkic */, + { 16, 4586, 4248, 17, 4, UNI_SIND } /* scriptextensions=sind */, + { 6, 5177, 0, 7, 0, UNI_SHRD } /* sharada */, + { 1, 1141, 82, 4, 4, UNI_GONG } /* scx=gong */, + { 0, 1911, 1396, 7, 9, UNI_ITAL } /* script=olditalic */, + { 5, 4, 0, 2, 0, UNI_LM } /* lm */, + { 1, 7176, 639, 24, 2, UNI_COMPEX } /* fullcompositionexclusion=t */, + { 4, 8494, 6864, 30, 4, UNI_CJKEXTC } /* blk=cjkunifiedideographsextensionc */, + { 1, 8732, 0, 26, 0, UNI_CJK } /* block=cjkunifiedideographs */, + { 1, 368, 563, 3, 2, UNI_CCC__7 } /* ccc=7 */, + { 0, 438, 1231, 2, 2, UNI_dia_values_index } /* dia= */, + { 2, 3136, 1388, 5, 2, UNI_IN__10 } /* in=v100 */, + { 0, 333, 635, 2, 2, UNI_IN__2 } /* in=2 */, + { 0, 316, 1387, 3, 3, UNI_NV__600 } /* nv=600 */, + { 0, 1911, 23, 7, 4, UNI_AHOM } /* script=ahom */, + { 5, 4305, 383, 4, 4, UNI_DASH } /* dash=yes */, + { 0, 3903, 294, 3, 2, UNI_LB__CB } /* lb=cb */, + { 0, 1258, 1070, 5, 4, UNI_CJKEXTB } /* incjkextb */, + { 1, 2922, 674, 8, 5, UNI_ETHIOPICEXT } /* isethiopicext */, + { 2, 1733, 6116, 4, 19, UNI_SUNDANESESUP } /* blk=sundanesesupplement */, + { 0, 2810, 4974, 3, 18, UNI_BC__B } /* bc=paragraphseparator */, + { 9, 6464, 1137, 3, 4, UNI_NSHU } /* sc=nshu */, + { 9, 6737, 6159, 19, 5, UNI_JG__AFRICANNOON } /* joininggroup=africannoon */, + { 3, 6342, 6060, 7, 15, UNI_ENCLOSEDALPHANUM } /* block=enclosedalphanum */, + { 12, 2380, 602, 4, 3, UNI_IN__12_DOT_1 } /* in=12.1 */, + { 1, 4586, 1265, 17, 7, UNI_GRAN } /* scriptextensions=grantha */, + { 1, 3903, 0, 3, 0, UNI_lb_values_index } /* lb= */, + { 12, 7900, 0, 29, 0, UNI_LB__CJ } /* lb=conditionaljapanesestarter */, + { 2, 333, 3355, 2, 15, UNI_INIMPERIALARAMAIC } /* inimperialaramaic */, + { 3, 2429, 5194, 6, 14, UNI_INHANIFIROHINGYA } /* block=hanifirohingya */, + { 0, 1733, 4698, 4, 18, UNI_COPTICEPACTNUMBERS } /* blk=copticepactnumbers */, + { 5, 3, 242, 1, 3, UNI_WCHO } /* wcho */, + { 0, 1911, 3248, 6, 9, UNI_SC__GEOR } /* script=georgian */, + { 0, 2596, 2999, 10, 2, UNI_joinc_values_index } /* joincontrol= */, + { 2, 1733, 2561, 4, 13, UNI_IPAEXT } /* blk=ipaextensions */, + { 3, 2844, 653, 5, 2, -UNI_EMOJI } /* emoji=n */, + { 0, 1733, 8535, 4, 18, UNI_IDEOGRAPHICSYMBOLS } /* blk=ideographicsymbols */, + { 1, 34, 1689, 1, 9, UNI_TOLS } /* tolongsiki */, + { 1, 6321, 5876, 17, 6, UNI_BPT__N } /* bidipairedbrackettype=n */, + { 0, 695, 936, 3, 2, UNI_HST__V } /* hst=v */, + { 0, 2858, 6634, 3, 6, UNI_CF } /* gc=format */, + { 1, 2508, 674, 6, 5, UNI_ETHIOPICEXT } /* ethiopicext */, + { 4, 293, 3318, 2, 7, UNI_L } /* gc=letter */, + { 0, 6464, 2134, 3, 12, UNI_SC__GONM } /* sc=masaramgondi */, + { 0, 6464, 4248, 3, 4, UNI_SC__SIND } /* sc=sind */, + { 2, 1281, 1573, 6, 4, UNI_KANAEXTA } /* inkanaexta */, + { 1, 1141, 5890, 4, 5, UNI_GREK } /* scx=greek */, + { 2, 695, 1962, 7, 8, UNI_LB__H3 } /* hst=lvtsyllable */, + { 3, 2429, 3535, 6, 15, UNI_NARB } /* block=oldnortharabian */, + { 0, 1465, 3565, 2, 7, UNI_WB__EXTEND } /* wb=extend */, + { 3, 1911, 1441, 7, 4, UNI_PAUC } /* script=pauc */, + { 0, 1733, 1024, 4, 6, UNI_INHATRAN } /* blk=hatran */, + { 10, 2273, 417, 4, 1, UNI_NV__46 } /* nv=46 */, + { 4, 2149, 383, 5, 4, UNI_XPOSIXALPHA } /* alpha=yes */, + { 0, 2373, 602, 11, 3, UNI_IN__12_DOT_1 } /* presentin=12.1 */, + { 0, 1911, 1922, 7, 11, UNI_SORA } /* script=sorasompeng */, + { 11, 9030, 8808, 9, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* block=supsymbolsandpictographs */, + { 18, 2373, 604, 10, 2, UNI_IN__13 } /* presentin=13 */, + { 3, 1733, 134, 4, 4, UNI_INLISU } /* blk=lisu */, + { 0, 1733, 762, 4, 7, UNI_INKANNADA } /* blk=kannada */, + { 0, 1733, 1172, 4, 8, UNI_INUGARITIC } /* blk=ugaritic */, + { 4, 4586, 817, 17, 7, UNI_OLCK } /* scriptextensions=olchiki */, + { 0, 2373, 2781, 10, 3, UNI_IN__6_DOT_1 } /* presentin=6.1 */, + { 0, 2429, 6097, 6, 12, UNI_MONGOLIANSUP } /* block=mongoliansup */, + { 0, 333, 5546, 2, 11, UNI_CHEROKEESUP } /* incherokeesup */, + { 7, 1941, 0, 11, 0, UNI_SYLO } /* sylotinagri */, + { 0, 2622, 1725, 4, 8, UNI_XPOSIXSPACE } /* isxperlspace */, + { 9, 8639, 8963, 23, 7, UNI_INPC__BOTTOM } /* indicpositionalcategory=bottom */, + { 3, 1911, 5043, 7, 5, UNI_BAMU } /* script=bamum */, + { 1, 776, 0, 7, 0, UNI_LINA } /* lineara */, + { 17, 274, 0, 4, 0, UNI_CWCF } /* cwcf */, + { 2, 3780, 0, 14, 0, UNI_PHONETICEXTSUP } /* phoneticextsup */, + { 2, 6462, 2487, 5, 5, UNI_INSC__VOWEL } /* insc=vowel */, + { 9, 7978, 4172, 19, 13, UNI_HST__NA } /* hangulsyllabletype=notapplicable */, + { 1, 2429, 6692, 9, 18, UNI_CJKCOMPATFORMS } /* block=cjkcompatibilityforms */, + { 0, 4586, 1164, 17, 8, UNI_TFNG } /* scriptextensions=tifinagh */, + { 0, 274, 296, 4, 1, UNI_cwcf_values_index } /* cwcf= */, + { 1, 1911, 6222, 7, 7, UNI_SC__SINH } /* script=sinhala */, + { 6, 3629, 4693, 10, 6, UNI_ARABICEXTC } /* block=arabicextc */, + { 1, 7107, 0, 19, 0, UNI_DEVANAGARIEXTA } /* devanagariextendeda */, + { 0, 925, 617, 4, 3, UNI_AGE__8 } /* age=8.0 */, + { 6, 225, 0, 4, 0, UNI_TIBT } /* tibt */, + { 1, 6464, 722, 3, 5, UNI_OGAM } /* sc=ogham */, + { 7, 333, 776, 2, 7, UNI_INLINEARA } /* inlineara */, + { 10, 2429, 727, 6, 5, UNI_INOSAGE } /* block=osage */, + { 0, 6164, 5993, 10, 9, UNI_EMOD } /* linebreak=emodifier */, + { 1, 6737, 4387, 13, 7, UNI_JG__HEHGOAL } /* joininggroup=hehgoal */, + { 1, 5740, 296, 21, 1, UNI_cwcf_values_index } /* changeswhencasefolded= */, + { 0, 2635, 528, 3, 3, UNI_JG__HAH } /* jg=hah */, + { 2, 333, 1301, 2, 7, UNI_NB } /* innoblock */, + { 0, 4533, 2677, 5, 4, -UNI_XPOSIXSPACE } /* wspace=no */, + { 1, 3903, 1866, 3, 8, UNI_LB__NL } /* lb=nextline */, + { 1, 2844, 639, 14, 5, UNI_ECOMP } /* emojicomponent=true */, + { 2, 7674, 5686, 9, 19, UNI_BC__ET } /* bidiclass=europeanterminator */, + { 0, 135, 6442, 2, 20, UNI_IDCOMPATMATHCONTINUE } /* isidcompatmathcontinue */, + { 0, 30, 946, 1, 9, UNI_INBALINESE } /* inbalinese */, + { 5, 2429, 4081, 7, 16, UNI_UCAS } /* block=canadiansyllabics */, + { 2, 368, 1744, 4, 7, UNI_CCC__1 } /* ccc=overlay */, + { 1, 978, 6888, 3, 19, UNI_INDICNUMBERFORMS } /* commonindicnumberforms */, + { 0, 1498, 319, 8, 1, UNI_CCC__19 } /* ccc=ccc19 */, + { 0, 6760, 1672, 14, 2, UNI_LB__LF } /* sentencebreak=lf */, + { 0, 8175, 2014, 11, 7, UNI_IDEOGRAPHICSYMBOLS } /* ideographicsymbols */, + { 6, 32, 639, 2, 2, UNI_VS } /* vs=t */, + { 4, 1590, 716, 3, 3, UNI_KALI } /* iskali */, + { 0, 1812, 7854, 4, 20, UNI_ARABICPFA } /* arabicpresentationformsa */, + { 3, 8117, 4053, 22, 4, UNI_JG__MANICHAEANTEN } /* joininggroup=manichaeanten */, + { 4, 6342, 8307, 7, 20, UNI_ENCLOSEDALPHANUM } /* block=enclosedalphanumerics */, + { 0, 7804, 419, 27, 2, UNI_CCC__34 } /* canonicalcombiningclass=ccc34 */, + { 12, 6464, 1622, 3, 10, UNI_NAGM } /* sc=nagmundari */, + { 0, 4586, 543, 17, 4, UNI_LYDI } /* scriptextensions=lydi */, + { 0, 6464, 60, 4, 3, UNI_CHRS } /* sc=chrs */, + { 11, 2429, 7210, 6, 23, UNI_BYZANTINEMUSIC } /* block=byzantinemusicalsymbols */, + { 4, 1733, 2002, 4, 4, UNI_UCAS } /* blk=ucas */, + { 0, 283, 0, 3, 0, UNI_CWT } /* cwt */, + { 4, 2429, 1577, 6, 8, UNI_INJAVANESE } /* block=javanese */, + { 2, 135, 7789, 2, 14, UNI_PUA } /* isprivateusearea */, + { 2, 174, 0, 2, 0, UNI_PC } /* pc */, + { 9, 4732, 972, 5, 6, -UNI_XPOSIXUPPER } /* upper=false */, + { 0, 1911, 478, 7, 4, UNI_SC__ORKH } /* script=orkh */, + { 0, 4586, 2057, 17, 7, UNI_SOGD } /* scriptextensions=sogdian */, + { 3, 1911, 1156, 7, 8, UNI_SC__TAGB } /* script=tagbanwa */, + { 0, 6464, 577, 3, 6, UNI_RJNG } /* sc=rejang */, + { 1, 333, 7789, 2, 14, UNI_PUA } /* inprivateusearea */, + { 1, 174, 653, 3, 2, -UNI_PCM } /* pcm=n */, + { 0, 326, 639, 5, 2, UNI__PERL_PATWS } /* patws=t */, + { 5, 651, 1773, 3, 3, UNI_DT__FRA } /* dt=fra */, + { 1, 1533, 0, 10, 0, UNI_DIAK } /* divesakuru */, + { 19, 2073, 383, 7, 2, UNI_RADICAL } /* radical=y */, + { 0, 1733, 2054, 4, 10, UNI_INOLDSOGDIAN } /* blk=oldsogdian */, + { 0, 1281, 6088, 6, 9, UNI_KANAEXTA } /* inkanaextendeda */, + { 0, 2858, 3849, 3, 14, UNI_MN } /* gc=nonspacingmark */, + { 0, 3257, 7929, 5, 28, UNI_MISCARROWS } /* blk=miscellaneoussymbolsandarrows */, + { 7, 1346, 2522, 5, 4, UNI_CJKEXTI } /* iscjkexti */, + { 7, 197, 0, 4, 0, UNI_SAMR } /* samr */, + { 10, 135, 4320, 2, 9, UNI_DIA } /* isdiacritic */, + { 2, 3070, 6775, 3, 22, UNI_SHORTHANDFORMATCONTROLS } /* inshorthandformatcontrols */, + { 0, 6369, 5257, 7, 18, UNI_MODIFIERTONELETTERS } /* block=modifiertoneletters */, + { 1, 30, 668, 1, 8, UNI_INELYMAIC } /* inelymaic */, + { 10, 333, 8000, 2, 28, UNI_PHONETICEXTSUP } /* inphoneticextensionssupplement */, + { 2, 30, 5919, 1, 5, UNI_MERO } /* ismero */, + { 12, 2429, 7789, 6, 14, UNI_PUA } /* block=privateusearea */, + { 8, 368, 9069, 4, 18, UNI_CCC__216 } /* ccc=attachedaboveright */, + { 0, 4586, 193, 17, 4, UNI_RUNR } /* scriptextensions=runr */, + { 0, 3070, 1316, 3, 6, UNI_INSIDDHAM } /* insiddham */, + { 0, 135, 7210, 2, 23, UNI_BYZANTINEMUSIC } /* isbyzantinemusicalsymbols */, + { 0, 6164, 301, 10, 2, UNI_LB__VF } /* linebreak=vf */, + { 1, 978, 0, 2, 0, UNI_CO } /* co */, + { 0, 135, 5390, 2, 20, UNI_PC } /* isconnectorpunctuation */, + { 4, 5740, 383, 21, 4, UNI_CWCF } /* changeswhencasefolded=yes */, + { 7, 549, 653, 5, 2, UNI_DT__CAN } /* nfdqc=n */, + { 2, 2765, 653, 13, 3, -UNI_PATSYN } /* patternsyntax=no */, + { 0, 554, 4005, 4, 2, UNI_NV__3_SLASH_8 } /* nv=3/8 */, + { 0, 6464, 6484, 3, 4, UNI_SC__GLAG } /* sc=glag */, + { 3, 6462, 7256, 15, 10, UNI_INSC__CONSONANTPLACEHOLDER } /* insc=consonantplaceholder */, + { 0, 0, 4516, 1, 16, UNI_LETTERLIKESYMBOLS } /* letterlikesymbols */, + { 0, 4586, 5355, 17, 6, UNI_TANG } /* scriptextensions=tangut */, + { 0, 333, 928, 2, 3, UNI_IN__10 } /* in=10 */, + { 4, 3903, 167, 3, 2, UNI_LB__SG } /* lb=sg */, + { 0, 1982, 296, 5, 1, UNI_bidim_values_index } /* bidim= */, + { 1, 316, 2197, 3, 3, UNI_NV__500 } /* nv=500 */, + { 1, 1346, 81, 7, 2, UNI_CJKEXTG } /* iscjkextg */, + { 1, 142, 0, 4, 0, UNI_MERC } /* merc */, + { 0, 769, 0, 7, 0, UNI_KALI } /* kayahli */, + { 7, 1141, 4097, 4, 17, UNI_AGHB } /* scx=caucasianalbanian */, + { 12, 6369, 8196, 7, 30, UNI_MATHALPHANUM } /* block=mathematicalalphanumericsymbols */, + { 2, 3521, 2189, 13, 2, UNI_NV__42 } /* numericvalue=42 */, + { 3, 8226, 291, 16, 2, UNI_ZP } /* generalcategory=zp */, + { 5, 3629, 5115, 7, 9, UNI_ALCHEMICAL } /* block=alchemical */, + { 7, 30, 5545, 1, 5, UNI_CHER } /* ischer */, + { 0, 913, 653, 5, 3, -UNI_UIDEO } /* uideo=no */, + { 33, 4586, 1533, 17, 10, UNI_DIAK } /* scriptextensions=divesakuru */, + { 0, 15, 4564, 2, 3, UNI_AGE__3 } /* age=3 */, + { 1, 1141, 5335, 4, 20, UNI_HLUW } /* scx=anatolianhieroglyphs */, + { 1, 3617, 6060, 5, 18, UNI_ENCLOSEDALPHANUMSUP } /* blk=enclosedalphanumsup */, + { 24, 1733, 126, 4, 3, UNI_INLAO } /* blk=lao */, + { 12, 135, 2157, 2, 4, UNI_MEND } /* ismend */, + { 0, 1112, 0, 4, 0, UNI_NV__1 } /* nv=1 */, + { 2, 7322, 3274, 24, 5, UNI_CCC__A } /* canonicalcombiningclass=above */, + { 4, 5098, 382, 16, 2, UNI_ebase_values_index } /* emojimodifierbase= */, + { 8, 7846, 6931, 9, 3, UNI_XPOSIXALPHA } /* alphabetic=t */, + { 1, 4586, 2340, 17, 4, UNI_HUNG } /* scriptextensions=hung */, + { 3, 397, 0, 2, 0, UNI_SM } /* sm */, + { 0, 2429, 1066, 6, 8, UNI_JAMOEXTB } /* block=jamoextb */, + { 0, 1141, 3869, 3, 10, UNI_MLYM } /* scx=malayalam */, + { 0, 3903, 222, 3, 2, UNI_LB__GL } /* lb=gl */, + { 3, 6535, 972, 21, 2, -UNI_MCM } /* modifiercombiningmark=f */, + { 8, 1112, 314, 5, 2, UNI_NV__1_SLASH_40 } /* nv=1/40 */, + { 4, 1911, 1048, 7, 4, UNI_SC__TELU } /* script=telu */, + { 9, 2596, 972, 5, 6, -UNI_JOINC } /* joinc=false */, + { 0, 2429, 1200, 6, 9, UNI_INBHAIKSUKI } /* block=bhaiksuki */, + { 1, 135, 3669, 2, 13, UNI_ZL } /* islineseparator */, + { 2, 5845, 3565, 20, 3, UNI_GCB__EX } /* graphemeclusterbreak=ex */, + { 0, 438, 639, 2, 2, UNI_DI } /* di=t */, + { 2, 6369, 6088, 13, 9, UNI_MYANMAREXTA } /* block=myanmarextendeda */, + { 1, 1141, 1789, 4, 4, UNI_GURU } /* scx=guru */, + { 1, 4586, 712, 17, 5, UNI_DOGR } /* scriptextensions=dogra */, + { 6, 1994, 1070, 8, 4, UNI_KANAEXTB } /* blk=kanaextb */, + { 9, 2607, 3492, 3, 14, UNI_MISCPICTOGRAPHS } /* ismiscpictographs */, + { 10, 1465, 5993, 3, 9, UNI_WB__EB } /* wb=emodifier */, + { 1, 695, 3345, 5, 10, UNI_GCB__L } /* hst=leadingjamo */, + { 1, 322, 639, 2, 5, UNI_RI } /* ri=true */, + { 0, 6464, 3590, 3, 15, UNI_ZANB } /* sc=zanabazarsquare */, + { 0, 4320, 0, 15, 0, UNI_DIACRITICALSEXT } /* diacriticalsext */, + { 4, 368, 569, 4, 2, UNI_CCC__AL } /* ccc=al */, + { 8, 1560, 990, 8, 5, UNI_GEORGIANEXT } /* ingeorgianext */, + { 0, 8283, 3317, 15, 2, UNI_uideo_values_index } /* unifiedideograph= */, + { 8, 2429, 3290, 7, 14, UNI_CONTROLPICTURES } /* block=controlpictures */, + { 0, 7789, 0, 14, 0, UNI_PUA } /* privateusearea */, + { 0, 3136, 314, 5, 2, UNI_IN__14 } /* in=v140 */, + { 1, 7525, 319, 25, 1, UNI_CCC__19 } /* canonicalcombiningclass=19 */, + { 16, 913, 972, 5, 2, -UNI_UIDEO } /* uideo=f */, + { 1, 8494, 2680, 31, 3, UNI_CJKEXTJ } /* blk=cjkunifiedideographsextensionj */, + { 0, 933, 1388, 6, 2, UNI_AGE__10 } /* age=v100 */, + { 1, 135, 286, 2, 4, UNI_GARA } /* isgara */, + { 13, 1733, 5508, 4, 20, UNI_ININSCRIPTIONALPAHLAVI } /* blk=inscriptionalpahlavi */, + { 0, 1911, 5177, 7, 7, UNI_SC__SHRD } /* script=sharada */, + { 1, 30, 5354, 1, 10, UNI_TANGUTSUP } /* istangutsup */, + { 0, 2607, 8669, 3, 32, UNI_MISCMATHSYMBOLSB } /* ismiscellaneousmathematicalsymbolsb */, + { 11, 3903, 2130, 3, 2, UNI_LB__H3 } /* lb=h3 */, + { 3, 1911, 4623, 7, 11, UNI_SGNW } /* script=signwriting */, + { 8, 2598, 4700, 4, 16, UNI_COPTICEPACTNUMBERS } /* incopticepactnumbers */, + { 5, 925, 2248, 4, 3, UNI_AGE__3_DOT_1 } /* age=3.1 */, + { 1, 5761, 0, 21, 0, UNI_CWCM } /* changeswhencasemapped */, + { 5, 331, 0, 5, 0, UNI_XPOSIXPRINT } /* print */, + { 4, 1260, 1070, 3, 4, UNI_CJKEXTB } /* cjkextb */, + { 48, 7674, 359, 10, 3, UNI_BC__PDF } /* bidiclass=pdf */, + { 3, 3826, 4770, 10, 13, UNI_SUPPUNCTUATION } /* supplementalpunctuation */, + { 6, 333, 1008, 2, 8, UNI_INGURMUKHI } /* ingurmukhi */, + { 4, 3976, 2240, 14, 8, UNI_NV__3_SLASH_20 } /* numericvalue=1.500e-01 */, + { 1, 4586, 6952, 17, 6, UNI_BRAH } /* scriptextensions=brahmi */, + { 1, 2922, 0, 6, 0, UNI_ETHI } /* isethi */, + { 1, 1141, 225, 4, 4, UNI_TIBT } /* scx=tibt */, + { 1, 2429, 7422, 7, 23, UNI_DIACRITICALSFORSYMBOLS } /* block=combiningmarksforsymbols */, + { 3, 1141, 237, 4, 4, UNI_TUTG } /* scx=tutg */, + { 4, 2810, 157, 3, 2, UNI_BC__BN } /* bc=bn */, + { 0, 1141, 118, 4, 4, UNI_KNDA } /* scx=knda */, + { 0, 1471, 383, 3, 4, UNI_IDS } /* ids=yes */, + { 0, 1586, 713, 3, 4, UNI_INDOGRA } /* indogra */, + { 0, 7396, 1800, 8, 3, UNI_ARABICPFB } /* inarabicpfb */, + { 5, 30, 7872, 1, 18, UNI_ANCIENTGREEKMUSIC } /* isancientgreekmusic */, + { 5, 135, 482, 2, 4, UNI_PHLI } /* isphli */, + { 0, 1141, 855, 4, 4, UNI_SYRC } /* scx=syrc */, + { 3, 7322, 3279, 24, 11, UNI_CCC__8 } /* canonicalcombiningclass=kanavoicing */, + { 1, 4586, 3620, 16, 9, UNI_ETHI } /* scriptextensions=ethiopic */, + { 0, 393, 639, 4, 2, UNI_CWCM } /* cwcm=t */, + { 0, 5648, 972, 19, 2, -UNI_TERM } /* terminalpunctuation=f */, + { 1, 135, 4732, 2, 9, UNI_XPOSIXUPPER } /* isuppercase */, + { 17, 5098, 0, 13, 0, UNI_EMOD } /* emojimodifier */, + { 4, 2376, 4055, 4, 12, UNI_STERM } /* sentenceterminal */, + { 1, 1141, 446, 4, 3, UNI_HAN } /* scx=han */, + { 2, 3605, 7776, 12, 13, UNI_CYRILLICSUP } /* blk=cyrillicsupplementary */, + { 0, 7151, 652, 24, 4, -UNI_DI } /* defaultignorablecodepoint=no */, + { 9, 3766, 139, 11, 3, UNI_LATINEXTF } /* latinextendedf */, + { 0, 4586, 8061, 17, 19, UNI_EGYP } /* scriptextensions=egyptianhieroglyphs */, + { 0, 1260, 6867, 3, 19, UNI_CJKCOMPATIDEOGRAPHSSUP } /* cjkcompatideographssup */, + { 0, 2054, 0, 10, 0, UNI_SOGO } /* oldsogdian */, + { 0, 6464, 5546, 3, 8, UNI_SC__CHER } /* sc=cherokee */, + { 14, 7525, 0, 25, 0, UNI_CCC__1 } /* canonicalcombiningclass=1 */, + { 0, 7509, 9047, 15, 22, UNI_SUPMATHOPERATORS } /* blk=supplementalmathematicaloperators */, + { 0, 135, 918, 2, 7, UNI_ZZZZ } /* isunknown */, + { 1, 1911, 1533, 7, 10, UNI_DIAK } /* script=divesakuru */, + { 0, 3903, 2699, 3, 10, UNI_LB__NS } /* lb=nonstarter */, + { 0, 1971, 653, 11, 2, -UNI_BIDIC } /* bidicontrol=n */, + { 0, 6928, 0, 5, 0, UNI_inpc_values_index } /* inpc= */, + { 1, 4350, 971, 8, 3, -UNI_XPOSIXLOWER } /* lowercase=f */, + { 6, 1733, 717, 4, 5, UNI_INLIMBU } /* blk=limbu */, + { 9, 333, 1156, 2, 8, UNI_INTAGBANWA } /* intagbanwa */, + { 0, 2273, 372, 4, 1, UNI_NV__41 } /* nv=41 */, + { 0, 1911, 454, 7, 4, UNI_SC__LINA } /* script=lina */, + { 0, 3521, 371, 12, 3, UNI_NV__12 } /* numericvalue=12 */, + { 0, 135, 776, 2, 7, UNI_LINA } /* islineara */, + { 0, 135, 1339, 2, 4, UNI_TIRH } /* istirh */, + { 1, 7180, 383, 20, 2, UNI_CE } /* compositionexclusion=y */, + { 0, 7674, 296, 9, 2, UNI_BC__B } /* bidiclass=b */, + { 4, 6760, 6555, 12, 4, UNI_SB__NU } /* sentencebreak=nu */, + { 3, 1733, 0, 7, 0, UNI_CJK } /* blk=cjk */, + { 21, 7396, 4673, 8, 9, UNI_ARABICEXTB } /* inarabicextendedb */, + { 2, 925, 608, 5, 3, UNI_AGE__14 } /* age=14.0 */, + { 2, 1141, 4443, 4, 17, UNI_KITS } /* scx=khitansmallscript */, + { 2, 174, 5, 2, 1, UNI_PCM } /* pcm */, + { 4, 135, 470, 2, 4, UNI_OLCK } /* isolck */, + { 12, 6164, 97, 10, 2, UNI_LB__HH } /* linebreak=hh */, + { 1, 8765, 6002, 22, 16, UNI_INSC__VOWELINDEPENDENT } /* indicsyllabiccategory=vowelindependent */, + { 0, 6135, 8808, 14, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* issupplementalsymbolsandpictographs */, + { 7, 1733, 5043, 4, 8, UNI_BAMUMSUP } /* blk=bamumsup */, + { 0, 2587, 6103, 7, 6, UNI_GEORGIANSUP } /* isgeorgiansup */, + { 1, 1523, 653, 10, 3, -UNI_DEP } /* deprecated=no */, + { 0, 8167, 0, 22, 0, UNI_ENCLOSEDIDEOGRAPHICSUP } /* enclosedideographicsup */, + { 0, 4586, 146, 17, 4, UNI_MTEI } /* scriptextensions=mtei */, + { 1, 2858, 291, 3, 2, UNI_ZP } /* gc=zp */, + { 4, 8226, 276, 16, 2, UNI_CF } /* generalcategory=cf */, + { 1, 1810, 1070, 8, 4, UNI_ARABICEXTB } /* isarabicextb */, + { 15, 1346, 8395, 3, 15, UNI_CUNEIFORMNUMBERS } /* iscuneiformnumbers */, + { 4, 4586, 732, 17, 5, UNI_RUNR } /* scriptextensions=runic */, + { 0, 1733, 5009, 4, 4, UNI_RUMI } /* blk=rumi */, + { 6, 8226, 5322, 16, 2, UNI_CASEDLETTER } /* generalcategory=l_ */, + { 1, 1911, 237, 7, 4, UNI_SC__TUTG } /* script=tutg */, + { 16, 333, 2932, 2, 12, UNI_KHMERSYMBOLS } /* inkhmersymbols */, + { 2, 1141, 387, 4, 6, UNI_CAKM } /* scx=chakma */, + { 0, 1616, 0, 6, 0, UNI_ARROWS } /* arrows */, + { 0, 1911, 1622, 7, 10, UNI_NAGM } /* script=nagmundari */, + { 0, 1112, 2172, 4, 8, UNI_NV__1_SLASH_9 } /* nv=1.111e-01 */, + { 1, 914, 383, 4, 4, UNI_IDEO } /* ideo=yes */, + { 0, 6737, 4408, 12, 15, UNI_JG__MANICHAEANKAPH } /* joininggroup=manichaeankaph */, + { 1, 1810, 4673, 8, 9, UNI_ARABICEXTB } /* isarabicextendedb */, + { 1, 5306, 1957, 10, 3, UNI_WB__EB } /* wordbreak=gaz */, + { 2, 6321, 966, 21, 5, UNI_BPT__O } /* bidipairedbrackettype=open */, + { 0, 817, 0, 7, 0, UNI_OLCK } /* olchiki */, + { 2, 4406, 5210, 13, 6, UNI_JG__MANICHAEANDALETH } /* jg=manichaeandaleth */, + { 0, 135, 1200, 2, 9, UNI_BHKS } /* isbhaiksuki */, + { 2, 1471, 639, 7, 5, UNI_IDS } /* idstart=true */, + { 5, 6464, 984, 3, 4, UNI_SC__DUPL } /* sc=dupl */, + { 1, 1048, 0, 6, 0, UNI_TELU } /* telugu */, + { 1, 8061, 0, 19, 0, UNI_EGYP } /* egyptianhieroglyphs */, + { 3, 1733, 737, 4, 5, UNI_INTAIYO } /* blk=taiyo */, + { 0, 5546, 0, 4, 0, UNI_CHER } /* cher */, + { 0, 1498, 372, 7, 2, UNI_CCC__12 } /* ccc=ccc12 */, + { 4, 8233, 4144, 9, 14, UNI_SK } /* category=modifiersymbol */, + { 0, 5, 653, 3, 2, -UNI_MCM } /* mcm=n */, + { 9, 4586, 130, 17, 4, UNI_LATN } /* scriptextensions=latn */, + { 3, 2108, 638, 10, 3, UNI_KEHNOROTATE } /* kehnorotate=t */, + { 0, 336, 972, 5, 6, -UNI_QMARK } /* qmark=false */, + { 0, 6464, 2157, 3, 12, UNI_MEND } /* sc=mendekikakui */, + { 1, 583, 1672, 3, 2, UNI_LB__LF } /* sb=lf */, + { 0, 3605, 1070, 12, 4, UNI_CYRILLICEXTB } /* blk=cyrillicextb */, + { 3, 5306, 305, 10, 2, UNI_WB__XX } /* wordbreak=xx */, + { 0, 2406, 382, 10, 5, UNI_XIDC } /* xidcontinue=yes */, + { 4, 1911, 2944, 7, 4, UNI_SC__MAHJ } /* script=mahj */, + { 0, 3129, 1391, 11, 2, UNI_IN__3_DOT_2 } /* presentin=v32 */, + { 5, 2429, 2054, 6, 10, UNI_INOLDSOGDIAN } /* block=oldsogdian */, + { 2, 3129, 422, 12, 2, UNI_IN__15_DOT_1 } /* presentin=v151 */, + { 0, 1971, 639, 5, 5, UNI_BIDIC } /* bidic=true */, + { 0, 1308, 2352, 3, 5, UNI_PHAISTOS } /* phaistos */, + { 5, 2607, 7929, 3, 28, UNI_MISCARROWS } /* ismiscellaneoussymbolsandarrows */, + { 4, 507, 4601, 2, 2, UNI_ids_values_index } /* ids= */, + { 17, 5371, 4917, 14, 10, UNI_LATINEXTADDITIONAL } /* block=latinextadditional */, + { 0, 1141, 1459, 4, 4, UNI_THAA } /* scx=thaa */, + { 0, 2081, 1547, 7, 5, UNI_POSIXSPACE } /* isposixspace */, + { 0, 409, 652, 4, 2, UNI_grext_values_index } /* grext= */, + { 0, 1483, 0, 5, 0, UNI_LATN } /* latin */, + { 0, 1560, 6103, 7, 6, UNI_GEORGIANSUP } /* ingeorgiansup */, + { 0, 333, 6661, 2, 23, UNI_COMPATJAMO } /* inhangulcompatibilityjamo */, + { 0, 3867, 828, 12, 3, UNI_JG__MALAYALAMNYA } /* jg=malayalamnya */, + { 4, 108, 2678, 2, 11, UNI_JT__U } /* jt=nonjoining */, + { 0, 333, 3870, 2, 9, UNI_INMALAYALAM } /* inmalayalam */, + { 0, 368, 1392, 4, 2, UNI_CCC__20 } /* ccc=20 */, + { 12, 1269, 0, 4, 0, UNI_THAI } /* thai */, + { 6, 4586, 185, 17, 4, UNI_COPT } /* scriptextensions=qaac */, + { 4, 4007, 2196, 14, 8, UNI_NV__15_SLASH_2 } /* numericvalue=7.500e+00 */, + { 2, 8226, 1274, 18, 3, UNI_C } /* generalcategory=other */, + { 8, 5088, 771, 8, 5, UNI_KALI } /* block=kayahli */, + { 6, 8765, 2064, 22, 7, UNI_INSC__VISARGA } /* indicsyllabiccategory=visarga */, + { 0, 2810, 4649, 3, 15, UNI_BC__CS } /* bc=commonseparator */, + { 9, 1911, 1997, 6, 5, UNI_SC__KANA } /* script=kana */, + { 0, 1994, 5183, 7, 11, UNI_KANASUP } /* blk=kanasupplement */, + { 1, 8765, 6726, 29, 11, UNI_INSC__CONSONANTSUBJOINED } /* indicsyllabiccategory=consonantsubjoined */, + { 1, 30, 7759, 1, 17, UNI_TANGUTCOMPONENTS } /* istangutcomponents */, + { 0, 3521, 2755, 13, 10, UNI_NV___MINUS_1_SLASH_2 } /* numericvalue=-5.000e-01 */, + { 5, 1733, 722, 4, 5, UNI_INOGHAM } /* blk=ogham */, + { 6, 1733, 2088, 4, 6, UNI_INSYRIAC } /* blk=syriac */, + { 0, 1733, 3698, 4, 16, UNI_HIGHPUSURROGATES } /* blk=highpusurrogates */, + { 1, 135, 4765, 2, 18, UNI_PI } /* isinitialpunctuation */, + { 18, 1523, 0, 3, 0, UNI_DEP } /* dep */, + { 0, 7674, 4999, 10, 10, UNI_BC__WS } /* bidiclass=whitespace */, + { 0, 977, 6748, 4, 2, UNI_ecomp_values_index } /* ecomp= */, + { 9, 6928, 4172, 5, 13, UNI_INPC__NA } /* inpc=notapplicable */, + { 1, 5306, 3571, 12, 7, UNI_WB__MB } /* wordbreak=midnumlet */, + { 4, 2429, 158, 6, 4, UNI_INNEWA } /* block=newa */, + { 24, 1810, 1188, 8, 3, UNI_ARABICPFA } /* isarabicpfa */, + { 11, 135, 6952, 2, 6, UNI_BRAH } /* isbrahmi */, + { 1, 6039, 4619, 4, 15, UNI_SUTTONSIGNWRITING } /* insuttonsignwriting */, + { 4, 2, 2999, 2, 2, UNI_cwl_values_index } /* cwl= */, + { 2, 1066, 0, 8, 0, UNI_JAMOEXTB } /* jamoextb */, + { 0, 2373, 564, 10, 1, UNI_IN__7 } /* presentin=7 */, + { 2, 5371, 4516, 7, 16, UNI_LETTERLIKESYMBOLS } /* block=letterlikesymbols */, + { 6, 1036, 0, 4, 0, UNI_LEPC } /* lepc */, + { 4, 1911, 2827, 6, 5, UNI_SC__ARAB } /* script=arab */, + { 3, 316, 7550, 3, 2, UNI_NV__28 } /* nv=28 */, + { 1, 7900, 4461, 4, 13, UNI_LB__CR } /* lb=carriagereturn */, + { 0, 4586, 518, 17, 3, UNI_VAI } /* scriptextensions=vai */, + { 0, 6164, 3453, 10, 12, UNI_LB__HL } /* linebreak=hebrewletter */, + { 0, 1911, 5920, 7, 19, UNI_SC__MERO } /* script=meroitichieroglyphs */, + { 6, 3521, 809, 13, 2, UNI_NV__45 } /* numericvalue=45 */, + { 9, 2824, 3949, 9, 5, UNI_ARABICMATH } /* blk=arabicmath */, + { 1, 30, 1155, 1, 5, UNI_TAGB } /* istagb */, + { 2, 3726, 972, 16, 6, -UNI_IDSU } /* idsunaryoperator=false */, + { 0, 1911, 138, 7, 4, UNI_MEDF } /* script=medf */, + { 3, 2301, 5612, 4, 5, UNI_NV__500000 } /* nv=500000 */, + { 0, 15, 4033, 2, 3, UNI_AGE__8 } /* age=8 */, + { 0, 1911, 1137, 7, 4, UNI_NSHU } /* script=nshu */, + { 2, 1733, 565, 4, 6, UNI_INOLONAL } /* blk=olonal */, + { 2, 1141, 6899, 4, 4, UNI_BERF } /* scx=berf */, + { 10, 2635, 4380, 3, 14, UNI_JG__HAMZAONHEHGOAL } /* jg=hamzaonhehgoal */, + { 0, 2506, 1573, 10, 4, UNI_ETHIOPICEXTA } /* inethiopicexta */, + { 5, 8233, 174, 9, 2, UNI_PC } /* category=pc */, + { 7, 1733, 2337, 4, 12, UNI_INOLDHUNGARIAN } /* blk=oldhungarian */, + { 8, 135, 1180, 2, 8, UNI_VITH } /* isvithkuqi */, + { 1, 1471, 972, 4, 6, -UNI_IDST } /* idst=false */, + { 3, 593, 0, 6, 0, UNI_TODR } /* todhri */, + { 0, 333, 2561, 2, 13, UNI_IPAEXT } /* inipaextensions */, + { 0, 3742, 1066, 6, 4, UNI_COMPATJAMO } /* compatjamo */, + { 7, 316, 2327, 2, 2, UNI_NV__8 } /* nv=8 */, + { 0, 333, 259, 2, 2, UNI_NB } /* innb */, + { 0, 6462, 2903, 5, 9, UNI_INSC__NONJOINER } /* insc=nonjoiner */, + { 11, 4586, 2827, 16, 5, UNI_ARAB } /* scriptextensions=arab */, + { 0, 1471, 652, 6, 2, UNI_ids_values_index } /* idstart= */, + { 1, 1141, 265, 4, 4, UNI_ZZZZ } /* scx=zzzz */, + { 7, 3521, 2757, 14, 8, UNI_NV__2_SLASH_5 } /* numericvalue=4.000e-01 */, + { 4, 6464, 426, 3, 4, UNI_MIAO } /* sc=miao */, + { 1, 333, 23, 2, 4, UNI_INAHOM } /* inahom */, + { 0, 2380, 611, 3, 3, UNI_IN__6 } /* in=6.0 */, + { 1, 3950, 972, 4, 2, -UNI_MATH } /* math=f */, + { 0, 4022, 5612, 14, 4, UNI_NV__80000 } /* numericvalue=80000 */, + { 0, 4569, 383, 17, 4, UNI_RI } /* regionalindicator=yes */, + { 2, 135, 679, 2, 2, UNI_PI } /* ispi */, + { 9, 403, 0, 6, 0, UNI_GOTH } /* gothic */, + { 1, 1911, 3453, 7, 6, UNI_SC__HEBR } /* script=hebrew */, + { 1, 2149, 972, 5, 6, -UNI_XPOSIXALPHA } /* alpha=false */, + { 3, 135, 498, 2, 4, UNI_ROHG } /* isrohg */, + { 1, 135, 947, 2, 4, UNI_BALI } /* isbali */, + { 1, 583, 566, 3, 2, UNI_SB__LO } /* sb=lo */, + { 8, 368, 135, 4, 2, UNI_CCC__IS } /* ccc=is */, + { 0, 3808, 3932, 3, 15, UNI_LINEARBIDEOGRAMS } /* islinearbideograms */, + { 0, 7525, 0, 26, 0, UNI_CCC__12 } /* canonicalcombiningclass=12 */, + { 2, 6264, 2014, 14, 7, UNI_YIJING } /* yijinghexagramsymbols */, + { 10, 1471, 972, 3, 2, -UNI_IDS } /* ids=f */, + { 3, 2824, 2797, 5, 13, UNI_ANCIENTSYMBOLS } /* blk=ancientsymbols */, + { 5, 913, 972, 5, 6, -UNI_UIDEO } /* uideo=false */, + { 7, 4202, 639, 17, 5, UNI_IDSB } /* idsbinaryoperator=true */, + { 2, 316, 1387, 3, 2, UNI_NV__60 } /* nv=60 */, + { 7, 2429, 8246, 6, 32, UNI_INIDC } /* block=ideographicdescriptioncharacters */, + { 0, 1911, 1090, 7, 8, UNI_KRAI } /* script=kiratrai */, + { 1, 4553, 564, 14, 1, UNI_NV__37 } /* numericvalue=37 */, + { 3, 1560, 7277, 5, 20, UNI_GEOMETRICSHAPESEXT } /* ingeometricshapesextended */, + { 0, 1141, 2134, 4, 12, UNI_GONM } /* scx=masaramgondi */, + { 0, 8089, 0, 18, 0, UNI_INVS } /* variationselectors */, + { 0, 1733, 1960, 4, 11, UNI_YISYLLABLES } /* blk=yisyllables */, + { 8, 7176, 972, 24, 2, -UNI_COMPEX } /* fullcompositionexclusion=f */, + { 1, 1911, 1603, 7, 4, UNI_KHAR } /* script=khar */, + { 3, 1141, 4649, 4, 6, UNI_ZYYY } /* scx=common */, + { 4, 2429, 712, 6, 5, UNI_INDOGRA } /* block=dogra */, + { 0, 3826, 1336, 4, 3, UNI_SUPPUAB } /* suppuab */, + { 1, 7322, 312, 24, 2, UNI_CCC__30 } /* canonicalcombiningclass=30 */, + { 1, 651, 400, 3, 3, UNI_DT__SQR } /* dt=sqr */, + { 4, 3808, 217, 9, 2, UNI_LATINEXTF } /* islatinextf */, + { 33, 1141, 434, 4, 4, UNI_ARMN } /* scx=armn */, + { 11, 3808, 4862, 7, 11, UNI_LATIN1 } /* islatin1supplement */, + { 3, 4022, 5612, 14, 5, UNI_NV__800000 } /* numericvalue=800000 */, + { 2, 293, 3578, 4, 12, UNI_WB__EB } /* gcb=glueafterzwj */, + { 2, 6464, 2340, 3, 4, UNI_SC__HUNG } /* sc=hung */, + { 0, 2635, 5234, 3, 4, UNI_JG__YUDH } /* jg=yudh */, + { 3, 3129, 424, 11, 2, UNI_IN__6_DOT_1 } /* presentin=v61 */, + { 2, 333, 5628, 2, 20, UNI_INNYIAKENGPUACHUEHMONG } /* innyiakengpuachuehmong */, + { 1, 1141, 1652, 4, 4, UNI_SAUR } /* scx=saur */, + { 0, 2429, 2932, 6, 5, UNI_INKHMER } /* block=khmer */, + { 0, 7322, 6638, 24, 3, UNI_CCC__202 } /* canonicalcombiningclass=atb */, + { 1, 2406, 653, 4, 2, -UNI_XIDC } /* xidc=n */, + { 6, 4320, 639, 9, 5, UNI_DIA } /* diacritic=true */, + { 0, 2576, 972, 5, 2, -UNI_CASED } /* cased=f */, + { 0, 1141, 197, 4, 4, UNI_SAMR } /* scx=samr */, + { 1, 7760, 0, 19, 0, UNI_TANGUTCOMPONENTSSUP } /* tangutcomponentssup */, + { 4, 1106, 383, 6, 4, UNI_DT__NONE } /* nfkdqc=yes */, + { 1, 1523, 653, 10, 2, -UNI_DEP } /* deprecated=n */, + { 2, 1733, 362, 4, 6, UNI_INCARIAN } /* blk=carian */, + { 0, 354, 1408, 2, 3, UNI_XPOSIXUPPER } /* upper */, + { 20, 1911, 403, 7, 6, UNI_SC__GOTH } /* script=gothic */, + { 1, 71, 972, 3, 2, -UNI_CWU } /* cwu=f */, + { 7, 2861, 0, 5, 0, UNI_C } /* other */, + { 5, 293, 3318, 2, 13, UNI_NL } /* gc=letternumber */, + { 4, 6928, 0, 24, 0, UNI_INPC__TOPANDBOTTOMANDLEFT } /* inpc=topandbottomandleft */, + { 13, 135, 43, 2, 4, UNI_BUHD } /* isbuhd */, + { 1, 1141, 790, 4, 4, UNI_MARC } /* scx=marc */, + { 6, 1812, 0, 4, 0, UNI_ARAB } /* arab */, + { 14, 925, 417, 5, 1, UNI_AGE__16 } /* age=16 */, + { 1, 1733, 5073, 4, 8, UNI_TAMILSUP } /* blk=tamilsup */, + { 2, 16, 443, 1, 3, UNI_GONM } /* gonm */, + { 0, 1911, 851, 7, 4, UNI_SC__SHRD } /* script=shrd */, + { 7, 2429, 1762, 6, 6, UNI_DOMINO } /* block=domino */, + { 0, 316, 804, 3, 3, UNI_NV__1_SLASH_2 } /* nv=1/2 */, + { 17, 7978, 3714, 19, 12, UNI_GCB__T } /* hangulsyllabletype=trailingjamo */, + { 3, 30, 4973, 1, 19, UNI_ZP } /* isparagraphseparator */, + { 6, 293, 32, 4, 1, UNI_GCB__V } /* gcb=v */, + { 0, 8280, 5572, 20, 10, UNI_CJKEXTD } /* cjkunifiedideographsextensiond */, + { 1, 1044, 653, 2, 3, -UNI_CI } /* ci=no */, + { 0, 4202, 653, 17, 2, -UNI_IDSB } /* idsbinaryoperator=n */, + { 0, 2273, 376, 4, 1, UNI_NV__48 } /* nv=48 */, + { 0, 333, 2057, 2, 7, UNI_INSOGDIAN } /* insogdian */, + { 3, 3991, 2196, 14, 8, UNI_NV__11_SLASH_2 } /* numericvalue=5.500e+00 */, + { 0, 6201, 972, 21, 2, -UNI__PERL_NCHAR } /* noncharactercodepoint=f */, + { 10, 293, 653, 2, 2, UNI_N } /* gc=n */, + { 2, 6464, 1042, 3, 4, UNI_SC__LYCI } /* sc=lyci */, + { 0, 1911, 662, 7, 7, UNI_SC__ELBA } /* script=elbasan */, + { 0, 3976, 2204, 14, 8, UNI_NV__1_SLASH_64 } /* numericvalue=1.562e-02 */, + { 1, 6928, 2812, 4, 6, UNI_INPC__RIGHT } /* inpc=right */, + { 0, 30, 2348, 1, 13, UNI_PHAISTOS } /* inphaistosdisc */, + { 0, 3629, 3209, 7, 4, UNI_ASCII } /* block=ascii */, + { 7, 135, 955, 2, 4, UNI_BASS } /* isbass */, + { 0, 333, 2878, 2, 14, UNI_HIGHSURROGATES } /* inhighsurrogates */, + { 0, 1112, 422, 4, 1, UNI_NV__15 } /* nv=15 */, + { 6, 5318, 2407, 6, 6, UNI__PERL_IDCONT } /* _perl_idcont */, + { 10, 7322, 8453, 24, 9, UNI_CCC__AL } /* canonicalcombiningclass=aboveleft */, + { 0, 135, 5073, 2, 8, UNI_TAMILSUP } /* istamilsup */, + { 5, 1911, 518, 7, 3, UNI_VAI } /* script=vai */, + { 0, 1141, 98, 4, 4, UNI_HLUW } /* scx=hluw */, + { 12, 1733, 8535, 4, 32, UNI_IDEOGRAPHICSYMBOLS } /* blk=ideographicsymbolsandpunctuation */, + { 1, 1733, 346, 4, 5, UNI_INTAKRI } /* blk=takri */, + { 1, 1498, 378, 7, 2, UNI_CCC__91 } /* ccc=ccc91 */, + { 0, 1470, 652, 7, 2, UNI_xids_values_index } /* xidstart= */, + { 12, 3764, 4861, 6, 5, UNI_LATIN1 } /* inlatin1sup */, + { 1, 8226, 8778, 7, 11, UNI_CO } /* generalcategory=co */, + { 1, 7804, 2173, 27, 2, UNI_CCC__11 } /* canonicalcombiningclass=ccc11 */, + { 3, 554, 2257, 4, 8, UNI_NV__1_SLASH_3 } /* nv=3.333e-01 */, + { 6, 2, 0, 3, 0, UNI_CWL } /* cwl */, + { 0, 135, 322, 2, 2, UNI_RI } /* isri */, + { 7, 4202, 0, 17, 0, UNI_IDSB } /* idsbinaryoperator */, + { 1, 333, 1423, 2, 9, UNI_INOLDUYGHUR } /* inolduyghur */, + { 12, 1141, 783, 4, 7, UNI_MAND } /* scx=mandaic */, + { 1, 2858, 6824, 3, 10, UNI_CO } /* gc=privateuse */, + { 17, 4586, 712, 17, 4, UNI_DOGR } /* scriptextensions=dogr */, + { 2, 135, 8061, 2, 4, UNI_EGYP } /* isegyp */, + { 0, 158, 0, 4, 0, UNI_NEWA } /* newa */, + { 0, 4586, 2337, 17, 12, UNI_HUNG } /* scriptextensions=oldhungarian */, + { 0, 913, 0, 5, 0, UNI_UIDEO } /* uideo */, + { 1, 3764, 140, 14, 2, UNI_LATINEXTF } /* inlatinextendedf */, + { 0, 583, 305, 3, 2, UNI_SB__XX } /* sb=xx */, + { 0, 53, 652, 1, 6, UNI_NV__NAN } /* nt=none */, + { 0, 333, 1922, 2, 11, UNI_INSORASOMPENG } /* insorasompeng */, + { 0, 1911, 824, 7, 7, UNI_OSMA } /* script=osmanya */, + { 15, 7846, 370, 9, 2, UNI_alpha_values_index } /* alphabetic= */, + { 2, 4350, 638, 8, 3, UNI_XPOSIXLOWER } /* lowercase=t */, + { 0, 1141, 543, 4, 6, UNI_LYDI } /* scx=lydian */, + { 0, 1141, 1552, 4, 4, UNI_BUGI } /* scx=bugi */, + { 3, 333, 7873, 2, 17, UNI_ANCIENTGREEKMUSIC } /* inancientgreekmusic */, + { 6, 1911, 170, 7, 4, UNI_SC__OUGR } /* script=ougr */, + { 1, 8, 728, 1, 4, UNI_OSGE } /* osage */, + { 8, 8226, 397, 16, 2, UNI_SM } /* generalcategory=sm */, + { 0, 7445, 6552, 22, 5, UNI_pcm_values_index } /* prependedconcatenationmark= */, + { 0, 333, 3780, 2, 11, UNI_PHONETICEXT } /* inphoneticext */, + { 1, 1911, 593, 7, 6, UNI_SC__TODR } /* script=todhri */, + { 1, 5306, 3453, 10, 12, UNI_LB__HL } /* wordbreak=hebrewletter */, + { 3, 135, 5528, 2, 11, UNI_TAIXUANJING } /* istaixuanjing */, + { 3, 6464, 438, 3, 4, UNI_DIAK } /* sc=diak */, + { 1, 5088, 3753, 9, 3, UNI_KANGXI } /* block=kangxi */, + { 4, 8233, 4309, 9, 11, UNI_P } /* category=punctuation */, + { 1, 54, 1997, 2, 5, UNI_SC__KANA } /* sc=kana */, + { 0, 446, 0, 4, 0, UNI_HANO } /* hano */, + { 1, 21, 1239, 1, 8, UNI_EMOTICONS } /* emoticons */, + { 2, 4350, 2677, 8, 4, -UNI_XPOSIXLOWER } /* lowercase=no */, + { 1, 583, 3072, 3, 3, UNI_SB__SE } /* sb=sep */, + { 3, 2858, 4366, 4, 14, UNI_PS } /* gc=openpunctuation */, + { 0, 4586, 86, 17, 4, UNI_GREK } /* scriptextensions=grek */, + { 3, 135, 831, 2, 4, UNI_HMNP } /* ishmnp */, + { 9, 2858, 5398, 7, 12, UNI_PO } /* gc=otherpunctuation */, + { 3, 992, 383, 8, 2, UNI_EXT } /* extender=y */, + { 0, 135, 3726, 2, 4, UNI_IDSU } /* isidsu */, + { 0, 2429, 1622, 6, 10, UNI_INNAGMUNDARI } /* block=nagmundari */, + { 0, 1733, 817, 4, 7, UNI_OLCK } /* blk=olchiki */, + { 9, 32, 653, 2, 2, -UNI_VS } /* vs=n */, + { 2, 2097, 2676, 9, 13, UNI_JT__U } /* joiningtype=nonjoining */, + { 5, 2236, 1388, 4, 3, UNI_NV__2000 } /* nv=2000 */, + { 1, 4732, 296, 5, 1, UNI_upper_values_index } /* upper= */, + { 0, 6356, 7277, 9, 12, UNI_GEOMETRICSHAPES } /* block=geometricshapes */, + { 10, 6928, 5463, 5, 15, UNI_LOE } /* inpc=visualorderleft */, + { 9, 316, 1388, 4, 2, UNI_NV__900 } /* nv=900 */, + { 2, 2525, 3836, 3, 13, UNI_MISCSYMBOLSSUP } /* inmiscsymbolssup */, + { 2, 135, 8089, 2, 28, UNI_VSSUP } /* isvariationselectorssupplement */, + { 2, 1260, 6692, 3, 18, UNI_CJKCOMPATFORMS } /* cjkcompatibilityforms */, + { 0, 4007, 1388, 14, 2, UNI_NV__700 } /* numericvalue=700 */, + { 3, 2844, 972, 14, 2, -UNI_ECOMP } /* emojicomponent=f */, + { 0, 1781, 825, 3, 6, UNI_OSMA } /* isosmanya */, + { 0, 5306, 1708, 10, 7, UNI_WB__LE } /* wordbreak=aletter */, + { 3, 1982, 383, 5, 4, UNI_BIDIM } /* bidim=yes */, + { 12, 992, 4729, 6, 3, UNI_ext_values_index } /* extender= */, + { 0, 8226, 4846, 16, 16, UNI_PF } /* generalcategory=finalpunctuation */, + { 1, 6464, 5355, 3, 6, UNI_SC__TANG } /* sc=tangut */, + { 0, 2525, 8462, 3, 32, UNI_MISCMATHSYMBOLSA } /* inmiscellaneousmathematicalsymbolsa */, + { 3, 7151, 652, 24, 3, -UNI_DI } /* defaultignorablecodepoint=n */, + { 2, 54, 2827, 2, 5, UNI_SC__ARAB } /* sc=arab */, + { 0, 368, 1993, 4, 2, UNI_CCC__DB } /* ccc=db */, + { 0, 1911, 261, 7, 4, UNI_SC__ZYYY } /* script=zyyy */, + { 5, 1141, 1399, 4, 4, UNI_ITAL } /* scx=ital */, + { 0, 4007, 0, 15, 0, UNI_NV__70 } /* numericvalue=70 */, + { 7, 2844, 652, 13, 4, -UNI_ECOMP } /* emojicomponent=no */, + { 0, 3976, 2172, 14, 8, UNI_NV__1_SLASH_9 } /* numericvalue=1.111e-01 */, + { 1, 1911, 253, 7, 2, UNI_SC__YI } /* script=yi */, + { 1, 3764, 81, 9, 2, UNI_LATINEXTG } /* inlatinextg */, + { 0, 1911, 947, 7, 4, UNI_BALI } /* script=bali */, + { 8, 135, 1368, 2, 9, UNI_NBAT } /* isnabataean */, + { 0, 1260, 6710, 3, 11, UNI_CJKRADICALSSUP } /* cjkradicalssup */, + { 0, 7509, 4873, 5, 15, UNI_SYRIACSUP } /* blk=syriacsupplement */, + { 0, 4664, 3823, 5, 13, UNI_LISUSUP } /* blk=lisusupplement */, + { 1, 4586, 1941, 17, 11, UNI_SYLO } /* scriptextensions=sylotinagri */, + { 0, 1789, 0, 11, 0, UNI_GUKH } /* gurungkhema */, + { 1, 6464, 1164, 3, 8, UNI_SC__TFNG } /* sc=tifinagh */, + { 12, 3976, 4035, 15, 2, UNI_NV__1_SLASH_80 } /* numericvalue=1/80 */, + { 0, 6597, 1781, 14, 7, UNI_BC__LRI } /* bc=lefttorightisolate */, + { 0, 333, 126, 2, 3, UNI_INLAO } /* inlao */, + { 11, 135, 839, 2, 4, UNI_LANA } /* islana */, + { 2, 1733, 8607, 5, 24, UNI_DIACRITICALS } /* blk=combiningdiacriticalmarks */, + { 0, 1141, 7734, 4, 8, UNI_KANA } /* scx=katakana */, + { 1, 274, 383, 4, 2, UNI_CWCF } /* cwcf=y */, + { 4, 8233, 6634, 9, 6, UNI_CF } /* category=format */, + { 2, 2429, 6891, 6, 16, UNI_INDICNUMBERFORMS } /* block=indicnumberforms */, + { 11, 6464, 2057, 3, 4, UNI_SC__SOGD } /* sc=sogd */, + { 0, 8117, 246, 23, 2, UNI_JG__MANICHAEANPE } /* joininggroup=manichaeanpe */, + { 9, 3070, 5564, 3, 17, UNI_SMALLKANAEXT } /* insmallkanaextension */, + { 0, 38, 451, 1, 3, UNI_KHMR } /* khmr */, + { 2, 760, 2516, 4, 9, UNI_KATAKANAEXT } /* inkatakanaext */, + { 6, 6464, 847, 3, 4, UNI_SARB } /* sc=sarb */, + { 0, 933, 314, 5, 2, UNI_AGE__4 } /* age=v40 */, + { 2, 135, 67, 2, 4, UNI_CPRT } /* iscprt */, + { 0, 6464, 1922, 3, 11, UNI_SORA } /* sc=sorasompeng */, + { 0, 316, 7345, 2, 3, UNI_NV__27 } /* nv=27 */, + { 0, 4586, 1294, 17, 7, UNI_MULT } /* scriptextensions=multani */, + { 0, 6535, 639, 21, 2, UNI_MCM } /* modifiercombiningmark=t */, + { 0, 135, 462, 2, 4, UNI_NKO } /* isnkoo */, + { 13, 1733, 5528, 4, 11, UNI_TAIXUANJING } /* blk=taixuanjing */, + { 3, 4569, 653, 17, 2, -UNI_RI } /* regionalindicator=n */, + { 0, 1733, 7846, 4, 27, UNI_ALPHABETICPF } /* blk=alphabeticpresentationforms */, + { 9, 4586, 346, 17, 5, UNI_TAKR } /* scriptextensions=takri */, + { 0, 1141, 1294, 4, 7, UNI_MULT } /* scx=multani */, + { 10, 4127, 653, 17, 3, -UNI_EPRES } /* emojipresentation=no */, + { 14, 4586, 450, 17, 4, UNI_KHMR } /* scriptextensions=khmr */, + { 0, 7176, 972, 24, 6, -UNI_COMPEX } /* fullcompositionexclusion=false */, + { 5, 2429, 742, 6, 5, UNI_INBATAK } /* block=batak */, + { 1, 2508, 0, 4, 0, UNI_ETHI } /* ethi */, + { 2, 2073, 0, 7, 0, UNI_RADICAL } /* radical */, + { 6, 316, 2755, 3, 10, UNI_NV___MINUS_1_SLASH_2 } /* nv=-5.000e-01 */, + { 1, 824, 0, 4, 0, UNI_OSMA } /* osma */, + { 1, 4586, 59, 17, 4, UNI_CHRS } /* scriptextensions=chrs */, + { 0, 333, 7219, 2, 14, UNI_MUSIC } /* inmusicalsymbols */, + { 0, 1141, 3590, 4, 15, UNI_ZANB } /* scx=zanabazarsquare */, + { 0, 333, 3794, 2, 13, UNI_DEVANAGARIEXT } /* indevanagariext */, + { 2, 651, 7322, 6, 5, UNI_DT__NONCANON } /* dt=noncanon */, + { 0, 2810, 6620, 3, 20, UNI_BC__PDF } /* bc=popdirectionalformat */, + { 0, 2429, 8061, 6, 28, UNI_EGYPTIANHIEROGLYPHSEXTA } /* block=egyptianhieroglyphsextendeda */, + { 0, 1911, 2134, 7, 12, UNI_SC__GONM } /* script=masaramgondi */, + { 0, 293, 5993, 4, 9, UNI_WB__EB } /* gcb=emodifier */, + { 0, 5371, 217, 13, 2, UNI_LATINEXTF } /* block=latinextf */, + { 4, 1547, 638, 4, 6, UNI_XPOSIXSPACE } /* space=true */, + { 0, 4664, 2719, 5, 12, UNI_LOWSURROGATES } /* blk=lowsurrogates */, + { 1, 333, 6078, 2, 10, UNI_JAMO } /* inhanguljamo */, + { 18, 2406, 0, 4, 0, UNI_XIDC } /* xidc */, + { 11, 30, 1246, 1, 5, UNI_BENG } /* isbeng */, + { 0, 5, 0, 2, 0, UNI_MC } /* mc */, + { 0, 2429, 3682, 6, 16, UNI_HALFANDFULLFORMS } /* block=halfandfullforms */, + { 9, 1141, 6116, 4, 9, UNI_SUND } /* scx=sundanese */, + { 16, 1733, 1191, 4, 9, UNI_INBERIAERFE } /* blk=beriaerfe */, + { 11, 2810, 7492, 3, 17, UNI_BC__ES } /* bc=europeanseparator */, + { 8, 1141, 257, 4, 4, UNI_ZANB } /* scx=zanb */, + { 7, 1911, 134, 7, 4, UNI_SC__LISU } /* script=lisu */, + { 0, 4553, 376, 14, 1, UNI_NV__38 } /* numericvalue=38 */, + { 0, 8732, 5572, 26, 10, UNI_CJKEXTD } /* block=cjkunifiedideographsextensiond */, + { 0, 2373, 6572, 10, 3, UNI_IN__5_DOT_1 } /* presentin=5.1 */, + { 8, 1911, 1024, 7, 4, UNI_HATR } /* script=hatr */, + { 8, 6464, 126, 3, 3, UNI_LAO } /* sc=lao */, + { 0, 2429, 2045, 7, 9, UNI_COMPATJAMO } /* block=compatjamo */, + { 1, 4586, 4097, 17, 17, UNI_AGHB } /* scriptextensions=caucasianalbanian */, + { 5, 21, 6060, 1, 18, UNI_ENCLOSEDALPHANUMSUP } /* enclosedalphanumsup */, + { 2, 5306, 1673, 10, 2, UNI_WB__FO } /* wordbreak=fo */, + { 1, 1141, 482, 4, 4, UNI_PHLI } /* scx=phli */, + { 0, 3521, 1388, 14, 3, UNI_NV__4000 } /* numericvalue=4000 */, + { 0, 8117, 4423, 23, 4, UNI_JG__MANICHAEANQOPH } /* joininggroup=manichaeanqoph */, + { 3, 7322, 378, 24, 2, UNI_CCC__91 } /* canonicalcombiningclass=91 */, + { 1, 5088, 5183, 9, 4, UNI_KANASUP } /* block=kanasup */, + { 1, 1911, 1172, 7, 8, UNI_UGAR } /* script=ugaritic */, + { 23, 2, 7422, 1, 23, UNI_DIACRITICALSFORSYMBOLS } /* combiningmarksforsymbols */, + { 16, 1141, 1603, 4, 4, UNI_KHAR } /* scx=khar */, + { 7, 1141, 1688, 4, 10, UNI_TOLS } /* scx=tolongsiki */, + { 4, 2429, 5528, 6, 11, UNI_TAIXUANJING } /* block=taixuanjing */, + { 2, 1465, 3578, 3, 12, UNI_WB__EB } /* wb=glueafterzwj */, + { 3, 5648, 639, 19, 2, UNI_TERM } /* terminalpunctuation=t */, + { 3, 1733, 1450, 4, 9, UNI_INSAMARITAN } /* blk=samaritan */, + { 10, 2429, 217, 11, 2, UNI_CJKEXTF } /* block=cjkextf */, + { 8, 5073, 3826, 5, 10, UNI_TAMILSUP } /* tamilsupplement */, + { 0, 1141, 3620, 3, 9, UNI_ETHI } /* scx=ethiopic */, + { 12, 1733, 3794, 4, 10, UNI_INDEVANAGARI } /* blk=devanagari */, + { 0, 7804, 312, 27, 2, UNI_CCC__30 } /* canonicalcombiningclass=ccc30 */, + { 1, 7957, 4765, 18, 4, UNI_DT__INIT } /* decompositiontype=init */, + { 1, 3257, 8196, 5, 30, UNI_MATHALPHANUM } /* blk=mathematicalalphanumericsymbols */, + { 0, 293, 305, 4, 2, UNI_GCB__XX } /* gcb=xx */, + { 0, 1911, 162, 7, 4, UNI_SC__ORYA } /* script=orya */, + { 0, 925, 602, 4, 3, UNI_AGE__2_DOT_1 } /* age=2.1 */, + { 2, 1470, 4601, 3, 2, UNI_xids_values_index } /* xids= */, + { 1, 1471, 653, 3, 3, -UNI_IDS } /* ids=no */, + { 3, 5866, 6858, 15, 9, UNI_IDENTIFIERTYPE__INCLUSION } /* identifiertype=inclusion */, + { 4, 663, 5240, 2, 17, UNI_LB__CP } /* lb=closeparenthesis */, + { 0, 3257, 6088, 11, 9, UNI_MYANMAREXTA } /* blk=myanmarextendeda */, + { 0, 1733, 892, 4, 7, UNI_INTAITHAM } /* blk=taitham */, + { 0, 135, 253, 2, 2, UNI_YI } /* isyi */, + { 0, 2429, 4320, 6, 15, UNI_DIACRITICALSEXT } /* block=diacriticalsext */, + { 4, 30, 1970, 1, 12, UNI_BIDIC } /* isbidicontrol */, + { 0, 4732, 382, 8, 3, UNI_XPOSIXUPPER } /* uppercase=y */, + { 3, 3103, 653, 13, 3, UNI_COMPEX } /* nfcquickcheck=no */, + { 0, 1733, 4814, 4, 8, UNI_INBOPOMOFO } /* blk=bopomofo */, + { 0, 1141, 1042, 4, 4, UNI_LYCI } /* scx=lyci */, + { 3, 7674, 322, 11, 2, UNI_BC__LRI } /* bidiclass=lri */, + { 0, 2021, 638, 11, 6, UNI_GRBASE } /* graphemebase=true */, + { 6, 92, 697, 1, 3, UNI_JT__L } /* jt=l */, + { 20, 632, 423, 5, 2, UNI_CCC__216 } /* ccc=216 */, + { 0, 1141, 321, 4, 5, UNI_ORYA } /* scx=oriya */, + { 0, 2081, 269, 7, 5, UNI_POSIXCNTRL } /* isposixcntrl */, + { 10, 8366, 4843, 28, 4, UNI_CJKEXTF } /* iscjkunifiedideographsextensionf */, + { 0, 5306, 1996, 8, 4, UNI_WB__KA } /* wordbreak=ka */, + { 0, 1260, 6667, 3, 13, UNI_CJKCOMPAT } /* cjkcompatibility */, + { 0, 2525, 2731, 3, 12, UNI_MAYANNUMERALS } /* inmayannumerals */, + { 7, 4553, 5612, 14, 5, UNI_NV__300000 } /* numericvalue=300000 */, + { 2, 135, 3766, 2, 14, UNI_LATINEXTD } /* islatinextendedd */, + { 4, 2912, 3771, 10, 9, UNI_CYRILLICEXTD } /* iscyrillicextendedd */, + { 0, 6464, 74, 3, 4, UNI_SC__CYRL } /* sc=cyrl */, + { 1, 316, 371, 2, 3, UNI_NV__12 } /* nv=12 */, + { 1, 1982, 972, 12, 6, -UNI_BIDIM } /* bidimirrored=false */, + { 6, 6464, 154, 3, 4, UNI_NARB } /* sc=narb */, + { 2, 1911, 4783, 7, 7, UNI_SC__LINB } /* script=linearb */, + { 6, 1141, 906, 4, 7, UNI_TIBT } /* scx=tibetan */, + { 16, 6464, 955, 3, 8, UNI_BASS } /* sc=bassavah */, + { 1, 5318, 1554, 17, 3, UNI__PERL_CHARNAME_BEGIN } /* _perl_charname_begin */, + { 0, 760, 3753, 5, 3, UNI_KANGXI } /* inkangxi */, + { 3, 135, 3249, 2, 8, UNI_GEOR } /* isgeorgian */, + { 3, 1141, 498, 4, 4, UNI_ROHG } /* scx=rohg */, + { 1, 1911, 662, 7, 4, UNI_SC__ELBA } /* script=elba */, + { 5, 2922, 6060, 3, 18, UNI_ENCLOSEDALPHANUMSUP } /* isenclosedalphanumsup */, + { 1, 7674, 453, 10, 3, UNI_BC__RLI } /* bidiclass=rli */, + { 0, 1733, 2071, 4, 10, UNI_YIRADICALS } /* blk=yiradicals */, + { 0, 2429, 1941, 6, 11, UNI_INSYLOTINAGRI } /* block=sylotinagri */, + { 0, 1911, 5890, 7, 5, UNI_SC__GREK } /* script=greek */, + { 0, 1733, 6987, 4, 15, UNI_MODIFIERLETTERS } /* blk=modifierletters */, + { 1, 3629, 1800, 12, 3, UNI_ARABICPFB } /* block=arabicpfb */, + { 0, 3521, 2315, 12, 10, UNI_NV__1_SLASH_16 } /* numericvalue=6.250e-02 */, + { 1, 8226, 653, 15, 2, UNI_N } /* generalcategory=n */, + { 0, 1000, 0, 8, 0, UNI_GUJR } /* gujarati */, + { 1, 4335, 3123, 14, 5, UNI_hst_values_index } /* hangulsyllabletype= */, + { 8, 925, 2781, 4, 3, UNI_AGE__6_DOT_1 } /* age=6.1 */, + { 3, 2858, 269, 3, 5, UNI_XPOSIXCNTRL } /* gc=cntrl */, + { 6, 30, 1677, 1, 11, UNI_SD } /* issoftdotted */, + { 7, 106, 0, 1, 0, UNI_Z } /* z */, + { 9, 4664, 16, 12, 1, UNI_LATINEXTG } /* blk=latinextg */, + { 0, 135, 1642, 2, 10, UNI_PHNX } /* isphoenician */, + { 1, 6164, 918, 10, 7, UNI_LB__XX } /* linebreak=unknown */, + { 11, 1346, 3742, 5, 6, UNI_CJKCOMPAT } /* iscjkcompat */, + { 12, 6342, 6492, 12, 12, UNI_ETHIOPICSUP } /* block=ethiopicsupplement */, + { 3, 135, 1044, 2, 2, UNI_CI } /* isci */, + { 1, 333, 543, 2, 6, UNI_INLYDIAN } /* inlydian */, + { 0, 205, 0, 4, 0, UNI_TAGS } /* tags */, + { 0, 3808, 127, 3, 3, UNI_LAO } /* islaoo */, + { 12, 4586, 4814, 17, 8, UNI_BOPO } /* scriptextensions=bopomofo */, + { 2, 1733, 6824, 4, 10, UNI_PUA } /* blk=privateuse */, + { 4, 1911, 253, 7, 4, UNI_SC__YI } /* script=yiii */, + { 3, 1911, 197, 7, 4, UNI_SC__SAMR } /* script=samr */, + { 8, 135, 1036, 2, 4, UNI_LEPC } /* islepc */, + { 1, 2429, 906, 6, 7, UNI_INTIBETAN } /* block=tibetan */, + { 2, 1733, 7297, 4, 25, UNI_SUPERANDSUB } /* blk=superscriptsandsubscripts */, + { 5, 3304, 3, 15, 1, UNI_EA__W } /* eastasianwidth=w */, + { 3, 4553, 0, 16, 0, UNI_NV__3_SLASH_2 } /* numericvalue=3/2 */, + { 2, 1141, 126, 4, 4, UNI_LAO } /* scx=laoo */, + { 1, 1911, 1652, 7, 4, UNI_SAUR } /* script=saur */, + { 0, 135, 6116, 2, 12, UNI_SUNDANESESUP } /* issundanesesup */, + { 2, 1733, 6820, 4, 24, UNI_HIGHPUSURROGATES } /* blk=highprivateusesurrogates */, + { 2, 6464, 482, 3, 4, UNI_PHLI } /* sc=phli */, + { 10, 1470, 383, 4, 4, UNI_XIDS } /* xids=yes */, + { 0, 6464, 47, 3, 4, UNI_SC__CAKM } /* sc=cakm */, + { 11, 2527, 1070, 7, 4, UNI_MYANMAREXTB } /* myanmarextb */, + { 0, 4320, 370, 8, 2, UNI_dia_values_index } /* diacritic= */, + { 2, 5371, 3823, 7, 13, UNI_LISUSUP } /* block=lisusupplement */, + { 0, 5648, 5681, 14, 6, UNI_term_values_index } /* terminalpunctuation= */, + { 1, 729, 1232, 3, 3, UNI_IN__NA } /* age=na */, + { 1, 1911, 1874, 7, 11, UNI_MEDF } /* script=medefaidrin */, + { 2, 583, 36, 3, 2, UNI_SB__AT } /* sb=at */, + { 16, 4022, 2196, 14, 8, UNI_NV__17_SLASH_2 } /* numericvalue=8.500e+00 */, + { 2, 5306, 98, 10, 2, UNI_LB__HL } /* wordbreak=hl */, + { 0, 1911, 1315, 7, 4, UNI_SIDD } /* script=sidd */, + { 0, 135, 514, 2, 4, UNI_TNSA } /* istnsa */, + { 0, 5824, 296, 21, 1, UNI_cwu_values_index } /* changeswhenuppercased= */, + { 0, 368, 1213, 4, 5, UNI_CCC__7 } /* ccc=nukta */, + { 1, 8639, 0, 27, 0, UNI_INPC__TOP } /* indicpositionalcategory=top */, + { 1, 2429, 1030, 6, 6, UNI_INKAITHI } /* block=kaithi */, + { 2, 2453, 638, 12, 3, UNI_CI } /* caseignorable=t */, + { 0, 1911, 1265, 7, 7, UNI_SC__GRAN } /* script=grantha */, + { 0, 1141, 1146, 5, 3, UNI_TALU } /* scx=talu */, + { 0, 1141, 217, 4, 4, UNI_TFNG } /* scx=tfng */, + { 2, 2596, 653, 5, 3, -UNI_JOINC } /* joinc=no */, + { 0, 2508, 6088, 8, 9, UNI_ETHIOPICEXTA } /* ethiopicextendeda */, + { 8, 3903, 4365, 3, 15, UNI_LB__OP } /* lb=openpunctuation */, + { 0, 1911, 1903, 7, 4, UNI_SC__MONG } /* script=mong */, + { 24, 135, 2406, 2, 4, UNI_XIDC } /* isxidc */, + { 5, 632, 1392, 5, 2, UNI_CCC__B } /* ccc=220 */, + { 0, 1733, 1573, 7, 4, UNI_CJKEXTA } /* blk=cjkexta */, + { 2, 2824, 2892, 5, 11, UNI_ALPHABETICPF } /* blk=alphabeticpf */, + { 1, 108, 3036, 2, 12, UNI_JT__T } /* jt=transparent */, + { 11, 6805, 0, 5, 0, UNI_MUSIC } /* music */, + { 3, 7804, 373, 27, 2, UNI_CCC__23 } /* canonicalcombiningclass=ccc23 */, + { 1, 3136, 4035, 4, 2, UNI_IN__8 } /* in=v80 */, + { 0, 3129, 812, 11, 2, UNI_IN__2_DOT_1 } /* presentin=v21 */, + { 9, 8233, 6824, 9, 10, UNI_CO } /* category=privateuse */, + { 0, 2380, 2756, 4, 3, UNI_IN__15 } /* in=15.0 */, + { 12, 2922, 8307, 3, 29, UNI_ENCLOSEDALPHANUMSUP } /* isenclosedalphanumericsupplement */, + { 2, 8226, 4309, 16, 11, UNI_P } /* generalcategory=punctuation */, + { 0, 2429, 885, 6, 7, UNI_INTAGALOG } /* block=tagalog */, + { 0, 2622, 4350, 8, 5, UNI_XPOSIXLOWER } /* isxposixlower */, + { 0, 1911, 3453, 7, 4, UNI_SC__HEBR } /* script=hebr */, + { 1, 5993, 972, 4, 2, -UNI_EMOD } /* emod=f */, + { 1, 676, 972, 7, 6, -UNI_EXTPICT } /* extpict=false */, + { 3, 3976, 5612, 14, 4, UNI_NV__10000 } /* numericvalue=10000 */, + { 5, 6535, 0, 21, 0, UNI_MCM } /* modifiercombiningmark */, + { 0, 918, 0, 7, 0, UNI_ZZZZ } /* unknown */, + { 0, 1971, 653, 11, 3, -UNI_BIDIC } /* bidicontrol=no */, + { 0, 2073, 383, 7, 4, UNI_RADICAL } /* radical=yes */, + { 0, 1024, 0, 6, 0, UNI_HATR } /* hatran */, + { 0, 16, 2034, 1, 11, UNI_GONG } /* gunjalagondi */, + { 16, 1911, 249, 7, 4, UNI_XSUX } /* script=xsux */, + { 2, 1254, 3654, 3, 15, UNI_CYPRIOTSYLLABARY } /* incypriotsyllabary */, + { 3, 3976, 314, 15, 1, UNI_NV__1_SLASH_4 } /* numericvalue=1/4 */, + { 2, 7509, 1149, 5, 7, UNI_SPECIALS } /* blk=specials */, + { 1, 913, 383, 5, 2, UNI_UIDEO } /* uideo=y */, + { 2, 6464, 3794, 3, 4, UNI_SC__DEVA } /* sc=deva */, + { 10, 1733, 7734, 4, 8, UNI_INKATAKANA } /* blk=katakana */, + { 1, 6737, 7619, 13, 14, UNI_JG__NOJOININGGROUP } /* joininggroup=nojoininggroup */, + { 0, 4586, 870, 17, 7, UNI_SIDT } /* scriptextensions=sidetic */, + { 2, 4309, 0, 11, 0, UNI_P } /* punctuation */, + { 5, 1911, 211, 9, 2, UNI_SC__TAML } /* script=taml */, + { 0, 6164, 4813, 10, 2, UNI_LB__BB } /* linebreak=bb */, + { 2, 5098, 653, 13, 3, -UNI_EMOD } /* emojimodifier=no */, + { 13, 3726, 383, 16, 4, UNI_IDSU } /* idsunaryoperator=yes */, + { 0, 2858, 4716, 3, 15, UNI_TITLE } /* gc=titlecaseletter */, + { 2, 1164, 0, 8, 0, UNI_TFNG } /* tifinagh */, + { 0, 1994, 534, 7, 3, UNI_KANBUN } /* blk=kanbun */, + { 10, 1733, 5073, 4, 15, UNI_TAMILSUP } /* blk=tamilsupplement */, + { 0, 6116, 0, 9, 0, UNI_SUND } /* sundanese */, + { 1, 283, 639, 3, 5, UNI_CWT } /* cwt=true */, + { 0, 135, 2385, 2, 12, UNI_TUTG } /* istulutigalari */, + { 3, 6464, 1423, 3, 9, UNI_SC__OUGR } /* sc=olduyghur */, + { 1, 3780, 0, 11, 0, UNI_PHONETICEXT } /* phoneticext */, + { 1, 6356, 2475, 7, 7, UNI_GREEKEXT } /* block=greekext */, + { 4, 135, 518, 2, 4, UNI_VAI } /* isvaii */, + { 18, 5098, 383, 13, 2, UNI_EMOD } /* emojimodifier=y */, + { 2, 6464, 776, 3, 7, UNI_SC__LINA } /* sc=lineara */, + { 0, 333, 5073, 2, 5, UNI_INTAMIL } /* intamil */, + { 0, 3950, 639, 4, 2, UNI_MATH } /* math=t */, + { 4, 4539, 383, 14, 4, UNI_DT__NONE } /* nfkdquickcheck=yes */, + { 3, 5, 4799, 1, 15, UNI_MISCMATHSYMBOLSB } /* miscmathsymbolsb */, + { 12, 2858, 4350, 3, 15, UNI_LOWERCASELETTER } /* gc=lowercaseletter */, + { 0, 1258, 4332, 5, 4, UNI_CJKEXTH } /* incjkexth */, + { 7, 8278, 5572, 22, 10, UNI_CJKEXTD } /* incjkunifiedideographsextensiond */, + { 1, 2872, 0, 4, 0, UNI_COPT } /* copt */, + { 0, 2373, 2327, 9, 2, UNI_IN__8 } /* presentin=8 */, + { 0, 1733, 1368, 4, 9, UNI_INNABATAEAN } /* blk=nabataean */, + { 2, 7525, 1390, 25, 2, UNI_CCC__103 } /* canonicalcombiningclass=103 */, + { 0, 1982, 972, 12, 2, -UNI_BIDIM } /* bidimirrored=f */, + { 0, 1911, 955, 7, 8, UNI_BASS } /* script=bassavah */, + { 21, 8233, 269, 9, 2, UNI_CN } /* category=cn */, + { 5, 8639, 6932, 23, 20, UNI_INPC__TOPANDBOTTOMANDLEFT } /* indicpositionalcategory=topandbottomandleft */, + { 4, 322, 383, 2, 2, UNI_RI } /* ri=y */, + { 0, 2635, 5234, 3, 6, UNI_JG__YUDHHE } /* jg=yudhhe */, + { 2, 5371, 1573, 11, 4, UNI_LATINEXTA } /* block=latinexta */, + { 73, 2635, 4435, 3, 4, UNI_JG__QAPH } /* jg=qaph */, + { 0, 333, 4443, 2, 17, UNI_INKHITANSMALLSCRIPT } /* inkhitansmallscript */, + { 11, 3976, 5612, 14, 16, UNI_NV__10000000000000000 } /* numericvalue=10000000000000000 */, + { 2, 2858, 99, 3, 2, UNI_UPPERCASELETTER } /* gc=lu */, + { 1, 4716, 0, 9, 0, UNI_TITLE } /* titlecase */, + { 0, 6464, 94, 3, 4, UNI_SC__GUKH } /* sc=gukh */, + { 0, 333, 1616, 2, 6, UNI_ARROWS } /* inarrows */, + { 17, 4586, 126, 17, 3, UNI_LAO } /* scriptextensions=lao */, + { 12, 7674, 752, 10, 2, UNI_BC__EN } /* bidiclass=en */, + { 8, 1141, 450, 4, 4, UNI_KHMR } /* scx=khmr */, + { 6, 333, 2440, 2, 13, UNI_BLOCKELEMENTS } /* inblockelements */, + { 0, 8226, 337, 16, 4, UNI_M } /* generalcategory=mark */, + { 7, 1911, 442, 7, 4, UNI_SC__GONM } /* script=gonm */, + { 0, 1733, 906, 4, 7, UNI_INTIBETAN } /* blk=tibetan */, + { 1, 4406, 4893, 13, 5, UNI_JG__MANICHAEANGIMEL } /* jg=manichaeangimel */, + { 1, 1733, 947, 4, 8, UNI_INBALINESE } /* blk=balinese */, + { 3, 135, 6116, 2, 9, UNI_SUND } /* issundanese */, + { 4, 4586, 102, 17, 4, UNI_HMNG } /* scriptextensions=hmng */, + { 1, 1141, 3260, 3, 8, UNI_MYMR } /* scx=myanmar */, + { 2, 135, 2406, 2, 11, UNI_XIDC } /* isxidcontinue */, + { 4, 1141, 3608, 3, 9, UNI_CYRL } /* scx=cyrillic */, + { 0, 4305, 653, 4, 2, -UNI_DASH } /* dash=n */, + { 14, 135, 47, 2, 4, UNI_CAKM } /* iscakm */, + { 1, 5866, 7191, 15, 9, UNI_IDENTIFIERTYPE__EXCLUSION } /* identifiertype=exclusion */, + { 0, 2429, 1048, 6, 6, UNI_INTELUGU } /* block=telugu */, + { 9, 1733, 1329, 4, 7, UNI_INSUNUWAR } /* blk=sunuwar */, + { 0, 1733, 2407, 4, 3, UNI_INIDC } /* blk=idc */, + { 2, 6464, 35, 3, 4, UNI_BATK } /* sc=batk */, + { 1, 2429, 4290, 6, 8, UNI_VEDICEXT } /* block=vedicext */, + { 1, 135, 341, 2, 5, UNI_TALE } /* istaile */, + { 0, 135, 2088, 2, 6, UNI_SYRC } /* issyriac */, + { 6, 1733, 1506, 4, 10, UNI_INCHORASMIAN } /* blk=chorasmian */, + { 2, 135, 7086, 2, 14, UNI_MEETEIMAYEKEXT } /* ismeeteimayekext */, + { 8, 1141, 5546, 4, 4, UNI_CHER } /* scx=cher */, + { 19, 2429, 1573, 9, 4, UNI_CJKEXTA } /* block=cjkexta */, + { 0, 2858, 6987, 3, 14, UNI_LM } /* gc=modifierletter */, + { 1, 2429, 5636, 6, 3, UNI_PUA } /* block=pua */, + { 0, 135, 5, 2, 2, UNI_MC } /* ismc */, + { 0, 1498, 7550, 7, 2, UNI_CCC__28 } /* ccc=ccc28 */, + { 0, 1498, 419, 7, 2, UNI_CCC__34 } /* ccc=ccc34 */, + { 12, 6464, 253, 3, 2, UNI_SC__YI } /* sc=yi */, + { 1, 6462, 3380, 5, 10, UNI_INSC__PUREKILLER } /* insc=purekiller */, + { 2, 6164, 4430, 10, 2, UNI_LB__HY } /* linebreak=hy */, + { 3, 6484, 0, 4, 0, UNI_GLAG } /* glag */, + { 6, 2635, 3428, 3, 12, UNI_JG__VERTICALTAIL } /* jg=verticaltail */, + { 0, 3605, 3771, 12, 9, UNI_CYRILLICEXTD } /* blk=cyrillicextendedd */, + { 0, 333, 5073, 2, 15, UNI_TAMILSUP } /* intamilsupplement */, + { 4, 4586, 181, 17, 4, UNI_PHNX } /* scriptextensions=phnx */, + { 3, 3521, 1209, 13, 2, UNI_NV__24 } /* numericvalue=24 */, + { 9, 8778, 0, 10, 0, UNI_C } /* category=c */, + { 4, 42, 3565, 2, 7, UNI_SB__EX } /* sb=extend */, + { 4, 2525, 6088, 9, 9, UNI_MYANMAREXTA } /* inmyanmarextendeda */, + { 0, 6464, 662, 3, 4, UNI_SC__ELBA } /* sc=elba */, + { 0, 6737, 2668, 13, 10, UNI_JG__REVERSEDPE } /* joininggroup=reversedpe */, + { 7, 8765, 2422, 22, 6, UNI_INSC__NUMBER } /* indicsyllabiccategory=number */, + { 0, 2429, 947, 6, 8, UNI_INBALINESE } /* block=balinese */, + { 7, 6464, 1368, 3, 9, UNI_NBAT } /* sc=nabataean */, + { 1, 7180, 972, 20, 2, -UNI_CE } /* compositionexclusion=f */, { 0, 33, 0, 1, 0, UNI_S } /* s */, - { 5, 2502, 1589, 3, 9, UNI_MISCARROWS } /* inmiscarrows */, - { 3, 1874, 4785, 7, 8, UNI_SC__BOPO } /* script=bopomofo */, - { 0, 2418, 630, 12, 3, UNI_CI } /* caseignorable=t */, - { 0, 135, 5069, 2, 13, UNI_EMOD } /* isemojimodifier */, - { 1, 5782, 1938, 21, 7, UNI_GCB__CN } /* graphemeclusterbreak=control */, - { 0, 135, 422, 2, 4, UNI_MIAO } /* ismiao */, - { 0, 19, 0, 4, 0, UNI_POSIXXDIGIT } /* ahex */, - { 5, 1957, 1549, 8, 4, UNI_KANAEXTA } /* blk=kanaexta */, - { 1, 7697, 1187, 27, 2, UNI_CCC__35 } /* canonicalcombiningclass=ccc35 */, - { 4, 1945, 0, 5, 0, UNI_BIDIM } /* bidim */, - { 42, 838, 0, 4, 0, UNI_SARB } /* sarb */, - { 0, 1441, 2362, 3, 9, UNI_WB__WSEGSPACE } /* wb=wsegspace */, - { 0, 6431, 3548, 10, 4, UNI_LB__GL } /* linebreak=glue */, - { 3, 969, 645, 6, 3, -UNI_COMPEX } /* compex=no */, - { 1, 7233, 364, 24, 2, UNI_CCC__31 } /* canonicalcombiningclass=31 */, - { 1, 323, 1545, 2, 8, UNI_JAMOEXTA } /* injamoexta */, - { 10, 1874, 336, 7, 5, UNI_SC__TAKR } /* script=takri */, - { 0, 30, 8303, 1, 5, UNI_MATH } /* ismath */, - { 1, 1696, 1725, 4, 11, UNI_DOMINO } /* blk=dominotiles */, - { 4, 4703, 372, 8, 3, UNI_XPOSIXUPPER } /* uppercase=y */, - { 53, 8145, 3287, 15, 2, UNI_uideo_values_index } /* unifiedideograph= */, - { 0, 3491, 365, 13, 2, UNI_NV__18 } /* numericvalue=18 */, - { 0, 285, 1915, 4, 8, UNI_WB__EB } /* gcb=ebasegaz */, - { 1, 135, 2836, 2, 5, UNI_C } /* isother */, - { 0, 30, 376, 1, 7, UNI_CAKM } /* ischakma */, - { 58, 1474, 309, 8, 1, UNI_CCC__19 } /* ccc=ccc19 */, - { 8, 306, 363, 3, 2, UNI_NV__23 } /* nv=23 */, - { 1, 7951, 963, 17, 6, -UNI_VS } /* variationselector=false */, - { 2, 4377, 2066, 13, 3, UNI_JG__MANICHAEANWAW } /* jg=manichaeanwaw */, - { 8, 4963, 372, 16, 5, UNI__PERL_PATWS } /* patternwhitespace=yes */, - { 1, 1874, 426, 7, 4, UNI_SC__TOTO } /* script=toto */, - { 9, 5325, 4888, 14, 10, UNI_LATINEXTADDITIONAL } /* block=latinextadditional */, - { 0, 135, 1965, 2, 7, UNI_UCASEXT } /* isucasext */, - { 3, 4557, 455, 18, 3, UNI_MRO } /* scriptextensions=mroo */, - { 0, 71, 288, 3, 1, UNI_cwu_values_index } /* cwu= */, - { 2, 2471, 1549, 10, 4, UNI_ETHIOPICEXTA } /* inethiopicexta */, - { 4, 529, 0, 4, 0, UNI_KHOJ } /* khoj */, - { 8, 3824, 1225, 12, 3, UNI_JG__MALAYALAMNGA } /* jg=malayalamnga */, - { 14, 5, 963, 3, 6, -UNI_MCM } /* mcm=false */, - { 40, 3215, 7187, 6, 13, UNI_GEOMETRICSHAPES } /* blk=geometricshapes */, - { 1, 8145, 373, 16, 4, UNI_UIDEO } /* unifiedideograph=yes */, - { 4, 8088, 3293, 19, 8, UNI_NO } /* generalcategory=othernumber */, - { 0, 2504, 1061, 7, 4, UNI_MYANMAREXTB } /* myanmarextb */, - { 8, 7739, 373, 10, 4, UNI_XPOSIXALPHA } /* alphabetic=yes */, - { 4, 8095, 65, 9, 2, UNI_MN } /* category=mn */, - { 1, 1464, 0, 10, 0, UNI_BOXDRAWING } /* boxdrawing */, - { 98, 1874, 3505, 7, 15, UNI_NARB } /* script=oldnortharabian */, - { 25, 1874, 74, 7, 4, UNI_SC__CYRL } /* script=cyrl */, - { 0, 924, 2171, 5, 2, UNI_AGE__6_DOT_2 } /* age=v62 */, - { 1, 8088, 558, 16, 2, UNI_LO } /* generalcategory=lo */, - { 0, 575, 1638, 3, 7, UNI_SB__LE } /* sb=oletter */, - { 9, 8140, 7582, 28, 4, UNI_CJKEXTB } /* incjkunifiedideographsextensionb */, - { 0, 7436, 2223, 25, 2, UNI_WB__EB } /* canonicalcombiningclass=133 */, - { 0, 4718, 631, 18, 2, UNI_IDST } /* idstrinaryoperator=t */, - { 0, 6372, 154, 3, 4, UNI_NEWA } /* sc=newa */, - { 0, 7585, 346, 10, 3, UNI_BC__FSI } /* bidiclass=fsi */, - { 0, 2053, 1107, 3, 7, UNI_POSIXWORD } /* isperlword */, - { 2, 1874, 1165, 7, 4, UNI_VITH } /* script=vith */, - { 1, 5260, 3541, 12, 4, UNI_WB__MN } /* wordbreak=midnum */, - { 0, 323, 7017, 2, 19, UNI_DEVANAGARIEXTA } /* indevanagariextendeda */, - { 1, 474, 0, 4, 0, UNI_ORKH } /* orkh */, - { 0, 135, 2432, 2, 8, UNI_ASSIGNED } /* isassigned */, - { 7, 575, 297, 3, 2, UNI_SB__NU } /* sb=nu */, - { 1, 2584, 1549, 9, 4, UNI_MYANMAREXTA } /* ismyanmarexta */, - { 4, 135, 1157, 2, 8, UNI_UGAR } /* isugaritic */, - { 0, 1696, 2878, 4, 12, UNI_KHMERSYMBOLS } /* blk=khmersymbols */, - { 25, 30, 54, 1, 5, UNI_CHAM } /* ischam */, - { 3, 6372, 999, 3, 8, UNI_SC__GURU } /* sc=gurmukhi */, - { 3, 135, 47, 2, 4, UNI_CAKM } /* iscakm */, - { 3, 4557, 1315, 17, 7, UNI_TIRH } /* scriptextensions=tirhuta */, - { 2, 4754, 0, 16, 0, UNI_LINEARBSYLLABARY } /* linearbsyllabary */, - { 1, 1696, 1305, 4, 7, UNI_INSUNUWAR } /* blk=sunuwar */, - { 9, 30, 568, 1, 7, UNI_INREJANG } /* inrejang */, - { 0, 2394, 1245, 6, 4, UNI_INTHAI } /* block=thai */, - { 0, 3778, 1034, 3, 5, UNI_LYCI } /* islycian */, - { 2, 2266, 0, 4, 0, UNI_NV__5 } /* nv=5 */, - { 0, 2909, 8168, 3, 20, UNI_ENCLOSEDALPHANUM } /* isenclosedalphanumerics */, - { 20, 2785, 4419, 3, 3, UNI_BC__NSM } /* bc=nsm */, - { 5, 135, 2305, 2, 4, UNI_HUNG } /* ishung */, - { 1, 1874, 7923, 7, 19, UNI_EGYP } /* script=egyptianhieroglyphs */, - { 0, 753, 3723, 3, 11, UNI_KANGXI } /* kangxiradicals */, - { 1, 4156, 373, 17, 2, UNI_IDCOMPATMATHSTART } /* idcompatmathstart=y */, - { 0, 7766, 0, 27, 0, UNI_ANCIENTGREEKMUSIC } /* ancientgreekmusicalnotation */, - { 0, 2394, 336, 6, 5, UNI_INTAKRI } /* block=takri */, - { 0, 11, 2867, 1, 11, UNI_ALPHABETICPF } /* alphabeticpf */, - { 5, 4557, 1553, 17, 8, UNI_JAVA } /* scriptextensions=javanese */, - { 2, 2632, 1519, 3, 9, UNI_XPOSIXBLANK } /* ishorizspace */, - { 0, 2394, 6707, 6, 13, UNI_ZNAMENNYMUSIC } /* block=znamennymusic */, - { 0, 498, 0, 4, 0, UNI_SHAW } /* shaw */, - { 0, 6072, 7906, 13, 17, UNI_SUPPUAB } /* issupplementaryprivateuseareab */, - { 0, 135, 119, 2, 2, UNI_XPOSIXDIGIT } /* isnd */, - { 3, 4557, 193, 17, 4, UNI_SAMR } /* scriptextensions=samr */, - { 41, 1874, 1223, 7, 4, UNI_SC__BENG } /* script=beng */, - { 3, 130, 0, 4, 0, UNI_LATN } /* latn */, - { 2, 1015, 0, 4, 0, UNI_HATR } /* hatr */, - { 0, 135, 7259, 2, 26, UNI_HALFANDFULLFORMS } /* ishalfwidthandfullwidthforms */, - { 0, 4377, 4410, 13, 4, UNI_JG__MANICHAEANTETH } /* jg=manichaeanteth */, - { 8, 6647, 2964, 13, 11, UNI_JG__YEHWITHTAIL } /* joininggroup=yehwithtail */, - { 5, 546, 3989, 5, 2, UNI_NV__3_SLASH_80 } /* nv=3/80 */, - { 2, 1874, 1664, 7, 4, UNI_WARA } /* script=wara */, - { 0, 3916, 373, 14, 4, UNI_NFKCQC__Y } /* nfkcquickcheck=yes */, - { 16, 1696, 7923, 4, 19, UNI_INEGYPTIANHIEROGLYPHS } /* blk=egyptianhieroglyphs */, - { 7, 6372, 1353, 3, 9, UNI_TALU } /* sc=newtailue */, - { 4, 1696, 1141, 4, 8, UNI_INTAGBANWA } /* blk=tagbanwa */, - { 1, 1696, 2538, 4, 13, UNI_IPAEXT } /* blk=ipaextensions */, - { 4, 1236, 1549, 3, 4, UNI_CJKEXTA } /* cjkexta */, - { 2, 6838, 2795, 20, 4, UNI_INPC__TOPANDBOTTOMANDLEFT } /* inpc=topandbottomandleft */, - { 8, 1696, 4261, 4, 8, UNI_VEDICEXT } /* blk=vedicext */, - { 3, 135, 1130, 2, 4, UNI_TALU } /* istalu */, - { 0, 1874, 4754, 7, 7, UNI_SC__LINB } /* script=linearb */, - { 0, 3106, 803, 5, 2, UNI_IN__12_DOT_1 } /* in=v121 */, - { 1, 4557, 257, 17, 4, UNI_ZZZZ } /* scriptextensions=zzzz */, - { 9, 2785, 153, 3, 2, UNI_BC__BN } /* bc=bn */, - { 2, 5014, 0, 15, 0, UNI_BAMUMSUP } /* bamumsupplement */, - { 1, 1773, 6400, 6, 5, UNI_ARABICSUP } /* isarabicsup */, - { 0, 7420, 1312, 8, 3, UNI_SUPPUAB } /* blk=suppuab */, - { 2, 454, 0, 4, 0, UNI_MRO } /* mroo */, - { 1, 270, 288, 5, 1, UNI_cwkcf_values_index } /* cwkcf= */, - { 1, 135, 1057, 2, 8, UNI_JAMOEXTB } /* isjamoextb */, - { 0, 4703, 963, 5, 6, -UNI_XPOSIXUPPER } /* upper=false */, - { 0, 7233, 5668, 24, 5, UNI_CCC__B } /* canonicalcombiningclass=below */, - { 0, 6467, 5549, 14, 5, UNI_NV__200000 } /* numericvalue=200000 */, - { 33, 2511, 0, 4, 0, UNI_NAND } /* nand */, - { 0, 2612, 1576, 3, 3, UNI_JG__YEH } /* jg=yeh */, - { 19, 8095, 4336, 9, 15, UNI_PS } /* category=openpunctuation */, - { 17, 4639, 0, 14, 0, UNI_LATINEXTB } /* latinextendedb */, - { 0, 6125, 963, 21, 2, -UNI__PERL_NCHAR } /* noncharactercodepoint=f */, - { 37, 4557, 11, 17, 4, UNI_ADLM } /* scriptextensions=adlm */, - { 0, 1126, 1885, 4, 4, UNI_SORA } /* scx=sora */, - { 3, 2833, 6544, 3, 6, UNI_CF } /* gc=format */, - { 4, 6372, 1075, 3, 8, UNI_KRAI } /* sc=kiratrai */, - { 10, 5782, 927, 20, 2, UNI_GCB__V } /* graphemeclusterbreak=v */, - { 1, 2666, 291, 3, 2, UNI_LB__VF } /* lb=vf */, - { 2, 229, 81, 2, 2, UNI_TUTG } /* tutg */, - { 0, 3274, 7259, 15, 9, UNI_EA__H } /* eastasianwidth=halfwidth */, - { 0, 6372, 3520, 3, 15, UNI_SARB } /* sc=oldsoutharabian */, - { 3, 1126, 430, 4, 4, UNI_ARMN } /* scx=armn */, - { 0, 6372, 834, 3, 4, UNI_NBAT } /* sc=nbat */, - { 0, 15, 0, 4, 0, UNI_AGHB } /* aghb */, - { 8, 2394, 2853, 6, 14, UNI_HIGHSURROGATES } /* block=highsurrogates */, - { 0, 7697, 2155, 28, 2, UNI_CCC__129 } /* canonicalcombiningclass=ccc129 */, - { 1, 135, 1446, 2, 8, UNI_XIDS } /* isxidstart */, - { 65, 4557, 1628, 17, 10, UNI_SAUR } /* scriptextensions=saurashtra */, - { 0, 2345, 309, 3, 1, UNI_IN__9 } /* in=9 */, - { 0, 1035, 963, 2, 2, -UNI_CI } /* ci=f */, - { 1, 135, 1579, 2, 10, UNI_KHAR } /* iskharoshthi */, - { 0, 1628, 0, 4, 0, UNI_SAUR } /* saur */, - { 1, 2394, 6341, 6, 9, UNI_INCUNEIFORM } /* block=cuneiform */, - { 0, 5976, 1896, 5, 8, UNI_SUPERANDSUB } /* insuperandsub */, - { 0, 266, 373, 4, 2, UNI_CWCF } /* cwcf=y */, - { 42, 924, 2138, 5, 2, UNI_IN__1_DOT_1 } /* age=v11 */, - { 0, 924, 1363, 5, 2, UNI_AGE__6 } /* age=v60 */, - { 1, 8596, 5218, 22, 10, UNI_INSC__TONELETTER } /* indicsyllabiccategory=toneletter */, - { 0, 270, 963, 5, 2, -UNI_CWKCF } /* cwkcf=f */, - { 0, 323, 4658, 2, 12, UNI_CYRILLICEXTC } /* incyrillicextc */, - { 0, 2394, 7923, 6, 28, UNI_EGYPTIANHIEROGLYPHSEXTA } /* block=egyptianhieroglyphsextendeda */, - { 0, 3976, 2222, 14, 8, UNI_NV__5_SLASH_6 } /* numericvalue=8.333e-01 */, - { 0, 6372, 1298, 3, 7, UNI_SOYO } /* sc=soyombo */, - { 4, 1874, 1628, 7, 10, UNI_SAUR } /* script=saurashtra */, - { 1, 135, 442, 2, 3, UNI_HAN } /* ishan */, - { 6, 323, 4785, 2, 16, UNI_BOPOMOFOEXT } /* inbopomofoextended */, - { 9, 655, 1699, 2, 3, UNI_LB__CJ } /* lb=cj */, - { 0, 438, 0, 4, 0, UNI_GONM } /* gonm */, - { 5, 1126, 1344, 4, 9, UNI_NBAT } /* scx=nabataean */, - { 5, 6431, 1523, 10, 5, UNI_LB__SP } /* linebreak=space */, - { 0, 1696, 8364, 4, 32, UNI_IDEOGRAPHICSYMBOLS } /* blk=ideographicsymbolsandpunctuation */, - { 0, 8324, 4111, 30, 4, UNI_CJKEXTG } /* blk=cjkunifiedideographsextensiong */, - { 9, 2599, 321, 8, 5, UNI_XPOSIXPRINT } /* isxposixprint */, - { 1, 2371, 630, 10, 3, UNI_XIDC } /* xidcontinue=t */, - { 4, 54, 4379, 2, 5, UNI_SC__MANI } /* sc=mani */, - { 0, 1696, 3447, 4, 15, UNI_INMEROITICCURSIVE } /* blk=meroiticcursive */, - { 0, 2394, 2026, 6, 10, UNI_INOLDSOGDIAN } /* block=oldsogdian */, - { 5, 6467, 2260, 16, 6, UNI_NV__1_SLASH_40 } /* numericvalue=2.500e-02 */, - { 0, 968, 6658, 4, 2, UNI_ecomp_values_index } /* ecomp= */, - { 4, 323, 3764, 2, 14, UNI_DEVANAGARIEXTA } /* indevanagariexta */, - { 1, 6372, 5148, 3, 14, UNI_SC__ROHG } /* sc=hanifirohingya */, - { 1, 7420, 6290, 7, 13, UNI_SUPMATHOPERATORS } /* blk=supmathoperators */, - { 1, 6277, 3901, 7, 15, UNI_MISCMATHSYMBOLSA } /* block=miscmathsymbolsa */, - { 1, 643, 3569, 3, 6, UNI_DT__SQR } /* dt=square */, - { 9, 8088, 3809, 16, 11, UNI_MC } /* generalcategory=spacingmark */, - { 34, 5272, 3169, 6, 9, UNI__PERL_QUOTEMETA } /* _perl_quotemeta */, - { 0, 6372, 1598, 3, 4, UNI_NAGM } /* sc=nagm */, - { 0, 6372, 1372, 3, 9, UNI_ITAL } /* sc=olditalic */, - { 5, 306, 304, 3, 2, UNI_NV__40 } /* nv=40 */, - { 0, 5344, 0, 20, 0, UNI_PC } /* connectorpunctuation */, - { 26, 285, 4540, 4, 17, UNI_RI } /* gcb=regionalindicator */, - { 53, 19, 963, 4, 6, -UNI_POSIXXDIGIT } /* ahex=false */, - { 40, 1696, 699, 4, 5, UNI_INBUHID } /* blk=buhid */, - { 0, 6372, 2060, 3, 6, UNI_SC__SYRC } /* sc=syriac */, - { 19, 323, 2759, 2, 13, UNI_VERTICALFORMS } /* inverticalforms */, - { 1, 1234, 1492, 5, 7, UNI_CJKSTROKES } /* incjkstrokes */, - { 3, 924, 2147, 6, 2, UNI_AGE__15 } /* age=v150 */, - { 2, 135, 7651, 2, 28, UNI_PHONETICEXTSUP } /* isphoneticextensionssupplement */, - { 27, 358, 1956, 4, 2, UNI_CCC__DB } /* ccc=db */, - { 1, 4557, 3423, 17, 6, UNI_HEBR } /* scriptextensions=hebrew */, - { 5, 2394, 4261, 6, 8, UNI_VEDICEXT } /* block=vedicext */, - { 2, 2394, 1381, 6, 9, UNI_INOLDPERMIC } /* block=oldpermic */, - { 1, 1499, 373, 10, 4, UNI_DEP } /* deprecated=yes */, - { 0, 4557, 1553, 17, 4, UNI_JAVA } /* scriptextensions=java */, - { 8, 2833, 4280, 3, 11, UNI_P } /* gc=punctuation */, - { 8, 1696, 8920, 4, 43, UNI_UCASEXTA } /* blk=unifiedcanadianaboriginalsyllabicsextendeda */, - { 16, 4291, 645, 9, 3, -UNI_DIA } /* diacritic=no */, - { 14, 1126, 3623, 4, 7, UNI_CPRT } /* scx=cypriot */, - { 8, 4557, 4638, 16, 6, UNI_LATN } /* scriptextensions=latin */, - { 0, 2345, 2756, 3, 3, UNI_IN__6_DOT_1 } /* in=6.1 */, - { 8, 6647, 6422, 13, 9, UNI_JG__YEHBARREE } /* joininggroup=yehbarree */, - { 24, 323, 2511, 2, 11, UNI_INNANDINAGARI } /* innandinagari */, - { 16, 343, 6086, 3, 7, UNI_SUPARROWSC } /* suparrowsc */, - { 7, 654, 0, 4, 0, UNI_ELBA } /* elba */, - { 81, 358, 2138, 4, 2, UNI_CCC__11 } /* ccc=11 */, - { 0, 2666, 135, 3, 2, UNI_LB__IS } /* lb=is */, - { 4, 1696, 4291, 4, 12, UNI_DIACRITICALS } /* blk=diacriticals */, - { 1, 675, 630, 5, 6, UNI_GRBASE } /* grbase=true */, - { 1, 1097, 2205, 4, 8, UNI_NV__3_SLASH_20 } /* nv=1.500e-01 */, - { 9, 8197, 4814, 28, 4, UNI_CJKEXTF } /* iscjkunifiedideographsextensionf */, - { 0, 1696, 3764, 4, 10, UNI_INDEVANAGARI } /* blk=devanagari */, - { 65, 924, 803, 6, 2, UNI_AGE__12_DOT_1 } /* age=v121 */, - { 2, 1874, 4858, 7, 4, UNI_SC__TALE } /* script=tale */, - { 32, 2463, 6400, 6, 12, UNI_CYRILLICSUP } /* cyrillicsupplement */, - { 65, 323, 5500, 2, 11, UNI_CHEROKEESUP } /* incherokeesup */, - { 1, 2394, 1977, 9, 7, UNI_CJKSYMBOLS } /* block=cjksymbols */, - { 2, 135, 709, 2, 5, UNI_LIMB } /* islimbu */, - { 15, 1696, 535, 4, 6, UNI_INLYDIAN } /* blk=lydian */, - { 2, 4115, 0, 4, 0, UNI_MODI } /* modi */, - { 0, 6838, 150, 5, 2, UNI_INPC__NA } /* inpc=na */, - { 1, 6370, 3350, 5, 10, UNI_INSC__PUREKILLER } /* insc=purekiller */, - { 0, 1322, 6620, 5, 18, UNI_CJKRADICALSSUP } /* iscjkradicalssupplement */, - { 1, 3274, 650, 15, 4, UNI_EA__W } /* eastasianwidth=wide */, - { 32, 3040, 2834, 3, 7, UNI_INSC__OTHER } /* insc=other */, - { 1, 8861, 5518, 7, 17, UNI_SMALLKANAEXT } /* block=smallkanaextension */, - { 6, 1236, 6577, 3, 13, UNI_CJKCOMPAT } /* cjkcompatibility */, - { 3, 4801, 4280, 5, 11, UNI_PE } /* closepunctuation */, - { 1, 205, 0, 4, 0, UNI_TAML } /* taml */, - { 0, 4291, 0, 9, 0, UNI_DIA } /* diacritic */, - { 0, 3227, 8058, 5, 30, UNI_MATHALPHANUM } /* blk=mathematicalalphanumericsymbols */, - { 0, 3734, 4793, 7, 9, UNI_LATINEXTC } /* inlatinextendedc */, - { 0, 1097, 5549, 4, 4, UNI_NV__10000 } /* nv=10000 */, - { 0, 1234, 4666, 5, 4, UNI_CJKEXTC } /* incjkextc */, - { 1, 4280, 1740, 7, 4, UNI_P } /* punctuation */, - { 0, 2666, 48, 3, 2, UNI_LB__AK } /* lb=ak */, - { 4, 2502, 2111, 3, 11, UNI_MATHALPHANUM } /* inmathalphanum */, - { 5, 6372, 458, 3, 4, UNI_SC__NKO } /* sc=nkoo */, - { 4, 6372, 241, 3, 4, UNI_XSUX } /* sc=xsux */, - { 5, 1874, 39, 7, 4, UNI_BHKS } /* script=bhks */, - { 2, 2573, 645, 5, 2, -UNI_JOINC } /* joinc=n */, - { 9, 916, 2213, 4, 3, UNI_AGE__3_DOT_1 } /* age=3.1 */, - { 2, 6372, 1039, 3, 6, UNI_SC__TELU } /* sc=telugu */, - { 37, 6229, 957, 21, 2, UNI_BPT__O } /* bidipairedbrackettype=o */, - { 0, 135, 102, 2, 4, UNI_HMNG } /* ishmng */, - { 0, 135, 826, 2, 4, UNI_KALI } /* iskali */, - { 0, 8088, 170, 16, 2, UNI_PC } /* generalcategory=pc */, - { 0, 8088, 671, 16, 2, UNI_PI } /* generalcategory=pi */, - { 4, 1126, 233, 4, 4, UNI_WCHO } /* scx=wcho */, - { 1, 6250, 8168, 7, 20, UNI_ENCLOSEDALPHANUM } /* block=enclosedalphanumerics */, - { 0, 2666, 2068, 3, 2, UNI_LB__WJ } /* lb=wj */, - { 5, 1696, 2878, 4, 5, UNI_INKHMER } /* blk=khmer */, - { 0, 135, 7061, 2, 25, UNI_DI } /* isdefaultignorablecodepoint */, - { 0, 8037, 645, 11, 2, -UNI_IDEO } /* ideographic=n */, - { 0, 1536, 6040, 7, 13, UNI_GEORGIANSUP } /* ingeorgiansupplement */, - { 0, 7979, 4394, 23, 4, UNI_JG__MANICHAEANQOPH } /* joininggroup=manichaeanqoph */, - { 5, 1417, 0, 4, 0, UNI_PAUC } /* pauc */, - { 0, 6372, 6146, 3, 7, UNI_SC__SINH } /* sc=sinhala */, - { 2, 1223, 0, 4, 0, UNI_BENG } /* beng */, - { 5, 575, 5248, 3, 5, UNI_SB__AT } /* sb=aterm */, - { 0, 2785, 0, 14, 0, UNI_BC__R } /* bc=righttoleft */, - { 1, 7356, 645, 26, 3, -UNI_PCM } /* prependedconcatenationmark=no */, - { 4, 135, 709, 2, 4, UNI_LIMB } /* islimb */, - { 0, 1126, 498, 4, 4, UNI_SHAW } /* scx=shaw */, - { 4, 2394, 6912, 6, 15, UNI_TRANSPORTANDMAP } /* block=transportandmap */, - { 0, 6431, 3873, 10, 13, UNI_LB__PR } /* linebreak=prefixnumeric */, - { 0, 108, 2975, 2, 2, UNI_JT__D } /* jt=d */, - { 10, 2394, 5309, 6, 9, UNI_TANGUTSUP } /* block=tangutsup */, - { 0, 6372, 2350, 3, 12, UNI_SC__TUTG } /* sc=tulutigalari */, - { 0, 1035, 631, 2, 5, UNI_CI } /* ci=true */, - { 5, 6072, 4590, 4, 15, UNI_SUTTONSIGNWRITING } /* issuttonsignwriting */, - { 0, 969, 0, 2, 0, UNI_CO } /* co */, - { 0, 6431, 4503, 10, 7, UNI_LB__ZW } /* linebreak=zwspace */, - { 0, 1696, 6015, 4, 10, UNI_JAMO } /* blk=hanguljamo */, - { 0, 4557, 1007, 17, 4, UNI_HIRA } /* scriptextensions=hira */, - { 9, 285, 2787, 3, 3, UNI_RI } /* gcb=ri */, - { 16, 3575, 7669, 12, 13, UNI_CYRILLICSUP } /* blk=cyrillicsupplementary */, - { 0, 6431, 3860, 10, 13, UNI_LB__AP } /* linebreak=aksaraprebase */, - { 1, 2785, 2668, 2, 2, UNI_BC__B } /* bc=b */, - { 1, 8095, 6903, 12, 8, UNI_LO } /* category=otherletter */, - { 0, 4557, 1241, 17, 4, UNI_GRAN } /* scriptextensions=gran */, - { 20, 3491, 2347, 12, 3, UNI_NV__14 } /* numericvalue=14 */, - { 2, 245, 0, 2, 0, UNI_YI } /* yi */, - { 3, 2060, 4848, 5, 11, UNI_SYRIACSUP } /* syriacsupplement */, - { 25, 553, 1364, 4, 2, UNI_NV__700 } /* nv=700 */, - { 0, 285, 3535, 3, 3, UNI_GCB__EX } /* gcb=ex */, - { 1, 1126, 826, 4, 4, UNI_KALI } /* scx=kali */, - { 3, 1696, 3826, 3, 10, UNI_INMALAYALAM } /* blk=malayalam */, - { 3, 2740, 373, 13, 4, UNI_PATSYN } /* patternsyntax=yes */, - { 0, 30, 4944, 1, 19, UNI_ZP } /* isparagraphseparator */, - { 13, 1126, 7923, 4, 19, UNI_EGYP } /* scx=egyptianhieroglyphs */, - { 3, 3778, 4832, 6, 2, UNI_LATIN1 } /* islatin1 */, - { 3, 3178, 963, 13, 6, -UNI_POSIXXDIGIT } /* asciihexdigit=false */, - { 0, 768, 5997, 3, 15, UNI_ENCLOSEDALPHANUM } /* inenclosedalphanum */, - { 5, 135, 1945, 2, 5, UNI_BIDIM } /* isbidim */, - { 8, 2372, 645, 10, 2, -UNI_IDC } /* idcontinue=n */, - { 2, 2317, 202, 3, 3, UNI_TAGS } /* istags */, - { 1, 306, 1364, 4, 3, UNI_NV__9000 } /* nv=9000 */, - { 0, 1874, 2511, 7, 11, UNI_SC__NAND } /* script=nandinagari */, - { 2, 135, 1725, 2, 11, UNI_DOMINO } /* isdominotiles */, - { 1, 7233, 730, 24, 3, UNI_CCC__214 } /* canonicalcombiningclass=ata */, - { 0, 323, 815, 2, 7, UNI_INOSMANYA } /* inosmanya */, - { 3, 6372, 1866, 3, 4, UNI_SC__MONG } /* sc=mong */, - { 0, 1874, 213, 7, 4, UNI_SC__TFNG } /* script=tfng */, - { 100, 1441, 3149, 3, 11, UNI_WB__SQ } /* wb=singlequote */, - { 3, 1474, 920, 7, 2, UNI_CCC__10 } /* ccc=ccc10 */, - { 3, 643, 150, 3, 3, UNI_DT__NAR } /* dt=nar */, - { 1, 326, 645, 5, 2, -UNI_QMARK } /* qmark=n */, - { 2, 2799, 5086, 5, 9, UNI_ALCHEMICAL } /* blk=alchemical */, - { 3, 32, 645, 2, 2, -UNI_VS } /* vs=n */, - { 1, 323, 361, 2, 3, UNI_IN__12 } /* in=12 */, - { 3, 8095, 671, 9, 2, UNI_PI } /* category=pi */, - { 1, 5976, 8639, 14, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* insupplementalsymbolsandpictographs */, - { 1, 6446, 6455, 9, 12, UNI_MCM } /* modifiercombiningmark */, - { 1, 30, 62, 1, 5, UNI_CPMN } /* iscpmn */, - { 1, 1276, 1373, 3, 8, UNI_INOLDITALIC } /* inolditalic */, - { 1, 1874, 1408, 7, 4, UNI_PALM } /* script=palm */, - { 1, 859, 373, 4, 4, UNI_DASH } /* dash=yes */, - { 0, 6125, 644, 20, 4, -UNI__PERL_NCHAR } /* noncharactercodepoint=no */, - { 0, 1459, 1549, 5, 4, UNI_LATINEXTA } /* latinexta */, - { 2, 4557, 189, 17, 4, UNI_RUNR } /* scriptextensions=runr */, - { 5, 6801, 0, 16, 0, UNI_INDICNUMBERFORMS } /* indicnumberforms */, - { 2, 1097, 309, 4, 1, UNI_NV__19 } /* nv=19 */, - { 0, 6104, 373, 21, 4, UNI_LOE } /* logicalorderexception=yes */, - { 0, 3073, 373, 13, 2, UNI_NFCQC__Y } /* nfcquickcheck=y */, - { 0, 4557, 2122, 17, 12, UNI_MEND } /* scriptextensions=mendekikakui */, - { 39, 8088, 3373, 16, 13, UNI_ME } /* generalcategory=enclosingmark */, - { 0, 2430, 0, 10, 0, UNI_CN } /* unassigned */, - { 1, 135, 1482, 2, 10, UNI_CHRS } /* ischorasmian */, - { 2, 401, 373, 3, 2, UNI_EXT } /* ext=y */, - { 33, 2833, 2881, 6, 8, UNI_SO } /* gc=othersymbol */, - { 2, 945, 372, 4, 5, UNI_EBASE } /* ebase=yes */, - { 2, 3106, 3974, 4, 2, UNI_IN__7 } /* in=v70 */, - { 35, 135, 1628, 2, 4, UNI_SAUR } /* issaur */, - { 1, 1773, 1549, 8, 4, UNI_ARABICEXTA } /* isarabicexta */, - { 0, 945, 372, 4, 2, UNI_ebase_values_index } /* ebase= */, - { 18, 306, 0, 4, 0, UNI_NV__9 } /* nv=9 */, - { 5, 1126, 760, 4, 7, UNI_KALI } /* scx=kayahli */, - { 0, 1126, 846, 4, 4, UNI_SYRC } /* scx=syrc */, - { 0, 643, 251, 3, 2, UNI_DT__NB } /* dt=nb */, - { 0, 358, 8908, 4, 10, UNI_CCC__AR } /* ccc=aboveright */, - { 78, 2394, 1837, 6, 11, UNI_INMEDEFAIDRIN } /* block=medefaidrin */, - { 1, 306, 627, 2, 3, UNI_NV__22 } /* nv=22 */, - { 1, 905, 645, 4, 2, -UNI_IDEO } /* ideo=n */, - { 33, 868, 631, 5, 5, UNI_STERM } /* sterm=true */, - { 8, 1399, 0, 9, 0, UNI_OUGR } /* olduyghur */, - { 1, 8596, 7725, 31, 15, UNI_INSC__CONSONANTSUCCEEDINGREPHA } /* indicsyllabiccategory=consonantsucceedingrepha */, - { 0, 135, 7682, 2, 14, UNI_PUA } /* isprivateusearea */, - { 0, 1277, 0, 7, 0, UNI_NB } /* noblock */, - { 2, 6431, 5194, 9, 3, UNI_LB__CL } /* linebreak=cl */, - { 0, 135, 316, 2, 5, UNI__PERL_PATWS } /* ispatws */, - { 0, 1696, 7923, 4, 28, UNI_EGYPTIANHIEROGLYPHSEXTA } /* blk=egyptianhieroglyphsextendeda */, - { 1, 6507, 1744, 14, 7, UNI_BC__LRI } /* bc=lefttorightisolate */, - { 4, 1097, 309, 5, 1, UNI_NV__1_SLASH_9 } /* nv=1/9 */, - { 0, 1447, 0, 7, 0, UNI_IDS } /* idstart */, - { 1, 1874, 0, 7, 0, UNI_sc_values_index } /* script= */, - { 2, 323, 5014, 2, 8, UNI_BAMUMSUP } /* inbamumsup */, - { 2, 2394, 6034, 6, 12, UNI_MONGOLIANSUP } /* block=mongoliansup */, - { 4, 6370, 2688, 5, 6, UNI_LB__ZWJ } /* insc=joiner */, - { 0, 8088, 4280, 16, 11, UNI_P } /* generalcategory=punctuation */, - { 1, 2584, 6817, 3, 21, UNI_MISCTECHNICAL } /* ismiscellaneoustechnical */, - { 1, 6431, 290, 11, 1, UNI_LB__B2 } /* linebreak=b2 */, - { 0, 7739, 0, 10, 0, UNI_XPOSIXALPHA } /* alphabetic */, - { 5, 7233, 413, 25, 1, UNI_CCC__26 } /* canonicalcombiningclass=26 */, - { 0, 135, 1938, 2, 7, UNI_XPOSIXCNTRL } /* iscontrol */, - { 0, 1874, 278, 7, 4, UNI_SC__GARA } /* script=gara */, - { 1, 8861, 1312, 10, 3, UNI_SUPPUAB } /* block=suppuab */, - { 0, 6431, 63, 10, 2, UNI_LB__CP } /* linebreak=cp */, - { 2, 4540, 645, 17, 3, -UNI_RI } /* regionalindicator=no */, - { 24, 2909, 0, 6, 0, UNI_ETHI } /* isethi */, - { 18, 1646, 0, 3, 0, UNI_ALL } /* all */, - { 1, 7233, 2668, 23, 3, UNI_CCC__BR } /* canonicalcombiningclass=br */, - { 40, 868, 288, 5, 1, UNI_sterm_values_index } /* sterm= */, - { 0, 7923, 0, 4, 0, UNI_EGYP } /* egyp */, - { 2, 1126, 138, 4, 4, UNI_MEDF } /* scx=medf */, - { 2, 7233, 7589, 18, 7, UNI_CCC__L } /* canonicalcombiningclass=l */, - { 16, 323, 1176, 2, 9, UNI_INBHAIKSUKI } /* inbhaiksuki */, - { 0, 1474, 803, 7, 2, UNI_CCC__21 } /* ccc=ccc21 */, - { 0, 8095, 54, 9, 2, UNI_SC } /* category=sc */, - { 5, 6647, 1576, 13, 3, UNI_JG__YEH } /* joininggroup=yeh */, - { 9, 983, 631, 8, 2, UNI_EXT } /* extender=t */, - { 2, 135, 3178, 2, 13, UNI_POSIXXDIGIT } /* isasciihexdigit */, - { 10, 4652, 6400, 12, 5, UNI_CYRILLICSUP } /* block=cyrillicsup */, - { 7, 6372, 1664, 3, 10, UNI_WARA } /* sc=warangciti */, - { 7, 146, 0, 4, 0, UNI_MYMR } /* mymr */, - { 2, 1874, 808, 7, 7, UNI_OLCK } /* script=olchiki */, - { 1, 1446, 0, 4, 0, UNI_XIDS } /* xids */, - { 1, 358, 4084, 4, 13, UNI_CCC__IS } /* ccc=iotasubscript */, - { 131, 2394, 753, 6, 7, UNI_INKANNADA } /* block=kannada */, - { 0, 2612, 2964, 3, 11, UNI_JG__YEHWITHTAIL } /* jg=yehwithtail */, - { 1, 323, 3219, 2, 8, UNI_INGEORGIAN } /* ingeorgian */, - { 0, 135, 2029, 2, 4, UNI_SOGD } /* issogd */, - { 22, 306, 1187, 3, 2, UNI_NV__35 } /* nv=35 */, - { 0, 643, 1744, 3, 8, UNI_DT__ISO } /* dt=isolated */, - { 10, 323, 7129, 2, 14, UNI_MUSIC } /* inmusicalsymbols */, - { 3, 135, 4963, 2, 17, UNI__PERL_PATWS } /* ispatternwhitespace */, - { 2, 135, 6571, 2, 23, UNI_COMPATJAMO } /* ishangulcompatibilityjamo */, - { 0, 5325, 1750, 17, 3, UNI_LATINEXTG } /* block=latinextendedg */, - { 1, 135, 1528, 2, 4, UNI_BUGI } /* isbugi */, - { 4, 4291, 373, 9, 2, UNI_DIA } /* diacritic=y */, - { 0, 1322, 6602, 5, 18, UNI_CJKCOMPATFORMS } /* iscjkcompatibilityforms */, - { 5, 2612, 2622, 3, 3, UNI_JG__FEH } /* jg=feh */, - { 0, 1353, 0, 9, 0, UNI_TALU } /* newtailue */, - { 0, 6431, 909, 10, 7, UNI_LB__XX } /* linebreak=unknown */, - { 1, 135, 261, 2, 2, UNI_CN } /* iscn */, - { 0, 3301, 0, 14, 0, UNI_GREXT } /* graphemeextend */, - { 3, 323, 2268, 2, 2, UNI_IN__5 } /* in=5 */, - { 1, 1696, 6715, 4, 5, UNI_MUSIC } /* blk=music */, - { 24, 39, 41, 2, 2, UNI_BHKS } /* bhks */, - { 10, 7697, 804, 27, 2, UNI_CCC__17 } /* canonicalcombiningclass=ccc17 */, - { 2, 135, 470, 2, 4, UNI_ONAO } /* isonao */, - { 3, 2394, 126, 6, 3, UNI_INLAO } /* block=lao */, - { 9, 4970, 2654, 9, 3, -UNI_XPOSIXSPACE } /* whitespace=n */, - { 3, 2473, 666, 6, 5, UNI_ETHIOPICEXT } /* ethiopicext */, - { 14, 3778, 0, 11, 0, UNI_LATINEXTE } /* islatinexte */, - { 3, 1874, 110, 7, 4, UNI_KAWI } /* script=kawi */, - { 1, 3904, 645, 4, 2, -UNI_MATH } /* math=n */, - { 2, 5803, 7101, 15, 9, UNI_IDENTIFIERTYPE__EXCLUSION } /* identifiertype=exclusion */, - { 0, 2612, 3391, 3, 7, UNI_JG__SEMKATH } /* jg=semkath */, - { 3, 323, 7120, 2, 14, UNI_BYZANTINEMUSIC } /* inbyzantinemusic */, - { 4, 135, 478, 2, 4, UNI_PHLI } /* isphli */, - { 2, 275, 373, 3, 2, UNI_CWT } /* cwt=y */, - { 1, 8095, 4276, 9, 15, UNI_PD } /* category=dashpunctuation */, - { 0, 643, 4420, 3, 5, UNI_DT__SML } /* dt=small */, - { 45, 7307, 4793, 8, 9, UNI_ARABICEXTC } /* inarabicextendedc */, - { 1, 1126, 490, 4, 4, UNI_QAAI } /* scx=qaai */, - { 0, 1126, 774, 4, 4, UNI_MAND } /* scx=mand */, - { 1, 2573, 631, 5, 5, UNI_JOINC } /* joinc=true */, - { 26, 916, 603, 5, 3, UNI_AGE__16 } /* age=16.0 */, - { 9, 135, 1904, 2, 4, UNI_SYLO } /* issylo */, - { 0, 1696, 3423, 4, 6, UNI_INHEBREW } /* blk=hebrew */, - { 0, 575, 558, 3, 2, UNI_SB__LO } /* sb=lo */, - { 0, 714, 0, 5, 0, UNI_OGAM } /* ogham */, - { 3, 135, 1523, 2, 5, UNI_XPOSIXSPACE } /* isspace */, - { 72, 4970, 630, 9, 6, UNI_XPOSIXSPACE } /* whitespace=true */, - { 8, 999, 0, 8, 0, UNI_GURU } /* gurmukhi */, - { 61, 2290, 2230, 4, 8, UNI_NV__7_SLASH_8 } /* nv=8.750e-01 */, - { 0, 2666, 1977, 8, 7, UNI_LB__SY } /* lb=breaksymbols */, - { 2, 2502, 8627, 3, 33, UNI_MISCPICTOGRAPHS } /* inmiscellaneoussymbolsandpictographs */, - { 10, 4291, 963, 9, 6, -UNI_DIA } /* diacritic=false */, - { 26, 1874, 2802, 6, 7, UNI_SC__ARAB } /* script=arabic */, - { 11, 135, 170, 2, 3, UNI_PCM } /* ispcm */, - { 3, 401, 631, 3, 5, UNI_EXT } /* ext=true */, - { 5, 2602, 1019, 7, 3, UNI_POSIXBLANK } /* posixblank */, - { 0, 5325, 4832, 10, 5, UNI_LATIN1 } /* block=latin1sup */, - { 0, 1234, 6602, 5, 18, UNI_CJKCOMPATFORMS } /* incjkcompatibilityforms */, - { 0, 2338, 594, 10, 3, UNI_IN__2_DOT_1 } /* presentin=2.1 */, - { 0, 6431, 591, 10, 2, UNI_EBASE } /* linebreak=eb */, - { 4, 4703, 645, 5, 3, -UNI_XPOSIXUPPER } /* upper=no */, - { 0, 624, 7461, 5, 2, UNI_CCC__AL } /* ccc=228 */, - { 92, 1696, 6806, 4, 11, UNI_NUMBERFORMS } /* blk=numberforms */, - { 4, 3491, 364, 13, 2, UNI_NV__31 } /* numericvalue=31 */, - { 49, 4635, 0, 13, 0, UNI_LATINEXTE } /* blk=latinexte */, - { 4, 4557, 494, 17, 4, UNI_ROHG } /* scriptextensions=rohg */, - { 5, 6647, 741, 13, 4, UNI_JG__SEEN } /* joininggroup=seen */, - { 9, 4557, 122, 17, 4, UNI_KRAI } /* scriptextensions=krai */, - { 20, 1598, 0, 10, 0, UNI_NAGM } /* nagmundari */, - { 0, 1498, 288, 2, 1, UNI_sd_values_index } /* sd= */, - { 4, 904, 6168, 4, 2, UNI_uideo_values_index } /* uideo= */, - { 0, 1696, 4927, 4, 18, UNI_ORNAMENTALDINGBATS } /* blk=ornamentaldingbats */, - { 0, 1126, 377, 4, 6, UNI_CAKM } /* scx=chakma */, - { 0, 1447, 631, 4, 2, UNI_IDST } /* idst=t */, - { 6, 3491, 304, 13, 2, UNI_NV__40 } /* numericvalue=40 */, - { 0, 4557, 27, 17, 4, UNI_ARMI } /* scriptextensions=armi */, - { 0, 753, 3723, 3, 3, UNI_KANGXI } /* kangxi */, - { 0, 4557, 704, 17, 5, UNI_DOGR } /* scriptextensions=dogra */, - { 1, 2573, 373, 5, 2, UNI_JOINC } /* joinc=y */, - { 0, 5, 645, 3, 3, -UNI_MCM } /* mcm=no */, - { 2, 135, 8920, 2, 43, UNI_UCASEXTA } /* isunifiedcanadianaboriginalsyllabicsextendeda */, - { 0, 1126, 454, 4, 4, UNI_MRO } /* scx=mroo */, - { 1, 7307, 0, 8, 0, UNI_INARABIC } /* inarabic */, - { 0, 2, 962, 1, 3, -UNI_CE } /* ce=f */, - { 19, 2612, 0, 3, 0, UNI_jg_values_index } /* jg= */, - { 8, 106, 0, 1, 1, UNI_ZL } /* zl */, - { 3, 1234, 6620, 5, 11, UNI_CJKRADICALSSUP } /* incjkradicalssup */, - { 0, 135, 341, 2, 5, UNI_VSSUP } /* isvssup */, - { 1, 1322, 2443, 4, 5, UNI_CJKEXTE } /* iscjkexte */, - { 1, 6370, 5907, 5, 16, UNI_LB__VF } /* insc=reorderingkiller */, - { 0, 2114, 631, 5, 5, UNI_XPOSIXALPHA } /* alpha=true */, - { 1, 1696, 2919, 4, 12, UNI_MAHJONG } /* blk=mahjongtiles */, - { 2, 5260, 3535, 9, 13, UNI_WB__EX } /* wordbreak=extendnumlet */, - { 8, 2599, 1523, 8, 5, UNI_XPOSIXSPACE } /* isxposixspace */, - { 46, 4557, 838, 17, 4, UNI_SARB } /* scriptextensions=sarb */, - { 9, 6670, 1649, 14, 2, UNI_SB__FO } /* sentencebreak=fo */, - { 54, 2740, 631, 13, 5, UNI_PATSYN } /* patternsyntax=true */, - { 0, 106, 0, 1, 0, UNI_Z } /* z */, - { 9, 21, 1215, 1, 8, UNI_EMOTICONS } /* emoticons */, - { 0, 1696, 1965, 4, 4, UNI_UCAS } /* blk=ucas */, - { 0, 8088, 3288, 15, 7, UNI_L } /* generalcategory=letter */, - { 20, 6372, 150, 3, 4, UNI_NARB } /* sc=narb */, - { 0, 6125, 373, 21, 4, UNI__PERL_NCHAR } /* noncharactercodepoint=yes */, - { 3, 1874, 569, 7, 6, UNI_RJNG } /* script=rejang */, - { 0, 3178, 644, 12, 3, -UNI_POSIXXDIGIT } /* asciihexdigit=n */, - { 64, 3961, 1364, 14, 2, UNI_NV__700 } /* numericvalue=700 */, - { 8, 2833, 261, 3, 5, UNI_XPOSIXCNTRL } /* gc=cntrl */, - { 11, 3215, 3740, 11, 9, UNI_GEORGIANEXT } /* blk=georgianextended */, - { 28, 8145, 631, 16, 2, UNI_UIDEO } /* unifiedideograph=t */, - { 8, 1775, 343, 6, 3, UNI_ARABICSUP } /* arabicsup */, - { 2, 1696, 1528, 4, 8, UNI_INBUGINESE } /* blk=buginese */, - { 2, 1126, 6996, 4, 11, UNI_MTEI } /* scx=meeteimayek */, - { 0, 1696, 5229, 4, 19, UNI_OTTOMANSIYAQNUMBERS } /* blk=ottomansiyaqnumbers */, - { 0, 2833, 345, 3, 2, UNI_PF } /* gc=pf */, - { 0, 3961, 5549, 14, 4, UNI_NV__70000 } /* numericvalue=70000 */, - { 2, 3099, 304, 11, 2, UNI_IN__4 } /* presentin=v40 */, - { 7, 2338, 413, 10, 1, UNI_IN__6 } /* presentin=6 */, - { 0, 7585, 4605, 10, 15, UNI_BC__BN } /* bidiclass=boundaryneutral */, - { 1, 2394, 808, 6, 7, UNI_OLCK } /* block=olchiki */, - { 1, 946, 0, 8, 0, UNI_BASS } /* bassavah */, - { 3, 6229, 1477, 21, 2, UNI_BPT__C } /* bidipairedbrackettype=c */, - { 5, 306, 419, 3, 2, UNI_NV__16 } /* nv=16 */, - { 1, 4557, 842, 17, 4, UNI_SHRD } /* scriptextensions=shrd */, - { 0, 1696, 1482, 4, 10, UNI_INCHORASMIAN } /* blk=chorasmian */, - { 0, 1126, 4785, 4, 4, UNI_BOPO } /* scx=bopo */, - { 0, 643, 7233, 6, 9, UNI_DT__NONCANON } /* dt=noncanonical */, - { 3, 1781, 4844, 3, 15, UNI_SYRIACSUP } /* issyriacsupplement */, - { 11, 2080, 962, 10, 3, -UNI_KEHNOROTATE } /* kehnorotate=f */, - { 0, 6647, 7544, 13, 14, UNI_JG__HAMZAONHEHGOAL } /* joininggroup=tehmarbutagoal */, - { 10, 8861, 0, 39, 0, UNI_SUPMATHOPERATORS } /* block=supplementalmathematicaloperators */, - { 4, 1874, 2847, 7, 6, UNI_SC__COPT } /* script=coptic */, - { 1, 2345, 609, 3, 3, UNI_IN__8 } /* in=8.0 */, - { 0, 1696, 0, 4, 0, UNI_blk_values_index } /* blk= */, - { 24, 2053, 1619, 3, 9, UNI_PHNX } /* isphoenician */, - { 16, 1126, 694, 4, 5, UNI_ADLM } /* scx=adlam */, - { 3, 7061, 373, 25, 4, UNI_DI } /* defaultignorablecodepoint=yes */, - { 0, 2785, 6520, 13, 10, UNI_BC__RLE } /* bc=righttoleftembedding */, - { 25, 1696, 8693, 4, 25, UNI_SYMBOLSFORLEGACYCOMPUTING } /* blk=symbolsforlegacycomputing */, - { 0, 869, 373, 4, 2, UNI_TERM } /* term=y */, - { 40, 8088, 3288, 15, 13, UNI_NL } /* generalcategory=letternumber */, - { 0, 3227, 4666, 11, 4, UNI_MYANMAREXTC } /* blk=myanmarextc */, - { 0, 3491, 2250, 14, 8, UNI_NV__3_SLASH_64 } /* numericvalue=4.688e-02 */, - { 0, 135, 8145, 2, 16, UNI_UIDEO } /* isunifiedideograph */, - { 5, 3916, 6280, 12, 4, UNI_NFCQC__M } /* nfkcquickcheck=m */, - { 7, 6431, 7739, 10, 10, UNI_LB__AL } /* linebreak=alphabetic */, - { 97, 1126, 2305, 4, 4, UNI_HUNG } /* scx=hung */, - { 5, 1874, 999, 7, 8, UNI_SC__GURU } /* script=gurmukhi */, - { 0, 135, 6053, 2, 12, UNI_SUNDANESESUP } /* issundanesesup */, - { 0, 3098, 963, 5, 2, -UNI_EPRES } /* epres=f */, - { 1, 358, 2223, 4, 2, UNI_CCC__33 } /* ccc=33 */, - { 0, 2612, 3386, 3, 12, UNI_JG__FINALSEMKATH } /* jg=finalsemkath */, - { 0, 2394, 7951, 6, 18, UNI_INVS } /* block=variationselectors */, - { 0, 6372, 909, 3, 7, UNI_ZZZZ } /* sc=unknown */, - { 5, 5803, 7285, 15, 11, UNI_IDENTIFIERTYPE__RECOMMENDED } /* identifiertype=recommended */, - { 0, 6372, 8927, 3, 18, UNI_CANS } /* sc=canadianaboriginal */, - { 0, 135, 4504, 2, 6, UNI_XPOSIXSPACE } /* iswspace */, - { 0, 2371, 963, 4, 2, -UNI_XIDC } /* xidc=f */, - { 9, 4557, 6862, 17, 4, UNI_BRAH } /* scriptextensions=brah */, - { 0, 3734, 4832, 6, 2, UNI_LATIN1 } /* inlatin1 */, - { 11, 30, 1968, 1, 4, UNI_EXT } /* isext */, - { 0, 4557, 714, 17, 5, UNI_OGAM } /* scriptextensions=ogham */, - { 1, 6431, 3023, 15, 6, UNI_LB__BB } /* linebreak=breakbefore */, - { 3, 7847, 4736, 18, 7, UNI_DT__INIT } /* decompositiontype=initial */, - { 1, 2494, 0, 2, 0, UNI__PERL_SURROGATE } /* cs */, - { 1, 1874, 193, 7, 4, UNI_SC__SAMR } /* script=samr */, - { 5, 7739, 360, 9, 2, UNI_alpha_values_index } /* alphabetic= */, - { 0, 135, 883, 2, 7, UNI_LANA } /* istaitham */, - { 2, 3961, 0, 14, 0, UNI_NV__7 } /* numericvalue=7 */, - { 0, 1874, 535, 7, 4, UNI_SC__LYDI } /* script=lydi */, - { 1, 1874, 680, 7, 7, UNI_SC__HANO } /* script=hanunoo */, - { 0, 5978, 0, 19, 0, UNI_SUPARROWSB } /* supplementalarrowsb */, - { 36, 1126, 1075, 4, 8, UNI_KRAI } /* scx=kiratrai */, - { 17, 1874, 1866, 7, 4, UNI_SC__MONG } /* script=mong */, - { 1, 924, 1364, 6, 2, UNI_AGE__10 } /* age=v100 */, - { 1, 4557, 1417, 17, 9, UNI_PAUC } /* scriptextensions=paucinhau */, - { 0, 6467, 2161, 14, 8, UNI_NV__5_SLASH_2 } /* numericvalue=2.500e+00 */, - { 6, 1126, 3764, 4, 10, UNI_DEVA } /* scx=devanagari */, - { 9, 2833, 4115, 3, 14, UNI_SK } /* gc=modifiersymbol */, - { 34, 1126, 1608, 4, 10, UNI_XPEO } /* scx=oldpersian */, - { 0, 1498, 645, 2, 2, -UNI_SD } /* sd=n */, - { 0, 8095, 261, 9, 5, UNI_XPOSIXCNTRL } /* category=cntrl */, - { 0, 904, 631, 5, 2, UNI_UIDEO } /* uideo=t */, - { 1, 2394, 3260, 7, 14, UNI_CONTROLPICTURES } /* block=controlpictures */, - { 0, 8095, 283, 9, 2, UNI_ZP } /* category=zp */, - { 0, 1474, 366, 7, 2, UNI_CCC__84 } /* ccc=ccc84 */, - { 7, 1696, 3560, 4, 15, UNI_INZANABAZARSQUARE } /* blk=zanabazarsquare */, - { 1, 5044, 0, 8, 0, UNI_TAMILSUP } /* tamilsup */, - { 1, 1126, 897, 4, 7, UNI_TIBT } /* scx=tibetan */, - { 0, 135, 1057, 2, 4, UNI_JAMO } /* isjamo */, - { 1, 2833, 4801, 3, 16, UNI_PE } /* gc=closepunctuation */, - { 0, 1126, 1353, 4, 9, UNI_TALU } /* scx=newtailue */, - { 0, 16, 2440, 1, 7, UNI_GREEKEXT } /* greekext */, - { 0, 1230, 1715, 3, 10, UNI_INCYPROMINOAN } /* incyprominoan */, - { 0, 1696, 3764, 4, 13, UNI_DEVANAGARIEXT } /* blk=devanagariext */, - { 0, 30, 320, 1, 6, UNI_XPOSIXPRINT } /* isprint */, - { 0, 4557, 166, 17, 4, UNI_OUGR } /* scriptextensions=ougr */, - { 88, 5677, 645, 21, 2, -UNI_CWCF } /* changeswhencasefolded=n */, - { 0, 1874, 938, 7, 8, UNI_BALI } /* script=balinese */, - { 4, 1236, 213, 5, 2, UNI_CJKEXTF } /* cjkextf */, - { 0, 1446, 4572, 3, 2, UNI_xids_values_index } /* xids= */, - { 18, 323, 7766, 2, 27, UNI_ANCIENTGREEKMUSIC } /* inancientgreekmusicalnotation */, - { 0, 7847, 1736, 18, 3, UNI_DT__FRA } /* decompositiontype=fra */, - { 3, 1874, 3590, 6, 9, UNI_SC__ETHI } /* script=ethiopic */, - { 19, 135, 6188, 2, 21, UNI_YIJING } /* isyijinghexagramsymbols */, - { 0, 2338, 603, 11, 3, UNI_IN__16 } /* presentin=16.0 */, - { 1, 8095, 4280, 9, 5, UNI_P } /* category=punct */, - { 10, 5069, 372, 16, 3, UNI_EBASE } /* emojimodifierbase=y */, - { 72, 2069, 1477, 11, 2, UNI_JT__C } /* joiningtype=c */, - { 0, 8596, 7631, 31, 14, UNI_INSC__CONSONANTPRECEDINGREPHA } /* indicsyllabiccategory=consonantprecedingrepha */, - { 5, 383, 963, 4, 2, -UNI_CWCM } /* cwcm=f */, - { 4, 3227, 8292, 5, 32, UNI_MISCMATHSYMBOLSA } /* blk=miscellaneousmathematicalsymbolsa */, - { 0, 135, 8, 2, 3, UNI_OCR } /* isocr */, - { 2, 4858, 0, 4, 0, UNI_TALE } /* tale */, - { 5, 4557, 5462, 17, 20, UNI_PHLI } /* scriptextensions=inscriptionalpahlavi */, - { 0, 285, 176, 4, 2, UNI_GCB__PP } /* gcb=pp */, - { 1, 135, 1752, 2, 4, UNI_GURU } /* isguru */, - { 0, 5, 4770, 1, 15, UNI_MISCMATHSYMBOLSB } /* miscmathsymbolsb */, - { 3, 2394, 5573, 6, 3, UNI_PUA } /* block=pua */, - { 0, 30, 1020, 1, 7, UNI_INKAITHI } /* inkaithi */, - { 2, 135, 5044, 2, 5, UNI_TAML } /* istamil */, - { 0, 135, 2538, 2, 13, UNI_IPAEXT } /* isipaextensions */, - { 1, 5364, 6841, 19, 3, UNI_EXTPICT } /* extendedpictographic=t */, - { 9, 323, 1270, 2, 7, UNI_INMULTANI } /* inmultani */, - { 4, 1874, 5014, 7, 4, UNI_BAMU } /* script=bamu */, - { 0, 358, 1368, 4, 2, UNI_CCC__20 } /* ccc=20 */, - { 0, 323, 774, 2, 7, UNI_INMANDAIC } /* inmandaic */, - { 1, 2278, 0, 12, 0, UNI_NV__1_SLASH_16 } /* nv=6.250e-02 */, - { 1, 1523, 3642, 4, 10, UNI_ZS } /* spaceseparator */, - { 1, 1696, 3623, 4, 16, UNI_CYPRIOTSYLLABARY } /* blk=cypriotsyllabary */, - { 1, 8861, 6290, 9, 13, UNI_SUPMATHOPERATORS } /* block=supmathoperators */, - { 0, 8861, 1896, 9, 8, UNI_SUPERANDSUB } /* block=superandsub */, - { 0, 6372, 569, 3, 6, UNI_RJNG } /* sc=rejang */, - { 0, 6372, 3447, 3, 4, UNI_SC__MERO } /* sc=mero */, - { 4, 6372, 579, 3, 6, UNI_TNSA } /* sc=tangsa */, - { 0, 4557, 661, 17, 7, UNI_ELYM } /* scriptextensions=elymaic */, - { 1, 6446, 373, 21, 2, UNI_MCM } /* modifiercombiningmark=y */, - { 0, 4173, 631, 4, 2, UNI_IDSB } /* idsb=t */, - { 8, 617, 0, 7, 0, UNI_AVST } /* avestan */, - { 0, 3945, 2258, 14, 8, UNI_NV__1_SLASH_20 } /* numericvalue=5.000e-02 */, - { 5, 4557, 1119, 18, 3, UNI_MERC } /* scriptextensions=merc */, - { 0, 1993, 2654, 11, 3, -UNI_GRBASE } /* graphemebase=n */, - { 64, 751, 526, 5, 3, UNI_KANBUN } /* inkanbun */, - { 0, 7233, 1368, 25, 2, UNI_CCC__B } /* canonicalcombiningclass=220 */, - { 104, 6372, 442, 3, 4, UNI_SC__HANO } /* sc=hano */, - { 1, 6838, 6849, 5, 13, UNI_INPC__BOTTOMANDLEFT } /* inpc=bottomandleft */, - { 4, 3778, 4832, 6, 5, UNI_LATIN1 } /* islatin1sup */, - { 4, 2612, 2795, 4, 3, UNI_JG__ALEF } /* jg=alef */, - { 66, 2833, 117, 3, 2, UNI_SK } /* gc=sk */, - { 0, 575, 54, 3, 2, UNI_SB__SC } /* sb=sc */, - { 0, 6372, 1399, 3, 9, UNI_SC__OUGR } /* sc=olduyghur */, - { 2, 3183, 373, 8, 2, UNI_XPOSIXXDIGIT } /* hexdigit=y */, - { 38, 321, 0, 5, 0, UNI_XPOSIXPRINT } /* print */, - { 0, 1874, 4620, 7, 6, UNI_SC__ZYYY } /* script=common */, - { 0, 2502, 6817, 3, 21, UNI_MISCTECHNICAL } /* inmiscellaneoustechnical */, - { 71, 5782, 690, 20, 3, UNI_LB__H2 } /* graphemeclusterbreak=lv */, - { 1, 1696, 6707, 4, 23, UNI_ZNAMENNYMUSIC } /* blk=znamennymusicalnotation */, - { 0, 285, 261, 4, 2, UNI_GCB__CN } /* gcb=cn */, - { 0, 668, 631, 7, 5, UNI_EXTPICT } /* extpict=true */, - { 0, 135, 1277, 2, 7, UNI_NB } /* isnoblock */, - { 8, 135, 117, 2, 2, UNI_SK } /* issk */, - { 13, 8861, 5518, 7, 11, UNI_SMALLKANAEXT } /* block=smallkanaext */, - { 0, 434, 963, 3, 2, -UNI_DIA } /* dia=f */, - { 0, 6372, 126, 3, 4, UNI_LAO } /* sc=laoo */, - { 0, 237, 0, 4, 0, UNI_XPEO } /* xpeo */, - { 0, 358, 3611, 4, 12, UNI_CCC__0 } /* ccc=notreordered */, - { 2, 135, 170, 2, 2, UNI_PC } /* ispc */, - { 0, 6072, 5253, 14, 7, UNI_SUPARROWSA } /* issupplementalarrowsa */, - { 2, 358, 1707, 4, 7, UNI_CCC__1 } /* ccc=overlay */, - { 52, 135, 5014, 2, 4, UNI_BAMU } /* isbamu */, - { 17, 3930, 5549, 14, 10, UNI_NV__10000000000 } /* numericvalue=10000000000 */, - { 2, 4703, 963, 5, 2, -UNI_XPOSIXUPPER } /* upper=f */, - { 9, 2371, 630, 10, 6, UNI_XIDC } /* xidcontinue=true */, - { 0, 4557, 3520, 17, 15, UNI_SARB } /* scriptextensions=oldsoutharabian */, - { 0, 4557, 1122, 17, 4, UNI_NSHU } /* scriptextensions=nshu */, - { 27, 2584, 8627, 3, 33, UNI_MISCPICTOGRAPHS } /* ismiscellaneoussymbolsandpictographs */, - { 2, 6372, 529, 3, 6, UNI_SC__KHOJ } /* sc=khojki */, - { 0, 2394, 2538, 6, 13, UNI_IPAEXT } /* block=ipaextensions */, - { 72, 1874, 3764, 7, 4, UNI_SC__DEVA } /* script=deva */, - { 1, 2666, 98, 3, 2, UNI_LB__HL } /* lb=hl */, - { 15, 8095, 106, 9, 1, UNI_Z } /* category=z */, - { 19, 135, 868, 2, 5, UNI_STERM } /* issterm */, - { 0, 4557, 438, 17, 4, UNI_GONM } /* scriptextensions=gonm */, - { 26, 1446, 373, 4, 2, UNI_XIDS } /* xids=y */, - { 0, 135, 2847, 2, 4, UNI_COPT } /* iscopt */, - { 2, 4557, 336, 17, 5, UNI_TAKR } /* scriptextensions=takri */, - { 1, 2394, 557, 6, 6, UNI_INOLONAL } /* block=olonal */, - { 1, 135, 724, 2, 5, UNI_RUNR } /* isrunic */, - { 0, 30, 7016, 1, 14, UNI_DEVANAGARIEXT } /* isdevanagariext */, - { 1, 1696, 5565, 4, 20, UNI_INNYIAKENGPUACHUEHMONG } /* blk=nyiakengpuachuehmong */, - { 116, 2055, 3185, 5, 6, UNI_POSIXXDIGIT } /* posixxdigit */, - { 1, 135, 138, 2, 4, UNI_MEDF } /* ismedf */, - { 37, 1874, 442, 7, 4, UNI_SC__HANO } /* script=hano */, - { 4, 2666, 6, 3, 2, UNI_LB__CM } /* lb=cm */, - { 2, 2785, 6509, 2, 12, UNI_BC__L } /* bc=lefttoright */, - { 40, 4557, 336, 17, 4, UNI_TAKR } /* scriptextensions=takr */, - { 0, 2612, 1329, 3, 6, UNI_JG__LAMADH } /* jg=lamadh */, - { 0, 4687, 0, 15, 0, UNI_TITLE } /* titlecaseletter */, - { 24, 358, 2155, 5, 2, UNI_CCC__129 } /* ccc=129 */, - { 4, 8596, 2387, 22, 6, UNI_INSC__NUMBER } /* indicsyllabiccategory=number */, - { 0, 5585, 373, 19, 2, UNI_TERM } /* terminalpunctuation=y */, - { 0, 1126, 3111, 4, 14, UNI_PHLP } /* scx=psalterpahlavi */, - { 2, 71, 631, 3, 2, UNI_CWU } /* cwu=t */, - { 8, 6431, 124, 10, 2, UNI_LB__AI } /* linebreak=ai */, - { 2, 135, 74, 2, 4, UNI_CYRL } /* iscyrl */, - { 0, 6372, 1033, 3, 6, UNI_SC__LYCI } /* sc=lycian */, - { 2, 1874, 699, 7, 5, UNI_SC__BUHD } /* script=buhid */, - { 0, 4557, 704, 17, 4, UNI_DOGR } /* scriptextensions=dogr */, - { 2, 135, 2080, 2, 11, UNI_KEHNOROTATE } /* iskehnorotate */, - { 2, 3778, 6025, 7, 9, UNI_LATINEXTA } /* islatinextendeda */, - { 1, 2471, 666, 8, 5, UNI_ETHIOPICEXT } /* inethiopicext */, - { 1, 1126, 257, 4, 4, UNI_ZZZZ } /* scx=zzzz */, - { 34, 6647, 517, 13, 3, UNI_JG__GAF } /* joininggroup=gaf */, - { 9, 1874, 4379, 6, 11, UNI_SC__MANI } /* script=manichaean */, - { 14, 636, 6658, 2, 2, UNI_dep_values_index } /* dep= */, - { 32, 6370, 2036, 5, 7, UNI_INSC__VISARGA } /* insc=visarga */, - { 8, 7979, 4369, 23, 4, UNI_JG__MANICHAEANFIVE } /* joininggroup=manichaeanfive */, - { 0, 6350, 3501, 18, 3, UNI_idcompatmathcontinue_values_index } /* idcompatmathcontinue= */, - { 2, 2055, 1523, 5, 5, UNI_POSIXSPACE } /* posixspace */, - { 0, 851, 6572, 3, 22, UNI_COMPATJAMO } /* inhangulcompatibilityjamo */, - { 0, 2394, 3764, 6, 10, UNI_INDEVANAGARI } /* block=devanagari */, - { 8, 1874, 2481, 7, 8, UNI_SC__KANA } /* script=katakana */, - { 2, 383, 645, 4, 3, -UNI_CWCM } /* cwcm=no */, - { 0, 1744, 5230, 3, 18, UNI_OTTOMANSIYAQNUMBERS } /* isottomansiyaqnumbers */, - { 2, 2394, 4306, 6, 15, UNI_INHANGUL } /* block=hangulsyllables */, - { 1, 5, 0, 1, 0, UNI_M } /* m */, - { 0, 2, 5839, 1, 10, UNI_COUNTINGROD } /* countingrod */, - { 64, 1874, 442, 7, 3, UNI_SC__HAN } /* script=han */, - { 1, 6647, 1065, 13, 5, UNI_JG__GAMAL } /* joininggroup=gamal */, - { 0, 393, 0, 6, 0, UNI_GOTH } /* gothic */, - { 2, 2114, 963, 5, 6, -UNI_XPOSIXALPHA } /* alpha=false */, - { 0, 5761, 645, 21, 3, -UNI_CWU } /* changeswhenuppercased=no */, - { 2, 1236, 6777, 3, 16, UNI_CJKCOMPATIDEOGRAPHS } /* cjkcompatideographs */, - { 24, 4540, 963, 17, 6, -UNI_RI } /* regionalindicator=false */, - { 0, 2345, 2731, 4, 3, UNI_IN__15 } /* in=15.0 */, - { 29, 8088, 349, 16, 2, UNI_PD } /* generalcategory=pd */, - { 0, 5260, 698, 10, 2, UNI_WB__MB } /* wordbreak=mb */, - { 24, 164, 7187, 2, 21, UNI_GEOMETRICSHAPESEXT } /* geometricshapesextended */, - { 8, 4557, 680, 17, 7, UNI_HANO } /* scriptextensions=hanunoo */, - { 14, 1874, 1960, 6, 5, UNI_SC__KANA } /* script=kana */, - { 2, 4557, 1298, 17, 7, UNI_SOYO } /* scriptextensions=soyombo */, - { 0, 4635, 6025, 9, 9, UNI_LATINEXTA } /* blk=latinextendeda */, - { 0, 3423, 0, 4, 0, UNI_HEBR } /* hebr */, - { 0, 2238, 551, 4, 2, UNI_NV__4_SLASH_5 } /* nv=4/5 */, - { 1, 4557, 5148, 17, 4, UNI_HAN } /* scriptextensions=hani */, - { 0, 323, 23, 2, 4, UNI_INAHOM } /* inahom */, - { 0, 135, 1241, 2, 7, UNI_GRAN } /* isgrantha */, - { 3, 7868, 2452, 19, 9, UNI_HST__V } /* hangulsyllabletype=voweljamo */, - { 12, 2819, 373, 14, 2, UNI_ECOMP } /* emojicomponent=y */, - { 1, 2055, 3185, 4, 6, UNI_POSIXDIGIT } /* posixdigit */, - { 7, 135, 3764, 2, 14, UNI_DEVANAGARIEXTA } /* isdevanagariexta */, - { 0, 1874, 490, 7, 4, UNI_SC__QAAI } /* script=qaai */, - { 0, 3183, 373, 8, 4, UNI_XPOSIXXDIGIT } /* hexdigit=yes */, - { 0, 135, 2878, 2, 12, UNI_KHMERSYMBOLS } /* iskhmersymbols */, - { 1, 1874, 143, 8, 3, UNI_MTEI } /* script=mtei */, - { 0, 5565, 0, 20, 0, UNI_HMNP } /* nyiakengpuachuehmong */, - { 0, 3491, 5549, 14, 4, UNI_NV__40000 } /* numericvalue=40000 */, - { 3, 1097, 2161, 4, 8, UNI_NV__3_SLASH_2 } /* nv=1.500e+00 */, - { 0, 6372, 378, 4, 5, UNI_SC__CAKM } /* sc=chakma */, - { 20, 4557, 229, 17, 4, UNI_TUTG } /* scriptextensions=tutg */, - { 0, 546, 419, 5, 2, UNI_NV__3_SLASH_16 } /* nv=3/16 */, - { 6, 1696, 5978, 4, 19, UNI_SUPARROWSB } /* blk=supplementalarrowsb */, - { 23, 2551, 7068, 6, 9, UNI_CI } /* iscaseignorable */, - { 8, 2740, 963, 13, 2, -UNI_PATSYN } /* patternsyntax=f */, - { 0, 2394, 2043, 6, 10, UNI_YIRADICALS } /* block=yiradicals */, - { 0, 2666, 657, 3, 2, UNI_LB__AS } /* lb=as */, - { 9, 15, 3956, 2, 3, UNI_AGE__5 } /* age=5 */, - { 1, 358, 368, 4, 2, UNI_CCC__91 } /* ccc=91 */, - { 0, 7979, 5534, 22, 8, UNI_JG__MANICHAEANDHAMEDH } /* joininggroup=manichaeandhamedh */, - { 0, 135, 154, 2, 4, UNI_NEWA } /* isnewa */, - { 19, 5782, 7356, 21, 7, UNI_GCB__PP } /* graphemeclusterbreak=prepend */, - { 73, 2080, 630, 10, 6, UNI_KEHNOROTATE } /* kehnorotate=true */, - { 9, 1696, 4291, 4, 15, UNI_DIACRITICALSEXT } /* blk=diacriticalsext */, - { 15, 2394, 2443, 8, 5, UNI_CJKEXTE } /* block=cjkexte */, - { 17, 2573, 0, 11, 0, UNI_JOINC } /* joincontrol */, - { 0, 8596, 7889, 30, 17, UNI_INSC__CONSONANTINITIALPOSTFIXED } /* indicsyllabiccategory=consonantinitialpostfixed */, - { 1, 135, 6307, 2, 22, UNI_DIACRITICALSFORSYMBOLS } /* isdiacriticalsforsymbols */, - { 1, 8095, 2494, 9, 2, UNI__PERL_SURROGATE } /* category=cs */, - { 1, 7036, 963, 25, 2, -UNI_CWKCF } /* changeswhennfkccasefolded=f */, - { 0, 8095, 3186, 9, 5, UNI_XPOSIXDIGIT } /* category=digit */, - { 18, 135, 5698, 2, 21, UNI_CWCM } /* ischangeswhencasemapped */, - { 2, 6670, 2835, 13, 6, UNI_SB__XX } /* sentencebreak=other */, - { 0, 1934, 631, 5, 2, UNI_BIDIC } /* bidic=t */, - { 78, 2612, 5188, 3, 6, UNI_JG__YUDHHE } /* jg=yudhhe */, - { 1, 358, 2786, 2, 7, UNI_CCC__R } /* ccc=right */, - { 0, 135, 1015, 2, 4, UNI_HATR } /* ishatr */, - { 0, 7951, 631, 17, 5, UNI_VS } /* variationselector=true */, - { 0, 1446, 645, 4, 2, -UNI_XIDS } /* xids=n */, - { 0, 1126, 6392, 4, 10, UNI_GLAG } /* scx=glagolitic */, - { 0, 2394, 938, 6, 8, UNI_INBALINESE } /* block=balinese */, - { 18, 53, 300, 2, 2, UNI_NSHU } /* nshu */, - { 89, 2338, 2753, 10, 3, UNI_IN__5_DOT_2 } /* presentin=5.2 */, - { 0, 2394, 719, 6, 5, UNI_INOSAGE } /* block=osage */, - { 72, 546, 1364, 4, 3, UNI_NV__3000 } /* nv=3000 */, - { 0, 135, 4540, 2, 17, UNI_RI } /* isregionalindicator */, - { 47620, 1126, 1837, 4, 11, UNI_MEDF } /* scx=medefaidrin */, - { 0, 2394, 1353, 6, 9, UNI_INNEWTAILUE } /* block=newtailue */, - { 65, 916, 594, 4, 3, UNI_AGE__2_DOT_1 } /* age=2.1 */, - { 2, 1945, 645, 12, 3, -UNI_BIDIM } /* bidimirrored=no */, - { 2, 969, 963, 6, 2, -UNI_COMPEX } /* compex=f */, - { 12, 6372, 654, 3, 7, UNI_SC__ELBA } /* sc=elbasan */, - { 1, 3099, 302, 12, 2, UNI_IN__13 } /* presentin=v130 */, - { 13, 1097, 795, 4, 3, UNI_NV__11_SLASH_2 } /* nv=11/2 */, - { 0, 2666, 4540, 3, 17, UNI_RI } /* lb=regionalindicator */, - { 20, 6372, 458, 3, 3, UNI_SC__NKO } /* sc=nko */, - { 23, 5803, 788, 18, 4, UNI_IDENTIFIERTYPE__NOTNFKC } /* identifiertype=notnfkc */, - { 1, 2394, 6552, 6, 19, UNI_JAMOEXTB } /* block=hanguljamoextendedb */, - { 0, 575, 4321, 3, 5, UNI_SB__LO } /* sb=lower */, - { 9, 1126, 1007, 4, 4, UNI_HIRA } /* scx=hira */, - { 1, 3916, 373, 14, 2, UNI_NFKCQC__Y } /* nfkcquickcheck=y */, - { 10, 6250, 2444, 14, 8, UNI_ETHIOPICEXT } /* block=ethiopicextended */, - { 4, 135, 1538, 2, 4, UNI_GEOR } /* isgeor */, - { 88, 135, 704, 2, 5, UNI_DOGR } /* isdogra */, - { 3, 1874, 31, 7, 4, UNI_SC__AVST } /* script=avst */, - { 0, 546, 304, 5, 1, UNI_NV__3_SLASH_4 } /* nv=3/4 */, - { 122, 135, 6897, 2, 15, UNI_MODIFIERLETTERS } /* ismodifierletters */, - { 2, 6647, 4883, 13, 5, UNI_JG__ZHAIN } /* joininggroup=zhain */, - { 13, 135, 8108, 2, 32, UNI_INIDC } /* isideographicdescriptioncharacters */, - { 1, 8693, 0, 28, 0, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* symbolsforlegacycomputingsup */, - { 33, 2666, 958, 3, 2, UNI_LB__OP } /* lb=op */, - { 4, 8140, 1741, 28, 4, UNI_CJKEXTI } /* incjkunifiedideographsextensioni */, - { 208, 945, 2654, 4, 3, -UNI_EBASE } /* ebase=n */, - { 0, 135, 946, 2, 4, UNI_BASS } /* isbass */, - { 1, 6167, 0, 3, 0, UNI_vo_values_index } /* vo= */, - { 5, 1775, 1173, 6, 3, UNI_ARABICPFA } /* arabicpfa */, - { 45462, 3736, 213, 7, 2, UNI_LATINEXTF } /* latinextf */, - { 1, 8088, 6897, 16, 14, UNI_LM } /* generalcategory=modifierletter */, - { 0, 3098, 0, 5, 0, UNI_EPRES } /* epres */, - { 33, 4557, 225, 17, 4, UNI_TODR } /* scriptextensions=todr */, - { 0, 5782, 735, 21, 2, UNI_WB__EB } /* graphemeclusterbreak=em */, - { 2, 6372, 709, 3, 5, UNI_SC__LIMB } /* sc=limbu */, - { 0, 7697, 2146, 27, 2, UNI_CCC__25 } /* canonicalcombiningclass=ccc25 */, - { 0, 3183, 631, 8, 5, UNI_XPOSIXXDIGIT } /* hexdigit=true */, - { 0, 454, 0, 3, 0, UNI_MRO } /* mro */, - { 0, 3734, 3793, 3, 13, UNI_LISUSUP } /* inlisusupplement */, - { 7, 1874, 946, 7, 4, UNI_BASS } /* script=bass */, - { 2, 2053, 3185, 7, 6, UNI_POSIXXDIGIT } /* isposixxdigit */, - { 0, 1115, 939, 3, 7, UNI_INBALINESE } /* inbalinese */, - { 18, 4321, 645, 5, 3, -UNI_XPOSIXLOWER } /* lower=no */, - { 6, 7868, 3684, 19, 12, UNI_GCB__T } /* hangulsyllabletype=trailingjamo */, - { 0, 8088, 6734, 16, 10, UNI_CO } /* generalcategory=privateuse */, - { 4, 323, 991, 2, 8, UNI_INGUJARATI } /* ingujarati */, - { 1, 2418, 630, 12, 6, UNI_CI } /* caseignorable=true */, - { 78, 8095, 133, 9, 2, UNI_NL } /* category=nl */, - { 1, 4620, 0, 6, 0, UNI_ZYYY } /* common */, - { 131, 323, 5573, 2, 3, UNI_PUA } /* inpua */, - { 4, 78, 0, 4, 0, UNI_DSRT } /* dsrt */, - { 2, 4557, 455, 18, 2, UNI_MRO } /* scriptextensions=mro */, - { 5, 1874, 1027, 7, 6, UNI_LEPC } /* script=lepcha */, - { 1, 1322, 8375, 5, 21, UNI_CJKSYMBOLS } /* iscjksymbolsandpunctuation */, - { 0, 3099, 302, 11, 2, UNI_IN__3 } /* presentin=v30 */, - { 1, 7420, 5990, 7, 7, UNI_SUPARROWSB } /* blk=suparrowsb */, - { 0, 7233, 415, 24, 2, UNI_CCC__34 } /* canonicalcombiningclass=34 */, - { 0, 135, 1051, 2, 4, UNI_YEZI } /* isyezi */, - { 9, 6955, 1176, 22, 3, UNI_JG__MALAYALAMBHA } /* joininggroup=malayalambha */, - { 1, 3599, 4793, 12, 9, UNI_ARABICEXTC } /* block=arabicextendedc */, - { 4, 1773, 5821, 3, 18, UNI_ANCIENTGREEKNUMBERS } /* isancientgreeknumbers */, - { 1, 323, 1528, 2, 8, UNI_INBUGINESE } /* inbuginese */, - { 0, 2584, 2706, 3, 12, UNI_MAYANNUMERALS } /* ismayannumerals */, - { 11, 7420, 4844, 5, 15, UNI_SYRIACSUP } /* blk=syriacsupplement */, - { 0, 30, 2889, 1, 3, UNI_NO } /* isno */, - { 32, 238, 0, 2, 0, UNI_PE } /* pe */, - { 0, 1874, 654, 7, 4, UNI_SC__ELBA } /* script=elba */, - { 1, 2599, 261, 8, 5, UNI_XPOSIXCNTRL } /* isxposixcntrl */, - { 33, 1126, 6034, 4, 9, UNI_MONG } /* scx=mongolian */, - { 0, 6446, 963, 21, 2, -UNI_MCM } /* modifiercombiningmark=f */, - { 4, 135, 905, 2, 4, UNI_IDEO } /* isideo */, - { 0, 2238, 1364, 4, 3, UNI_NV__4000 } /* nv=4000 */, - { 0, 399, 963, 5, 6, -UNI_GREXT } /* grext=false */, - { 2, 1696, 1372, 4, 9, UNI_INOLDITALIC } /* blk=olditalic */, - { 1, 6372, 1165, 3, 4, UNI_VITH } /* sc=vith */, - { 3, 6372, 1553, 3, 8, UNI_SC__JAVA } /* sc=javanese */, - { 2, 1915, 645, 5, 3, -UNI_EBASE } /* ebase=no */, - { 14, 135, 209, 2, 4, UNI_TAVT } /* istavt */, - { 4, 6372, 883, 3, 7, UNI_LANA } /* sc=taitham */, - { 54, 2740, 963, 13, 6, -UNI_PATSYN } /* patternsyntax=false */, - { 3, 4557, 23, 17, 4, UNI_AHOM } /* scriptextensions=ahom */, - { 8, 3183, 963, 8, 2, -UNI_XPOSIXXDIGIT } /* hexdigit=f */, - { 2, 306, 805, 3, 3, UNI_NV__7_SLASH_2 } /* nv=7/2 */, - { 5, 2394, 7017, 6, 19, UNI_DEVANAGARIEXTA } /* block=devanagariextendeda */, - { 11, 4021, 0, 6, 0, UNI_TANG } /* tangut */, - { 18, 135, 7036, 2, 25, UNI_CWKCF } /* ischangeswhennfkccasefolded */, - { 0, 42, 2835, 2, 6, UNI_SB__XX } /* sb=other */, - { 0, 916, 596, 4, 2, UNI_AGE__13 } /* age=13 */, - { 0, 1874, 6146, 7, 4, UNI_SC__SINH } /* script=sinh */, - { 26, 2666, 63, 3, 2, UNI_LB__CP } /* lb=cp */, - { 0, 6372, 205, 3, 4, UNI_SC__TAML } /* sc=taml */, - { 0, 2345, 0, 3, 0, UNI_in_values_index } /* in= */, - { 204, 32, 4572, 1, 2, UNI_vs_values_index } /* vs= */, - { 0, 1536, 7187, 4, 13, UNI_GEOMETRICSHAPES } /* ingeometricshapes */, - { 8, 2463, 1703, 8, 4, UNI_CYRILLICEXTD } /* cyrillicextd */, - { 1, 8596, 5876, 23, 15, UNI_INSC__CANTILLATIONMARK } /* indicsyllabiccategory=cantillationmark */, - { 1, 1874, 138, 7, 4, UNI_MEDF } /* script=medf */, - { 0, 1566, 3723, 5, 11, UNI_KANGXI } /* iskangxiradicals */, - { 2, 2564, 2440, 3, 12, UNI_GREEKEXT } /* isgreekextended */, - { 16, 3736, 1750, 11, 3, UNI_LATINEXTG } /* latinextendedg */, - { 27, 16, 6373, 1, 4, UNI_CO } /* gc=co */, - { 0, 3599, 1061, 12, 4, UNI_ARABICEXTB } /* block=arabicextb */, - { 4, 42, 5194, 2, 3, UNI_SB__CL } /* sb=cl */, - { 2, 2394, 6146, 6, 7, UNI_INSINHALA } /* block=sinhala */, - { 1, 1322, 5839, 3, 10, UNI_COUNTINGROD } /* iscountingrod */, - { 6, 1015, 0, 6, 0, UNI_HATR } /* hatran */, - { 2, 1126, 557, 4, 6, UNI_ONAO } /* scx=olonal */, - { 0, 8088, 4736, 16, 18, UNI_PI } /* generalcategory=initialpunctuation */, - { 1, 4377, 5182, 13, 6, UNI_JG__MANICHAEANTWENTY } /* jg=manichaeantwenty */, - { 16, 4557, 63, 17, 4, UNI_CPMN } /* scriptextensions=cpmn */, - { 0, 1696, 661, 4, 7, UNI_INELYMAIC } /* blk=elymaic */, - { 0, 6431, 53, 10, 2, UNI_LB__NS } /* linebreak=ns */, - { 2, 358, 1366, 5, 2, UNI_CCC__103 } /* ccc=103 */, - { 6, 1874, 5565, 7, 20, UNI_HMNP } /* script=nyiakengpuachuehmong */, - { 25, 2502, 782, 3, 6, UNI_INMARCHEN } /* inmarchen */, - { 4, 1097, 1364, 4, 2, UNI_NV__100 } /* nv=100 */, - { 1, 1284, 0, 7, 0, UNI_PHAG } /* phagspa */, - { 12, 5, 1119, 1, 3, UNI_MERC } /* merc */, - { 1, 266, 631, 4, 2, UNI_CWCF } /* cwcf=t */, - { 0, 6431, 2095, 10, 2, UNI_LB__H3 } /* linebreak=h3 */, - { 1, 2612, 2635, 3, 10, UNI_JG__KNOTTEDHEH } /* jg=knottedheh */, - { 0, 135, 1390, 2, 9, UNI_ORKH } /* isoldturkic */, - { 1, 8088, 3360, 16, 13, UNI_XPOSIXDIGIT } /* generalcategory=decimalnumber */, - { 118, 1874, 1375, 7, 4, UNI_ITAL } /* script=ital */, - { 2, 7356, 963, 26, 6, -UNI_PCM } /* prependedconcatenationmark=false */, - { 0, 991, 0, 8, 0, UNI_GUJR } /* gujarati */, - { 0, 3778, 1061, 7, 4, UNI_LATINEXTB } /* islatinextb */, - { 80, 7233, 3249, 24, 11, UNI_CCC__8 } /* canonicalcombiningclass=kanavoicing */, - { 0, 306, 0, 3, 0, UNI_nv_values_index } /* nv= */, - { 0, 54, 0, 2, 0, UNI_SC } /* sc */, - { 0, 1874, 897, 7, 7, UNI_SC__TIBT } /* script=tibetan */, - { 17, 1566, 6025, 6, 9, UNI_KANAEXTA } /* iskanaextendeda */, - { 22, 323, 919, 2, 5, UNI_IN__10 } /* in=10.0 */, - { 1, 2394, 4190, 6, 15, UNI_BRAI } /* block=braillepatterns */, - { 0, 2584, 2920, 3, 11, UNI_MAHJONG } /* ismahjongtiles */, - { 18, 135, 173, 2, 4, UNI_PHLP } /* isphlp */, - { 0, 2785, 83, 3, 2, UNI_BC__ON } /* bc=on */, - { 1, 5585, 645, 19, 2, -UNI_TERM } /* terminalpunctuation=n */, - { 1, 575, 868, 3, 5, UNI_SB__ST } /* sb=sterm */, - { 1, 8324, 4348, 30, 4, UNI_CJKEXTH } /* blk=cjkunifiedideographsextensionh */, - { 1, 575, 1648, 3, 2, UNI_LB__LF } /* sb=lf */, - { 1, 8142, 1741, 26, 4, UNI_CJKEXTI } /* cjkunifiedideographsextensioni */, - { 0, 1474, 412, 7, 2, UNI_CCC__26 } /* ccc=ccc26 */, - { 0, 4718, 631, 18, 5, UNI_IDST } /* idstrinaryoperator=true */, - { 5, 5059, 1061, 10, 4, UNI_KANAEXTB } /* block=kanaextb */, - { 6, 3183, 644, 7, 2, UNI_hex_values_index } /* hexdigit= */, - { 1, 323, 1408, 2, 9, UNI_PALM } /* inpalmyrene */, - { 0, 270, 631, 5, 5, UNI_CWKCF } /* cwkcf=true */, - { 1, 1441, 1920, 3, 3, UNI_WB__EB } /* wb=gaz */, - { 0, 2394, 5014, 6, 5, UNI_INBAMUM } /* block=bamum */, - { 4, 868, 631, 5, 2, UNI_STERM } /* sterm=t */, - { 0, 6370, 5891, 5, 16, UNI_INSC__INVISIBLESTACKER } /* insc=invisiblestacker */, - { 0, 916, 609, 4, 3, UNI_AGE__8 } /* age=8.0 */, - { 0, 1696, 1263, 4, 7, UNI_INMAKASAR } /* blk=makasar */, - { 2, 21, 644, 2, 4, -UNI_EXT } /* ext=no */, - { 5, 6431, 3062, 10, 11, UNI_LB__VF } /* linebreak=viramafinal */, - { 226, 312, 631, 2, 5, UNI_RI } /* ri=true */, - { 10, 136, 4590, 2, 15, UNI_SUTTONSIGNWRITING } /* suttonsignwriting */, - { 0, 6372, 6392, 3, 4, UNI_SC__GLAG } /* sc=glag */, - { 1, 3373, 7465, 3, 8, UNI_ENCLOSEDCJK } /* enclosedcjk */, - { 0, 1126, 2060, 4, 6, UNI_SYRC } /* scx=syriac */, - { 0, 2584, 5211, 3, 18, UNI_MODIFIERTONELETTERS } /* ismodifiertoneletters */, - { 1, 249, 0, 4, 0, UNI_ZANB } /* zanb */, - { 0, 3809, 0, 11, 0, UNI_MC } /* spacingmark */, - { 1, 1874, 5044, 7, 5, UNI_SC__TAML } /* script=tamil */, - { 3, 3976, 0, 15, 0, UNI_NV__80 } /* numericvalue=80 */, - { 0, 343, 8639, 3, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* supsymbolsandpictographs */, - { 4, 6372, 494, 3, 4, UNI_SC__ROHG } /* sc=rohg */, - { 2, 6897, 0, 15, 0, UNI_MODIFIERLETTERS } /* modifierletters */, - { 0, 1696, 1241, 4, 7, UNI_INGRANTHA } /* blk=grantha */, - { 0, 904, 631, 5, 5, UNI_UIDEO } /* uideo=true */, - { 34, 6034, 0, 12, 0, UNI_MONGOLIANSUP } /* mongoliansup */, - { 0, 7233, 458, 24, 2, UNI_CCC__7 } /* canonicalcombiningclass=nk */, - { 0, 535, 0, 6, 0, UNI_LYDI } /* lydian */, - { 1, 8095, 4736, 9, 18, UNI_PI } /* category=initialpunctuation */, - { 173, 7420, 4844, 5, 8, UNI_SYRIACSUP } /* blk=syriacsup */, - { 1, 3587, 6329, 5, 21, UNI_EARLYDYNASTICCUNEIFORM } /* blk=earlydynasticcuneiform */, - { 12, 4557, 510, 17, 4, UNI_VAI } /* scriptextensions=vaii */, - { 0, 4156, 631, 17, 2, UNI_IDCOMPATMATHSTART } /* idcompatmathstart=t */, - { 9, 1874, 1157, 7, 8, UNI_UGAR } /* script=ugaritic */, - { 0, 6372, 2302, 3, 12, UNI_SC__HUNG } /* sc=oldhungarian */, - { 0, 4524, 419, 15, 2, UNI_NV__3_SLASH_16 } /* numericvalue=3/16 */, - { 0, 4377, 4859, 13, 5, UNI_JG__MANICHAEANALEPH } /* jg=manichaeanaleph */, - { 0, 7129, 0, 14, 0, UNI_MUSIC } /* musicalsymbols */, - { 0, 2394, 1973, 7, 11, UNI_CHESSSYMBOLS } /* block=chesssymbols */, - { 18, 2612, 4406, 3, 4, UNI_JG__QAPH } /* jg=qaph */, - { 0, 8197, 6773, 27, 5, UNI_CJKEXTC } /* iscjkunifiedideographsextensionc */, - { 129, 4557, 7923, 17, 4, UNI_EGYP } /* scriptextensions=egyp */, - { 0, 1322, 1061, 5, 4, UNI_CJKEXTB } /* iscjkextb */, - { 0, 189, 29, 2, 2, UNI_RUMI } /* rumi */, - { 2, 6647, 745, 13, 4, UNI_JG__SHIN } /* joininggroup=shin */, - { 0, 4557, 2029, 17, 7, UNI_SOGD } /* scriptextensions=sogdian */, - { 3, 1874, 1315, 7, 4, UNI_SC__TIRH } /* script=tirh */, - { 0, 5325, 81, 13, 2, UNI_LATINEXTG } /* block=latinextg */, - { 296, 33, 1602, 1, 3, UNI_SUND } /* sund */, - { 0, 1874, 3578, 6, 9, UNI_SC__CYRL } /* script=cyrillic */, - { 18, 63, 65, 2, 2, UNI_CPMN } /* cpmn */, - { 0, 6372, 4306, 3, 6, UNI_SC__HANG } /* sc=hangul */, - { 4, 7868, 0, 19, 0, UNI_hst_values_index } /* hangulsyllabletype= */, - { 7, 8088, 65, 16, 2, UNI_MN } /* generalcategory=mn */, - { 0, 135, 283, 2, 2, UNI_ZP } /* iszp */, - { 0, 1234, 213, 7, 2, UNI_CJKEXTF } /* incjkextf */, - { 78, 7606, 6209, 21, 8, UNI_BC__RLO } /* bidiclass=righttoleftoverride */, - { 0, 6372, 510, 3, 3, UNI_VAI } /* sc=vai */, - { 1, 6372, 1027, 3, 4, UNI_LEPC } /* sc=lepc */, - { 0, 4557, 4594, 17, 11, UNI_SGNW } /* scriptextensions=signwriting */, - { 0, 4557, 991, 17, 8, UNI_GUJR } /* scriptextensions=gujarati */, - { 0, 6372, 4190, 3, 7, UNI_BRAI } /* sc=braille */, - { 2, 404, 2346, 5, 2, UNI_hyphen_values_index } /* hyphen= */, - { 0, 1566, 1336, 3, 8, UNI_SIND } /* iskhudawadi */, - { 0, 6431, 320, 10, 2, UNI_LB__SP } /* linebreak=sp */, - { 2, 306, 804, 3, 4, UNI_NV__17_SLASH_2 } /* nv=17/2 */, - { 6, 4557, 502, 17, 4, UNI_SOGO } /* scriptextensions=sogo */, - { 65, 323, 3560, 2, 15, UNI_INZANABAZARSQUARE } /* inzanabazarsquare */, - { 0, 3734, 139, 13, 3, UNI_LATINEXTF } /* inlatinextendedf */, - { 32, 6431, 3051, 10, 11, UNI_LB__IN } /* linebreak=inseperable */, - { 8, 1234, 6777, 5, 19, UNI_CJKCOMPATIDEOGRAPHSSUP } /* incjkcompatideographssup */, - { 22, 6544, 0, 6, 0, UNI_CF } /* format */, - { 14, 135, 699, 2, 5, UNI_BUHD } /* isbuhid */, - { 0, 3491, 801, 13, 3, UNI_NV__5_SLASH_2 } /* numericvalue=5/2 */, - { 2, 2345, 2257, 3, 3, UNI_IN__2 } /* in=2.0 */, - { 0, 5677, 631, 21, 5, UNI_CWCF } /* changeswhencasefolded=true */, - { 1, 6431, 4898, 10, 15, UNI_LB__CB } /* linebreak=contingentbreak */, - { 0, 135, 850, 2, 4, UNI_QAAI } /* iszinh */, - { 2, 2612, 514, 3, 3, UNI_JG__BEH } /* jg=beh */, - { 1, 30, 1617, 1, 11, UNI_INPHOENICIAN } /* inphoenician */, - { 1, 1257, 1061, 6, 4, UNI_KANAEXTB } /* inkanaextb */, - { 1, 3447, 0, 4, 0, UNI_MERO } /* mero */, - { 1, 2394, 352, 6, 6, UNI_INCARIAN } /* block=carian */, - { 14, 788, 1850, 3, 4, UNI_nfkcqc_values_index } /* nfkcqc= */, - { 2, 5976, 873, 6, 3, UNI_SUPPUAA } /* insuppuaa */, - { 0, 3778, 3793, 3, 6, UNI_LISUSUP } /* islisusup */, - { 8, 2833, 2055, 3, 2, UNI_PO } /* gc=po */, - { 0, 434, 373, 2, 2, UNI_DI } /* di=y */, - { 0, 1126, 1015, 4, 6, UNI_HATR } /* scx=hatran */, - { 45, 1176, 0, 9, 0, UNI_BHKS } /* bhaiksuki */, - { 8, 2394, 6074, 6, 19, UNI_SUPARROWSC } /* block=supplementalarrowsc */, - { 0, 4321, 0, 15, 0, UNI_LOWERCASELETTER } /* lowercaseletter */, - { 16, 2394, 2017, 7, 9, UNI_COMPATJAMO } /* block=compatjamo */, - { 1, 8927, 4058, 8, 9, UNI_UCAS } /* canadiansyllabics */, - { 1, 6670, 5248, 14, 5, UNI_SB__AT } /* sentencebreak=aterm */, - { 1, 7585, 8009, 10, 21, UNI_BC__PDI } /* bidiclass=popdirectionalisolate */, - { 1, 3491, 2730, 13, 10, UNI_NV___MINUS_1_SLASH_2 } /* numericvalue=-5.000e-01 */, - { 3, 4557, 2481, 17, 8, UNI_KANA } /* scriptextensions=katakana */, - { 0, 6431, 2684, 10, 10, UNI_LB__WJ } /* linebreak=wordjoiner */, - { 5, 7356, 631, 26, 5, UNI_PCM } /* prependedconcatenationmark=true */, - { 11, 2394, 2489, 9, 4, UNI_CJKEXTI } /* block=cjkexti */, - { 13, 323, 4414, 2, 17, UNI_INKHITANSMALLSCRIPT } /* inkhitansmallscript */, - { 3, 135, 1904, 2, 11, UNI_SYLO } /* issylotinagri */, - { 0, 2394, 6620, 9, 18, UNI_CJKRADICALSSUP } /* block=cjkradicalssupplement */, - { 26, 3750, 0, 11, 0, UNI_PHONETICEXT } /* phoneticext */, - { 6, 6372, 946, 3, 8, UNI_BASS } /* sc=bassavah */, - { 0, 1696, 2017, 5, 9, UNI_COMPATJAMO } /* blk=compatjamo */, - { 0, 1945, 645, 5, 2, -UNI_BIDIM } /* bidim=n */, - { 0, 916, 612, 4, 3, UNI_AGE__9 } /* age=9.0 */, - { 25, 7436, 0, 26, 0, UNI_CCC__12 } /* canonicalcombiningclass=12 */, - { 2, 2372, 0, 10, 0, UNI_IDC } /* idcontinue */, - { 12, 8088, 3806, 16, 14, UNI_MN } /* generalcategory=nonspacingmark */, - { 0, 38, 855, 1, 3, UNI_KHAR } /* khar */, - { 0, 643, 7233, 6, 5, UNI_DT__NONCANON } /* dt=noncanon */, - { 7, 6350, 630, 19, 3, UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=t */, - { 8, 1773, 5086, 3, 16, UNI_ALCHEMICAL } /* isalchemicalsymbols */, - { 165, 135, 253, 2, 4, UNI_ZYYY } /* iszyyy */, - { 0, 1126, 724, 4, 5, UNI_RUNR } /* scx=runic */, - { 0, 4280, 0, 5, 0, UNI_P } /* punct */, - { 26, 1874, 585, 7, 6, UNI_SC__TODR } /* script=todhri */, - { 7, 1870, 0, 4, 0, UNI_KTHI } /* kthi */, - { 0, 3227, 4644, 11, 9, UNI_MYANMAREXTB } /* blk=myanmarextendedb */, - { 67, 1696, 6392, 4, 20, UNI_GLAGOLITICSUP } /* blk=glagoliticsupplement */, - { 0, 270, 373, 5, 4, UNI_CWKCF } /* cwkcf=yes */, - { 40, 1923, 0, 11, 0, UNI_YISYLLABLES } /* yisyllables */, - { 0, 2584, 1589, 3, 9, UNI_MISCARROWS } /* ismiscarrows */, - { 2, 54, 3590, 2, 9, UNI_SC__ETHI } /* sc=ethiopic */, - { 0, 323, 3652, 2, 16, UNI_HALFANDFULLFORMS } /* inhalfandfullforms */, - { 1, 323, 709, 2, 5, UNI_INLIMBU } /* inlimbu */, - { 128, 3587, 5997, 5, 18, UNI_ENCLOSEDALPHANUMSUP } /* blk=enclosedalphanumsup */, - { 1, 643, 2669, 5, 5, UNI_DT__NB } /* dt=nobreak */, - { 0, 1126, 569, 4, 6, UNI_RJNG } /* scx=rejang */, - { 8, 2538, 0, 13, 0, UNI_IPAEXT } /* ipaextensions */, - { 0, 3086, 0, 12, 0, UNI_nt_values_index } /* numerictype= */, - { 0, 1126, 142, 4, 4, UNI_MTEI } /* scx=mtei */, - { 4, 3099, 2179, 11, 2, UNI_IN__6_DOT_3 } /* presentin=v63 */, - { 1, 2833, 4736, 3, 18, UNI_PI } /* gc=initialpunctuation */, - { 4, 1874, 1051, 7, 6, UNI_SC__YEZI } /* script=yezidi */, - { 0, 2, 2974, 2, 2, UNI_cwl_values_index } /* cwl= */, - { 1, 6996, 0, 11, 0, UNI_MTEI } /* meeteimayek */, - { 0, 6372, 1284, 3, 7, UNI_SC__PHAG } /* sc=phagspa */, - { 0, 4377, 238, 13, 2, UNI_JG__MANICHAEANPE } /* jg=manichaeanpe */, - { 1, 7420, 5518, 5, 17, UNI_SMALLKANAEXT } /* blk=smallkanaextension */, - { 3, 6372, 815, 3, 7, UNI_OSMA } /* sc=osmanya */, - { 9, 3991, 5549, 14, 5, UNI_NV__900000 } /* numericvalue=900000 */, - { 1, 135, 126, 2, 3, UNI_LAO } /* islao */, - { 0, 1874, 1904, 7, 4, UNI_SC__SYLO } /* script=sylo */, - { 1, 1696, 1015, 4, 6, UNI_INHATRAN } /* blk=hatran */, - { 6, 1126, 162, 4, 4, UNI_OSGE } /* scx=osge */, - { 9, 2502, 7819, 3, 28, UNI_MISCARROWS } /* inmiscellaneoussymbolsandarrows */, - { 0, 135, 3447, 2, 4, UNI_MERO } /* ismero */, - { 2, 924, 364, 5, 2, UNI_AGE__3_DOT_1 } /* age=v31 */, - { 5, 2593, 6903, 5, 8, UNI_LO } /* isotherletter */, - { 0, 6372, 336, 3, 4, UNI_SC__TAKR } /* sc=takr */, - { 0, 2069, 2975, 11, 2, UNI_JT__D } /* joiningtype=d */, - { 1, 306, 3957, 2, 4, UNI_NV__5_SLASH_8 } /* nv=5/8 */, - { 6, 4557, 158, 17, 4, UNI_ORYA } /* scriptextensions=orya */, - { 0, 173, 0, 4, 0, UNI_PHLP } /* phlp */, - { 0, 7697, 2155, 27, 2, UNI_CCC__29 } /* canonicalcombiningclass=ccc29 */, - { 12, 16, 5081, 1, 5, UNI_GRBASE } /* grbase */, - { 0, 4913, 2161, 14, 8, UNI_NV__13_SLASH_2 } /* numericvalue=6.500e+00 */, - { 3, 2394, 6734, 6, 10, UNI_PUA } /* block=privateuse */, - { 5, 323, 4220, 2, 17, UNI_INDICSIYAQNUMBERS } /* inindicsiyaqnumbers */, - { 10, 6838, 1418, 3, 8, UNI_INPAUCINHAU } /* inpaucinhau */, - { 0, 4703, 372, 8, 5, UNI_XPOSIXUPPER } /* uppercase=yes */, - { 3, 323, 8867, 2, 33, UNI_SUPMATHOPERATORS } /* insupplementalmathematicaloperators */, - { 1, 135, 1498, 2, 2, UNI_SD } /* issd */, - { 14, 1874, 393, 7, 6, UNI_SC__GOTH } /* script=gothic */, - { 0, 983, 645, 8, 2, -UNI_EXT } /* extender=n */, - { 8, 2394, 1628, 6, 10, UNI_INSAURASHTRA } /* block=saurashtra */, - { 0, 687, 3684, 4, 12, UNI_GCB__T } /* hst=trailingjamo */, - { 0, 135, 233, 2, 4, UNI_WCHO } /* iswcho */, - { 3, 323, 5309, 2, 9, UNI_TANGUTSUP } /* intangutsup */, - { 0, 2502, 6025, 9, 9, UNI_MYANMAREXTA } /* inmyanmarextendeda */, - { 0, 1874, 1628, 7, 4, UNI_SAUR } /* script=saur */, - { 27, 6670, 4321, 14, 5, UNI_SB__LO } /* sentencebreak=lower */, - { 0, 2338, 419, 10, 2, UNI_IN__16 } /* presentin=16 */, - { 65, 6897, 0, 14, 0, UNI_LM } /* modifierletter */, - { 0, 1874, 850, 7, 4, UNI_SC__QAAI } /* script=zinh */, - { 0, 7868, 1925, 21, 8, UNI_LB__H2 } /* hangulsyllabletype=lvsyllable */, - { 5, 8564, 6774, 32, 4, UNI_CJKEXTC } /* block=cjkunifiedideographsextensionc */, - { 1, 3976, 2230, 14, 8, UNI_NV__7_SLASH_8 } /* numericvalue=8.750e-01 */, - { 32, 306, 1363, 3, 2, UNI_NV__60 } /* nv=60 */, - { 3, 6372, 617, 3, 7, UNI_SC__AVST } /* sc=avestan */, - { 2, 6372, 1384, 3, 4, UNI_SC__PERM } /* sc=perm */, - { 0, 135, 8364, 2, 18, UNI_IDEOGRAPHICSYMBOLS } /* isideographicsymbols */, - { 0, 323, 2350, 2, 12, UNI_INTULUTIGALARI } /* intulutigalari */, - { 4, 1874, 6862, 7, 4, UNI_BRAH } /* script=brah */, - { 0, 135, 4306, 2, 6, UNI_HANG } /* ishangul */, - { 9, 306, 795, 3, 3, UNI_NV__1_SLASH_2 } /* nv=1/2 */, - { 0, 4557, 1051, 17, 6, UNI_YEZI } /* scriptextensions=yezidi */, - { 49, 1035, 631, 2, 2, UNI_CI } /* ci=t */, - { 0, 1259, 1549, 4, 4, UNI_KANAEXTA } /* kanaexta */, - { 0, 7233, 302, 25, 1, UNI_CCC__23 } /* canonicalcombiningclass=23 */, - { 19, 2394, 1725, 6, 11, UNI_DOMINO } /* block=dominotiles */, - { 1, 4557, 579, 17, 4, UNI_TANG } /* scriptextensions=tang */, - { 3, 1372, 0, 9, 0, UNI_ITAL } /* olditalic */, - { 0, 4970, 372, 9, 5, UNI_XPOSIXSPACE } /* whitespace=yes */, - { 2, 2053, 3185, 6, 6, UNI_POSIXDIGIT } /* isposixdigit */, - { 0, 7233, 6759, 22, 3, UNI_CCC__A } /* canonicalcombiningclass=a */, - { 38, 6372, 474, 3, 4, UNI_SC__ORKH } /* sc=orkh */, - { 1, 1097, 1103, 4, 4, UNI_NV__11_SLASH_12 } /* nv=11/12 */, - { 11, 2394, 1057, 6, 4, UNI_JAMO } /* block=jamo */, - { 34, 4557, 1305, 17, 7, UNI_SUNU } /* scriptextensions=sunuwar */, - { 0, 1696, 5482, 4, 11, UNI_TAIXUANJING } /* blk=taixuanjing */, - { 2, 636, 0, 7, 0, UNI_DSRT } /* deseret */, - { 2, 2317, 5483, 3, 10, UNI_TAIXUANJING } /* istaixuanjing */, - { 0, 2394, 5029, 6, 15, UNI_DIACRITICALSSUP } /* block=diacriticalssup */, - { 9, 1126, 5462, 4, 20, UNI_PHLI } /* scx=inscriptionalpahlavi */, - { 1, 1696, 6290, 4, 13, UNI_MATHOPERATORS } /* blk=mathoperators */, - { 2, 323, 1592, 2, 6, UNI_ARROWS } /* inarrows */, - { 1, 3930, 5549, 14, 7, UNI_NV__10000000 } /* numericvalue=10000000 */, - { 2, 6431, 4473, 10, 14, UNI_LB__PO } /* linebreak=postfixnumeric */, - { 0, 270, 631, 5, 2, UNI_CWKCF } /* cwkcf=t */, - { 2, 1874, 4219, 7, 4, UNI_SC__SIND } /* script=sind */, - { 0, 1322, 8660, 3, 34, UNI_DIACRITICALSFORSYMBOLS } /* iscombiningdiacriticalmarksforsymbols */, - { 66, 311, 0, 5, 0, UNI_ORYA } /* oriya */, - { 1, 6125, 373, 21, 2, UNI__PERL_NCHAR } /* noncharactercodepoint=y */, - { 0, 2573, 631, 11, 2, UNI_JOINC } /* joincontrol=t */, - { 1, 135, 5565, 2, 20, UNI_HMNP } /* isnyiakengpuachuehmong */, - { 0, 8596, 1200, 31, 6, UNI_INSC__CONSONANTMEDIAL } /* indicsyllabiccategory=consonantmedial */, - { 0, 2394, 6777, 9, 19, UNI_CJKCOMPATIDEOGRAPHSSUP } /* block=cjkcompatideographssup */, - { 0, 8095, 3806, 9, 14, UNI_MN } /* category=nonspacingmark */, - { 1, 983, 373, 8, 4, UNI_EXT } /* extender=yes */, - { 4, 7979, 4864, 23, 5, UNI_JG__MANICHAEANGIMEL } /* joininggroup=manichaeangimel */, - { 0, 1471, 2840, 3, 13, UNI_INGREEK } /* ingreekandcoptic */, - { 70, 2740, 4970, 7, 10, UNI__PERL_PATWS } /* patternwhitespace */, - { 1, 1874, 237, 7, 4, UNI_XPEO } /* script=xpeo */, - { 0, 6372, 5014, 3, 5, UNI_BAMU } /* sc=bamum */, - { 1, 4291, 6318, 11, 11, UNI_DIACRITICALSFORSYMBOLS } /* diacriticalsforsymbols */, - { 1, 306, 302, 3, 2, UNI_NV__30 } /* nv=30 */, - { 64, 323, 897, 2, 7, UNI_INTIBETAN } /* intibetan */, - { 2, 8468, 4241, 27, 8, UNI_INPC__TOPANDRIGHT } /* indicpositionalcategory=topandright */, - { 3, 4557, 557, 17, 6, UNI_ONAO } /* scriptextensions=olonal */, - { 0, 3491, 363, 13, 2, UNI_NV__23 } /* numericvalue=23 */, - { 0, 916, 597, 4, 3, UNI_AGE__3 } /* age=3.0 */, - { 3, 1474, 302, 7, 2, UNI_CCC__30 } /* ccc=ccc30 */, - { 0, 306, 2192, 3, 9, UNI_NV__3_SLASH_16 } /* nv=1.875e-01 */, - { 1, 306, 1103, 3, 4, UNI_NV__1_SLASH_12 } /* nv=1/12 */, - { 33, 323, 4980, 2, 4, UNI_RUMI } /* inrumi */, - { 8, 1848, 0, 7, 0, UNI_NFCQC__M } /* nfcqc=m */, - { 0, 30, 1976, 1, 7, UNI_S } /* issymbol */, - { 4, 16, 1476, 1, 3, UNI_C } /* gc=c */, - { 0, 7979, 3843, 23, 3, UNI_JG__MANICHAEANTAW } /* joininggroup=manichaeantaw */, - { 16, 1874, 502, 7, 4, UNI_SOGO } /* script=sogo */, - { 7, 6372, 122, 3, 4, UNI_KRAI } /* sc=krai */, - { 33, 135, 6552, 2, 19, UNI_JAMOEXTB } /* ishanguljamoextendedb */, - { 0, 2601, 261, 6, 5, UNI_XPOSIXCNTRL } /* xposixcntrl */, - { 1, 2573, 2974, 10, 2, UNI_joinc_values_index } /* joincontrol= */, - { 0, 651, 6168, 3, 2, UNI_ideo_values_index } /* ideo= */, - { 3, 2463, 4644, 8, 9, UNI_CYRILLICEXTB } /* cyrillicextendedb */, - { 1, 8088, 1977, 16, 6, UNI_S } /* generalcategory=symbol */, - { 80, 1874, 2005, 7, 12, UNI_SC__GONG } /* script=gunjalagondi */, - { 1, 4540, 631, 17, 5, UNI_RI } /* regionalindicator=true */, - { 0, 4190, 0, 7, 0, UNI_BRAI } /* braille */, - { 0, 2612, 2060, 3, 9, UNI_JG__SYRIACWAW } /* jg=syriacwaw */, - { 3, 135, 4736, 2, 18, UNI_PI } /* isinitialpunctuation */, - { 0, 30, 528, 1, 7, UNI_INKHOJKI } /* inkhojki */, - { 1, 1126, 3590, 3, 5, UNI_ETHI } /* scx=ethi */, - { 37, 7307, 6400, 6, 12, UNI_ARABICSUP } /* inarabicsupplement */, - { 2, 3778, 140, 14, 2, UNI_LATINEXTF } /* islatinextendedf */, - { 3, 16, 2840, 1, 13, UNI_INGREEK } /* greekandcoptic */, - { 24, 2666, 3423, 3, 12, UNI_LB__HL } /* lb=hebrewletter */, - { 4, 1126, 5565, 4, 20, UNI_HMNP } /* scx=nyiakengpuachuehmong */, - { 4, 1126, 4379, 3, 5, UNI_MANI } /* scx=mani */, - { 0, 4557, 774, 17, 4, UNI_MAND } /* scriptextensions=mand */, - { 0, 6372, 138, 3, 4, UNI_MEDF } /* sc=medf */, - { 1, 4557, 1141, 17, 8, UNI_TAGB } /* scriptextensions=tagbanwa */, - { 41, 285, 4702, 2, 16, UNI_UPPERCASELETTER } /* gc=uppercaseletter */, - { 66, 3227, 5858, 5, 18, UNI_SC__MERO } /* blk=meroitichieroglyphs */, - { 0, 6670, 2374, 15, 8, UNI_SB__SC } /* sentencebreak=scontinue */, - { 0, 3764, 0, 14, 0, UNI_DEVANAGARIEXTA } /* devanagariexta */, - { 1, 59, 0, 4, 0, UNI_CHRS } /* chrs */, - { 5, 704, 0, 4, 0, UNI_DOGR } /* dogr */, - { 0, 6670, 33, 14, 2, UNI_SB__ST } /* sentencebreak=st */, - { 1, 2338, 413, 10, 3, UNI_IN__6_DOT_3 } /* presentin=6.3 */, - { 0, 1447, 644, 6, 4, -UNI_IDS } /* idstart=no */, - { 0, 4557, 1270, 17, 7, UNI_MULT } /* scriptextensions=multani */, - { 53, 1874, 126, 7, 3, UNI_LAO } /* script=lao */, - { 1, 2899, 6400, 8, 5, UNI_CYRILLICSUP } /* iscyrillicsup */, - { 3, 4557, 1305, 17, 4, UNI_SUNU } /* scriptextensions=sunu */, - { 3, 2461, 6400, 8, 5, UNI_CYRILLICSUP } /* incyrillicsup */, - { 0, 135, 6544, 2, 6, UNI_CF } /* isformat */, - { 0, 323, 3178, 2, 5, UNI_ASCII } /* inascii */, - { 0, 2785, 3806, 3, 14, UNI_BC__NSM } /* bc=nonspacingmark */, - { 0, 8088, 4945, 16, 18, UNI_ZP } /* generalcategory=paragraphseparator */, - { 1, 546, 798, 4, 3, UNI_NV__3_SLASH_64 } /* nv=3/64 */, - { 2, 2612, 523, 3, 3, UNI_JG__REH } /* jg=reh */, - { 17, 1874, 5014, 7, 5, UNI_BAMU } /* script=bamum */, - { 0, 1696, 8693, 4, 28, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* blk=symbolsforlegacycomputingsup */, - { 2, 1126, 1408, 4, 4, UNI_PALM } /* scx=palm */, - { 0, 5, 2920, 1, 11, UNI_MAHJONG } /* mahjongtiles */, - { 3, 3491, 418, 14, 1, UNI_NV__45 } /* numericvalue=45 */, - { 0, 815, 0, 7, 0, UNI_OSMA } /* osmanya */, - { 5, 434, 1207, 2, 2, UNI_dia_values_index } /* dia= */, - { 0, 5782, 2835, 20, 6, UNI_GCB__XX } /* graphemeclusterbreak=other */, - { 0, 6372, 1752, 3, 11, UNI_SC__GUKH } /* sc=gurungkhema */, - { 1, 4557, 74, 17, 4, UNI_CYRL } /* scriptextensions=cyrl */, - { 12, 2394, 8029, 6, 22, UNI_ENCLOSEDIDEOGRAPHICSUP } /* block=enclosedideographicsup */, - { 0, 1523, 5273, 5, 4, UNI_XPOSIXSPACE } /* spaceperl */, - { 44, 135, 6996, 2, 14, UNI_MEETEIMAYEKEXT } /* ismeeteimayekext */, - { 6, 1322, 6777, 5, 16, UNI_CJKCOMPATIDEOGRAPHS } /* iscjkcompatideographs */, - { 20, 5260, 3149, 10, 11, UNI_WB__SQ } /* wordbreak=singlequote */, - { 1, 668, 0, 7, 0, UNI_EXTPICT } /* extpict */, - { 4, 8142, 5361, 26, 4, UNI_CJKEXTE } /* cjkunifiedideographsextensione */, - { 1, 7036, 645, 25, 3, -UNI_CWKCF } /* changeswhennfkccasefolded=no */, - { 0, 1874, 474, 7, 4, UNI_SC__ORKH } /* script=orkh */, - { 25, 4557, 5500, 17, 4, UNI_CHER } /* scriptextensions=cher */, - { 0, 5719, 963, 21, 6, -UNI_CWL } /* changeswhenlowercased=false */, - { 4, 643, 1208, 2, 7, UNI_DT__NAR } /* dt=narrow */, - { 57, 135, 5029, 2, 15, UNI_DIACRITICALSSUP } /* isdiacriticalssup */, - { 23, 3491, 415, 13, 2, UNI_NV__34 } /* numericvalue=34 */, - { 1, 71, 631, 3, 5, UNI_CWU } /* cwu=true */, - { 2, 643, 387, 3, 3, UNI_DT__SML } /* dt=sml */, - { 0, 8609, 4206, 10, 13, UNI_SC } /* category=currencysymbol */, - { 3, 6250, 6025, 14, 9, UNI_ETHIOPICEXTA } /* block=ethiopicextendeda */, - { 3, 4557, 4414, 17, 17, UNI_KITS } /* scriptextensions=khitansmallscript */, - { 0, 7951, 0, 28, 0, UNI_VSSUP } /* variationselectorssupplement */, - { 1, 2317, 225, 4, 2, UNI_TOTO } /* istoto */, - { 0, 6392, 0, 13, 0, UNI_GLAGOLITICSUP } /* glagoliticsup */, - { 2, 4557, 1866, 17, 4, UNI_MONG } /* scriptextensions=mong */, - { 0, 1126, 506, 4, 4, UNI_TNSA } /* scx=tnsa */, - { 0, 4377, 5534, 12, 8, UNI_JG__MANICHAEANDHAMEDH } /* jg=manichaeandhamedh */, - { 0, 8095, 0, 9, 2, UNI_CASEDLETTER } /* category=l& */, - { 80, 3106, 3989, 4, 2, UNI_IN__8 } /* in=v80 */, - { 0, 5782, 3548, 21, 12, UNI_WB__EB } /* graphemeclusterbreak=glueafterzwj */, - { 1, 1696, 1083, 4, 8, UNI_INMAHAJANI } /* blk=mahajani */, - { 0, 2394, 5955, 6, 21, UNI_ININSCRIPTIONALPARTHIAN } /* block=inscriptionalparthian */, - { 18, 4557, 4219, 17, 4, UNI_SIND } /* scriptextensions=sind */, - { 0, 5719, 373, 21, 4, UNI_CWL } /* changeswhenlowercased=yes */, - { 69, 358, 5668, 4, 9, UNI_CCC__BL } /* ccc=belowleft */, - { 1, 1696, 753, 4, 7, UNI_INKANNADA } /* blk=kannada */, - { 0, 1874, 205, 7, 4, UNI_SC__TAML } /* script=taml */, - { 12, 1230, 4206, 3, 14, UNI_CURRENCYSYMBOLS } /* incurrencysymbols */, - { 0, 21, 5997, 1, 18, UNI_ENCLOSEDALPHANUMSUP } /* enclosedalphanumsup */, - { 0, 2338, 548, 9, 2, UNI_IN__3 } /* presentin=3 */, - { 2, 135, 6034, 2, 12, UNI_MONGOLIANSUP } /* ismongoliansup */, - { 2, 1126, 4306, 4, 4, UNI_HANG } /* scx=hang */, - { 0, 8596, 6881, 31, 10, UNI_INSC__CONSONANTHEADLETTER } /* indicsyllabiccategory=consonantheadletter */, - { 0, 135, 1021, 2, 6, UNI_KTHI } /* iskaithi */, - { 0, 1696, 4785, 4, 16, UNI_BOPOMOFOEXT } /* blk=bopomofoextended */, - { 0, 6250, 666, 12, 5, UNI_ETHIOPICEXT } /* block=ethiopicext */, - { 0, 358, 2668, 3, 3, UNI_CCC__BR } /* ccc=br */, - { 3, 668, 644, 6, 4, -UNI_EXTPICT } /* extpict=no */, - { 41, 774, 0, 7, 0, UNI_MAND } /* mandaic */, - { 101, 2666, 7739, 3, 10, UNI_LB__AL } /* lb=alphabetic */, - { 0, 1126, 278, 4, 4, UNI_GARA } /* scx=gara */, - { 0, 1874, 1399, 7, 9, UNI_SC__OUGR } /* script=olduyghur */, - { 33, 358, 2614, 3, 2, UNI_CCC__A } /* ccc=a */, - { 3, 2833, 170, 3, 2, UNI_PC } /* gc=pc */, - { 26, 1057, 0, 4, 0, UNI_JAMO } /* jamo */, - { 11, 2833, 4321, 3, 15, UNI_LOWERCASELETTER } /* gc=lowercaseletter */, - { 3, 5719, 288, 21, 1, UNI_cwl_values_index } /* changeswhenlowercased= */, - { 16, 135, 245, 2, 4, UNI_YI } /* isyiii */, - { 1, 4652, 0, 14, 0, UNI_INCYRILLIC } /* block=cyrillic */, - { 4, 5585, 0, 19, 0, UNI_TERM } /* terminalpunctuation */, - { 0, 8037, 373, 11, 2, UNI_IDEO } /* ideographic=y */, - { 1, 1696, 6777, 7, 16, UNI_CJKCOMPATIDEOGRAPHS } /* blk=cjkcompatideographs */, - { 0, 675, 372, 5, 2, UNI_grbase_values_index } /* grbase= */, - { 0, 1874, 1885, 7, 11, UNI_SORA } /* script=sorasompeng */, - { 101, 5803, 6754, 10, 14, UNI_IDENTIFIERSTATUS__ALLOWED } /* identifierstatus=allowed */, - { 1, 694, 0, 5, 0, UNI_ADLM } /* adlam */, - { 10, 2394, 1291, 6, 7, UNI_INSIDDHAM } /* block=siddham */, - { 0, 5719, 645, 21, 3, -UNI_CWL } /* changeswhenlowercased=no */, - { 137, 6290, 0, 13, 0, UNI_MATHOPERATORS } /* mathoperators */, - { 0, 7259, 0, 26, 0, UNI_HALFANDFULLFORMS } /* halfwidthandfullwidthforms */, - { 1, 108, 4702, 2, 2, UNI_JT__U } /* jt=u */, - { 0, 54, 3578, 2, 9, UNI_SC__CYRL } /* sc=cyrillic */, - { 4, 1781, 7506, 3, 24, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* issymbolsandpictographsexta */, - { 18, 4849, 8639, 12, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* supplementalsymbolsandpictographs */, - { 10, 890, 0, 7, 0, UNI_TAVT } /* taiviet */, - { 4, 135, 5364, 2, 20, UNI_EXTPICT } /* isextendedpictographic */, - { 0, 2394, 3560, 6, 15, UNI_INZANABAZARSQUARE } /* block=zanabazarsquare */, - { 8, 4557, 753, 17, 7, UNI_KNDA } /* scriptextensions=kannada */, - { 3, 8088, 4, 16, 2, UNI_LM } /* generalcategory=lm */, - { 21, 1696, 883, 4, 7, UNI_INTAITHAM } /* blk=taitham */, - { 1, 1126, 1284, 4, 7, UNI_PHAG } /* scx=phagspa */, - { 3, 1126, 1885, 4, 11, UNI_SORA } /* scx=sorasompeng */, - { 0, 2372, 373, 3, 2, UNI_IDC } /* idc=y */, - { 1, 422, 0, 4, 0, UNI_MIAO } /* miao */, - { 24, 2564, 394, 3, 5, UNI_GOTH } /* isgothic */, - { 122, 135, 4190, 2, 15, UNI_BRAI } /* isbraillepatterns */, - { 0, 6372, 1579, 3, 10, UNI_KHAR } /* sc=kharoshthi */, - { 2, 135, 1305, 2, 7, UNI_SUNU } /* issunuwar */, - { 0, 3976, 0, 14, 0, UNI_NV__8 } /* numericvalue=8 */, - { 3, 1696, 4021, 4, 6, UNI_INTANGUT } /* blk=tangut */, - { 10, 5719, 963, 21, 2, -UNI_CWL } /* changeswhenlowercased=f */, - { 0, 3491, 2144, 13, 9, UNI_NV__1_SLASH_8 } /* numericvalue=1.250e-01 */, - { 0, 404, 645, 6, 2, -UNI_HYPHEN } /* hyphen=n */, - { 0, 2785, 349, 3, 3, UNI_BC__PDF } /* bc=pdf */, - { 40, 4557, 4190, 17, 7, UNI_BRAI } /* scriptextensions=braille */, - { 0, 326, 373, 5, 4, UNI_QMARK } /* qmark=yes */, - { 14, 4557, 490, 17, 4, UNI_QAAI } /* scriptextensions=qaai */, - { 4, 306, 556, 3, 1, UNI_NV__7 } /* nv=7 */, - { 0, 3106, 304, 4, 2, UNI_IN__4 } /* in=v40 */, - { 12, 4557, 3423, 17, 4, UNI_HEBR } /* scriptextensions=hebr */, - { 0, 8861, 1134, 7, 7, UNI_SPECIALS } /* block=specials */, - { 48, 916, 2257, 5, 3, UNI_AGE__12 } /* age=12.0 */, - { 43, 7585, 4419, 10, 3, UNI_BC__NSM } /* bidiclass=nsm */, - { 2, 7697, 2223, 27, 2, UNI_CCC__33 } /* canonicalcombiningclass=ccc33 */, - { 32, 285, 1938, 4, 7, UNI_GCB__CN } /* gcb=control */, - { 1, 2266, 2161, 4, 8, UNI_NV__11_SLASH_2 } /* nv=5.500e+00 */, - { 4, 5803, 1446, 18, 3, UNI_IDENTIFIERTYPE__NOTXID } /* identifiertype=notxid */, - { 1, 1781, 847, 3, 3, UNI_SYRC } /* issyrc */, - { 2, 135, 1165, 2, 8, UNI_VITH } /* isvithkuqi */, - { 1, 2785, 4037, 3, 14, UNI_BC__EN } /* bc=europeannumber */, - { 1, 135, 1141, 2, 4, UNI_TAGB } /* istagb */, - { 0, 135, 7090, 2, 20, UNI_CE } /* iscompositionexclusion */, - { 0, 323, 2372, 2, 3, UNI_INIDC } /* inidc */, - { 0, 1126, 842, 4, 4, UNI_SHRD } /* scx=shrd */, - { 4, 2584, 1119, 3, 3, UNI_MERC } /* ismerc */, - { 5, 916, 413, 4, 3, UNI_AGE__6_DOT_3 } /* age=6.3 */, - { 0, 2114, 631, 5, 2, UNI_XPOSIXALPHA } /* alpha=t */, - { 27, 6647, 4358, 13, 7, UNI_JG__HEHGOAL } /* joininggroup=hehgoal */, - { 0, 6127, 373, 5, 4, UNI__PERL_NCHAR } /* nchar=yes */, - { 41, 983, 631, 8, 5, UNI_EXT } /* extender=true */, - { 15, 1837, 0, 11, 0, UNI_MEDF } /* medefaidrin */, - { 1, 135, 842, 2, 4, UNI_SHRD } /* isshrd */, - { 40, 2394, 1454, 6, 10, UNI_ASCII } /* block=basiclatin */, - { 32, 1236, 4666, 3, 4, UNI_CJKEXTC } /* cjkextc */, - { 0, 5698, 631, 21, 2, UNI_CWCM } /* changeswhencasemapped=t */, - { 0, 3227, 455, 5, 2, UNI_INMRO } /* blk=mro */, - { 6, 4557, 1291, 17, 7, UNI_SIDD } /* scriptextensions=siddham */, - { 2, 4703, 631, 5, 5, UNI_XPOSIXUPPER } /* upper=true */, - { 0, 546, 1364, 4, 2, UNI_NV__300 } /* nv=300 */, - { 73, 135, 1945, 2, 12, UNI_BIDIM } /* isbidimirrored */, - { 53, 1874, 6146, 7, 7, UNI_SC__SINH } /* script=sinhala */, - { 0, 2238, 5549, 4, 4, UNI_NV__40000 } /* nv=40000 */, - { 0, 6250, 1215, 7, 8, UNI_EMOTICONS } /* block=emoticons */, - { 1, 1270, 0, 7, 0, UNI_MULT } /* multani */, - { 0, 135, 2122, 2, 4, UNI_MEND } /* ismend */, - { 32, 135, 8364, 2, 32, UNI_IDEOGRAPHICSYMBOLS } /* isideographicsymbolsandpunctuation */, - { 0, 135, 1499, 2, 10, UNI_DEP } /* isdeprecated */, - { 1, 1874, 482, 7, 4, UNI_MIAO } /* script=plrd */, - { 34, 6647, 4365, 13, 4, UNI_JG__BETH } /* joininggroup=beth */, - { 0, 399, 644, 4, 4, -UNI_GREXT } /* grext=no */, - { 4, 8498, 3465, 6, 11, UNI_MISCPICTOGRAPHS } /* inmiscpictographs */, - { 0, 1874, 930, 7, 8, UNI_SC__ARMN } /* script=armenian */, - { 23, 3491, 2161, 14, 8, UNI_NV__9_SLASH_2 } /* numericvalue=4.500e+00 */, - { 9, 6372, 510, 3, 4, UNI_VAI } /* sc=vaii */, - { 1, 2833, 268, 3, 2, UNI_CF } /* gc=cf */, - { 0, 4173, 645, 17, 2, -UNI_IDSB } /* idsbinaryoperator=n */, - { 6, 135, 1176, 2, 9, UNI_BHKS } /* isbhaiksuki */, - { 93, 3086, 3186, 12, 5, UNI_NT__DI } /* numerictype=digit */, - { 0, 1696, 2005, 4, 12, UNI_INGUNJALAGONDI } /* blk=gunjalagondi */, - { 0, 502, 0, 4, 0, UNI_SOGO } /* sogo */, - { 33, 4504, 630, 5, 6, UNI_XPOSIXSPACE } /* wspace=true */, - { 2, 1874, 7923, 7, 4, UNI_EGYP } /* script=egyp */, - { 1, 323, 5148, 2, 14, UNI_INHANIFIROHINGYA } /* inhanifirohingya */, - { 0, 30, 133, 1, 5, UNI_INLISU } /* inlisu */, - { 21, 4557, 1904, 17, 11, UNI_SYLO } /* scriptextensions=sylotinagri */, - { 2, 7847, 1194, 18, 6, UNI_DT__ENC } /* decompositiontype=circle */, - { 1, 4557, 826, 17, 4, UNI_KALI } /* scriptextensions=kali */, - { 0, 1874, 654, 7, 7, UNI_SC__ELBA } /* script=elbasan */, - { 71, 6372, 5827, 3, 5, UNI_SC__GREK } /* sc=greek */, - { 12, 1126, 229, 4, 4, UNI_TUTG } /* scx=tutg */, - { 1, 4557, 241, 17, 4, UNI_XSUX } /* scriptextensions=xsux */, - { 4, 135, 1027, 2, 4, UNI_LEPC } /* islepc */, - { 0, 1441, 1681, 3, 7, UNI_WB__NL } /* wb=newline */, - { 24, 135, 6996, 2, 21, UNI_MEETEIMAYEKEXT } /* ismeeteimayekextensions */, - { 18726, 1773, 0, 6, 0, UNI_ARAB } /* isarab */, - { 6, 1441, 2999, 2, 3, UNI_WB__LE } /* wb=le */, - { 0, 2584, 3462, 3, 14, UNI_MISCPICTOGRAPHS } /* ismiscpictographs */, - { 0, 3106, 364, 4, 2, UNI_IN__3_DOT_1 } /* in=v31 */, - { 7, 2461, 1549, 10, 4, UNI_CYRILLICEXTA } /* incyrillicexta */, - { 2, 2053, 2114, 7, 5, UNI_POSIXALPHA } /* isposixalpha */, - { 3, 312, 373, 2, 4, UNI_RI } /* ri=yes */, - { 0, 1126, 4306, 4, 6, UNI_HANG } /* scx=hangul */, - { 1, 1696, 636, 4, 7, UNI_DSRT } /* blk=deseret */, - { 3, 1447, 0, 4, 0, UNI_IDST } /* idst */, - { 72, 6264, 2840, 7, 13, UNI_INGREEK } /* block=greekandcoptic */, - { 24, 11, 0, 4, 0, UNI_ADLM } /* adlm */, - { 2, 3930, 1103, 14, 4, UNI_NV__11_SLASH_12 } /* numericvalue=11/12 */, - { 33, 6431, 657, 10, 2, UNI_LB__AS } /* linebreak=as */, - { 10, 2394, 3111, 6, 14, UNI_INPSALTERPAHLAVI } /* block=psalterpahlavi */, - { 8, 1498, 0, 2, 0, UNI_SD } /* sd */, - { 5, 6431, 4540, 10, 17, UNI_RI } /* linebreak=regionalindicator */, - { 0, 154, 0, 4, 0, UNI_NEWA } /* newa */, + { 2, 8226, 246, 16, 2, UNI_PE } /* generalcategory=pe */, + { 1, 2407, 638, 9, 3, UNI_IDC } /* idcontinue=t */, + { 1, 6464, 64, 4, 3, UNI_SC__CPMN } /* sc=cpmn */, + { 2, 561, 1119, 4, 3, UNI_NV__7_SLASH_12 } /* nv=7/12 */, + { 2, 5803, 383, 21, 2, UNI_CWT } /* changeswhentitlecased=y */, + { 0, 135, 3870, 2, 9, UNI_MLYM } /* ismalayalam */, + { 0, 6203, 639, 5, 2, UNI__PERL_NCHAR } /* nchar=t */, + { 2, 135, 3216, 2, 5, UNI_XPOSIXDIGIT } /* isdigit */, + { 0, 3808, 4351, 3, 14, UNI_LOWERCASELETTER } /* islowercaseletter */, + { 0, 1254, 7422, 3, 23, UNI_DIACRITICALSFORSYMBOLS } /* incombiningmarksforsymbols */, + { 0, 4586, 2872, 17, 4, UNI_COPT } /* scriptextensions=copt */, + { 0, 286, 0, 5, 0, UNI_GARA } /* garay */, + { 6, 1911, 90, 7, 4, UNI_SC__GUJR } /* script=gujr */, + { 1, 2525, 3492, 3, 14, UNI_MISCPICTOGRAPHS } /* inmiscpictographs */, + { 0, 1994, 353, 8, 3, UNI_KANASUP } /* blk=kanasup */, + { 1, 2429, 737, 6, 5, UNI_INTAIYO } /* block=taiyo */, + { 0, 777, 8307, 3, 20, UNI_ENCLOSEDALPHANUM } /* inenclosedalphanumerics */, + { 0, 2429, 1751, 6, 11, UNI_INCYPROMINOAN } /* block=cyprominoan */, + { 0, 3136, 812, 4, 2, UNI_IN__2_DOT_1 } /* in=v21 */, + { 0, 4586, 1322, 17, 7, UNI_SOYO } /* scriptextensions=soyombo */, + { 3, 2622, 1028, 10, 3, UNI_XPOSIXBLANK } /* isxposixblank */, + { 16, 6464, 1308, 3, 4, UNI_SC__PHAG } /* sc=phag */, + { 3, 1141, 518, 4, 3, UNI_VAI } /* scx=vai */, + { 0, 2824, 1188, 10, 3, UNI_ARABICPFA } /* blk=arabicpfa */, + { 0, 135, 1522, 2, 2, UNI_SD } /* issd */, + { 6, 1733, 1569, 4, 8, UNI_JAMOEXTA } /* blk=jamoexta */, + { 0, 1141, 843, 4, 4, UNI_NBAT } /* scx=nbat */, + { 4, 1141, 15, 4, 4, UNI_AGHB } /* scx=aghb */, + { 0, 2525, 427, 3, 3, UNI_INMIAO } /* inmiao */, + { 1, 1810, 20, 3, 3, UNI_POSIXXDIGIT } /* isahex */, + { 0, 2236, 1388, 4, 2, UNI_NV__200 } /* nv=200 */, + { 0, 9030, 6118, 8, 7, UNI_INSUNDANESE } /* block=sundanese */, + { 2, 1141, 462, 4, 3, UNI_NKO } /* scx=nko */, + { 0, 6201, 1916, 20, 3, UNI__PERL_NCHAR } /* noncharactercodepoint=t */, + { 16, 6535, 972, 21, 6, -UNI_MCM } /* modifiercombiningmark=false */, + { 8, 1733, 7107, 4, 18, UNI_DEVANAGARIEXT } /* blk=devanagariextended */, + { 0, 4732, 2677, 8, 4, -UNI_XPOSIXUPPER } /* uppercase=no */, + { 0, 6737, 2989, 13, 11, UNI_JG__YEHWITHTAIL } /* joininggroup=yehwithtail */, + { 0, 2506, 6492, 8, 5, UNI_ETHIOPICSUP } /* inethiopicsup */, + { 1, 7322, 9077, 24, 10, UNI_CCC__AR } /* canonicalcombiningclass=aboveright */, + { 0, 3903, 2083, 3, 2, UNI_LB__PO } /* lb=po */, + { 2, 2, 652, 2, 3, -UNI_CWT } /* cwt=n */, + { 0, 4586, 1688, 17, 10, UNI_TOLS } /* scriptextensions=tolongsiki */, + { 1, 8283, 639, 16, 5, UNI_UIDEO } /* unifiedideograph=true */, + { 1, 135, 5438, 2, 9, UNI_HALFMARKS } /* ishalfmarks */, + { 0, 6464, 1265, 3, 4, UNI_SC__GRAN } /* sc=gran */, + { 0, 3629, 6492, 10, 5, UNI_ARABICSUP } /* block=arabicsup */, + { 5, 1141, 241, 4, 4, UNI_WCHO } /* scx=wcho */, + { 3, 135, 1459, 2, 4, UNI_THAA } /* isthaa */, + { 2, 3766, 4917, 8, 10, UNI_LATINEXTADDITIONAL } /* latinextadditional */, + { 1, 6464, 537, 3, 4, UNI_SC__KHOJ } /* sc=khoj */, + { 2, 278, 972, 5, 6, -UNI_CWKCF } /* cwkcf=false */, + { 0, 1733, 7760, 4, 26, UNI_TANGUTCOMPONENTSSUP } /* blk=tangutcomponentssupplement */, + { 4, 135, 1459, 2, 6, UNI_THAA } /* isthaana */, + { 0, 675, 0, 2, 0, UNI_CE } /* ce */, + { 0, 326, 4601, 4, 2, UNI_patws_values_index } /* patws= */, + { 2, 333, 6820, 2, 24, UNI_HIGHPUSURROGATES } /* inhighprivateusesurrogates */, + { 70, 6464, 1129, 3, 4, UNI_SC__LINB } /* sc=linb */, + { 1, 135, 205, 2, 4, UNI_TAGS } /* istags */, + { 0, 3976, 5612, 14, 7, UNI_NV__10000000 } /* numericvalue=10000000 */, + { 2, 6464, 2337, 3, 12, UNI_SC__HUNG } /* sc=oldhungarian */, + { 0, 29, 8797, 2, 32, UNI_MISCPICTOGRAPHS } /* miscellaneoussymbolsandpictographs */, + { 0, 6464, 1269, 3, 4, UNI_SC__THAI } /* sc=thai */, + { 0, 8089, 0, 28, 0, UNI_VSSUP } /* variationselectorssupplement */, + { 0, 2429, 1698, 6, 10, UNI_INWARANGCITI } /* block=warangciti */, + { 10, 3617, 6492, 10, 12, UNI_ETHIOPICSUP } /* blk=ethiopicsupplement */, + { 0, 135, 2872, 2, 4, UNI_COPT } /* iscopt */, + { 1, 368, 0, 6, 0, UNI_CCC__12 } /* ccc=12 */, + { 0, 1911, 565, 7, 6, UNI_SC__ONAO } /* script=olonal */, + { 0, 1141, 86, 4, 4, UNI_GREK } /* scx=grek */, + { 0, 2607, 2743, 3, 12, UNI_MISCTECHNICAL } /* ismisctechnical */, + { 9, 7322, 9069, 24, 13, UNI_CCC__214 } /* canonicalcombiningclass=attachedabove */, + { 7, 8897, 327, 7, 4, UNI__PERL_PATWS } /* _perl_patws */, + { 1, 1733, 0, 4, 0, UNI_blk_values_index } /* blk= */, + { 6, 6164, 2812, 9, 3, UNI_RI } /* linebreak=ri */, + { 17, 2844, 1916, 13, 3, UNI_ECOMP } /* emojicomponent=t */, + { 0, 1911, 5194, 7, 14, UNI_SC__ROHG } /* script=hanifirohingya */, + { 0, 8961, 3390, 3, 7, UNI_XPOSIXDIGIT } /* nt=decimal */, + { 0, 3245, 2865, 5, 13, UNI_INGREEK } /* blk=greekandcoptic */, + { 0, 2944, 0, 12, 0, UNI_MAHJONG } /* mahjongtiles */, + { 17, 4586, 6116, 17, 4, UNI_SUND } /* scriptextensions=sund */, + { 5, 3726, 383, 16, 2, UNI_IDSU } /* idsunaryoperator=y */, + { 9, 2406, 653, 4, 3, -UNI_XIDC } /* xidc=no */, + { 5, 7322, 7550, 24, 2, UNI_CCC__28 } /* canonicalcombiningclass=28 */, + { 1, 4681, 6088, 14, 9, UNI_CYRILLICEXTA } /* block=cyrillicextendeda */, + { 0, 333, 5355, 2, 16, UNI_TANGUTSUP } /* intangutsupplement */, + { 1, 30, 1761, 1, 12, UNI_DOMINO } /* indominotiles */, + { 4, 2429, 5073, 6, 8, UNI_TAMILSUP } /* block=tamilsup */, + { 1, 4586, 490, 17, 4, UNI_PRTI } /* scriptextensions=prti */, { 0, 135, 94, 2, 4, UNI_GUKH } /* isgukh */, - { 33, 71, 645, 3, 2, -UNI_CWU } /* cwu=n */, - { 2, 6072, 5253, 5, 7, UNI_SUPARROWSA } /* issuparrowsa */, - { 0, 135, 327, 2, 4, UNI_M } /* ismark */, - { 0, 2553, 631, 5, 2, UNI_CASED } /* cased=t */, - { 25, 5803, 6768, 15, 9, UNI_IDENTIFIERTYPE__INCLUSION } /* identifiertype=inclusion */, - { 6, 1097, 2732, 4, 8, UNI_NV__1_SLASH_10 } /* nv=1.000e-01 */, - { 1, 1696, 8761, 7, 33, UNI_CJKCOMPATIDEOGRAPHSSUP } /* blk=cjkcompatibilityideographssupplement */, - { 1, 323, 5044, 2, 5, UNI_INTAMIL } /* intamil */, - { 1, 2833, 64, 3, 1, UNI_P } /* gc=p */, - { 2, 4557, 585, 17, 6, UNI_TODR } /* scriptextensions=todhri */, - { 305, 1874, 6053, 7, 9, UNI_SUND } /* script=sundanese */, - { 0, 4557, 834, 17, 4, UNI_NBAT } /* scriptextensions=nbat */, - { 6, 1696, 458, 4, 3, UNI_INNKO } /* blk=nko */, - { 0, 1696, 8, 4, 3, UNI_OCR } /* blk=ocr */, - { 1, 4635, 3793, 5, 13, UNI_LISUSUP } /* blk=lisusupplement */, - { 24, 170, 631, 3, 2, UNI_PCM } /* pcm=t */, - { 0, 3599, 2382, 7, 12, UNI_AEGEANNUMBERS } /* block=aegeannumbers */, - { 7, 4291, 963, 9, 2, -UNI_DIA } /* diacritic=f */, - { 1, 323, 3623, 2, 16, UNI_CYPRIOTSYLLABARY } /* incypriotsyllabary */, - { 0, 2394, 1608, 6, 10, UNI_INOLDPERSIAN } /* block=oldpersian */, - { 1, 306, 2154, 3, 2, UNI_NV__42 } /* nv=42 */, - { 0, 1945, 631, 12, 2, UNI_BIDIM } /* bidimirrored=t */, - { 0, 1126, 704, 4, 4, UNI_DOGR } /* scx=dogr */, - { 2, 6647, 1070, 13, 5, UNI_JG__KHAPH } /* joininggroup=khaph */, - { 112, 2394, 2005, 6, 12, UNI_INGUNJALAGONDI } /* block=gunjalagondi */, - { 17, 2372, 645, 3, 3, -UNI_IDC } /* idc=no */, - { 11, 3916, 1853, 14, 6, UNI_NFCQC__M } /* nfkcquickcheck=maybe */, - { 33, 6372, 2122, 3, 4, UNI_MEND } /* sc=mend */, - { 2, 657, 3180, 2, 11, UNI_POSIXXDIGIT } /* asciihexdigit */, - { 4, 4557, 5827, 17, 5, UNI_GREK } /* scriptextensions=greek */, - { 19, 1696, 1298, 4, 7, UNI_INSOYOMBO } /* blk=soyombo */, - { 264, 6647, 1329, 13, 6, UNI_JG__LAMADH } /* joininggroup=lamadh */, - { 0, 3106, 302, 5, 2, UNI_IN__13 } /* in=v130 */, - { 1, 1322, 4206, 3, 13, UNI_SC } /* iscurrencysymbol */, - { 1, 135, 345, 2, 2, UNI_PF } /* ispf */, - { 0, 4557, 4858, 17, 4, UNI_TALE } /* scriptextensions=tale */, - { 32, 5069, 630, 16, 6, UNI_EBASE } /* emojimodifierbase=true */, - { 3, 6734, 0, 10, 0, UNI_CO } /* privateuse */, - { 1, 3587, 8168, 5, 20, UNI_ENCLOSEDALPHANUM } /* blk=enclosedalphanumerics */, - { 44, 358, 3244, 4, 5, UNI_CCC__A } /* ccc=above */, - { 0, 323, 5462, 2, 20, UNI_ININSCRIPTIONALPAHLAVI } /* ininscriptionalpahlavi */, - { 0, 2060, 0, 6, 0, UNI_SYRC } /* syriac */, - { 0, 18, 708, 1, 3, UNI_BALI } /* bali */, - { 120, 1696, 2026, 4, 10, UNI_INOLDSOGDIAN } /* blk=oldsogdian */, - { 8, 1696, 1176, 4, 9, UNI_INBHAIKSUKI } /* blk=bhaiksuki */, - { 0, 7090, 963, 20, 6, -UNI_CE } /* compositionexclusion=false */, - { 0, 5976, 5253, 5, 7, UNI_SUPARROWSA } /* insuparrowsa */, - { 110, 316, 631, 5, 5, UNI__PERL_PATWS } /* patws=true */, - { 64, 135, 65, 2, 2, UNI_MN } /* ismn */, - { 10, 1874, 2123, 8, 11, UNI_MEND } /* script=mendekikakui */, - { 4, 1230, 1765, 3, 8, UNI_INCB__LINKER } /* incb=linker */, - { 0, 1236, 8375, 3, 21, UNI_CJKSYMBOLS } /* cjksymbolsandpunctuation */, - { 0, 1598, 0, 4, 0, UNI_NAGM } /* nagm */, - { 14, 5782, 387, 21, 2, UNI_GCB__SM } /* graphemeclusterbreak=sm */, - { 3, 1234, 6777, 5, 16, UNI_CJKCOMPATIDEOGRAPHS } /* incjkcompatideographs */, - { 42, 358, 804, 4, 2, UNI_CCC__17 } /* ccc=17 */, - { 0, 323, 3764, 2, 10, UNI_INDEVANAGARI } /* indevanagari */, - { 3, 3040, 6891, 3, 21, UNI_MODIFIERLETTERS } /* inspacingmodifierletters */, - { 1, 2345, 413, 3, 3, UNI_IN__6_DOT_3 } /* in=6.3 */, - { 4, 54, 3590, 2, 5, UNI_SC__ETHI } /* sc=ethi */, - { 1, 3797, 4700, 3, 3, UNI_upper_values_index } /* upper= */, - { 1, 2833, 3643, 3, 9, UNI_Z } /* gc=separator */, - { 10, 1126, 82, 4, 4, UNI_GONG } /* scx=gong */, - { 0, 8197, 4288, 28, 4, UNI_CJKEXTD } /* iscjkunifiedideographsextensiond */, - { 10, 323, 7951, 2, 28, UNI_VSSUP } /* invariationselectorssupplement */, - { 0, 170, 631, 3, 5, UNI_PCM } /* pcm=true */, - { 0, 1126, 2511, 4, 4, UNI_NAND } /* scx=nand */, - { 0, 1874, 975, 7, 4, UNI_SC__DUPL } /* script=dupl */, - { 1, 6372, 579, 3, 4, UNI_SC__TANG } /* sc=tang */, - { 73, 5260, 1920, 10, 3, UNI_WB__EB } /* wordbreak=gaz */, - { 3, 8145, 963, 16, 2, -UNI_UIDEO } /* unifiedideograph=f */, - { 14, 1234, 1549, 5, 4, UNI_CJKEXTA } /* incjkexta */, - { 2, 3301, 631, 14, 5, UNI_GREXT } /* graphemeextend=true */, - { 8, 2785, 561, 3, 2, UNI_BC__AL } /* bc=al */, - { 5, 1696, 2122, 4, 12, UNI_INMENDEKIKAKUI } /* blk=mendekikakui */, - { 1, 2394, 1241, 6, 7, UNI_INGRANTHA } /* block=grantha */, - { 0, 7090, 631, 20, 5, UNI_CE } /* compositionexclusion=true */, - { 1, 8324, 4543, 30, 4, UNI_CJKEXTA } /* blk=cjkunifiedideographsextensiona */, - { 7, 6431, 566, 10, 2, UNI_LB__SY } /* linebreak=sy */, - { 0, 2666, 133, 3, 2, UNI_LB__NL } /* lb=nl */, - { 4, 4635, 141, 17, 1, UNI_LATINEXTF } /* blk=latinextendedf */, - { 1, 4173, 645, 4, 2, -UNI_IDSB } /* idsb=n */, - { 2, 2394, 569, 6, 6, UNI_INREJANG } /* block=rejang */, - { 0, 1874, 3828, 8, 8, UNI_SC__MLYM } /* script=malayalam */, - { 70, 5782, 2787, 20, 3, UNI_RI } /* graphemeclusterbreak=ri */, - { 0, 1788, 1523, 6, 5, UNI_VERTSPACE } /* isvertspace */, - { 0, 6372, 1263, 3, 4, UNI_MAKA } /* sc=maka */, - { 5, 1126, 86, 4, 4, UNI_GREK } /* scx=grek */, - { 0, 2394, 7120, 6, 23, UNI_BYZANTINEMUSIC } /* block=byzantinemusicalsymbols */, - { 0, 135, 150, 2, 4, UNI_NARB } /* isnarb */, - { 0, 6372, 462, 3, 4, UNI_OGAM } /* sc=ogam */, - { 135, 2345, 0, 5, 0, UNI_IN__14 } /* in=14 */, - { 28, 135, 3639, 2, 13, UNI_ZL } /* islineseparator */, - { 1, 6647, 2625, 13, 10, UNI_JG__DALATHRISH } /* joininggroup=dalathrish */, - { 3, 4097, 373, 17, 2, UNI_EPRES } /* emojipresentation=y */, - { 28, 358, 415, 4, 2, UNI_CCC__34 } /* ccc=34 */, - { 17, 3734, 213, 9, 2, UNI_LATINEXTF } /* inlatinextf */, - { 17, 135, 71, 2, 3, UNI_CWU } /* iscwu */, - { 0, 6277, 6025, 13, 9, UNI_MYANMAREXTA } /* block=myanmarextendeda */, - { 36, 1263, 0, 7, 0, UNI_MAKA } /* makasar */, - { 13, 1781, 855, 3, 6, UNI_SHRD } /* issharada */, - { 7, 6647, 5188, 13, 6, UNI_JG__YUDHHE } /* joininggroup=yudhhe */, - { 2, 2452, 631, 2, 3, UNI_VO__TR } /* vo=tr */, - { 0, 2394, 4021, 6, 16, UNI_TANGUTCOMPONENTS } /* block=tangutcomponents */, - { 3, 8088, 4280, 16, 5, UNI_P } /* generalcategory=punct */, - { 0, 15, 3987, 2, 3, UNI_AGE__8 } /* age=8 */, - { 1, 6372, 490, 3, 4, UNI_SC__QAAI } /* sc=qaai */, - { 80, 1874, 1007, 7, 4, UNI_SC__HIRA } /* script=hira */, - { 392, 1126, 1305, 4, 7, UNI_SUNU } /* scx=sunuwar */, - { 4, 1696, 5044, 4, 15, UNI_TAMILSUP } /* blk=tamilsupplement */, - { 43, 2338, 410, 10, 3, UNI_IN__3_DOT_2 } /* presentin=3.2 */, - { 1, 2504, 6025, 7, 9, UNI_MYANMAREXTA } /* myanmarextendeda */, - { 0, 4970, 372, 9, 2, UNI_wspace_values_index } /* whitespace= */, - { 0, 1934, 360, 4, 2, UNI_bidic_values_index } /* bidic= */, - { 8, 3778, 4755, 3, 15, UNI_LINEARBSYLLABARY } /* islinearbsyllabary */, - { 0, 135, 213, 2, 4, UNI_TFNG } /* istfng */, - { 0, 3930, 551, 14, 2, UNI_NV__1_SLASH_5 } /* numericvalue=1/5 */, - { 0, 316, 645, 5, 2, -UNI__PERL_PATWS } /* patws=n */, - { 6, 1874, 6392, 7, 4, UNI_SC__GLAG } /* script=glag */, - { 32, 135, 654, 2, 7, UNI_ELBA } /* iselbasan */, - { 257, 4703, 0, 9, 0, UNI_XPOSIXUPPER } /* uppercase */, - { 246, 1523, 0, 5, 0, UNI_XPOSIXSPACE } /* space */, - { 1, 434, 963, 3, 6, -UNI_DIA } /* dia=false */, - { 1, 2045, 373, 7, 4, UNI_RADICAL } /* radical=yes */, - { 0, 1874, 3560, 7, 15, UNI_ZANB } /* script=zanabazarsquare */, - { 3, 4524, 551, 14, 2, UNI_NV__3_SLASH_5 } /* numericvalue=3/5 */, - { 0, 3696, 645, 4, 2, -UNI_IDSU } /* idsu=n */, - { 0, 1126, 126, 4, 3, UNI_LAO } /* scx=lao */, - { 1, 6125, 0, 21, 0, UNI__PERL_NCHAR } /* noncharactercodepoint */, - { 0, 7356, 373, 26, 4, UNI_PCM } /* prependedconcatenationmark=yes */, - { 1, 7436, 309, 25, 1, UNI_CCC__19 } /* canonicalcombiningclass=19 */, - { 0, 2394, 311, 6, 5, UNI_INORIYA } /* block=oriya */, - { 1, 2394, 2326, 6, 12, UNI_PLAYINGCARDS } /* block=playingcards */, - { 46, 924, 302, 6, 2, UNI_AGE__13 } /* age=v130 */, - { 0, 1696, 7951, 4, 28, UNI_VSSUP } /* blk=variationselectorssupplement */, - { 1, 1874, 1122, 7, 4, UNI_NSHU } /* script=nshu */, - { 0, 643, 1736, 3, 8, UNI_DT__FRA } /* dt=fraction */, - { 2, 1874, 229, 7, 4, UNI_SC__TUTG } /* script=tutg */, - { 1, 6838, 8794, 4, 15, UNI_INPC__BOTTOMANDRIGHT } /* inpc=bottomandright */, - { 1, 1447, 631, 4, 5, UNI_IDST } /* idst=true */, - { 55, 1459, 4832, 4, 5, UNI_LATIN1 } /* latin1sup */, - { 1, 3491, 361, 12, 3, UNI_NV__12 } /* numericvalue=12 */, - { 35, 3736, 4888, 13, 10, UNI_LATINEXTADDITIONAL } /* latinextendedadditional */, - { 0, 2785, 2494, 3, 2, UNI_BC__CS } /* bc=cs */, - { 62, 1696, 3111, 4, 14, UNI_INPSALTERPAHLAVI } /* blk=psalterpahlavi */, - { 0, 30, 1933, 1, 6, UNI_BIDIC } /* isbidic */, - { 1, 135, 1149, 2, 8, UNI_TFNG } /* istifinagh */, - { 2, 8468, 2999, 23, 5, UNI_INPC__LEFT } /* indicpositionalcategory=left */, - { 0, 7951, 0, 17, 0, UNI_VS } /* variationselector */, - { 0, 6647, 4379, 12, 15, UNI_JG__MANICHAEANKAPH } /* joininggroup=manichaeankaph */, - { 2, 2785, 449, 3, 3, UNI_BC__RLI } /* bc=rli */, - { 5, 2394, 999, 6, 8, UNI_INGURMUKHI } /* block=gurmukhi */, - { 25, 1474, 362, 7, 2, UNI_CCC__12 } /* ccc=ccc12 */, - { 0, 135, 529, 2, 6, UNI_KHOJ } /* iskhojki */, - { 2, 3904, 645, 4, 3, -UNI_MATH } /* math=no */, - { 0, 1126, 6862, 4, 6, UNI_BRAH } /* scx=brahmi */, - { 4, 7868, 1925, 22, 8, UNI_LB__H3 } /* hangulsyllabletype=lvtsyllable */, - { 0, 7086, 963, 24, 2, -UNI_COMPEX } /* fullcompositionexclusion=f */, - { 3, 135, 4801, 2, 16, UNI_PE } /* isclosepunctuation */, - { 9, 4557, 458, 17, 3, UNI_NKO } /* scriptextensions=nko */, - { 0, 1874, 185, 7, 4, UNI_RJNG } /* script=rjng */, - { 1, 8088, 645, 15, 3, UNI_NO } /* generalcategory=no */, - { 0, 323, 930, 2, 8, UNI_INARMENIAN } /* inarmenian */, - { 2, 1459, 4666, 5, 4, UNI_LATINEXTC } /* latinextc */, - { 26, 7585, 4998, 10, 16, UNI_BC__S } /* bidiclass=segmentseparator */, - { 0, 7585, 153, 10, 2, UNI_BC__BN } /* bidiclass=bn */, - { 33, 323, 458, 2, 3, UNI_INNKO } /* innko */, - { 0, 1874, 834, 7, 4, UNI_NBAT } /* script=nbat */, - { 0, 1126, 1859, 4, 11, UNI_HMNG } /* scx=pahawhhmong */, - { 0, 323, 426, 2, 4, UNI_INTOTO } /* intoto */, - { 0, 7697, 1368, 27, 2, UNI_CCC__20 } /* canonicalcombiningclass=ccc20 */, - { 0, 868, 0, 5, 0, UNI_STERM } /* sterm */, - { 3, 306, 1368, 3, 2, UNI_NV__20 } /* nv=20 */, - { 0, 2394, 6730, 6, 24, UNI_HIGHPUSURROGATES } /* block=highprivateusesurrogates */, - { 0, 1696, 6571, 4, 23, UNI_COMPATJAMO } /* blk=hangulcompatibilityjamo */, - { 3, 3215, 2440, 5, 7, UNI_GREEKEXT } /* blk=greekext */, - { 1, 3696, 645, 16, 3, -UNI_IDSU } /* idsunaryoperator=no */, - { 84, 6838, 0, 8, 0, UNI_INPC__TOP } /* inpc=top */, - { 1, 323, 6307, 2, 22, UNI_DIACRITICALSFORSYMBOLS } /* indiacriticalsforsymbols */, - { 9, 2394, 1923, 6, 11, UNI_YISYLLABLES } /* block=yisyllables */, - { 1, 135, 221, 2, 4, UNI_TIBT } /* istibt */, - { 3, 6647, 2614, 12, 11, UNI_JG__AFRICANFEH } /* joininggroup=africanfeh */, - { 8, 4557, 6146, 17, 4, UNI_SINH } /* scriptextensions=sinh */, - { 32, 7233, 6548, 24, 4, UNI_WB__EB } /* canonicalcombiningclass=atbl */, - { 0, 869, 373, 4, 4, UNI_TERM } /* term=yes */, - { 1, 5677, 373, 21, 2, UNI_CWCF } /* changeswhencasefolded=y */, - { 9, 7233, 2809, 24, 4, UNI_CCC__6 } /* canonicalcombiningclass=hanr */, - { 0, 4524, 5549, 14, 5, UNI_NV__300000 } /* numericvalue=300000 */, - { 4, 8095, 261, 9, 2, UNI_CN } /* category=cn */, - { 33, 135, 946, 2, 8, UNI_BASS } /* isbassavah */, - { 30, 8088, 327, 16, 4, UNI_M } /* generalcategory=mark */, - { 1, 969, 1128, 5, 2, UNI_compex_values_index } /* compex= */, - { 328, 323, 2481, 2, 8, UNI_INKATAKANA } /* inkatakana */, - { 6, 358, 3249, 4, 11, UNI_CCC__8 } /* ccc=kanavoicing */, - { 0, 1874, 245, 7, 4, UNI_SC__YI } /* script=yiii */, - { 296, 6431, 3552, 15, 5, UNI_LB__BA } /* linebreak=breakafter */, - { 0, 1874, 278, 7, 5, UNI_SC__GARA } /* script=garay */, - { 9, 876, 0, 7, 0, UNI_TGLG } /* tagalog */, - { 14, 6372, 1007, 3, 8, UNI_SC__HIRA } /* sc=hiragana */, - { 0, 8095, 5344, 9, 20, UNI_PC } /* category=connectorpunctuation */, - { 96, 2740, 1128, 12, 3, UNI_PATSYN } /* patternsyntax=t */, - { 0, 19, 373, 4, 2, UNI_POSIXXDIGIT } /* ahex=y */, - { 2, 1441, 591, 3, 3, UNI_WB__EB } /* wb=ebg */, - { 1, 4205, 0, 14, 0, UNI_SC } /* currencysymbol */, - { 148, 2345, 603, 4, 3, UNI_IN__16 } /* in=16.0 */, - { 3, 3040, 8254, 3, 29, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* insymbolsandpictographsextendeda */, - { 0, 1126, 245, 4, 2, UNI_YI } /* scx=yi */, - { 5, 6507, 312, 4, 2, UNI_BC__LRI } /* bc=lri */, - { 0, 266, 645, 4, 2, -UNI_CWCF } /* cwcf=n */, - { 0, 7951, 963, 17, 2, -UNI_VS } /* variationselector=f */, - { 0, 2502, 0, 9, 0, UNI_INMYANMAR } /* inmyanmar */, - { 0, 4005, 0, 16, 0, UNI_STERM } /* sentenceterminal */, - { 0, 7090, 631, 20, 2, UNI_CE } /* compositionexclusion=t */, - { 0, 6670, 1648, 14, 2, UNI_LB__LF } /* sentencebreak=lf */, - { 409, 4377, 646, 12, 4, UNI_JG__MANICHAEANONE } /* jg=manichaeanone */, - { 1, 7233, 366, 25, 1, UNI_CCC__28 } /* canonicalcombiningclass=28 */, - { 65, 4557, 6053, 17, 4, UNI_SUND } /* scriptextensions=sund */, - { 66, 897, 0, 7, 0, UNI_TIBT } /* tibetan */, - { 1, 1441, 3423, 3, 12, UNI_LB__HL } /* wb=hebrewletter */, - { 31, 1259, 343, 4, 3, UNI_KANASUP } /* kanasup */, - { 0, 2, 2017, 1, 9, UNI_COMPATJAMO } /* compatjamo */, - { 0, 8095, 208, 9, 2, UNI_TITLE } /* category=lt */, - { 4, 8095, 387, 9, 2, UNI_SM } /* category=sm */, - { 6, 3301, 373, 14, 2, UNI_GREXT } /* graphemeextend=y */, - { 67, 4658, 0, 12, 0, UNI_CYRILLICEXTC } /* cyrillicextc */, - { 2, 6372, 5500, 3, 8, UNI_SC__CHER } /* sc=cherokee */, - { 0, 323, 1381, 2, 9, UNI_INOLDPERMIC } /* inoldpermic */, - { 0, 4173, 963, 17, 6, -UNI_IDSB } /* idsbinaryoperator=false */, - { 47, 323, 1885, 2, 11, UNI_INSORASOMPENG } /* insorasompeng */, - { 0, 323, 6290, 2, 13, UNI_MATHOPERATORS } /* inmathoperators */, - { 33, 2372, 962, 9, 7, -UNI_IDC } /* idcontinue=false */, - { 0, 6370, 2387, 5, 6, UNI_INSC__NUMBER } /* insc=number */, - { 1, 3274, 1984, 15, 9, UNI_EA__A } /* eastasianwidth=ambiguous */, - { 1, 5976, 6290, 5, 13, UNI_SUPMATHOPERATORS } /* insupmathoperators */, - { 2, 2371, 963, 4, 6, -UNI_XIDC } /* xidc=false */, - { 0, 6372, 1083, 3, 8, UNI_SC__MAHJ } /* sc=mahajani */, - { 1, 1874, 1664, 7, 10, UNI_WARA } /* script=warangciti */, - { 0, 1474, 363, 7, 2, UNI_CCC__23 } /* ccc=ccc23 */, - { 3, 546, 556, 4, 1, UNI_NV__37 } /* nv=37 */, - { 0, 2785, 6530, 3, 20, UNI_BC__PDF } /* bc=popdirectionalformat */, - { 2, 3930, 2169, 14, 8, UNI_NV__1_SLASH_64 } /* numericvalue=1.562e-02 */, - { 27, 6372, 23, 3, 4, UNI_AHOM } /* sc=ahom */, - { 66, 1126, 3218, 3, 9, UNI_GEOR } /* scx=georgian */, - { 55, 5585, 5618, 14, 6, UNI_term_values_index } /* terminalpunctuation= */, - { 0, 5325, 6025, 11, 9, UNI_LATINEXTA } /* block=latinextendeda */, - { 0, 2394, 699, 6, 5, UNI_INBUHID } /* block=buhid */, - { 22, 788, 1850, 3, 5, UNI_NFCQC__M } /* nfkcqc=m */, - { 153, 2, 645, 3, 2, -UNI_CWL } /* cwl=n */, - { 3, 1874, 2029, 7, 4, UNI_SC__SOGD } /* script=sogd */, - { 88, 323, 555, 2, 2, UNI_IN__7 } /* in=7 */, - { 1, 4005, 645, 16, 2, -UNI_STERM } /* sentenceterminal=n */, - { 8, 8088, 3639, 16, 13, UNI_ZL } /* generalcategory=lineseparator */, - { 0, 6370, 1189, 5, 5, UNI_INSC__NUKTA } /* insc=nukta */, - { 3, 7697, 2138, 27, 2, UNI_CCC__11 } /* canonicalcombiningclass=ccc11 */, - { 0, 1426, 0, 9, 0, UNI_SAMR } /* samaritan */, - { 64, 968, 645, 5, 2, -UNI_ECOMP } /* ecomp=n */, - { 36, 3106, 420, 4, 2, UNI_IN__6_DOT_1 } /* in=v61 */, - { 305, 5069, 2654, 16, 4, -UNI_EBASE } /* emojimodifierbase=no */, - { 2, 1874, 2350, 7, 12, UNI_SC__TUTG } /* script=tulutigalari */, - { 1, 2338, 596, 10, 4, UNI_IN__13 } /* presentin=13.0 */, - { 21, 323, 729, 2, 5, UNI_INBATAK } /* inbatak */, - { 5, 3778, 81, 9, 2, UNI_LATINEXTG } /* islatinextg */, - { 0, 2114, 1207, 4, 2, UNI_alpha_values_index } /* alpha= */, - { 10, 1696, 7766, 4, 17, UNI_ANCIENTGREEKMUSIC } /* blk=ancientgreekmusic */, - { 69, 2564, 982, 9, 4, UNI_GEORGIANEXT } /* isgeorgianext */, - { 0, 3930, 2137, 14, 8, UNI_NV__1_SLASH_9 } /* numericvalue=1.111e-01 */, - { 0, 8095, 2696, 9, 9, UNI__PERL_SURROGATE } /* category=surrogate */, - { 5, 5585, 645, 19, 3, -UNI_TERM } /* terminalpunctuation=no */, - { 4, 11, 2772, 1, 13, UNI_ANCIENTSYMBOLS } /* ancientsymbols */, - { 2, 135, 2371, 2, 4, UNI_XIDC } /* isxidc */, - { 7, 643, 51, 3, 3, UNI_DT__CAN } /* dt=can */, - { 0, 4306, 0, 15, 0, UNI_INHANGUL } /* hangulsyllables */, - { 0, 1523, 372, 4, 2, UNI_wspace_values_index } /* space= */, - { 0, 7307, 7747, 6, 20, UNI_ARABICPFA } /* inarabicpresentationformsa */, - { 5, 3945, 5549, 14, 5, UNI_NV__500000 } /* numericvalue=500000 */, - { 2, 6446, 373, 21, 4, UNI_MCM } /* modifiercombiningmark=yes */, - { 0, 135, 5719, 2, 21, UNI_CWL } /* ischangeswhenlowercased */, - { 0, 2394, 8827, 7, 34, UNI_DIACRITICALSSUP } /* block=combiningdiacriticalmarkssupplement */, - { 18, 1874, 1033, 7, 4, UNI_SC__LYCI } /* script=lyci */, - { 28, 1126, 1904, 4, 11, UNI_SYLO } /* scx=sylotinagri */, - { 0, 6431, 3423, 10, 12, UNI_LB__HL } /* linebreak=hebrewletter */, - { 0, 2471, 6025, 10, 9, UNI_ETHIOPICEXTA } /* inethiopicextendeda */, - { 65, 358, 5133, 4, 2, UNI_CCC__8 } /* ccc=kv */, - { 0, 6372, 5014, 3, 4, UNI_BAMU } /* sc=bamu */, - { 0, 1874, 1298, 7, 7, UNI_SOYO } /* script=soyombo */, - { 35, 2372, 3501, 8, 3, UNI_idc_values_index } /* idcontinue= */, - { 0, 2394, 6034, 6, 19, UNI_MONGOLIANSUP } /* block=mongoliansupplement */, - { 0, 8861, 5253, 9, 7, UNI_SUPARROWSA } /* block=suparrowsa */, - { 387, 8095, 5276, 9, 2, UNI_CASEDLETTER } /* category=l_ */, - { 10, 1126, 3423, 4, 4, UNI_HEBR } /* scx=hebr */, - { 0, 3099, 304, 12, 2, UNI_IN__14 } /* presentin=v140 */, - { 1, 2612, 750, 3, 3, UNI_JG__AIN } /* jg=ain */, - { 8, 1781, 6147, 3, 20, UNI_SINHALAARCHAICNUMBERS } /* issinhalaarchaicnumbers */, - { 6, 4557, 1075, 17, 8, UNI_KRAI } /* scriptextensions=kiratrai */, - { 354, 4785, 0, 11, 0, UNI_BOPOMOFOEXT } /* bopomofoext */, - { 1, 3491, 2223, 13, 2, UNI_NV__33 } /* numericvalue=33 */, - { 1, 3587, 8168, 5, 29, UNI_ENCLOSEDALPHANUMSUP } /* blk=enclosedalphanumericsupplement */, - { 0, 4557, 4785, 17, 8, UNI_BOPO } /* scriptextensions=bopomofo */, - { 12, 135, 1007, 2, 8, UNI_HIRA } /* ishiragana */, - { 9, 135, 446, 2, 4, UNI_KHMR } /* iskhmr */, - { 0, 4524, 1364, 14, 2, UNI_NV__300 } /* numericvalue=300 */, - { 0, 135, 1553, 2, 4, UNI_JAVA } /* isjava */, - { 0, 842, 0, 4, 0, UNI_SHRD } /* shrd */, - { 0, 1696, 1045, 4, 6, UNI_INWANCHO } /* blk=wancho */, - { 4, 546, 5549, 4, 5, UNI_NV__300000 } /* nv=300000 */, - { 0, 434, 0, 3, 0, UNI_DIA } /* dia */, - { 1, 1039, 0, 4, 0, UNI_TELU } /* telu */, - { 8, 1126, 510, 4, 4, UNI_VAI } /* scx=vaii */, - { 0, 4377, 2328, 13, 4, UNI_JG__MANICHAEANAYIN } /* jg=manichaeanayin */, - { 3, 8596, 5120, 22, 14, UNI_INSC__GEMINATIONMARK } /* indicsyllabiccategory=geminationmark */, - { 169, 323, 393, 2, 6, UNI_INGOTHIC } /* ingothic */, - { 0, 4557, 6341, 17, 9, UNI_XSUX } /* scriptextensions=cuneiform */, - { 1, 4557, 1149, 17, 8, UNI_TFNG } /* scriptextensions=tifinagh */, - { 6, 1696, 579, 4, 6, UNI_INTANGSA } /* blk=tangsa */, - { 72, 2612, 1825, 3, 2, UNI_JG__FE } /* jg=fe */, - { 0, 5325, 3793, 7, 13, UNI_LISUSUP } /* block=lisusupplement */, - { 7, 7979, 4869, 23, 5, UNI_JG__MANICHAEANSADHE } /* joininggroup=manichaeansadhe */, - { 83, 945, 962, 4, 7, -UNI_EBASE } /* ebase=false */, - { 2, 4504, 645, 6, 3, -UNI_XPOSIXSPACE } /* wspace=no */, - { 9, 4557, 426, 17, 4, UNI_TOTO } /* scriptextensions=toto */, - { 1, 1322, 81, 7, 2, UNI_CJKEXTG } /* iscjkextg */, - { 2, 3099, 2138, 11, 2, UNI_IN__1_DOT_1 } /* presentin=v11 */, - { 304, 822, 0, 4, 0, UNI_HMNP } /* hmnp */, - { 0, 1775, 6025, 6, 9, UNI_ARABICEXTA } /* arabicextendeda */, - { 1, 2909, 1215, 3, 8, UNI_EMOTICONS } /* isemoticons */, - { 1, 4557, 850, 17, 4, UNI_QAAI } /* scriptextensions=zinh */, - { 96, 1126, 1528, 4, 4, UNI_BUGI } /* scx=bugi */, - { 0, 4380, 0, 10, 0, UNI_MANI } /* manichaean */, - { 0, 1664, 0, 10, 0, UNI_WARA } /* warangciti */, - { 0, 5677, 373, 21, 4, UNI_CWCF } /* changeswhencasefolded=yes */, - { 17, 8088, 283, 16, 2, UNI_ZP } /* generalcategory=zp */, - { 12, 1696, 8029, 4, 29, UNI_ENCLOSEDIDEOGRAPHICSUP } /* blk=enclosedideographicsupplement */, - { 41, 401, 963, 3, 2, -UNI_EXT } /* ext=f */, - { 1, 6647, 4373, 13, 4, UNI_JG__HETH } /* joininggroup=heth */, - { 0, 1874, 729, 7, 5, UNI_BATK } /* script=batak */, - { 0, 7307, 6400, 6, 5, UNI_ARABICSUP } /* inarabicsup */, - { 26, 3491, 2154, 13, 2, UNI_NV__42 } /* numericvalue=42 */, - { 1, 3778, 0, 3, 0, UNI_L } /* isl */, - { 42, 394, 2881, 3, 8, UNI_SO } /* othersymbol */, - { 3, 3106, 2147, 4, 2, UNI_IN__5 } /* in=v50 */, - { 0, 1696, 5392, 4, 9, UNI_HALFMARKS } /* blk=halfmarks */, - { 5, 2338, 2240, 9, 2, UNI_IN__4 } /* presentin=4 */, - { 1, 3945, 2161, 14, 8, UNI_NV__11_SLASH_2 } /* numericvalue=5.500e+00 */, - { 2, 2666, 3023, 8, 6, UNI_LB__BB } /* lb=breakbefore */, - { 0, 1097, 799, 5, 2, UNI_NV__1_SLASH_64 } /* nv=1/64 */, - { 14, 8095, 4702, 8, 16, UNI_UPPERCASELETTER } /* category=uppercaseletter */, - { 3, 6372, 861, 3, 7, UNI_SC__SHAW } /* sc=shavian */, - { 0, 4557, 2029, 17, 4, UNI_SOGD } /* scriptextensions=sogd */, - { 134, 323, 6392, 2, 20, UNI_GLAGOLITICSUP } /* inglagoliticsupplement */, - { 28, 3086, 3360, 12, 7, UNI_XPOSIXDIGIT } /* numerictype=decimal */, - { 2, 6372, 209, 3, 4, UNI_TAVT } /* sc=tavt */, - { 0, 563, 2346, 5, 2, UNI_patsyn_values_index } /* patsyn= */, - { 0, 6350, 2654, 19, 3, -UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=n */, - { 3, 3778, 3793, 3, 13, UNI_LISUSUP } /* islisusupplement */, - { 23, 1696, 7017, 4, 18, UNI_DEVANAGARIEXT } /* blk=devanagariextended */, - { 3, 1446, 373, 4, 4, UNI_XIDS } /* xids=yes */, - { 0, 1696, 4190, 4, 15, UNI_BRAI } /* blk=braillepatterns */, - { 4, 135, 39, 2, 4, UNI_BHKS } /* isbhks */, - { 0, 1696, 1408, 4, 9, UNI_PALM } /* blk=palmyrene */, - { 0, 4173, 373, 17, 4, UNI_IDSB } /* idsbinaryoperator=yes */, - { 0, 5260, 98, 10, 2, UNI_LB__HL } /* wordbreak=hl */, - { 35, 1097, 2282, 4, 8, UNI_NV__1_SLASH_80 } /* nv=1.250e-02 */, - { 0, 6670, 3042, 14, 3, UNI_SB__SE } /* sentencebreak=sep */, - { 1, 2833, 349, 3, 2, UNI_PD } /* gc=pd */, - { 1, 2, 8225, 1, 29, UNI_CUNEIFORMNUMBERS } /* cuneiformnumbersandpunctuation */, - { 1, 434, 631, 2, 2, UNI_DI } /* di=t */, - { 0, 6431, 1829, 10, 8, UNI_LB__NL } /* linebreak=nextline */, - { 0, 306, 2347, 2, 3, UNI_NV__14 } /* nv=14 */, - { 0, 4635, 4666, 9, 4, UNI_LATINEXTC } /* blk=latinextc */, - { 200, 6431, 98, 10, 2, UNI_LB__HL } /* linebreak=hl */, - { 35, 7585, 5623, 9, 19, UNI_BC__ET } /* bidiclass=europeanterminator */, - { 0, 2394, 6620, 9, 11, UNI_CJKRADICALSSUP } /* block=cjkradicalssup */, - { 155, 5761, 0, 21, 0, UNI_CWU } /* changeswhenuppercased */, - { 328, 1696, 4937, 4, 8, UNI_DINGBATS } /* blk=dingbats */, - { 0, 1874, 221, 7, 4, UNI_SC__TIBT } /* script=tibt */, - { 152, 2394, 251, 6, 2, UNI_NB } /* block=nb */, - { 0, 3734, 4888, 10, 10, UNI_LATINEXTADDITIONAL } /* inlatinextadditional */, - { 0, 3734, 4832, 6, 5, UNI_LATIN1 } /* inlatin1sup */, - { 4, 1618, 0, 10, 0, UNI_PHNX } /* phoenician */, - { 1, 1696, 760, 4, 7, UNI_KALI } /* blk=kayahli */, - { 1, 135, 2372, 2, 10, UNI_IDC } /* isidcontinue */, - { 0, 1874, 1618, 7, 10, UNI_PHNX } /* script=phoenician */, - { 1, 4718, 963, 18, 6, -UNI_IDST } /* idstrinaryoperator=false */, - { 194, 2372, 963, 3, 2, -UNI_IDC } /* idc=f */, - { 0, 1874, 6341, 7, 9, UNI_XSUX } /* script=cuneiform */, - { 3, 1097, 5549, 4, 9, UNI_NV__1000000000 } /* nv=1000000000 */, - { 0, 6431, 2787, 9, 3, UNI_RI } /* linebreak=ri */, - { 0, 5, 5211, 1, 18, UNI_MODIFIERTONELETTERS } /* modifiertoneletters */, - { 0, 1874, 1435, 7, 6, UNI_SC__THAA } /* script=thaana */, - { 2, 6372, 498, 3, 4, UNI_SC__SHAW } /* sc=shaw */, - { 1, 2909, 2444, 10, 8, UNI_ETHIOPICEXT } /* isethiopicextended */, - { 0, 2666, 18, 3, 2, UNI_LB__BA } /* lb=ba */, - { 3, 7585, 7403, 10, 17, UNI_BC__ES } /* bidiclass=europeanseparator */, - { 0, 6370, 7631, 14, 14, UNI_INSC__CONSONANTPRECEDINGREPHA } /* insc=consonantprecedingrepha */, - { 0, 3930, 0, 14, 0, UNI_NV__1 } /* numericvalue=1 */, - { 0, 275, 373, 3, 4, UNI_CWT } /* cwt=yes */, - { 8, 7233, 417, 24, 2, UNI_CCC__15 } /* canonicalcombiningclass=15 */, - { 8, 575, 0, 3, 0, UNI_sb_values_index } /* sb= */, - { 8, 1696, 4021, 4, 16, UNI_TANGUTCOMPONENTS } /* blk=tangutcomponents */, - { 1, 2601, 1110, 6, 4, UNI_XPOSIXWORD } /* xposixword */, - { 217, 6072, 1312, 6, 3, UNI_SUPPUAB } /* issuppuab */, - { 128, 1126, 2511, 4, 11, UNI_NAND } /* scx=nandinagari */, - { 38, 266, 288, 4, 1, UNI_cwcf_values_index } /* cwcf= */, - { 5, 624, 1364, 5, 2, UNI_WB__EB } /* ccc=200 */, - { 1, 2338, 2257, 11, 3, UNI_IN__12 } /* presentin=12.0 */, - { 27, 869, 963, 4, 2, -UNI_TERM } /* term=f */, - { 8, 2394, 8693, 6, 28, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* block=symbolsforlegacycomputingsup */, - { 0, 7233, 555, 23, 2, UNI_CCC__7 } /* canonicalcombiningclass=7 */, - { 1, 2394, 1408, 6, 9, UNI_PALM } /* block=palmyrene */, - { 0, 323, 694, 2, 5, UNI_INADLAM } /* inadlam */, - { 14, 3930, 4537, 14, 3, UNI_NV__13_SLASH_2 } /* numericvalue=13/2 */, - { 6, 323, 1149, 2, 8, UNI_INTIFINAGH } /* intifinagh */, - { 9, 1874, 51, 7, 4, UNI_CANS } /* script=cans */, - { 31, 5782, 295, 21, 2, UNI_GCB__XX } /* graphemeclusterbreak=xx */, - { 136, 687, 4143, 4, 13, UNI_HST__NA } /* hst=notapplicable */, - { 50, 1874, 3218, 6, 5, UNI_SC__GEOR } /* script=geor */, - { 4, 2819, 644, 13, 3, -UNI_ECOMP } /* emojicomponent=n */, - { 2, 1874, 1426, 7, 9, UNI_SC__SAMR } /* script=samaritan */, - { 0, 1097, 5549, 4, 6, UNI_NV__1000000 } /* nv=1000000 */, - { 65, 1097, 1364, 4, 3, UNI_NV__1000 } /* nv=1000 */, - { 1, 7017, 0, 19, 0, UNI_DEVANAGARIEXTA } /* devanagariextendeda */, - { 1, 8088, 4801, 16, 16, UNI_PE } /* generalcategory=closepunctuation */, - { 0, 323, 278, 2, 5, UNI_INGARAY } /* ingaray */, - { 292, 1696, 7739, 4, 27, UNI_ALPHABETICPF } /* blk=alphabeticpresentationforms */, - { 0, 6372, 585, 3, 6, UNI_SC__TODR } /* sc=todhri */, - { 24, 3916, 2397, 12, 3, UNI_nfkcqc_values_index } /* nfkcquickcheck= */, - { 65, 1499, 631, 10, 2, UNI_DEP } /* deprecated=t */, - { 0, 3227, 0, 11, 0, UNI_INMYANMAR } /* blk=myanmar */, - { 0, 983, 963, 8, 6, -UNI_EXT } /* extender=false */, - { 2, 358, 8425, 4, 11, UNI_CCC__DB } /* ccc=doublebelow */, - { 0, 563, 631, 6, 2, UNI_PATSYN } /* patsyn=t */, - { 11, 1298, 0, 4, 0, UNI_SOYO } /* soyo */, - { 0, 3227, 3901, 5, 15, UNI_MISCMATHSYMBOLSA } /* blk=miscmathsymbolsa */, - { 0, 6955, 571, 22, 2, UNI_JG__MALAYALAMJA } /* joininggroup=malayalamja */, - { 1, 1236, 401, 3, 4, UNI_CJKEXTH } /* cjkexth */, - { 0, 3976, 5549, 14, 5, UNI_NV__800000 } /* numericvalue=800000 */, - { 1, 1206, 1984, 3, 9, UNI_EA__A } /* ea=ambiguous */, - { 0, 4557, 3447, 17, 15, UNI_MERC } /* scriptextensions=meroiticcursive */, - { 448, 1126, 78, 4, 4, UNI_DSRT } /* scx=dsrt */, - { 16, 1126, 3447, 4, 15, UNI_MERC } /* scx=meroiticcursive */, - { 2, 4557, 1315, 17, 4, UNI_TIRH } /* scriptextensions=tirh */, - { 1, 4652, 34, 16, 2, UNI_CYRILLICEXTB } /* block=cyrillicextb */, - { 1, 1126, 241, 4, 4, UNI_XSUX } /* scx=xsux */, - { 0, 541, 373, 5, 2, UNI_NFDQC__Y } /* nfdqc=y */, - { 7, 4557, 470, 17, 4, UNI_ONAO } /* scriptextensions=onao */, - { 0, 30, 1352, 1, 10, UNI_INNEWTAILUE } /* innewtailue */, - { 3, 6277, 1589, 7, 9, UNI_MISCARROWS } /* block=miscarrows */, - { 2, 770, 645, 2, 2, UNI_EA__N } /* ea=n */, - { 1, 2, 8436, 1, 24, UNI_DIACRITICALS } /* combiningdiacriticalmarks */, - { 0, 135, 975, 2, 8, UNI_DUPL } /* isduployan */, - { 1, 6647, 2642, 13, 3, UNI_JG__HEH } /* joininggroup=heh */, - { 388, 135, 35, 2, 4, UNI_BATK } /* isbatk */, - { 126, 2799, 1763, 10, 3, UNI_ARABICPFB } /* blk=arabicpfb */, - { 3, 6670, 0, 14, 0, UNI_sb_values_index } /* sentencebreak= */, - { 0, 2394, 8879, 6, 21, UNI_MATHOPERATORS } /* block=mathematicaloperators */, - { 0, 2612, 1971, 3, 3, UNI_JG__TAH } /* jg=tah */, - { 0, 33, 2030, 1, 3, UNI_SOGD } /* sogd */, - { 39, 3183, 644, 7, 4, -UNI_XPOSIXXDIGIT } /* hexdigit=no */, - { 25, 358, 412, 4, 2, UNI_CCC__26 } /* ccc=26 */, - { 1, 5383, 8444, 9, 24, UNI_DIACRITICALSEXT } /* combiningdiacriticalmarksextended */, - { 129, 135, 3111, 2, 2, UNI_PS } /* isps */, - { 0, 7307, 1061, 8, 4, UNI_ARABICEXTB } /* inarabicextb */, - { 0, 135, 5930, 2, 4, UNI_EMOD } /* isemod */, - { 1, 8564, 4348, 32, 4, UNI_CJKEXTH } /* block=cjkunifiedideographsextensionh */, - { 0, 135, 714, 2, 5, UNI_OGAM } /* isogham */, - { 29, 6715, 0, 5, 0, UNI_MUSIC } /* music */, - { 0, 135, 1447, 2, 4, UNI_IDST } /* isidst */, - { 0, 687, 927, 3, 2, UNI_HST__V } /* hst=v */, - { 0, 135, 4306, 2, 15, UNI_INHANGUL } /* ishangulsyllables */, - { 1, 7847, 390, 18, 3, UNI_DT__SQR } /* decompositiontype=sqr */, - { 7, 30, 3667, 1, 17, UNI_HIGHPUSURROGATES } /* ishighpusurrogates */, - { 152, 5803, 0, 15, 0, UNI_identifiertype_values_index } /* identifiertype= */, - { 1, 6372, 6862, 3, 4, UNI_BRAH } /* sc=brah */, - { 0, 118, 0, 4, 0, UNI_KNDA } /* knda */, - { 0, 2394, 1885, 6, 11, UNI_INSORASOMPENG } /* block=sorasompeng */, - { 341, 6467, 366, 14, 1, UNI_NV__28 } /* numericvalue=28 */, - { 0, 2418, 372, 12, 5, UNI_CI } /* caseignorable=yes */, - { 75, 2799, 2867, 5, 11, UNI_ALPHABETICPF } /* blk=alphabeticpf */, - { 17, 166, 0, 4, 0, UNI_OUGR } /* ougr */, - { 0, 7233, 412, 25, 2, UNI_CCC__R } /* canonicalcombiningclass=226 */, - { 1, 8596, 0, 31, 0, UNI_INSC__CONSONANT } /* indicsyllabiccategory=consonant */, - { 1, 1993, 962, 11, 7, -UNI_GRBASE } /* graphemebase=false */, - { 0, 2055, 3365, 5, 5, UNI_POSIXALNUM } /* posixalnum */, - { 0, 323, 5014, 2, 5, UNI_INBAMUM } /* inbamum */, - { 288, 5698, 631, 21, 5, UNI_CWCM } /* changeswhencasemapped=true */, - { 70, 1874, 1033, 7, 6, UNI_SC__LYCI } /* script=lycian */, - { 0, 5, 288, 3, 1, UNI_mcm_values_index } /* mcm= */, - { 33, 788, 373, 6, 4, UNI_NFKCQC__Y } /* nfkcqc=yes */, - { 1, 1696, 4785, 4, 8, UNI_INBOPOMOFO } /* blk=bopomofo */, - { 1, 6372, 221, 3, 4, UNI_SC__TIBT } /* sc=tibt */, - { 162, 7697, 302, 28, 2, UNI_CCC__130 } /* canonicalcombiningclass=ccc130 */, - { 0, 6372, 529, 3, 4, UNI_SC__KHOJ } /* sc=khoj */, - { 1, 323, 2878, 2, 5, UNI_INKHMER } /* inkhmer */, - { 0, 1874, 6392, 7, 10, UNI_SC__GLAG } /* script=glagolitic */, - { 0, 1696, 6912, 4, 22, UNI_TRANSPORTANDMAP } /* blk=transportandmapsymbols */, - { 322, 1696, 709, 4, 5, UNI_INLIMBU } /* blk=limbu */, - { 385, 5740, 288, 21, 1, UNI_cwt_values_index } /* changeswhentitlecased= */, - { 65, 2502, 3901, 3, 15, UNI_MISCMATHSYMBOLSA } /* inmiscmathsymbolsa */, - { 38, 2345, 2134, 4, 3, UNI_IN__11 } /* in=11.0 */, - { 1, 3215, 5401, 6, 16, UNI_INPUNCTUATION } /* blk=generalpunctuation */, - { 5, 1696, 5309, 4, 16, UNI_TANGUTSUP } /* blk=tangutsupplement */, - { 0, 5976, 4280, 5, 11, UNI_SUPPUNCTUATION } /* insuppunctuation */, - { 0, 270, 373, 5, 2, UNI_CWKCF } /* cwkcf=y */, - { 0, 575, 3042, 3, 3, UNI_SB__SE } /* sb=sep */, - { 0, 8918, 0, 44, 0, UNI_UCASEXT } /* isunifiedcanadianaboriginalsyllabicsextended */, - { 14, 98, 0, 4, 0, UNI_HLUW } /* hluw */, - { 0, 6372, 94, 3, 4, UNI_SC__GUKH } /* sc=gukh */, - { 0, 7233, 8900, 24, 13, UNI_CCC__214 } /* canonicalcombiningclass=attachedabove */, - { 32, 8596, 3062, 22, 6, UNI_INSC__VIRAMA } /* indicsyllabiccategory=virama */, - { 4, 2345, 6482, 3, 3, UNI_IN__5_DOT_1 } /* in=5.1 */, - { 0, 6072, 0, 21, 0, UNI_SUPARROWSC } /* issupplementalarrowsc */, - { 5, 868, 963, 5, 2, -UNI_STERM } /* sterm=f */, - { 0, 5761, 373, 21, 4, UNI_CWU } /* changeswhenuppercased=yes */, - { 137, 4635, 3886, 5, 15, UNI_LINEARBIDEOGRAMS } /* blk=linearbideograms */, - { 0, 8861, 8254, 7, 29, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* block=symbolsandpictographsextendeda */, - { 139, 6431, 4801, 10, 16, UNI_LB__CL } /* linebreak=closepunctuation */, - { 133, 7697, 3489, 27, 2, UNI_CCC__36 } /* canonicalcombiningclass=ccc36 */, - { 0, 2, 0, 3, 0, UNI_CWL } /* cwl */, - { 7, 3186, 0, 5, 0, UNI_XPOSIXDIGIT } /* digit */, - { 33, 1523, 372, 4, 5, UNI_XPOSIXSPACE } /* space=yes */, - { 2, 850, 0, 4, 0, UNI_QAAI } /* zinh */, - { 0, 5, 373, 3, 4, UNI_MCM } /* mcm=yes */, - { 0, 2612, 4410, 3, 4, UNI_JG__TETH } /* jg=teth */, - { 5, 2338, 2138, 10, 2, UNI_IN__11 } /* presentin=11 */, - { 5, 8596, 6374, 21, 18, UNI_INSC__CONSONANTPREFIXED } /* indicsyllabiccategory=consonantprefixed */, - { 8, 3587, 3796, 12, 10, UNI_ETHIOPICSUP } /* blk=ethiopicsupplement */, - { 0, 905, 373, 4, 4, UNI_IDEO } /* ideo=yes */, - { 0, 3227, 7819, 5, 19, UNI_MISCSYMBOLS } /* blk=miscellaneoussymbols */, - { 3, 135, 249, 2, 4, UNI_ZANB } /* iszanb */, - { 15, 1993, 1915, 7, 5, UNI_GRBASE } /* graphemebase */, - { 1, 6372, 1245, 3, 4, UNI_SC__THAI } /* sc=thai */, - { 0, 3575, 1061, 12, 4, UNI_CYRILLICEXTB } /* blk=cyrillicextb */, - { 0, 6431, 48, 10, 2, UNI_LB__AK } /* linebreak=ak */, - { 154, 30, 6729, 1, 25, UNI_HIGHPUSURROGATES } /* inhighprivateusesurrogates */, - { 0, 3587, 7143, 5, 22, UNI_EGYPTIANHIEROGLYPHSEXTA } /* blk=egyptianhieroglyphsexta */, - { 0, 2564, 6040, 7, 13, UNI_GEORGIANSUP } /* isgeorgiansupplement */, - { 487, 135, 4190, 2, 7, UNI_BRAI } /* isbraille */, - { 0, 4557, 699, 17, 5, UNI_BUHD } /* scriptextensions=buhid */, - { 1, 20, 963, 3, 2, -UNI_XPOSIXXDIGIT } /* hex=f */, - { 19, 1447, 373, 4, 4, UNI_IDST } /* idst=yes */, - { 1, 135, 5331, 2, 14, UNI_LATINEXTC } /* islatinextendedc */, - { 322, 3491, 1363, 13, 3, UNI_NV__600 } /* numericvalue=600 */, - { 0, 135, 4097, 2, 17, UNI_EPRES } /* isemojipresentation */, - { 6, 6372, 830, 3, 4, UNI_LANA } /* sc=lana */, - { 3, 6372, 636, 3, 7, UNI_DSRT } /* sc=deseret */, - { 4, 135, 498, 2, 4, UNI_SHAW } /* isshaw */, - { 0, 2584, 782, 3, 6, UNI_MARC } /* ismarchen */, - { 1, 8468, 5417, 24, 15, UNI_LOE } /* indicpositionalcategory=visualorderleft */, - { 0, 1126, 3764, 4, 4, UNI_DEVA } /* scx=deva */, - { 1, 1696, 8920, 4, 34, UNI_UCAS } /* blk=unifiedcanadianaboriginalsyllabics */, - { 0, 2394, 8920, 6, 34, UNI_UCAS } /* block=unifiedcanadianaboriginalsyllabics */, - { 0, 2666, 2091, 8, 4, UNI_LB__B2 } /* lb=breakboth */, - { 5, 3778, 1115, 3, 3, UNI_LINB } /* islinb */, - { 8, 323, 579, 2, 6, UNI_INTANGSA } /* intangsa */, - { 0, 8095, 3289, 9, 12, UNI_NL } /* category=letternumber */, - { 0, 6104, 645, 21, 3, -UNI_LOE } /* logicalorderexception=no */, - { 0, 624, 628, 5, 2, UNI_CCC__BR } /* ccc=222 */, - { 1, 4557, 442, 17, 4, UNI_HANO } /* scriptextensions=hano */, - { 1, 1773, 2382, 3, 12, UNI_AEGEANNUMBERS } /* isaegeannumbers */, - { 38, 30, 5499, 1, 9, UNI_CHER } /* ischerokee */, - { 32, 5740, 645, 21, 2, -UNI_CWT } /* changeswhentitlecased=n */, - { 195, 7233, 3062, 24, 6, UNI_CCC__9 } /* canonicalcombiningclass=virama */, - { 4, 1234, 401, 5, 4, UNI_CJKEXTH } /* incjkexth */, - { 7, 8861, 7506, 7, 24, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* block=symbolsandpictographsexta */, - { 0, 2612, 520, 3, 3, UNI_JG__HAH } /* jg=hah */, - { 7, 2394, 2759, 6, 13, UNI_VERTICALFORMS } /* block=verticalforms */, - { 2, 1874, 838, 7, 4, UNI_SARB } /* script=sarb */, - { 8, 30, 204, 1, 5, UNI_TAML } /* istaml */, - { 4, 2338, 919, 9, 5, UNI_IN__10 } /* presentin=10.0 */, - { 14, 1259, 6025, 4, 9, UNI_KANAEXTA } /* kanaextendeda */, - { 258, 2394, 6034, 6, 9, UNI_INMONGOLIAN } /* block=mongolian */, - { 0, 285, 1648, 4, 2, UNI_LB__LF } /* gcb=lf */, - { 2, 1236, 6602, 3, 18, UNI_CJKCOMPATFORMS } /* cjkcompatibilityforms */, - { 0, 4557, 1051, 17, 4, UNI_YEZI } /* scriptextensions=yezi */, - { 0, 869, 963, 4, 6, -UNI_TERM } /* term=false */, - { 3, 1447, 644, 3, 3, -UNI_IDST } /* idst=n */, - { 11, 1874, 1021, 7, 6, UNI_SC__KTHI } /* script=kaithi */, - { 3, 1141, 0, 8, 0, UNI_TAGB } /* tagbanwa */, - { 1, 7979, 4373, 23, 4, UNI_JG__MANICHAEANHETH } /* joininggroup=manichaeanheth */, - { 9, 5260, 3535, 9, 3, UNI_WB__EX } /* wordbreak=ex */, - { 53, 6431, 4784, 10, 2, UNI_LB__BB } /* linebreak=bb */, - { 0, 1126, 146, 4, 4, UNI_MYMR } /* scx=mymr */, - { 0, 5761, 631, 21, 5, UNI_CWU } /* changeswhenuppercased=true */, - { 601, 3491, 795, 13, 3, UNI_NV__1_SLASH_2 } /* numericvalue=1/2 */, - { 0, 4220, 5031, 4, 13, UNI_DIACRITICALSSUP } /* indiacriticalssup */, - { 2, 15, 4535, 2, 3, UNI_AGE__3 } /* age=3 */, - { 0, 323, 7651, 2, 18, UNI_PHONETICEXT } /* inphoneticextensions */, - { 0, 2053, 1110, 7, 4, UNI_POSIXWORD } /* isposixword */, - { 1, 8088, 106, 16, 2, UNI_ZL } /* generalcategory=zl */, - { 0, 30, 4320, 1, 3, UNI_LO } /* islo */, - { 120, 135, 5014, 2, 8, UNI_BAMUMSUP } /* isbamumsup */, - { 0, 74, 0, 4, 0, UNI_CYRL } /* cyrl */, - { 130, 3125, 0, 13, 0, UNI_QMARK } /* quotationmark */, - { 2, 135, 11, 2, 4, UNI_ADLM } /* isadlm */, - { 0, 6370, 5923, 5, 16, UNI_INSC__SYLLABLEMODIFIER } /* insc=syllablemodifier */, - { 70, 6372, 4858, 3, 4, UNI_SC__TALE } /* sc=tale */, - { 1, 6647, 2625, 13, 3, UNI_JG__DAL } /* joininggroup=dal */, - { 0, 6167, 229, 3, 2, UNI_VO__TU } /* vo=tu */, - { 1, 42, 4702, 2, 6, UNI_SB__UP } /* sb=upper */, - { 98, 64, 0, 1, 0, UNI_P } /* p */, - { 1, 1874, 90, 7, 4, UNI_SC__GUJR } /* script=gujr */, - { 0, 5573, 0, 3, 0, UNI_PUA } /* pua */, - { 0, 6670, 36, 14, 2, UNI_SB__AT } /* sentencebreak=at */, - { 0, 1097, 2137, 4, 8, UNI_NV__1_SLASH_9 } /* nv=1.111e-01 */, - { 248, 2394, 81, 11, 2, UNI_CJKEXTG } /* block=cjkextg */, - { 403, 2080, 372, 10, 5, UNI_KEHNOROTATE } /* kehnorotate=yes */, - { 3, 1654, 631, 10, 5, UNI_SD } /* softdotted=true */, - { 2, 2394, 709, 6, 5, UNI_INLIMBU } /* block=limbu */, - { 1, 3587, 5997, 5, 15, UNI_ENCLOSEDALPHANUM } /* blk=enclosedalphanum */, - { 0, 135, 1965, 2, 4, UNI_UCAS } /* isucas */, - { 2, 6431, 193, 10, 2, UNI_LB__SA } /* linebreak=sa */, - { 1, 3824, 1927, 12, 3, UNI_JG__MALAYALAMLLA } /* jg=malayalamlla */, - { 0, 268, 0, 2, 0, UNI_CF } /* cf */, - { 1, 135, 2, 2, 3, UNI_CWL } /* iscwl */, - { 2, 905, 645, 4, 3, -UNI_IDEO } /* ideo=no */, - { 36, 2394, 3520, 6, 15, UNI_SARB } /* block=oldsoutharabian */, - { 144, 8861, 4844, 7, 15, UNI_SYRIACSUP } /* block=syriacsupplement */, - { 1, 1126, 130, 4, 4, UNI_LATN } /* scx=latn */, - { 117, 2584, 2718, 3, 12, UNI_MISCTECHNICAL } /* ismisctechnical */, - { 84, 2394, 8693, 6, 25, UNI_SYMBOLSFORLEGACYCOMPUTING } /* block=symbolsforlegacycomputing */, - { 0, 6372, 4067, 3, 17, UNI_SC__AGHB } /* sc=caucasianalbanian */, - { 264, 4557, 393, 17, 6, UNI_GOTH } /* scriptextensions=gothic */, - { 0, 2371, 373, 4, 2, UNI_XIDC } /* xidc=y */, - { 25, 6127, 963, 5, 2, -UNI__PERL_NCHAR } /* nchar=f */, - { 0, 7923, 7939, 16, 12, UNI_EGYPTIANHIEROGLYPHSEXTA } /* egyptianhieroglyphsextendeda */, - { 0, 1696, 680, 4, 7, UNI_INHANUNOO } /* blk=hanunoo */, - { 1, 17, 443, 1, 3, UNI_HANO } /* hano */, - { 18, 135, 1083, 2, 8, UNI_MAHJ } /* ismahajani */, - { 16, 306, 365, 3, 2, UNI_NV__18 } /* nv=18 */, - { 0, 1126, 1039, 4, 6, UNI_TELU } /* scx=telugu */, - { 18, 4377, 4874, 13, 5, UNI_JG__MANICHAEANZAYIN } /* jg=manichaeanzayin */, - { 0, 1848, 645, 5, 3, UNI_COMPEX } /* nfcqc=no */, - { 128, 7233, 1364, 25, 2, UNI_WB__EB } /* canonicalcombiningclass=200 */, - { 0, 1881, 0, 4, 0, UNI_MLYM } /* mlym */, - { 4, 6372, 938, 3, 8, UNI_BALI } /* sc=balinese */, - { 1, 7086, 645, 24, 3, -UNI_COMPEX } /* fullcompositionexclusion=no */, - { 165, 2029, 0, 7, 0, UNI_SOGD } /* sogdian */, - { 4, 1126, 5148, 4, 4, UNI_HAN } /* scx=hani */, - { 2, 6647, 7544, 13, 10, UNI_JG__TEHMARBUTA } /* joininggroup=tehmarbuta */, - { 1, 4718, 373, 18, 4, UNI_IDST } /* idstrinaryoperator=yes */, - { 40, 306, 303, 3, 1, UNI_NV__0 } /* nv=0 */, - { 233, 6392, 0, 4, 0, UNI_GLAG } /* glag */, - { 0, 1241, 0, 4, 0, UNI_GRAN } /* gran */, - { 0, 3183, 0, 8, 0, UNI_XPOSIXXDIGIT } /* hexdigit */, - { 1, 1459, 0, 5, 0, UNI_LATN } /* latin */, - { 0, 1696, 569, 4, 6, UNI_INREJANG } /* blk=rejang */, - { 17, 1696, 876, 4, 7, UNI_INTAGALOG } /* blk=tagalog */, - { 0, 108, 2787, 2, 2, UNI_JT__R } /* jt=r */, - { 24, 1206, 3208, 3, 7, UNI_EA__N } /* ea=neutral */, - { 2, 2, 630, 1, 3, UNI_CE } /* ce=t */, - { 6, 32, 373, 2, 4, UNI_VS } /* vs=yes */, - { 6, 546, 796, 4, 2, UNI_NV__3_SLASH_2 } /* nv=3/2 */, - { 0, 6454, 0, 13, 0, UNI_M } /* combiningmark */, - { 0, 8140, 4111, 28, 4, UNI_CJKEXTG } /* incjkunifiedideographsextensiong */, - { 1, 6372, 704, 3, 5, UNI_SC__DOGR } /* sc=dogra */, - { 0, 2394, 1904, 6, 11, UNI_INSYLOTINAGRI } /* block=sylotinagri */, - { 5, 1696, 8225, 5, 29, UNI_CUNEIFORMNUMBERS } /* blk=cuneiformnumbersandpunctuation */, - { 5, 4718, 373, 18, 2, UNI_IDST } /* idstrinaryoperator=y */, - { 3, 1474, 368, 7, 2, UNI_CCC__91 } /* ccc=ccc91 */, - { 32, 668, 373, 7, 4, UNI_EXTPICT } /* extpict=yes */, - { 0, 8095, 3809, 9, 11, UNI_MC } /* category=spacingmark */, - { 0, 1696, 1165, 4, 8, UNI_INVITHKUQI } /* blk=vithkuqi */, - { 1, 5698, 645, 21, 2, -UNI_CWCM } /* changeswhencasemapped=n */, - { 0, 285, 0, 4, 0, UNI_gcb_values_index } /* gcb= */, - { 0, 135, 3696, 2, 16, UNI_IDSU } /* isidsunaryoperator */, - { 0, 7697, 7257, 27, 2, UNI_CCC__27 } /* canonicalcombiningclass=ccc27 */, - { 0, 651, 4572, 2, 2, UNI_ids_values_index } /* ids= */, - { 2, 7923, 0, 19, 0, UNI_EGYP } /* egyptianhieroglyphs */, - { 32, 1696, 6053, 4, 9, UNI_INSUNDANESE } /* blk=sundanese */, - { 1, 2053, 4321, 7, 5, UNI_POSIXLOWER } /* isposixlower */, - { 16, 541, 645, 5, 2, UNI_DT__CAN } /* nfdqc=n */, - { 24, 6127, 645, 5, 3, -UNI__PERL_NCHAR } /* nchar=no */, - { 11, 1223, 0, 7, 0, UNI_BENG } /* bengali */, - { 0, 135, 861, 2, 7, UNI_SHAW } /* isshavian */, - { 1, 8920, 0, 34, 0, UNI_UCAS } /* unifiedcanadianaboriginalsyllabics */, - { 0, 7233, 1367, 24, 2, UNI_CCC__32 } /* canonicalcombiningclass=32 */, - { 2, 2201, 309, 4, 1, UNI_NV__29 } /* nv=29 */, - { 0, 2584, 1061, 9, 4, UNI_MYANMAREXTB } /* ismyanmarextb */, - { 212, 6372, 1628, 3, 4, UNI_SAUR } /* sc=saur */, - { 40, 323, 7923, 2, 28, UNI_EGYPTIANHIEROGLYPHSEXTA } /* inegyptianhieroglyphsextendeda */, - { 0, 8364, 0, 18, 0, UNI_IDEOGRAPHICSYMBOLS } /* ideographicsymbols */, - { 5, 3099, 1367, 11, 2, UNI_IN__3_DOT_2 } /* presentin=v32 */, - { 2, 5260, 297, 10, 2, UNI_WB__NU } /* wordbreak=nu */, - { 1, 323, 2302, 2, 12, UNI_INOLDHUNGARIAN } /* inoldhungarian */, - { 5, 5803, 7296, 15, 11, UNI_IDENTIFIERTYPE__UNCOMMONUSE } /* identifiertype=uncommonuse */, - { 0, 1322, 8761, 5, 33, UNI_CJKCOMPATIDEOGRAPHSSUP } /* iscjkcompatibilityideographssupplement */, - { 34, 8088, 502, 16, 2, UNI_SO } /* generalcategory=so */, - { 1, 2833, 4945, 3, 18, UNI_ZP } /* gc=paragraphseparator */, - { 4, 323, 1223, 2, 7, UNI_INBENGALI } /* inbengali */, - { 0, 6955, 1927, 22, 3, UNI_JG__MALAYALAMLLA } /* joininggroup=malayalamlla */, - { 24, 1874, 1284, 7, 7, UNI_SC__PHAG } /* script=phagspa */, - { 0, 135, 1915, 2, 5, UNI_EBASE } /* isebase */, - { 0, 2394, 6392, 6, 13, UNI_GLAGOLITICSUP } /* block=glagoliticsup */, - { 0, 7669, 0, 28, 0, UNI_SUPPUAA } /* supplementaryprivateuseareaa */, - { 7, 6370, 5134, 5, 14, UNI_INSC__VOWELDEPENDENT } /* insc=voweldependent */, - { 0, 7120, 0, 14, 0, UNI_BYZANTINEMUSIC } /* byzantinemusic */, - { 1, 19, 373, 4, 4, UNI_POSIXXDIGIT } /* ahex=yes */, - { 70, 1696, 5309, 4, 9, UNI_TANGUTSUP } /* blk=tangutsup */, - { 0, 6372, 5955, 3, 21, UNI_PRTI } /* sc=inscriptionalparthian */, - { 0, 2394, 6996, 6, 11, UNI_INMEETEIMAYEK } /* block=meeteimayek */, - { 169, 6372, 991, 3, 8, UNI_SC__GUJR } /* sc=gujarati */, - { 0, 1874, 661, 7, 4, UNI_ELYM } /* script=elym */, - { 0, 323, 1241, 2, 7, UNI_INGRANTHA } /* ingrantha */, - { 0, 1126, 5827, 4, 5, UNI_GREK } /* scx=greek */, - { 0, 1874, 767, 7, 7, UNI_SC__LINA } /* script=lineara */, - { 8, 7233, 1707, 24, 2, UNI_CCC__1 } /* canonicalcombiningclass=ov */, - { 0, 19, 963, 4, 2, -UNI_POSIXXDIGIT } /* ahex=f */, - { 1, 1696, 1344, 4, 9, UNI_INNABATAEAN } /* blk=nabataean */, - { 0, 1447, 0, 3, 0, UNI_IDS } /* ids */, - { 0, 7585, 4945, 10, 18, UNI_BC__B } /* bidiclass=paragraphseparator */, - { 2, 1945, 0, 12, 0, UNI_BIDIM } /* bidimirrored */, - { 3, 7739, 373, 10, 2, UNI_XPOSIXALPHA } /* alphabetic=y */, - { 1, 6372, 3560, 3, 15, UNI_ZANB } /* sc=zanabazarsquare */, - { 11, 1874, 1270, 7, 4, UNI_SC__MULT } /* script=mult */, - { 132, 3099, 803, 12, 2, UNI_IN__12_DOT_1 } /* presentin=v121 */, - { 1, 687, 3315, 5, 10, UNI_GCB__L } /* hst=leadingjamo */, - { 8, 8095, 4, 9, 2, UNI_LM } /* category=lm */, - { 5, 916, 2138, 4, 2, UNI_AGE__11 } /* age=11 */, - { 1, 4557, 197, 17, 4, UNI_SGNW } /* scriptextensions=sgnw */, - { 80, 138, 0, 4, 0, UNI_MEDF } /* medf */, - { 38, 31, 0, 4, 0, UNI_AVST } /* avst */, - { 12, 8095, 4115, 9, 14, UNI_SK } /* category=modifiersymbol */, - { 64, 768, 7463, 3, 26, UNI_ENCLOSEDCJK } /* inenclosedcjklettersandmonths */, - { 2, 4557, 177, 17, 4, UNI_PHNX } /* scriptextensions=phnx */, - { 0, 1126, 975, 4, 4, UNI_DUPL } /* scx=dupl */, - { 153, 2599, 3185, 7, 6, UNI_XPOSIXDIGIT } /* isxposixdigit */, - { 1, 135, 502, 2, 4, UNI_SOGO } /* issogo */, - { 65, 1993, 372, 11, 2, UNI_grbase_values_index } /* graphemebase= */, - { 1, 1474, 7461, 7, 2, UNI_CCC__28 } /* ccc=ccc28 */, - { 0, 1126, 39, 4, 4, UNI_BHKS } /* scx=bhks */, - { 4, 30, 2313, 1, 9, UNI_PHAISTOS } /* inphaistos */, - { 393, 4703, 373, 5, 2, UNI_XPOSIXUPPER } /* upper=y */, - { 113, 1874, 59, 7, 4, UNI_CHRS } /* script=chrs */, - { 4, 1459, 6025, 5, 9, UNI_LATINEXTA } /* latinextendeda */, - { 0, 6817, 0, 4, 0, UNI_CE } /* isce */, - { 0, 8304, 6294, 12, 9, UNI_MATHOPERATORS } /* mathematicaloperators */, - { 0, 1945, 645, 12, 2, -UNI_BIDIM } /* bidimirrored=n */, - { 87, 4321, 963, 5, 2, -UNI_XPOSIXLOWER } /* lower=f */, - { 23, 2553, 0, 11, 0, UNI_CASEDLETTER } /* casedletter */, - { 0, 316, 645, 5, 3, -UNI__PERL_PATWS } /* patws=no */, - { 84, 2833, 3639, 3, 13, UNI_ZL } /* gc=lineseparator */, - { 3, 1696, 7309, 4, 24, UNI_ARABICPFB } /* blk=arabicpresentationformsb */, - { 1, 1874, 1408, 7, 9, UNI_PALM } /* script=palmyrene */, - { 0, 1957, 3846, 6, 14, UNI_KAKTOVIKNUMERALS } /* blk=kaktoviknumerals */, - { 3, 7585, 3191, 10, 12, UNI_BC__AL } /* bidiclass=arabicletter */, - { 60, 3824, 734, 4, 3, UNI_JG__MEEM } /* jg=meem */, - { 0, 135, 5069, 2, 17, UNI_EBASE } /* isemojimodifierbase */, - { 0, 135, 3178, 2, 5, UNI_ASCII } /* isascii */, - { 34, 4557, 1752, 17, 11, UNI_GUKH } /* scriptextensions=gurungkhema */, - { 2, 5325, 4888, 19, 10, UNI_LATINEXTADDITIONAL } /* block=latinextendedadditional */, - { 1, 1874, 2305, 7, 4, UNI_SC__HUNG } /* script=hung */, - { 606, 6372, 2026, 3, 10, UNI_SOGO } /* sc=oldsogdian */, - { 0, 434, 963, 2, 6, -UNI_DI } /* di=false */, - { 0, 399, 631, 5, 5, UNI_GREXT } /* grext=true */, - { 0, 5604, 8820, 20, 7, UNI_VO__U } /* verticalorientation=upright */, - { 1, 7233, 2787, 23, 2, UNI_CCC__R } /* canonicalcombiningclass=r */, - { 0, 162, 0, 4, 0, UNI_OSGE } /* osge */, - { 3, 3599, 0, 12, 0, UNI_INARABIC } /* block=arabic */, - { 3, 383, 373, 4, 2, UNI_CWCM } /* cwcm=y */, - { 1, 135, 78, 2, 4, UNI_DSRT } /* isdsrt */, - { 27, 2045, 963, 7, 2, -UNI_RADICAL } /* radical=f */, - { 1, 1322, 0, 3, 0, UNI_C } /* isc */, - { 97, 5325, 3793, 7, 6, UNI_LISUSUP } /* block=lisusup */, - { 0, 2584, 4644, 9, 9, UNI_MYANMAREXTB } /* ismyanmarextendedb */, - { 0, 1482, 0, 10, 0, UNI_CHRS } /* chorasmian */, - { 0, 1441, 1915, 3, 8, UNI_WB__EB } /* wb=ebasegaz */, - { 5, 6372, 393, 3, 4, UNI_SC__GOTH } /* sc=goth */, - { 2, 1499, 645, 3, 3, -UNI_DEP } /* dep=no */, - { 0, 323, 2314, 2, 12, UNI_PHAISTOS } /* inphaistosdisc */, - { 0, 8095, 64, 9, 1, UNI_P } /* category=p */, - { 2, 6446, 963, 21, 6, -UNI_MCM } /* modifiercombiningmark=false */, - { 0, 1126, 1904, 4, 4, UNI_SYLO } /* scx=sylo */, - { 0, 3185, 0, 6, 0, UNI_XPOSIXXDIGIT } /* xdigit */, - { 0, 4524, 796, 14, 2, UNI_NV__3_SLASH_2 } /* numericvalue=3/2 */, - { 0, 135, 4703, 2, 9, UNI_XPOSIXUPPER } /* isuppercase */, - { 1, 323, 854, 2, 7, UNI_SC__SHRD } /* insharada */, - { 887, 135, 8693, 2, 28, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* issymbolsforlegacycomputingsup */, - { 64, 323, 1664, 2, 10, UNI_INWARANGCITI } /* inwarangciti */, - { 7, 5364, 631, 20, 5, UNI_EXTPICT } /* extendedpictographic=true */, - { 0, 8596, 2036, 22, 7, UNI_INSC__VISARGA } /* indicsyllabiccategory=visarga */, - { 33, 643, 1901, 3, 3, UNI_DT__SUB } /* dt=sub */, - { 0, 306, 1368, 3, 3, UNI_NV__200 } /* nv=200 */, - { 0, 6372, 774, 3, 4, UNI_SC__MAND } /* sc=mand */, - { 612, 1874, 2026, 7, 10, UNI_SOGO } /* script=oldsogdian */, - { 290, 6372, 1241, 3, 7, UNI_SC__GRAN } /* sc=grantha */, - { 0, 190, 911, 2, 5, UNI_ZZZZ } /* unknown */, - { 1, 383, 631, 4, 5, UNI_CWCM } /* cwcm=true */, - { 1, 6370, 5120, 5, 14, UNI_INSC__GEMINATIONMARK } /* insc=geminationmark */, - { 10, 1874, 3111, 7, 14, UNI_SC__PHLP } /* script=psalterpahlavi */, - { 0, 6372, 118, 3, 4, UNI_SC__KNDA } /* sc=knda */, - { 529, 859, 963, 4, 2, -UNI_DASH } /* dash=f */, - { 148, 135, 904, 2, 5, UNI_UIDEO } /* isuideo */, - { 8, 1248, 0, 9, 0, UNI_QAAI } /* inherited */, - { 0, 2785, 4620, 3, 15, UNI_BC__CS } /* bc=commonseparator */, - { 1, 3086, 3086, 12, 7, UNI_NT__NU } /* numerictype=numeric */, - { 0, 1874, 1241, 7, 7, UNI_SC__GRAN } /* script=grantha */, - { 0, 135, 4620, 2, 6, UNI_ZYYY } /* iscommon */, - { 0, 8792, 0, 3, 0, UNI_nt_values_index } /* nt= */, - { 15, 6264, 6040, 11, 6, UNI_GEORGIANSUP } /* block=georgiansup */, - { 32, 135, 4927, 2, 18, UNI_ORNAMENTALDINGBATS } /* isornamentaldingbats */, - { 2, 1874, 1579, 7, 10, UNI_KHAR } /* script=kharoshthi */, - { 44, 323, 6912, 2, 22, UNI_TRANSPORTANDMAP } /* intransportandmapsymbols */, - { 0, 323, 680, 2, 7, UNI_INHANUNOO } /* inhanunoo */, - { 1, 486, 0, 4, 0, UNI_PRTI } /* prti */, - { 0, 2833, 3806, 3, 14, UNI_MN } /* gc=nonspacingmark */, - { 11, 6372, 6053, 3, 4, UNI_SUND } /* sc=sund */, - { 82, 135, 442, 2, 4, UNI_HANO } /* ishano */, - { 0, 1126, 166, 4, 4, UNI_OUGR } /* scx=ougr */, - { 1, 30, 7016, 1, 19, UNI_DEVANAGARIEXT } /* isdevanagariextended */, - { 2, 358, 3238, 4, 11, UNI_CCC__DA } /* ccc=doubleabove */, - { 67, 1441, 2481, 3, 8, UNI_WB__KA } /* wb=katakana */, - { 0, 5102, 3535, 18, 7, UNI_INCB__EXTEND } /* indicconjunctbreak=extend */, - { 1, 135, 5, 2, 2, UNI_MC } /* ismc */, - { 0, 8197, 4543, 28, 4, UNI_CJKEXTA } /* iscjkunifiedideographsextensiona */, - { 0, 1696, 585, 4, 6, UNI_INTODHRI } /* blk=todhri */, - { 2, 2394, 6862, 6, 6, UNI_INBRAHMI } /* block=brahmi */, - { 32, 1874, 3218, 6, 9, UNI_SC__GEOR } /* script=georgian */, - { 97, 2394, 781, 6, 7, UNI_INMARCHEN } /* block=marchen */, - { 2, 2394, 341, 6, 5, UNI_VSSUP } /* block=vssup */, - { 0, 6431, 2055, 10, 2, UNI_LB__PO } /* linebreak=po */, - { 0, 323, 6715, 2, 5, UNI_MUSIC } /* inmusic */, - { 576, 6372, 56, 4, 3, UNI_CHAM } /* sc=cham */, - { 0, 1696, 719, 4, 5, UNI_INOSAGE } /* blk=osage */, - { 0, 8596, 5447, 22, 15, UNI_INSC__REGISTERSHIFTER } /* indicsyllabiccategory=registershifter */, - { 9, 3099, 309, 11, 2, UNI_IN__9 } /* presentin=v90 */, - { 32, 11, 2382, 1, 12, UNI_AEGEANNUMBERS } /* aegeannumbers */, - { 4, 1696, 897, 4, 7, UNI_INTIBETAN } /* blk=tibetan */, - { 192, 323, 8029, 2, 29, UNI_ENCLOSEDIDEOGRAPHICSUP } /* inenclosedideographicsupplement */, - { 1, 1230, 1701, 3, 6, UNI_CJKEXTD } /* incjkextd */, - { 0, 4703, 372, 8, 2, UNI_upper_values_index } /* uppercase= */, - { 296, 1874, 890, 7, 7, UNI_TAVT } /* script=taiviet */, - { 0, 185, 0, 4, 0, UNI_RJNG } /* rjng */, - { 32, 30, 578, 1, 5, UNI_TANG } /* istang */, - { 0, 135, 3325, 2, 15, UNI_ARMI } /* isimperialaramaic */, - { 131, 7233, 303, 24, 1, UNI_CCC__0 } /* canonicalcombiningclass=0 */, - { 2, 1744, 4337, 3, 14, UNI_PS } /* isopenpunctuation */, - { 1, 8088, 1443, 15, 2, UNI_M } /* generalcategory=m */, - { 267, 2666, 2696, 3, 9, UNI_LB__SG } /* lb=surrogate */, - { 1035, 135, 90, 2, 4, UNI_GUJR } /* isgujr */, - { 0, 3491, 309, 13, 2, UNI_NV__90 } /* numericvalue=90 */, - { 0, 4963, 630, 16, 3, UNI__PERL_PATWS } /* patternwhitespace=t */, - { 0, 135, 2847, 2, 6, UNI_COPT } /* iscoptic */, - { 0, 1230, 8436, 3, 24, UNI_DIACRITICALS } /* incombiningdiacriticalmarks */, - { 2, 4557, 4785, 17, 4, UNI_BOPO } /* scriptextensions=bopo */, - { 1, 1206, 650, 3, 4, UNI_EA__W } /* ea=wide */, - { 0, 4557, 209, 17, 4, UNI_TAVT } /* scriptextensions=tavt */, - { 128, 1126, 661, 4, 7, UNI_ELYM } /* scx=elymaic */, - { 0, 6146, 0, 4, 0, UNI_SINH } /* sinh */, - { 3, 135, 98, 2, 4, UNI_HLUW } /* ishluw */, - { 12, 4557, 1335, 17, 9, UNI_SIND } /* scriptextensions=khudawadi */, - { 2, 2394, 6602, 9, 18, UNI_CJKCOMPATFORMS } /* block=cjkcompatibilityforms */, - { 2, 1474, 605, 8, 2, UNI_CCC__107 } /* ccc=ccc107 */, - { 0, 4557, 94, 17, 4, UNI_GUKH } /* scriptextensions=gukh */, - { 75, 323, 557, 2, 6, UNI_INOLONAL } /* inolonal */, - { 1, 135, 265, 2, 2, UNI_CASEDLETTER } /* islc */, - { 2, 135, 2302, 2, 12, UNI_HUNG } /* isoldhungarian */, - { 32, 2, 0, 1, 0, UNI_C } /* c */, - { 0, 5, 645, 3, 2, -UNI_MCM } /* mcm=n */, - { 211, 312, 288, 2, 1, UNI_ri_values_index } /* ri= */, - { 129, 8861, 8639, 9, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* block=supsymbolsandpictographs */, - { 0, 4652, 6025, 14, 9, UNI_CYRILLICEXTA } /* block=cyrillicextendeda */, - { 329, 2504, 0, 7, 0, UNI_MYMR } /* myanmar */, - { 14, 5500, 0, 8, 0, UNI_CHER } /* cherokee */, - { 0, 135, 4291, 2, 12, UNI_DIACRITICALS } /* isdiacriticals */, - { 148, 7307, 6025, 8, 9, UNI_ARABICEXTA } /* inarabicextendeda */, - { 48, 323, 5565, 2, 20, UNI_INNYIAKENGPUACHUEHMONG } /* innyiakengpuachuehmong */, - { 0, 3639, 3647, 8, 5, UNI_ZL } /* lineseparator */, - { 0, 135, 177, 2, 4, UNI_PHNX } /* isphnx */, - { 236, 7847, 7233, 18, 9, UNI_DT__CAN } /* decompositiontype=canonical */, - { 1, 904, 963, 5, 6, -UNI_UIDEO } /* uideo=false */, - { 174, 4005, 2974, 15, 2, UNI_sterm_values_index } /* sentenceterminal= */, - { 2, 30, 3519, 1, 16, UNI_SARB } /* inoldsoutharabian */, - { 5, 6372, 470, 3, 4, UNI_SC__ONAO } /* sc=onao */, - { 4, 8920, 0, 43, 0, UNI_UCASEXTA } /* unifiedcanadianaboriginalsyllabicsextendeda */, - { 558, 4557, 846, 17, 4, UNI_SYRC } /* scriptextensions=syrc */, - { 0, 6372, 2919, 3, 4, UNI_SC__MAHJ } /* sc=mahj */, - { 0, 1874, 430, 7, 4, UNI_SC__ARMN } /* script=armn */, - { 18, 135, 4219, 2, 4, UNI_SIND } /* issind */, - { 130, 969, 373, 6, 2, UNI_COMPEX } /* compex=y */, - { 2, 2394, 8761, 9, 33, UNI_CJKCOMPATIDEOGRAPHSSUP } /* block=cjkcompatibilityideographssupplement */, - { 1329, 1874, 422, 7, 4, UNI_MIAO } /* script=miao */, - { 0, 135, 3360, 2, 13, UNI_XPOSIXDIGIT } /* isdecimalnumber */, - { 10, 1126, 478, 4, 4, UNI_PHLI } /* scx=phli */, - { 148, 2612, 682, 3, 3, UNI_JG__NUN } /* jg=nun */, - { 3, 323, 4380, 2, 10, UNI_INMANICHAEAN } /* inmanichaean */, - { 0, 135, 1270, 2, 4, UNI_MULT } /* ismult */, - { 0, 2338, 595, 11, 2, UNI_IN__1_DOT_1 } /* presentin=1.1 */, - { 0, 1126, 217, 4, 4, UNI_TGLG } /* scx=tglg */, - { 650, 5719, 631, 21, 2, UNI_CWL } /* changeswhenlowercased=t */, - { 72, 4557, 393, 17, 4, UNI_GOTH } /* scriptextensions=goth */, - { 1, 3824, 145, 4, 2, UNI_JG__MIM } /* jg=mim */, - { 1, 4261, 0, 15, 0, UNI_VEDICEXT } /* vedicextensions */, - { 0, 2909, 5997, 3, 15, UNI_ENCLOSEDALPHANUM } /* isenclosedalphanum */, - { 143, 451, 5086, 3, 16, UNI_ALCHEMICAL } /* inalchemicalsymbols */, - { 9, 8095, 3373, 9, 13, UNI_ME } /* category=enclosingmark */, - { 1, 1874, 455, 8, 3, UNI_MRO } /* script=mroo */, - { 0, 336, 0, 4, 0, UNI_TAKR } /* takr */, - { 288, 11, 5821, 1, 18, UNI_ANCIENTGREEKNUMBERS } /* ancientgreeknumbers */, - { 0, 7585, 87, 11, 2, UNI_BC__LRE } /* bidiclass=lre */, - { 18, 323, 1277, 2, 7, UNI_NB } /* innoblock */, - { 0, 2601, 1993, 6, 5, UNI_XPOSIXGRAPH } /* xposixgraph */, - { 2, 1696, 1492, 7, 7, UNI_CJKSTROKES } /* blk=cjkstrokes */, - { 26, 1874, 1553, 7, 8, UNI_SC__JAVA } /* script=javanese */, - { 0, 1126, 4754, 4, 7, UNI_LINB } /* scx=linearb */, - { 2, 135, 2314, 2, 8, UNI_PHAISTOS } /* isphaistos */, - { 65, 2666, 0, 3, 0, UNI_lb_values_index } /* lb= */, - { 1, 323, 5044, 2, 8, UNI_TAMILSUP } /* intamilsup */, - { 2, 2666, 4431, 3, 14, UNI_LB__CR } /* lb=carriagereturn */, - { 1, 135, 1714, 2, 11, UNI_CPMN } /* iscyprominoan */, - { 7, 170, 645, 3, 2, -UNI_PCM } /* pcm=n */, - { 234, 83, 127, 2, 2, UNI_ONAO } /* onao */, - { 8, 3099, 420, 11, 2, UNI_IN__6_DOT_1 } /* presentin=v61 */, - { 0, 8095, 349, 9, 2, UNI_PD } /* category=pd */, - { 30, 2266, 2258, 4, 8, UNI_NV__1_SLASH_20 } /* nv=5.000e-02 */, - { 0, 4097, 645, 17, 2, -UNI_EPRES } /* emojipresentation=n */, - { 0, 2372, 2654, 9, 4, -UNI_IDC } /* idcontinue=no */, - { 136, 38, 123, 1, 3, UNI_KRAI } /* krai */, - { 4, 323, 1165, 2, 8, UNI_INVITHKUQI } /* invithkuqi */, - { 0, 1126, 1598, 4, 4, UNI_NAGM } /* scx=nagm */, - { 1, 1474, 417, 7, 2, UNI_CCC__15 } /* ccc=ccc15 */, - { 0, 1126, 1417, 4, 4, UNI_PAUC } /* scx=pauc */, - { 0, 33, 5518, 1, 17, UNI_SMALLKANAEXT } /* smallkanaextension */, - { 0, 2114, 963, 5, 2, -UNI_XPOSIXALPHA } /* alpha=f */, - { 1, 2, 8660, 1, 34, UNI_DIACRITICALSFORSYMBOLS } /* combiningdiacriticalmarksforsymbols */, - { 8, 8095, 4945, 9, 18, UNI_ZP } /* category=paragraphseparator */, - { 0, 4540, 645, 17, 2, -UNI_RI } /* regionalindicator=n */, - { 322, 1446, 963, 8, 6, -UNI_XIDS } /* xidstart=false */, - { 81, 7233, 6548, 24, 3, UNI_CCC__202 } /* canonicalcombiningclass=atb */, - { 1, 1752, 0, 11, 0, UNI_GUKH } /* gurungkhema */, - { 0, 1696, 1381, 4, 9, UNI_INOLDPERMIC } /* blk=oldpermic */, - { 0, 861, 0, 7, 0, UNI_SHAW } /* shavian */, - { 37, 1696, 297, 4, 5, UNI_INNUSHU } /* blk=nushu */, - { 0, 2599, 3185, 8, 6, UNI_XPOSIXXDIGIT } /* isxposixxdigit */, - { 1156, 2345, 2138, 3, 2, UNI_IN__11 } /* in=11 */, - { 0, 2909, 6025, 10, 9, UNI_ETHIOPICEXTA } /* isethiopicextendeda */, - { 64, 2666, 3557, 3, 3, UNI_LB__ZWJ } /* lb=zwj */, - { 0, 358, 0, 5, 0, UNI_CCC__1 } /* ccc=1 */, - { 0, 5604, 0, 20, 0, UNI_vo_values_index } /* verticalorientation= */, - { 146, 4635, 4888, 12, 10, UNI_LATINEXTADDITIONAL } /* blk=latinextadditional */, - { 21, 1126, 1482, 4, 10, UNI_CHRS } /* scx=chorasmian */, - { 4, 135, 4980, 2, 18, UNI_RUMI } /* isruminumeralsymbols */, - { 0, 135, 4858, 2, 4, UNI_TALE } /* istale */, - { 5, 126, 0, 4, 0, UNI_LAO } /* laoo */, - { 0, 5069, 373, 13, 4, UNI_EMOD } /* emojimodifier=yes */, - { 25, 7061, 8792, 23, 3, UNI_di_values_index } /* defaultignorablecodepoint= */, - { 0, 751, 3723, 5, 11, UNI_KANGXI } /* inkangxiradicals */, - { 59, 729, 0, 5, 0, UNI_BATK } /* batak */, - { 130, 2612, 2645, 3, 10, UNI_JG__REVERSEDPE } /* jg=reversedpe */, - { 144, 1934, 645, 5, 2, -UNI_BIDIC } /* bidic=n */, - { 6, 1874, 774, 7, 7, UNI_SC__MAND } /* script=mandaic */, - { 4, 7847, 645, 17, 5, UNI_DT__NONE } /* decompositiontype=none */, - { 7, 6188, 0, 6, 0, UNI_YIJING } /* yijing */, - { 1, 6431, 3860, 10, 6, UNI_LB__AK } /* linebreak=aksara */, - { 0, 358, 2155, 4, 2, UNI_CCC__29 } /* ccc=29 */, - { 0, 6250, 5997, 7, 15, UNI_ENCLOSEDALPHANUM } /* block=enclosedalphanum */, - { 208, 8564, 4543, 32, 4, UNI_CJKEXTA } /* block=cjkunifiedideographsextensiona */, - { 218, 4557, 1015, 17, 4, UNI_HATR } /* scriptextensions=hatr */, - { 0, 6647, 6660, 13, 10, UNI_JG__AFRICANQAF } /* joininggroup=africanqaf */, - { 2, 4557, 876, 17, 7, UNI_TGLG } /* scriptextensions=tagalog */, - { 3, 1097, 304, 5, 1, UNI_NV__1_SLASH_4 } /* nv=1/4 */, - { 0, 323, 4261, 2, 15, UNI_VEDICEXT } /* invedicextensions */, - { 136, 358, 8900, 4, 13, UNI_CCC__214 } /* ccc=attachedabove */, - { 0, 323, 32, 2, 2, UNI_INVS } /* invs */, - { 154, 2201, 551, 4, 2, UNI_NV__2_SLASH_5 } /* nv=2/5 */, - { 1, 6372, 5565, 3, 20, UNI_HMNP } /* sc=nyiakengpuachuehmong */, - { 1258, 1696, 729, 4, 5, UNI_INBATAK } /* blk=batak */, - { 2, 1126, 7923, 4, 4, UNI_EGYP } /* scx=egyp */, - { 131, 1696, 4414, 4, 17, UNI_INKHITANSMALLSCRIPT } /* blk=khitansmallscript */, - { 72, 2612, 7544, 3, 14, UNI_JG__HAMZAONHEHGOAL } /* jg=tehmarbutagoal */, - { 32, 2266, 2224, 6, 6, UNI_NV__7_SLASH_12 } /* nv=5.833e-01 */, - { 6, 2394, 1752, 6, 11, UNI_INGURUNGKHEMA } /* block=gurungkhema */, - { 6, 4557, 5014, 17, 4, UNI_BAMU } /* scriptextensions=bamu */, - { 67, 135, 82, 2, 4, UNI_GONG } /* isgong */, - { 1, 3491, 803, 13, 2, UNI_NV__21 } /* numericvalue=21 */, - { 0, 7233, 2146, 24, 2, UNI_CCC__25 } /* canonicalcombiningclass=25 */, - { 0, 4156, 644, 16, 3, -UNI_IDCOMPATMATHSTART } /* idcompatmathstart=n */, - { 0, 3301, 631, 14, 2, UNI_GREXT } /* graphemeextend=t */, - { 1, 3778, 536, 3, 5, UNI_LYDI } /* islydian */, - { 0, 323, 6053, 2, 19, UNI_SUNDANESESUP } /* insundanesesupplement */, - { 24, 2502, 4793, 9, 9, UNI_MYANMAREXTC } /* inmyanmarextendedc */, - { 0, 4005, 631, 16, 2, UNI_STERM } /* sentenceterminal=t */, - { 0, 1499, 963, 3, 2, -UNI_DEP } /* dep=f */, - { 1, 3301, 645, 14, 3, -UNI_GREXT } /* graphemeextend=no */, - { 2, 1441, 390, 3, 2, UNI_WB__SQ } /* wb=sq */, - { 608, 7356, 645, 26, 2, -UNI_PCM } /* prependedconcatenationmark=n */, - { 30, 5364, 0, 20, 0, UNI_EXTPICT } /* extendedpictographic */, - { 1, 30, 4320, 1, 6, UNI_XPOSIXLOWER } /* islower */, - { 0, 306, 1367, 3, 2, UNI_NV__32 } /* nv=32 */, - { 42, 2394, 6996, 6, 21, UNI_MEETEIMAYEKEXT } /* block=meeteimayekextensions */, - { 8, 770, 3276, 2, 13, UNI_ea_values_index } /* eastasianwidth= */, - { 89, 1097, 1362, 5, 3, UNI_NV__1_SLASH_160 } /* nv=1/160 */, - { 0, 2338, 0, 10, 0, UNI_in_values_index } /* presentin= */, - { 0, 4557, 1083, 17, 8, UNI_MAHJ } /* scriptextensions=mahajani */, - { 3, 1447, 644, 6, 3, -UNI_IDS } /* idstart=n */, - { 21, 135, 3652, 2, 16, UNI_HALFANDFULLFORMS } /* ishalfandfullforms */, - { 0, 969, 963, 6, 6, -UNI_COMPEX } /* compex=false */, - { 68, 1696, 3325, 4, 15, UNI_INIMPERIALARAMAIC } /* blk=imperialaramaic */, - { 4, 5260, 5930, 10, 9, UNI_WB__EB } /* wordbreak=emodifier */, - { 0, 6034, 0, 9, 0, UNI_MONG } /* mongolian */, - { 0, 2314, 0, 8, 0, UNI_PHAISTOS } /* phaistos */, - { 1, 1279, 4379, 5, 11, UNI_INMANICHAEAN } /* block=manichaean */, - { 36, 323, 4937, 2, 8, UNI_DINGBATS } /* indingbats */, - { 0, 4291, 6841, 8, 3, UNI_DIA } /* diacritic=t */, - { 0, 3125, 1698, 12, 2, UNI_qmark_values_index } /* quotationmark= */, - { 152, 306, 2152, 3, 9, UNI_NV__1_SLASH_7 } /* nv=1.429e-01 */, - { 8, 1441, 3541, 5, 4, UNI_WB__MN } /* wb=midnum */, - { 1, 7979, 2066, 23, 3, UNI_JG__MANICHAEANWAW } /* joininggroup=manichaeanwaw */, - { 81, 3178, 644, 12, 2, UNI_ahex_values_index } /* asciihexdigit= */, - { 761, 1874, 225, 7, 4, UNI_SC__TODR } /* script=todr */, - { 0, 4594, 0, 11, 0, UNI_SGNW } /* signwriting */, - { 0, 1097, 920, 5, 2, UNI_NV__1_SLASH_10 } /* nv=1/10 */, - { 2, 6838, 4241, 8, 8, UNI_INPC__TOPANDRIGHT } /* inpc=topandright */, - { 376, 4557, 1408, 17, 9, UNI_PALM } /* scriptextensions=palmyrene */, - { 673, 5782, 591, 21, 3, UNI_WB__EB } /* graphemeclusterbreak=ebg */, - { 64, 924, 1368, 5, 2, UNI_AGE__2 } /* age=v20 */, - { 0, 1696, 861, 4, 7, UNI_SC__SHAW } /* blk=shavian */, - { 945, 2666, 864, 3, 2, UNI_LB__VI } /* lb=vi */, - { 290, 916, 2241, 4, 3, UNI_AGE__4_DOT_1 } /* age=4.1 */, - { 0, 1441, 0, 3, 0, UNI_wb_values_index } /* wb= */, - { 6, 3106, 1362, 4, 3, UNI_IN__16 } /* in=v160 */, - { 1, 1874, 86, 7, 4, UNI_SC__GREK } /* script=grek */, - { 0, 1654, 963, 10, 2, -UNI_SD } /* softdotted=f */, - { 2, 135, 2005, 2, 12, UNI_GONG } /* isgunjalagondi */, - { 0, 2666, 1821, 3, 8, UNI_LB__LF } /* lb=linefeed */, - { 154, 4557, 709, 17, 5, UNI_LIMB } /* scriptextensions=limbu */, - { 0, 275, 631, 3, 2, UNI_CWT } /* cwt=t */, - { 34, 1781, 1655, 3, 9, UNI_SD } /* issoftdotted */, - { 14, 7233, 1707, 24, 7, UNI_CCC__1 } /* canonicalcombiningclass=overlay */, - { 1, 6250, 8168, 7, 29, UNI_ENCLOSEDALPHANUMSUP } /* block=enclosedalphanumericsupplement */, - { 1, 6647, 5148, 13, 16, UNI_JG__HANIFIROHINGYAPA } /* joininggroup=hanifirohingyapa */, - { 267, 8142, 6773, 25, 5, UNI_CJKEXTC } /* cjkunifiedideographsextensionc */, - { 7, 1874, 1129, 6, 5, UNI_TALU } /* script=talu */, - { 848, 7585, 52, 10, 2, UNI_BC__AN } /* bidiclass=an */, - { 132, 1874, 3623, 7, 7, UNI_SC__CPRT } /* script=cypriot */, - { 32, 135, 6350, 2, 20, UNI_IDCOMPATMATHCONTINUE } /* isidcompatmathcontinue */, - { 0, 177, 0, 4, 0, UNI_PHNX } /* phnx */, - { 0, 6647, 520, 13, 3, UNI_JG__HAH } /* joininggroup=hah */, - { 9, 1126, 1157, 4, 4, UNI_UGAR } /* scx=ugar */, - { 0, 2394, 760, 6, 7, UNI_KALI } /* block=kayahli */, - { 258, 8095, 690, 8, 2, UNI_L } /* category=l */, - { 0, 2394, 1149, 6, 8, UNI_INTIFINAGH } /* block=tifinagh */, - { 41, 135, 2602, 2, 10, UNI_POSIXBLANK } /* isposixblank */, - { 1, 6431, 68, 10, 2, UNI_LB__PR } /* linebreak=pr */, - { 8, 1654, 373, 10, 2, UNI_SD } /* softdotted=y */, - { 3, 7847, 51, 18, 3, UNI_DT__CAN } /* decompositiontype=can */, - { 0, 6372, 1305, 3, 7, UNI_SC__SUNU } /* sc=sunuwar */, - { 249, 135, 7923, 2, 28, UNI_EGYPTIANHIEROGLYPHSEXTA } /* isegyptianhieroglyphsextendeda */, - { 0, 399, 644, 4, 3, -UNI_GREXT } /* grext=n */, - { 9, 6647, 2942, 13, 11, UNI_JG__ROHINGYAYEH } /* joininggroup=rohingyayeh */, - { 0, 275, 0, 3, 0, UNI_CWT } /* cwt */, - { 0, 6250, 6400, 12, 12, UNI_ETHIOPICSUP } /* block=ethiopicsupplement */, - { 0, 2338, 2756, 10, 3, UNI_IN__6_DOT_1 } /* presentin=6.1 */, - { 4, 6707, 0, 23, 0, UNI_ZNAMENNYMUSIC } /* znamennymusicalnotation */, - { 41, 1696, 201, 4, 4, UNI_TAGS } /* blk=tags */, - { 80, 1566, 123, 3, 3, UNI_KRAI } /* iskrai */, - { 25, 3491, 3489, 13, 2, UNI_NV__36 } /* numericvalue=36 */, - { 0, 4557, 482, 17, 4, UNI_MIAO } /* scriptextensions=plrd */, - { 0, 1696, 8108, 4, 32, UNI_INIDC } /* blk=ideographicdescriptioncharacters */, - { 7, 401, 0, 3, 0, UNI_EXT } /* ext */, - { 0, 2666, 3548, 3, 4, UNI_LB__GL } /* lb=glue */, - { 72, 1696, 213, 9, 2, UNI_CJKEXTF } /* blk=cjkextf */, - { 0, 6955, 734, 14, 3, UNI_JG__MEEM } /* joininggroup=meem */, - { 0, 5260, 4540, 10, 17, UNI_RI } /* wordbreak=regionalindicator */, - { 0, 8088, 3111, 16, 2, UNI_PS } /* generalcategory=ps */, - { 13, 7061, 963, 25, 2, -UNI_DI } /* defaultignorablecodepoint=f */, - { 0, 3491, 556, 14, 1, UNI_NV__47 } /* numericvalue=47 */, - { 0, 64, 1107, 1, 7, UNI_POSIXWORD } /* perlword */, - { 0, 2394, 3447, 6, 15, UNI_INMEROITICCURSIVE } /* block=meroiticcursive */, - { 0, 323, 2405, 2, 13, UNI_BLOCKELEMENTS } /* inblockelements */, - { 0, 1874, 150, 7, 4, UNI_NARB } /* script=narb */, - { 0, 323, 2043, 2, 10, UNI_YIRADICALS } /* inyiradicals */, - { 0, 6372, 890, 3, 7, UNI_TAVT } /* sc=taiviet */, - { 0, 2666, 68, 3, 2, UNI_LB__PR } /* lb=pr */, - { 36, 7090, 373, 20, 4, UNI_CE } /* compositionexclusion=yes */, - { 0, 1965, 0, 8, 0, UNI_UCASEXTA } /* ucasexta */, - { 9, 5462, 0, 20, 0, UNI_PHLI } /* inscriptionalpahlavi */, - { 0, 3961, 3959, 14, 2, UNI_NV__7_SLASH_8 } /* numericvalue=7/8 */, - { 646, 1773, 2772, 3, 13, UNI_ANCIENTSYMBOLS } /* isancientsymbols */, - { 120, 135, 830, 2, 4, UNI_LANA } /* islana */, - { 304, 3476, 373, 13, 4, UNI_NFDQC__Y } /* nfdquickcheck=yes */, - { 65, 5719, 631, 21, 5, UNI_CWL } /* changeswhenlowercased=true */, - { 0, 21, 8168, 1, 20, UNI_ENCLOSEDALPHANUM } /* enclosedalphanumerics */, - { 0, 3227, 8627, 5, 33, UNI_MISCPICTOGRAPHS } /* blk=miscellaneoussymbolsandpictographs */, - { 0, 1322, 401, 5, 4, UNI_CJKEXTH } /* iscjkexth */, - { 3, 323, 6392, 2, 13, UNI_GLAGOLITICSUP } /* inglagoliticsup */, - { 64, 4557, 450, 17, 4, UNI_LINA } /* scriptextensions=lina */, - { 0, 7951, 0, 18, 0, UNI_INVS } /* variationselectors */, - { 0, 1471, 2440, 3, 12, UNI_GREEKEXT } /* ingreekextended */, - { 1027, 20, 631, 3, 5, UNI_XPOSIXXDIGIT } /* hex=true */, - { 8, 2394, 897, 6, 7, UNI_INTIBETAN } /* block=tibetan */, - { 0, 6372, 278, 3, 5, UNI_SC__GARA } /* sc=garay */, - { 2, 434, 645, 2, 2, -UNI_DI } /* di=n */, - { 1, 2394, 6571, 6, 23, UNI_COMPATJAMO } /* block=hangulcompatibilityjamo */, - { 322, 1696, 4980, 4, 4, UNI_RUMI } /* blk=rumi */, - { 0, 1874, 1305, 7, 4, UNI_SC__SUNU } /* script=sunu */, - { 293, 6350, 630, 19, 6, UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=true */, - { 14, 2394, 2029, 6, 7, UNI_INSOGDIAN } /* block=sogdian */, - { 0, 6372, 426, 3, 4, UNI_SC__TOTO } /* sc=toto */, - { 72, 3778, 4888, 10, 10, UNI_LATINEXTADDITIONAL } /* islatinextadditional */, - { 1, 6264, 2440, 7, 12, UNI_GREEKEXT } /* block=greekextended */, - { 0, 7233, 3238, 24, 11, UNI_CCC__DA } /* canonicalcombiningclass=doubleabove */, - { 89, 2833, 1938, 3, 7, UNI_XPOSIXCNTRL } /* gc=control */, - { 12, 1647, 0, 2, 0, UNI_LOWERCASELETTER } /* ll */, - { 1, 1696, 1157, 4, 8, UNI_INUGARITIC } /* blk=ugaritic */, - { 0, 6072, 4741, 12, 13, UNI_SUPPUNCTUATION } /* issupplementalpunctuation */, - { 16564, 1696, 6552, 4, 19, UNI_JAMOEXTB } /* blk=hanguljamoextendedb */, - { 587, 5325, 4832, 10, 12, UNI_LATIN1 } /* block=latin1supplement */, - { 5, 2785, 0, 4, 0, UNI_BC__R } /* bc=r */, - { 7, 643, 647, 4, 3, UNI_DT__NONE } /* dt=none */, - { 105, 4557, 31, 17, 4, UNI_AVST } /* scriptextensions=avst */, - { 2, 399, 644, 4, 2, UNI_grext_values_index } /* grext= */, - { 0, 2471, 2444, 10, 8, UNI_ETHIOPICEXT } /* inethiopicextended */, - { 4, 3360, 0, 13, 0, UNI_XPOSIXDIGIT } /* decimalnumber */, - { 0, 1874, 535, 7, 6, UNI_SC__LYDI } /* script=lydian */, - { 2, 6372, 2029, 3, 4, UNI_SC__SOGD } /* sc=sogd */, - { 2, 2612, 238, 3, 2, UNI_JG__PE } /* jg=pe */, - { 0, 4219, 0, 4, 0, UNI_SIND } /* sind */, - { 0, 7086, 631, 24, 5, UNI_COMPEX } /* fullcompositionexclusion=true */, - { 0, 7233, 370, 24, 2, UNI_CCC__9 } /* canonicalcombiningclass=vr */, - { 0, 6372, 102, 3, 4, UNI_HMNG } /* sc=hmng */, - { 26, 3520, 0, 15, 0, UNI_SARB } /* oldsoutharabian */, - { 3, 6372, 63, 3, 4, UNI_SC__CPMN } /* sc=cpmn */, - { 1, 4557, 2802, 16, 5, UNI_ARAB } /* scriptextensions=arab */, - { 26, 306, 596, 3, 2, UNI_NV__13 } /* nv=13 */, - { 2, 2069, 2653, 9, 13, UNI_JT__U } /* joiningtype=nonjoining */, - { 3, 1885, 0, 11, 0, UNI_SORA } /* sorasompeng */, - { 5, 6372, 661, 3, 4, UNI_ELYM } /* sc=elym */, - { 129, 1126, 850, 4, 4, UNI_QAAI } /* scx=zinh */, - { 0, 1315, 0, 7, 0, UNI_TIRH } /* tirhuta */, - { 0, 323, 6034, 2, 9, UNI_INMONGOLIAN } /* inmongolian */, - { 20, 7233, 3611, 24, 12, UNI_CCC__0 } /* canonicalcombiningclass=notreordered */, - { 0, 4557, 2878, 17, 5, UNI_KHMR } /* scriptextensions=khmer */, - { 24, 30, 1992, 1, 6, UNI_XPOSIXGRAPH } /* isgraph */, - { 4, 135, 59, 2, 4, UNI_CHRS } /* ischrs */, - { 0, 323, 946, 2, 8, UNI_INBASSAVAH } /* inbassavah */, - { 40, 1126, 617, 4, 7, UNI_AVST } /* scx=avestan */, - { 227, 1874, 241, 7, 4, UNI_XSUX } /* script=xsux */, - { 6, 2785, 52, 3, 2, UNI_BC__AN } /* bc=an */, - { 37, 1924, 2044, 3, 9, UNI_YIRADICALS } /* isyiradicals */, - { 33, 1934, 631, 11, 5, UNI_BIDIC } /* bidicontrol=true */, - { 0, 193, 0, 4, 0, UNI_SAMR } /* samr */, - { 0, 451, 2867, 3, 11, UNI_ALPHABETICPF } /* inalphabeticpf */, - { 128, 4005, 373, 16, 4, UNI_STERM } /* sentenceterminal=yes */, - { 21, 358, 3489, 4, 2, UNI_CCC__36 } /* ccc=36 */, - { 0, 5782, 591, 21, 2, UNI_WB__EB } /* graphemeclusterbreak=eb */, - { 0, 54, 3826, 2, 10, UNI_SC__MLYM } /* sc=malayalam */, - { 0, 8596, 3354, 31, 6, UNI_INSC__CONSONANTKILLER } /* indicsyllabiccategory=consonantkiller */, - { 1, 1446, 644, 7, 3, -UNI_XIDS } /* xidstart=n */, - { 3, 3696, 373, 4, 2, UNI_IDSU } /* idsu=y */, - { 0, 1499, 631, 3, 5, UNI_DEP } /* dep=true */, - { 911, 7086, 631, 24, 2, UNI_COMPEX } /* fullcompositionexclusion=t */, - { 257, 1945, 631, 5, 2, UNI_BIDIM } /* bidim=t */, - { 1, 316, 373, 5, 2, UNI__PERL_PATWS } /* patws=y */, - { 0, 2666, 3552, 8, 5, UNI_LB__BA } /* lb=breakafter */, - { 0, 358, 458, 4, 2, UNI_CCC__7 } /* ccc=nk */, - { 3, 323, 1291, 2, 7, UNI_INSIDDHAM } /* insiddham */, - { 0, 2564, 3740, 9, 9, UNI_GEORGIANEXT } /* isgeorgianextended */, - { 278, 135, 8867, 2, 33, UNI_SUPMATHOPERATORS } /* issupplementalmathematicaloperators */, - { 182, 6372, 1039, 3, 4, UNI_SC__TELU } /* sc=telu */, - { 11, 394, 6903, 3, 8, UNI_LO } /* otherletter */, - { 0, 55, 0, 4, 0, UNI_CHAM } /* cham */, - { 588, 7585, 3806, 10, 14, UNI_BC__NSM } /* bidiclass=nonspacingmark */, - { 27, 1126, 3505, 4, 15, UNI_NARB } /* scx=oldnortharabian */, - { 67, 135, 3750, 2, 11, UNI_PHONETICEXT } /* isphoneticext */, - { 6, 1230, 8436, 3, 32, UNI_DIACRITICALSEXT } /* incombiningdiacriticalmarksextended */, - { 148, 4321, 372, 8, 3, UNI_XPOSIXLOWER } /* lowercase=y */, - { 37, 6431, 2696, 10, 9, UNI_LB__SG } /* linebreak=surrogate */, - { 653, 2394, 975, 6, 8, UNI_INDUPLOYAN } /* block=duployan */, - { 1, 2573, 645, 5, 3, -UNI_JOINC } /* joinc=no */, - { 13, 326, 373, 5, 2, UNI_QMARK } /* qmark=y */, - { 918, 8095, 5352, 13, 12, UNI_PO } /* category=otherpunctuation */, - { 1, 5014, 0, 4, 0, UNI_BAMU } /* bamu */, - { 1, 2053, 3365, 7, 5, UNI_POSIXALNUM } /* isposixalnum */, - { 68, 668, 963, 7, 2, -UNI_EXTPICT } /* extpict=f */, - { 0, 2666, 1829, 3, 8, UNI_LB__NL } /* lb=nextline */, - { 0, 3491, 2240, 12, 10, UNI_NV__5_SLASH_12 } /* numericvalue=4.167e-01 */, - { 1538, 2345, 597, 3, 3, UNI_IN__3 } /* in=3.0 */, - { 0, 7697, 364, 27, 2, UNI_CCC__31 } /* canonicalcombiningclass=ccc31 */, - { 775, 6277, 2706, 7, 12, UNI_MAYANNUMERALS } /* block=mayannumerals */, - { 0, 8095, 1522, 9, 2, UNI_ZS } /* category=zs */, - { 412, 4557, 782, 18, 6, UNI_MARC } /* scriptextensions=marchen */, - { 1, 5044, 0, 15, 0, UNI_TAMILSUP } /* tamilsupplement */, - { 233, 1126, 2802, 3, 5, UNI_ARAB } /* scx=arab */, - { 0, 916, 2756, 4, 3, UNI_AGE__6_DOT_1 } /* age=6.1 */, - { 128, 687, 0, 5, 0, UNI_GCB__L } /* hst=l */, - { 0, 2290, 2161, 4, 8, UNI_NV__17_SLASH_2 } /* nv=8.500e+00 */, - { 0, 135, 458, 2, 4, UNI_NKO } /* isnkoo */, - { 0, 135, 6015, 2, 10, UNI_JAMO } /* ishanguljamo */, - { 1, 5014, 0, 8, 0, UNI_BAMUMSUP } /* bamumsup */, - { 5, 1126, 1375, 4, 4, UNI_ITAL } /* scx=ital */, - { 0, 323, 6188, 2, 6, UNI_YIJING } /* inyijing */, - { 64, 323, 2122, 2, 12, UNI_INMENDEKIKAKUI } /* inmendekikakui */, - { 1, 2899, 6400, 8, 12, UNI_CYRILLICSUP } /* iscyrillicsupplement */, - { 0, 135, 2372, 2, 3, UNI_IDC } /* isidc */, - { 202, 1236, 2443, 2, 5, UNI_CJKEXTE } /* cjkexte */, - { 904, 6370, 6862, 5, 19, UNI_INSC__BRAHMIJOININGNUMBER } /* insc=brahmijoiningnumber */, - { 0, 1257, 343, 6, 3, UNI_KANASUP } /* inkanasup */, - { 0, 2799, 6400, 8, 12, UNI_ARABICSUP } /* blk=arabicsupplement */, - { 943, 2201, 1362, 4, 5, UNI_NV__216000 } /* nv=216000 */, - { 1, 1474, 1367, 8, 2, UNI_CCC__132 } /* ccc=ccc132 */, - { 0, 1874, 5858, 8, 18, UNI_SC__MERO } /* script=meroitichieroglyphs */, - { 8, 945, 630, 4, 6, UNI_EBASE } /* ebase=true */, - { 7, 1126, 2122, 4, 12, UNI_MEND } /* scx=mendekikakui */, - { 1, 2461, 4793, 10, 9, UNI_CYRILLICEXTC } /* incyrillicextendedc */, - { 222, 2394, 2314, 6, 8, UNI_PHAISTOS } /* block=phaistos */, - { 841, 6431, 3435, 10, 12, UNI_LB__IS } /* linebreak=infixnumeric */, - { 2, 5260, 3086, 10, 7, UNI_WB__NU } /* wordbreak=numeric */, - { 1698, 4173, 963, 4, 6, -UNI_IDSB } /* idsb=false */, - { 3, 8500, 3903, 3, 13, UNI_MISCMATHSYMBOLSA } /* miscmathsymbolsa */, - { 150, 4557, 278, 17, 5, UNI_GARA } /* scriptextensions=garay */, - { 97, 6372, 1528, 3, 8, UNI_SC__BUGI } /* sc=buginese */, - { 1, 1696, 8436, 5, 24, UNI_DIACRITICALS } /* blk=combiningdiacriticalmarks */, - { 0, 135, 617, 2, 7, UNI_AVST } /* isavestan */, - { 0, 5069, 373, 13, 2, UNI_EMOD } /* emojimodifier=y */, - { 132, 1945, 645, 5, 3, -UNI_BIDIM } /* bidim=no */, - { 0, 1126, 2029, 4, 7, UNI_SOGD } /* scx=sogdian */, - { 582, 2, 630, 1, 6, UNI_CE } /* ce=true */, - { 257, 358, 1189, 4, 5, UNI_CCC__7 } /* ccc=nukta */, - { 769, 1126, 249, 4, 4, UNI_ZANB } /* scx=zanb */, - { 66, 6104, 963, 21, 2, -UNI_LOE } /* logicalorderexception=f */, - { 7, 2338, 6482, 11, 3, UNI_IN__15_DOT_1 } /* presentin=15.1 */, - { 0, 434, 0, 4, 0, UNI_DIAK } /* diak */, - { 2, 7585, 2787, 9, 2, UNI_BC__R } /* bidiclass=r */, - { 0, 285, 1920, 4, 3, UNI_WB__EB } /* gcb=gaz */, - { 1, 135, 1646, 2, 3, UNI_ALL } /* isall */, - { 2, 3111, 0, 2, 0, UNI_PS } /* ps */, - { 0, 8088, 4817, 16, 16, UNI_PF } /* generalcategory=finalpunctuation */, - { 0, 1696, 6912, 4, 15, UNI_TRANSPORTANDMAP } /* blk=transportandmap */, - { 528, 135, 3560, 2, 15, UNI_ZANB } /* iszanabazarsquare */, - { 0, 4557, 5014, 17, 5, UNI_BAMU } /* scriptextensions=bamum */, - { 3, 323, 6015, 2, 19, UNI_JAMOEXTA } /* inhanguljamoextendeda */, - { 0, 2394, 1315, 6, 7, UNI_INTIRHUTA } /* block=tirhuta */, - { 0, 6372, 5500, 3, 4, UNI_SC__CHER } /* sc=cher */, - { 36, 323, 3668, 2, 16, UNI_HIGHPUSURROGATES } /* inhighpusurrogates */, - { 0, 3073, 373, 13, 4, UNI_NFCQC__Y } /* nfcquickcheck=yes */, - { 0, 135, 6862, 2, 6, UNI_BRAH } /* isbrahmi */, - { 0, 189, 0, 4, 0, UNI_RUNR } /* runr */, - { 3, 4504, 372, 5, 3, UNI_XPOSIXSPACE } /* wspace=y */, - { 0, 3274, 963, 14, 2, UNI_EA__F } /* eastasianwidth=f */, - { 0, 4557, 529, 17, 6, UNI_KHOJ } /* scriptextensions=khojki */, - { 1, 1126, 1598, 4, 10, UNI_NAGM } /* scx=nagmundari */, + { 0, 1733, 4332, 7, 4, UNI_CJKEXTH } /* blk=cjkexth */, + { 1, 2858, 4309, 3, 5, UNI_P } /* gc=punct */, + { 1, 4698, 0, 18, 0, UNI_COPTICEPACTNUMBERS } /* copticepactnumbers */, + { 8, 2858, 2083, 3, 2, UNI_PO } /* gc=po */, + { 2, 135, 7151, 2, 25, UNI_DI } /* isdefaultignorablecodepoint */, + { 0, 6039, 6053, 5, 7, UNI_SUPARROWSB } /* insuparrowsb */, + { 0, 3245, 7277, 7, 15, UNI_GEOMETRICSHAPESEXT } /* blk=geometricshapesext */, + { 0, 3808, 0, 7, 0, UNI_LATN } /* islatin */, + { 4, 135, 577, 2, 6, UNI_RJNG } /* isrejang */, + { 1, 3257, 3947, 5, 15, UNI_MISCMATHSYMBOLSA } /* blk=miscmathsymbolsa */, + { 4, 4586, 6116, 17, 9, UNI_SUND } /* scriptextensions=sundanese */, + { 7, 6464, 146, 3, 4, UNI_MTEI } /* sc=mtei */, + { 1, 3155, 639, 13, 5, UNI_QMARK } /* quotationmark=true */, + { 1, 7509, 5564, 5, 11, UNI_SMALLKANAEXT } /* blk=smallkanaext */, + { 0, 4681, 1573, 14, 4, UNI_CYRILLICEXTA } /* block=cyrillicexta */, + { 0, 135, 1030, 2, 6, UNI_KTHI } /* iskaithi */, + { 1, 2810, 0, 3, 0, UNI_bc_values_index } /* bc= */, + { 0, 135, 717, 2, 4, UNI_LIMB } /* islimb */, + { 4, 1733, 4097, 4, 17, UNI_INCAUCASIANALBANIAN } /* blk=caucasianalbanian */, + { 1, 135, 4248, 2, 4, UNI_SIND } /* issind */, + { 2, 4586, 2057, 17, 4, UNI_SOGD } /* scriptextensions=sogd */, + { 1, 6164, 1221, 10, 2, UNI_LB__CL } /* linebreak=cl */, + { 19, 1141, 1000, 4, 8, UNI_GUJR } /* scx=gujarati */, + { 4, 554, 564, 4, 1, UNI_NV__37 } /* nv=37 */, + { 0, 1465, 3565, 2, 3, UNI_WB__EX } /* wb=ex */, + { 6, 1141, 3141, 4, 14, UNI_PHLP } /* scx=psalterpahlavi */, + { 1, 5318, 6203, 6, 5, UNI__PERL_NCHAR } /* _perl_nchar */, + { 2, 4586, 162, 17, 4, UNI_ORYA } /* scriptextensions=orya */, + { 0, 2406, 639, 4, 5, UNI_XIDC } /* xidc=true */, + { 4, 1911, 1030, 7, 6, UNI_SC__KTHI } /* script=kaithi */, + { 0, 4185, 972, 17, 6, -UNI_IDCOMPATMATHSTART } /* idcompatmathstart=false */, + { 0, 135, 790, 2, 4, UNI_MARC } /* ismarc */, + { 1, 877, 653, 5, 2, -UNI_STERM } /* sterm=n */, + { 0, 4539, 653, 14, 3, UNI_NFKDQC__N } /* nfkdquickcheck=no */, + { 4, 679, 0, 2, 0, UNI_PI } /* pi */, + { 0, 3521, 0, 14, 0, UNI_NV__4 } /* numericvalue=4 */, + { 4, 5782, 296, 21, 1, UNI_cwl_values_index } /* changeswhenlowercased= */, + { 1, 409, 639, 5, 5, UNI_GREXT } /* grext=true */, + { 1, 1733, 543, 4, 6, UNI_INLYDIAN } /* blk=lydian */, + { 2, 4586, 5043, 17, 5, UNI_BAMU } /* scriptextensions=bamum */, + { 1, 4406, 654, 12, 4, UNI_JG__MANICHAEANONE } /* jg=manichaeanone */, + { 0, 1141, 742, 4, 5, UNI_BATK } /* scx=batak */, + { 1, 5088, 534, 9, 3, UNI_KANBUN } /* block=kanbun */, + { 3, 135, 99, 2, 2, UNI_UPPERCASELETTER } /* islu */, + { 14, 1141, 1137, 4, 4, UNI_NSHU } /* scx=nshu */, + { 5, 1258, 1573, 5, 4, UNI_CJKEXTA } /* incjkexta */, + { 3, 8765, 6952, 22, 19, UNI_INSC__BRAHMIJOININGNUMBER } /* indicsyllabiccategory=brahmijoiningnumber */, + { 4, 933, 374, 5, 2, UNI_AGE__3_DOT_1 } /* age=v31 */, + { 0, 333, 1066, 2, 8, UNI_JAMOEXTB } /* injamoextb */, + { 0, 3808, 3823, 3, 6, UNI_LISUSUP } /* islisusup */, + { 0, 3950, 383, 4, 4, UNI_MATH } /* math=yes */, + { 0, 4586, 51, 17, 4, UNI_CANS } /* scriptextensions=cans */, + { 0, 2765, 972, 13, 6, -UNI_PATSYN } /* patternsyntax=false */, + { 2, 135, 742, 2, 5, UNI_BATK } /* isbatak */, + { 0, 1141, 6484, 4, 4, UNI_GLAG } /* scx=glag */, + { 7, 2429, 341, 6, 5, UNI_INTAILE } /* block=taile */, + { 0, 6464, 1191, 3, 9, UNI_BERF } /* sc=beriaerfe */, + { 12, 3903, 2119, 3, 9, UNI_LB__B2 } /* lb=breakboth */, + { 0, 261, 0, 4, 0, UNI_ZYYY } /* zyyy */, + { 0, 322, 972, 2, 2, -UNI_RI } /* ri=f */, + { 0, 651, 4449, 3, 5, UNI_DT__SML } /* dt=small */, + { 0, 409, 972, 5, 6, -UNI_GREXT } /* grext=false */, + { 1, 2429, 110, 6, 4, UNI_INKAWI } /* block=kawi */, + { 1, 5098, 2677, 16, 3, -UNI_EBASE } /* emojimodifierbase=n */, + { 2, 2273, 2196, 4, 8, UNI_NV__9_SLASH_2 } /* nv=4.500e+00 */, + { 1, 984, 486, 2, 2, UNI_DUPL } /* dupl */, + { 0, 5098, 971, 16, 7, -UNI_EBASE } /* emojimodifierbase=false */, + { 1, 831, 0, 4, 0, UNI_HMNP } /* hmnp */, + { 7, 676, 383, 7, 2, UNI_EXTPICT } /* extpict=y */, + { 6, 2429, 5920, 6, 19, UNI_SC__MERO } /* block=meroitichieroglyphs */, + { 0, 135, 978, 2, 6, UNI_COMPEX } /* iscompex */, + { 4, 6464, 1903, 3, 4, UNI_SC__MONG } /* sc=mong */, + { 12, 2337, 0, 12, 0, UNI_HUNG } /* oldhungarian */, + { 0, 4185, 972, 17, 2, -UNI_IDCOMPATMATHSTART } /* idcompatmathstart=f */, + { 14, 368, 2834, 4, 4, UNI_CCC__6 } /* ccc=hanr */, + { 1, 583, 1221, 3, 2, UNI_SB__CL } /* sb=cl */, + { 1, 2858, 876, 3, 2, UNI__PERL_SURROGATE } /* gc=cs */, + { 2, 2525, 0, 9, 0, UNI_INMYANMAR } /* inmyanmar */, + { 0, 4887, 0, 4, 0, UNI_TALE } /* tale */, + { 0, 1733, 5628, 4, 20, UNI_INNYIAKENGPUACHUEHMONG } /* blk=nyiakengpuachuehmong */, + { 1, 6321, 5239, 20, 7, UNI_BPT__C } /* bidipairedbrackettype=close */, + { 2, 835, 0, 4, 0, UNI_KALI } /* kali */, + { 9, 4586, 4335, 17, 4, UNI_HANG } /* scriptextensions=hang */, + { 0, 6356, 404, 7, 5, UNI_INGOTHIC } /* block=gothic */, + { 0, 2467, 0, 8, 0, UNI_ASSIGNED } /* assigned */, + { 1, 2858, 3852, 3, 11, UNI_MC } /* gc=spacingmark */, + { 0, 3521, 375, 13, 2, UNI_NV__18 } /* numericvalue=18 */, + { 1, 2325, 5612, 4, 5, UNI_NV__800000 } /* nv=800000 */, + { 2, 6597, 0, 14, 0, UNI_BC__L } /* bc=lefttoright */, + { 1, 3403, 0, 13, 0, UNI_ME } /* enclosingmark */, + { 3, 2429, 3794, 6, 10, UNI_INDEVANAGARI } /* block=devanagari */, + { 2, 2496, 1070, 10, 4, UNI_CYRILLICEXTB } /* incyrillicextb */, + { 2, 1098, 0, 8, 0, UNI_MAHJ } /* mahajani */, + { 5, 2596, 383, 5, 2, UNI_JOINC } /* joinc=y */, + { 0, 1911, 217, 7, 4, UNI_SC__TFNG } /* script=tfng */, + { 7, 2373, 423, 10, 2, UNI_IN__16 } /* presentin=16 */, + { 10, 4586, 151, 18, 3, UNI_MYMR } /* scriptextensions=mymr */, + { 3, 8226, 5390, 16, 20, UNI_PC } /* generalcategory=connectorpunctuation */, + { 3, 6164, 4532, 10, 7, UNI_LB__ZW } /* linebreak=zwspace */, + { 30, 1911, 4144, 7, 4, UNI_SC__MODI } /* script=modi */, + { 0, 2429, 4332, 9, 4, UNI_CJKEXTH } /* block=cjkexth */, + { 9, 4350, 639, 5, 2, UNI_XPOSIXLOWER } /* lower=t */, + { 0, 1911, 181, 7, 4, UNI_PHNX } /* script=phnx */, + { 0, 6464, 1652, 3, 4, UNI_SAUR } /* sc=saur */, + { 4, 1498, 373, 7, 2, UNI_CCC__23 } /* ccc=ccc23 */, + { 4, 4783, 0, 7, 0, UNI_LINB } /* linearb */, + { 3, 3155, 6552, 9, 5, UNI_qmark_values_index } /* quotationmark= */, + { 1, 4586, 2385, 17, 12, UNI_TUTG } /* scriptextensions=tulutigalari */, + { 0, 108, 2812, 2, 2, UNI_JT__R } /* jt=r */, + { 3, 2380, 608, 3, 3, UNI_IN__4 } /* in=4.0 */, + { 3, 174, 296, 3, 1, UNI_pcm_values_index } /* pcm= */, + { 1, 3521, 2197, 13, 3, UNI_NV__500 } /* numericvalue=500 */, + { 1, 2624, 4732, 6, 5, UNI_XPOSIXUPPER } /* xposixupper */, + { 1, 2373, 614, 11, 3, UNI_IN__17 } /* presentin=17.0 */, + { 4, 3867, 747, 4, 3, UNI_JG__MEEM } /* jg=meem */, + { 12, 6464, 5628, 3, 20, UNI_HMNP } /* sc=nyiakengpuachuehmong */, + { 2, 1294, 0, 4, 0, UNI_MULT } /* mult */, + { 0, 135, 1663, 2, 6, UNI_L } /* isletter */, + { 1, 6464, 727, 3, 5, UNI_SC__OSGE } /* sc=osage */, + { 2, 8639, 0, 24, 0, UNI_inpc_values_index } /* indicpositionalcategory= */, + { 4, 7322, 314, 25, 2, UNI_CCC__IS } /* canonicalcombiningclass=240 */, + { 4, 135, 4992, 2, 17, UNI__PERL_PATWS } /* ispatternwhitespace */, + { 8, 8233, 3323, 12, 8, UNI_NO } /* category=othernumber */, + { 1, 8336, 3839, 4, 10, UNI_MISCSYMBOLSSUP } /* miscsymbolssup */, + { 8, 135, 6116, 2, 19, UNI_SUNDANESESUP } /* issundanesesupplement */, + { 1, 1911, 577, 7, 6, UNI_RJNG } /* script=rejang */, + { 5, 3808, 4861, 6, 2, UNI_LATIN1 } /* islatin1 */, + { 0, 2301, 1388, 4, 3, UNI_NV__5000 } /* nv=5000 */, + { 2, 7322, 636, 25, 2, UNI_CCC__BR } /* canonicalcombiningclass=222 */, + { 6, 368, 5723, 4, 17, UNI_WB__EB } /* ccc=attachedbelowleft */, + { 0, 2429, 2002, 6, 4, UNI_UCAS } /* block=ucas */, + { 0, 5410, 383, 20, 4, UNI_EXTPICT } /* extendedpictographic=yes */, + { 0, 1911, 3355, 7, 15, UNI_ARMI } /* script=imperialaramaic */, + { 8, 1441, 0, 9, 0, UNI_PAUC } /* paucinhau */, + { 4, 322, 0, 2, 0, UNI_RI } /* ri */, + { 0, 333, 928, 2, 5, UNI_IN__10 } /* in=10.0 */, + { 4, 2097, 7992, 7, 6, UNI_JT__L } /* joiningtype=l */, + { 0, 8283, 972, 16, 2, -UNI_UIDEO } /* unifiedideograph=f */, + { 20, 1911, 486, 7, 4, UNI_MIAO } /* script=plrd */, + { 0, 7398, 0, 24, 0, UNI_ARABICPFB } /* arabicpresentationformsb */, + { 6, 2406, 382, 10, 3, UNI_XIDC } /* xidcontinue=y */, + { 0, 1733, 1294, 4, 7, UNI_INMULTANI } /* blk=multani */, + { 1, 2498, 0, 8, 0, UNI_CYRL } /* cyrillic */, + { 12, 135, 117, 2, 2, UNI_SK } /* issk */, + { 15, 1810, 7847, 3, 26, UNI_ALPHABETICPF } /* isalphabeticpresentationforms */, + { 8, 2373, 928, 9, 5, UNI_IN__10 } /* presentin=10.0 */, + { 0, 1141, 253, 4, 4, UNI_YI } /* scx=yiii */, + { 2, 7957, 138, 18, 3, UNI_DT__MED } /* decompositiontype=med */, + { 0, 6464, 1024, 3, 4, UNI_HATR } /* sc=hatr */, + { 0, 6464, 6899, 3, 4, UNI_BERF } /* sc=berf */, + { 16, 1911, 6952, 7, 6, UNI_BRAH } /* script=brahmi */, + { 0, 1911, 1156, 7, 4, UNI_SC__TAGB } /* script=tagb */, + { 7, 2097, 3440, 11, 13, UNI_JT__R } /* joiningtype=rightjoining */, + { 0, 5, 1613, 1, 9, UNI_MISCARROWS } /* miscarrows */, + { 0, 2607, 4673, 9, 9, UNI_MYANMAREXTB } /* ismyanmarextendedb */, + { 4, 8233, 4309, 9, 5, UNI_P } /* category=punct */, + { 3, 2858, 4974, 3, 18, UNI_ZP } /* gc=paragraphseparator */, + { 2, 8226, 3669, 16, 13, UNI_ZL } /* generalcategory=lineseparator */, + { 0, 6164, 3465, 10, 12, UNI_LB__IS } /* linebreak=infixnumeric */, + { 5, 6356, 2475, 7, 12, UNI_GREEKEXT } /* block=greekextended */, + { 0, 1141, 1024, 4, 6, UNI_HATR } /* scx=hatran */, + { 0, 3070, 2859, 3, 7, UNI_INSC__OTHER } /* insc=other */, + { 0, 1141, 885, 4, 7, UNI_TGLG } /* scx=tagalog */, + { 1, 6464, 742, 3, 5, UNI_BATK } /* sc=batak */, + { 5, 6737, 1198, 13, 2, UNI_JG__FE } /* joininggroup=fe */, + { 0, 2721, 0, 9, 0, UNI__PERL_SURROGATE } /* surrogate */, + { 8, 2587, 0, 6, 0, UNI_GEOR } /* isgeor */, + { 9, 8765, 1224, 31, 6, UNI_INSC__CONSONANTMEDIAL } /* indicsyllabiccategory=consonantmedial */, + { 2, 2429, 5043, 6, 8, UNI_BAMUMSUP } /* block=bamumsup */, + { 8, 2429, 3590, 6, 15, UNI_INZANABAZARSQUARE } /* block=zanabazarsquare */, + { 6, 333, 5508, 2, 20, UNI_ININSCRIPTIONALPAHLAVI } /* ininscriptionalpahlavi */, + { 8, 3331, 383, 14, 2, UNI_GREXT } /* graphemeextend=y */, + { 5, 4586, 122, 17, 4, UNI_KRAI } /* scriptextensions=krai */, + { 0, 977, 639, 5, 2, UNI_ECOMP } /* ecomp=t */, + { 0, 7674, 3233, 10, 12, UNI_BC__ON } /* bidiclass=otherneutral */, + { 2, 1911, 1414, 7, 9, UNI_SC__ORKH } /* script=oldturkic */, + { 15, 4586, 1896, 17, 11, UNI_HMNG } /* scriptextensions=pahawhhmong */, + { 1, 3521, 1387, 13, 4, UNI_NV__6000 } /* numericvalue=6000 */, + { 10, 4586, 1698, 17, 10, UNI_WARA } /* scriptextensions=warangciti */, + { 0, 6039, 4770, 12, 13, UNI_SUPPUNCTUATION } /* insupplementalpunctuation */, + { 16, 8639, 4172, 24, 13, UNI_INPC__NA } /* indicpositionalcategory=notapplicable */, + { 0, 2429, 5043, 6, 15, UNI_BAMUMSUP } /* block=bamumsupplement */, + { 0, 1258, 3742, 5, 11, UNI_CJKCOMPATFORMS } /* incjkcompatforms */, + { 4, 1141, 817, 4, 7, UNI_OLCK } /* scx=olchiki */, + { 7, 4586, 918, 17, 7, UNI_ZZZZ } /* scriptextensions=unknown */, + { 40, 3617, 674, 10, 5, UNI_ETHIOPICEXT } /* blk=ethiopicext */, + { 0, 554, 559, 4, 2, UNI_NV__3_SLASH_5 } /* nv=3/5 */, + { 0, 135, 1952, 2, 5, UNI_EBASE } /* isebase */, + { 1, 135, 1329, 2, 7, UNI_SUNU } /* issunuwar */, + { 8, 8280, 0, 20, 0, UNI_CJK } /* cjkunifiedideographs */, + { 4, 4664, 139, 15, 3, UNI_LATINEXTF } /* blk=latinextendedf */, + { 0, 4350, 972, 5, 6, -UNI_XPOSIXLOWER } /* lower=false */, + { 0, 2598, 8608, 4, 31, UNI_DIACRITICALSEXT } /* incombiningdiacriticalmarksextended */, + { 0, 8226, 2465, 16, 10, UNI_CN } /* generalcategory=unassigned */, + { 1, 1141, 74, 4, 4, UNI_CYRL } /* scx=cyrl */, + { 3, 2380, 422, 4, 1, UNI_IN__15 } /* in=15 */, + { 4, 3506, 2432, 11, 3, UNI_nfdqc_values_index } /* nfdquickcheck= */, + { 1, 1994, 3753, 7, 3, UNI_KANGXI } /* blk=kangxi */, + { 3, 2525, 6907, 3, 21, UNI_MISCTECHNICAL } /* inmiscellaneoustechnical */, + { 1, 4350, 0, 9, 0, UNI_XPOSIXLOWER } /* lowercase */, + { 15, 3521, 2303, 12, 10, UNI_NV__7_SLASH_12 } /* numericvalue=5.833e-01 */, + { 3, 1141, 851, 4, 4, UNI_SHRD } /* scx=shrd */, + { 7, 368, 319, 5, 1, UNI_CCC__19 } /* ccc=19 */, + { 25, 7151, 972, 25, 6, -UNI_DI } /* defaultignorablecodepoint=false */, + { 2, 293, 9, 4, 2, UNI_LB__CR } /* gcb=cr */, + { 0, 2922, 7233, 3, 22, UNI_EGYPTIANHIEROGLYPHSEXTA } /* isegyptianhieroglyphsexta */, + { 3, 6737, 3127, 12, 2, UNI_JG__E } /* joininggroup=e */, + { 0, 1922, 0, 11, 0, UNI_SORA } /* sorasompeng */, + { 4, 1141, 1907, 4, 4, UNI_KTHI } /* scx=kthi */, + { 1, 7322, 312, 25, 1, UNI_CCC__23 } /* canonicalcombiningclass=23 */, + { 8, 2429, 1552, 6, 8, UNI_INBUGINESE } /* block=buginese */, + { 4, 6464, 1315, 3, 4, UNI_SIDD } /* sc=sidd */, + { 5, 6039, 4309, 5, 11, UNI_SUPPUNCTUATION } /* insuppunctuation */, + { 0, 1254, 4081, 3, 16, UNI_UCAS } /* incanadiansyllabics */, + { 0, 2858, 355, 3, 2, UNI_PF } /* gc=pf */, + { 4, 2858, 4, 3, 2, UNI_LM } /* gc=lm */, + { 1, 1911, 790, 7, 7, UNI_MARC } /* script=marchen */, + { 0, 5845, 5993, 21, 9, UNI_WB__EB } /* graphemeclusterbreak=emodifier */, + { 73, 1733, 2878, 4, 14, UNI_HIGHSURROGATES } /* blk=highsurrogates */, + { 1, 1141, 261, 4, 4, UNI_ZYYY } /* scx=zyyy */, + { 4, 2236, 0, 4, 0, UNI_NV__2 } /* nv=2 */, + { 4, 7322, 296, 23, 2, UNI_CCC__B } /* canonicalcombiningclass=b */, + { 1, 6464, 4650, 4, 5, UNI_SC__ZYYY } /* sc=common */, + { 16, 333, 7002, 2, 22, UNI_TRANSPORTANDMAP } /* intransportandmapsymbols */, + { 16, 561, 1388, 4, 3, UNI_NV__7000 } /* nv=7000 */, + { 1, 5845, 0, 21, 0, UNI_gcb_values_index } /* graphemeclusterbreak= */, + { 0, 2429, 1569, 6, 8, UNI_JAMOEXTA } /* block=jamoexta */, + { 12, 1733, 4783, 4, 16, UNI_LINEARBSYLLABARY } /* blk=linearbsyllabary */, + { 5, 1733, 3794, 4, 13, UNI_DEVANAGARIEXT } /* blk=devanagariext */, + { 5, 353, 4309, 3, 11, UNI_SUPPUNCTUATION } /* suppunctuation */, + { 1, 4992, 2677, 16, 4, -UNI__PERL_PATWS } /* patternwhitespace=no */, + { 0, 478, 0, 4, 0, UNI_ORKH } /* orkh */, + { 16, 1733, 3290, 5, 14, UNI_CONTROLPICTURES } /* blk=controlpictures */, + { 3, 3766, 0, 9, 0, UNI_LATINEXTE } /* latinexte */, + { 2, 135, 35, 2, 4, UNI_BATK } /* isbatk */, + { 10, 8226, 138, 16, 2, UNI_ME } /* generalcategory=me */, + { 5, 4586, 27, 17, 4, UNI_ARMI } /* scriptextensions=armi */, + { 2, 2635, 758, 3, 4, UNI_JG__ZAIN } /* jg=zain */, + { 2, 6201, 972, 21, 6, -UNI__PERL_NCHAR } /* noncharactercodepoint=false */, + { 21, 30, 7759, 1, 20, UNI_TANGUTCOMPONENTSSUP } /* istangutcomponentssup */, + { 3, 2, 4235, 1, 13, UNI_SC } /* currencysymbol */, + { 0, 5306, 65, 10, 2, UNI_WB__MN } /* wordbreak=mn */, + { 6, 707, 0, 5, 0, UNI_BUHD } /* buhid */, + { 2, 4586, 197, 17, 4, UNI_SAMR } /* scriptextensions=samr */, + { 1, 954, 638, 4, 6, UNI_EBASE } /* ebase=true */, + { 1, 355, 0, 2, 0, UNI_PF } /* pf */, + { 1, 316, 312, 3, 2, UNI_NV__30 } /* nv=30 */, + { 6, 5845, 698, 20, 3, UNI_LB__H2 } /* graphemeclusterbreak=lv */, + { 6, 8494, 83, 31, 3, UNI_CJKEXTG } /* blk=cjkunifiedideographsextensiong */, + { 16, 4586, 855, 17, 4, UNI_SYRC } /* scriptextensions=syrc */, + { 0, 1254, 1802, 3, 8, UNI_INCB__LINKER } /* incb=linker */, + { 4, 4586, 2944, 17, 4, UNI_MAHJ } /* scriptextensions=mahj */, + { 0, 676, 972, 7, 2, -UNI_EXTPICT } /* extpict=f */, + { 0, 6464, 1294, 3, 7, UNI_SC__MULT } /* sc=multani */, + { 0, 7045, 5724, 22, 3, UNI_JG__MALAYALAMTTA } /* joininggroup=malayalamtta */, + { 0, 5306, 133, 10, 2, UNI_WB__NL } /* wordbreak=nl */, + { 1, 1911, 3477, 7, 15, UNI_MERC } /* script=meroiticcursive */, + { 0, 3991, 2293, 14, 8, UNI_NV__1_SLASH_20 } /* numericvalue=5.000e-02 */, + { 0, 4202, 972, 17, 6, -UNI_IDSB } /* idsbinaryoperator=false */, + { 1, 1260, 81, 5, 2, UNI_CJKEXTG } /* cjkextg */, + { 1, 1258, 217, 7, 2, UNI_CJKEXTF } /* incjkextf */, + { 0, 333, 2315, 2, 2, UNI_IN__6 } /* in=6 */, + { 36, 6442, 2677, 19, 4, -UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=no */, + { 9, 135, 4698, 2, 18, UNI_COPTICEPACTNUMBERS } /* iscopticepactnumbers */, + { 2, 1911, 1308, 7, 4, UNI_SC__PHAG } /* script=phag */, + { 7, 583, 2409, 4, 8, UNI_SB__SC } /* sb=scontinue */, + { 0, 2525, 3947, 3, 15, UNI_MISCMATHSYMBOLSA } /* inmiscmathsymbolsa */, + { 0, 1560, 7277, 5, 15, UNI_GEOMETRICSHAPESEXT } /* ingeometricshapesext */, + { 7, 7445, 383, 26, 4, UNI_PCM } /* prependedconcatenationmark=yes */, + { 4, 7804, 376, 27, 2, UNI_CCC__84 } /* canonicalcombiningclass=ccc84 */, + { 0, 1733, 1698, 4, 10, UNI_INWARANGCITI } /* blk=warangciti */, + { 0, 762, 534, 3, 3, UNI_KANBUN } /* kanbun */, + { 0, 1470, 6931, 3, 3, UNI_XIDC } /* xidc=t */, + { 2, 5866, 1523, 15, 10, UNI_DEP } /* identifiertype=deprecated */, + { 0, 1523, 383, 10, 4, UNI_DEP } /* deprecated=yes */, + { 1, 393, 383, 4, 2, UNI_CWCM } /* cwcm=y */, + { 1, 135, 197, 2, 4, UNI_SAMR } /* issamr */, + { 1, 1733, 9048, 4, 21, UNI_MATHOPERATORS } /* blk=mathematicaloperators */, + { 0, 249, 0, 4, 0, UNI_XSUX } /* xsux */, + { 0, 6464, 237, 3, 4, UNI_SC__TUTG } /* sc=tutg */, + { 6, 6041, 0, 19, 0, UNI_SUPARROWSB } /* supplementalarrowsb */, + { 1, 1994, 112, 6, 2, UNI_INKAWI } /* blk=kawi */, + { 1, 5377, 0, 14, 0, UNI_LATINEXTC } /* latinextendedc */, + { 40, 3903, 133, 3, 2, UNI_LB__NL } /* lb=nl */, + { 17, 1911, 1751, 7, 11, UNI_SC__CPMN } /* script=cyprominoan */, + { 4, 2313, 5612, 4, 4, UNI_NV__60000 } /* nv=60000 */, + { 10, 2429, 7742, 6, 18, UNI_PHONETICEXT } /* block=phoneticextensions */, + { 3, 4586, 587, 17, 6, UNI_TNSA } /* scriptextensions=tangsa */, + { 0, 2607, 3836, 3, 10, UNI_MISCSYMBOLS } /* ismiscsymbols */, + { 1, 6464, 1941, 3, 4, UNI_SC__SYLO } /* sc=sylo */, + { 0, 135, 2108, 2, 11, UNI_KEHNOROTATE } /* iskehnorotate */, + { 0, 8233, 117, 9, 2, UNI_SK } /* category=sk */, + { 0, 7322, 2827, 23, 3, UNI_CCC__AR } /* canonicalcombiningclass=ar */, + { 4, 135, 5009, 2, 4, UNI_RUMI } /* isrumi */, + { 19, 135, 6535, 2, 21, UNI_MCM } /* ismodifiercombiningmark */, + { 2, 6464, 6222, 3, 4, UNI_SC__SINH } /* sc=sinh */, + { 1, 1141, 839, 4, 4, UNI_LANA } /* scx=lana */, + { 1, 135, 506, 2, 4, UNI_SIDT } /* issidt */, + { 1, 3976, 372, 14, 1, UNI_NV__11 } /* numericvalue=11 */, + { 15, 3129, 4035, 11, 2, UNI_IN__8 } /* presentin=v80 */, + { 0, 333, 6433, 2, 9, UNI_INCUNEIFORM } /* incuneiform */, + { 0, 4664, 4695, 9, 4, UNI_LATINEXTC } /* blk=latinextc */, + { 0, 4586, 851, 17, 4, UNI_SHRD } /* scriptextensions=shrd */, + { 0, 316, 2189, 3, 2, UNI_NV__42 } /* nv=42 */, + { 1, 8280, 2680, 27, 3, UNI_CJKEXTJ } /* cjkunifiedideographsextensionj */, + { 2, 4586, 67, 17, 4, UNI_CPRT } /* scriptextensions=cprt */, + { 0, 1911, 1129, 7, 4, UNI_SC__LINB } /* script=linb */, + { 8, 6462, 3092, 5, 6, UNI_INSC__VIRAMA } /* insc=virama */, + { 20, 4586, 899, 17, 7, UNI_TAVT } /* scriptextensions=taiviet */, + { 1, 135, 4783, 2, 7, UNI_LINB } /* islinearb */, + { 0, 1368, 0, 9, 0, UNI_NBAT } /* nabataean */, + { 0, 6464, 7734, 3, 8, UNI_SC__KANA } /* sc=katakana */, + { 2, 7396, 6088, 8, 9, UNI_ARABICEXTA } /* inarabicextendeda */, + { 8, 6797, 0, 13, 0, UNI_ZNAMENNYMUSIC } /* znamennymusic */, + { 1, 4350, 639, 5, 5, UNI_XPOSIXLOWER } /* lower=true */, + { 2, 6369, 2743, 7, 12, UNI_MISCTECHNICAL } /* block=misctechnical */, + { 1, 651, 1224, 3, 6, UNI_DT__MED } /* dt=medial */, + { 5, 333, 5073, 2, 8, UNI_TAMILSUP } /* intamilsup */, + { 0, 1911, 1024, 7, 6, UNI_HATR } /* script=hatran */, + { 11, 438, 383, 3, 2, UNI_DIA } /* dia=y */, + { 9, 925, 602, 5, 3, UNI_AGE__12_DOT_1 } /* age=12.1 */, + { 0, 1818, 6775, 3, 22, UNI_SHORTHANDFORMATCONTROLS } /* isshorthandformatcontrols */, + { 0, 5410, 972, 20, 2, -UNI_EXTPICT } /* extendedpictographic=f */, + { 0, 1733, 205, 4, 4, UNI_TAGS } /* blk=tags */, + { 5, 135, 119, 2, 2, UNI_XPOSIXDIGIT } /* isnd */, + { 1, 992, 0, 8, 0, UNI_EXT } /* extender */, + { 3, 8233, 4365, 9, 15, UNI_PS } /* category=openpunctuation */, + { 4, 135, 7180, 2, 20, UNI_CE } /* iscompositionexclusion */, + { 0, 135, 102, 2, 4, UNI_HMNG } /* ishmng */, + { 9, 368, 5162, 4, 2, UNI_CCC__8 } /* ccc=kv */, + { 1, 2576, 972, 5, 6, -UNI_CASED } /* cased=false */, + { 0, 2487, 4731, 2, 2, UNI_VO__U } /* vo=u */, + { 1, 6203, 972, 5, 2, -UNI__PERL_NCHAR } /* nchar=f */, + { 8, 135, 769, 2, 7, UNI_KALI } /* iskayahli */, + { 1, 135, 5098, 2, 13, UNI_EMOD } /* isemojimodifier */, + { 0, 4732, 2677, 8, 3, -UNI_XPOSIXUPPER } /* uppercase=n */, + { 1, 8117, 5582, 24, 6, UNI_JG__MANICHAEANTHAMEDH } /* joininggroup=manichaeanthamedh */, + { 0, 2, 653, 3, 3, -UNI_CWL } /* cwl=no */, + { 0, 1339, 0, 4, 0, UNI_TIRH } /* tirh */, + { 1, 33, 7595, 1, 24, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* symbolsandpictographsexta */, + { 0, 7957, 7322, 18, 9, UNI_DT__CAN } /* decompositiontype=canonical */, + { 2, 4533, 638, 5, 6, UNI_XPOSIXSPACE } /* wspace=true */, + { 7, 662, 0, 4, 0, UNI_ELBA } /* elba */, + { 0, 1141, 1603, 4, 10, UNI_KHAR } /* scx=kharoshthi */, + { 18, 135, 6805, 2, 5, UNI_MUSIC } /* ismusic */, + { 3, 2429, 5177, 6, 10, UNI_SHARADASUP } /* block=sharadasup */, + { 1, 1982, 383, 12, 4, UNI_BIDIM } /* bidimirrored=yes */, + { 0, 1141, 150, 4, 4, UNI_MYMR } /* scx=mymr */, + { 4, 7674, 5027, 10, 16, UNI_BC__S } /* bidiclass=segmentseparator */, + { 3, 2635, 7633, 3, 14, UNI_JG__HAMZAONHEHGOAL } /* jg=tehmarbutagoal */, + { 4, 2429, 7348, 6, 26, UNI_HALFANDFULLFORMS } /* block=halfwidthandfullwidthforms */, + { 0, 5993, 639, 4, 2, UNI_EMOD } /* emod=t */, + { 20, 1733, 3869, 3, 10, UNI_INMALAYALAM } /* blk=malayalam */, + { 0, 146, 0, 4, 0, UNI_MTEI } /* mtei */, + { 0, 1911, 1459, 7, 4, UNI_SC__THAA } /* script=thaa */, + { 1, 6369, 1613, 7, 9, UNI_MISCARROWS } /* block=miscarrows */, + { 1, 583, 4350, 3, 5, UNI_SB__LO } /* sb=lower */, + { 16, 162, 0, 4, 0, UNI_ORYA } /* orya */, + { 2, 3116, 438, 12, 2, UNI_NT__DI } /* numerictype=di */, + { 4, 135, 1432, 2, 4, UNI_PALM } /* ispalm */, + { 0, 333, 4290, 2, 8, UNI_VEDICEXT } /* invedicext */, + { 1, 1590, 3753, 5, 11, UNI_KANGXI } /* iskangxiradicals */, + { 0, 6264, 0, 6, 0, UNI_YIJING } /* yijing */, + { 6, 1141, 43, 4, 4, UNI_BUHD } /* scx=buhd */, + { 2, 537, 0, 4, 0, UNI_KHOJ } /* khoj */, + { 1, 3208, 639, 13, 5, UNI_POSIXXDIGIT } /* asciihexdigit=true */, + { 2, 181, 0, 4, 0, UNI_PHNX } /* phnx */, + { 0, 5824, 653, 21, 2, -UNI_CWU } /* changeswhenuppercased=n */, + { 4, 333, 885, 2, 7, UNI_INTAGALOG } /* intagalog */, + { 3, 368, 7346, 4, 2, UNI_CCC__27 } /* ccc=27 */, + { 8, 6464, 1008, 3, 8, UNI_SC__GURU } /* sc=gurmukhi */, + { 17, 4305, 3317, 3, 2, UNI_dash_values_index } /* dash= */, + { 0, 135, 3535, 2, 15, UNI_NARB } /* isoldnortharabian */, + { 14, 135, 5740, 2, 21, UNI_CWCF } /* ischangeswhencasefolded */, + { 1, 7957, 3742, 18, 6, UNI_DT__COM } /* decompositiontype=compat */, + { 0, 1465, 98, 3, 2, UNI_LB__HL } /* wb=hl */, + { 0, 4533, 382, 5, 5, UNI_XPOSIXSPACE } /* wspace=yes */, + { 0, 2108, 382, 10, 2, UNI_kehnorotate_values_index } /* kehnorotate= */, + { 1, 1141, 5508, 4, 20, UNI_PHLI } /* scx=inscriptionalpahlavi */, + { 1, 8117, 5229, 24, 5, UNI_JG__MANICHAEANTWENTY } /* joininggroup=manichaeantwenty */, + { 1, 6464, 166, 3, 4, UNI_SC__OSGE } /* sc=osge */, + { 0, 1733, 8246, 4, 32, UNI_INIDC } /* blk=ideographicdescriptioncharacters */, + { 0, 5993, 383, 4, 4, UNI_EMOD } /* emod=yes */, + { 5, 2, 382, 1, 3, UNI_CE } /* ce=y */, + { 0, 1523, 639, 10, 5, UNI_DEP } /* deprecated=true */, + { 17, 336, 639, 5, 2, UNI_QMARK } /* qmark=t */, + { 0, 3617, 4673, 12, 9, UNI_ETHIOPICEXTB } /* blk=ethiopicextendedb */, + { 1, 1066, 1573, 4, 4, UNI_JAMOEXTA } /* jamoexta */, + { 1, 2373, 2292, 10, 3, UNI_IN__2 } /* presentin=2.0 */, + { 3, 3629, 2417, 7, 12, UNI_AEGEANNUMBERS } /* block=aegeannumbers */, + { 0, 1994, 3753, 7, 11, UNI_KANGXI } /* blk=kangxiradicals */, + { 0, 2635, 828, 3, 3, UNI_JG__NYA } /* jg=nya */, + { 0, 2373, 2275, 9, 2, UNI_IN__4 } /* presentin=4 */, + { 2, 1733, 8167, 4, 22, UNI_ENCLOSEDIDEOGRAPHICSUP } /* blk=enclosedideographicsup */, + { 9, 135, 6661, 2, 23, UNI_COMPATJAMO } /* ishangulcompatibilityjamo */, + { 1, 2429, 4249, 6, 17, UNI_INDICSIYAQNUMBERS } /* block=indicsiyaqnumbers */, + { 12, 4127, 0, 17, 0, UNI_EPRES } /* emojipresentation */, + { 10, 2635, 1600, 3, 3, UNI_JG__YEH } /* jg=yeh */, + { 1, 5761, 653, 21, 2, -UNI_CWCM } /* changeswhencasemapped=n */, + { 17, 978, 972, 6, 6, -UNI_COMPEX } /* compex=false */, + { 0, 4586, 1423, 17, 9, UNI_OUGR } /* scriptextensions=olduyghur */, + { 0, 4586, 265, 17, 4, UNI_ZZZZ } /* scriptextensions=zzzz */, + { 0, 877, 296, 5, 1, UNI_sterm_values_index } /* sterm= */, + { 9, 135, 5043, 2, 5, UNI_BAMU } /* isbamum */, + { 1, 5667, 8989, 20, 7, UNI_VO__U } /* verticalorientation=upright */, + { 1, 12, 1755, 1, 5, UNI_DOMINO } /* domino */, + { 3, 3136, 1391, 4, 2, UNI_IN__3_DOT_2 } /* in=v32 */, + { 5, 4202, 0, 4, 0, UNI_IDSB } /* idsb */, + { 1, 3155, 972, 13, 6, -UNI_QMARK } /* quotationmark=false */, + { 0, 6464, 403, 3, 6, UNI_SC__GOTH } /* sc=gothic */, + { 0, 135, 1698, 2, 4, UNI_WARA } /* iswara */, + { 0, 1911, 4219, 7, 7, UNI_BRAI } /* script=braille */, + { 0, 2429, 1812, 6, 6, UNI_INARABIC } /* block=arabic */, + { 1, 5410, 0, 20, 0, UNI_EXTPICT } /* extendedpictographic */, + { 0, 3521, 417, 14, 1, UNI_NV__46 } /* numericvalue=46 */, + { 1, 135, 6399, 2, 22, UNI_DIACRITICALSFORSYMBOLS } /* isdiacriticalsforsymbols */, + { 10, 760, 765, 5, 4, UNI_INKANNADA } /* inkannada */, + { 2, 6464, 1172, 3, 4, UNI_UGAR } /* sc=ugar */, + { 2, 333, 6222, 2, 21, UNI_SINHALAARCHAICNUMBERS } /* insinhalaarchaicnumbers */, + { 8, 5993, 639, 4, 5, UNI_EMOD } /* emod=true */, + { 1, 4586, 2088, 17, 6, UNI_SYRC } /* scriptextensions=syriac */, + { 0, 333, 4956, 2, 18, UNI_ORNAMENTALDINGBATS } /* inornamentaldingbats */, + { 0, 6737, 2088, 13, 9, UNI_JG__SYRIACWAW } /* joininggroup=syriacwaw */, + { 2, 51, 0, 4, 0, UNI_CANS } /* cans */, + { 35, 15, 4018, 2, 3, UNI_AGE__7 } /* age=7 */, + { 40, 333, 294, 2, 3, UNI_incb_values_index } /* incb= */, + { 1, 1911, 4814, 7, 4, UNI_SC__BOPO } /* script=bopo */, + { 5, 1465, 3179, 3, 11, UNI_WB__SQ } /* wb=singlequote */, + { 1, 8233, 359, 9, 2, UNI_PD } /* category=pd */, + { 18, 4007, 2240, 14, 8, UNI_NV__3_SLASH_4 } /* numericvalue=7.500e-01 */, + { 3, 368, 2258, 5, 2, UNI_WB__EB } /* ccc=133 */, + { 1, 992, 972, 8, 6, -UNI_EXT } /* extender=false */, + { 1, 6557, 2196, 14, 8, UNI_NV__5_SLASH_2 } /* numericvalue=2.500e+00 */, + { 9, 3629, 8567, 12, 29, UNI_ARABICMATH } /* block=arabicmathematicalalphabeticsymbols */, + { 5, 2373, 603, 11, 2, UNI_IN__1_DOT_1 } /* presentin=1.1 */, + { 0, 4051, 972, 16, 2, -UNI_STERM } /* sentenceterminal=f */, + { 0, 135, 4, 2, 2, UNI_LM } /* islm */, + { 0, 2622, 331, 8, 5, UNI_XPOSIXPRINT } /* isxposixprint */, + { 0, 4586, 1100, 19, 6, UNI_MAHJ } /* scriptextensions=mahajani */, + { 2, 651, 259, 3, 2, UNI_DT__NB } /* dt=nb */, + { 2, 1733, 6116, 4, 9, UNI_INSUNDANESE } /* blk=sundanese */, + { 2, 438, 0, 4, 0, UNI_DIAK } /* diak */, + { 0, 6737, 4908, 14, 4, UNI_JG__ALAPH } /* joininggroup=alaph */, + { 3, 47, 4082, 2, 15, UNI_UCAS } /* canadiansyllabics */, + { 0, 8233, 5322, 9, 2, UNI_CASEDLETTER } /* category=l_ */, + { 0, 2380, 417, 3, 3, UNI_IN__6_DOT_3 } /* in=6.3 */, + { 3, 1498, 2190, 8, 2, UNI_CCC__129 } /* ccc=ccc129 */, + { 0, 1911, 5073, 7, 5, UNI_SC__TAML } /* script=tamil */, + { 1, 333, 7086, 2, 11, UNI_INMEETEIMAYEK } /* inmeeteimayek */, + { 0, 4586, 362, 17, 6, UNI_CARI } /* scriptextensions=carian */, + { 0, 2824, 1070, 10, 4, UNI_ARABICEXTB } /* blk=arabicextb */, + { 5, 1911, 885, 7, 7, UNI_SC__TGLG } /* script=tagalog */, + { 0, 1141, 78, 4, 4, UNI_DSRT } /* scx=dsrt */, + { 0, 7322, 1388, 25, 2, UNI_WB__EB } /* canonicalcombiningclass=200 */, + { 0, 4586, 466, 17, 4, UNI_OGAM } /* scriptextensions=ogam */, + { 20, 6464, 39, 3, 4, UNI_BHKS } /* sc=bhks */, + { 1, 6535, 653, 21, 3, -UNI_MCM } /* modifiercombiningmark=no */, + { 2, 6164, 294, 10, 2, UNI_LB__CB } /* linebreak=cb */, + { 0, 4586, 1997, 16, 5, UNI_KANA } /* scriptextensions=kana */, + { 8, 135, 1060, 2, 4, UNI_YEZI } /* isyezi */, + { 0, 135, 1272, 2, 9, UNI_QAAI } /* isinherited */, + { 3, 7846, 7402, 8, 19, UNI_ALPHABETICPF } /* alphabeticpresentationforms */, + { 4, 4586, 1036, 17, 4, UNI_LEPC } /* scriptextensions=lepc */, + { 6, 2373, 620, 10, 3, UNI_IN__9 } /* presentin=9.0 */, + { 2, 2824, 4673, 10, 9, UNI_ARABICEXTB } /* blk=arabicextendedb */, + { 3, 6342, 2479, 14, 8, UNI_ETHIOPICEXT } /* block=ethiopicextended */, + { 3, 135, 1060, 2, 6, UNI_YEZI } /* isyezidi */, + { 7, 3136, 1387, 4, 2, UNI_IN__6 } /* in=v60 */, + { 3, 4586, 5628, 17, 20, UNI_HMNP } /* scriptextensions=nyiakengpuachuehmong */, + { 41, 925, 6572, 4, 3, UNI_AGE__5_DOT_1 } /* age=5.1 */, + { 4, 14, 3316, 2, 3, UNI_math_values_index } /* math= */, + { 0, 2429, 346, 6, 5, UNI_INTAKRI } /* block=takri */, + { 3, 3521, 1391, 13, 2, UNI_NV__32 } /* numericvalue=32 */, + { 0, 333, 2002, 2, 7, UNI_UCASEXT } /* inucasext */, + { 12, 7674, 6599, 9, 12, UNI_BC__L } /* bidiclass=lefttoright */, + { 0, 1054, 0, 6, 0, UNI_WCHO } /* wancho */, + { 2, 2810, 6622, 3, 3, UNI_BC__PDI } /* bc=pdi */, + { 0, 3826, 882, 4, 3, UNI_SUPPUAA } /* suppuaa */, + { 0, 6464, 3355, 3, 15, UNI_ARMI } /* sc=imperialaramaic */, + { 0, 3808, 4695, 7, 4, UNI_LATINEXTC } /* islatinextc */, + { 0, 1141, 712, 4, 5, UNI_DOGR } /* scx=dogra */, + { 7, 4305, 383, 4, 2, UNI_DASH } /* dash=y */, + { 4, 19, 972, 4, 6, -UNI_POSIXXDIGIT } /* ahex=false */, + { 4, 6342, 7552, 7, 26, UNI_ENCLOSEDCJK } /* block=enclosedcjklettersandmonths */, + { 4, 1141, 2872, 4, 6, UNI_COPT } /* scx=coptic */, + { 21, 135, 1488, 2, 10, UNI_BOXDRAWING } /* isboxdrawing */, + { 4, 3521, 841, 13, 3, UNI_NV__NAN } /* numericvalue=nan */, + { 4, 18, 964, 1, 7, UNI_BPT__O } /* bpt=open */, + { 0, 6464, 7086, 3, 11, UNI_MTEI } /* sc=meeteimayek */, + { 6, 6891, 0, 16, 0, UNI_INDICNUMBERFORMS } /* indicnumberforms */, + { 0, 7322, 743, 24, 3, UNI_CCC__214 } /* canonicalcombiningclass=ata */, + { 10, 4586, 225, 17, 4, UNI_TIBT } /* scriptextensions=tibt */, + { 14, 1125, 0, 4, 0, UNI_XPOSIXWORD } /* word */, + { 0, 4586, 47, 17, 4, UNI_CAKM } /* scriptextensions=cakm */, + { 0, 368, 8525, 4, 10, UNI_CCC__BR } /* ccc=belowright */, + { 1, 293, 1952, 4, 8, UNI_WB__EB } /* gcb=ebasegaz */, + { 0, 2099, 8536, 3, 17, UNI_IDEOGRAPHICSYMBOLS } /* inideographicsymbols */, + { 0, 6321, 5239, 20, 3, UNI_BPT__C } /* bidipairedbrackettype=c */, + { 1, 2635, 2094, 3, 3, UNI_JG__WAW } /* jg=waw */, + { 0, 1498, 636, 8, 2, UNI_CCC__122 } /* ccc=ccc122 */, + { 9, 2525, 3836, 3, 10, UNI_MISCSYMBOLS } /* inmiscsymbols */, + { 5, 925, 604, 4, 2, UNI_AGE__13 } /* age=13 */, + { 2, 1522, 639, 2, 2, UNI_SD } /* sd=t */, + { 1, 583, 330, 3, 2, UNI_SB__SP } /* sb=sp */, + { 0, 1733, 8089, 4, 28, UNI_VSSUP } /* blk=variationselectorssupplement */, + { 10, 1441, 0, 4, 0, UNI_PAUC } /* pauc */, + { 6, 2508, 0, 8, 0, UNI_ETHI } /* ethiopic */, + { 1, 1670, 0, 3, 0, UNI_ALL } /* all */, + { 0, 7873, 0, 17, 0, UNI_ANCIENTGREEKMUSIC } /* ancientgreekmusic */, + { 16, 3136, 312, 5, 2, UNI_IN__13 } /* in=v130 */, + { 0, 5306, 400, 10, 2, UNI_WB__SQ } /* wordbreak=sq */, + { 0, 1141, 3794, 4, 4, UNI_DEVA } /* scx=deva */, + { 4, 1112, 564, 5, 1, UNI_NV__1_SLASH_7 } /* nv=1/7 */, + { 0, 1911, 1423, 7, 9, UNI_SC__OUGR } /* script=olduyghur */, + { 0, 8280, 4572, 26, 4, UNI_CJKEXTA } /* cjkunifiedideographsextensiona */, + { 1, 3521, 423, 13, 2, UNI_NV__16 } /* numericvalue=16 */, + { 1, 877, 383, 5, 4, UNI_STERM } /* sterm=yes */, + { 1, 135, 1478, 2, 10, UNI_ASCII } /* isbasiclatin */, + { 0, 1810, 5336, 3, 19, UNI_HLUW } /* isanatolianhieroglyphs */, + { 1, 2081, 3215, 6, 6, UNI_POSIXDIGIT } /* isposixdigit */, + { 3, 5803, 653, 21, 2, -UNI_CWT } /* changeswhentitlecased=n */, + { 3, 5667, 4731, 19, 2, UNI_VO__U } /* verticalorientation=u */, + { 3, 135, 2054, 2, 10, UNI_SOGO } /* isoldsogdian */, + { 26, 1254, 56, 3, 3, UNI_INCHAM } /* incham */, + { 0, 135, 269, 2, 5, UNI_XPOSIXCNTRL } /* iscntrl */, + { 3, 7509, 4619, 6, 15, UNI_SUTTONSIGNWRITING } /* blk=suttonsignwriting */, + { 5, 16, 1500, 1, 3, UNI_C } /* gc=c */, + { 1, 1911, 1632, 7, 10, UNI_XPEO } /* script=oldpersian */, + { 2, 135, 906, 2, 7, UNI_TIBT } /* istibetan */, + { 0, 129, 472, 2, 2, UNI_OLCK } /* olck */, + { 0, 6464, 2534, 3, 11, UNI_SC__NAND } /* sc=nandinagari */, + { 0, 4350, 972, 5, 2, -UNI_XPOSIXLOWER } /* lower=f */, + { 1, 30, 576, 1, 7, UNI_INREJANG } /* inrejang */, + { 0, 6928, 0, 17, 0, UNI_INPC__TOPANDBOTTOM } /* inpc=topandbottom */, + { 0, 1733, 1301, 4, 7, UNI_NB } /* blk=noblock */, + { 0, 7674, 329, 10, 2, UNI_BC__WS } /* bidiclass=ws */, + { 0, 135, 490, 2, 4, UNI_PRTI } /* isprti */, + { 3, 333, 1432, 2, 9, UNI_PALM } /* inpalmyrene */, + { 1, 3155, 383, 13, 4, UNI_QMARK } /* quotationmark=yes */, + { 0, 7726, 2477, 5, 5, UNI_GREEKEXT } /* ingreekext */, + { 0, 6464, 1042, 3, 6, UNI_SC__LYCI } /* sc=lycian */, + { 0, 3903, 124, 3, 2, UNI_LB__AI } /* lb=ai */, + { 5, 368, 376, 4, 2, UNI_CCC__84 } /* ccc=84 */, + { 3, 2429, 577, 6, 6, UNI_INREJANG } /* block=rejang */, + { 1, 933, 2182, 5, 2, UNI_AGE__5 } /* age=v50 */, + { 10, 7804, 372, 27, 2, UNI_CCC__12 } /* canonicalcombiningclass=ccc12 */, + { 0, 6369, 3836, 7, 13, UNI_MISCSYMBOLSSUP } /* block=miscsymbolssup */, + { 15, 8283, 639, 16, 2, UNI_UIDEO } /* unifiedideograph=t */, + { 2, 135, 947, 2, 8, UNI_BALI } /* isbalinese */, + { 2, 8283, 0, 16, 0, UNI_UIDEO } /* unifiedideograph */, + { 0, 5824, 972, 21, 6, -UNI_CWU } /* changeswhenuppercased=false */, + { 3, 337, 0, 4, 0, UNI_M } /* mark */, { 0, 126, 0, 3, 0, UNI_LAO } /* lao */, - { 29, 1934, 645, 11, 2, -UNI_BIDIC } /* bidicontrol=n */, - { 5, 306, 3973, 2, 3, UNI_NV__70 } /* nv=70 */, - { 0, 2601, 1523, 6, 5, UNI_XPOSIXSPACE } /* xposixspace */, - { 2, 7697, 1366, 28, 2, UNI_CCC__103 } /* canonicalcombiningclass=ccc103 */, - { 229, 2511, 0, 11, 0, UNI_NAND } /* nandinagari */, - { 4, 5803, 2721, 15, 9, UNI_IDENTIFIERTYPE__TECHNICAL } /* identifiertype=technical */, - { 2, 1446, 631, 4, 2, UNI_XIDS } /* xids=t */, - { 8, 32, 963, 2, 6, -UNI_VS } /* vs=false */, - { 0, 3587, 1061, 12, 4, UNI_ETHIOPICEXTB } /* blk=ethiopicextb */, - { 522, 135, 1110, 2, 4, UNI_XPOSIXWORD } /* isword */, - { 6, 135, 838, 2, 4, UNI_SARB } /* issarb */, - { 48, 2394, 7682, 6, 14, UNI_PUA } /* block=privateusearea */, - { 13, 2564, 2440, 3, 7, UNI_GREEKEXT } /* isgreekext */, - { 3, 1447, 373, 3, 2, UNI_IDS } /* ids=y */, - { 0, 285, 3548, 4, 12, UNI_WB__EB } /* gcb=glueafterzwj */, - { 0, 2055, 4703, 5, 5, UNI_POSIXUPPER } /* posixupper */, - { 8, 30, 4502, 1, 2, UNI_Z } /* isz */, - { 2, 3991, 796, 14, 2, UNI_NV__9_SLASH_2 } /* numericvalue=9/2 */, - { 0, 7979, 0, 30, 0, UNI_JG__MANICHAEANTHAMEDH } /* joininggroup=manichaeanthamedh */, - { 1170, 1696, 7259, 4, 26, UNI_HALFANDFULLFORMS } /* blk=halfwidthandfullwidthforms */, - { 0, 8324, 6773, 29, 5, UNI_CJKEXTC } /* blk=cjkunifiedideographsextensionc */, - { 17, 3447, 0, 15, 0, UNI_MERC } /* meroiticcursive */, - { 1, 2394, 7259, 6, 26, UNI_HALFANDFULLFORMS } /* block=halfwidthandfullwidthforms */, - { 254, 135, 349, 2, 2, UNI_PD } /* ispd */, - { 17, 3099, 3989, 11, 2, UNI_IN__8 } /* presentin=v80 */, - { 208, 2833, 6903, 6, 8, UNI_LO } /* gc=otherletter */, - { 1, 2394, 5309, 6, 16, UNI_TANGUTSUP } /* block=tangutsupplement */, - { 43, 2394, 5565, 6, 20, UNI_INNYIAKENGPUACHUEHMONG } /* block=nyiakengpuachuehmong */, - { 0, 135, 2607, 2, 5, UNI_XPOSIXBLANK } /* isblank */, - { 1, 1874, 759, 8, 3, UNI_MAKA } /* script=maka */, - { 11, 768, 662, 3, 6, UNI_INELYMAIC } /* inelymaic */, - { 1, 404, 0, 6, 0, UNI_HYPHEN } /* hyphen */, - { 16, 2238, 304, 4, 1, UNI_NV__44 } /* nv=44 */, - { 3, 6072, 6086, 5, 7, UNI_SUPARROWSC } /* issuparrowsc */, - { 4, 7847, 3373, 18, 3, UNI_DT__ENC } /* decompositiontype=enc */, - { 1, 3824, 819, 12, 3, UNI_JG__MALAYALAMNYA } /* jg=malayalamnya */, - { 0, 21, 655, 1, 6, UNI_ELBA } /* elbasan */, - { 102, 135, 466, 2, 4, UNI_OLCK } /* isolck */, - { 0, 5761, 963, 21, 2, -UNI_CWU } /* changeswhenuppercased=f */, - { 0, 4963, 372, 16, 2, UNI_patws_values_index } /* patternwhitespace= */, - { 257, 2114, 373, 5, 4, UNI_XPOSIXALPHA } /* alpha=yes */, - { 0, 306, 5549, 4, 4, UNI_NV__90000 } /* nv=90000 */, - { 2, 323, 617, 2, 7, UNI_INAVESTAN } /* inavestan */, - { 6, 2338, 2134, 11, 3, UNI_IN__11 } /* presentin=11.0 */, - { 34, 135, 225, 2, 4, UNI_TODR } /* istodr */, - { 8, 1874, 4115, 7, 4, UNI_SC__MODI } /* script=modi */, - { 0, 4173, 4701, 16, 2, UNI_idsb_values_index } /* idsbinaryoperator= */, - { 0, 1874, 352, 7, 4, UNI_SC__CARI } /* script=cari */, - { 306, 3099, 417, 11, 3, UNI_IN__15_DOT_1 } /* presentin=v151 */, - { 323, 30, 6800, 1, 17, UNI_INDICNUMBERFORMS } /* inindicnumberforms */, - { 0, 6955, 1225, 22, 3, UNI_JG__MALAYALAMNGA } /* joininggroup=malayalamnga */, - { 3, 1773, 4644, 8, 9, UNI_ARABICEXTB } /* isarabicextendedb */, - { 6, 6431, 561, 10, 2, UNI_LB__AL } /* linebreak=al */, - { 3, 33, 4844, 1, 8, UNI_SYRIACSUP } /* syriacsup */, - { 66, 655, 3535, 2, 3, UNI_LB__EX } /* lb=ex */, - { 30, 5976, 6086, 5, 7, UNI_SUPARROWSC } /* insuparrowsc */, - { 0, 257, 0, 4, 0, UNI_ZZZZ } /* zzzz */, - { 1027, 4557, 3325, 17, 15, UNI_ARMI } /* scriptextensions=imperialaramaic */, - { 32, 2394, 1553, 6, 8, UNI_INJAVANESE } /* block=javanese */, - { 0, 358, 7627, 4, 4, UNI_CCC__216 } /* ccc=atar */, - { 176, 7061, 373, 25, 2, UNI_DI } /* defaultignorablecodepoint=y */, - { 6, 5069, 962, 16, 7, -UNI_EBASE } /* emojimodifierbase=false */, - { 0, 323, 2026, 2, 10, UNI_INOLDSOGDIAN } /* inoldsogdian */, - { 1, 2394, 5839, 7, 18, UNI_COUNTINGROD } /* block=countingrodnumerals */, - { 0, 358, 418, 5, 1, UNI_CCC__15 } /* ccc=15 */, - { 0, 1945, 631, 12, 5, UNI_BIDIM } /* bidimirrored=true */, - { 22, 3599, 2772, 7, 13, UNI_ANCIENTSYMBOLS } /* block=ancientsymbols */, - { 3, 6372, 197, 3, 4, UNI_SGNW } /* sc=sgnw */, - { 4, 687, 150, 4, 2, UNI_HST__NA } /* hst=na */, - { 6, 135, 8927, 2, 18, UNI_CANS } /* iscanadianaboriginal */, - { 0, 135, 352, 2, 4, UNI_CARI } /* iscari */, - { 1, 3106, 1368, 4, 2, UNI_IN__2 } /* in=v20 */, - { 2, 2799, 1061, 10, 4, UNI_ARABICEXTB } /* blk=arabicextb */, - { 1, 6372, 217, 3, 4, UNI_SC__TGLG } /* sc=tglg */, - { 15, 7697, 366, 27, 2, UNI_CCC__84 } /* canonicalcombiningclass=ccc84 */, - { 65, 3587, 6025, 12, 9, UNI_ETHIOPICEXTA } /* blk=ethiopicextendeda */, - { 0, 1934, 0, 11, 0, UNI_BIDIC } /* bidicontrol */, - { 346, 1230, 3535, 4, 7, UNI_INCB__EXTEND } /* incb=extend */, - { 1, 30, 7016, 1, 11, UNI_DEVA } /* isdevanagari */, - { 286, 2394, 5044, 6, 5, UNI_INTAMIL } /* block=tamil */, - { 0, 3227, 6997, 5, 10, UNI_INMEETEIMAYEK } /* blk=meeteimayek */, - { 0, 1696, 336, 4, 5, UNI_INTAKRI } /* blk=takri */, - { 0, 1775, 0, 4, 0, UNI_ARAB } /* arab */, - { 1, 7061, 631, 25, 5, UNI_DI } /* defaultignorablecodepoint=true */, - { 1, 5782, 1915, 21, 8, UNI_WB__EB } /* graphemeclusterbreak=ebasegaz */, - { 4, 3945, 5549, 14, 4, UNI_NV__50000 } /* numericvalue=50000 */, - { 0, 1874, 377, 7, 6, UNI_SC__CAKM } /* script=chakma */, - { 0, 7233, 308, 23, 2, UNI_CCC__9 } /* canonicalcombiningclass=9 */, - { 0, 3227, 5211, 5, 18, UNI_MODIFIERTONELETTERS } /* blk=modifiertoneletters */, - { 178, 7233, 120, 24, 2, UNI_CCC__DA } /* canonicalcombiningclass=da */, - { 0, 1696, 3736, 4, 14, UNI_LATINEXTD } /* blk=latinextendedd */, - { 0, 2394, 1598, 6, 10, UNI_INNAGMUNDARI } /* block=nagmundari */, - { 0, 3491, 832, 13, 3, UNI_NV__NAN } /* numericvalue=nan */, - { 0, 2899, 4644, 10, 9, UNI_CYRILLICEXTB } /* iscyrillicextendedb */, - { 2, 2573, 373, 11, 4, UNI_JOINC } /* joincontrol=yes */, - { 0, 1874, 82, 7, 4, UNI_SC__GONG } /* script=gong */, - { 530, 7233, 366, 24, 2, UNI_CCC__84 } /* canonicalcombiningclass=84 */, - { 0, 2573, 645, 11, 3, -UNI_JOINC } /* joincontrol=no */, - { 0, 1874, 774, 7, 4, UNI_SC__MAND } /* script=mand */, - { 190, 2799, 4644, 10, 9, UNI_ARABICEXTB } /* blk=arabicextendedb */, - { 1, 7585, 0, 21, 0, UNI_BC__L } /* bidiclass=lefttoright */, - { 0, 7307, 3904, 8, 4, UNI_ARABICMATH } /* inarabicmath */, - { 30, 3764, 0, 13, 0, UNI_DEVANAGARIEXT } /* devanagariext */, - { 532, 2394, 8660, 7, 34, UNI_DIACRITICALSFORSYMBOLS } /* block=combiningdiacriticalmarksforsymbols */, - { 99, 135, 579, 2, 6, UNI_TNSA } /* istangsa */, - { 0, 1874, 1752, 7, 4, UNI_SC__GURU } /* script=guru */, - { 0, 7420, 4741, 14, 13, UNI_SUPPUNCTUATION } /* blk=supplementalpunctuation */, - { 5, 6372, 245, 3, 2, UNI_SC__YI } /* sc=yi */, - { 0, 135, 3373, 2, 13, UNI_ME } /* isenclosingmark */, - { 1, 1874, 2122, 7, 4, UNI_MEND } /* script=mend */, - { 1079, 3734, 1703, 7, 4, UNI_LATINEXTD } /* inlatinextd */, - { 0, 2394, 1344, 6, 9, UNI_INNABATAEAN } /* block=nabataean */, - { 0, 6277, 4793, 13, 9, UNI_MYANMAREXTC } /* block=myanmarextendedc */, - { 2, 1126, 118, 4, 4, UNI_KNDA } /* scx=knda */, - { 0, 2666, 315, 3, 2, UNI_LB__AP } /* lb=ap */, - { 0, 15, 4924, 2, 3, UNI_AGE__6 } /* age=6 */, - { 34, 1257, 6025, 6, 9, UNI_KANAEXTA } /* inkanaextendeda */, - { 320, 3623, 3630, 7, 9, UNI_CYPRIOTSYLLABARY } /* cypriotsyllabary */, - { 2, 6670, 4801, 14, 5, UNI_SB__CL } /* sentencebreak=close */, - { 0, 135, 4687, 2, 9, UNI_TITLE } /* istitlecase */, - { 0, 2338, 597, 10, 3, UNI_IN__3 } /* presentin=3.0 */, - { 12, 164, 7187, 2, 16, UNI_GEOMETRICSHAPESEXT } /* geometricshapesext */, - { 12, 2394, 8436, 7, 32, UNI_DIACRITICALSEXT } /* block=combiningdiacriticalmarksextended */, - { 0, 358, 0, 2, 0, UNI_XPOSIXCNTRL } /* cc */, - { 577, 1566, 3846, 4, 14, UNI_KAKTOVIKNUMERALS } /* iskaktoviknumerals */, - { 395, 1696, 5573, 4, 3, UNI_PUA } /* blk=pua */, - { 7, 4557, 767, 17, 7, UNI_LINA } /* scriptextensions=lineara */, - { 714, 7017, 0, 18, 0, UNI_DEVANAGARIEXT } /* devanagariextended */, - { 664, 3215, 2840, 5, 13, UNI_INGREEK } /* blk=greekandcoptic */, - { 40, 5059, 4644, 10, 9, UNI_KANAEXTB } /* block=kanaextendedb */, - { 0, 1957, 3723, 7, 3, UNI_KANGXI } /* blk=kangxi */, - { 50, 3491, 918, 11, 4, UNI_NV__10 } /* numericvalue=10 */, - { 0, 651, 575, 2, 3, UNI_idsb_values_index } /* idsb= */, - { 1, 3930, 556, 15, 1, UNI_NV__1_SLASH_7 } /* numericvalue=1/7 */, - { 673, 3106, 2147, 5, 2, UNI_IN__15 } /* in=v150 */, - { 512, 4557, 5565, 17, 20, UNI_HMNP } /* scriptextensions=nyiakengpuachuehmong */, - { 855, 7420, 8254, 5, 29, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* blk=symbolsandpictographsextendeda */, - { 481, 2785, 558, 4, 2, UNI_BC__RLO } /* bc=rlo */, - { 0, 2612, 2625, 3, 3, UNI_JG__DAL } /* jg=dal */, - { 7, 7697, 365, 28, 2, UNI_CCC__118 } /* canonicalcombiningclass=ccc118 */, - { 0, 1874, 393, 7, 4, UNI_SC__GOTH } /* script=goth */, - { 0, 6431, 4459, 10, 14, UNI_LB__BK } /* linebreak=mandatorybreak */, - { 4, 916, 2731, 4, 3, UNI_AGE__5 } /* age=5.0 */, - { 19, 5272, 6127, 6, 5, UNI__PERL_NCHAR } /* _perl_nchar */, - { 0, 270, 963, 5, 6, -UNI_CWKCF } /* cwkcf=false */, - { 4, 54, 2802, 2, 5, UNI_SC__ARAB } /* sc=arab */, - { 0, 135, 3623, 2, 16, UNI_CYPRIOTSYLLABARY } /* iscypriotsyllabary */, - { 2, 2504, 4793, 7, 9, UNI_MYANMAREXTC } /* myanmarextendedc */, - { 129, 30, 6706, 1, 14, UNI_ZNAMENNYMUSIC } /* isznamennymusic */, - { 806, 7420, 7506, 5, 24, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* blk=symbolsandpictographsexta */, - { 961, 6431, 1648, 10, 2, UNI_LB__LF } /* linebreak=lf */, - { 5, 1126, 2099, 4, 12, UNI_GONM } /* scx=masaramgondi */, - { 0, 2394, 1157, 6, 8, UNI_INUGARITIC } /* block=ugaritic */, - { 1, 846, 0, 4, 0, UNI_SYRC } /* syrc */, - { 42, 6372, 557, 3, 6, UNI_SC__ONAO } /* sc=olonal */, - { 32, 6372, 1904, 3, 4, UNI_SC__SYLO } /* sc=sylo */, - { 0, 6647, 514, 13, 3, UNI_JG__BEH } /* joininggroup=beh */, - { 0, 2394, 6897, 6, 15, UNI_MODIFIERLETTERS } /* block=modifierletters */, - { 0, 1874, 719, 7, 5, UNI_SC__OSGE } /* script=osage */, - { 0, 135, 7309, 2, 24, UNI_ARABICPFB } /* isarabicpresentationformsb */, - { 6, 1874, 938, 7, 4, UNI_BALI } /* script=bali */, - { 0, 6431, 3086, 10, 7, UNI_LB__NU } /* linebreak=numeric */, - { 0, 135, 6897, 2, 14, UNI_LM } /* ismodifierletter */, - { 2, 135, 4785, 2, 8, UNI_BOPO } /* isbopomofo */, - { 67, 2394, 6015, 6, 19, UNI_JAMOEXTA } /* block=hanguljamoextendeda */, - { 0, 323, 3111, 2, 14, UNI_INPSALTERPAHLAVI } /* inpsalterpahlavi */, - { 4, 2394, 8920, 6, 43, UNI_UCASEXTA } /* block=unifiedcanadianaboriginalsyllabicsextendeda */, - { 1, 1499, 963, 10, 2, -UNI_DEP } /* deprecated=f */, - { 0, 2278, 2732, 4, 8, UNI_NV__3_SLASH_5 } /* nv=6.000e-01 */, - { 0, 323, 7017, 2, 18, UNI_DEVANAGARIEXT } /* indevanagariextended */, - { 0, 2833, 1522, 3, 2, UNI_ZS } /* gc=zs */, - { 1344, 3736, 0, 9, 0, UNI_LATINEXTE } /* latinexte */, - { 0, 2345, 419, 3, 2, UNI_IN__16 } /* in=16 */, - { 0, 1775, 1763, 6, 3, UNI_ARABICPFB } /* arabicpfb */, - { 0, 6647, 682, 13, 3, UNI_JG__NUN } /* joininggroup=nun */, - { 1, 7585, 5427, 10, 3, UNI_BC__RLE } /* bidiclass=rle */, - { 150, 8095, 645, 8, 3, UNI_NO } /* category=no */, - { 24, 1126, 2847, 4, 4, UNI_COPT } /* scx=copt */, - { 281, 323, 8364, 2, 18, UNI_IDEOGRAPHICSYMBOLS } /* inideographicsymbols */, - { 18, 2122, 0, 4, 0, UNI_MEND } /* mend */, - { 128, 323, 636, 2, 7, UNI_DSRT } /* indeseret */, - { 3, 668, 644, 6, 2, UNI_extpict_values_index } /* extpict= */, - { 4, 358, 8354, 4, 10, UNI_CCC__BR } /* ccc=belowright */, - { 1588, 7697, 628, 27, 2, UNI_CCC__22 } /* canonicalcombiningclass=ccc22 */, - { 137, 2371, 631, 4, 5, UNI_XIDC } /* xidc=true */, - { 0, 6372, 1021, 3, 6, UNI_SC__KTHI } /* sc=kaithi */, - { 257, 135, 399, 2, 5, UNI_GREXT } /* isgrext */, - { 1, 358, 2292, 3, 2, UNI_CCC__8 } /* ccc=8 */, - { 5, 404, 631, 6, 2, UNI_HYPHEN } /* hyphen=t */, - { 1834, 6372, 422, 3, 4, UNI_MIAO } /* sc=miao */, - { 219, 6372, 767, 3, 7, UNI_SC__LINA } /* sc=lineara */, - { 2, 1696, 8029, 4, 22, UNI_ENCLOSEDIDEOGRAPHICSUP } /* blk=enclosedideographicsup */, - { 16, 4557, 90, 17, 4, UNI_GUJR } /* scriptextensions=gujr */, - { 0, 2394, 5482, 6, 18, UNI_TAIXUANJING } /* block=taixuanjingsymbols */, - { 17, 2612, 737, 10, 4, UNI_JG__AFRICANNOON } /* jg=africannoon */, - { 2, 4557, 1628, 17, 4, UNI_SAUR } /* scriptextensions=saur */, - { 6, 2666, 6454, 3, 13, UNI_LB__CM } /* lb=combiningmark */, - { 1, 2201, 413, 4, 1, UNI_NV__26 } /* nv=26 */, - { 2, 1447, 631, 3, 5, UNI_IDS } /* ids=true */, - { 296, 7233, 5660, 24, 17, UNI_WB__EB } /* canonicalcombiningclass=attachedbelowleft */, - { 2, 2785, 6209, 14, 8, UNI_BC__RLO } /* bc=righttoleftoverride */, - { 113, 4557, 1141, 17, 4, UNI_TAGB } /* scriptextensions=tagb */, - { 0, 2045, 0, 7, 0, UNI_RADICAL } /* radical */, - { 65, 2909, 6329, 3, 21, UNI_EARLYDYNASTICCUNEIFORM } /* isearlydynasticcuneiform */, - { 1, 345, 0, 2, 0, UNI_PF } /* pf */, - { 0, 1236, 8761, 3, 33, UNI_CJKCOMPATIDEOGRAPHSSUP } /* cjkcompatibilityideographssupplement */, - { 1, 1126, 482, 4, 4, UNI_MIAO } /* scx=plrd */, - { 0, 2553, 288, 5, 1, UNI_cased_values_index } /* cased= */, - { 1, 135, 133, 2, 2, UNI_NL } /* isnl */, - { 274, 1874, 6034, 7, 9, UNI_SC__MONG } /* script=mongolian */, - { 1, 7233, 419, 25, 2, UNI_CCC__216 } /* canonicalcombiningclass=216 */, - { 952, 2612, 2942, 3, 11, UNI_JG__ROHINGYAYEH } /* jg=rohingyayeh */, - { 2205, 1874, 1344, 7, 9, UNI_NBAT } /* script=nabataean */, - { 0, 4557, 782, 18, 3, UNI_MARC } /* scriptextensions=marc */, - { 106, 1874, 1390, 7, 9, UNI_SC__ORKH } /* script=oldturkic */, - { 4, 4557, 3764, 17, 4, UNI_DEVA } /* scriptextensions=deva */, - { 8, 135, 1027, 2, 6, UNI_LEPC } /* islepcha */, - { 0, 323, 699, 2, 5, UNI_INBUHID } /* inbuhid */, - { 0, 1874, 98, 7, 4, UNI_HLUW } /* script=hluw */, - { 36, 1007, 0, 8, 0, UNI_HIRA } /* hiragana */, - { 2, 6372, 1141, 3, 4, UNI_SC__TAGB } /* sc=tagb */, - { 1, 5260, 3138, 10, 11, UNI_WB__DQ } /* wordbreak=doublequote */, - { 25, 6955, 948, 22, 3, UNI_JG__MALAYALAMSSA } /* joininggroup=malayalamssa */, - { 0, 1236, 3712, 3, 6, UNI_CJKCOMPAT } /* cjkcompat */, - { 2180, 4970, 2654, 9, 4, -UNI_XPOSIXSPACE } /* whitespace=no */, - { 0, 7739, 6841, 9, 3, UNI_XPOSIXALPHA } /* alphabetic=t */, - { 16, 135, 975, 2, 4, UNI_DUPL } /* isdupl */, - { 1, 1441, 2835, 2, 6, UNI_WB__XX } /* wb=other */, - { 104, 6507, 455, 4, 2, UNI_BC__LRO } /* bc=lro */, - { 0, 6647, 2060, 13, 9, UNI_JG__SYRIACWAW } /* joininggroup=syriacwaw */, - { 2076, 6647, 4879, 14, 4, UNI_JG__ALAPH } /* joininggroup=alaph */, - { 1, 7651, 0, 18, 0, UNI_PHONETICEXT } /* phoneticextensions */, - { 0, 4557, 694, 17, 5, UNI_ADLM } /* scriptextensions=adlam */, - { 2, 8095, 502, 9, 2, UNI_SO } /* category=so */, - { 0, 5309, 0, 16, 0, UNI_TANGUTSUP } /* tangutsupplement */, - { 0, 5059, 3723, 9, 11, UNI_KANGXI } /* block=kangxiradicals */, - { 0, 905, 963, 4, 6, -UNI_IDEO } /* ideo=false */, - { 4, 916, 419, 4, 2, UNI_AGE__16 } /* age=16 */, - { 4, 2463, 1549, 8, 4, UNI_CYRILLICEXTA } /* cyrillicexta */, - { 1, 135, 1284, 2, 4, UNI_PHAG } /* isphag */, - { 5, 1033, 0, 6, 0, UNI_LYCI } /* lycian */, - { 8, 4557, 297, 17, 5, UNI_NSHU } /* scriptextensions=nushu */, - { 1, 6670, 5194, 13, 3, UNI_SB__CL } /* sentencebreak=cl */, - { 1, 6125, 644, 20, 3, -UNI__PERL_NCHAR } /* noncharactercodepoint=n */, - { 3, 1091, 645, 6, 3, UNI_NFKDQC__N } /* nfkdqc=no */, - { 0, 135, 1923, 2, 11, UNI_YISYLLABLES } /* isyisyllables */, - { 2379, 6372, 1248, 3, 9, UNI_SC__QAAI } /* sc=inherited */, - { 2, 1874, 529, 7, 4, UNI_SC__KHOJ } /* script=khoj */, - { 8, 3599, 1549, 12, 4, UNI_ARABICEXTA } /* block=arabicexta */, - { 0, 1474, 2146, 7, 2, UNI_CCC__25 } /* ccc=ccc25 */, - { 0, 6372, 6146, 3, 4, UNI_SC__SINH } /* sc=sinh */, - { 302, 404, 645, 6, 3, -UNI_HYPHEN } /* hyphen=no */, - { 3, 546, 309, 4, 1, UNI_NV__39 } /* nv=39 */, - { 0, 4097, 0, 17, 0, UNI_EPRES } /* emojipresentation */, - { 1, 6372, 1408, 3, 4, UNI_PALM } /* sc=palm */, - { 2215, 5260, 2999, 9, 3, UNI_WB__LE } /* wordbreak=le */, - { 1, 5102, 6374, 18, 10, UNI_INCB__CONSONANT } /* indicconjunctbreak=consonant */, - { 18, 2601, 3365, 6, 5, UNI_XPOSIXALNUM } /* xposixalnum */, - { 15, 306, 2213, 3, 9, UNI_NV__1_SLASH_32 } /* nv=3.125e-02 */, - { 0, 1993, 372, 11, 3, UNI_GRBASE } /* graphemebase=y */, - { 199, 6372, 5857, 3, 19, UNI_SC__MERO } /* sc=meroitichieroglyphs */, - { 0, 2, 4206, 1, 14, UNI_CURRENCYSYMBOLS } /* currencysymbols */, - { 27, 7697, 596, 27, 2, UNI_CCC__13 } /* canonicalcombiningclass=ccc13 */, - { 7, 2553, 645, 5, 2, -UNI_CASED } /* cased=n */, - { 1, 1126, 704, 4, 5, UNI_DOGR } /* scx=dogra */, - { 228, 1498, 645, 2, 3, -UNI_SD } /* sd=no */, - { 290, 4377, 4373, 13, 4, UNI_JG__MANICHAEANHETH } /* jg=manichaeanheth */, - { 0, 1696, 1859, 4, 11, UNI_INPAHAWHHMONG } /* blk=pahawhhmong */, - { 784, 6372, 1157, 3, 4, UNI_UGAR } /* sc=ugar */, - { 47, 6372, 454, 3, 3, UNI_MRO } /* sc=mro */, - { 1034, 1696, 23, 4, 4, UNI_INAHOM } /* blk=ahom */, - { 2, 3215, 6040, 9, 13, UNI_GEORGIANSUP } /* blk=georgiansupplement */, - { 56, 1126, 822, 4, 4, UNI_HMNP } /* scx=hmnp */, - { 2, 2266, 5549, 4, 4, UNI_NV__50000 } /* nv=50000 */, - { 24, 135, 5462, 2, 20, UNI_PHLI } /* isinscriptionalpahlavi */, - { 1, 2502, 2718, 3, 12, UNI_MISCTECHNICAL } /* inmisctechnical */, - { 1346, 2394, 7651, 6, 18, UNI_PHONETICEXT } /* block=phoneticextensions */, - { 0, 1945, 288, 5, 1, UNI_bidim_values_index } /* bidim= */, - { 1035, 135, 7923, 2, 19, UNI_EGYP } /* isegyptianhieroglyphs */, - { 1, 1126, 1399, 4, 9, UNI_OUGR } /* scx=olduyghur */, - { 2, 3106, 2179, 4, 2, UNI_IN__6_DOT_3 } /* in=v63 */, - { 1, 3778, 1549, 7, 4, UNI_LATINEXTA } /* islatinexta */, - { 0, 546, 2161, 4, 8, UNI_NV__7_SLASH_2 } /* nv=3.500e+00 */, - { 2002, 7868, 690, 18, 4, UNI_LB__H3 } /* hangulsyllabletype=lvt */, - { 1616, 2584, 4770, 3, 15, UNI_MISCMATHSYMBOLSB } /* ismiscmathsymbolsb */, - { 4, 5976, 7906, 13, 17, UNI_SUPPUAB } /* insupplementaryprivateuseareab */, - { 0, 270, 645, 5, 2, -UNI_CWKCF } /* cwkcf=n */, - { 0, 2833, 106, 3, 1, UNI_Z } /* gc=z */, - { 2073, 5, 631, 3, 2, UNI_MCM } /* mcm=t */, - { 0, 2564, 394, 3, 3, UNI_GOTH } /* isgoth */, - { 813, 675, 372, 5, 3, UNI_GRBASE } /* grbase=y */, - { 0, 1874, 189, 7, 4, UNI_SC__RUNR } /* script=runr */, - { 2, 541, 1850, 2, 4, UNI_nfcqc_values_index } /* nfcqc= */, - { 2350, 2575, 5385, 4, 16, UNI_HALFMARKS } /* incombininghalfmarks */, - { 2304, 8861, 6086, 9, 7, UNI_SUPARROWSC } /* block=suparrowsc */, - { 3, 1945, 373, 5, 4, UNI_BIDIM } /* bidim=yes */, - { 1, 1957, 6025, 8, 9, UNI_KANAEXTA } /* blk=kanaextendeda */, - { 0, 1696, 1027, 4, 6, UNI_INLEPCHA } /* blk=lepcha */, - { 2599, 2238, 366, 4, 1, UNI_NV__48 } /* nv=48 */, - { 0, 2394, 7766, 6, 17, UNI_ANCIENTGREEKMUSIC } /* block=ancientgreekmusic */, - { 299, 1874, 709, 7, 4, UNI_SC__LIMB } /* script=limb */, - { 34, 323, 286, 2, 3, UNI_incb_values_index } /* incb= */, - { 0, 2394, 1284, 6, 7, UNI_INPHAGSPA } /* block=phagspa */, - { 11, 3750, 0, 14, 0, UNI_PHONETICEXTSUP } /* phoneticextsup */, - { 86, 3696, 631, 16, 2, UNI_IDSU } /* idsunaryoperator=t */, - { 9, 2394, 4414, 6, 17, UNI_INKHITANSMALLSCRIPT } /* block=khitansmallscript */, - { 346, 2290, 2180, 7, 5, UNI_NV__1_SLASH_12 } /* nv=8.333e-02 */, - { 12, 1696, 1545, 4, 8, UNI_JAMOEXTA } /* blk=jamoexta */, - { 6, 4557, 126, 17, 4, UNI_LAO } /* scriptextensions=laoo */, - { 2563, 275, 963, 3, 6, -UNI_CWT } /* cwt=false */, - { 1842, 916, 600, 5, 3, UNI_AGE__14 } /* age=14.0 */, - { 777, 5782, 1648, 21, 2, UNI_LB__LF } /* graphemeclusterbreak=lf */, - { 0, 2833, 133, 3, 2, UNI_NL } /* gc=nl */, - { 0, 1696, 7333, 5, 23, UNI_DIACRITICALSFORSYMBOLS } /* blk=combiningmarksforsymbols */, - { 0, 6372, 134, 3, 4, UNI_SC__LISU } /* sc=lisu */, - { 1059, 1696, 991, 4, 8, UNI_INGUJARATI } /* blk=gujarati */, - { 0, 4557, 1245, 17, 4, UNI_THAI } /* scriptextensions=thai */, - { 8, 2394, 529, 6, 6, UNI_INKHOJKI } /* block=khojki */, - { 1046, 6127, 4701, 4, 2, UNI_nchar_values_index } /* nchar= */, - { 0, 558, 962, 2, 7, -UNI_LOE } /* loe=false */, - { 0, 5289, 0, 20, 0, UNI_HLUW } /* anatolianhieroglyphs */, - { 2, 0, 287, 1, 4, UNI_LB__H2 } /* lb=h2 */, - { 515, 135, 4190, 2, 4, UNI_BRAI } /* isbrai */, - { 656, 1097, 2185, 4, 8, UNI_NV__1_SLASH_6 } /* nv=1.667e-01 */, - { 0, 7739, 631, 10, 5, UNI_XPOSIXALPHA } /* alphabetic=true */, - { 259, 2394, 1859, 6, 11, UNI_INPAHAWHHMONG } /* block=pahawhhmong */, - { 0, 8088, 3904, 16, 10, UNI_SM } /* generalcategory=mathsymbol */, - { 0, 358, 309, 5, 1, UNI_CCC__19 } /* ccc=19 */, - { 1294, 4005, 631, 16, 5, UNI_STERM } /* sentenceterminal=true */, - { 0, 1696, 1245, 4, 4, UNI_INTHAI } /* blk=thai */, - { 0, 774, 0, 4, 0, UNI_MAND } /* mand */, - { 521, 1322, 1549, 5, 4, UNI_CJKEXTA } /* iscjkexta */, - { 1, 135, 969, 2, 6, UNI_COMPEX } /* iscompex */, - { 0, 1775, 4793, 6, 9, UNI_ARABICEXTC } /* arabicextendedc */, - { 0, 5976, 0, 21, 0, UNI_SUPARROWSB } /* insupplementalarrowsb */, - { 0, 7585, 349, 10, 3, UNI_BC__PDF } /* bidiclass=pdf */, - { 5, 5930, 288, 4, 1, UNI_emod_values_index } /* emod= */, - { 2, 2502, 1061, 9, 4, UNI_MYANMAREXTB } /* inmyanmarextb */, - { 0, 4652, 3741, 14, 9, UNI_CYRILLICEXTD } /* block=cyrillicextendedd */, - { 532, 7208, 0, 25, 0, UNI_SUPERANDSUB } /* superscriptsandsubscripts */, - { 0, 135, 938, 2, 4, UNI_BALI } /* isbali */, - { 0, 1696, 4785, 4, 11, UNI_BOPOMOFOEXT } /* blk=bopomofoext */, - { 0, 4524, 2230, 14, 8, UNI_NV__3_SLASH_8 } /* numericvalue=3.750e-01 */, - { 0, 2833, 3809, 3, 11, UNI_MC } /* gc=spacingmark */, - { 2443, 1441, 9, 3, 2, UNI_LB__CR } /* wb=cr */, - { 5, 135, 2511, 2, 4, UNI_NAND } /* isnand */, - { 0, 4557, 67, 17, 4, UNI_CPRT } /* scriptextensions=cprt */, - { 2049, 8088, 5, 16, 2, UNI_MC } /* generalcategory=mc */, - { 17, 2553, 963, 5, 2, -UNI_CASED } /* cased=f */, - { 1, 6372, 1579, 3, 4, UNI_KHAR } /* sc=khar */, - { 0, 5604, 2787, 19, 2, UNI_VO__R } /* verticalorientation=r */, - { 0, 3106, 615, 4, 2, UNI_IN__5_DOT_2 } /* in=v52 */, - { 773, 924, 615, 5, 2, UNI_AGE__5_DOT_2 } /* age=v52 */, - { 10, 6372, 142, 3, 4, UNI_MTEI } /* sc=mtei */, - { 1, 2338, 600, 10, 3, UNI_IN__4 } /* presentin=4.0 */, - { 2836, 1126, 438, 4, 4, UNI_GONM } /* scx=gonm */, - { 1, 6372, 352, 3, 4, UNI_SC__CARI } /* sc=cari */, - { 1, 3734, 4832, 6, 12, UNI_LATIN1 } /* inlatin1supplement */, - { 2171, 8861, 6891, 7, 21, UNI_MODIFIERLETTERS } /* block=spacingmodifierletters */, + { 0, 6464, 321, 3, 5, UNI_SC__ORYA } /* sc=oriya */, + { 0, 2097, 638, 10, 3, UNI_JT__T } /* joiningtype=t */, + { 2, 1911, 2385, 7, 12, UNI_SC__TUTG } /* script=tulutigalari */, + { 0, 6464, 1156, 3, 8, UNI_SC__TAGB } /* sc=tagbanwa */, { 0, 135, 53, 2, 1, UNI_N } /* isn */, - { 79, 4557, 5289, 17, 20, UNI_HLUW } /* scriptextensions=anatolianhieroglyphs */, - { 0, 8088, 2430, 16, 10, UNI_CN } /* generalcategory=unassigned */, - { 2362, 5782, 0, 21, 0, UNI_gcb_values_index } /* graphemeclusterbreak= */, - { 2, 1696, 1598, 4, 10, UNI_INNAGMUNDARI } /* blk=nagmundari */, - { 596, 2573, 963, 5, 2, -UNI_JOINC } /* joinc=f */, - { 23, 135, 6034, 2, 9, UNI_MONG } /* ismongolian */, - { 531, 1035, 963, 2, 6, -UNI_CI } /* ci=false */, - { 361, 6127, 631, 5, 2, UNI__PERL_NCHAR } /* nchar=t */, - { 1, 3040, 2061, 3, 5, UNI_INSYRIAC } /* insyriac */, - { 10, 869, 0, 4, 0, UNI_TERM } /* term */, - { 0, 624, 2223, 5, 2, UNI_CCC__DB } /* ccc=233 */, - { 13, 4557, 47, 17, 4, UNI_CAKM } /* scriptextensions=cakm */, - { 0, 5325, 0, 20, 0, UNI_LATINEXTC } /* block=latinextendedc */, - { 791, 1874, 1509, 7, 10, UNI_DIAK } /* script=divesakuru */, - { 0, 2394, 6806, 6, 11, UNI_NUMBERFORMS } /* block=numberforms */, - { 1190, 2551, 0, 7, 0, UNI_CASED } /* iscased */, - { 556, 2612, 741, 3, 4, UNI_JG__SEEN } /* jg=seen */, - { 1, 770, 6331, 3, 19, UNI_EARLYDYNASTICCUNEIFORM } /* earlydynasticcuneiform */, - { 1284, 643, 2759, 3, 8, UNI_DT__VERT } /* dt=vertical */, - { 666, 4635, 1549, 9, 4, UNI_LATINEXTA } /* blk=latinexta */, - { 0, 323, 5955, 2, 21, UNI_ININSCRIPTIONALPARTHIAN } /* ininscriptionalparthian */, - { 1, 5260, 3423, 10, 12, UNI_LB__HL } /* wordbreak=hebrewletter */, - { 0, 6647, 2953, 13, 11, UNI_JG__STRAIGHTWAW } /* joininggroup=straightwaw */, - { 1585, 6372, 181, 3, 4, UNI_SC__COPT } /* sc=qaac */, - { 4, 1874, 1007, 7, 8, UNI_SC__HIRA } /* script=hiragana */, - { 0, 2394, 1390, 6, 9, UNI_INOLDTURKIC } /* block=oldturkic */, - { 0, 3643, 0, 9, 0, UNI_Z } /* separator */, - { 0, 358, 27, 4, 2, UNI_CCC__AR } /* ccc=ar */, - { 0, 1035, 373, 2, 4, UNI_CI } /* ci=yes */, - { 209, 5059, 3723, 9, 3, UNI_KANGXI } /* block=kangxi */, - { 0, 316, 963, 5, 6, -UNI__PERL_PATWS } /* patws=false */, - { 0, 92, 689, 1, 3, UNI_JT__L } /* jt=l */, - { 11, 3227, 2111, 5, 11, UNI_MATHALPHANUM } /* blk=mathalphanum */, - { 0, 323, 7951, 2, 18, UNI_INVS } /* invariationselectors */, - { 30, 8095, 138, 9, 2, UNI_ME } /* category=me */, - { 244, 2833, 106, 3, 2, UNI_ZL } /* gc=zl */, - { 371, 2069, 2987, 11, 12, UNI_JT__C } /* joiningtype=joincausing */, - { 0, 2666, 5930, 3, 9, UNI_EMOD } /* lb=emodifier */, - { 7, 323, 352, 2, 6, UNI_INCARIAN } /* incarian */, - { 304, 1874, 1039, 7, 6, UNI_SC__TELU } /* script=telugu */, - { 1, 3652, 0, 16, 0, UNI_HALFANDFULLFORMS } /* halfandfullforms */, - { 825, 6372, 6862, 3, 6, UNI_BRAH } /* sc=brahmi */, - { 3, 2573, 631, 11, 5, UNI_JOINC } /* joincontrol=true */, - { 0, 8088, 208, 16, 2, UNI_TITLE } /* generalcategory=lt */, - { 987, 1874, 27, 7, 4, UNI_ARMI } /* script=armi */, - { 1, 2394, 1263, 6, 7, UNI_INMAKASAR } /* block=makasar */, - { 0, 6647, 4406, 13, 4, UNI_JG__QAPH } /* joininggroup=qaph */, - { 13, 7233, 804, 24, 2, UNI_CCC__17 } /* canonicalcombiningclass=17 */, - { 560, 135, 5276, 2, 2, UNI_CASEDLETTER } /* isl_ */, - { 0, 135, 67, 2, 4, UNI_CPRT } /* iscprt */, - { 0, 6372, 3423, 3, 4, UNI_SC__HEBR } /* sc=hebr */, - { 1, 135, 1752, 2, 11, UNI_GUKH } /* isgurungkhema */, - { 542, 624, 2175, 5, 2, UNI_CCC__202 } /* ccc=202 */, - { 1, 4524, 0, 14, 0, UNI_NV__3 } /* numericvalue=3 */, - { 0, 2394, 4220, 6, 17, UNI_INDICSIYAQNUMBERS } /* block=indicsiyaqnumbers */, - { 6, 768, 8168, 3, 29, UNI_ENCLOSEDALPHANUMSUP } /* inenclosedalphanumericsupplement */, - { 329, 2394, 4068, 7, 16, UNI_INCAUCASIANALBANIAN } /* block=caucasianalbanian */, - { 3, 1446, 631, 8, 5, UNI_XIDS } /* xidstart=true */, - { 2, 135, 1315, 2, 4, UNI_TIRH } /* istirh */, - { 2, 323, 714, 2, 5, UNI_INOGHAM } /* inogham */, - { 3, 5604, 6181, 20, 7, UNI_VO__R } /* verticalorientation=rotated */, - { 0, 2345, 595, 4, 2, UNI_IN__1_DOT_1 } /* in=1.1 */, - { 501, 32, 963, 2, 2, -UNI_VS } /* vs=f */, - { 0, 326, 963, 5, 2, -UNI_QMARK } /* qmark=f */, - { 524, 905, 373, 4, 2, UNI_IDEO } /* ideo=y */, - { 47, 4557, 146, 17, 4, UNI_MYMR } /* scriptextensions=mymr */, - { 1, 312, 963, 2, 2, -UNI_RI } /* ri=f */, - { 3, 7951, 645, 17, 3, -UNI_VS } /* variationselector=no */, - { 3, 8095, 106, 9, 2, UNI_ZL } /* category=zl */, - { 2051, 668, 373, 7, 2, UNI_EXTPICT } /* extpict=y */, - { 386, 135, 2740, 2, 13, UNI_PATSYN } /* ispatternsyntax */, - { 0, 326, 0, 5, 0, UNI_QMARK } /* qmark */, - { 3, 3778, 4487, 3, 16, UNI_LETTERLIKESYMBOLS } /* isletterlikesymbols */, - { 584, 306, 2730, 3, 10, UNI_NV___MINUS_1_SLASH_2 } /* nv=-5.000e-01 */, - { 2660, 6431, 4431, 10, 14, UNI_LB__CR } /* linebreak=carriagereturn */, - { 1, 1236, 3712, 3, 11, UNI_CJKCOMPATFORMS } /* cjkcompatforms */, - { 2, 1810, 631, 11, 2, UNI_KEHNOMIRROR } /* kehnomirror=t */, - { 128, 6350, 372, 19, 5, UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=yes */, - { 0, 1279, 6682, 2, 25, UNI_SHORTHANDFORMATCONTROLS } /* blk=shorthandformatcontrols */, - { 1, 2394, 23, 6, 4, UNI_INAHOM } /* block=ahom */, - { 0, 8095, 4129, 9, 14, UNI_ZS } /* category=spaceseparator */, - { 0, 8, 0, 3, 0, UNI_OCR } /* ocr */, - { 0, 7951, 373, 17, 2, UNI_VS } /* variationselector=y */, - { 16, 4557, 719, 17, 5, UNI_OSGE } /* scriptextensions=osage */, - { 75, 5677, 645, 21, 3, -UNI_CWCF } /* changeswhencasefolded=no */, - { 7, 323, 1509, 2, 10, UNI_INDIVESAKURU } /* indivesakuru */, - { 0, 1938, 0, 7, 0, UNI_XPOSIXCNTRL } /* control */, - { 0, 1126, 226, 5, 3, UNI_TODR } /* scx=todr */, - { 2498, 2394, 7120, 6, 14, UNI_BYZANTINEMUSIC } /* block=byzantinemusic */, - { 621, 4321, 372, 8, 5, UNI_XPOSIXLOWER } /* lowercase=yes */, - { 2, 1322, 8225, 3, 15, UNI_CUNEIFORMNUMBERS } /* iscuneiformnumbers */, - { 18, 135, 668, 2, 7, UNI_EXTPICT } /* isextpict */, - { 0, 2461, 3741, 10, 9, UNI_CYRILLICEXTD } /* incyrillicextendedd */, - { 1164, 6370, 5432, 5, 15, UNI_INSC__MODIFYINGLETTER } /* insc=modifyingletter */, - { 8, 1126, 1408, 4, 9, UNI_PALM } /* scx=palmyrene */, - { 0, 4736, 4741, 5, 13, UNI_PI } /* initialpunctuation */, - { 0, 905, 631, 4, 5, UNI_IDEO } /* ideo=true */, - { 2832, 2819, 631, 5, 2, UNI_EMOJI } /* emoji=t */, - { 2308, 7420, 7906, 15, 17, UNI_SUPPUAB } /* blk=supplementaryprivateuseareab */, - { 3456, 2394, 7309, 6, 24, UNI_ARABICPFB } /* block=arabicpresentationformsb */, - { 2, 1696, 6034, 4, 12, UNI_MONGOLIANSUP } /* blk=mongoliansup */, - { 0, 8095, 265, 9, 2, UNI_CASEDLETTER } /* category=lc */, - { 2, 3111, 0, 14, 0, UNI_PHLP } /* psalterpahlavi */, - { 2, 905, 963, 4, 2, -UNI_IDEO } /* ideo=f */, - { 132, 7847, 1744, 18, 8, UNI_DT__ISO } /* decompositiontype=isolated */, - { 5341, 135, 5677, 2, 21, UNI_CWCF } /* ischangeswhencasefolded */, - { 4, 2045, 631, 7, 2, UNI_RADICAL } /* radical=t */, - { 1, 6372, 1118, 3, 4, UNI_MERC } /* sc=merc */, - { 0, 8596, 7165, 31, 11, UNI_INSC__CONSONANTPLACEHOLDER } /* indicsyllabiccategory=consonantplaceholder */, - { 6, 135, 6684, 2, 23, UNI_SHORTHANDFORMATCONTROLS } /* isshorthandformatcontrols */, - { 25, 2201, 5549, 4, 5, UNI_NV__200000 } /* nv=200000 */, - { 10, 358, 1185, 4, 2, UNI_CCC__24 } /* ccc=24 */, - { 1, 8564, 4814, 32, 4, UNI_CJKEXTF } /* block=cjkunifiedideographsextensionf */, - { 0, 1447, 963, 7, 6, -UNI_IDS } /* idstart=false */, - { 6, 4557, 3219, 17, 8, UNI_GEOR } /* scriptextensions=georgian */, - { 457, 30, 1244, 1, 5, UNI_INTHAI } /* inthai */, - { 0, 1126, 94, 4, 4, UNI_GUKH } /* scx=gukh */, - { 0, 3599, 5086, 7, 9, UNI_ALCHEMICAL } /* block=alchemical */, - { 2, 1696, 6146, 4, 7, UNI_INSINHALA } /* blk=sinhala */, - { 0, 687, 631, 3, 2, UNI_GCB__T } /* hst=t */, - { 0, 90, 0, 4, 0, UNI_GUJR } /* gujr */, - { 2, 4321, 631, 5, 2, UNI_XPOSIXLOWER } /* lower=t */, - { 0, 968, 963, 5, 6, -UNI_ECOMP } /* ecomp=false */, - { 2565, 4377, 1072, 14, 3, UNI_JG__MANICHAEANKAPH } /* jg=manichaeankaph */, - { 0, 7233, 1185, 25, 2, UNI_CCC__L } /* canonicalcombiningclass=224 */, - { 1, 1874, 253, 7, 4, UNI_SC__ZYYY } /* script=zyyy */, - { 68, 859, 963, 4, 6, -UNI_DASH } /* dash=false */, - { 10, 3491, 1368, 13, 4, UNI_NV__2000 } /* numericvalue=2000 */, - { 10, 3491, 412, 13, 2, UNI_NV__26 } /* numericvalue=26 */, - { 1, 2833, 502, 3, 2, UNI_SO } /* gc=so */, - { 8, 8095, 4280, 9, 11, UNI_P } /* category=punctuation */, - { 0, 2847, 0, 6, 0, UNI_COPT } /* coptic */, - { 868, 546, 2222, 4, 8, UNI_NV__1_SLASH_3 } /* nv=3.333e-01 */, - { 0, 7090, 645, 20, 2, -UNI_CE } /* compositionexclusion=n */, - { 2, 1696, 3520, 4, 15, UNI_SARB } /* blk=oldsoutharabian */, - { 0, 6372, 225, 3, 4, UNI_SC__TODR } /* sc=todr */, - { 1, 2394, 154, 6, 4, UNI_INNEWA } /* block=newa */, - { 4615, 3824, 948, 12, 3, UNI_JG__MALAYALAMSSA } /* jg=malayalamssa */, - { 0, 1874, 5955, 7, 21, UNI_PRTI } /* script=inscriptionalparthian */, - { 1613, 1259, 1061, 4, 4, UNI_KANAEXTB } /* kanaextb */, - { 0, 4557, 43, 17, 4, UNI_BUHD } /* scriptextensions=buhd */, - { 0, 285, 9, 4, 2, UNI_LB__CR } /* gcb=cr */, - { 12, 7697, 1367, 28, 2, UNI_CCC__132 } /* canonicalcombiningclass=ccc132 */, - { 8, 6467, 1364, 14, 2, UNI_NV__200 } /* numericvalue=200 */, - { 0, 6838, 0, 5, 0, UNI_inpc_values_index } /* inpc= */, - { 34, 3599, 1173, 12, 3, UNI_ARABICPFA } /* block=arabicpfa */, - { 8, 1126, 699, 4, 5, UNI_BUHD } /* scx=buhid */, - { 89, 2785, 4605, 3, 15, UNI_BC__BN } /* bc=boundaryneutral */, - { 5, 1126, 991, 4, 8, UNI_GUJR } /* scx=gujarati */, - { 0, 4173, 631, 17, 2, UNI_IDSB } /* idsbinaryoperator=t */, - { 0, 316, 0, 5, 0, UNI__PERL_PATWS } /* patws */, - { 2, 4377, 4402, 13, 4, UNI_JG__MANICHAEANYODH } /* jg=manichaeanyodh */, - { 0, 2, 644, 2, 3, -UNI_CWT } /* cwt=n */, - { 0, 2799, 0, 10, 0, UNI_INARABIC } /* blk=arabic */, - { 0, 541, 373, 5, 4, UNI_NFDQC__Y } /* nfdqc=yes */, - { 70, 1165, 0, 4, 0, UNI_VITH } /* vith */, - { 5, 3904, 631, 4, 2, UNI_MATH } /* math=t */, - { 4245, 323, 6341, 2, 9, UNI_INCUNEIFORM } /* incuneiform */, - { 3, 1126, 4638, 3, 6, UNI_LATN } /* scx=latin */, - { 0, 2053, 0, 4, 0, UNI_PO } /* ispo */, - { 5666, 1874, 118, 7, 4, UNI_SC__KNDA } /* script=knda */, - { 0, 323, 5309, 2, 16, UNI_TANGUTSUP } /* intangutsupplement */, - { 3, 2, 631, 3, 2, UNI_CWL } /* cwl=t */, - { 2304, 1945, 963, 5, 6, -UNI_BIDIM } /* bidim=false */, - { 5259, 1234, 3712, 5, 11, UNI_CJKCOMPATFORMS } /* incjkcompatforms */, - { 0, 7558, 0, 27, 0, UNI_OCR } /* opticalcharacterrecognition */, - { 2441, 6647, 2931, 13, 11, UNI_JG__KASHMIRIYEH } /* joininggroup=kashmiriyeh */, - { 0, 7585, 4620, 10, 15, UNI_BC__CS } /* bidiclass=commonseparator */, - { 3140, 859, 631, 4, 2, UNI_DASH } /* dash=t */, - { 0, 2666, 4445, 3, 14, UNI_LB__SA } /* lb=complexcontext */, - { 4, 2338, 596, 10, 2, UNI_IN__13 } /* presentin=13 */, - { 4608, 1474, 1187, 7, 2, UNI_CCC__35 } /* ccc=ccc35 */, - { 7, 859, 631, 4, 5, UNI_DASH } /* dash=true */, - { 0, 3040, 1645, 3, 9, UNI_SMALLFORMS } /* insmallforms */, - { 0, 4504, 372, 5, 5, UNI_XPOSIXSPACE } /* wspace=yes */, - { 6, 3560, 0, 15, 0, UNI_ZANB } /* zanabazarsquare */, - { 3105, 181, 0, 4, 0, UNI_COPT } /* qaac */, - { 0, 2833, 5344, 3, 20, UNI_PC } /* gc=connectorpunctuation */, - { 0, 5325, 1061, 11, 4, UNI_LATINEXTB } /* block=latinextb */, - { 0, 6372, 15, 3, 4, UNI_SC__AGHB } /* sc=aghb */, - { 71, 2394, 2372, 6, 3, UNI_INIDC } /* block=idc */, - { 0, 135, 6015, 2, 19, UNI_JAMOEXTA } /* ishanguljamoextendeda */, - { 0, 3575, 1703, 12, 4, UNI_CYRILLICEXTD } /* blk=cyrillicextd */, - { 4384, 2833, 2430, 3, 10, UNI_CN } /* gc=unassigned */, - { 6619, 135, 3111, 2, 14, UNI_PHLP } /* ispsalterpahlavi */, - { 0, 6467, 551, 14, 2, UNI_NV__2_SLASH_5 } /* numericvalue=2/5 */, - { 6, 7847, 7423, 17, 4, UNI_DT__SUP } /* decompositiontype=sup */, - { 1, 1874, 478, 7, 4, UNI_PHLI } /* script=phli */, - { 12, 3575, 3741, 12, 9, UNI_CYRILLICEXTD } /* blk=cyrillicextendedd */, - { 1, 3125, 645, 13, 2, -UNI_QMARK } /* quotationmark=n */, - { 0, 1874, 352, 7, 6, UNI_SC__CARI } /* script=carian */, - { 0, 1126, 1298, 4, 7, UNI_SOYO } /* scx=soyombo */, - { 7168, 3778, 635, 13, 3, UNI_LATINEXTE } /* islatinextendede */, - { 0, 1696, 5029, 4, 15, UNI_DIACRITICALSSUP } /* blk=diacriticalssup */, - { 1187, 1447, 373, 7, 4, UNI_IDS } /* idstart=yes */, - { 4108, 6431, 5930, 10, 9, UNI_EMOD } /* linebreak=emodifier */, - { 0, 2371, 373, 4, 4, UNI_XIDC } /* xidc=yes */, - { 3, 2666, 323, 3, 2, UNI_LB__IN } /* lb=in */, - { 4108, 1654, 645, 10, 3, -UNI_SD } /* softdotted=no */, - { 3201, 1934, 645, 5, 3, -UNI_BIDIC } /* bidic=no */, - { 0, 3827, 0, 9, 0, UNI_MLYM } /* malayalam */, - { 5062, 1126, 31, 4, 4, UNI_AVST } /* scx=avst */, - { 1553, 7233, 2223, 25, 2, UNI_CCC__DB } /* canonicalcombiningclass=233 */, - { 2, 1696, 3219, 4, 8, UNI_INGEORGIAN } /* blk=georgian */, - { 2066, 2666, 5195, 3, 16, UNI_LB__CP } /* lb=closeparenthesis */, - { 7377, 624, 303, 6, 1, UNI_CCC__B } /* ccc=220 */, - { 0, 5, 2706, 1, 12, UNI_MAYANNUMERALS } /* mayannumerals */, - { 29, 4377, 4365, 13, 4, UNI_JG__MANICHAEANBETH } /* jg=manichaeanbeth */, - { 0, 7585, 3590, 9, 3, UNI_BC__ET } /* bidiclass=et */, - { 2211, 4557, 3590, 16, 5, UNI_ETHI } /* scriptextensions=ethi */, - { 0, 4635, 4888, 17, 10, UNI_LATINEXTADDITIONAL } /* blk=latinextendedadditional */, - { 306, 1126, 975, 4, 8, UNI_DUPL } /* scx=duployan */, - { 656, 8728, 3163, 24, 6, UNI__PERL_PROBLEMATIC_LOCALE_FOLDS } /* _perl_problematic_locale_folds */, - { 1, 4524, 309, 14, 1, UNI_NV__39 } /* numericvalue=39 */, - { 0, 1126, 1528, 4, 8, UNI_BUGI } /* scx=buginese */, - { 6639, 1696, 4666, 7, 4, UNI_CJKEXTC } /* blk=cjkextc */, - { 462, 8596, 3068, 31, 5, UNI_INSC__CONSONANTFINAL } /* indicsyllabiccategory=consonantfinal */, - { 0, 11, 5086, 1, 9, UNI_ALCHEMICAL } /* alchemical */, - { 0, 6431, 8037, 10, 11, UNI_LB__ID } /* linebreak=ideographic */, - { 0, 1126, 5500, 4, 8, UNI_CHER } /* scx=cherokee */, - { 0, 1696, 1051, 4, 6, UNI_INYEZIDI } /* blk=yezidi */, - { 2, 8088, 2881, 19, 8, UNI_SO } /* generalcategory=othersymbol */, - { 4353, 4321, 0, 5, 0, UNI_XPOSIXLOWER } /* lower */, - { 3264, 3491, 366, 14, 1, UNI_NV__48 } /* numericvalue=48 */, - { 0, 6372, 1027, 3, 6, UNI_LEPC } /* sc=lepcha */, - { 0, 1993, 0, 5, 0, UNI_XPOSIXGRAPH } /* graph */, - { 1, 6838, 3340, 5, 10, UNI_INPC__OVERSTRUCK } /* inpc=overstruck */, - { 4668, 1126, 278, 4, 5, UNI_GARA } /* scx=garay */, - { 6504, 5272, 2372, 6, 6, UNI__PERL_IDCONT } /* _perl_idcont */, - { 1537, 1874, 1714, 7, 11, UNI_SC__CPMN } /* script=cyprominoan */, - { 0, 1126, 126, 4, 4, UNI_LAO } /* scx=laoo */, - { 6721, 4652, 6400, 12, 12, UNI_CYRILLICSUP } /* block=cyrillicsupplement */, - { 3, 135, 1157, 2, 4, UNI_UGAR } /* isugar */, - { 3, 6372, 1305, 3, 4, UNI_SC__SUNU } /* sc=sunu */, - { 6145, 2238, 1367, 4, 5, UNI_NV__432000 } /* nv=432000 */, - { 5, 5761, 288, 21, 1, UNI_cwu_values_index } /* changeswhenuppercased= */, - { 6666, 1696, 1553, 4, 8, UNI_INJAVANESE } /* blk=javanese */, - { 2204, 4970, 962, 9, 3, -UNI_XPOSIXSPACE } /* whitespace=f */, - { 7680, 1781, 4844, 3, 8, UNI_SYRIACSUP } /* issyriacsup */, - { 0, 924, 416, 5, 2, UNI_AGE__4_DOT_1 } /* age=v41 */, - { 3, 8088, 6454, 16, 13, UNI_M } /* generalcategory=combiningmark */, - { 6203, 3696, 288, 4, 1, UNI_idsu_values_index } /* idsu= */, - { 0, 1696, 1417, 4, 9, UNI_INPAUCINHAU } /* blk=paucinhau */, - { 0, 968, 631, 5, 5, UNI_ECOMP } /* ecomp=true */, - { 1, 8088, 4336, 16, 15, UNI_PS } /* generalcategory=openpunctuation */, - { 2, 135, 4, 2, 2, UNI_LM } /* islm */, - { 1, 6806, 0, 11, 0, UNI_NUMBERFORMS } /* numberforms */, - { 0, 4510, 645, 14, 2, UNI_NFKDQC__N } /* nfkdquickcheck=n */, - { 0, 2, 644, 2, 2, UNI_cwt_values_index } /* cwt= */, - { 2629, 30, 4275, 1, 5, UNI_DASH } /* isdash */, - { 1368, 1957, 2482, 5, 7, UNI_INKATAKANA } /* blk=katakana */, - { 6, 1874, 1157, 7, 4, UNI_UGAR } /* script=ugar */, - { 1, 6372, 842, 3, 4, UNI_SC__SHRD } /* sc=shrd */, - { 2, 7356, 1698, 25, 2, UNI_pcm_values_index } /* prependedconcatenationmark= */, - { 4313, 1874, 1417, 7, 4, UNI_PAUC } /* script=pauc */, - { 0, 6392, 0, 10, 0, UNI_GLAG } /* glagolitic */, - { 4127, 1305, 0, 4, 0, UNI_SUNU } /* sunu */, - { 4626, 6125, 631, 21, 5, UNI__PERL_NCHAR } /* noncharactercodepoint=true */, - { 6215, 135, 86, 2, 4, UNI_GREK } /* isgrek */, - { 1, 1126, 336, 4, 4, UNI_TAKR } /* scx=takr */, - { 0, 323, 6996, 2, 21, UNI_MEETEIMAYEKEXT } /* inmeeteimayekextensions */, - { 8, 1874, 249, 7, 4, UNI_ZANB } /* script=zanb */ + { 11, 2607, 3836, 3, 13, UNI_MISCSYMBOLSSUP } /* ismiscsymbolssup */, + { 4, 6737, 531, 13, 3, UNI_JG__REH } /* joininggroup=reh */, + { 1, 6737, 2645, 20, 3, UNI_JG__AFRICANFEH } /* joininggroup=africanfeh */, + { 0, 3764, 6088, 7, 9, UNI_LATINEXTA } /* inlatinextendeda */, + { 9, 1141, 824, 4, 4, UNI_OSMA } /* scx=osma */, + { 18, 333, 7107, 2, 18, UNI_DEVANAGARIEXT } /* indevanagariextended */, + { 1, 135, 5508, 2, 20, UNI_PHLI } /* isinscriptionalpahlavi */, + { 2, 1498, 423, 7, 2, UNI_CCC__16 } /* ccc=ccc16 */, + { 0, 1911, 1450, 7, 9, UNI_SC__SAMR } /* script=samaritan */, + { 0, 3903, 4830, 3, 16, UNI_LB__CL } /* lb=closepunctuation */, + { 1, 455, 2797, 3, 13, UNI_ANCIENTSYMBOLS } /* inancientsymbols */, + { 0, 3213, 652, 7, 2, UNI_hex_values_index } /* hexdigit= */, + { 0, 1911, 543, 7, 4, UNI_SC__LYDI } /* script=lydi */, + { 0, 135, 221, 2, 4, UNI_TGLG } /* istglg */, + { 0, 135, 1441, 2, 9, UNI_PAUC } /* ispaucinhau */, + { 0, 8117, 4398, 23, 4, UNI_JG__MANICHAEANFIVE } /* joininggroup=manichaeanfive */, + { 2, 2922, 8307, 3, 20, UNI_ENCLOSEDALPHANUM } /* isenclosedalphanumerics */, + { 0, 6164, 7846, 10, 10, UNI_LB__AL } /* linebreak=alphabetic */, + { 5, 5761, 653, 21, 3, -UNI_CWCM } /* changeswhencasemapped=no */, + { 0, 2429, 4097, 6, 17, UNI_INCAUCASIANALBANIAN } /* block=caucasianalbanian */, + { 2, 1141, 1414, 4, 9, UNI_ORKH } /* scx=oldturkic */, + { 0, 3682, 0, 16, 0, UNI_HALFANDFULLFORMS } /* halfandfullforms */, + { 1, 1911, 55, 7, 4, UNI_CHAM } /* script=cham */, + { 0, 333, 6797, 2, 13, UNI_ZNAMENNYMUSIC } /* inznamennymusic */, + { 1, 6399, 0, 22, 0, UNI_DIACRITICALSFORSYMBOLS } /* diacriticalsforsymbols */, + { 0, 1812, 0, 6, 0, UNI_ARAB } /* arabic */, + { 0, 1847, 639, 11, 2, UNI_KEHNOMIRROR } /* kehnomirror=t */, + { 23, 30, 2943, 1, 13, UNI_MAHJONG } /* ismahjongtiles */, + { 3, 7674, 1781, 21, 7, UNI_BC__LRI } /* bidiclass=lefttorightisolate */, + { 1, 7445, 6552, 22, 6, -UNI_PCM } /* prependedconcatenationmark=n */, + { 1, 174, 383, 3, 2, UNI_PCM } /* pcm=y */, + { 1, 695, 1962, 6, 8, UNI_LB__H2 } /* hst=lvsyllable */, + { 3, 135, 7742, 2, 18, UNI_PHONETICEXT } /* isphoneticextensions */, + { 0, 34, 1460, 1, 5, UNI_THAA } /* thaana */, + { 11, 1678, 296, 10, 1, UNI_sd_values_index } /* softdotted= */, + { 2, 19, 639, 4, 5, UNI_POSIXXDIGIT } /* ahex=true */, + { 4, 777, 8307, 3, 29, UNI_ENCLOSEDALPHANUMSUP } /* inenclosedalphanumericsupplement */, + { 1, 3808, 4917, 15, 10, UNI_LATINEXTADDITIONAL } /* islatinextendedadditional */, + { 0, 7322, 8596, 24, 11, UNI_CCC__DB } /* canonicalcombiningclass=doublebelow */, + { 14, 6464, 110, 3, 4, UNI_KAWI } /* sc=kawi */, + { 0, 1911, 498, 7, 4, UNI_SC__ROHG } /* script=rohg */, + { 0, 978, 383, 6, 4, UNI_COMPEX } /* compex=yes */, + { 3, 2429, 2944, 6, 7, UNI_MAHJONG } /* block=mahjong */, + { 3, 20, 653, 3, 2, -UNI_XPOSIXXDIGIT } /* hex=n */, + { 0, 1733, 6642, 4, 19, UNI_JAMOEXTB } /* blk=hanguljamoextendedb */, + { 16, 2429, 1762, 6, 11, UNI_DOMINO } /* block=dominotiles */, + { 12, 4586, 1941, 17, 4, UNI_SYLO } /* scriptextensions=sylo */, + { 10, 5410, 370, 19, 2, UNI_extpict_values_index } /* extendedpictographic= */, + { 1, 6342, 0, 14, 0, UNI_INETHIOPIC } /* block=ethiopic */, + { 0, 2429, 321, 6, 5, UNI_INORIYA } /* block=oriya */, + { 1, 4586, 482, 17, 4, UNI_PHLI } /* scriptextensions=phli */, + { 0, 3355, 0, 15, 0, UNI_ARMI } /* imperialaramaic */, + { 49, 7322, 8525, 24, 10, UNI_CCC__BR } /* canonicalcombiningclass=belowright */, + { 2, 3331, 296, 14, 1, UNI_grext_values_index } /* graphemeextend= */, + { 0, 3903, 918, 3, 7, UNI_LB__XX } /* lb=unknown */, + { 4, 135, 4158, 2, 14, UNI_ZS } /* isspaceseparator */, + { 0, 33, 1626, 1, 3, UNI_SUND } /* sund */, + { 1, 333, 2071, 2, 10, UNI_YIRADICALS } /* inyiradicals */, + { 1, 2373, 556, 9, 2, UNI_IN__3 } /* presentin=3 */, + { 4, 3521, 1118, 13, 4, UNI_NV__1_SLASH_12 } /* numericvalue=1/12 */, + { 0, 3629, 5115, 7, 16, UNI_ALCHEMICAL } /* block=alchemicalsymbols */, + { 0, 30, 8473, 1, 5, UNI_MATH } /* ismath */, + { 0, 760, 3753, 5, 11, UNI_KANGXI } /* inkangxiradicals */, + { 5, 333, 5528, 2, 18, UNI_TAIXUANJING } /* intaixuanjingsymbols */, + { 10, 2596, 653, 11, 3, -UNI_JOINC } /* joincontrol=no */, + { 1, 6164, 53, 10, 2, UNI_LB__NS } /* linebreak=ns */, + { 9, 3976, 1392, 15, 2, UNI_NV__1_SLASH_20 } /* numericvalue=1/20 */, + { 0, 6164, 4927, 10, 15, UNI_LB__CB } /* linebreak=contingentbreak */, + { 0, 1733, 4814, 4, 16, UNI_BOPOMOFOEXT } /* blk=bopomofoextended */, + { 0, 1733, 3794, 4, 14, UNI_DEVANAGARIEXTA } /* blk=devanagariexta */, + { 1, 2429, 1098, 6, 8, UNI_INMAHAJANI } /* block=mahajani */, + { 4, 2, 971, 1, 7, -UNI_CE } /* ce=false */, + { 6, 316, 1209, 3, 2, UNI_NV__24 } /* nv=24 */, + { 0, 6737, 522, 13, 3, UNI_JG__BEH } /* joininggroup=beh */, + { 1, 2922, 6060, 3, 15, UNI_ENCLOSEDALPHANUM } /* isenclosedalphanum */, + { 0, 1911, 7734, 7, 8, UNI_SC__KANA } /* script=katakana */, + { 1, 3521, 319, 14, 1, UNI_NV__49 } /* numericvalue=49 */, + { 1, 333, 5275, 2, 19, UNI_OTTOMANSIYAQNUMBERS } /* inottomansiyaqnumbers */, + { 4, 5, 6907, 1, 21, UNI_MISCTECHNICAL } /* miscellaneoustechnical */, + { 0, 1733, 1036, 4, 6, UNI_INLEPCHA } /* blk=lepcha */, + { 4, 30, 386, 1, 7, UNI_CAKM } /* ischakma */, + { 0, 2301, 1119, 4, 3, UNI_NV__5_SLASH_12 } /* nv=5/12 */, + { 0, 4586, 438, 17, 4, UNI_DIAK } /* scriptextensions=diak */, + { 0, 9030, 7595, 7, 24, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* block=symbolsandpictographsexta */, + { 1, 6039, 5299, 14, 7, UNI_SUPARROWSA } /* insupplementalarrowsa */, + { 5, 3129, 1392, 12, 2, UNI_IN__12 } /* presentin=v120 */, + { 1, 2, 280, 2, 3, UNI_CWKCF } /* cwkcf */, + { 17, 8226, 119, 16, 2, UNI_XPOSIXDIGIT } /* generalcategory=nd */, + { 0, 508, 1232, 2, 7, UNI_DT__NAR } /* dt=narrow */, + { 1, 3976, 2212, 14, 8, UNI_NV__1_SLASH_64 } /* numericvalue=1.563e-02 */, + { 4, 135, 4956, 2, 18, UNI_ORNAMENTALDINGBATS } /* isornamentaldingbats */, + { 0, 8765, 5149, 22, 14, UNI_INSC__GEMINATIONMARK } /* indicsyllabiccategory=geminationmark */, + { 2, 2844, 639, 5, 5, UNI_EMOJI } /* emoji=true */, + { 50, 135, 4732, 2, 15, UNI_UPPERCASELETTER } /* isuppercaseletter */, + { 4, 6557, 2295, 16, 6, UNI_NV__1_SLASH_40 } /* numericvalue=2.500e-02 */, + { 0, 135, 4350, 2, 9, UNI_XPOSIXLOWER } /* islowercase */, + { 18, 1141, 1423, 4, 9, UNI_OUGR } /* scx=olduyghur */, + { 4, 2635, 4387, 3, 7, UNI_JG__HEHGOAL } /* jg=hehgoal */, + { 0, 8233, 0, 9, 2, UNI_CASEDLETTER } /* category=l& */, + { 0, 6135, 8044, 13, 17, UNI_SUPPUAB } /* issupplementaryprivateuseareab */, + { 1, 6760, 2860, 13, 6, UNI_SB__XX } /* sentencebreak=other */, + { 0, 1141, 1172, 4, 4, UNI_UGAR } /* scx=ugar */, + { 1, 404, 3323, 3, 8, UNI_NO } /* othernumber */, + { 5, 316, 5612, 4, 4, UNI_NV__90000 } /* nv=90000 */, + { 0, 587, 0, 6, 0, UNI_TNSA } /* tangsa */, + { 3, 1260, 3742, 3, 11, UNI_CJKCOMPATFORMS } /* cjkcompatforms */, + { 3, 3726, 653, 16, 2, -UNI_IDSU } /* idsunaryoperator=n */, + { 5, 6369, 4695, 13, 4, UNI_MYANMAREXTC } /* block=myanmarextc */, + { 6, 2407, 972, 3, 2, -UNI_IDC } /* idc=f */, + { 0, 1471, 972, 7, 6, -UNI_IDS } /* idstart=false */, + { 5, 3304, 7360, 15, 9, UNI_EA__F } /* eastasianwidth=fullwidth */, + { 4, 7126, 972, 25, 6, -UNI_CWKCF } /* changeswhennfkccasefolded=false */, + { 26, 2858, 3403, 3, 13, UNI_ME } /* gc=enclosingmark */, + { 0, 6464, 466, 3, 4, UNI_OGAM } /* sc=ogam */, + { 0, 4586, 824, 17, 7, UNI_OSMA } /* scriptextensions=osmanya */, + { 12, 3903, 3465, 3, 12, UNI_LB__IS } /* lb=infixnumeric */, + { 0, 6557, 559, 14, 2, UNI_NV__2_SLASH_5 } /* numericvalue=2/5 */, + { 0, 7322, 423, 24, 2, UNI_CCC__16 } /* canonicalcombiningclass=16 */, + { 3, 411, 383, 3, 4, UNI_EXT } /* ext=yes */, + { 0, 4586, 1432, 17, 9, UNI_PALM } /* scriptextensions=palmyrene */, + { 0, 7322, 419, 24, 2, UNI_CCC__34 } /* canonicalcombiningclass=34 */, + { 2, 2, 971, 1, 3, -UNI_CE } /* ce=f */, + { 0, 1141, 1247, 4, 7, UNI_BENG } /* scx=bengali */, + { 0, 3521, 5612, 14, 4, UNI_NV__40000 } /* numericvalue=40000 */, + { 1, 7674, 3620, 9, 3, UNI_BC__ET } /* bidiclass=et */, + { 1, 4999, 382, 9, 5, UNI_XPOSIXSPACE } /* whitespace=yes */, + { 1, 5043, 0, 15, 0, UNI_BAMUMSUP } /* bamumsupplement */, + { 0, 6462, 5986, 5, 16, UNI_INSC__SYLLABLEMODIFIER } /* insc=syllablemodifier */, + { 0, 106, 265, 1, 3, UNI_ZZZZ } /* zzzz */, + { 0, 5322, 0, 2, 0, UNI_CASEDLETTER } /* l_ */, + { 1, 3794, 0, 4, 0, UNI_DEVA } /* deva */, + { 0, 135, 2057, 2, 7, UNI_SOGD } /* issogdian */, + { 0, 3629, 4822, 12, 9, UNI_ARABICEXTC } /* block=arabicextendedc */, + { 0, 2607, 6098, 3, 18, UNI_MONGOLIANSUP } /* ismongoliansupplement */, + { 1, 2858, 1975, 3, 7, UNI_XPOSIXCNTRL } /* gc=control */, + { 6, 1141, 1577, 4, 8, UNI_JAVA } /* scx=javanese */, + { 0, 135, 7846, 2, 10, UNI_XPOSIXALPHA } /* isalphabetic */, + { 0, 1470, 653, 4, 2, -UNI_XIDS } /* xids=n */, + { 0, 933, 4020, 6, 2, UNI_AGE__17 } /* age=v170 */, + { 2, 2083, 2021, 5, 5, UNI_POSIXGRAPH } /* posixgraph */, + { 5, 3794, 0, 14, 0, UNI_DEVANAGARIEXTA } /* devanagariexta */, + { 10, 1733, 158, 4, 4, UNI_INNEWA } /* blk=newa */, + { 34, 4586, 587, 17, 4, UNI_TANG } /* scriptextensions=tang */, + { 0, 2624, 1125, 6, 4, UNI_XPOSIXWORD } /* xposixword */, + { 8, 1471, 383, 7, 4, UNI_IDS } /* idstart=yes */, + { 5, 135, 278, 2, 5, UNI_CWKCF } /* iscwkcf */, + { 0, 4586, 742, 17, 5, UNI_BATK } /* scriptextensions=batak */, + { 6, 7322, 419, 25, 2, UNI_CCC__DA } /* canonicalcombiningclass=234 */, + { 1, 30, 4368, 1, 12, UNI_INPUNCTUATION } /* inpunctuation */, + { 8, 135, 4887, 2, 4, UNI_TALE } /* istale */, + { 2, 2810, 1781, 14, 7, UNI_BC__RLI } /* bc=righttoleftisolate */, + { 2, 2083, 4732, 5, 5, UNI_POSIXUPPER } /* posixupper */, + { 4, 7045, 579, 22, 2, UNI_JG__MALAYALAMJA } /* joininggroup=malayalamja */, + { 2, 2429, 1516, 9, 7, UNI_CJKSTROKES } /* block=cjkstrokes */, + { 2, 1733, 955, 4, 8, UNI_INBASSAVAH } /* blk=bassavah */, + { 0, 1733, 5058, 4, 15, UNI_DIACRITICALSSUP } /* blk=diacriticalssup */, + { 2, 4586, 1506, 17, 10, UNI_CHRS } /* scriptextensions=chorasmian */, + { 1, 2429, 1060, 6, 6, UNI_INYEZIDI } /* block=yezidi */, + { 2, 333, 6896, 2, 11, UNI_NUMBERFORMS } /* innumberforms */, + { 0, 135, 7297, 2, 25, UNI_SUPERANDSUB } /* issuperscriptsandsubscripts */, + { 0, 2429, 2157, 6, 12, UNI_INMENDEKIKAKUI } /* block=mendekikakui */, + { 0, 135, 249, 2, 4, UNI_XSUX } /* isxsux */, + { 12, 2858, 269, 3, 2, UNI_CN } /* gc=cn */, + { 2, 6464, 1552, 3, 4, UNI_SC__BUGI } /* sc=bugi */, + { 0, 135, 1903, 2, 4, UNI_MONG } /* ismong */, + { 3, 2407, 2677, 9, 3, -UNI_IDC } /* idcontinue=n */, + { 9, 4586, 1339, 17, 4, UNI_TIRH } /* scriptextensions=tirh */, + { 4, 8226, 212, 16, 2, UNI_TITLE } /* generalcategory=lt */, + { 0, 2429, 8546, 9, 21, UNI_CJKSYMBOLS } /* block=cjksymbolsandpunctuation */, + { 7, 135, 130, 2, 4, UNI_LATN } /* islatn */, + { 0, 5, 8462, 1, 32, UNI_MISCMATHSYMBOLSA } /* miscellaneousmathematicalsymbolsa */, + { 1, 135, 1024, 2, 4, UNI_HATR } /* ishatr */, + { 8, 2429, 6797, 6, 23, UNI_ZNAMENNYMUSIC } /* block=znamennymusicalnotation */, + { 1, 2429, 2337, 6, 12, UNI_INOLDHUNGARIAN } /* block=oldhungarian */, + { 0, 2858, 133, 3, 2, UNI_NL } /* gc=nl */, + { 0, 1112, 372, 4, 1, UNI_NV__11 } /* nv=11 */, + { 8, 135, 3403, 2, 13, UNI_ME } /* isenclosingmark */, + { 0, 8226, 3141, 16, 2, UNI_PS } /* generalcategory=ps */, + { 0, 1598, 1961, 3, 10, UNI_YISYLLABLES } /* inyisyllables */, + { 1, 1141, 1405, 4, 9, UNI_PERM } /* scx=oldpermic */, + { 20, 3726, 383, 4, 2, UNI_IDSU } /* idsu=y */, + { 0, 2624, 2149, 6, 5, UNI_XPOSIXALPHA } /* xposixalpha */, + { 5, 7957, 1781, 18, 8, UNI_DT__ISO } /* decompositiontype=isolated */, + { 2, 1810, 5884, 3, 18, UNI_ANCIENTGREEKNUMBERS } /* isancientgreeknumbers */, + { 1, 8732, 4572, 32, 4, UNI_CJKEXTA } /* block=cjkunifiedideographsextensiona */, + { 5, 333, 8246, 2, 32, UNI_INIDC } /* inideographicdescriptioncharacters */, + { 1, 6464, 1359, 3, 9, UNI_SC__SIND } /* sc=khudawadi */, + { 0, 6203, 383, 5, 4, UNI__PERL_NCHAR } /* nchar=yes */, + { 0, 1141, 490, 4, 4, UNI_PRTI } /* scx=prti */, + { 1, 3304, 2637, 14, 2, UNI_EA__A } /* eastasianwidth=a */, + { 0, 6164, 3905, 9, 7, UNI_LB__AK } /* linebreak=aksara */, + { 7, 2429, 7002, 6, 15, UNI_TRANSPORTANDMAP } /* block=transportandmap */, + { 10, 2099, 6893, 4, 14, UNI_INDICNUMBERFORMS } /* inindicnumberforms */, + { 1, 5845, 599, 21, 3, UNI_WB__EB } /* graphemeclusterbreak=ebg */, + { 3, 8061, 0, 28, 0, UNI_EGYPTIANHIEROGLYPHSEXTA } /* egyptianhieroglyphsextendeda */, + { 0, 4586, 430, 17, 4, UNI_TOTO } /* scriptextensions=toto */, + { 2, 135, 1789, 2, 11, UNI_GUKH } /* isgurungkhema */, + { 3, 135, 6041, 2, 19, UNI_SUPARROWSB } /* issupplementalarrowsb */, + { 4, 6928, 8963, 4, 15, UNI_INPC__BOTTOMANDRIGHT } /* inpc=bottomandright */, + { 0, 7957, 978, 18, 3, UNI_DT__COM } /* decompositiontype=com */, + { 0, 4942, 2180, 14, 8, UNI_NV__5_SLASH_8 } /* numericvalue=6.250e-01 */, + { 1, 6464, 5335, 3, 20, UNI_HLUW } /* sc=anatolianhieroglyphs */, + { 10, 7804, 422, 28, 1, UNI_CCC__15 } /* canonicalcombiningclass=ccc15 */, + { 10, 651, 3599, 3, 6, UNI_DT__SQR } /* dt=square */, + { 0, 1911, 1294, 7, 7, UNI_SC__MULT } /* script=multani */, + { 0, 3629, 1188, 12, 3, UNI_ARABICPFA } /* block=arabicpfa */, + { 1, 7396, 8567, 8, 29, UNI_ARABICMATH } /* inarabicmathematicalalphabeticsymbols */, + { 11, 7734, 7742, 8, 18, UNI_KATAKANAEXT } /* katakanaphoneticextensions */, + { 4, 6464, 4814, 3, 4, UNI_SC__BOPO } /* sc=bopo */, + { 2, 4664, 1740, 9, 4, UNI_LATINEXTD } /* blk=latinextd */, + { 0, 2607, 3947, 3, 15, UNI_MISCMATHSYMBOLSA } /* ismiscmathsymbolsa */, + { 2, 8226, 8778, 7, 10, UNI_C } /* generalcategory=c */, + { 2, 6760, 5240, 13, 6, UNI_SB__CL } /* sentencebreak=close */, + { 0, 1141, 51, 4, 4, UNI_CANS } /* scx=cans */, + { 4, 4586, 35, 17, 4, UNI_BATK } /* scriptextensions=batk */, + { 1, 4586, 776, 17, 7, UNI_LINA } /* scriptextensions=lineara */, + { 0, 6464, 1506, 3, 10, UNI_CHRS } /* sc=chorasmian */, + { 0, 2858, 2721, 3, 9, UNI__PERL_SURROGATE } /* gc=surrogate */, + { 0, 8226, 4732, 16, 15, UNI_UPPERCASELETTER } /* generalcategory=uppercaseletter */, + { 19, 333, 2157, 2, 12, UNI_INMENDEKIKAKUI } /* inmendekikakui */, + { 5, 5306, 2580, 12, 7, UNI_WB__ML } /* wordbreak=midletter */, + { 0, 2635, 6514, 3, 9, UNI_JG__YEHBARREE } /* jg=yehbarree */, + { 5, 4586, 498, 17, 4, UNI_ROHG } /* scriptextensions=rohg */, + { 8, 6464, 4887, 3, 4, UNI_SC__TALE } /* sc=tale */, + { 1, 1733, 1396, 4, 9, UNI_INOLDITALIC } /* blk=olditalic */, + { 6, 54, 3260, 2, 8, UNI_SC__MYMR } /* sc=myanmar */, + { 0, 2429, 8930, 9, 23, UNI_CJKCOMPATIDEOGRAPHS } /* block=cjkcompatibilityideographs */, + { 0, 135, 5073, 2, 15, UNI_TAMILSUP } /* istamilsupplement */, + { 0, 7509, 864, 5, 6, UNI_SC__SHAW } /* blk=shavian */, + { 1, 6164, 4830, 10, 16, UNI_LB__CL } /* linebreak=closepunctuation */, + { 0, 5740, 5814, 11, 10, UNI_CWT } /* changeswhentitlecased */, + { 7, 30, 976, 1, 6, UNI_ECOMP } /* isecomp */, + { 0, 7804, 416, 27, 2, UNI_CCC__26 } /* canonicalcombiningclass=ccc26 */, + { 8, 571, 639, 6, 5, UNI_PATSYN } /* patsyn=true */, + { 4, 4586, 1180, 17, 4, UNI_VITH } /* scriptextensions=vith */, + { 5, 5528, 0, 11, 0, UNI_TAIXUANJING } /* taixuanjing */, + { 1, 135, 276, 2, 2, UNI_CF } /* iscf */, + { 0, 6462, 2064, 5, 7, UNI_INSC__VISARGA } /* insc=visarga */, + { 1, 6464, 31, 3, 4, UNI_SC__AVST } /* sc=avst */, + { 1, 316, 373, 3, 2, UNI_NV__23 } /* nv=23 */, + { 5, 1911, 1060, 7, 6, UNI_SC__YEZI } /* script=yezidi */, + { 25, 5740, 972, 21, 2, -UNI_CWCF } /* changeswhencasefolded=f */, + { 0, 6164, 3059, 10, 11, UNI_LB__EX } /* linebreak=exclamation */, + { 0, 5528, 0, 18, 0, UNI_TAIXUANJING } /* taixuanjingsymbols */, + { 6, 9030, 8424, 7, 29, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* block=symbolsandpictographsextendeda */, + { 0, 1911, 466, 7, 4, UNI_OGAM } /* script=ogam */, + { 3, 2527, 1573, 7, 4, UNI_MYANMAREXTA } /* myanmarexta */, + { 12, 333, 3535, 2, 15, UNI_NARB } /* inoldnortharabian */, + { 4, 4350, 383, 5, 4, UNI_XPOSIXLOWER } /* lower=yes */, + { 1, 1911, 3620, 6, 5, UNI_SC__ETHI } /* script=ethi */, + { 1, 4127, 383, 17, 4, UNI_EPRES } /* emojipresentation=yes */, + { 0, 6243, 0, 3, 0, UNI_vo_values_index } /* vo= */, + { 2, 135, 4335, 2, 4, UNI_HANG } /* ishang */, + { 0, 5606, 653, 6, 3, -UNI_HYPHEN } /* hyphen=no */, + { 4, 1346, 8607, 3, 32, UNI_DIACRITICALSEXT } /* iscombiningdiacriticalmarksextended */, + { 1, 6464, 86, 3, 4, UNI_SC__GREK } /* sc=grek */, + { 0, 333, 1247, 2, 7, UNI_INBENGALI } /* inbengali */, + { 4, 1258, 6527, 4, 8, UNI_CJKSYMBOLS } /* incjksymbols */, + { 1, 6464, 1533, 3, 10, UNI_DIAK } /* sc=divesakuru */, + { 0, 333, 3141, 2, 14, UNI_INPSALTERPAHLAVI } /* inpsalterpahlavi */, + { 8, 368, 375, 5, 2, UNI_CCC__118 } /* ccc=118 */, + { 0, 1141, 587, 4, 6, UNI_TNSA } /* scx=tangsa */, + { 1, 2429, 6041, 6, 19, UNI_SUPARROWSB } /* block=supplementalarrowsb */, + { 0, 3903, 4430, 3, 2, UNI_LB__HY } /* lb=hy */, + { 7, 2810, 566, 4, 2, UNI_BC__RLO } /* bc=rlo */, + { 0, 1733, 1048, 4, 6, UNI_INTELUGU } /* blk=telugu */, + { 8, 3726, 0, 16, 0, UNI_IDSU } /* idsunaryoperator */, + { 0, 316, 2195, 3, 9, UNI_NV__3_SLASH_2 } /* nv=1.500e+00 */, + { 15, 135, 1907, 2, 4, UNI_KTHI } /* iskthi */, + { 5, 2858, 5, 3, 2, UNI_MC } /* gc=mc */, + { 1, 1733, 217, 9, 2, UNI_CJKEXTF } /* blk=cjkextf */, + { 3, 3605, 0, 12, 0, UNI_INCYRILLIC } /* blk=cyrillic */, + { 14, 4206, 941, 4, 6, UNI_INARMENIAN } /* inarmenian */, + { 3, 2922, 663, 3, 3, UNI_ELBA } /* iselba */, + { 28, 762, 765, 3, 4, UNI_KNDA } /* kannada */, + { 9, 6737, 528, 13, 3, UNI_JG__HAH } /* joininggroup=hah */, + { 6, 3764, 4695, 7, 4, UNI_LATINEXTC } /* inlatinextc */, + { 0, 135, 9096, 2, 18, UNI_CANS } /* iscanadianaboriginal */, + { 11, 4320, 0, 12, 0, UNI_DIACRITICALS } /* diacriticals */, + { 0, 8278, 6864, 28, 4, UNI_CJKEXTC } /* incjkunifiedideographsextensionc */, + { 4, 1141, 1339, 4, 7, UNI_TIRH } /* scx=tirhuta */, + { 0, 1911, 955, 7, 4, UNI_BASS } /* script=bass */, + { 0, 2429, 6661, 6, 23, UNI_COMPATJAMO } /* block=hangulcompatibilityjamo */, + { 0, 135, 2861, 2, 5, UNI_C } /* isother */, + { 7, 368, 312, 4, 2, UNI_CCC__30 } /* ccc=30 */, + { 0, 6464, 6018, 3, 21, UNI_PRTI } /* sc=inscriptionalparthian */, + { 0, 135, 1125, 2, 4, UNI_XPOSIXWORD } /* isword */, + { 1, 4586, 1048, 17, 4, UNI_TELU } /* scriptextensions=telu */, + { 2, 368, 743, 4, 3, UNI_CCC__214 } /* ccc=ata */, + { 1, 6180, 639, 21, 2, UNI_LOE } /* logicalorderexception=t */, + { 13, 135, 273, 2, 2, UNI_CASEDLETTER } /* islc */, + { 1, 9030, 1336, 10, 3, UNI_SUPPUAB } /* block=suppuab */, + { 6, 2576, 653, 5, 3, -UNI_CASED } /* cased=no */, + { 2, 486, 0, 4, 0, UNI_MIAO } /* plrd */, + { 5, 135, 3550, 2, 15, UNI_SARB } /* isoldsoutharabian */, + { 16, 30, 2005, 1, 4, UNI_EXT } /* isext */, + { 0, 6464, 1642, 3, 10, UNI_PHNX } /* sc=phoenician */, + { 7, 5306, 748, 10, 2, UNI_WB__EB } /* wordbreak=em */, + { 1, 333, 688, 2, 7, UNI_INHANUNOO } /* inhanunoo */, + { 2, 1258, 8546, 5, 21, UNI_CJKSYMBOLS } /* incjksymbolsandpunctuation */, + { 1, 8366, 7671, 28, 4, UNI_CJKEXTB } /* iscjkunifiedideographsextensionb */, + { 4, 2858, 3141, 3, 2, UNI_PS } /* gc=ps */, + { 3, 7176, 383, 24, 2, UNI_COMPEX } /* fullcompositionexclusion=y */, + { 0, 1141, 847, 4, 4, UNI_SARB } /* scx=sarb */, + { 5, 6201, 0, 21, 0, UNI__PERL_NCHAR } /* noncharactercodepoint */, + { 18, 33, 1669, 1, 9, UNI_SMALLFORMS } /* smallforms */, + { 11, 6797, 0, 23, 0, UNI_ZNAMENNYMUSIC } /* znamennymusicalnotation */, + { 9, 1911, 47, 7, 4, UNI_SC__CAKM } /* script=cakm */, + { 5, 1827, 1547, 4, 5, UNI_VERTSPACE } /* vertspace */, + { 1, 2587, 5110, 3, 5, UNI_GRBASE } /* isgrbase */, + { 0, 482, 0, 4, 0, UNI_PHLI } /* phli */, + { 1, 3390, 0, 13, 0, UNI_XPOSIXDIGIT } /* decimalnumber */, + { 0, 2858, 54, 3, 2, UNI_SC } /* gc=sc */, + { 1, 1911, 1698, 7, 4, UNI_WARA } /* script=wara */, + { 1, 30, 4319, 1, 13, UNI_DIACRITICALS } /* indiacriticals */, + { 1, 7957, 0, 18, 0, UNI_dt_values_index } /* decompositiontype= */, + { 1, 877, 972, 5, 6, -UNI_STERM } /* sterm=false */, + { 0, 333, 783, 2, 7, UNI_INMANDAIC } /* inmandaic */, + { 1, 4350, 0, 5, 0, UNI_XPOSIXLOWER } /* lower */, + { 3, 6464, 1200, 3, 9, UNI_BHKS } /* sc=bhaiksuki */, + { 0, 1733, 6797, 4, 23, UNI_ZNAMENNYMUSIC } /* blk=znamennymusicalnotation */, + { 6, 4747, 639, 18, 5, UNI_IDST } /* idstrinaryoperator=true */, + { 0, 6135, 1933, 5, 8, UNI_SUPERANDSUB } /* issuperandsub */, + { 0, 9030, 0, 39, 0, UNI_SUPMATHOPERATORS } /* block=supplementalmathematicaloperators */, + { 0, 185, 186, 1, 3, UNI_COPT } /* qaac */, + { 0, 2407, 383, 3, 2, UNI_IDC } /* idc=y */, + { 18, 7674, 569, 10, 2, UNI_BC__AL } /* bidiclass=al */, + { 0, 7180, 383, 20, 4, UNI_CE } /* compositionexclusion=yes */, + { 1, 7322, 7716, 24, 4, UNI_CCC__216 } /* canonicalcombiningclass=atar */, + { 5, 2498, 4822, 8, 9, UNI_CYRILLICEXTC } /* cyrillicextendedc */, + { 0, 135, 510, 2, 4, UNI_SOGO } /* issogo */, + { 0, 1818, 6981, 3, 21, UNI_MODIFIERLETTERS } /* isspacingmodifierletters */, + { 0, 2858, 2465, 3, 10, UNI_CN } /* gc=unassigned */, + { 0, 762, 3753, 3, 3, UNI_KANGXI } /* kangxi */, + { 0, 5371, 18, 14, 1, UNI_LATINEXTB } /* block=latinextb */, + { 0, 6164, 63, 10, 2, UNI_LB__CP } /* linebreak=cp */, + { 4, 368, 2119, 4, 2, UNI_CCC__BR } /* ccc=br */, + { 1, 30, 2943, 1, 8, UNI_MAHJONG } /* ismahjong */, + { 8, 1911, 31, 7, 4, UNI_SC__AVST } /* script=avst */, + { 2, 2810, 5027, 3, 16, UNI_BC__S } /* bc=segmentseparator */, + { 1, 1911, 7086, 7, 11, UNI_MTEI } /* script=meeteimayek */, + { 2, 2635, 3127, 2, 2, UNI_JG__E } /* jg=e */, + { 4, 4586, 939, 17, 8, UNI_ARMN } /* scriptextensions=armenian */, + { 0, 1141, 1506, 4, 10, UNI_CHRS } /* scx=chorasmian */, + { 0, 1733, 3590, 4, 15, UNI_INZANABAZARSQUARE } /* blk=zanabazarsquare */, + { 2, 1465, 6634, 3, 6, UNI_WB__FO } /* wb=format */, + { 0, 4664, 4917, 12, 10, UNI_LATINEXTADDITIONAL } /* blk=latinextadditional */, + { 0, 9030, 1933, 9, 8, UNI_SUPERANDSUB } /* block=superandsub */, + { 2, 1911, 2534, 7, 4, UNI_SC__NAND } /* script=nand */, + { 0, 209, 0, 4, 0, UNI_TAML } /* taml */, + { 0, 5866, 797, 18, 4, UNI_IDENTIFIERTYPE__NOTNFKC } /* identifiertype=notnfkc */, + { 0, 6356, 7277, 9, 15, UNI_GEOMETRICSHAPESEXT } /* block=geometricshapesext */, + { 0, 1141, 762, 4, 7, UNI_KNDA } /* scx=kannada */, + { 4, 6535, 383, 21, 4, UNI_MCM } /* modifiercombiningmark=yes */, + { 2, 135, 6078, 2, 19, UNI_JAMOEXTA } /* ishanguljamoextendeda */, + { 1, 135, 1471, 2, 7, UNI_IDS } /* isidstart */, + { 1, 1911, 426, 7, 4, UNI_MIAO } /* script=miao */, + { 0, 393, 972, 4, 2, -UNI_CWCM } /* cwcm=f */, + { 2, 4007, 1119, 14, 3, UNI_NV__7_SLASH_12 } /* numericvalue=7/12 */, + { 8, 4586, 5920, 17, 19, UNI_MERO } /* scriptextensions=meroitichieroglyphs */, + { 1, 4747, 972, 18, 2, -UNI_IDST } /* idstrinaryoperator=f */, + { 0, 1733, 5073, 4, 5, UNI_INTAMIL } /* blk=tamil */, + { 1, 4185, 639, 17, 5, UNI_IDCOMPATMATHSTART } /* idcompatmathstart=true */, + { 0, 1470, 0, 8, 0, UNI_XIDS } /* xidstart */, + { 0, 3521, 812, 13, 2, UNI_NV__21 } /* numericvalue=21 */, + { 3, 2429, 1070, 9, 4, UNI_CJKEXTB } /* block=cjkextb */, + { 1, 2380, 2778, 3, 3, UNI_IN__5_DOT_2 } /* in=5.2 */, + { 2, 3208, 0, 13, 0, UNI_POSIXXDIGIT } /* asciihexdigit */, + { 3, 3950, 972, 4, 6, -UNI_MATH } /* math=false */, + { 1, 1498, 2258, 7, 2, UNI_CCC__33 } /* ccc=ccc33 */, + { 2, 2380, 2248, 3, 3, UNI_IN__3_DOT_1 } /* in=3.1 */, + { 2, 1141, 1450, 4, 9, UNI_SAMR } /* scx=samaritan */, + { 58, 4586, 3477, 17, 15, UNI_MERC } /* scriptextensions=meroiticcursive */, + { 15, 729, 2275, 3, 4, UNI_AGE__4_DOT_1 } /* age=4.1 */, + { 4, 4406, 4431, 13, 4, UNI_JG__MANICHAEANYODH } /* jg=manichaeanyodh */, + { 0, 135, 1191, 2, 9, UNI_BERF } /* isberiaerfe */, + { 5, 1911, 286, 7, 5, UNI_SC__GARA } /* script=garay */, + { 0, 4406, 4402, 13, 4, UNI_JG__MANICHAEANHETH } /* jg=manichaeanheth */, + { 8, 1733, 1016, 4, 8, UNI_INHIRAGANA } /* blk=hiragana */, + { 1, 2525, 4673, 9, 9, UNI_MYANMAREXTB } /* inmyanmarextendedb */, + { 0, 1911, 346, 7, 5, UNI_SC__TAKR } /* script=takri */, + { 20, 135, 225, 2, 4, UNI_TIBT } /* istibt */, + { 0, 2429, 0, 9, 0, UNI_CJK } /* block=cjk */, + { 6, 2587, 990, 8, 5, UNI_GEORGIANEXT } /* isgeorgianext */, + { 1, 6737, 4380, 13, 14, UNI_JG__HAMZAONHEHGOAL } /* joininggroup=hamzaonhehgoal */, + { 8, 2385, 363, 9, 3, UNI_TUTG } /* tulutigalari */, + { 3, 1885, 0, 7, 0, UNI_NFCQC__M } /* nfcqc=m */, + { 0, 269, 0, 5, 0, UNI_XPOSIXCNTRL } /* cntrl */, + { 0, 3629, 5336, 7, 19, UNI_INANATOLIANHIEROGLYPHS } /* block=anatolianhieroglyphs */, + { 0, 1346, 6710, 5, 11, UNI_CJKRADICALSSUP } /* iscjkradicalssup */, + { 0, 1260, 6710, 3, 18, UNI_CJKRADICALSSUP } /* cjkradicalssupplement */, + { 0, 6464, 181, 3, 4, UNI_PHNX } /* sc=phnx */, + { 1, 1141, 594, 5, 5, UNI_TODR } /* scx=todhri */, + { 0, 7957, 2119, 20, 5, UNI_DT__NB } /* decompositiontype=nobreak */, + { 4, 4586, 702, 17, 5, UNI_ADLM } /* scriptextensions=adlam */, + { 1, 8226, 6634, 16, 6, UNI_CF } /* generalcategory=format */, + { 16, 3116, 6556, 11, 8, UNI_NT__NU } /* numerictype=numeric */, + { 16, 6203, 653, 5, 3, -UNI__PERL_NCHAR } /* nchar=no */, + { 9, 2429, 23, 6, 4, UNI_INAHOM } /* block=ahom */, + { 0, 135, 8535, 2, 18, UNI_IDEOGRAPHICSYMBOLS } /* isideographicsymbols */, + { 30, 2635, 2978, 3, 11, UNI_JG__STRAIGHTWAW } /* jg=straightwaw */, + { 0, 2858, 2576, 3, 11, UNI_CASEDLETTER } /* gc=casedletter */, + { 2, 8732, 4377, 32, 4, UNI_CJKEXTH } /* block=cjkunifiedideographsextensionh */, + { 3, 6464, 229, 3, 4, UNI_SC__TODR } /* sc=todr */, + { 0, 8175, 972, 11, 6, -UNI_IDEO } /* ideographic=false */, + { 0, 3304, 653, 14, 2, UNI_EA__N } /* eastasianwidth=n */, + { 1, 1733, 8930, 7, 33, UNI_CJKCOMPATIDEOGRAPHSSUP } /* blk=cjkcompatibilityideographssupplement */, + { 9, 30, 330, 1, 6, UNI_XPOSIXPRINT } /* isprint */, + { 0, 135, 4335, 2, 6, UNI_HANG } /* ishangul */, + { 1, 259, 0, 2, 0, UNI_NB } /* nb */, + { 5, 135, 6264, 2, 6, UNI_YIJING } /* isyijing */, + { 0, 9030, 4770, 16, 13, UNI_SUPPUNCTUATION } /* block=supplementalpunctuation */, + { 0, 2622, 1125, 8, 4, UNI_XPOSIXWORD } /* isxposixword */, + { 11, 7322, 6638, 24, 4, UNI_WB__EB } /* canonicalcombiningclass=atbl */, + { 2, 1141, 6222, 4, 4, UNI_SINH } /* scx=sinh */, + { 5, 135, 1896, 2, 11, UNI_HMNG } /* ispahawhhmong */, + { 18, 1522, 972, 2, 2, -UNI_SD } /* sd=f */, + { 0, 1911, 6952, 7, 4, UNI_BRAH } /* script=brah */, + { 2, 8233, 698, 8, 2, UNI_L } /* category=l */, + { 4, 7674, 5473, 10, 3, UNI_BC__RLE } /* bidiclass=rle */, + { 0, 6356, 2865, 7, 13, UNI_INGREEK } /* block=greekandcoptic */, + { 3, 4586, 537, 17, 4, UNI_KHOJ } /* scriptextensions=khoj */, + { 22, 2, 652, 2, 4, -UNI_CWT } /* cwt=no */, + { 1, 7525, 1391, 25, 2, UNI_CCC__132 } /* canonicalcombiningclass=132 */, + { 0, 1810, 2892, 3, 11, UNI_ALPHABETICPF } /* isalphabeticpf */, + { 1, 683, 971, 5, 7, -UNI_GRBASE } /* grbase=false */, + { 0, 3155, 653, 13, 3, -UNI_QMARK } /* quotationmark=no */, + { 8, 135, 6018, 2, 21, UNI_PRTI } /* isinscriptionalparthian */, + { 6, 6464, 6433, 3, 9, UNI_XSUX } /* sc=cuneiform */, + { 6, 316, 2187, 3, 9, UNI_NV__1_SLASH_7 } /* nv=1.429e-01 */, + { 3, 2622, 269, 8, 5, UNI_XPOSIXCNTRL } /* isxposixcntrl */, + { 0, 1141, 426, 4, 4, UNI_MIAO } /* scx=miao */, + { 2, 1733, 1247, 4, 7, UNI_INBENGALI } /* blk=bengali */, + { 2, 1818, 0, 7, 0, UNI_XPOSIXSPACE } /* isspace */, + { 3, 1911, 362, 7, 6, UNI_SC__CARI } /* script=carian */, + { 6, 3213, 652, 7, 3, -UNI_XPOSIXXDIGIT } /* hexdigit=n */, + { 0, 2380, 614, 4, 3, UNI_IN__17 } /* in=17.0 */, + { 10, 1911, 458, 7, 4, UNI_MRO } /* script=mroo */, + { 0, 4586, 63, 17, 4, UNI_CPMN } /* scriptextensions=cpmn */, + { 0, 779, 653, 2, 2, UNI_EA__N } /* ea=n */, + { 0, 5667, 237, 20, 2, UNI_VO__TU } /* verticalorientation=tu */, + { 1, 2108, 971, 10, 3, -UNI_KEHNOROTATE } /* kehnorotate=f */, + { 0, 2858, 106, 3, 2, UNI_ZL } /* gc=zl */, + { 12, 5318, 3190, 6, 9, UNI__PERL_ANY_FOLDS } /* _perl_any_folds */, + { 2, 135, 5824, 2, 21, UNI_CWU } /* ischangeswhenuppercased */, + { 1, 1465, 1672, 3, 2, UNI_LB__LF } /* wb=lf */, + { 7, 2607, 2731, 3, 12, UNI_MAYANNUMERALS } /* ismayannumerals */, + { 1, 7957, 1166, 18, 3, UNI_DT__FIN } /* decompositiontype=fin */, + { 8, 135, 6116, 2, 4, UNI_SUND } /* issund */, + { 2, 1523, 639, 3, 2, UNI_DEP } /* dep=t */, + { 2, 368, 564, 5, 1, UNI_CCC__17 } /* ccc=17 */, + { 0, 326, 639, 5, 5, UNI__PERL_PATWS } /* patws=true */, + { 0, 3808, 4516, 3, 16, UNI_LETTERLIKESYMBOLS } /* isletterlikesymbols */, + { 16, 733, 6213, 3, 4, UNI_ANY } /* unicode */, + { 7, 1141, 783, 4, 4, UNI_MAND } /* scx=mand */, + { 1, 2073, 653, 7, 3, -UNI_RADICAL } /* radical=no */, + { 1, 6928, 6598, 3, 6, UNI_INPC__LEFT } /* inpc=left */, + { 12, 32, 4601, 1, 2, UNI_vs_values_index } /* vs= */, + { 1, 3257, 5257, 5, 18, UNI_MODIFIERTONELETTERS } /* blk=modifiertoneletters */, + { 1, 333, 1896, 2, 11, UNI_INPAHAWHHMONG } /* inpahawhhmong */, + { 5, 4586, 3535, 17, 15, UNI_NARB } /* scriptextensions=oldnortharabian */, + { 1, 135, 7086, 2, 11, UNI_MTEI } /* ismeeteimayek */, + { 5, 1733, 2002, 4, 7, UNI_UCASEXT } /* blk=ucasext */, + { 0, 6135, 6382, 5, 13, UNI_SUPMATHOPERATORS } /* issupmathoperators */, + { 7, 3653, 0, 16, 0, UNI_CYPRIOTSYLLABARY } /* cypriotsyllabary */, + { 0, 8175, 370, 10, 2, UNI_ideo_values_index } /* ideographic= */, + { 3, 2349, 0, 12, 0, UNI_PHAISTOS } /* phaistosdisc */, + { 4, 368, 3268, 4, 11, UNI_CCC__DA } /* ccc=doubleabove */, + { 0, 3257, 6098, 5, 18, UNI_MONGOLIANSUP } /* blk=mongoliansupplement */, + { 0, 293, 1975, 4, 7, UNI_GCB__CN } /* gcb=control */, + { 0, 333, 6805, 2, 5, UNI_MUSIC } /* inmusic */, + { 0, 6462, 3344, 14, 4, UNI_INSC__CONSONANTDEAD } /* insc=consonantdead */, + { 0, 166, 826, 2, 5, UNI_OSMA } /* osmanya */, + { 1, 333, 2134, 2, 12, UNI_INMASARAMGONDI } /* inmasaramgondi */, + { 3, 8233, 1975, 9, 7, UNI_XPOSIXCNTRL } /* category=control */, + { 2, 1733, 1423, 4, 9, UNI_INOLDUYGHUR } /* blk=olduyghur */, + { 1, 1911, 15, 7, 4, UNI_SC__AGHB } /* script=aghb */, + { 14, 8175, 0, 11, 0, UNI_IDEO } /* ideographic */, + { 10, 1885, 653, 5, 3, UNI_COMPEX } /* nfcqc=no */, + { 1, 7396, 1573, 8, 4, UNI_ARABICEXTA } /* inarabicexta */, + { 0, 1141, 918, 4, 7, UNI_ZZZZ } /* scx=unknown */, + { 8, 6464, 434, 3, 4, UNI_SC__ARMN } /* sc=armn */, + { 1, 3129, 312, 12, 2, UNI_IN__13 } /* presentin=v130 */, + { 2, 7957, 3403, 18, 3, UNI_DT__ENC } /* decompositiontype=enc */, + { 0, 3304, 1232, 14, 7, UNI_EA__NA } /* eastasianwidth=narrow */, + { 0, 1141, 2385, 4, 12, UNI_TUTG } /* scx=tulutigalari */, + { 2, 333, 341, 2, 5, UNI_INTAILE } /* intaile */, + { 1, 6928, 1232, 4, 3, UNI_INPC__NA } /* inpc=na */, + { 2, 4681, 1740, 14, 4, UNI_CYRILLICEXTD } /* block=cyrillicextd */, + { 0, 135, 346, 2, 5, UNI_TAKR } /* istakri */, + { 12, 2429, 1164, 6, 8, UNI_INTIFINAGH } /* block=tifinagh */, + { 2, 2429, 6867, 9, 19, UNI_CJKCOMPATIDEOGRAPHSSUP } /* block=cjkcompatideographssup */, + { 0, 7695, 6610, 20, 10, UNI_BC__RLE } /* bidiclass=righttoleftembedding */, + { 1, 8283, 653, 16, 3, -UNI_UIDEO } /* unifiedideograph=no */, + { 20, 4586, 717, 17, 5, UNI_LIMB } /* scriptextensions=limbu */, + { 4, 5993, 972, 4, 6, -UNI_EMOD } /* emod=false */, + { 0, 2021, 971, 11, 3, -UNI_GRBASE } /* graphemebase=f */, + { 6, 3726, 0, 4, 0, UNI_IDSU } /* idsu */, + { 2, 2534, 0, 4, 0, UNI_NAND } /* nand */, + { 10, 954, 2677, 4, 3, -UNI_EBASE } /* ebase=n */, + { 0, 1465, 2812, 2, 3, UNI_RI } /* wb=ri */, + { 16, 1141, 209, 4, 4, UNI_TAML } /* scx=taml */, + { 0, 0, 1069, 1, 2, UNI_LOE } /* loe */, + { 0, 6760, 5294, 14, 5, UNI_SB__AT } /* sentencebreak=aterm */, + { 1, 1733, 6886, 5, 21, UNI_INDICNUMBERFORMS } /* blk=commonindicnumberforms */, + { 2, 2373, 1232, 9, 3, UNI_IN__NA } /* presentin=na */, + { 0, 2635, 7024, 3, 21, UNI_JG__HANIFIROHINGYAKINNAYA } /* jg=hanifirohingyakinnaya */, + { 14, 11, 5115, 1, 16, UNI_ALCHEMICAL } /* alchemicalsymbols */, + { 4, 7322, 380, 24, 2, UNI_CCC__9 } /* canonicalcombiningclass=vr */, + { 0, 3976, 376, 15, 1, UNI_NV__1_SLASH_8 } /* numericvalue=1/8 */, + { 6, 1911, 3794, 7, 4, UNI_SC__DEVA } /* script=deva */, + { 0, 2429, 1789, 6, 11, UNI_INGURUNGKHEMA } /* block=gurungkhema */, + { 0, 3976, 0, 14, 0, UNI_NV__1 } /* numericvalue=1 */, + { 0, 2273, 5612, 4, 4, UNI_NV__40000 } /* nv=40000 */, + { 3, 4814, 0, 16, 0, UNI_BOPOMOFOEXT } /* bopomofoextended */, + { 0, 2429, 2361, 6, 12, UNI_PLAYINGCARDS } /* block=playingcards */, + { 0, 1911, 2872, 7, 4, UNI_SC__COPT } /* script=copt */, + { 0, 4999, 2677, 9, 3, -UNI_XPOSIXSPACE } /* whitespace=n */, + { 10, 7525, 613, 25, 2, UNI_CCC__107 } /* canonicalcombiningclass=107 */, + { 2, 135, 827, 2, 3, UNI_ANY } /* isany */, + { 4, 8765, 5939, 23, 15, UNI_INSC__CANTILLATIONMARK } /* indicsyllabiccategory=cantillationmark */, + { 0, 4202, 383, 17, 4, UNI_IDSB } /* idsbinaryoperator=yes */, + { 0, 933, 1391, 5, 2, UNI_AGE__3_DOT_2 } /* age=v32 */, + { 2, 1141, 3477, 4, 15, UNI_MERC } /* scx=meroiticcursive */, + { 0, 6164, 966, 9, 3, UNI_LB__OP } /* linebreak=op */, + { 0, 333, 2327, 2, 2, UNI_IN__8 } /* in=8 */, + { 0, 368, 318, 3, 2, UNI_CCC__9 } /* ccc=9 */, + { 0, 644, 0, 7, 0, UNI_DSRT } /* deseret */, + { 1, 1733, 4966, 4, 8, UNI_DINGBATS } /* blk=dingbats */, + { 0, 8233, 99, 9, 2, UNI_UPPERCASELETTER } /* category=lu */, + { 0, 3521, 1387, 13, 2, UNI_NV__60 } /* numericvalue=60 */, + { 2, 1254, 3290, 3, 14, UNI_CONTROLPICTURES } /* incontrolpictures */, + { 3, 925, 2169, 5, 3, UNI_AGE__11 } /* age=11.0 */, + { 0, 3808, 4861, 6, 5, UNI_LATIN1 } /* islatin1sup */, + { 1, 8278, 4377, 28, 4, UNI_CJKEXTH } /* incjkunifiedideographsextensionh */, + { 8, 6164, 6523, 10, 12, UNI_LB__SY } /* linebreak=breaksymbols */, + { 2, 1911, 1008, 7, 8, UNI_SC__GURU } /* script=gurmukhi */, + { 1, 4732, 653, 5, 2, -UNI_XPOSIXUPPER } /* upper=n */, + { 3, 135, 3590, 2, 15, UNI_ZANB } /* iszanabazarsquare */, + { 0, 1911, 458, 7, 3, UNI_MRO } /* script=mro */, + { 21, 4586, 1339, 17, 7, UNI_TIRH } /* scriptextensions=tirhuta */, + { 0, 1560, 6103, 7, 13, UNI_GEORGIANSUP } /* ingeorgiansupplement */, + { 1, 2498, 3771, 8, 9, UNI_CYRILLICEXTD } /* cyrillicextendedd */, + { 25, 6464, 712, 3, 5, UNI_SC__DOGR } /* sc=dogra */, + { 2, 3903, 3070, 3, 11, UNI_LB__IN } /* lb=inseparable */, + { 3, 1141, 1308, 4, 7, UNI_PHAG } /* scx=phagspa */, + { 12, 566, 2677, 2, 4, -UNI_LOE } /* loe=no */, + { 1, 4586, 2827, 16, 7, UNI_ARAB } /* scriptextensions=arabic */, + { 0, 1141, 1577, 4, 4, UNI_JAVA } /* scx=java */, + { 5, 5803, 383, 21, 4, UNI_CWT } /* changeswhentitlecased=yes */, + { 16, 2635, 704, 3, 3, UNI_JG__LAM } /* jg=lam */, + { 0, 2635, 2956, 3, 11, UNI_JG__KASHMIRIYEH } /* jg=kashmiriyeh */, + { 9, 253, 0, 2, 0, UNI_YI } /* yi */, + { 0, 4586, 1751, 17, 11, UNI_CPMN } /* scriptextensions=cyprominoan */, + { 8, 6462, 8026, 12, 18, UNI_INSC__CONSONANTINITIALPOSTFIXED } /* insc=consonantinitialpostfixed */, + { 1, 8535, 0, 32, 0, UNI_IDEOGRAPHICSYMBOLS } /* ideographicsymbolsandpunctuation */, + { 9, 583, 5294, 3, 5, UNI_SB__AT } /* sb=aterm */, + { 0, 3617, 8701, 5, 31, UNI_EGYPTIANHIEROGLYPHFORMATCONTROLS } /* blk=egyptianhieroglyphformatcontrols */, + { 0, 135, 859, 2, 4, UNI_QAAI } /* iszinh */, + { 0, 6018, 0, 21, 0, UNI_PRTI } /* inscriptionalparthian */, + { 0, 333, 3794, 2, 14, UNI_DEVANAGARIEXTA } /* indevanagariexta */, + { 57, 9030, 8044, 17, 17, UNI_SUPPUAB } /* block=supplementaryprivateuseareab */, + { 2, 4716, 0, 5, 0, UNI_TITLE } /* title */, + { 1, 6737, 1600, 13, 3, UNI_JG__YEH } /* joininggroup=yeh */, + { 0, 6737, 5234, 13, 4, UNI_JG__YUDH } /* joininggroup=yudh */, + { 0, 3331, 653, 14, 3, -UNI_GREXT } /* graphemeextend=no */, + { 0, 4586, 2157, 17, 4, UNI_MEND } /* scriptextensions=mend */, + { 2, 278, 653, 5, 2, -UNI_CWKCF } /* cwkcf=n */, + { 1, 9030, 5299, 9, 7, UNI_SUPARROWSA } /* block=suparrowsa */, + { 0, 3521, 1392, 13, 4, UNI_NV__2000 } /* numericvalue=2000 */, + { 1, 3976, 808, 15, 2, UNI_NV__1_SLASH_64 } /* numericvalue=1/64 */, + { 0, 2429, 307, 6, 5, UNI_INNUSHU } /* block=nushu */, + { 0, 2325, 5612, 4, 4, UNI_NV__80000 } /* nv=80000 */, + { 0, 1141, 4783, 4, 7, UNI_LINB } /* scx=linearb */, + { 0, 4586, 1287, 17, 7, UNI_MAKA } /* scriptextensions=makasar */, + { 2, 1498, 375, 8, 2, UNI_CCC__118 } /* ccc=ccc118 */, + { 0, 135, 474, 2, 4, UNI_ONAO } /* isonao */, + { 0, 7045, 3863, 22, 4, UNI_JG__MALAYALAMLLLA } /* joininggroup=malayalamllla */, + { 2, 333, 1090, 2, 8, UNI_INKIRATRAI } /* inkiratrai */, + { 1, 135, 644, 2, 7, UNI_DSRT } /* isdeseret */, + { 1, 1498, 1209, 7, 2, UNI_CCC__24 } /* ccc=ccc24 */, + { 12, 135, 6899, 2, 4, UNI_BERF } /* isberf */, + { 4, 4305, 0, 15, 0, UNI_PD } /* dashpunctuation */, + { 0, 5606, 0, 6, 0, UNI_HYPHEN } /* hyphen */, + { 1, 6321, 3123, 17, 5, UNI_bpt_values_index } /* bidipairedbrackettype= */, + { 1, 2429, 4320, 6, 12, UNI_DIACRITICALS } /* block=diacriticals */, + { 0, 135, 4623, 2, 11, UNI_SGNW } /* issignwriting */, + { 17, 71, 639, 3, 2, UNI_CWU } /* cwu=t */, + { 5, 1465, 1952, 3, 8, UNI_WB__EB } /* wb=ebasegaz */, + { 12, 583, 6634, 3, 6, UNI_SB__FO } /* sb=format */, + { 8, 135, 283, 2, 3, UNI_CWT } /* iscwt */, + { 0, 135, 3780, 2, 14, UNI_PHONETICEXTSUP } /* isphoneticextsup */, + { 19, 6464, 1688, 3, 10, UNI_TOLS } /* sc=tolongsiki */, + { 1, 2635, 5194, 3, 16, UNI_JG__HANIFIROHINGYAPA } /* jg=hanifirohingyapa */, + { 0, 135, 1042, 2, 6, UNI_LYCI } /* islycian */, + { 0, 7760, 0, 16, 0, UNI_TANGUTCOMPONENTS } /* tangutcomponents */, + { 0, 1254, 2010, 3, 11, UNI_CHESSSYMBOLS } /* inchesssymbols */, + { 0, 6164, 3587, 10, 3, UNI_LB__ZWJ } /* linebreak=zwj */, + { 1, 6464, 783, 3, 4, UNI_SC__MAND } /* sc=mand */, + { 8, 4406, 4903, 13, 5, UNI_JG__MANICHAEANZAYIN } /* jg=manichaeanzayin */, + { 5, 1016, 0, 4, 0, UNI_HIRA } /* hira */, + { 0, 2622, 3215, 7, 6, UNI_XPOSIXDIGIT } /* isxposixdigit */, + { 7, 3521, 7550, 13, 2, UNI_NV__28 } /* numericvalue=28 */, + { 1, 583, 646, 3, 2, UNI_SB__SE } /* sb=se */, + { 1, 2496, 7776, 10, 13, UNI_CYRILLICSUP } /* incyrillicsupplementary */, + { 4, 7957, 7322, 21, 9, UNI_DT__NONCANON } /* decompositiontype=noncanonical */, + { 8, 1812, 6088, 6, 9, UNI_ARABICEXTA } /* arabicextendeda */, + { 0, 1911, 1432, 7, 9, UNI_PALM } /* script=palmyrene */, + { 8, 1141, 863, 4, 7, UNI_SHAW } /* scx=shavian */, + { 17, 2, 638, 1, 3, UNI_CE } /* ce=t */, + { 13, 977, 972, 5, 2, -UNI_ECOMP } /* ecomp=f */, + { 1, 2429, 7086, 6, 14, UNI_MEETEIMAYEKEXT } /* block=meeteimayekext */, + { 9, 333, 1172, 2, 8, UNI_INUGARITIC } /* inugaritic */, + { 1, 30, 4715, 1, 6, UNI_TITLE } /* istitle */, + { 4, 333, 458, 2, 3, UNI_INMRO } /* inmro */, + { 3, 1652, 0, 10, 0, UNI_SAUR } /* saurashtra */, + { 0, 4022, 2265, 14, 8, UNI_NV__7_SLASH_8 } /* numericvalue=8.750e-01 */, + { 6, 6464, 8061, 3, 19, UNI_EGYP } /* sc=egyptianhieroglyphs */, + { 9, 6464, 261, 3, 4, UNI_SC__ZYYY } /* sc=zyyy */, + { 0, 7176, 5683, 21, 4, UNI_compex_values_index } /* fullcompositionexclusion= */, + { 4, 2083, 1547, 5, 5, UNI_POSIXSPACE } /* posixspace */, + { 10, 5306, 1672, 10, 2, UNI_LB__LF } /* wordbreak=lf */, + { 0, 2406, 638, 10, 6, UNI_XIDC } /* xidcontinue=true */, + { 8, 2587, 5447, 4, 16, UNI_INPUNCTUATION } /* isgeneralpunctuation */, + { 0, 4586, 6098, 18, 8, UNI_MONG } /* scriptextensions=mongolian */, + { 1, 933, 2206, 5, 2, UNI_AGE__6_DOT_2 } /* age=v62 */, + { 1, 20, 383, 3, 2, UNI_XPOSIXXDIGIT } /* hex=y */, + { 8, 4533, 2677, 5, 3, -UNI_XPOSIXSPACE } /* wspace=n */, + { 7, 333, 462, 2, 3, UNI_INNKO } /* innko */, + { 0, 1812, 4693, 4, 6, UNI_ARABICEXTC } /* arabicextc */, + { 0, 4586, 2872, 17, 6, UNI_COPT } /* scriptextensions=coptic */, + { 0, 1498, 2190, 7, 2, UNI_CCC__29 } /* ccc=ccc29 */, + { 2, 5845, 7445, 21, 7, UNI_GCB__PP } /* graphemeclusterbreak=prepend */, + { 1, 3257, 1613, 5, 9, UNI_MISCARROWS } /* blk=miscarrows */, + { 8, 2380, 611, 4, 3, UNI_IN__16 } /* in=16.0 */, + { 0, 1911, 742, 7, 5, UNI_BATK } /* script=batak */, + { 0, 2429, 7002, 6, 22, UNI_TRANSPORTANDMAP } /* block=transportandmapsymbols */, + { 0, 333, 7086, 2, 21, UNI_MEETEIMAYEKEXT } /* inmeeteimayekextensions */, + { 1, 9089, 7288, 33, 9, UNI_UCASEXT } /* unifiedcanadianaboriginalsyllabicsextended */, + { 68, 2407, 2677, 9, 4, -UNI_IDC } /* idcontinue=no */, + { 3, 108, 3012, 2, 12, UNI_JT__C } /* jt=joincausing */, + { 6, 4586, 78, 17, 4, UNI_DSRT } /* scriptextensions=dsrt */, + { 10, 1112, 5612, 4, 7, UNI_NV__10000000 } /* nv=10000000 */, + { 0, 2596, 383, 11, 4, UNI_JOINC } /* joincontrol=yes */, + { 1, 4586, 506, 17, 4, UNI_SIDT } /* scriptextensions=sidt */, + { 12, 8117, 3886, 23, 3, UNI_JG__MANICHAEANTAW } /* joininggroup=manichaeantaw */, + { 0, 135, 237, 2, 4, UNI_TUTG } /* istutg */, + { 5, 2429, 3766, 6, 14, UNI_LATINEXTD } /* block=latinextendedd */, + { 73, 1471, 383, 4, 2, UNI_IDST } /* idst=y */, + { 7, 1329, 0, 7, 0, UNI_SUNU } /* sunuwar */, + { 2, 1112, 423, 5, 2, UNI_NV__1_SLASH_16 } /* nv=1/16 */, + { 1, 1733, 1516, 7, 7, UNI_CJKSTROKES } /* blk=cjkstrokes */, + { 0, 4586, 1042, 17, 4, UNI_LYCI } /* scriptextensions=lyci */, + { 6, 1346, 3654, 3, 6, UNI_CPRT } /* iscypriot */, + { 7, 669, 0, 4, 0, UNI_ELYM } /* elym */, + { 5, 1911, 286, 7, 4, UNI_SC__GARA } /* script=gara */, + { 4, 1044, 972, 2, 6, -UNI_CI } /* ci=false */, + { 5, 2922, 8701, 3, 31, UNI_EGYPTIANHIEROGLYPHFORMATCONTROLS } /* isegyptianhieroglyphformatcontrols */, + { 0, 3764, 2719, 3, 12, UNI_LOWSURROGATES } /* inlowsurrogates */, + { 0, 7804, 7550, 27, 2, UNI_CCC__28 } /* canonicalcombiningclass=ccc28 */, + { 5, 6164, 8175, 10, 11, UNI_LB__ID } /* linebreak=ideographic */, + { 0, 7151, 383, 25, 4, UNI_DI } /* defaultignorablecodepoint=yes */, + { 0, 3257, 8669, 5, 32, UNI_MISCMATHSYMBOLSB } /* blk=miscellaneousmathematicalsymbolsb */, + { 4, 8765, 7255, 31, 11, UNI_INSC__CONSONANTPLACEHOLDER } /* indicsyllabiccategory=consonantplaceholder */, + { 0, 3213, 652, 7, 4, -UNI_XPOSIXXDIGIT } /* hexdigit=no */, + { 7, 2765, 0, 13, 0, UNI_PATSYN } /* patternsyntax */, + { 2, 21, 652, 2, 3, -UNI_EXT } /* ext=n */, + { 2, 316, 4565, 2, 4, UNI_NV__3_SLASH_2 } /* nv=3/2 */, + { 0, 2429, 5429, 6, 18, UNI_HALFMARKS } /* block=combininghalfmarks */, + { 1, 4406, 3886, 13, 3, UNI_JG__MANICHAEANTAW } /* jg=manichaeantaw */, + { 0, 6737, 4419, 13, 4, UNI_JG__KAPH } /* joininggroup=kaph */, + { 0, 6164, 133, 10, 2, UNI_LB__NL } /* linebreak=nl */, + { 1, 2810, 569, 3, 2, UNI_BC__AL } /* bc=al */, + { 8, 333, 565, 2, 6, UNI_INOLONAL } /* inolonal */, + { 0, 4586, 1269, 17, 4, UNI_THAI } /* scriptextensions=thai */, + { 1, 2380, 423, 3, 2, UNI_IN__16 } /* in=16 */, + { 0, 135, 78, 2, 4, UNI_DSRT } /* isdsrt */, + { 1, 5740, 639, 21, 2, UNI_CWCF } /* changeswhencasefolded=t */, + { 2, 2453, 382, 12, 3, UNI_CI } /* caseignorable=y */, + { 0, 4586, 321, 17, 5, UNI_ORYA } /* scriptextensions=oriya */, + { 1, 3257, 1099, 5, 7, UNI_INMAHAJANI } /* blk=mahajani */, + { 2, 1141, 939, 4, 8, UNI_ARMN } /* scx=armenian */, + { 0, 2429, 2561, 6, 13, UNI_IPAEXT } /* block=ipaextensions */, + { 4, 6760, 3565, 13, 7, UNI_SB__EX } /* sentencebreak=extend */, + { 4, 6737, 1079, 13, 5, UNI_JG__KHAPH } /* joininggroup=khaph */, + { 2, 3136, 319, 4, 2, UNI_IN__9 } /* in=v90 */, + { 0, 1303, 5375, 2, 16, UNI_LATINEXTC } /* blk=latinextendedc */, + { 11, 1346, 2045, 3, 9, UNI_COMPATJAMO } /* iscompatjamo */, + { 0, 135, 2844, 2, 5, UNI_EMOJI } /* isemoji */, + { 0, 3903, 0, 16, 0, UNI_LB__AP } /* lb=aksaraprebase */, + { 2, 174, 653, 3, 3, -UNI_PCM } /* pcm=no */, + { 0, 27, 0, 4, 0, UNI_ARMI } /* armi */, + { 1, 7045, 1249, 22, 3, UNI_JG__MALAYALAMNGA } /* joininggroup=malayalamnga */, + { 1, 4586, 3453, 17, 6, UNI_HEBR } /* scriptextensions=hebrew */, + { 7, 3136, 422, 4, 2, UNI_IN__5_DOT_1 } /* in=v51 */, + { 0, 7322, 314, 25, 1, UNI_CCC__24 } /* canonicalcombiningclass=24 */, + { 3, 4320, 653, 9, 2, -UNI_DIA } /* diacritic=n */, + { 1, 1141, 67, 4, 4, UNI_CPRT } /* scx=cprt */, + { 3, 316, 2258, 3, 2, UNI_NV__33 } /* nv=33 */, + { 3, 30, 1246, 1, 8, UNI_BENG } /* isbengali */, + { 37, 4586, 9096, 17, 18, UNI_CANS } /* scriptextensions=canadianaboriginal */, + { 7, 2635, 4908, 4, 4, UNI_JG__ALAPH } /* jg=alaph */, + { 1, 1733, 4956, 4, 18, UNI_ORNAMENTALDINGBATS } /* blk=ornamentaldingbats */, + { 8, 561, 0, 4, 0, UNI_NV__7 } /* nv=7 */, + { 0, 3976, 804, 14, 3, UNI_NV__11_SLASH_2 } /* numericvalue=11/2 */, + { 0, 135, 855, 2, 4, UNI_SYRC } /* issyrc */, + { 2, 2635, 4439, 3, 4, UNI_JG__TETH } /* jg=teth */, + { 0, 2021, 382, 11, 3, UNI_GRBASE } /* graphemebase=y */, + { 2, 2429, 8089, 6, 28, UNI_VSSUP } /* block=variationselectorssupplement */, + { 4, 5866, 6844, 10, 7, UNI_identifierstatus_values_index } /* identifierstatus= */, + { 8, 2273, 559, 4, 2, UNI_NV__4_SLASH_5 } /* nv=4/5 */, + { 48, 5866, 7374, 15, 11, UNI_IDENTIFIERTYPE__RECOMMENDED } /* identifiertype=recommended */, + { 0, 3629, 2892, 7, 11, UNI_ALPHABETICPF } /* block=alphabeticpf */, + { 0, 3766, 217, 7, 2, UNI_LATINEXTF } /* latinextf */, + { 1, 2858, 4158, 3, 14, UNI_ZS } /* gc=spaceseparator */, + { 0, 7509, 8044, 15, 17, UNI_SUPPUAB } /* blk=supplementaryprivateuseareab */, + { 1, 135, 5636, 2, 3, UNI_PUA } /* ispua */, + { 0, 6180, 972, 21, 2, -UNI_LOE } /* logicalorderexception=f */, + { 4, 2607, 8796, 3, 33, UNI_MISCPICTOGRAPHS } /* ismiscellaneoussymbolsandpictographs */, + { 1, 6369, 6098, 7, 18, UNI_MONGOLIANSUP } /* block=mongoliansupplement */, + { 1, 1590, 451, 3, 3, UNI_KHMR } /* iskhmr */, + { 0, 135, 1322, 2, 7, UNI_SOYO } /* issoyombo */, + { 3, 1141, 142, 4, 4, UNI_MERC } /* scx=merc */, + { 0, 3870, 0, 9, 0, UNI_MLYM } /* malayalam */, + { 2, 632, 312, 5, 2, UNI_CCC__A } /* ccc=230 */, + { 0, 8765, 1585, 22, 5, UNI_INSC__BINDU } /* indicsyllabiccategory=bindu */, + { 0, 7804, 312, 28, 2, UNI_CCC__130 } /* canonicalcombiningclass=ccc130 */, + { 0, 2607, 1070, 9, 4, UNI_MYANMAREXTB } /* ismyanmarextb */, + { 0, 246, 0, 2, 0, UNI_PE } /* pe */, + { 44, 4022, 0, 14, 0, UNI_NV__8 } /* numericvalue=8 */, + { 1, 4406, 4888, 13, 5, UNI_JG__MANICHAEANALEPH } /* jg=manichaeanaleph */, + { 0, 19, 653, 4, 2, -UNI_POSIXXDIGIT } /* ahex=n */, + { 0, 1671, 0, 2, 0, UNI_LOWERCASELETTER } /* ll */, + { 0, 19, 1143, 3, 2, UNI_ahex_values_index } /* ahex= */, + { 1, 1260, 4332, 3, 4, UNI_CJKEXTH } /* cjkexth */, + { 0, 2108, 0, 11, 0, UNI_KEHNOROTATE } /* kehnorotate */, + { 2, 1911, 717, 7, 5, UNI_SC__LIMB } /* script=limbu */, + { 1, 6464, 286, 3, 5, UNI_SC__GARA } /* sc=garay */, + { 3, 30, 1522, 1, 11, UNI_DEP } /* isdeprecated */, + { 16, 333, 1874, 2, 11, UNI_INMEDEFAIDRIN } /* inmedefaidrin */, + { 0, 1871, 1240, 4, 7, UNI_EMOTICONS } /* inemoticons */, + { 0, 368, 2315, 3, 2, UNI_CCC__6 } /* ccc=6 */, + { 10, 3903, 6, 3, 2, UNI_LB__CM } /* lb=cm */, + { 3, 4320, 0, 9, 0, UNI_DIA } /* diacritic */, + { 1, 2824, 5115, 5, 16, UNI_ALCHEMICAL } /* blk=alchemicalsymbols */, + { 2, 333, 1622, 2, 10, UNI_INNAGMUNDARI } /* innagmundari */, + { 0, 7509, 6981, 5, 21, UNI_MODIFIERLETTERS } /* blk=spacingmodifierletters */, + { 6, 1258, 2478, 4, 5, UNI_CJKEXTE } /* incjkexte */, + { 0, 5845, 748, 21, 2, UNI_WB__EB } /* graphemeclusterbreak=em */, + { 0, 1547, 2677, 4, 3, -UNI_XPOSIXSPACE } /* space=n */, + { 12, 3129, 4020, 11, 2, UNI_IN__7 } /* presentin=v70 */, + { 1, 1346, 7422, 3, 23, UNI_DIACRITICALSFORSYMBOLS } /* iscombiningmarksforsymbols */, + { 5, 6464, 486, 3, 4, UNI_MIAO } /* sc=plrd */, + { 1, 1346, 6710, 5, 18, UNI_CJKRADICALSSUP } /* iscjkradicalssupplement */, + { 20, 2429, 2407, 6, 3, UNI_INIDC } /* block=idc */, + { 8, 135, 4569, 2, 17, UNI_RI } /* isregionalindicator */, + { 8, 4586, 1441, 17, 9, UNI_PAUC } /* scriptextensions=paucinhau */, + { 18, 333, 5636, 2, 3, UNI_PUA } /* inpua */, + { 1, 2406, 383, 4, 2, UNI_XIDC } /* xidc=y */, + { 8, 1911, 1408, 7, 4, UNI_SC__PERM } /* script=perm */, + { 5, 30, 687, 1, 4, UNI_HAN } /* ishan */, + { 1, 3617, 7233, 5, 22, UNI_EGYPTIANHIEROGLYPHSEXTA } /* blk=egyptianhieroglyphsexta */, + { 73, 135, 4783, 2, 16, UNI_LINEARBSYLLABARY } /* islinearbsyllabary */, + { 1, 1377, 0, 9, 0, UNI_TALU } /* newtailue */, + { 0, 5782, 653, 21, 2, -UNI_CWL } /* changeswhenlowercased=n */, + { 18, 4586, 4335, 17, 6, UNI_HANG } /* scriptextensions=hangul */, + { 0, 1141, 565, 4, 6, UNI_ONAO } /* scx=olonal */, + { 3, 777, 8701, 3, 31, UNI_EGYPTIANHIEROGLYPHFORMATCONTROLS } /* inegyptianhieroglyphformatcontrols */, + { 0, 2858, 0, 3, 2, UNI_CASEDLETTER } /* gc=l& */, + { 5, 565, 0, 6, 0, UNI_ONAO } /* olonal */, + { 0, 5, 8196, 1, 30, UNI_MATHALPHANUM } /* mathematicalalphanumericsymbols */, + { 0, 1465, 3571, 5, 7, UNI_WB__MB } /* wb=midnumlet */, + { 1, 1911, 2932, 7, 5, UNI_KHMR } /* script=khmer */, + { 2, 217, 0, 4, 0, UNI_TFNG } /* tfng */, + { 1, 30, 7106, 1, 11, UNI_DEVA } /* isdevanagari */, + { 0, 2587, 1027, 3, 3, UNI_GRAN } /* isgran */, + { 0, 5131, 1803, 18, 7, UNI_INCB__LINKER } /* indicconjunctbreak=linker */, + { 1, 8061, 2005, 18, 5, UNI_EGYPTIANHIEROGLYPHSEXTA } /* egyptianhieroglyphsexta */, + { 5, 2373, 2315, 9, 4, UNI_IN__6_DOT_2 } /* presentin=6.2 */, + { 1, 1281, 1070, 6, 4, UNI_KANAEXTB } /* inkanaextb */, + { 0, 2373, 371, 9, 3, UNI_IN__12 } /* presentin=12 */, + { 3, 3726, 653, 4, 2, -UNI_IDSU } /* idsu=n */, + { 18, 9030, 4619, 8, 15, UNI_SUTTONSIGNWRITING } /* block=suttonsignwriting */, + { 0, 1911, 6899, 7, 4, UNI_BERF } /* script=berf */, + { 0, 1971, 0, 11, 0, UNI_BIDIC } /* bidicontrol */, + { 1, 2273, 564, 4, 1, UNI_NV__47 } /* nv=47 */, + { 8, 2373, 2292, 11, 3, UNI_IN__12 } /* presentin=12.0 */, + { 3, 135, 2467, 2, 8, UNI_ASSIGNED } /* isassigned */, + { 3, 6164, 68, 10, 2, UNI_LB__PR } /* linebreak=pr */, + { 4, 2429, 351, 6, 5, UNI_VSSUP } /* block=vssup */, + { 14, 333, 1098, 2, 8, UNI_INMAHAJANI } /* inmahajani */, + { 3, 333, 707, 2, 5, UNI_INBUHID } /* inbuhid */, + { 0, 2081, 3215, 7, 6, UNI_POSIXXDIGIT } /* isposixxdigit */, + { 18, 3213, 639, 8, 5, UNI_XPOSIXXDIGIT } /* hexdigit=true */, + { 12, 1911, 1577, 7, 8, UNI_SC__JAVA } /* script=javanese */, + { 1, 5098, 639, 13, 5, UNI_EMOD } /* emojimodifier=true */, + { 0, 1254, 8996, 3, 34, UNI_DIACRITICALSSUP } /* incombiningdiacriticalmarkssupplement */, + { 9, 6464, 1036, 3, 6, UNI_LEPC } /* sc=lepcha */, + { 14, 933, 4035, 5, 2, UNI_AGE__8 } /* age=v80 */, + { 0, 8233, 3852, 9, 11, UNI_MC } /* category=spacingmark */, + { 0, 110, 3889, 2, 14, UNI_KAKTOVIKNUMERALS } /* kaktoviknumerals */, + { 0, 135, 1408, 2, 4, UNI_PERM } /* isperm */, + { 10, 1911, 6116, 7, 9, UNI_SUND } /* script=sundanese */, + { 6, 30, 1047, 1, 7, UNI_INTELUGU } /* intelugu */, + { 0, 3629, 7854, 10, 20, UNI_ARABICPFA } /* block=arabicpresentationformsa */, + { 1, 8226, 273, 16, 2, UNI_CASEDLETTER } /* generalcategory=lc */, + { 1, 2373, 2756, 11, 3, UNI_IN__15 } /* presentin=15.0 */, + { 1, 9087, 6213, 5, 4, UNI_ANY } /* isunicode */, + { 0, 53, 0, 1, 0, UNI_N } /* n */, + { 0, 6164, 5240, 9, 17, UNI_LB__CP } /* linebreak=closeparenthesis */, + { 5, 3617, 1070, 12, 4, UNI_ETHIOPICEXTB } /* blk=ethiopicextb */, + { 1, 1733, 2134, 4, 12, UNI_INMASARAMGONDI } /* blk=masaramgondi */, + { 0, 1258, 6692, 5, 18, UNI_CJKCOMPATFORMS } /* incjkcompatibilityforms */, + { 6, 33, 1149, 1, 7, UNI_SPECIALS } /* specials */, + { 4, 4586, 2498, 17, 8, UNI_CYRL } /* scriptextensions=cyrillic */, + { 0, 174, 639, 3, 2, UNI_PCM } /* pcm=t */, + { 10, 4732, 0, 9, 0, UNI_XPOSIXUPPER } /* uppercase */, + { 3, 135, 2440, 2, 13, UNI_BLOCKELEMENTS } /* isblockelements */, + { 0, 8639, 8964, 30, 14, UNI_INPC__TOPANDBOTTOMANDRIGHT } /* indicpositionalcategory=topandbottomandright */, + { 2, 1283, 3826, 4, 10, UNI_KANASUP } /* kanasupplement */, + { 64, 3257, 2743, 5, 12, UNI_MISCTECHNICAL } /* blk=misctechnical */, + { 0, 4185, 652, 16, 2, UNI_idcompatmathstart_values_index } /* idcompatmathstart= */, + { 1, 393, 972, 4, 6, -UNI_CWCM } /* cwcm=false */, + { 0, 6369, 7929, 7, 28, UNI_MISCARROWS } /* block=miscellaneoussymbolsandarrows */, + { 55, 8089, 0, 17, 0, UNI_VS } /* variationselector */, + { 0, 2429, 662, 6, 7, UNI_INELBASAN } /* block=elbasan */, + { 0, 6164, 3905, 9, 3, UNI_LB__AK } /* linebreak=ak */, + { 4, 1733, 6867, 7, 19, UNI_CJKCOMPATIDEOGRAPHSSUP } /* blk=cjkcompatideographssup */, + { 8, 3794, 0, 10, 0, UNI_DEVA } /* devanagari */, + { 5, 135, 1432, 2, 9, UNI_PALM } /* ispalmyrene */, + { 9, 2635, 522, 3, 3, UNI_JG__BEH } /* jg=beh */, + { 17, 1498, 375, 7, 2, UNI_CCC__18 } /* ccc=ccc18 */, + { 0, 1733, 7348, 4, 26, UNI_HALFANDFULLFORMS } /* blk=halfwidthandfullwidthforms */, + { 0, 4586, 494, 17, 4, UNI_QAAI } /* scriptextensions=qaai */, + { 6, 133, 0, 2, 0, UNI_NL } /* nl */, + { 0, 1141, 154, 4, 4, UNI_NARB } /* scx=narb */, + { 2, 7804, 1211, 27, 2, UNI_CCC__35 } /* canonicalcombiningclass=ccc35 */, + { 0, 4942, 5612, 14, 4, UNI_NV__60000 } /* numericvalue=60000 */, + { 4, 135, 543, 2, 6, UNI_LYDI } /* islydian */, + { 2, 21, 652, 2, 4, -UNI_EXT } /* ext=no */, + { 21, 2429, 817, 6, 7, UNI_OLCK } /* block=olchiki */, + { 20, 2429, 518, 6, 3, UNI_INVAI } /* block=vai */, + { 6, 30, 7106, 1, 20, UNI_DEVANAGARIEXTA } /* isdevanagariextendeda */, + { 1, 135, 510, 2, 2, UNI_SO } /* isso */, + { 0, 1230, 5597, 3, 9, UNI_EA__A } /* ea=ambiguous */, + { 0, 135, 3355, 2, 15, UNI_ARMI } /* isimperialaramaic */, + { 2, 135, 3155, 2, 13, UNI_QMARK } /* isquotationmark */, + { 0, 3629, 6492, 10, 12, UNI_ARABICSUP } /* block=arabicsupplement */, + { 0, 676, 652, 6, 4, -UNI_EXTPICT } /* extpict=no */, + { 0, 5306, 551, 10, 2, UNI_WB__DQ } /* wordbreak=dq */, + { 3, 316, 2277, 4, 8, UNI_NV__11_SLASH_12 } /* nv=9.167e-01 */, + { 6, 1590, 1070, 6, 4, UNI_KANAEXTB } /* iskanaextb */, + { 0, 4586, 1577, 17, 4, UNI_JAVA } /* scriptextensions=java */, + { 2, 992, 653, 8, 2, -UNI_EXT } /* extender=n */, + { 2, 2429, 4698, 6, 18, UNI_COPTICEPACTNUMBERS } /* block=copticepactnumbers */, + { 0, 1141, 4814, 4, 4, UNI_BOPO } /* scx=bopo */, + { 10, 1733, 3780, 4, 11, UNI_PHONETICEXT } /* blk=phoneticext */, + { 0, 7180, 5683, 17, 4, UNI_ce_values_index } /* compositionexclusion= */, + { 0, 6760, 5240, 13, 3, UNI_SB__CL } /* sentencebreak=cl */, + { 1, 1652, 0, 4, 0, UNI_SAUR } /* saur */, + { 0, 293, 269, 4, 2, UNI_GCB__CN } /* gcb=cn */, + { 4, 4051, 383, 16, 4, UNI_STERM } /* sentenceterminal=yes */, + { 24, 6464, 1000, 3, 8, UNI_SC__GUJR } /* sc=gujarati */, + { 6, 6464, 1322, 3, 7, UNI_SOYO } /* sc=soyombo */, + { 1, 333, 3590, 2, 15, UNI_INZANABAZARSQUARE } /* inzanabazarsquare */, + { 0, 1346, 1516, 5, 7, UNI_CJKSTROKES } /* iscjkstrokes */, + { 0, 3257, 4695, 11, 4, UNI_MYANMAREXTC } /* blk=myanmarextc */, + { 0, 6464, 947, 3, 8, UNI_BALI } /* sc=balinese */, + { 41, 4586, 3794, 17, 4, UNI_DEVA } /* scriptextensions=deva */, + { 0, 1911, 587, 7, 6, UNI_TNSA } /* script=tangsa */, + { 9, 333, 3453, 2, 6, UNI_INHEBREW } /* inhebrew */, + { 1, 8167, 0, 29, 0, UNI_ENCLOSEDIDEOGRAPHICSUP } /* enclosedideographicsupplement */, + { 18, 1141, 362, 4, 6, UNI_CARI } /* scx=carian */, + { 1, 1281, 4673, 6, 9, UNI_KANAEXTB } /* inkanaextendedb */, + { 3, 9087, 0, 45, 0, UNI_UCASEXTA } /* isunifiedcanadianaboriginalsyllabicsextendeda */, + { 2, 1523, 972, 3, 2, -UNI_DEP } /* dep=f */, + { 0, 2236, 2295, 6, 6, UNI_NV__1_SLASH_40 } /* nv=2.500e-02 */, + { 0, 333, 5355, 2, 6, UNI_INTANGUT } /* intangut */, + { 2, 2624, 0, 11, 0, UNI_XPOSIXBLANK } /* xposixblank */, + { 4, 6078, 6088, 10, 9, UNI_JAMOEXTA } /* hanguljamoextendeda */, + { 2, 1818, 5178, 3, 16, UNI_SHARADASUP } /* issharadasupplement */, + { 2, 8233, 2422, 9, 6, UNI_N } /* category=number */, + { 14, 2373, 318, 9, 2, UNI_IN__9 } /* presentin=9 */, + { 40, 7509, 8424, 5, 29, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* blk=symbolsandpictographsextendeda */, + { 8, 2635, 8129, 2, 18, UNI_JG__MANICHAEANTHAMEDH } /* jg=manichaeanthamedh */, + { 9, 3521, 1210, 13, 2, UNI_NV__43 } /* numericvalue=43 */, + { 0, 135, 1737, 2, 7, UNI_CJKEXTD } /* iscjkextd */, + { 1, 1254, 5902, 3, 10, UNI_COUNTINGROD } /* incountingrod */, + { 9, 274, 972, 4, 2, -UNI_CWCF } /* cwcf=f */, + { 2, 2607, 427, 3, 3, UNI_MIAO } /* ismiao */, + { 0, 2380, 372, 4, 1, UNI_IN__11 } /* in=11 */, + { 14, 1733, 7219, 4, 14, UNI_MUSIC } /* blk=musicalsymbols */, + { 4, 3617, 6088, 12, 9, UNI_ETHIOPICEXTA } /* blk=ethiopicextendeda */, + { 3, 6464, 1272, 3, 9, UNI_SC__QAAI } /* sc=inherited */, + { 0, 2453, 971, 12, 3, -UNI_CI } /* caseignorable=f */, + { 4, 1733, 899, 4, 7, UNI_INTAIVIET } /* blk=taiviet */, + { 2, 3136, 372, 5, 1, UNI_IN__1_DOT_1 } /* in=v11 */, + { 0, 2373, 2169, 11, 3, UNI_IN__11 } /* presentin=11.0 */, + { 0, 5740, 653, 21, 3, -UNI_CWCF } /* changeswhencasefolded=no */, + { 0, 2273, 2757, 4, 8, UNI_NV__2_SLASH_5 } /* nv=4.000e-01 */, + { 1, 6484, 0, 13, 0, UNI_GLAGOLITICSUP } /* glagoliticsup */, + { 1, 15, 6568, 2, 3, UNI_AGE__2 } /* age=2 */, + { 0, 1733, 2932, 4, 5, UNI_INKHMER } /* blk=khmer */, + { 0, 5546, 0, 18, 0, UNI_CHEROKEESUP } /* cherokeesupplement */, + { 0, 333, 2944, 2, 12, UNI_MAHJONG } /* inmahjongtiles */, + { 0, 135, 6201, 2, 21, UNI__PERL_NCHAR } /* isnoncharactercodepoint */, + { 0, 333, 8089, 2, 28, UNI_VSSUP } /* invariationselectorssupplement */, + { 3, 2429, 6078, 6, 10, UNI_JAMO } /* block=hanguljamo */, + { 12, 2810, 385, 3, 2, UNI_BC__ES } /* bc=es */, + { 8, 5761, 972, 21, 6, -UNI_CWCM } /* changeswhencasemapped=false */, + { 5, 5, 0, 3, 0, UNI_MCM } /* mcm */, + { 3, 8233, 679, 9, 2, UNI_PI } /* category=pi */, + { 8, 6597, 322, 4, 2, UNI_BC__LRI } /* bc=lri */, + { 0, 6737, 3428, 13, 12, UNI_JG__VERTICALTAIL } /* joininggroup=verticaltail */, + { 2, 2373, 614, 10, 3, UNI_IN__7 } /* presentin=7.0 */, + { 1, 42, 6556, 2, 3, UNI_SB__NU } /* sb=nu */, + { 9, 4586, 446, 17, 3, UNI_HAN } /* scriptextensions=han */, + { 0, 1495, 2034, 3, 11, UNI_INGUNJALAGONDI } /* ingunjalagondi */, + { 1, 30, 1029, 1, 7, UNI_INKAITHI } /* inkaithi */, + { 11, 1994, 1573, 8, 4, UNI_KANAEXTA } /* blk=kanaexta */, + { 26, 135, 3141, 2, 2, UNI_PS } /* isps */, + { 2, 1141, 5628, 4, 20, UNI_HMNP } /* scx=nyiakengpuachuehmong */, + { 1, 6464, 1941, 3, 11, UNI_SC__SYLO } /* sc=sylotinagri */, + { 1, 9030, 6775, 7, 22, UNI_SHORTHANDFORMATCONTROLS } /* block=shorthandformatcontrols */, + { 3, 135, 51, 2, 4, UNI_CANS } /* iscans */, + { 3, 135, 870, 2, 7, UNI_SIDT } /* issidetic */, + { 3, 3103, 1890, 13, 6, UNI_NFCQC__M } /* nfcquickcheck=maybe */, + { 0, 939, 0, 8, 0, UNI_ARMN } /* armenian */, + { 1, 4586, 362, 17, 4, UNI_CARI } /* scriptextensions=cari */, + { 0, 6442, 971, 19, 7, -UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=false */, + { 1, 1911, 543, 7, 6, UNI_SC__LYDI } /* script=lydian */, + { 4, 6462, 1213, 5, 5, UNI_INSC__NUKTA } /* insc=nukta */, + { 0, 4586, 1042, 17, 6, UNI_LYCI } /* scriptextensions=lycian */, + { 6, 1733, 3535, 4, 15, UNI_NARB } /* blk=oldnortharabian */, + { 0, 2587, 7277, 5, 20, UNI_GEOMETRICSHAPESEXT } /* isgeometricshapesextended */, + { 1, 1483, 1573, 5, 4, UNI_LATINEXTA } /* latinexta */, + { 0, 135, 351, 2, 5, UNI_VSSUP } /* isvssup */, + { 0, 2429, 2944, 6, 12, UNI_MAHJONG } /* block=mahjongtiles */, + { 0, 34, 1049, 1, 3, UNI_TELU } /* telu */, + { 0, 6462, 2713, 5, 6, UNI_LB__ZWJ } /* insc=joiner */, + { 16, 2429, 1896, 6, 11, UNI_INPAHAWHHMONG } /* block=pahawhhmong */, + { 0, 30, 2013, 1, 7, UNI_S } /* issymbol */, + { 18, 135, 229, 2, 4, UNI_TODR } /* istodr */, + { 1, 333, 6824, 2, 10, UNI_PUA } /* inprivateuse */, + { 3, 925, 414, 4, 3, UNI_AGE__3_DOT_2 } /* age=3.2 */, + { 0, 1982, 296, 12, 1, UNI_bidim_values_index } /* bidimirrored= */, + { 1, 8226, 6993, 19, 8, UNI_LO } /* generalcategory=otherletter */, + { 1, 925, 2778, 4, 3, UNI_AGE__5_DOT_2 } /* age=5.2 */, + { 2, 8233, 2014, 9, 6, UNI_S } /* category=symbol */, + { 1, 3136, 2214, 4, 2, UNI_IN__6_DOT_3 } /* in=v63 */, + { 0, 6464, 1698, 3, 4, UNI_WARA } /* sc=wara */, + { 6, 5667, 0, 20, 0, UNI_vo_values_index } /* verticalorientation= */, + { 0, 7760, 0, 26, 0, UNI_TANGUTCOMPONENTSSUP } /* tangutcomponentssupplement */, + { 4, 1260, 4695, 3, 4, UNI_CJKEXTC } /* cjkextc */, + { 0, 1180, 0, 8, 0, UNI_VITH } /* vithkuqi */, + { 2, 3903, 301, 3, 2, UNI_LB__VF } /* lb=vf */, + { 0, 7957, 6395, 18, 4, UNI_DT__FONT } /* decompositiontype=font */, + { 10, 1254, 5902, 3, 18, UNI_COUNTINGROD } /* incountingrodnumerals */, + { 1, 1141, 1441, 4, 4, UNI_PAUC } /* scx=pauc */, + { 0, 663, 1736, 2, 3, UNI_LB__CJ } /* lb=cj */, + { 0, 6180, 972, 21, 6, -UNI_LOE } /* logicalorderexception=false */, + { 1, 7045, 149, 14, 2, UNI_JG__MIM } /* joininggroup=mim */, + { 7, 1982, 639, 12, 2, UNI_BIDIM } /* bidimirrored=t */, + { 0, 1308, 0, 4, 0, UNI_PHAG } /* phag */, + { 0, 5824, 383, 21, 4, UNI_CWU } /* changeswhenuppercased=yes */, + { 0, 6464, 5073, 3, 5, UNI_SC__TAML } /* sc=tamil */, + { 10, 6464, 1329, 3, 4, UNI_SC__SUNU } /* sc=sunu */, + { 0, 5306, 599, 10, 3, UNI_WB__EB } /* wordbreak=ebg */, + { 17, 4687, 0, 12, 0, UNI_CYRILLICEXTC } /* cyrillicextc */, + { 1, 1733, 8930, 7, 23, UNI_CJKCOMPATIDEOGRAPHS } /* blk=cjkcompatibilityideographs */, + { 3, 925, 0, 6, 0, UNI_AGE__10 } /* age=10 */, + { 0, 3213, 383, 8, 4, UNI_XPOSIXXDIGIT } /* hexdigit=yes */, + { 1, 2429, 3794, 6, 13, UNI_DEVANAGARIEXT } /* block=devanagariext */, + { 1, 333, 8336, 2, 20, UNI_MISCSYMBOLS } /* inmiscellaneoussymbols */, + { 2, 8117, 4893, 23, 5, UNI_JG__MANICHAEANGIMEL } /* joininggroup=manichaeangimel */, + { 3, 2429, 2057, 6, 7, UNI_INSOGDIAN } /* block=sogdian */, + { 5, 1733, 6137, 4, 19, UNI_SUPARROWSC } /* blk=supplementalarrowsc */, + { 0, 651, 7322, 3, 9, UNI_DT__CAN } /* dt=canonical */, + { 1, 4586, 1789, 17, 11, UNI_GUKH } /* scriptextensions=gurungkhema */, + { 0, 126, 0, 4, 0, UNI_LAO } /* laoo */, + { 4, 7045, 764, 22, 3, UNI_JG__MALAYALAMNNA } /* joininggroup=malayalamnna */, + { 4, 8233, 510, 9, 2, UNI_SO } /* category=so */, + { 0, 4732, 383, 5, 4, UNI_XPOSIXUPPER } /* upper=yes */, + { 2, 2301, 2293, 4, 8, UNI_NV__1_SLASH_20 } /* nv=5.000e-02 */, + { 1, 2844, 972, 5, 2, -UNI_EMOJI } /* emoji=f */, + { 0, 2635, 1596, 3, 7, UNI_JG__THINYEH } /* jg=thinyeh */, + { 0, 2380, 614, 3, 3, UNI_IN__7 } /* in=7.0 */, + { 0, 6442, 2677, 19, 3, -UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=n */, + { 4, 1112, 4005, 4, 2, UNI_NV__1_SLASH_8 } /* nv=1/8 */, + { 2, 3766, 1787, 11, 3, UNI_LATINEXTG } /* latinextendedg */, + { 0, 30, 208, 1, 5, UNI_TAML } /* istaml */, + { 0, 1733, 7210, 4, 14, UNI_BYZANTINEMUSIC } /* blk=byzantinemusic */, + { 4, 16, 83, 1, 3, UNI_GONG } /* gong */, + { 2, 6464, 669, 3, 4, UNI_ELYM } /* sc=elym */, + { 11, 1141, 213, 4, 4, UNI_TAVT } /* scx=tavt */, + { 3, 507, 583, 2, 3, UNI_idsb_values_index } /* idsb= */, + { 5, 1733, 7873, 4, 17, UNI_ANCIENTGREEKMUSIC } /* blk=ancientgreekmusic */, + { 1, 1733, 1941, 4, 11, UNI_INSYLOTINAGRI } /* blk=sylotinagri */, + { 0, 5667, 2812, 19, 2, UNI_VO__R } /* verticalorientation=r */, + { 1, 1024, 0, 4, 0, UNI_HATR } /* hatr */, + { 0, 278, 639, 5, 5, UNI_CWKCF } /* cwkcf=true */, + { 0, 6737, 4439, 13, 4, UNI_JG__TETH } /* joininggroup=teth */, + { 0, 2429, 593, 6, 6, UNI_INTODHRI } /* block=todhri */, + { 10, 1733, 1164, 4, 8, UNI_INTIFINAGH } /* blk=tifinagh */, + { 0, 4350, 382, 8, 2, UNI_lower_values_index } /* lowercase= */, + { 9, 878, 383, 4, 2, UNI_TERM } /* term=y */, + { 9, 3976, 422, 14, 1, UNI_NV__15 } /* numericvalue=15 */, + { 1, 4747, 383, 18, 2, UNI_IDST } /* idstrinaryoperator=y */, + { 12, 3521, 2327, 12, 10, UNI_NV__1_SLASH_12 } /* numericvalue=8.333e-02 */, + { 0, 3070, 1669, 3, 9, UNI_SMALLFORMS } /* insmallforms */, + { 3, 1911, 2340, 7, 4, UNI_SC__HUNG } /* script=hung */, + { 0, 8117, 4898, 23, 5, UNI_JG__MANICHAEANSADHE } /* joininggroup=manichaeansadhe */, + { 0, 1911, 769, 7, 7, UNI_SC__KALI } /* script=kayahli */, + { 20, 4586, 154, 17, 4, UNI_NARB } /* scriptextensions=narb */, + { 2, 760, 534, 5, 3, UNI_KANBUN } /* inkanbun */, + { 0, 1911, 193, 7, 4, UNI_SC__RUNR } /* script=runr */, + { 0, 1562, 3770, 7, 9, UNI_GEORGIANEXT } /* georgianextended */, + { 2, 1141, 47, 4, 4, UNI_CAKM } /* scx=cakm */, + { 1, 4409, 0, 4, 0, UNI_MANI } /* mani */, + { 4, 2325, 1388, 4, 3, UNI_NV__8000 } /* nv=8000 */, + { 39, 506, 873, 3, 4, UNI_SIDT } /* sidetic */, + { 0, 1733, 7742, 4, 18, UNI_PHONETICEXT } /* blk=phoneticextensions */, + { 0, 2429, 790, 6, 7, UNI_INMARCHEN } /* block=marchen */, + { 1, 1522, 653, 2, 3, -UNI_SD } /* sd=no */, + { 0, 8175, 639, 11, 5, UNI_IDEO } /* ideographic=true */, + { 0, 1810, 4693, 6, 6, UNI_ARABICEXTC } /* isarabicextc */, + { 1, 1847, 972, 11, 2, -UNI_KEHNOMIRROR } /* kehnomirror=f */, + { 2, 293, 3852, 4, 11, UNI_GCB__SM } /* gcb=spacingmark */, + { 1, 3903, 569, 3, 2, UNI_LB__AL } /* lb=al */, + { 32, 6464, 537, 3, 6, UNI_SC__KHOJ } /* sc=khojki */, + { 0, 8233, 2860, 8, 6, UNI_C } /* category=other */, + { 3, 1141, 2057, 4, 7, UNI_SOGD } /* scx=sogdian */, + { 0, 6078, 0, 10, 0, UNI_JAMO } /* hanguljamo */, + { 6, 2429, 5902, 7, 18, UNI_COUNTINGROD } /* block=countingrodnumerals */, + { 0, 7674, 83, 10, 2, UNI_BC__ON } /* bidiclass=on */, + { 0, 33, 4873, 1, 8, UNI_SYRIACSUP } /* syriacsup */, + { 2, 2622, 1547, 8, 5, UNI_XPOSIXSPACE } /* isxposixspace */, + { 17, 42, 3024, 2, 3, UNI_SB__LE } /* sb=le */, + { 1, 1733, 2057, 4, 7, UNI_INSOGDIAN } /* blk=sogdian */, + { 1, 914, 639, 4, 5, UNI_IDEO } /* ideo=true */, + { 0, 3764, 4861, 6, 12, UNI_LATIN1 } /* inlatin1supplement */, + { 0, 1911, 1164, 7, 8, UNI_SC__TFNG } /* script=tifinagh */, + { 0, 3099, 5116, 4, 15, UNI_ALCHEMICAL } /* inalchemicalsymbols */, + { 1, 135, 4309, 2, 5, UNI_P } /* ispunct */, + { 0, 7151, 1916, 24, 3, UNI_DI } /* defaultignorablecodepoint=t */, + { 1, 1498, 372, 8, 1, UNI_CCC__11 } /* ccc=ccc11 */, + { 1, 1733, 6222, 4, 7, UNI_INSINHALA } /* blk=sinhala */, + { 0, 3605, 1573, 12, 4, UNI_CYRILLICEXTA } /* blk=cyrillicexta */, + { 10, 4586, 3260, 16, 8, UNI_MYMR } /* scriptextensions=myanmar */, + { 0, 3257, 6907, 5, 21, UNI_MISCTECHNICAL } /* blk=miscellaneoustechnical */, + { 0, 2429, 776, 6, 7, UNI_INLINEARA } /* block=lineara */, + { 7, 8765, 3344, 31, 4, UNI_INSC__CONSONANTDEAD } /* indicsyllabiccategory=consonantdead */, + { 0, 2429, 6952, 6, 6, UNI_INBRAHMI } /* block=brahmi */, + { 2, 135, 1329, 2, 4, UNI_SUNU } /* issunu */, + { 0, 6321, 653, 21, 5, UNI_BPT__N } /* bidipairedbrackettype=none */, + { 1, 9030, 6981, 7, 21, UNI_MODIFIERLETTERS } /* block=spacingmodifierletters */, + { 2, 1911, 434, 7, 4, UNI_SC__ARMN } /* script=armn */, + { 0, 135, 571, 2, 6, UNI_PATSYN } /* ispatsyn */, + { 20, 4586, 6484, 17, 10, UNI_GLAG } /* scriptextensions=glagolitic */, + { 0, 6737, 7024, 13, 21, UNI_JG__HANIFIROHINGYAKINNAYA } /* joininggroup=hanifirohingyakinnaya */, + { 7, 583, 4830, 3, 5, UNI_SB__CL } /* sb=close */, + { 0, 5098, 972, 13, 6, -UNI_EMOD } /* emojimodifier=false */, + { 6, 2373, 2465, 10, 10, UNI_IN__NA } /* presentin=unassigned */, + { 40, 4814, 0, 8, 0, UNI_BOPO } /* bopomofo */, + { 0, 4586, 1552, 17, 4, UNI_BUGI } /* scriptextensions=bugi */, + { 0, 1141, 644, 4, 7, UNI_DSRT } /* scx=deseret */, + { 1, 333, 4097, 2, 17, UNI_INCAUCASIANALBANIAN } /* incaucasianalbanian */, + { 3, 2429, 462, 6, 3, UNI_INNKO } /* block=nko */, + { 0, 6464, 947, 3, 4, UNI_BALI } /* sc=bali */, + { 10, 4974, 0, 18, 0, UNI_ZP } /* paragraphseparator */, + { 0, 135, 5194, 2, 4, UNI_HAN } /* ishani */, + { 4, 174, 972, 3, 2, -UNI_PCM } /* pcm=f */, + { 22, 8765, 2713, 22, 6, UNI_LB__ZWJ } /* indicsyllabiccategory=joiner */, + { 3, 6464, 717, 3, 5, UNI_SC__LIMB } /* sc=limbu */, + { 1, 2912, 1740, 10, 4, UNI_CYRILLICEXTD } /* iscyrillicextd */, + { 8, 632, 312, 5, 1, UNI_CCC__23 } /* ccc=23 */, + { 1, 1471, 652, 6, 4, -UNI_IDS } /* idstart=no */, + { 21, 1465, 599, 3, 3, UNI_WB__EB } /* wb=ebg */, + { 4, 1465, 551, 3, 2, UNI_WB__DQ } /* wb=dq */, + { 0, 135, 4966, 2, 8, UNI_DINGBATS } /* isdingbats */, + { 0, 21, 7552, 1, 10, UNI_ENCLOSEDCJK } /* enclosedcjk */, + { 0, 1044, 639, 2, 5, UNI_CI } /* ci=true */, + { 4, 2429, 5546, 6, 18, UNI_CHEROKEESUP } /* block=cherokeesupplement */, + { 2, 3903, 3453, 3, 12, UNI_LB__HL } /* lb=hebrewletter */, + { 4, 5845, 639, 20, 2, UNI_GCB__T } /* graphemeclusterbreak=t */, + { 3, 1247, 0, 7, 0, UNI_BENG } /* bengali */, + { 0, 4007, 4005, 14, 2, UNI_NV__7_SLASH_8 } /* numericvalue=7/8 */, + { 0, 2429, 6886, 7, 21, UNI_INDICNUMBERFORMS } /* block=commonindicnumberforms */, + { 12, 30, 2943, 1, 5, UNI_MAHJ } /* ismahj */, + { 2, 3129, 374, 11, 2, UNI_IN__3_DOT_1 } /* presentin=v31 */, + { 18, 5957, 2562, 3, 12, UNI_IPAEXT } /* isipaextensions */, + { 17, 6760, 646, 14, 2, UNI_SB__SE } /* sentencebreak=se */, + { 1, 411, 639, 3, 5, UNI_EXT } /* ext=true */, + { 13, 1141, 1200, 4, 9, UNI_BHKS } /* scx=bhaiksuki */, + { 2, 925, 604, 4, 4, UNI_AGE__13 } /* age=13.0 */, + { 10, 1470, 370, 3, 2, UNI_xidc_values_index } /* xidc= */, + { 3, 4037, 5612, 14, 4, UNI_NV__90000 } /* numericvalue=90000 */, + { 0, 695, 0, 7, 0, UNI_LB__H3 } /* hst=lvt */, + { 1, 6164, 3587, 10, 2, UNI_LB__ZW } /* linebreak=zw */, + { 0, 954, 382, 4, 3, UNI_EBASE } /* ebase=y */, + { 1, 2496, 6088, 10, 9, UNI_CYRILLICEXTA } /* incyrillicextendeda */, + { 1, 2596, 972, 11, 2, -UNI_JOINC } /* joincontrol=f */, + { 4, 6164, 3907, 11, 12, UNI_LB__AP } /* linebreak=aksaraprebase */, + { 4, 20, 0, 3, 0, UNI_XPOSIXXDIGIT } /* hex */, + { 14, 8639, 3370, 24, 10, UNI_INPC__OVERSTRUCK } /* indicpositionalcategory=overstruck */, + { 50, 7957, 2784, 18, 8, UNI_DT__VERT } /* decompositiontype=vertical */, + { 8, 316, 2190, 3, 2, UNI_NV__29 } /* nv=29 */, + { 16, 6464, 193, 3, 4, UNI_SC__RUNR } /* sc=runr */, + { 0, 8226, 3403, 16, 13, UNI_ME } /* generalcategory=enclosingmark */, + { 2, 3903, 7846, 3, 10, UNI_LB__AL } /* lb=alphabetic */, + { 0, 4553, 6573, 14, 8, UNI_NV__1_SLASH_320 } /* numericvalue=3.125e-03 */, + { 0, 4406, 5228, 13, 6, UNI_JG__MANICHAEANTWENTY } /* jg=manichaeantwenty */, + { 6, 2607, 5257, 3, 18, UNI_MODIFIERTONELETTERS } /* ismodifiertoneletters */, + { 0, 1141, 7086, 4, 11, UNI_MTEI } /* scx=meeteimayek */, + { 4, 1141, 1632, 4, 10, UNI_XPEO } /* scx=oldpersian */, + { 2, 4586, 459, 18, 3, UNI_MRO } /* scriptextensions=mroo */, + { 2, 1911, 4335, 7, 4, UNI_SC__HANG } /* script=hang */, + { 7, 5803, 653, 21, 3, -UNI_CWT } /* changeswhentitlecased=no */, + { 1, 3070, 8424, 3, 29, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* insymbolsandpictographsextendeda */, + { 2, 333, 2002, 2, 4, UNI_UCAS } /* inucas */, + { 4, 4586, 1405, 17, 9, UNI_PERM } /* scriptextensions=oldpermic */, + { 1, 2506, 1070, 10, 4, UNI_ETHIOPICEXTB } /* inethiopicextb */, + { 0, 368, 3279, 4, 11, UNI_CCC__8 } /* ccc=kanavoicing */, + { 1, 2407, 639, 3, 5, UNI_IDC } /* idc=true */, + { 0, 8366, 4377, 28, 4, UNI_CJKEXTH } /* iscjkunifiedideographsextensionh */, + { 0, 4586, 1450, 17, 9, UNI_SAMR } /* scriptextensions=samaritan */, + { 1, 5845, 2860, 20, 6, UNI_GCB__XX } /* graphemeclusterbreak=other */, + { 0, 4202, 4730, 16, 2, UNI_idsb_values_index } /* idsbinaryoperator= */, + { 0, 6535, 0, 23, 0, -UNI_MCM } /* modifiercombiningmark=n */, + { 9, 11, 2892, 1, 11, UNI_ALPHABETICPF } /* alphabeticpf */, + { 0, 9030, 5564, 7, 11, UNI_SMALLKANAEXT } /* block=smallkanaext */, + { 4, 135, 233, 2, 4, UNI_TOLS } /* istols */, + { 5, 6464, 1622, 3, 4, UNI_NAGM } /* sc=nagm */, + { 7, 30, 7775, 1, 29, UNI_SUPPUAA } /* issupplementaryprivateuseareaa */, + { 33, 3521, 2238, 12, 10, UNI_NV__1_SLASH_4 } /* numericvalue=2.500e-01 */, + { 0, 583, 877, 3, 5, UNI_SB__ST } /* sb=sterm */, + { 1, 333, 1751, 2, 11, UNI_INCYPROMINOAN } /* incyprominoan */, + { 0, 316, 0, 4, 0, UNI_NV__9 } /* nv=9 */, + { 0, 316, 6580, 3, 9, UNI_NV__3_SLASH_80 } /* nv=3.750e-02 */, + { 0, 1470, 383, 8, 4, UNI_XIDS } /* xidstart=yes */, + { 0, 4586, 722, 17, 5, UNI_OGAM } /* scriptextensions=ogham */, + { 0, 1141, 5194, 4, 4, UNI_HAN } /* scx=hani */, + { 0, 4569, 653, 17, 3, -UNI_RI } /* regionalindicator=no */, + { 3, 135, 8862, 2, 35, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* issymbolsforlegacycomputingsupplement */, + { 0, 4586, 23, 17, 4, UNI_AHOM } /* scriptextensions=ahom */, + { 1, 135, 1396, 2, 9, UNI_ITAL } /* isolditalic */, + { 5, 6464, 906, 3, 7, UNI_SC__TIBT } /* sc=tibetan */, + { 0, 1911, 118, 7, 4, UNI_SC__KNDA } /* script=knda */, + { 5, 7322, 375, 24, 2, UNI_CCC__18 } /* canonicalcombiningclass=18 */, + { 32, 7322, 2173, 24, 2, UNI_CCC__11 } /* canonicalcombiningclass=11 */, + { 4, 6164, 3092, 10, 6, UNI_LB__VI } /* linebreak=virama */, + { 64, 1911, 843, 7, 4, UNI_NBAT } /* script=nbat */, + { 3, 30, 5545, 1, 12, UNI_CHEROKEESUP } /* ischerokeesup */, + { 0, 1308, 1311, 3, 4, UNI_PHAG } /* phagspa */, + { 21, 8226, 3673, 16, 9, UNI_Z } /* generalcategory=separator */, + { 0, 892, 0, 7, 0, UNI_LANA } /* taitham */, + { 0, 5, 6098, 1, 8, UNI_MONG } /* mongolian */, + { 6, 4586, 1308, 17, 7, UNI_PHAG } /* scriptextensions=phagspa */, + { 2, 7846, 383, 10, 4, UNI_XPOSIXALPHA } /* alphabetic=yes */, + { 4, 135, 851, 2, 4, UNI_SHRD } /* isshrd */, + { 0, 1911, 166, 7, 4, UNI_SC__OSGE } /* script=osge */, + { 0, 3521, 3519, 13, 2, UNI_NV__36 } /* numericvalue=36 */, + { 25, 1141, 1315, 4, 4, UNI_SIDD } /* scx=sidd */, + { 1, 1733, 1577, 4, 8, UNI_INJAVANESE } /* blk=javanese */, + { 0, 2844, 652, 13, 2, UNI_ecomp_values_index } /* emojicomponent= */, + { 0, 1112, 1391, 5, 3, UNI_NV__1_SLASH_320 } /* nv=1/320 */, + { 0, 7322, 2258, 24, 2, UNI_CCC__33 } /* canonicalcombiningclass=33 */, + { 1, 4586, 241, 17, 4, UNI_WCHO } /* scriptextensions=wcho */, + { 5, 3129, 2206, 11, 2, UNI_IN__6_DOT_2 } /* presentin=v62 */, + { 8, 1733, 4235, 5, 14, UNI_CURRENCYSYMBOLS } /* blk=currencysymbols */, + { 0, 1733, 7873, 4, 27, UNI_ANCIENTGREEKMUSIC } /* blk=ancientgreekmusicalnotation */, + { 24, 278, 383, 5, 2, UNI_CWKCF } /* cwkcf=y */, + { 0, 2922, 4673, 10, 9, UNI_ETHIOPICEXTB } /* isethiopicextendedb */, + { 5, 3808, 81, 9, 2, UNI_LATINEXTG } /* islatinextg */, + { 0, 1733, 5355, 4, 16, UNI_TANGUTSUP } /* blk=tangutsupplement */, + { 0, 4586, 55, 17, 4, UNI_CHAM } /* scriptextensions=cham */, + { 0, 651, 3742, 3, 6, UNI_DT__COM } /* dt=compat */, + { 20, 6464, 1030, 3, 6, UNI_SC__KTHI } /* sc=kaithi */, + { 0, 1465, 400, 3, 2, UNI_WB__SQ } /* wb=sq */, + { 0, 1918, 0, 4, 0, UNI_TAYO } /* tayo */, + { 0, 1810, 2797, 3, 13, UNI_ANCIENTSYMBOLS } /* isancientsymbols */, + { 4, 7126, 383, 25, 4, UNI_CWKCF } /* changeswhennfkccasefolded=yes */, + { 0, 4406, 246, 13, 2, UNI_JG__MANICHAEANPE } /* jg=manichaeanpe */, + { 0, 2429, 1329, 6, 7, UNI_INSUNUWAR } /* block=sunuwar */, + { 0, 30, 1970, 1, 6, UNI_BIDIC } /* isbidic */, + { 0, 135, 4219, 2, 15, UNI_BRAI } /* isbraillepatterns */, + { 3, 5648, 653, 19, 2, -UNI_TERM } /* terminalpunctuation=n */, + { 2, 6164, 3081, 10, 11, UNI_LB__IN } /* linebreak=inseperable */, + { 6, 7210, 0, 14, 0, UNI_BYZANTINEMUSIC } /* byzantinemusic */, + { 2, 925, 564, 5, 1, UNI_AGE__17 } /* age=17 */, + { 1, 1141, 984, 4, 8, UNI_DUPL } /* scx=duployan */, + { 8, 583, 9, 3, 2, UNI_LB__CR } /* sb=cr */, + { 2, 6464, 114, 3, 4, UNI_KITS } /* sc=kits */, + { 6, 3903, 5606, 3, 6, UNI_LB__HY } /* lb=hyphen */, + { 0, 2149, 383, 5, 2, UNI_XPOSIXALPHA } /* alpha=y */, + { 3, 2429, 6896, 6, 11, UNI_NUMBERFORMS } /* block=numberforms */, + { 1, 1733, 7086, 4, 14, UNI_MEETEIMAYEKEXT } /* blk=meeteimayekext */, + { 26, 978, 653, 6, 3, -UNI_COMPEX } /* compex=no */, + { 0, 135, 2002, 2, 8, UNI_UCASEXTA } /* isucasexta */, + { 2, 3116, 0, 12, 0, UNI_nt_values_index } /* numerictype= */, + { 4, 2844, 383, 5, 2, UNI_EMOJI } /* emoji=y */, + { 0, 4234, 0, 15, 0, UNI_CURRENCYSYMBOLS } /* currencysymbols */, + { 8, 4586, 346, 17, 4, UNI_TAKR } /* scriptextensions=takr */, + { 19, 5, 8669, 1, 32, UNI_MISCMATHSYMBOLSB } /* miscellaneousmathematicalsymbolsb */, + { 5, 6737, 5194, 13, 16, UNI_JG__HANIFIROHINGYAPA } /* joininggroup=hanifirohingyapa */, + { 1, 1112, 0, 6, 0, UNI_NV__1_SLASH_3 } /* nv=1/3 */, + { 1, 1733, 4081, 5, 16, UNI_UCAS } /* blk=canadiansyllabics */, + { 7, 1971, 972, 11, 2, -UNI_BIDIC } /* bidicontrol=f */, + { 1, 7107, 0, 18, 0, UNI_DEVANAGARIEXT } /* devanagariextended */, + { 0, 2498, 6492, 6, 12, UNI_CYRILLICSUP } /* cyrillicsupplement */, + { 22, 1733, 458, 4, 3, UNI_INMRO } /* blk=mro */, + { 6, 583, 0, 5, 0, UNI_SB__ST } /* sb=st */, + { 1, 316, 377, 3, 2, UNI_NV__49 } /* nv=49 */, + { 1, 17, 1543, 1, 9, UNI_XPOSIXBLANK } /* horizspace */, + { 0, 1141, 1922, 4, 4, UNI_SORA } /* scx=sora */, + { 2, 8280, 5407, 26, 4, UNI_CJKEXTE } /* cjkunifiedideographsextensione */, + { 1, 71, 972, 3, 6, -UNI_CWU } /* cwu=false */, + { 0, 1112, 2757, 4, 8, UNI_NV__1_SLASH_10 } /* nv=1.000e-01 */, + { 2, 6760, 305, 14, 2, UNI_SB__XX } /* sentencebreak=xx */, + { 2, 1818, 4873, 3, 8, UNI_SYRIACSUP } /* issyriacsup */, + { 11, 333, 8167, 2, 22, UNI_ENCLOSEDIDEOGRAPHICSUP } /* inenclosedideographicsup */, + { 0, 2073, 972, 7, 6, -UNI_RADICAL } /* radical=false */, + { 2, 2429, 543, 6, 6, UNI_INLYDIAN } /* block=lydian */, + { 23, 1254, 8395, 3, 29, UNI_CUNEIFORMNUMBERS } /* incuneiformnumbersandpunctuation */, + { 1, 2073, 2999, 6, 2, UNI_radical_values_index } /* radical= */, + { 0, 2429, 732, 6, 5, UNI_INRUNIC } /* block=runic */, + { 0, 3903, 1547, 3, 5, UNI_LB__SP } /* lb=space */, + { 3, 1112, 314, 4, 1, UNI_NV__14 } /* nv=14 */, + { 4, 2635, 2665, 3, 3, UNI_JG__HEH } /* jg=heh */, + { 3, 1141, 138, 4, 4, UNI_MEDF } /* scx=medf */, + { 0, 6164, 665, 10, 2, UNI_LB__AS } /* linebreak=as */, + { 2, 554, 2265, 4, 8, UNI_NV__3_SLASH_8 } /* nv=3.750e-01 */, + { 6, 1911, 1459, 7, 6, UNI_SC__THAA } /* script=thaana */, + { 4, 333, 625, 2, 7, UNI_INAVESTAN } /* inavestan */, + { 0, 8226, 269, 16, 2, UNI_CN } /* generalcategory=cn */, + { 7, 2429, 3141, 6, 14, UNI_INPSALTERPAHLAVI } /* block=psalterpahlavi */, + { 0, 2429, 4219, 6, 7, UNI_BRAI } /* block=braille */, + { 2, 393, 639, 4, 5, UNI_CWCM } /* cwcm=true */, + { 0, 7957, 653, 17, 5, UNI_DT__NONE } /* decompositiontype=none */, + { 7, 2765, 653, 13, 2, -UNI_PATSYN } /* patternsyntax=n */, + { 1, 4586, 478, 17, 4, UNI_ORKH } /* scriptextensions=orkh */, + { 3, 1911, 2088, 7, 6, UNI_SC__SYRC } /* script=syriac */, + { 0, 2429, 2349, 6, 12, UNI_PHAISTOS } /* block=phaistosdisc */, + { 3, 1141, 31, 4, 4, UNI_AVST } /* scx=avst */, + { 1, 7804, 423, 27, 2, UNI_CCC__16 } /* canonicalcombiningclass=ccc16 */, + { 9, 4202, 653, 4, 3, -UNI_IDSB } /* idsb=no */, + { 0, 1315, 0, 7, 0, UNI_SIDD } /* siddham */, + { 2, 2607, 4799, 3, 15, UNI_MISCMATHSYMBOLSB } /* ismiscmathsymbolsb */, + { 0, 2587, 2475, 3, 7, UNI_GREEKEXT } /* isgreekext */, + { 0, 797, 1887, 3, 5, UNI_NFCQC__M } /* nfkcqc=m */, + { 1, 2373, 0, 10, 0, UNI_in_values_index } /* presentin= */, + { 3, 333, 5177, 2, 10, UNI_SHARADASUP } /* insharadasup */, + { 0, 4290, 2564, 5, 10, UNI_VEDICEXT } /* vedicextensions */, + { 0, 1141, 1652, 4, 10, UNI_SAUR } /* scx=saurashtra */, + { 0, 3976, 423, 15, 2, UNI_NV__1_SLASH_16 } /* numericvalue=1/16 */, + { 4, 0, 3932, 1, 15, UNI_LINEARBIDEOGRAMS } /* linearbideograms */, + { 0, 8862, 0, 35, 0, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* symbolsforlegacycomputingsupplement */, + { 2, 566, 971, 2, 7, -UNI_LOE } /* loe=false */, + { 8, 5131, 5310, 13, 6, UNI_incb_values_index } /* indicconjunctbreak= */, + { 3, 1141, 859, 4, 4, UNI_QAAI } /* scx=zinh */, + { 6, 3764, 643, 13, 3, UNI_LATINEXTE } /* inlatinextendede */, + { 0, 6164, 3106, 10, 2, UNI_LB__QU } /* linebreak=qu */, + { 0, 1733, 8862, 4, 28, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* blk=symbolsforlegacycomputingsup */, + { 6, 1911, 906, 7, 7, UNI_SC__TIBT } /* script=tibetan */, + { 18, 6462, 2545, 5, 8, UNI_INSC__AVAGRAHA } /* insc=avagraha */, + { 1, 4553, 314, 15, 1, UNI_NV__3_SLASH_4 } /* numericvalue=3/4 */, + { 1, 185, 6552, 1, 5, UNI_qmark_values_index } /* qmark= */, + { 2, 8226, 3852, 16, 11, UNI_MC } /* generalcategory=spacingmark */, + { 20, 6737, 2665, 13, 3, UNI_JG__HEH } /* joininggroup=heh */, + { 0, 1141, 63, 4, 4, UNI_CPMN } /* scx=cpmn */, + { 0, 4942, 2757, 14, 8, UNI_NV__3_SLASH_5 } /* numericvalue=6.000e-01 */, + { 0, 404, 6993, 3, 8, UNI_LO } /* otherletter */, + { 0, 7957, 658, 18, 4, UNI_EA__F } /* decompositiontype=wide */, + { 1, 6464, 1339, 3, 7, UNI_SC__TIRH } /* sc=tirhuta */, + { 1, 2858, 65, 3, 2, UNI_MN } /* gc=mn */, + { 0, 4999, 638, 9, 3, UNI_XPOSIXSPACE } /* whitespace=t */, + { 0, 333, 906, 2, 7, UNI_INTIBETAN } /* intibetan */, + { 0, 6243, 8978, 3, 18, UNI_VO__TU } /* vo=transformedupright */, + { 18, 30, 877, 1, 5, UNI_TERM } /* isterm */, + { 0, 1112, 1392, 5, 2, UNI_NV__1_SLASH_20 } /* nv=1/20 */, + { 1, 2844, 383, 14, 2, UNI_ECOMP } /* emojicomponent=y */, + { 1, 2325, 2215, 7, 5, UNI_NV__1_SLASH_12 } /* nv=8.333e-02 */, + { 1, 1141, 1156, 4, 4, UNI_TAGB } /* scx=tagb */, + { 2, 1911, 43, 7, 4, UNI_SC__BUHD } /* script=buhd */, + { 2, 3453, 0, 6, 0, UNI_HEBR } /* hebrew */, + { 26, 135, 2625, 2, 10, UNI_POSIXBLANK } /* isposixblank */, + { 22, 4999, 638, 9, 6, UNI_XPOSIXSPACE } /* whitespace=true */, + { 0, 2912, 6492, 8, 12, UNI_CYRILLICSUP } /* iscyrillicsupplement */, + { 1, 135, 185, 2, 4, UNI_COPT } /* isqaac */, + { 0, 1042, 0, 4, 0, UNI_LYCI } /* lyci */, + { 24, 2596, 639, 11, 5, UNI_JOINC } /* joincontrol=true */, + { 3, 6164, 2132, 10, 2, UNI_HST__V } /* linebreak=jv */, + { 0, 135, 368, 2, 2, UNI_XPOSIXCNTRL } /* iscc */, + { 4, 3213, 972, 8, 6, -UNI_XPOSIXXDIGIT } /* hexdigit=false */, + { 2, 34, 1460, 1, 3, UNI_THAA } /* thaa */, + { 2, 368, 120, 4, 2, UNI_CCC__DA } /* ccc=da */, + { 0, 33, 507, 1, 3, UNI_SIDT } /* sidt */, + { 0, 1471, 652, 3, 3, -UNI_IDST } /* idst=n */, + { 0, 3991, 1119, 14, 3, UNI_NV__5_SLASH_12 } /* numericvalue=5/12 */, + { 4, 7126, 972, 25, 2, -UNI_CWKCF } /* changeswhennfkccasefolded=f */, + { 0, 135, 762, 2, 7, UNI_KNDA } /* iskannada */, + { 0, 1084, 2677, 6, 3, UNI_KEHCORE__N } /* kehcore=n */, + { 0, 7322, 3641, 24, 12, UNI_CCC__0 } /* canonicalcombiningclass=notreordered */, + { 5, 1810, 7854, 6, 20, UNI_ARABICPFA } /* isarabicpresentationformsa */, + { 0, 135, 3215, 2, 6, UNI_XPOSIXXDIGIT } /* isxdigit */, + { 0, 135, 3673, 2, 9, UNI_Z } /* isseparator */, + { 8, 6462, 5939, 6, 15, UNI_INSC__CANTILLATIONMARK } /* insc=cantillationmark */, + { 2, 625, 586, 3, 4, UNI_AVST } /* avestan */, + { 14, 3903, 3578, 3, 4, UNI_LB__GL } /* lb=glue */, + { 1, 2021, 0, 5, 0, UNI_XPOSIXGRAPH } /* graph */, + { 16, 6464, 122, 3, 4, UNI_KRAI } /* sc=krai */, + { 2, 4586, 3590, 17, 15, UNI_ZANB } /* scriptextensions=zanabazarsquare */, + { 2, 933, 812, 5, 2, UNI_AGE__2_DOT_1 } /* age=v21 */, + { 9, 4051, 653, 16, 3, -UNI_STERM } /* sentenceterminal=no */, + { 0, 914, 653, 4, 2, -UNI_IDEO } /* ideo=n */, + { 0, 3764, 217, 9, 2, UNI_LATINEXTF } /* inlatinextf */, + { 0, 3521, 804, 13, 3, UNI_NV__1_SLASH_2 } /* numericvalue=1/2 */, + { 9, 1911, 201, 7, 4, UNI_SGNW } /* script=sgnw */, + { 2, 695, 1232, 3, 3, UNI_HST__NA } /* hst=na */, + { 67, 4586, 2033, 17, 12, UNI_GONG } /* scriptextensions=gunjalagondi */, + { 1, 6543, 0, 13, 0, UNI_M } /* combiningmark */, + { 2, 2429, 7086, 6, 21, UNI_MEETEIMAYEKEXT } /* block=meeteimayekextensions */, + { 6, 135, 1283, 2, 4, UNI_KANA } /* iskana */, + { 1, 5845, 180, 21, 2, UNI_GCB__PP } /* graphemeclusterbreak=pp */, + { 0, 316, 1392, 3, 2, UNI_NV__20 } /* nv=20 */, + { 65, 293, 4731, 2, 16, UNI_UPPERCASELETTER } /* gc=uppercaseletter */, + { 0, 566, 638, 2, 6, UNI_LOE } /* loe=true */, + { 1, 5845, 3587, 21, 3, UNI_LB__ZWJ } /* graphemeclusterbreak=zwj */, + { 5, 777, 6060, 3, 18, UNI_ENCLOSEDALPHANUMSUP } /* inenclosedalphanumsup */, + { 16, 554, 4035, 5, 2, UNI_NV__3_SLASH_80 } /* nv=3/80 */, + { 0, 1911, 1377, 7, 9, UNI_TALU } /* script=newtailue */, + { 0, 2635, 2645, 3, 3, UNI_JG__FEH } /* jg=feh */, + { 1, 6464, 2088, 3, 6, UNI_SC__SYRC } /* sc=syriac */, + { 2, 3208, 1916, 12, 3, UNI_POSIXXDIGIT } /* asciihexdigit=t */, + { 1, 6737, 2967, 13, 11, UNI_JG__ROHINGYAYEH } /* joininggroup=rohingyayeh */, + { 4, 333, 1396, 2, 9, UNI_INOLDITALIC } /* inolditalic */, + { 12, 1423, 0, 9, 0, UNI_OUGR } /* olduyghur */, + { 1, 1733, 6399, 4, 22, UNI_DIACRITICALSFORSYMBOLS } /* blk=diacriticalsforsymbols */, + { 0, 6342, 6421, 7, 21, UNI_EARLYDYNASTICCUNEIFORM } /* block=earlydynasticcuneiform */, + { 10, 135, 409, 2, 5, UNI_GREXT } /* isgrext */, + { 0, 3903, 3092, 3, 6, UNI_LB__VI } /* lb=virama */, + { 0, 1911, 1789, 7, 11, UNI_SC__GUKH } /* script=gurungkhema */, + { 8, 8366, 83, 29, 3, UNI_CJKEXTG } /* iscjkunifiedideographsextensiong */, + { 0, 1733, 6433, 4, 9, UNI_INCUNEIFORM } /* blk=cuneiform */, + { 0, 4586, 1875, 18, 10, UNI_MEDF } /* scriptextensions=medefaidrin */, + { 16, 6737, 2658, 13, 10, UNI_JG__KNOTTEDHEH } /* joininggroup=knottedheh */, + { 5, 135, 23, 2, 4, UNI_AHOM } /* isahom */, + { 0, 3903, 9, 3, 2, UNI_LB__CR } /* lb=cr */, + { 13, 1523, 972, 3, 6, -UNI_DEP } /* dep=false */, + { 0, 8233, 566, 9, 2, UNI_LO } /* category=lo */, + { 0, 7509, 5564, 5, 17, UNI_SMALLKANAEXT } /* blk=smallkanaextension */, + { 0, 38, 1604, 1, 3, UNI_KHAR } /* khar */, + { 5, 6201, 8961, 19, 3, UNI_nchar_values_index } /* noncharactercodepoint= */, + { 0, 3950, 653, 4, 2, -UNI_MATH } /* math=n */, + { 2, 1911, 762, 7, 7, UNI_SC__KNDA } /* script=kannada */, + { 1, 1547, 382, 4, 3, UNI_XPOSIXSPACE } /* space=y */, + { 2, 135, 6952, 2, 4, UNI_BRAH } /* isbrah */, + { 1, 8639, 5463, 24, 15, UNI_LOE } /* indicpositionalcategory=visualorderleft */, + { 2, 5782, 653, 21, 3, -UNI_CWL } /* changeswhenlowercased=no */, + { 3, 6464, 15, 3, 4, UNI_SC__AGHB } /* sc=aghb */, + { 0, 6464, 286, 3, 4, UNI_SC__GARA } /* sc=gara */, + { 18, 878, 972, 4, 6, -UNI_TERM } /* term=false */, + { 0, 6535, 639, 21, 5, UNI_MCM } /* modifiercombiningmark=true */, + { 5, 8226, 6824, 16, 10, UNI_CO } /* generalcategory=privateuse */, + { 1, 102, 0, 4, 0, UNI_HMNG } /* hmng */, + { 1, 368, 613, 5, 2, UNI_CCC__107 } /* ccc=107 */, + { 0, 3950, 639, 4, 5, UNI_MATH } /* math=true */, + { 2, 6462, 7832, 14, 15, UNI_INSC__CONSONANTSUCCEEDINGREPHA } /* insc=consonantsucceedingrepha */, + { 1, 5371, 81, 13, 2, UNI_LATINEXTG } /* block=latinextg */, + { 0, 4732, 639, 5, 2, UNI_XPOSIXUPPER } /* upper=t */, + { 0, 3257, 5921, 5, 18, UNI_SC__MERO } /* blk=meroitichieroglyphs */, + { 2, 7322, 1213, 24, 5, UNI_CCC__7 } /* canonicalcombiningclass=nukta */, + { 9, 3116, 6556, 11, 3, UNI_NT__NU } /* numerictype=nu */, + { 0, 1911, 78, 7, 4, UNI_DSRT } /* script=dsrt */, + { 0, 4586, 1603, 17, 4, UNI_KHAR } /* scriptextensions=khar */, + { 37, 1733, 2944, 4, 12, UNI_MAHJONG } /* blk=mahjongtiles */, + { 0, 6462, 3384, 14, 6, UNI_INSC__CONSONANTKILLER } /* insc=consonantkiller */, + { 1, 1911, 82, 7, 4, UNI_SC__GONG } /* script=gong */, + { 16, 3903, 2128, 3, 2, UNI_LB__BK } /* lb=bk */, + { 5, 1810, 5115, 3, 9, UNI_ALCHEMICAL } /* isalchemical */, + { 3, 4290, 0, 8, 0, UNI_VEDICEXT } /* vedicext */, + { 6, 797, 1887, 3, 4, UNI_nfkcqc_values_index } /* nfkcqc= */, + { 0, 3808, 2719, 3, 12, UNI_LOWSURROGATES } /* islowsurrogates */, + { 0, 2429, 7107, 6, 19, UNI_DEVANAGARIEXTA } /* block=devanagariextendeda */, + { 5, 1733, 3141, 4, 14, UNI_INPSALTERPAHLAVI } /* blk=psalterpahlavi */, + { 0, 2373, 2756, 10, 3, UNI_IN__5 } /* presentin=5.0 */, + { 0, 6243, 6257, 3, 7, UNI_VO__R } /* vo=rotated */, + { 20, 5131, 3565, 18, 7, UNI_INCB__EXTEND } /* indicconjunctbreak=extend */, + { 0, 1781, 9, 3, 2, UNI_OCR } /* isocr */, + { 17, 1733, 5043, 4, 5, UNI_INBAMUM } /* blk=bamum */, + { 0, 4350, 383, 5, 2, UNI_XPOSIXLOWER } /* lower=y */, + { 16, 4248, 0, 4, 0, UNI_SIND } /* sind */, + { 0, 4305, 639, 4, 2, UNI_DASH } /* dash=t */, + { 0, 135, 6642, 2, 19, UNI_JAMOEXTB } /* ishanguljamoextendedb */, + { 4, 6039, 6382, 5, 13, UNI_SUPMATHOPERATORS } /* insupmathoperators */, + { 4, 6464, 3653, 3, 7, UNI_SC__CPRT } /* sc=cypriot */, + { 0, 2406, 972, 4, 2, -UNI_XIDC } /* xidc=f */, + { 2, 7322, 312, 25, 2, UNI_CCC__A } /* canonicalcombiningclass=230 */, + { 6, 7509, 8808, 16, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* blk=supplementalsymbolsandpictographs */, + { 0, 9030, 882, 10, 3, UNI_SUPPUAA } /* block=suppuaa */, + { 5, 7509, 1336, 8, 3, UNI_SUPPUAB } /* blk=suppuab */, + { 0, 6464, 98, 3, 4, UNI_HLUW } /* sc=hluw */, + { 37, 7957, 400, 18, 3, UNI_DT__SQR } /* decompositiontype=sqr */, + { 0, 1911, 2534, 7, 11, UNI_SC__NAND } /* script=nandinagari */, + { 0, 3136, 4020, 4, 2, UNI_IN__7 } /* in=v70 */, + { 0, 2429, 81, 11, 2, UNI_CJKEXTG } /* block=cjkextg */, + { 1, 4406, 5216, 13, 6, UNI_JG__MANICHAEANLAMEDH } /* jg=manichaeanlamedh */, + { 0, 1911, 712, 7, 5, UNI_SC__DOGR } /* script=dogra */, + { 0, 5890, 0, 5, 0, UNI_GREK } /* greek */, + { 0, 7804, 374, 27, 2, UNI_CCC__31 } /* canonicalcombiningclass=ccc31 */, + { 0, 135, 1164, 2, 8, UNI_TFNG } /* istifinagh */, + { 9, 5306, 3587, 10, 3, UNI_LB__ZWJ } /* wordbreak=zwj */, + { 7, 2429, 6527, 8, 8, UNI_CJKSYMBOLS } /* block=cjksymbols */, + { 0, 925, 2292, 4, 3, UNI_AGE__2 } /* age=2.0 */, + { 6, 3629, 3949, 11, 5, UNI_ARABICMATH } /* block=arabicmath */, + { 3, 1733, 1622, 4, 10, UNI_INNAGMUNDARI } /* blk=nagmundari */, + { 1, 30, 1268, 1, 5, UNI_INTHAI } /* inthai */, + { 19, 4037, 1388, 14, 2, UNI_NV__900 } /* numericvalue=900 */, + { 2, 1522, 383, 2, 2, UNI_SD } /* sd=y */, + { 3, 2380, 414, 3, 3, UNI_IN__3_DOT_2 } /* in=3.2 */, + { 2, 2932, 0, 5, 0, UNI_KHMR } /* khmer */, + { 1, 1346, 5547, 3, 7, UNI_CHER } /* ischerokee */, + { 2, 1733, 2349, 4, 12, UNI_PHAISTOS } /* blk=phaistosdisc */, + { 2, 574, 2090, 2, 4, UNI_SYRC } /* syriac */, + { 1, 135, 3331, 2, 14, UNI_GREXT } /* isgraphemeextend */, + { 3, 2429, 6797, 6, 13, UNI_ZNAMENNYMUSIC } /* block=znamennymusic */, + { 2, 8226, 2083, 16, 2, UNI_PO } /* generalcategory=po */, + { 39, 154, 0, 4, 0, UNI_NARB } /* narb */, + { 2, 2406, 638, 10, 3, UNI_XIDC } /* xidcontinue=t */, + { 1, 4202, 972, 17, 2, -UNI_IDSB } /* idsbinaryoperator=f */, + { 16, 2429, 2561, 6, 6, UNI_IPAEXT } /* block=ipaext */, + { 18, 135, 847, 2, 4, UNI_SARB } /* issarb */, + { 8, 474, 0, 4, 0, UNI_ONAO } /* onao */, + { 0, 135, 462, 2, 3, UNI_NKO } /* isnko */, + { 0, 1470, 639, 4, 5, UNI_XIDS } /* xids=true */, + { 0, 2429, 8930, 9, 33, UNI_CJKCOMPATIDEOGRAPHSSUP } /* block=cjkcompatibilityideographssupplement */, + { 3, 8732, 5407, 32, 4, UNI_CJKEXTE } /* block=cjkunifiedideographsextensione */, + { 1, 2635, 2088, 3, 9, UNI_JG__SYRIACWAW } /* jg=syriacwaw */, + { 1, 651, 0, 3, 0, UNI_dt_values_index } /* dt= */, + { 1, 6464, 3453, 3, 4, UNI_SC__HEBR } /* sc=hebr */, + { 0, 3808, 643, 13, 3, UNI_LATINEXTE } /* islatinextendede */, + { 3, 135, 914, 2, 4, UNI_IDEO } /* isideo */, + { 10, 2912, 4822, 10, 9, UNI_CYRILLICEXTC } /* iscyrillicextendedc */, + { 1, 6464, 346, 3, 4, UNI_SC__TAKR } /* sc=takr */, + { 18, 4097, 0, 17, 0, UNI_AGHB } /* caucasianalbanian */, + { 8, 3903, 333, 3, 2, UNI_LB__IN } /* lb=in */, + { 0, 30, 4304, 1, 16, UNI_PD } /* isdashpunctuation */, + { 2, 5, 383, 3, 2, UNI_MCM } /* mcm=y */, + { 13, 6369, 6907, 7, 21, UNI_MISCTECHNICAL } /* block=miscellaneoustechnical */, + { 11, 6462, 0, 5, 0, UNI_insc_values_index } /* insc= */, + { 5, 732, 0, 5, 0, UNI_RUNR } /* runic */, + { 3, 3136, 1392, 5, 2, UNI_IN__12 } /* in=v120 */, + { 1, 32, 972, 2, 2, -UNI_VS } /* vs=f */, + { 0, 978, 1143, 5, 2, UNI_compex_values_index } /* compex= */, + { 1, 6442, 638, 19, 6, UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=true */, + { 0, 6201, 652, 20, 3, -UNI__PERL_NCHAR } /* noncharactercodepoint=n */, + { 0, 2596, 972, 11, 6, -UNI_JOINC } /* joincontrol=false */, + { 0, 6203, 0, 5, 0, UNI__PERL_NCHAR } /* nchar */, + { 0, 7978, 1232, 18, 3, UNI_HST__NA } /* hangulsyllabletype=na */, + { 8, 2622, 2021, 8, 5, UNI_XPOSIXGRAPH } /* isxposixgraph */, + { 0, 925, 611, 4, 3, UNI_AGE__6 } /* age=6.0 */, + { 21, 6462, 5493, 5, 15, UNI_INSC__REGISTERSHIFTER } /* insc=registershifter */, + { 0, 3477, 0, 15, 0, UNI_MERC } /* meroiticcursive */, + { 2, 2527, 4822, 7, 9, UNI_MYANMAREXTC } /* myanmarextendedc */, + { 1, 2596, 0, 5, 0, UNI_JOINC } /* joinc */, + { 16, 333, 1200, 2, 9, UNI_INBHAIKSUKI } /* inbhaiksuki */, + { 33, 2429, 7776, 6, 28, UNI_SUPPUAA } /* block=supplementaryprivateuseareaa */, + { 10, 5845, 4666, 19, 3, UNI_GCB__L } /* graphemeclusterbreak=l */, + { 20, 4586, 1329, 17, 4, UNI_SUNU } /* scriptextensions=sunu */, + { 0, 1141, 1789, 4, 11, UNI_GUKH } /* scx=gurungkhema */, + { 4, 3506, 653, 13, 3, UNI_DT__CAN } /* nfdquickcheck=no */, + { 19, 4586, 1030, 17, 6, UNI_KTHI } /* scriptextensions=kaithi */, + { 0, 7804, 2190, 28, 2, UNI_CCC__129 } /* canonicalcombiningclass=ccc129 */, + { 0, 1678, 383, 10, 2, UNI_SD } /* softdotted=y */, + { 25, 3521, 1391, 14, 5, UNI_NV__432000 } /* numericvalue=432000 */, + { 2, 8639, 6939, 24, 13, UNI_INPC__BOTTOMANDLEFT } /* indicpositionalcategory=bottomandleft */, + { 0, 1346, 6692, 5, 18, UNI_CJKCOMPATFORMS } /* iscjkcompatibilityforms */, + { 0, 8283, 383, 16, 2, UNI_UIDEO } /* unifiedideograph=y */, + { 10, 1408, 0, 4, 0, UNI_PERM } /* perm */, + { 1, 1590, 538, 3, 3, UNI_KHOJ } /* iskhoj */, + { 0, 6464, 1405, 3, 9, UNI_SC__PERM } /* sc=oldpermic */, + { 1, 3976, 810, 14, 3, UNI_NV__15_SLASH_2 } /* numericvalue=15/2 */, + { 16, 1733, 6867, 7, 16, UNI_CJKCOMPATIDEOGRAPHS } /* blk=cjkcompatideographs */, + { 5, 5606, 383, 6, 4, UNI_HYPHEN } /* hyphen=yes */, + { 8, 135, 4747, 2, 18, UNI_IDST } /* isidstrinaryoperator */, + { 2, 2429, 6805, 6, 5, UNI_MUSIC } /* block=music */, + { 2, 135, 899, 2, 7, UNI_TAVT } /* istaiviet */, + { 1, 7804, 636, 27, 2, UNI_CCC__22 } /* canonicalcombiningclass=ccc22 */, + { 3, 21, 1916, 2, 3, UNI_EXT } /* ext=t */, + { 0, 1733, 3550, 4, 15, UNI_SARB } /* blk=oldsoutharabian */, + { 31, 333, 8061, 2, 19, UNI_INEGYPTIANHIEROGLYPHS } /* inegyptianhieroglyphs */, + { 3, 6464, 1294, 3, 4, UNI_SC__MULT } /* sc=mult */, + { 0, 1141, 1030, 4, 6, UNI_KTHI } /* scx=kaithi */, + { 5, 5429, 0, 18, 0, UNI_HALFMARKS } /* combininghalfmarks */, + { 42, 6737, 2978, 13, 11, UNI_JG__STRAIGHTWAW } /* joininggroup=straightwaw */, + { 22, 7445, 383, 26, 2, UNI_PCM } /* prependedconcatenationmark=y */, + { 1, 878, 653, 4, 3, -UNI_TERM } /* term=no */, + { 0, 6164, 4569, 10, 17, UNI_RI } /* linebreak=regionalindicator */, + { 2, 1141, 430, 4, 4, UNI_TOTO } /* scx=toto */, + { 7, 2525, 2743, 3, 12, UNI_MISCTECHNICAL } /* inmisctechnical */, + { 0, 353, 5299, 3, 7, UNI_SUPARROWSA } /* suparrowsa */, + { 2, 3129, 314, 11, 2, UNI_IN__4 } /* presentin=v40 */, + { 3, 2810, 8147, 3, 21, UNI_BC__PDI } /* bc=popdirectionalisolate */, + { 2, 2429, 669, 6, 7, UNI_INELYMAIC } /* block=elymaic */, + { 4, 6203, 639, 5, 5, UNI__PERL_NCHAR } /* nchar=true */, + { 0, 1733, 7789, 4, 14, UNI_PUA } /* blk=privateusearea */, + { 1, 1303, 1028, 2, 3, UNI_XPOSIXBLANK } /* blank */, + { 0, 1141, 1287, 4, 7, UNI_MAKA } /* scx=makasar */, + { 28, 2429, 1339, 6, 7, UNI_INTIRHUTA } /* block=tirhuta */, + { 34, 118, 0, 4, 0, UNI_KNDA } /* knda */, + { 0, 1733, 1070, 7, 4, UNI_CJKEXTB } /* blk=cjkextb */, + { 1, 4586, 768, 18, 3, UNI_MAKA } /* scriptextensions=maka */, + { 0, 6464, 446, 3, 3, UNI_SC__HAN } /* sc=han */, + { 78, 8233, 4765, 9, 18, UNI_PI } /* category=initialpunctuation */, + { 3, 54, 4408, 2, 11, UNI_SC__MANI } /* sc=manichaean */, + { 0, 135, 5, 2, 3, UNI_MCM } /* ismcm */, + { 5, 3976, 2196, 14, 8, UNI_NV__3_SLASH_2 } /* numericvalue=1.500e+00 */, + { 0, 1141, 8061, 4, 4, UNI_EGYP } /* scx=egyp */, + { 1, 4586, 662, 17, 7, UNI_ELBA } /* scriptextensions=elbasan */, + { 1, 4586, 15, 17, 4, UNI_AGHB } /* scriptextensions=aghb */, + { 0, 2635, 1198, 3, 2, UNI_JG__FE } /* jg=fe */, + { 0, 2635, 525, 3, 3, UNI_JG__GAF } /* jg=gaf */, + { 9, 4586, 1632, 17, 10, UNI_XPEO } /* scriptextensions=oldpersian */, + { 5, 2429, 2071, 6, 10, UNI_YIRADICALS } /* block=yiradicals */, + { 0, 4007, 1388, 14, 3, UNI_NV__7000 } /* numericvalue=7000 */, + { 2, 2429, 5073, 6, 15, UNI_TAMILSUP } /* block=tamilsupplement */, + { 0, 8089, 653, 17, 2, -UNI_VS } /* variationselector=n */, + { 2, 341, 740, 3, 2, UNI_TAYO } /* taiyo */, + { 3, 7126, 639, 25, 5, UNI_CWKCF } /* changeswhennfkccasefolded=true */, + { 5, 2624, 269, 6, 5, UNI_XPOSIXCNTRL } /* xposixcntrl */, + { 8, 1465, 305, 3, 2, UNI_WB__XX } /* wb=xx */, + { 0, 7151, 972, 25, 2, -UNI_DI } /* defaultignorablecodepoint=f */, + { 6, 1810, 0, 8, 0, UNI_ARAB } /* isarabic */, + { 1, 2858, 4144, 3, 14, UNI_SK } /* gc=modifiersymbol */, + { 0, 2506, 0, 10, 0, UNI_INETHIOPIC } /* inethiopic */, + { 0, 1678, 972, 10, 6, -UNI_SD } /* softdotted=false */, + { 2, 368, 419, 4, 2, UNI_CCC__34 } /* ccc=34 */, + { 1, 6164, 6543, 10, 13, UNI_LB__CM } /* linebreak=combiningmark */, + { 1, 8226, 4309, 16, 5, UNI_P } /* generalcategory=punct */, + { 0, 2407, 971, 9, 7, -UNI_IDC } /* idcontinue=false */, + { 0, 1141, 4814, 4, 8, UNI_BOPO } /* scx=bopomofo */, + { 2, 566, 2677, 2, 3, -UNI_LOE } /* loe=n */, + { 3, 518, 0, 4, 0, UNI_VAI } /* vaii */, + { 40, 4664, 1573, 9, 4, UNI_LATINEXTA } /* blk=latinexta */, + { 0, 1254, 8829, 3, 34, UNI_DIACRITICALSFORSYMBOLS } /* incombiningdiacriticalmarksforsymbols */, + { 0, 4586, 261, 17, 4, UNI_ZYYY } /* scriptextensions=zyyy */, + { 22, 1911, 5194, 7, 4, UNI_SC__HAN } /* script=hani */, + { 4, 3976, 422, 15, 1, UNI_NV__1_SLASH_5 } /* numericvalue=1/5 */, + { 2, 1982, 972, 5, 2, -UNI_BIDIM } /* bidim=f */, + { 4, 333, 8535, 2, 32, UNI_IDEOGRAPHICSYMBOLS } /* inideographicsymbolsandpunctuation */, + { 34, 6164, 18, 10, 2, UNI_LB__BA } /* linebreak=ba */, + { 2, 6464, 1603, 3, 4, UNI_KHAR } /* sc=khar */, + { 3, 333, 32, 2, 2, UNI_INVS } /* invs */, + { 1, 368, 2382, 3, 3, UNI_CCC__14 } /* ccc=14 */, + { 1, 2635, 1839, 3, 8, UNI_JG__SWASHKAF } /* jg=swashkaf */, + { 0, 6557, 0, 14, 0, UNI_NV__2 } /* numericvalue=2 */, + { 0, 3208, 652, 12, 2, UNI_ahex_values_index } /* asciihexdigit= */, + { 0, 6484, 0, 10, 0, UNI_GLAG } /* glagolitic */, + { 0, 2453, 382, 12, 2, UNI_ci_values_index } /* caseignorable= */, + { 6, 2824, 5336, 5, 19, UNI_INANATOLIANHIEROGLYPHS } /* blk=anatolianhieroglyphs */, + { 4, 7509, 4309, 7, 11, UNI_SUPPUNCTUATION } /* blk=suppunctuation */, + { 1, 1112, 2212, 4, 8, UNI_NV__1_SLASH_64 } /* nv=1.563e-02 */, + { 4, 1911, 110, 7, 4, UNI_KAWI } /* script=kawi */, + { 20, 3903, 2096, 3, 2, UNI_LB__WJ } /* lb=wj */, + { 10, 341, 0, 5, 0, UNI_TALE } /* taile */, + { 1, 135, 984, 2, 8, UNI_DUPL } /* isduployan */, + { 4, 4406, 4423, 13, 4, UNI_JG__MANICHAEANQOPH } /* jg=manichaeanqoph */, + { 0, 8246, 0, 32, 0, UNI_INIDC } /* ideographicdescriptioncharacters */, + { 1, 2858, 510, 3, 2, UNI_SO } /* gc=so */, + { 2, 566, 382, 2, 5, UNI_LOE } /* loe=yes */, + { 5, 8278, 83, 29, 3, UNI_CJKEXTG } /* incjkunifiedideographsextensiong */, + { 11, 135, 355, 2, 2, UNI_PF } /* ispf */, + { 5, 6464, 6116, 3, 4, UNI_SUND } /* sc=sund */, + { 6, 6464, 0, 3, 0, UNI_sc_values_index } /* sc= */, + { 0, 2429, 2522, 9, 4, UNI_CJKEXTI } /* block=cjkexti */, + { 0, 1911, 1180, 7, 8, UNI_VITH } /* script=vithkuqi */, + { 0, 1733, 593, 4, 6, UNI_INTODHRI } /* blk=todhri */, + { 0, 1562, 6103, 5, 13, UNI_GEORGIANSUP } /* georgiansupplement */, + { 1, 6464, 518, 3, 4, UNI_VAI } /* sc=vaii */, + { 2, 30, 4782, 1, 17, UNI_LINEARBSYLLABARY } /* inlinearbsyllabary */, + { 0, 651, 1938, 3, 3, UNI_DT__SUB } /* dt=sub */, + { 19, 2429, 7297, 6, 25, UNI_SUPERANDSUB } /* block=superscriptsandsubscripts */, + { 1, 1141, 5920, 4, 19, UNI_MERO } /* scx=meroitichieroglyphs */, + { 0, 5648, 0, 19, 0, UNI_TERM } /* terminalpunctuation */, + { 33, 7322, 423, 25, 2, UNI_CCC__216 } /* canonicalcombiningclass=216 */, + { 7, 963, 652, 2, 3, UNI_BPT__N } /* bpt=n */, + { 9, 587, 5359, 4, 5, UNI_TANGUTSUP } /* tangutsup */, + { 0, 8961, 644, 3, 2, UNI_XPOSIXDIGIT } /* nt=de */, + { 7, 293, 3587, 4, 3, UNI_LB__ZWJ } /* gcb=zwj */, + { 12, 1141, 702, 4, 5, UNI_ADLM } /* scx=adlam */, + { 0, 4586, 5194, 17, 4, UNI_HAN } /* scriptextensions=hani */, + { 1, 9087, 7288, 35, 9, UNI_UCASEXT } /* isunifiedcanadianaboriginalsyllabicsextended */, + { 7, 135, 8000, 2, 28, UNI_PHONETICEXTSUP } /* isphoneticextensionssupplement */, + { 0, 2429, 2010, 7, 11, UNI_CHESSSYMBOLS } /* block=chesssymbols */, + { 5, 1258, 1516, 5, 7, UNI_CJKSTROKES } /* incjkstrokes */, + { 0, 5306, 3565, 9, 7, UNI_WB__EXTEND } /* wordbreak=extend */, + { 7, 2429, 7760, 6, 16, UNI_TANGUTCOMPONENTS } /* block=tangutcomponents */, + { 3, 11, 5884, 1, 18, UNI_ANCIENTGREEKNUMBERS } /* ancientgreeknumbers */, + { 4, 3257, 3836, 5, 10, UNI_MISCSYMBOLS } /* blk=miscsymbols */, + { 11, 135, 494, 2, 4, UNI_QAAI } /* isqaai */, + { 31, 2506, 6088, 10, 9, UNI_ETHIOPICEXTA } /* inethiopicextendeda */, + { 4, 135, 2134, 2, 12, UNI_GONM } /* ismasaramgondi */, + { 0, 6164, 599, 10, 2, UNI_EBASE } /* linebreak=eb */, + { 0, 4586, 593, 17, 6, UNI_TODR } /* scriptextensions=todhri */, + { 34, 1733, 1269, 4, 4, UNI_INTHAI } /* blk=thai */, + { 4, 135, 6543, 2, 13, UNI_M } /* iscombiningmark */, + { 3, 2313, 2220, 4, 8, UNI_NV__2_SLASH_3 } /* nv=6.667e-01 */, + { 1, 3991, 5612, 14, 4, UNI_NV__50000 } /* numericvalue=50000 */, + { 6, 4586, 790, 17, 7, UNI_MARC } /* scriptextensions=marchen */, + { 0, 8089, 639, 17, 5, UNI_VS } /* variationselector=true */, + { 5, 135, 1294, 2, 7, UNI_MULT } /* ismultani */, + { 0, 8233, 653, 8, 3, UNI_NO } /* category=no */, + { 33, 571, 653, 6, 3, -UNI_PATSYN } /* patsyn=no */, + { 1, 4144, 0, 14, 0, UNI_SK } /* modifiersymbol */, + { 2, 5088, 2516, 8, 9, UNI_KATAKANAEXT } /* block=katakanaext */, + { 9, 135, 5043, 2, 15, UNI_BAMUMSUP } /* isbamumsupplement */, + { 4, 3903, 108, 3, 2, UNI_GCB__T } /* lb=jt */, + { 1, 6464, 90, 3, 4, UNI_SC__GUJR } /* sc=gujr */, + { 65, 2932, 2014, 5, 7, UNI_KHMERSYMBOLS } /* khmersymbols */, + { 1, 663, 6556, 2, 3, UNI_LB__NU } /* lb=nu */, + { 0, 135, 8167, 2, 29, UNI_ENCLOSEDIDEOGRAPHICSUP } /* isenclosedideographicsupplement */, + { 1, 1522, 383, 2, 4, UNI_SD } /* sd=yes */, + { 8, 1733, 1090, 4, 8, UNI_INKIRATRAI } /* blk=kiratrai */, + { 0, 2525, 7929, 3, 28, UNI_MISCARROWS } /* inmiscellaneoussymbolsandarrows */, + { 0, 3521, 2181, 13, 2, UNI_NV__25 } /* numericvalue=25 */, + { 1, 293, 180, 4, 2, UNI_GCB__PP } /* gcb=pp */, + { 9, 1971, 639, 11, 2, UNI_BIDIC } /* bidicontrol=t */, + { 1, 4586, 4144, 17, 4, UNI_MODI } /* scriptextensions=modi */, + { 33, 7396, 0, 26, 0, UNI_ARABICPFB } /* inarabicpresentationformsb */, + { 9, 54, 4408, 2, 5, UNI_SC__MANI } /* sc=mani */, + { 0, 135, 8336, 2, 20, UNI_MISCSYMBOLS } /* ismiscellaneoussymbols */, + { 0, 6135, 6149, 5, 7, UNI_SUPARROWSC } /* issuparrowsc */, + { 1, 4586, 1156, 17, 8, UNI_TAGB } /* scriptextensions=tagbanwa */, + { 2, 8226, 566, 16, 2, UNI_LO } /* generalcategory=lo */, + { 0, 6464, 732, 3, 5, UNI_SC__RUNR } /* sc=runic */, + { 0, 2635, 2008, 3, 3, UNI_JG__TAH } /* jg=tah */, + { 0, 5131, 6466, 18, 10, UNI_INCB__CONSONANT } /* indicconjunctbreak=consonant */, + { 2, 92, 1916, 1, 3, UNI_JT__T } /* jt=t */, + { 0, 977, 0, 5, 0, UNI_ECOMP } /* ecomp */, + { 1, 1911, 341, 7, 5, UNI_SC__TALE } /* script=taile */, + { 0, 455, 2892, 3, 11, UNI_ALPHABETICPF } /* inalphabeticpf */, + { 5, 2273, 5612, 4, 5, UNI_NV__400000 } /* nv=400000 */, + { 4, 2097, 370, 4, 2, UNI_joinc_values_index } /* joinc= */, + { 34, 8226, 355, 16, 2, UNI_PF } /* generalcategory=pf */, + { 0, 92, 652, 1, 2, UNI_jt_values_index } /* jt= */, + { 0, 6464, 225, 3, 4, UNI_SC__TIBT } /* sc=tibt */, + { 1, 7322, 1209, 25, 2, UNI_CCC__L } /* canonicalcombiningclass=224 */, + { 1, 2429, 1423, 6, 9, UNI_INOLDUYGHUR } /* block=olduyghur */, + { 3, 1678, 972, 10, 2, -UNI_SD } /* softdotted=f */, + { 0, 2429, 6867, 9, 16, UNI_CJKCOMPATIDEOGRAPHS } /* block=cjkcompatideographs */, + { 8, 1141, 114, 4, 4, UNI_KITS } /* scx=kits */, + { 0, 2810, 3221, 3, 12, UNI_BC__AL } /* bc=arabicletter */, + { 7, 1470, 972, 4, 6, -UNI_XIDS } /* xids=false */, + { 4, 878, 653, 4, 2, -UNI_TERM } /* term=n */, + { 0, 6464, 518, 3, 3, UNI_VAI } /* sc=vai */, + { 1, 6164, 2119, 10, 9, UNI_LB__B2 } /* linebreak=breakboth */, + { 2, 6464, 265, 3, 4, UNI_ZZZZ } /* sc=zzzz */, + { 0, 8765, 4278, 22, 12, UNI_INSC__NUMBERJOINER } /* indicsyllabiccategory=numberjoiner */, + { 8, 3208, 972, 13, 6, -UNI_POSIXXDIGIT } /* asciihexdigit=false */, + { 0, 1396, 0, 9, 0, UNI_ITAL } /* olditalic */, + { 3, 2429, 4814, 6, 11, UNI_BOPOMOFOEXT } /* block=bopomofoext */, + { 98, 933, 424, 5, 2, UNI_AGE__6_DOT_1 } /* age=v61 */, + { 3, 6464, 6484, 3, 10, UNI_SC__GLAG } /* sc=glagolitic */, + { 1, 2525, 8196, 3, 30, UNI_MATHALPHANUM } /* inmathematicalalphanumericsymbols */, + { 21, 3976, 1391, 15, 2, UNI_NV__1_SLASH_32 } /* numericvalue=1/32 */, + { 8, 6464, 543, 3, 4, UNI_SC__LYDI } /* sc=lydi */, + { 0, 5306, 7734, 10, 8, UNI_WB__KA } /* wordbreak=katakana */, + { 6, 346, 0, 4, 0, UNI_TAKR } /* takr */, + { 2, 3136, 1392, 4, 2, UNI_IN__2 } /* in=v20 */, + { 1, 1042, 0, 6, 0, UNI_LYCI } /* lycian */, + { 0, 5606, 639, 6, 5, UNI_HYPHEN } /* hyphen=true */, + { 0, 1141, 4248, 4, 4, UNI_SIND } /* scx=sind */, + { 5, 8765, 5163, 22, 14, UNI_INSC__VOWELDEPENDENT } /* indicsyllabiccategory=voweldependent */, + { 0, 1522, 972, 2, 6, -UNI_SD } /* sd=false */, + { 3, 651, 51, 3, 3, UNI_DT__CAN } /* dt=can */, + { 0, 8233, 133, 9, 2, UNI_NL } /* category=nl */, + { 0, 4586, 118, 17, 4, UNI_KNDA } /* scriptextensions=knda */, + { 2, 1812, 4673, 6, 9, UNI_ARABICEXTB } /* arabicextendedb */, + { 0, 8226, 269, 16, 5, UNI_XPOSIXCNTRL } /* generalcategory=cntrl */, + { 2, 8278, 7671, 28, 4, UNI_CJKEXTB } /* incjkunifiedideographsextensionb */, + { 0, 3764, 3823, 3, 6, UNI_LISUSUP } /* inlisusup */, + { 0, 42, 4731, 2, 3, UNI_SB__UP } /* sb=up */, + { 0, 6464, 142, 3, 4, UNI_MERC } /* sc=merc */, + { 16, 67, 0, 4, 0, UNI_CPRT } /* cprt */, + { 0, 1733, 7086, 4, 21, UNI_MEETEIMAYEKEXT } /* blk=meeteimayekextensions */, + { 3, 3521, 2182, 13, 2, UNI_NV__50 } /* numericvalue=50 */, + { 0, 2429, 717, 6, 5, UNI_INLIMBU } /* block=limbu */, + { 0, 7509, 4873, 5, 8, UNI_SYRIACSUP } /* blk=syriacsup */, + { 3, 6464, 403, 3, 4, UNI_SC__GOTH } /* sc=goth */, + { 0, 462, 0, 3, 0, UNI_NKO } /* nko */, + { 38, 554, 6573, 4, 8, UNI_NV__1_SLASH_320 } /* nv=3.125e-03 */, + { 3, 5371, 6088, 11, 9, UNI_LATINEXTA } /* block=latinextendeda */, + { 36, 5371, 4861, 10, 2, UNI_LATIN1 } /* block=latin1 */, + { 2, 276, 0, 2, 0, UNI_CF } /* cf */, + { 2, 2624, 3215, 5, 6, UNI_XPOSIXDIGIT } /* xposixdigit */, + { 0, 6464, 454, 3, 4, UNI_SC__LINA } /* sc=lina */, + { 3, 2527, 0, 7, 0, UNI_MYMR } /* myanmar */, + { 1, 1346, 60, 3, 3, UNI_CHRS } /* ischrs */, + { 8, 8117, 5210, 23, 6, UNI_JG__MANICHAEANDALETH } /* joininggroup=manichaeandaleth */, + { 1, 6760, 3565, 13, 3, UNI_SB__EX } /* sentencebreak=ex */, + { 0, 1141, 189, 4, 4, UNI_RJNG } /* scx=rjng */, + { 2, 6737, 2820, 14, 3, UNI_JG__ALEF } /* joininggroup=alef */, + { 0, 2380, 0, 3, 0, UNI_in_values_index } /* in= */, + { 13, 2429, 8, 6, 3, UNI_OCR } /* block=ocr */, + { 8, 6039, 6149, 5, 7, UNI_SUPARROWSC } /* insuparrowsc */, + { 9, 368, 604, 4, 2, UNI_CCC__13 } /* ccc=13 */, + { 0, 1911, 150, 7, 4, UNI_SC__MYMR } /* script=mymr */, + { 0, 6464, 4219, 3, 7, UNI_BRAI } /* sc=braille */, + { 2, 213, 0, 4, 0, UNI_TAVT } /* tavt */, + { 0, 4127, 972, 17, 6, -UNI_EPRES } /* emojipresentation=false */, + { 0, 4586, 565, 17, 6, UNI_ONAO } /* scriptextensions=olonal */, + { 1, 5088, 4673, 10, 9, UNI_KANAEXTB } /* block=kanaextendedb */, + { 5, 3136, 4020, 5, 2, UNI_IN__17 } /* in=v170 */, + { 1, 8897, 3193, 24, 6, UNI__PERL_PROBLEMATIC_LOCALE_FOLDS } /* _perl_problematic_locale_folds */, + { 0, 8233, 3141, 9, 2, UNI_PS } /* category=ps */, + { 2, 135, 1922, 2, 4, UNI_SORA } /* issora */, + { 1, 3136, 623, 4, 2, UNI_IN__5_DOT_2 } /* in=v52 */, + { 0, 3521, 0, 13, 0, UNI_nv_values_index } /* numericvalue= */, + { 1, 1483, 4861, 4, 12, UNI_LATIN1 } /* latin1supplement */, + { 2, 6462, 5478, 5, 15, UNI_INSC__MODIFYINGLETTER } /* insc=modifyingletter */, + { 0, 54, 3869, 2, 10, UNI_SC__MLYM } /* sc=malayalam */, + { 0, 1522, 0, 2, 0, UNI_SD } /* sd */, + { 4, 7322, 2190, 24, 2, UNI_CCC__29 } /* canonicalcombiningclass=29 */, + { 0, 4586, 39, 17, 4, UNI_BHKS } /* scriptextensions=bhks */, + { 4, 2149, 1231, 4, 2, UNI_alpha_values_index } /* alpha= */, + { 1, 2429, 8167, 6, 29, UNI_ENCLOSEDIDEOGRAPHICSUP } /* block=enclosedideographicsupplement */, + { 89, 23, 0, 4, 0, UNI_AHOM } /* ahom */, + { 0, 7180, 653, 20, 3, -UNI_CE } /* compositionexclusion=no */, + { 0, 21, 8307, 1, 20, UNI_ENCLOSEDALPHANUM } /* enclosedalphanumerics */, + { 1, 2635, 2820, 4, 3, UNI_JG__ALEF } /* jg=alef */, + { 1, 4878, 8808, 12, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* supplementalsymbolsandpictographs */, + { 12, 2635, 3421, 3, 7, UNI_JG__SEMKATH } /* jg=semkath */, + { 0, 1733, 2522, 7, 4, UNI_CJKEXTI } /* blk=cjkexti */, + { 0, 3257, 4799, 5, 15, UNI_MISCMATHSYMBOLSB } /* blk=miscmathsymbolsb */, + { 3, 490, 0, 4, 0, UNI_PRTI } /* prti */, + { 0, 1678, 639, 10, 5, UNI_SD } /* softdotted=true */, + { 0, 1911, 1016, 7, 4, UNI_SC__HIRA } /* script=hira */, + { 0, 8117, 4903, 23, 5, UNI_JG__MANICHAEANZAYIN } /* joininggroup=manichaeanzayin */, + { 0, 3903, 98, 3, 2, UNI_LB__HL } /* lb=hl */, + { 67, 8233, 4350, 9, 15, UNI_LOWERCASELETTER } /* category=lowercaseletter */, + { 0, 651, 1781, 3, 8, UNI_DT__ISO } /* dt=isolated */, + { 0, 6737, 6757, 13, 3, UNI_JG__QAF } /* joininggroup=qaf */, + { 3, 2508, 2479, 8, 8, UNI_ETHIOPICEXT } /* ethiopicextended */, + { 0, 7509, 6775, 5, 22, UNI_SHORTHANDFORMATCONTROLS } /* blk=shorthandformatcontrols */, + { 34, 4586, 885, 17, 7, UNI_TGLG } /* scriptextensions=tagalog */, + { 0, 5866, 7578, 10, 17, UNI_IDENTIFIERSTATUS__RESTRICTED } /* identifierstatus=restricted */, + { 0, 2607, 459, 3, 2, UNI_MRO } /* ismro */, + { 29, 135, 1137, 2, 4, UNI_NSHU } /* isnshu */, + { 0, 6462, 0, 14, 0, UNI_INSC__CONSONANT } /* insc=consonant */, + { 10, 6737, 2648, 13, 3, UNI_JG__DAL } /* joininggroup=dal */, + { 19, 3245, 0, 12, 0, UNI_INGEORGIAN } /* blk=georgian */, + { 2, 2429, 1265, 6, 7, UNI_INGRANTHA } /* block=grantha */, + { 0, 1994, 3889, 6, 14, UNI_KAKTOVIKNUMERALS } /* blk=kaktoviknumerals */, + { 5, 8226, 5, 16, 2, UNI_MC } /* generalcategory=mc */, + { 6, 2429, 1874, 6, 11, UNI_INMEDEFAIDRIN } /* block=medefaidrin */, + { 5, 1911, 644, 7, 7, UNI_DSRT } /* script=deseret */, + { 0, 4586, 955, 17, 4, UNI_BASS } /* scriptextensions=bass */, + { 1, 438, 383, 3, 4, UNI_DIA } /* dia=yes */, + { 0, 316, 3519, 3, 2, UNI_NV__36 } /* nv=36 */, + { 17, 6164, 6, 10, 2, UNI_LB__CM } /* linebreak=cm */, + { 4, 2083, 4350, 5, 5, UNI_POSIXLOWER } /* posixlower */, + { 2, 1498, 1390, 8, 2, UNI_CCC__103 } /* ccc=ccc103 */, + { 1, 2607, 1573, 9, 4, UNI_MYANMAREXTA } /* ismyanmarexta */, + { 3, 368, 9069, 4, 13, UNI_CCC__214 } /* ccc=attachedabove */, + { 2, 3991, 0, 14, 0, UNI_NV__5 } /* numericvalue=5 */, + { 1, 1141, 1329, 4, 4, UNI_SUNU } /* scx=sunu */, + { 1, 7322, 7678, 18, 7, UNI_CCC__L } /* canonicalcombiningclass=l */, + { 2, 3208, 972, 13, 2, -UNI_POSIXXDIGIT } /* asciihexdigit=f */, + { 0, 6464, 851, 3, 4, UNI_SC__SHRD } /* sc=shrd */, + { 0, 683, 2677, 5, 3, -UNI_GRBASE } /* grbase=n */, + { 0, 7804, 2258, 28, 2, UNI_WB__EB } /* canonicalcombiningclass=ccc133 */, + { 2, 4992, 382, 16, 2, UNI_patws_values_index } /* patternwhitespace= */, + { 2, 4586, 126, 17, 4, UNI_LAO } /* scriptextensions=laoo */, + { 0, 2108, 2677, 10, 3, -UNI_KEHNOROTATE } /* kehnorotate=n */, + { 8, 2810, 359, 3, 3, UNI_BC__PDF } /* bc=pdf */, + { 0, 1733, 6797, 4, 13, UNI_ZNAMENNYMUSIC } /* blk=znamennymusic */, + { 0, 4586, 707, 17, 5, UNI_BUHD } /* scriptextensions=buhid */, + { 0, 135, 212, 2, 2, UNI_TITLE } /* islt */, + { 0, 2635, 2989, 3, 11, UNI_JG__YEHWITHTAIL } /* jg=yehwithtail */, + { 35, 1911, 1359, 7, 9, UNI_SC__SIND } /* script=khudawadi */, + { 36, 4533, 971, 5, 7, -UNI_XPOSIXSPACE } /* wspace=false */, + { 4, 5866, 6844, 10, 14, UNI_IDENTIFIERSTATUS__ALLOWED } /* identifierstatus=allowed */, + { 1, 393, 653, 4, 3, -UNI_CWCM } /* cwcm=no */, + { 1, 135, 5194, 2, 14, UNI_ROHG } /* ishanifirohingya */, + { 7, 8117, 4427, 23, 4, UNI_JG__MANICHAEANRESH } /* joininggroup=manichaeanresh */, + { 10, 333, 9089, 2, 34, UNI_UCAS } /* inunifiedcanadianaboriginalsyllabics */, + { 18, 2380, 617, 3, 3, UNI_IN__8 } /* in=8.0 */, + { 10, 4586, 1652, 17, 4, UNI_SAUR } /* scriptextensions=saur */, + { 23, 3903, 6543, 3, 13, UNI_LB__CM } /* lb=combiningmark */, + { 0, 1230, 7360, 3, 9, UNI_EA__F } /* ea=fullwidth */, + { 10, 2407, 639, 3, 2, UNI_IDC } /* idc=t */, + { 0, 2534, 2539, 5, 6, UNI_NAND } /* nandinagari */, + { 13, 135, 587, 2, 6, UNI_TNSA } /* istangsa */, + { 0, 1141, 5043, 4, 5, UNI_BAMU } /* scx=bamum */, + { 21, 2057, 0, 4, 0, UNI_SOGD } /* sogd */, + { 5, 1260, 8930, 3, 33, UNI_CJKCOMPATIDEOGRAPHSSUP } /* cjkcompatibilityideographssupplement */, + { 1, 5306, 6555, 8, 9, UNI_WB__NU } /* wordbreak=numeric */, + { 1, 1911, 892, 7, 7, UNI_LANA } /* script=taitham */, + { 1, 1141, 470, 4, 4, UNI_OLCK } /* scx=olck */, + { 1, 1465, 1673, 3, 2, UNI_WB__FO } /* wb=fo */, + { 0, 4586, 3620, 16, 5, UNI_ETHI } /* scriptextensions=ethi */, + { 7, 8233, 276, 9, 2, UNI_CF } /* category=cf */, + { 0, 6464, 1308, 3, 7, UNI_SC__PHAG } /* sc=phagspa */, + { 23, 1090, 1094, 4, 4, UNI_KRAI } /* kiratrai */, + { 2, 2429, 1414, 6, 9, UNI_INOLDTURKIC } /* block=oldturkic */, + { 0, 1112, 810, 4, 3, UNI_NV__15_SLASH_2 } /* nv=15/2 */, + { 65, 135, 2872, 2, 6, UNI_COPT } /* iscoptic */, + { 1, 333, 1180, 2, 8, UNI_INVITHKUQI } /* invithkuqi */, + { 0, 1590, 3753, 5, 3, UNI_KANGXI } /* iskangxi */, + { 0, 6180, 383, 21, 4, UNI_LOE } /* logicalorderexception=yes */, + { 0, 7322, 2327, 23, 2, UNI_CCC__8 } /* canonicalcombiningclass=8 */, + { 25, 695, 1916, 2, 3, UNI_GCB__T } /* hst=t */, + { 0, 502, 0, 4, 0, UNI_SHAW } /* shaw */, + { 9, 1465, 0, 3, 0, UNI_wb_values_index } /* wb= */, + { 17, 6464, 1060, 3, 6, UNI_SC__YEZI } /* sc=yezidi */, + { 0, 11, 0, 4, 0, UNI_ADLM } /* adlm */, + { 0, 1141, 110, 4, 4, UNI_KAWI } /* scx=kawi */, + { 2, 333, 371, 2, 3, UNI_IN__12 } /* in=12 */, + { 9, 4305, 972, 4, 2, -UNI_DASH } /* dash=f */, + { 3, 4586, 307, 17, 5, UNI_NSHU } /* scriptextensions=nushu */, + { 0, 3103, 6372, 11, 4, UNI_NFCQC__M } /* nfcquickcheck=m */, + { 0, 333, 7760, 2, 26, UNI_TANGUTCOMPONENTSSUP } /* intangutcomponentssupplement */, + { 0, 2, 8607, 1, 24, UNI_DIACRITICALS } /* combiningdiacriticalmarks */, + { 3, 3506, 6555, 12, 3, UNI_DT__CAN } /* nfdquickcheck=n */, + { 18, 4409, 0, 10, 0, UNI_MANI } /* manichaean */, + { 4, 2373, 422, 11, 1, UNI_IN__15 } /* presentin=15 */, + { 0, 2429, 205, 6, 4, UNI_TAGS } /* block=tags */, + { 0, 30, 6709, 1, 8, UNI_RADICAL } /* isradical */, + { 0, 2021, 971, 11, 7, -UNI_GRBASE } /* graphemebase=false */, + { 8, 8233, 876, 9, 2, UNI__PERL_SURROGATE } /* category=cs */, + { 2, 6464, 688, 3, 7, UNI_SC__HANO } /* sc=hanunoo */, + { 0, 2453, 971, 12, 7, -UNI_CI } /* caseignorable=false */, + { 0, 1141, 712, 4, 4, UNI_DOGR } /* scx=dogr */, + { 0, 2429, 1432, 6, 9, UNI_PALM } /* block=palmyrene */, + { 3, 3213, 383, 8, 2, UNI_XPOSIXXDIGIT } /* hexdigit=y */, + { 3, 1498, 1392, 7, 2, UNI_CCC__20 } /* ccc=ccc20 */, + { 0, 1982, 653, 5, 3, -UNI_BIDIM } /* bidim=no */, + { 34, 5306, 3168, 10, 11, UNI_WB__DQ } /* wordbreak=doublequote */, + { 3, 7151, 639, 25, 5, UNI_DI } /* defaultignorablecodepoint=true */, + { 1, 135, 2534, 2, 11, UNI_NAND } /* isnandinagari */, + { 0, 3903, 3059, 3, 11, UNI_LB__EX } /* lb=exclamation */, + { 4, 5866, 6684, 15, 8, UNI_IDENTIFIERTYPE__OBSOLETE } /* identifiertype=obsolete */, + { 0, 7126, 296, 25, 1, UNI_cwkcf_values_index } /* changeswhennfkccasefolded= */, + { 0, 8765, 7832, 31, 15, UNI_INSC__CONSONANTSUCCEEDINGREPHA } /* indicsyllabiccategory=consonantsucceedingrepha */, + { 2, 4586, 762, 17, 7, UNI_KNDA } /* scriptextensions=kannada */, + { 0, 1818, 1149, 3, 7, UNI_SPECIALS } /* isspecials */, + { 1, 1141, 1024, 4, 4, UNI_HATR } /* scx=hatr */, + { 38, 6464, 458, 3, 4, UNI_MRO } /* sc=mroo */, + { 0, 1810, 5115, 3, 16, UNI_ALCHEMICAL } /* isalchemicalsymbols */, + { 2, 1911, 831, 7, 4, UNI_HMNP } /* script=hmnp */, + { 2, 55, 61, 2, 2, UNI_CHRS } /* chrs */, + { 0, 7509, 6382, 7, 13, UNI_SUPMATHOPERATORS } /* blk=supmathoperators */, + { 6, 6464, 843, 3, 4, UNI_NBAT } /* sc=nbat */, + { 11, 1818, 5319, 7, 4, UNI_XPOSIXSPACE } /* isspaceperl */, + { 5, 2429, 8862, 6, 35, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* block=symbolsforlegacycomputingsupplement */, + { 0, 3976, 1386, 15, 3, UNI_NV__1_SLASH_160 } /* numericvalue=1/160 */, + { 8, 135, 732, 2, 5, UNI_RUNR } /* isrunic */, + { 0, 2429, 7210, 6, 14, UNI_BYZANTINEMUSIC } /* block=byzantinemusic */, + { 0, 333, 7647, 2, 27, UNI_OCR } /* inopticalcharacterrecognition */, + { 0, 3976, 1391, 15, 3, UNI_NV__1_SLASH_320 } /* numericvalue=1/320 */, + { 2, 6164, 748, 10, 2, UNI_EMOD } /* linebreak=em */, + { 8, 571, 639, 6, 2, UNI_PATSYN } /* patsyn=t */, + { 0, 1825, 1547, 6, 5, UNI_VERTSPACE } /* isvertspace */, + { 3, 4202, 639, 17, 2, UNI_IDSB } /* idsbinaryoperator=t */, + { 0, 6464, 955, 3, 4, UNI_BASS } /* sc=bass */, + { 2, 1112, 5612, 4, 6, UNI_NV__1000000 } /* nv=1000000 */, + { 9, 8233, 5398, 13, 12, UNI_PO } /* category=otherpunctuation */, + { 0, 3764, 4917, 10, 10, UNI_LATINEXTADDITIONAL } /* inlatinextadditional */, + { 24, 3617, 6492, 10, 5, UNI_ETHIOPICSUP } /* blk=ethiopicsup */, + { 0, 1733, 5890, 4, 5, UNI_INGREEK } /* blk=greek */, + { 1, 6164, 507, 10, 2, UNI_LB__ID } /* linebreak=id */, + { 0, 1141, 346, 4, 4, UNI_TAKR } /* scx=takr */, + { 2, 2912, 7776, 10, 13, UNI_CYRILLICSUP } /* iscyrillicsupplementary */, + { 1, 2429, 4144, 6, 4, UNI_INMODI } /* block=modi */, + { 13, 4586, 1090, 17, 8, UNI_KRAI } /* scriptextensions=kiratrai */, + { 0, 293, 397, 4, 2, UNI_GCB__SM } /* gcb=sm */, + { 4, 333, 742, 2, 5, UNI_INBATAK } /* inbatak */, + { 0, 448, 0, 2, 0, UNI_NO } /* no */, + { 27, 2429, 5546, 6, 11, UNI_CHEROKEESUP } /* block=cherokeesup */, + { 0, 925, 614, 5, 3, UNI_AGE__17 } /* age=17.0 */, + { 8, 8226, 4366, 17, 14, UNI_PS } /* generalcategory=openpunctuation */, + { 8, 4586, 110, 17, 4, UNI_KAWI } /* scriptextensions=kawi */, + { 1, 3331, 972, 14, 6, -UNI_GREXT } /* graphemeextend=false */, + { 0, 4219, 0, 7, 0, UNI_BRAI } /* braille */, + { 3, 1733, 6097, 4, 12, UNI_MONGOLIANSUP } /* blk=mongoliansup */, + { 11, 6203, 4730, 4, 2, UNI_nchar_values_index } /* nchar= */, + { 1, 1911, 1287, 7, 7, UNI_MAKA } /* script=makasar */, + { 0, 1733, 1552, 4, 8, UNI_INBUGINESE } /* blk=buginese */, + { 1, 632, 314, 5, 2, UNI_CCC__IS } /* ccc=240 */, + { 42, 1733, 1066, 4, 4, UNI_JAMO } /* blk=jamo */, + { 0, 1733, 6484, 4, 13, UNI_GLAGOLITICSUP } /* blk=glagoliticsup */, + { 41, 651, 3098, 3, 5, UNI_DT__FIN } /* dt=final */, + { 0, 6464, 702, 3, 5, UNI_SC__ADLM } /* sc=adlam */, + { 0, 3245, 7277, 7, 20, UNI_GEOMETRICSHAPESEXT } /* blk=geometricshapesextended */, + { 2, 4830, 0, 16, 0, UNI_PE } /* closepunctuation */, + { 0, 1590, 1573, 6, 4, UNI_KANAEXTA } /* iskanaexta */, + { 6, 1994, 771, 6, 5, UNI_KALI } /* blk=kayahli */, + { 2, 283, 972, 3, 2, -UNI_CWT } /* cwt=f */, + { 1, 368, 2190, 4, 2, UNI_CCC__29 } /* ccc=29 */, + { 1, 316, 1118, 3, 4, UNI_NV__1_SLASH_12 } /* nv=1/12 */, + { 7, 1471, 1716, 3, 3, -UNI_IDSB } /* idsb=n */, + { 4, 2236, 5612, 4, 5, UNI_NV__200000 } /* nv=200000 */, + { 2, 4586, 486, 17, 4, UNI_MIAO } /* scriptextensions=plrd */, + { 1, 1552, 0, 8, 0, UNI_BUGI } /* buginese */, + { 1, 933, 312, 6, 2, UNI_AGE__13 } /* age=v130 */, + { 1, 1260, 6527, 2, 8, UNI_CJKSYMBOLS } /* cjksymbols */, + { 0, 2607, 6088, 9, 9, UNI_MYANMAREXTA } /* ismyanmarextendeda */, + { 0, 3726, 639, 16, 5, UNI_IDSU } /* idsunaryoperator=true */, + { 0, 4586, 6899, 17, 4, UNI_BERF } /* scriptextensions=berf */, + { 0, 135, 346, 2, 4, UNI_TAKR } /* istakr */, + { 41, 6464, 1751, 3, 11, UNI_SC__CPMN } /* sc=cyprominoan */, + { 2, 135, 1269, 2, 4, UNI_THAI } /* isthai */, + { 9, 1346, 1573, 5, 4, UNI_CJKEXTA } /* iscjkexta */, + { 0, 6737, 2648, 13, 10, UNI_JG__DALATHRISH } /* joininggroup=dalathrish */, + { 25, 1911, 2057, 7, 4, UNI_SC__SOGD } /* script=sogd */, + { 2, 3903, 325, 3, 2, UNI_LB__AP } /* lb=ap */, + { 1, 1733, 6661, 4, 23, UNI_COMPATJAMO } /* blk=hangulcompatibilityjamo */, + { 13, 6642, 0, 19, 0, UNI_JAMOEXTB } /* hanguljamoextendedb */, + { 0, 5606, 383, 6, 2, UNI_HYPHEN } /* hyphen=y */, + { 37, 3257, 2146, 5, 11, UNI_MATHALPHANUM } /* blk=mathalphanum */, + { 61829, 4664, 1787, 15, 3, UNI_LATINEXTG } /* blk=latinextendedg */, + { 0, 2607, 8196, 3, 30, UNI_MATHALPHANUM } /* ismathematicalalphanumericsymbols */, + { 1, 4406, 4439, 13, 4, UNI_JG__MANICHAEANTETH } /* jg=manichaeanteth */, + { 1, 1911, 737, 7, 5, UNI_TAYO } /* script=taiyo */, + { 3, 316, 813, 3, 4, UNI_NV__17_SLASH_2 } /* nv=17/2 */, + { 9, 1733, 5177, 4, 17, UNI_SHARADASUP } /* blk=sharadasupplement */, + { 0, 6464, 1459, 3, 4, UNI_SC__THAA } /* sc=thaa */, + { 14, 30, 133, 1, 5, UNI_INLISU } /* inlisu */, + { 4, 6116, 5553, 8, 4, UNI_SUNDANESESUP } /* sundanesesup */, + { 6, 7126, 383, 25, 2, UNI_CWKCF } /* changeswhennfkccasefolded=y */, + { 2, 3521, 2187, 13, 9, UNI_NV__1_SLASH_7 } /* numericvalue=1.429e-01 */, + { 2, 1471, 383, 4, 4, UNI_IDST } /* idst=yes */, + { 3, 3128, 0, 5, 0, UNI_EPRES } /* epres */, + { 2, 3331, 383, 14, 4, UNI_GREXT } /* graphemeextend=yes */, + { 2, 1733, 5275, 4, 19, UNI_OTTOMANSIYAQNUMBERS } /* blk=ottomansiyaqnumbers */, + { 9, 3129, 4020, 12, 2, UNI_IN__17 } /* presentin=v170 */, + { 0, 33, 8424, 1, 29, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* symbolsandpictographsextendeda */, + { 1, 1141, 1459, 4, 6, UNI_THAA } /* scx=thaana */, + { 52, 2236, 0, 12, 0, UNI_NV__1_SLASH_4 } /* nv=2.500e-01 */, + { 1, 2083, 4309, 5, 5, UNI_POSIXPUNCT } /* posixpunct */, + { 2, 135, 4290, 2, 8, UNI_VEDICEXT } /* isvedicext */, + { 2, 554, 0, 4, 0, UNI_NV__3 } /* nv=3 */, + { 0, 135, 1506, 2, 10, UNI_CHRS } /* ischorasmian */, + { 12, 6135, 4770, 12, 13, UNI_SUPPUNCTUATION } /* issupplementalpunctuation */, + { 0, 1141, 1432, 4, 4, UNI_PALM } /* scx=palm */, + { 7, 54, 0, 2, 0, UNI_SC } /* sc */, + { 1, 455, 5884, 3, 18, UNI_ANCIENTGREEKNUMBERS } /* inancientgreeknumbers */, + { 4, 7322, 1392, 24, 2, UNI_CCC__20 } /* canonicalcombiningclass=20 */, + { 0, 6464, 162, 3, 4, UNI_SC__ORYA } /* sc=orya */, + { 1, 4406, 4898, 13, 5, UNI_JG__MANICHAEANSADHE } /* jg=manichaeansadhe */, + { 13, 316, 1388, 4, 3, UNI_NV__9000 } /* nv=9000 */, + { 6, 2236, 559, 4, 2, UNI_NV__2_SLASH_5 } /* nv=2/5 */, + { 0, 2508, 6492, 6, 5, UNI_ETHIOPICSUP } /* ethiopicsup */, + { 0, 8765, 3384, 31, 6, UNI_INSC__CONSONANTKILLER } /* indicsyllabiccategory=consonantkiller */, + { 9, 5845, 4569, 21, 17, UNI_RI } /* graphemeclusterbreak=regionalindicator */, + { 1, 438, 653, 3, 3, -UNI_DIA } /* dia=no */, + { 2, 1141, 1408, 4, 4, UNI_PERM } /* scx=perm */, + { 2, 2858, 4234, 3, 14, UNI_SC } /* gc=currencysymbol */, + { 0, 1483, 1070, 5, 4, UNI_LATINEXTB } /* latinextb */, + { 10, 30, 7001, 1, 23, UNI_TRANSPORTANDMAP } /* istransportandmapsymbols */, + { 0, 1911, 177, 7, 4, UNI_SC__PHLP } /* script=phlp */, + { 17, 333, 4335, 2, 6, UNI_INHANGUL } /* inhangul */, + { 3, 6369, 4822, 13, 9, UNI_MYANMAREXTC } /* block=myanmarextendedc */, + { 2, 2081, 1125, 7, 4, UNI_POSIXWORD } /* isposixword */, + { 0, 1141, 4335, 4, 4, UNI_HANG } /* scx=hang */, + { 1, 8226, 2422, 16, 6, UNI_N } /* generalcategory=number */, + { 8, 2429, 2002, 6, 7, UNI_UCASEXT } /* block=ucasext */, + { 3, 1911, 824, 7, 4, UNI_OSMA } /* script=osma */, + { 10, 3962, 383, 14, 2, UNI_NFKCQC__Y } /* nfkcquickcheck=y */, + { 0, 777, 6060, 3, 15, UNI_ENCLOSEDALPHANUM } /* inenclosedalphanum */, + { 74, 1470, 0, 4, 0, UNI_XIDS } /* xids */, + { 1, 7086, 0, 21, 0, UNI_MEETEIMAYEKEXT } /* meeteimayekextensions */, + { 12, 333, 1789, 2, 11, UNI_INGURUNGKHEMA } /* ingurungkhema */, + { 5, 333, 1066, 2, 4, UNI_JAMO } /* injamo */, + { 0, 1733, 662, 4, 7, UNI_INELBASAN } /* blk=elbasan */, + { 19, 245, 1725, 2, 8, UNI_XPOSIXSPACE } /* xperlspace */, + { 69, 3257, 2731, 5, 12, UNI_MAYANNUMERALS } /* blk=mayannumerals */, + { 18, 2616, 2935, 5, 8, UNI_SO } /* isothersymbol */, + { 1, 135, 213, 2, 4, UNI_TAVT } /* istavt */, + { 0, 1911, 707, 7, 5, UNI_SC__BUHD } /* script=buhid */, + { 0, 8494, 5572, 24, 10, UNI_CJKEXTD } /* blk=cjkunifiedideographsextensiond */, + { 1, 632, 419, 5, 2, UNI_CCC__DA } /* ccc=234 */, + { 0, 2655, 1543, 3, 9, UNI_XPOSIXBLANK } /* ishorizspace */, + { 5, 925, 606, 6, 2, UNI_AGE__10 } /* age=10.0 */, + { 9, 2429, 1441, 6, 9, UNI_INPAUCINHAU } /* block=paucinhau */, + { 4, 8089, 383, 17, 4, UNI_VS } /* variationselector=yes */, + { 4, 877, 972, 5, 2, -UNI_STERM } /* sterm=f */, + { 20, 6760, 6555, 12, 9, UNI_SB__NU } /* sentencebreak=numeric */, + { 0, 6557, 5612, 14, 5, UNI_NV__200000 } /* numericvalue=200000 */, + { 2, 3521, 2756, 13, 9, UNI_NV__1_SLASH_2 } /* numericvalue=5.000e-01 */, + { 0, 5098, 653, 13, 2, -UNI_EMOD } /* emojimodifier=n */, + { 1, 1911, 6222, 7, 4, UNI_SC__SINH } /* script=sinh */, + { 0, 6356, 5447, 8, 16, UNI_INPUNCTUATION } /* block=generalpunctuation */, + { 0, 333, 2303, 2, 2, UNI_IN__5 } /* in=5 */, + { 2, 135, 3477, 2, 15, UNI_MERC } /* ismeroiticcursive */, + { 1, 8765, 3092, 22, 6, UNI_INSC__VIRAMA } /* indicsyllabiccategory=virama */, + { 2, 135, 241, 2, 4, UNI_WCHO } /* iswcho */, + { 2, 330, 1549, 2, 3, UNI_XPOSIXSPACE } /* space */, + { 2, 6928, 4270, 8, 8, UNI_INPC__TOPANDRIGHT } /* inpc=topandright */, + { 28, 510, 0, 4, 0, UNI_SOGO } /* sogo */, + { 1, 333, 4290, 2, 15, UNI_VEDICEXT } /* invedicextensions */, + { 3, 1911, 1339, 7, 4, UNI_SC__TIRH } /* script=tirh */, + { 2, 6464, 82, 3, 4, UNI_SC__GONG } /* sc=gong */, + { 0, 135, 6987, 2, 15, UNI_MODIFIERLETTERS } /* ismodifierletters */, + { 32, 1258, 0, 5, 0, UNI_CJK } /* incjk */, + { 4, 2635, 0, 3, 0, UNI_jg_values_index } /* jg= */, + { 0, 54, 3248, 2, 9, UNI_SC__GEOR } /* sc=georgian */, + { 0, 843, 0, 4, 0, UNI_NBAT } /* nbat */, + { 2, 3070, 6981, 3, 21, UNI_MODIFIERLETTERS } /* inspacingmodifierletters */, + { 2, 2635, 20, 3, 2, UNI_JG__HE } /* jg=he */, + { 0, 1982, 383, 12, 2, UNI_BIDIM } /* bidimirrored=y */, + { 53, 2429, 7873, 6, 27, UNI_ANCIENTGREEKMUSIC } /* block=ancientgreekmusicalnotation */, + { 0, 1678, 653, 10, 3, -UNI_SD } /* softdotted=no */, + { 0, 1141, 3535, 4, 15, UNI_NARB } /* scx=oldnortharabian */, + { 4, 1733, 307, 4, 5, UNI_INNUSHU } /* blk=nushu */, + { 0, 322, 653, 2, 2, -UNI_RI } /* ri=n */, + { 2, 2858, 3673, 3, 9, UNI_Z } /* gc=separator */, + { 1, 1733, 2784, 4, 13, UNI_VERTICALFORMS } /* blk=verticalforms */, + { 12, 78, 0, 4, 0, UNI_DSRT } /* dsrt */, + { 1, 4878, 5299, 12, 7, UNI_SUPARROWSA } /* supplementalarrowsa */, + { 2, 3521, 318, 12, 3, UNI_NV__90 } /* numericvalue=90 */, + { 0, 3155, 383, 13, 2, UNI_QMARK } /* quotationmark=y */, + { 9, 1911, 1652, 7, 10, UNI_SAUR } /* script=saurashtra */, + { 1, 1471, 652, 3, 4, -UNI_IDST } /* idst=no */, + { 1, 6164, 3919, 10, 13, UNI_LB__PR } /* linebreak=prefixnumeric */, + { 0, 9030, 4603, 7, 16, UNI_SMALLFORMS } /* block=smallformvariants */, + { 0, 2496, 6492, 8, 12, UNI_CYRILLICSUP } /* incyrillicsupplement */, + { 46, 1141, 2054, 4, 10, UNI_SOGO } /* scx=oldsogdian */, + { 32, 316, 1210, 3, 2, UNI_NV__43 } /* nv=43 */, + { 9, 6760, 4731, 13, 3, UNI_SB__UP } /* sentencebreak=up */, + { 0, 1885, 383, 5, 2, UNI_NFCQC__Y } /* nfcqc=y */, + { 9, 2429, 1405, 6, 9, UNI_INOLDPERMIC } /* block=oldpermic */, + { 0, 2858, 337, 3, 4, UNI_M } /* gc=mark */, + { 67, 3521, 927, 11, 4, UNI_NV__10 } /* numericvalue=10 */, + { 0, 1141, 5194, 4, 14, UNI_ROHG } /* scx=hanifirohingya */, + { 40, 6464, 197, 3, 4, UNI_SC__SAMR } /* sc=samr */, + { 6, 7674, 0, 11, 0, UNI_BC__L } /* bidiclass=l */, + { 0, 135, 86, 2, 4, UNI_GREK } /* isgrek */, + { 0, 2622, 3215, 8, 6, UNI_XPOSIXXDIGIT } /* isxposixxdigit */, + { 0, 2429, 5275, 6, 19, UNI_OTTOMANSIYAQNUMBERS } /* block=ottomansiyaqnumbers */, + { 2, 274, 972, 4, 6, -UNI_CWCF } /* cwcf=false */, + { 0, 6464, 2932, 3, 5, UNI_KHMR } /* sc=khmer */, + { 3, 1733, 4219, 4, 15, UNI_BRAI } /* blk=braillepatterns */, + { 0, 168, 7277, 3, 20, UNI_GEOMETRICSHAPESEXT } /* geometricshapesextended */, + { 0, 4747, 639, 18, 2, UNI_IDST } /* idstrinaryoperator=t */, + { 0, 4586, 6018, 17, 21, UNI_PRTI } /* scriptextensions=inscriptionalparthian */, + { 1, 4007, 5612, 14, 5, UNI_NV__700000 } /* numericvalue=700000 */, + { 1, 54, 3608, 2, 9, UNI_SC__CYRL } /* sc=cyrillic */, + { 6, 7396, 6492, 6, 12, UNI_ARABICSUP } /* inarabicsupplement */, + { 0, 135, 261, 2, 4, UNI_ZYYY } /* iszyyy */, + { 8, 2858, 6993, 6, 8, UNI_LO } /* gc=otherletter */, + { 8, 4992, 382, 16, 5, UNI__PERL_PATWS } /* patternwhitespace=yes */, + { 0, 135, 6891, 2, 16, UNI_INDICNUMBERFORMS } /* isindicnumberforms */, + { 1, 6369, 459, 7, 2, UNI_INMRO } /* block=mro */, + { 0, 135, 1941, 2, 11, UNI_SYLO } /* issylotinagri */, + { 4, 1141, 1329, 4, 7, UNI_SUNU } /* scx=sunuwar */, + { 5, 947, 0, 4, 0, UNI_BALI } /* bali */, + { 5, 783, 0, 4, 0, UNI_MAND } /* mand */, + { 11, 4586, 237, 17, 4, UNI_TUTG } /* scriptextensions=tutg */, + { 0, 7804, 375, 27, 2, UNI_CCC__18 } /* canonicalcombiningclass=ccc18 */, + { 0, 193, 195, 2, 2, UNI_RUNR } /* runr */, + { 5, 6760, 6634, 14, 6, UNI_SB__FO } /* sentencebreak=format */, + { 19, 1141, 1133, 4, 4, UNI_MLYM } /* scx=mlym */, + { 1, 4586, 6952, 17, 4, UNI_BRAH } /* scriptextensions=brah */, + { 0, 1911, 870, 7, 7, UNI_SIDT } /* script=sidetic */, + { 0, 1141, 2534, 4, 11, UNI_NAND } /* scx=nandinagari */, + { 21, 2525, 1573, 9, 4, UNI_MYANMAREXTA } /* inmyanmarexta */, + { 1, 1911, 1432, 7, 4, UNI_PALM } /* script=palm */, + { 43, 2576, 296, 5, 1, UNI_cased_values_index } /* cased= */, + { 8, 64, 7446, 1, 25, UNI_PCM } /* prependedconcatenationmark */, + { 2, 2429, 56, 7, 3, UNI_INCHAM } /* block=cham */, + { 21, 4586, 245, 17, 4, UNI_XPEO } /* scriptextensions=xpeo */, + { 1, 4586, 4443, 17, 17, UNI_KITS } /* scriptextensions=khitansmallscript */, + { 0, 4586, 6484, 17, 4, UNI_GLAG } /* scriptextensions=glag */, + { 3, 1141, 134, 4, 4, UNI_LISU } /* scx=lisu */, + { 3, 1141, 4623, 4, 11, UNI_SGNW } /* scx=signwriting */, + { 4, 6464, 1603, 3, 10, UNI_KHAR } /* sc=kharoshthi */, + { 23, 8283, 653, 16, 2, -UNI_UIDEO } /* unifiedideograph=n */, + { 0, 7509, 6149, 7, 7, UNI_SUPARROWSC } /* blk=suparrowsc */, + { 5, 3867, 764, 12, 3, UNI_JG__MALAYALAMNNA } /* jg=malayalamnna */, + { 0, 2618, 5398, 4, 12, UNI_PO } /* otherpunctuation */, + { 1, 333, 4687, 2, 12, UNI_CYRILLICEXTC } /* incyrillicextc */, + { 0, 5761, 639, 21, 5, UNI_CWCM } /* changeswhencasemapped=true */, + { 0, 2525, 2146, 3, 11, UNI_MATHALPHANUM } /* inmathalphanum */, + { 1, 6462, 6952, 5, 19, UNI_INSC__BRAHMIJOININGNUMBER } /* insc=brahmijoiningnumber */, + { 2, 1141, 403, 4, 4, UNI_GOTH } /* scx=goth */, + { 2, 2440, 0, 13, 0, UNI_BLOCKELEMENTS } /* blockelements */, + { 0, 1112, 5612, 4, 10, UNI_NV__10000000000 } /* nv=10000000000 */, + { 67, 368, 4114, 4, 13, UNI_CCC__IS } /* ccc=iotasubscript */, + { 9, 333, 1533, 2, 10, UNI_INDIVESAKURU } /* indivesakuru */, + { 3, 5275, 0, 19, 0, UNI_OTTOMANSIYAQNUMBERS } /* ottomansiyaqnumbers */, + { 0, 5, 3492, 1, 14, UNI_MISCPICTOGRAPHS } /* miscpictographs */, + { 7, 7322, 3268, 24, 11, UNI_CCC__DA } /* canonicalcombiningclass=doubleabove */, + { 0, 4649, 0, 6, 0, UNI_ZYYY } /* common */, + { 0, 3605, 1740, 12, 4, UNI_CYRILLICEXTD } /* blk=cyrillicextd */, + { 1, 2429, 1450, 6, 9, UNI_INSAMARITAN } /* block=samaritan */, + { 3, 2149, 653, 5, 3, -UNI_XPOSIXALPHA } /* alpha=no */, + { 25, 955, 0, 4, 0, UNI_BASS } /* bass */, + { 1, 135, 486, 2, 4, UNI_MIAO } /* isplrd */, + { 3, 5606, 972, 6, 2, -UNI_HYPHEN } /* hyphen=f */, + { 0, 8233, 5, 9, 2, UNI_MC } /* category=mc */, + { 0, 2, 8996, 1, 34, UNI_DIACRITICALSSUP } /* combiningdiacriticalmarkssupplement */, + { 0, 6737, 4394, 13, 4, UNI_JG__BETH } /* joininggroup=beth */, + { 1, 333, 4409, 2, 10, UNI_INMANICHAEAN } /* inmanichaean */, + { 0, 7509, 7595, 5, 24, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* blk=symbolsandpictographsexta */, + { 44, 2429, 7398, 6, 24, UNI_ARABICPFB } /* block=arabicpresentationformsb */, + { 13, 5740, 639, 21, 5, UNI_CWCF } /* changeswhencasefolded=true */, + { 2, 4586, 442, 17, 4, UNI_GONM } /* scriptextensions=gonm */, + { 0, 2429, 1247, 6, 7, UNI_INBENGALI } /* block=bengali */, + { 10, 5628, 0, 20, 0, UNI_HMNP } /* nyiakengpuachuehmong */, + { 1, 368, 416, 4, 2, UNI_CCC__26 } /* ccc=26 */, + { 6, 2912, 0, 10, 0, UNI_CYRL } /* iscyrillic */, + { 0, 8226, 3849, 16, 14, UNI_MN } /* generalcategory=nonspacingmark */, + { 2, 135, 4687, 2, 12, UNI_CYRILLICEXTC } /* iscyrillicextc */, + { 6, 2429, 1180, 6, 8, UNI_INVITHKUQI } /* block=vithkuqi */, + { 0, 1141, 955, 4, 4, UNI_BASS } /* scx=bass */, + { 27, 1465, 65, 3, 2, UNI_WB__MN } /* wb=mn */, + { 24, 6164, 2709, 10, 10, UNI_LB__WJ } /* linebreak=wordjoiner */, + { 34, 1471, 1916, 3, 3, UNI_IDST } /* idst=t */, + { 0, 2373, 602, 10, 3, UNI_IN__2_DOT_1 } /* presentin=2.1 */, + { 1, 1733, 4335, 4, 6, UNI_INHANGUL } /* blk=hangul */, + { 0, 168, 5447, 2, 16, UNI_INPUNCTUATION } /* generalpunctuation */, + { 0, 561, 5612, 4, 4, UNI_NV__70000 } /* nv=70000 */, + { 0, 2453, 382, 12, 5, UNI_CI } /* caseignorable=yes */, + { 1, 4586, 2157, 17, 12, UNI_MEND } /* scriptextensions=mendekikakui */, + { 2, 4586, 1396, 17, 9, UNI_ITAL } /* scriptextensions=olditalic */, + { 2, 2429, 6434, 7, 8, UNI_INCUNEIFORM } /* block=cuneiform */, + { 0, 4992, 2677, 16, 3, -UNI__PERL_PATWS } /* patternwhitespace=n */, + { 4, 5740, 383, 21, 2, UNI_CWCF } /* changeswhencasefolded=y */, + { 0, 4586, 1329, 17, 7, UNI_SUNU } /* scriptextensions=sunuwar */, + { 0, 6464, 4097, 3, 17, UNI_SC__AGHB } /* sc=caucasianalbanian */, + { 0, 6464, 543, 3, 6, UNI_SC__LYDI } /* sc=lydian */, + { 2, 4586, 727, 17, 5, UNI_OSGE } /* scriptextensions=osage */, + { 0, 1911, 510, 7, 4, UNI_SOGO } /* script=sogo */, + { 4, 6464, 3535, 3, 15, UNI_NARB } /* sc=oldnortharabian */, + { 2, 6164, 866, 10, 2, UNI_LB__VI } /* linebreak=vi */, + { 26, 2373, 2303, 9, 2, UNI_IN__5 } /* presentin=5 */, + { 0, 659, 6244, 3, 3, UNI_IDEO } /* ideo=t */, + { 2, 1141, 1359, 4, 9, UNI_SIND } /* scx=khudawadi */, + { 6, 333, 1164, 2, 8, UNI_INTIFINAGH } /* intifinagh */, + { 18, 333, 2534, 2, 11, UNI_INNANDINAGARI } /* innandinagari */, + { 9, 7322, 7699, 18, 11, UNI_CCC__R } /* canonicalcombiningclass=right */, + { 6, 1283, 4673, 4, 9, UNI_KANAEXTB } /* kanaextendedb */, + { 1, 7978, 3345, 20, 10, UNI_GCB__L } /* hangulsyllabletype=leadingjamo */, + { 41, 4185, 383, 17, 2, UNI_IDCOMPATMATHSTART } /* idcompatmathstart=y */, + { 3, 2429, 8395, 7, 15, UNI_CUNEIFORMNUMBERS } /* block=cuneiformnumbers */, + { 1, 6464, 51, 3, 4, UNI_CANS } /* sc=cans */, + { 0, 322, 296, 2, 1, UNI_ri_values_index } /* ri= */, + { 0, 3521, 564, 14, 1, UNI_NV__47 } /* numericvalue=47 */, + { 1, 6462, 0, 22, 0, UNI_INSC__CONSONANTPREFIXED } /* insc=consonantprefixed */, + { 0, 3070, 5564, 3, 11, UNI_SMALLKANAEXT } /* insmallkanaext */, + { 2, 4586, 518, 17, 4, UNI_VAI } /* scriptextensions=vaii */, + { 0, 3903, 2709, 3, 10, UNI_LB__WJ } /* lb=wordjoiner */, + { 0, 2429, 863, 6, 7, UNI_SC__SHAW } /* block=shavian */, + { 0, 2607, 6907, 3, 21, UNI_MISCTECHNICAL } /* ismiscellaneoustechnical */, + { 0, 1971, 383, 11, 4, UNI_BIDIC } /* bidicontrol=yes */, + { 0, 5306, 3565, 9, 3, UNI_WB__EX } /* wordbreak=ex */, + { 0, 9030, 8808, 18, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* block=supplementalsymbolsandpictographs */, + { 1, 8226, 4974, 16, 18, UNI_ZP } /* generalcategory=paragraphseparator */, + { 72, 135, 98, 2, 4, UNI_HLUW } /* ishluw */, + { 2, 8233, 246, 9, 2, UNI_PE } /* category=pe */, + { 4, 885, 0, 7, 0, UNI_TGLG } /* tagalog */, + { 0, 15, 4953, 2, 3, UNI_AGE__6 } /* age=6 */, + { 0, 1141, 286, 4, 5, UNI_GARA } /* scx=garay */, + { 18, 2429, 892, 6, 7, UNI_INTAITHAM } /* block=taitham */, + { 1, 368, 1391, 5, 2, UNI_CCC__132 } /* ccc=132 */, + { 2, 2429, 8061, 6, 19, UNI_INEGYPTIANHIEROGLYPHS } /* block=egyptianhieroglyphs */, + { 0, 6597, 87, 4, 2, UNI_BC__LRE } /* bc=lre */, + { 0, 1971, 653, 5, 2, -UNI_BIDIC } /* bidic=n */, + { 1, 135, 1671, 2, 2, UNI_LOWERCASELETTER } /* isll */, + { 1, 6164, 2130, 10, 2, UNI_LB__H3 } /* linebreak=h3 */, + { 2, 4586, 4649, 17, 6, UNI_ZYYY } /* scriptextensions=common */, + { 1, 2021, 638, 11, 3, UNI_GRBASE } /* graphemebase=t */, + { 2, 1911, 482, 7, 4, UNI_PHLI } /* script=phli */, + { 2, 333, 2315, 2, 4, UNI_IN__6_DOT_2 } /* in=6.2 */, + { 6, 1911, 947, 7, 8, UNI_BALI } /* script=balinese */, + { 5, 6928, 3370, 5, 10, UNI_INPC__OVERSTRUCK } /* inpc=overstruck */, + { 8, 3257, 3478, 5, 14, UNI_INMEROITICCURSIVE } /* blk=meroiticcursive */, + { 14, 2824, 4693, 8, 6, UNI_ARABICEXTC } /* blk=arabicextc */, + { 37, 4305, 653, 4, 3, -UNI_DASH } /* dash=no */, + { 2, 3867, 1249, 12, 3, UNI_JG__MALAYALAMNGA } /* jg=malayalamnga */, + { 0, 5306, 1952, 10, 8, UNI_WB__EB } /* wordbreak=ebasegaz */, + { 72, 4586, 1432, 17, 4, UNI_PALM } /* scriptextensions=palm */, + { 0, 4586, 0, 17, 0, UNI_scx_values_index } /* scriptextensions= */, + { 1, 438, 0, 2, 0, UNI_DI } /* di */, + { 1, 333, 5194, 2, 14, UNI_INHANIFIROHINGYA } /* inhanifirohingya */, + { 0, 3726, 653, 4, 3, -UNI_IDSU } /* idsu=no */, + { 0, 2624, 1547, 6, 5, UNI_XPOSIXSPACE } /* xposixspace */, + { 36, 1141, 2827, 3, 7, UNI_ARAB } /* scx=arabic */, + { 0, 1141, 737, 4, 5, UNI_TAYO } /* scx=taiyo */, + { 4, 135, 1016, 2, 4, UNI_HIRA } /* ishira */, + { 0, 409, 972, 5, 2, -UNI_GREXT } /* grext=f */, + { 1, 4586, 6222, 17, 4, UNI_SINH } /* scriptextensions=sinh */, + { 24, 4586, 1552, 17, 8, UNI_BUGI } /* scriptextensions=buginese */, + { 0, 2429, 1156, 6, 8, UNI_INTAGBANWA } /* block=tagbanwa */, + { 3, 1141, 458, 4, 3, UNI_MRO } /* scx=mro */, + { 1, 4586, 1408, 17, 4, UNI_PERM } /* scriptextensions=perm */, + { 0, 5088, 3753, 9, 11, UNI_KANGXI } /* block=kangxiradicals */, + { 6, 1346, 8607, 3, 24, UNI_DIACRITICALS } /* iscombiningdiacriticalmarks */, + { 1, 3521, 374, 13, 2, UNI_NV__31 } /* numericvalue=31 */, + { 5, 4956, 844, 14, 4, UNI_ORNAMENTALDINGBATS } /* ornamentaldingbats */, + { 0, 695, 0, 5, 0, UNI_GCB__L } /* hst=l */, + { 1, 1733, 6264, 4, 21, UNI_YIJING } /* blk=yijinghexagramsymbols */, + { 0, 8639, 2812, 23, 6, UNI_INPC__RIGHT } /* indicpositionalcategory=right */, + { 0, 1254, 2045, 3, 9, UNI_COMPATJAMO } /* incompatjamo */, + { 2, 135, 286, 2, 5, UNI_GARA } /* isgaray */, + { 65, 6464, 2872, 3, 6, UNI_SC__COPT } /* sc=coptic */, + { 5, 1781, 4366, 3, 14, UNI_PS } /* isopenpunctuation */, + { 4, 177, 0, 4, 0, UNI_PHLP } /* phlp */, + { 0, 8233, 54, 9, 2, UNI_SC } /* category=sc */, + { 14, 333, 1652, 2, 10, UNI_INSAURASHTRA } /* insaurashtra */, + { 2, 135, 2349, 2, 8, UNI_PHAISTOS } /* isphaistos */, + { 0, 135, 3453, 2, 4, UNI_HEBR } /* ishebr */, + { 4, 954, 382, 4, 2, UNI_ebase_values_index } /* ebase= */, + { 6, 6342, 4673, 14, 9, UNI_ETHIOPICEXTB } /* block=ethiopicextendedb */, + { 17, 6164, 2699, 10, 10, UNI_LB__NS } /* linebreak=nonstarter */, + { 24, 6164, 197, 10, 2, UNI_LB__SA } /* linebreak=sa */, + { 0, 6464, 5177, 3, 7, UNI_SC__SHRD } /* sc=sharada */, + { 0, 333, 5546, 2, 8, UNI_INCHEROKEE } /* incherokee */, + { 0, 135, 3794, 2, 14, UNI_DEVANAGARIEXTA } /* isdevanagariexta */, + { 28, 6464, 213, 3, 4, UNI_TAVT } /* sc=tavt */, + { 0, 6464, 1180, 3, 8, UNI_VITH } /* sc=vithkuqi */, + { 0, 2373, 414, 10, 3, UNI_IN__3_DOT_2 } /* presentin=3.2 */, + { 2, 1698, 0, 10, 0, UNI_WARA } /* warangciti */, + { 0, 6462, 7266, 14, 11, UNI_INSC__CONSONANTWITHSTACKER } /* insc=consonantwithstacker */, + { 0, 977, 383, 5, 4, UNI_ECOMP } /* ecomp=yes */, + { 1, 729, 2382, 3, 3, UNI_AGE__14 } /* age=14 */, + { 2, 1911, 130, 7, 4, UNI_SC__LATN } /* script=latn */, + { 2, 1141, 1129, 4, 4, UNI_LINB } /* scx=linb */, + { 0, 2561, 2564, 3, 10, UNI_IPAEXT } /* ipaextensions */, + { 2, 676, 652, 6, 3, -UNI_EXTPICT } /* extpict=n */, + { 1, 4999, 2677, 9, 4, -UNI_XPOSIXSPACE } /* whitespace=no */, + { 1, 368, 1392, 4, 3, UNI_WB__EB } /* ccc=200 */, + { 20, 42, 6556, 2, 8, UNI_SB__NU } /* sb=numeric */, + { 8, 2824, 4822, 10, 9, UNI_ARABICEXTC } /* blk=arabicextendedc */, + { 2, 1982, 383, 5, 2, UNI_BIDIM } /* bidim=y */, + { 0, 7846, 653, 10, 2, -UNI_XPOSIXALPHA } /* alphabetic=n */, + { 3, 1733, 5430, 5, 17, UNI_HALFMARKS } /* blk=combininghalfmarks */, + { 15, 5043, 0, 4, 0, UNI_BAMU } /* bamu */, + { 0, 537, 0, 6, 0, UNI_KHOJ } /* khojki */, + { 0, 2429, 6097, 6, 9, UNI_INMONGOLIAN } /* block=mongolian */, + { 0, 2810, 83, 3, 2, UNI_BC__ON } /* bc=on */, + { 4, 1112, 314, 5, 1, UNI_NV__1_SLASH_4 } /* nv=1/4 */, + { 0, 583, 0, 3, 0, UNI_sb_values_index } /* sb= */, + { 5, 7322, 2315, 23, 2, UNI_CCC__6 } /* canonicalcombiningclass=6 */, + { 6, 8226, 3216, 16, 5, UNI_XPOSIXDIGIT } /* generalcategory=digit */, + { 0, 293, 639, 3, 2, UNI_GCB__T } /* gcb=t */, + { 1, 8280, 7672, 27, 3, UNI_CJKEXTB } /* cjkunifiedideographsextensionb */, + { 3, 2810, 4634, 3, 15, UNI_BC__BN } /* bc=boundaryneutral */, + { 25, 1642, 0, 10, 0, UNI_PHNX } /* phoenician */, + { 10, 7978, 0, 21, 0, UNI_LB__H2 } /* hangulsyllabletype=lv */, + { 1, 1911, 4887, 7, 4, UNI_SC__TALE } /* script=tale */, + { 0, 1911, 1368, 7, 9, UNI_NBAT } /* script=nabataean */, + { 12, 135, 1172, 2, 8, UNI_UGAR } /* isugaritic */, + { 3, 2635, 7633, 3, 10, UNI_JG__TEHMARBUTA } /* jg=tehmarbuta */, + { 1, 543, 438, 2, 2, UNI_LYDI } /* lydi */, + { 0, 6737, 750, 13, 4, UNI_JG__SEEN } /* joininggroup=seen */, + { 3, 16, 6598, 1, 3, UNI_L } /* gc=l */, + { 6, 4335, 0, 15, 0, UNI_INHANGUL } /* hangulsyllables */, + { 3, 5845, 3565, 20, 7, UNI_GCB__EX } /* graphemeclusterbreak=extend */, + { 5, 138, 0, 2, 0, UNI_ME } /* me */, + { 0, 5954, 2785, 3, 12, UNI_VERTICALFORMS } /* inverticalforms */, + { 0, 135, 1322, 2, 4, UNI_SOYO } /* issoyo */, + { 0, 2635, 4419, 3, 4, UNI_JG__KAPH } /* jg=kaph */, + { 0, 6464, 4335, 3, 4, UNI_SC__HANG } /* sc=hang */, + { 1, 3991, 417, 15, 1, UNI_NV__5_SLASH_6 } /* numericvalue=5/6 */, + { 3, 3136, 420, 4, 2, UNI_IN__4_DOT_1 } /* in=v41 */, + { 0, 135, 6987, 2, 14, UNI_LM } /* ismodifierletter */, + { 4, 587, 0, 4, 0, UNI_TANG } /* tang */, + { 7, 5009, 0, 4, 0, UNI_RUMI } /* rumi */, + { 2, 135, 133, 2, 2, UNI_NL } /* isnl */, + { 23, 1911, 126, 7, 3, UNI_LAO } /* script=lao */, + { 16, 2810, 296, 2, 2, UNI_BC__B } /* bc=b */, + { 1, 2081, 327, 3, 4, UNI__PERL_PATWS } /* ispatws */, + { 0, 7804, 604, 27, 2, UNI_CCC__13 } /* canonicalcombiningclass=ccc13 */, + { 1, 6464, 1552, 3, 8, UNI_SC__BUGI } /* sc=buginese */, + { 5, 4586, 142, 17, 4, UNI_MERC } /* scriptextensions=merc */, + { 0, 362, 0, 6, 0, UNI_CARI } /* carian */, + { 0, 8233, 585, 8, 2, UNI_S } /* category=s */, + { 0, 2, 0, 1, 0, UNI_C } /* c */, + { 0, 8765, 7266, 31, 11, UNI_INSC__CONSONANTWITHSTACKER } /* indicsyllabiccategory=consonantwithstacker */, + { 0, 3521, 6580, 13, 9, UNI_NV__3_SLASH_80 } /* numericvalue=3.750e-02 */, + { 0, 1911, 346, 7, 4, UNI_SC__TAKR } /* script=takr */, + { 0, 2824, 6492, 8, 5, UNI_ARABICSUP } /* blk=arabicsup */, + { 0, 368, 6598, 2, 3, UNI_CCC__L } /* ccc=l */, + { 3, 3331, 0, 14, 0, UNI_GREXT } /* graphemeextend */, + { 2, 30, 54, 1, 5, UNI_CHAM } /* ischam */, + { 0, 2607, 0, 3, 0, UNI_M } /* ism */, + { 0, 6203, 653, 5, 2, -UNI__PERL_NCHAR } /* nchar=n */, + { 0, 2097, 4731, 11, 2, UNI_JT__U } /* joiningtype=u */, + { 9, 7, 6537, 2, 20, UNI_mcm_values_index } /* modifiercombiningmark= */, + { 1, 933, 422, 5, 2, UNI_AGE__5_DOT_1 } /* age=v51 */, + { 18, 2, 5902, 1, 18, UNI_COUNTINGROD } /* countingrodnumerals */, + { 0, 2429, 1368, 6, 9, UNI_INNABATAEAN } /* block=nabataean */, + { 0, 7900, 4476, 5, 12, UNI_LB__SA } /* lb=complexcontext */, + { 2, 1498, 422, 8, 1, UNI_CCC__15 } /* ccc=ccc15 */, + { 0, 3976, 4566, 14, 3, UNI_NV__13_SLASH_2 } /* numericvalue=13/2 */, + { 0, 3304, 5597, 15, 9, UNI_EA__A } /* eastasianwidth=ambiguous */, + { 0, 933, 319, 5, 2, UNI_AGE__9 } /* age=v90 */, + { 0, 779, 2637, 2, 2, UNI_EA__A } /* ea=a */, + { 5, 1733, 824, 4, 7, UNI_INOSMANYA } /* blk=osmanya */, + { 0, 2108, 382, 10, 3, UNI_KEHNOROTATE } /* kehnorotate=y */, + { 25, 2429, 4219, 6, 15, UNI_BRAI } /* block=braillepatterns */, + { 0, 6484, 0, 20, 0, UNI_GLAGOLITICSUP } /* glagoliticsupplement */, + { 0, 8226, 54, 16, 2, UNI_SC } /* generalcategory=sc */, + { 1, 913, 639, 5, 5, UNI_UIDEO } /* uideo=true */, + { 0, 1523, 383, 3, 2, UNI_DEP } /* dep=y */, + { 1, 6382, 0, 13, 0, UNI_MATHOPERATORS } /* mathoperators */, + { 0, 8639, 4266, 24, 12, UNI_INPC__LEFTANDRIGHT } /* indicpositionalcategory=leftandright */, + { 2, 1141, 3248, 3, 5, UNI_GEOR } /* scx=geor */, + { 0, 6462, 6971, 14, 10, UNI_INSC__CONSONANTHEADLETTER } /* insc=consonantheadletter */, + { 0, 554, 423, 5, 2, UNI_NV__3_SLASH_16 } /* nv=3/16 */, + { 1, 566, 382, 2, 3, UNI_LOE } /* loe=y */, + { 12, 1911, 3535, 7, 15, UNI_NARB } /* script=oldnortharabian */, + { 2, 2081, 2021, 7, 5, UNI_POSIXGRAPH } /* isposixgraph */, + { 0, 1733, 286, 4, 5, UNI_INGARAY } /* blk=garay */, + { 0, 333, 955, 2, 8, UNI_INBASSAVAH } /* inbassavah */, + { 2, 5318, 2409, 15, 8, UNI__PERL_CHARNAME_CONTINUE } /* _perl_charname_continue */, + { 0, 7674, 3849, 10, 14, UNI_BC__NSM } /* bidiclass=nonspacingmark */, + { 1, 6737, 754, 13, 4, UNI_JG__SHIN } /* joininggroup=shin */, + { 0, 135, 5782, 2, 21, UNI_CWL } /* ischangeswhenlowercased */, + { 6, 322, 653, 2, 3, -UNI_RI } /* ri=no */, + { 1, 1678, 0, 10, 0, UNI_SD } /* softdotted */, + { 35, 135, 142, 2, 4, UNI_MERC } /* ismerc */, + { 2, 135, 3780, 2, 11, UNI_PHONETICEXT } /* isphoneticext */, + { 2, 1562, 6103, 5, 6, UNI_GEORGIANSUP } /* georgiansup */, + { 2, 283, 383, 3, 4, UNI_CWT } /* cwt=yes */, + { 14, 30, 4531, 1, 2, UNI_Z } /* isz */, + { 0, 135, 2932, 2, 5, UNI_KHMR } /* iskhmer */, + { 26, 3950, 0, 10, 0, UNI_SM } /* mathsymbol */, + { 5, 135, 5528, 2, 18, UNI_TAIXUANJING } /* istaixuanjingsymbols */, + { 0, 4586, 2134, 17, 12, UNI_GONM } /* scriptextensions=masaramgondi */, + { 0, 3903, 6523, 3, 12, UNI_LB__SY } /* lb=breaksymbols */, + { 0, 7176, 653, 24, 3, -UNI_COMPEX } /* fullcompositionexclusion=no */, + { 1, 6464, 23, 3, 4, UNI_AHOM } /* sc=ahom */, + { 1, 3331, 653, 14, 2, -UNI_GREXT } /* graphemeextend=n */, + { 35, 925, 6572, 5, 3, UNI_AGE__15_DOT_1 } /* age=15.1 */, + { 28, 5761, 972, 21, 2, -UNI_CWCM } /* changeswhencasemapped=f */, + { 0, 333, 824, 2, 7, UNI_INOSMANYA } /* inosmanya */, + { 19, 2922, 7552, 3, 10, UNI_ENCLOSEDCJK } /* isenclosedcjk */, + { 3, 135, 2596, 2, 5, UNI_JOINC } /* isjoinc */, + { 40, 135, 7398, 2, 24, UNI_ARABICPFB } /* isarabicpresentationformsb */, + { 1, 1911, 3260, 6, 8, UNI_SC__MYMR } /* script=myanmar */, + { 1, 4586, 984, 17, 4, UNI_DUPL } /* scriptextensions=dupl */, + { 1, 333, 732, 2, 5, UNI_INRUNIC } /* inrunic */, + { 1, 6464, 1265, 3, 7, UNI_SC__GRAN } /* sc=grantha */, + { 0, 8089, 639, 17, 2, UNI_VS } /* variationselector=t */, + { 8, 4586, 1603, 17, 10, UNI_KHAR } /* scriptextensions=kharoshthi */, + { 0, 1733, 2440, 4, 13, UNI_BLOCKELEMENTS } /* blk=blockelements */, + { 3, 3257, 1875, 5, 10, UNI_INMEDEFAIDRIN } /* blk=medefaidrin */, + { 0, 438, 653, 2, 2, -UNI_DI } /* di=n */, + { 0, 5866, 7151, 15, 16, UNI_IDENTIFIERTYPE__DEFAULTIGNORABLE } /* identifiertype=defaultignorable */, + { 0, 6464, 118, 3, 4, UNI_SC__KNDA } /* sc=knda */, + { 1, 2944, 0, 7, 0, UNI_MAHJONG } /* mahjong */, + { 0, 3764, 0, 11, 0, UNI_LATINEXTE } /* inlatinexte */, + { 8, 2313, 6577, 8, 4, UNI_NV__1_SLASH_160 } /* nv=6.250e-03 */, + { 1, 3867, 5724, 12, 3, UNI_JG__MALAYALAMTTA } /* jg=malayalamtta */, + { 2, 4350, 638, 8, 6, UNI_XPOSIXLOWER } /* lowercase=true */, + { 24, 3477, 0, 4, 0, UNI_MERO } /* mero */, + { 8, 1733, 8862, 4, 35, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* blk=symbolsforlegacycomputingsupplement */, + { 1, 333, 1016, 2, 8, UNI_INHIRAGANA } /* inhiragana */, + { 4, 8226, 106, 16, 2, UNI_ZL } /* generalcategory=zl */, + { 1, 7978, 935, 17, 3, UNI_HST__V } /* hangulsyllabletype=v */, + { 8, 316, 2181, 3, 2, UNI_NV__25 } /* nv=25 */, + { 39, 6464, 918, 3, 7, UNI_ZZZZ } /* sc=unknown */, + { 0, 1911, 8061, 7, 4, UNI_EGYP } /* script=egyp */, + { 2, 1470, 972, 8, 2, -UNI_XIDS } /* xidstart=f */, + { 108, 3070, 7595, 3, 24, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* insymbolsandpictographsexta */, + { 8, 1141, 892, 4, 7, UNI_LANA } /* scx=taitham */, + { 0, 5306, 1717, 9, 8, UNI_WB__NL } /* wordbreak=newline */, + { 5, 333, 2088, 2, 6, UNI_INSYRIAC } /* insyriac */, + { 0, 6164, 2128, 10, 2, UNI_LB__BK } /* linebreak=bk */, + { 1, 6737, 5234, 13, 6, UNI_JG__YUDHHE } /* joininggroup=yudhhe */, + { 0, 554, 1388, 4, 3, UNI_NV__3000 } /* nv=3000 */, + { 0, 30, 4248, 1, 18, UNI_INDICSIYAQNUMBERS } /* isindicsiyaqnumbers */, + { 0, 2587, 404, 3, 5, UNI_GOTH } /* isgothic */, + { 42, 2429, 286, 6, 5, UNI_INGARAY } /* block=garay */, + { 0, 6039, 0, 21, 0, UNI_SUPARROWSB } /* insupplementalarrowsb */, + { 1, 2273, 0, 12, 0, UNI_NV__5_SLASH_12 } /* nv=4.167e-01 */, + { 0, 1044, 653, 2, 2, -UNI_CI } /* ci=n */, + { 0, 4051, 653, 16, 2, -UNI_STERM } /* sentenceterminal=n */, + { 0, 6442, 0, 20, 0, UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue */, + { 1, 1141, 947, 4, 4, UNI_BALI } /* scx=bali */, + { 0, 1141, 4219, 4, 4, UNI_BRAI } /* scx=brai */, + { 0, 5866, 7385, 15, 11, UNI_IDENTIFIERTYPE__UNCOMMONUSE } /* identifiertype=uncommonuse */, + { 0, 2429, 7107, 6, 18, UNI_DEVANAGARIEXT } /* block=devanagariextended */, + { 9, 5318, 6285, 6, 16, UNI__PERL_WORD_BUT_NONCONT } /* _perl_word_but_noncont */, + { 0, 8366, 5572, 22, 10, UNI_CJKEXTD } /* iscjkunifiedideographsextensiond */, + { 2, 8639, 8963, 23, 15, UNI_INPC__BOTTOMANDRIGHT } /* indicpositionalcategory=bottomandright */, + { 2, 4406, 4394, 13, 4, UNI_JG__MANICHAEANBETH } /* jg=manichaeanbeth */, + { 13, 2635, 4898, 3, 3, UNI_JG__SAD } /* jg=sad */, + { 0, 1733, 8, 4, 3, UNI_OCR } /* blk=ocr */, + { 3, 5782, 0, 21, 0, UNI_CWL } /* changeswhenlowercased */, + { 1, 4350, 4729, 3, 3, UNI_lower_values_index } /* lower= */, + { 0, 1141, 478, 4, 4, UNI_ORKH } /* scx=orkh */, + { 145, 135, 430, 2, 4, UNI_TOTO } /* istoto */, + { 0, 683, 638, 5, 6, UNI_GRBASE } /* grbase=true */, + { 34, 6369, 1070, 13, 4, UNI_MYANMAREXTB } /* block=myanmarextb */, + { 6, 508, 1232, 2, 4, UNI_DT__NAR } /* dt=nar */, + { 1, 6464, 839, 3, 4, UNI_LANA } /* sc=lana */, + { 38, 135, 442, 2, 4, UNI_GONM } /* isgonm */, + { 0, 4732, 383, 5, 2, UNI_XPOSIXUPPER } /* upper=y */, + { 0, 3070, 4873, 3, 8, UNI_SYRIACSUP } /* insyriacsup */, + { 23, 1471, 972, 7, 2, -UNI_IDS } /* idstart=f */, + { 2, 6737, 3886, 13, 3, UNI_JG__TAW } /* joininggroup=taw */, + { 1, 94, 0, 4, 0, UNI_GUKH } /* gukh */, + { 0, 1141, 1164, 4, 8, UNI_TFNG } /* scx=tifinagh */, + { 0, 135, 193, 2, 4, UNI_RUNR } /* isrunr */, + { 0, 876, 0, 2, 0, UNI__PERL_SURROGATE } /* cs */, + { 0, 5845, 305, 21, 2, UNI_GCB__XX } /* graphemeclusterbreak=xx */, + { 1, 8233, 337, 9, 4, UNI_M } /* category=mark */, + { 0, 877, 639, 5, 2, UNI_STERM } /* sterm=t */, + { 0, 135, 1294, 2, 4, UNI_MULT } /* ismult */, + { 0, 2824, 7854, 8, 20, UNI_ARABICPFA } /* blk=arabicpresentationformsa */, + { 15553, 6464, 712, 3, 4, UNI_SC__DOGR } /* sc=dogr */, + { 2, 6464, 249, 3, 4, UNI_XSUX } /* sc=xsux */, + { 10, 6737, 3421, 13, 7, UNI_JG__SEMKATH } /* joininggroup=semkath */, + { 4, 135, 170, 2, 4, UNI_OUGR } /* isougr */, + { 6, 561, 4005, 4, 2, UNI_NV__7_SLASH_8 } /* nv=7/8 */, + { 0, 3780, 2564, 8, 10, UNI_PHONETICEXT } /* phoneticextensions */, + { 1, 933, 422, 6, 2, UNI_AGE__15_DOT_1 } /* age=v151 */, + { 26, 2325, 2265, 4, 8, UNI_NV__7_SLASH_8 } /* nv=8.750e-01 */, + { 0, 54, 4667, 2, 6, UNI_SC__LATN } /* sc=latin */, + { 0, 7322, 421, 24, 2, UNI_CCC__15 } /* canonicalcombiningclass=15 */, + { 0, 368, 636, 5, 2, UNI_CCC__122 } /* ccc=122 */, + { 16, 6164, 4502, 10, 14, UNI_LB__PO } /* linebreak=postfixnumeric */, + { 8, 8175, 972, 11, 2, -UNI_IDEO } /* ideographic=f */, + { 1, 6462, 5970, 5, 16, UNI_LB__VF } /* insc=reorderingkiller */, + { 9, 7322, 2258, 25, 2, UNI_CCC__DB } /* canonicalcombiningclass=233 */, + { 3, 4586, 6433, 17, 9, UNI_XSUX } /* scriptextensions=cuneiform */, + { 0, 6464, 3477, 3, 15, UNI_MERC } /* sc=meroiticcursive */, + { 0, 438, 972, 3, 2, -UNI_DIA } /* dia=f */, + { 0, 2635, 1353, 3, 6, UNI_JG__LAMADH } /* jg=lamadh */, + { 0, 1141, 1060, 4, 4, UNI_YEZI } /* scx=yezi */, + { 4, 3726, 383, 4, 4, UNI_IDSU } /* idsu=yes */, + { 0, 2635, 6757, 3, 3, UNI_JG__QAF } /* jg=qaf */, + { 3, 2081, 4732, 7, 5, UNI_POSIXUPPER } /* isposixupper */, + { 0, 43, 0, 4, 0, UNI_BUHD } /* buhd */, + { 55306, 368, 9077, 4, 10, UNI_CCC__AR } /* ccc=aboveright */, + { 1, 683, 382, 5, 3, UNI_GRBASE } /* grbase=y */, + { 0, 135, 4649, 2, 6, UNI_ZYYY } /* iscommon */, + { 9, 4219, 0, 15, 0, UNI_BRAI } /* braillepatterns */, + { 2, 6097, 0, 12, 0, UNI_MONGOLIANSUP } /* mongoliansup */, + { 0, 3976, 2180, 14, 8, UNI_NV__1_SLASH_8 } /* numericvalue=1.250e-01 */, + { 1, 71, 383, 3, 2, UNI_CWU } /* cwu=y */, + { 4, 554, 5612, 4, 5, UNI_NV__300000 } /* nv=300000 */, + { 1, 4553, 4035, 15, 2, UNI_NV__3_SLASH_80 } /* numericvalue=3/80 */, + { 0, 5845, 269, 21, 2, UNI_GCB__CN } /* graphemeclusterbreak=cn */, + { 4, 4586, 955, 17, 8, UNI_BASS } /* scriptextensions=bassavah */, + { 5, 135, 4732, 2, 5, UNI_XPOSIXUPPER } /* isupper */, + { 24, 947, 0, 8, 0, UNI_BALI } /* balinese */, + { 2, 878, 639, 4, 2, UNI_TERM } /* term=t */, + { 1, 6737, 7633, 13, 10, UNI_JG__TEHMARBUTA } /* joininggroup=tehmarbuta */, + { 3, 8226, 99, 16, 2, UNI_UPPERCASELETTER } /* generalcategory=lu */, + { 17, 2407, 638, 9, 6, UNI_IDC } /* idcontinue=true */, + { 3, 1465, 3168, 3, 11, UNI_WB__DQ } /* wb=doublequote */, + { 0, 1141, 947, 4, 8, UNI_BALI } /* scx=balinese */, + { 0, 3903, 5597, 3, 9, UNI_LB__AI } /* lb=ambiguous */, + { 1, 5782, 972, 21, 6, -UNI_CWL } /* changeswhenlowercased=false */, + { 0, 7445, 653, 26, 3, -UNI_PCM } /* prependedconcatenationmark=no */, + { 0, 135, 438, 2, 4, UNI_DIAK } /* isdiak */, + { 81, 4586, 217, 17, 4, UNI_TFNG } /* scriptextensions=tfng */, + { 57, 26, 793, 3, 4, UNI_MARC } /* marchen */, + { 34, 712, 0, 4, 0, UNI_DOGR } /* dogr */, + { 0, 2003, 7158, 4, 9, UNI_CI } /* caseignorable */, + { 18, 1301, 0, 7, 0, UNI_NB } /* noblock */, + { 1, 5318, 3199, 6, 9, UNI__PERL_QUOTEMETA } /* _perl_quotemeta */, + { 0, 1260, 8930, 3, 23, UNI_CJKCOMPATIDEOGRAPHS } /* cjkcompatibilityideographs */, + { 1, 1733, 3742, 7, 6, UNI_CJKCOMPAT } /* blk=cjkcompat */, + { 0, 914, 972, 4, 6, -UNI_IDEO } /* ideo=false */, + { 0, 4586, 1907, 17, 4, UNI_KTHI } /* scriptextensions=kthi */, + { 1, 3976, 5612, 14, 9, UNI_NV__1000000000 } /* numericvalue=1000000000 */, + { 5, 8732, 7671, 32, 4, UNI_CJKEXTB } /* block=cjkunifiedideographsextensionb */, + { 0, 3903, 4502, 3, 14, UNI_LB__PO } /* lb=postfixnumeric */, + { 0, 1230, 658, 3, 4, UNI_EA__W } /* ea=wide */, + { 1, 1141, 900, 5, 6, UNI_TAVT } /* scx=taiviet */, + { 2, 35, 0, 4, 0, UNI_BATK } /* batk */, + { 16, 632, 2383, 5, 2, UNI_CCC__214 } /* ccc=214 */, + { 1, 1254, 8395, 3, 15, UNI_CUNEIFORMNUMBERS } /* incuneiformnumbers */, + { 27, 316, 928, 2, 3, UNI_NV__10 } /* nv=10 */, + { 9, 2453, 638, 12, 6, UNI_CI } /* caseignorable=true */, + { 12, 5, 639, 3, 2, UNI_MCM } /* mcm=t */, + { 0, 4586, 4623, 17, 11, UNI_SGNW } /* scriptextensions=signwriting */, + { 0, 2429, 8089, 6, 18, UNI_INVS } /* block=variationselectors */, + { 2, 7957, 3098, 18, 5, UNI_DT__FIN } /* decompositiontype=final */, + { 49, 333, 5546, 2, 18, UNI_CHEROKEESUP } /* incherokeesupplement */, + { 26, 333, 2932, 2, 5, UNI_INKHMER } /* inkhmer */, + { 30, 663, 3565, 2, 3, UNI_LB__EX } /* lb=ex */, + { 3, 333, 1191, 2, 9, UNI_INBERIAERFE } /* inberiaerfe */, + { 0, 1733, 1054, 4, 6, UNI_INWANCHO } /* blk=wancho */, + { 0, 6356, 3770, 13, 9, UNI_GEORGIANEXT } /* block=georgianextended */, + { 81, 877, 639, 5, 5, UNI_STERM } /* sterm=true */, + { 5, 6135, 5299, 14, 7, UNI_SUPARROWSA } /* issupplementalarrowsa */, + { 3, 7695, 566, 11, 2, UNI_BC__RLO } /* bidiclass=rlo */, + { 0, 1141, 3453, 4, 4, UNI_HEBR } /* scx=hebr */, + { 6, 409, 383, 5, 4, UNI_GREXT } /* grext=yes */, + { 4, 3245, 5447, 6, 16, UNI_INPUNCTUATION } /* blk=generalpunctuation */, + { 15, 21, 7552, 1, 26, UNI_ENCLOSEDCJK } /* enclosedcjklettersandmonths */, + { 0, 6464, 5194, 3, 14, UNI_SC__ROHG } /* sc=hanifirohingya */, + { 1, 2002, 0, 4, 0, UNI_UCAS } /* ucas */, + { 14, 8226, 698, 15, 2, UNI_L } /* generalcategory=l */, + { 1, 4664, 0, 13, 0, UNI_LATINEXTE } /* blk=latinexte */, + { 1, 3590, 0, 15, 0, UNI_ZANB } /* zanabazarsquare */, + { 6, 1141, 193, 4, 4, UNI_RUNR } /* scx=runr */, + { 0, 651, 4765, 3, 4, UNI_DT__INIT } /* dt=init */, + { 26, 4586, 4783, 17, 7, UNI_LINB } /* scriptextensions=linearb */, + { 2, 8233, 4305, 9, 15, UNI_PD } /* category=dashpunctuation */, + { 0, 1141, 249, 4, 4, UNI_XSUX } /* scx=xsux */, + { 2, 2858, 4309, 3, 11, UNI_P } /* gc=punctuation */, + { 0, 2236, 5612, 4, 7, UNI_NV__20000000 } /* nv=20000000 */, + { 0, 1911, 1789, 7, 4, UNI_SC__GURU } /* script=guru */, + { 1, 8117, 2094, 23, 3, UNI_JG__MANICHAEANWAW } /* joininggroup=manichaeanwaw */, + { 4, 31, 0, 4, 0, UNI_AVST } /* avst */, + { 1, 1911, 1405, 7, 9, UNI_SC__PERM } /* script=oldpermic */, + { 52, 1733, 8829, 5, 34, UNI_DIACRITICALSFORSYMBOLS } /* blk=combiningdiacriticalmarksforsymbols */, + { 1, 333, 1000, 2, 8, UNI_INGUJARATI } /* ingujarati */, + { 10, 135, 1941, 2, 4, UNI_SYLO } /* issylo */, + { 0, 135, 1577, 2, 4, UNI_JAVA } /* isjava */, + { 9, 1952, 0, 5, 0, UNI_EBASE } /* ebase */, + { 2, 1818, 5564, 3, 17, UNI_SMALLKANAEXT } /* issmallkanaextension */, + { 0, 6464, 662, 3, 7, UNI_SC__ELBA } /* sc=elbasan */, + { 0, 7445, 972, 26, 2, -UNI_PCM } /* prependedconcatenationmark=f */, + { 8, 7804, 2181, 27, 2, UNI_CCC__25 } /* canonicalcombiningclass=ccc25 */, + { 4, 135, 6634, 2, 6, UNI_CF } /* isformat */, + { 1, 1470, 972, 8, 6, -UNI_XIDS } /* xidstart=false */, + { 1, 2596, 639, 5, 5, UNI_JOINC } /* joinc=true */, + { 1, 7176, 0, 24, 0, UNI_COMPEX } /* fullcompositionexclusion */, + { 5, 368, 6638, 4, 4, UNI_WB__EB } /* ccc=atbl */, + { 0, 1733, 2872, 4, 6, UNI_INCOPTIC } /* blk=coptic */, + { 2, 1911, 474, 7, 4, UNI_SC__ONAO } /* script=onao */, + { 2, 1141, 790, 4, 7, UNI_MARC } /* scx=marchen */, + { 88, 2587, 2034, 3, 11, UNI_GONG } /* isgunjalagondi */, + { 6, 2429, 6710, 9, 11, UNI_CJKRADICALSSUP } /* block=cjkradicalssup */, + { 3, 2635, 6749, 2, 11, UNI_JG__AFRICANQAF } /* jg=africanqaf */, + { 1, 135, 2721, 2, 9, UNI__PERL_SURROGATE } /* issurrogate */, + { 0, 1847, 0, 11, 0, UNI_KEHNOMIRROR } /* kehnomirror */, + { 34, 3808, 139, 13, 3, UNI_LATINEXTF } /* islatinextendedf */, + { 7, 1230, 17, 3, 1, UNI_EA__H } /* ea=h */, + { 0, 8765, 2903, 22, 9, UNI_INSC__NONJOINER } /* indicsyllabiccategory=nonjoiner */, + { 5, 6135, 1336, 6, 3, UNI_SUPPUAB } /* issuppuab */, + { 0, 1733, 3355, 4, 15, UNI_INIMPERIALARAMAIC } /* blk=imperialaramaic */, + { 0, 135, 8089, 2, 17, UNI_VS } /* isvariationselector */, + { 37, 1260, 1516, 3, 7, UNI_CJKSTROKES } /* cjkstrokes */, + { 4, 571, 383, 6, 4, UNI_PATSYN } /* patsyn=yes */, + { 0, 135, 3653, 2, 16, UNI_CYPRIOTSYLLABARY } /* iscypriotsyllabary */, + { 0, 6201, 639, 21, 5, UNI__PERL_NCHAR } /* noncharactercodepoint=true */, + { 0, 20, 972, 3, 2, -UNI_XPOSIXXDIGIT } /* hex=f */, + { 1, 1733, 7760, 4, 16, UNI_TANGUTCOMPONENTS } /* blk=tangutcomponents */, + { 2, 1733, 1200, 4, 9, UNI_INBHAIKSUKI } /* blk=bhaiksuki */, + { 0, 632, 416, 5, 2, UNI_CCC__R } /* ccc=226 */, + { 1, 1733, 81, 9, 2, UNI_CJKEXTG } /* blk=cjkextg */, + { 1, 9030, 5299, 18, 7, UNI_SUPARROWSA } /* block=supplementalarrowsa */, + { 0, 4586, 1698, 17, 4, UNI_WARA } /* scriptextensions=wara */, + { 2, 549, 383, 5, 2, UNI_NFDQC__Y } /* nfdqc=y */, + { 0, 4586, 139, 18, 3, UNI_MEDF } /* scriptextensions=medf */, + { 9, 6464, 892, 3, 7, UNI_LANA } /* sc=taitham */, + { 51, 1346, 0, 3, 0, UNI_C } /* isc */, + { 1, 2429, 6399, 6, 22, UNI_DIACRITICALSFORSYMBOLS } /* block=diacriticalsforsymbols */, + { 52, 30, 5354, 1, 7, UNI_TANG } /* istangut */, + { 2, 2406, 3531, 9, 3, UNI_xidc_values_index } /* xidcontinue= */, + { 0, 3903, 1858, 3, 8, UNI_LB__LF } /* lb=linefeed */, + { 0, 899, 0, 7, 0, UNI_TAVT } /* taiviet */, + { 1, 1733, 5546, 4, 18, UNI_CHEROKEESUP } /* blk=cherokeesupplement */, + { 0, 4586, 2534, 17, 11, UNI_NAND } /* scriptextensions=nandinagari */, + { 32, 3764, 34, 9, 2, UNI_LATINEXTB } /* inlatinextb */, + { 3, 3903, 3048, 3, 11, UNI_LB__BB } /* lb=breakbefore */, + { 1, 5782, 639, 21, 5, UNI_CWL } /* changeswhenlowercased=true */, + { 7, 2301, 0, 12, 0, UNI_NV__7_SLASH_12 } /* nv=5.833e-01 */, + { 1, 3903, 330, 3, 2, UNI_LB__SP } /* lb=sp */, + { 18, 954, 638, 4, 3, UNI_EBASE } /* ebase=t */, + { 2, 1141, 185, 4, 4, UNI_COPT } /* scx=qaac */, + { 1, 455, 3209, 3, 4, UNI_ASCII } /* inascii */, + { 0, 2622, 2149, 8, 5, UNI_XPOSIXALPHA } /* isxposixalpha */, + { 0, 5845, 1952, 21, 5, UNI_WB__EB } /* graphemeclusterbreak=ebase */, + { 4, 6464, 502, 3, 4, UNI_SC__SHAW } /* sc=shaw */, + { 0, 368, 374, 4, 2, UNI_CCC__31 } /* ccc=31 */, + { 3, 274, 639, 4, 2, UNI_CWCF } /* cwcf=t */, + { 2, 1141, 1191, 4, 9, UNI_BERF } /* scx=beriaerfe */, + { 2, 2912, 6492, 8, 5, UNI_CYRILLICSUP } /* iscyrillicsup */, + { 3, 963, 5240, 3, 6, UNI_BPT__C } /* bpt=close */, + { 2, 16, 404, 1, 3, UNI_GOTH } /* goth */, + { 56, 333, 1552, 2, 8, UNI_INBUGINESE } /* inbuginese */, + { 37, 6442, 3531, 18, 3, UNI_idcompatmathcontinue_values_index } /* idcompatmathcontinue= */, + { 2, 3128, 972, 5, 2, -UNI_EPRES } /* epres=f */, + { 0, 1450, 0, 9, 0, UNI_SAMR } /* samaritan */, + { 4, 1733, 8061, 4, 28, UNI_EGYPTIANHIEROGLYPHSEXTA } /* blk=egyptianhieroglyphsextendeda */, + { 0, 5845, 1672, 21, 2, UNI_LB__LF } /* graphemeclusterbreak=lf */, + { 0, 6464, 510, 3, 4, UNI_SOGO } /* sc=sogo */, + { 1, 1982, 639, 12, 5, UNI_BIDIM } /* bidimirrored=true */, + { 9, 135, 1066, 2, 4, UNI_JAMO } /* isjamo */, + { 1, 4586, 201, 17, 4, UNI_SGNW } /* scriptextensions=sgnw */, + { 5, 1523, 383, 3, 4, UNI_DEP } /* dep=yes */, + { 0, 3976, 417, 15, 1, UNI_NV__1_SLASH_6 } /* numericvalue=1/6 */, + { 8, 3617, 6421, 5, 21, UNI_EARLYDYNASTICCUNEIFORM } /* blk=earlydynasticcuneiform */, + { 144, 6535, 383, 21, 2, UNI_MCM } /* modifiercombiningmark=y */, + { 1, 8366, 6863, 27, 5, UNI_CJKEXTC } /* iscjkunifiedideographsextensionc */, + { 0, 1733, 2932, 4, 12, UNI_KHMERSYMBOLS } /* blk=khmersymbols */, + { 11, 6760, 4350, 14, 5, UNI_SB__LO } /* sentencebreak=lower */, + { 0, 1465, 3565, 2, 13, UNI_WB__EX } /* wb=extendnumlet */, + { 23, 5667, 6257, 20, 7, UNI_VO__R } /* verticalorientation=rotated */, + { 2, 30, 4096, 1, 18, UNI_AGHB } /* iscaucasianalbanian */, + { 1, 1911, 122, 7, 4, UNI_KRAI } /* script=krai */, + { 0, 1141, 177, 4, 4, UNI_PHLP } /* scx=phlp */, + { 1, 1141, 2088, 4, 6, UNI_SYRC } /* scx=syriac */, + { 1, 7180, 0, 20, 0, UNI_CE } /* compositionexclusion */, + { 0, 2858, 3323, 6, 8, UNI_NO } /* gc=othernumber */, + { 1, 6164, 574, 10, 2, UNI_LB__SY } /* linebreak=sy */, + { 0, 368, 8596, 4, 11, UNI_CCC__DB } /* ccc=doublebelow */, + { 0, 6464, 1441, 3, 4, UNI_PAUC } /* sc=pauc */, + { 0, 5667, 8978, 20, 18, UNI_VO__TU } /* verticalorientation=transformedupright */, + { 36, 5371, 4695, 11, 4, UNI_LATINEXTC } /* block=latinextc */, + { 6, 5954, 352, 3, 4, UNI_VSSUP } /* invssup */, + { 0, 1733, 1533, 4, 10, UNI_INDIVESAKURU } /* blk=divesakuru */, + { 1, 368, 1390, 5, 2, UNI_CCC__103 } /* ccc=103 */, + { 0, 135, 707, 2, 5, UNI_BUHD } /* isbuhid */, + { 1, 5098, 382, 16, 3, UNI_EBASE } /* emojimodifierbase=y */, + { 1, 2108, 2677, 10, 4, -UNI_KEHNOROTATE } /* kehnorotate=no */, + { 7, 333, 1632, 2, 10, UNI_INOLDPERSIAN } /* inoldpersian */, + { 0, 4365, 0, 15, 0, UNI_PS } /* openpunctuation */, + { 1, 2498, 4673, 8, 9, UNI_CYRILLICEXTB } /* cyrillicextendedb */, + { 9, 135, 4290, 2, 15, UNI_VEDICEXT } /* isvedicextensions */, + { 168, 5761, 296, 21, 1, UNI_cwcm_values_index } /* changeswhencasemapped= */, + { 4, 409, 1916, 4, 3, UNI_GREXT } /* grext=t */, + { 6, 8233, 2721, 9, 9, UNI__PERL_SURROGATE } /* category=surrogate */, + { 1, 333, 2385, 2, 12, UNI_INTULUTIGALARI } /* intulutigalari */, + { 0, 2081, 3395, 7, 5, UNI_POSIXALNUM } /* isposixalnum */, + { 5, 3155, 6552, 9, 6, -UNI_QMARK } /* quotationmark=n */, + { 4, 2373, 617, 10, 3, UNI_IN__8 } /* presentin=8.0 */, + { 0, 1141, 170, 4, 4, UNI_OUGR } /* scx=ougr */, + { 1, 4586, 906, 17, 7, UNI_TIBT } /* scriptextensions=tibetan */, + { 0, 1258, 6667, 5, 13, UNI_CJKCOMPAT } /* incjkcompatibility */, + { 1, 5088, 1604, 7, 9, UNI_INKHAROSHTHI } /* block=kharoshthi */, + { 7, 1465, 6556, 2, 3, UNI_WB__NU } /* wb=nu */, + { 0, 1733, 3780, 4, 14, UNI_PHONETICEXTSUP } /* blk=phoneticextsup */, + { 1, 3521, 635, 12, 3, UNI_NV__22 } /* numericvalue=22 */, + { 0, 2380, 604, 3, 4, UNI_IN__13 } /* in=13.0 */, + { 5, 293, 1802, 2, 3, UNI_GCB__L } /* gcb=l */, + { 3, 2313, 1388, 4, 3, UNI_NV__6000 } /* nv=6000 */, + { 8, 4586, 403, 17, 4, UNI_GOTH } /* scriptextensions=goth */, + { 38, 777, 6421, 3, 21, UNI_EARLYDYNASTICCUNEIFORM } /* inearlydynasticcuneiform */, + { 0, 1470, 972, 4, 2, -UNI_XIDS } /* xids=f */, + { 0, 6180, 639, 21, 5, UNI_LOE } /* logicalorderexception=true */, + { 1, 5845, 3578, 21, 12, UNI_WB__EB } /* graphemeclusterbreak=glueafterzwj */, + { 5, 2149, 972, 5, 2, -UNI_XPOSIXALPHA } /* alpha=f */, + { 1, 6464, 1060, 3, 4, UNI_SC__YEZI } /* sc=yezi */, + { 0, 4732, 382, 8, 5, UNI_XPOSIXUPPER } /* uppercase=yes */, + { 9, 6464, 6097, 3, 9, UNI_SC__MONG } /* sc=mongolian */, + { 0, 3521, 2275, 12, 10, UNI_NV__5_SLASH_12 } /* numericvalue=4.167e-01 */, + { 9, 8233, 2935, 12, 8, UNI_SO } /* category=othersymbol */, + { 0, 1141, 1896, 4, 11, UNI_HMNG } /* scx=pahawhhmong */, + { 56, 316, 0, 3, 0, UNI_nv_values_index } /* nv= */, + { 0, 6464, 625, 3, 7, UNI_SC__AVST } /* sc=avestan */, + { 5, 270, 6556, 2, 8, UNI_NT__NU } /* nt=numeric */, + { 16, 2844, 639, 5, 2, UNI_EMOJI } /* emoji=t */, + { 14, 9030, 4309, 9, 11, UNI_SUPPUNCTUATION } /* block=suppunctuation */, + { 0, 30, 4715, 1, 16, UNI_TITLE } /* istitlecaseletter */, + { 14, 9030, 5564, 7, 17, UNI_SMALLKANAEXT } /* block=smallkanaextension */, + { 0, 2429, 4695, 9, 4, UNI_CJKEXTC } /* block=cjkextc */, + { 0, 925, 608, 4, 3, UNI_AGE__4 } /* age=4.0 */, + { 4, 3808, 6088, 7, 9, UNI_LATINEXTA } /* islatinextendeda */, + { 0, 33, 5178, 1, 16, UNI_SHARADASUP } /* sharadasupplement */, + { 2, 33, 202, 1, 3, UNI_SGNW } /* sgnw */, + { 37, 1498, 1391, 7, 2, UNI_CCC__32 } /* ccc=ccc32 */, + { 1, 3976, 1118, 14, 4, UNI_NV__11_SLASH_12 } /* numericvalue=11/12 */, + { 9, 135, 676, 2, 7, UNI_EXTPICT } /* isextpict */, + { 0, 1613, 4082, 4, 15, UNI_UCAS } /* iscanadiansyllabics */, + { 0, 2525, 4822, 9, 9, UNI_MYANMAREXTC } /* inmyanmarextendedc */, + { 8, 135, 8167, 2, 22, UNI_ENCLOSEDIDEOGRAPHICSUP } /* isenclosedideographicsup */, + { 8, 8226, 1671, 16, 2, UNI_LOWERCASELETTER } /* generalcategory=ll */, + { 0, 8226, 5398, 20, 12, UNI_PO } /* generalcategory=otherpunctuation */, + { 32, 368, 6638, 4, 3, UNI_CCC__202 } /* ccc=atb */, + { 1, 2635, 4912, 3, 5, UNI_JG__ZHAIN } /* jg=zhain */, + { 0, 5866, 2746, 15, 9, UNI_IDENTIFIERTYPE__TECHNICAL } /* identifiertype=technical */, + { 51, 2858, 119, 3, 2, UNI_XPOSIXDIGIT } /* gc=nd */, + { 1, 914, 0, 4, 0, UNI_IDEO } /* ideo */, + { 0, 1733, 4814, 4, 11, UNI_BOPOMOFOEXT } /* blk=bopomofoext */, + { 3, 583, 54, 3, 2, UNI_SB__SC } /* sb=sc */, + { 0, 1911, 59, 7, 4, UNI_CHRS } /* script=chrs */, + { 1, 333, 4814, 2, 8, UNI_INBOPOMOFO } /* inbopomofo */, + { 16, 2, 383, 3, 2, UNI_CWL } /* cwl=y */, + { 26, 2429, 5073, 6, 5, UNI_INTAMIL } /* block=tamil */, + { 4, 1254, 4235, 3, 14, UNI_CURRENCYSYMBOLS } /* incurrencysymbols */, + { 2, 1733, 742, 4, 5, UNI_INBATAK } /* blk=batak */, + { 4, 1547, 382, 4, 5, UNI_XPOSIXSPACE } /* space=yes */, + { 2, 4350, 382, 8, 5, UNI_XPOSIXLOWER } /* lowercase=yes */, + { 32, 8732, 1778, 32, 4, UNI_CJKEXTI } /* block=cjkunifiedideographsextensioni */, + { 38, 455, 5336, 3, 19, UNI_INANATOLIANHIEROGLYPHS } /* inanatolianhieroglyphs */, + { 0, 135, 4409, 2, 4, UNI_MANI } /* ismani */, + { 9, 6737, 2645, 13, 3, UNI_JG__FEH } /* joininggroup=feh */, + { 0, 2429, 1488, 6, 10, UNI_BOXDRAWING } /* block=boxdrawing */, + { 0, 5318, 2721, 6, 9, UNI__PERL_SURROGATE } /* _perl_surrogate */, + { 0, 1106, 1888, 4, 3, UNI_nfkdqc_values_index } /* nfkdqc= */, + { 0, 6164, 333, 10, 2, UNI_LB__IN } /* linebreak=in */, + { 3, 4586, 221, 17, 4, UNI_TGLG } /* scriptextensions=tglg */, + { 5, 851, 0, 4, 0, UNI_SHRD } /* shrd */, + { 0, 978, 653, 6, 2, -UNI_COMPEX } /* compex=n */, + { 4, 6928, 967, 6, 2, UNI_INPC__TOP } /* inpc=top */, + { 0, 34, 234, 1, 3, UNI_TOLS } /* tols */, + { 23, 1112, 4566, 4, 3, UNI_NV__13_SLASH_2 } /* nv=13/2 */, + { 0, 135, 1622, 2, 10, UNI_NAGM } /* isnagmundari */, + { 0, 2406, 383, 4, 4, UNI_XIDC } /* xidc=yes */, + { 159, 1590, 5183, 5, 11, UNI_KANASUP } /* iskanasupplement */, + { 2, 1112, 1388, 4, 2, UNI_NV__100 } /* nv=100 */, + { 2, 8226, 876, 16, 2, UNI__PERL_SURROGATE } /* generalcategory=cs */, + { 19, 18, 6598, 1, 3, UNI_BC__L } /* bc=l */, + { 10, 2429, 5902, 7, 10, UNI_COUNTINGROD } /* block=countingrod */, + { 3, 1911, 4219, 7, 4, UNI_BRAI } /* script=brai */, + { 5, 1911, 1060, 7, 4, UNI_SC__YEZI } /* script=yezi */, + { 0, 8233, 1467, 8, 2, UNI_M } /* category=m */, + { 50, 2429, 362, 6, 6, UNI_INCARIAN } /* block=carian */, + { 0, 8765, 5493, 22, 15, UNI_INSC__REGISTERSHIFTER } /* indicsyllabiccategory=registershifter */, + { 0, 6164, 5597, 10, 9, UNI_LB__AI } /* linebreak=ambiguous */, + { 0, 2810, 6300, 13, 9, UNI_BC__RLO } /* bc=righttoleftoverride */, + { 0, 1552, 0, 4, 0, UNI_BUGI } /* bugi */, + { 1, 1733, 2385, 4, 12, UNI_INTULUTIGALARI } /* blk=tulutigalari */, + { 10, 6164, 1952, 10, 5, UNI_EBASE } /* linebreak=ebase */, + { 1, 7525, 2258, 25, 2, UNI_WB__EB } /* canonicalcombiningclass=133 */, + { 3, 7322, 1744, 24, 2, UNI_CCC__1 } /* canonicalcombiningclass=ov */, + { 0, 2525, 6098, 3, 8, UNI_INMONGOLIAN } /* inmongolian */, + { 3, 2429, 565, 6, 6, UNI_INOLONAL } /* block=olonal */, + { 0, 1911, 1322, 7, 7, UNI_SOYO } /* script=soyombo */, + { 2, 2635, 690, 3, 3, UNI_JG__NUN } /* jg=nun */, + { 0, 1303, 4666, 4, 16, UNI_LATINEXTB } /* block=latinextendedb */, + { 0, 1911, 5508, 7, 20, UNI_PHLI } /* script=inscriptionalpahlavi */, + { 20, 1911, 1042, 7, 4, UNI_SC__LYCI } /* script=lyci */, + { 0, 3617, 8307, 5, 29, UNI_ENCLOSEDALPHANUMSUP } /* blk=enclosedalphanumericsupplement */, + { 0, 3506, 383, 13, 2, UNI_NFDQC__Y } /* nfdquickcheck=y */, + { 2, 554, 5612, 4, 4, UNI_NV__30000 } /* nv=30000 */, + { 0, 333, 3249, 2, 8, UNI_INGEORGIAN } /* ingeorgian */, + { 4, 333, 5043, 2, 5, UNI_INBAMUM } /* inbamum */, + { 4, 1818, 4873, 3, 15, UNI_SYRIACSUP } /* issyriacsupplement */, + { 19, 333, 593, 2, 6, UNI_INTODHRI } /* intodhri */, + { 0, 2574, 0, 13, 0, UNI_CASEDLETTER } /* iscasedletter */, + { 0, 1465, 3024, 2, 3, UNI_WB__LE } /* wb=le */, + { 0, 651, 0, 7, 0, UNI_DT__NONE } /* dt=none */, + { 1, 4681, 6492, 12, 12, UNI_CYRILLICSUP } /* block=cyrillicsupplement */, + { 0, 5410, 653, 20, 2, -UNI_EXTPICT } /* extendedpictographic=n */, + { 0, 1141, 1441, 4, 9, UNI_PAUC } /* scx=paucinhau */, + { 0, 333, 1478, 2, 10, UNI_ASCII } /* inbasiclatin */, + { 2, 4586, 1272, 17, 9, UNI_QAAI } /* scriptextensions=inherited */, + { 10, 6356, 990, 12, 5, UNI_GEORGIANEXT } /* block=georgianext */, + { 0, 368, 0, 4, 0, UNI_ccc_values_index } /* ccc= */, + { 2, 333, 722, 2, 5, UNI_INOGHAM } /* inogham */, + { 0, 368, 928, 3, 3, UNI_CCC__10 } /* ccc=10 */, + { 40, 229, 229, 2, 2, UNI_TOTO } /* toto */, + { 0, 2021, 382, 11, 2, UNI_grbase_values_index } /* graphemebase= */, + { 0, 5740, 653, 21, 2, -UNI_CWCF } /* changeswhencasefolded=n */, + { 122, 135, 1603, 2, 10, UNI_KHAR } /* iskharoshthi */, + { 2, 333, 6264, 2, 21, UNI_YIJING } /* inyijinghexagramsymbols */, + { 2, 1112, 319, 4, 1, UNI_NV__19 } /* nv=19 */, + { 5, 2325, 2757, 4, 8, UNI_NV__4_SLASH_5 } /* nv=8.000e-01 */, + { 3, 6464, 1698, 3, 10, UNI_WARA } /* sc=warangciti */, + { 11, 855, 0, 4, 0, UNI_SYRC } /* syrc */, + { 0, 3852, 0, 11, 0, UNI_MC } /* spacingmark */, + { 40, 2407, 653, 3, 3, -UNI_IDC } /* idc=no */, + { 0, 4732, 638, 8, 6, UNI_XPOSIXUPPER } /* uppercase=true */, + { 0, 7978, 1962, 22, 8, UNI_LB__H3 } /* hangulsyllabletype=lvtsyllable */, + { 0, 4320, 6931, 8, 3, UNI_DIA } /* diacritic=t */, + { 0, 4586, 1903, 17, 4, UNI_MONG } /* scriptextensions=mong */, + { 35, 3245, 990, 10, 5, UNI_GEORGIANEXT } /* blk=georgianext */, + { 66, 1911, 35, 7, 4, UNI_BATK } /* script=batk */, + { 4, 1911, 490, 7, 4, UNI_PRTI } /* script=prti */, + { 38, 2607, 4145, 3, 13, UNI_SK } /* ismodifiersymbol */, + { 0, 3141, 0, 14, 0, UNI_PHLP } /* psalterpahlavi */, + { 12, 1812, 1800, 6, 3, UNI_ARABICPFB } /* arabicpfb */, + { 0, 135, 269, 2, 2, UNI_CN } /* iscn */, + { 122, 3136, 422, 5, 2, UNI_IN__15_DOT_1 } /* in=v151 */, + { 2, 2429, 134, 6, 4, UNI_INLISU } /* block=lisu */, + { 1, 1733, 537, 4, 6, UNI_INKHOJKI } /* blk=khojki */, + { 0, 18, 964, 1, 3, UNI_bpt_values_index } /* bpt= */, + { 0, 1141, 1036, 4, 6, UNI_LEPC } /* scx=lepcha */, + { 0, 30, 6796, 1, 14, UNI_ZNAMENNYMUSIC } /* isznamennymusic */, + { 0, 4586, 947, 17, 8, UNI_BALI } /* scriptextensions=balinese */, + { 0, 4681, 4822, 14, 9, UNI_CYRILLICEXTC } /* block=cyrillicextendedc */, + { 0, 135, 6484, 2, 10, UNI_GLAG } /* isglagolitic */, + { 4, 1911, 1340, 8, 6, UNI_SC__TIRH } /* script=tirhuta */, + { 0, 368, 296, 3, 2, UNI_CCC__B } /* ccc=b */, + { 2, 6464, 2944, 3, 4, UNI_SC__MAHJ } /* sc=mahj */, + { 0, 6952, 0, 4, 0, UNI_BRAH } /* brah */, + { 1, 1911, 3794, 7, 10, UNI_SC__DEVA } /* script=devanagari */, + { 0, 7978, 2487, 19, 9, UNI_HST__V } /* hangulsyllabletype=voweljamo */, + { 4, 2596, 639, 11, 2, UNI_JOINC } /* joincontrol=t */, + { 4, 2236, 5612, 4, 4, UNI_NV__20000 } /* nv=20000 */, + { 1, 2429, 6484, 6, 10, UNI_INGLAGOLITIC } /* block=glagolitic */, + { 6, 1471, 0, 4, 0, UNI_IDST } /* idst */, + { 3, 1084, 5239, 6, 3, UNI_KEHCORE__C } /* kehcore=c */, + { 0, 2429, 6264, 6, 21, UNI_YIJING } /* block=yijinghexagramsymbols */, + { 24, 3962, 383, 14, 4, UNI_NFKCQC__Y } /* nfkcquickcheck=yes */, + { 0, 333, 5529, 3, 10, UNI_TAIXUANJING } /* intaixuanjing */, + { 0, 6557, 5612, 14, 4, UNI_NV__20000 } /* numericvalue=20000 */, + { 1, 1818, 7595, 3, 24, UNI_SYMBOLSANDPICTOGRAPHSEXTA } /* issymbolsandpictographsexta */, + { 1, 8226, 65, 16, 2, UNI_MN } /* generalcategory=mn */, + { 1, 1141, 2033, 4, 12, UNI_GONG } /* scx=gunjalagondi */, + { 27, 368, 2327, 3, 2, UNI_CCC__8 } /* ccc=8 */, + { 0, 6369, 8462, 7, 32, UNI_MISCMATHSYMBOLSA } /* block=miscellaneousmathematicalsymbolsa */, + { 4, 1265, 0, 4, 0, UNI_GRAN } /* gran */, + { 42, 135, 4202, 2, 17, UNI_IDSB } /* isidsbinaryoperator */, + { 2, 554, 319, 4, 1, UNI_NV__39 } /* nv=39 */, + { 0, 3903, 574, 3, 2, UNI_LB__SY } /* lb=sy */, + { 0, 6464, 241, 3, 4, UNI_WCHO } /* sc=wcho */, + { 10, 5098, 4729, 11, 3, UNI_emod_values_index } /* emojimodifier= */, + { 4, 3976, 319, 15, 1, UNI_NV__1_SLASH_9 } /* numericvalue=1/9 */, + { 0, 278, 653, 5, 3, -UNI_CWKCF } /* cwkcf=no */, + { 36, 2083, 0, 2, 0, UNI_PO } /* po */, + { 0, 4942, 0, 14, 0, UNI_NV__6 } /* numericvalue=6 */, + { 1, 3208, 383, 13, 2, UNI_POSIXXDIGIT } /* asciihexdigit=y */, + { 25, 135, 2157, 2, 12, UNI_MEND } /* ismendekikakui */, + { 1, 1141, 1048, 4, 4, UNI_TELU } /* scx=telu */, + { 0, 7957, 1218, 18, 6, UNI_DT__ENC } /* decompositiontype=circle */, + { 13, 21, 652, 2, 2, UNI_ext_values_index } /* ext= */, + { 16, 4586, 1399, 17, 4, UNI_ITAL } /* scriptextensions=ital */, + { 2, 1733, 9089, 4, 34, UNI_UCAS } /* blk=unifiedcanadianaboriginalsyllabics */, + { 0, 6464, 859, 3, 4, UNI_SC__QAAI } /* sc=zinh */, + { 0, 3726, 4730, 15, 2, UNI_idsu_values_index } /* idsunaryoperator= */, + { 26, 5098, 639, 13, 2, UNI_EMOD } /* emojimodifier=t */, + { 21, 4586, 1247, 17, 7, UNI_BENG } /* scriptextensions=bengali */, + { 0, 1137, 0, 4, 0, UNI_NSHU } /* nshu */, + { 0, 333, 8862, 2, 28, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* insymbolsforlegacycomputingsup */, + { 3, 2508, 6492, 6, 12, UNI_ETHIOPICSUP } /* ethiopicsupplement */, + { 20, 1911, 1000, 7, 8, UNI_SC__GUJR } /* script=gujarati */, + { 2, 1346, 4332, 5, 4, UNI_CJKEXTH } /* iscjkexth */, + { 2, 3116, 3390, 12, 7, UNI_XPOSIXDIGIT } /* numerictype=decimal */, + { 3, 3849, 0, 14, 0, UNI_MN } /* nonspacingmark */, + { 8, 135, 6222, 2, 7, UNI_SINH } /* issinhala */, + { 0, 316, 2182, 3, 2, UNI_NV__50 } /* nv=50 */, + { 4, 2429, 5058, 6, 15, UNI_DIACRITICALSSUP } /* block=diacriticalssup */, + { 0, 6464, 442, 3, 4, UNI_SC__GONM } /* sc=gonm */, + { 10, 1141, 1339, 4, 4, UNI_TIRH } /* scx=tirh */, + { 11, 393, 383, 4, 4, UNI_CWCM } /* cwcm=yes */, + { 1, 6164, 330, 10, 2, UNI_LB__SP } /* linebreak=sp */, + { 0, 368, 1303, 4, 2, UNI_CCC__BL } /* ccc=bl */, + { 26, 8, 467, 1, 3, UNI_OGAM } /* ogam */, + { 2, 1733, 1008, 4, 8, UNI_INGURMUKHI } /* blk=gurmukhi */, + { 1, 2429, 5628, 6, 20, UNI_INNYIAKENGPUACHUEHMONG } /* block=nyiakengpuachuehmong */, + { 0, 1106, 653, 6, 3, UNI_NFKDQC__N } /* nfkdqc=no */, + { 2, 333, 321, 2, 5, UNI_INORIYA } /* inoriya */, + { 0, 4586, 1200, 17, 9, UNI_BHKS } /* scriptextensions=bhaiksuki */, + { 0, 1471, 1916, 6, 3, UNI_IDS } /* idstart=t */, + { 17, 2561, 0, 6, 0, UNI_IPAEXT } /* ipaext */, + { 0, 135, 8336, 2, 30, UNI_MISCSYMBOLSSUP } /* ismiscellaneoussymbolssupplement */, + { 0, 1733, 5546, 4, 11, UNI_CHEROKEESUP } /* blk=cherokeesup */, + { 0, 6464, 1024, 3, 6, UNI_HATR } /* sc=hatran */, + { 3, 2858, 117, 3, 2, UNI_SK } /* gc=sk */, + { 1, 7957, 154, 18, 3, UNI_DT__NAR } /* decompositiontype=nar */, + { 0, 4681, 0, 14, 0, UNI_INCYRILLIC } /* block=cyrillic */, + { 3, 6464, 5194, 3, 4, UNI_SC__HAN } /* sc=hani */, + { 3, 135, 2021, 2, 12, UNI_GRBASE } /* isgraphemebase */, + { 4, 135, 1552, 2, 8, UNI_BUGI } /* isbuginese */, + { 1, 135, 5628, 2, 20, UNI_HMNP } /* isnyiakengpuachuehmong */, + { 0, 16, 5110, 1, 5, UNI_GRBASE } /* grbase */, + { 1, 1911, 1315, 7, 7, UNI_SIDD } /* script=siddham */, + { 0, 2635, 3416, 3, 12, UNI_JG__FINALSEMKATH } /* jg=finalsemkath */, + { 1, 1470, 653, 4, 3, -UNI_XIDS } /* xids=no */, + { 0, 8765, 6971, 31, 10, UNI_INSC__CONSONANTHEADLETTER } /* indicsyllabiccategory=consonantheadletter */, + { 1, 387, 0, 6, 0, UNI_CAKM } /* chakma */, + { 36, 797, 1887, 3, 9, UNI_NFCQC__M } /* nfkcqc=maybe */, + { 0, 135, 1632, 2, 10, UNI_XPEO } /* isoldpersian */, + { 0, 760, 5183, 5, 11, UNI_KANASUP } /* inkanasupplement */, + { 1, 571, 972, 6, 2, -UNI_PATSYN } /* patsyn=f */, + { 3, 1141, 1294, 4, 4, UNI_MULT } /* scx=mult */, + { 0, 1141, 776, 4, 7, UNI_LINA } /* scx=lineara */, + { 0, 293, 585, 2, 2, UNI_S } /* gc=s */, + { 1, 7957, 1827, 18, 4, UNI_DT__VERT } /* decompositiontype=vert */, + { 0, 5824, 653, 21, 3, -UNI_CWU } /* changeswhenuppercased=no */, + { 0, 1141, 1698, 4, 4, UNI_WARA } /* scx=wara */, + { 4, 7396, 3949, 7, 5, UNI_ARABICMATH } /* inarabicmath */, + { 96, 1733, 6078, 4, 10, UNI_JAMO } /* blk=hanguljamo */, + { 12, 4747, 653, 18, 2, -UNI_IDST } /* idstrinaryoperator=n */, + { 56, 38, 4444, 1, 16, UNI_KITS } /* khitansmallscript */, + { 0, 5306, 3578, 10, 12, UNI_WB__EB } /* wordbreak=glueafterzwj */, + { 1, 2273, 1391, 4, 5, UNI_NV__432000 } /* nv=432000 */, + { 4, 333, 1506, 2, 10, UNI_INCHORASMIAN } /* inchorasmian */, + { 1, 1498, 2181, 7, 2, UNI_CCC__25 } /* ccc=ccc25 */, + { 23, 393, 0, 4, 0, UNI_CWCM } /* cwcm */, + { 26, 4664, 3932, 5, 15, UNI_LINEARBIDEOGRAMS } /* blk=linearbideograms */, + { 8, 7322, 120, 24, 2, UNI_CCC__DA } /* canonicalcombiningclass=da */, + { 0, 1112, 808, 5, 2, UNI_NV__1_SLASH_64 } /* nv=1/64 */, + { 2, 3521, 2190, 13, 2, UNI_NV__29 } /* numericvalue=29 */, + { 0, 2429, 2049, 11, 2, UNI_CJKEXTJ } /* block=cjkextj */, + { 16, 3605, 4822, 12, 9, UNI_CYRILLICEXTC } /* blk=cyrillicextendedc */, + { 12, 3521, 559, 14, 2, UNI_NV__4_SLASH_5 } /* numericvalue=4/5 */, + { 0, 3245, 2475, 5, 12, UNI_GREEKEXT } /* blk=greekextended */, + { 1, 2810, 585, 2, 2, UNI_BC__S } /* bc=s */, + { 1, 1733, 625, 4, 7, UNI_INAVESTAN } /* blk=avestan */, + { 1, 135, 2361, 2, 12, UNI_PLAYINGCARDS } /* isplayingcards */, + { 0, 1522, 653, 2, 2, -UNI_SD } /* sd=n */, + { 12, 3070, 4603, 3, 16, UNI_SMALLFORMS } /* insmallformvariants */, + { 1, 106, 258, 1, 3, UNI_ZANB } /* zanb */, + { 1, 2635, 2648, 3, 3, UNI_JG__DAL } /* jg=dal */, + { 0, 9089, 6088, 34, 9, UNI_UCASEXTA } /* unifiedcanadianaboriginalsyllabicsextendeda */, + { 3, 4406, 2094, 13, 3, UNI_JG__MANICHAEANWAW } /* jg=manichaeanwaw */, + { 1, 1141, 722, 4, 5, UNI_OGAM } /* scx=ogham */, + { 3, 6203, 383, 5, 2, UNI__PERL_NCHAR } /* nchar=y */, + { 1, 135, 1441, 2, 4, UNI_PAUC } /* ispauc */, + { 0, 1465, 1957, 3, 3, UNI_WB__EB } /* wb=gaz */, + { 2, 333, 702, 2, 5, UNI_INADLAM } /* inadlam */, + { 32, 7045, 957, 22, 3, UNI_JG__MALAYALAMSSA } /* joininggroup=malayalamssa */, + { 31, 2407, 382, 9, 3, UNI_IDC } /* idcontinue=y */, + { 0, 1498, 1391, 8, 2, UNI_CCC__132 } /* ccc=ccc132 */, + { 0, 566, 382, 2, 2, UNI_loe_values_index } /* loe= */, + { 1, 7322, 1392, 25, 2, UNI_CCC__B } /* canonicalcombiningclass=220 */, + { 25, 1471, 0, 3, 0, UNI_IDS } /* ids */, + { 0, 4586, 1922, 17, 4, UNI_SORA } /* scriptextensions=sora */, + { 0, 7957, 1224, 18, 6, UNI_DT__MED } /* decompositiontype=medial */, + { 2, 8233, 6987, 9, 14, UNI_LM } /* category=modifierletter */, + { 0, 336, 639, 5, 5, UNI_QMARK } /* qmark=true */, + { 2, 135, 2596, 2, 11, UNI_JOINC } /* isjoincontrol */, + { 4, 6464, 1172, 3, 8, UNI_UGAR } /* sc=ugaritic */, + { 248, 6464, 498, 3, 4, UNI_SC__ROHG } /* sc=rohg */, + { 9, 3903, 135, 3, 2, UNI_LB__IS } /* lb=is */, + { 0, 5306, 3024, 9, 3, UNI_WB__LE } /* wordbreak=le */, + { 1, 1911, 11, 7, 4, UNI_SC__ADLM } /* script=adlm */, + { 1, 2858, 2014, 3, 6, UNI_S } /* gc=symbol */, + { 0, 333, 1339, 2, 7, UNI_INTIRHUTA } /* intirhuta */, + { 129, 3257, 3492, 5, 14, UNI_MISCPICTOGRAPHS } /* blk=miscpictographs */, + { 8, 2429, 6222, 6, 7, UNI_INSINHALA } /* block=sinhala */, + { 1, 19, 0, 4, 0, UNI_POSIXXDIGIT } /* ahex */, + { 4, 1733, 7107, 4, 19, UNI_DEVANAGARIEXTA } /* blk=devanagariextendeda */, + { 0, 1994, 4444, 5, 16, UNI_INKHITANSMALLSCRIPT } /* blk=khitansmallscript */, + { 0, 2810, 2812, 2, 12, UNI_BC__R } /* bc=righttoleft */, + { 1, 3903, 665, 3, 2, UNI_LB__AS } /* lb=as */, + { 22, 368, 3641, 4, 12, UNI_CCC__0 } /* ccc=notreordered */, + { 1, 2607, 1875, 3, 10, UNI_MEDF } /* ismedefaidrin */, + { 64, 1141, 835, 4, 4, UNI_KALI } /* scx=kali */, + { 9, 326, 383, 5, 2, UNI__PERL_PATWS } /* patws=y */, + { 1, 6342, 6060, 7, 18, UNI_ENCLOSEDALPHANUMSUP } /* block=enclosedalphanumsup */, + { 1, 4586, 1024, 17, 4, UNI_HATR } /* scriptextensions=hatr */, + { 0, 8226, 6543, 16, 13, UNI_M } /* generalcategory=combiningmark */, + { 3, 1733, 1156, 4, 8, UNI_INTAGBANWA } /* blk=tagbanwa */, + { 4, 4586, 502, 17, 4, UNI_SHAW } /* scriptextensions=shaw */, + { 1, 4586, 82, 17, 4, UNI_GONG } /* scriptextensions=gong */, + { 4, 4586, 213, 17, 4, UNI_TAVT } /* scriptextensions=tavt */, + { 0, 6464, 3477, 3, 4, UNI_SC__MERO } /* sc=mero */, + { 3, 1911, 863, 7, 7, UNI_SC__SHAW } /* script=shavian */, + { 5, 1911, 1016, 7, 8, UNI_SC__HIRA } /* script=hiragana */, + { 1, 1141, 1432, 4, 9, UNI_PALM } /* scx=palmyrene */, + { 0, 1911, 6484, 7, 4, UNI_SC__GLAG } /* script=glag */, + { 23, 1044, 0, 2, 0, UNI_CI } /* ci */, + { 0, 6464, 3794, 3, 10, UNI_SC__DEVA } /* sc=devanagari */, + { 32, 2073, 639, 7, 2, UNI_RADICAL } /* radical=t */, + { 1, 5371, 643, 17, 3, UNI_LATINEXTE } /* block=latinextendede */, + { 1, 510, 0, 2, 0, UNI_SO } /* so */, + { 0, 135, 1066, 2, 8, UNI_JAMOEXTB } /* isjamoextb */, + { 0, 6464, 4144, 3, 4, UNI_SC__MODI } /* sc=modi */, + { 0, 1733, 6891, 4, 16, UNI_INDICNUMBERFORMS } /* blk=indicnumberforms */, + { 2, 7509, 4770, 14, 13, UNI_SUPPUNCTUATION } /* blk=supplementalpunctuation */, + { 0, 1141, 102, 4, 4, UNI_HMNG } /* scx=hmng */, + { 12, 3903, 4569, 3, 17, UNI_RI } /* lb=regionalindicator */, + { 13, 1733, 5009, 4, 18, UNI_RUMI } /* blk=ruminumeralsymbols */, + { 6, 4992, 638, 16, 3, UNI__PERL_PATWS } /* patternwhitespace=t */, + { 2, 454, 0, 4, 0, UNI_LINA } /* lina */, + { 3, 7509, 8808, 7, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* blk=supsymbolsandpictographs */, + { 0, 333, 3794, 2, 10, UNI_INDEVANAGARI } /* indevanagari */, + { 13, 293, 3565, 3, 7, UNI_GCB__EX } /* gcb=extend */, + { 0, 1733, 3766, 4, 14, UNI_LATINEXTD } /* blk=latinextendedd */, + { 24, 6464, 5043, 3, 5, UNI_BAMU } /* sc=bamum */, + { 0, 2380, 602, 3, 3, UNI_IN__2_DOT_1 } /* in=2.1 */, + { 0, 1733, 776, 4, 7, UNI_INLINEARA } /* blk=lineara */, + { 9, 135, 4202, 2, 4, UNI_IDSB } /* isidsb */, + { 9, 1172, 0, 8, 0, UNI_UGAR } /* ugaritic */, + { 5, 1346, 1070, 5, 4, UNI_CJKEXTB } /* iscjkextb */, + { 0, 2380, 813, 3, 2, UNI_IN__17 } /* in=17 */, + { 27, 2635, 759, 3, 3, UNI_JG__AIN } /* jg=ain */, + { 0, 2922, 2845, 3, 13, UNI_ECOMP } /* isemojicomponent */, + { 0, 7445, 639, 26, 2, UNI_PCM } /* prependedconcatenationmark=t */, + { 30, 4586, 1000, 17, 8, UNI_GUJR } /* scriptextensions=gujarati */, + { 0, 1141, 286, 4, 4, UNI_GARA } /* scx=gara */, + { 4, 8226, 1975, 16, 7, UNI_XPOSIXCNTRL } /* generalcategory=control */, + { 2, 30, 6534, 1, 5, UNI_MODI } /* ismodi */, + { 16, 1030, 0, 6, 0, UNI_KTHI } /* kaithi */, + { 4, 1911, 362, 7, 4, UNI_SC__CARI } /* script=cari */, + { 2, 4586, 769, 17, 7, UNI_KALI } /* scriptextensions=kayahli */, + { 2, 333, 727, 2, 5, UNI_INOSAGE } /* inosage */, + { 1, 1911, 2337, 7, 12, UNI_SC__HUNG } /* script=oldhungarian */, + { 2, 411, 972, 3, 6, -UNI_EXT } /* ext=false */, + { 1, 135, 5546, 2, 18, UNI_CHEROKEESUP } /* ischerokeesupplement */, + { 6, 1762, 0, 11, 0, UNI_DOMINO } /* dominotiles */, + { 0, 135, 274, 2, 4, UNI_CWCF } /* iscwcf */, + { 0, 2429, 1315, 6, 7, UNI_INSIDDHAM } /* block=siddham */, + { 0, 7126, 639, 25, 2, UNI_CWKCF } /* changeswhennfkccasefolded=t */, + { 1, 4681, 3771, 14, 9, UNI_CYRILLICEXTD } /* block=cyrillicextendedd */, + { 0, 7322, 2181, 24, 2, UNI_CCC__25 } /* canonicalcombiningclass=25 */, + { 9, 6464, 1016, 3, 8, UNI_SC__HIRA } /* sc=hiragana */, + { 82, 4586, 3248, 16, 9, UNI_GEOR } /* scriptextensions=georgian */, + { 0, 2858, 359, 3, 2, UNI_PD } /* gc=pd */, + { 0, 1141, 90, 4, 4, UNI_GUJR } /* scx=gujr */, + { 32, 1971, 6931, 4, 3, UNI_BIDIC } /* bidic=t */, + { 5, 3903, 97, 3, 2, UNI_LB__HH } /* lb=hh */, + { 0, 8233, 2083, 9, 2, UNI_PO } /* category=po */, + { 1, 2429, 8535, 6, 32, UNI_IDEOGRAPHICSYMBOLS } /* block=ideographicsymbolsandpunctuation */, + { 3, 7846, 383, 10, 2, UNI_XPOSIXALPHA } /* alphabetic=y */, + { 1, 135, 1577, 2, 8, UNI_JAVA } /* isjavanese */, + { 1, 438, 383, 2, 2, UNI_DI } /* di=y */, + { 0, 6464, 5043, 3, 4, UNI_BAMU } /* sc=bamu */, + { 5, 7322, 3092, 24, 6, UNI_CCC__9 } /* canonicalcombiningclass=virama */, + { 0, 1911, 859, 7, 4, UNI_SC__QAAI } /* script=zinh */, + { 0, 2273, 0, 4, 0, UNI_NV__4 } /* nv=4 */, + { 0, 1733, 3208, 4, 5, UNI_ASCII } /* blk=ascii */, + { 8, 651, 2119, 5, 5, UNI_DT__NB } /* dt=nobreak */, + { 0, 954, 971, 4, 3, -UNI_EBASE } /* ebase=f */, + { 1, 3766, 81, 7, 2, UNI_LATINEXTG } /* latinextg */, + { 6, 135, 2071, 2, 10, UNI_YIRADICALS } /* isyiradicals */, + { 1, 3867, 149, 4, 2, UNI_JG__MIM } /* jg=mim */, + { 9, 6464, 5920, 3, 19, UNI_SC__MERO } /* sc=meroitichieroglyphs */, + { 7, 561, 2196, 4, 8, UNI_NV__15_SLASH_2 } /* nv=7.500e+00 */, + { 3, 6464, 490, 3, 4, UNI_PRTI } /* sc=prti */, + { 0, 566, 0, 2, 0, UNI_LO } /* lo */, + { 1, 6464, 1180, 3, 4, UNI_VITH } /* sc=vith */, + { 8, 5306, 211, 10, 2, UNI_WB__ML } /* wordbreak=ml */, + { 96, 1733, 7776, 4, 28, UNI_SUPPUAA } /* blk=supplementaryprivateuseareaa */, + { 0, 316, 1391, 3, 2, UNI_NV__32 } /* nv=32 */, + { 84, 1141, 3794, 4, 10, UNI_DEVA } /* scx=devanagari */, + { 3, 1141, 1997, 3, 5, UNI_KANA } /* scx=kana */, + { 100, 3208, 652, 12, 4, -UNI_POSIXXDIGIT } /* asciihexdigit=no */, + { 0, 1470, 383, 8, 2, UNI_XIDS } /* xidstart=y */, + { 2, 135, 321, 2, 5, UNI_ORYA } /* isoriya */, + { 2, 1498, 613, 8, 2, UNI_CCC__107 } /* ccc=ccc107 */, + { 0, 8494, 4572, 30, 4, UNI_CJKEXTA } /* blk=cjkunifiedideographsextensiona */, + { 14, 3129, 623, 11, 2, UNI_IN__5_DOT_2 } /* presentin=v52 */, + { 4, 359, 0, 2, 0, UNI_PD } /* pd */, + { 3, 1733, 7647, 4, 27, UNI_OCR } /* blk=opticalcharacterrecognition */, + { 2, 135, 158, 2, 4, UNI_NEWA } /* isnewa */, + { 0, 2407, 972, 3, 6, -UNI_IDC } /* idc=false */, + { 2, 1260, 2522, 3, 4, UNI_CJKEXTI } /* cjkexti */, + { 0, 2429, 1016, 6, 8, UNI_INHIRAGANA } /* block=hiragana */, + { 2, 135, 1652, 2, 4, UNI_SAUR } /* issaur */, + { 1, 3521, 319, 13, 1, UNI_NV__9 } /* numericvalue=9 */, + { 52, 2429, 2534, 6, 11, UNI_INNANDINAGARI } /* block=nandinagari */, + { 0, 4999, 971, 9, 3, -UNI_XPOSIXSPACE } /* whitespace=f */, + { 2, 7695, 1781, 21, 7, UNI_BC__RLI } /* bidiclass=righttoleftisolate */, + { 1, 1547, 382, 4, 2, UNI_wspace_values_index } /* space= */, + { 0, 368, 0, 5, 0, UNI_CCC__1 } /* ccc=1 */, + { 0, 663, 5240, 2, 3, UNI_LB__CL } /* lb=cl */, + { 6, 135, 2508, 2, 8, UNI_ETHI } /* isethiopic */, + { 0, 1141, 537, 4, 6, UNI_KHOJ } /* scx=khojki */, + { 1, 8233, 269, 9, 5, UNI_XPOSIXCNTRL } /* category=cntrl */, + { 0, 326, 653, 5, 3, -UNI__PERL_PATWS } /* patws=no */, + { 0, 333, 1737, 2, 7, UNI_CJKEXTD } /* incjkextd */, + { 0, 135, 955, 2, 8, UNI_BASS } /* isbassavah */, + { 1, 2, 8829, 1, 34, UNI_DIACRITICALSFORSYMBOLS } /* combiningdiacriticalmarksforsymbols */, + { 19, 33, 6775, 1, 22, UNI_SHORTHANDFORMATCONTROLS } /* shorthandformatcontrols */, + { 23, 4586, 474, 17, 4, UNI_ONAO } /* scriptextensions=onao */, + { 0, 6464, 170, 3, 4, UNI_SC__OUGR } /* sc=ougr */, + { 1, 5, 2146, 1, 11, UNI_MATHALPHANUM } /* mathalphanum */, + { 1, 4586, 4219, 17, 7, UNI_BRAI } /* scriptextensions=braille */, + { 1, 4586, 543, 17, 6, UNI_LYDI } /* scriptextensions=lydian */, + { 0, 4732, 972, 5, 2, -UNI_XPOSIXUPPER } /* upper=f */, + { 1, 1590, 4444, 3, 16, UNI_KITS } /* iskhitansmallscript */, + { 12, 8897, 1473, 33, 5, UNI__PERL_PROBLEMATIC_LOCALE_FOLDEDS_START } /* _perl_problematic_locale_foldeds_start */, + { 0, 6464, 1432, 3, 9, UNI_PALM } /* sc=palmyrene */, + { 2, 1141, 181, 4, 4, UNI_PHNX } /* scx=phnx */, + { 4, 2576, 639, 5, 5, UNI_CASED } /* cased=true */, + { 15, 2429, 1396, 6, 9, UNI_INOLDITALIC } /* block=olditalic */, + { 2, 333, 1042, 2, 6, UNI_INLYCIAN } /* inlycian */, + { 1, 2429, 8336, 6, 20, UNI_MISCSYMBOLS } /* block=miscellaneoussymbols */, + { 128, 1911, 702, 7, 5, UNI_SC__ADLM } /* script=adlam */, + { 123, 4586, 1322, 17, 4, UNI_SOYO } /* scriptextensions=soyo */, + { 9, 4586, 1308, 17, 4, UNI_PHAG } /* scriptextensions=phag */, + { 0, 2083, 1125, 5, 4, UNI_POSIXWORD } /* posixword */, + { 1, 3629, 1573, 12, 4, UNI_ARABICEXTA } /* block=arabicexta */, + { 3, 293, 698, 3, 3, UNI_LB__H2 } /* gcb=lv */, + { 1, 4406, 4427, 13, 4, UNI_JG__MANICHAEANRESH } /* jg=manichaeanresh */, + { 0, 1465, 6556, 2, 8, UNI_WB__NU } /* wb=numeric */, + { 32, 2373, 6572, 11, 3, UNI_IN__15_DOT_1 } /* presentin=15.1 */, + { 1, 3976, 2757, 14, 8, UNI_NV__1_SLASH_10 } /* numericvalue=1.000e-01 */, + { 1, 4553, 423, 15, 2, UNI_NV__3_SLASH_16 } /* numericvalue=3/16 */, + { 0, 4747, 383, 18, 4, UNI_IDST } /* idstrinaryoperator=yes */, + { 11, 977, 639, 5, 5, UNI_ECOMP } /* ecomp=true */, + { 2, 2429, 1191, 6, 9, UNI_INBERIAERFE } /* block=beriaerfe */, + { 6, 2149, 639, 5, 2, UNI_XPOSIXALPHA } /* alpha=t */, + { 0, 8280, 4377, 26, 4, UNI_CJKEXTH } /* cjkunifiedideographsextensionh */, + { 0, 19, 383, 4, 4, UNI_POSIXXDIGIT } /* ahex=yes */, + { 2, 2273, 314, 4, 1, UNI_NV__44 } /* nv=44 */, + { 1, 1141, 458, 4, 4, UNI_MRO } /* scx=mroo */, + { 37, 1470, 639, 4, 2, UNI_XIDS } /* xids=t */, + { 5, 3208, 383, 13, 4, UNI_POSIXXDIGIT } /* asciihexdigit=yes */, + { 1, 1346, 8546, 5, 21, UNI_CJKSYMBOLS } /* iscjksymbolsandpunctuation */, + { 5, 5043, 0, 8, 0, UNI_BAMUMSUP } /* bamumsup */, + { 2, 2373, 417, 10, 3, UNI_IN__6_DOT_3 } /* presentin=6.3 */, + { 0, 135, 6896, 2, 11, UNI_NUMBERFORMS } /* isnumberforms */, + { 19, 2624, 4309, 6, 5, UNI_XPOSIXPUNCT } /* xposixpunct */, + { 34, 1141, 462, 4, 4, UNI_NKO } /* scx=nkoo */, + { 17, 1523, 639, 3, 5, UNI_DEP } /* dep=true */, + { 3, 2373, 2173, 10, 2, UNI_IN__11 } /* presentin=11 */, + { 0, 3629, 2797, 7, 13, UNI_ANCIENTSYMBOLS } /* block=ancientsymbols */, + { 4, 4664, 4516, 5, 16, UNI_LETTERLIKESYMBOLS } /* blk=letterlikesymbols */, + { 0, 2858, 4830, 3, 16, UNI_PE } /* gc=closepunctuation */, + { 0, 21, 6421, 1, 21, UNI_EARLYDYNASTICCUNEIFORM } /* earlydynasticcuneiform */, + { 19, 3129, 1388, 12, 2, UNI_IN__10 } /* presentin=v100 */, + { 1, 368, 5731, 4, 5, UNI_CCC__B } /* ccc=below */, + { 0, 1141, 201, 4, 4, UNI_SGNW } /* scx=sgnw */, + { 41, 7674, 4974, 10, 18, UNI_BC__B } /* bidiclass=paragraphseparator */, + { 15, 6464, 221, 3, 4, UNI_SC__TGLG } /* sc=tglg */, + { 16, 5306, 9, 10, 2, UNI_LB__CR } /* wordbreak=cr */, + { 4, 2858, 106, 3, 1, UNI_Z } /* gc=z */, + { 1, 1141, 233, 4, 4, UNI_TOLS } /* scx=tols */, + { 0, 1911, 939, 7, 8, UNI_SC__ARMN } /* script=armenian */, + { 16, 1112, 1391, 5, 2, UNI_NV__1_SLASH_32 } /* nv=1/32 */, + { 3, 4533, 971, 5, 3, -UNI_XPOSIXSPACE } /* wspace=f */, + { 0, 3617, 1573, 12, 4, UNI_ETHIOPICEXTA } /* blk=ethiopicexta */, + { 2, 6464, 790, 3, 4, UNI_MARC } /* sc=marc */, + { 0, 2, 383, 3, 4, UNI_CWL } /* cwl=yes */, + { 10, 135, 1762, 2, 11, UNI_DOMINO } /* isdominotiles */, + { 19, 6737, 4898, 13, 5, UNI_JG__SADHE } /* joininggroup=sadhe */, + { 64, 316, 4004, 3, 3, UNI_NV__5_SLASH_8 } /* nv=5/8 */, + { 0, 2525, 1070, 9, 4, UNI_MYANMAREXTB } /* inmyanmarextb */, + { 2, 135, 189, 2, 4, UNI_RJNG } /* isrjng */, + { 98, 1471, 639, 4, 5, UNI_IDST } /* idst=true */, + { 2, 333, 6642, 2, 19, UNI_JAMOEXTB } /* inhanguljamoextendedb */, + { 5, 7674, 3221, 10, 12, UNI_BC__AL } /* bidiclass=arabicletter */, + { 0, 2824, 2417, 5, 12, UNI_AEGEANNUMBERS } /* blk=aegeannumbers */, + { 0, 5098, 638, 16, 6, UNI_EBASE } /* emojimodifierbase=true */, + { 0, 2429, 537, 6, 6, UNI_INKHOJKI } /* block=khojki */, + { 0, 977, 653, 5, 2, -UNI_ECOMP } /* ecomp=n */, + { 1, 135, 454, 2, 4, UNI_LINA } /* islina */, + { 0, 135, 3390, 2, 13, UNI_XPOSIXDIGIT } /* isdecimalnumber */, + { 26, 2525, 6098, 3, 18, UNI_MONGOLIANSUP } /* inmongoliansupplement */, + { 0, 3991, 1388, 14, 3, UNI_NV__5000 } /* numericvalue=5000 */, + { 97, 3245, 2475, 5, 7, UNI_GREEKEXT } /* blk=greekext */, + { 4, 1230, 3, 3, 1, UNI_EA__W } /* ea=w */, + { 13, 1141, 1322, 4, 4, UNI_SOYO } /* scx=soyo */, + { 7, 4586, 43, 17, 4, UNI_BUHD } /* scriptextensions=buhd */, + { 32, 2406, 971, 10, 3, -UNI_XIDC } /* xidcontinue=f */, + { 5, 8778, 4235, 10, 13, UNI_SC } /* category=currencysymbol */, + { 2, 3395, 0, 5, 0, UNI_XPOSIXALNUM } /* alnum */, + { 1, 1141, 55, 4, 4, UNI_CHAM } /* scx=cham */, + { 0, 1141, 1287, 4, 4, UNI_MAKA } /* scx=maka */, + { 1, 7804, 3519, 27, 2, UNI_CCC__36 } /* canonicalcombiningclass=ccc36 */, + { 0, 4586, 947, 17, 4, UNI_BALI } /* scriptextensions=bali */, + { 2, 1141, 1308, 4, 4, UNI_PHAG } /* scx=phag */, + { 66, 8961, 0, 3, 0, UNI_nt_values_index } /* nt= */, + { 4, 1172, 0, 4, 0, UNI_UGAR } /* ugar */, + { 19, 333, 1054, 2, 6, UNI_INWANCHO } /* inwancho */, + { 30, 1254, 3565, 4, 7, UNI_INCB__EXTEND } /* incb=extend */, + { 6, 8226, 653, 15, 3, UNI_NO } /* generalcategory=no */, + { 0, 307, 0, 5, 0, UNI_NSHU } /* nushu */, + { 1, 16, 1540, 1, 3, UNI_GURU } /* guru */, + { 1, 5, 5257, 1, 18, UNI_MODIFIERTONELETTERS } /* modifiertoneletters */, + { 2, 1911, 625, 7, 7, UNI_SC__AVST } /* script=avestan */, + { 4, 954, 971, 4, 7, -UNI_EBASE } /* ebase=false */, + { 1, 393, 296, 4, 1, UNI_cwcm_values_index } /* cwcm= */, + { 0, 5648, 383, 19, 4, UNI_TERM } /* terminalpunctuation=yes */, + { 6, 4586, 6222, 17, 7, UNI_SINH } /* scriptextensions=sinhala */, + { 1, 3304, 1232, 14, 3, UNI_EA__NA } /* eastasianwidth=na */, + { 0, 7126, 0, 25, 0, UNI_CWKCF } /* changeswhennfkccasefolded */, + { 0, 6464, 2534, 3, 4, UNI_SC__NAND } /* sc=nand */, + { 34, 2429, 6987, 6, 15, UNI_MODIFIERLETTERS } /* block=modifierletters */, + { 96, 135, 737, 2, 5, UNI_TAYO } /* istaiyo */, + { 2, 135, 5058, 2, 15, UNI_DIACRITICALSSUP } /* isdiacriticalssup */, + { 12, 2429, 6018, 6, 21, UNI_ININSCRIPTIONALPARTHIAN } /* block=inscriptionalparthian */, + { 0, 135, 790, 2, 7, UNI_MARC } /* ismarchen */, + { 4, 2149, 0, 5, 0, UNI_XPOSIXALPHA } /* alpha */, + { 1, 1818, 5564, 3, 11, UNI_SMALLKANAEXT } /* issmallkanaext */, + { 3, 8765, 0, 22, 0, UNI_insc_values_index } /* indicsyllabiccategory= */, + { 0, 977, 383, 5, 2, UNI_ECOMP } /* ecomp=y */, + { 0, 3903, 1952, 3, 5, UNI_EBASE } /* lb=ebase */, + { 250, 3257, 1070, 11, 4, UNI_MYANMAREXTB } /* blk=myanmarextb */, + { 1, 368, 2181, 4, 2, UNI_CCC__25 } /* ccc=25 */, + { 0, 695, 2487, 4, 9, UNI_HST__V } /* hst=voweljamo */, + { 19, 3521, 814, 13, 3, UNI_NV__7_SLASH_2 } /* numericvalue=7/2 */, + { 0, 7957, 4765, 18, 7, UNI_DT__INIT } /* decompositiontype=initial */, + { 49, 1346, 2010, 3, 11, UNI_CHESSSYMBOLS } /* ischesssymbols */, + { 0, 1141, 1265, 4, 7, UNI_GRAN } /* scx=grantha */, + { 6, 7674, 7492, 10, 17, UNI_BC__ES } /* bidiclass=europeanseparator */, + { 141, 3808, 1069, 3, 2, UNI_LOE } /* isloe */, + { 2, 1300, 9, 3, 2, UNI_OCR } /* inocr */, + { 0, 2301, 5612, 4, 4, UNI_NV__50000 } /* nv=50000 */, + { 172, 1141, 1247, 4, 4, UNI_BENG } /* scx=beng */, + { 4, 2607, 768, 3, 3, UNI_MAKA } /* ismaka */, + { 0, 1432, 0, 4, 0, UNI_PALM } /* palm */, + { 40, 6464, 341, 3, 5, UNI_SC__TALE } /* sc=taile */, + { 2, 2429, 387, 6, 6, UNI_INCHAKMA } /* block=chakma */, + { 0, 3136, 312, 4, 2, UNI_IN__3 } /* in=v30 */, + { 12, 7957, 7322, 21, 5, UNI_DT__NONCANON } /* decompositiontype=noncanon */, + { 7, 6464, 1133, 3, 4, UNI_SC__MLYM } /* sc=mlym */, + { 0, 135, 1975, 2, 7, UNI_XPOSIXCNTRL } /* iscontrol */, + { 1, 2858, 4305, 3, 15, UNI_PD } /* gc=dashpunctuation */, + { 0, 411, 972, 3, 2, -UNI_EXT } /* ext=f */, + { 0, 135, 1698, 2, 10, UNI_WARA } /* iswarangciti */, + { 1, 4586, 1459, 17, 4, UNI_THAA } /* scriptextensions=thaa */, + { 0, 2083, 2149, 5, 5, UNI_POSIXALPHA } /* posixalpha */, + { 0, 4814, 0, 4, 0, UNI_BOPO } /* bopo */, + { 0, 30, 5354, 1, 17, UNI_TANGUTSUP } /* istangutsupplement */, + { 0, 135, 1470, 2, 8, UNI_XIDS } /* isxidstart */, + { 4, 15, 4002, 2, 3, UNI_AGE__5 } /* age=5 */, + { 1, 1346, 2478, 4, 5, UNI_CJKEXTE } /* iscjkexte */, + { 0, 2081, 4309, 7, 5, UNI_POSIXPUNCT } /* isposixpunct */, + { 4, 5993, 653, 4, 3, -UNI_EMOD } /* emod=no */, + { 65, 6164, 7902, 9, 27, UNI_LB__CJ } /* linebreak=conditionaljapanesestarter */, + { 0, 2429, 9089, 6, 42, UNI_UCASEXT } /* block=unifiedcanadianaboriginalsyllabicsextended */, + { 0, 3903, 197, 3, 2, UNI_LB__SA } /* lb=sa */, + { 0, 7322, 7678, 18, 10, UNI_CCC__L } /* canonicalcombiningclass=left */, + { 0, 7045, 1200, 22, 3, UNI_JG__MALAYALAMBHA } /* joininggroup=malayalambha */, + { 0, 6243, 237, 3, 2, UNI_VO__TU } /* vo=tu */, + { 51, 2810, 3233, 3, 12, UNI_BC__ON } /* bc=otherneutral */, + { 1, 333, 2872, 2, 6, UNI_INCOPTIC } /* incoptic */, + { 2, 2858, 174, 3, 2, UNI_PC } /* gc=pc */, + { 1, 6464, 817, 3, 7, UNI_OLCK } /* sc=olchiki */, + { 1, 135, 362, 2, 4, UNI_CARI } /* iscari */, + { 0, 8233, 355, 9, 2, UNI_PF } /* category=pf */, + { 1, 1733, 4320, 4, 12, UNI_DIACRITICALS } /* blk=diacriticals */, + { 1, 6464, 769, 3, 7, UNI_SC__KALI } /* sc=kayahli */, + { 2, 8233, 4716, 9, 15, UNI_TITLE } /* category=titlecaseletter */, + { 0, 326, 0, 5, 0, UNI__PERL_PATWS } /* patws */, + { 0, 135, 5177, 2, 10, UNI_SHARADASUP } /* issharadasup */, + { 31, 4320, 972, 9, 2, -UNI_DIA } /* diacritic=f */, + { 17, 4999, 382, 9, 3, UNI_XPOSIXSPACE } /* whitespace=y */, + { 17, 368, 7716, 4, 4, UNI_CCC__216 } /* ccc=atar */, + { 0, 1911, 817, 7, 7, UNI_OLCK } /* script=olchiki */, + { 1, 5319, 1125, 4, 4, UNI_POSIXWORD } /* perlword */, + { 0, 1112, 5612, 4, 16, UNI_NV__10000000000000000 } /* nv=10000000000000000 */, + { 4, 333, 8336, 2, 30, UNI_MISCSYMBOLSSUP } /* inmiscellaneoussymbolssupplement */, + { 116, 933, 1386, 5, 3, UNI_AGE__16 } /* age=v160 */, + { 4, 3136, 1386, 4, 3, UNI_IN__16 } /* in=v160 */, + { 8, 135, 5993, 2, 4, UNI_EMOD } /* isemod */, + { 4, 2922, 6421, 3, 21, UNI_EARLYDYNASTICCUNEIFORM } /* isearlydynasticcuneiform */, + { 2, 6180, 653, 21, 2, -UNI_LOE } /* logicalorderexception=n */, + { 139, 1911, 6018, 7, 21, UNI_PRTI } /* script=inscriptionalparthian */, + { 9, 3521, 314, 13, 2, UNI_NV__40 } /* numericvalue=40 */, + { 3, 651, 397, 3, 3, UNI_DT__SML } /* dt=sml */, + { 114, 3521, 1392, 13, 3, UNI_NV__200 } /* numericvalue=200 */, + { 0, 1524, 4601, 4, 2, UNI_epres_values_index } /* epres= */, + { 0, 7322, 2210, 25, 2, UNI_CCC__202 } /* canonicalcombiningclass=202 */, + { 0, 1911, 5355, 7, 6, UNI_SC__TANG } /* script=tangut */, + { 1, 2406, 0, 11, 0, UNI_XIDC } /* xidcontinue */, + { 2, 3128, 383, 5, 2, UNI_EPRES } /* epres=y */, + { 2, 1258, 6710, 5, 11, UNI_CJKRADICALSSUP } /* incjkradicalssup */, + { 0, 1982, 639, 5, 2, UNI_BIDIM } /* bidim=t */, + { 0, 1733, 5043, 4, 15, UNI_BAMUMSUP } /* blk=bamumsupplement */, + { 12, 6464, 762, 3, 7, UNI_SC__KNDA } /* sc=kannada */, + { 2, 6039, 8808, 14, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* insupplementalsymbolsandpictographs */, + { 10, 1733, 1000, 4, 8, UNI_INGUJARATI } /* blk=gujarati */, + { 4, 3136, 2206, 4, 2, UNI_IN__6_DOT_2 } /* in=v62 */, + { 0, 8226, 4158, 16, 14, UNI_ZS } /* generalcategory=spaceseparator */, + { 1, 7322, 135, 24, 2, UNI_CCC__IS } /* canonicalcombiningclass=is */, + { 34, 1911, 39, 7, 4, UNI_BHKS } /* script=bhks */, + { 1, 7674, 4634, 10, 15, UNI_BC__BN } /* bidiclass=boundaryneutral */, + { 0, 9048, 0, 21, 0, UNI_MATHOPERATORS } /* mathematicaloperators */, + { 0, 1141, 2340, 4, 4, UNI_HUNG } /* scx=hung */, + { 0, 8494, 4377, 30, 4, UNI_CJKEXTH } /* blk=cjkunifiedideographsextensionh */, + { 1, 1060, 0, 6, 0, UNI_YEZI } /* yezidi */, + { 9, 19, 972, 4, 2, -UNI_POSIXXDIGIT } /* ahex=f */, + { 0, 2429, 824, 6, 7, UNI_INOSMANYA } /* block=osmanya */, + { 0, 293, 3565, 3, 3, UNI_GCB__EX } /* gcb=ex */, + { 0, 333, 5043, 2, 15, UNI_BAMUMSUP } /* inbamumsupplement */, + { 0, 6464, 1399, 3, 4, UNI_ITAL } /* sc=ital */, + { 8, 1112, 319, 5, 1, UNI_NV__1_SLASH_9 } /* nv=1/9 */, + { 2, 914, 653, 4, 3, -UNI_IDEO } /* ideo=no */, + { 2, 1141, 27, 4, 4, UNI_ARMI } /* scx=armi */, + { 35, 2, 2010, 1, 11, UNI_CHESSSYMBOLS } /* chesssymbols */, + { 2, 6164, 135, 10, 2, UNI_LB__IS } /* linebreak=is */, + { 0, 8117, 3883, 23, 3, UNI_JG__MANICHAEANMEM } /* joininggroup=manichaeanmem */, + { 0, 6557, 2757, 14, 8, UNI_NV__1_SLASH_5 } /* numericvalue=2.000e-01 */, + { 0, 135, 1423, 2, 9, UNI_OUGR } /* isolduyghur */, + { 0, 6464, 1054, 3, 6, UNI_WCHO } /* sc=wancho */, + { 13, 913, 383, 5, 4, UNI_UIDEO } /* uideo=yes */, + { 0, 1911, 265, 7, 4, UNI_ZZZZ } /* script=zzzz */, + { 1, 1941, 0, 4, 0, UNI_SYLO } /* sylo */, + { 6, 1483, 4862, 5, 4, UNI_LATIN1 } /* latin1sup */, + { 0, 1141, 1322, 4, 7, UNI_SOYO } /* scx=soyombo */, + { 0, 1847, 383, 11, 4, UNI_KEHNOMIRROR } /* kehnomirror=yes */, + { 95, 1200, 0, 9, 0, UNI_BHKS } /* bhaiksuki */, + { 13, 1141, 454, 4, 4, UNI_LINA } /* scx=lina */, + { 0, 925, 372, 5, 1, UNI_AGE__11 } /* age=11 */, + { 29, 2373, 2248, 10, 3, UNI_IN__3_DOT_1 } /* presentin=3.1 */, + { 5, 508, 7512, 2, 4, UNI_DT__SUP } /* dt=sup */, + { 1, 3766, 0, 14, 0, UNI_LATINEXTD } /* latinextendedd */, + { 0, 30, 4233, 1, 16, UNI_CURRENCYSYMBOLS } /* iscurrencysymbols */, + { 1, 6464, 3550, 3, 15, UNI_SARB } /* sc=oldsoutharabian */, + { 0, 2506, 6492, 8, 12, UNI_ETHIOPICSUP } /* inethiopicsupplement */, + { 0, 7509, 6045, 8, 15, UNI_SUPARROWSB } /* blk=supplementalarrowsb */, + { 0, 316, 2756, 3, 9, UNI_NV__1_SLASH_2 } /* nv=5.000e-01 */, + { 0, 4249, 2422, 10, 7, UNI_INDICSIYAQNUMBERS } /* indicsiyaqnumbers */, + { 8, 1911, 221, 7, 4, UNI_SC__TGLG } /* script=tglg */, + { 11, 4664, 4861, 8, 12, UNI_LATIN1 } /* blk=latin1supplement */, + { 0, 1346, 8395, 3, 29, UNI_CUNEIFORMNUMBERS } /* iscuneiformnumbersandpunctuation */, + { 29, 7322, 2834, 24, 10, UNI_CCC__6 } /* canonicalcombiningclass=hanreading */, + { 0, 6737, 4435, 13, 4, UNI_JG__QAPH } /* joininggroup=qaph */, + { 150, 4037, 2277, 14, 8, UNI_NV__11_SLASH_12 } /* numericvalue=9.167e-01 */, + { 1, 1911, 494, 7, 4, UNI_SC__QAAI } /* script=qaai */, + { 0, 2498, 1070, 8, 4, UNI_CYRILLICEXTB } /* cyrillicextb */, + { 2, 1911, 4443, 7, 17, UNI_KITS } /* script=khitansmallscript */, + { 2, 3976, 314, 14, 1, UNI_NV__14 } /* numericvalue=14 */, + { 36, 1346, 64, 3, 3, UNI_CPMN } /* iscpmn */, + { 0, 1560, 7277, 5, 12, UNI_GEOMETRICSHAPES } /* ingeometricshapes */, + { 4, 333, 2337, 2, 12, UNI_INOLDHUNGARIAN } /* inoldhungarian */, + { 0, 4586, 669, 17, 4, UNI_ELYM } /* scriptextensions=elym */, + { 0, 135, 6484, 2, 20, UNI_GLAGOLITICSUP } /* isglagoliticsupplement */, + { 1, 4533, 382, 5, 2, UNI_wspace_values_index } /* wspace= */, + { 12, 1044, 296, 2, 1, UNI_ci_values_index } /* ci= */, + { 5, 4022, 2257, 14, 8, UNI_NV__5_SLASH_6 } /* numericvalue=8.333e-01 */, + { 32, 4586, 3355, 17, 15, UNI_ARMI } /* scriptextensions=imperialaramaic */, + { 0, 1141, 2944, 4, 4, UNI_MAHJ } /* scx=mahj */, + { 0, 1303, 3869, 5, 10, UNI_INMALAYALAM } /* block=malayalam */, + { 0, 2021, 382, 11, 5, UNI_GRBASE } /* graphemebase=yes */, + { 2, 8233, 4846, 9, 16, UNI_PF } /* category=finalpunctuation */, + { 2, 6464, 1339, 3, 4, UNI_SC__TIRH } /* sc=tirh */, + { 0, 333, 3698, 2, 16, UNI_HIGHPUSURROGATES } /* inhighpusurrogates */, + { 2, 3726, 972, 4, 2, -UNI_IDSU } /* idsu=f */, + { 73, 8336, 0, 20, 0, UNI_MISCSYMBOLS } /* miscellaneoussymbols */, + { 0, 2858, 5390, 3, 20, UNI_PC } /* gc=connectorpunctuation */, + { 0, 135, 502, 2, 4, UNI_SHAW } /* isshaw */, + { 0, 1141, 662, 4, 7, UNI_ELBA } /* scx=elbasan */, + { 2, 6464, 1789, 3, 11, UNI_SC__GUKH } /* sc=gurungkhema */, + { 26, 6737, 0, 13, 0, UNI_jg_values_index } /* joininggroup= */, + { 75, 6661, 0, 23, 0, UNI_COMPATJAMO } /* hangulcompatibilityjamo */, + { 2, 1911, 1322, 7, 4, UNI_SOYO } /* script=soyo */, + { 0, 3257, 784, 5, 6, UNI_INMANDAIC } /* blk=mandaic */, + { 12, 333, 6399, 2, 22, UNI_DIACRITICALSFORSYMBOLS } /* indiacriticalsforsymbols */, + { 3, 135, 448, 2, 2, UNI_NO } /* isno */, + { 1, 2765, 1143, 12, 3, UNI_PATSYN } /* patternsyntax=t */, + { 0, 2587, 3770, 9, 9, UNI_GEORGIANEXT } /* isgeorgianextended */, + { 0, 2429, 8862, 6, 28, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* block=symbolsforlegacycomputingsup */, + { 0, 333, 8862, 2, 35, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* insymbolsforlegacycomputingsupplement */, + { 49, 5088, 5183, 9, 11, UNI_KANASUP } /* block=kanasupplement */, + { 0, 6464, 835, 3, 4, UNI_SC__KALI } /* sc=kali */, + { 133, 4553, 2265, 14, 8, UNI_NV__3_SLASH_8 } /* numericvalue=3.750e-01 */, + { 24, 9030, 6382, 9, 13, UNI_SUPMATHOPERATORS } /* block=supmathoperators */, + { 1, 2858, 0, 3, 0, UNI_gc_values_index } /* gc= */, + { 0, 1911, 1247, 7, 4, UNI_SC__BENG } /* script=beng */, + { 0, 2134, 0, 12, 0, UNI_GONM } /* masaramgondi */, + { 1, 6464, 1016, 3, 4, UNI_SC__HIRA } /* sc=hira */, + { 0, 1678, 639, 10, 2, UNI_SD } /* softdotted=t */, + { 1, 3903, 48, 3, 2, UNI_LB__AK } /* lb=ak */, + { 0, 5957, 2562, 3, 5, UNI_IPAEXT } /* isipaext */, + { 1, 2576, 383, 5, 4, UNI_CASED } /* cased=yes */, + { 3, 333, 5377, 2, 14, UNI_LATINEXTC } /* inlatinextendedc */, + { 5, 675, 653, 2, 3, -UNI_CE } /* ce=no */, + { 0, 1911, 403, 7, 4, UNI_SC__GOTH } /* script=goth */, + { 0, 571, 383, 6, 2, UNI_PATSYN } /* patsyn=y */, + { 0, 1971, 972, 11, 6, -UNI_BIDIC } /* bidicontrol=false */, + { 4, 4350, 382, 8, 3, UNI_XPOSIXLOWER } /* lowercase=y */, + { 1, 1498, 929, 7, 2, UNI_CCC__10 } /* ccc=ccc10 */, + { 2, 2380, 2169, 4, 3, UNI_IN__11 } /* in=11.0 */, + { 1, 1733, 6222, 4, 21, UNI_SINHALAARCHAICNUMBERS } /* blk=sinhalaarchaicnumbers */, + { 38, 2765, 639, 13, 5, UNI_PATSYN } /* patternsyntax=true */, + { 1, 135, 3726, 2, 16, UNI_IDSU } /* isidsunaryoperator */, + { 0, 3976, 929, 15, 2, UNI_NV__1_SLASH_10 } /* numericvalue=1/10 */, + { 68, 2429, 1008, 6, 8, UNI_INGURMUKHI } /* block=gurmukhi */, + { 0, 1818, 4603, 3, 16, UNI_SMALLFORMS } /* issmallformvariants */, + { 3, 6760, 566, 14, 2, UNI_SB__LO } /* sentencebreak=lo */, + { 3, 1141, 984, 4, 4, UNI_DUPL } /* scx=dupl */, + { 33, 839, 0, 4, 0, UNI_LANA } /* lana */, + { 0, 2, 5902, 1, 10, UNI_COUNTINGROD } /* countingrod */, + { 0, 1810, 0, 6, 0, UNI_ARAB } /* isarab */, + { 1, 688, 0, 7, 0, UNI_HANO } /* hanunoo */, + { 29, 566, 971, 2, 3, -UNI_LOE } /* loe=f */, + { 1, 1733, 5528, 4, 18, UNI_TAIXUANJING } /* blk=taixuanjingsymbols */, + { 19, 54, 1917, 2, 5, UNI_TAYO } /* sc=tayo */, + { 9, 6039, 7300, 5, 22, UNI_SUPERANDSUB } /* insuperscriptsandsubscripts */, + { 2, 333, 6797, 2, 23, UNI_ZNAMENNYMUSIC } /* inznamennymusicalnotation */, + { 33, 54, 3248, 2, 5, UNI_SC__GEOR } /* sc=geor */, + { 0, 2, 382, 1, 2, UNI_ce_values_index } /* ce= */, + { 0, 6462, 1585, 5, 5, UNI_INSC__BINDU } /* insc=bindu */, + { 0, 992, 972, 8, 2, -UNI_EXT } /* extender=f */, + { 1, 1141, 229, 4, 4, UNI_TODR } /* scx=todr */, + { 60, 333, 1294, 2, 7, UNI_INMULTANI } /* inmultani */, + { 2, 7509, 5178, 5, 9, UNI_SHARADASUP } /* blk=sharadasup */, + { 1, 4586, 3869, 16, 10, UNI_MLYM } /* scriptextensions=malayalam */, + { 127, 1911, 717, 7, 4, UNI_SC__LIMB } /* script=limb */, + { 3, 229, 0, 4, 0, UNI_TODR } /* todr */, + { 86, 333, 6382, 2, 13, UNI_MATHOPERATORS } /* inmathoperators */, + { 12, 632, 0, 6, 0, UNI_CCC__22 } /* ccc=22 */, + { 1, 3976, 1388, 14, 2, UNI_NV__100 } /* numericvalue=100 */, + { 2, 3129, 312, 11, 2, UNI_IN__3 } /* presentin=v30 */, + { 0, 6462, 5264, 5, 10, UNI_INSC__TONELETTER } /* insc=toneletter */, + { 1, 4320, 653, 9, 3, -UNI_DIA } /* diacritic=no */, + { 20, 3331, 639, 14, 2, UNI_GREXT } /* graphemeextend=t */, + { 0, 1911, 1552, 7, 8, UNI_SC__BUGI } /* script=buginese */, + { 0, 135, 1377, 2, 9, UNI_TALU } /* isnewtailue */, + { 18, 1562, 990, 6, 5, UNI_GEORGIANEXT } /* georgianext */, + { 2, 1283, 1070, 4, 4, UNI_KANAEXTB } /* kanaextb */, + { 0, 3103, 2432, 11, 3, UNI_nfcqc_values_index } /* nfcquickcheck= */, + { 0, 293, 599, 4, 3, UNI_WB__EB } /* gcb=ebg */, + { 29, 717, 0, 4, 0, UNI_LIMB } /* limb */, + { 360, 21, 8307, 1, 29, UNI_ENCLOSEDALPHANUMSUP } /* enclosedalphanumericsupplement */, + { 3, 8336, 0, 30, 0, UNI_MISCSYMBOLSSUP } /* miscellaneoussymbolssupplement */, + { 0, 2073, 972, 7, 2, -UNI_RADICAL } /* radical=f */, + { 0, 333, 1359, 2, 9, UNI_INKHUDAWADI } /* inkhudawadi */, + { 111, 1847, 296, 11, 1, UNI_kehnomirror_values_index } /* kehnomirror= */, + { 0, 135, 4219, 2, 7, UNI_BRAI } /* isbraille */, + { 0, 561, 2240, 4, 8, UNI_NV__3_SLASH_4 } /* nv=7.500e-01 */, + { 0, 2429, 259, 6, 2, UNI_NB } /* block=nb */, + { 1, 135, 4051, 2, 16, UNI_STERM } /* issentenceterminal */, + { 2, 2587, 7277, 5, 15, UNI_GEOMETRICSHAPESEXT } /* isgeometricshapesext */, + { 0, 8089, 383, 17, 2, UNI_VS } /* variationselector=y */, + { 0, 455, 2417, 3, 12, UNI_AEGEANNUMBERS } /* inaegeannumbers */, + { 0, 1911, 1272, 7, 9, UNI_SC__QAAI } /* script=inherited */, + { 0, 1733, 3453, 4, 6, UNI_INHEBREW } /* blk=hebrew */, + { 0, 1911, 1036, 7, 4, UNI_LEPC } /* script=lepc */, + { 4, 8, 9, 1, 2, UNI_OCR } /* ocr */, + { 0, 2496, 4673, 10, 9, UNI_CYRILLICEXTB } /* incyrillicextendedb */, + { 13, 1300, 818, 3, 6, UNI_OLCK } /* inolchiki */, + { 2, 6464, 102, 3, 4, UNI_HMNG } /* sc=hmng */, + { 10, 3521, 2248, 13, 9, UNI_NV__1_SLASH_32 } /* numericvalue=3.125e-02 */, + { 3, 3070, 1451, 3, 8, UNI_INSAMARITAN } /* insamaritan */, + { 4, 1522, 639, 2, 5, UNI_SD } /* sd=true */, + { 34, 2429, 1024, 6, 6, UNI_INHATRAN } /* block=hatran */, + { 0, 5, 3836, 1, 10, UNI_MISCSYMBOLS } /* miscsymbols */, + { 0, 368, 5731, 4, 9, UNI_CCC__BL } /* ccc=belowleft */, + { 18, 4586, 158, 17, 4, UNI_NEWA } /* scriptextensions=newa */, + { 4, 2453, 2677, 12, 3, -UNI_CI } /* caseignorable=n */, + { 0, 1911, 0, 11, 0, UNI_TAYO } /* script=tayo */, + { 28, 2301, 2196, 4, 8, UNI_NV__11_SLASH_2 } /* nv=5.500e+00 */, + { 0, 1141, 146, 4, 4, UNI_MTEI } /* scx=mtei */, + { 0, 333, 8061, 2, 28, UNI_EGYPTIANHIEROGLYPHSEXTA } /* inegyptianhieroglyphsextendeda */, + { 0, 1975, 0, 7, 0, UNI_XPOSIXCNTRL } /* control */, + { 7, 6356, 7277, 9, 20, UNI_GEOMETRICSHAPESEXT } /* block=geometricshapesextended */, + { 92, 1903, 0, 4, 0, UNI_MONG } /* mong */, + { 1, 651, 658, 3, 4, UNI_EA__F } /* dt=wide */, + { 28, 6243, 0, 5, 0, UNI_VO__TR } /* vo=tr */, + { 8, 1733, 1459, 4, 6, UNI_INTHAANA } /* blk=thaana */, + { 0, 2373, 608, 10, 3, UNI_IN__4 } /* presentin=4.0 */, + { 2, 293, 2812, 3, 3, UNI_RI } /* gcb=ri */, + { 7, 1911, 1329, 7, 7, UNI_SC__SUNU } /* script=sunuwar */, + { 1, 8233, 4731, 8, 16, UNI_UPPERCASELETTER } /* category=uppercaseletter */, + { 148, 7219, 0, 14, 0, UNI_MUSIC } /* musicalsymbols */, + { 1, 2622, 169, 4, 2, UNI_XPEO } /* isxpeo */, + { 0, 8117, 4888, 23, 5, UNI_JG__MANICHAEANALEPH } /* joininggroup=manichaeanaleph */, + { 4, 651, 1218, 3, 6, UNI_DT__ENC } /* dt=circle */, + { 0, 644, 6748, 2, 2, UNI_dep_values_index } /* dep= */, + { 3, 274, 653, 4, 3, -UNI_CWCF } /* cwcf=no */, + { 1, 333, 158, 2, 4, UNI_INNEWA } /* innewa */, + { 0, 5824, 639, 21, 5, UNI_CWU } /* changeswhenuppercased=true */, + { 7, 1590, 5183, 5, 4, UNI_KANASUP } /* iskanasup */, + { 3, 8366, 1778, 28, 4, UNI_CJKEXTI } /* iscjkunifiedideographsextensioni */, + { 1, 4586, 1144, 16, 5, UNI_TALU } /* scriptextensions=talu */, + { 112, 333, 7734, 2, 8, UNI_INKATAKANA } /* inkatakana */, + { 13, 135, 1042, 2, 4, UNI_LYCI } /* islyci */, + { 31, 4942, 2196, 14, 8, UNI_NV__13_SLASH_2 } /* numericvalue=6.500e+00 */, + { 2, 6464, 1329, 3, 7, UNI_SC__SUNU } /* sc=sunuwar */, + { 1, 2097, 3123, 7, 5, UNI_jt_values_index } /* joiningtype= */, + { 8, 6369, 1573, 13, 4, UNI_MYANMAREXTA } /* block=myanmarexta */, + { 0, 3129, 314, 12, 2, UNI_IN__14 } /* presentin=v140 */, + { 2, 6737, 6156, 13, 8, UNI_JG__THINNOON } /* joininggroup=thinnoon */, + { 0, 4586, 824, 17, 4, UNI_OSMA } /* scriptextensions=osma */, + { 7, 933, 1392, 6, 2, UNI_AGE__12 } /* age=v120 */, + { 12, 1911, 2057, 7, 7, UNI_SC__SOGD } /* script=sogdian */, + { 3, 0, 3823, 1, 6, UNI_LISUSUP } /* lisusup */, + { 0, 543, 0, 6, 0, UNI_LYDI } /* lydian */, + { 64, 1911, 790, 7, 4, UNI_MARC } /* script=marc */, + { 2, 333, 6116, 2, 12, UNI_SUNDANESESUP } /* insundanesesup */, + { 4, 7322, 928, 23, 3, UNI_CCC__10 } /* canonicalcombiningclass=10 */, + { 3, 4586, 3477, 17, 4, UNI_MERO } /* scriptextensions=mero */, + { 0, 1733, 5194, 4, 14, UNI_INHANIFIROHINGYA } /* blk=hanifirohingya */, + { 34, 135, 2407, 2, 3, UNI_IDC } /* isidc */, + { 72, 1885, 383, 5, 4, UNI_NFCQC__Y } /* nfcqc=yes */, + { 1, 3976, 2317, 14, 8, UNI_NV__1_SLASH_80 } /* numericvalue=1.250e-02 */, + { 0, 19, 383, 4, 2, UNI_POSIXXDIGIT } /* ahex=y */, + { 0, 8765, 2545, 22, 8, UNI_INSC__AVAGRAHA } /* indicsyllabiccategory=avagraha */, + { 0, 2858, 5322, 3, 2, UNI_CASEDLETTER } /* gc=l_ */, + { 12, 4553, 422, 14, 1, UNI_NV__35 } /* numericvalue=35 */, + { 2, 4144, 1663, 8, 6, UNI_LM } /* modifierletter */, + { 134, 1847, 653, 11, 3, -UNI_KEHNOMIRROR } /* kehnomirror=no */, + { 0, 6180, 0, 21, 0, UNI_LOE } /* logicalorderexception */, + { 30, 3903, 18, 3, 2, UNI_LB__BA } /* lb=ba */, + { 0, 7322, 1391, 24, 2, UNI_CCC__32 } /* canonicalcombiningclass=32 */, + { 0, 135, 669, 2, 7, UNI_ELYM } /* iselymaic */, + { 6, 333, 2944, 2, 7, UNI_MAHJONG } /* inmahjong */, + { 5, 30, 4349, 1, 6, UNI_XPOSIXLOWER } /* islower */, + { 0, 3808, 1740, 7, 4, UNI_LATINEXTD } /* islatinextd */, + { 0, 3213, 0, 8, 0, UNI_XPOSIXXDIGIT } /* hexdigit */, + { 1, 2922, 6088, 10, 9, UNI_ETHIOPICEXTA } /* isethiopicextendeda */, + { 1, 174, 639, 3, 5, UNI_PCM } /* pcm=true */, + { 1, 336, 0, 5, 0, UNI_QMARK } /* qmark */, + { 1, 4305, 0, 4, 0, UNI_DASH } /* dash */, + { 18, 6464, 11, 3, 4, UNI_SC__ADLM } /* sc=adlm */, + { 1, 135, 265, 2, 4, UNI_ZZZZ } /* iszzzz */, + { 4, 4586, 470, 17, 4, UNI_OLCK } /* scriptextensions=olck */, + { 3, 6760, 36, 14, 2, UNI_SB__AT } /* sentencebreak=at */, + { 0, 3129, 2214, 11, 2, UNI_IN__6_DOT_3 } /* presentin=v63 */, + { 0, 3103, 383, 13, 2, UNI_NFCQC__Y } /* nfcquickcheck=y */, + { 18, 6464, 587, 3, 6, UNI_TNSA } /* sc=tangsa */, + { 0, 1265, 0, 7, 0, UNI_GRAN } /* grantha */, + { 1, 4732, 638, 8, 3, UNI_XPOSIXUPPER } /* uppercase=t */, + { 0, 2824, 8567, 10, 29, UNI_ARABICMATH } /* blk=arabicmathematicalalphabeticsymbols */, + { 0, 1399, 0, 4, 0, UNI_ITAL } /* ital */, + { 18, 1260, 8546, 3, 21, UNI_CJKSYMBOLS } /* cjksymbolsandpunctuation */, + { 178, 1060, 0, 4, 0, UNI_YEZI } /* yezi */, + { 23, 4586, 863, 17, 7, UNI_SHAW } /* scriptextensions=shavian */, + { 35, 5088, 765, 9, 4, UNI_INKANNADA } /* block=kannada */, + { 0, 1911, 918, 7, 7, UNI_ZZZZ } /* script=unknown */, + { 4, 6442, 971, 19, 3, -UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=f */, + { 1, 438, 639, 3, 5, UNI_DIA } /* dia=true */, + { 136, 3808, 4917, 10, 10, UNI_LATINEXTADDITIONAL } /* islatinextadditional */, + { 0, 8233, 4830, 9, 16, UNI_PE } /* category=closepunctuation */, + { 17, 135, 8535, 2, 32, UNI_IDEOGRAPHICSYMBOLS } /* isideographicsymbolsandpunctuation */, + { 0, 1303, 3247, 4, 10, UNI_INGEORGIAN } /* block=georgian */, + { 3, 2407, 383, 3, 4, UNI_IDC } /* idc=yes */, + { 8, 3764, 4917, 15, 10, UNI_LATINEXTADDITIONAL } /* inlatinextendedadditional */, + { 0, 6164, 1547, 10, 5, UNI_LB__SP } /* linebreak=space */, + { 0, 6135, 4309, 5, 11, UNI_SUPPUNCTUATION } /* issuppunctuation */, + { 19, 333, 7846, 2, 27, UNI_ALPHABETICPF } /* inalphabeticpresentationforms */, + { 4, 4586, 1191, 17, 9, UNI_BERF } /* scriptextensions=beriaerfe */, + { 4, 6164, 2721, 10, 9, UNI_LB__SG } /* linebreak=surrogate */, + { 1, 4716, 0, 15, 0, UNI_TITLE } /* titlecaseletter */, + { 2, 135, 1098, 2, 8, UNI_MAHJ } /* ismahajani */, + { 0, 1911, 158, 7, 4, UNI_SC__NEWA } /* script=newa */, + { 1, 6164, 1473, 16, 5, UNI_LB__AS } /* linebreak=aksarastart */, + { 1, 333, 7348, 2, 26, UNI_HALFANDFULLFORMS } /* inhalfwidthandfullwidthforms */, + { 0, 4569, 4730, 16, 2, UNI_ri_values_index } /* regionalindicator= */, + { 14, 561, 1388, 4, 2, UNI_NV__700 } /* nv=700 */, + { 20, 3617, 8307, 5, 20, UNI_ENCLOSEDALPHANUM } /* blk=enclosedalphanumerics */, + { 2, 1470, 639, 8, 5, UNI_XIDS } /* xidstart=true */, + { 61, 135, 1359, 2, 9, UNI_SIND } /* iskhudawadi */, + { 0, 1733, 4290, 4, 8, UNI_VEDICEXT } /* blk=vedicext */, + { 0, 1141, 5355, 4, 6, UNI_TANG } /* scx=tangut */, + { 29, 6464, 1922, 3, 4, UNI_SORA } /* sc=sora */, + { 20, 2596, 653, 5, 2, -UNI_JOINC } /* joinc=n */, + { 4, 1751, 0, 11, 0, UNI_CPMN } /* cyprominoan */, + { 135, 2429, 5508, 6, 20, UNI_ININSCRIPTIONALPAHLAVI } /* block=inscriptionalpahlavi */, + { 2, 333, 1941, 2, 11, UNI_INSYLOTINAGRI } /* insylotinagri */, + { 85, 4586, 11, 17, 4, UNI_ADLM } /* scriptextensions=adlm */, + { 0, 2406, 971, 10, 7, -UNI_XIDC } /* xidcontinue=false */, + { 0, 1112, 564, 4, 1, UNI_NV__17 } /* nv=17 */, + { 0, 978, 1143, 5, 3, UNI_COMPEX } /* compex=t */, + { 1, 1112, 1118, 4, 4, UNI_NV__11_SLASH_12 } /* nv=11/12 */, + { 49, 2373, 604, 10, 4, UNI_IN__13 } /* presentin=13.0 */, + { 0, 4586, 8061, 17, 4, UNI_EGYP } /* scriptextensions=egyp */, + { 0, 1911, 732, 7, 5, UNI_SC__RUNR } /* script=runic */, + { 0, 6464, 1789, 3, 4, UNI_SC__GURU } /* sc=guru */, + { 1, 663, 5865, 2, 3, UNI_LB__ID } /* lb=id */, + { 2, 7695, 0, 21, 0, UNI_BC__R } /* bidiclass=righttoleft */, + { 0, 20, 653, 3, 3, -UNI_XPOSIXXDIGIT } /* hex=no */, + { 2, 6164, 325, 10, 2, UNI_LB__AP } /* linebreak=ap */, + { 2, 4309, 0, 5, 0, UNI_P } /* punct */, + { 1, 2824, 6492, 8, 12, UNI_ARABICSUP } /* blk=arabicsupplement */, + { 4, 1141, 4667, 3, 6, UNI_LATN } /* scx=latin */, + { 0, 4533, 638, 5, 3, UNI_XPOSIXSPACE } /* wspace=t */, + { 0, 1911, 537, 7, 4, UNI_SC__KHOJ } /* script=khoj */, + { 0, 106, 0, 2, 0, UNI_ZL } /* zl */, + { 5, 1911, 229, 7, 4, UNI_SC__TODR } /* script=todr */, + { 2, 1911, 506, 7, 4, UNI_SIDT } /* script=sidt */, + { 1, 4586, 1441, 17, 4, UNI_PAUC } /* scriptextensions=pauc */, + { 0, 152, 128, 2, 2, UNI_MRO } /* mroo */, + { 3, 5410, 653, 20, 3, -UNI_EXTPICT } /* extendedpictographic=no */, + { 1, 8765, 8029, 32, 15, UNI_INSC__CONSONANTINITIALPOSTFIXED } /* indicsyllabiccategory=consonantinitialpostfixed */, + { 1, 135, 783, 2, 7, UNI_MAND } /* ismandaic */, + { 0, 1847, 653, 11, 2, -UNI_KEHNOMIRROR } /* kehnomirror=n */, + { 0, 797, 653, 6, 2, UNI_NFKCQC__N } /* nfkcqc=n */, + { 2, 1322, 0, 4, 0, UNI_SOYO } /* soyo */, + { 0, 1733, 1441, 4, 9, UNI_INPAUCINHAU } /* blk=paucinhau */, + { 76, 8639, 1232, 23, 3, UNI_INPC__NA } /* indicpositionalcategory=na */, + { 0, 3764, 0, 16, 0, UNI_LATINEXTD } /* inlatinextendedd */, + { 3, 185, 6552, 1, 6, -UNI_QMARK } /* qmark=n */, + { 2, 135, 6484, 2, 4, UNI_GLAG } /* isglag */, + { 0, 3521, 810, 13, 3, UNI_NV__5_SLASH_2 } /* numericvalue=5/2 */, + { 78, 135, 1616, 2, 6, UNI_ARROWS } /* isarrows */, + { 0, 2429, 1294, 6, 7, UNI_INMULTANI } /* block=multani */, + { 0, 8226, 4305, 16, 15, UNI_PD } /* generalcategory=dashpunctuation */, + { 0, 8283, 383, 16, 4, UNI_UIDEO } /* unifiedideograph=yes */, + { 0, 333, 1460, 3, 5, UNI_INTHAANA } /* inthaana */, + { 9, 1632, 0, 10, 0, UNI_XPEO } /* oldpersian */, + { 0, 438, 972, 3, 6, -UNI_DIA } /* dia=false */, + { 21, 4553, 2196, 14, 8, UNI_NV__7_SLASH_2 } /* numericvalue=3.500e+00 */, + { 1, 3506, 383, 13, 4, UNI_NFDQC__Y } /* nfdquickcheck=yes */, + { 0, 3726, 653, 16, 3, -UNI_IDSU } /* idsunaryoperator=no */, + { 3, 7804, 813, 27, 2, UNI_CCC__17 } /* canonicalcombiningclass=ccc17 */, + { 3, 4664, 4917, 17, 10, UNI_LATINEXTADDITIONAL } /* blk=latinextendedadditional */, + { 1, 8226, 510, 16, 2, UNI_SO } /* generalcategory=so */, + { 0, 3453, 0, 4, 0, UNI_HEBR } /* hebr */, + { 0, 4553, 559, 14, 2, UNI_NV__3_SLASH_5 } /* numericvalue=3/5 */, + { 1, 6164, 2689, 10, 10, UNI_LB__BA } /* linebreak=breakafter */, + { 31, 2858, 6543, 3, 13, UNI_M } /* gc=combiningmark */, + { 17, 3319, 0, 12, 0, UNI_NL } /* letternumber */, + { 0, 7957, 7297, 18, 5, UNI_DT__SUP } /* decompositiontype=super */, + { 56, 2325, 2257, 4, 8, UNI_NV__5_SLASH_6 } /* nv=8.333e-01 */, + { 1, 7674, 6309, 10, 12, UNI_BC__AN } /* bidiclass=arabicnumber */, + { 0, 4586, 5335, 17, 20, UNI_HLUW } /* scriptextensions=anatolianhieroglyphs */, + { 0, 8233, 3673, 9, 9, UNI_Z } /* category=separator */, + { 0, 571, 972, 6, 6, -UNI_PATSYN } /* patsyn=false */, + { 4, 8280, 4843, 26, 4, UNI_CJKEXTF } /* cjkunifiedideographsextensionf */, + { 0, 8639, 4270, 27, 8, UNI_INPC__TOPANDRIGHT } /* indicpositionalcategory=topandright */, + { 7, 1603, 0, 10, 0, UNI_KHAR } /* kharoshthi */, + { 162, 1733, 1751, 4, 11, UNI_INCYPROMINOAN } /* blk=cyprominoan */, + { 33, 2429, 126, 6, 3, UNI_INLAO } /* block=lao */, + { 0, 3116, 644, 12, 2, UNI_XPOSIXDIGIT } /* numerictype=de */, + { 0, 6135, 882, 6, 3, UNI_SUPPUAA } /* issuppuaa */, + { 121, 3304, 3238, 15, 7, UNI_EA__N } /* eastasianwidth=neutral */, + { 0, 2, 1916, 2, 3, UNI_CWT } /* cwt=t */, + { 34, 2506, 2479, 10, 8, UNI_ETHIOPICEXT } /* inethiopicextended */, + { 16, 2429, 7760, 6, 19, UNI_TANGUTCOMPONENTSSUP } /* block=tangutcomponentssup */, + { 1, 3155, 0, 13, 0, UNI_QMARK } /* quotationmark */, + { 0, 135, 5009, 2, 18, UNI_RUMI } /* isruminumeralsymbols */, + { 0, 6737, 2956, 13, 11, UNI_JG__KASHMIRIYEH } /* joininggroup=kashmiriyeh */, + { 2, 368, 3092, 4, 6, UNI_CCC__9 } /* ccc=virama */, + { 1, 1733, 0, 11, 0, UNI_CJKEXTD } /* blk=cjkextd */, + { 2, 827, 0, 3, 0, UNI_ANY } /* any */, + { 131, 1911, 1812, 7, 6, UNI_SC__ARAB } /* script=arabic */, + { 2, 1141, 1874, 4, 11, UNI_MEDF } /* scx=medefaidrin */, + { 0, 4586, 166, 17, 4, UNI_OSGE } /* scriptextensions=osge */, + { 0, 6164, 3070, 10, 11, UNI_LB__IN } /* linebreak=inseparable */, + { 1, 4586, 1133, 17, 4, UNI_MLYM } /* scriptextensions=mlym */, + { 2, 4037, 805, 14, 2, UNI_NV__9_SLASH_2 } /* numericvalue=9/2 */, + { 11, 326, 653, 5, 2, -UNI__PERL_PATWS } /* patws=n */, + { 0, 6597, 459, 4, 2, UNI_BC__LRO } /* bc=lro */, + { 23, 3903, 4488, 3, 14, UNI_LB__BK } /* lb=mandatorybreak */, + { 0, 7804, 613, 28, 2, UNI_CCC__107 } /* canonicalcombiningclass=ccc107 */, + { 1, 0, 0, 2, 0, UNI_CASEDLETTER } /* l& */, + { 1, 4586, 257, 17, 4, UNI_ZANB } /* scriptextensions=zanb */, + { 42, 1141, 8061, 4, 19, UNI_EGYP } /* scx=egyptianhieroglyphs */, + { 1, 2844, 0, 5, 0, UNI_EMOJI } /* emoji */, + { 5, 135, 625, 2, 7, UNI_AVST } /* isavestan */, + { 45, 5371, 4862, 11, 11, UNI_LATIN1 } /* block=latin1supplement */, + { 0, 933, 1392, 5, 2, UNI_AGE__2 } /* age=v20 */, + { 1, 3764, 1573, 7, 4, UNI_LATINEXTA } /* inlatinexta */, + { 0, 2081, 1725, 3, 8, UNI_POSIXSPACE } /* isperlspace */, + { 15, 293, 1952, 4, 5, UNI_WB__EB } /* gcb=ebase */, + { 0, 2596, 653, 11, 2, -UNI_JOINC } /* joincontrol=n */, + { 0, 1733, 587, 4, 6, UNI_INTANGSA } /* blk=tangsa */, + { 0, 333, 7776, 2, 28, UNI_SUPPUAA } /* insupplementaryprivateuseareaa */, + { 47, 4586, 1922, 17, 11, UNI_SORA } /* scriptextensions=sorasompeng */, + { 1, 316, 812, 3, 2, UNI_NV__21 } /* nv=21 */, + { 6, 4037, 5612, 14, 5, UNI_NV__900000 } /* numericvalue=900000 */, + { 0, 6464, 790, 3, 7, UNI_MARC } /* sc=marchen */, + { 23, 2607, 459, 3, 3, UNI_MRO } /* ismroo */, + { 74, 5824, 383, 21, 2, UNI_CWU } /* changeswhenuppercased=y */, + { 3, 135, 3208, 2, 13, UNI_POSIXXDIGIT } /* isasciihexdigit */, + { 26, 5667, 6245, 19, 19, UNI_VO__TR } /* verticalorientation=transformedrotated */, + { 0, 368, 1391, 4, 2, UNI_CCC__32 } /* ccc=32 */, + { 0, 1911, 446, 7, 4, UNI_SC__HANO } /* script=hano */, + { 1, 2, 972, 3, 2, -UNI_CWL } /* cwl=f */, + { 0, 1911, 94, 7, 4, UNI_SC__GUKH } /* script=gukh */, + { 12, 42, 2860, 2, 6, UNI_SB__XX } /* sb=other */, + { 0, 353, 8808, 3, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* supsymbolsandpictographs */, + { 0, 3521, 1114, 12, 4, UNI_NV__1_SLASH_3 } /* numericvalue=1/3 */, + { 66, 1498, 376, 7, 2, UNI_CCC__84 } /* ccc=ccc84 */, + { 1, 1141, 6433, 4, 9, UNI_XSUX } /* scx=cuneiform */, + { 0, 2944, 0, 4, 0, UNI_MAHJ } /* mahj */, + { 98, 2429, 6484, 6, 20, UNI_GLAGOLITICSUP } /* block=glagoliticsupplement */, + { 4, 135, 8175, 2, 11, UNI_IDEO } /* isideographic */, + { 85, 2429, 7734, 6, 26, UNI_KATAKANAEXT } /* block=katakanaphoneticextensions */, + { 2, 6737, 4912, 13, 5, UNI_JG__ZHAIN } /* joininggroup=zhain */, + { 7, 135, 669, 2, 4, UNI_ELYM } /* iselym */, + { 1, 878, 639, 4, 5, UNI_TERM } /* term=true */, + { 6, 4586, 1459, 17, 6, UNI_THAA } /* scriptextensions=thaana */, + { 0, 4586, 249, 17, 4, UNI_XSUX } /* scriptextensions=xsux */, + { 1, 878, 383, 4, 4, UNI_TERM } /* term=yes */, + { 2, 2083, 3215, 4, 6, UNI_POSIXDIGIT } /* posixdigit */, + { 11, 1911, 245, 7, 4, UNI_XPEO } /* script=xpeo */, + { 98, 2607, 6383, 3, 12, UNI_MATHOPERATORS } /* ismathoperators */, + { 0, 8233, 1671, 9, 2, UNI_LOWERCASELETTER } /* category=ll */, + { 3, 8278, 4572, 28, 4, UNI_CJKEXTA } /* incjkunifiedideographsextensiona */, + { 0, 293, 698, 3, 4, UNI_LB__H3 } /* gcb=lvt */, + { 1, 135, 4309, 2, 11, UNI_P } /* ispunctuation */, + { 307, 6164, 3092, 10, 11, UNI_LB__VF } /* linebreak=viramafinal */, + { 19, 8117, 2363, 23, 4, UNI_JG__MANICHAEANAYIN } /* joininggroup=manichaeanayin */, + { 0, 135, 4219, 2, 4, UNI_BRAI } /* isbrai */, + { 1, 1733, 6116, 4, 12, UNI_SUNDANESESUP } /* blk=sundanesesup */, + { 2, 1733, 7086, 4, 11, UNI_INMEETEIMAYEK } /* blk=meeteimayek */, + { 1, 2071, 0, 10, 0, UNI_YIRADICALS } /* yiradicals */, + { 14, 134, 3826, 4, 10, UNI_LISUSUP } /* lisusupplement */, + { 0, 877, 0, 5, 0, UNI_STERM } /* sterm */, + { 1, 1141, 166, 4, 4, UNI_OSGE } /* scx=osge */, + { 34, 245, 0, 4, 0, UNI_XPEO } /* xpeo */, + { 1, 1911, 3869, 6, 10, UNI_SC__MLYM } /* script=malayalam */, + { 0, 7322, 375, 25, 2, UNI_CCC__BL } /* canonicalcombiningclass=218 */, + { 29, 5371, 1740, 11, 4, UNI_LATINEXTD } /* block=latinextd */, + { 21, 6243, 1529, 17, 4, UNI_VO__TR } /* vo=transformedrotated */, + { 0, 4320, 383, 9, 4, UNI_DIA } /* diacritic=yes */, + { 2, 1141, 307, 4, 5, UNI_NSHU } /* scx=nushu */, + { 257, 6464, 4219, 3, 4, UNI_BRAI } /* sc=brai */, + { 0, 6760, 0, 14, 0, UNI_sb_values_index } /* sentencebreak= */, + { 1, 3141, 0, 2, 0, UNI_PS } /* ps */, + { 0, 135, 1180, 2, 4, UNI_VITH } /* isvith */, + { 76, 3070, 864, 3, 6, UNI_SC__SHAW } /* inshavian */, + { 0, 7674, 385, 10, 2, UNI_BC__ES } /* bidiclass=es */, + { 0, 4586, 839, 17, 4, UNI_LANA } /* scriptextensions=lana */, + { 0, 135, 5322, 2, 2, UNI_CASEDLETTER } /* isl_ */, + { 0, 1733, 3682, 4, 16, UNI_HALFANDFULLFORMS } /* blk=halfandfullforms */, + { 0, 108, 3024, 2, 12, UNI_JT__L } /* jt=leftjoining */, + { 5, 3867, 579, 12, 2, UNI_JG__MALAYALAMJA } /* jg=malayalamja */, + { 3, 5, 139, 1, 3, UNI_MEDF } /* medf */, + { 0, 3766, 4917, 13, 10, UNI_LATINEXTADDITIONAL } /* latinextendedadditional */, + { 64, 3629, 5884, 7, 18, UNI_ANCIENTGREEKNUMBERS } /* block=ancientgreeknumbers */, + { 1, 333, 1265, 2, 7, UNI_INGRANTHA } /* ingrantha */, + { 2, 3903, 866, 3, 2, UNI_LB__VI } /* lb=vi */, + { 1, 3867, 10, 12, 2, UNI_JG__MALAYALAMRA } /* jg=malayalamra */, + { 4, 1141, 510, 4, 4, UNI_SOGO } /* scx=sogo */, + { 7, 7695, 6300, 20, 9, UNI_BC__RLO } /* bidiclass=righttoleftoverride */, + { 3, 777, 7233, 3, 22, UNI_EGYPTIANHIEROGLYPHSEXTA } /* inegyptianhieroglyphsexta */, + { 0, 8233, 3216, 9, 5, UNI_XPOSIXDIGIT } /* category=digit */, + { 44, 1911, 4408, 6, 5, UNI_SC__MANI } /* script=mani */, + { 103, 5845, 1952, 21, 8, UNI_WB__EB } /* graphemeclusterbreak=ebasegaz */, + { 0, 1141, 2157, 4, 4, UNI_MEND } /* scx=mend */, + { 0, 1066, 0, 4, 0, UNI_JAMO } /* jamo */, + { 2, 135, 307, 2, 5, UNI_NSHU } /* isnushu */, + { 1, 1733, 1642, 4, 10, UNI_INPHOENICIAN } /* blk=phoenician */, + { 4, 1590, 4673, 6, 9, UNI_KANAEXTB } /* iskanaextendedb */, + { 3, 135, 1847, 2, 11, UNI_KEHNOMIRROR } /* iskehnomirror */, + { 0, 135, 984, 2, 4, UNI_DUPL } /* isdupl */, + { 0, 2380, 2756, 3, 3, UNI_IN__5 } /* in=5.0 */, + { 0, 1141, 625, 4, 7, UNI_AVST } /* scx=avestan */, + { 8, 1523, 383, 10, 2, UNI_DEP } /* deprecated=y */, + { 86, 1498, 374, 7, 2, UNI_CCC__31 } /* ccc=ccc31 */, + { 99, 7804, 1391, 27, 2, UNI_CCC__32 } /* canonicalcombiningclass=ccc32 */, + { 2, 333, 6264, 2, 6, UNI_YIJING } /* inyijing */, + { 7, 2083, 269, 5, 5, UNI_POSIXCNTRL } /* posixcntrl */, + { 0, 6442, 382, 19, 3, UNI_IDCOMPATMATHCONTINUE } /* idcompatmathcontinue=y */, + { 0, 2429, 1737, 6, 7, UNI_CJKEXTD } /* block=cjkextd */, + { 4, 5073, 0, 5, 0, UNI_TAML } /* tamil */, + { 0, 2429, 625, 6, 7, UNI_INAVESTAN } /* block=avestan */, + { 7, 3257, 4822, 11, 9, UNI_MYANMAREXTC } /* blk=myanmarextendedc */, + { 0, 135, 4830, 2, 16, UNI_PE } /* isclosepunctuation */, + { 47, 135, 65, 2, 2, UNI_MN } /* ismn */, + { 4, 2429, 1506, 6, 10, UNI_INCHORASMIAN } /* block=chorasmian */, + { 1, 925, 603, 5, 2, UNI_IN__1_DOT_1 } /* age=1.1 */, + { 0, 2429, 644, 6, 7, UNI_DSRT } /* block=deseret */, + { 0, 6464, 245, 3, 4, UNI_XPEO } /* sc=xpeo */, + { 0, 4158, 0, 14, 0, UNI_ZS } /* spaceseparator */, + { 1, 1733, 7422, 5, 23, UNI_DIACRITICALSFORSYMBOLS } /* blk=combiningmarksforsymbols */, + { 1, 7509, 882, 8, 3, UNI_SUPPUAA } /* blk=suppuaa */, + { 0, 2081, 1122, 3, 7, UNI_POSIXWORD } /* isperlword */, + { 4, 2429, 1066, 6, 4, UNI_JAMO } /* block=jamo */, + { 0, 3128, 383, 5, 4, UNI_EPRES } /* epres=yes */, + { 1, 3976, 5612, 14, 5, UNI_NV__100000 } /* numericvalue=100000 */, + { 1, 676, 0, 7, 0, UNI_EXTPICT } /* extpict */, + { 96, 333, 900, 3, 6, UNI_INTAIVIET } /* intaiviet */, + { 11, 1971, 7699, 4, 7, UNI_BC__R } /* bidiclass=r */, + { 64, 6464, 462, 3, 4, UNI_SC__NKO } /* sc=nkoo */, + { 0, 4202, 383, 17, 2, UNI_IDSB } /* idsbinaryoperator=y */, + { 2, 651, 138, 3, 3, UNI_DT__MED } /* dt=med */, + { 35, 1272, 1278, 6, 3, UNI_QAAI } /* inherited */, + { 0, 8732, 4843, 32, 4, UNI_CJKEXTF } /* block=cjkunifiedideographsextensionf */, + { 27, 797, 383, 6, 4, UNI_NFKCQC__Y } /* nfkcqc=yes */, + { 51, 3726, 639, 4, 2, UNI_IDSU } /* idsu=t */, + { 23, 2912, 4673, 10, 9, UNI_CYRILLICEXTB } /* iscyrillicextendedb */, + { 5, 4553, 5612, 14, 4, UNI_NV__30000 } /* numericvalue=30000 */, + { 0, 2635, 2967, 3, 11, UNI_JG__ROHINGYAYEH } /* jg=rohingyayeh */, + { 1, 135, 4668, 2, 14, UNI_LATINEXTB } /* islatinextendedb */, + { 33, 7509, 1669, 5, 9, UNI_SMALLFORMS } /* blk=smallforms */, + { 2, 3903, 3587, 3, 3, UNI_LB__ZWJ } /* lb=zwj */, + { 2, 2527, 4673, 7, 9, UNI_MYANMAREXTB } /* myanmarextendedb */, + { 0, 2429, 6078, 6, 19, UNI_JAMOEXTA } /* block=hanguljamoextendeda */, + { 6, 3245, 3770, 11, 9, UNI_GEORGIANEXT } /* blk=georgianextended */, + { 3, 1733, 7760, 4, 19, UNI_TANGUTCOMPONENTSSUP } /* blk=tangutcomponentssup */, + { 132, 3249, 0, 8, 0, UNI_GEOR } /* georgian */, + { 0, 3304, 0, 15, 0, UNI_ea_values_index } /* eastasianwidth= */, + { 266, 3136, 812, 5, 2, UNI_IN__12_DOT_1 } /* in=v121 */, + { 3, 135, 291, 2, 2, UNI_ZP } /* iszp */, + { 136, 4586, 1377, 17, 9, UNI_TALU } /* scriptextensions=newtailue */, + { 0, 333, 1329, 2, 7, UNI_INSUNUWAR } /* insunuwar */, + { 0, 353, 1933, 3, 8, UNI_SUPERANDSUB } /* superandsub */, + { 1, 2765, 972, 13, 2, -UNI_PATSYN } /* patternsyntax=f */, + { 0, 695, 0, 4, 0, UNI_hst_values_index } /* hst= */, + { 1, 1911, 1287, 7, 4, UNI_MAKA } /* script=maka */, + { 3, 1818, 1669, 3, 9, UNI_SMALLFORMS } /* issmallforms */, + { 0, 2, 8607, 1, 32, UNI_DIACRITICALSEXT } /* combiningdiacriticalmarksextended */, + { 1, 1346, 6886, 3, 21, UNI_INDICNUMBERFORMS } /* iscommonindicnumberforms */, + { 8, 1141, 6018, 4, 21, UNI_PRTI } /* scx=inscriptionalparthian */, + { 0, 8233, 653, 8, 2, UNI_N } /* category=n */, + { 17, 333, 518, 2, 3, UNI_INVAI } /* invai */, + { 22, 554, 2249, 4, 8, UNI_NV__1_SLASH_32 } /* nv=3.125e-02 */, + { 0, 925, 417, 4, 3, UNI_AGE__6_DOT_3 } /* age=6.3 */, + { 0, 1141, 6097, 4, 9, UNI_MONG } /* scx=mongolian */, + { 12, 135, 478, 2, 4, UNI_ORKH } /* isorkh */, + { 2, 2465, 0, 10, 0, UNI_CN } /* unassigned */, + { 0, 1911, 1191, 7, 9, UNI_BERF } /* script=beriaerfe */, + { 4, 8226, 4350, 16, 15, UNI_LOWERCASELETTER } /* generalcategory=lowercaseletter */, + { 0, 6464, 4814, 3, 8, UNI_SC__BOPO } /* sc=bopomofo */, + { 0, 6464, 1036, 3, 4, UNI_LEPC } /* sc=lepc */, + { 1, 1141, 543, 4, 4, UNI_LYDI } /* scx=lydi */, + { 0, 1106, 383, 6, 2, UNI_DT__NONE } /* nfkdqc=y */, + { 5, 1141, 1098, 4, 8, UNI_MAHJ } /* scx=mahajani */, + { 1, 20, 383, 3, 4, UNI_XPOSIXXDIGIT } /* hex=yes */, + { 134, 7525, 312, 25, 2, UNI_CCC__130 } /* canonicalcombiningclass=130 */, + { 0, 1590, 119, 3, 3, UNI_KNDA } /* isknda */, + { 4, 554, 1388, 4, 2, UNI_NV__300 } /* nv=300 */, + { 1, 6464, 2872, 3, 4, UNI_SC__COPT } /* sc=copt */, + { 13, 676, 639, 7, 5, UNI_EXTPICT } /* extpict=true */, + { 0, 1733, 732, 4, 5, UNI_INRUNIC } /* blk=runic */, + { 3, 3867, 764, 13, 3, UNI_JG__MALAYALAMNNNA } /* jg=malayalamnnna */, + { 506, 2587, 91, 3, 3, UNI_GUJR } /* isgujr */, + { 4, 5866, 1470, 18, 3, UNI_IDENTIFIERTYPE__NOTXID } /* identifiertype=notxid */, + { 0, 566, 638, 2, 3, UNI_LOE } /* loe=t */, + { 121, 4664, 3823, 5, 6, UNI_LISUSUP } /* blk=lisusup */, + { 1, 8639, 6932, 23, 13, UNI_INPC__TOPANDBOTTOM } /* indicpositionalcategory=topandbottom */, + { 2, 2380, 603, 4, 2, UNI_IN__1_DOT_1 } /* in=1.1 */, + { 1, 4586, 514, 17, 4, UNI_TNSA } /* scriptextensions=tnsa */, + { 67, 7804, 812, 27, 2, UNI_CCC__21 } /* canonicalcombiningclass=ccc21 */, + { 10, 462, 0, 4, 0, UNI_NKO } /* nkoo */, + { 1, 5606, 639, 6, 2, UNI_HYPHEN } /* hyphen=t */, + { 0, 4127, 653, 17, 2, -UNI_EPRES } /* emojipresentation=n */, + { 288, 2380, 620, 3, 3, UNI_IN__9 } /* in=9.0 */, + { 0, 368, 421, 4, 2, UNI_CCC__15 } /* ccc=15 */, + { 0, 2313, 5612, 4, 5, UNI_NV__600000 } /* nv=600000 */, + { 2, 3903, 305, 3, 2, UNI_LB__XX } /* lb=xx */, + { 10, 1733, 1688, 4, 10, UNI_INTOLONGSIKI } /* blk=tolongsiki */, + { 0, 1230, 154, 3, 2, UNI_EA__NA } /* ea=na */, + { 2, 1141, 1698, 4, 10, UNI_WARA } /* scx=warangciti */, + { 24, 274, 383, 4, 4, UNI_CWCF } /* cwcf=yes */, + { 26, 5371, 4861, 10, 5, UNI_LATIN1 } /* block=latin1sup */, + { 6, 8117, 654, 22, 4, UNI_JG__MANICHAEANONE } /* joininggroup=manichaeanone */, + { 0, 6464, 1396, 3, 9, UNI_ITAL } /* sc=olditalic */, + { 1, 2429, 4235, 7, 14, UNI_CURRENCYSYMBOLS } /* block=currencysymbols */, + { 3, 6760, 9, 14, 2, UNI_LB__CR } /* sentencebreak=cr */, + { 8, 2, 64, 1, 3, UNI_CPMN } /* cpmn */, + { 1, 1112, 5612, 4, 8, UNI_NV__100000000 } /* nv=100000000 */, + { 0, 1471, 972, 4, 2, -UNI_IDST } /* idst=f */, + { 25, 3129, 420, 11, 2, UNI_IN__4_DOT_1 } /* presentin=v41 */, + { 2, 1733, 5902, 5, 10, UNI_COUNTINGROD } /* blk=countingrod */, + { 1, 7126, 653, 25, 2, -UNI_CWKCF } /* changeswhennfkccasefolded=n */, + { 0, 1812, 1188, 6, 3, UNI_ARABICPFA } /* arabicpfa */, + { 33, 1911, 1294, 7, 4, UNI_SC__MULT } /* script=mult */, + { 3, 632, 636, 5, 2, UNI_CCC__BR } /* ccc=222 */, + { 0, 7396, 4693, 6, 6, UNI_ARABICEXTC } /* inarabicextc */, + { 15, 110, 2516, 2, 9, UNI_KATAKANAEXT } /* katakanaext */, + { 317, 1141, 1941, 4, 4, UNI_SYLO } /* scx=sylo */, + { 0, 1733, 4695, 7, 4, UNI_CJKEXTC } /* blk=cjkextc */, + { 27, 2453, 2677, 12, 4, -UNI_CI } /* caseignorable=no */, + { 13, 4320, 383, 9, 2, UNI_DIA } /* diacritic=y */, + { 0, 1911, 1689, 8, 9, UNI_TOLS } /* script=tolongsiki */, + { 0, 333, 6484, 2, 13, UNI_GLAGOLITICSUP } /* inglagoliticsup */, + { 1, 4992, 0, 17, 0, UNI__PERL_PATWS } /* patternwhitespace */, + { 0, 3257, 427, 5, 3, UNI_INMIAO } /* blk=miao */, + { 0, 368, 2637, 3, 2, UNI_CCC__A } /* ccc=a */, + { 5, 1911, 98, 7, 4, UNI_HLUW } /* script=hluw */, + { 4, 914, 972, 4, 2, -UNI_IDEO } /* ideo=f */, + { 1, 4586, 1917, 16, 5, UNI_TAYO } /* scriptextensions=tayo */, + { 12, 6369, 8669, 7, 32, UNI_MISCMATHSYMBOLSB } /* block=miscellaneousmathematicalsymbolsb */, + { 0, 7322, 195, 24, 2, UNI_CCC__0 } /* canonicalcombiningclass=nr */, + { 0, 30, 869, 1, 8, UNI_INSIDETIC } /* insidetic */, + { 4, 4586, 3653, 17, 7, UNI_CPRT } /* scriptextensions=cypriot */, + { 2, 4586, 510, 17, 4, UNI_SOGO } /* scriptextensions=sogo */, + { 0, 3867, 3863, 12, 4, UNI_JG__MALAYALAMLLLA } /* jg=malayalamllla */, + { 97, 1465, 2397, 3, 9, UNI_WB__WSEGSPACE } /* wb=wsegspace */, + { 13, 3962, 6555, 13, 3, UNI_NFKCQC__N } /* nfkcquickcheck=n */, + { 1, 368, 1211, 4, 2, UNI_CCC__35 } /* ccc=35 */, + { 8, 135, 11, 2, 4, UNI_ADLM } /* isadlm */, + { 1, 1911, 189, 7, 4, UNI_RJNG } /* script=rjng */, + { 0, 6464, 462, 3, 3, UNI_SC__NKO } /* sc=nko */, + { 4, 1258, 6867, 5, 19, UNI_CJKCOMPATIDEOGRAPHSSUP } /* incjkcompatideographssup */, + { 261, 2083, 3395, 5, 5, UNI_POSIXALNUM } /* posixalnum */, + { 35, 8233, 3390, 9, 13, UNI_XPOSIXDIGIT } /* category=decimalnumber */, + { 0, 1141, 130, 4, 4, UNI_LATN } /* scx=latn */, + { 0, 1141, 1396, 4, 9, UNI_ITAL } /* scx=olditalic */, + { 14, 3216, 0, 5, 0, UNI_XPOSIXDIGIT } /* digit */, + { 0, 362, 0, 4, 0, UNI_CARI } /* cari */, + { 1, 683, 638, 5, 3, UNI_GRBASE } /* grbase=t */, + { 0, 2496, 0, 10, 0, UNI_INCYRILLIC } /* incyrillic */, + { 6, 1465, 133, 3, 2, UNI_WB__NL } /* wb=nl */, + { 1, 4553, 0, 14, 0, UNI_NV__3 } /* numericvalue=3 */, + { 90, 5073, 0, 8, 0, UNI_TAMILSUP } /* tamilsup */, + { 0, 8226, 6987, 16, 14, UNI_LM } /* generalcategory=modifierletter */, + { 160, 1971, 370, 4, 2, UNI_bidic_values_index } /* bidic= */, + { 0, 2844, 653, 5, 3, -UNI_EMOJI } /* emoji=no */, + { 2, 99, 0, 2, 0, UNI_UPPERCASELETTER } /* lu */, + { 2, 2002, 0, 7, 0, UNI_UCASEXT } /* ucasext */, + { 3, 9089, 0, 34, 0, UNI_UCAS } /* unifiedcanadianaboriginalsyllabics */, + { 0, 6464, 1048, 3, 4, UNI_SC__TELU } /* sc=telu */, + { 40, 1141, 486, 4, 4, UNI_MIAO } /* scx=plrd */, + { 0, 2, 382, 1, 5, UNI_CE } /* ce=yes */, + { 0, 1258, 2049, 7, 2, UNI_CJKEXTJ } /* incjkextj */, + { 0, 6464, 450, 3, 4, UNI_KHMR } /* sc=khmr */, + { 0, 1733, 518, 4, 3, UNI_INVAI } /* blk=vai */, + { 134, 1733, 644, 4, 7, UNI_DSRT } /* blk=deseret */, + { 0, 2635, 750, 3, 4, UNI_JG__SEEN } /* jg=seen */, + { 558, 1141, 1172, 4, 8, UNI_UGAR } /* scx=ugaritic */, + { 11, 6223, 3685, 5, 13, UNI_HALFANDFULLFORMS } /* inhalfandfullforms */, + { 0, 1733, 6952, 4, 6, UNI_INBRAHMI } /* blk=brahmi */, + { 0, 135, 3128, 2, 5, UNI_EPRES } /* isepres */, + { 397, 8278, 4843, 28, 4, UNI_CJKEXTF } /* incjkunifiedideographsextensionf */, + { 18, 5371, 2719, 7, 12, UNI_LOWSURROGATES } /* block=lowsurrogates */, + { 2, 2097, 3012, 11, 12, UNI_JT__C } /* joiningtype=joincausing */, + { 2, 368, 380, 4, 2, UNI_CCC__9 } /* ccc=vr */, + { 1, 2496, 6492, 8, 5, UNI_CYRILLICSUP } /* incyrillicsup */, + { 0, 135, 4846, 2, 16, UNI_PF } /* isfinalpunctuation */, + { 2, 6464, 158, 3, 4, UNI_SC__NEWA } /* sc=newa */, + { 72, 1141, 1642, 4, 10, UNI_PHNX } /* scx=phoenician */, + { 64, 4586, 403, 17, 6, UNI_GOTH } /* scriptextensions=gothic */, + { 6, 6135, 4619, 4, 15, UNI_SUTTONSIGNWRITING } /* issuttonsignwriting */, + { 32, 135, 2784, 2, 13, UNI_VERTICALFORMS } /* isverticalforms */, + { 1, 4992, 971, 16, 7, -UNI__PERL_PATWS } /* patternwhitespace=false */, + { 0, 135, 4320, 2, 12, UNI_DIACRITICALS } /* isdiacriticals */, + { 0, 5782, 383, 21, 2, UNI_CWL } /* changeswhenlowercased=y */, + { 0, 1141, 221, 4, 4, UNI_TGLG } /* scx=tglg */, + { 0, 963, 0, 5, 0, UNI_BPT__O } /* bpt=o */, + { 32, 6737, 7633, 13, 14, UNI_JG__HAMZAONHEHGOAL } /* joininggroup=tehmarbutagoal */, + { 1, 4586, 4408, 16, 11, UNI_MANI } /* scriptextensions=manichaean */, + { 3, 6760, 4732, 14, 5, UNI_SB__UP } /* sentencebreak=upper */, + { 0, 6462, 6002, 5, 16, UNI_INSC__VOWELINDEPENDENT } /* insc=vowelindependent */, + { 0, 368, 2190, 5, 2, UNI_CCC__129 } /* ccc=129 */, + { 0, 1911, 1200, 7, 9, UNI_BHKS } /* script=bhaiksuki */, + { 45, 877, 653, 5, 3, -UNI_STERM } /* sterm=no */, + { 1, 333, 4814, 2, 16, UNI_BOPOMOFOEXT } /* inbopomofoextended */, + { 82, 977, 972, 5, 6, -UNI_ECOMP } /* ecomp=false */, + { 2, 6464, 307, 3, 5, UNI_NSHU } /* sc=nushu */, + { 69, 2429, 6667, 9, 13, UNI_CJKCOMPAT } /* block=cjkcompatibility */, + { 5, 7674, 4649, 10, 15, UNI_BC__CS } /* bidiclass=commonseparator */, + { 14, 4127, 639, 17, 5, UNI_EPRES } /* emojipresentation=true */, + { 4, 2054, 3555, 5, 10, UNI_SARB } /* oldsoutharabian */, + { 7, 1112, 2240, 4, 8, UNI_NV__3_SLASH_20 } /* nv=1.500e-01 */, + { 82, 2429, 6824, 6, 10, UNI_PUA } /* block=privateuse */, + { 3, 1733, 1478, 4, 10, UNI_ASCII } /* blk=basiclatin */, + { 0, 2810, 3849, 3, 14, UNI_BC__NSM } /* bc=nonspacingmark */, + { 0, 333, 7002, 2, 15, UNI_TRANSPORTANDMAP } /* intransportandmap */, + { 4, 9030, 6149, 9, 7, UNI_SUPARROWSC } /* block=suparrowsc */, + { 289, 6342, 7233, 7, 22, UNI_EGYPTIANHIEROGLYPHSEXTA } /* block=egyptianhieroglyphsexta */, + { 32, 1141, 2057, 4, 4, UNI_SOGD } /* scx=sogd */, + { 0, 333, 7086, 2, 14, UNI_MEETEIMAYEKEXT } /* inmeeteimayekext */, + { 3, 2525, 1613, 3, 9, UNI_MISCARROWS } /* inmiscarrows */, + { 148, 6737, 1353, 13, 6, UNI_JG__LAMADH } /* joininggroup=lamadh */, + { 2, 8226, 3323, 19, 8, UNI_NO } /* generalcategory=othernumber */, + { 3, 2858, 64, 3, 1, UNI_P } /* gc=p */, + { 1, 2429, 2878, 6, 14, UNI_HIGHSURROGATES } /* block=highsurrogates */, + { 2, 6464, 514, 3, 4, UNI_TNSA } /* sc=tnsa */, + { 4, 1911, 1133, 7, 4, UNI_SC__MLYM } /* script=mlym */, + { 0, 4999, 382, 9, 2, UNI_wspace_values_index } /* whitespace= */, + { 3, 6464, 1896, 3, 11, UNI_HMNG } /* sc=pahawhhmong */, + { 0, 1498, 3519, 7, 2, UNI_CCC__36 } /* ccc=ccc36 */, + { 0, 1498, 416, 7, 2, UNI_CCC__26 } /* ccc=ccc26 */, + { 0, 1141, 158, 4, 4, UNI_NEWA } /* scx=newa */, + { 0, 5088, 1070, 10, 4, UNI_KANAEXTB } /* block=kanaextb */, + { 0, 3521, 416, 13, 2, UNI_NV__26 } /* numericvalue=26 */, + { 3, 8765, 7720, 31, 14, UNI_INSC__CONSONANTPRECEDINGREPHA } /* indicsyllabiccategory=consonantprecedingrepha */, + { 12, 8765, 1213, 22, 5, UNI_INSC__NUKTA } /* indicsyllabiccategory=nukta */, + { 137, 1141, 39, 4, 4, UNI_BHKS } /* scx=bhks */, + { 1, 1560, 5447, 4, 16, UNI_INPUNCTUATION } /* ingeneralpunctuation */, + { 36, 1911, 1941, 7, 4, UNI_SC__SYLO } /* script=sylo */, + { 169, 6464, 217, 3, 4, UNI_SC__TFNG } /* sc=tfng */, + { 0, 1230, 0, 3, 0, UNI_ea_values_index } /* ea= */, + { 0, 3208, 652, 12, 3, -UNI_POSIXXDIGIT } /* asciihexdigit=n */, + { 0, 5194, 164, 12, 2, UNI_ROHG } /* hanifirohingya */, + { 264, 2429, 1042, 6, 6, UNI_INLYCIAN } /* block=lycian */, + { 0, 6164, 305, 10, 2, UNI_LB__XX } /* linebreak=xx */, + { 6, 6135, 6053, 5, 7, UNI_SUPARROWSB } /* issuparrowsb */, + { 0, 5920, 0, 19, 0, UNI_MERO } /* meroitichieroglyphs */, + { 0, 7396, 7854, 6, 20, UNI_ARABICPFA } /* inarabicpresentationformsa */, + { 1, 333, 1688, 2, 10, UNI_INTOLONGSIKI } /* intolongsiki */, + { 0, 2301, 805, 4, 2, UNI_NV__5_SLASH_2 } /* nv=5/2 */, + { 10, 6433, 0, 9, 0, UNI_XSUX } /* cuneiform */, + { 0, 108, 4731, 2, 2, UNI_JT__U } /* jt=u */, + { 39, 135, 3395, 2, 5, UNI_XPOSIXALNUM } /* isalnum */, + { 3, 135, 5098, 2, 17, UNI_EBASE } /* isemojimodifierbase */, + { 52, 135, 1000, 2, 8, UNI_GUJR } /* isgujarati */, + { 130, 3129, 422, 11, 2, UNI_IN__5_DOT_1 } /* presentin=v51 */, + { 17, 71, 296, 3, 1, UNI_cwu_values_index } /* cwu= */, + { 6, 1911, 1098, 7, 8, UNI_SC__MAHJ } /* script=mahajani */, + { 1, 1733, 8546, 7, 21, UNI_CJKSYMBOLS } /* blk=cjksymbolsandpunctuation */, + { 5, 135, 8862, 2, 28, UNI_SYMBOLSFORLEGACYCOMPUTINGSUP } /* issymbolsforlegacycomputingsup */, + { 0, 135, 843, 2, 4, UNI_NBAT } /* isnbat */, + { 2, 1141, 9096, 4, 18, UNI_CANS } /* scx=canadianaboriginal */, + { 47, 333, 2407, 2, 3, UNI_INIDC } /* inidc */, + { 108, 1322, 0, 7, 0, UNI_SOYO } /* soyombo */, + { 0, 1733, 6692, 7, 18, UNI_CJKCOMPATFORMS } /* blk=cjkcompatibilityforms */, + { 110, 4942, 5612, 14, 5, UNI_NV__600000 } /* numericvalue=600000 */, + { 1, 4783, 0, 16, 0, UNI_LINEARBSYLLABARY } /* linearbsyllabary */, + { 3, 1044, 383, 2, 4, UNI_CI } /* ci=yes */, + { 11, 933, 1387, 5, 2, UNI_AGE__6 } /* age=v60 */, + { 0, 1733, 1180, 4, 8, UNI_INVITHKUQI } /* blk=vithkuqi */, + { 35, 135, 6180, 2, 21, UNI_LOE } /* islogicalorderexception */, + { 165, 1911, 3653, 7, 7, UNI_SC__CPRT } /* script=cypriot */, + { 0, 3257, 3836, 5, 13, UNI_MISCSYMBOLSSUP } /* blk=miscsymbolssup */, + { 1, 1911, 712, 7, 4, UNI_SC__DOGR } /* script=dogr */, + { 1, 1733, 790, 4, 7, UNI_INMARCHEN } /* blk=marchen */, + { 0, 4586, 717, 17, 4, UNI_LIMB } /* scriptextensions=limb */, + { 0, 1982, 653, 5, 2, -UNI_BIDIM } /* bidim=n */, + { 0, 2429, 1632, 6, 10, UNI_INOLDPERSIAN } /* block=oldpersian */, + { 22, 3103, 383, 13, 4, UNI_NFCQC__Y } /* nfcquickcheck=yes */, + { 12, 6116, 0, 19, 0, UNI_SUNDANESESUP } /* sundanesesupplement */, + { 1, 71, 653, 3, 3, -UNI_CWU } /* cwu=no */, + { 1, 6464, 1322, 3, 4, UNI_SOYO } /* sc=soyo */, + { 0, 5648, 639, 19, 5, UNI_TERM } /* terminalpunctuation=true */, + { 0, 4586, 253, 17, 4, UNI_YI } /* scriptextensions=yiii */, + { 1, 2, 8395, 1, 15, UNI_CUNEIFORMNUMBERS } /* cuneiformnumbers */, + { 29, 1911, 2033, 7, 12, UNI_SC__GONG } /* script=gunjalagondi */, + { 34, 16, 2865, 1, 13, UNI_INGREEK } /* greekandcoptic */, + { 10, 1471, 639, 3, 5, UNI_IDS } /* ids=true */, + { 8, 16, 2475, 1, 7, UNI_GREEKEXT } /* greekext */, + { 18, 1247, 0, 4, 0, UNI_BENG } /* beng */, + { 1, 2607, 1613, 3, 9, UNI_MISCARROWS } /* ismiscarrows */, + { 7, 2810, 4448, 3, 3, UNI_BC__NSM } /* bc=nsm */, + { 3, 2810, 6309, 3, 12, UNI_BC__AN } /* bc=arabicnumber */, + { 0, 651, 3403, 3, 3, UNI_DT__ENC } /* dt=enc */, + { 0, 333, 1287, 2, 7, UNI_INMAKASAR } /* inmakasar */, + { 0, 135, 181, 2, 4, UNI_PHNX } /* isphnx */, + { 526, 5667, 639, 19, 3, UNI_VO__TR } /* verticalorientation=tr */, + { 1, 1847, 972, 11, 6, -UNI_KEHNOMIRROR } /* kehnomirror=false */, + { 332, 6039, 1933, 5, 8, UNI_SUPERANDSUB } /* insuperandsub */, + { 4, 1911, 502, 7, 4, UNI_SC__SHAW } /* script=shaw */, + { 0, 1733, 4290, 4, 15, UNI_VEDICEXT } /* blk=vedicextensions */, + { 4, 6342, 8701, 7, 31, UNI_EGYPTIANHIEROGLYPHFORMATCONTROLS } /* block=egyptianhieroglyphformatcontrols */, + { 0, 135, 1569, 2, 8, UNI_JAMOEXTA } /* isjamoexta */, + { 1, 8117, 2508, 24, 3, UNI_JG__MANICHAEANTETH } /* joininggroup=manichaeanteth */, + { 0, 4202, 653, 17, 3, -UNI_IDSB } /* idsbinaryoperator=no */, + { 6, 286, 0, 4, 0, UNI_GARA } /* gara */, + { 43, 5371, 140, 18, 2, UNI_LATINEXTF } /* block=latinextendedf */, + { 0, 3116, 653, 11, 5, UNI_NV__NAN } /* numerictype=none */, + { 9, 1911, 839, 7, 4, UNI_LANA } /* script=lana */, + { 4, 135, 1036, 2, 6, UNI_LEPC } /* islepcha */, + { 0, 1911, 241, 7, 4, UNI_WCHO } /* script=wcho */, + { 0, 4664, 6088, 9, 9, UNI_LATINEXTA } /* blk=latinextendeda */, + { 0, 1129, 0, 4, 0, UNI_LINB } /* linb */, + { 28, 5761, 639, 21, 2, UNI_CWCM } /* changeswhencasemapped=t */, + { 1, 1911, 1642, 7, 10, UNI_PHNX } /* script=phoenician */, + { 32, 1303, 4408, 5, 11, UNI_INMANICHAEAN } /* block=manichaean */, + { 0, 6737, 828, 13, 3, UNI_JG__NYA } /* joininggroup=nya */, + { 0, 914, 383, 4, 2, UNI_IDEO } /* ideo=y */, + { 3, 695, 4172, 4, 13, UNI_HST__NA } /* hst=notapplicable */, + { 1, 4406, 5222, 13, 6, UNI_JG__MANICHAEANSAMEKH } /* jg=manichaeansamekh */, + { 2, 762, 3753, 3, 11, UNI_KANGXI } /* kangxiradicals */, + { 26, 6462, 6726, 12, 11, UNI_INSC__CONSONANTSUBJOINED } /* insc=consonantsubjoined */, + { 24, 5088, 6088, 10, 9, UNI_KANAEXTA } /* block=kanaextendeda */, + { 21, 135, 1688, 2, 10, UNI_TOLS } /* istolongsiki */, + { 0, 2810, 52, 3, 2, UNI_BC__AN } /* bc=an */, + { 2, 8117, 4431, 23, 4, UNI_JG__MANICHAEANYODH } /* joininggroup=manichaeanyodh */, + { 0, 1885, 0, 6, 0, UNI_nfcqc_values_index } /* nfcqc= */, + { 1, 5410, 639, 20, 5, UNI_EXTPICT } /* extendedpictographic=true */, + { 112, 6464, 150, 3, 4, UNI_SC__MYMR } /* sc=mymr */, + { 0, 4586, 1414, 17, 9, UNI_ORKH } /* scriptextensions=oldturkic */, + { 0, 1346, 6867, 5, 16, UNI_CJKCOMPATIDEOGRAPHS } /* iscjkcompatideographs */, + { 1, 6464, 2054, 3, 10, UNI_SOGO } /* sc=oldsogdian */, + { 2, 135, 8862, 2, 25, UNI_SYMBOLSFORLEGACYCOMPUTING } /* issymbolsforlegacycomputing */, + { 125, 3521, 1387, 13, 3, UNI_NV__600 } /* numericvalue=600 */, + { 0, 135, 1789, 2, 4, UNI_GURU } /* isguru */, + { 1, 1733, 2049, 9, 2, UNI_CJKEXTJ } /* blk=cjkextj */, + { 3, 7322, 416, 24, 2, UNI_CCC__26 } /* canonicalcombiningclass=26 */, + { 0, 5740, 972, 21, 6, -UNI_CWCF } /* changeswhencasefolded=false */, + { 10, 1523, 296, 10, 1, UNI_dep_values_index } /* deprecated= */, + { 0, 9087, 0, 36, 0, UNI_UCAS } /* isunifiedcanadianaboriginalsyllabics */, + { 699, 4185, 652, 16, 4, -UNI_IDCOMPATMATHSTART } /* idcompatmathstart=no */, + { 22, 2922, 7552, 3, 26, UNI_ENCLOSEDCJK } /* isenclosedcjklettersandmonths */, + { 3, 2635, 6156, 3, 8, UNI_JG__THINNOON } /* jg=thinnoon */, + { 0, 3962, 2432, 12, 3, UNI_nfkcqc_values_index } /* nfkcquickcheck= */, + { 0, 30, 1522, 1, 4, UNI_DEP } /* isdep */, + { 1, 1141, 3248, 3, 9, UNI_GEOR } /* scx=georgian */, + { 83, 2858, 679, 3, 2, UNI_PI } /* gc=pi */, + { 2, 2872, 0, 6, 0, UNI_COPT } /* coptic */, + { 74, 4586, 1048, 17, 6, UNI_TELU } /* scriptextensions=telugu */, + { 0, 2844, 972, 5, 6, -UNI_EMOJI } /* emoji=false */, + { 0, 7322, 9069, 24, 18, UNI_CCC__216 } /* canonicalcombiningclass=attachedaboveright */, + { 139, 7322, 1303, 24, 2, UNI_CCC__BL } /* canonicalcombiningclass=bl */, + { 0, 8765, 0, 31, 0, UNI_INSC__CONSONANT } /* indicsyllabiccategory=consonant */, + { 6, 1346, 5902, 3, 10, UNI_COUNTINGROD } /* iscountingrod */, + { 0, 135, 5803, 2, 21, UNI_CWT } /* ischangeswhentitlecased */, + { 0, 1733, 1315, 4, 7, UNI_INSIDDHAM } /* blk=siddham */, + { 6, 8089, 972, 17, 2, -UNI_VS } /* variationselector=f */, + { 0, 4539, 6555, 13, 3, UNI_NFKDQC__N } /* nfkdquickcheck=n */, + { 0, 4681, 0, 18, 0, UNI_CYRILLICEXTC } /* block=cyrillicextc */, + { 1, 2858, 3216, 3, 5, UNI_XPOSIXDIGIT } /* gc=digit */, + { 7, 4586, 5194, 17, 14, UNI_ROHG } /* scriptextensions=hanifirohingya */, + { 0, 1971, 972, 5, 6, -UNI_BIDIC } /* bidic=false */, + { 50, 6760, 1662, 14, 7, UNI_SB__LE } /* sentencebreak=oletter */, + { 1, 913, 6244, 4, 2, UNI_uideo_values_index } /* uideo= */, + { 0, 4586, 831, 17, 4, UNI_HMNP } /* scriptextensions=hmnp */, + { 0, 1971, 0, 5, 0, UNI_BIDIC } /* bidic */, + { 2, 4586, 454, 17, 4, UNI_LINA } /* scriptextensions=lina */, + { 11, 1470, 1916, 7, 3, UNI_XIDS } /* xidstart=t */, + { 7, 316, 1211, 3, 2, UNI_NV__35 } /* nv=35 */, + { 0, 695, 3714, 4, 12, UNI_GCB__T } /* hst=trailingjamo */, + { 5, 2810, 4999, 3, 10, UNI_BC__WS } /* bc=whitespace */, + { 0, 913, 653, 5, 2, -UNI_UIDEO } /* uideo=n */, + { 0, 632, 1391, 5, 2, UNI_CCC__AR } /* ccc=232 */, + { 0, 8494, 7671, 30, 4, UNI_CJKEXTB } /* blk=cjkunifiedideographsextensionb */, + { 14, 293, 599, 4, 2, UNI_WB__EB } /* gcb=eb */, + { 0, 3103, 6555, 12, 3, UNI_COMPEX } /* nfcquickcheck=n */, + { 227, 6464, 185, 3, 4, UNI_SC__COPT } /* sc=qaac */, + { 8, 1733, 1042, 4, 6, UNI_INLYCIAN } /* blk=lycian */, + { 0, 1141, 506, 4, 4, UNI_SIDT } /* scx=sidt */, + { 0, 135, 39, 2, 4, UNI_BHKS } /* isbhks */, + { 1, 5993, 383, 4, 2, UNI_EMOD } /* emod=y */, + { 0, 2429, 1922, 6, 11, UNI_INSORASOMPENG } /* block=sorasompeng */, + { 26, 6928, 6945, 8, 7, UNI_INPC__TOPANDLEFT } /* inpc=topandleft */, + { 1, 135, 4533, 2, 6, UNI_XPOSIXSPACE } /* iswspace */, + { 1, 1911, 4408, 6, 11, UNI_SC__MANI } /* script=manichaean */, + { 0, 5740, 0, 21, 0, UNI_CWCF } /* changeswhencasefolded */, + { 176, 135, 4335, 2, 15, UNI_INHANGUL } /* ishangulsyllables */, + { 1, 333, 556, 2, 2, UNI_IN__3 } /* in=3 */, + { 0, 1781, 467, 3, 3, UNI_OGAM } /* isogam */, + { 4, 1260, 2049, 5, 2, UNI_CJKEXTJ } /* cjkextj */, + { 0, 368, 462, 4, 2, UNI_CCC__7 } /* ccc=nk */, + { 116, 2622, 3395, 8, 5, UNI_XPOSIXALNUM } /* isxposixalnum */, + { 20, 554, 2196, 4, 8, UNI_NV__7_SLASH_2 } /* nv=3.500e+00 */, + { 5, 7804, 1391, 28, 2, UNI_CCC__132 } /* canonicalcombiningclass=ccc132 */, + { 272, 9030, 1669, 7, 9, UNI_SMALLFORMS } /* block=smallforms */, + { 3, 135, 114, 2, 4, UNI_KITS } /* iskits */, + { 0, 3962, 1890, 14, 6, UNI_NFCQC__M } /* nfkcquickcheck=maybe */, + { 0, 30, 2020, 1, 6, UNI_XPOSIXGRAPH } /* isgraph */, + { 0, 2858, 4765, 3, 18, UNI_PI } /* gc=initialpunctuation */, + { 0, 2380, 2292, 4, 3, UNI_IN__12 } /* in=12.0 */, + { 0, 1112, 4035, 5, 2, UNI_NV__1_SLASH_80 } /* nv=1/80 */, + { 0, 4586, 669, 17, 7, UNI_ELYM } /* scriptextensions=elymaic */, + { 12, 2108, 382, 10, 5, UNI_KEHNOROTATE } /* kehnorotate=yes */, + { 47, 1258, 4695, 5, 4, UNI_CJKEXTC } /* incjkextc */, + { 0, 135, 110, 2, 4, UNI_KAWI } /* iskawi */, + { 0, 914, 296, 4, 1, UNI_ideo_values_index } /* ideo= */, + { 18, 333, 7734, 2, 26, UNI_KATAKANAEXT } /* inkatakanaphoneticextensions */, + { 9, 438, 639, 3, 2, UNI_DIA } /* dia=t */, + { 1, 30, 1641, 1, 11, UNI_INPHOENICIAN } /* inphoenician */, + { 4, 1911, 2157, 7, 4, UNI_MEND } /* script=mend */, + { 0, 2429, 5355, 6, 6, UNI_INTANGUT } /* block=tangut */, + { 18, 2525, 6988, 3, 14, UNI_MODIFIERLETTERS } /* inmodifierletters */, + { 240, 135, 2337, 2, 12, UNI_HUNG } /* isoldhungarian */, + { 0, 409, 0, 5, 0, UNI_GREXT } /* grext */, + { 0, 6737, 525, 13, 3, UNI_JG__GAF } /* joininggroup=gaf */, + { 5, 4586, 5546, 17, 4, UNI_CHER } /* scriptextensions=cher */, + { 2, 11, 704, 2, 3, UNI_ADLM } /* adlam */, + { 2, 2810, 329, 3, 2, UNI_BC__WS } /* bc=ws */, + { 44, 6464, 138, 3, 4, UNI_MEDF } /* sc=medf */, + { 0, 1084, 381, 5, 3, UNI_kehcore_values_index } /* kehcore= */, + { 0, 135, 7734, 2, 8, UNI_KANA } /* iskatakana */, + { 4, 6321, 966, 21, 2, UNI_BPT__O } /* bidipairedbrackettype=o */, + { 0, 1141, 1922, 4, 11, UNI_SORA } /* scx=sorasompeng */, + { 1, 7322, 318, 23, 2, UNI_CCC__9 } /* canonicalcombiningclass=9 */, + { 64, 5508, 0, 20, 0, UNI_PHLI } /* inscriptionalpahlavi */, + { 34, 2236, 2757, 4, 8, UNI_NV__1_SLASH_5 } /* nv=2.000e-01 */, + { 12, 1733, 5355, 4, 9, UNI_TANGUTSUP } /* blk=tangutsup */, + { 1, 1911, 3248, 6, 5, UNI_SC__GEOR } /* script=geor */, + { 9, 6464, 3453, 3, 6, UNI_SC__HEBR } /* sc=hebrew */, + { 24, 925, 0, 4, 0, UNI_age_values_index } /* age= */, + { 334, 1470, 383, 4, 2, UNI_XIDS } /* xids=y */, + { 0, 2373, 0, 12, 0, UNI_IN__14 } /* presentin=14 */, + { 4, 6464, 717, 3, 4, UNI_SC__LIMB } /* sc=limb */, + { 2, 333, 8862, 2, 25, UNI_SYMBOLSFORLEGACYCOMPUTING } /* insymbolsforlegacycomputing */, + { 0, 2429, 1377, 6, 9, UNI_INNEWTAILUE } /* block=newtailue */, + { 396, 1971, 639, 11, 5, UNI_BIDIC } /* bidicontrol=true */, + { 25, 2429, 2349, 6, 8, UNI_PHAISTOS } /* block=phaistos */, + { 12, 2635, 1844, 3, 3, UNI_JG__KAF } /* jg=kaf */, + { 1, 2, 972, 3, 6, -UNI_CWL } /* cwl=false */, + { 259, 1498, 812, 7, 2, UNI_CCC__21 } /* ccc=ccc21 */, + { 72, 4144, 0, 4, 0, UNI_MODI } /* modi */, + { 52, 2429, 2932, 6, 12, UNI_KHMERSYMBOLS } /* block=khmersymbols */, + { 0, 1465, 4569, 3, 17, UNI_RI } /* wb=regionalindicator */, + { 2, 4586, 253, 17, 2, UNI_YI } /* scriptextensions=yi */, + { 0, 1911, 4814, 7, 8, UNI_SC__BOPO } /* script=bopomofo */, + { 0, 2429, 6484, 6, 13, UNI_GLAGOLITICSUP } /* block=glagoliticsup */, + { 0, 2487, 2812, 2, 2, UNI_VO__R } /* vo=r */, + { 0, 1141, 3620, 3, 5, UNI_ETHI } /* scx=ethi */, + { 13, 5410, 383, 20, 2, UNI_EXTPICT } /* extendedpictographic=y */, + { 0, 3903, 303, 3, 2, UNI_GCB__L } /* lb=jl */, + { 2, 8117, 5216, 23, 6, UNI_JG__MANICHAEANLAMEDH } /* joininggroup=manichaeanlamedh */, + { 725, 3629, 1070, 12, 4, UNI_ARABICEXTB } /* block=arabicextb */, + { 7, 1495, 2865, 3, 13, UNI_INGREEK } /* ingreekandcoptic */, + { 0, 368, 2820, 4, 4, UNI_CCC__L } /* ccc=left */, + { 0, 30, 3549, 1, 16, UNI_SARB } /* inoldsoutharabian */, + { 418, 1141, 438, 4, 4, UNI_DIAK } /* scx=diak */, + { 24, 6464, 1156, 3, 4, UNI_SC__TAGB } /* sc=tagb */, + { 7, 3991, 5612, 14, 5, UNI_NV__500000 } /* numericvalue=500000 */, + { 6, 7045, 10, 22, 2, UNI_JG__MALAYALAMRA } /* joininggroup=malayalamra */, + { 4, 1810, 6492, 6, 12, UNI_ARABICSUP } /* isarabicsupplement */, + { 169, 554, 1392, 5, 2, UNI_NV__3_SLASH_20 } /* nv=3/20 */, + { 195, 1847, 639, 11, 5, UNI_KEHNOMIRROR } /* kehnomirror=true */, + { 3, 4999, 0, 10, 0, UNI_XPOSIXSPACE } /* whitespace */, + { 0, 135, 712, 2, 4, UNI_DOGR } /* isdogr */, + { 296, 333, 6078, 2, 19, UNI_JAMOEXTA } /* inhanguljamoextendeda */, + { 0, 135, 174, 2, 3, UNI_PCM } /* ispcm */, + { 0, 2508, 1070, 8, 4, UNI_ETHIOPICEXTB } /* ethiopicextb */, + { 0, 1678, 653, 10, 2, -UNI_SD } /* softdotted=n */, + { 2, 6462, 3098, 14, 5, UNI_INSC__CONSONANTFINAL } /* insc=consonantfinal */, + { 0, 9030, 1149, 7, 7, UNI_SPECIALS } /* block=specials */, + { 76, 135, 9048, 2, 21, UNI_MATHOPERATORS } /* ismathematicaloperators */, + { 0, 4586, 1368, 17, 9, UNI_NBAT } /* scriptextensions=nabataean */, + { 0, 6760, 3024, 13, 3, UNI_SB__LE } /* sentencebreak=le */, + { 165, 2429, 4783, 6, 16, UNI_LINEARBSYLLABARY } /* block=linearbsyllabary */, + { 0, 135, 1129, 2, 4, UNI_LINB } /* islinb */, + { 0, 3903, 3106, 3, 2, UNI_LB__QU } /* lb=qu */, + { 0, 32, 383, 2, 4, UNI_VS } /* vs=yes */, + { 67, 878, 972, 4, 2, -UNI_TERM } /* term=f */, + { 0, 9030, 5178, 7, 6, UNI_INSHARADA } /* block=sharada */, + { 0, 1733, 1789, 4, 11, UNI_INGURUNGKHEMA } /* blk=gurungkhema */, + { 2, 1911, 1907, 7, 4, UNI_SC__KTHI } /* script=kthi */, + { 0, 333, 5009, 2, 4, UNI_RUMI } /* inrumi */, + { 24, 1911, 1172, 7, 4, UNI_UGAR } /* script=ugar */, + { 1, 2325, 1388, 4, 2, UNI_NV__800 } /* nv=800 */, + { 89, 4586, 783, 17, 4, UNI_MAND } /* scriptextensions=mand */, + { 17, 5546, 0, 8, 0, UNI_CHER } /* cherokee */, + { 1, 5, 972, 3, 2, -UNI_MCM } /* mcm=f */, + { 0, 3521, 803, 13, 4, UNI_NV___MINUS_1_SLASH_2 } /* numericvalue=-1/2 */, + { 1, 5098, 2677, 16, 4, -UNI_EBASE } /* emojimodifierbase=no */, + { 3, 71, 0, 3, 0, UNI_CWU } /* cwu */, + { 49, 4586, 790, 17, 4, UNI_MARC } /* scriptextensions=marc */, + { 0, 1733, 6805, 4, 5, UNI_MUSIC } /* blk=music */, + { 28, 1141, 1269, 4, 4, UNI_THAI } /* scx=thai */, + { 5, 135, 397, 2, 2, UNI_SM } /* issm */, + { 0, 651, 7322, 6, 9, UNI_DT__NONCANON } /* dt=noncanonical */, + { 0, 6464, 783, 3, 7, UNI_SC__MAND } /* sc=mandaic */, + { 1, 135, 1405, 2, 9, UNI_PERM } /* isoldpermic */, + { 4, 651, 6395, 3, 4, UNI_DT__FONT } /* dt=font */, + { 0, 1141, 1156, 4, 8, UNI_TAGB } /* scx=tagbanwa */, + { 1, 8233, 138, 9, 2, UNI_ME } /* category=me */, + { 1, 978, 0, 6, 0, UNI_COMPEX } /* compex */, + { 67, 8226, 2935, 19, 8, UNI_SO } /* generalcategory=othersymbol */, + { 0, 438, 0, 3, 0, UNI_DIA } /* dia */, + { 514, 6356, 6103, 11, 6, UNI_GEORGIANSUP } /* block=georgiansup */, + { 0, 368, 7550, 4, 2, UNI_CCC__28 } /* ccc=28 */, + { 2, 71, 383, 3, 4, UNI_CWU } /* cwu=yes */, + { 16, 6164, 3155, 10, 9, UNI_LB__QU } /* linebreak=quotation */, + { 2, 1911, 5546, 7, 4, UNI_SC__CHER } /* script=cher */, + { 4, 7151, 8961, 23, 3, UNI_di_values_index } /* defaultignorablecodepoint= */, + { 0, 5009, 0, 18, 0, UNI_RUMI } /* ruminumeralsymbols */, + { 0, 3836, 0, 4, 0, UNI__PERL_SURROGATE } /* iscs */, + { 208, 2607, 0, 9, 0, UNI_MYMR } /* ismyanmar */, + { 0, 2429, 8607, 7, 32, UNI_DIACRITICALSEXT } /* block=combiningdiacriticalmarksextended */, + { 0, 7396, 0, 8, 0, UNI_INARABIC } /* inarabic */, + { 0, 1733, 2561, 4, 6, UNI_IPAEXT } /* blk=ipaext */, + { 512, 30, 4715, 1, 10, UNI_TITLE } /* istitlecase */, + { 2, 8061, 0, 4, 0, UNI_EGYP } /* egyp */, + { 133, 4051, 639, 16, 5, UNI_STERM } /* sentenceterminal=true */, + { 0, 1141, 4887, 4, 4, UNI_TALE } /* scx=tale */, + { 781, 269, 0, 2, 0, UNI_CN } /* cn */, + { 324, 3764, 4516, 3, 16, UNI_LETTERLIKESYMBOLS } /* inletterlikesymbols */, + { 0, 2081, 2149, 7, 5, UNI_POSIXALPHA } /* isposixalpha */, + { 0, 55, 0, 4, 0, UNI_CHAM } /* cham */, + { 1, 2149, 639, 5, 5, UNI_XPOSIXALPHA } /* alpha=true */, + { 1, 1141, 253, 4, 2, UNI_YI } /* scx=yi */, + { 7, 1112, 1386, 5, 3, UNI_NV__1_SLASH_160 } /* nv=1/160 */, + { 0, 4586, 114, 17, 4, UNI_KITS } /* scriptextensions=kits */, + { 0, 333, 769, 2, 7, UNI_KALI } /* inkayahli */, + { 3, 135, 4409, 2, 10, UNI_MANI } /* ismanichaean */, + { 5, 561, 5612, 4, 5, UNI_NV__700000 } /* nv=700000 */, + { 2, 1911, 855, 7, 4, UNI_SC__SYRC } /* script=syrc */, + { 0, 6369, 2146, 7, 11, UNI_MATHALPHANUM } /* block=mathalphanum */, + { 1, 1911, 4335, 7, 6, UNI_SC__HANG } /* script=hangul */, + { 20, 1523, 0, 10, 0, UNI_DEP } /* deprecated */, + { 0, 2380, 604, 3, 2, UNI_IN__13 } /* in=13 */, + { 18, 135, 1301, 2, 7, UNI_NB } /* isnoblock */, + { 0, 1911, 984, 7, 8, UNI_SC__DUPL } /* script=duployan */, + { 0, 7846, 653, 10, 3, -UNI_XPOSIXALPHA } /* alphabetic=no */, + { 560, 4586, 835, 17, 4, UNI_KALI } /* scriptextensions=kali */, + { 0, 2429, 3780, 6, 11, UNI_PHONETICEXT } /* block=phoneticext */, + { 147, 1346, 217, 7, 2, UNI_CJKEXTF } /* iscjkextf */, + { 8, 1911, 9096, 7, 18, UNI_CANS } /* script=canadianaboriginal */, + { 2, 1733, 727, 4, 5, UNI_INOSAGE } /* blk=osage */, + { 1, 2858, 566, 3, 2, UNI_LO } /* gc=lo */, + { 0, 1911, 3620, 6, 9, UNI_SC__ETHI } /* script=ethiopic */, + { 0, 2429, 1322, 6, 7, UNI_INSOYOMBO } /* block=soyombo */, + { 177, 1781, 7648, 3, 26, UNI_OCR } /* isopticalcharacterrecognition */, + { 1, 4586, 189, 17, 4, UNI_RJNG } /* scriptextensions=rjng */, + { 34, 2858, 2935, 6, 8, UNI_SO } /* gc=othersymbol */, + { 2, 446, 0, 3, 0, UNI_HAN } /* han */, + { 3, 7322, 812, 24, 2, UNI_CCC__21 } /* canonicalcombiningclass=21 */, + { 0, 8226, 1546, 16, 2, UNI_ZS } /* generalcategory=zs */, + { 0, 6164, 4488, 10, 14, UNI_LB__BK } /* linebreak=mandatorybreak */, + { 64, 353, 6382, 3, 13, UNI_SUPMATHOPERATORS } /* supmathoperators */, + { 86, 135, 1470, 2, 4, UNI_XIDS } /* isxids */, + { 226, 20, 1143, 2, 3, UNI_XPOSIXXDIGIT } /* hex=t */, + { 28, 333, 5355, 2, 9, UNI_TANGUTSUP } /* intangutsup */, + { 155, 1733, 3653, 4, 16, UNI_CYPRIOTSYLLABARY } /* blk=cypriotsyllabary */, + { 2, 135, 1450, 2, 9, UNI_SAMR } /* issamaritan */, + { 27, 3903, 4532, 3, 7, UNI_LB__ZW } /* lb=zwspace */, + { 5, 1733, 5636, 4, 3, UNI_PUA } /* blk=pua */, + { 33, 7322, 376, 24, 2, UNI_CCC__84 } /* canonicalcombiningclass=84 */, + { 3, 333, 790, 2, 7, UNI_INMARCHEN } /* inmarchen */, + { 4, 1733, 7210, 4, 23, UNI_BYZANTINEMUSIC } /* blk=byzantinemusicalsymbols */, + { 1, 6369, 4673, 13, 9, UNI_MYANMAREXTB } /* block=myanmarextendedb */, + { 0, 2429, 4335, 6, 6, UNI_INHANGUL } /* block=hangul */, + { 0, 1283, 0, 4, 0, UNI_KANA } /* kana */, + { 0, 316, 313, 3, 1, UNI_NV__0 } /* nv=0 */, + { 37, 2596, 383, 11, 2, UNI_JOINC } /* joincontrol=y */, + { 58, 2373, 611, 10, 3, UNI_IN__6 } /* presentin=6.0 */, + { 6, 3129, 2182, 12, 2, UNI_IN__15 } /* presentin=v150 */, + { 7, 2429, 8535, 6, 18, UNI_IDEOGRAPHICSYMBOLS } /* block=ideographicsymbols */, + { 0, 1483, 4695, 5, 4, UNI_LATINEXTC } /* latinextc */, + { 166, 438, 383, 2, 4, UNI_DI } /* di=yes */, + { 1, 2844, 0, 14, 0, UNI_ECOMP } /* emojicomponent */, + { 6, 30, 4319, 1, 16, UNI_DIACRITICALSEXT } /* indiacriticalsext */, + { 1, 6557, 1386, 14, 5, UNI_NV__216000 } /* numericvalue=216000 */, + { 0, 346, 0, 5, 0, UNI_TAKR } /* takri */, + { 0, 2858, 3390, 3, 13, UNI_XPOSIXDIGIT } /* gc=decimalnumber */, + { 0, 6464, 6222, 3, 7, UNI_SC__SINH } /* sc=sinhala */, + { 20, 4406, 5580, 12, 8, UNI_JG__MANICHAEANDHAMEDH } /* jg=manichaeandhamedh */, + { 0, 1465, 2580, 5, 7, UNI_WB__ML } /* wb=midletter */, + { 11, 1733, 1432, 4, 9, UNI_PALM } /* blk=palmyrene */, + { 0, 1471, 653, 3, 2, -UNI_IDS } /* ids=n */, + { 0, 1733, 4408, 3, 11, UNI_INMANICHAEAN } /* blk=manichaean */, + { 0, 333, 1441, 2, 9, UNI_INPAUCINHAU } /* inpaucinhau */, + { 0, 8494, 5407, 30, 4, UNI_CJKEXTE } /* blk=cjkunifiedideographsextensione */, + { 0, 3128, 639, 5, 2, UNI_EPRES } /* epres=t */, + { 2, 2429, 984, 6, 8, UNI_INDUPLOYAN } /* block=duployan */, + { 14, 4185, 0, 17, 0, UNI_IDCOMPATMATHSTART } /* idcompatmathstart */, + { 10, 925, 605, 4, 3, UNI_AGE__3 } /* age=3.0 */, + { 2, 877, 383, 5, 2, UNI_STERM } /* sterm=y */, + { 59, 683, 971, 5, 3, -UNI_GRBASE } /* grbase=f */, + { 285, 3903, 299, 3, 2, UNI_LB__H2 } /* lb=h2 */, + { 2, 7734, 0, 8, 0, UNI_KANA } /* katakana */, + { 182, 333, 3780, 2, 14, UNI_PHONETICEXTSUP } /* inphoneticextsup */, + { 45, 1141, 3550, 4, 15, UNI_SARB } /* scx=oldsoutharabian */, + { 27, 7176, 653, 24, 2, -UNI_COMPEX } /* fullcompositionexclusion=n */, + { 0, 1260, 2478, 2, 5, UNI_CJKEXTE } /* cjkexte */, + { 0, 135, 3213, 2, 8, UNI_XPOSIXXDIGIT } /* ishexdigit */, + { 156, 333, 2275, 2, 2, UNI_IN__4 } /* in=4 */, + { 0, 4569, 383, 17, 2, UNI_RI } /* regionalindicator=y */, + { 3, 2273, 1388, 4, 2, UNI_NV__400 } /* nv=400 */, + { 4, 7674, 6622, 10, 3, UNI_BC__PDI } /* bidiclass=pdi */, + { 34, 273, 0, 2, 0, UNI_CASEDLETTER } /* lc */, + { 24, 1495, 2475, 3, 12, UNI_GREEKEXT } /* ingreekextended */, + { 2, 1141, 514, 4, 4, UNI_TNSA } /* scx=tnsa */, + { 0, 3257, 0, 11, 0, UNI_INMYANMAR } /* blk=myanmar */, + { 1, 4586, 5890, 17, 5, UNI_GREK } /* scriptextensions=greek */, + { 35, 2844, 972, 14, 6, -UNI_ECOMP } /* emojicomponent=false */, + { 16, 7804, 319, 28, 1, UNI_CCC__19 } /* canonicalcombiningclass=ccc19 */, + { 8, 368, 8453, 4, 9, UNI_CCC__AL } /* ccc=aboveleft */, + { 61, 1733, 4144, 4, 4, UNI_INMODI } /* blk=modi */, + { 78, 333, 307, 2, 5, UNI_INNUSHU } /* innushu */, + { 152, 6737, 246, 13, 2, UNI_JG__PE } /* joininggroup=pe */, + { 0, 5993, 0, 4, 0, UNI_EMOD } /* emod */, + { 0, 6737, 759, 13, 3, UNI_JG__AIN } /* joininggroup=ain */, + { 0, 2525, 6098, 3, 11, UNI_MONGOLIANSUP } /* inmongoliansup */, + { 0, 1486, 1495, 9, 3, UNI_BOXDRAWING } /* inboxdrawing */, + { 51, 1911, 783, 7, 7, UNI_SC__MAND } /* script=mandaic */, + { 0, 5306, 2812, 9, 3, UNI_RI } /* wordbreak=ri */, + { 9, 6737, 20, 13, 2, UNI_JG__HE } /* joininggroup=he */, + { 0, 1483, 372, 5, 1, UNI_LATIN1 } /* latin1 */, + { 17, 316, 803, 3, 4, UNI_NV___MINUS_1_SLASH_2 } /* nv=-1/2 */, + { 2, 71, 653, 3, 2, -UNI_CWU } /* cwu=n */, + { 157, 1483, 6088, 5, 9, UNI_LATINEXTA } /* latinextendeda */, + { 8, 4586, 1156, 17, 4, UNI_TAGB } /* scriptextensions=tagb */, + { 2, 1733, 5546, 4, 8, UNI_INCHEROKEE } /* blk=cherokee */, + { 0, 333, 662, 2, 7, UNI_INELBASAN } /* inelbasan */, + { 1, 1733, 8862, 4, 25, UNI_SYMBOLSFORLEGACYCOMPUTING } /* blk=symbolsforlegacycomputing */, + { 0, 7509, 5299, 16, 7, UNI_SUPARROWSA } /* blk=supplementalarrowsa */, + { 0, 5306, 1952, 10, 5, UNI_WB__EB } /* wordbreak=ebase */, + { 6, 1230, 3239, 4, 6, UNI_EA__N } /* ea=neutral */, + { 0, 2108, 971, 10, 7, -UNI_KEHNOROTATE } /* kehnorotate=false */, + { 130, 1471, 383, 7, 2, UNI_IDS } /* idstart=y */, + { 310, 7322, 313, 24, 1, UNI_CCC__0 } /* canonicalcombiningclass=0 */, + { 528, 135, 913, 2, 5, UNI_UIDEO } /* isuideo */, + { 12, 168, 7277, 3, 12, UNI_GEOMETRICSHAPES } /* geometricshapes */, + { 3, 2498, 1573, 8, 4, UNI_CYRILLICEXTA } /* cyrillicexta */, + { 658, 4586, 1036, 17, 6, UNI_LEPC } /* scriptextensions=lepcha */, + { 1, 8175, 383, 11, 2, UNI_IDEO } /* ideographic=y */, + { 136, 3521, 604, 13, 2, UNI_NV__13 } /* numericvalue=13 */, + { 34, 1141, 831, 4, 4, UNI_HMNP } /* scx=hmnp */, + { 32, 2097, 3036, 11, 12, UNI_JT__T } /* joiningtype=transparent */, + { 1, 2014, 0, 6, 0, UNI_S } /* symbol */, + { 256, 106, 64, 1, 1, UNI_ZP } /* zp */, + { 21959, 3128, 639, 5, 5, UNI_EPRES } /* epres=true */, + { 18, 316, 314, 3, 2, UNI_NV__40 } /* nv=40 */, + { 0, 6464, 8061, 3, 4, UNI_EGYP } /* sc=egyp */, + { 1, 2273, 2285, 4, 8, UNI_NV__3_SLASH_64 } /* nv=4.688e-02 */, + { 2, 1818, 202, 3, 3, UNI_SGNW } /* issgnw */, + { 9, 8765, 2860, 21, 6, UNI_INSC__OTHER } /* indicsyllabiccategory=other */, + { 146, 7297, 0, 25, 0, UNI_SUPERANDSUB } /* superscriptsandsubscripts */, + { 9, 549, 1887, 2, 9, UNI_NFCQC__M } /* nfcqc=maybe */, + { 1, 2352, 594, 3, 5, UNI_TODR } /* istodhri */, + { 163, 1141, 6952, 4, 6, UNI_BRAH } /* scx=brahmi */, + { 1, 333, 984, 2, 8, UNI_INDUPLOYAN } /* induployan */, + { 0, 6164, 4474, 10, 14, UNI_LB__SA } /* linebreak=complexcontext */, + { 34, 1141, 824, 4, 7, UNI_OSMA } /* scx=osmanya */, + { 2, 1781, 1416, 4, 7, UNI_ORKH } /* isoldturkic */, + { 52, 760, 112, 4, 2, UNI_INKAWI } /* inkawi */, + { 0, 3903, 748, 3, 2, UNI_EMOD } /* lb=em */, + { 147, 3521, 2227, 13, 9, UNI_NV__3_SLASH_16 } /* numericvalue=1.875e-01 */, + { 42, 135, 6484, 2, 13, UNI_GLAGOLITICSUP } /* isglagoliticsup */, + { 5, 135, 259, 2, 2, UNI_NB } /* isnb */, + { 9, 5410, 972, 20, 6, -UNI_EXTPICT } /* extendedpictographic=false */, + { 71, 1506, 0, 10, 0, UNI_CHRS } /* chorasmian */, + { 0, 4586, 537, 17, 6, UNI_KHOJ } /* scriptextensions=khojki */, + { 17, 4586, 4219, 17, 4, UNI_BRAI } /* scriptextensions=brai */, + { 7, 2858, 1546, 3, 2, UNI_ZS } /* gc=zs */, + { 0, 5, 7929, 1, 28, UNI_MISCARROWS } /* miscellaneoussymbolsandarrows */, + { 0, 1141, 2932, 4, 5, UNI_KHMR } /* scx=khmer */, + { 0, 760, 3889, 4, 14, UNI_KAKTOVIKNUMERALS } /* inkaktoviknumerals */, + { 10, 8233, 106, 9, 2, UNI_ZL } /* category=zl */, + { 1, 2810, 6610, 13, 10, UNI_BC__RLE } /* bc=righttoleftembedding */, + { 0, 2429, 8996, 7, 34, UNI_DIACRITICALSSUP } /* block=combiningdiacriticalmarkssupplement */, + { 4, 2157, 0, 12, 0, UNI_MEND } /* mendekikakui */, + { 0, 6164, 3048, 10, 11, UNI_LB__BB } /* linebreak=breakbefore */, + { 0, 1911, 321, 7, 5, UNI_SC__ORYA } /* script=oriya */, + { 1, 2429, 1287, 6, 7, UNI_INMAKASAR } /* block=makasar */, + { 2, 2429, 1533, 6, 10, UNI_INDIVESAKURU } /* block=divesakuru */, + { 1, 8233, 0, 9, 0, UNI_gc_values_index } /* category= */, + { 5, 1465, 3587, 3, 3, UNI_LB__ZWJ } /* wb=zwj */, + { 950, 2635, 3886, 3, 3, UNI_JG__TAW } /* jg=taw */, + { 400, 6464, 737, 3, 5, UNI_TAYO } /* sc=taiyo */, + { 18, 4127, 5678, 9, 9, UNI_epres_values_index } /* emojipresentation= */, + { 0, 7396, 6492, 6, 5, UNI_ARABICSUP } /* inarabicsup */, + { 0, 2429, 6116, 6, 19, UNI_SUNDANESESUP } /* block=sundanesesupplement */, + { 1, 6928, 4266, 11, 12, UNI_INPC__TOPANDLEFTANDRIGHT } /* inpc=topandleftandright */, + { 5, 6464, 1377, 3, 9, UNI_TALU } /* sc=newtailue */, + { 21, 5824, 0, 21, 0, UNI_CWU } /* changeswhenuppercased */, + { 7, 1498, 604, 7, 2, UNI_CCC__13 } /* ccc=ccc13 */, + { 2, 1141, 4219, 4, 7, UNI_BRAI } /* scx=braille */, + { 0, 1156, 0, 4, 0, UNI_TAGB } /* tagb */, + { 0, 7509, 6053, 7, 7, UNI_SUPARROWSB } /* blk=suparrowsb */, + { 131, 14, 785, 2, 5, UNI_MAND } /* mandaic */, + { 33, 6462, 2553, 5, 8, UNI_INSC__TONEMARK } /* insc=tonemark */, + { 0, 8226, 4234, 16, 14, UNI_SC } /* generalcategory=currencysymbol */, + { 0, 1781, 819, 4, 5, UNI_OLCK } /* isolchiki */, + { 10, 1911, 2157, 7, 12, UNI_MEND } /* script=mendekikakui */, + { 12, 316, 805, 4, 2, UNI_NV__9_SLASH_2 } /* nv=9/2 */, + { 442, 2429, 8607, 7, 24, UNI_DIACRITICALS } /* block=combiningdiacriticalmarks */, + { 4, 1733, 1632, 4, 10, UNI_INOLDPERSIAN } /* blk=oldpersian */, + { 0, 742, 0, 5, 0, UNI_BATK } /* batak */, + { 10, 4127, 383, 17, 2, UNI_EPRES } /* emojipresentation=y */, + { 65, 5, 768, 1, 3, UNI_MAKA } /* maka */, + { 0, 4335, 0, 4, 0, UNI_HANG } /* hang */, + { 3, 6164, 569, 10, 2, UNI_LB__AL } /* linebreak=al */, + { 0, 2784, 0, 13, 0, UNI_VERTICALFORMS } /* verticalforms */, + { 1184, 135, 1751, 2, 11, UNI_CPMN } /* iscyprominoan */, + { 7, 135, 5073, 2, 5, UNI_TAML } /* istamil */, + { 9, 6737, 0, 23, 0, UNI_JG__AFRICANQAF } /* joininggroup=africanqaf */, + { 1024, 1733, 2045, 5, 9, UNI_COMPATJAMO } /* blk=compatjamo */, + { 1, 368, 812, 4, 2, UNI_CCC__21 } /* ccc=21 */, + { 6, 1346, 8996, 3, 34, UNI_DIACRITICALSSUP } /* iscombiningdiacriticalmarkssupplement */, + { 2, 135, 166, 2, 4, UNI_OSGE } /* isosge */, + { 271, 2429, 4290, 6, 15, UNI_VEDICEXT } /* block=vedicextensions */, + { 141, 8765, 2487, 22, 5, UNI_INSC__VOWEL } /* indicsyllabiccategory=vowel */, + { 0, 2081, 0, 3, 0, UNI_P } /* isp */, + { 0, 2844, 652, 13, 3, -UNI_ECOMP } /* emojicomponent=n */, + { 0, 30, 687, 1, 8, UNI_HANO } /* ishanunoo */, + { 6, 135, 543, 2, 4, UNI_LYDI } /* islydi */, + { 0, 6342, 1239, 7, 8, UNI_EMOTICONS } /* block=emoticons */, + { 10, 6464, 458, 3, 3, UNI_MRO } /* sc=mro */, + { 49, 4202, 972, 4, 2, -UNI_IDSB } /* idsb=f */, + { 0, 1141, 1042, 4, 6, UNI_LYCI } /* scx=lycian */, + { 1, 438, 296, 2, 1, UNI_di_values_index } /* di= */, + { 11, 7978, 0, 22, 0, UNI_LB__H3 } /* hangulsyllabletype=lvt */, + { 3, 438, 972, 2, 6, -UNI_DI } /* di=false */, + { 0, 3903, 1672, 3, 2, UNI_LB__LF } /* lb=lf */, + { 0, 1141, 94, 4, 4, UNI_GUKH } /* scx=gukh */, + { 3, 1911, 51, 7, 4, UNI_CANS } /* script=cans */, + { 0, 1733, 870, 4, 7, UNI_INSIDETIC } /* blk=sidetic */, + { 4, 5845, 32, 21, 1, UNI_GCB__V } /* graphemeclusterbreak=v */, + { 0, 1911, 3608, 6, 9, UNI_SC__CYRL } /* script=cyrillic */, + { 0, 4586, 625, 17, 7, UNI_AVST } /* scriptextensions=avestan */, + { 59, 1733, 6264, 4, 6, UNI_YIJING } /* blk=yijing */, + { 10, 8117, 5580, 22, 8, UNI_JG__MANICHAEANDHAMEDH } /* joininggroup=manichaeandhamedh */, + { 5, 2912, 1070, 10, 4, UNI_CYRILLICEXTB } /* iscyrillicextb */, + { 0, 4553, 808, 15, 2, UNI_NV__3_SLASH_64 } /* numericvalue=3/64 */, + { 1, 135, 863, 2, 7, UNI_SHAW } /* isshavian */, + { 0, 2496, 1740, 10, 4, UNI_CYRILLICEXTD } /* incyrillicextd */, + { 848, 6760, 54, 14, 2, UNI_SB__SC } /* sentencebreak=sc */, + { 2, 6203, 972, 5, 6, -UNI__PERL_NCHAR } /* nchar=false */, + { 0, 1283, 1573, 4, 4, UNI_KANAEXTA } /* kanaexta */, + { 0, 4732, 0, 15, 0, UNI_UPPERCASELETTER } /* uppercaseletter */, + { 18, 1303, 4685, 2, 14, UNI_CYRILLICEXTC } /* blk=cyrillicextc */, + { 0, 411, 0, 3, 0, UNI_EXT } /* ext */, + { 3, 4586, 1247, 17, 4, UNI_BENG } /* scriptextensions=beng */, + { 18, 5866, 7200, 15, 10, UNI_IDENTIFIERTYPE__LIMITEDUSE } /* identifiertype=limiteduse */, + { 1143, 404, 2935, 3, 8, UNI_SO } /* othersymbol */, + { 3, 2587, 7277, 5, 12, UNI_GEOMETRICSHAPES } /* isgeometricshapes */, + { 4, 135, 7734, 2, 26, UNI_KATAKANAEXT } /* iskatakanaphoneticextensions */, + { 9, 6464, 863, 3, 7, UNI_SC__SHAW } /* sc=shavian */, + { 20, 2858, 2422, 3, 6, UNI_N } /* gc=number */, + { 33, 1141, 35, 4, 4, UNI_BATK } /* scx=batk */, + { 0, 4586, 286, 17, 4, UNI_GARA } /* scriptextensions=gara */, + { 16, 3521, 314, 14, 1, UNI_NV__44 } /* numericvalue=44 */, + { 64, 1896, 0, 11, 0, UNI_HMNG } /* pahawhhmong */, + { 1, 2429, 2002, 6, 8, UNI_UCASEXTA } /* block=ucasexta */, + { 303, 135, 2878, 2, 14, UNI_HIGHSURROGATES } /* ishighsurrogates */, + { 0, 5648, 972, 19, 6, -UNI_TERM } /* terminalpunctuation=false */, + { 123, 117, 0, 2, 0, UNI_SK } /* sk */, + { 25, 15, 4048, 2, 3, UNI_AGE__9 } /* age=9 */, + { 312, 33, 5564, 1, 17, UNI_SMALLKANAEXT } /* smallkanaextension */, + { 0, 8175, 383, 11, 4, UNI_IDEO } /* ideographic=yes */, + { 1, 2498, 6492, 6, 5, UNI_CYRILLICSUP } /* cyrillicsup */, + { 22, 4406, 3883, 13, 3, UNI_JG__MANICHAEANMEM } /* jg=manichaeanmem */, + { 4, 4305, 972, 4, 6, -UNI_DASH } /* dash=false */, + { 264, 1911, 462, 7, 3, UNI_SC__NKO } /* script=nko */, + { 96, 2810, 3620, 2, 3, UNI_BC__ET } /* bc=et */, + { 1, 2635, 754, 3, 4, UNI_JG__SHIN } /* jg=shin */, + { 0, 3903, 5993, 3, 9, UNI_EMOD } /* lb=emodifier */, + { 0, 1346, 394, 3, 3, UNI_CWCM } /* iscwcm */, + { 0, 2429, 7086, 6, 11, UNI_INMEETEIMAYEK } /* block=meeteimayek */, + { 168, 86, 0, 4, 0, UNI_GREK } /* grek */, + { 0, 1283, 6088, 4, 9, UNI_KANAEXTA } /* kanaextendeda */, + { 21, 4569, 972, 17, 2, -UNI_RI } /* regionalindicator=f */, + { 258, 1044, 639, 2, 2, UNI_CI } /* ci=t */, + { 0, 170, 0, 4, 0, UNI_OUGR } /* ougr */, + { 131, 6164, 5595, 10, 17, UNI_LB__HH } /* linebreak=unambiguoushyphen */, + { 344, 135, 566, 2, 2, UNI_LO } /* islo */, + { 0, 4586, 1652, 17, 10, UNI_SAUR } /* scriptextensions=saurashtra */, + { 0, 333, 7760, 2, 19, UNI_TANGUTCOMPONENTSSUP } /* intangutcomponentssup */, + { 6, 293, 0, 4, 0, UNI_gcb_values_index } /* gcb= */, + { 1, 6464, 1432, 3, 4, UNI_PALM } /* sc=palm */, + { 21, 1141, 446, 4, 4, UNI_HANO } /* scx=hano */, + { 1, 5098, 638, 16, 3, UNI_EBASE } /* emojimodifierbase=t */, + { 1, 2380, 2781, 3, 3, UNI_IN__6_DOT_1 } /* in=6.1 */, + { 0, 6737, 2094, 13, 3, UNI_JG__WAW } /* joininggroup=waw */, + { 1, 1733, 712, 4, 5, UNI_INDOGRA } /* blk=dogra */, + { 0, 336, 383, 5, 4, UNI_QMARK } /* qmark=yes */, + { 12, 6201, 383, 21, 4, UNI__PERL_NCHAR } /* noncharactercodepoint=yes */, + { 1141, 1191, 0, 9, 0, UNI_BERF } /* beriaerfe */, + { 0, 135, 1048, 2, 4, UNI_TELU } /* istelu */, + { 25, 2587, 83, 3, 3, UNI_GONG } /* isgong */, + { 0, 6928, 8964, 11, 14, UNI_INPC__TOPANDBOTTOMANDRIGHT } /* inpc=topandbottomandright */, + { 19, 5761, 383, 21, 4, UNI_CWCM } /* changeswhencasemapped=yes */, + { 0, 1141, 3477, 4, 4, UNI_MERO } /* scx=mero */, + { 0, 561, 805, 4, 2, UNI_NV__7_SLASH_2 } /* nv=7/2 */, + { 0, 549, 1888, 3, 3, UNI_nfdqc_values_index } /* nfdqc= */, + { 136, 135, 1024, 2, 6, UNI_HATR } /* ishatran */, + { 1, 7322, 604, 24, 2, UNI_CCC__13 } /* canonicalcombiningclass=13 */, + { 0, 1810, 6492, 6, 5, UNI_ARABICSUP } /* isarabicsup */, + { 0, 1911, 3590, 7, 15, UNI_ZANB } /* script=zanabazarsquare */, + { 2, 7322, 374, 24, 2, UNI_CCC__31 } /* canonicalcombiningclass=31 */, + { 0, 3521, 312, 13, 2, UNI_NV__30 } /* numericvalue=30 */, + { 0, 2429, 9089, 6, 34, UNI_UCAS } /* block=unifiedcanadianaboriginalsyllabics */, + { 0, 1141, 6116, 4, 4, UNI_SUND } /* scx=sund */, + { 0, 717, 0, 5, 0, UNI_LIMB } /* limbu */, + { 2, 6164, 299, 10, 2, UNI_LB__H2 } /* linebreak=h2 */, + { 0, 2616, 3323, 5, 8, UNI_NO } /* isothernumber */, + { 113, 7396, 4822, 8, 9, UNI_ARABICEXTC } /* inarabicextendedc */, + { 0, 2429, 5438, 6, 9, UNI_HALFMARKS } /* block=halfmarks */, + { 113, 8226, 3950, 16, 10, UNI_SM } /* generalcategory=mathsymbol */, + { 1, 1911, 4649, 7, 6, UNI_SC__ZYYY } /* script=common */, + { 1, 4586, 7734, 17, 8, UNI_KANA } /* scriptextensions=katakana */, + { 0, 2373, 2315, 9, 2, UNI_IN__6 } /* presentin=6 */, + { 1, 5606, 2381, 5, 2, UNI_hyphen_values_index } /* hyphen= */, + { 8, 5098, 972, 13, 2, -UNI_EMOD } /* emojimodifier=f */, + { 4, 3808, 1573, 7, 4, UNI_LATINEXTA } /* islatinexta */, + { 2, 760, 5183, 5, 4, UNI_KANASUP } /* inkanasup */, + { 0, 6820, 0, 24, 0, UNI_HIGHPUSURROGATES } /* highprivateusesurrogates */, + { 6, 3903, 4813, 3, 2, UNI_LB__BB } /* lb=bb */, + { 148, 1911, 515, 8, 3, UNI_TNSA } /* script=tnsa */, + { 563, 3950, 653, 4, 3, -UNI_MATH } /* math=no */, + { 2, 6737, 3416, 13, 12, UNI_JG__FINALSEMKATH } /* joininggroup=finalsemkath */, + { 0, 3129, 1387, 11, 2, UNI_IN__6 } /* presentin=v60 */, + { 3, 1622, 0, 10, 0, UNI_NAGM } /* nagmundari */, + { 0, 6342, 6088, 14, 9, UNI_ETHIOPICEXTA } /* block=ethiopicextendeda */, + { 0, 2607, 6098, 3, 11, UNI_MONGOLIANSUP } /* ismongoliansup */, + { 0, 2429, 4443, 6, 17, UNI_INKHITANSMALLSCRIPT } /* block=khitansmallscript */, + { 2, 2429, 4966, 6, 8, UNI_DINGBATS } /* block=dingbats */, + { 1, 925, 422, 5, 1, UNI_AGE__15 } /* age=15 */, + { 66, 135, 1287, 2, 7, UNI_MAKA } /* ismakasar */, + { 533, 4586, 3141, 17, 14, UNI_PHLP } /* scriptextensions=psalterpahlavi */, + { 1057, 6243, 8989, 3, 7, UNI_VO__U } /* vo=upright */, + { 2, 651, 7297, 3, 5, UNI_DT__SUP } /* dt=super */, + { 3, 2635, 4898, 3, 5, UNI_JG__SADHE } /* jg=sadhe */, + { 1, 270, 6556, 2, 3, UNI_NT__NU } /* nt=nu */, + { 0, 16, 1500, 1, 4, UNI_XPOSIXCNTRL } /* gc=cc */, + { 13, 1590, 2516, 4, 9, UNI_KATAKANAEXT } /* iskatakanaext */, + { 1334, 1547, 5319, 5, 4, UNI_XPOSIXSPACE } /* spaceperl */, + { 0, 4037, 1388, 14, 3, UNI_NV__9000 } /* numericvalue=9000 */, + { 0, 3808, 3320, 3, 11, UNI_NL } /* isletternumber */, + { 393, 2506, 674, 8, 5, UNI_ETHIOPICEXT } /* inethiopicext */, + { 0, 135, 824, 2, 4, UNI_OSMA } /* isosma */, + { 6, 333, 5920, 2, 19, UNI_SC__MERO } /* inmeroitichieroglyphs */, + { 17, 1145, 0, 4, 0, UNI_TALU } /* talu */, + { 0, 8226, 585, 15, 2, UNI_S } /* generalcategory=s */, + { 0, 1112, 559, 4, 2, UNI_NV__1_SLASH_5 } /* nv=1/5 */, + { 0, 2, 639, 3, 5, UNI_CWL } /* cwl=true */, + { 0, 1733, 4320, 4, 15, UNI_DIACRITICALSEXT } /* blk=diacriticalsext */, + { 17, 7322, 563, 23, 2, UNI_CCC__7 } /* canonicalcombiningclass=7 */, + { 3, 2, 639, 3, 2, UNI_CWL } /* cwl=t */, + { 0, 7957, 7512, 17, 4, UNI_DT__SUP } /* decompositiontype=sup */, + { 4, 6737, 1831, 13, 8, UNI_JG__FARSIYEH } /* joininggroup=farsiyeh */, + { 0, 8280, 6864, 26, 4, UNI_CJKEXTC } /* cjkunifiedideographsextensionc */, + { 0, 134, 0, 4, 0, UNI_LISU } /* lisu */, + { 41, 4586, 4814, 17, 4, UNI_BOPO } /* scriptextensions=bopo */, + { 10, 135, 4814, 2, 11, UNI_BOPOMOFOEXT } /* isbopomofoext */, + { 0, 108, 3000, 2, 2, UNI_JT__D } /* jt=d */, + { 0, 1141, 362, 4, 4, UNI_CARI } /* scx=cari */, + { 337, 3629, 7847, 7, 26, UNI_ALPHABETICPF } /* block=alphabeticpresentationforms */, + { 2, 16, 1889, 1, 3, UNI_M } /* gc=m */, + { 1, 1141, 1016, 4, 4, UNI_HIRA } /* scx=hira */, + { 2, 1733, 387, 4, 6, UNI_INCHAKMA } /* blk=chakma */, + { 0, 4586, 229, 17, 4, UNI_TODR } /* scriptextensions=todr */, + { 14, 2073, 639, 7, 5, UNI_RADICAL } /* radical=true */, + { 0, 1471, 0, 7, 0, UNI_IDS } /* idstart */, + { 0, 4586, 2534, 17, 4, UNI_NAND } /* scriptextensions=nand */, + { 0, 6634, 0, 6, 0, UNI_CF } /* format */, + { 4, 978, 383, 6, 2, UNI_COMPEX } /* compex=y */, + { 532, 1141, 577, 4, 6, UNI_RJNG } /* scx=rejang */, + { 2, 5306, 3565, 9, 13, UNI_WB__EX } /* wordbreak=extendnumlet */, + { 1, 333, 4249, 2, 17, UNI_INDICSIYAQNUMBERS } /* inindicsiyaqnumbers */, + { 0, 1112, 2220, 4, 8, UNI_NV__1_SLASH_6 } /* nv=1.667e-01 */, + { 0, 8639, 6945, 27, 7, UNI_INPC__TOPANDLEFT } /* indicpositionalcategory=topandleft */, + { 109, 333, 1698, 2, 10, UNI_INWARANGCITI } /* inwarangciti */, + { 859, 5098, 382, 16, 5, UNI_EBASE } /* emojimodifierbase=yes */, + { 4, 6462, 5163, 5, 14, UNI_INSC__VOWELDEPENDENT } /* insc=voweldependent */, + { 1, 1133, 0, 4, 0, UNI_MLYM } /* mlym */, + { 0, 333, 1036, 2, 6, UNI_INLEPCHA } /* inlepcha */, + { 0, 333, 6222, 2, 7, UNI_INSINHALA } /* insinhala */, + { 21, 6760, 877, 14, 5, UNI_SB__ST } /* sentencebreak=sterm */, + { 43, 8233, 1546, 9, 2, UNI_ZS } /* category=zs */, + { 1, 135, 1982, 2, 12, UNI_BIDIM } /* isbidimirrored */, + { 0, 135, 1016, 2, 8, UNI_HIRA } /* ishiragana */, + { 10, 6462, 4278, 5, 12, UNI_INSC__NUMBERJOINER } /* insc=numberjoiner */, + { 0, 7804, 929, 27, 2, UNI_CCC__10 } /* canonicalcombiningclass=ccc10 */, + { 1, 3521, 1388, 14, 2, UNI_NV__400 } /* numericvalue=400 */, + { 93, 8233, 64, 9, 1, UNI_P } /* category=p */, + { 0, 5, 6988, 1, 14, UNI_MODIFIERLETTERS } /* modifierletters */, + { 534, 5355, 0, 6, 0, UNI_TANG } /* tangut */, + { 101, 2635, 4402, 3, 4, UNI_JG__HETH } /* jg=heth */, + { 0, 1141, 162, 4, 4, UNI_ORYA } /* scx=orya */, + { 98, 933, 623, 5, 2, UNI_AGE__5_DOT_2 } /* age=v52 */, + { 9, 3764, 1787, 13, 3, UNI_LATINEXTG } /* inlatinextendedg */, + { 51, 2858, 4846, 3, 16, UNI_PF } /* gc=finalpunctuation */, + { 9, 3808, 0, 3, 0, UNI_L } /* isl */, + { 0, 8233, 4158, 9, 14, UNI_ZS } /* category=spaceseparator */, + { 67, 135, 32, 2, 2, UNI_VS } /* isvs */, + { 1, 2380, 608, 4, 3, UNI_IN__14 } /* in=14.0 */, + { 0, 3129, 929, 12, 2, UNI_IN__11 } /* presentin=v110 */, + { 73, 1498, 2383, 7, 2, UNI_CCC__14 } /* ccc=ccc14 */, + { 14, 1733, 1322, 4, 7, UNI_INSOYOMBO } /* blk=soyombo */, + { 22, 6464, 388, 4, 5, UNI_SC__CAKM } /* sc=chakma */, + { 1, 135, 2002, 2, 7, UNI_UCASEXT } /* isucasext */, + { 835, 90, 0, 4, 0, UNI_GUJR } /* gujr */, + { 0, 20, 972, 3, 6, -UNI_XPOSIXXDIGIT } /* hex=false */, + { 0, 1911, 146, 7, 4, UNI_MTEI } /* script=mtei */, + { 425, 6464, 1459, 3, 6, UNI_SC__THAA } /* sc=thaana */, + { 96, 2498, 7776, 8, 13, UNI_CYRILLICSUP } /* cyrillicsupplementary */, + { 1, 4586, 1577, 17, 8, UNI_JAVA } /* scriptextensions=javanese */, + { 1, 2429, 5043, 6, 5, UNI_INBAMUM } /* block=bamum */, + { 0, 6464, 707, 3, 5, UNI_SC__BUHD } /* sc=buhid */, + { 1, 1911, 27, 7, 4, UNI_ARMI } /* script=armi */, + { 7, 683, 382, 5, 5, UNI_GRBASE } /* grbase=yes */, + { 0, 2373, 611, 11, 3, UNI_IN__16 } /* presentin=16.0 */, + { 0, 4553, 1388, 14, 3, UNI_NV__3000 } /* numericvalue=3000 */, + { 182, 5606, 653, 6, 2, -UNI_HYPHEN } /* hyphen=n */, + { 517, 1911, 1042, 7, 6, UNI_SC__LYCI } /* script=lycian */, + { 0, 1911, 1922, 7, 4, UNI_SORA } /* script=sora */, + { 1, 135, 1652, 2, 10, UNI_SAUR } /* issaurashtra */, + { 1, 2429, 8862, 6, 25, UNI_SYMBOLSFORLEGACYCOMPUTING } /* block=symbolsforlegacycomputing */, + { 0, 1141, 1941, 4, 11, UNI_SYLO } /* scx=sylotinagri */, + { 512, 1141, 126, 4, 3, UNI_LAO } /* scx=lao */, + { 0, 9030, 4873, 7, 8, UNI_SYRIACSUP } /* block=syriacsup */, + { 1, 2422, 0, 6, 0, UNI_N } /* number */, + { 2, 8366, 0, 22, 0, UNI_CJK } /* iscjkunifiedideographs */, + { 0, 8117, 4402, 23, 4, UNI_JG__MANICHAEANHETH } /* joininggroup=manichaeanheth */, + { 1, 1141, 3653, 4, 7, UNI_CPRT } /* scx=cypriot */, + { 784, 1911, 669, 7, 4, UNI_ELYM } /* script=elym */, + { 0, 135, 257, 2, 4, UNI_ZANB } /* iszanb */, + { 3, 8233, 3403, 9, 13, UNI_ME } /* category=enclosingmark */, + { 1204, 4992, 971, 16, 3, -UNI__PERL_PATWS } /* patternwhitespace=f */, + { 0, 15, 0, 4, 0, UNI_AGHB } /* aghb */, + { 0, 1141, 717, 4, 4, UNI_LIMB } /* scx=limb */, + { 1, 283, 383, 3, 2, UNI_CWT } /* cwt=y */, + { 37, 6369, 3836, 7, 10, UNI_MISCSYMBOLS } /* block=miscsymbols */, + { 0, 2922, 6492, 8, 12, UNI_ETHIOPICSUP } /* isethiopicsupplement */, + { 2, 978, 639, 6, 5, UNI_COMPEX } /* compex=true */, + { 0, 6464, 257, 3, 4, UNI_ZANB } /* sc=zanb */, + { 0, 6462, 7721, 15, 13, UNI_INSC__CONSONANTPRECEDINGREPHA } /* insc=consonantprecedingrepha */, + { 17, 4202, 383, 4, 2, UNI_IDSB } /* idsb=y */, + { 0, 7322, 2834, 24, 4, UNI_CCC__6 } /* canonicalcombiningclass=hanr */, + { 4, 1084, 7995, 6, 3, UNI_KEHCORE__L } /* kehcore=l */, + { 88, 2587, 6103, 7, 13, UNI_GEORGIANSUP } /* isgeorgiansupplement */, + { 1, 8089, 653, 17, 3, -UNI_VS } /* variationselector=no */, + { 17, 632, 7550, 5, 2, UNI_CCC__AL } /* ccc=228 */, + { 0, 135, 7219, 2, 14, UNI_MUSIC } /* ismusicalsymbols */, + { 6, 4586, 31, 17, 4, UNI_AVST } /* scriptextensions=avst */, + { 0, 1141, 732, 4, 5, UNI_RUNR } /* scx=runic */, + { 0, 135, 702, 2, 5, UNI_ADLM } /* isadlam */, + { 0, 135, 5043, 2, 8, UNI_BAMUMSUP } /* isbamumsup */, + { 1, 6464, 824, 3, 7, UNI_OSMA } /* sc=osmanya */, + { 3, 2313, 0, 12, 0, UNI_NV__1_SLASH_16 } /* nv=6.250e-02 */, + { 0, 2635, 2658, 3, 10, UNI_JG__KNOTTEDHEH } /* jg=knottedheh */, + { 2, 925, 2756, 5, 3, UNI_AGE__15 } /* age=15.0 */, + { 0, 1911, 462, 7, 4, UNI_SC__NKO } /* script=nkoo */, + { 0, 3764, 1740, 7, 4, UNI_LATINEXTD } /* inlatinextd */, + { 179, 33, 864, 1, 6, UNI_SHAW } /* shavian */, + { 5, 316, 416, 3, 2, UNI_NV__26 } /* nv=26 */, + { 0, 1141, 669, 4, 4, UNI_ELYM } /* scx=elym */, + { 0, 4586, 209, 17, 4, UNI_TAML } /* scriptextensions=taml */, + { 838, 1112, 1388, 4, 3, UNI_NV__1000 } /* nv=1000 */, + { 0, 4586, 3794, 17, 10, UNI_DEVA } /* scriptextensions=devanagari */, + { 0, 333, 387, 2, 6, UNI_INCHAKMA } /* inchakma */, + { 0, 368, 2812, 3, 6, UNI_CCC__R } /* ccc=right */, + { 0, 30, 7872, 1, 28, UNI_ANCIENTGREEKMUSIC } /* isancientgreekmusicalnotation */, + { 6, 20, 639, 3, 5, UNI_XPOSIXXDIGIT } /* hex=true */, + { 0, 321, 0, 5, 0, UNI_ORYA } /* oriya */, + { 0, 676, 383, 7, 4, UNI_EXTPICT } /* extpict=yes */, + { 0, 1911, 5628, 7, 20, UNI_HMNP } /* script=nyiakengpuachuehmong */, + { 845, 1911, 1265, 7, 4, UNI_SC__GRAN } /* script=gran */, + { 6, 1141, 494, 4, 4, UNI_QAAI } /* scx=qaai */, + { 0, 7957, 51, 18, 3, UNI_DT__CAN } /* decompositiontype=can */, + { 0, 293, 1957, 4, 3, UNI_WB__EB } /* gcb=gaz */, + { 17, 1911, 1399, 7, 4, UNI_ITAL } /* script=ital */, + { 154, 2922, 1070, 10, 4, UNI_ETHIOPICEXTB } /* isethiopicextb */, + { 3, 6464, 506, 3, 4, UNI_SIDT } /* sc=sidt */, + { 1, 2624, 331, 6, 5, UNI_XPOSIXPRINT } /* xposixprint */, + { 9, 1141, 4408, 3, 11, UNI_MANI } /* scx=manichaean */, + { 0, 1971, 972, 5, 2, -UNI_BIDIC } /* bidic=f */, + { 0, 6039, 54, 19, 2, UNI_SUPARROWSC } /* insupplementalarrowsc */, + { 23, 6039, 882, 6, 3, UNI_SUPPUAA } /* insuppuaa */, + { 0, 8366, 5407, 28, 4, UNI_CJKEXTE } /* iscjkunifiedideographsextensione */, + { 160, 33, 6981, 1, 21, UNI_MODIFIERLETTERS } /* spacingmodifierletters */, + { 1204, 3605, 6492, 10, 12, UNI_CYRILLICSUP } /* blk=cyrillicsupplement */, + { 0, 135, 6820, 2, 24, UNI_HIGHPUSURROGATES } /* ishighprivateusesurrogates */, + { 40, 7322, 7699, 18, 7, UNI_CCC__R } /* canonicalcombiningclass=r */, + { 37, 5993, 653, 4, 2, -UNI_EMOD } /* emod=n */, + { 0, 2587, 2865, 3, 13, UNI_INGREEK } /* isgreekandcoptic */, + { 0, 135, 162, 2, 4, UNI_ORYA } /* isorya */, + { 1226, 1141, 6952, 4, 4, UNI_BRAH } /* scx=brah */, + { 1, 6737, 6504, 13, 19, UNI_JG__BURUSHASKIYEHBARREE } /* joininggroup=burushaskiyehbarree */, + { 2, 3903, 63, 3, 2, UNI_LB__CP } /* lb=cp */, + { 32, 933, 420, 5, 2, UNI_AGE__4_DOT_1 } /* age=v41 */, + { 1, 4586, 577, 17, 6, UNI_RJNG } /* scriptextensions=rejang */, + { 1, 1812, 1573, 6, 4, UNI_ARABICEXTA } /* arabicexta */, + { 769, 2081, 0, 4, 0, UNI_PO } /* ispo */, + { 1, 8226, 4716, 16, 15, UNI_TITLE } /* generalcategory=titlecaseletter */, + { 0, 1733, 8996, 5, 34, UNI_DIACRITICALSSUP } /* blk=combiningdiacriticalmarkssupplement */, + { 0, 6737, 1844, 13, 3, UNI_JG__KAF } /* joininggroup=kaf */, + { 0, 5390, 3065, 15, 5, UNI_PC } /* connectorpunctuation */, + { 12, 1112, 2204, 4, 8, UNI_NV__1_SLASH_64 } /* nv=1.562e-02 */, + { 130, 3976, 5612, 14, 12, UNI_NV__1000000000000 } /* numericvalue=1000000000000 */, + { 4, 3136, 314, 4, 2, UNI_IN__4 } /* in=v40 */, + { 0, 1982, 653, 12, 2, -UNI_BIDIM } /* bidimirrored=n */, + { 16, 4553, 319, 14, 1, UNI_NV__39 } /* numericvalue=39 */, + { 2, 4586, 1294, 17, 4, UNI_MULT } /* scriptextensions=mult */, + { 1767, 1141, 5043, 4, 4, UNI_BAMU } /* scx=bamu */, + { 0, 1911, 783, 7, 4, UNI_SC__MAND } /* script=mand */, + { 194, 6164, 4365, 10, 15, UNI_LB__OP } /* linebreak=openpunctuation */, + { 0, 333, 6952, 2, 6, UNI_INBRAHMI } /* inbrahmi */, + { 0, 409, 652, 4, 3, -UNI_GREXT } /* grext=n */, + { 170, 135, 15, 2, 4, UNI_AGHB } /* isaghb */, + { 0, 135, 5410, 2, 20, UNI_EXTPICT } /* isextendedpictographic */, + { 321, 2858, 0, 8, 0, UNI_C } /* gc=other */, + { 0, 4747, 653, 18, 3, -UNI_IDST } /* idstrinaryoperator=no */, + { 4, 1733, 7398, 4, 24, UNI_ARABICPFB } /* blk=arabicpresentationformsb */, + { 0, 6737, 2008, 13, 3, UNI_JG__TAH } /* joininggroup=tah */, + { 6, 7322, 2382, 23, 3, UNI_CCC__14 } /* canonicalcombiningclass=14 */, + { 11, 4586, 1060, 17, 6, UNI_YEZI } /* scriptextensions=yezidi */, + { 4, 6164, 2096, 10, 2, UNI_LB__WJ } /* linebreak=wj */, + { 474, 135, 1918, 2, 4, UNI_TAYO } /* istayo */, + { 1, 3617, 0, 12, 0, UNI_INETHIOPIC } /* blk=ethiopic */, + { 0, 5058, 0, 15, 0, UNI_DIACRITICALSSUP } /* diacriticalssup */, + { 2, 7674, 356, 10, 3, UNI_BC__FSI } /* bidiclass=fsi */, + { 0, 933, 2182, 6, 2, UNI_AGE__15 } /* age=v150 */, + { 1, 1733, 702, 4, 5, UNI_INADLAM } /* blk=adlam */, + { 67, 6369, 2731, 7, 12, UNI_MAYANNUMERALS } /* block=mayannumerals */, + { 1, 2373, 2778, 10, 3, UNI_IN__5_DOT_2 } /* presentin=5.2 */, + { 1558, 4586, 662, 17, 4, UNI_ELBA } /* scriptextensions=elba */, + { 3, 3136, 929, 5, 2, UNI_IN__11 } /* in=v110 */, + { 38, 2596, 0, 11, 0, UNI_JOINC } /* joincontrol */, + { 0, 333, 7760, 2, 16, UNI_TANGUTCOMPONENTS } /* intangutcomponents */, + { 0, 135, 2422, 2, 6, UNI_N } /* isnumber */, + { 0, 2824, 5115, 5, 9, UNI_ALCHEMICAL } /* blk=alchemical */, + { 0, 135, 3453, 2, 6, UNI_HEBR } /* ishebrew */, + { 0, 1523, 972, 10, 2, -UNI_DEP } /* deprecated=f */, + { 21, 1465, 9, 3, 2, UNI_LB__CR } /* wb=cr */, + { 4, 7322, 1391, 25, 2, UNI_CCC__AR } /* canonicalcombiningclass=232 */, + { 2, 1141, 5177, 4, 7, UNI_SHRD } /* scx=sharada */, + { 649, 1911, 142, 7, 4, UNI_MERC } /* script=merc */, + { 1528, 651, 4765, 3, 7, UNI_DT__INIT } /* dt=initial */, + { 566, 1141, 4408, 3, 5, UNI_MANI } /* scx=mani */, + { 194, 1911, 446, 7, 3, UNI_SC__HAN } /* script=han */, + { 53288, 4586, 387, 17, 6, UNI_CAKM } /* scriptextensions=chakma */, + { 0, 507, 370, 2, 2, UNI_idc_values_index } /* idc= */, + { 1, 7002, 0, 15, 0, UNI_TRANSPORTANDMAP } /* transportandmap */, + { 1, 6164, 4460, 10, 14, UNI_LB__CR } /* linebreak=carriagereturn */, + { 0, 1733, 7002, 4, 22, UNI_TRANSPORTANDMAP } /* blk=transportandmapsymbols */, + { 6, 4586, 233, 17, 4, UNI_TOLS } /* scriptextensions=tols */, + { 1562, 3070, 5178, 3, 6, UNI_INSHARADA } /* insharada */, + { 0, 5845, 9, 21, 2, UNI_LB__CR } /* graphemeclusterbreak=cr */, + { 144, 2635, 4394, 3, 4, UNI_JG__BETH } /* jg=beth */, + { 54, 7322, 3519, 24, 2, UNI_CCC__36 } /* canonicalcombiningclass=36 */, + { 2, 933, 2173, 5, 2, UNI_IN__1_DOT_1 } /* age=v11 */, + { 1, 1432, 0, 9, 0, UNI_PALM } /* palmyrene */, + { 865, 925, 611, 5, 3, UNI_AGE__16 } /* age=16.0 */, + { 4, 316, 841, 3, 3, UNI_NV__NAN } /* nv=nan */, + { 24, 1523, 639, 10, 2, UNI_DEP } /* deprecated=t */, + { 20, 21, 6060, 1, 15, UNI_ENCLOSEDALPHANUM } /* enclosedalphanum */, + { 17, 6464, 1577, 3, 8, UNI_SC__JAVA } /* sc=javanese */, + { 1, 2429, 1301, 6, 7, UNI_NB } /* block=noblock */, + { 32, 333, 6116, 2, 19, UNI_SUNDANESESUP } /* insundanesesupplement */, + { 7, 1810, 2417, 3, 12, UNI_AEGEANNUMBERS } /* isaegeannumbers */, + { 1793, 4553, 2257, 14, 8, UNI_NV__1_SLASH_3 } /* numericvalue=3.333e-01 */, + { 0, 135, 1339, 2, 7, UNI_TIRH } /* istirhuta */, + { 9, 1911, 5546, 7, 8, UNI_SC__CHER } /* script=cherokee */, + { 2333, 108, 1501, 2, 2, UNI_JT__C } /* jt=c */, + { 1038, 6164, 1672, 10, 2, UNI_LB__LF } /* linebreak=lf */, + { 1200, 7804, 378, 27, 2, UNI_CCC__91 } /* canonicalcombiningclass=ccc91 */, + { 0, 8226, 106, 16, 1, UNI_Z } /* generalcategory=z */, + { 72, 7180, 653, 20, 2, -UNI_CE } /* compositionexclusion=n */, + { 2, 2429, 3453, 6, 6, UNI_INHEBREW } /* block=hebrew */, + { 0, 4586, 859, 17, 4, UNI_QAAI } /* scriptextensions=zinh */, + { 0, 1911, 233, 7, 4, UNI_TOLS } /* script=tols */, + { 132, 135, 1315, 2, 4, UNI_SIDD } /* issidd */, + { 0, 1911, 438, 7, 4, UNI_DIAK } /* script=diak */, + { 295, 8233, 2465, 9, 10, UNI_CN } /* category=unassigned */, + { 1, 6164, 2083, 10, 2, UNI_LB__PO } /* linebreak=po */, + { 0, 1523, 653, 3, 3, -UNI_DEP } /* dep=no */, + { 0, 74, 0, 4, 0, UNI_CYRL } /* cyrl */, + { 0, 8732, 6863, 31, 5, UNI_CJKEXTC } /* block=cjkunifiedideographsextensionc */, + { 0, 3808, 1787, 13, 3, UNI_LATINEXTG } /* islatinextendedg */, + { 2072, 316, 604, 3, 2, UNI_NV__13 } /* nv=13 */, + { 0, 6464, 1577, 3, 4, UNI_SC__JAVA } /* sc=java */, + { 5, 135, 1670, 2, 3, UNI_ALL } /* isall */, + { 276, 1141, 466, 4, 4, UNI_OGAM } /* scx=ogam */, + { 0, 2429, 722, 6, 5, UNI_INOGHAM } /* block=ogham */, + { 0, 1733, 341, 4, 5, UNI_INTAILE } /* blk=taile */, + { 3, 7957, 3599, 18, 6, UNI_DT__SQR } /* decompositiontype=square */, + { 0, 4320, 972, 9, 6, -UNI_DIA } /* diacritic=false */, + { 2, 8226, 1663, 16, 6, UNI_L } /* generalcategory=letter */, + { 1, 6464, 430, 3, 4, UNI_SC__TOTO } /* sc=toto */, + { 6, 135, 4127, 2, 17, UNI_EPRES } /* isemojipresentation */, + { 9, 1733, 1414, 4, 9, UNI_INOLDTURKIC } /* blk=oldturkic */, + { 7, 135, 1308, 2, 7, UNI_PHAG } /* isphagspa */, + { 0, 135, 1546, 2, 2, UNI_ZS } /* iszs */, + { 6, 2429, 1459, 6, 6, UNI_INTHAANA } /* block=thaana */, + { 153, 5824, 639, 21, 2, UNI_CWU } /* changeswhenuppercased=t */, + { 0, 4022, 2757, 14, 8, UNI_NV__4_SLASH_5 } /* numericvalue=8.000e-01 */, + { 0, 8226, 1467, 15, 2, UNI_M } /* generalcategory=m */, + { 0, 4942, 6589, 14, 8, UNI_NV__1_SLASH_160 } /* numericvalue=6.250e-03 */, + { 1, 6557, 5612, 14, 7, UNI_NV__20000000 } /* numericvalue=20000000 */, + { 78, 2429, 5528, 6, 18, UNI_TAIXUANJING } /* block=taixuanjingsymbols */, + { 0, 1733, 1339, 4, 7, UNI_INTIRHUTA } /* blk=tirhuta */, + { 1, 4878, 8044, 11, 17, UNI_SUPPUAB } /* supplementaryprivateuseareab */, + { 1113, 1733, 6527, 6, 8, UNI_CJKSYMBOLS } /* blk=cjksymbols */, + { 66, 4664, 217, 11, 2, UNI_LATINEXTF } /* blk=latinextf */, + { 0, 2429, 6642, 6, 19, UNI_JAMOEXTB } /* block=hanguljamoextendedb */, + { 0, 6899, 0, 4, 0, UNI_BERF } /* berf */, + { 1, 135, 434, 2, 4, UNI_ARMN } /* isarmn */, + { 2, 135, 712, 2, 5, UNI_DOGR } /* isdogra */, + { 0, 4350, 2677, 8, 3, -UNI_XPOSIXLOWER } /* lowercase=n */, + { 242, 9036, 0, 33, 0, UNI_SUPMATHOPERATORS } /* supplementalmathematicaloperators */, + { 1, 1141, 1552, 4, 8, UNI_BUGI } /* scx=buginese */, + { 0, 4942, 2220, 14, 8, UNI_NV__2_SLASH_3 } /* numericvalue=6.667e-01 */, + { 258, 2576, 383, 5, 2, UNI_CASED } /* cased=y */, + { 5, 3764, 372, 7, 1, UNI_LATIN1 } /* inlatin1 */, + { 0, 1971, 383, 5, 4, UNI_BIDIC } /* bidic=yes */, + { 0, 135, 722, 2, 5, UNI_OGAM } /* isogham */, + { 0, 4992, 382, 16, 3, UNI__PERL_PATWS } /* patternwhitespace=y */, + { 523, 4586, 984, 17, 8, UNI_DUPL } /* scriptextensions=duployan */, + { 0, 6737, 3869, 12, 14, UNI_JG__MALAYALAMNNNA } /* joininggroup=malayalamnnna */, + { 3, 4586, 1016, 17, 4, UNI_HIRA } /* scriptextensions=hira */, + { 6, 8226, 117, 16, 2, UNI_SK } /* generalcategory=sk */, + { 1, 333, 717, 2, 5, UNI_INLIMBU } /* inlimbu */, + { 3, 4999, 971, 9, 7, -UNI_XPOSIXSPACE } /* whitespace=false */, + { 14, 7804, 1209, 27, 2, UNI_CCC__24 } /* canonicalcombiningclass=ccc24 */, + { 0, 2616, 5398, 6, 12, UNI_PO } /* isotherpunctuation */, + { 0, 5194, 0, 4, 0, UNI_HAN } /* hani */, + { 1, 6464, 899, 3, 7, UNI_TAVT } /* sc=taiviet */, + { 416, 4586, 892, 17, 7, UNI_LANA } /* scriptextensions=taitham */, + { 78, 1812, 6492, 4, 12, UNI_ARABICSUP } /* arabicsupplement */, + { 2, 1141, 6222, 4, 7, UNI_SINH } /* scx=sinhala */, + { 2, 1733, 8061, 4, 19, UNI_INEGYPTIANHIEROGLYPHS } /* blk=egyptianhieroglyphs */, + { 8, 7322, 5731, 24, 5, UNI_CCC__B } /* canonicalcombiningclass=below */, + { 266, 8765, 3380, 22, 10, UNI_INSC__PUREKILLER } /* indicsyllabiccategory=purekiller */, + { 236, 2858, 212, 3, 2, UNI_TITLE } /* gc=lt */, + { 293, 1346, 5902, 3, 18, UNI_COUNTINGROD } /* iscountingrodnumerals */, + { 1056, 5, 383, 3, 4, UNI_MCM } /* mcm=yes */, + { 0, 1733, 4335, 4, 15, UNI_INHANGUL } /* blk=hangulsyllables */, + { 0, 1911, 1698, 7, 10, UNI_WARA } /* script=warangciti */, + { 2, 438, 972, 2, 2, -UNI_DI } /* di=f */, + { 0, 2429, 7873, 6, 17, UNI_ANCIENTGREEKMUSIC } /* block=ancientgreekmusic */, + { 1105, 1465, 748, 3, 2, UNI_WB__EB } /* wb=em */, + { 0, 2527, 4695, 7, 4, UNI_MYANMAREXTC } /* myanmarextc */, + { 3, 1112, 2180, 4, 8, UNI_NV__1_SLASH_8 } /* nv=1.250e-01 */, + { 0, 6464, 1874, 3, 11, UNI_MEDF } /* sc=medefaidrin */, + { 3, 3331, 972, 14, 2, -UNI_GREXT } /* graphemeextend=f */, + { 0, 1590, 534, 5, 3, UNI_KANBUN } /* iskanbun */, + { 2096, 2429, 3355, 6, 15, UNI_INIMPERIALARAMAIC } /* block=imperialaramaic */, + { 8, 954, 2677, 4, 4, -UNI_EBASE } /* ebase=no */, + { 1195, 4586, 94, 17, 4, UNI_GUKH } /* scriptextensions=gukh */, + { 0, 1971, 383, 5, 2, UNI_BIDIC } /* bidic=y */, + { 8, 6135, 8808, 5, 21, UNI_SUPSYMBOLSANDPICTOGRAPHS } /* issupsymbolsandpictographs */, + { 2, 878, 0, 4, 0, UNI_TERM } /* term */, + { 2060, 2508, 4673, 8, 9, UNI_ETHIOPICEXTB } /* ethiopicextendedb */, + { 0, 1180, 0, 4, 0, UNI_VITH } /* vith */, + { 273, 4586, 177, 17, 4, UNI_PHLP } /* scriptextensions=phlp */, + { 256, 2574, 7158, 6, 9, UNI_CI } /* iscaseignorable */, + { 2, 3129, 1392, 11, 2, UNI_IN__2 } /* presentin=v20 */, + { 1, 2635, 531, 3, 3, UNI_JG__REH } /* jg=reh */, + { 0, 2810, 453, 3, 3, UNI_BC__RLI } /* bc=rli */, + { 1, 3521, 5612, 14, 5, UNI_NV__400000 } /* numericvalue=400000 */, + { 1164, 7045, 747, 14, 3, UNI_JG__MEEM } /* joininggroup=meem */, + { 12, 6464, 855, 3, 4, UNI_SC__SYRC } /* sc=syrc */, + { 8, 7804, 1390, 28, 2, UNI_CCC__103 } /* canonicalcombiningclass=ccc103 */, + { 0, 1465, 3571, 5, 4, UNI_WB__MN } /* wb=midnum */, + { 0, 1922, 0, 4, 0, UNI_SORA } /* sora */, + { 0, 2380, 6572, 4, 3, UNI_IN__15_DOT_1 } /* in=15.1 */, + { 2, 8061, 6783, 18, 14, UNI_EGYPTIANHIEROGLYPHFORMATCONTROLS } /* egyptianhieroglyphformatcontrols */, + { 0, 7846, 972, 10, 2, -UNI_XPOSIXALPHA } /* alphabetic=f */, + { 24, 4747, 296, 18, 1, UNI_idst_values_index } /* idstrinaryoperator= */, + { 1, 135, 4185, 2, 17, UNI_IDCOMPATMATHSTART } /* isidcompatmathstart */, + { 0, 1258, 6710, 5, 18, UNI_CJKRADICALSSUP } /* incjkradicalssupplement */, + { 27, 2574, 0, 7, 0, UNI_CASED } /* iscased */, + { 3, 135, 537, 2, 6, UNI_KHOJ } /* iskhojki */, + { 584, 1586, 1755, 3, 5, UNI_DOMINO } /* indomino */, + { 402, 6464, 474, 3, 4, UNI_SC__ONAO } /* sc=onao */, + { 181, 368, 2827, 3, 3, UNI_CCC__AR } /* ccc=ar */, + { 198, 135, 217, 2, 4, UNI_TFNG } /* istfng */, + { 0, 368, 3519, 4, 2, UNI_CCC__36 } /* ccc=36 */, + { 2623, 316, 2227, 3, 9, UNI_NV__3_SLASH_16 } /* nv=1.875e-01 */, + { 1052, 6464, 885, 3, 7, UNI_SC__TGLG } /* sc=tagalog */, + { 1, 5318, 1471, 6, 7, UNI__PERL_IDSTART } /* _perl_idstart */, + { 258, 1994, 2516, 6, 9, UNI_KATAKANAEXT } /* blk=katakanaext */, + { 162, 1470, 652, 7, 3, -UNI_XIDS } /* xidstart=n */, + { 0, 2429, 3742, 9, 6, UNI_CJKCOMPAT } /* block=cjkcompat */, + { 0, 2616, 6993, 5, 8, UNI_LO } /* isotherletter */, + { 10, 4406, 4398, 13, 4, UNI_JG__MANICHAEANFIVE } /* jg=manichaeanfive */, + { 0, 3976, 564, 15, 1, UNI_NV__1_SLASH_7 } /* numericvalue=1/7 */, + { 1027, 663, 966, 2, 3, UNI_LB__OP } /* lb=op */, + { 12, 6164, 9, 10, 2, UNI_LB__CR } /* linebreak=cr */, + { 652, 1971, 2999, 10, 2, UNI_bidic_values_index } /* bidicontrol= */, + { 1544, 5546, 353, 8, 3, UNI_CHEROKEESUP } /* cherokeesup */, + { 106, 7045, 1964, 22, 3, UNI_JG__MALAYALAMLLA } /* joininggroup=malayalamlla */, + { 0, 6464, 494, 3, 4, UNI_SC__QAAI } /* sc=qaai */, + { 0, 1911, 1622, 7, 4, UNI_NAGM } /* script=nagm */, + { 4, 1911, 1441, 7, 9, UNI_PAUC } /* script=paucinhau */, + { 320, 1911, 450, 7, 4, UNI_KHMR } /* script=khmr */, + { 2, 135, 892, 2, 7, UNI_LANA } /* istaitham */, + { 3, 5371, 3823, 7, 6, UNI_LISUSUP } /* block=lisusup */, + { 3, 1471, 383, 3, 2, UNI_IDS } /* ids=y */, + { 772, 6369, 3947, 7, 15, UNI_MISCMATHSYMBOLSA } /* block=miscmathsymbolsa */, + { 5, 1044, 972, 2, 2, -UNI_CI } /* ci=f */, + { 3, 135, 359, 2, 2, UNI_PD } /* ispd */, + { 0, 114, 0, 4, 0, UNI_KITS } /* kits */, + { 453, 1622, 0, 4, 0, UNI_NAGM } /* nagm */, + { 834, 2858, 397, 3, 2, UNI_SM } /* gc=sm */, + { 4, 8765, 5954, 22, 16, UNI_INSC__INVISIBLESTACKER } /* indicsyllabiccategory=invisiblestacker */, + { 0, 2429, 1036, 6, 6, UNI_INLEPCHA } /* block=lepcha */, + { 0, 1258, 3742, 5, 6, UNI_CJKCOMPAT } /* incjkcompat */, + { 2063, 6737, 1596, 13, 7, UNI_JG__THINYEH } /* joininggroup=thinyeh */, + { 1026, 8278, 5407, 28, 4, UNI_CJKEXTE } /* incjkunifiedideographsextensione */, + { 1, 135, 146, 2, 4, UNI_MTEI } /* ismtei */, + { 0, 1733, 6896, 4, 11, UNI_NUMBERFORMS } /* blk=numberforms */, + { 2, 1258, 2522, 5, 4, UNI_CJKEXTI } /* incjkexti */, + { 6, 3629, 6088, 12, 9, UNI_ARABICEXTA } /* block=arabicextendeda */, + { 16, 1911, 1941, 7, 11, UNI_SC__SYLO } /* script=sylotinagri */, + { 0, 1733, 1030, 4, 6, UNI_INKAITHI } /* blk=kaithi */, + { 0, 3976, 5612, 14, 10, UNI_NV__10000000000 } /* numericvalue=10000000000 */, + { 0, 333, 1377, 2, 9, UNI_INNEWTAILUE } /* innewtailue */, + { 0, 2922, 6492, 8, 5, UNI_ETHIOPICSUP } /* isethiopicsup */, + { 0, 5098, 971, 16, 3, -UNI_EBASE } /* emojimodifierbase=f */, + { 0, 1471, 652, 6, 3, -UNI_IDS } /* idstart=n */, + { 0, 2498, 6088, 8, 9, UNI_CYRILLICEXTA } /* cyrillicextendeda */, + { 0, 7322, 2383, 25, 2, UNI_CCC__214 } /* canonicalcombiningclass=214 */, + { 0, 8778, 0, 11, 0, UNI_CO } /* category=co */, + { 37, 7674, 52, 10, 2, UNI_BC__AN } /* bidiclass=an */, + { 1, 5318, 7067, 6, 19, UNI__PERL_FOLDS_TO_MULTI_CHAR } /* _perl_folds_to_multi_char */, + { 7, 8233, 3318, 8, 7, UNI_L } /* category=letter */, + { 0, 4586, 1016, 17, 8, UNI_HIRA } /* scriptextensions=hiragana */, + { 456, 19, 1143, 3, 3, UNI_POSIXXDIGIT } /* ahex=t */, + { 0, 2429, 5546, 6, 8, UNI_INCHEROKEE } /* block=cherokee */, + { 4, 6464, 446, 3, 4, UNI_SC__HANO } /* sc=hano */, + { 12, 4185, 652, 16, 3, -UNI_IDCOMPATMATHSTART } /* idcompatmathstart=n */, + { 132, 1810, 1573, 8, 4, UNI_ARABICEXTA } /* isarabicexta */, + { 0, 2625, 1028, 7, 3, UNI_POSIXBLANK } /* posixblank */, + { 552, 135, 1308, 2, 4, UNI_PHAG } /* isphag */, + { 1, 3726, 639, 4, 5, UNI_IDSU } /* idsu=true */, + { 2126, 8175, 653, 11, 2, -UNI_IDEO } /* ideographic=n */, + { 3, 4202, 972, 4, 6, -UNI_IDSB } /* idsb=false */, + { 532, 5, 1875, 1, 10, UNI_MEDF } /* medefaidrin */, + { 0, 5318, 7471, 6, 21, UNI__PERL_IS_IN_MULTI_CHAR_FOLD } /* _perl_is_in_multi_char_fold */, + { 0, 4586, 446, 17, 4, UNI_HANO } /* scriptextensions=hano */, + { 1249, 135, 1762, 2, 6, UNI_DOMINO } /* isdomino */, + { 0, 5088, 1573, 10, 4, UNI_KANAEXTA } /* block=kanaexta */, + { 0, 1141, 662, 4, 4, UNI_ELBA } /* scx=elba */, + { 3, 438, 653, 3, 2, -UNI_DIA } /* dia=n */, + { 185, 1911, 2872, 7, 6, UNI_SC__COPT } /* script=coptic */, + { 1, 135, 138, 2, 4, UNI_MEDF } /* ismedf */, + { 0, 1911, 6484, 7, 10, UNI_SC__GLAG } /* script=glagolitic */, + { 632, 135, 1048, 2, 6, UNI_TELU } /* istelugu */, + { 107, 2429, 7760, 6, 26, UNI_TANGUTCOMPONENTSSUP } /* block=tangutcomponentssupplement */, + { 11, 353, 6149, 3, 7, UNI_SUPARROWSC } /* suparrowsc */, + { 0, 5306, 6555, 8, 4, UNI_WB__NU } /* wordbreak=nu */, + { 3, 135, 2932, 2, 12, UNI_KHMERSYMBOLS } /* iskhmersymbols */, + { 857, 1733, 5438, 4, 9, UNI_HALFMARKS } /* blk=halfmarks */, + { 0, 135, 4814, 2, 16, UNI_BOPOMOFOEXT } /* isbopomofoextended */, + { 27, 1733, 9089, 4, 42, UNI_UCASEXT } /* blk=unifiedcanadianaboriginalsyllabicsextended */, + { 0, 3903, 5595, 3, 17, UNI_LB__HH } /* lb=unambiguoushyphen */, + { 12, 135, 5429, 2, 18, UNI_HALFMARKS } /* iscombininghalfmarks */, + { 0, 221, 0, 4, 0, UNI_TGLG } /* tglg */, + { 14, 6464, 2385, 3, 12, UNI_SC__TUTG } /* sc=tulutigalari */, + { 9, 135, 337, 2, 4, UNI_M } /* ismark */, + { 1, 4586, 737, 17, 5, UNI_TAYO } /* scriptextensions=taiyo */, + { 0, 3903, 2132, 3, 2, UNI_HST__V } /* lb=jv */, + { 19, 3521, 373, 13, 2, UNI_NV__23 } /* numericvalue=23 */, + { 1426, 1141, 1008, 4, 8, UNI_GURU } /* scx=gurmukhi */, + { 1, 135, 1922, 2, 11, UNI_SORA } /* issorasompeng */, + { 1156, 1994, 4673, 8, 9, UNI_KANAEXTB } /* blk=kanaextendedb */, + { 2, 651, 1827, 3, 4, UNI_DT__VERT } /* dt=vert */, + { 0, 3867, 1200, 12, 3, UNI_JG__MALAYALAMBHA } /* jg=malayalambha */, + { 21, 1562, 0, 4, 0, UNI_GEOR } /* geor */, + { 1, 8226, 4, 16, 2, UNI_LM } /* generalcategory=lm */, + { 1, 1982, 653, 12, 3, -UNI_BIDIM } /* bidimirrored=no */, + { 2560, 5306, 5993, 10, 9, UNI_WB__EB } /* wordbreak=emodifier */, + { 2118, 368, 1744, 4, 2, UNI_CCC__1 } /* ccc=ov */, + { 1, 1141, 955, 4, 8, UNI_BASS } /* scx=bassavah */, + { 1, 1498, 1211, 7, 2, UNI_CCC__35 } /* ccc=ccc35 */, + { 0, 2810, 876, 3, 2, UNI_BC__CS } /* bc=cs */, + { 0, 8765, 3098, 31, 5, UNI_INSC__CONSONANTFINAL } /* indicsyllabiccategory=consonantfinal */, + { 33, 326, 383, 5, 4, UNI__PERL_PATWS } /* patws=yes */, + { 8, 4814, 0, 11, 0, UNI_BOPOMOFOEXT } /* bopomofoext */, + { 0, 1733, 7002, 4, 15, UNI_TRANSPORTANDMAP } /* blk=transportandmap */, + { 1, 333, 286, 2, 5, UNI_INGARAY } /* ingaray */, + { 0, 3764, 3823, 3, 13, UNI_LISUSUP } /* inlisusupplement */, + { 3, 8226, 359, 16, 2, UNI_PD } /* generalcategory=pd */, + { 0, 2622, 4309, 8, 5, UNI_XPOSIXPUNCT } /* isxposixpunct */, + { 1061, 333, 5890, 2, 5, UNI_INGREEK } /* ingreek */, + { 7, 1911, 430, 7, 4, UNI_SC__TOTO } /* script=toto */, + { 0, 2236, 1386, 4, 5, UNI_NV__216000 } /* nv=216000 */, + { 93, 1911, 1036, 7, 6, UNI_LEPC } /* script=lepcha */, + { 1, 8732, 2680, 33, 3, UNI_CJKEXTJ } /* block=cjkunifiedideographsextensionj */, + { 17, 333, 2054, 2, 10, UNI_INOLDSOGDIAN } /* inoldsogdian */, + { 4, 2021, 653, 12, 3, -UNI_GRBASE } /* graphemebase=no */, + { 0, 6369, 3492, 7, 14, UNI_MISCPICTOGRAPHS } /* block=miscpictographs */, + { 135, 11, 5115, 1, 9, UNI_ALCHEMICAL } /* alchemical */, + { 1, 135, 1552, 2, 4, UNI_BUGI } /* isbugi */, + { 2, 2576, 653, 5, 2, -UNI_CASED } /* cased=n */, + { 1, 3304, 17, 15, 1, UNI_EA__H } /* eastasianwidth=h */, + { 2227, 925, 2465, 4, 10, UNI_IN__NA } /* age=unassigned */, + { 0, 1560, 3770, 9, 9, UNI_GEORGIANEXT } /* ingeorgianextended */, + { 10, 2824, 1800, 10, 3, UNI_ARABICPFB } /* blk=arabicpfb */, + { 0, 2429, 6820, 6, 24, UNI_HIGHPUSURROGATES } /* block=highprivateusesurrogates */, + { 0, 6464, 1247, 3, 4, UNI_SC__BENG } /* sc=beng */, + { 2107, 1112, 5612, 4, 4, UNI_NV__10000 } /* nv=10000 */, + { 0, 1260, 6867, 3, 16, UNI_CJKCOMPATIDEOGRAPHS } /* cjkcompatideographs */, + { 3, 5, 296, 3, 1, UNI_mcm_values_index } /* mcm= */, + { 16, 6464, 130, 3, 4, UNI_SC__LATN } /* sc=latn */, + { 0, 333, 4335, 2, 15, UNI_INHANGUL } /* inhangulsyllables */, + { 9, 1733, 1066, 4, 8, UNI_JAMOEXTB } /* blk=jamoextb */, + { 0, 1260, 0, 3, 0, UNI_CJK } /* cjk */, + { 236, 135, 54, 2, 2, UNI_SC } /* issc */, + { 3113, 316, 375, 3, 2, UNI_NV__18 } /* nv=18 */, + { 2080, 30, 5919, 1, 20, UNI_MERO } /* ismeroitichieroglyphs */, + { 1201, 8175, 639, 11, 2, UNI_IDEO } /* ideographic=t */, + { 1, 1911, 5043, 7, 4, UNI_BAMU } /* script=bamu */, + { 0, 1577, 0, 8, 0, UNI_JAVA } /* javanese */, + { 6, 4992, 638, 16, 6, UNI__PERL_PATWS } /* patternwhitespace=true */, + { 0, 2097, 3000, 11, 2, UNI_JT__D } /* joiningtype=d */, + { 17, 1141, 1090, 4, 8, UNI_KRAI } /* scx=kiratrai */, + { 2, 2587, 2475, 3, 12, UNI_GREEKEXT } /* isgreekextended */, + { 4, 1733, 462, 4, 3, UNI_INNKO } /* blk=nko */, + { 1, 933, 929, 6, 2, UNI_AGE__11 } /* age=v110 */, + { 2230, 797, 383, 6, 2, UNI_NFKCQC__Y } /* nfkcqc=y */, + { 0, 1141, 3453, 4, 6, UNI_HEBR } /* scx=hebrew */, + { 1040, 1254, 363, 3, 5, UNI_INCARIAN } /* incarian */, + { 3133, 2429, 430, 6, 4, UNI_INTOTO } /* block=toto */, + { 0, 5845, 599, 21, 2, UNI_WB__EB } /* graphemeclusterbreak=eb */, + { 133, 2, 2677, 1, 3, -UNI_CE } /* ce=n */, + { 64, 1112, 5612, 4, 5, UNI_NV__100000 } /* nv=100000 */, + { 2, 333, 5058, 2, 15, UNI_DIACRITICALSSUP } /* indiacriticalssup */, + { 0, 5371, 0, 20, 0, UNI_LATINEXTC } /* block=latinextendedc */, + { 58, 1733, 6382, 4, 13, UNI_MATHOPERATORS } /* blk=mathoperators */, + { 86, 135, 6824, 2, 10, UNI_CO } /* isprivateuse */, + { 0, 1733, 1616, 4, 6, UNI_ARROWS } /* blk=arrows */, + { 3332, 7322, 5162, 24, 2, UNI_CCC__8 } /* canonicalcombiningclass=kv */, + { 2114, 2429, 1359, 6, 9, UNI_INKHUDAWADI } /* block=khudawadi */, + { 1341, 2099, 2562, 3, 5, UNI_IPAEXT } /* inipaext */, + { 0, 6737, 6514, 13, 9, UNI_JG__YEHBARREE } /* joininggroup=yehbarree */, + { 28, 135, 7086, 2, 21, UNI_MEETEIMAYEKEXT } /* ismeeteimayekextensions */, + { 50, 7873, 0, 27, 0, UNI_ANCIENTGREEKMUSIC } /* ancientgreekmusicalnotation */, + { 253, 4553, 4005, 14, 2, UNI_NV__3_SLASH_8 } /* numericvalue=3/8 */, + { 2704, 6760, 330, 14, 2, UNI_SB__SP } /* sentencebreak=sp */, + { 0, 1911, 669, 7, 7, UNI_ELYM } /* script=elymaic */, + { 0, 368, 2173, 4, 2, UNI_CCC__11 } /* ccc=11 */, + { 3, 5306, 2397, 10, 9, UNI_WB__WSEGSPACE } /* wordbreak=wsegspace */, + { 2120, 8765, 5970, 22, 16, UNI_LB__VF } /* indicsyllabiccategory=reorderingkiller */, + { 3352, 6356, 2034, 7, 11, UNI_INGUNJALAGONDI } /* block=gunjalagondi */, + { 112, 6464, 201, 3, 4, UNI_SGNW } /* sc=sgnw */, + { 26, 6464, 209, 3, 4, UNI_SC__TAML } /* sc=taml */, + { 0, 174, 972, 3, 6, -UNI_PCM } /* pcm=false */, + { 524, 135, 3682, 2, 16, UNI_HALFANDFULLFORMS } /* ishalfandfullforms */, + { 339, 8233, 6543, 9, 13, UNI_M } /* category=combiningmark */, + { 1, 992, 639, 8, 2, UNI_EXT } /* extender=t */, + { 0, 3726, 972, 4, 6, -UNI_IDSU } /* idsu=false */, + { 0, 1733, 321, 4, 5, UNI_INORIYA } /* blk=oriya */, + { 2, 368, 378, 4, 2, UNI_CCC__91 } /* ccc=91 */, + { 196, 135, 8283, 2, 16, UNI_UIDEO } /* isunifiedideograph */, + { 0, 4586, 4667, 16, 6, UNI_LATN } /* scriptextensions=latin */, + { 0, 4051, 383, 16, 2, UNI_STERM } /* sentenceterminal=y */, + { 13, 3903, 2689, 3, 10, UNI_LB__BA } /* lb=breakafter */, + { 582, 8233, 3849, 9, 14, UNI_MN } /* category=nonspacingmark */, + { 8, 1733, 984, 4, 8, UNI_INDUPLOYAN } /* blk=duployan */, + { 0, 135, 2340, 2, 4, UNI_HUNG } /* ishung */, + { 2, 7674, 4067, 10, 14, UNI_BC__EN } /* bidiclass=europeannumber */, + { 560, 5438, 0, 9, 0, UNI_HALFMARKS } /* halfmarks */, + { 106, 1911, 6097, 7, 9, UNI_SC__MONG } /* script=mongolian */, + { 0, 135, 978, 2, 2, UNI_CO } /* isco */, + { 1, 2429, 4335, 6, 15, UNI_INHANGUL } /* block=hangulsyllables */, + { 2262, 333, 6484, 2, 20, UNI_GLAGOLITICSUP } /* inglagoliticsupplement */, + { 1287, 3136, 2182, 5, 2, UNI_IN__15 } /* in=v150 */, + { 655, 434, 0, 4, 0, UNI_ARMN } /* armn */, + { 12, 5761, 383, 21, 2, UNI_CWCM } /* changeswhencasemapped=y */, + { 0, 1478, 0, 10, 0, UNI_ASCII } /* basiclatin */, + { 138, 6342, 1070, 14, 4, UNI_ETHIOPICEXTB } /* block=ethiopicextb */, + { 0, 1522, 296, 2, 1, UNI_sd_values_index } /* sd= */, + { 0, 925, 614, 4, 3, UNI_AGE__7 } /* age=7.0 */, + { 0, 4681, 4673, 14, 9, UNI_CYRILLICEXTB } /* block=cyrillicextendedb */, + { 0, 1982, 0, 12, 0, UNI_BIDIM } /* bidimirrored */, + { 0, 2429, 1616, 6, 6, UNI_ARROWS } /* block=arrows */, + { 1, 4219, 0, 4, 0, UNI_BRAI } /* brai */, + { 2158, 5306, 3571, 12, 4, UNI_WB__MN } /* wordbreak=midnum */, + { 0, 1810, 4822, 8, 9, UNI_ARABICEXTC } /* isarabicextendedc */, + { 0, 1737, 0, 7, 0, UNI_CJKEXTD } /* cjkextd */, + { 5, 2429, 3742, 9, 11, UNI_CJKCOMPATFORMS } /* block=cjkcompatforms */, + { 895, 2429, 6116, 6, 12, UNI_SUNDANESESUP } /* block=sundanesesup */, + { 1301, 336, 653, 5, 3, -UNI_QMARK } /* qmark=no */, + { 18, 1911, 1049, 8, 5, UNI_SC__TELU } /* script=telugu */, + { 4064, 6222, 0, 21, 0, UNI_SINHALAARCHAICNUMBERS } /* sinhalaarchaicnumbers */, + { 0, 2081, 331, 7, 5, UNI_POSIXPRINT } /* isposixprint */, + { 4844, 4586, 1060, 17, 4, UNI_YEZI } /* scriptextensions=yezi */, + { 0, 6164, 222, 10, 2, UNI_LB__GL } /* linebreak=gl */, + { 5, 1733, 9089, 4, 43, UNI_UCASEXTA } /* blk=unifiedcanadianaboriginalsyllabicsextendeda */, + { 903, 2429, 939, 6, 8, UNI_INARMENIAN } /* block=armenian */, + { 3, 2922, 2479, 10, 8, UNI_ETHIOPICEXT } /* isethiopicextended */, + { 4036, 2380, 154, 3, 2, UNI_IN__NA } /* in=na */, + { 1431, 2429, 0, 6, 0, UNI_blk_values_index } /* block= */, + { 0, 333, 430, 2, 4, UNI_INTOTO } /* intoto */, + { 0, 1733, 2002, 4, 8, UNI_UCASEXTA } /* blk=ucasexta */, + { 2538, 3128, 653, 5, 2, -UNI_EPRES } /* epres=n */, + { 3080, 135, 246, 2, 2, UNI_PE } /* ispe */, + { 0, 554, 376, 4, 1, UNI_NV__38 } /* nv=38 */, + { 0, 30, 7106, 1, 14, UNI_DEVANAGARIEXT } /* isdevanagariext */, + { 0, 16, 2475, 1, 12, UNI_GREEKEXT } /* greekextended */, + { 0, 33, 4873, 1, 15, UNI_SYRIACSUP } /* syriacsupplement */, + { 0, 683, 382, 5, 2, UNI_grbase_values_index } /* grbase= */, + { 594, 293, 748, 4, 2, UNI_WB__EB } /* gcb=em */, + { 0, 4007, 0, 14, 0, UNI_NV__7 } /* numericvalue=7 */, + { 10, 5, 0, 1, 0, UNI_M } /* m */, + { 1186, 7509, 1933, 7, 8, UNI_SUPERANDSUB } /* blk=superandsub */, + { 1349, 2576, 0, 11, 0, UNI_CASEDLETTER } /* casedletter */, + { 0, 6760, 2409, 15, 8, UNI_SB__SC } /* sentencebreak=scontinue */, + { 8, 333, 1603, 2, 10, UNI_INKHAROSHTHI } /* inkharoshthi */, + { 1, 438, 653, 2, 3, -UNI_DI } /* di=no */, + { 2641, 2081, 7446, 3, 25, UNI_PCM } /* isprependedconcatenationmark */, + { 1265, 1156, 0, 8, 0, UNI_TAGB } /* tagbanwa */, + { 0, 333, 1569, 2, 8, UNI_JAMOEXTA } /* injamoexta */, + { 5305, 368, 5723, 4, 13, UNI_CCC__202 } /* ccc=attachedbelow */, + { 2400, 6737, 6160, 13, 4, UNI_JG__NOON } /* joininggroup=noon */, + { 10, 933, 312, 5, 2, UNI_AGE__3 } /* age=v30 */, + { 0, 2429, 7734, 6, 8, UNI_INKATAKANA } /* block=katakana */, + { 2048, 135, 1533, 2, 10, UNI_DIAK } /* isdivesakuru */, + { 0, 293, 4569, 4, 17, UNI_RI } /* gcb=regionalindicator */, + { 19, 8278, 2680, 29, 3, UNI_CJKEXTJ } /* incjkunifiedideographsextensionj */, + { 3424, 1590, 3889, 4, 14, UNI_KAKTOVIKNUMERALS } /* iskaktoviknumerals */, + { 0, 583, 1673, 3, 2, UNI_SB__FO } /* sb=fo */, + { 0, 7176, 383, 24, 4, UNI_COMPEX } /* fullcompositionexclusion=yes */, + { 5, 333, 4814, 2, 11, UNI_BOPOMOFOEXT } /* inbopomofoext */, + { 0, 135, 150, 2, 4, UNI_MYMR } /* ismymr */, + { 0, 39, 41, 2, 2, UNI_BHKS } /* bhks */, + { 4, 1283, 353, 4, 3, UNI_KANASUP } /* kanasup */, + { 3543, 5845, 3852, 21, 11, UNI_GCB__SM } /* graphemeclusterbreak=spacingmark */, + { 1, 333, 6116, 2, 9, UNI_INSUNDANESE } /* insundanese */, + { 0, 4051, 2999, 15, 2, UNI_sterm_values_index } /* sentenceterminal= */, + { 5199, 135, 2057, 2, 4, UNI_SOGD } /* issogd */, + { 7, 2525, 8796, 3, 33, UNI_MISCPICTOGRAPHS } /* inmiscellaneoussymbolsandpictographs */, + { 5287, 4586, 2054, 17, 10, UNI_SOGO } /* scriptextensions=oldsogdian */, + { 1236, 316, 319, 3, 2, UNI_NV__90 } /* nv=90 */, + { 0, 6464, 1414, 3, 9, UNI_SC__ORKH } /* sc=oldturkic */, + { 1, 2429, 8167, 6, 22, UNI_ENCLOSEDIDEOGRAPHICSUP } /* block=enclosedideographicsup */, + { 1362, 3903, 0, 9, 0, UNI_LB__AK } /* lb=aksara */, + { 5254, 963, 1501, 3, 2, UNI_BPT__C } /* bpt=c */, + { 27, 1911, 1577, 7, 4, UNI_SC__JAVA } /* script=java */, + { 3712, 8117, 5588, 23, 7, UNI_JG__MANICHAEANHUNDRED } /* joininggroup=manichaeanhundred */, + { 7209, 1781, 728, 3, 4, UNI_OSGE } /* isosage */, + { 3, 8765, 5986, 22, 16, UNI_INSC__SYLLABLEMODIFIER } /* indicsyllabiccategory=syllablemodifier */, + { 19, 2021, 0, 12, 0, UNI_GRBASE } /* graphemebase */, + { 5896, 2429, 5009, 6, 18, UNI_RUMI } /* block=ruminumeralsymbols */, + { 16, 2635, 6159, 9, 5, UNI_JG__AFRICANNOON } /* jg=africannoon */, + { 5, 6342, 674, 12, 5, UNI_ETHIOPICEXT } /* block=ethiopicext */, + { 20, 4586, 3550, 17, 15, UNI_SARB } /* scriptextensions=oldsoutharabian */, + { 0, 3155, 972, 13, 2, -UNI_QMARK } /* quotationmark=f */, + { 0, 4406, 5588, 13, 7, UNI_JG__MANICHAEANHUNDRED } /* jg=manichaeanhundred */, + { 0, 5648, 383, 19, 2, UNI_TERM } /* terminalpunctuation=y */ }; MPH_VALt @@ -7997,60 +8122,60 @@ match_uniprop( const unsigned char * con #endif /* #if defined(PERL_CORE) || defined(PERL_EXT_RE_BUILD) */ /* Generated from: - * b7f46fc1010fd83f5a678b268a23fef0142a18d0ab2a142edd0bb03328e667c3 lib/Unicode/UCD.pm - * 764f420cedfc8b43d9fec251c957a5d55fc45d40f6573f162990ed1dce7e36e0 lib/unicore/ArabicShaping.txt - * b8f32554c6f658821fb0ee742d21c5b1f2086b9bf13071fed04894b022f93d67 lib/unicore/BidiBrackets.txt - * d7afdadd1bbd66f5a663ac0e8f7958f18fd9491fc0bc59ec5877cb82db71db7d lib/unicore/BidiMirroring.txt - * f3907b395d410f1b97342292ca6bc83dd12eb4b205f2a0c48efdef99e517d7b0 lib/unicore/Blocks.txt - * 6f1f9c588eb4a5c718d9e8f93b782685e5c7fec872cf05e8e6878053599e09bb lib/unicore/CaseFolding.txt - * 89e83cf9cc8bef6c1f8bf77e42cf6f0341dfa42e66261f4dbe9b492e7a23c8ee lib/unicore/CompositionExclusions.txt - * 60caa81b99a4dfb0bc5d38440d323073e3f356f46f9ca7869da848cd0715408b lib/unicore/DAge.txt - * 39d35161f2954497f69e08bdb9e701493f476a3d30222de20028feda36c1dabd lib/unicore/DCoreProperties.txt - * 4d4c03892dea9146d674b686e495df2d55a28d071ac474041d73518f887abddc lib/unicore/DNormalizationProps.txt - * 43adc76c0686a42cb370764eb8cfe2b2a45b10b855e5572a2db4a0eecce15d5b lib/unicore/EastAsianWidth.txt - * 628929adae97427348337003e39d29da7b55acdddfac21e06d3dacad92237834 lib/unicore/EquivalentUnifiedIdeograph.txt - * 329612f2aea8672379d93202ca6fcd948b4f08062d4fc43ee31c7061c66ed279 lib/unicore/HangulSyllableType.txt - * c6108ca140e054b55a5b0378e7ebed8b1ef0e846251f6195361bc9af8ffc61b1 lib/unicore/IdStatus.txt - * c7e57f71176fb3035e0c85e4d9f30b08374588b2bd16e729efbc7e49c7c9438f lib/unicore/IdType.txt - * cbb9e2193e26c9b3d595a8f0ff4fd2ad956482309143ceb4ce5469c19f14feba lib/unicore/IndicPositionalCategory.txt - * 615f1b92ba7ec76e18c5b5c05d2e1836e4b98bc791eb9e27946c7621fc047ae7 lib/unicore/IndicSyllabicCategory.txt - * e0f42a73ec3bf9fa4bc404ea0a2921675c73742905dacbe439675fe8c9b2359f lib/unicore/Jamo.txt - * e97e4259d0d20fab150b9c7b4b28abfae5cd78ca97e7f4ac6ed20d685d5f4a7c lib/unicore/LineBreak.txt - * 9953f0fcebf5ea8091c5c581e4df0e43f20d2533c84ccca7987a9bb819a896a8 lib/unicore/NameAliases.txt - * 4ff660cb922480cd5aab9a689b1a6905d0a54575baf9967d0f1e00ac866f04dd lib/unicore/NamedSequences.txt - * d811971453e7075e1ad56fb1b301eece5aa80757b81f6156e74a1bfb3ae5ceb1 lib/unicore/NormTest.txt - * 53d614508e2a0b2305a8aa21cd60d993de9326cdf65993660dfcce4503548583 lib/unicore/PropList.txt - * 440fd3e5460b9bfe31da67b6f923992e1989d31fe2ed91e091c4b8f8e2620bf9 lib/unicore/PropValueAliases.txt - * 33a9f2266ad6b8e8de05c0ea3dfac411ac62cf8839ff1c94057471e4c5f6a2b3 lib/unicore/PropertyAliases.txt - * 049117ce26b9769fe2749b06eef51a50a89faef4a97764dd2d81daa715980700 lib/unicore/ScriptExtensions.txt - * 9e88f0a677df47311106340be8ede2ecdacd9c1c931831218d2be6d5508e0039 lib/unicore/Scripts.txt - * 8d5de354eef79f2395a54c9c7dcebbaf3d30fc962d0f85611ea97aa973a0c451 lib/unicore/SpecialCasing.txt - * ff58e5823bd095166564a006e47d111130813dcf8bf234ef79fa51a870edb48f lib/unicore/UnicodeData.txt - * b71d2d4b57b4f751a40658e9ddb1ddc8aa0a9220bf37890d9a825e30e0612ddc lib/unicore/Unikemet.txt - * 24ac1474554eb55c85ace5c16d551535a8c52cdc2f4c13cf68c3839214339bbe lib/unicore/VerticalOrientation.txt - * ee2b9354d270ac061b29f09662cafea06341d77e704b8cc6bd72aaeeda363cb5 lib/unicore/auxiliary/GCBTest.txt - * c29360bd6f7132811d701d29069541e827eb44bfc4c8fbde8c370d6982689dc1 lib/unicore/auxiliary/GraphemeBreakProperty.txt - * 910759a611a479f37df4f535d2e64d7589be3c5ac5f7491cf1fb4fa4cdb211e9 lib/unicore/auxiliary/LBTest.txt - * 0aef84034ee1789eb71021454fac384e83080b05922272d63cf297f4bf08150e lib/unicore/auxiliary/SBTest.txt - * 20aab5eca3842c7a27cc6756d74488a4a5f744c8dca2948ec1128f26a60d1f79 lib/unicore/auxiliary/SentenceBreakProperty.txt - * ad985d5721f3fa6b45495663dfe44180f2f68976100dee0ea7451ef1a8f838e8 lib/unicore/auxiliary/WBTest.txt - * 476464e71a4b7b779b8ba7c5671f4338fea77da8e6b6b05fb82b3fdd14603779 lib/unicore/auxiliary/WordBreakProperty.txt - * f1365a5173eee18e1f98b240cdc492e84a25f1ce7e0c9d1094eb29c41a22696a lib/unicore/emoji/emoji.txt - * 71ed943a49c58568d8d92e80ecc2ba2f06e62aee9c8ebb0e6e8bd2c3ed8b180e lib/unicore/extracted/DBidiClass.txt - * 1ed4d4791c0e34fcad4dfcb5dd4c4122e16428241b75452f05d780ffa661f89d lib/unicore/extracted/DBinaryProperties.txt - * 52064d588c98c623b2373905e6a449eb520f900113954bcd212e94ef0810b471 lib/unicore/extracted/DCombiningClass.txt - * 29f8bff31296bab424e8d728e2a3c0a3240c5a67dadf47fa7092ec0585ad91b6 lib/unicore/extracted/DDecompositionType.txt - * 372e34de237e5a644ce8379a0d02b91a1f584f04d4fb240ea6ccc87c5767f926 lib/unicore/extracted/DEastAsianWidth.txt - * 7676ab755a41ef82108460238569e60ad65c191ddafe61b36c6765ec1353f293 lib/unicore/extracted/DGeneralCategory.txt - * ab2c98db3f945f14f7fe8ab1c80e5c77734cecfd1f34a443ffa283c51fd4c9d7 lib/unicore/extracted/DJoinGroup.txt - * 6bd08b97da66b70ccfdab105a352de2984e02625239ec5695422c99b33d854f0 lib/unicore/extracted/DJoinType.txt - * 4be1c18e7b121d951018065b453bb05083f624c8f905ce8be7c0f354c9097c95 lib/unicore/extracted/DLineBreak.txt - * 786833e0a3f5ec0c0cd0940e4c15f730f3a92163f354ecd7dede28a70c0fa892 lib/unicore/extracted/DNumType.txt - * 00b43cc5c9b86a834f82389c4537f103e652821387daa556f0bd220f6c23007e lib/unicore/extracted/DNumValues.txt - * 308c29a8d4df1761b0ea5a6a93fbe8649a80b7863d2848be6dc2d65238348e13 lib/unicore/mktables - * 63f771c327e92574fbd77919586079c38f669058a5e6b67ccec385ef8fcde882 lib/unicore/version + * 198105a1b3637a4bc7240628bae2f65f6d0c31df2cee4f0242c2561421ea2e75 lib/Unicode/UCD.pm + * 39afa01e680e27d0fd10b67a9b27be13fbaa3d0efecfb5be45991de9a0d267d0 lib/unicore/ArabicShaping.txt + * dadbaf38a0d0246e5b805bf8725cb81b7c621f93d030595635f5ba2c2f179428 lib/unicore/BidiBrackets.txt + * a2f16fb873ab4fcdf3221cb1a8a85a134ddd6ed03603181823ff5206af3741ce lib/unicore/BidiMirroring.txt + * c0edefaf1a19771e830a82735472716af6bf3c3975f6c2a23ffbe2580fbbcb15 lib/unicore/Blocks.txt + * ff8d8fefbf123574205085d6714c36149eb946d717a0c585c27f0f4ef58c4183 lib/unicore/CaseFolding.txt + * 5e6e9c8f8e76561da04cb1703a9306c63707be2ed8ff2eb12cd3a942368a6f72 lib/unicore/CompositionExclusions.txt + * f8ecdf768bdc210f201abd271d9bc587825618a86a7046a8146cc816393f1998 lib/unicore/DAge.txt + * 24c7fed1195c482faaefd5c1e7eb821c5ee1fb6de07ecdbaa64b56a99da22c08 lib/unicore/DCoreProperties.txt + * 71fd6a206a2c0cdd41feb6b7f656aa31091db45e9cedc926985d718397f9e488 lib/unicore/DNormalizationProps.txt + * ea7ce50f3444a050333448dffef1cadd9325af55cbb764b4a2280faf52170a33 lib/unicore/EastAsianWidth.txt + * 38619c05a17e771554000fe604afee92e10eb49e0616ecf0c87af3c1eb0f4320 lib/unicore/EquivalentUnifiedIdeograph.txt + * 5a57450afde0d082bc5026f7458649eac3b615490cc7e3d916b0367f1593c0e3 lib/unicore/HangulSyllableType.txt + * 617228a16da13850bf8af28b6cd08f5e9b6595d2eb60404fe6eee2c85b4e4a35 lib/unicore/IdStatus.txt + * 924ac63faa97ed73420d6ac48d08279d90968c7da0502ab701e08bfbb9683c22 lib/unicore/IdType.txt + * 68cedc29a7e57f984d90fe2c7712f2e6d0c717e253db219607daea8997d6c480 lib/unicore/IndicPositionalCategory.txt + * 3fc122f4cf58b0c19268d5f810263b04ab4e1e67743386ec0e0ada9c76aec5be lib/unicore/IndicSyllabicCategory.txt + * 17bb07f5e37f995351ddcef393c04464a9e3891ed0c0bd56a03a5c5e400a6326 lib/unicore/Jamo.txt + * e6a18fa91f8f6a6f8e534b1d3f128c21ada45bfe152eb6b1bcc5e15fd8ac92e6 lib/unicore/LineBreak.txt + * 793f6f1e4d15fd90f05ae66460191dc4d75d1fea90136a25f30dd6a4cb950eac lib/unicore/NameAliases.txt + * 360dac27d5abafdcd8c03a8597f47acf92e8ebf7f6ee28020c173ed8b2ed0cc5 lib/unicore/NamedSequences.txt + * 5019ffd530751a741900c849c0e010332f142a3612234639bd200b82138a87db lib/unicore/NormTest.txt + * 130dcddcaadaf071008bdfce1e7743e04fdfbc910886f017d9f9ac931d8c64dd lib/unicore/PropList.txt + * 670d2bebb48649c04fabfbf033308073dcff47946324a8033237254c048b3b01 lib/unicore/PropValueAliases.txt + * 4441f573caf952ffece1d7c892e7715bd7136dfc26f96eb6f268bf1e474715fb lib/unicore/PropertyAliases.txt + * ec2107e58825a1586acee8e0911ce18260394ac8b87e535ca325f1ccbeb06bc6 lib/unicore/ScriptExtensions.txt + * 9f5e50d3abaee7d6ce09480f325c706f485ae3240912527e651954d2d6b035bf lib/unicore/Scripts.txt + * efc25faf19de21b92c1194c111c932e03d2a5eaf18194e33f1156e96de4c9588 lib/unicore/SpecialCasing.txt + * 2e1efc1dcb59c575eedf5ccae60f95229f706ee6d031835247d843c11d96470c lib/unicore/UnicodeData.txt + * 76a3081265e6eb673873f9c93d6f36062e82c7ed027c5c1a592accfbe48c20a5 lib/unicore/Unikemet.txt + * dcef09c3fb24d356b042569c328ec341efc5b53447700d799f2fb4834c3cd3cd lib/unicore/VerticalOrientation.txt + * e2d134d2c52919bace503ebb6a551c1855fe1a1faec18478c78fff254a1793ec lib/unicore/auxiliary/GCBTest.txt + * d6b51d1d2ae5c33b451b7ed994b48f1f4dc62b2272a5831e7fd418514a6bae89 lib/unicore/auxiliary/GraphemeBreakProperty.txt + * e69884e0dde6a8724873f885d68c52dc14518abf9ae4ca9e2283b8773db3b752 lib/unicore/auxiliary/LBTest.txt + * 12cb47d028ded0c1cb8a28558f95479cbcd24559c46977015c82f3b50a1cc6e4 lib/unicore/auxiliary/SBTest.txt + * 871c0c985ad95125e25b302414065a10839d068970bceb383ecec138f22a0a18 lib/unicore/auxiliary/SentenceBreakProperty.txt + * 1de23a75f37904abc7d206239ee8d34f8fdf0fb4ab32a7174dfbabbde25419b2 lib/unicore/auxiliary/WBTest.txt + * 72274cac1e6b919507db35655c3e175aa27274668a1ece95c28d2069f2ad9852 lib/unicore/auxiliary/WordBreakProperty.txt + * 2cb2bb9455cda83e8481541ecf5b6dfda66a3bb89efa3fa7c5297eccf607b72b lib/unicore/emoji/emoji.txt + * 4867b4b7f0731ed1bfcd34cc6251211ff1542541fce0734b6fbda139ee80b3a4 lib/unicore/extracted/DBidiClass.txt + * 13dd09d35a9377e33eb388a01e6581d4bfec6b2685316078c341982fa444071a lib/unicore/extracted/DBinaryProperties.txt + * 191463abfbd202703c6fd6776a92a23ac44ec65e0476a7f95aa91ca492cef29b lib/unicore/extracted/DCombiningClass.txt + * f44e5ceaf40edc1fe06ea0404e8bebc7d356dcc38aac076543b6874008a06e3e lib/unicore/extracted/DDecompositionType.txt + * 0b5523a2217cb318d20b329a05d31eec5af5686ba09d263b85bb75a28989a3a8 lib/unicore/extracted/DEastAsianWidth.txt + * d62e5bab70ca74f099343f71224fa051cb1fdd61a1ab45c0488c44cfc0b6102e lib/unicore/extracted/DGeneralCategory.txt + * bb67e0c00b88acfa5be633967b66b23326844a86e49c6fde7b57960d3af66cae lib/unicore/extracted/DJoinGroup.txt + * f39ebe974825d6736aee15582250307aa532b2cfab3caf3f86bd23fddc9c5c4d lib/unicore/extracted/DJoinType.txt + * dad3ef492d198d6f1dde4922b175f7371a27dfe62fce489f3e04807015a4c682 lib/unicore/extracted/DLineBreak.txt + * 7c83684d3336b698381745b78a971c3e1242cb3fcac58604469086c19b6edcee lib/unicore/extracted/DNumType.txt + * 139b976bdc288be01c80f018523da769cf2845109b5a7f0f8a432db64bfedcfa lib/unicore/extracted/DNumValues.txt + * e3ac360c03d18779fea6d6497fbbe53798135da55e3764d3c9f90a79bbf7e8b5 lib/unicore/mktables + * 8c30575264b2772c7a69c5bb6069a28f0e0a7a0df735871bde2d99ee674316ac lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl - * c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl - * 6f140fe16685fe5d0e81e2984af81342aff5eaba309991002eaca94d032b2ecc regen/mk_invlists.pl - * d6987e01ad538d1567394851cf199f99815f7701bebd6092be4bc7a6d8f147c6 regen/mph.pl + * c4f76f4ba54f533e6b3c6197d2733a4f83f7bbf3c01e6d83b8950e291a3fe36a regen/mk_PL_charclass.pl + * 20a6e3d507a66f4594586485568134873485b08e23383f3dc4e6b3047569267b regen/mk_invlists.pl + * a6ce8aefad005c081d4e04523e1f1f1a5a1bed5414ca4a421b5b16b73bfce6a4 regen/mph.pl * ex: set ro ft=c: */ Index: gnu/usr.bin/perl/unicode_constants.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/unicode_constants.h,v diff -u -p -a -u -p -r1.9 unicode_constants.h --- gnu/usr.bin/perl/unicode_constants.h 26 Dec 2025 22:14:13 -0000 1.9 +++ gnu/usr.bin/perl/unicode_constants.h 16 Nov 2026 00:57:40 -0000 @@ -47,7 +47,7 @@ bytes. =cut */ -#define UNICODE_MAJOR_VERSION 16 +#define UNICODE_MAJOR_VERSION 17 #define UNICODE_DOT_VERSION 0 #define UNICODE_DOT_DOT_VERSION 0 @@ -57,6 +57,7 @@ bytes. # define COMBINING_GRAVE_ACCENT_UTF8 "\xCC\x80" /* U+0300 */ # define COMBINING_DOT_ABOVE_UTF8 "\xCC\x87" /* U+0307 */ +# define COMBINING_GREEK_YPOGEGRAMMENI_UTF8 "\xCD\x85" /* U+0345 */ # define LATIN_CAPITAL_LETTER_SHARP_S_UTF8 "\xE1\xBA\x9E" /* U+1E9E */ @@ -75,6 +76,7 @@ bytes. # define MAX_UNICODE_UTF8 "\xF4\x8F\xBF\xBF" /* U+10FFFF */ +# define SHY_NATIVE 0xAD /* U+00AD */ # define NBSP_NATIVE 0xA0 /* U+00A0 */ # define NBSP_UTF8 "\xC2\xA0" /* U+00A0 */ @@ -122,6 +124,7 @@ bytes. # define COMBINING_GRAVE_ACCENT_UTF8 "\xAF\x41" /* U+0300 */ # define COMBINING_DOT_ABOVE_UTF8 "\xAF\x48" /* U+0307 */ +# define COMBINING_GREEK_YPOGEGRAMMENI_UTF8 "\xB1\x46" /* U+0345 */ # define LATIN_CAPITAL_LETTER_SHARP_S_UTF8 "\xBF\x63\x72" /* U+1E9E */ @@ -140,6 +143,7 @@ bytes. # define MAX_UNICODE_UTF8 "\xEE\x42\x73\x73\x73" /* U+10FFFF */ +# define SHY_NATIVE 0xCA /* U+00AD */ # define NBSP_NATIVE 0x41 /* U+00A0 */ # define NBSP_UTF8 "\x80\x41" /* U+00A0 */ @@ -187,6 +191,7 @@ bytes. # define COMBINING_GRAVE_ACCENT_UTF8 "\xAD\x41" /* U+0300 */ # define COMBINING_DOT_ABOVE_UTF8 "\xAD\x48" /* U+0307 */ +# define COMBINING_GREEK_YPOGEGRAMMENI_UTF8 "\xAF\x46" /* U+0345 */ # define LATIN_CAPITAL_LETTER_SHARP_S_UTF8 "\xBF\x62\x71" /* U+1E9E */ @@ -205,6 +210,7 @@ bytes. # define MAX_UNICODE_UTF8 "\xEE\x42\x72\x72\x72" /* U+10FFFF */ +# define SHY_NATIVE 0xCA /* U+00AD */ # define NBSP_NATIVE 0x41 /* U+00A0 */ # define NBSP_UTF8 "\x78\x41" /* U+00A0 */ @@ -246,7 +252,7 @@ bytes. /* The number of code points not matching \pC */ #ifdef PERL_IN_REGCOMP_ANY -# define NON_OTHER_COUNT 154828 +# define NON_OTHER_COUNT 159631 #endif /* The highest code point that has any type of case change */ Index: gnu/usr.bin/perl/universal.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/universal.c,v diff -u -p -a -u -p -r1.25 universal.c --- gnu/usr.bin/perl/universal.c 26 Dec 2025 22:14:13 -0000 1.25 +++ gnu/usr.bin/perl/universal.c 16 Nov 2026 00:57:40 -0000 @@ -39,20 +39,15 @@ * The main guts of traverse_isa was actually copied from gv_fetchmeth */ -#define PERL_ARGS_ASSERT_ISA_LOOKUP \ - assert(stash); \ - assert(namesv || name) - - -STATIC bool +static bool S_isa_lookup(pTHX_ HV *stash, SV *namesv, const char * name, STRLEN len, U32 flags) { + PERL_ARGS_ASSERT_ISA_LOOKUP; + const struct mro_meta *const meta = HvMROMETA(stash); HV *isa = meta->isa; const HV *our_stash; - PERL_ARGS_ASSERT_ISA_LOOKUP; - if (!isa) { (void)mro_get_linear_isa(stash); isa = meta->isa; @@ -83,16 +78,13 @@ S_isa_lookup(pTHX_ HV *stash, SV *namesv return FALSE; } -#define PERL_ARGS_ASSERT_SV_DERIVED_FROM_SVPVN \ - assert(sv); \ - assert(namesv || name) - -STATIC bool +static bool S_sv_derived_from_svpvn(pTHX_ SV *sv, SV *namesv, const char * name, const STRLEN len, U32 flags) { + PERL_ARGS_ASSERT_SV_DERIVED_FROM_SVPVN; + HV* stash; - PERL_ARGS_ASSERT_SV_DERIVED_FROM_SVPVN; SvGETMAGIC(sv); if (SvROK(sv)) { @@ -122,7 +114,6 @@ S_sv_derived_from_svpvn(pTHX_ SV *sv, SV /* =for apidoc_section $SV - =for apidoc sv_derived_from =for apidoc_item sv_derived_from_hv =for apidoc_item sv_derived_from_pv @@ -133,23 +124,27 @@ These each return a boolean indicating w specified class I. To check derivation at the Perl level, call C as a normal Perl method. +The differences between the forms is how the class is specified, and the +UTF-8ness of its name. + +In C, the class name is extracted from C using +some version of L>. This is the preferred form. The class name is +considered to be in UTF-8 iff C is marked as such, hence C is +effectively currently ignored. + In C, the class name is C (which would presumably represent a stash). Its UTF8ness is C. -In C and C, the class name is given by -C, which is a NUL-terminated C string. In C, the name -is never considered to be encoded as UTF-8. - -The remaining forms differ only in how the class name is specified; -they all have a C parameter. Currently, the only significant value for -which is C to indicate that the class name is encoded as such. - -In C, the class name is extracted from C. -This is the preferred form. The class name is considered to be in UTF-8 if -C is marked as such. - -In C, C gives the length of C, so the latter -may contain embedded NUL characters. +In the remaining forms, the class name is specified by the C parameter. +In C and C, it is a NUL-terminated C +string. In C, C points to the first byte of the +string specifying the class, and an additional parameter, C, specifies +its length in bytes. Hence, C may contain embedded-NUL characters. + +C is never considered to be encoded as UTF-8 in C. The +remaining forms have a C parameter. If the C is set in it, +the class name is encoded as UTF-8; otherwise not. No other flags are +currently meaningful. =cut @@ -218,10 +213,10 @@ overloaded C method, nor will che bool Perl_sv_isa_sv(pTHX_ SV *sv, SV *namesv) { - GV *isagv; - PERL_ARGS_ASSERT_SV_ISA_SV; + GV *isagv; + if(!SvROK(sv) || !SvOBJECT(SvRV(sv))) return FALSE; @@ -262,12 +257,39 @@ Perl_sv_isa_sv(pTHX_ SV *sv, SV *namesv) } /* -=for apidoc sv_does_sv +=for apidoc sv_does +=for apidoc_item sv_does_pv +=for apidoc_item sv_does_pvn +=for apidoc_item sv_does_sv + +These each return a boolean indicating whether C performs a specific, named +role. + +C can be a Perl object or the name of a Perl class. + +The forms differ in how the role is specified. + +In C and C, the role is in C, which is a +NUL-terminated string, which means that it may not contain embedded NUL +characters. + +In C, the role is in C whose length is given by C. +Hence it may contain embedded NUL characters. + +In C, the role is extracted from C. Its C argument +is currently ignored. -Returns a boolean indicating whether the SV performs a specific, named role. -The SV can be a Perl object or the name of a Perl class. +You can pass C to the other functions that have a C argument +to indicate that C is encoded as UTF-8. C does not have a +C argument, so its role is never considered to be UTF-8. =cut + +The above is based on the behavior of newSVpvn_flags at the time of this +writing. It only recognizes SVs_TEMP and SVf_UTF8. + +XXX extracted in sv_does_sv is more complicated than the hand waving above + */ #include "XSUB.h" @@ -275,12 +297,13 @@ The SV can be a Perl object or the name bool Perl_sv_does_sv(pTHX_ SV *sv, SV *namesv, U32 flags) { + PERL_ARGS_ASSERT_SV_DOES_SV; + SV *classname; bool does_it; SV *methodname; dSP; - PERL_ARGS_ASSERT_SV_DOES_SV; PERL_UNUSED_ARG(flags); ENTER; @@ -327,14 +350,6 @@ Perl_sv_does_sv(pTHX_ SV *sv, SV *namesv return does_it; } -/* -=for apidoc sv_does - -Like L, but doesn't take a C parameter. - -=cut -*/ - bool Perl_sv_does(pTHX_ SV *sv, const char *const name) { @@ -342,15 +357,6 @@ Perl_sv_does(pTHX_ SV *sv, const char *c return sv_does_sv(sv, newSVpvn_flags(name, strlen(name), SVs_TEMP), 0); } -/* -=for apidoc sv_does_pv - -Like L, but takes a nul-terminated string instead of an SV. - -=cut -*/ - - bool Perl_sv_does_pv(pTHX_ SV *sv, const char *const name, U32 flags) { @@ -358,14 +364,6 @@ Perl_sv_does_pv(pTHX_ SV *sv, const char return sv_does_sv(sv, newSVpvn_flags(name, strlen(name), SVs_TEMP | flags), flags); } -/* -=for apidoc sv_does_pvn - -Like L, but takes a string/length pair instead of an SV. - -=cut -*/ - bool Perl_sv_does_pvn(pTHX_ SV *sv, const char *const name, const STRLEN len, U32 flags) { @@ -384,8 +382,7 @@ A specialised variant of C for works out the package name and subroutine name from C, and then calls C. Hence if C is C<&ouch::awk>, it would call C as: - diag_listed_as: SKIPME - croak("Usage: %" SVf "::%" SVf "(%s)", "ouch" "awk", + croak("Usage: %" SVf "::%" SVf "(%s)", "ouch", "awk", "eee_yow"); =cut @@ -394,11 +391,11 @@ C. Hence if C is C<&ouch:: void Perl_croak_xs_usage(const CV *const cv, const char *const params) { + PERL_ARGS_ASSERT_CROAK_XS_USAGE; + /* Avoid CvGV as it requires aTHX. */ const GV *gv = CvNAMED(cv) ? NULL : cv->sv_any->xcv_gv_u.xcv_gv; - PERL_ARGS_ASSERT_CROAK_XS_USAGE; - if (gv) got_gv: { const HV *const stash = GvSTASH(gv); @@ -456,8 +453,8 @@ XS(XS_UNIVERSAL_import_unimport) * depends on it has its own "no import" logic that produces better * warnings than this does. */ if (strNE(class_pv,"_charnames")) - ck_warner_d(packWARN(WARN_DEPRECATED__MISSING_IMPORT_CALLED_WITH_ARGS), - "Attempt to call undefined %s method with arguments " + ck_warner_d(packWARN(WARN_MISSING_IMPORT), + "Attempt to call missing %s method with arguments " "(%" SVf_QUOTEDPREFIX "%s) via package " "%" SVf_QUOTEDPREFIX " (Perhaps you forgot to load the package?)", ix ? "unimport" : "import", @@ -647,27 +644,27 @@ XS(XS_utf8_downgrade) XS(XS_utf8_native_to_unicode); /* prototype to pass -Wmissing-prototypes */ XS(XS_utf8_native_to_unicode) { - dXSARGS; - const UV uv = SvUV(ST(0)); + dXSARGS; + const UV uv = SvUV(ST(0)); - if (items > 1) - croak_xs_usage(cv, "sv"); + if (items > 1) + croak_xs_usage(cv, "sv"); - ST(0) = sv_2mortal(newSVuv(NATIVE_TO_UNI(uv))); - XSRETURN(1); + ST(0) = sv_2mortal(newSVuv(NATIVE_TO_UNI(uv))); + XSRETURN(1); } XS(XS_utf8_unicode_to_native); /* prototype to pass -Wmissing-prototypes */ XS(XS_utf8_unicode_to_native) { - dXSARGS; - const UV uv = SvUV(ST(0)); + dXSARGS; + const UV uv = SvUV(ST(0)); - if (items > 1) - croak_xs_usage(cv, "sv"); + if (items > 1) + croak_xs_usage(cv, "sv"); - ST(0) = sv_2mortal(newSVuv(UNI_TO_NATIVE(uv))); - XSRETURN(1); + ST(0) = sv_2mortal(newSVuv(UNI_TO_NATIVE(uv))); + XSRETURN(1); } XS(XS_Internals_SvREADONLY); /* prototype to pass -Wmissing-prototypes */ @@ -882,9 +879,9 @@ XS(XS_PerlIO_get_layers) } else { if (namok && argok) - PUSHs(sv_2mortal(Perl_newSVpvf(aTHX_ "%" SVf "(%" SVf ")", - SVfARG(*namsvp), - SVfARG(*argsvp)))); + PUSHs(sv_2mortal(newSVpvf("%" SVf "(%" SVf ")", + SVfARG(*namsvp), + SVfARG(*argsvp)))); else if (namok) PUSHs(sv_2mortal(SvREFCNT_inc_simple_NN(*namsvp))); else @@ -1357,7 +1354,7 @@ static const struct xsub_details these_d {"Tie::Hash::NamedCapture::flags", XS_NamedCapture_flags, NULL, 0 }, }; -STATIC OP* +static OP* optimize_out_native_convert_function(pTHX_ OP* entersubop, GV* namegv, SV* protosv) @@ -1409,6 +1406,8 @@ optimize_out_native_convert_function(pTH void Perl_boot_core_UNIVERSAL(pTHX) { + PERL_ARGS_ASSERT_BOOT_CORE_UNIVERSAL; + static const char file[] = __FILE__; const struct xsub_details *xsub = these_details; const struct xsub_details *end = C_ARRAY_END(these_details); Index: gnu/usr.bin/perl/utf8.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/utf8.c,v diff -u -p -a -u -p -r1.9 utf8.c --- gnu/usr.bin/perl/utf8.c 26 Dec 2025 22:14:13 -0000 1.9 +++ gnu/usr.bin/perl/utf8.c 16 Nov 2026 00:57:40 -0000 @@ -37,6 +37,21 @@ static const char malformed_text[] = "Ma static const char unees[] = "Malformed UTF-8 character (unexpected end of string)"; +UV +Perl_long_valid_utf8_to_uv(const U8 * const s, const U8 * const e) +{ + PERL_ARGS_ASSERT_LONG_VALID_UTF8_TO_UV; + + /* This exists entirely to make the inlined 'valid_utf8_to_uv' smaller, to + * increase its chances of actually getting inlined. For the code points + * it doesn't handle, it calls utf8_to_uv_or_die(), which is also inlined. + * So the compiler would try to inline both, getting a too-large-to-inline + * result. So this non-inlined routine acts as an intermediary, to avoid + * that */ + + return utf8_to_uv_or_die(s, e, NULL); +} + /* These are various utility functions for manipulating UTF8-encoded strings. For the uninitiated, this is a method of representing arbitrary @@ -82,11 +97,13 @@ Perl_force_out_malformed_utf8_message_(p } } -STATIC HV * +static HV * S_new_msg_hv(pTHX_ const char * const message, /* The message text */ U32 categories, /* Packed warning categories */ U32 flag) /* Flag associated with this message */ { + PERL_ARGS_ASSERT_NEW_MSG_HV; + /* Creates, populates, and returns an HV* that describes an error message * for the translators between UTF8 and code point */ @@ -96,8 +113,6 @@ S_new_msg_hv(pTHX_ const char * const me HV* msg_hv = newHV(); - PERL_ARGS_ASSERT_NEW_MSG_HV; - (void) hv_stores(msg_hv, "text", msg_sv); (void) hv_stores(msg_hv, "warn_categories", category_sv); (void) hv_stores(msg_hv, "flag_bit", flag_bit_sv); @@ -105,30 +120,6 @@ S_new_msg_hv(pTHX_ const char * const me return msg_hv; } -/* -=for apidoc uvoffuni_to_utf8_flags - -THIS FUNCTION SHOULD BE USED IN ONLY VERY SPECIALIZED CIRCUMSTANCES. -Instead, B or -L>. - -This function is like them, but the input is a strict Unicode -(as opposed to native) code point. Only in very rare circumstances should code -not be using the native code point. - -For details, see the description for L. - -=cut -*/ - -U8 * -Perl_uvoffuni_to_utf8_flags(pTHX_ U8 *d, UV uv, const UV flags) -{ - PERL_ARGS_ASSERT_UVOFFUNI_TO_UTF8_FLAGS; - - return uvoffuni_to_utf8_flags_msgs(d, uv, flags, NULL); -} - /* All these formats take a single UV code point argument */ const char surrogate_cp_format[] = "UTF-16 surrogate U+%04" UVXf; const char nonchar_cp_format[] = "Unicode non-character U+%04" UVXf @@ -145,21 +136,26 @@ const char super_cp_format[] = "Code /* =for apidoc uv_to_utf8_msgs =for apidoc_item uvchr_to_utf8_flags_msgs +=for apidoc_flag UNICODE_GOT_SURROGATE +=for apidoc_flag UNICODE_GOT_NONCHAR +=for apidoc_flag UNICODE_GOT_SUPER +=for apidoc_flag UNICODE_GOT_PERL_EXTENDED + These functions are identical. THEY SHOULD BE USED IN ONLY VERY SPECIALIZED -CIRCUMSTANCES. +CIRCUMSTANCES. The C spelling is preferred in new code. -Most code should use C()> rather than call this directly. +Most code should use C()> rather than call these directly. -This function is for code that wants any warning and/or error messages to be +These functions are for code that wants any warning and/or error messages to be returned to the caller rather than be displayed. Any message that would have been displayed if all lexical warnings are enabled will instead be returned. -It is just like C> but it takes an extra parameter -placed after all the others, C. If this parameter is 0, this function -behaves identically to C>. Otherwise, C should -be a pointer to an C variable, in which this function creates a new HV to -contain any appropriate message. The hash has three key-value pairs, as +They are just like C> but take an extra parameter +placed after all the others, C. If this parameter is 0, the functions +behave identically to C>. Otherwise, C should +be a pointer to an C variable, in which these functions create a new HV +to contain any appropriate message. The hash has three key-value pairs, as follows: =over 4 @@ -193,7 +189,7 @@ The possibilities are: =back It's important to note that specifying this parameter as non-null will cause -any warning this function would otherwise generate to be suppressed, and +any warning the functions would otherwise generate to be suppressed, and instead be placed in C<*msgs>. The caller can check the lexical warnings state (or not) when choosing what to do with the returned message. @@ -213,12 +209,12 @@ The caller, of course, is responsible fo U8 * Perl_uvoffuni_to_utf8_flags_msgs(pTHX_ U8 *d, UV input_uv, UV flags, HV** msgs) { + PERL_ARGS_ASSERT_UVOFFUNI_TO_UTF8_FLAGS_MSGS; + U8 *p; UV shifted_uv = input_uv; STRLEN utf8_skip = OFFUNISKIP(input_uv); - PERL_ARGS_ASSERT_UVOFFUNI_TO_UTF8_FLAGS_MSGS; - if (msgs) { *msgs = NULL; } @@ -379,6 +375,20 @@ Perl_uvoffuni_to_utf8_flags_msgs(pTHX_ U =for apidoc_item uv_to_utf8_flags =for apidoc_item uvchr_to_utf8 =for apidoc_item uvchr_to_utf8_flags +=for apidoc_flag UNICODE_DISALLOW_ABOVE_31_BIT +=for apidoc_flag UNICODE_DISALLOW_ILLEGAL_C9_INTERCHANGE +=for apidoc_flag UNICODE_DISALLOW_ILLEGAL_INTERCHANGE +=for apidoc_flag UNICODE_DISALLOW_NONCHAR +=for apidoc_flag UNICODE_DISALLOW_PERL_EXTENDED +=for apidoc_flag UNICODE_DISALLOW_SUPER +=for apidoc_flag UNICODE_DISALLOW_SURROGATE +=for apidoc_flag UNICODE_WARN_ABOVE_31_BIT +=for apidoc_flag UNICODE_WARN_ILLEGAL_C9_INTERCHANGE +=for apidoc_flag UNICODE_WARN_ILLEGAL_INTERCHANGE +=for apidoc_flag UNICODE_WARN_NONCHAR +=for apidoc_flag UNICODE_WARN_PERL_EXTENDED +=for apidoc_flag UNICODE_WARN_SUPER +=for apidoc_flag UNICODE_WARN_SURROGATE These each add the UTF-8 representation of the native code point C to the end of the string C; C should have at least C (up to @@ -452,27 +462,14 @@ C. The platforms,these flags can apply to code points that actually do fit in 31 bits. The new names accurately describe the situation in all cases. -=for apidoc Amnh||UNICODE_DISALLOW_ABOVE_31_BIT -=for apidoc Amnh||UNICODE_DISALLOW_ILLEGAL_C9_INTERCHANGE -=for apidoc Amnh||UNICODE_DISALLOW_ILLEGAL_INTERCHANGE -=for apidoc Amnh||UNICODE_DISALLOW_NONCHAR -=for apidoc Amnh||UNICODE_DISALLOW_PERL_EXTENDED -=for apidoc Amnh||UNICODE_DISALLOW_SUPER -=for apidoc Amnh||UNICODE_DISALLOW_SURROGATE -=for apidoc Amnh||UNICODE_WARN_ABOVE_31_BIT -=for apidoc Amnh||UNICODE_WARN_ILLEGAL_C9_INTERCHANGE -=for apidoc Amnh||UNICODE_WARN_ILLEGAL_INTERCHANGE -=for apidoc Amnh||UNICODE_WARN_NONCHAR -=for apidoc Amnh||UNICODE_WARN_PERL_EXTENDED -=for apidoc Amnh||UNICODE_WARN_SUPER -=for apidoc Amnh||UNICODE_WARN_SURROGATE - =cut */ -PERL_STATIC_INLINE int +PERL_STATIC_INLINE SSize_t S_is_utf8_overlong(const U8 * const s, const STRLEN len) { + PERL_ARGS_ASSERT_IS_UTF8_OVERLONG; + /* Returns an int indicating whether or not the UTF-8 sequence from 's' to * 's' + 'len' - 1 is an overlong. It returns a positive number if it is * an overlong; 0 if it isn't, and -1 if there isn't enough information to @@ -491,8 +488,6 @@ S_is_utf8_overlong(const U8 * const s, c * start byte. That happens for start bytes C0, E0, F0, F8, FC, FE, and * FF. */ - PERL_ARGS_ASSERT_IS_UTF8_OVERLONG; - /* Each platform has overlongs after the start bytes given above (expressed * in I8 for EBCDIC). The values below were found by manually inspecting * the UTF-8 patterns. See the tables in utf8.h and utfebcdic.h. */ @@ -537,9 +532,11 @@ S_is_utf8_overlong(const U8 * const s, c PERL_STATIC_INLINE int S_isFF_overlong(const U8 * const s, const STRLEN len) { - /* Returns an int indicating whether or not the UTF-8 sequence from 's' to - * 'e' - 1 is an overlong beginning with \xFF. It returns a positive - * number if it is; 0 if it isn't, and -1 if there isn't enough + PERL_ARGS_ASSERT_ISFF_OVERLONG; + + /* Returns an int indicating whether or not the UTF-8 sequence of 'len' + * bytes starting at 's' is an overlong beginning with \xFF. It returns a + * positive number if it is; 0 if it isn't, and -1 if there isn't enough * information to tell. This last return value can happen if the sequence * is incomplete, missing some trailing bytes that would form a complete * character. If there are enough bytes to make a definitive decision, @@ -548,8 +545,6 @@ S_isFF_overlong(const U8 * const s, cons * A positive return gives the number of bytes needed to be examined to * make the determination */ - PERL_ARGS_ASSERT_ISFF_OVERLONG; - #ifdef EBCDIC /* This works on all three EBCDIC code pages traditionally supported by * perl */ @@ -658,7 +653,7 @@ S_does_utf8_overflow(const U8 * const s, overflows_if_not_overlong: ; /* Here, the sequence overflows if not overlong. Check for that */ - int is_overlong = is_utf8_overlong(s, len); + SSize_t is_overlong = is_utf8_overlong(s, len); if (LIKELY(is_overlong == 0)) { return OVERFLOWS; } @@ -733,6 +728,9 @@ S_does_utf8_overflow(const U8 * const s, STRLEN Perl_is_utf8_char_helper_(const U8 * const s, const U8 * e, const U32 flags) { + PERL_ARGS_ASSERT_IS_UTF8_CHAR_HELPER_; + assert(0 == (flags & ~UTF8_DISALLOW_ILLEGAL_INTERCHANGE)); + SSize_t len, full_len; /* An internal helper function. @@ -761,11 +759,6 @@ Perl_is_utf8_char_helper_(const U8 * con * */ - PERL_ARGS_ASSERT_IS_UTF8_CHAR_HELPER_; - - assert(e > s); - assert(0 == (flags & ~UTF8_DISALLOW_ILLEGAL_INTERCHANGE)); - full_len = UTF8SKIP(s); len = e - s; @@ -850,6 +843,9 @@ Size_t Perl_is_utf8_FF_helper_(const U8 * const s0, const U8 * const e, const bool require_partial) { + PERL_ARGS_ASSERT_IS_UTF8_FF_HELPER_; + assert(*s0 == I8_TO_NATIVE_UTF8(0xFF)); + /* This is called to determine if the UTF-8 sequence starting at s0 and * continuing for up to one full character of bytes, but looking no further * than 'e - 1', is legal. *s0 must be 0xFF (or whatever the native @@ -876,11 +872,6 @@ Perl_is_utf8_FF_helper_(const U8 * const const U8 *s = s0 + 1; const U8 *send = e; - PERL_ARGS_ASSERT_IS_UTF8_FF_HELPER_; - - assert(s0 < e); - assert(*s0 == I8_TO_NATIVE_UTF8(0xFF)); - send = s + MIN(UTF8_MAXBYTES - 1, e - s); while (s < send) { if (! UTF8_IS_CONTINUATION(*s)) { @@ -909,8 +900,10 @@ Perl_is_utf8_FF_helper_(const U8 * const } const char * -Perl__byte_dump_string(pTHX_ const U8 * const start, const STRLEN len, const bool format) +Perl_byte_dump_string_(pTHX_ const U8 * const start, const STRLEN len, const bool format) { + PERL_ARGS_ASSERT_BYTE_DUMP_STRING_; + /* Returns a mortalized C string that is a displayable copy of the 'len' * bytes starting at 'start'. 'format' gives how to display each byte. * Currently, there are only two formats, so it is currently a bool: @@ -929,8 +922,6 @@ Perl__byte_dump_string(pTHX_ const U8 * char * output; char * d; - PERL_ARGS_ASSERT__BYTE_DUMP_STRING; - Newx(output, output_len, char); SAVEFREEPV(output); @@ -980,6 +971,8 @@ S_unexpected_non_continuation_text(pTHX_ /* How many bytes should there be? */ const STRLEN expect_len) { + PERL_ARGS_ASSERT_UNEXPECTED_NON_CONTINUATION_TEXT; + /* Return the malformation warning text for an unexpected continuation * byte. */ @@ -990,8 +983,6 @@ S_unexpected_non_continuation_text(pTHX_ const U8 * x = s + non_cont_byte_pos; const U8 * e = s + print_len; - PERL_ARGS_ASSERT_UNEXPECTED_NON_CONTINUATION_TEXT; - /* We don't need to pass this parameter, but since it has already been * calculated, it's likely faster to pass it; verify under DEBUGGING */ assert(expect_len == UTF8SKIP(s)); @@ -1009,7 +1000,7 @@ S_unexpected_non_continuation_text(pTHX_ return form("%s: %s (unexpected non-continuation byte 0x%02x," " %s after start byte 0x%02x; need %d bytes, got %d)", malformed_text, - _byte_dump_string(s, x - s, 0), + byte_dump_string_(s, x - s, 0), *(s + non_cont_byte_pos), where, *s, @@ -1261,6 +1252,22 @@ will result in simpler, more robust code =for apidoc utf8_to_uv_flags =for apidoc_item utf8n_to_uvchr +=for apidoc_flag UTF8_ALLOW_ANY +=for apidoc_flag UTF8_CHECK_ONLY +=for apidoc_flag UTF8_DIE_IF_MALFORMED +=for apidoc_flag UTF8_DISALLOW_ILLEGAL_C9_INTERCHANGE +=for apidoc_flag UTF8_DISALLOW_ILLEGAL_INTERCHANGE +=for apidoc_flag UTF8_DISALLOW_NONCHAR +=for apidoc_flag UTF8_DISALLOW_PERL_EXTENDED +=for apidoc_flag UTF8_DISALLOW_SUPER +=for apidoc_flag UTF8_DISALLOW_SURROGATE +=for apidoc_flag UTF8_FORCE_WARN_IF_MALFORMED +=for apidoc_flag UTF8_WARN_ILLEGAL_C9_INTERCHANGE +=for apidoc_flag UTF8_WARN_ILLEGAL_INTERCHANGE +=for apidoc_flag UTF8_WARN_NONCHAR +=for apidoc_flag UTF8_WARN_PERL_EXTENDED +=for apidoc_flag UTF8_WARN_SUPER +=for apidoc_flag UTF8_WARN_SURROGATE These functions are extensions of C>, where you need more control over what UTF-8 sequences are acceptable. These functions are @@ -1270,12 +1277,14 @@ C is more like an extens with fewer quirks, and a different method of specifying the bytes in C it is allowed to examine. It has a C parameter instead of an C parameter, so the furthest byte in C it can look at is S>. Its -return value is, like C, ambiguous with respect to the NUL -and REPLACEMENT characters, but the value of C<*retlen> can be relied on -(except with the C flag described below) to know where the -next possible character along C starts, removing that quirk. Hence, you -always should use C<*retlen> to determine where the next character in C -starts. +failure return value is not dependent on if warnings are enabled or not. It is +always 0 upon failure. But like C, 0 could also be the +return for a successful translation of an input C character. Use the same +method given above for disambiguating this. Unlike C, +C<*retlen> can be relied on (except with the C flag described +below) to know where the next possible character along C starts, removing +that quirk. Hence, you always should use C<*retlen> to determine where the +next character in C starts. These functions have an additional parameter, C, besides the ones in C and C, which can be used to broaden or @@ -1422,6 +1431,38 @@ of the croak is displayed. =for apidoc_item utf8n_to_uvchr_msgs =for apidoc_item utf8_to_uv_errors =for apidoc_item utf8n_to_uvchr_error +=for apidoc_flag UTF8_ALLOW_ANY +=for apidoc_flag UTF8_ALLOW_CONTINUATION +=for apidoc_flag UTF8_ALLOW_EMPTY +=for apidoc_flag UTF8_ALLOW_LONG +=for apidoc_flag UTF8_ALLOW_NON_CONTINUATION +=for apidoc_flag UTF8_ALLOW_OVERFLOW +=for apidoc_flag UTF8_ALLOW_SHORT +=for apidoc_flag UTF8_CHECK_ONLY +=for apidoc_flag UTF8_DIE_IF_MALFORMED +=for apidoc_flag UTF8_DISALLOW_ILLEGAL_C9_INTERCHANGE +=for apidoc_flag UTF8_DISALLOW_ILLEGAL_INTERCHANGE +=for apidoc_flag UTF8_DISALLOW_NONCHAR +=for apidoc_flag UTF8_DISALLOW_PERL_EXTENDED +=for apidoc_flag UTF8_DISALLOW_SUPER +=for apidoc_flag UTF8_DISALLOW_SURROGATE +=for apidoc_flag UTF8_FORCE_WARN_IF_MALFORMED +=for apidoc_flag UTF8_GOT_CONTINUATION +=for apidoc_flag UTF8_GOT_EMPTY +=for apidoc_flag UTF8_GOT_LONG +=for apidoc_flag UTF8_GOT_NONCHAR +=for apidoc_flag UTF8_GOT_NON_CONTINUATION +=for apidoc_flag UTF8_GOT_OVERFLOW +=for apidoc_flag UTF8_GOT_PERL_EXTENDED +=for apidoc_flag UTF8_GOT_SHORT +=for apidoc_flag UTF8_GOT_SUPER +=for apidoc_flag UTF8_GOT_SURROGATE +=for apidoc_flag UTF8_WARN_ILLEGAL_C9_INTERCHANGE +=for apidoc_flag UTF8_WARN_ILLEGAL_INTERCHANGE +=for apidoc_flag UTF8_WARN_NONCHAR +=for apidoc_flag UTF8_WARN_PERL_EXTENDED +=for apidoc_flag UTF8_WARN_SUPER +=for apidoc_flag UTF8_WARN_SURROGATE These functions are extensions of C> and C>. They are used for the highly specialized purpose of @@ -1613,38 +1654,6 @@ lexical warnings state (or not) when cho messages. The caller, of course, is responsible for freeing any returned AV. - -=for apidoc Amnh||UTF8_ALLOW_CONTINUATION -=for apidoc Amnh||UTF8_ALLOW_EMPTY -=for apidoc Amnh||UTF8_ALLOW_LONG -=for apidoc Amnh||UTF8_ALLOW_NON_CONTINUATION -=for apidoc Amnh||UTF8_ALLOW_OVERFLOW -=for apidoc Amnh||UTF8_ALLOW_PERL_EXTENDED -=for apidoc Amnh||UTF8_ALLOW_SHORT -=for apidoc Amnh||UTF8_CHECK_ONLY -=for apidoc Amnh||UTF8_DISALLOW_ILLEGAL_C9_INTERCHANGE -=for apidoc Amnh||UTF8_DISALLOW_ILLEGAL_INTERCHANGE -=for apidoc Amnh||UTF8_DISALLOW_NONCHAR -=for apidoc Amnh||UTF8_DISALLOW_PERL_EXTENDED -=for apidoc Amnh||UTF8_DISALLOW_SUPER -=for apidoc Amnh||UTF8_DISALLOW_SURROGATE -=for apidoc Amnh||UTF8_GOT_CONTINUATION -=for apidoc Amnh||UTF8_GOT_EMPTY -=for apidoc Amnh||UTF8_GOT_LONG -=for apidoc Amnh||UTF8_GOT_NONCHAR -=for apidoc Amnh||UTF8_GOT_NON_CONTINUATION -=for apidoc Amnh||UTF8_GOT_OVERFLOW -=for apidoc Amnh||UTF8_GOT_PERL_EXTENDED -=for apidoc Amnh||UTF8_GOT_SHORT -=for apidoc Amnh||UTF8_GOT_SUPER -=for apidoc Amnh||UTF8_GOT_SURROGATE -=for apidoc Amnh||UTF8_WARN_ILLEGAL_C9_INTERCHANGE -=for apidoc Amnh||UTF8_WARN_ILLEGAL_INTERCHANGE -=for apidoc Amnh||UTF8_WARN_NONCHAR -=for apidoc Amnh||UTF8_WARN_PERL_EXTENDED -=for apidoc Amnh||UTF8_WARN_SUPER -=for apidoc Amnh||UTF8_WARN_SURROGATE - =cut */ @@ -1960,7 +1969,7 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * possible_problems |= UTF8_GOT_SUPER; } } - else if (UNLIKELY(UNICODE_IS_NONCHAR(uv))) { + else if (UNLIKELY(UNICODE_IS_NONCHAR_GIVEN_NOT_SUPER(uv))) { if (flags & (UTF8_DISALLOW_NONCHAR|UTF8_WARN_NONCHAR)) { possible_problems |= UTF8_GOT_NONCHAR; } @@ -2001,6 +2010,11 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * * end, based on how many bytes the start byte tells * us should be in it, but no further than s0 + * avail_len + * overlong_detect_length if no overlong malformation is present, this is + * 0; otherwise it is the number of bytes required to + * make that determination. It is used below to limit + * the number of bytes displayed in a warning so as to + * make the warning accurate and not misleading. */ bool success = true; @@ -2212,8 +2226,9 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * * depend on earlier actions. Also the ordering tries to cause any * messages to be displayed in kind of decreasing severity order. * */ - U32 this_problem = 1U << lsbit_pos32(possible_problems); + U8 this_problem_bit = lsbit_pos32(possible_problems); + U32 this_problem = 1U << this_problem_bit; U32 this_flag_bit = this_problem; /* All cases set this */ @@ -2238,11 +2253,10 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * * would be to handle the message. */ - switch (this_problem) { + switch (this_problem_bit) { default: - croak("panic: Unexpected case value in " - " utf8n_to_uvchr_msgs() %" U32uf, - this_problem); + croak("panic: Unexpected case value in utf8_to_uv_msgs() %" + U32uf, this_problem); /* NOTREACHED */ break; @@ -2256,7 +2270,7 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * continue; \ } \ - case UTF8_GOT_EMPTY: + case UTF8_GOT_EMPTY_BIT_POS_: COMMON_DEFAULT_REJECTS(,); /* This so-called malformation is now treated as a bug in the @@ -2264,31 +2278,31 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * * function */ assert(0); - message = Perl_form(aTHX_ "%s (empty string)", malformed_text); + message = form("%s: (empty string)", malformed_text); break; - case UTF8_GOT_CONTINUATION: + case UTF8_GOT_CONTINUATION_BIT_POS_: COMMON_DEFAULT_REJECTS(,); message = form( "%s: %s (unexpected continuation byte 0x%02x," " with no preceding start byte)", malformed_text, - _byte_dump_string(s0, 1, 0), + byte_dump_string_(s0, 1, 0), *s0); break; - case UTF8_GOT_SHORT: + case UTF8_GOT_SHORT_BIT_POS_: COMMON_DEFAULT_REJECTS(,); message = form( "%s: %s (too short; %d byte%s available, need %d)", malformed_text, - _byte_dump_string(s0, avail_len, 0), + byte_dump_string_(s0, avail_len, 0), (int)avail_len, avail_len == 1 ? "" : "s", /* Pluralize */ (int)expectlen); break; - case UTF8_GOT_NON_CONTINUATION: + case UTF8_GOT_NON_CONTINUATION_BIT_POS_: { COMMON_DEFAULT_REJECTS(,); @@ -2306,8 +2320,8 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * break; } - case UTF8_GOT_LONG: - case UTF8_GOT_LONG_WITH_VALUE: + case UTF8_GOT_LONG_BIT_POS_: + case UTF8_GOT_LONG_WITH_VALUE_BIT_POS_: COMMON_DEFAULT_REJECTS(,); /* These error types cause 'input_uv' to be something that @@ -2315,13 +2329,16 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * * The other error types either can't generate an overlong, or * else the 'input_uv' is valid */ if (orig_problems & (UTF8_GOT_TOO_SHORT|UTF8_GOT_OVERFLOW)) { - message = Perl_form(aTHX_ + message = form( "%s: %s (any UTF-8 sequence that starts with" " \"%s\" is overlong which can and should be" " represented with a different, shorter sequence)", malformed_text, - _byte_dump_string(s0, send - s0, 0), - _byte_dump_string(s0, curlen, 0)); + byte_dump_string_(s0, curlen, 0), + byte_dump_string_(s0, + MIN((SSize_t) avail_len, + overlong_detect_length), + 0)); } else { U8 tmpbuf[UTF8_MAXBYTES+1]; @@ -2337,12 +2354,12 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * ) ? "0x" : "U+"; - message = Perl_form(aTHX_ + message = form( "%s: %s (overlong; instead use %s to represent" " %s%0*" UVXf ")", malformed_text, - _byte_dump_string(s0, avail_len, 0), - _byte_dump_string(tmpbuf, e - tmpbuf, 0), + byte_dump_string_(s0, avail_len, 0), + byte_dump_string_(tmpbuf, e - tmpbuf, 0), preface, ((input_uv < 256) ? 2 : 4), /* Field width of 2 for small code @@ -2380,33 +2397,39 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * continue; \ } - case UTF8_GOT_SURROGATE: + case UTF8_GOT_SURROGATE_BIT_POS_: COMMON_DEFAULT_ACCEPTEDS(UTF8_WARN_SURROGATE, WARN_SURROGATE,,); /* This is the only error that can occur with a surrogate when * the 'input_uv' isn't valid */ if (orig_problems & UTF8_GOT_TOO_SHORT) { - message = Perl_form(aTHX_ + message = form( "UTF-16 surrogate (any UTF-8 sequence that" " starts with \"%s\" is for a surrogate)", - _byte_dump_string(s0, curlen, 0)); + byte_dump_string_(s0, curlen, 0)); } else { - message = Perl_form(aTHX_ surrogate_cp_format, input_uv); + message = form(surrogate_cp_format, input_uv); } break; - case UTF8_GOT_NONCHAR: + case UTF8_GOT_NONCHAR_BIT_POS_: COMMON_DEFAULT_ACCEPTEDS(UTF8_WARN_NONCHAR, WARN_NONCHAR,,); /* The code above should have guaranteed that we don't get here * with conditions other than these */ +#ifndef EBCDIC + /* But it turns out it can get here with a too-short + * malformation on EBCDIC. This was discovered so close to + * 5.44, that this temporary solution was made, so as to avoid + * any possible effect on any ASCII platform. GH #24481 */ assert (! (orig_problems & ~( UTF8_GOT_LONG |UTF8_GOT_LONG_WITH_VALUE |UTF8_GOT_PERL_EXTENDED |UTF8_GOT_NONCHAR))); +#endif message = form(nonchar_cp_format, input_uv); break; @@ -2430,13 +2453,13 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * bool overflows; bool is_extended; - case UTF8_GOT_OVERFLOW: + case UTF8_GOT_OVERFLOW_BIT_POS_: COMMON_DEFAULT_REJECTS(ckWARN_d, WARN_NON_UNICODE); overflows = true; is_extended = true; goto super_common; - case UTF8_GOT_PERL_EXTENDED: + case UTF8_GOT_PERL_EXTENDED_BIT_POS_: COMMON_DEFAULT_ACCEPTEDS(UTF8_WARN_PERL_EXTENDED, WARN_NON_UNICODE, ckWARN_d, WARN_PORTABLE); @@ -2444,7 +2467,7 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * is_extended = true; goto super_common; - case UTF8_GOT_SUPER: + case UTF8_GOT_SUPER_BIT_POS_: COMMON_DEFAULT_ACCEPTEDS(UTF8_WARN_SUPER, WARN_NON_UNICODE,,); overflows = orig_problems & UTF8_GOT_OVERFLOW; is_extended = UTF8_IS_PERL_EXTENDED(s0); @@ -2478,34 +2501,34 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * * have this situation. */ if (overflows) { - message = Perl_form(aTHX_ "%s: %s (overflows)", + message = form("%s: %s (overflows)", malformed_text, - _byte_dump_string(s0, curlen, 0)); + byte_dump_string_(s0, curlen, 0)); } else if ( (orig_problems & UTF8_GOT_TOO_SHORT) || ( UTF8_IS_PERL_EXTENDED(s0) && ! UNICODE_IS_SUPER(input_uv))) { if (is_extended) { - message = Perl_form(aTHX_ + message = form( "Any UTF-8 sequence that starts with" " \"%s\" is a Perl extension, and so" " is not portable", - _byte_dump_string(s0, curlen, 0)); + byte_dump_string_(s0, curlen, 0)); } else { - message = Perl_form(aTHX_ + message = form( "Any UTF-8 sequence that starts with" " \"%s\" is for a non-Unicode code" " point, may not be portable", - _byte_dump_string(s0, curlen, 0)); + byte_dump_string_(s0, curlen, 0)); } } else if (is_extended) { - message = Perl_form(aTHX_ PL_extended_cp_format, input_uv); + message = form(PL_extended_cp_format, input_uv); } else { - message = Perl_form(aTHX_ super_cp_format, input_uv); + message = form(super_cp_format, input_uv); } /* This message only needs to output once. Ww can potentially @@ -2592,6 +2615,7 @@ Perl_utf8_to_uv_msgs_helper_(const U8 * if (advance_p) { *advance_p = curlen; + ASSUME(inRANGE(*advance_p, 1, UTF8_MAXBYTES)); } *cp_p = UNI_TO_NATIVE(uv); @@ -2625,12 +2649,12 @@ and returns the number of valid characte STRLEN Perl_utf8_length(pTHX_ const U8 * const s0, const U8 * const e) { + PERL_ARGS_ASSERT_UTF8_LENGTH; + STRLEN continuations = 0; STRLEN len = 0; const U8 * s = s0; - PERL_ARGS_ASSERT_UTF8_LENGTH; - /* For EBCDIC and short strings, we count the characters. The boundary * was determined by eyeballing the output of Porting/bench.pl and * choosing a number where the continuations method gave better results (on @@ -2638,13 +2662,8 @@ Perl_utf8_length(pTHX_ const U8 * const * cachegrind). The number isn't critical, as at these sizes, the total * time spent isn't large either way */ -#ifndef EBCDIC - - if (e - s0 < 96) - -#endif - - { + const U8 * const per_byte_end = WORTH_PER_WORD_LOOP(s0, e, 12); + if (! per_byte_end) { while (s < e) { /* Count characters directly */ /* Take extra care to not exceed 'e' (which would be undefined @@ -2673,21 +2692,14 @@ Perl_utf8_length(pTHX_ const U8 * const return s - s0; } -#ifndef EBCDIC - /* Count continuations, word-at-a-time. * * We need to stop before the final start character in order to * preserve the limited error checking that's always been done */ const U8 * e_limit = e - UTF8_MAXBYTES; - /* Points to the first byte >=s which is positioned at a word boundary. If - * s is on a word boundary, it is s, otherwise it is to the next word. */ - const U8 * partial_word_end = s + PERL_WORDSIZE * PERL_IS_SUBWORD_ADDR(s) - - (PTR2nat(s) & PERL_WORD_BOUNDARY_MASK); - /* Process up to a full word boundary. */ - while (s < partial_word_end) { + while (s < per_byte_end ) { const Size_t skip = UTF8SKIP(s); continuations += skip - 1; @@ -2695,8 +2707,8 @@ Perl_utf8_length(pTHX_ const U8 * const } /* Adjust back down any overshoot */ - continuations -= s - partial_word_end; - s = partial_word_end; + continuations -= s - per_byte_end; + s = per_byte_end; do { /* Process per-word */ @@ -2745,8 +2757,6 @@ Perl_utf8_length(pTHX_ const U8 * const break; } -# endif - if (LIKELY(e == s)) { return s - s0 - continuations; } @@ -2777,11 +2787,11 @@ within the strings. int Perl_bytes_cmp_utf8(pTHX_ const U8 *b, STRLEN blen, const U8 *u, STRLEN ulen) { + PERL_ARGS_ASSERT_BYTES_CMP_UTF8; + const U8 *const bend = b + blen; const U8 *const uend = u + ulen; - PERL_ARGS_ASSERT_BYTES_CMP_UTF8; - while (b < bend && u < uend) { U8 c = *u++; if (!UTF8_IS_INVARIANT(c)) { @@ -3017,15 +3027,11 @@ Perl_utf8_to_bytes_(pTHX_ U8 **s_ptr, ST Size_t invariant_length = first_variant - s0; Size_t variant_count = 0; -#ifndef EBCDIC /* The below relies on the bit patterns of UTF-8 */ - - /* Do a first pass through the string to see if it actually is translatable - * into bytes, and if so, how big the result is. On long strings this is - * done a word at a time, so is relatively quick. (There is some - * start-up/tear-down overhead with the per-word algorithm, so no real gain + /* There is some start-up/tear-down overhead with this, so no real gain * unless the remaining portion of the string is long enough. The current - * value is just a guess.) On EBCDIC, it's always per-byte. */ - if ((send - s) > (ptrdiff_t) (5 * PERL_WORDSIZE)) { + * value is just a guess. */ + U8 * const per_byte_end = WORTH_PER_WORD_LOOP(s, send, 5); + if (per_byte_end) { /* If the string contains any start byte besides C2 and C3, then it * isn't translatable into bytes */ @@ -3034,15 +3040,7 @@ Perl_utf8_to_bytes_(pTHX_ U8 **s_ptr, ST const PERL_UINTMAX_T C2_mask = PERL_COUNT_MULTIPLIER * 0xC2; const PERL_UINTMAX_T FE_mask = PERL_COUNT_MULTIPLIER * 0xFE; - /* Points to the first byte >=s which is positioned at a word boundary. - * If s is on a word boundary, it is s, otherwise it is the first byte - * of the next word. */ - U8 * partial_word_end = s + PERL_WORDSIZE * PERL_IS_SUBWORD_ADDR(s) - - (PTR2nat(s) & PERL_WORD_BOUNDARY_MASK); - - /* Here there is at least a full word beyond the first word boundary. - * Process up to that boundary. */ - while (s < partial_word_end) { + while (s < per_byte_end ) { if (! UTF8_IS_INVARIANT(*s)) { if (! UTF8_IS_NEXT_CHAR_DOWNGRADEABLE(s, send)) { return false; @@ -3056,7 +3054,7 @@ Perl_utf8_to_bytes_(pTHX_ U8 **s_ptr, ST } /* Adjust back down any overshoot */ - s = partial_word_end; + s = per_byte_end; /* Process per-word */ do { @@ -3119,8 +3117,7 @@ Perl_utf8_to_bytes_(pTHX_ U8 **s_ptr, ST } } -#endif - /* Do the straggler bytes beyond what the loop above did */ + /* Do the straggler bytes beyond the final word boundary */ while (s < send) { if (! UTF8_IS_INVARIANT(*s)) { if (! UTF8_IS_NEXT_CHAR_DOWNGRADEABLE(s, send)) { @@ -3421,12 +3418,12 @@ Perl_utf16_to_utf8_base(pTHX_ U8* p, U8* high order */ const bool low_byte) { + PERL_ARGS_ASSERT_UTF16_TO_UTF8_BASE; + U8* pend; U8* dstart = d; - PERL_ARGS_ASSERT_UTF16_TO_UTF8_BASE; - - if (bytelen & 1) + if (isODD(bytelen)) croak("panic: utf16_to_utf8%s: odd bytelen %" UVuf, ((high_byte == 0) ? "" : "_reversed"), (UV)bytelen); pend = p + bytelen; @@ -3479,22 +3476,6 @@ Perl_utf16_to_utf8_base(pTHX_ U8* p, U8* return d; } -U8* -Perl_utf16_to_utf8(pTHX_ U8* p, U8* d, Size_t bytelen, Size_t *newlen) -{ - PERL_ARGS_ASSERT_UTF16_TO_UTF8; - - return utf16_to_utf8(p, d, bytelen, newlen); -} - -U8* -Perl_utf16_to_utf8_reversed(pTHX_ U8* p, U8* d, Size_t bytelen, Size_t *newlen) -{ - PERL_ARGS_ASSERT_UTF16_TO_UTF8_REVERSED; - - return utf16_to_utf8_reversed(p, d, bytelen, newlen); -} - /* * Convert UTF-8 to native UTF-16. Called via the macros utf8_to_utf16() for * big-endian and utf8_to_utf16_reversed() for little-endian, @@ -3516,11 +3497,11 @@ Perl_utf8_to_utf16_base(pTHX_ U8* s, U8* is high order */ const bool low_byte) { + PERL_ARGS_ASSERT_UTF8_TO_UTF16_BASE; + U8* send; U8* dstart = d; - PERL_ARGS_ASSERT_UTF8_TO_UTF16_BASE; - send = s + bytelen; while (s < send) { @@ -3561,27 +3542,35 @@ Perl_utf8_to_utf16_base(pTHX_ U8* s, U8* } bool -Perl__is_uni_FOO(pTHX_ const U8 classnum, const UV c) +Perl_is_uni_FOO_(pTHX_ const U8 classnum, const UV c) { - return _invlist_contains_cp(PL_XPosix_ptrs[classnum], c); + PERL_ARGS_ASSERT_IS_UNI_FOO_; + + return invlist_contains_cp_(PL_XPosix_ptrs[classnum], c); } bool -Perl__is_uni_perl_idcont(pTHX_ UV c) +Perl_is_uni_perl_idcont_(pTHX_ UV c) { - return _invlist_contains_cp(PL_utf8_perl_idcont, c); + PERL_ARGS_ASSERT_IS_UNI_PERL_IDCONT_; + + return invlist_contains_cp_(PL_utf8_perl_idcont, c); } bool -Perl__is_uni_perl_idstart(pTHX_ UV c) +Perl_is_uni_perl_idstart_(pTHX_ UV c) { - return _invlist_contains_cp(PL_utf8_perl_idstart, c); + PERL_ARGS_ASSERT_IS_UNI_PERL_IDSTART_; + + return invlist_contains_cp_(PL_utf8_perl_idstart, c); } UV -Perl__to_upper_title_latin1(pTHX_ const U8 c, U8* p, STRLEN *lenp, +Perl_to_upper_title_latin1_(pTHX_ const U8 c, U8* p, STRLEN *lenp, const char S_or_s) { + PERL_ARGS_ASSERT_TO_UPPER_TITLE_LATIN1_; + /* We have the latin1-range values compiled into the core, so just use * those, converting the result to UTF-8. The only difference between upper * and title case in this range is that LATIN_SMALL_LETTER_SHARP_S is @@ -3590,8 +3579,6 @@ Perl__to_upper_title_latin1(pTHX_ const UV converted = toUPPER_LATIN1_MOD(c); - PERL_ARGS_ASSERT__TO_UPPER_TITLE_LATIN1; - assert(S_or_s == 'S' || S_or_s == 's'); if (UVCHR_IS_INVARIANT(converted)) { /* No difference between the two for @@ -3665,19 +3652,19 @@ Perl__to_upper_title_latin1(pTHX_ const * The functions return the ordinal of the first character in the string of * 'd' */ #define CALL_UPPER_CASE(uv, s, d, lenp) \ - _to_utf8_case(uv, s, d, lenp, PL_utf8_toupper, \ + to_utf8_case_(uv, s, d, lenp, PL_utf8_toupper, \ Uppercase_Mapping_invmap, \ UC_AUX_TABLE_ptrs, \ UC_AUX_TABLE_lengths, \ "uppercase") #define CALL_TITLE_CASE(uv, s, d, lenp) \ - _to_utf8_case(uv, s, d, lenp, PL_utf8_totitle, \ + to_utf8_case_(uv, s, d, lenp, PL_utf8_totitle, \ Titlecase_Mapping_invmap, \ TC_AUX_TABLE_ptrs, \ TC_AUX_TABLE_lengths, \ "titlecase") #define CALL_LOWER_CASE(uv, s, d, lenp) \ - _to_utf8_case(uv, s, d, lenp, PL_utf8_tolower, \ + to_utf8_case_(uv, s, d, lenp, PL_utf8_tolower, \ Lowercase_Mapping_invmap, \ LC_AUX_TABLE_ptrs, \ LC_AUX_TABLE_lengths, \ @@ -3689,12 +3676,12 @@ Perl__to_upper_title_latin1(pTHX_ const * folding); otherwise, when zero, this implies a simple case fold */ #define CALL_FOLD_CASE(uv, s, d, lenp, specials) \ (specials) \ - ? _to_utf8_case(uv, s, d, lenp, PL_utf8_tofold, \ + ? to_utf8_case_(uv, s, d, lenp, PL_utf8_tofold, \ Case_Folding_invmap, \ CF_AUX_TABLE_ptrs, \ CF_AUX_TABLE_lengths, \ "foldcase") \ - : _to_utf8_case(uv, s, d, lenp, PL_utf8_tosimplefold, \ + : to_utf8_case_(uv, s, d, lenp, PL_utf8_tosimplefold, \ Simple_Case_Folding_invmap, \ NULL, NULL, \ "foldcase") @@ -3702,6 +3689,8 @@ Perl__to_upper_title_latin1(pTHX_ const UV Perl_to_uni_upper(pTHX_ UV c, U8* p, STRLEN *lenp) { + PERL_ARGS_ASSERT_TO_UNI_UPPER; + /* Convert the Unicode character whose ordinal is to its uppercase * version and store that in UTF-8 in

and its length in bytes in . * Note that the

needs to be at least UTF8_MAXBYTES_CASE+1 bytes since @@ -3710,10 +3699,8 @@ Perl_to_uni_upper(pTHX_ UV c, U8* p, STR * The ordinal of the first character of the changed version is returned * (but note, as explained above, that there may be more.) */ - PERL_ARGS_ASSERT_TO_UNI_UPPER; - if (c < 256) { - return _to_upper_title_latin1((U8) c, p, lenp, 'S'); + return to_upper_title_latin1_((U8) c, p, lenp, 'S'); } return CALL_UPPER_CASE(c, NULL, p, lenp); @@ -3725,15 +3712,17 @@ Perl_to_uni_title(pTHX_ UV c, U8* p, STR PERL_ARGS_ASSERT_TO_UNI_TITLE; if (c < 256) { - return _to_upper_title_latin1((U8) c, p, lenp, 's'); + return to_upper_title_latin1_((U8) c, p, lenp, 's'); } return CALL_TITLE_CASE(c, NULL, p, lenp); } -STATIC U8 +static U8 S_to_lower_latin1(const U8 c, U8* p, STRLEN *lenp, const char dummy) { + PERL_ARGS_ASSERT_TO_LOWER_LATIN1; + /* We have the latin1-range values compiled into the core, so just use * those, converting the result to UTF-8. Since the result is always just * one character, we allow

to be NULL */ @@ -3771,8 +3760,10 @@ Perl_to_uni_lower(pTHX_ UV c, U8* p, STR } UV -Perl__to_fold_latin1(const U8 c, U8* p, STRLEN *lenp, const unsigned int flags) +Perl_to_fold_latin1_(const U8 c, U8* p, STRLEN *lenp, const unsigned int flags) { + PERL_ARGS_ASSERT_TO_FOLD_LATIN1_; + /* Corresponds to to_lower_latin1(); bits meanings: * FOLD_FLAGS_NOMIX_ASCII iff non-ASCII to ASCII folds are prohibited * FOLD_FLAGS_FULL iff full folding is to be used; @@ -3782,8 +3773,6 @@ Perl__to_fold_latin1(const U8 c, U8* p, UV converted; - PERL_ARGS_ASSERT__TO_FOLD_LATIN1; - assert (! (flags & FOLD_FLAGS_LOCALE)); if (UNLIKELY(c == MICRO_SIGN)) { @@ -3831,8 +3820,9 @@ Perl__to_fold_latin1(const U8 c, U8* p, } UV -Perl__to_uni_fold_flags(pTHX_ UV c, U8* p, STRLEN *lenp, U8 flags) +Perl_to_uni_fold_flags_(pTHX_ UV c, U8* p, STRLEN *lenp, U8 flags) { + PERL_ARGS_ASSERT_TO_UNI_FOLD_FLAGS_; /* Not currently externally documented, and subject to change * bits meanings: @@ -3842,8 +3832,6 @@ Perl__to_uni_fold_flags(pTHX_ UV c, U8* * FOLD_FLAGS_NOMIX_ASCII iff non-ASCII to ASCII folds are prohibited */ - PERL_ARGS_ASSERT__TO_UNI_FOLD_FLAGS; - if (flags & FOLD_FLAGS_LOCALE) { /* Treat a non-Turkic UTF-8 locale as not being in locale at all, * except for potentially warning */ @@ -3857,7 +3845,7 @@ Perl__to_uni_fold_flags(pTHX_ UV c, U8* } if (c < 256) { - return _to_fold_latin1((U8) c, p, lenp, + return to_fold_latin1_((U8) c, p, lenp, flags & (FOLD_FLAGS_FULL | FOLD_FLAGS_NOMIX_ASCII)); } @@ -3865,13 +3853,13 @@ Perl__to_uni_fold_flags(pTHX_ UV c, U8* if ( ! (flags & (FOLD_FLAGS_LOCALE|FOLD_FLAGS_NOMIX_ASCII))) { return CALL_FOLD_CASE(c, NULL, p, lenp, flags & FOLD_FLAGS_FULL); } - else { /* Otherwise, _toFOLD_utf8_flags has the intelligence to deal with + else { /* Otherwise, toFOLD_utf8_flags_ has the intelligence to deal with the special flags. */ U8 utf8_c[UTF8_MAXBYTES + 1]; needs_full_generality: uv_to_utf8(utf8_c, c); - return _toFOLD_utf8_flags(utf8_c, utf8_c + C_ARRAY_LENGTH(utf8_c), + return toFOLD_utf8_flags_(utf8_c, utf8_c + C_ARRAY_LENGTH(utf8_c), p, lenp, flags); } } @@ -3879,7 +3867,7 @@ Perl__to_uni_fold_flags(pTHX_ UV c, U8* #if 0 /* Not currently used, but may be needed in the future */ PERLVAR(I, seen_deprecated_macro, HV *) -STATIC void +static void S_warn_on_first_deprecated_use(pTHX_ U32 category, const char * const name, const char * const alternative, @@ -3887,10 +3875,10 @@ S_warn_on_first_deprecated_use(pTHX_ U32 const char * const file, const unsigned line) { - const char * key; - PERL_ARGS_ASSERT_WARN_ON_FIRST_DEPRECATED_USE; + const char * key; + if (ckWARN_d(category)) { key = form("%s;%d;%s;%d", name, use_locale, file, line); @@ -3923,37 +3911,45 @@ S_warn_on_first_deprecated_use(pTHX_ U32 } #endif -/* returns a boolean giving whether or not the UTF8-encoded character that - * starts at

, and extending no further than is in the inversion - * list . */ -#define IS_UTF8_IN_INVLIST(p, e, invlist) \ - _invlist_contains_cp(invlist, utf8_to_uv_or_die(p, e, NULL)) +/* returns the number of bytes comprising the UTF8-encoded character that + * starts at

, and extending no further than if it is in the + * inversion list ; or 0 if it isn't */ +static Size_t +S_is_utf8_in_invlist(pTHX_ const U8 * p, const U8 * e, SV * const invlist) +{ + Size_t advance; + if (invlist_contains_cp_(invlist, utf8_to_uv_or_die(p, e, &advance))) { + return advance; + } -bool -Perl__is_utf8_FOO(pTHX_ const U8 classnum, const U8 *p, const U8 * const e) + return 0; +} + +Size_t +Perl_is_utf8_FOO_(pTHX_ const U8 classnum, const U8 *p, const U8 * const e) { - PERL_ARGS_ASSERT__IS_UTF8_FOO; + PERL_ARGS_ASSERT_IS_UTF8_FOO_; - return IS_UTF8_IN_INVLIST(p, e, PL_XPosix_ptrs[classnum]); + return S_is_utf8_in_invlist(aTHX_ p, e, PL_XPosix_ptrs[classnum]); } -bool -Perl__is_utf8_perl_idstart(pTHX_ const U8 *p, const U8 * const e) +Size_t +Perl_is_utf8_perl_idstart_(pTHX_ const U8 *p, const U8 * const e) { - PERL_ARGS_ASSERT__IS_UTF8_PERL_IDSTART; + PERL_ARGS_ASSERT_IS_UTF8_PERL_IDSTART_; - return IS_UTF8_IN_INVLIST(p, e, PL_utf8_perl_idstart); + return S_is_utf8_in_invlist(aTHX_ p, e, PL_utf8_perl_idstart); } -bool -Perl__is_utf8_perl_idcont(pTHX_ const U8 *p, const U8 * const e) +Size_t +Perl_is_utf8_perl_idcont_(pTHX_ const U8 *p, const U8 * const e) { - PERL_ARGS_ASSERT__IS_UTF8_PERL_IDCONT; + PERL_ARGS_ASSERT_IS_UTF8_PERL_IDCONT_; - return IS_UTF8_IN_INVLIST(p, e, PL_utf8_perl_idcont); + return S_is_utf8_in_invlist(aTHX_ p, e, PL_utf8_perl_idcont); } -STATIC UV +static UV S_to_case_cp_list(pTHX_ const UV original, const U32 ** const remaining_list, @@ -3963,6 +3959,8 @@ S_to_case_cp_list(pTHX_ const U8 * const aux_table_lengths, const char * const normal) { + PERL_ARGS_ASSERT_TO_CASE_CP_LIST; + SSize_t index; I32 base; @@ -3985,11 +3983,9 @@ S_to_case_cp_list(pTHX_ * arguments. */ - PERL_ARGS_ASSERT_TO_CASE_CP_LIST; - /* 'index' is guaranteed to be non-negative, as this is an inversion map * that covers all possible inputs. See [perl #133365] */ - index = _invlist_search(invlist, original); + index = invlist_search_(invlist, original); base = invmap[index]; /* Most likely, the case change will contain just a single code point */ @@ -4050,14 +4046,16 @@ S_to_case_cp_list(pTHX_ return (UV) aux_tables[base][0]; } -STATIC UV -S__to_utf8_case(pTHX_ const UV original, const U8 *p, +static UV +S_to_utf8_case_(pTHX_ const UV original, const U8 *p, U8* ustrp, STRLEN *lenp, SV *invlist, const I32 * const invmap, const U32 * const * const aux_tables, const U8 * const aux_table_lengths, const char * const normal) { + PERL_ARGS_ASSERT_TO_UTF8_CASE_; + /* Change the case of code point 'original'. If 'p' is non-NULL, it points to * the beginning of the (assumed to be valid) UTF-8 representation of * 'original'. 'normal' is a string to use to name the new case in any @@ -4080,8 +4078,6 @@ S__to_utf8_case(pTHX_ const UV original, aux_tables, aux_table_lengths, normal); - PERL_ARGS_ASSERT__TO_UTF8_CASE; - /* If the code point maps to itself and we already have its representation, * copy it instead of recalculating */ if (original == first && p) { @@ -4109,9 +4105,11 @@ S__to_utf8_case(pTHX_ const UV original, } Size_t -Perl__inverse_folds(pTHX_ const UV cp, U32 * first_folds_to, +Perl_inverse_folds_(pTHX_ const UV cp, U32 * first_folds_to, const U32 ** remaining_folds_to) { + PERL_ARGS_ASSERT_INVERSE_FOLDS_; + /* Returns the count of the number of code points that fold to the input * 'cp' (besides itself). * @@ -4136,12 +4134,11 @@ Perl__inverse_folds(pTHX_ const UV cp, U * pointers, so they must be this size */ /* 'index' is guaranteed to be non-negative, as this is an inversion map - * that covers all possible inputs. See [perl #133365] */ - SSize_t index = _invlist_search(PL_utf8_foldclosures, cp); + * that covers all possible inputs. See [GH #16624] */ + SSize_t index = invlist_search_(PL_utf8_foldclosures, cp); + assert(index >= 0); I32 base = _Perl_IVCF_invmap[index]; - PERL_ARGS_ASSERT__INVERSE_FOLDS; - if (base == 0) { /* No fold */ *first_folds_to = 0; *remaining_folds_to = NULL; @@ -4176,10 +4173,12 @@ Perl__inverse_folds(pTHX_ const UV cp, U return 1; } -STATIC UV +static UV S_check_locale_boundary_crossing(pTHX_ const U8* const p, const UV result, U8* const ustrp, STRLEN *lenp) { + PERL_ARGS_ASSERT_CHECK_LOCALE_BOUNDARY_CROSSING; + /* This is called when changing the case of a UTF-8-encoded character above * the Latin1 range, and the operation is in a non-UTF-8 locale. If the * result contains a character that crosses the 255/256 boundary, disallow @@ -4195,8 +4194,6 @@ S_check_locale_boundary_crossing(pTHX_ c UV original; /* To store the first code point of

*/ - PERL_ARGS_ASSERT_CHECK_LOCALE_BOUNDARY_CROSSING; - assert(UTF8_IS_ABOVE_LATIN1(*p)); /* We know immediately if the first character in the string crosses the @@ -4222,7 +4219,7 @@ S_check_locale_boundary_crossing(pTHX_ c bad_crossing: /* Failed, have to return the original */ - original = valid_utf8_to_uvchr(p, lenp); + original = valid_utf8_to_uv(p, lenp); /* diag_listed_as: Can't do %s("%s") on non-UTF-8 locale; resolved to "%s". */ ck_warner(packWARN(WARN_LOCALE), @@ -4233,10 +4230,12 @@ S_check_locale_boundary_crossing(pTHX_ c return original; } -STATIC UV +static UV S_turkic_fc(pTHX_ const U8 * const p, const U8 * const e, U8 * ustrp, STRLEN *lenp) { + PERL_ARGS_ASSERT_TURKIC_FC; + /* Returns 0 if the foldcase of the input UTF-8 encoded sequence from * p0..e-1 according to Turkic rules is the same as for non-Turkic. * Otherwise, it returns the first code point of the Turkic foldcased @@ -4247,9 +4246,6 @@ S_turkic_fc(pTHX_ const U8 * const p, co * I WITH DOT ABOVE form a case pair, as do 'I' and LATIN SMALL LETTER * DOTLESS I */ - PERL_ARGS_ASSERT_TURKIC_FC; - assert(e > p); - if (UNLIKELY(*p == 'I')) { *lenp = 2; ustrp[0] = UTF8_TWO_BYTE_HI(LATIN_SMALL_LETTER_DOTLESS_I); @@ -4268,19 +4264,18 @@ S_turkic_fc(pTHX_ const U8 * const p, co return 0; } -STATIC UV +static UV S_turkic_lc(pTHX_ const U8 * const p0, const U8 * const e, U8 * ustrp, STRLEN *lenp) { + PERL_ARGS_ASSERT_TURKIC_LC; + /* Returns 0 if the lowercase of the input UTF-8 encoded sequence from * p0..e-1 according to Turkic rules is the same as for non-Turkic. * Otherwise, it returns the first code point of the Turkic lowercased * sequence, and the entire sequence will be stored in *ustrp. ustrp will * contain *lenp bytes */ - PERL_ARGS_ASSERT_TURKIC_LC; - assert(e > p0); - /* A 'I' requires context as to what to do */ if (UNLIKELY(*p0 == 'I')) { const U8 * p = p0 + 1; @@ -4299,13 +4294,14 @@ S_turkic_lc(pTHX_ const U8 * const p0, c /* For the dot above to modify the 'I', it must be part of a * combining sequence immediately following the 'I', and no other * modifier with a ccc of 230 may intervene */ - cp = utf8_to_uv_or_die(p, e, NULL); - if (! _invlist_contains_cp(PL_CCC_non0_non230, cp)) { + Size_t advance; + cp = utf8_to_uv_or_die(p, e, &advance); + if (! invlist_contains_cp_(PL_CCC_non0_non230, cp)) { break; } /* Here the combining sequence continues */ - p += UTF8SKIP(p); + p += advance; } } @@ -4313,10 +4309,12 @@ S_turkic_lc(pTHX_ const U8 * const p0, c return turkic_fc(p0, e, ustrp, lenp); } -STATIC UV +static UV S_turkic_uc(pTHX_ const U8 * const p, const U8 * const e, U8 * ustrp, STRLEN *lenp) { + PERL_ARGS_ASSERT_TURKIC_UC; + /* Returns 0 if the upper or title-case of the input UTF-8 encoded sequence * from p0..e-1 according to Turkic rules is the same as for non-Turkic. * Otherwise, it returns the first code point of the Turkic upper or @@ -4327,9 +4325,6 @@ S_turkic_uc(pTHX_ const U8 * const p, co * I WITH DOT ABOVE form a case pair, as do 'I' and LATIN SMALL LETTER * DOTLESS I */ - PERL_ARGS_ASSERT_TURKIC_UC; - assert(e > p); - if (*p == 'i') { *lenp = 2; ustrp[0] = UTF8_TWO_BYTE_HI(LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE); @@ -4441,19 +4436,19 @@ S_turkic_uc(pTHX_ const U8 * const p, co * be used. */ UV -Perl__to_utf8_upper_flags(pTHX_ const U8 *p, +Perl_to_utf8_upper_flags_(pTHX_ const U8 *p, const U8 *e, U8* ustrp, STRLEN *lenp, bool flags) { - UV result; + PERL_ARGS_ASSERT_TO_UTF8_UPPER_FLAGS_; - PERL_ARGS_ASSERT__TO_UTF8_UPPER_FLAGS; + UV result; /* ~0 makes anything non-zero in 'flags' mean we are using locale rules */ /* 2nd char of uc(U+DF) is 'S' */ - CASE_CHANGE_BODY_START(~0, toupper, _to_upper_title_latin1, 'S', + CASE_CHANGE_BODY_START(~0, toupper, to_upper_title_latin1_, 'S', turkic_uc); CASE_CHANGE_BODY_END (~0, CALL_UPPER_CASE); } @@ -4465,18 +4460,18 @@ Perl__to_utf8_upper_flags(pTHX_ const U8 */ UV -Perl__to_utf8_title_flags(pTHX_ const U8 *p, +Perl_to_utf8_title_flags_(pTHX_ const U8 *p, const U8 *e, U8* ustrp, STRLEN *lenp, bool flags) { - UV result; + PERL_ARGS_ASSERT_TO_UTF8_TITLE_FLAGS_; - PERL_ARGS_ASSERT__TO_UTF8_TITLE_FLAGS; + UV result; /* 2nd char of ucfirst(U+DF) is 's' */ - CASE_CHANGE_BODY_START(~0, toupper, _to_upper_title_latin1, 's', + CASE_CHANGE_BODY_START(~0, toupper, to_upper_title_latin1_, 's', turkic_uc); CASE_CHANGE_BODY_END (~0, CALL_TITLE_CASE); } @@ -4487,15 +4482,15 @@ Perl__to_utf8_title_flags(pTHX_ const U8 */ UV -Perl__to_utf8_lower_flags(pTHX_ const U8 *p, +Perl_to_utf8_lower_flags_(pTHX_ const U8 *p, const U8 *e, U8* ustrp, STRLEN *lenp, bool flags) { - UV result; + PERL_ARGS_ASSERT_TO_UTF8_LOWER_FLAGS_; - PERL_ARGS_ASSERT__TO_UTF8_LOWER_FLAGS; + UV result; CASE_CHANGE_BODY_START(~0, tolower, to_lower_latin1, 0 /* 0 is dummy */, turkic_lc); @@ -4513,22 +4508,22 @@ Perl__to_utf8_lower_flags(pTHX_ const U8 */ UV -Perl__to_utf8_fold_flags(pTHX_ const U8 *p, +Perl_to_utf8_fold_flags_(pTHX_ const U8 *p, const U8 *e, U8* ustrp, STRLEN *lenp, U8 flags) { - UV result; + PERL_ARGS_ASSERT_TO_UTF8_FOLD_FLAGS_; - PERL_ARGS_ASSERT__TO_UTF8_FOLD_FLAGS; + UV result; /* These are mutually exclusive */ assert (! ((flags & FOLD_FLAGS_LOCALE) && (flags & FOLD_FLAGS_NOMIX_ASCII))); assert(p != ustrp); /* Otherwise overwrites */ - CASE_CHANGE_BODY_START(FOLD_FLAGS_LOCALE, tolower, _to_fold_latin1, + CASE_CHANGE_BODY_START(FOLD_FLAGS_LOCALE, tolower, to_fold_latin1_, ((flags) & (FOLD_FLAGS_FULL | FOLD_FLAGS_NOMIX_ASCII)), turkic_fc); @@ -4599,7 +4594,7 @@ Perl__to_utf8_fold_flags(pTHX_ const U8 while (s < send) { if (isASCII(*s)) { /* Crossed, have to return the original */ - original = valid_utf8_to_uvchr(p, lenp); + original = valid_utf8_to_uv(p, lenp); /* But in these instances, there is an alternative we can * return that is valid */ @@ -4681,6 +4676,8 @@ Perl__to_utf8_fold_flags(pTHX_ const U8 bool Perl_check_utf8_print(pTHX_ const U8* s, const STRLEN len) { + PERL_ARGS_ASSERT_CHECK_UTF8_PRINT; + /* May change: warns if surrogates, non-character code points, or * non-Unicode code points are in 's' which has length 'len' bytes. * Returns TRUE if none found; FALSE otherwise. The only other validity @@ -4690,8 +4687,6 @@ Perl_check_utf8_print(pTHX_ const U8* s, const U8* const e = s + len; bool ok = TRUE; - PERL_ARGS_ASSERT_CHECK_UTF8_PRINT; - while (s < e) { if (UTF8SKIP(s) > len) { ck_warner_d(packWARN(WARN_UTF8), @@ -4740,6 +4735,12 @@ Perl_check_utf8_print(pTHX_ const U8* s, /* =for apidoc pv_uni_display +=for apidoc_flag UNI_DISPLAY_BACKSLASH +=for apidoc_flag UNI_DISPLAY_BACKSPACE +=for apidoc_flag UNI_DISPLAY_ISPRINT +=for apidoc_flag UNI_DISPLAY_QQ +=for apidoc_flag UNI_DISPLAY_REGEX +=for apidoc_flag C|UNI_DISPLAY_TR Build to the scalar C a displayable version of the UTF-8 encoded string C, length C, the displayable version being at most C bytes @@ -4780,13 +4781,18 @@ The pointer to the PV of the C is r See also L. -=for apidoc Amnh||UNI_DISPLAY_BACKSLASH -=for apidoc Amnh||UNI_DISPLAY_BACKSPACE -=for apidoc Amnh||UNI_DISPLAY_ISPRINT -=for apidoc Amnh||UNI_DISPLAY_QQ -=for apidoc Amnh||UNI_DISPLAY_REGEX + +=for apidoc Cmn||UNI_DISPLAY_TR + +This is an extra flag for L which is for internal use +only. It displays an operand of the tr/// operation. These operands have a +peculiar, deliberate UTF-8 malformation which this flag enables the proper +handling of. It turns on ISPRINT and BACKSLASH as well. + =cut + */ + char * Perl_pv_uni_display(pTHX_ SV *dsv, const U8 *spv, STRLEN len, STRLEN pvlim, UV flags) @@ -4808,6 +4814,14 @@ Perl_pv_uni_display(pTHX_ SV *dsv, const break; } + /* The minus is unambiguously the range indicator within a UTF-8 tr/// + * operand */ + if (UNLIKELY(flags & UNI_DISPLAY_TR_ && *s == ILLEGAL_UTF8_BYTE)) { + sv_catpvs(dsv, "-"); + next_len = 1; + continue; + } + (void) utf8_to_uv(s, e, &u, &next_len); assert(next_len > 0); @@ -4844,7 +4858,13 @@ Perl_pv_uni_display(pTHX_ SV *dsv, const } /* -=for apidoc sv_uni_display +=for apidoc sv_uni_display +=for apidoc_flag UNI_DISPLAY_BACKSLASH +=for apidoc_flag UNI_DISPLAY_BACKSPACE +=for apidoc_flag UNI_DISPLAY_ISPRINT +=for apidoc_flag UNI_DISPLAY_QQ +=for apidoc_flag UNI_DISPLAY_REGEX +=for apidoc_flag C|UNI_DISPLAY_TR Build to the scalar C a displayable version of the scalar C, the displayable version being at most C bytes long @@ -4859,17 +4879,22 @@ The pointer to the PV of the C is r char * Perl_sv_uni_display(pTHX_ SV *dsv, SV *ssv, STRLEN pvlim, UV flags) { + PERL_ARGS_ASSERT_SV_UNI_DISPLAY; + const char * const ptr = isREGEXP(ssv) ? RX_WRAPPED((REGEXP*)ssv) : SvPVX_const(ssv); - PERL_ARGS_ASSERT_SV_UNI_DISPLAY; - - return Perl_pv_uni_display(aTHX_ dsv, (const U8*)ptr, - SvCUR(ssv), pvlim, flags); + return pv_uni_display(dsv, (const U8*)ptr, SvCUR(ssv), pvlim, flags); } /* -=for apidoc foldEQ_utf8 +=for apidoc foldEQ_utf8 +=for apidoc_flag C|FOLDEQ_UTF8_NOMIX_ASCII +=for apidoc_flag C|FOLDEQ_LOCALE +=for apidoc_flag C|FOLDEQ_S1_ALREADY_FOLDED +=for apidoc_flag C|FOLDEQ_S1_FOLDS_SANE +=for apidoc_flag C|FOLDEQ_S2_ALREADY_FOLDED +=for apidoc_flag C|FOLDEQ_S2_FOLDS_SANE Returns true if the leading portions of the strings C and C (either or both of which may be in UTF-8) are the same case-insensitively; false @@ -4910,13 +4935,6 @@ For case-insensitiveness, the "casefoldi instead of upper/lowercasing both the characters, see L (Case Mappings). -=for apidoc Cmnh||FOLDEQ_UTF8_NOMIX_ASCII -=for apidoc Cmnh||FOLDEQ_LOCALE -=for apidoc Cmnh||FOLDEQ_S1_ALREADY_FOLDED -=for apidoc Cmnh||FOLDEQ_S1_FOLDS_SANE -=for apidoc Cmnh||FOLDEQ_S2_ALREADY_FOLDED -=for apidoc Cmnh||FOLDEQ_S2_FOLDS_SANE - =cut */ /* A flags parameter has been added which may change, and hence isn't @@ -4952,6 +4970,8 @@ Perl_foldEQ_utf8_flags(pTHX_ const char const char *s2, char **pe2, UV l2, bool u2, U32 flags) { + PERL_ARGS_ASSERT_FOLDEQ_UTF8_FLAGS; + const U8 *p1 = (const U8*)s1; /* Point to current char */ const U8 *p2 = (const U8*)s2; const U8 *g1 = NULL; /* goal for s1 */ @@ -4965,8 +4985,6 @@ Perl_foldEQ_utf8_flags(pTHX_ const char U8 foldbuf2[UTF8_MAXBYTES_CASE+1]; U8 flags_for_folder = FOLD_FLAGS_FULL; - PERL_ARGS_ASSERT_FOLDEQ_UTF8_FLAGS; - assert( ! ( (flags & (FOLDEQ_UTF8_NOMIX_ASCII | FOLDEQ_LOCALE)) && (( (flags & FOLDEQ_S1_ALREADY_FOLDED) && !(flags & FOLDEQ_S1_FOLDS_SANE)) @@ -5072,10 +5090,10 @@ Perl_foldEQ_utf8_flags(pTHX_ const char *foldbuf1 = toFOLD(*p1); } else if (u1) { - _toFOLD_utf8_flags(p1, e1, foldbuf1, &n1, flags_for_folder); + toFOLD_utf8_flags_(p1, e1, foldbuf1, &n1, flags_for_folder); } else { /* Not UTF-8, get UTF-8 fold */ - _to_uni_fold_flags(*p1, foldbuf1, &n1, flags_for_folder); + to_uni_fold_flags_(*p1, foldbuf1, &n1, flags_for_folder); } f1 = foldbuf1; } @@ -5110,10 +5128,10 @@ Perl_foldEQ_utf8_flags(pTHX_ const char *foldbuf2 = toFOLD(*p2); } else if (u2) { - _toFOLD_utf8_flags(p2, e2, foldbuf2, &n2, flags_for_folder); + toFOLD_utf8_flags_(p2, e2, foldbuf2, &n2, flags_for_folder); } else { - _to_uni_fold_flags(*p2, foldbuf2, &n2, flags_for_folder); + to_uni_fold_flags_(*p2, foldbuf2, &n2, flags_for_folder); } f2 = foldbuf2; } Index: gnu/usr.bin/perl/utf8.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/utf8.h,v diff -u -p -a -u -p -r1.15 utf8.h --- gnu/usr.bin/perl/utf8.h 26 Dec 2025 22:14:13 -0000 1.15 +++ gnu/usr.bin/perl/utf8.h 16 Nov 2026 00:57:40 -0000 @@ -139,40 +139,59 @@ typedef enum { #define is_ascii_string(s, len) is_utf8_invariant_string(s, len) #define is_invariant_string(s, len) is_utf8_invariant_string(s, len) +/* +=for apidoc uvoffuni_to_utf8_flags + +THIS FUNCTION SHOULD BE USED IN ONLY VERY SPECIALIZED CIRCUMSTANCES. +Instead, B or +L>. + +This function is like them, but the input is a strict Unicode +(as opposed to native) code point. Only in very rare circumstances should code +not be using the native code point. + +For details, see the description for L. + +=cut +*/ #define uvoffuni_to_utf8_flags(d,uv,flags) \ uvoffuni_to_utf8_flags_msgs(d, uv, flags, 0) #define uvchr_to_utf8 uv_to_utf8 #define uvchr_to_utf8_flags uv_to_utf8_flags #define uvchr_to_utf8_flags_msgs uv_to_utf8_msgs -#define Perl_uvchr_to_utf8 Perl_uv_to_utf8 -#define Perl_uvchr_to_utf8_flags Perl_uv_to_utf8_flags -#define Perl_uvchr_to_utf8_flags_msgs Perl_uv_to_utf8_msgs +#define uvchr_to_utf8 uv_to_utf8 +#define uvchr_to_utf8_flags uv_to_utf8_flags +#define uvchr_to_utf8_flags_msgs uv_to_utf8_msgs + +#define uv_to_utf8_msgs(d, uv, flags, msgs) \ + uvoffuni_to_utf8_flags_msgs(d, NATIVE_TO_UNI(uv), flags, msgs) /* This is needed to cast the parameters for all those calls that had them * improperly as chars */ -#define utf8_to_uvchr_buf(s, e, lenp) \ +#define utf8_to_uvchr_buf(s, e, lenp) \ Perl_utf8_to_uvchr_buf(aTHX_ (const U8 *) (s), (const U8 *) e, lenp) -#define Perl_utf8n_to_uvchr(s, len, lenp, flags) \ - Perl_utf8n_to_uvchr_error(s, len, lenp, flags, 0) -#define Perl_utf8n_to_uvchr_error(s, len, lenp, flags, errors) \ - Perl_utf8n_to_uvchr_msgs(s, len, lenp, flags, errors, 0) - -#define Perl_utf8_to_uv( s, e, cp_p, advance_p) \ - Perl_utf8_to_uv_flags( s, e, cp_p, advance_p, 0) -#define Perl_utf8_to_uv_flags( s, e, cp_p, advance_p, flags) \ - Perl_utf8_to_uv_errors( s, e, cp_p, advance_p, flags, 0) -#define Perl_utf8_to_uv_errors( s, e, cp_p, advance_p, flags, errors) \ - Perl_utf8_to_uv_msgs( s, e, cp_p, advance_p, flags, errors, 0) -#define Perl_extended_utf8_to_uv(s, e, cp_p, advance_p) \ - Perl_utf8_to_uv(s, e, cp_p, advance_p) -#define Perl_strict_utf8_to_uv( s, e, cp_p, advance_p) \ - Perl_utf8_to_uv_flags( s, e, cp_p, advance_p, \ - UTF8_DISALLOW_ILLEGAL_INTERCHANGE) -#define Perl_c9strict_utf8_to_uv(s, e, cp_p, advance_p) \ - Perl_utf8_to_uv_flags( s, e, cp_p, advance_p, \ - UTF8_DISALLOW_ILLEGAL_C9_INTERCHANGE) +#define utf8n_to_uvchr(s, len, lenp, flags) \ + utf8n_to_uvchr_error(s, len, lenp, flags, 0) +#define utf8n_to_uvchr_error(s, len, lenp, flags, errors) \ + utf8n_to_uvchr_msgs(s, len, lenp, flags, errors, 0) + +#define utf8_to_uv( s, e, cp_p, advance_p) \ + utf8_to_uv_flags( s, e, cp_p, advance_p, 0) +#define utf8_to_uv_flags( s, e, cp_p, advance_p, flags) \ + utf8_to_uv_errors( s, e, cp_p, advance_p, flags, 0) +#define utf8_to_uv_errors( s, e, cp_p, advance_p, flags, errors) \ + utf8_to_uv_msgs( s, e, cp_p, advance_p, flags, errors, 0) +#define extended_utf8_to_uv(s, e, cp_p, advance_p) \ + utf8_to_uv(s, e, cp_p, advance_p) +#define strict_utf8_to_uv( s, e, cp_p, advance_p) \ + utf8_to_uv_flags( s, e, cp_p, advance_p, \ + UTF8_DISALLOW_ILLEGAL_INTERCHANGE) +#define c9strict_utf8_to_uv(s, e, cp_p, advance_p) \ + utf8_to_uv_flags( s, e, cp_p, advance_p, \ + UTF8_DISALLOW_ILLEGAL_C9_INTERCHANGE) +#define valid_utf8_to_uvchr(s, advance_p) valid_utf8_to_uv(s, advance_p) #define utf16_to_utf8(p, d, bytelen, newlen) \ utf16_to_utf8_base(p, d, bytelen, newlen, 0, 1) @@ -183,7 +202,7 @@ typedef enum { #define utf8_to_utf16_reversed(p, d, bytelen, newlen) \ utf8_to_utf16_base(p, d, bytelen, newlen, 1, 0) -#define to_uni_fold(c, p, lenp) _to_uni_fold_flags(c, p, lenp, FOLD_FLAGS_FULL) +#define to_uni_fold(c, p, lenp) to_uni_fold_flags_(c, p, lenp, FOLD_FLAGS_FULL) #define foldEQ_utf8(s1, pe1, l1, u1, s2, pe2, l2, u2) \ foldEQ_utf8_flags(s1, pe1, l1, u1, s2, pe2, l2, u2, 0) @@ -216,10 +235,7 @@ typedef enum { START_EXTERN_C -# ifndef DOINIT -EXTCONST unsigned char PL_utf8skip[]; -# else -EXTCONST unsigned char PL_utf8skip[] = { +EXTCONST unsigned char PL_utf8skip[] INIT( { /* 0x00 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* ascii */ /* 0x10 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* ascii */ /* 0x20 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* ascii */ @@ -241,8 +257,7 @@ EXTCONST unsigned char PL_utf8skip[] = { /* 0xFE */ 7, /* More extended, Up to 72 bits (64-bit + reserved) */ /* 0xFF */ ASCII_PLATFORM_UTF8_MAXBYTES -}; -# endif +}); END_EXTERN_C @@ -291,8 +306,8 @@ adding no time nor space requirements to =cut */ -#define NATIVE_TO_LATIN1(ch) (__ASSERT_(FITS_IN_8_BITS(ch)) ((U8) (ch))) -#define LATIN1_TO_NATIVE(ch) (__ASSERT_(FITS_IN_8_BITS(ch)) ((U8) (ch))) +#define NATIVE_TO_LATIN1(ch) (assert(FITS_IN_8_BITS(ch)), ((U8) (ch))) +#define LATIN1_TO_NATIVE(ch) (assert(FITS_IN_8_BITS(ch)), ((U8) (ch))) /* I8 is an intermediate version of UTF-8 used only in UTF-EBCDIC. We thus * consider it to be identical to UTF-8 on ASCII platforms. Strictly speaking @@ -300,8 +315,8 @@ adding no time nor space requirements to * because they are 8-bit encodings that serve the same purpose in Perl, and * rarely do we need to distinguish them. The term "NATIVE_UTF8" applies to * whichever one is applicable on the current platform */ -#define NATIVE_UTF8_TO_I8(ch) (__ASSERT_(FITS_IN_8_BITS(ch)) ((U8) (ch))) -#define I8_TO_NATIVE_UTF8(ch) (__ASSERT_(FITS_IN_8_BITS(ch)) ((U8) (ch))) +#define NATIVE_UTF8_TO_I8(ch) (assert(FITS_IN_8_BITS(ch)), ((U8) (ch))) +#define I8_TO_NATIVE_UTF8(ch) (assert(FITS_IN_8_BITS(ch)), ((U8) (ch))) #define UNI_TO_NATIVE(ch) ((UV) ASSERT_NOT_PTR(ch)) #define NATIVE_TO_UNI(ch) ((UV) ASSERT_NOT_PTR(ch)) @@ -424,7 +439,7 @@ are in the character. */ /* Is the byte 'c' part of a multi-byte UTF8-8 encoded sequence, and not the * first byte thereof? */ -#define UTF8_IS_CONTINUATION(c) (__ASSERT_(FITS_IN_8_BITS(c)) \ +#define UTF8_IS_CONTINUATION(c) (assert(FITS_IN_8_BITS(c)), \ (((NATIVE_UTF8_TO_I8(c) & UTF_IS_CONTINUATION_MASK) \ == UTF_CONTINUATION_MARK))) @@ -555,6 +570,11 @@ regen/charset_translations.pl. */ + (pos) + ((UTF_CONTINUATION_BYTE_INFO_BITS - 1) - 1)) /* Step fcn */ \ / (UTF_CONTINUATION_BYTE_INFO_BITS - 1)) /* take floor of */ + +/* The maximum number of bytes required to represent any Unicode code point + * 0..0x10FFFF */ +#define MAX_UNICODE_UTF8_BYTES UNISKIP_BY_MSB_(20) + /* Compute the number of UTF-8 bytes required for representing the input uv, * which must be a Unicode, not native value. * @@ -617,8 +637,8 @@ encoded as UTF-8. C is a native (AS * * Note that on EBCDIC platforms, this is actually the I8 */ #define UTF_START_BYTE(uv, bits) \ - (__ASSERT_((uv) >> ((bits) - 1)) /* At least 'bits' */ \ - __ASSERT_(((uv) & ~nBIT_MASK(bits)) == 0) /* No extra bits */ \ + (assert((uv) >> ((bits) - 1)), /* At least 'bits' */ \ + assert(((uv) & ~nBIT_MASK(bits)) == 0), /* No extra bits */ \ UTF_START_MARK(UNISKIP_BY_MSB_((bits) - 1)) \ | ((uv) >> (((bits) / UTF_CONTINUATION_BYTE_INFO_BITS) \ * UTF_CONTINUATION_BYTE_INFO_BITS))) @@ -633,8 +653,8 @@ encoded as UTF-8. C is a native (AS * * Note that on EBCDIC platforms, this is actually the I8 */ #define UTF_FIRST_CONT_BYTE(uv, bits) \ - (__ASSERT_((uv) >> ((bits) - 1)) /* At least 'bits' */ \ - __ASSERT_(((uv) & ~nBIT_MASK(bits)) == 0) /* No extra bits */ \ + (assert((uv) >> ((bits) - 1)), /* At least 'bits' */ \ + assert(((uv) & ~nBIT_MASK(bits)) == 0), /* No extra bits */ \ UTF_CONTINUATION_MARK \ | ( UTF_CONTINUATION_MASK \ & ((uv) >> ((((bits) / UTF_CONTINUATION_BYTE_INFO_BITS) - 1) \ @@ -648,7 +668,7 @@ encoded as UTF-8. C is a native (AS * C0-C4 I8 start bytes on EBCDIC ones. On EBCDIC E0 can't start a * non-overlong sequence, so we define a base macro and for those platforms, * extend it to also exclude E0 */ -#define UTF8_IS_START_base(c) (__ASSERT_(FITS_IN_8_BITS(c)) \ +#define UTF8_IS_START_base(c) (assert(FITS_IN_8_BITS(c)), \ (NATIVE_UTF8_TO_I8(c) >= UTF_MIN_START_BYTE)) #ifdef EBCDIC # define UTF8_IS_START(c) \ @@ -661,13 +681,13 @@ encoded as UTF-8. C is a native (AS /* Is the UTF8-encoded byte 'c' the first byte of a sequence of bytes that * represent a code point > 255? */ -#define UTF8_IS_ABOVE_LATIN1(c) (__ASSERT_(FITS_IN_8_BITS(c)) \ +#define UTF8_IS_ABOVE_LATIN1(c) (assert(FITS_IN_8_BITS(c)), \ (NATIVE_UTF8_TO_I8(c) >= UTF_MIN_ABOVE_LATIN1_BYTE)) /* Is the UTF8-encoded byte 'c' the first byte of a two byte sequence? Use * UTF8_IS_NEXT_CHAR_DOWNGRADEABLE() instead if the input isn't known to * be well-formed. */ -#define UTF8_IS_DOWNGRADEABLE_START(c) (__ASSERT_(FITS_IN_8_BITS(c)) \ +#define UTF8_IS_DOWNGRADEABLE_START(c) (assert(FITS_IN_8_BITS(c)), \ inRANGE_helper_(U8, NATIVE_UTF8_TO_I8(c), \ UTF_MIN_START_BYTE, UTF_MIN_ABOVE_LATIN1_BYTE - 1)) @@ -709,7 +729,7 @@ uppercase/lowercase/titlecase/fold into. =cut */ #define UTF8_MAXBYTES_CASE \ - MAX(UTF8_MAXBYTES, UTF8_MAX_FOLD_CHAR_EXPAND * UNISKIP_BY_MSB_(20)) + MAX(UTF8_MAXBYTES, UTF8_MAX_FOLD_CHAR_EXPAND * MAX_UNICODE_UTF8_BYTES) /* Rest of these are attributes of Unicode and perl's internals rather than the * encoding, or happen to be the same in both ASCII and EBCDIC (at least at @@ -734,7 +754,7 @@ uppercase/lowercase/titlecase/fold into. * that this is asymmetric on EBCDIC platforms, in that the 'new' parameter is * the UTF-EBCDIC byte, whereas the 'old' parameter is a Unicode (not EBCDIC) * code point in process of being generated */ -#define UTF8_ACCUMULATE(old, new) (__ASSERT_(FITS_IN_8_BITS(new)) \ +#define UTF8_ACCUMULATE(old, new) (assert(FITS_IN_8_BITS(new)), \ ((old) << UTF_ACCUMULATION_SHIFT) \ | ((NATIVE_UTF8_TO_I8(new)) \ & UTF_CONTINUATION_MASK)) @@ -758,8 +778,8 @@ uppercase/lowercase/titlecase/fold into. * LO: continuation. * */ #define EIGHT_BIT_UTF8_TO_NATIVE(HI, LO) \ - ( __ASSERT_(UTF8_IS_DOWNGRADEABLE_START(HI)) \ - __ASSERT_(UTF8_IS_CONTINUATION(LO)) \ + ( assert(UTF8_IS_DOWNGRADEABLE_START(HI)), \ + assert(UTF8_IS_CONTINUATION(LO)), \ LATIN1_TO_NATIVE(UTF8_ACCUMULATE(( \ NATIVE_UTF8_TO_I8(HI) & UTF_START_MASK(2)), (LO)))) @@ -769,11 +789,11 @@ uppercase/lowercase/titlecase/fold into. * Note that the result can be larger than 255 if the input character is not * downgradable */ #define TWO_BYTE_UTF8_TO_NATIVE(HI, LO) \ - (__ASSERT_(FITS_IN_8_BITS(HI)) \ - __ASSERT_(FITS_IN_8_BITS(LO)) \ - __ASSERT_(PL_utf8skip[(U8) HI] == 2) \ - __ASSERT_(UTF8_IS_CONTINUATION(LO)) \ - UNI_TO_NATIVE(UTF8_ACCUMULATE((NATIVE_UTF8_TO_I8(HI) & UTF_START_MASK(2)), \ + (assert(FITS_IN_8_BITS(HI)), \ + assert(FITS_IN_8_BITS(LO)), \ + assert(PL_utf8skip[(U8) HI] == 2), \ + assert(UTF8_IS_CONTINUATION(LO)), \ + UNI_TO_NATIVE(UTF8_ACCUMULATE((NATIVE_UTF8_TO_I8(HI) & UTF_START_MASK(2)),\ (LO)))) /* Should never be used, and be deprecated */ @@ -828,7 +848,7 @@ C>, for example when #define UTF8_SKIP(s) UTF8SKIP(s) #define UTF8_CHK_SKIP(s) \ (UNLIKELY(s[0] == '\0') ? 1 : my_strnlen((const char *) (s), UTF8SKIP(s))) -#define UTF8_SAFE_SKIP(s, e) (__ASSERT_((e) >= (s)) \ +#define UTF8_SAFE_SKIP(s, e) (assert((e) >= (s)), \ UNLIKELY(((e) - (s)) <= 0) \ ? 0 \ : MIN(((e) - (s)), UTF8_SKIP(s))) @@ -864,7 +884,7 @@ implementation of the latter. */ /* Misleadingly named: is the UTF8-encoded byte 'c' part of a variant sequence * in UTF-8? This is the inverse of UTF8_IS_INVARIANT. */ -#define UTF8_IS_CONTINUED(c) (__ASSERT_(FITS_IN_8_BITS(c)) \ +#define UTF8_IS_CONTINUED(c) (assert(FITS_IN_8_BITS(c)), \ (! UTF8_IS_INVARIANT(c))) /* The macros in the next 4 sets are used to generate the two utf8 or utfebcdic @@ -875,27 +895,27 @@ implementation of the latter. */ * directly anywhere else. 'translate_function' is either NATIVE_TO_LATIN1 * (which works for code points up through 0xFF) or NATIVE_TO_UNI which works * for any code point */ -#define __BASE_TWO_BYTE_HI(c, translate_function) \ - (__ASSERT_(! UVCHR_IS_INVARIANT(c)) \ +#define BASE_TWO_BYTE_HI_(c, translate_function) \ + (assert(! UVCHR_IS_INVARIANT(c)), \ I8_TO_NATIVE_UTF8((translate_function(c) >> UTF_ACCUMULATION_SHIFT) \ | UTF_START_MARK(2))) -#define __BASE_TWO_BYTE_LO(c, translate_function) \ - (__ASSERT_(! UVCHR_IS_INVARIANT(c)) \ +#define BASE_TWO_BYTE_LO_(c, translate_function) \ + (assert(! UVCHR_IS_INVARIANT(c)), \ I8_TO_NATIVE_UTF8((translate_function(c) & UTF_CONTINUATION_MASK) \ | UTF_CONTINUATION_MARK)) /* The next two macros should not be used. They were designed to be usable as * the case label of a switch statement, but this doesn't work for EBCDIC. Use * regen/unicode_constants.pl instead */ -#define UTF8_TWO_BYTE_HI_nocast(c) __BASE_TWO_BYTE_HI(c, NATIVE_TO_UNI) -#define UTF8_TWO_BYTE_LO_nocast(c) __BASE_TWO_BYTE_LO(c, NATIVE_TO_UNI) +#define UTF8_TWO_BYTE_HI_nocast(c) BASE_TWO_BYTE_HI_(c, NATIVE_TO_UNI) +#define UTF8_TWO_BYTE_LO_nocast(c) BASE_TWO_BYTE_LO_(c, NATIVE_TO_UNI) /* The next two macros are used when the source should be a single byte * character; checked for under DEBUGGING */ -#define UTF8_EIGHT_BIT_HI(c) (__ASSERT_(FITS_IN_8_BITS(c)) \ - ( __BASE_TWO_BYTE_HI(c, NATIVE_TO_LATIN1))) -#define UTF8_EIGHT_BIT_LO(c) (__ASSERT_(FITS_IN_8_BITS(c)) \ - (__BASE_TWO_BYTE_LO(c, NATIVE_TO_LATIN1))) +#define UTF8_EIGHT_BIT_HI(c) (assert(FITS_IN_8_BITS(c)), \ + ( BASE_TWO_BYTE_HI_(c, NATIVE_TO_LATIN1))) +#define UTF8_EIGHT_BIT_LO(c) (assert(FITS_IN_8_BITS(c)), \ + (BASE_TWO_BYTE_LO_(c, NATIVE_TO_LATIN1))) /* These final two macros in the series are used when the source can be any * code point whose UTF-8 is known to occupy 2 bytes; they are less efficient @@ -904,13 +924,13 @@ implementation of the latter. */ * MAX_UTF8_TWO_BYTE should be exactly all one bits in the lower few * places, so the ~ works */ #define UTF8_TWO_BYTE_HI(c) \ - (__ASSERT_((sizeof(c) == 1) \ - || !(((WIDEST_UTYPE)(c)) & ~MAX_UTF8_TWO_BYTE)) \ - (__BASE_TWO_BYTE_HI(c, NATIVE_TO_UNI))) + (assert((sizeof(c) == 1) \ + || !(((WIDEST_UTYPE)(c)) & ~MAX_UTF8_TWO_BYTE)), \ + (BASE_TWO_BYTE_HI_(c, NATIVE_TO_UNI))) #define UTF8_TWO_BYTE_LO(c) \ - (__ASSERT_((sizeof(c) == 1) \ - || !(((WIDEST_UTYPE)(c)) & ~MAX_UTF8_TWO_BYTE)) \ - (__BASE_TWO_BYTE_LO(c, NATIVE_TO_UNI))) + (assert((sizeof(c) == 1) \ + || !(((WIDEST_UTYPE)(c)) & ~MAX_UTF8_TWO_BYTE)), \ + (BASE_TWO_BYTE_LO_(c, NATIVE_TO_UNI))) /* This is illegal in any well-formed UTF-8 in both EBCDIC and ASCII * as it is only in overlongs. */ @@ -927,6 +947,10 @@ implementation of the latter. */ ((IN_BYTES || !UTF) \ ? isIDFIRST(*(p)) \ : isIDFIRST_utf8_safe(p, e)) +#define isIDCONT_lazy_if_safe(p, e, UTF) \ + ((IN_BYTES || !UTF) \ + ? isIDCONT(*(p)) \ + : isIDCONT_utf8_safe(p, e)) #define isWORDCHAR_lazy_if_safe(p, e, UTF) \ ((IN_BYTES || !UTF) \ ? isWORDCHAR(*(p)) \ @@ -1071,7 +1095,7 @@ this macro matches || NATIVE_UTF8_TO_I8(s[1]) >= UTF_FIRST_CONT_BYTE_110000_)) #define UTF8_IS_SUPER(s, e) \ - ((((e) - (s)) >= UNISKIP_BY_MSB_(20) && UTF8_IS_SUPER_NO_CHECK_(s)) \ + ((((e) - (s)) >= MAX_UNICODE_UTF8_BYTES && UTF8_IS_SUPER_NO_CHECK_(s)) \ ? isUTF8_CHAR(s, e) \ : 0) @@ -1093,11 +1117,13 @@ non-character code points * the Unicode legal max */ #define UNICODE_IS_END_PLANE_NONCHAR_GIVEN_NOT_SUPER(uv) \ UNLIKELY(((UV) (uv) & 0xFFFE) == 0xFFFE) +#define UNICODE_IS_NONCHAR_GIVEN_NOT_SUPER(uv) \ + ( UNLIKELY(UNICODE_IS_32_CONTIGUOUS_NONCHARS(uv)) \ + || UNLIKELY(UNICODE_IS_END_PLANE_NONCHAR_GIVEN_NOT_SUPER(uv))) #define UNICODE_IS_NONCHAR(uv) \ - ( UNLIKELY(UNICODE_IS_32_CONTIGUOUS_NONCHARS(uv)) \ - || ( UNLIKELY(UNICODE_IS_END_PLANE_NONCHAR_GIVEN_NOT_SUPER(uv)) \ - && LIKELY(! UNICODE_IS_SUPER(uv)))) + ( LIKELY(! UNICODE_IS_SUPER(uv)) \ + && UNLIKELY(UNICODE_IS_NONCHAR_GIVEN_NOT_SUPER(uv))) /* =for apidoc Am|bool|UTF8_IS_NONCHAR|const U8 *s|const U8 *e @@ -1154,27 +1180,56 @@ point's representation. /* The ordering of these bits is important to a switch() statement in utf8.c * for handling problems in converting UTF-8 to a UV */ -#define UTF8_ALLOW_OVERFLOW 0x0001 -#define UTF8_GOT_OVERFLOW UTF8_ALLOW_OVERFLOW +#define UTF8_GOT_OVERFLOW_BIT_POS_ 0 +#define UTF8_GOT_EMPTY_BIT_POS_ 1 +#define UTF8_GOT_CONTINUATION_BIT_POS_ 2 +#define UTF8_GOT_SHORT_BIT_POS_ 3 +#define UTF8_GOT_NON_CONTINUATION_BIT_POS_ 4 + +#define UTF8_GOT_SURROGATE_BIT_POS_ 5 +#define UTF8_WARN_SURROGATE_BIT_POS_ 6 + +#define UTF8_GOT_PERL_EXTENDED_BIT_POS_ 7 +#define UTF8_WARN_PERL_EXTENDED_BIT_POS_ 8 + +#define UTF8_GOT_SUPER_BIT_POS_ 9 +#define UTF8_WARN_SUPER_BIT_POS_ 10 + +#define UTF8_GOT_NONCHAR_BIT_POS_ 11 +#define UTF8_WARN_NONCHAR_BIT_POS_ 12 + +#define UTF8_GOT_LONG_BIT_POS_ 13 +#define UTF8_GOT_LONG_WITH_VALUE_BIT_POS_ 14 + +#define UTF8_CHECK_ONLY_BIT_POS_ 15 +#define UTF8_DIE_IF_MALFORMED_BIT_POS_ 16 +#define UTF8_FORCE_WARN_IF_MALFORMED_BIT_POS_ 17 + +#define UTF8_NO_CONFIDENCE_IN_CURLEN_BIT_POS_ 18 + +#define UTF8_GOT_OVERFLOW (1U << UTF8_GOT_OVERFLOW_BIT_POS_) +#define UTF8_ALLOW_OVERFLOW UTF8_GOT_OVERFLOW -#define UTF8_ALLOW_EMPTY 0x0002 /* Allow a zero length string */ -#define UTF8_GOT_EMPTY UTF8_ALLOW_EMPTY +/* Allow a zero length string */ +#define UTF8_GOT_EMPTY (1U << UTF8_GOT_EMPTY_BIT_POS_) +#define UTF8_ALLOW_EMPTY UTF8_GOT_EMPTY /* Allow first byte to be a continuation byte */ -#define UTF8_ALLOW_CONTINUATION 0x0004 -#define UTF8_GOT_CONTINUATION UTF8_ALLOW_CONTINUATION +#define UTF8_GOT_CONTINUATION (1U << UTF8_GOT_CONTINUATION_BIT_POS_) +#define UTF8_ALLOW_CONTINUATION UTF8_GOT_CONTINUATION /* expecting more bytes than were available in the string */ -#define UTF8_ALLOW_SHORT 0x0008 -#define UTF8_GOT_SHORT UTF8_ALLOW_SHORT +#define UTF8_GOT_SHORT (1U << UTF8_GOT_SHORT_BIT_POS_) +#define UTF8_ALLOW_SHORT UTF8_GOT_SHORT /* Unexpected non-continuation byte */ -#define UTF8_ALLOW_NON_CONTINUATION 0x0010 -#define UTF8_GOT_NON_CONTINUATION UTF8_ALLOW_NON_CONTINUATION +#define UTF8_GOT_NON_CONTINUATION (1U << UTF8_GOT_NON_CONTINUATION_BIT_POS_) +#define UTF8_ALLOW_NON_CONTINUATION UTF8_GOT_NON_CONTINUATION -#define UTF8_DISALLOW_SURROGATE 0x0020 /* Unicode surrogates */ -#define UTF8_GOT_SURROGATE UTF8_DISALLOW_SURROGATE -#define UTF8_WARN_SURROGATE 0x0040 +/* Unicode surrogates */ +#define UTF8_GOT_SURROGATE (1U << UTF8_GOT_SURROGATE_BIT_POS_) +#define UTF8_DISALLOW_SURROGATE UTF8_GOT_SURROGATE +#define UTF8_WARN_SURROGATE (1U << UTF8_WARN_SURROGATE_BIT_POS_) /* The original UTF-8 standard did not define UTF-8 with start bytes of 0xFE or * 0xFF, though UTF-EBCDIC did. This allowed both versions to represent code @@ -1185,27 +1240,27 @@ point's representation. * extensions, and not likely to be interchangeable with other languages. Note * that on ASCII platforms, FE overflows a signed 32-bit word, and FF an * unsigned one. */ -#define UTF8_DISALLOW_PERL_EXTENDED 0x0080 -#define UTF8_GOT_PERL_EXTENDED UTF8_DISALLOW_PERL_EXTENDED -#define UTF8_WARN_PERL_EXTENDED 0x0100 +#define UTF8_GOT_PERL_EXTENDED (1U << UTF8_GOT_PERL_EXTENDED_BIT_POS_) +#define UTF8_DISALLOW_PERL_EXTENDED UTF8_GOT_PERL_EXTENDED +#define UTF8_WARN_PERL_EXTENDED (1U << UTF8_WARN_PERL_EXTENDED_BIT_POS_) /* Super-set of Unicode: code points above the legal max */ -#define UTF8_DISALLOW_SUPER 0x0200 -#define UTF8_GOT_SUPER UTF8_DISALLOW_SUPER -#define UTF8_WARN_SUPER 0x0400 +#define UTF8_GOT_SUPER (1U << UTF8_GOT_SUPER_BIT_POS_) +#define UTF8_DISALLOW_SUPER UTF8_GOT_SUPER +#define UTF8_WARN_SUPER (1U << UTF8_WARN_SUPER_BIT_POS_) /* Unicode non-character code points */ -#define UTF8_DISALLOW_NONCHAR 0x0800 -#define UTF8_GOT_NONCHAR UTF8_DISALLOW_NONCHAR -#define UTF8_WARN_NONCHAR 0x1000 +#define UTF8_GOT_NONCHAR (1U << UTF8_GOT_NONCHAR_BIT_POS_) +#define UTF8_DISALLOW_NONCHAR UTF8_GOT_NONCHAR +#define UTF8_WARN_NONCHAR (1U << UTF8_WARN_NONCHAR_BIT_POS_) /* Overlong sequence; i.e., the code point can be specified in fewer bytes. * First one will convert the overlong to the REPLACEMENT CHARACTER; second * will return what the overlong evaluates to */ -#define UTF8_ALLOW_LONG 0x2000 -#define UTF8_GOT_LONG UTF8_ALLOW_LONG -#define UTF8_ALLOW_LONG_AND_ITS_VALUE 0x4000 -#define UTF8_GOT_LONG_WITH_VALUE UTF8_ALLOW_LONG_AND_ITS_VALUE +#define UTF8_GOT_LONG (1U << UTF8_GOT_LONG_BIT_POS_) +#define UTF8_ALLOW_LONG UTF8_GOT_LONG +#define UTF8_GOT_LONG_WITH_VALUE (1U << UTF8_GOT_LONG_WITH_VALUE_BIT_POS_) +#define UTF8_ALLOW_LONG_AND_ITS_VALUE UTF8_GOT_LONG_WITH_VALUE /* For back compat, these old names are misleading for overlongs and * UTF_EBCDIC. */ @@ -1215,10 +1270,12 @@ point's representation. #define UTF8_DISALLOW_FE_FF UTF8_DISALLOW_PERL_EXTENDED #define UTF8_WARN_FE_FF UTF8_WARN_PERL_EXTENDED -#define UTF8_CHECK_ONLY 0x8000 -#define UTF8_NO_CONFIDENCE_IN_CURLEN_ 0x10000 /* Internal core use only */ -#define UTF8_DIE_IF_MALFORMED 0x20000 -#define UTF8_FORCE_WARN_IF_MALFORMED 0x40000 +#define UTF8_CHECK_ONLY (1U << UTF8_CHECK_ONLY_BIT_POS_) +#define UTF8_NO_CONFIDENCE_IN_CURLEN_ /* Internal core use only */ \ + (1U << UTF8_NO_CONFIDENCE_IN_CURLEN_BIT_POS_) +#define UTF8_DIE_IF_MALFORMED (1U << UTF8_DIE_IF_MALFORMED_BIT_POS_) +#define UTF8_FORCE_WARN_IF_MALFORMED \ + (1U < #include +/* For get_entropy() on non-Linux systems (MacOS, Android) we need sys/random.h */ +#ifdef I_SYS_RANDOM +#include +#endif + #ifdef __Lynx__ /* Missing protos on LynxOS */ int putenv(char *); @@ -149,6 +154,8 @@ Paranoid version of system's malloc() Malloc_t Perl_safesysmalloc(MEM_SIZE size) { + PERL_ARGS_ASSERT_SAFESYSMALLOC; + #ifdef ALWAYS_NEED_THX dTHX; #endif @@ -238,6 +245,8 @@ Paranoid version of system's realloc() Malloc_t Perl_safesysrealloc(Malloc_t where,MEM_SIZE size) { + PERL_ARGS_ASSERT_SAFESYSREALLOC; + #ifdef ALWAYS_NEED_THX dTHX; #endif @@ -374,6 +383,8 @@ Safe version of system's free() Free_t Perl_safesysfree(Malloc_t where) { + PERL_ARGS_ASSERT_SAFESYSFREE; + #ifdef ALWAYS_NEED_THX dTHX; #endif @@ -445,6 +456,8 @@ Safe version of system's calloc() Malloc_t Perl_safesyscalloc(MEM_SIZE count, MEM_SIZE size) { + PERL_ARGS_ASSERT_SAFESYSCALLOC; + #ifdef ALWAYS_NEED_THX dTHX; #endif @@ -612,16 +625,13 @@ Perl_delimcpy_no_escape(char *to, const const char *from, const char *from_end, const int delim, I32 *retlen) { + PERL_ARGS_ASSERT_DELIMCPY_NO_ESCAPE; + const char * delim_pos; ptrdiff_t from_len = from_end - from; ptrdiff_t to_len = to_end - to; SSize_t copy_len; - PERL_ARGS_ASSERT_DELIMCPY_NO_ESCAPE; - - assert(from_len >= 0); - assert(to_len >= 0); - /* Look for the first delimiter in the source */ delim_pos = (const char *) memchr(from, delim, from_len); @@ -654,7 +664,7 @@ Perl_delimcpy_no_escape(char *to, const Copy a source buffer to a destination buffer, stopping at (but not including) the first occurrence in the source of an unescaped (defined below) delimiter byte, C. The source is the bytes between S and C - -1>. Similarly, the dest is C up to C. +1> inclusive. Similarly, the dest is C up through C. The number of bytes copied is written to C<*retlen>. @@ -717,14 +727,12 @@ Perl_delimcpy(char *to, const char *to_e const char *from, const char *from_end, const int delim, I32 *retlen) { + PERL_ARGS_ASSERT_DELIMCPY; + const char * const orig_to = to; ptrdiff_t copy_len = 0; bool stopped_early = FALSE; /* Ran out of room to copy to */ - PERL_ARGS_ASSERT_DELIMCPY; - assert(from_end >= from); - assert(to_end >= to); - /* Don't use the loop for the trivial case of the first character being the * delimiter; otherwise would have to worry inside the loop about backing * up before the start of 'from' */ @@ -766,7 +774,7 @@ Perl_delimcpy(char *to, const char *to_e /* If the number of backslashes is even, they just escape one * another, leaving the delimiter unescaped, and stopping the copy. * */ - if (! ((delim_pos - (backslash_pos + 1)) & 1)) { + if (isEVEN(delim_pos - (backslash_pos + 1))) { copy_len = delim_pos - from; /* even, copy up to delimiter */ break; } @@ -896,11 +904,11 @@ such occurrence. char * Perl_rninstr(const char *big, const char *bigend, const char *little, const char *lend) { + PERL_ARGS_ASSERT_RNINSTR; + const ptrdiff_t little_len = lend - little; const ptrdiff_t big_len = bigend - big; - PERL_ARGS_ASSERT_RNINSTR; - /* A non-existent needle trivially matches the rightmost possible position * in the haystack */ if (UNLIKELY(little_len <= 0)) { @@ -1006,13 +1014,13 @@ Analyzes the string in order to make fas void Perl_fbm_compile(pTHX_ SV *sv, U32 flags) { + PERL_ARGS_ASSERT_FBM_COMPILE; + const U8 *s; STRLEN i; STRLEN len; MAGIC *mg; - PERL_ARGS_ASSERT_FBM_COMPILE; - if (isGV_with_GP(sv) || SvROK(sv)) return; @@ -1099,6 +1107,8 @@ a littlestr of "ab\n", SvTAIL matches as char * Perl_fbm_instr(pTHX_ unsigned char *big, unsigned char *bigend, SV *littlestr, U32 flags) { + PERL_ARGS_ASSERT_FBM_INSTR; + unsigned char *s; STRLEN l; const unsigned char *little = (const unsigned char *)SvPV_const(littlestr,l); @@ -1107,10 +1117,6 @@ Perl_fbm_instr(pTHX_ unsigned char *big, bool valid = SvVALID(littlestr); bool tail = valid ? cBOOL(SvTAIL(littlestr)) : FALSE; - PERL_ARGS_ASSERT_FBM_INSTR; - - assert(bigend >= big); - if ((STRLEN)(bigend - big) < littlelen) { if ( tail && ((STRLEN)(bigend - big) == littlelen - 1) @@ -1320,6 +1326,8 @@ Perl_fbm_instr(pTHX_ unsigned char *big, const char * Perl_cntrl_to_mnemonic(const U8 c) { + PERL_ARGS_ASSERT_CNTRL_TO_MNEMONIC; + /* Returns the mnemonic string that represents character 'c', if one * exists; NULL otherwise. The only ones that exist for the purposes of * this routine are a few control characters */ @@ -1340,6 +1348,8 @@ Perl_cntrl_to_mnemonic(const U8 c) char * Perl_savesharedpv(pTHX_ const char *pv) { + PERL_ARGS_ASSERT_SAVESHAREDPV; + char *newaddr; STRLEN pvlen; @@ -1359,10 +1369,10 @@ Perl_savesharedpv(pTHX_ const char *pv) char * Perl_savesharedpvn(pTHX_ const char *const pv, const STRLEN len) { - char *const newaddr = (char*)PerlMemShared_malloc(len + 1); - + PERL_ARGS_ASSERT_SAVESHAREDPVN; PERL_UNUSED_CONTEXT; - /* PERL_ARGS_ASSERT_SAVESHAREDPVN; */ + + char *const newaddr = (char*)PerlMemShared_malloc(len + 1); if (!newaddr) { croak_no_mem_ext(STR_WITH_LEN("util:savesharedpvn")); @@ -1373,9 +1383,11 @@ Perl_savesharedpvn(pTHX_ const char *con /* the SV for Perl_form() and mess() is not kept in an arena */ -STATIC SV * +static SV * S_mess_alloc(pTHX) { + PERL_ARGS_ASSERT_MESS_ALLOC; + SV *sv; XPVMG *any; @@ -1400,10 +1412,11 @@ S_mess_alloc(pTHX) char * Perl_form_nocontext(const char* pat, ...) { + PERL_ARGS_ASSERT_FORM_NOCONTEXT; + dTHX; char *retval; va_list args; - PERL_ARGS_ASSERT_FORM_NOCONTEXT; va_start(args, pat); retval = vform(pat, &args); va_end(args); @@ -1434,13 +1447,10 @@ This is contrary to the incorrect previo that the return was a single per-thread buffer. That was (and is) actually true only when these are called during global destruction. -C

and C differ only in that C does -not take a thread context (C) parameter, so is used in situations where -the caller doesn't already have the thread context (and can be called without -the C prefix. +__PLAIN_vs_NOCONTEXT_wording__(form) -C is the same as C except the arguments are an encapsulated -argument list. It does need a thread context parameter, but that is supplied +C is the same as C except the arguments are a C. +It does need a thread context parameter, but that is supplied automatically when called without the C prefix. =cut @@ -1449,9 +1459,10 @@ automatically when called without the C< char * Perl_form(pTHX_ const char* pat, ...) { + PERL_ARGS_ASSERT_FORM; + char *retval; va_list args; - PERL_ARGS_ASSERT_FORM; va_start(args, pat); retval = vform(pat, &args); va_end(args); @@ -1461,8 +1472,9 @@ Perl_form(pTHX_ const char* pat, ...) char * Perl_vform(pTHX_ const char *pat, va_list *args) { - SV * const sv = mess_alloc(); PERL_ARGS_ASSERT_VFORM; + + SV * const sv = mess_alloc(); sv_vsetpvfn(sv, pat, strlen(pat), args, NULL, 0, NULL); return SvPVX(sv); } @@ -1477,12 +1489,10 @@ used to generate a string message. If t then it will be extended with some indication of the current location in the code, as described for C>. -C and C differ only in that C does -not take a thread context (C) parameter, so is used in situations where -the caller doesn't already have the thread context. +__PLAIN_vs_NOCONTEXT_wording__(mess) -C is the same as C except the arguments are an encapsulated -argument list. It needs a thread context parameter only when called with the +C is the same as C except the arguments are a . +It needs a thread context parameter only when called with the C prefix. Normally, the resulting message is returned in a new mortal SV. @@ -1496,10 +1506,11 @@ this function. SV * Perl_mess_nocontext(const char *pat, ...) { + PERL_ARGS_ASSERT_MESS_NOCONTEXT; + dTHX; SV *retval; va_list args; - PERL_ARGS_ASSERT_MESS_NOCONTEXT; va_start(args, pat); retval = vmess(pat, &args); va_end(args); @@ -1510,9 +1521,10 @@ Perl_mess_nocontext(const char *pat, ... SV * Perl_mess(pTHX_ const char *pat, ...) { + PERL_ARGS_ASSERT_MESS; + SV *retval; va_list args; - PERL_ARGS_ASSERT_MESS; va_start(args, pat); retval = vmess(pat, &args); va_end(args); @@ -1523,12 +1535,12 @@ const COP* Perl_closest_cop(pTHX_ const COP *cop, const OP *o, const OP *curop, bool opnext) { + PERL_ARGS_ASSERT_CLOSEST_COP; + /* Look for curop starting from o. cop is the last COP we've seen. */ /* opnext means that curop is actually the ->op_next of the op we are seeking. */ - PERL_ARGS_ASSERT_CLOSEST_COP; - if (!o || !curop || ( opnext ? o->op_next == curop && o->op_type != OP_SCOPE : o == curop )) @@ -1585,6 +1597,8 @@ required) to modify and return C, except for the return type. -It should be used only where the C return type is required. -The function never actually returns. - -=cut -*/ - /* silence __declspec(noreturn) warnings */ MSVC_DIAG_IGNORE(4646 4645) OP * @@ -1779,21 +1783,6 @@ Perl_die_sv(pTHX_ SV *baseex) } MSVC_DIAG_RESTORE -/* -=for apidoc die -=for apidoc_item die_nocontext - -These behave the same as L, except for the return type. -They should be used only where the C return type is required. -They never actually return. - -The two forms differ only in that C does not take a thread -context (C) parameter, so is used in situations where the caller doesn't -already have the thread context. - -=cut -*/ - #if defined(MULTIPLICITY) /* silence __declspec(noreturn) warnings */ @@ -1801,6 +1790,8 @@ MSVC_DIAG_IGNORE(4646 4645) OP * Perl_die_nocontext(const char* pat, ...) { + PERL_ARGS_ASSERT_DIE_NOCONTEXT; + dTHX; va_list args; va_start(args, pat); @@ -1818,6 +1809,8 @@ MSVC_DIAG_IGNORE(4646 4645) OP * Perl_die(pTHX_ const char* pat, ...) { + PERL_ARGS_ASSERT_DIE; + va_list args; va_start(args, pat); vcroak(pat, &args); @@ -1827,95 +1820,71 @@ Perl_die(pTHX_ const char* pat, ...) } MSVC_DIAG_RESTORE -/* -=for apidoc croak_sv - -This is an XS interface to Perl's C function. - -C is the error message or object. If it is a reference, it -will be used as-is. Otherwise it is used as a string, and if it does -not end with a newline then it will be extended with some indication of -the current location in the code, as described for L. - -The error message or object will be used as an exception, by default -returning control to the nearest enclosing C, but subject to -modification by a C<$SIG{__DIE__}> handler. In any case, the C -function never returns normally. - -To die with a simple string message, the L function may be -more convenient. - -=cut -*/ - void Perl_croak_sv(pTHX_ SV *baseex) { - SV *ex = with_queued_errors(mess_sv(baseex, 0)); PERL_ARGS_ASSERT_CROAK_SV; + + SV *ex = with_queued_errors(mess_sv(baseex, 0)); invoke_exception_hook(ex, FALSE); die_unwind(ex); } -/* -=for apidoc vcroak - -This is an XS interface to Perl's C function. - -C and C are a sprintf-style format pattern and encapsulated -argument list. These are used to generate a string message. If the -message does not end with a newline, then it will be extended with -some indication of the current location in the code, as described for -L. - -The error message will be used as an exception, by default -returning control to the nearest enclosing C, but subject to -modification by a C<$SIG{__DIE__}> handler. In any case, the C -function never returns normally. - -For historical reasons, if C is null then the contents of C -(C<$@>) will be used as an error message or object instead of building an -error message from arguments. If you want to throw a non-string object, -or build an error message in an SV yourself, it is preferable to use -the L function, which does not involve clobbering C. - -=cut -*/ - void Perl_vcroak(pTHX_ const char* pat, va_list *args) { + PERL_ARGS_ASSERT_VCROAK; + SV *ex = with_queued_errors(pat ? vmess(pat, args) : mess_sv(ERRSV, 0)); invoke_exception_hook(ex, FALSE); die_unwind(ex); } /* -=for apidoc croak +=for apidoc croak +=for apidoc_item croak_sv +=for apidoc_item vcroak +=for apidoc_item die +=for apidoc_item die_sv =for apidoc_item croak_nocontext +=for apidoc_item die_nocontext These are XS interfaces to Perl's C function. -They take a sprintf-style format pattern and argument list, which are used to -generate a string message. If the message does not end with a newline, then it -will be extended with some indication of the current location in the code, as -described for C>. - -The error message will be used as an exception, by default -returning control to the nearest enclosing C, but subject to -modification by a C<$SIG{__DIE__}> handler. In any case, these croak -functions never return normally. - -For historical reasons, if C is null then the contents of C -(C<$@>) will be used as an error message or object instead of building an -error message from arguments. If you want to throw a non-string object, -or build an error message in an SV yourself, it is preferable to use -the C> function, which does not involve clobbering C. - -The two forms differ only in that C does not take a thread -context (C) parameter. It is usually preferred as it takes up fewer -bytes of code than plain C, and time is rarely a critical resource -when you are about to throw an exception. +The arguments are used to generate a string message. If the message does not +end with a newline, it will be extended with some indication of the current +location in the code, as described for C>. + +The error message will be used as an exception, by default returning control to +the nearest enclosing C, but subject to modification by a +C<$SIG{__DIE__}> handler. In any case, none of these functions ever actually +return normally. + +In C and C, C is the error message or object. If it +is a reference, it will be used as-is. Otherwise it is used as a string. + +To die with a simple string message, one of the other forms may be more +convenient. These take a sprintf-style format pattern, with arguments, to +generate the message. + +The arguments to C are specified as a C. The arguments to the +remaining forms are specified as a sprintf-style list of arguments. + +In the non-C<_sv> forms, for historical reasons, if C is null then the +contents of C> (C<$@>) will be used as an error message or object +instead of building an error message from arguments. Use the C<_sv> forms +instead if you want to throw a non-string object, or build an error message in +an SV yourself; these do not involve clobbering C. + +The difference between the C forms and the C forms is only the +return type of the functions. The C forms return C; the C +ones are listed as returning (confusingly) an S>, even though they +never actually return. The C forms should only be used when that return +type is required. + +When called from outside the perl core, plain C and C have always +been the same as C and C, respectively. That +is now true even when called from within core. =cut */ @@ -1924,6 +1893,8 @@ when you are about to throw an exception void Perl_croak_nocontext(const char *pat, ...) { + PERL_ARGS_ASSERT_CROAK_NOCONTEXT; + dTHX; va_list args; va_start(args, pat); @@ -1936,6 +1907,8 @@ Perl_croak_nocontext(const char *pat, .. void Perl_croak(pTHX_ const char *pat, ...) { + PERL_ARGS_ASSERT_CROAK; + va_list args; va_start(args, pat); vcroak(pat, &args); @@ -1959,6 +1932,8 @@ Less code used on exception code paths r void Perl_croak_no_modify(void) { + PERL_ARGS_ASSERT_CROAK_NO_MODIFY; + Perl_croak_nocontext( "%s", PL_no_modify); } @@ -1968,10 +1943,10 @@ Perl_croak_no_modify(void) void Perl_croak_no_mem_ext(const char *context, STRLEN len) { - dTHX; - PERL_ARGS_ASSERT_CROAK_NO_MEM_EXT; + dTHX; + int fd = PerlIO_fileno(Perl_error_log); if (fd < 0) SETERRNO(EBADF,RMS_IFI); @@ -1992,6 +1967,8 @@ Perl_croak_no_mem_ext(const char *contex void Perl_croak_no_mem(void) { + PERL_ARGS_ASSERT_CROAK_NO_MEM; + croak_no_mem_ext(STR_WITH_LEN("???")); } @@ -1999,80 +1976,59 @@ Perl_croak_no_mem(void) void Perl_croak_popstack(void) { + PERL_ARGS_ASSERT_CROAK_POPSTACK; + dTHX; PerlIO_printf(Perl_error_log, "panic: POPSTACK\n"); my_exit(1); } -/* -=for apidoc warn_sv - -This is an XS interface to Perl's C function. - -C is the error message or object. If it is a reference, it -will be used as-is. Otherwise it is used as a string, and if it does -not end with a newline then it will be extended with some indication of -the current location in the code, as described for L. - -The error message or object will by default be written to standard error, -but this is subject to modification by a C<$SIG{__WARN__}> handler. - -To warn with a simple string message, the L function may be -more convenient. - -=cut -*/ - void Perl_warn_sv(pTHX_ SV *baseex) { - SV *ex = mess_sv(baseex, 0); PERL_ARGS_ASSERT_WARN_SV; + + SV *ex = mess_sv(baseex, 0); if (!invoke_exception_hook(ex, TRUE)) write_to_stderr(ex); } -/* -=for apidoc vwarn - -This is an XS interface to Perl's C function. - -This is like C>, but C are an encapsulated -argument list. - -Unlike with L, C is not permitted to be null. - -=cut -*/ - void Perl_vwarn(pTHX_ const char* pat, va_list *args) { - SV *ex = vmess(pat, args); PERL_ARGS_ASSERT_VWARN; + + SV *ex = vmess(pat, args); if (!invoke_exception_hook(ex, TRUE)) write_to_stderr(ex); } /* -=for apidoc warn +=for apidoc warn =for apidoc_item warn_nocontext +=for apidoc_item warn_sv +=for apidoc_item vwarn These are XS interfaces to Perl's C function. -They take a sprintf-style format pattern and argument list, which are used to -generate a string message. If the message does not end with a newline, then it -will be extended with some indication of the current location in the code, as -described for C>. +The arguments are used to generate a string message. If the message does not +end with a newline, it will be extended with some indication of the current +location in the code, as described for C>. -The error message or object will by default be written to standard error, +The message or object will by default be written to standard error, but this is subject to modification by a C<$SIG{__WARN__}> handler. -Unlike with C>, C is not permitted to be null. +In C, C is the message or object. If it +is a reference, it will be used as-is. Otherwise it is used as a string. + +__PLAIN_vs_NOCONTEXT_wording__(warn) + +The arguments to C are specified as a C. The arguments to the +remaining forms are specified as a sprintf-style list of arguments. + +Unlike with the C> functions, C is not permitted to be null. -The two forms differ only in that C does not take a thread -context (C) parameter, so is used in situations where the caller doesn't -already have the thread context. +See also C>. =cut */ @@ -2081,9 +2037,10 @@ already have the thread context. void Perl_warn_nocontext(const char *pat, ...) { + PERL_ARGS_ASSERT_WARN_NOCONTEXT; + dTHX; va_list args; - PERL_ARGS_ASSERT_WARN_NOCONTEXT; va_start(args, pat); vwarn(pat, &args); va_end(args); @@ -2093,26 +2050,39 @@ Perl_warn_nocontext(const char *pat, ... void Perl_warn(pTHX_ const char *pat, ...) { - va_list args; PERL_ARGS_ASSERT_WARN; + + va_list args; va_start(args, pat); vwarn(pat, &args); va_end(args); } /* -=for apidoc warner +=for apidoc warner =for apidoc_item warner_nocontext +=for apidoc_item vwarner +=for apidoc_item fatal_warner +=for apidoc_item vfatal_warner -These output a warning of the specified category (or categories) given by -C, using the sprintf-style format pattern C, and argument list. +These each output a warning of the specified category (or categories) given by +C, using the sprintf-style format pattern C, and the arguments. C must be one of the C>, C, C, C macros populated with the appropriate number of warning -categories. If any of the warning categories they specify is fatal, a fatal +categories. + +If any of the warning categories they specify is fatal, a fatal exception is thrown. -In any event a message is generated by the pattern and arguments. If the +C and C act as if fatal warnings are enabled +for the warning. If called when there are pending compilation errors these +functions may actually return. They are currently used to generate "used only +once" fatal warnings since the COP where the name being reported is no longer +the current COP when the warning is generated and may be useful for similar +cases. + +In any event, a message is generated by the pattern and arguments. If the message does not end with a newline, then it will be extended with some indication of the current location in the code, as described for L. @@ -2121,13 +2091,15 @@ but this is subject to modification by a C is not permitted to be null. -The two forms differ only in that C does not take a thread -context (C) parameter, so is used in situations where the caller doesn't -already have the thread context. +__PLAIN_vs_NOCONTEXT_wording__(warner) + +The arguments to C and C are specified as a +C. The arguments to the remaining forms are specified as a +sprintf-style list of arguments. These functions differ from the similarly named C> functions, in that the latter are for XS code to unconditionally display a warning, whereas these -are for code that may be compiling a perl program, and does extra checking to +are for code that may be compiling a perl program, and do extra checking to see if the warning should be fatal. =for apidoc ck_warner @@ -2143,29 +2115,6 @@ categories. The two forms differ only in that C should be used if warnings for any of the categories are by default enabled. -=for apidoc vwarner -This is like C>, but C are an encapsulated argument list. - -=for apidoc fatal_warner - -Like L except that it acts as if fatal warnings are enabled -for the warning. - -If called when there are pending compilation errors this function may -return. - -This is currently used to generate "used only once" fatal warnings -since the COP where the name being reported is no longer the current -COP when the warning is generated and may be useful for similar cases. - -C must be one of the C>, C, C, -C macros populated with the appropriate number of warning -categories. - -=for apidoc vfatal_warner - -This is like C> but C are an encapsulated -argument list. =cut */ @@ -2174,9 +2123,10 @@ argument list. void Perl_warner_nocontext(U32 err, const char *pat, ...) { - dTHX; - va_list args; PERL_ARGS_ASSERT_WARNER_NOCONTEXT; + + dTHX; + va_list args; va_start(args, pat); vwarner(err, pat, &args); va_end(args); @@ -2212,8 +2162,9 @@ Perl_ck_warner(pTHX_ U32 err, const char void Perl_warner(pTHX_ U32 err, const char* pat,...) { - va_list args; PERL_ARGS_ASSERT_WARNER; + + va_list args; va_start(args, pat); vwarner(err, pat, &args); va_end(args); @@ -2255,7 +2206,7 @@ Perl_vfatal_warner(pTHX_ U32 err, const SV * const msv = vmess(pat, args); if (PL_parser && PL_parser->error_count) { - qerror(msv); + defer_error(msv); } else { invoke_exception_hook(msv, FALSE); @@ -2268,6 +2219,8 @@ Perl_vfatal_warner(pTHX_ U32 err, const bool Perl_ckwarn(pTHX_ U32 w) { + PERL_ARGS_ASSERT_CKWARN; + /* If lexical warnings have not been set, use $^W. */ if (isLEXWARN_off) return PL_dowarn & G_WARN_ON; @@ -2280,6 +2233,8 @@ Perl_ckwarn(pTHX_ U32 w) bool Perl_ckwarn_d(pTHX_ U32 w) { + PERL_ARGS_ASSERT_CKWARN_D; + /* If lexical warnings have not been set then default classes warn. */ if (isLEXWARN_off) return TRUE; @@ -2290,6 +2245,8 @@ Perl_ckwarn_d(pTHX_ U32 w) static bool S_ckwarn_common(pTHX_ U32 w) { + PERL_ARGS_ASSERT_CKWARN_COMMON; + if (PL_curcop->cop_warnings == pWARN_ALL) return TRUE; @@ -2307,7 +2264,7 @@ S_ckwarn_common(pTHX_ U32 w) } else if (!unpackWARN3(w)) { assert(!unpackWARN4(w)); } - + /* Right, dealt with all the special cases, which are implemented as non- pointers, so there is a pointer to a real warnings mask. */ do { @@ -2321,9 +2278,10 @@ S_ckwarn_common(pTHX_ U32 w) char * Perl_new_warnings_bitfield(pTHX_ char *buffer, const char *const bits, STRLEN size) { - const MEM_SIZE len_wanted = (size > WARNsize ? size : WARNsize); - PERL_UNUSED_CONTEXT; PERL_ARGS_ASSERT_NEW_WARNINGS_BITFIELD; + PERL_UNUSED_CONTEXT; + + const MEM_SIZE len_wanted = (size > WARNsize ? size : WARNsize); /* pass in null as the source string as we will do the * copy ourselves. */ @@ -2393,6 +2351,8 @@ version has desirable safeguards void Perl_my_setenv(pTHX_ const char *nam, const char *val) { + PERL_ARGS_ASSERT_MY_SETENV; + # if defined(USE_ITHREADS) && !defined(WIN32) /* only parent thread can modify process environment */ if (PL_curinterp != aTHX) @@ -2454,10 +2414,10 @@ Perl_my_setenv(pTHX_ const char *nam, co I32 Perl_unlnk(pTHX_ const char *f) /* unlink all versions of a file */ { - I32 retries = 0; - PERL_ARGS_ASSERT_UNLNK; + I32 retries = 0; + while (PerlLIO_unlink(f) >= 0) retries++; return retries ? 0 : -1; @@ -2466,7 +2426,7 @@ Perl_unlnk(pTHX_ const char *f) /* unlin #if defined(OEMVS) #if (__CHARSET_LIB == 1) - static int chgfdccsid(int fd, unsigned short ccsid) + static int chgfdccsid(int fd, unsigned short ccsid) { attrib_t attr; memset(&attr, 0, sizeof(attr)); @@ -2491,6 +2451,8 @@ Implementing function on some systems fo PerlIO * Perl_my_popen_list(pTHX_ const char *mode, int n, SV **args) { + PERL_ARGS_ASSERT_MY_POPEN_LIST; + #if (!defined(DOSISH) || defined(HAS_FORK)) && !defined(OS2) && !defined(VMS) && !defined(__LIBCATAMOUNT__) && !defined(__amigaos4__) int p[2]; I32 This, that; @@ -2499,8 +2461,6 @@ Perl_my_popen_list(pTHX_ const char *mod I32 did_pipes = 0; int pp[2]; - PERL_ARGS_ASSERT_MY_POPEN_LIST; - PERL_FLUSHALL_FOR_CHILD; This = (*mode == 'w'); that = !This; @@ -2528,19 +2488,13 @@ Perl_my_popen_list(pTHX_ const char *mod } if (pid == 0) { /* Child */ -#undef THIS -#undef THAT -#define THIS that -#define THAT This +# undef THIS +# undef THAT +# define THIS that +# define THAT This /* Close parent's end of error status pipe (if any) */ if (did_pipes) PerlLIO_close(pp[0]); -#if defined(OEMVS) - #if (__CHARSET_LIB == 1) - chgfdccsid(p[THIS], 819); - chgfdccsid(p[THAT], 819); - #endif -#endif /* Now dup our end of _the_ pipe to right position */ if (p[THIS] != (*mode == 'r')) { PerlLIO_dup2(p[THIS], *mode == 'r'); @@ -2552,11 +2506,11 @@ Perl_my_popen_list(pTHX_ const char *mod setfd_cloexec_or_inhexec_by_sysfdness(p[THIS]); PerlLIO_close(p[THAT]); /* close parent's end of _the_ pipe */ } -#if !defined(HAS_FCNTL) || !defined(F_SETFD) +# if !defined(HAS_FCNTL) || !defined(F_SETFD) /* No automatic close - do it by hand */ -# ifndef NOFILE -# define NOFILE 20 -# endif +# ifndef NOFILE +# define NOFILE 20 +# endif { int fd; @@ -2565,11 +2519,11 @@ Perl_my_popen_list(pTHX_ const char *mod PerlLIO_close(fd); } } -#endif +# endif do_aexec5(NULL, args-1, args-1+n, pp[1], did_pipes); PerlProc__exit(1); -#undef THIS -#undef THAT +# undef THIS +# undef THAT } /* Parent */ if (did_pipes) @@ -2616,20 +2570,7 @@ Perl_my_popen_list(pTHX_ const char *mod } if (did_pipes) PerlLIO_close(pp[0]); -#if defined(OEMVS) - #if (__CHARSET_LIB == 1) - PerlIO* io = PerlIO_fdopen(p[This], mode); - if (io) { - chgfdccsid(p[This], 819); - } - return io; - #else return PerlIO_fdopen(p[This], mode); - #endif -#else - return PerlIO_fdopen(p[This], mode); -#endif - #else # if defined(OS2) /* Same, without fork()ing and all extra overhead... */ return my_syspopen4(aTHX_ NULL, mode, n, args); @@ -2658,6 +2599,8 @@ version knows things that interact with PerlIO * Perl_my_popen(pTHX_ const char *cmd, const char *mode) { + PERL_ARGS_ASSERT_MY_POPEN; + int p[2]; I32 This, that; Pid_t pid; @@ -2666,8 +2609,6 @@ Perl_my_popen(pTHX_ const char *cmd, con I32 did_pipes = 0; int pp[2]; - PERL_ARGS_ASSERT_MY_POPEN; - PERL_FLUSHALL_FOR_CHILD; #ifdef OS2 if (doexec) { @@ -2707,12 +2648,6 @@ Perl_my_popen(pTHX_ const char *cmd, con #define THAT This if (did_pipes) PerlLIO_close(pp[0]); -#if defined(OEMVS) - #if (__CHARSET_LIB == 1) - chgfdccsid(p[THIS], 819); - chgfdccsid(p[THAT], 819); - #endif -#endif if (p[THIS] != (*mode == 'r')) { PerlLIO_dup2(p[THIS], *mode == 'r'); PerlLIO_close(p[THIS]); @@ -2748,7 +2683,7 @@ Perl_my_popen(pTHX_ const char *cmd, con filedescriptors directly, need to manually switch to the default, binary, low-level mode; see PerlIOBuf_open(). */ PerlLIO_setmode((*mode == 'r'), O_BINARY); -#endif +#endif PL_forkprocess = 0; #ifdef PERL_USES_PL_PIDSTATUS hv_clear(PL_pidstatus); /* we have no children */ @@ -2799,19 +2734,7 @@ Perl_my_popen(pTHX_ const char *cmd, con } if (did_pipes) PerlLIO_close(pp[0]); -#if defined(OEMVS) - #if (__CHARSET_LIB == 1) - PerlIO* io = PerlIO_fdopen(p[This], mode); - if (io) { - chgfdccsid(p[This], 819); - } - return io; - #else - return PerlIO_fdopen(p[This], mode); - #endif -#else return PerlIO_fdopen(p[This], mode); -#endif } #elif defined(__LIBCATAMOUNT__) PerlIO * @@ -2835,6 +2758,8 @@ Perl_atfork_lock(void) PERL_TSA_ACQUIRE(PL_op_mutex) #endif { + PERL_ARGS_ASSERT_ATFORK_LOCK; + #if defined(USE_ITHREADS) /* locks must be held in locking order (if any) */ # ifdef USE_PERLIO @@ -2860,6 +2785,8 @@ Perl_atfork_unlock(void) PERL_TSA_RELEASE(PL_op_mutex) #endif { + PERL_ARGS_ASSERT_ATFORK_UNLOCK; + #if defined(USE_ITHREADS) /* locks must be released in same order as in atfork_lock() */ # ifdef USE_PERLIO @@ -2872,6 +2799,21 @@ Perl_atfork_unlock(void) #endif } +void +Perl_atfork_child(void) +{ + PERL_ARGS_ASSERT_ATFORK_CHILD; + +#ifdef USE_ITHREADS + /* so we can resend signals received in a non-perl thread to the + new main thread + */ + PTHREAD_INIT_SELF(PL_main_thread); +#endif + + Perl_atfork_unlock(); +} + /* =for apidoc_section $concurrency =for apidoc my_fork @@ -2887,6 +2829,8 @@ used except through C. Pid_t Perl_my_fork(void) { + PERL_ARGS_ASSERT_MY_FORK; + #if defined(HAS_FORK) Pid_t pid; #if defined(USE_ITHREADS) && !defined(HAS_PTHREAD_ATFORK) @@ -2959,6 +2903,8 @@ rest of the perl interpreter. Sighandler_t Perl_rsignal(pTHX_ int signo, Sighandler_t handler) { + PERL_ARGS_ASSERT_RSIGNAL; + struct sigaction act, oact; #ifdef USE_ITHREADS @@ -2997,6 +2943,8 @@ See L>. Sighandler_t Perl_rsignal_state(pTHX_ int signo) { + PERL_ARGS_ASSERT_RSIGNAL_STATE; + struct sigaction oact; PERL_UNUSED_CONTEXT; @@ -3009,10 +2957,10 @@ Perl_rsignal_state(pTHX_ int signo) int Perl_rsignal_save(pTHX_ int signo, Sighandler_t handler, Sigsave_t *save) { - struct sigaction act; - PERL_ARGS_ASSERT_RSIGNAL_SAVE; + struct sigaction act; + #ifdef USE_ITHREADS /* only "parent" interpreter can diddle signals */ if (PL_curinterp != aTHX) @@ -3036,7 +2984,9 @@ Perl_rsignal_save(pTHX_ int signo, Sigha int Perl_rsignal_restore(pTHX_ int signo, Sigsave_t *save) { + PERL_ARGS_ASSERT_RSIGNAL_RESTORE; PERL_UNUSED_CONTEXT; + #ifdef USE_ITHREADS /* only "parent" interpreter can diddle signals */ if (PL_curinterp != aTHX) @@ -3051,6 +3001,8 @@ Perl_rsignal_restore(pTHX_ int signo, Si Sighandler_t Perl_rsignal(pTHX_ int signo, Sighandler_t handler) { + PERL_ARGS_ASSERT_RSIGNAL; + #if defined(USE_ITHREADS) && !defined(WIN32) /* only "parent" interpreter can diddle signals */ if (PL_curinterp != aTHX) @@ -3063,12 +3015,15 @@ Perl_rsignal(pTHX_ int signo, Sighandler static Signal_t sig_trap(int signo) { + PERL_UNUSED_ARG(signo); PL_sig_trapped++; } Sighandler_t Perl_rsignal_state(pTHX_ int signo) { + PERL_ARGS_ASSERT_RSIGNAL_STATE; + Sighandler_t oldsig; #if defined(USE_ITHREADS) && !defined(WIN32) @@ -3100,6 +3055,8 @@ Perl_rsignal_save(pTHX_ int signo, Sigha int Perl_rsignal_restore(pTHX_ int signo, Sigsave_t *save) { + PERL_ARGS_ASSERT_RSIGNAL_RESTORE; + #if defined(USE_ITHREADS) && !defined(WIN32) /* only "parent" interpreter can diddle signals */ if (PL_curinterp != aTHX) @@ -3126,6 +3083,8 @@ version knows things that interact with I32 Perl_my_pclose(pTHX_ PerlIO *ptr) { + PERL_ARGS_ASSERT_MY_PCLOSE; + int status; SV **svp; Pid_t pid; @@ -3176,6 +3135,8 @@ Perl_my_pclose(pTHX_ PerlIO *ptr) I32 Perl_my_pclose(pTHX_ PerlIO *ptr) { + PERL_ARGS_ASSERT_MY_PCLOSE; + return -1; } #endif /* !DOSISH */ @@ -3184,8 +3145,9 @@ Perl_my_pclose(pTHX_ PerlIO *ptr) I32 Perl_wait4pid(pTHX_ Pid_t pid, int *statusp, int flags) { - I32 result = 0; PERL_ARGS_ASSERT_WAIT4PID; + + I32 result = 0; #ifdef PERL_USES_PL_PIDSTATUS if (!pid) { /* PERL_USES_PL_PIDSTATUS is only defined when neither @@ -3272,9 +3234,11 @@ Perl_wait4pid(pTHX_ Pid_t pid, int *stat #endif /* !DOSISH || OS2 || WIN32 */ #ifdef PERL_USES_PL_PIDSTATUS -void +static void S_pidgone(pTHX_ Pid_t pid, int status) { + PERL_ARGS_ASSERT_PIDGONE; + SV *sv; sv = *hv_fetch(PL_pidstatus,(const char*)&pid,sizeof(Pid_t),TRUE); @@ -3295,6 +3259,8 @@ I32 Perl_my_pclose(pTHX_ PerlIO *ptr) #endif { + PERL_ARGS_ASSERT_MY_PCLOSE; + /* Needs work for PerlIO ! */ FILE * const f = PerlIO_findFILE(ptr); const I32 result = pclose(f); @@ -3355,14 +3321,14 @@ Perl_repeatcpy(char *to, const char *fro I32 Perl_same_dirent(pTHX_ const char *a, const char *b) { + PERL_ARGS_ASSERT_SAME_DIRENT; + char *fa = strrchr(a,'/'); char *fb = strrchr(b,'/'); Stat_t tmpstatbuf1; Stat_t tmpstatbuf2; SV * const tmpsv = sv_newmortal(); - PERL_ARGS_ASSERT_SAME_DIRENT; - if (fa) fa++; else @@ -3394,11 +3360,13 @@ char* Perl_find_script(pTHX_ const char *scriptname, bool dosearch, const char *const *const search_ext, I32 flags) { + PERL_ARGS_ASSERT_FIND_SCRIPT; + const char *xfound = NULL; char *xfailed = NULL; char tmpbuf[MAXPATHLEN]; char *s; - I32 len = 0; + size_t len = 0; int retval; char *bufend; #if defined(DOSISH) && !defined(OS2) @@ -3424,8 +3392,6 @@ Perl_find_script(pTHX_ const char *scrip # define MAX_EXT_LEN 0 #endif - PERL_ARGS_ASSERT_FIND_SCRIPT; - /* * If dosearch is true and if scriptname does not contain path * delimiters, search the PATH for scriptname. @@ -3538,13 +3504,26 @@ Perl_find_script(pTHX_ const char *scrip if (len < sizeof tmpbuf) tmpbuf[len] = '\0'; # else - s = delimcpy_no_escape(tmpbuf, tmpbuf + sizeof tmpbuf, s, bufend, - ':', &len); + { + I32 n; + s = delimcpy_no_escape(tmpbuf, tmpbuf + sizeof tmpbuf, s, + bufend, ':', &n); + assert(n >= 0); + len = n; + } # endif if (s < bufend) s++; - if (len + 1 + strlen(scriptname) + MAX_EXT_LEN >= sizeof tmpbuf) - continue; /* don't search dir with too-long name */ + { + const size_t + available_len = sizeof tmpbuf - MAX_EXT_LEN - 1, + scriptname_len = strlen(scriptname); + if ( + scriptname_len >= available_len || + len >= available_len - scriptname_len + ) + continue; /* don't search dir with too-long name */ + } if (len # ifdef DOSISH && tmpbuf[len - 1] != '/' @@ -3667,11 +3646,15 @@ Given an opcode from the enum in F on I32 Perl_my_fflush_all(pTHX) { + PERL_ARGS_ASSERT_MY_FFLUSH_ALL; + #if defined(USE_PERLIO) || defined(FFLUSH_NULL) return PerlIO_flush(NULL); #else @@ -3781,6 +3777,8 @@ Perl_my_fflush_all(pTHX) void Perl_report_wrongway_fh(pTHX_ const GV *gv, const char have) { + PERL_ARGS_ASSERT_REPORT_WRONGWAY_FH; + if (ckWARN(WARN_IO)) { HEK * const name = gv && (isGV_with_GP(gv)) @@ -3801,6 +3799,8 @@ Perl_report_wrongway_fh(pTHX_ const GV * void Perl_report_evil_fh(pTHX_ const GV *gv) { + PERL_ARGS_ASSERT_REPORT_EVIL_FH; + const IO *io = gv ? GvIO(gv) : NULL; const PERL_BITFIELD16 op = PL_op->op_type; const char *vile; @@ -3837,8 +3837,7 @@ Perl_report_evil_fh(pTHX_ const GV *gv) have_name ? " " : "", SVfARG(have_name ? name : &PL_sv_no)); if (io && IoDIRP(io) && !(IoFLAGS(io) & IOf_FAKE_DIRP)) - Perl_warner( - aTHX_ packWARN(warn_type), + warner(packWARN(warn_type), "\t(Are you trying to call %s%s on dirhandle%s%" SVf "?)\n", func, pars, have_name ? " " : "", SVfARG(have_name ? name : &PL_sv_no) @@ -3871,11 +3870,12 @@ Perl_report_evil_fh(pTHX_ const GV *gv) void Perl_init_tm(pTHX_ struct tm *ptm) /* see mktime, strftime and asctime */ { + PERL_ARGS_ASSERT_INIT_TM; + PERL_UNUSED_CONTEXT; + #ifdef HAS_TM_TM_ZONE Time_t now; const struct tm* my_tm; - PERL_UNUSED_CONTEXT; - PERL_ARGS_ASSERT_INIT_TM; (void)time(&now); LOCALTIME_LOCK; @@ -3884,8 +3884,6 @@ Perl_init_tm(pTHX_ struct tm *ptm) /* se Copy(my_tm, ptm, 1, struct tm); LOCALTIME_UNLOCK; #else - PERL_UNUSED_CONTEXT; - PERL_ARGS_ASSERT_INIT_TM; PERL_UNUSED_ARG(ptm); #endif } @@ -3901,13 +3899,13 @@ overhead) of mktime(). void Perl_mini_mktime(struct tm *ptm) { + PERL_ARGS_ASSERT_MINI_MKTIME; + int yearday; int secs; int month, mday, year, jday; int odd_cent, odd_year; - PERL_ARGS_ASSERT_MINI_MKTIME; - #define DAYS_PER_YEAR 365 #define DAYS_PER_QYEAR (4*DAYS_PER_YEAR+1) #define DAYS_PER_CENT (25*DAYS_PER_QYEAR-1) @@ -4114,10 +4112,10 @@ Fill C with current working director int Perl_getcwd_sv(pTHX_ SV *sv) { - SvTAINTED_on(sv); - PERL_ARGS_ASSERT_GETCWD_SV; + SvTAINTED_on(sv); + #ifdef HAS_GETCWD { char buf[MAXPATHLEN]; @@ -4521,6 +4519,8 @@ Perl_my_socketpair (int family, int type * to the my_socketpair in embed.fnc. */ int Perl_my_socketpair (int family, int type, int protocol, int fd[2]) { + PERL_ARGS_ASSERT_MY_SOCKETPAIR; + #ifdef HAS_SOCKETPAIR return socketpair(family, type, protocol, fd); #else @@ -4545,6 +4545,7 @@ potentially warn under some level of str void Perl_sv_nosharing(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_NOSHARING; PERL_UNUSED_CONTEXT; PERL_UNUSED_ARG(sv); } @@ -4564,19 +4565,21 @@ could potentially warn under some level bool Perl_sv_destroyable(pTHX_ SV *sv) { + PERL_ARGS_ASSERT_SV_DESTROYABLE; PERL_UNUSED_CONTEXT; PERL_UNUSED_ARG(sv); + return TRUE; } U32 Perl_parse_unicode_opts(pTHX_ const char **popt) { + PERL_ARGS_ASSERT_PARSE_UNICODE_OPTS; + const char *p = *popt; U32 opt = 0; - PERL_ARGS_ASSERT_PARSE_UNICODE_OPTS; - if (*p) { if (isDIGIT(*p)) { const char* endptr = p + strlen(p); @@ -4647,75 +4650,33 @@ Perl_parse_unicode_opts(pTHX_ const char # include #endif -/* hash a pointer and return a U32 */ +/* Splitmix64 is a simple PRNG and integer hashing function. It was + * introduced in 2015: https://gee.cs.oswego.edu/dl/papers/oopsla14.pdf + * Examples: https://rosettacode.org/wiki/Pseudo-random_numbers/Splitmix64 + */ +static U64 +splitmix64(U64 *state) +{ + U64 z = (*state += 0x9e3779b97f4a7c15); + z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9; + z = (z ^ (z >> 27)) * 0x94d049bb133111eb; -PERL_STATIC_INLINE U32 S_ptr_hash(PTRV u) { -/* 64 bit input */ -#if PTRSIZE == 8 - /* - * This is one of Thomas Wang's hash functions for 64-bit integers from: - * https://gist.github.com/scottchiefbaker/9e21877a0c6041fbf54bd583cd1c52b4 - */ - u = (~u) + (u << 18); - u = u ^ (u >> 31); - u = u * 21; - u = u ^ (u >> 11); - u = u + (u << 6); - u = u ^ (u >> 22); -/* 32 bit input */ -#else - /* - * This is one of Bob Jenkins' hash functions for 32-bit integers - * from: https://burtleburtle.net/bob/hash/integer.html - */ - u = (u + 0x7ed55d16) + (u << 12); - u = (u ^ 0xc761c23c) ^ (u >> 19); - u = (u + 0x165667b1) + (u << 5); - u = (u + 0xd3a2646c) ^ (u << 9); - u = (u + 0xfd7046c5) + (u << 3); - u = (u ^ 0xb55a4f09) ^ (u >> 16); -#endif - return (U32)u; + return z ^ (z >> 31); } - -U32 +U64 Perl_seed(pTHX) { -#if defined(__OpenBSD__) - return arc4random(); -#else - /* - * This is really just a quick hack which grabs various garbage - * values. It really should be a real hash algorithm which - * spreads the effect of every input bit onto every output bit, - * if someone who knows about such things would bother to write it. - * Might be a good idea to add that function to CORE as well. - * No numbers below come from careful analysis or anything here, - * except they are primes and SEED_C1 > 1E6 to get a full-width - * value from (tv_sec * SEED_C1 + tv_usec). The multipliers should - * probably be bigger too. - */ -#if RANDBITS > 16 -# define SEED_C1 1000003 -#define SEED_C4 73819 -#else -# define SEED_C1 25747 -#define SEED_C4 20639 -#endif -#define SEED_C2 3 -#define SEED_C3 269 -#define SEED_C5 26107 + PERL_ARGS_ASSERT_SEED; -#ifndef PERL_NO_DEV_RANDOM - int fd; -#endif - U32 u; -#ifdef HAS_GETTIMEOFDAY - struct timeval when; +#if defined(__OpenBSD__) + return arc4random(); #else - Time_t when; -#endif + /* + * Attempt to read from /dev/urandom to generate a pseudo-random number. + * If that does not work, or it is unavailable, we fall back to gathering + * several state variables and hashing them into a seed value. + */ /* This test is an escape hatch, this symbol isn't set by Configure. */ #ifndef PERL_NO_DEV_RANDOM @@ -4725,48 +4686,79 @@ Perl_seed(pTHX) * PERL_RANDOM_DEVICE to it if you'd prefer Perl to block until there * is enough real entropy to fill the seed. */ # ifdef __amigaos4__ -# define PERL_RANDOM_DEVICE "RANDOM:SIZE=4" + /* https://wiki.amigaos.net/wiki/AmigaOS_Manual%3A_AmigaDOS_Additional_Amiga_Directories#Random-Handler_(RANDOM:) */ +# define PERL_RANDOM_DEVICE "RANDOM:" # else # define PERL_RANDOM_DEVICE "/dev/urandom" # endif #endif - fd = PerlLIO_open_cloexec(PERL_RANDOM_DEVICE, 0); + U64 seed; + +#ifdef HAS_GETENTROPY + U8 ok = (getentropy(&seed, sizeof(seed)) == 0); + /* PerlIO_printf(Perl_debug_log, "Entropy: OK:%i Seed:%lu\n", ok, seed); */ + if (ok) { + return seed; + } +#endif + + int fd = PerlLIO_open_cloexec(PERL_RANDOM_DEVICE, 0); if (fd != -1) { - if (PerlLIO_read(fd, (void*)&u, sizeof u) != sizeof u) - u = 0; + if (PerlLIO_read(fd, (void*)&seed, sizeof seed) != sizeof seed) { + seed = 0; + } + PerlLIO_close(fd); - if (u) - return u; + + if (seed) { + return seed; + } } #endif + /* We only get this far if /dev/urandom is not available or the read fails. + * Grab several state variables and hash those for randomness instead. */ + #ifdef HAS_GETTIMEOFDAY + struct timeval when; + PerlProc_gettimeofday(&when,NULL); - u = (U32)SEED_C1 * when.tv_sec + (U32)SEED_C2 * when.tv_usec; + /* Milliseconds */ + U64 epoch = ((U64)when.tv_sec * 1000000) + when.tv_usec; #else + Time_t when; + (void)time(&when); - u = (U32)SEED_C1 * when; -#endif - u += SEED_C3 * (U32)PerlProc_getpid(); - u += SEED_C4 * (U32)PTR2UV(PL_stack_sp); -#ifndef PLAN9 /* XXX Plan9 assembler chokes on this; fix needed */ - UV ptruv = PTR2UV(&when); - u += SEED_C5 * ptr_hash(ptruv); + /* Seconds */ + U64 epoch = when; #endif - return u; + + UV pid = PerlProc_getpid(); + UV time_ptr = PTR2UV(&when); + UV stack_ptr = PTR2UV(PL_stack_sp); + + /* epoch in microseconds is ~52 bits, PIDs are ~22 bits, PTRs are ~48 bits. + * We mix the bits for all four together to get a good spread of entropy */ + U64 tmp = ROTL64(time_ptr, 16) ^ ROTL32(pid, 8) ^ epoch ^ stack_ptr; + U64 ret = splitmix64(&tmp); + + /* PerlIO_printf(Perl_debug_log, "XXXX: TIME:%lu PID:%lu PTR:%lu\n", epoch, pid, time_ptr); */ + /* PerlIO_printf(Perl_debug_log, "SEED: %lu\n", ret); */ + + return ret; #endif } void Perl_get_hash_seed(pTHX_ unsigned char * const seed_buffer) { + PERL_ARGS_ASSERT_GET_HASH_SEED; + #ifndef NO_PERL_HASH_ENV const char *env_pv; #endif unsigned long i; - PERL_ARGS_ASSERT_GET_HASH_SEED; - Zero(seed_buffer, PERL_HASH_SEED_BYTES, U8); Zero((U8*)PL_hash_state_w, PERL_HASH_STATE_BYTES, U8); @@ -4934,24 +4926,24 @@ Perl_debug_hash_seed(pTHX_ bool via_debu # ifdef DEBUG_LEAKING_SCALARS # define SV_LOG_SERIAL_FMT " [%lu]" -# define _SV_LOG_SERIAL_ARG(sv) , (unsigned long) (sv)->sv_debug_serial +# define SV_LOG_SERIAL_ARG_(sv) , (unsigned long) (sv)->sv_debug_serial # else # define SV_LOG_SERIAL_FMT -# define _SV_LOG_SERIAL_ARG(sv) +# define SV_LOG_SERIAL_ARG_(sv) # endif static void -S_mem_log_common(enum mem_log_type mlt, const UV n, +S_mem_log_common(enum mem_log_type mlt, const UV n, const UV typesize, const char *type_name, const SV *sv, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname) { + PERL_ARGS_ASSERT_MEM_LOG_COMMON; + const char *pmlenv; dTHX; - PERL_ARGS_ASSERT_MEM_LOG_COMMON; - PL_mem_log[0] |= 0x2; /* Flag that the call is from this code */ pmlenv = PerlEnv_getenv("PERL_MEM_LOG"); PL_mem_log[0] &= ~0x2; @@ -5024,7 +5016,7 @@ S_mem_log_common(enum mem_log_type mlt, "%s_SV: %s:%d:%s: %" UVxf SV_LOG_SERIAL_FMT "\n", mlt == MLT_NEW_SV ? "new" : "del", filename, linenumber, funcname, - PTR2UV(sv) _SV_LOG_SERIAL_ARG(sv)); + PTR2UV(sv) SV_LOG_SERIAL_ARG_(sv)); break; default: len = 0; @@ -5039,7 +5031,7 @@ S_mem_log_common(enum mem_log_type mlt, CopFILE(PL_curcop), CopLINE(PL_curcop)); PERL_UNUSED_RESULT(PerlLIO_write(fd, buf, len)); - Perl_c_backtrace *bt = Perl_get_c_backtrace(aTHX_ 3, 3); + Perl_c_backtrace *bt = get_c_backtrace(3, 3); Perl_c_backtrace_frame *frame; UV i; for (i = 0, frame = bt->frame_info; @@ -5077,7 +5069,7 @@ S_mem_log_common(enum mem_log_type mlt, Malloc_t Perl_mem_log_alloc(const UV n, const UV typesize, const char *type_name, - Malloc_t newalloc, + Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname) { @@ -5091,32 +5083,32 @@ Perl_mem_log_alloc(const UV n, const UV Malloc_t Perl_mem_log_realloc(const UV n, const UV typesize, const char *type_name, - Malloc_t oldalloc, Malloc_t newalloc, - const char *filename, const int linenumber, + Malloc_t oldalloc, Malloc_t newalloc, + const char *filename, const int linenumber, const char *funcname) { PERL_ARGS_ASSERT_MEM_LOG_REALLOC; mem_log_common_if(MLT_REALLOC, n, typesize, type_name, - NULL, oldalloc, newalloc, + NULL, oldalloc, newalloc, filename, linenumber, funcname); return newalloc; } Malloc_t -Perl_mem_log_free(Malloc_t oldalloc, - const char *filename, const int linenumber, +Perl_mem_log_free(Malloc_t oldalloc, + const char *filename, const int linenumber, const char *funcname) { PERL_ARGS_ASSERT_MEM_LOG_FREE; - mem_log_common_if(MLT_FREE, 0, 0, "", NULL, oldalloc, NULL, + mem_log_common_if(MLT_FREE, 0, 0, "", NULL, oldalloc, NULL, filename, linenumber, funcname); return oldalloc; } void -Perl_mem_log_new_sv(const SV *sv, +Perl_mem_log_new_sv(const SV *sv, const char *filename, const int linenumber, const char *funcname) { @@ -5128,12 +5120,12 @@ Perl_mem_log_new_sv(const SV *sv, void Perl_mem_log_del_sv(const SV *sv, - const char *filename, const int linenumber, + const char *filename, const int linenumber, const char *funcname) { PERL_ARGS_ASSERT_MEM_LOG_DEL_SV; - mem_log_common_if(MLT_DEL_SV, 0, 0, "", sv, NULL, NULL, + mem_log_common_if(MLT_DEL_SV, 0, 0, "", sv, NULL, NULL, filename, linenumber, funcname); } @@ -5162,10 +5154,10 @@ See also L. bool Perl_quadmath_format_valid(const char* format) { - STRLEN len; - PERL_ARGS_ASSERT_QUADMATH_FORMAT_VALID; + STRLEN len; + if (format[0] != '%' || strchr(format + 1, '%')) return FALSE; len = strlen(format); @@ -5202,11 +5194,11 @@ In this case, the code should probably f bool Perl_quadmath_format_needed(const char* format) { + PERL_ARGS_ASSERT_QUADMATH_FORMAT_NEEDED; + const char *p = format; const char *q; - PERL_ARGS_ASSERT_QUADMATH_FORMAT_NEEDED; - while ((q = strchr(p, '%'))) { q++; if (*q == '+') /* plus */ @@ -5251,11 +5243,12 @@ getting C. int Perl_my_snprintf(char *buffer, const Size_t len, const char *format, ...) { + PERL_ARGS_ASSERT_MY_SNPRINTF; + int retval = -1; va_list ap; dTHX; - PERL_ARGS_ASSERT_MY_SNPRINTF; #ifndef HAS_VSNPRINTF PERL_UNUSED_VAR(len); #endif @@ -5342,6 +5335,8 @@ C instead, or getting C= 2) /* version supplied as bootstrap arg */ sv = PL_stack_base[ax + 1]; else { @@ -5717,14 +5714,15 @@ S_xs_version_bootcheck(pTHX_ SSize_t ite } } if (sv) { - SV *xssv = Perl_newSVpvn_flags(aTHX_ xs_p, xs_len, SVs_TEMP); + SV *xssv = newSVpvn_flags(xs_p, xs_len, SVs_TEMP); SV *pmsv = sv_isobject(sv) && sv_derived_from(sv, "version") ? sv : sv_2mortal(new_version(sv)); xssv = upg_version(xssv, 0); if ( vcmp(pmsv,xssv) ) { SV *string = vstringify(xssv); - SV *xpt = Perl_newSVpvf(aTHX_ "%" SVf " object version %" SVf - " does not match ", SVfARG(module), SVfARG(string)); + SV *xpt = newSVpvf("%" SVf " object version %" SVf + " does not match ", + SVfARG(module), SVfARG(string)); SvREFCNT_dec(string); string = vstringify(pmsv); @@ -5737,12 +5735,55 @@ S_xs_version_bootcheck(pTHX_ SSize_t ite } SvREFCNT_dec(string); - Perl_sv_2mortal(aTHX_ xpt); - Perl_croak_sv(aTHX_ xpt); + sv_2mortal(xpt); + croak_sv(xpt); } } } +/* +=for apidoc api_version_assert + +Used by the PERL_API_VERSION_CHECK macro to compare the perl the +object was built with and the perl that C was built with. + +This can be used to ensure that these match and produces a more +diagnosable than random crashes and mis-behaviour. + +=cut +*/ + +void +Perl_api_version_assert(size_t interp_size, void *v_my_perl, + const char *api_version) { + PERL_ARGS_ASSERT_API_VERSION_ASSERT; + + dTHX; + + if (interp_size != sizeof(PerlInterpreter)) { + /* detects various types of configuration mismatches */ + /* diag_listed_as: Mismatch between expected and libperl %s */ + croak("Mismatch between expected and libperl interpreter structure" + " size %zd vs %zd", interp_size, sizeof(PerlInterpreter)); + } + if ( +#ifdef MULTIPLICITY + v_my_perl != my_perl +#else + v_my_perl != NULL +#endif + ) { + /* detect threads vs non-threads mismatch */ + /* diag_listed_as: Mismatch between expected and libperl %s */ + croak("Mismatch between expected and libperl interpreter pointer"); + } + if (strNE(api_version, PERL_API_VERSION_STRING)) { + /* diag_listed_as: Mismatch between expected and libperl %s */ + croak("Mismatch between expected and libperl API versions %s vs %s", + api_version, PERL_API_VERSION_STRING); + } +} + PERL_STATIC_INLINE bool S_gv_has_usable_name(pTHX_ GV *gv) { @@ -5758,6 +5799,8 @@ S_gv_has_usable_name(pTHX_ GV *gv) void Perl_get_db_sub(pTHX_ SV **svp, CV *cv) { + PERL_ARGS_ASSERT_GET_DB_SUB; + SV * const dbsv = GvSVn(PL_DBsub); const bool save_taint = TAINT_get; @@ -5766,8 +5809,6 @@ Perl_get_db_sub(pTHX_ SV **svp, CV *cv) * it's for informational purposes only. */ - PERL_ARGS_ASSERT_GET_DB_SUB; - TAINT_set(FALSE); save_item(dbsv); if (!PERLDB_SUB_NN) { @@ -5784,7 +5825,7 @@ Perl_get_db_sub(pTHX_ SV **svp, CV *cv) !( (SvTYPE(*svp) == SVt_PVGV) && (GvCV((const GV *)*svp) == cv) /* Use GV from the stack as a fallback. */ - && S_gv_has_usable_name(aTHX_ gv = (GV *)*svp) + && S_gv_has_usable_name(aTHX_ gv = (GV *)*svp) ) ) ) { @@ -5824,7 +5865,9 @@ if not easily emulatable. */ int -Perl_my_dirfd(DIR * dir) { +Perl_my_dirfd(DIR * dir) +{ + PERL_ARGS_ASSERT_MY_DIRFD; /* Most dirfd implementations have problems when passed NULL. */ if(!dir) @@ -5837,7 +5880,7 @@ Perl_my_dirfd(DIR * dir) { Perl_croak_nocontext(PL_no_func, "dirfd"); NOT_REACHED; /* NOTREACHED */ return 0; -#endif +#endif } #if !defined(HAS_MKOSTEMP) || !defined(HAS_MKSTEMP) @@ -5846,7 +5889,8 @@ Perl_my_dirfd(DIR * dir) { #define TEMP_FILE_CH_COUNT (sizeof(TEMP_FILE_CH)-1) static int -S_my_mkostemp(char *templte, int flags) { +S_my_mkostemp(char *templte, int flags) +{ dTHX; STRLEN len = strlen(templte); int fd; @@ -5922,7 +5966,9 @@ Perl_my_mkstemp(char *templte) #endif REGEXP * -Perl_get_re_arg(pTHX_ SV *sv) { +Perl_get_re_arg(pTHX_ SV *sv) +{ + PERL_ARGS_ASSERT_GET_RE_ARG; if (sv) { if (SvMAGICAL(sv)) @@ -5932,7 +5978,7 @@ Perl_get_re_arg(pTHX_ SV *sv) { if (SvTYPE(sv) == SVt_REGEXP) return (REGEXP*) sv; } - + return NULL; } @@ -5974,12 +6020,12 @@ Perl_get_re_arg(pTHX_ SV *sv) { #define FREEBSD_DRAND48_MULT_2 (0x0005) #define FREEBSD_DRAND48_ADD (0x000b) -const unsigned short _rand48_mult[3] = { - FREEBSD_DRAND48_MULT_0, - FREEBSD_DRAND48_MULT_1, - FREEBSD_DRAND48_MULT_2 +static const unsigned short rand48_mult_[3] = { + FREEBSD_DRAND48_MULT_0, + FREEBSD_DRAND48_MULT_1, + FREEBSD_DRAND48_MULT_2 }; -const unsigned short _rand48_add = FREEBSD_DRAND48_ADD; +static const unsigned short rand48_add_ = FREEBSD_DRAND48_ADD; #endif @@ -6012,17 +6058,17 @@ Perl_drand48_r(perl_drand48_t *random_st U32 accu; U16 temp[2]; - accu = (U32) _rand48_mult[0] * (U32) random_state->seed[0] - + (U32) _rand48_add; + accu = (U32) rand48_mult_[0] * (U32) random_state->seed[0] + + (U32) rand48_add_; temp[0] = (U16) accu; /* lower 16 bits */ accu >>= sizeof(U16) * 8; - accu += (U32) _rand48_mult[0] * (U32) random_state->seed[1] - + (U32) _rand48_mult[1] * (U32) random_state->seed[0]; + accu += (U32) rand48_mult_[0] * (U32) random_state->seed[1] + + (U32) rand48_mult_[1] * (U32) random_state->seed[0]; temp[1] = (U16) accu; /* middle 16 bits */ accu >>= sizeof(U16) * 8; - accu += _rand48_mult[0] * random_state->seed[2] - + _rand48_mult[1] * random_state->seed[1] - + _rand48_mult[2] * random_state->seed[0]; + accu += rand48_mult_[0] * random_state->seed[2] + + rand48_mult_[1] * random_state->seed[1] + + rand48_mult_[2] * random_state->seed[0]; random_state->seed[0] = temp[0]; random_state->seed[1] = temp[1]; random_state->seed[2] = (U16) accu; @@ -6183,11 +6229,11 @@ static void atos_update(atos_context* ct if (ctx->unavail) return; if (ctx->tool == NULL) { - const char* tools[] = { + static const char* const tools[] = { "/usr/bin/xcrun", "/usr/bin/atos" }; - const char* formats[] = { + static const char* const formats[] = { "/usr/bin/xcrun atos -o '%s' -l %08x %08x 2>&1", "/usr/bin/atos -d -o '%s' -l %08x %08x 2>&1" }; @@ -6366,6 +6412,8 @@ returning at most C frames. Perl_c_backtrace* Perl_get_c_backtrace(pTHX_ int depth, int skip) { + PERL_ARGS_ASSERT_GET_C_BACKTRACE; + /* Note that here we must stay as low-level as possible: Newx(), * Copy(), Safefree(); since we may be called from anywhere, * so we should avoid higher level constructs like SVs or AVs. @@ -6635,6 +6683,8 @@ if the optimizer has transformed the cod SV* Perl_get_c_backtrace_dump(pTHX_ int depth, int skip) { + PERL_ARGS_ASSERT_GET_C_BACKTRACE_DUMP; + Perl_c_backtrace* bt; bt = get_c_backtrace(depth, skip + 1 /* Hide ourselves. */); @@ -6698,11 +6748,9 @@ Returns true if a backtrace could be ret bool Perl_dump_c_backtrace(pTHX_ PerlIO* fp, int depth, int skip) { - SV* sv; - PERL_ARGS_ASSERT_DUMP_C_BACKTRACE; - sv = Perl_get_c_backtrace_dump(aTHX_ depth, skip); + SV* sv = get_c_backtrace_dump(depth, skip); if (sv) { sv_2mortal(sv); PerlIO_printf(fp, "%s", SvPV_nolen(sv)); @@ -6742,14 +6790,14 @@ int perl_tsa_mutex_destroy(perl_mutex* m void Perl_dtrace_probe_call(pTHX_ CV *cv, bool is_call) { + PERL_ARGS_ASSERT_DTRACE_PROBE_CALL; + const char *func; const char *file; const char *stash; const COP *start; line_t line; - PERL_ARGS_ASSERT_DTRACE_PROBE_CALL; - if (CvNAMED(cv)) { HEK *hek = CvNAME_HEK(cv); func = HEK_KEY(hek); @@ -6804,6 +6852,8 @@ Perl_dtrace_probe_op(pTHX_ const OP *op) void Perl_dtrace_probe_phase(pTHX_ enum perl_phase phase) { + PERL_ARGS_ASSERT_DTRACE_PROBE_PHASE; + const char *ph_old = PL_phase_names[PL_phase]; const char *ph_new = PL_phase_names[phase]; Index: gnu/usr.bin/perl/util.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/util.h,v diff -u -p -a -u -p -r1.20 util.h --- gnu/usr.bin/perl/util.h 26 Dec 2025 22:14:13 -0000 1.20 +++ gnu/usr.bin/perl/util.h 16 Nov 2026 00:57:40 -0000 @@ -11,6 +11,29 @@ #ifndef PERL_UTIL_H_ #define PERL_UTIL_H_ +/* Calling Perl_(croak|die)_nocontext instead of plain Perl_(croak|die) is one + * less argument to pass under threads, so each instance takes up fewer bytes + * (but the nocontext function has to derive the thread context itself, taking + * more time). We trade time for less space here, because time is rarely a + * critical resource when you are about to throw an exception. */ +#define croak(...) Perl_croak_nocontext(__VA_ARGS__) +#define die(...) Perl_die_nocontext(__VA_ARGS__) +#ifndef MULTIPLICITY +# define Perl_croak_nocontext Perl_croak +# define Perl_die_nocontext Perl_die +#endif + +/* +=for apidoc_section $warning + +=for apidoc qerror + +A deprecated alias for L. + +=cut +*/ + +#define qerror(err) defer_error(err) #ifdef VMS # define PERL_FILE_IS_ABSOLUTE(f) \ @@ -240,13 +263,16 @@ returning NULL if not found. The termin =cut */ - -#define Perl_instr(haystack, needle) strstr(haystack, needle) +/* The casting away const is because some implementations of strstr() have + * haystack not declared const, even though POSIX requires it to be const. + * This allows them to compile; we've never had a problem with the function + * zapping the 'haystack' */ +#define instr(haystack, needle) strstr( (char *) haystack, needle) #ifdef HAS_MEMMEM # define ninstr(big, bigend, little, lend) \ - (__ASSERT_(bigend >= big) \ - __ASSERT_(lend >= little) \ + (assert(bigend >= big), \ + assert(lend >= little), \ (char *) memmem((big), (bigend) - (big), \ (little), (lend) - (little))) #else Index: gnu/usr.bin/perl/vutil.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/vutil.c,v diff -u -p -a -u -p -r1.24 vutil.c --- gnu/usr.bin/perl/vutil.c 26 Dec 2025 22:15:22 -0000 1.24 +++ gnu/usr.bin/perl/vutil.c 16 Nov 2026 00:57:40 -0000 @@ -56,9 +56,6 @@ Perl_prescan_version(pTHX_ const char *s PERL_ARGS_ASSERT_PRESCAN_VERSION; PERL_UNUSED_CONTEXT; - if (qv && isDIGIT(*d)) - goto dotted_decimal_version; - if (*d == 'v') { /* explicit v-string */ d++; if (isDIGIT(*d)) { @@ -68,7 +65,9 @@ Perl_prescan_version(pTHX_ const char *s /* requires v1.2.3 */ BADVERSION(s,errstr,"Invalid version format (dotted-decimal versions require at least three parts)"); } + } + if (qv && isDIGIT(*d)) { dotted_decimal_version: if (strict && d[0] == '0' && isDIGIT(d[1])) { /* no leading zeros allowed */ @@ -1017,7 +1016,7 @@ Perl_vnumify(pTHX_ SV *vs) { SV * tsv = *av_fetch(av, i, 0); digit = SvIV(tsv); - sv_catpvf(sv, "%03d", (int)digit); + Perl_sv_catpvf(aTHX_ sv, "%03d", (int)digit); } if ( len == 0 ) { @@ -1075,7 +1074,7 @@ Perl_vnormal(pTHX_ SV *vs) for ( i = 1 ; i <= len ; i++ ) { SV * tsv = *av_fetch(av, i, 0); digit = SvIV(tsv); - sv_catpvf(sv, ".%" IVdf, (IV)digit); + Perl_sv_catpvf(aTHX_ sv, ".%" IVdf, (IV)digit); } if ( len <= 2 ) { /* short version, must be at least three */ Index: gnu/usr.bin/perl/warnings.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/warnings.h,v diff -u -p -a -u -p -r1.10 warnings.h --- gnu/usr.bin/perl/warnings.h 26 Dec 2025 22:14:13 -0000 1.10 +++ gnu/usr.bin/perl/warnings.h 16 Nov 2026 00:57:40 -0000 @@ -82,89 +82,91 @@ /* Warnings Categories added in Perl 5.011003 */ -#define WARN_DEPRECATED__GOTO_CONSTRUCT 48 -#define WARN_DEPRECATED__UNICODE_PROPERTY_NAME 49 +#define WARN_DEPRECATED__UNICODE_PROPERTY_NAME 48 /* Warnings Categories added in Perl 5.013 */ -#define WARN_NON_UNICODE 50 -#define WARN_NONCHAR 51 -#define WARN_SURROGATE 52 +#define WARN_NON_UNICODE 49 +#define WARN_NONCHAR 50 +#define WARN_SURROGATE 51 /* Warnings Categories added in Perl 5.017 */ -#define WARN_EXPERIMENTAL 53 -#define WARN_EXPERIMENTAL__REGEX_SETS 54 +#define WARN_EXPERIMENTAL 52 +#define WARN_EXPERIMENTAL__REGEX_SETS 53 /* Warnings Categories added in Perl 5.019 */ -#define WARN_SYSCALLS 55 +#define WARN_SYSCALLS 54 /* Warnings Categories added in Perl 5.021 */ -#define WARN_EXPERIMENTAL__RE_STRICT 56 -#define WARN_EXPERIMENTAL__REFALIASING 57 -#define WARN_LOCALE 58 -#define WARN_MISSING 59 -#define WARN_REDUNDANT 60 +#define WARN_EXPERIMENTAL__RE_STRICT 55 +#define WARN_EXPERIMENTAL__REFALIASING 56 +#define WARN_LOCALE 57 +#define WARN_MISSING 58 +#define WARN_REDUNDANT 59 /* Warnings Categories added in Perl 5.025 */ -#define WARN_EXPERIMENTAL__DECLARED_REFS 61 +#define WARN_EXPERIMENTAL__DECLARED_REFS 60 /* Warnings Categories added in Perl 5.025011 */ -#define WARN_DEPRECATED__DOT_IN_INC 62 +#define WARN_DEPRECATED__DOT_IN_INC 61 /* Warnings Categories added in Perl 5.027 */ -#define WARN_SHADOW 63 +#define WARN_SHADOW 62 /* Warnings Categories added in Perl 5.029 */ -#define WARN_EXPERIMENTAL__PRIVATE_USE 64 -#define WARN_EXPERIMENTAL__UNIPROP_WILDCARDS 65 -#define WARN_EXPERIMENTAL__VLB 66 +#define WARN_EXPERIMENTAL__PRIVATE_USE 63 +#define WARN_EXPERIMENTAL__UNIPROP_WILDCARDS 64 +#define WARN_EXPERIMENTAL__VLB 65 /* Warnings Categories added in Perl 5.033 */ -#define WARN_EXPERIMENTAL__TRY 67 +#define WARN_EXPERIMENTAL__TRY 66 /* Warnings Categories added in Perl 5.035 */ -#define WARN_EXPERIMENTAL__ARGS_ARRAY_WITH_SIGNATURES 68 -#define WARN_EXPERIMENTAL__BUILTIN 69 -#define WARN_EXPERIMENTAL__DEFER 70 -#define WARN_EXPERIMENTAL__EXTRA_PAIRED_DELIMITERS 71 -#define WARN_SCALAR 72 +#define WARN_EXPERIMENTAL__ARGS_ARRAY_WITH_SIGNATURES 67 +#define WARN_EXPERIMENTAL__BUILTIN 68 +#define WARN_EXPERIMENTAL__DEFER 69 +#define WARN_EXPERIMENTAL__EXTRA_PAIRED_DELIMITERS 70 +#define WARN_SCALAR 71 /* Warnings Categories added in Perl 5.035009 */ -#define WARN_DEPRECATED__VERSION_DOWNGRADE 73 +#define WARN_DEPRECATED__VERSION_DOWNGRADE 72 /* Warnings Categories added in Perl 5.03501 */ -#define WARN_DEPRECATED__DELIMITER_WILL_BE_PAIRED 74 +#define WARN_DEPRECATED__DELIMITER_WILL_BE_PAIRED 73 /* Warnings Categories added in Perl 5.037 */ -#define WARN_EXPERIMENTAL__CLASS 75 - -/* Warnings Categories added in Perl 5.039002 */ - -#define WARN_DEPRECATED__MISSING_IMPORT_CALLED_WITH_ARGS 76 +#define WARN_EXPERIMENTAL__CLASS 74 /* Warnings Categories added in Perl 5.039008 */ -#define WARN_DEPRECATED__SUBSEQUENT_USE_VERSION 77 +#define WARN_DEPRECATED__SUBSEQUENT_USE_VERSION 75 /* Warnings Categories added in Perl 5.041 */ -#define WARN_EXPERIMENTAL__KEYWORD_ALL 78 -#define WARN_EXPERIMENTAL__KEYWORD_ANY 79 -#define WARNsize 20 -#define WARN_ALLstring "\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125" -#define WARN_NONEstring "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" +#define WARN_EXPERIMENTAL__KEYWORD_ALL 76 +#define WARN_EXPERIMENTAL__KEYWORD_ANY 77 + +/* Warnings Categories added in Perl 5.043 */ + +#define WARN_EXPERIMENTAL__ENHANCED_XX 78 +#define WARN_EXPERIMENTAL__SIGNATURE_NAMED_PARAMETERS 79 +#define WARN_MISSING_IMPORT 80 +#define WARNsize 21 +#define WARN_ALLstring "\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125" +#define WARN_NONEstring "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" +#define WARN_DEFAULTstring "\x10\x01\x00\x00\x00\x50\x04\x00\x00\x00\x00\x00\x01\x40\x05\x45\x55\x15\x55\x55\x01" #define isLEXWARN_on \ cBOOL(PL_curcop && PL_curcop->cop_warnings != pWARN_STD) @@ -324,7 +326,6 @@ category parameters passed. =for apidoc Amnh||WARN_VOID =for apidoc Amnh||WARN_IMPRECISION =for apidoc Amnh||WARN_ILLEGALPROTO -=for apidoc Amnh||WARN_DEPRECATED__GOTO_CONSTRUCT =for apidoc Amnh||WARN_DEPRECATED__UNICODE_PROPERTY_NAME =for apidoc Amnh||WARN_NON_UNICODE =for apidoc Amnh||WARN_NONCHAR @@ -352,10 +353,12 @@ category parameters passed. =for apidoc Amnh||WARN_DEPRECATED__VERSION_DOWNGRADE =for apidoc Amnh||WARN_DEPRECATED__DELIMITER_WILL_BE_PAIRED =for apidoc Amnh||WARN_EXPERIMENTAL__CLASS -=for apidoc Amnh||WARN_DEPRECATED__MISSING_IMPORT_CALLED_WITH_ARGS =for apidoc Amnh||WARN_DEPRECATED__SUBSEQUENT_USE_VERSION =for apidoc Amnh||WARN_EXPERIMENTAL__KEYWORD_ALL =for apidoc Amnh||WARN_EXPERIMENTAL__KEYWORD_ANY +=for apidoc Amnh||WARN_EXPERIMENTAL__ENHANCED_XX +=for apidoc Amnh||WARN_EXPERIMENTAL__SIGNATURE_NAMED_PARAMETERS +=for apidoc Amnh||WARN_MISSING_IMPORT =cut */ Index: gnu/usr.bin/perl/zaphod32_hash.h =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/zaphod32_hash.h,v diff -u -p -a -u -p -r1.1.1.4 zaphod32_hash.h --- gnu/usr.bin/perl/zaphod32_hash.h 14 May 2024 19:36:29 -0000 1.1.1.4 +++ gnu/usr.bin/perl/zaphod32_hash.h 16 Nov 2026 00:57:40 -0000 @@ -38,7 +38,7 @@ #endif #endif -#ifndef PERL_SEEN_HV_FUNC_H_ +#ifndef PERL_HV_FUNC_H_ #if !defined(U64) #include #define U64 uint64_t Index: gnu/usr.bin/perl/Cross/Makefile-cross-SH =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Cross/Makefile-cross-SH,v diff -u -p -a -u -p -r1.5 Makefile-cross-SH --- gnu/usr.bin/perl/Cross/Makefile-cross-SH 28 Jan 2025 01:06:10 -0000 1.5 +++ gnu/usr.bin/perl/Cross/Makefile-cross-SH 16 Nov 2026 00:57:36 -0000 @@ -342,14 +342,14 @@ h = $(h1) $(h2) $(h3) $(h4) $(h5) c1 = av.c scope.c op.c doop.c doio.c dquote.c dump.c gv.c hv.c mg.c reentr.c mro_core.c perl.c c2 = perly.c pp.c pp_hot.c pp_ctl.c pp_sys.c regcomp.c regexec.c utf8.c sv.c c3 = taint.c time64.c toke.c util.c deb.c run.c universal.c pad.c globals.c keywords.c -c4 = perlio.c numeric.c mathoms.c locale.c pp_pack.c pp_sort.c +c4 = perlio.c numeric.c mathoms.c locale.c long_names.c pp_pack.c pp_sort.c c5 = $(mallocsrc) c = $(c1) $(c2) $(c3) $(c4) $(c5) miniperlmain.c perlmain.c opmini.c obj1 = $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) op$(OBJ_EXT) pad$(OBJ_EXT) regcomp$(OBJ_EXT) dquote$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT) reentr$(OBJ_EXT) mro_core$(OBJ_EXT) obj2 = hv$(OBJ_EXT) av$(OBJ_EXT) perl$(OBJ_EXT) run$(OBJ_EXT) pp_hot$(OBJ_EXT) sv$(OBJ_EXT) pp$(OBJ_EXT) scope$(OBJ_EXT) pp_ctl$(OBJ_EXT) pp_sys$(OBJ_EXT) -obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) numeric$(OBJ_EXT) mathoms$(OBJ_EXT) locale$(OBJ_EXT) pp_pack$(OBJ_EXT) pp_sort$(OBJ_EXT) time64$(OBJ_EXT) +obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) numeric$(OBJ_EXT) mathoms$(OBJ_EXT) locale$(OBJ_EXT) long_names($OBJ_EXT) pp_pack$(OBJ_EXT) pp_sort$(OBJ_EXT) time64$(OBJ_EXT) obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) Index: gnu/usr.bin/perl/Cross/config.sh-arm-linux =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Cross/config.sh-arm-linux,v diff -u -p -a -u -p -r1.23 config.sh-arm-linux --- gnu/usr.bin/perl/Cross/config.sh-arm-linux 21 Sep 2026 18:20:27 -0000 1.23 +++ gnu/usr.bin/perl/Cross/config.sh-arm-linux 16 Nov 2026 00:57:36 -0000 @@ -32,11 +32,11 @@ alignbytes='4' aphostname='/bin/hostname' api_revision='5' api_subversion='0' -api_version='42' -api_versionstring='5.42.0' +api_version='44' +api_versionstring='5.44.0' ar='ar' -archlib='/usr/lib/perl5/5.42.3/armv4l-linux' -archlibexp='/usr/lib/perl5/5.42.3/armv4l-linux' +archlib='/usr/lib/perl5/5.44.0/armv4l-linux' +archlibexp='/usr/lib/perl5/5.44.0/armv4l-linux' archname64='' archname='armv4l-linux' archobjs='' @@ -55,7 +55,7 @@ castflags='0' cat='cat' cc='cc' cccdlflags='-fpic' -ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.42.3/armv4l-linux/CORE' +ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.44.0/armv4l-linux/CORE' ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccname='arm-linux-gcc' @@ -252,6 +252,7 @@ d_gdbm_ndbm_h_uses_prototypes='undef' d_gdbmndbm_h_uses_prototypes='undef' d_getaddrinfo='undef' d_getcwd='define' +d_getentropy='undef' d_getenv_preserves_other_thread='define' d_getespwnam='undef' d_getfsstat='undef' @@ -791,6 +792,7 @@ i_sgtty='undef' i_shadow='define' i_socks='undef' i_stdbool='undef' +i_stdckdint='undef' i_stdint='define' i_stdlib='define' i_sunmath='undef' @@ -807,6 +809,7 @@ i_sysmount='define' i_sysndir='undef' i_sysparam='define' i_syspoll='undef' +i_sysrandom='undef' i_sysresrc='define' i_syssecrt='undef' i_sysselct='define' @@ -839,7 +842,7 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.42.3/armv4l-linux' +installarchlib='./install_me_here/usr/lib/perl5/5.44.0/armv4l-linux' installbin='./install_me_here/usr/bin' installhtml1dir='' installhtml3dir='' @@ -847,13 +850,13 @@ installman1dir='./install_me_here/usr/sh installman3dir='./install_me_here/usr/share/man/man3' installprefix='./install_me_here/usr' installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.42.3' +installprivlib='./install_me_here/usr/lib/perl5/5.44.0' installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.42.3/armv4l-linux' +installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.44.0/armv4l-linux' installsitebin='./install_me_here/usr/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.42.3' +installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.44.0' installsiteman1dir='./install_me_here/usr/share/man/man1' installsiteman3dir='./install_me_here/usr/share/man/man3' installsitescript='./install_me_here/usr/bin' @@ -867,6 +870,7 @@ installvendorlib='' installvendorman1dir='' installvendorman3dir='' installvendorscript='' +intmaxsize='8' intsize='4' issymlink='/usr/bin/test -h' ivdformat='"ld"' @@ -990,8 +994,8 @@ pmake='' pr='' prefix='/usr' prefixexp='/usr' -privlib='/usr/lib/perl5/5.42.3' -privlibexp='/usr/lib/perl5/5.42.3' +privlib='/usr/lib/perl5/5.44.0' +privlibexp='/usr/lib/perl5/5.44.0' procselfexe='"/proc/self/exe"' prototype='define' ptrsize='4' @@ -1056,17 +1060,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0' sig_size='68' signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.42.3/armv4l-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.42.3/armv4l-linux' +sitearch='/usr/lib/perl5/site_perl/5.44.0/armv4l-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.44.0/armv4l-linux' sitebin='/usr/bin' sitebinexp='/usr/bin' sitehtml1dir='' sitehtml1direxp='' sitehtml3dir='' sitehtml3direxp='' -sitelib='/usr/lib/perl5/site_perl/5.42.3' +sitelib='/usr/lib/perl5/site_perl/5.44.0' sitelib_stem='/usr/lib/perl5/site_perl' -sitelibexp='/usr/lib/perl5/site_perl/5.42.3' +sitelibexp='/usr/lib/perl5/site_perl/5.44.0' siteman1dir='/usr/share/man/man1' siteman1direxp='/usr/share/man/man1' siteman3dir='/usr/share/man/man3' @@ -1107,7 +1111,7 @@ stdio_stream_array='' strerror_r_proto='0' strings='/usr/include/string.h' submit='' -subversion='3' +subversion='0' sysman='/usr/share/man/man1' tail='' tar='' @@ -1153,7 +1157,6 @@ usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='define' -usegetexecpath='undef' useithreads='undef' usekernprocpathname='undef' uselargefiles='define' @@ -1203,8 +1206,8 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.42.3' -version_patchlevel_string='version 42 subversion 3' +version='5.44.0' +version_patchlevel_string='version 44 subversion 0' versiononly='undef' vi='' xlibpth='/usr/lib/386 /lib/386' @@ -1218,10 +1221,10 @@ config_arg0='Configure' config_args='' config_argc=0 PERL_REVISION=5 -PERL_VERSION=42 -PERL_SUBVERSION=3 +PERL_VERSION=44 +PERL_SUBVERSION=0 PERL_API_REVISION=5 -PERL_API_VERSION=42 +PERL_API_VERSION=44 PERL_API_SUBVERSION=0 PERL_PATCHLEVEL= PERL_CONFIG_SH=true Index: gnu/usr.bin/perl/Cross/config.sh-arm-linux-n770 =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Cross/config.sh-arm-linux-n770,v diff -u -p -a -u -p -r1.20 config.sh-arm-linux-n770 --- gnu/usr.bin/perl/Cross/config.sh-arm-linux-n770 21 Sep 2026 18:20:27 -0000 1.20 +++ gnu/usr.bin/perl/Cross/config.sh-arm-linux-n770 16 Nov 2026 00:57:36 -0000 @@ -32,11 +32,11 @@ alignbytes='4' aphostname='/bin/hostname' api_revision='5' api_subversion='0' -api_version='42' -api_versionstring='5.42.0' +api_version='44' +api_versionstring='5.44.0' ar='ar' -archlib='/usr/lib/perl5/5.42.3/armv4l-linux' -archlibexp='/usr/lib/perl5/5.42.3/armv4l-linux' +archlib='/usr/lib/perl5/5.44.0/armv4l-linux' +archlibexp='/usr/lib/perl5/5.44.0/armv4l-linux' archname64='' archname='armv4l-linux' archobjs='' @@ -54,7 +54,7 @@ castflags='0' cat='cat' cc='arm-none-linux-gnueabi-gcc' cccdlflags='-fpic' -ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.42.3/armv4l-linux/CORE' +ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.44.0/armv4l-linux/CORE' ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccname='arm-linux-gcc' @@ -251,6 +251,7 @@ d_gdbm_ndbm_h_uses_prototypes='undef' d_gdbmndbm_h_uses_prototypes='undef' d_getaddrinfo='undef' d_getcwd='define' +d_getentropy='undef' d_getenv_preserves_other_thread='define' d_getespwnam='undef' d_getfsstat='undef' @@ -789,6 +790,7 @@ i_sgtty='undef' i_shadow='define' i_socks='undef' i_stdbool='undef' +i_stdckdint='undef' i_stdint='define' i_stdlib='define' i_sunmath='undef' @@ -805,6 +807,7 @@ i_sysmount='define' i_sysndir='undef' i_sysparam='define' i_syspoll='undef' +i_sysrandom='undef' i_sysresrc='define' i_syssecrt='undef' i_sysselct='define' @@ -837,7 +840,7 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.42.3/armv4l-linux' +installarchlib='./install_me_here/usr/lib/perl5/5.44.0/armv4l-linux' installbin='./install_me_here/usr/bin' installhtml1dir='' installhtml3dir='' @@ -845,13 +848,13 @@ installman1dir='./install_me_here/usr/sh installman3dir='./install_me_here/usr/share/man/man3' installprefix='./install_me_here/usr' installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.42.3' +installprivlib='./install_me_here/usr/lib/perl5/5.44.0' installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.42.3/armv4l-linux' +installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.44.0/armv4l-linux' installsitebin='./install_me_here/usr/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.42.3' +installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.44.0' installsiteman1dir='./install_me_here/usr/share/man/man1' installsiteman3dir='./install_me_here/usr/share/man/man3' installsitescript='./install_me_here/usr/bin' @@ -865,6 +868,7 @@ installvendorlib='' installvendorman1dir='' installvendorman3dir='' installvendorscript='' +intmaxsize='8' intsize='4' issymlink='/usr/bin/test -h' ivdformat='"ld"' @@ -988,8 +992,8 @@ pmake='' pr='' prefix='/usr' prefixexp='/usr' -privlib='/usr/lib/perl5/5.42.3' -privlibexp='/usr/lib/perl5/5.42.3' +privlib='/usr/lib/perl5/5.44.0' +privlibexp='/usr/lib/perl5/5.44.0' procselfexe='"/proc/self/exe"' prototype='define' ptrsize='4' @@ -1054,17 +1058,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0' sig_size='68' signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.42.3/armv4l-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.42.3/armv4l-linux' +sitearch='/usr/lib/perl5/site_perl/5.44.0/armv4l-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.44.0/armv4l-linux' sitebin='/usr/bin' sitebinexp='/usr/bin' sitehtml1dir='' sitehtml1direxp='' sitehtml3dir='' sitehtml3direxp='' -sitelib='/usr/lib/perl5/site_perl/5.42.3' +sitelib='/usr/lib/perl5/site_perl/5.44.0' sitelib_stem='/usr/lib/perl5/site_perl' -sitelibexp='/usr/lib/perl5/site_perl/5.42.3' +sitelibexp='/usr/lib/perl5/site_perl/5.44.0' siteman1dir='/usr/share/man/man1' siteman1direxp='/usr/share/man/man1' siteman3dir='/usr/share/man/man3' @@ -1105,7 +1109,7 @@ stdio_stream_array='' strerror_r_proto='0' strings='/usr/include/string.h' submit='' -subversion='3' +subversion='0' sysman='/usr/share/man/man1' tail='' tar='' @@ -1151,7 +1155,6 @@ usedevel='undef' usedl='define' usedtrace='undef' usefaststdio='define' -usegetexecpath='undef' useithreads='undef' usekernprocpathname='undef' uselargefiles='define' @@ -1201,8 +1204,8 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.42.3' -version_patchlevel_string='version 42 subversion 3' +version='5.44.0' +version_patchlevel_string='version 44 subversion 0' versiononly='undef' vi='' xlibpth='/usr/lib/386 /lib/386' @@ -1216,10 +1219,10 @@ config_arg0='Configure' config_args='' config_argc=0 PERL_REVISION=5 -PERL_VERSION=42 -PERL_SUBVERSION=3 +PERL_VERSION=44 +PERL_SUBVERSION=0 PERL_API_REVISION=5 -PERL_API_VERSION=42 +PERL_API_VERSION=44 PERL_API_SUBVERSION=0 PERL_PATCHLEVEL= PERL_CONFIG_SH=true Index: gnu/usr.bin/perl/Porting/Glossary =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/Glossary,v diff -u -p -a -u -p -r1.24 Glossary --- gnu/usr.bin/perl/Porting/Glossary 21 Sep 2026 18:20:27 -0000 1.24 +++ gnu/usr.bin/perl/Porting/Glossary 16 Nov 2026 00:57:36 -0000 @@ -888,6 +888,11 @@ d_fdim (d_fdim.U): This variable conditionally defines the HAS_FDIM symbol, which indicates to the C program that the fdim() routine is available. +d_fdopendir (d_fdopendir.U): + This variable conditionally defines HAS_FDOPENDIR if fdopendir() is + available to open a directory using an opened file descriptor already + referring to that directory. + d_fds_bits (d_fd_set.U): This variable contains the eventual value of the HAS_FDS_BITS symbol, which indicates if your fd_set typedef contains the fds_bits member. @@ -947,11 +952,6 @@ d_fmin (d_fmin.U): This variable conditionally defines the HAS_FMIN symbol, which indicates to the C program that the fmin() routine is available. -d_fdopendir (d_fdopendir.U): - This variable conditionally defines the HAS_FORK symbol, which - indicates that the fdopen routine is available to open a - directory descriptor. - d_fork (d_fork.U): This variable conditionally defines the HAS_FORK symbol, which indicates to the C program that the fork() routine is available. @@ -1094,6 +1094,10 @@ d_getcwd (d_getcwd.U): indicates to the C program that the getcwd() routine is available to get the current working directory. +d_getentropy (d_getentropy.U): + This variable conditionally defines HAS_GETENTROPY if getentropy() + is available to fill a buffer with random bytes. + d_getenv_preserves_other_thread (d_getenv_thread.U): This variable conditionally defines the GETENV_PRESERVES_OTHER_THREAD symbol, which indicates to the C program that the getenv() system call @@ -3722,6 +3726,11 @@ i_stdbool (i_stdbool.U): indicates to the C program that exists and should be included. +i_stdckdint (i_stdckdint.U): + This variable conditionally defines the I_STDCKDINT symbol, which + indicates to the C program that exists and should + be included. + i_stdint (i_stdint.U): This variable conditionally defines the I_STDINT symbol, which indicates to the C program that exists and should @@ -3789,6 +3798,10 @@ i_syspoll (i_syspoll.U): This variable conditionally defines the I_SYS_POLL symbol, which indicates to the C program that it should include . +i_sysrandom (i_sysrandom.U): + This variable conditionally defines the I_SYS_RANDOM symbol, + and indicates whether a C program should include . + i_sysresrc (i_sysresrc.U): This variable conditionally defines the I_SYS_RESOURCE symbol, and indicates whether a C program should include . @@ -4129,6 +4142,10 @@ installvendorscript (vendorscript.U): those systems using AFS. For extra portability, only this variable should be used in makefiles. +intmaxsize (intsize.U): + This variable contains the value of the INTMAXSIZE symbol, which + indicates to the C program how many bytes there are in an intmax_t. + intsize (intsize.U): This variable contains the value of the INTSIZE symbol, which indicates to the C program how many bytes there are in an int. @@ -4708,27 +4725,12 @@ perl_lc_all_category_positions_init (dis setlocale(LC_ALL, NULL) when not all categories are the same, on systems that use a positional notation. After element [0] is $lc_all_separator_init, then the category given by element [1], and so on. - For example, at the time this was written, the value in config.sh for - FreeBSD boxes is: - perl_lc_all_category_positions_init='{ 1, 2, 3, 4, 5, 6 }' - And the result of running this program - LC_ALL=C ./perl -Ilib -MPOSIX \ - -le 'setlocale(LC_MONETARY, "fr_FR.UTF-8"); \ - print setlocale(LC_ALL)' - is - C/C/fr_FR.UTF-8/C/C/C - This shows that the LC_MONETARY category on FreeBSD occupies the third - position in the string returned by querying LC_ALL. (See - perl_lc_all_separator for the source of the forward slash.) perl_lc_all_separator (disparate_lc_all.U): - This symbol, when defined, gives the substring, enclosed in double - quotes, used to separate categories in the aggregated string returned - by setlocale(LC_ALL, NULL) when not all categories are in the same - locale. This is for systems that use a positional notation as opposed - to 'name=value' pairs. For example, at the time this was written, the - value in config.sh for FreeBSD boxes is: - perl_lc_all_separator='"/"' + This symbol, when defined, gives the substring used to separate + categories in the aggregated string returned by setlocale(LC_ALL, NULL) + when not all categories are in the same locale. This is for systems + that use a positional notation as opposed to 'name=value' pairs. PERL_PATCHLEVEL (Oldsyms.U): This symbol reflects the patchlevel, if available. Will usually @@ -5684,10 +5686,6 @@ usefaststdio (usefaststdio.U): This variable conditionally defines the USE_FAST_STDIO symbol, and indicates that Perl should be built to use 'fast stdio'. Defaults to define in Perls 5.8 and earlier, to undef later. - -usegetexecpath (usegetexecpath.U): - This variable, indicates that we can use getexecpath to get a full - path for the executable, and hence convert $^X to an absolute path. useithreads (usethreads.U): This variable conditionally defines the USE_ITHREADS symbol, Index: gnu/usr.bin/perl/Porting/Maintainers.pl =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/Maintainers.pl,v diff -u -p -a -u -p -r1.32 Maintainers.pl --- gnu/usr.bin/perl/Porting/Maintainers.pl 19 Aug 2026 00:19:00 -0000 1.32 +++ gnu/usr.bin/perl/Porting/Maintainers.pl 16 Nov 2026 00:57:36 -0000 @@ -130,6 +130,7 @@ our %Modules = ( 'Archive::Tar' => { 'DISTRIBUTION' => 'BINGOS/Archive-Tar-3.12.tar.gz', + 'SYNCINFO' => 'leont on Wed Jun 3 15:24:01 2026', 'FILES' => q[cpan/Archive-Tar], 'BUGS' => 'bug-archive-tar@rt.cpan.org', 'EXCLUDED' => [ @@ -144,7 +145,7 @@ our %Modules = ( }, 'Attribute::Handlers' => { - 'DISTRIBUTION' => 'RJBS/Attribute-Handlers-0.99.tar.gz', + 'DISTRIBUTION' => 'RJBS/Attribute-Handlers-1.03.tar.gz', 'FILES' => q[dist/Attribute-Handlers], }, @@ -218,11 +219,17 @@ our %Modules = ( 'Compress::Raw::Bzip2' => { 'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.218.tar.gz', + 'SYNCINFO' => 'jkeenan on Wed Mar 11 22:43:18 2026', 'FILES' => q[cpan/Compress-Raw-Bzip2], 'EXCLUDED' => [ qr{^t/Test/}, qr{^t/meta}, - 'SECURITY.md', + qw( + bzip2-src/bzip2-const.patch + bzip2-src/bzip2-cpp.patch + bzip2-src/bzip2-unsigned.patch + SECURITY.md + ), ], }, @@ -234,7 +241,8 @@ our %Modules = ( qr{^examples/}, qr{^t/Test/}, qr{^t/meta}, - qw( t/000prereq.t + qw( + t/000prereq.t t/99pod.t SECURITY.md ), @@ -242,8 +250,8 @@ our %Modules = ( }, 'Config::Perl::V' => { - 'DISTRIBUTION' => 'HMBRAND/Config-Perl-V-0.38.tgz', - 'SYNCINFO' => 'jkeenan on Fri Jan 17 14:43:53 2025', + 'DISTRIBUTION' => 'HMBRAND/Config-Perl-V-0.39.tgz', + 'SYNCINFO' => 'jkeenan on Wed Feb 11 08:21:24 2026', 'FILES' => q[cpan/Config-Perl-V], 'EXCLUDED' => [qw( examples/show-v.pl @@ -308,7 +316,8 @@ our %Modules = ( # Note: When updating CPAN-Meta the META.* files will need to be regenerated # perl -Icpan/CPAN-Meta/lib Porting/makemeta 'CPAN::Meta' => { - 'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-2.150010.tar.gz', + 'DISTRIBUTION' => 'RJBS/CPAN-Meta-2.150013.tar.gz', + 'SYNCINFO' => 'jkeenan on Sun Feb 22 18:34:41 2026', 'FILES' => q[cpan/CPAN-Meta], 'EXCLUDED' => [ qw[t/00-report-prereqs.t @@ -320,7 +329,8 @@ our %Modules = ( }, 'CPAN::Meta::Requirements' => { - 'DISTRIBUTION' => 'RJBS/CPAN-Meta-Requirements-2.143.tar.gz', + 'DISTRIBUTION' => 'RJBS/CPAN-Meta-Requirements-2.145.tar.gz', + 'SYNCINFO' => 'jkeenan on Sun Feb 22 18:56:47 2026', 'FILES' => q[cpan/CPAN-Meta-Requirements], 'EXCLUDED' => [ qw(t/00-report-prereqs.t), @@ -347,8 +357,8 @@ our %Modules = ( }, 'DB_File' => { - 'DISTRIBUTION' => 'PMQS/DB_File-1.859.tar.gz', - 'SYNCINFO' => 'jkeenan on Tue Sep 5 20:46:44 2023', + 'DISTRIBUTION' => 'PMQS/DB_File-1.860.tar.gz', + 'SYNCINFO' => 'jkeenan on Wed Feb 11 13:27:52 2026', 'FILES' => q[cpan/DB_File], 'EXCLUDED' => [ qr{^patches/}, @@ -405,8 +415,8 @@ our %Modules = ( }, 'Encode' => { - 'DISTRIBUTION' => 'DANKOGAI/Encode-3.21.tar.gz', - 'SYNCINFO' => 'jkeenan on Sun Feb 25 19:56:46 2024', + 'DISTRIBUTION' => 'DANKOGAI/Encode-3.24.tar.gz', + 'SYNCINFO' => 'jkeenan on Wed Apr 29 14:28:15 2026', 'FILES' => q[cpan/Encode], 'EXCLUDED' => [ qw( t/whatwg-aliases.json @@ -431,14 +441,15 @@ our %Modules = ( }, 'experimental' => { - 'DISTRIBUTION' => 'LEONT/experimental-0.035.tar.gz', - 'SYNCINFO' => 'jkeenan on Thu May 1 06:44:57 2025', + 'DISTRIBUTION' => 'LEONT/experimental-0.036.tar.gz', + 'SYNCINFO' => 'jkeenan on Sat Jul 19 12:50:08 2025', 'FILES' => q[cpan/experimental], 'EXCLUDED' => [qr{^xt/}], }, 'Exporter' => { - 'DISTRIBUTION' => 'TODDR/Exporter-5.78.tar.gz', + 'DISTRIBUTION' => 'TODDR/Exporter-5.79.tar.gz', + 'SYNCINFO' => 'book on Fri Apr 17 09:48:56 2026', 'FILES' => q[dist/Exporter], 'EXCLUDED' => [ qw( t/pod.t @@ -491,8 +502,8 @@ our %Modules = ( }, 'ExtUtils::MakeMaker' => { - 'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-7.76.tar.gz', - 'SYNCINFO' => 'yorton on Sun Mar 26 16:20:23 2023', + 'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-7.78.tar.gz', + 'SYNCINFO' => 'jkeenan on Thu Mar 12 07:27:54 2026', 'FILES' => q[cpan/ExtUtils-MakeMaker], 'EXCLUDED' => [ qr{^t/lib/Test/}, @@ -525,12 +536,13 @@ our %Modules = ( }, 'ExtUtils::ParseXS' => { - 'DISTRIBUTION' => 'LEONT/ExtUtils-ParseXS-3.57.tar.gz', + 'DISTRIBUTION' => 'LEONT/ExtUtils-ParseXS-3.63.tar.gz', 'FILES' => q[dist/ExtUtils-ParseXS], }, 'File::Fetch' => { - 'DISTRIBUTION' => 'BINGOS/File-Fetch-1.04.tar.gz', + 'DISTRIBUTION' => 'BINGOS/File-Fetch-1.08.tar.gz', + 'SYNCINFO' => 'jkeenan on Thu May 1 07:12:12 2025', 'FILES' => q[cpan/File-Fetch], }, @@ -544,7 +556,8 @@ our %Modules = ( }, 'File::Temp' => { - 'DISTRIBUTION' => 'ETHER/File-Temp-0.2311.tar.gz', + 'DISTRIBUTION' => 'ETHER/File-Temp-0.2312.tar.gz', + 'SYNCINFO' => 'ether on Mon Sep 1 13:49:39 2025', 'FILES' => q[cpan/File-Temp], 'EXCLUDED' => [ qw( README.mkdn @@ -565,7 +578,8 @@ our %Modules = ( }, 'Filter::Util::Call' => { - 'DISTRIBUTION' => 'RURBAN/Filter-1.64.tar.gz', + 'DISTRIBUTION' => 'RURBAN/Filter-1.65.tar.gz', + 'SYNCINFO' => 'tib on Mon Sep 22 08:36:59 2025', 'FILES' => q[cpan/Filter-Util-Call pod/perlfilter.pod ], @@ -628,6 +642,7 @@ our %Modules = ( 'HTTP::Tiny' => { 'DISTRIBUTION' => 'HAARG/HTTP-Tiny-0.096.tar.gz', + 'SYNCINFO' => 'leont on Mon Jun 8 16:26:22 2026', 'FILES' => q[cpan/HTTP-Tiny], 'EXCLUDED' => [ 't/00-report-prereqs.t', @@ -670,17 +685,19 @@ our %Modules = ( qr{^examples/}, qr{^t/Test/}, qr{^t/999meta-}, - 't/000prereq.t', - 't/010examples-bzip2.t', - 't/010examples-zlib.t', - 't/cz-05examples.t', - 'SECURITY.md', + qw( + t/000prereq.t + t/010examples-bzip2.t + t/010examples-zlib.t + t/cz-05examples.t + SECURITY.md + ) ], }, 'IO::Socket::IP' => { - 'DISTRIBUTION' => 'PEVANS/IO-Socket-IP-0.43.tar.gz', - 'SYNCINFO' => 'tib on Wed Dec 4 17:32:19 2024', + 'DISTRIBUTION' => 'PEVANS/IO-Socket-IP-0.44.tar.gz', + 'SYNCINFO' => 'jkeenan on Fri May 15 06:56:20 2026', 'FILES' => q[cpan/IO-Socket-IP], 'EXCLUDED' => [ qr{^examples/}, @@ -762,8 +779,8 @@ our %Modules = ( }, 'Math::BigInt' => { - 'DISTRIBUTION' => 'PJACKLAM/Math-BigInt-2.005002.tar.gz', - 'SYNCINFO' => 'jkeenan on Thu Apr 10 20:38:17 2025', + 'DISTRIBUTION' => 'PJACKLAM/Math-BigInt-2.005003.tar.gz', + 'SYNCINFO' => 'jkeenan on Sun Apr 13 14:50:24 2025', 'FILES' => q[cpan/Math-BigInt], 'EXCLUDED' => [ qr{^xt/}, @@ -829,7 +846,7 @@ our %Modules = ( }, 'Module::CoreList' => { - 'DISTRIBUTION' => 'BINGOS/Module-CoreList-5.20250421.tar.gz', + 'DISTRIBUTION' => 'BINGOS/Module-CoreList-5.20260601.tar.gz', 'FILES' => q[dist/Module-CoreList], }, @@ -849,7 +866,8 @@ our %Modules = ( }, 'Module::Metadata' => { - 'DISTRIBUTION' => 'ETHER/Module-Metadata-1.000038.tar.gz', + 'DISTRIBUTION' => 'ETHER/Module-Metadata-1.000039.tar.gz', + 'SYNCINFO' => 'jkeenan on Sun Apr 5 19:01:14 2026', 'FILES' => q[cpan/Module-Metadata], 'EXCLUDED' => [ qw(t/00-report-prereqs.t), @@ -860,7 +878,7 @@ our %Modules = ( }, 'Net::Ping' => { - 'DISTRIBUTION' => 'RURBAN/Net-Ping-2.75.tar.gz', + 'DISTRIBUTION' => 'RURBAN/Net-Ping-2.76.tar.gz', 'FILES' => q[dist/Net-Ping], 'EXCLUDED' => [ qr{^\.[awc]}, @@ -963,18 +981,13 @@ our %Modules = ( }, 'Pod::Simple' => { - 'DISTRIBUTION' => 'KHW/Pod-Simple-3.45.tar.gz', - 'SYNCINFO' => 'jkeenan on Wed Aug 2 19:32:39 2023', + 'DISTRIBUTION' => 'KHW/Pod-Simple-3.48.tar.gz', + 'SYNCINFO' => 'jkeenan on Sun Apr 5 19:44:36 2026', 'FILES' => q[cpan/Pod-Simple], 'EXCLUDED' => [ qw{.ChangeLog.swp}, qr{^\.github/} ], - - 'CUSTOMIZED' => [ - # Customized by 6ea7dace3401e25dcf8318146be82c03e07a6a72 - 'lib/Pod/Simple/HTMLLegacy.pm', - ], }, 'Pod::Usage' => { @@ -1010,17 +1023,9 @@ our %Modules = ( }, 'Scalar::Util' => { - 'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.69.tar.gz', - 'SYNCINFO' => 'jkeenan on Thu Apr 10 21:01:49 2025', + 'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.70.tar.gz', + 'SYNCINFO' => 'ether on Wed Jul 30 16:32:42 2025', 'FILES' => q[cpan/Scalar-List-Utils], - 'CUSTOMIZED' => [ - 'ListUtil.xs', - 'lib/List/Util.pm', - 'lib/List/Util/XS.pm', - 'lib/Scalar/Util.pm', - 'lib/Sub/Util.pm', - 't/exotic_names.t' - ], }, 'Search::Dict' => { @@ -1036,6 +1041,7 @@ our %Modules = ( 'Socket' => { 'DISTRIBUTION' => 'PEVANS/Socket-2.041.tar.gz', + 'SYNCINFO' => 'leo on Mon May 4 16:10:37 2026', 'FILES' => q[cpan/Socket], 'EXCLUDED' => ['.editorconfig'], }, @@ -1096,8 +1102,8 @@ our %Modules = ( }, 'Term::Table' => { - 'DISTRIBUTION' => 'EXODIST/Term-Table-0.024.tar.gz', - 'SYNCINFO' => 'jkeenan on Sun Jan 5 06:51:34 2025', + 'DISTRIBUTION' => 'EXODIST/Term-Table-0.028.tar.gz', + 'SYNCINFO' => 'jkeenan on Fri Nov 28 08:45:03 2025', 'FILES' => q[cpan/Term-Table], 'EXCLUDED' => [ qw( appveyor.yml ), @@ -1110,8 +1116,8 @@ our %Modules = ( }, 'Test::Harness' => { - 'DISTRIBUTION' => 'LEONT/Test-Harness-3.50.tar.gz', - 'SYNCINFO' => 'jkeenan on Wed Aug 14 21:59:59 2024', + 'DISTRIBUTION' => 'LEONT/Test-Harness-3.52.tar.gz', + 'SYNCINFO' => 'jkeenan on Sun May 4 07:13:21 2025', 'FILES' => q[cpan/Test-Harness], 'EXCLUDED' => [ qr{^examples/}, @@ -1127,8 +1133,8 @@ our %Modules = ( }, 'Test::Simple' => { - 'DISTRIBUTION' => 'EXODIST/Test-Simple-1.302210.tar.gz', - 'SYNCINFO' => 'jkeenan on Tue Apr 1 20:47:53 2025', + 'DISTRIBUTION' => 'EXODIST/Test-Simple-1.302219.tar.gz', + 'SYNCINFO' => 'jkeenan on Sat Dec 13 21:08:23 2025', 'FILES' => q[cpan/Test-Simple], 'EXCLUDED' => [ qr{^examples/}, @@ -1148,7 +1154,7 @@ our %Modules = ( }, 'Text::Balanced' => { - 'DISTRIBUTION' => 'SHAY/Text-Balanced-2.06.tar.gz', + 'DISTRIBUTION' => 'SHAY/Text-Balanced-2.07.tar.gz', 'FILES' => q[cpan/Text-Balanced], }, @@ -1262,8 +1268,8 @@ our %Modules = ( }, 'Time::Piece' => { - 'DISTRIBUTION' => 'ESAYM/Time-Piece-1.36.tar.gz', - 'SYNCINFO' => 'jkeenan on Fri Apr 11 07:13:44 2025', + 'DISTRIBUTION' => 'ESAYM/Time-Piece-1.41.tar.gz', + 'SYNCINFO' => 'tib on Fri Nov 14 11:59:09 2025', 'FILES' => q[cpan/Time-Piece], 'EXCLUDED' => [ qw[reverse_deps.txt] ], }, @@ -1295,8 +1301,8 @@ our %Modules = ( }, 'version' => { - 'DISTRIBUTION' => 'LEONT/version-0.9933.tar.gz', - 'SYNCINFO' => 'tib on Sat Sep 14 15:02:52 2024', + 'DISTRIBUTION' => 'LEONT/version-0.9934.tar.gz', + 'SYNCINFO' => 'book on Fri Apr 17 11:05:44 2026', 'FILES' => q[cpan/version vutil.c vutil.h vxs.inc], 'EXCLUDED' => [ qr{^vutil/lib/}, @@ -1313,9 +1319,6 @@ our %Modules = ( # only necessary with the CPAN release. 'CUSTOMIZED' => [ 'lib/version.pm', - - # Customized by ba04a9040af061424b6d6f0b1e888cd3ce4b3d9f - 'vutil.c', ], 'MAP' => { Index: gnu/usr.bin/perl/Porting/README.pod =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/README.pod,v diff -u -p -a -u -p -r1.8 README.pod --- gnu/usr.bin/perl/Porting/README.pod 26 Dec 2025 22:14:13 -0000 1.8 +++ gnu/usr.bin/perl/Porting/README.pod 16 Nov 2026 00:57:36 -0000 @@ -245,6 +245,11 @@ This library provides functions used in This script sorts the files in F. +=head2 F + +This script merges the various perldeltas for the development releases +into the final perldelta for the stable release. + =head2 F This script regenerates F and F. Index: gnu/usr.bin/perl/Porting/bisect-runner.pl =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/bisect-runner.pl,v diff -u -p -a -u -p -r1.7 bisect-runner.pl --- gnu/usr.bin/perl/Porting/bisect-runner.pl 28 Jan 2025 01:06:10 -0000 1.7 +++ gnu/usr.bin/perl/Porting/bisect-runner.pl 16 Nov 2026 00:57:36 -0000 @@ -1272,6 +1272,51 @@ L) was reported as crashing under certain +circumstances (the experimental C feature). The program demonstrating +the crash needed to use a module installed in the same directory as the demo +program. The feature was subsequently reported to be working properly. At what +commit did the program stop crashing? + +=item * Solution + +The module: + + $ cat /tmp/Noofoo.pm + # https://github.com/Perl/perl5/issues/23435 + use experimental 'class'; + use feature 'module_true'; + class Noofoo; + ADJUST {} + +The demonstration program: + + $ cat /tmp/foo.pl + use strict; + use warnings; + use Noofoo; + print "Hello world!\n"; + +The bisection invocation: + + $ perl Porting/bisect.pl \ + --expect-fail \ + --start=v5.43.3 \ + --end=v5.43.4 \ + -- ./perl -Ilib -I/tmp "/tmp/foo.pl" + +=item * Reference + +L + +=back + =cut # Ensure we always exit with 255, to cause git bisect to abort. Index: gnu/usr.bin/perl/Porting/config.sh =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/config.sh,v diff -u -p -a -u -p -r1.23 config.sh --- gnu/usr.bin/perl/Porting/config.sh 21 Sep 2026 18:20:27 -0000 1.23 +++ gnu/usr.bin/perl/Porting/config.sh 16 Nov 2026 00:57:36 -0000 @@ -42,11 +42,11 @@ alignbytes='16' aphostname='/usr/bin/hostname' api_revision='5' api_subversion='0' -api_version='42' -api_versionstring='5.42.0' +api_version='44' +api_versionstring='5.44.0' ar='ar' -archlib='/pro/lib/perl5/5.42.3/x86_64-linux-thread-multi-quadmath' -archlibexp='/pro/lib/perl5/5.42.3/x86_64-linux-thread-multi-quadmath' +archlib='/pro/lib/perl5/5.44.0/x86_64-linux-thread-multi-quadmath' +archlibexp='/pro/lib/perl5/5.44.0/x86_64-linux-thread-multi-quadmath' archname64='' archname='x86_64-linux-thread-multi-quadmath' archobjs='' @@ -263,6 +263,7 @@ d_gdbm_ndbm_h_uses_prototypes='undef' d_gdbmndbm_h_uses_prototypes='undef' d_getaddrinfo='define' d_getcwd='define' +d_getentropy='undef' d_getenv_preserves_other_thread='define' d_getespwnam='undef' d_getfsstat='undef' @@ -813,6 +814,7 @@ i_sgtty='undef' i_shadow='define' i_socks='define' i_stdbool='define' +i_stdckdint='undef' i_stdint='define' i_stdlib='define' i_sunmath='undef' @@ -829,6 +831,7 @@ i_sysmount='define' i_sysndir='undef' i_sysparam='define' i_syspoll='define' +i_sysrandom='undef' i_sysresrc='define' i_syssecrt='undef' i_sysselct='define' @@ -863,7 +866,7 @@ incpath='' incpth='/usr/lib64/gcc/x86_64-suse-linux/13/include /usr/local/include /usr/lib64/gcc/x86_64-suse-linux/13/include-fixed /usr/x86_64-suse-linux/include /usr/include' inews='' initialinstalllocation='/pro/bin' -installarchlib='/pro/lib/perl5/5.42.3/x86_64-linux-thread-multi-quadmath' +installarchlib='/pro/lib/perl5/5.44.0/x86_64-linux-thread-multi-quadmath' installbin='/pro/bin' installhtml1dir='' installhtml3dir='' @@ -871,13 +874,13 @@ installman1dir='/pro/local/man/man1' installman3dir='/pro/local/man/man3' installprefix='/pro' installprefixexp='/pro' -installprivlib='/pro/lib/perl5/5.42.3' +installprivlib='/pro/lib/perl5/5.44.0' installscript='/pro/bin' -installsitearch='/pro/lib/perl5/site_perl/5.42.3/x86_64-linux-thread-multi-quadmath' +installsitearch='/pro/lib/perl5/site_perl/5.44.0/x86_64-linux-thread-multi-quadmath' installsitebin='/pro/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='/pro/lib/perl5/site_perl/5.42.3' +installsitelib='/pro/lib/perl5/site_perl/5.44.0' installsiteman1dir='/pro/local/man/man1' installsiteman3dir='/pro/local/man/man3' installsitescript='/pro/bin' @@ -891,6 +894,7 @@ installvendorlib='' installvendorman1dir='' installvendorman3dir='' installvendorscript='' +intmaxsize='8' intsize='4' issymlink='test -h' ivdformat='"ld"' @@ -1005,7 +1009,7 @@ perl_static_inline='static __inline__' perl_thread_local='_Thread_local' perladmin='hmbrand@cpan.org' perllibs='-lpthread -ldl -lm -lcrypt -lutil -lc -lquadmath' -perlpath='/pro/bin/perl5.42.3' +perlpath='/pro/bin/perl5.44.0' pg='pg' phostname='hostname' pidtype='pid_t' @@ -1014,8 +1018,8 @@ pmake='' pr='' prefix='/pro' prefixexp='/pro' -privlib='/pro/lib/perl5/5.42.3' -privlibexp='/pro/lib/perl5/5.42.3' +privlib='/pro/lib/perl5/5.44.0' +privlibexp='/pro/lib/perl5/5.44.0' procselfexe='"/proc/self/exe"' ptrsize='8' quadkind='2' @@ -1080,17 +1084,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 0' sig_size='68' signal_t='void' -sitearch='/pro/lib/perl5/site_perl/5.42.3/x86_64-linux-thread-multi-quadmath' -sitearchexp='/pro/lib/perl5/site_perl/5.42.3/x86_64-linux-thread-multi-quadmath' +sitearch='/pro/lib/perl5/site_perl/5.44.0/x86_64-linux-thread-multi-quadmath' +sitearchexp='/pro/lib/perl5/site_perl/5.44.0/x86_64-linux-thread-multi-quadmath' sitebin='/pro/bin' sitebinexp='/pro/bin' sitehtml1dir='' sitehtml1direxp='' sitehtml3dir='' sitehtml3direxp='' -sitelib='/pro/lib/perl5/site_perl/5.42.3' +sitelib='/pro/lib/perl5/site_perl/5.44.0' sitelib_stem='/pro/lib/perl5/site_perl' -sitelibexp='/pro/lib/perl5/site_perl/5.42.3' +sitelibexp='/pro/lib/perl5/site_perl/5.44.0' siteman1dir='/pro/local/man/man1' siteman1direxp='/pro/local/man/man1' siteman3dir='/pro/local/man/man3' @@ -1118,7 +1122,7 @@ st_dev_sign='1' st_dev_size='8' st_ino_sign='1' st_ino_size='8' -startperl='#!/pro/bin/perl5.42.3' +startperl='#!/pro/bin/perl5.44.0' startsh='#!/bin/sh' static_ext=' ' stdchar='char' @@ -1130,7 +1134,7 @@ stdio_ptr='((fp)->_ptr)' stdio_stream_array='' strerror_r_proto='REENTRANT_PROTO_B_IBW' submit='' -subversion='3' +subversion='0' sysman='/usr/share/man/man1' sysroot='' tail='' @@ -1182,7 +1186,6 @@ usedevel='define' usedl='define' usedtrace='undef' usefaststdio='undef' -usegetexecpath='undef' useithreads='define' usekernprocpathname='undef' uselanginfo='true' @@ -1234,8 +1237,8 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.42.3' -version_patchlevel_string='version 42 subversion 3' +version='5.44.0' +version_patchlevel_string='version 44 subversion 0' versiononly='define' vi='' xlibpth='/usr/lib/386 /lib/386 /usr/lib64/gcc/x86_64-suse-linux/13 /usr/lib64/gcc/x86_64-suse-linux/13/../../../../lib64 /usr/lib64/gcc/x86_64-suse-linux/13/../../..' @@ -1245,10 +1248,10 @@ yaccflags='' zcat='' zip='zip' PERL_REVISION=5 -PERL_VERSION=42 -PERL_SUBVERSION=3 +PERL_VERSION=44 +PERL_SUBVERSION=0 PERL_API_REVISION=5 -PERL_API_VERSION=42 +PERL_API_VERSION=44 PERL_API_SUBVERSION=0 PERL_PATCHLEVEL='' PERL_CONFIG_SH=true Index: gnu/usr.bin/perl/Porting/config_H =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/config_H,v diff -u -p -a -u -p -r1.34 config_H --- gnu/usr.bin/perl/Porting/config_H 19 Aug 2026 00:19:00 -0000 1.34 +++ gnu/usr.bin/perl/Porting/config_H 16 Nov 2026 00:57:36 -0000 @@ -1239,8 +1239,8 @@ * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define ARCHLIB "/opt/perl/lib/5.42.3/x86_64-linux" /**/ -#define ARCHLIB_EXP "/opt/perl/lib/5.42.3/x86_64-linux" /**/ +#define ARCHLIB "/opt/perl/lib/5.44.0/x86_64-linux" /**/ +#define ARCHLIB_EXP "/opt/perl/lib/5.44.0/x86_64-linux" /**/ /* BIN: * This symbol holds the path of the bin directory where the package will @@ -1293,8 +1293,8 @@ * This symbol contains the ~name expanded version of PRIVLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define PRIVLIB "/opt/perl/lib/5.42.3" /**/ -#define PRIVLIB_EXP "/opt/perl/lib/5.42.3" /**/ +#define PRIVLIB "/opt/perl/lib/5.44.0" /**/ +#define PRIVLIB_EXP "/opt/perl/lib/5.44.0" /**/ /* SITEARCH: * This symbol contains the name of the private library for this package. @@ -1311,8 +1311,8 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "/opt/perl/lib/site_perl/5.42.3/x86_64-linux" /**/ -#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.42.3/x86_64-linux" /**/ +#define SITEARCH "/opt/perl/lib/site_perl/5.44.0/x86_64-linux" /**/ +#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.44.0/x86_64-linux" /**/ /* SITELIB: * This symbol contains the name of the private library for this package. @@ -1334,8 +1334,8 @@ * removed. The elements in inc_version_list (inc_version_list.U) can * be tacked onto this variable to generate a list of directories to search. */ -#define SITELIB "/opt/perl/lib/site_perl/5.42.3" /**/ -#define SITELIB_EXP "/opt/perl/lib/site_perl/5.42.3" /**/ +#define SITELIB "/opt/perl/lib/site_perl/5.44.0" /**/ +#define SITELIB_EXP "/opt/perl/lib/site_perl/5.44.0" /**/ #define SITELIB_STEM "/opt/perl/lib/site_perl" /**/ /* PERL_VENDORARCH: @@ -4109,7 +4109,7 @@ * script to make sure (one hopes) that it runs with perl and not * some shell. */ -#define STARTPERL "#!/opt/perl/bin/perl5.42.3" /**/ +#define STARTPERL "#!/opt/perl/bin/perl5.44.0" /**/ /* HAS_STDIO_STREAM_ARRAY: * This symbol, if defined, tells that there is an array Index: gnu/usr.bin/perl/Porting/core-team.json =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/core-team.json,v diff -u -p -a -u -p -r1.1.1.3 core-team.json --- gnu/usr.bin/perl/Porting/core-team.json 26 Dec 2025 22:12:43 -0000 1.1.1.3 +++ gnu/usr.bin/perl/Porting/core-team.json 16 Nov 2026 00:57:36 -0000 @@ -8,29 +8,32 @@ "xdg@xdg.me" ], "active": [ - "book@cpan.org", + "andk@cpan.org", "chris@bingosnet.co.uk", "cpan@corion.net", "craigberry@mac.com", "davem@iabyn.com", "demerphq@gmail.com", - "ether@cpan.org", + "perl@froods.org", "exodist7@gmail.com", "fawaka@gmail.com", "hv@crypt.org", "ilmari@ilmari.org", - "jkeenan@cpan.org", + "jkeenan@pobox.com", "haarg@haarg.org", - "khw@cpan.org", + "lukasmai.403+p5p@gmail.com", + "perl@khwilliamson.com", "leonerd@leonerd.org.uk", "neilb@neilb.org", "nick@ccl4.org", "nicolas@atoomic.org", "pagaltzis@gmx.de", "perl5@tux.freedom.nl", + "philippe@bruhat.net", "rjbs@semiotic.systems", "steve.m.hay@googlemail.com", "stuart@perlfoundation.org", + "thibault.duponchelle@gmail.com", "toddr@cpanel.net", "tony@develop-help.com", "wolfsage@gmail.com" Index: gnu/usr.bin/perl/Porting/deparse-skips.txt =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/deparse-skips.txt,v diff -u -p -a -u -p -r1.7 deparse-skips.txt --- gnu/usr.bin/perl/Porting/deparse-skips.txt 26 Dec 2025 22:14:13 -0000 1.7 +++ gnu/usr.bin/perl/Porting/deparse-skips.txt 16 Nov 2026 00:57:36 -0000 @@ -38,6 +38,7 @@ class/class.t class/construct.t class/destruct.t class/field.t +class/gh22169.t class/inherit.t class/method.t class/phasers.t @@ -54,6 +55,8 @@ mro/complex_c3_utf8.t mro/isarev.t mro/isarev_utf8.t op/attrhand.t # Custom attrs ignored; also AH provides none +op/caller.t # due to the GV-as_CV optimisation, the + # RT129239 test gets the wrong #line info emitted op/goto.t op/gv.t # glob copy constants op/index.t @@ -68,6 +71,10 @@ op/pack.t op/postfixderef.t op/range.t op/readline.t + +# currently named parameters in signatures don't deparse correctly +op/signatures.t + op/srand.t op/sub_lval.t op/sub.t @@ -124,7 +131,6 @@ uni/variables.t ../cpan/autodie/t/eval_error.t ../cpan/autodie/t/exception_class.t ../cpan/autodie/t/exception_nonref.t -../cpan/autodie/t/exceptions-smartmatch.t ../cpan/autodie/t/exec.t ../cpan/autodie/t/filehandles.t ../cpan/autodie/t/fileno.t @@ -226,6 +232,12 @@ uni/variables.t ../cpan/Test-Simple/t/Legacy/plan.t ../cpan/Test-Simple/t/Legacy/subtest/line_numbers.t ../cpan/Test-Simple/t/Legacy/subtest/predicate.t + +# These two use the imported T2 constant blessed HV ref,which +# deparse treats as a standalone non-blessed hash ref +../cpan/Test-Simple/t/modules/Handle.t +../cpan/Test-Simple/t/modules/V1.t + ../cpan/Test-Simple/t/regression/684-nested_todo_diag.t ../cpan/Test-Simple/t/Test2/behavior/run_subtest_inherit.t @@ -254,7 +266,6 @@ uni/variables.t ../dist/Carp/t/Carp.t ../dist/constant/t/constant.t ../dist/Data-Dumper/t/dumper.t -../dist/Data-Dumper/t/trailing_comma.t ../dist/Exporter/t/Exporter.t ../dist/Filter-Simple/t/data.t ../dist/Storable/t/croak.t @@ -265,6 +276,10 @@ uni/variables.t # which has a slightly different optree ../ext/B/t/optree_for.t ../ext/B/t/optree_samples.t + +# currently named parameters in signatures don't deparse correctly +../ext/B/t/optree_signatures.t + ../ext/Devel-Peek/t/Peek.t ../ext/IPC-Open3/t/IPC-Open2.t ../ext/IPC-Open3/t/IPC-Open3.t Index: gnu/usr.bin/perl/Porting/epigraphs.pod =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/epigraphs.pod,v diff -u -p -a -u -p -r1.18 epigraphs.pod --- gnu/usr.bin/perl/Porting/epigraphs.pod 19 Aug 2026 00:19:00 -0000 1.18 +++ gnu/usr.bin/perl/Porting/epigraphs.pod 16 Nov 2026 00:57:36 -0000 @@ -17,22 +17,6 @@ Consult your favorite dictionary for det =head1 EPIGRAPHS -=head2 v5.45.1 - Mike Oldfield - Far Above The Clouds - -L - - And the man in the rain picked up his bag of secrets, and journeyed - up the mountainside, far above the clouds, and nothing was ever heard - from him again... - ...except for the sound of Tubular Bells. - -=head2 v5.44.0 - Frank Herbert - Dune - -L - -Once men turned their thinking over to machines in the hope that this would set them free. -But that only permitted other men with machines to enslave them. - =head2 v5.44.0-RC2 - Frank Herbert - Dune Messiah L @@ -134,14 +118,6 @@ L - -The Default Male gaze does not just dominate cinema, it looks down on -society like the Eye of Sauron in The Lord of the Rings. Every other -identity group is 'othered' by it. - =head2 v5.42.2 - Edgar Allan Poe, "The Pit and the Pendulum" (in "Tales of Mystery and Imagination") L @@ -329,14 +305,6 @@ L - -Default Man feels he is the reference point from which all other values -and cultures are judged. He might not be aware of it, but Default Man -thinks he is the zero longitude of identities. =head2 v5.40.4 - Edgar Allan Poe, "The Masque of the Red Death" (in "Tales of Mystery and Imagination") Index: gnu/usr.bin/perl/Porting/make-rmg-checklist =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/make-rmg-checklist,v diff -u -p -a -u -p -r1.6 make-rmg-checklist --- gnu/usr.bin/perl/Porting/make-rmg-checklist 26 Dec 2025 22:14:13 -0000 1.6 +++ gnu/usr.bin/perl/Porting/make-rmg-checklist 16 Nov 2026 00:57:36 -0000 @@ -155,7 +155,12 @@ my $passthru_headers = qr/^= (?: over | my ($major, $minor, $point_with_maybe_rc) = split(/\./, $version); my ($point) = split(/-/, $point_with_maybe_rc); my $last_version = join('.', $major, ($point == 0 ? ($minor - 2, 0) : ($minor, $point-1))); +my $next_version = join('.', $major, ($point == 0 && $minor % 2 == 0 ? ($minor + 1, 0) : ($minor, $point+1))); +# Oldest version ("previous stable") that still has full support. +# This is supposed to match the "Version Support Status" table in perlpolicy.pod +my $old_support = join('.', $major, ($type eq 'BLEAD-POINT') ? $minor - 3 : + ($type eq 'MAINT') ? $minor - 2 : $minor - 4 ); foreach my $line (@pod_lines) { $line =~ $skip_headers @@ -192,7 +197,9 @@ foreach my $line (@pod_lines) { $line =~ s/\Q5.X.Y\E/$version/g; $line =~ s/\Q5.LAST\E/$last_version/g; + $line =~ s/\Q5.NEXT\E/$next_version/g; $line =~ s/\Q5.X\E\b/$major.$minor/g; + $line =~ s/\Q5.OLDSUPPORT\E/$old_support/g; $current_element->{'content'} .= "\n" . $line; } Index: gnu/usr.bin/perl/Porting/merge-deltas.pl =================================================================== RCS file: gnu/usr.bin/perl/Porting/merge-deltas.pl diff -N gnu/usr.bin/perl/Porting/merge-deltas.pl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/usr.bin/perl/Porting/merge-deltas.pl 16 Nov 2026 00:57:36 -0000 @@ -0,0 +1,243 @@ +#!perl +use v5.36; +use Pod::Simple::SimpleTree; + +# POD NAVIGATION SUBROUTINES + +sub header_pos ( $tree, $level, $title, $pos = 0 ) { + while ( $pos < @$tree ) { + next + unless ref( $tree->[$pos] ) eq 'ARRAY' + && $tree->[$pos][0] eq "head$level"; + return $pos if $tree->[$pos][2] eq $title; + } + continue { $pos++ } + return; # not found +} + +sub next_header_pos ( $tree, $level, $pos = 0 ) { + $pos++; + while ( $pos < @$tree ) { + next + unless ref( $tree->[$pos] ) eq 'ARRAY'; + next unless $tree->[$pos][0] =~ /\Ahead([1-4])\z/; + next if $1 > $level; + last if $1 < $level; + return $pos; + } + continue { $pos++ } + return; # not found +} + +sub find_pos_in ( $master, $delta, $title ) { + return + map header_pos( $_, 1, $title ), + $master, $delta; +} + +# POD GENERATION SUBROUTINES + +# NOTE: A Pod::Simple::SimpleTree "tree" is really just a list of +# directives. The only parts that are really tree-like / recursive are +# the list directives, and pod formatting codes. + +sub as_pod ( $tree ) { + return $tree unless ref $tree; # simple string + state $handler = { + Document => sub ( $name, $attr, @nodes ) { + return map( as_pod($_), @nodes), "=cut\n"; + }, + Para => sub ( $name, $attr, @nodes ) { + return map( as_pod($_), @nodes ), "\n\n"; + }, + Verbatim => sub ( $name, $attr, @nodes ) { + return map( as_pod($_), @nodes ), "\n\n"; + }, + X => sub ( $name, $attr, @nodes ) { + my ( $open, $spacer, $close ) = + $attr->{'~bracket_count'} + ? ( + '<' x $attr->{'~bracket_count'}, + ' ', + '>' x $attr->{'~bracket_count'} + ) + : ( '<', '', '>' ); + return "$name$open$spacer", + map( as_pod($_), @nodes ), + "$spacer$close"; + }, + L => sub ( $name, $attr, @nodes ) { + return "$name<$attr->{raw}>"; + }, + # TODO: =begin / =for + over => sub ( $name, $attr, @nodes ) { + return "=over", + $attr->{'~orig_content'} && " $attr->{'~orig_content'}", "\n\n", + map( as_pod($_), @nodes ), "=back\n\n"; + }, + item => sub ( $name, $attr, @nodes ) { + return "=item ", + $attr->{'~orig_content'} ? "$attr->{'~orig_content'}\n\n" : '', + map( as_pod($_), @nodes ), "\n\n"; + }, + '' => sub ( $name, $attr, @nodes ) { + return "=$name", @nodes && ' ', map( as_pod($_), @nodes ), "\n\n"; + }, + }; + my ( $directive, $attr, @nodes ) = @$tree; + my $name = + exists $handler->{$directive} ? $directive + : $directive =~ /\Aover-/ ? 'over' + : $directive =~ /\Aitem-/ ? 'item' + : length($directive) == 1 ? 'X' + : ''; + return join '', $handler->{$name}->( $directive, $attr, @nodes ); +} + +sub pod_excerpt ( $tree, $begin, $end ) { + return as_pod( [ Document => {}, $tree->@[ $begin .. $end ] ] ); +} + +# CONTENT MANIPULATION SUBROUTINES + +sub copy_section ( $master, $title, $delta ) { + my ( $master_pos, $delta_pos ) = find_pos_in( $master, $delta, $title ); + + # find the end of the section in the delta + my $end_pos = next_header_pos( $delta, 1, $delta_pos ) - 1; + + # inject the whole section from the delta + splice @$master, $master_pos + 1, + 0, $delta->@[ $delta_pos + 1 .. $end_pos ]; +} + +sub remove_identical ( $master, $title, $template ) { + my ( $master_pos, $template_pos ) = + find_pos_in( $master, $template, $title ); + + # find the end of the section in both + my $master_end_pos = next_header_pos( $master, 1, $master_pos ) - 1; + my $template_end_pos = next_header_pos( $template, 1, $template_pos ) - 1; + + # drop the section from the master if it's identical + # to that in the template + if ( pod_excerpt( $master, $master_pos, $master_end_pos ) eq + pod_excerpt( $template, $template_pos, $template_end_pos ) ) + { + splice @$master, $master_pos, $master_end_pos - $master_pos + 1; + } +} + +# map each section to an action +my %ACTION_FOR = ( + 'NAME' => 'skip', + 'DESCRIPTION' => 'skip', + 'Notice' => 'copy', + 'Core Enhancements' => 'copy', + 'Security' => 'copy', + 'Incompatible Changes' => 'copy', + 'Deprecations' => 'copy', + 'Performance Enhancements' => 'copy', + 'Modules and Pragmata' => 'skip', + 'Documentation' => 'copy', + 'Diagnostics' => 'copy', + 'Utility Changes' => 'copy', + 'Configuration and Compilation' => 'copy', + 'Testing' => 'copy', + 'Platform Support' => 'copy', + 'Internal Changes' => 'copy', + 'Selected Bug Fixes' => 'copy', + 'Known Problems' => 'copy', + 'Errata From Previous Releases' => 'copy', + 'Obituary' => 'copy', + 'Acknowledgements' => 'skip', + 'Reporting Bugs' => 'skip', + 'Give Thanks' => 'skip', + 'SEE ALSO' => 'skip', +); + +# HELPER SUBROUTINES + +# Note: the parser can only be used *once* per file +sub tree_for ($string) { + my $parser = Pod::Simple::SimpleTree->new; + $parser->keep_encoding_directive(1); + $parser->preserve_whitespace(1); + $parser->accept_targets('*'); # for & begin/end + $parser->_output_is_for_JustPod(1); # for ~bracket_count + $parser->parse_string_document($string)->root; +} + +sub loop_head1 ( $master, $tree, $file, $cb ) { + for my $title ( + map $_->[2], # grab the title + grep ref eq 'ARRAY' && $_->[0] eq 'head1', # of the =head1 + @$tree # of the tree + ) + { + die "Unexpected section '=head1 $title' in $file\n" + unless exists $ACTION_FOR{$title}; + next if $ACTION_FOR{$title} eq 'skip'; + $cb->( $master, $title, $tree ); + } +} + +sub slurp ($file) { + open my $fh, '<:utf8', $file + or die "Can't open $file for reading: $!"; + return do { local $/; <$fh> }; +} + +# MAIN PROGRAM + +sub main (@argv) { + + # compute the version + my ($version) = `git describe` =~ /\Av(5\.[0-9]+)/g; + die "$version does not look like a devel Perl version\n" + unless $version =~ /\A5\.[0-9]{1,2}[13579]\z/; + + # the current, unfinished, delta will be used + # as the master to produce the final document + my $final_delta = 'pod/perldelta.pod'; + my $master = tree_for( slurp($final_delta) ); + + # loop over all the development deltas + my $tag_devel = $version =~ tr/.//dr; + for my $file_tree ( + map [ $_->[0], tree_for( slurp( $_->[0] ) ) ], + sort { $b->[1] <=> $a->[1] } + map [ $_, m{pod/perl$tag_devel([0-9]+)delta\.pod}g ], + glob "pod/perl$tag_devel*delta.pod" + ) + { + my ( $file, $delta ) = @$file_tree; + loop_head1( + $master, $delta, $file, + sub ( $master, $title, $delta ) { + copy_section( $master, $title, $delta ); + } + ); + } + + # find all sections in the template identical to those + # in the master and remove them (from the master) + my $template_file = 'Porting/perldelta_template.pod'; + my $template = tree_for( slurp($template_file) ); + loop_head1( + $master, $template, $template_file, + sub ( $master, $title, $template ) { + remove_identical( $master, $title, $template ); + } + ); + + # save the result + open my $fh, '>:utf8', $final_delta + or die "Can't open $final_delta for writing: $!"; + print $fh as_pod($master); + + return 0; +} + +# make it easier to test +exit main( @ARGV ) unless caller; Index: gnu/usr.bin/perl/Porting/perldelta_template.pod =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/perldelta_template.pod,v diff -u -p -a -u -p -r1.18 perldelta_template.pod --- gnu/usr.bin/perl/Porting/perldelta_template.pod 19 Aug 2026 00:19:00 -0000 1.18 +++ gnu/usr.bin/perl/Porting/perldelta_template.pod 16 Nov 2026 00:57:36 -0000 @@ -406,7 +406,7 @@ died, add a short obituary here. XXX Generate this with: - perl Porting/acknowledgements.pl v5.42.3..HEAD + perl Porting/acknowledgements.pl v5.44.0..HEAD =head1 Reporting Bugs Index: gnu/usr.bin/perl/Porting/release_announcement_template.txt =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/release_announcement_template.txt,v diff -u -p -a -u -p -r1.9 release_announcement_template.txt --- gnu/usr.bin/perl/Porting/release_announcement_template.txt 26 Dec 2025 22:14:13 -0000 1.9 +++ gnu/usr.bin/perl/Porting/release_announcement_template.txt 16 Nov 2026 00:57:36 -0000 @@ -22,7 +22,9 @@ https://metacpan.org/release/[AUTHOR]/pe [ACKNOWLEDGEMENTS SECTION FROM PERLDELTA] +[END OF SUPPORT NOTE] + We expect to release version 5.[NEXT BLEAD VERSION.NEXT BLEAD SUBVERSION] on [FUTURE DATE]. -The next major stable release of Perl should appear in the first half of 2025. +The next major stable release of Perl should appear in the first half of 2026. [YOUR SALUTATION HERE] Index: gnu/usr.bin/perl/Porting/release_schedule.pod =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/release_schedule.pod,v diff -u -p -a -u -p -r1.15 release_schedule.pod --- gnu/usr.bin/perl/Porting/release_schedule.pod 19 Aug 2026 00:19:01 -0000 1.15 +++ gnu/usr.bin/perl/Porting/release_schedule.pod 16 Nov 2026 00:57:36 -0000 @@ -13,14 +13,13 @@ deemed necessary by the Steering Council =head2 Perl 5.44 - 2026-07-15 5.44.0 ✓ Leon Timmermans + 2026-??-?? 5.44.0 =head2 Perl 5.42 2025-07-02 5.42.0 ✓ Philippe Bruhat 2026-03-08 5.42.1 ✓ Steve Hay 2026-03-29 5.42.2 ✓ Steve Hay - 2026-08-02 5.42.3 Steve Hay =head2 Perl 5.40 @@ -29,7 +28,6 @@ deemed necessary by the Steering Council 2025-04-13 5.40.2 ✓ Steve Hay 2025-08-03 5.40.3 ✓ Steve Hay 2026-03-29 5.40.4 ✓ Steve Hay - 2026-08-02 5.40.5 Steve Hay =head1 DEVELOPMENT RELEASE SCHEDULE @@ -45,21 +43,23 @@ When shipping a release, you should incl the next four releases. If a stable version of Perl is released, you should reset the version numbers to the next blead series. -=head2 Perl 5.45 +=head2 Perl 5.43 - 2026-07-15 5.45.0 ✓ Leon Timmermans (tag only) - 2026-07-21 5.45.1 ✓ Paul Evans - 2026-08-20 5.45.2 - 2026-09-20 5.45.3 - 2026-10-20 5.45.4 - 2026-11-20 5.45.5 - 2026-12-20 5.45.6 - 2027-01-20 5.45.7 - 2027-02-20 5.45.8 Contentious changes freeze - 2027-03-20 5.45.9 User-visible changes - freeze - 2027-04-20 5.46.0-RC1 Full program freeze - 2027-05-20 5.46.0 New perl! + 2025-07-04 5.43.0 ✓ Philippe Bruhat (tag only) + 2025-07-20 5.43.1 ✓ Richard Leach + 2025-08-20 5.43.2 ✓ Karen Etheridge + 2025-09-20 5.43.3 ✓ Thibault Duponchelle + 2025-10-22 5.43.4 ✓ Eric Herman + 2025-11-20 5.43.5 ✓ Thibault Duponchelle + 2025-12-20 5.43.6 ✓ Steve Hay + 2026-01-19 5.43.7 ✓ Max Maischein + 2026-02-20 5.43.8 ✓ Richard Leach Contentious changes freeze + 2026-03-20 5.43.9 ✓ Eric Herman User-visible changes to + correctly functioning + programs freeze + 2026-04-20 5.43.10 ✓ Philippe Bruhat Full program freeze + 2026-06-01 5.43.11 ✓ Paul Evans + 2026-05-20 5.44.0 New perl! =head1 VICTIMS @@ -73,7 +73,7 @@ consent of the Steering Council.) Abigail Aristotle Pagaltzis Ask Bjørn Hansen - Chris Williams + Chris Williams Dave Cross Dave Rolsky David Golden Index: gnu/usr.bin/perl/Porting/sync-with-cpan =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/sync-with-cpan,v diff -u -p -a -u -p -r1.11 sync-with-cpan --- gnu/usr.bin/perl/Porting/sync-with-cpan 19 Aug 2026 00:19:01 -0000 1.11 +++ gnu/usr.bin/perl/Porting/sync-with-cpan 16 Nov 2026 00:57:36 -0000 @@ -209,7 +209,7 @@ my $package_file = "$tmpdir/$package"; # my $type_dir = "cpan"; my @problematic = ( - # no current entries as of perl-5.42.3 (July 2026) + # no current entries as of perl-5.44.0 ); @@ -355,7 +355,9 @@ If you've checked that the CUSTOMIZED ve proceed now. Otherwise, you should abort and investigate the situation. If the blead customizations are no longer needed, delete the CUSTOMIZED entry for $module in Porting/Maintainers.pl (and you'll also need to regenerate -t/porting/customized.dat in that case; see t/porting/customized.t). +t/porting/customized.dat in that case, via: +(cd t; ./perl -I../lib porting/customized.t --regen); +see also t/porting/customized.t). EOF if ($yes_to_all and !$force) { Index: gnu/usr.bin/perl/Porting/test-dist-modules.pl =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/test-dist-modules.pl,v diff -u -p -a -u -p -r1.1.1.2 test-dist-modules.pl --- gnu/usr.bin/perl/Porting/test-dist-modules.pl 26 Dec 2025 22:12:43 -0000 1.1.1.2 +++ gnu/usr.bin/perl/Porting/test-dist-modules.pl 16 Nov 2026 00:57:36 -0000 @@ -878,7 +878,7 @@ sub _create_runperl { # Create the strin } elsif (defined $args{progfile}) { $runperl .= qq( "$args{progfile}"); } else { - # You probaby didn't want to be sucking in from the upstream stdin + # You probably didn't want to be sucking in from the upstream stdin die "test.pl:runperl(): none of prog, progs, progfile, args, " . " switches or stdin specified" unless defined $args{args} or defined $args{switches} Index: gnu/usr.bin/perl/Porting/todo.pod =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/Porting/todo.pod,v diff -u -p -a -u -p -r1.17 todo.pod --- gnu/usr.bin/perl/Porting/todo.pod 19 Aug 2026 00:19:01 -0000 1.17 +++ gnu/usr.bin/perl/Porting/todo.pod 16 Nov 2026 00:57:36 -0000 @@ -1193,7 +1193,7 @@ L "commit_subject", ); -my $Collate= Unicode::Collate->new(level => 1, indentical => 1); +my $Collate= Unicode::Collate->new(level => 1, identical => 1); my @field_codes= sort keys %field_spec; my @field_names= map { $field_spec{$_} } @field_codes; my $tformat= "=" . join "%x09", map { "%" . $_ } @field_codes; Index: gnu/usr.bin/perl/amigaos4/amigaio.c =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/amigaos4/amigaio.c,v diff -u -p -a -u -p -r1.6 amigaio.c --- gnu/usr.bin/perl/amigaos4/amigaio.c 26 Dec 2025 22:14:13 -0000 1.6 +++ gnu/usr.bin/perl/amigaos4/amigaio.c 16 Nov 2026 00:57:36 -0000 @@ -380,7 +380,7 @@ int amigaos_kill(Pid_t pid, int signal) } } IExec->ReleaseSemaphore(&fork_array_sema); - /* Allow the C library to work out which signals are realy valid */ + /* Allow the C library to work out which signals are really valid */ if(thistask) { /* A quirk in newlib kill handling means it's better to call raise() rather than kill on out own task. */ Index: gnu/usr.bin/perl/cpan/CPAN-Meta/corpus/BadMETA.yml =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta/corpus/BadMETA.yml,v diff -u -p -a -u -p -r1.1.1.1 BadMETA.yml --- gnu/usr.bin/perl/cpan/CPAN-Meta/corpus/BadMETA.yml 13 Feb 2019 21:10:50 -0000 1.1.1.1 +++ gnu/usr.bin/perl/cpan/CPAN-Meta/corpus/BadMETA.yml 16 Nov 2026 00:57:37 -0000 @@ -1,24 +1,24 @@ ---- -abstract: ~ -author: - - 'Olivier Mengué' -build_requires: - ExtUtils::MakeMaker: 6.36 -configure_requires: - ExtUtils::MakeMaker: 6.36 -distribution_type: module -dynamic_config: 1 -generated_by: 'Module::Install version 1.06' -license: perl -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 -name: Foo -no_index: - directory: - - inc -requires: - perl: 5.005 -resources: - license: http://dev.perl.org/licenses/ -version: 0.01 +--- +abstract: ~ +author: + - 'Olivier Mengué' +build_requires: + ExtUtils::MakeMaker: 6.36 +configure_requires: + ExtUtils::MakeMaker: 6.36 +distribution_type: module +dynamic_config: 1 +generated_by: 'Module::Install version 1.06' +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: Foo +no_index: + directory: + - inc +requires: + perl: 5.005 +resources: + license: http://dev.perl.org/licenses/ +version: 0.01 Index: gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta.pm,v diff -u -p -a -u -p -r1.3 Meta.pm --- gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta.pm 13 Feb 2019 21:15:08 -0000 1.3 +++ gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta.pm 16 Nov 2026 00:57:37 -0000 @@ -1,9 +1,9 @@ -use 5.006; +use 5.008001; use strict; use warnings; package CPAN::Meta; -our $VERSION = '2.150010'; +our $VERSION = '2.150013'; #pod =head1 SYNOPSIS #pod @@ -398,7 +398,6 @@ sub save { my ($self, $file, $options) = @_; my $version = $options->{version} || '2'; - my $layer = $] ge '5.008001' ? ':utf8' : ''; if ( $version ge '2' ) { carp "'$file' should end in '.json'" @@ -410,7 +409,7 @@ sub save { } my $data = $self->as_string( $options ); - open my $fh, ">$layer", $file + open my $fh, '>:encoding(UTF-8)', $file or die "Error opening '$file' for writing: $!\n"; print {$fh} $data; @@ -650,7 +649,7 @@ CPAN::Meta - the distribution metadata f =head1 VERSION -version 2.150010 +version 2.150013 =head1 SYNOPSIS @@ -1000,7 +999,7 @@ L =back -=for :stopwords cpan testmatrix url annocpan anno bugtracker rt cpants kwalitee diff irc mailto metadata placeholders metacpan +=for :stopwords cpan testmatrix url bugtracker rt cpants kwalitee diff irc mailto metadata placeholders metacpan =head1 SUPPORT @@ -1029,7 +1028,7 @@ David Golden =item * -Ricardo Signes +Ricardo Signes =item * @@ -1039,7 +1038,7 @@ Adam Kennedy =head1 CONTRIBUTORS -=for stopwords Ansgar Burchardt Avar Arnfjord Bjarmason Benjamin Noggle Christopher J. Madsen Chuck Adams Cory G Watson Damyan Ivanov David Golden Eric Wilhelm Graham Knop Gregor Hermann Karen Etheridge Kenichi Ishigaki Kent Fredric Ken Williams Lars Dieckow Leon Timmermans majensen Mark Fowler Matt S Trout Michael G. Schwern Mohammad Anwar mohawk2 moznion Niko Tyni Olaf Alders Olivier Mengué Randy Sims Tomohiro Hosaka +=for stopwords Ansgar Burchardt Avar Arnfjord Bjarmason Benjamin Noggle Christopher J. Madsen Chuck Adams Cory G Watson Damyan Ivanov Dan Book Eric Wilhelm Graham Knop Gregor Hermann Karen Etheridge Kenichi Ishigaki Kent Fredric Ken Williams Lars Dieckow Leon Timmermans majensen Mark Fowler Matt S Trout Michael G. Schwern Mohammad Anwar mohawk2 moznion Niko Tyni Olaf Alders Olivier Mengué Philippe Bruhat (BooK) Randy Sims Ricardo Signes Tomohiro Hosaka =over 4 @@ -1073,7 +1072,7 @@ Damyan Ivanov =item * -David Golden +Dan Book =item * @@ -1153,7 +1152,15 @@ Olivier Mengué =item * +Philippe Bruhat (BooK) + +=item * + Randy Sims + +=item * + +Ricardo Signes =item * Index: gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm,v diff -u -p -a -u -p -r1.3 Converter.pm --- gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm 13 Feb 2019 21:15:08 -0000 1.3 +++ gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm 16 Nov 2026 00:57:37 -0000 @@ -1,9 +1,9 @@ -use 5.006; +use 5.008001; use strict; use warnings; package CPAN::Meta::Converter; -our $VERSION = '2.150010'; +our $VERSION = '2.150013'; #pod =head1 SYNOPSIS #pod @@ -1513,7 +1513,7 @@ CPAN::Meta::Converter - Convert CPAN dis =head1 VERSION -version 2.150010 +version 2.150013 =head1 SYNOPSIS @@ -1634,7 +1634,7 @@ David Golden =item * -Ricardo Signes +Ricardo Signes =item * Index: gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm,v diff -u -p -a -u -p -r1.3 Feature.pm --- gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm 13 Feb 2019 21:15:08 -0000 1.3 +++ gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm 16 Nov 2026 00:57:37 -0000 @@ -1,9 +1,9 @@ -use 5.006; +use 5.008001; use strict; use warnings; package CPAN::Meta::Feature; -our $VERSION = '2.150010'; +our $VERSION = '2.150013'; use CPAN::Meta::Prereqs; @@ -77,7 +77,7 @@ CPAN::Meta::Feature - an optional featur =head1 VERSION -version 2.150010 +version 2.150013 =head1 DESCRIPTION @@ -130,7 +130,7 @@ David Golden =item * -Ricardo Signes +Ricardo Signes =item * Index: gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm,v diff -u -p -a -u -p -r1.3 History.pm --- gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm 13 Feb 2019 21:15:08 -0000 1.3 +++ gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm 16 Nov 2026 00:57:37 -0000 @@ -1,10 +1,10 @@ # vi:tw=72 -use 5.006; +use 5.008001; use strict; use warnings; package CPAN::Meta::History; -our $VERSION = '2.150010'; +our $VERSION = '2.150013'; 1; @@ -22,7 +22,7 @@ CPAN::Meta::History - history of CPAN Me =head1 VERSION -version 2.150010 +version 2.150013 =head1 DESCRIPTION @@ -302,7 +302,7 @@ David Golden =item * -Ricardo Signes +Ricardo Signes =item * Index: gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm,v diff -u -p -a -u -p -r1.2 Merge.pm --- gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm 13 Feb 2019 21:15:08 -0000 1.2 +++ gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Merge.pm 16 Nov 2026 00:57:37 -0000 @@ -1,9 +1,10 @@ +use 5.008001; use strict; use warnings; package CPAN::Meta::Merge; -our $VERSION = '2.150010'; +our $VERSION = '2.150013'; use Carp qw/croak/; use Scalar::Util qw/blessed/; @@ -251,7 +252,7 @@ CPAN::Meta::Merge - Merging CPAN Meta fr =head1 VERSION -version 2.150010 +version 2.150013 =head1 SYNOPSIS @@ -333,7 +334,7 @@ David Golden =item * -Ricardo Signes +Ricardo Signes =item * Index: gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm,v diff -u -p -a -u -p -r1.3 Prereqs.pm --- gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm 13 Feb 2019 21:15:08 -0000 1.3 +++ gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm 16 Nov 2026 00:57:37 -0000 @@ -1,9 +1,9 @@ -use 5.006; +use 5.008001; use strict; use warnings; package CPAN::Meta::Prereqs; -our $VERSION = '2.150010'; +our $VERSION = '2.150013'; #pod =head1 DESCRIPTION #pod @@ -326,7 +326,7 @@ CPAN::Meta::Prereqs - a set of distribut =head1 VERSION -version 2.150010 +version 2.150013 =head1 DESCRIPTION @@ -458,7 +458,7 @@ David Golden =item * -Ricardo Signes +Ricardo Signes =item * Index: gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm,v diff -u -p -a -u -p -r1.3 Spec.pm --- gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm 13 Feb 2019 21:15:08 -0000 1.3 +++ gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm 16 Nov 2026 00:57:37 -0000 @@ -3,12 +3,12 @@ # that change semantics are not acceptable without prior approval # by David Golden or Ricardo Signes. -use 5.006; +use 5.008001; use strict; use warnings; package CPAN::Meta::Spec; -our $VERSION = '2.150010'; +our $VERSION = '2.150013'; 1; @@ -29,7 +29,7 @@ CPAN::Meta::Spec - specification for CPA =head1 VERSION -version 2.150010 +version 2.150013 =head1 SYNOPSIS @@ -144,7 +144,8 @@ serializes into a bytestream and/or writ =item must, should, may, etc. -These terms are interpreted as described in IETF RFC 2119. +These terms are interpreted as described in +L. =back @@ -1086,7 +1087,7 @@ other methods for locating a module in C If only a filename is available, the following approach may be used: - # via Module::Build + # via Module::Metadata my $info = Module::Metadata->new_from_file($file); my $version = $info->version; @@ -1104,16 +1105,25 @@ ordinary comparison operators. For exam } If the only comparison needed is whether an installed module is of a -sufficiently high version, a direct test may be done using the string -form of C and the C function. For example, for module C<$mod> -and version prerequisite C<$prereq>: +sufficiently high version, a direct test may be done using the C +method. For example, for module C<$mod> and version prerequisite +C<$prereq>: - if ( eval "use $mod $prereq (); 1" ) { + use Module::Load 'load'; + if ( $mod =~ m/\A[\w:']+\z/a and eval { load $mod; $mod->VERSION($prereq); 1 } ) { print "Module $mod version is OK.\n"; } -If the values of C<$mod> and C<$prereq> have not been scrubbed, however, -this presents security implications. +The regexp checks that C<$mod> only includes characters legal for module +names before passing it to L, which also accepts file +paths that may escape C<@INC>. Alternatively, if L is +installed, the C function can load the module and perform the +version check at the same time, and does not accept file paths: + + use Module::Runtime 'use_module'; + if ( eval { use_module $mod, $prereq; 1 } ) { + print "Module $mod version is OK.\n"; + } =head2 Prerequisites for dynamically configured distributions @@ -1226,7 +1236,7 @@ David Golden =item * -Ricardo Signes +Ricardo Signes =item * Index: gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm,v diff -u -p -a -u -p -r1.3 Validator.pm --- gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm 13 Feb 2019 21:15:08 -0000 1.3 +++ gnu/usr.bin/perl/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm 16 Nov 2026 00:57:37 -0000 @@ -1,9 +1,9 @@ -use 5.006; +use 5.008001; use strict; use warnings; package CPAN::Meta::Validator; -our $VERSION = '2.150010'; +our $VERSION = '2.150013'; #pod =head1 SYNOPSIS #pod @@ -996,7 +996,7 @@ CPAN::Meta::Validator - validate CPAN di =head1 VERSION -version 2.150010 +version 2.150013 =head1 SYNOPSIS @@ -1191,7 +1191,7 @@ David Golden =item * -Ricardo Signes +Ricardo Signes =item * Index: gnu/usr.bin/perl/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm,v diff -u -p -a -u -p -r1.1.1.1 Meta.pm --- gnu/usr.bin/perl/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm 13 Feb 2019 21:10:50 -0000 1.1.1.1 +++ gnu/usr.bin/perl/cpan/CPAN-Meta/lib/Parse/CPAN/Meta.pm 16 Nov 2026 00:57:37 -0000 @@ -4,7 +4,7 @@ use warnings; package Parse::CPAN::Meta; # ABSTRACT: Parse META.yml and META.json CPAN metadata files -our $VERSION = '2.150010'; +our $VERSION = '2.150013'; use Exporter; use Carp 'croak'; @@ -169,7 +169,7 @@ Parse::CPAN::Meta - Parse META.yml and M =head1 VERSION -version 2.150010 +version 2.150013 =head1 SYNOPSIS @@ -352,7 +352,7 @@ David Golden =item * -Ricardo Signes +Ricardo Signes =item * Index: gnu/usr.bin/perl/cpan/CPAN-Meta/t/merge.t =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta/t/merge.t,v diff -u -p -a -u -p -r1.4 merge.t --- gnu/usr.bin/perl/cpan/CPAN-Meta/t/merge.t 13 Feb 2019 21:15:08 -0000 1.4 +++ gnu/usr.bin/perl/cpan/CPAN-Meta/t/merge.t 16 Nov 2026 00:57:37 -0000 @@ -22,7 +22,7 @@ my %base = ( prereqs => { runtime => { requires => { - Foo => '0', + Foo => '1', }, }, }, @@ -48,7 +48,7 @@ my %first = ( prereqs => { runtime => { requires => { - Foo => '< 1', + Foo => '< 2', }, recommends => { Bar => '3.14', @@ -79,7 +79,7 @@ my %first_expected = ( prereqs => { runtime => { requires => { - Foo => '>= 0, < 1', + Foo => '>= 1, < 2', }, recommends => { Bar => '3.14', @@ -117,7 +117,7 @@ my %provides_merge_expected = ( prereqs => { runtime => { requires => { - Foo => '0', + Foo => '1', }, }, }, Index: gnu/usr.bin/perl/cpan/CPAN-Meta/t/lib/Parse/CPAN/Meta/Test.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta/t/lib/Parse/CPAN/Meta/Test.pm,v diff -u -p -a -u -p -r1.1.1.1 Test.pm --- gnu/usr.bin/perl/cpan/CPAN-Meta/t/lib/Parse/CPAN/Meta/Test.pm 13 Feb 2019 21:10:50 -0000 1.1.1.1 +++ gnu/usr.bin/perl/cpan/CPAN-Meta/t/lib/Parse/CPAN/Meta/Test.pm 16 Nov 2026 00:57:37 -0000 @@ -1,3 +1,4 @@ +use 5.008001; package Parse::CPAN::Meta::Test; use strict; Index: gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm,v diff -u -p -a -u -p -r1.3 Requirements.pm --- gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm 28 Jan 2025 01:06:10 -0000 1.3 +++ gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements.pm 16 Nov 2026 00:57:36 -0000 @@ -4,7 +4,7 @@ use warnings; package CPAN::Meta::Requirements; # ABSTRACT: a set of version requirements for a CPAN dist -our $VERSION = '2.143'; +our $VERSION = '2.145'; use CPAN::Meta::Requirements::Range; @@ -486,7 +486,7 @@ CPAN::Meta::Requirements - a set of vers =head1 VERSION -version 2.143 +version 2.145 =head1 SYNOPSIS @@ -776,13 +776,13 @@ David Golden =item * -Ricardo Signes +Ricardo Signes =back =head1 CONTRIBUTORS -=for stopwords Ed J Graham Knop Karen Etheridge Leon Timmermans Paul Howarth Ricardo Signes robario Tatsuhiko Miyagawa +=for stopwords Ed J Graham Knop Karen Etheridge Leon Timmermans Paul Howarth Philippe Bruhat (BooK) Ricardo Signes robario Tatsuhiko Miyagawa =over 4 @@ -808,19 +808,19 @@ Paul Howarth =item * -Ricardo Signes +Philippe Bruhat (BooK) =item * -robario +Ricardo Signes =item * -Tatsuhiko Miyagawa +robario =item * -Tatsuhiko Miyagawa +Tatsuhiko Miyagawa =back Index: gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm,v diff -u -p -a -u -p -r1.1.1.1 Range.pm --- gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm 28 Jan 2025 01:04:23 -0000 1.1.1.1 +++ gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/lib/CPAN/Meta/Requirements/Range.pm 16 Nov 2026 00:57:36 -0000 @@ -4,7 +4,7 @@ use warnings; package CPAN::Meta::Requirements::Range; # ABSTRACT: a set of version requirements for a CPAN dist -our $VERSION = '2.143'; +our $VERSION = '2.145'; use Carp (); @@ -97,10 +97,6 @@ sub _version_object { my $magic = _find_magic_vstring( $version ); $version = $magic if length $magic; } - # pad to 3 characters if before 5.8.1 and appears to be a v-string - if ( $] < 5.008001 && $version !~ /\A[0-9]/ && substr($version,0,1) ne 'v' && length($version) < 3 ) { - $version .= "\0" x (3 - length($version)); - } eval { local $SIG{__WARN__} = sub { die "Invalid version: $_[0]" }; # avoid specific segfault on some older version.pm versions @@ -460,6 +456,7 @@ sub as_string { my @parts = @{ $self->as_struct }; return $parts[0][1] if @parts == 1 and $parts[0][0] eq '>='; + @parts = grep { $_->[0] ne '>=' || $_->[1] ne '0' } @parts; return join q{, }, map {; join q{ }, @$_ } @parts; } @@ -607,7 +604,7 @@ CPAN::Meta::Requirements::Range - a set =head1 VERSION -version 2.143 +version 2.145 =head1 SYNOPSIS @@ -762,7 +759,7 @@ David Golden =item * -Ricardo Signes +Ricardo Signes =back Index: gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/t/basic.t =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/t/basic.t,v diff -u -p -a -u -p -r1.2 basic.t --- gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/t/basic.t 5 Feb 2017 00:31:55 -0000 1.2 +++ gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/t/basic.t 16 Nov 2026 00:57:36 -0000 @@ -271,4 +271,19 @@ sub foo_1 { } +{ + my $r = CPAN::Meta::Requirements::Range->with_string_requirement(">= 0, < 2"); + is($r->as_string, '< 2', ">= 0 is filtered out when there's a maximum defined"); +} + +{ + my $r = CPAN::Meta::Requirements::Range->with_string_requirement(">= v1.2.3, < 2"); + is($r->as_string, '>= v1.2.3, < 2', ">= v1.2.3 is not filtered out when there's a maximum defined"); +} + +{ + my $r = CPAN::Meta::Requirements::Range->with_string_requirement(">= 0"); + is($r->as_string, '0', ">= 0 becomes a plain old '0' when alone"); +} + done_testing; Index: gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/t/from-hash.t =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/t/from-hash.t,v diff -u -p -a -u -p -r1.3 from-hash.t --- gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/t/from-hash.t 28 Jan 2025 01:06:10 -0000 1.3 +++ gnu/usr.bin/perl/cpan/CPAN-Meta-Requirements/t/from-hash.t 16 Nov 2026 00:57:36 -0000 @@ -41,9 +41,7 @@ for my $string (10, '>= 2, <= 9, != 7') ); } -SKIP: { - skip "Can't tell v-strings from strings until 5.8.1", 1 - unless $] gt '5.008'; +{ my $string_hash = { Left => 10, Shared => '= 2', @@ -53,17 +51,17 @@ SKIP: { dies_ok { CPAN::Meta::Requirements->from_string_hash($string_hash) } qr/Can't convert/, "we die when we can't understand a version spec"; -} - -{ - my $warning; - local $SIG{__WARN__} = sub { $warning = join("\n",@_) }; - my $range = CPAN::Meta::Requirements::Range->with_string_requirement(undef); - like ($warning, qr/Undefined requirement.*treated as '0'/, "undef requirement warns"); - $range->with_string_requirement(''); - like ($warning, qr/Undefined requirement.*treated as '0'/, "'' requirement warns"); + { + my $warning; + local $SIG{__WARN__} = sub { $warning = join("\n",@_) }; + + my $range = CPAN::Meta::Requirements::Range->with_string_requirement(undef); + like ($warning, qr/Undefined requirement.*treated as '0'/, "undef requirement warns"); + $range->with_string_requirement(''); + like ($warning, qr/Undefined requirement.*treated as '0'/, "'' requirement warns"); + } } { @@ -85,9 +83,7 @@ SKIP: { ); } -SKIP: { - skip "Can't tell v-strings from strings until 5.8.1", 2 - unless $] gt '5.008'; +{ my $string_hash = { Left => 10, Shared => v50.44.60, @@ -105,7 +101,6 @@ SKIP: { "vstring treated as if string", ); } - { my $req = CPAN::Meta::Requirements->from_string_hash( Index: gnu/usr.bin/perl/cpan/Config-Perl-V/V.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Config-Perl-V/V.pm,v diff -u -p -a -u -p -r1.7 V.pm --- gnu/usr.bin/perl/cpan/Config-Perl-V/V.pm 26 Dec 2025 22:14:13 -0000 1.7 +++ gnu/usr.bin/perl/cpan/Config-Perl-V/V.pm 16 Nov 2026 00:57:36 -0000 @@ -5,7 +5,7 @@ use warnings; use Config; use Exporter; -our $VERSION = "0.38"; +our $VERSION = "0.39"; our @ISA = qw( Exporter ); our @EXPORT_OK = qw( plv2hash summary myconfig signature ); our %EXPORT_TAGS = ( @@ -575,7 +575,7 @@ H.Merijn Brand =head1 COPYRIGHT AND LICENSE -Copyright (C) 2009-2025 H.Merijn Brand +Copyright (C) 2009-2026 H.Merijn Brand This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Index: gnu/usr.bin/perl/cpan/Config-Perl-V/t/47_plv5420tqm.t =================================================================== RCS file: gnu/usr.bin/perl/cpan/Config-Perl-V/t/47_plv5420tqm.t diff -N gnu/usr.bin/perl/cpan/Config-Perl-V/t/47_plv5420tqm.t --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/usr.bin/perl/cpan/Config-Perl-V/t/47_plv5420tqm.t 16 Nov 2026 00:57:36 -0000 @@ -0,0 +1,192 @@ +#!/pro/bin/perl + +use strict; +use warnings; + +BEGIN { + use Test::More; + my $tests = 137; + unless ($ENV{PERL_CORE}) { + require Test::NoWarnings; + Test::NoWarnings->import (); + $tests++; + } + + plan tests => $tests; + } + +use Config::Perl::V qw( summary ); + +ok (my $conf = Config::Perl::V::plv2hash (), "Read perl -v block"); +ok (exists $conf->{$_}, "Has $_ entry") for qw( build environment config inc ); + +is ($conf->{build}{osname}, $conf->{config}{osname}, "osname"); +is ($conf->{build}{stamp}, "Jul 5 2025 09:58:46", "Build time"); +is ($conf->{config}{version}, "5.42.0", "reconstructed \$Config{version}"); + +my $opt = Config::Perl::V::plv2hash ("")->{build}{options}; +foreach my $o (sort qw( + DEBUGGING HAS_LONG_DOUBLE HAS_STRTOLD HAS_TIMES MULTIPLICITY + PERL_COPY_ON_WRITE PERL_DONT_CREATE_GVSV PERL_HASH_FUNC_SIPHASH13 + PERL_HASH_USE_SBOX32 PERL_MALLOC_WRAP PERL_OP_PARENT PERL_PRESERVE_IVUV + PERL_TRACK_MEMPOOL PERL_USE_SAFE_PUTENV PERLIO_LAYERS USE_64_BIT_ALL + USE_64_BIT_INT USE_ITHREADS USE_LARGE_FILES USE_LOCALE + USE_LOCALE_COLLATE USE_LOCALE_CTYPE USE_LOCALE_NUMERIC USE_LOCALE_TIME + USE_PERL_ATOF USE_PERLIO USE_QUADMATH USE_REENTRANT_API + USE_THREAD_SAFE_LOCALE + )) { + is ($conf->{build}{options}{$o}, 1, "Runtime option $o set"); + delete $opt->{$o}; + } +foreach my $o (sort keys %$opt) { + is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); + } + +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "c9059d95d503f14acf267d22fe5fa762"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); + +SKIP: { + ord "A" == 65 or skip "ASCII-centric test", 1; + is ($sig, $md5, "MD5"); + } + +is_deeply ($conf->{build}{patches}, [ ], "No patches"); + +my %check = ( + alignbytes => 16, + api_version => 42, + bincompat5005 => undef, # GONE, chainsawed + byteorder => 12345678, + cc => "cc", + cccdlflags => "-fPIC", + ccdlflags => "-Wl,-E -Wl,-rpath,/pro/lib/perl5/5.42.0/x86_64-linux-thread-multi-quadmath/CORE", + config_args => "-Duse64bitall -Dusequadmath -Dusethreads -Duseithreads -Duseshrplib -Uversiononly -Dinc_version_list=none -des", + gccversion => "15.1.1 20250626", + gnulibc_version => "2.41", + ivsize => 8, + ivtype => "long", + ld => "cc", + lddlflags => "-shared -O2 -L/pro/local/lib -fstack-protector-strong", + ldflags => "-L/pro/local/lib -fstack-protector-strong", + libc => "/lib/../lib64/libc.so.6", + lseektype => "off_t", + osvers => "6.15.4-1-default", + use64bitall => "define", + use64bitint => "define", + usemymalloc => "n", + default_inc_excludes_dot + => "define", + ); +is ($conf->{config}{$_}, $check{$_}, "reconstructed \$Config{$_}") for sort keys %check; + +ok (my $info = summary ($conf), "A summary"); +ok (exists $info->{$_}, "Summary has $_") for qw( cc config_args usemymalloc default_inc_excludes_dot ); +is ($info->{default_inc_excludes_dot}, "define", "This build has . NOT in INC"); + +__END__ +Summary of my perl5 (revision 5 version 42 subversion 0) configuration: + + Platform: + osname=linux + osvers=6.15.4-1-default + archname=x86_64-linux-thread-multi-quadmath + uname='linux lx09 6.15.4-1-default #1 smp preempt_dynamic mon jun 30 10:37:39 utc 2025 (55e70a8) x86_64 x86_64 x86_64 gnulinux ' + config_args='-Duse64bitall -Dusequadmath -Dusethreads -Duseithreads -Duseshrplib -Uversiononly -Dinc_version_list=none -des' + hint=recommended + useposix=true + d_sigaction=define + useithreads=define + usemultiplicity=define + use64bitint=define + use64bitall=define + uselongdouble=undef + usemymalloc=n + default_inc_excludes_dot=define + Compiler: + cc='cc' + ccflags ='-D_REENTRANT -D_GNU_SOURCE -pie -fPIE -fPIC -DDEBUGGING -fwrapv -fno-strict-aliasing -pipe -fstack-protector-strong -I/pro/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2' + optimize='-O2' + cppflags='-D_REENTRANT -D_GNU_SOURCE -pie -fPIE -fPIC -DDEBUGGING -fwrapv -fno-strict-aliasing -pipe -fstack-protector-strong -I/pro/local/include' + ccversion='' + gccversion='15.1.1 20250626' + gccosandvers='' + intsize=4 + longsize=8 + ptrsize=8 + doublesize=8 + byteorder=12345678 + doublekind=3 + d_longlong=define + longlongsize=8 + d_longdbl=define + longdblsize=16 + longdblkind=3 + ivtype='long' + ivsize=8 + nvtype='__float128' + nvsize=16 + Off_t='off_t' + lseeksize=8 + alignbytes=16 + prototype=define + Linker and Libraries: + ld='cc' + ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/local/lib /usr/x86_64-suse-linux/lib /usr/lib /pro/local/lib /usr/lib64 /usr/local/lib64 + libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat -lquadmath + perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc -lquadmath + libc=/lib/../lib64/libc.so.6 + so=so + useshrplib=true + libperl=libperl.so + gnulibc_version='2.41' + Dynamic Linking: + dlsrc=dl_dlopen.xs + dlext=so + d_dlsymun=undef + ccdlflags='-Wl,-E -Wl,-rpath,/pro/lib/perl5/5.42.0/x86_64-linux-thread-multi-quadmath/CORE' + cccdlflags='-fPIC' + lddlflags='-shared -O2 -L/pro/local/lib -fstack-protector-strong' + + +Characteristics of this binary (from libperl): + Compile-time options: + DEBUGGING + HAS_LONG_DOUBLE + HAS_STRTOLD + HAS_TIMES + MULTIPLICITY + PERLIO_LAYERS + PERL_COPY_ON_WRITE + PERL_DONT_CREATE_GVSV + PERL_HASH_FUNC_SIPHASH13 + PERL_HASH_USE_SBOX32 + PERL_MALLOC_WRAP + PERL_OP_PARENT + PERL_PRESERVE_IVUV + PERL_TRACK_MEMPOOL + PERL_USE_SAFE_PUTENV + USE_64_BIT_ALL + USE_64_BIT_INT + USE_ITHREADS + USE_LARGE_FILES + USE_LOCALE + USE_LOCALE_COLLATE + USE_LOCALE_CTYPE + USE_LOCALE_NUMERIC + USE_LOCALE_TIME + USE_PERLIO + USE_PERL_ATOF + USE_QUADMATH + USE_REENTRANT_API + USE_THREAD_SAFE_LOCALE + Built under linux + Compiled at Jul 5 2025 09:58:46 + %ENV: + PERL6LIB="inst#/pro/3gl/CPAN/rakudo/install" + @INC: + /pro/lib/perl5/site_perl/5.42.0/x86_64-linux-thread-multi-quadmath + /pro/lib/perl5/site_perl/5.42.0 + /pro/lib/perl5/5.42.0/x86_64-linux-thread-multi-quadmath + /pro/lib/perl5/5.42.0 Index: gnu/usr.bin/perl/cpan/Config-Perl-V/t/48_plv5437.t =================================================================== RCS file: gnu/usr.bin/perl/cpan/Config-Perl-V/t/48_plv5437.t diff -N gnu/usr.bin/perl/cpan/Config-Perl-V/t/48_plv5437.t --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/usr.bin/perl/cpan/Config-Perl-V/t/48_plv5437.t 16 Nov 2026 00:57:36 -0000 @@ -0,0 +1,186 @@ +#!/pro/bin/perl + +use strict; +use warnings; + +BEGIN { + use Test::More; + my $tests = 137; + unless ($ENV{PERL_CORE}) { + require Test::NoWarnings; + Test::NoWarnings->import (); + $tests++; + } + + plan tests => $tests; + } + +use Config::Perl::V qw( summary ); + +ok (my $conf = Config::Perl::V::plv2hash (), "Read perl -v block"); +ok (exists $conf->{$_}, "Has $_ entry") for qw( build environment config inc ); + +is ($conf->{build}{osname}, $conf->{config}{osname}, "osname"); +is ($conf->{build}{stamp}, "Jan 20 2026 12:22:09", "Build time"); +is ($conf->{config}{version}, "5.43.7", "reconstructed \$Config{version}"); + +my $opt = Config::Perl::V::plv2hash ("")->{build}{options}; +foreach my $o (sort qw( + DEBUGGING HAS_LONG_DOUBLE HAS_STRTOLD HAS_TIMES + PERL_COPY_ON_WRITE PERL_DONT_CREATE_GVSV PERL_HASH_FUNC_SIPHASH13 + PERL_HASH_USE_SBOX32 PERL_MALLOC_WRAP PERL_OP_PARENT PERL_PRESERVE_IVUV + PERL_USE_SAFE_PUTENV PERLIO_LAYERS PERL_USE_DEVEL USE_64_BIT_ALL + USE_64_BIT_INT USE_LARGE_FILES USE_LOCALE + USE_LOCALE_COLLATE USE_LOCALE_CTYPE USE_LOCALE_NUMERIC USE_LOCALE_TIME + USE_PERL_ATOF USE_PERLIO + )) { + is ($conf->{build}{options}{$o}, 1, "Runtime option $o set"); + delete $opt->{$o}; + } +foreach my $o (sort keys %$opt) { + is ($conf->{build}{options}{$o}, 0, "Runtime option $o unset"); + } + +eval { require Digest::MD5; }; +my $md5 = $@ ? "0" x 32 : "3e9e3a27c1579ee4753d46680bc469df"; +ok (my $sig = Config::Perl::V::signature ($conf), "Get signature"); + +SKIP: { + ord "A" == 65 or skip "ASCII-centric test", 1; + is ($sig, $md5, "MD5"); + } + +is_deeply ($conf->{build}{patches}, [ ], "No patches"); + +my %check = ( + alignbytes => 8, + api_version => 43, + bincompat5005 => undef, # GONE, chainsawed + byteorder => 12345678, + cc => "cc", + cccdlflags => "-fPIC", + ccdlflags => "-Wl,-E", + config_args => "-Dusedevel -Duse64bitall -desr -Dusedevel -Uinstallusrbinperl -Dprefix=/media/Tux/perls", + gccversion => "15.2.1 20251006", + gnulibc_version => "2.42", + ivsize => 8, + ivtype => "long", + ld => "cc", + lddlflags => "-shared -O2 -L/pro/local/lib -fstack-protector-strong", + ldflags => "-L/pro/local/lib -fstack-protector-strong", + libc => "/lib/../lib64/libc.so.6", + lseektype => "off_t", + osvers => "6.18.5-1-default", + use64bitall => "define", + use64bitint => "define", + usemymalloc => "n", + default_inc_excludes_dot + => "define", + ); +is ($conf->{config}{$_}, $check{$_}, "reconstructed \$Config{$_}") for sort keys %check; + +ok (my $info = summary ($conf), "A summary"); +ok (exists $info->{$_}, "Summary has $_") for qw( cc config_args usemymalloc default_inc_excludes_dot ); +is ($info->{default_inc_excludes_dot}, "define", "This build has . NOT in INC"); + +__END__ +Summary of my perl5 (revision 5 version 43 subversion 7) configuration: + + Platform: + osname=linux + osvers=6.18.5-1-default + archname=x86_64-linux + uname='linux lx09 6.18.5-1-default #1 smp preempt_dynamic mon jan 12 07:24:59 utc 2026 (c0cb237) x86_64 x86_64 x86_64 gnulinux ' + config_args='-Dusedevel -Duse64bitall -desr -Dusedevel -Uinstallusrbinperl -Dprefix=/media/Tux/perls' + hint=recommended + useposix=true + d_sigaction=define + useithreads=undef + usemultiplicity=undef + use64bitint=define + use64bitall=define + uselongdouble=undef + usemymalloc=n + default_inc_excludes_dot=define + Compiler: + cc='cc' + ccflags ='-DDEBUGGING -fwrapv -fno-strict-aliasing -pipe -fstack-protector-strong -I/pro/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2' + optimize='-O2' + cppflags='-DDEBUGGING -fwrapv -fno-strict-aliasing -pipe -fstack-protector-strong -I/pro/local/include' + ccversion='' + gccversion='15.2.1 20251006' + gccosandvers='' + intsize=4 + longsize=8 + ptrsize=8 + doublesize=8 + byteorder=12345678 + doublekind=3 + d_longlong=define + longlongsize=8 + d_longdbl=define + longdblsize=16 + longdblkind=3 + ivtype='long' + ivsize=8 + nvtype='double' + nvsize=8 + Off_t='off_t' + lseeksize=8 + alignbytes=8 + prototype=define + Linker and Libraries: + ld='cc' + ldflags ='-L/pro/local/lib -fstack-protector-strong' + libpth=/usr/local/lib /usr/x86_64-suse-linux/lib /usr/lib /pro/local/lib /usr/lib64 /usr/local/lib64 + libs=-lpthread -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lgdbm_compat + perllibs=-lpthread -ldl -lm -lcrypt -lutil -lc + libc=/lib/../lib64/libc.so.6 + so=so + useshrplib=false + libperl=libperl.a + gnulibc_version='2.42' + Dynamic Linking: + dlsrc=dl_dlopen.xs + dlext=so + d_dlsymun=undef + ccdlflags='-Wl,-E' + cccdlflags='-fPIC' + lddlflags='-shared -O2 -L/pro/local/lib -fstack-protector-strong' + + +Characteristics of this binary (from libperl): + Compile-time options: + DEBUGGING + HAS_LONG_DOUBLE + HAS_STRTOLD + HAS_TIMES + PERLIO_LAYERS + PERL_COPY_ON_WRITE + PERL_DONT_CREATE_GVSV + PERL_HASH_FUNC_SIPHASH13 + PERL_HASH_USE_SBOX32 + PERL_MALLOC_WRAP + PERL_OP_PARENT + PERL_PRESERVE_IVUV + PERL_USE_DEVEL + PERL_USE_SAFE_PUTENV + USE_64_BIT_ALL + USE_64_BIT_INT + USE_LARGE_FILES + USE_LOCALE + USE_LOCALE_COLLATE + USE_LOCALE_CTYPE + USE_LOCALE_NUMERIC + USE_LOCALE_TIME + USE_PERLIO + USE_PERL_ATOF + Built under linux + Compiled at Jan 20 2026 12:22:09 + %ENV: + PERL6LIB="inst#/pro/3gl/CPAN/rakudo/install" + @INC: + /media/Tux/perls/lib/site_perl/5.43.7/x86_64-linux + /media/Tux/perls/lib/site_perl/5.43.7 + /media/Tux/perls/lib/5.43.7/x86_64-linux + /media/Tux/perls/lib/5.43.7 Index: gnu/usr.bin/perl/cpan/DB_File/DB_File.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/DB_File/DB_File.pm,v diff -u -p -a -u -p -r1.8 DB_File.pm --- gnu/usr.bin/perl/cpan/DB_File/DB_File.pm 28 Jan 2025 01:06:11 -0000 1.8 +++ gnu/usr.bin/perl/cpan/DB_File/DB_File.pm 16 Nov 2026 00:57:37 -0000 @@ -2,7 +2,7 @@ # # Written by Paul Marquess (pmqs@cpan.org) # -# Copyright (c) 1995-2023 Paul Marquess. All rights reserved. +# Copyright (c) 1995-2026 Paul Marquess. All rights reserved. # This program is free software; you can redistribute it and/or # modify it under the same terms as Perl itself. @@ -165,7 +165,7 @@ use Carp; # Module not thread safe, so don't clone sub CLONE_SKIP { 1 } -$VERSION = "1.859" ; +$VERSION = "1.860" ; $VERSION = eval $VERSION; # needed for dev releases { @@ -593,7 +593,7 @@ __END__ =head1 NAME -DB_File - Perl5 access to Berkeley DB version 1.x +DB_File - Perl access to Berkeley DB 1.x =head1 SYNOPSIS @@ -1646,7 +1646,7 @@ destroyed. See L for more details. -All the functions defined in L are available except for +All the functions defined in L are available except for close() and dbopen() itself. The B method interface to the supported functions have been implemented to mirror the way Berkeley DB works whenever possible. In particular note that: @@ -1708,7 +1708,7 @@ The code above can be rearranged to get =back -All the constants defined in L for use in the flags parameters +All the constants defined in L for use in the flags parameters in the methods defined below are also available. Refer to the Berkeley DB documentation for the precise meaning of the flags values. @@ -1755,7 +1755,7 @@ not use C to lock your database. =item B<$status = $X-Eseq($key, $value, $flags) ;> This interface allows sequential retrieval from the database. See -L for full details. +L for full details. Both the C<$key> and C<$value> parameters will be set to the key/value pair read from the database. @@ -2325,7 +2325,7 @@ archive in F. =head1 COPYRIGHT -Copyright (c) 1995-2023 Paul Marquess. All rights reserved. This program +Copyright (c) 1995-2026 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Index: gnu/usr.bin/perl/cpan/DB_File/DB_File.xs =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/DB_File/DB_File.xs,v diff -u -p -a -u -p -r1.7 DB_File.xs --- gnu/usr.bin/perl/cpan/DB_File/DB_File.xs 28 Jan 2025 01:06:11 -0000 1.7 +++ gnu/usr.bin/perl/cpan/DB_File/DB_File.xs 16 Nov 2026 00:57:37 -0000 @@ -6,7 +6,7 @@ All comments/suggestions/problems are welcome - Copyright (c) 1995-2023 Paul Marquess. All rights reserved. + Copyright (c) 1995-2026 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. Index: gnu/usr.bin/perl/cpan/DB_File/Makefile.PL =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/DB_File/Makefile.PL,v diff -u -p -a -u -p -r1.5 Makefile.PL --- gnu/usr.bin/perl/cpan/DB_File/Makefile.PL 15 Feb 2023 01:36:16 -0000 1.5 +++ gnu/usr.bin/perl/cpan/DB_File/Makefile.PL 16 Nov 2026 00:57:37 -0000 @@ -71,7 +71,9 @@ WriteMakefile( #OPTIMIZE => '-g', 'depend' => { 'Makefile' => 'config.in', - 'version$(OBJ_EXT)' => 'version.c'}, + 'version$(OBJ_EXT)' => 'version.c', + 'manifypods' => 'READMEmd' + }, 'clean' => { FILES => 'constants.h constants.xs *.bak t/*.t.bak' }, 'macro' => { my_files => "@files" }, 'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz', @@ -193,7 +195,11 @@ sub MY::libscan } -sub MY::postamble { <<'EOM' } ; +sub MY::postamble +{ + my %params = %{ $_[0] }; + + my $postamble = <<'EOM'; MyDoubleCheck: @echo Checking config.in is setup for a release @@ -227,6 +233,29 @@ MyDoubleCheck: EOM + if (-e '.github') + { + $postamble .= <){ next if 1 .. /^__END__/; print}' DB_File.pm >.github/DB_File.pod + +EOM + } + else + { + $postamble .= < !!$ENV{PERL_ENCODE_DEBUG}; our $VERSION; BEGIN { - $VERSION = sprintf "%d.%02d", q$Revision: 3.21 $ =~ /(\d+)/g; + $VERSION = sprintf "%d.%02d", q$Revision: 3.24 $ =~ /(\d+)/g; require XSLoader; XSLoader::load( __PACKAGE__, $VERSION ); } Index: gnu/usr.bin/perl/cpan/Encode/Byte/Makefile.PL =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Encode/Byte/Makefile.PL,v diff -u -p -a -u -p -r1.2 Makefile.PL --- gnu/usr.bin/perl/cpan/Encode/Byte/Makefile.PL 5 Feb 2017 00:31:57 -0000 1.2 +++ gnu/usr.bin/perl/cpan/Encode/Byte/Makefile.PL 16 Nov 2026 00:57:37 -0000 @@ -171,7 +171,7 @@ sub postamble my $lengthsofar = length($str); my $continuator = ''; $str .= "$table.c : $enc2xs Makefile.PL"; - foreach my $file (@{$tables{$table}}) + foreach my $file (sort (@{$tables{$table}})) { $str .= $continuator.' '.$self->catfile($dir,$file); if ( length($str)-$lengthsofar > 128*$numlines ) @@ -189,7 +189,7 @@ sub postamble qq{\n\t\$(PERL) $plib $enc2xs $ucopts -o \$\@ -f $table.fnm\n\n}; open (FILELIST, ">$table.fnm") || die "Could not open $table.fnm: $!"; - foreach my $file (@{$tables{$table}}) + foreach my $file (sort (@{$tables{$table}})) { print FILELIST $self->catfile($dir,$file) . "\n"; } Index: gnu/usr.bin/perl/cpan/Encode/lib/Encode/Supported.pod =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Encode/lib/Encode/Supported.pod,v diff -u -p -a -u -p -r1.4 Supported.pod --- gnu/usr.bin/perl/cpan/Encode/lib/Encode/Supported.pod 28 Jan 2025 01:06:11 -0000 1.4 +++ gnu/usr.bin/perl/cpan/Encode/lib/Encode/Supported.pod 16 Nov 2026 00:57:37 -0000 @@ -507,8 +507,8 @@ is added the value 0x80. By carefully looking at the encoded byte sequence, you can find that the byte sequence conforms a unique number. In that sense, EUC is a CCS generated by a CES above from up to four CCS (complicated?). UTF-8 -falls into this category. See L to find out how -UTF-8 maps Unicode to a byte sequence. +falls into this category. See L to +find out how UTF-8 maps Unicode to a byte sequence. You may also have found out by now why 7bit ISO-2022 cannot comprise a CCS. If you look at a byte sequence \x21\x21, you can't tell if Index: gnu/usr.bin/perl/cpan/Encode/t/Unicode_trailing_nul.t =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Encode/t/Unicode_trailing_nul.t,v diff -u -p -a -u -p -r1.1.1.2 Unicode_trailing_nul.t --- gnu/usr.bin/perl/cpan/Encode/t/Unicode_trailing_nul.t 14 May 2024 19:36:32 -0000 1.1.1.2 +++ gnu/usr.bin/perl/cpan/Encode/t/Unicode_trailing_nul.t 16 Nov 2026 00:57:37 -0000 @@ -16,7 +16,7 @@ use File::Spec; my $foo = Encode::decode("UTF-16LE", "/\0v\0a\0r\0/\0f\0f\0f\0f\0f\0f\0/\0u\0s\0e\0r\0s\0/\0s\0u\0p\0e\0r\0m\0a\0n\0"); -my ($fh, $path) = File::Temp::tempfile( CLEANUP => 1 ); +my ($fh, $path) = File::Temp::tempfile( UNLINK => 1 ); note "temp file: $path"; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm,v diff -u -p -a -u -p -r1.6 Command.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm 26 Dec 2025 22:14:14 -0000 1.6 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm 16 Nov 2026 00:57:37 -0000 @@ -7,7 +7,7 @@ require Exporter; our @ISA = qw(Exporter); our @EXPORT = qw(cp rm_f rm_rf mv cat eqtime mkpath touch test_f test_d chmod dos2unix); -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; my $Is_VMS = $^O eq 'VMS'; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm,v diff -u -p -a -u -p -r1.8 Liblist.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ package ExtUtils::Liblist; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; use File::Spec; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm,v diff -u -p -a -u -p -r1.8 MM.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm 16 Nov 2026 00:57:37 -0000 @@ -4,7 +4,7 @@ use strict; use warnings; use ExtUtils::MakeMaker::Config; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; require ExtUtils::Liblist; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm,v diff -u -p -a -u -p -r1.8 MM_AIX.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm 16 Nov 2026 00:57:37 -0000 @@ -2,7 +2,7 @@ package ExtUtils::MM_AIX; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; use ExtUtils::MakeMaker::Config; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm,v diff -u -p -a -u -p -r1.15 MM_Any.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 26 Dec 2025 22:14:14 -0000 1.15 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 16 Nov 2026 00:57:37 -0000 @@ -2,7 +2,7 @@ package ExtUtils::MM_Any; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; use Carp; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm,v diff -u -p -a -u -p -r1.8 MM_BeOS.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm 16 Nov 2026 00:57:37 -0000 @@ -27,7 +27,7 @@ require ExtUtils::MM_Any; require ExtUtils::MM_Unix; our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm,v diff -u -p -a -u -p -r1.8 MM_Cygwin.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm 16 Nov 2026 00:57:37 -0000 @@ -10,7 +10,7 @@ require ExtUtils::MM_Unix; require ExtUtils::MM_Win32; our @ISA = qw( ExtUtils::MM_Unix ); -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm,v diff -u -p -a -u -p -r1.8 MM_DOS.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ package ExtUtils::MM_DOS; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; require ExtUtils::MM_Any; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm,v diff -u -p -a -u -p -r1.8 MM_Darwin.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm 16 Nov 2026 00:57:37 -0000 @@ -8,7 +8,7 @@ BEGIN { our @ISA = qw( ExtUtils::MM_Unix ); } -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; @@ -44,31 +44,6 @@ sub init_dist { 'COPY_EXTENDED_ATTRIBUTES_DISABLE=1 COPYFILE_DISABLE=1 tar'; $self->SUPER::init_dist(@_); -} - -=head3 cflags - -Over-ride Apple's automatic setting of -Werror - -=cut - -sub cflags { - my($self,$libperl)=@_; - return $self->{CFLAGS} if $self->{CFLAGS}; - return '' unless $self->needs_linking(); - - my $base = $self->SUPER::cflags($libperl); - - foreach (split /\n/, $base) { - /^(\S*)\s*=\s*(\S*)$/ and $self->{$1} = $2; - }; - $self->{CCFLAGS} .= " -Wno-error=implicit-function-declaration"; - - return $self->{CFLAGS} = qq{ -CCFLAGS = $self->{CCFLAGS} -OPTIMIZE = $self->{OPTIMIZE} -PERLTYPE = $self->{PERLTYPE} -}; } 1; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm,v diff -u -p -a -u -p -r1.8 MM_MacOS.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ package ExtUtils::MM_MacOS; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; sub new { Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm,v diff -u -p -a -u -p -r1.8 MM_NW5.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm 16 Nov 2026 00:57:37 -0000 @@ -23,7 +23,7 @@ use warnings; use ExtUtils::MakeMaker::Config; use File::Basename; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; require ExtUtils::MM_Win32; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm,v diff -u -p -a -u -p -r1.8 MM_OS2.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm 16 Nov 2026 00:57:37 -0000 @@ -6,7 +6,7 @@ use warnings; use ExtUtils::MakeMaker qw(neatvalue); use File::Spec; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; require ExtUtils::MM_Any; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS390.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS390.pm,v diff -u -p -a -u -p -r1.1.1.3 MM_OS390.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS390.pm 26 Dec 2025 22:12:38 -0000 1.1.1.3 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS390.pm 16 Nov 2026 00:57:37 -0000 @@ -2,7 +2,7 @@ package ExtUtils::MM_OS390; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; use ExtUtils::MakeMaker::Config; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm,v diff -u -p -a -u -p -r1.8 MM_QNX.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm 16 Nov 2026 00:57:37 -0000 @@ -2,7 +2,7 @@ package ExtUtils::MM_QNX; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; require ExtUtils::MM_Unix; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm,v diff -u -p -a -u -p -r1.8 MM_UWIN.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm 16 Nov 2026 00:57:37 -0000 @@ -2,7 +2,7 @@ package ExtUtils::MM_UWIN; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; require ExtUtils::MM_Unix; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm,v diff -u -p -a -u -p -r1.30 MM_Unix.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 26 Dec 2025 22:15:23 -0000 1.30 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 16 Nov 2026 00:57:37 -0000 @@ -15,7 +15,7 @@ use ExtUtils::MakeMaker qw($Verbose neat # If $VERSION is in scope, parse_version() breaks { -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; } @@ -1322,6 +1322,7 @@ sub _fixin_replace_shebang { my $interpreter; if ( defined $ENV{PERL_MM_SHEBANG} && $ENV{PERL_MM_SHEBANG} eq "relocatable" ) { $interpreter = "/usr/bin/env perl"; + $arg = ''; } elsif ( $cmd =~ m{^perl(?:\z|[^a-z])} ) { if ( $Config{startperl} =~ m,^\#!.*/perl, ) { @@ -3030,7 +3031,7 @@ sub parse_version { next if $inpod || /^\s*#/; chop; next if /^\s*(if|unless|elsif)/; - if ( m{^ \s* package \s+ \w[\w\:\']* \s+ (v?[0-9._]+) \s* (;|\{) }x ) { + if ( m{^ \s* (?:package|class) \s+ \w[\w\:\']* \s+ (v?[0-9._]+) \s* (:|;|\{) }x ) { no warnings; $result = $1; } @@ -3968,7 +3969,7 @@ sub tool_xsubpp { } - $self->{XSPROTOARG} = "" unless defined $self->{XSPROTOARG}; + $self->{XSPROTOARG} = "-noprototypes" unless defined $self->{XSPROTOARG}; $self->tool_xsubpp_emit($xsdir, \@tmdeps, \@tmargs); } Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm,v diff -u -p -a -u -p -r1.8 MM_VMS.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm 16 Nov 2026 00:57:37 -0000 @@ -16,7 +16,7 @@ BEGIN { use File::Basename; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; require ExtUtils::MM_Any; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm,v diff -u -p -a -u -p -r1.8 MM_VOS.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm 16 Nov 2026 00:57:37 -0000 @@ -2,7 +2,7 @@ package ExtUtils::MM_VOS; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; require ExtUtils::MM_Unix; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm,v diff -u -p -a -u -p -r1.8 MM_Win32.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm 16 Nov 2026 00:57:37 -0000 @@ -27,7 +27,7 @@ use ExtUtils::MakeMaker qw(neatvalue _sp require ExtUtils::MM_Any; require ExtUtils::MM_Unix; our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; $ENV{EMXSHELL} = 'sh'; # to run `commands` Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm,v diff -u -p -a -u -p -r1.8 MM_Win95.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ package ExtUtils::MM_Win95; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; require ExtUtils::MM_Win32; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm,v diff -u -p -a -u -p -r1.8 MY.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ package ExtUtils::MY; use strict; require ExtUtils::MM; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; our @ISA = qw(ExtUtils::MM); Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm,v diff -u -p -a -u -p -r1.12 MakeMaker.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 26 Dec 2025 22:14:14 -0000 1.12 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 16 Nov 2026 00:57:37 -0000 @@ -25,7 +25,7 @@ our %Recognized_Att_Keys; our %macro_fsentity; # whether a macro is a filesystem name our %macro_dep; # whether a macro is a dependency -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; # Emulate something resembling CVS $Revision$ Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm,v diff -u -p -a -u -p -r1.8 Mkbootstrap.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ package ExtUtils::Mkbootstrap; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; require Exporter; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm,v diff -u -p -a -u -p -r1.8 Mksymlists.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm 16 Nov 2026 00:57:37 -0000 @@ -11,7 +11,7 @@ use Config; our @ISA = qw(Exporter); our @EXPORT = qw(&Mksymlists); -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; sub Mksymlists { Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm,v diff -u -p -a -u -p -r1.8 testlib.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ package ExtUtils::testlib; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; use Cwd; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm,v diff -u -p -a -u -p -r1.8 MM.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm 16 Nov 2026 00:57:37 -0000 @@ -10,7 +10,7 @@ our @ISA = qw(Exporter); our @EXPORT = qw(test_harness pod2man perllocal_install uninstall warn_if_old_packlist test_s cp_nonempty); -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; my $Is_VMS = $^O eq 'VMS'; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm,v diff -u -p -a -u -p -r1.8 Kid.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 16 Nov 2026 00:57:37 -0000 @@ -11,7 +11,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; use ExtUtils::MakeMaker::Config; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm,v diff -u -p -a -u -p -r1.8 Config.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ package ExtUtils::MakeMaker::Config; use strict; use warnings; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; use Config (); Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod,v diff -u -p -a -u -p -r1.12 FAQ.pod --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod 26 Dec 2025 22:14:14 -0000 1.12 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod 16 Nov 2026 00:57:37 -0000 @@ -1,6 +1,6 @@ package ExtUtils::MakeMaker::FAQ; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; 1; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm,v diff -u -p -a -u -p -r1.6 Locale.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm 26 Dec 2025 22:14:14 -0000 1.6 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm 16 Nov 2026 00:57:37 -0000 @@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::Locale; use strict; use warnings; -our $VERSION = "7.76"; +our $VERSION = "7.78"; $VERSION =~ tr/_//d; use base 'Exporter'; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod,v diff -u -p -a -u -p -r1.8 Tutorial.pod --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod 26 Dec 2025 22:14:14 -0000 1.8 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod 16 Nov 2026 00:57:37 -0000 @@ -1,6 +1,6 @@ package ExtUtils::MakeMaker::Tutorial; -our $VERSION = '7.76'; +our $VERSION = '7.78'; $VERSION =~ tr/_//d; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm,v diff -u -p -a -u -p -r1.6 version.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm 26 Dec 2025 22:14:14 -0000 1.6 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm 16 Nov 2026 00:57:37 -0000 @@ -16,7 +16,7 @@ use warnings; use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv); -$VERSION = '7.76'; +$VERSION = '7.78'; $VERSION =~ tr/_//d; $CLASS = 'version'; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm,v diff -u -p -a -u -p -r1.6 regex.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm 26 Dec 2025 22:14:14 -0000 1.6 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm 16 Nov 2026 00:57:37 -0000 @@ -11,7 +11,7 @@ use warnings; use vars qw($VERSION $CLASS $STRICT $LAX); -$VERSION = '7.76'; +$VERSION = '7.78'; $VERSION =~ tr/_//d; #--------------------------------------------------------------------------# Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/basic.t =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/basic.t,v diff -u -p -a -u -p -r1.6 basic.t --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/basic.t 26 Dec 2025 22:14:14 -0000 1.6 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/basic.t 16 Nov 2026 00:57:37 -0000 @@ -183,10 +183,11 @@ $mtext =~ s/^(\s*PERL\s*=.*)$/$1 -Iinc/m write_file($makefile, $mtext); sub check_dummy_inst { - my ($loc, $install_args, $label, $skipsubdir) = @_; + my ($loc, $label, $skipsubdir) = (shift, shift, shift); my %files; SKIP: { - my $install_out = run("$make install NOECHO= $install_args"); + my $run_cmd = make_macro($make, 'install', 'NOECHO' => '', @_); + my $install_out = run($run_cmd); is( $?, 0, "install $label" ) || diag $install_out; like( $install_out, qr/^Installing /m, "/Installing/ $label" ); ok( -r $loc, "$label install dir created" ) @@ -209,17 +210,17 @@ sub check_dummy_inst { \%files; } -check_dummy_inst($DUMMYINST, '', 'Module::Install style'); +check_dummy_inst($DUMMYINST, 'Module::Install style'); SKIP: { skip 'VMS install targets do not preserve $(PREFIX)', 8 if $Is_VMS; - check_dummy_inst('elsewhere', "PREFIX=elsewhere", 'with PREFIX'); + check_dummy_inst('elsewhere', 'with PREFIX', 0, 'PREFIX' => 'elsewhere'); rmtree('elsewhere'); } SKIP: { skip 'VMS install targets do not preserve $(DESTDIR)', 10 if $Is_VMS; - my $files = check_dummy_inst('other', 'PREFIX= DESTDIR=other', 'with DESTDIR'); + my $files = check_dummy_inst('other', 'with DESTDIR', 0, 'PREFIX' => '', 'DESTDIR' => 'other'); eval { unlike slurp($files->{'perllocal.pod'}), qr/other/, 'DESTDIR should not appear in perllocal'; 1 } or fail "error in slurp: $@"; @@ -239,7 +240,7 @@ SKIP: { SKIP: { skip 'VMS install targets do not preserve $(PREFIX)', 9 if $Is_VMS; - check_dummy_inst('other/elsewhere', 'PREFIX=elsewhere DESTDIR=other/', 'PREFIX override and DESTDIR'); + check_dummy_inst('other/elsewhere', 'PREFIX override and DESTDIR', 0, 'PREFIX' => 'elsewhere', 'DESTDIR' => 'other/'); ok( !-d 'elsewhere', ' install dir not created' ); rmtree('other'); } @@ -460,13 +461,13 @@ write_file($file, $text); # now do with "Liar" subdir still there rmtree $DUMMYINST; # so no false positive from before @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST"}); -check_dummy_inst($DUMMYINST, '', "with PREFIX=$DUMMYINST"); +check_dummy_inst($DUMMYINST, "with PREFIX=$DUMMYINST"); # now clean, delete "Liar" subdir, do again $realclean_out = run("$make realclean"); rmtree 'Liar'; rmtree $DUMMYINST; # so no false positive from before @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST"}); -check_dummy_inst($DUMMYINST, '', "with PREFIX=$DUMMYINST minus subdir", 1); +check_dummy_inst($DUMMYINST, "with PREFIX=$DUMMYINST minus subdir", 1); write_file($file, $preserve_MPL); # restore Makefile.PL $realclean_out = run("$make realclean"); rmtree 'Liar'; @@ -477,7 +478,8 @@ $text = $preserve_MPL; ok(($text =~ s:\);: PM_FILTER => '\$(ABSPERLRUN) -ne "print unless /^#/"',\n$&:), 'successful M.PL edit'); write_file($file, $text); @mpl_out = run(qq{$perl Makefile.PL}); -$test_out = run("$make test NOECHO="); +my $run_cmd = make_macro($make, 'test', 'NOECHO' => ''); +$test_out = run($run_cmd); like( $test_out, qr/All tests successful/, 'make test' ); is( $?, 0, ' exited normally' ) || diag $test_out; Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/fixin.t =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/fixin.t,v diff -u -p -a -u -p -r1.1.1.7 fixin.t --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/fixin.t 26 Dec 2025 22:12:39 -0000 1.1.1.7 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/fixin.t 16 Nov 2026 00:57:37 -0000 @@ -12,7 +12,7 @@ BEGIN { use File::Spec; -use Test::More tests => 25; +use Test::More tests => 28; use Config; use TieOut; @@ -122,6 +122,21 @@ END blah blah blah END } + ); +} + +SKIP: { + skip "Not relevant on VMS or MSWin32", 3 if $^O eq 'VMS' || $^O eq 'MSWin32' || $^O eq 'cygwin'; + local $ENV{PERL_MM_SHEBANG}='relocatable'; + test_fixin(<^|@() !"&<>^ try_oneliner(q{print q[ "C:\TEST A\" ]}, [], q{ "C:\TEST A\" }, 'example 8.4' ); try_oneliner(q{print q[ "C:\TEST %&^ A\" ]}, [], q{ "C:\TEST %&^ A\" }, 'example 8.5' ); -try_oneliner(<= 5.038 ) { + $versions{'class Foo 1.23;' } = '1.23'; + $versions{'class Foo::Bar 1.23;' } = '1.23'; + $versions{'class Foo v1.2.3;' } = 'v1.2.3'; + $versions{'class Foo::Bar v1.2.3;' } = 'v1.2.3'; + $versions{' class Foo::Bar v1.2.3;' } = 'v1.2.3'; + $versions{"class Foo'Bar 1.23;" } = '1.23'; + $versions{'class Foo 1.230;' } = '1.230'; + + $versions{'class Foo 1.23 { }' } = '1.23'; + $versions{'class Foo::Bar 1.23 { }' } = '1.23'; + $versions{'class Foo v1.2.3 { }' } = 'v1.2.3'; + $versions{'class Foo::Bar v1.2.3 { }' } = 'v1.2.3'; + $versions{' class Foo::Bar v1.2.3 { }' } = 'v1.2.3'; + $versions{"class Foo'Bar 1.23 { }" } = '1.23'; + $versions{'class Foo 1.230 { }' } = '1.230'; + + $versions{'class Foo 1.23 :isa(Bar);' } = '1.23'; + $versions{'class Foo::Bar 1.23 :isa(Bar);' } = '1.23'; + $versions{'class Foo v1.2.3 :isa(Bar);' } = 'v1.2.3'; + $versions{'class Foo::Bar v1.2.3 :isa(Bar);' } = 'v1.2.3'; + $versions{' class Foo::Bar v1.2.3 :isa(Bar);' } = 'v1.2.3'; + $versions{"class Foo'Bar 1.23 :isa(Bar);" } = '1.23'; + $versions{'class Foo 1.230 :isa(Bar);' } = '1.230'; + + $versions{'class Foo 1.23 :isa(Bar) { }' } = '1.23'; + $versions{'class Foo::Bar 1.23 :isa(Bar) { }' } = '1.23'; + $versions{'class Foo v1.2.3 :isa(Bar) { }' } = 'v1.2.3'; + $versions{'class Foo::Bar v1.2.3 :isa(Bar) { }' } = 'v1.2.3'; + $versions{' class Foo::Bar v1.2.3 :isa(Bar) { }' } = 'v1.2.3'; + $versions{"class Foo'Bar 1.23 :isa(Bar) { }" } = '1.23'; + $versions{'class Foo 1.230 :isa(Bar) { }' } = '1.230'; +} + if ( "$]" < 5.012 ) { delete $versions{'$VERSION = -1.0'}; } Index: gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm,v diff -u -p -a -u -p -r1.5 XS.pm --- gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm 26 Dec 2025 22:14:14 -0000 1.5 +++ gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm 16 Nov 2026 00:57:37 -0000 @@ -203,43 +203,17 @@ $label2files{eud_consume} = +{ %{ $label2files{basic} }, # make copy 'Makefile.PL' => <<'EOF' . use File::Spec::Functions; -my $root; BEGIN {$root = catdir(updir, qw(XS-Testeud_produce blib arch));} +my @parts = split /::/, 'XS::Other'; +my $libdir = catdir(updir, qw(XS-Testeud_produce blib arch auto), @parts); +my $stem = defined &DynaLoader::mod2fname ? DynaLoader::mod2fname(\@parts) : $parts[-1]; EOF sprintf( $MAKEFILEPL, 'Test', 'Test.pm', qq{}, q{ DEFINE => '-DINVAR=input', - LDFROM => join(' ', '$(OBJECT)', map _quote_if_space($_), find_extra_libs({'XS::Other'=>undef}, [$root])), + LIBS => ["-L$libdir -l$stem"], }, - ) . <<'EOF', -use Config; -use File::Spec::Functions; -sub _quote_if_space { $_[0] =~ / / ? qq{"$_[0]"} : $_[0] } -my %exts; BEGIN { %exts = ( - MSWin32 => [ ".lib", ".$Config{dlext}", $Config{_a} ], - cygwin => [ '.dll' ], - android => [ ".$Config{dlext}" ], -); } -sub find_extra_libs { - my ($deps, $search) = @_; - return () if !keys %$deps; - return () unless my $exts = $exts{$^O}; - my @found_libs = (); - DEP: foreach my $name (keys %$deps) { - my @parts = split /::/, $name; - my $stem = defined &DynaLoader::mod2fname - ? DynaLoader::mod2fname(\@parts) : $parts[-1]; - my @bases = map $stem.$_, @$exts; - for my $dir (grep -d, @$search) { # only extant dirs - my ($found) = grep -f, map catfile($dir, 'auto', @parts, $_), @bases; - next if !defined $found; - push @found_libs, $found; - next DEP; - } - } - @found_libs; -} -EOF + ), 'Test.pm' => do { my $t = $PM_TEST; $t =~ s:is_even:is_odd:g; $t =~ s/bootstrap/ Index: gnu/usr.bin/perl/cpan/File-Fetch/lib/File/Fetch.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/File-Fetch/lib/File/Fetch.pm,v diff -u -p -a -u -p -r1.4 Fetch.pm --- gnu/usr.bin/perl/cpan/File-Fetch/lib/File/Fetch.pm 15 Feb 2023 01:36:17 -0000 1.4 +++ gnu/usr.bin/perl/cpan/File-Fetch/lib/File/Fetch.pm 16 Nov 2026 00:57:37 -0000 @@ -1,6 +1,7 @@ package File::Fetch; use strict; +use warnings; use FileHandle; use File::Temp; use File::Copy; @@ -22,7 +23,7 @@ use vars qw[ $VERBOSE $PREFER_BIN $FR $FTP_PASSIVE $TIMEOUT $DEBUG $WARN $FORCEIPV4 ]; -$VERSION = '1.04'; +$VERSION = '1.08'; $VERSION = eval $VERSION; # avoid warnings with development releases $PREFER_BIN = 0; # XXX TODO implement $FROM_EMAIL = 'File-Fetch@example.com'; @@ -39,7 +40,7 @@ $FORCEIPV4 = 0; ### methods available to fetch the file depending on the scheme $METHODS = { http => [ qw|lwp httptiny wget curl lftp fetch httplite lynx iosock| ], - https => [ qw|lwp wget curl| ], + https => [ qw|lwp httptiny wget curl| ], ftp => [ qw|lwp netftp wget curl lftp fetch ncftp ftp| ], file => [ qw|lwp lftp file| ], rsync => [ qw|rsync| ], @@ -58,7 +59,7 @@ use constant ON_VMS => ($^O eq 'VMS' use constant ON_UNIX => (!ON_WIN); use constant HAS_VOL => (ON_WIN); use constant HAS_SHARE => (ON_WIN); -use constant HAS_FETCH => ( $^O =~ m!^(freebsd|netbsd|dragonfly)$! ); +use constant HAS_FETCH => ( $^O =~ m!^(freebsd|netbsd|dragonfly|midnightbsd)$! ); =pod @@ -400,9 +401,12 @@ sub _parse_uri { ### rebuild the path from the leftover parts; $href->{path} = join '/', '', splice( @parts, $index, $#parts ); - } else { + } elsif ( $href->{scheme} eq 'http' || $href->{scheme} eq 'https' ) { ### using anything but qw() in hash slices may produce warnings ### in older perls :-( + @{$href}{ qw(userinfo host path) } = $uri =~ m|(?:([^\@:]*:[^\:\@]*)@)?([^/]*)(/.*)?$|s; + $href->{path} = '/' unless defined $href->{path}; + } else { @{$href}{ qw(userinfo host path) } = $uri =~ m|(?:([^\@:]*:[^\:\@]*)@)?([^/]*)(/.*)$|s; } @@ -491,7 +495,9 @@ sub fetch { next if grep { lc $_ eq $method } @$BLACKLIST; ### method is known to fail ### - next if $METHOD_FAIL->{$method}; + next if ref $METHOD_FAIL->{$method} + ? $METHOD_FAIL->{$method}{$self->scheme} + : $METHOD_FAIL->{$method}; ### there's serious issues with IPC::Run and quoting of command ### line arguments. using quotes in the wrong place breaks things, @@ -569,10 +575,6 @@ sub _lwp_fetch { }; - if ($self->scheme eq 'https') { - $use_list->{'LWP::Protocol::https'} = '0'; - } - ### Fix CVE-2016-1238 ### local $Module::Load::Conditional::FORCE_SAFE_INC = 1; unless( can_load( modules => $use_list ) ) { @@ -580,6 +582,17 @@ sub _lwp_fetch { return; } + if ($self->scheme eq 'https') { + my $https_use_list = { + 'LWP::Protocol::https' => '0.0', + }; + + unless ( can_load(modules => $https_use_list) ) { + $METHOD_FAIL->{'lwp'} = { 'https' => 1 }; + return; + } + } + ### setup the uri object my $uri = URI->new( File::Spec::Unix->catfile( $self->path, $self->file @@ -638,6 +651,10 @@ sub _httptiny_fetch { $METHOD_FAIL->{'httptiny'} = 1; return; } + if ( $self->scheme eq 'https' && !HTTP::Tiny->can_ssl ) { + $METHOD_FAIL->{'httptiny'} = 1; + return; + } my $uri = $self->uri; @@ -961,6 +978,9 @@ sub _lftp_fetch { ### if a timeout is set, add it ### $str .= "set net:timeout $TIMEOUT;\n" if $TIMEOUT; + + ### lftp can get stuck in a loop of retries without this + $str .= "set net:reconnect-interval-base 5;\nset net:max-retries 2;\n"; ### run passive if specified ### $str .= "set ftp:passive-mode 1;\n" if $FTP_PASSIVE; Index: gnu/usr.bin/perl/cpan/File-Fetch/t/01_File-Fetch.t =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/File-Fetch/t/01_File-Fetch.t,v diff -u -p -a -u -p -r1.1.1.6 01_File-Fetch.t --- gnu/usr.bin/perl/cpan/File-Fetch/t/01_File-Fetch.t 15 Feb 2023 01:32:35 -0000 1.1.1.6 +++ gnu/usr.bin/perl/cpan/File-Fetch/t/01_File-Fetch.t 16 Nov 2026 00:57:37 -0000 @@ -1,6 +1,7 @@ BEGIN { chdir 't' if -d 't' }; use strict; +use warnings; use lib '../lib'; use Test::More 'no_plan'; @@ -16,7 +17,9 @@ use_ok('File::Fetch'); $File::Fetch::DEBUG = $File::Fetch::DEBUG = 1 if $ARGV[0]; $IPC::Cmd::DEBUG = $IPC::Cmd::DEBUG = 1 if $ARGV[0]; -$File::Fetch::FORCEIPV4=1; +$File::Fetch::FORCEIPV4 = $File::Fetch::FORCEIPV4 = 1; + +$File::Fetch::TIMEOUT = $File::Fetch::TIMEOUT = 30; unless( $ENV{PERL_CORE} ) { warn qq[ @@ -77,6 +80,12 @@ my @map = ( path => '/tmp/', file => 'index.txt', }, + { uri => 'http://localhost', # non-canonical URI + scheme => 'http', + host => 'localhost', + path => '/', # default path is '/' + file => '', + }, ### only test host part, the rest is OS dependant { uri => 'file://localhost/tmp/index.txt', @@ -195,14 +204,15 @@ for my $entry (@map) { ### Heuristics { require IO::Socket::INET; - my $sock = IO::Socket::INET->new( PeerAddr => 'httpbin.org', PeerPort => 80, Timeout => 20 ) + my $sock = IO::Socket::INET->new( PeerAddr => 'httpbingo.org', PeerPort => 80, Timeout => 20 ) or $heuristics{http} = 0; } ### http:// tests ### -{ for my $uri ( 'http://httpbin.org/html', - 'http://httpbin.org/response-headers?q=1', - 'http://httpbin.org/response-headers?q=1&y=2', +{ for my $uri ( 'http://httpbingo.org', + 'http://httpbingo.org/html', + 'http://httpbingo.org/response-headers?q=1', + 'http://httpbingo.org/response-headers?q=1&y=2', #'http://www.cpan.org/index.html?q=1&y=2', #'http://user:passwd@httpbin.org/basic-auth/user/passwd', ) { @@ -300,11 +310,3 @@ sub _fetch_uri { }} } } - - - - - - - - Index: gnu/usr.bin/perl/cpan/File-Temp/lib/File/Temp.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/File-Temp/lib/File/Temp.pm,v diff -u -p -a -u -p -r1.1.1.4 Temp.pm --- gnu/usr.bin/perl/cpan/File-Temp/lib/File/Temp.pm 15 Feb 2023 01:32:43 -0000 1.1.1.4 +++ gnu/usr.bin/perl/cpan/File-Temp/lib/File/Temp.pm 16 Nov 2026 00:57:37 -0000 @@ -1,7 +1,7 @@ -package File::Temp; # git description: v0.2310-3-gc7148fe +package File::Temp; # git description: v0.2311-9-gca0cdb7 # ABSTRACT: return name and handle of a temporary file safely -our $VERSION = '0.2311'; +our $VERSION = '0.2312'; #pod =begin :__INTERNALS #pod @@ -658,7 +658,6 @@ sub _force_writable { #Args: directory path to check # Optionally: reference to scalar to contain error message # Returns true if the path is safe and false otherwise. -# Returns undef if can not even run stat() on the path # This routine based on version written by Tom Christiansen @@ -1706,8 +1705,8 @@ sub tempdir { # Create the directory my $tempdir; my $suffixlen = 0; - if ($^O eq 'VMS') { # dir names can end in delimiters - $template =~ m/([\.\]:>]+)$/; + if ($^O eq 'VMS' + && ($template =~ m/([\.\]:>]+)$/)) { # dir specs can end in delimiters $suffixlen = length($1); } if ( ($^O eq 'MacOS') && (substr($template, -1) eq ':') ) { @@ -2596,7 +2595,7 @@ sub unlink1 { package ## hide from PAUSE File::Temp::Dir; -our $VERSION = '0.2311'; +our $VERSION = '0.2312'; use File::Path qw/ rmtree /; use strict; @@ -2663,7 +2662,7 @@ File::Temp - return name and handle of a =head1 VERSION -version 0.2311 +version 0.2312 =head1 SYNOPSIS @@ -3610,7 +3609,7 @@ different implementations of temporary f See L for an alternative object-oriented wrapper for the C function. -=for Pod::Coverage STRINGIFY NUMIFY top_system_uid +=for Pod::Coverage STRINGIFY NUMIFY top_system_uid MAX_TRIES MINX TEMPXXX =head1 SUPPORT @@ -3629,16 +3628,12 @@ Tim Jenness =head1 CONTRIBUTORS -=for stopwords Tim Jenness Karen Etheridge David Golden Slaven Rezic mohawk2 Roy Ivy III Peter Rabbitson Olivier Mengué John Acklam Gim Yee Nicolas R Brian Mowrey Dagfinn Ilmari Mannsåker Steinbrunner Ed Avis Guillem Jover James E. Keenan Kevin Ryde Ben Tilly +=for stopwords Karen Etheridge David Golden Slaven Rezic mohawk2 Roy Ivy III Craig A. Berry Olivier Mengué Peter Rabbitson Ben Tilly Brian Mowrey Dagfinn Ilmari Mannsåker Steinbrunner Ed Avis Guillem Jover James E. Keenan Kevin Ryde mauke Nicolas R John Acklam Tim Gim Yee =over 4 =item * -Tim Jenness - -=item * - Karen Etheridge =item * @@ -3659,7 +3654,7 @@ Roy Ivy III =item * -Peter Rabbitson +Craig A. Berry =item * @@ -3667,15 +3662,11 @@ Olivier Mengué =item * -Peter John Acklam - -=item * - -Tim Gim Yee +Peter Rabbitson =item * -Nicolas R +Ben Tilly =item * @@ -3707,13 +3698,25 @@ Kevin Ryde =item * -Ben Tilly +mauke + +=item * + +Nicolas R + +=item * + +Peter John Acklam + +=item * + +Tim Gim Yee =back =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2020 by Tim Jenness and the UK Particle Physics and Astronomy Research Council. +This software is copyright (c) 2025 by Tim Jenness and the UK Particle Physics and Astronomy Research Council. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. Index: gnu/usr.bin/perl/cpan/Filter-Util-Call/Call.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Filter-Util-Call/Call.pm,v diff -u -p -a -u -p -r1.6 Call.pm --- gnu/usr.bin/perl/cpan/Filter-Util-Call/Call.pm 14 May 2024 19:38:55 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Filter-Util-Call/Call.pm 16 Nov 2026 00:57:36 -0000 @@ -18,7 +18,7 @@ use warnings; our @ISA = qw(Exporter); our @EXPORT = qw( filter_add filter_del filter_read filter_read_exact) ; -our $VERSION = "1.64" ; +our $VERSION = "1.65" ; our $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -289,16 +289,16 @@ The function, C, is used to does not affect the running of the filter. All it does is tell Perl not to call filter any more. -See L for details. +See L for details. =item I -Internal function which adds the filter, based on the L +Internal function which adds the filter, based on the L argument type. =item I -May be used to disable a filter, but is rarely needed. See L. +May be used to disable a filter, but is rarely needed. See L. =back @@ -313,7 +313,7 @@ filtering code in a textual line-level o The content from the __DATA__ block is not filtered. This is a serious limitation, e.g. for the L module. -See L for more. +See L for more. =item Max. codesize limited to 32-bit Index: gnu/usr.bin/perl/cpan/Filter-Util-Call/Call.xs =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Filter-Util-Call/Call.xs,v diff -u -p -a -u -p -r1.6 Call.xs --- gnu/usr.bin/perl/cpan/Filter-Util-Call/Call.xs 14 May 2024 19:38:55 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Filter-Util-Call/Call.xs 16 Nov 2026 00:57:36 -0000 @@ -3,7 +3,7 @@ * * Author : Reini Urban * Date : Di 16. Aug 7:59:10 CEST 2022 - * Version : 1.64 + * Version : 1.65 * * Copyright (c) 1995-2011 Paul Marquess. All rights reserved. * Copyright (c) 2011-2014, 2018 Reini Urban. All rights reserved. Index: gnu/usr.bin/perl/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm,v diff -u -p -a -u -p -r1.9 IP.pm --- gnu/usr.bin/perl/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm 26 Dec 2025 22:14:14 -0000 1.9 +++ gnu/usr.bin/perl/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm 16 Nov 2026 00:57:36 -0000 @@ -3,12 +3,12 @@ # # (C) Paul Evans, 2010-2024 -- leonerd@leonerd.org.uk -package IO::Socket::IP 0.43; +package IO::Socket::IP 0.44; use v5.14; use warnings; -use base qw( IO::Socket ); +use parent qw( IO::Socket ); use Carp; @@ -1199,7 +1199,7 @@ sub join_addr package # hide from indexer IO::Socket::IP::_ForINET; -use base qw( IO::Socket::IP ); +use parent qw( IO::Socket::IP ); sub configure { @@ -1213,7 +1213,7 @@ sub configure package # hide from indexer IO::Socket::IP::_ForINET6; -use base qw( IO::Socket::IP ); +use parent qw( IO::Socket::IP ); sub configure { Index: gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigFloat.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigFloat.pm,v diff -u -p -a -u -p -r1.10 BigFloat.pm --- gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigFloat.pm 26 Dec 2025 22:14:14 -0000 1.10 +++ gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigFloat.pm 16 Nov 2026 00:57:37 -0000 @@ -21,7 +21,7 @@ use Carp qw< carp croak >; use Scalar::Util qw< blessed >; use Math::BigInt qw< >; -our $VERSION = '2.005002'; +our $VERSION = '2.005003'; $VERSION =~ tr/_//d; require Exporter; @@ -872,6 +872,130 @@ sub from_ieee754 { croak("The format '$format' is not yet supported."); } +sub from_fp80 { + my $self = shift; + my $selfref = ref $self; + my $class = $selfref || $self; + + # Make "require" work. + + $class -> import() if $IMPORT == 0; + + # Don't modify constant (read-only) objects. + + return $self if $selfref && $self -> modify('from_fp80'); + + my $in = shift; # input string (or raw bytes) + my @r = @_; # rounding parameters, if any + + # Undefined input. + + unless (defined $in) { + carp("Input is undefined"); + return $self -> bzero(@r); + } + + # The parameters for this format. + + my $p = 64; # precision (in bits) + my $w = 15; # number of bits in exponent + + # The maximum exponent, minimum exponent, and exponent bias. + + my $emax = $class -> new(2) -> bpow($w - 1) -> bdec(); # = 16383 + my $emin = 1 - $emax; # = -16382 + my $bias = $emax; # = -16383 + + # Make sure input string is a string of zeros and ones. + + my $len = CORE::length $in; + if (8 * $len == 80) { # bytes + $in = unpack "B*", $in; + } elsif (4 * $len == 80) { # hexadecimal + if ($in =~ /([^\da-f])/i) { + croak "Illegal hexadecimal digit '$1'"; + } + $in = unpack "B*", pack "H*", $in; + } elsif ($len == 80) { # bits + if ($in =~ /([^01])/) { + croak "Illegal binary digit '$1'"; + } + } else { + croak "Unknown input -- $in"; + } + + # Split bit string into sign, exponent, and mantissa/significand. + + my $sign = substr($in, 0, 1) eq '1' ? '-' : '+'; + my $expo = $class -> from_bin(substr($in, 1, $w)); + my $mant = $class -> from_bin(substr($in, $w + 1)); + + my $x; + + $expo -> bsub($bias); # subtract bias + + # zero and subnormal numbers + + if ($expo < $emin) { + if ($mant == 0) { # zero + $x = $class -> bzero(); + } else { # subnormals + # compute (1/2)**N rather than 2**(-N) + $x = $class -> new("0.5"); + $x -> bpow(-$emin - 1 + $p) -> bmul($mant); + $x -> bneg() if $sign eq '-'; + } + } + + # inf and nan + + elsif ($expo > $emax) { + + # if fraction of mantissa is zero, i.e., if mantissa is + # 0.000... or 1.000... + + if (substr($in, 16) =~ /^[01]0+$/) { + $x = $class -> binf($sign); + } else { + $x = $class -> bnan(); + } + } + + # normal numbers + + else { + + # downscale mantissa + $mant -> blsft($p - 1, "0.5"); # brsft($p - 1, 2) does division + + if ($expo < 0) { + # compute (1/2)**N rather than 2**(-N) + $x = $mant -> blsft(-$expo, "0.5"); + } elsif ($expo > 0) { + $x = $mant -> blsft($expo, "2"); + } else { + $x = $mant; + } + + $x -> bneg() if $sign eq '-'; + } + + if ($selfref) { + $self -> {sign} = $x -> {sign}; + $self -> {_m} = $x -> {_m}; + $self -> {_es} = $x -> {_es}; + $self -> {_e} = $x -> {_e}; + } else { + $self = $x; + } + + $self -> round(@r); + $self -> _dng() if ($self -> is_int() || + $self -> is_inf() || + $self -> is_nan()); + return $self; +} + sub from_base { my $self = shift; my $selfref = ref $self; @@ -5016,7 +5140,7 @@ sub bblsft { # Don't modify constant (read-only) objects. - return $x if $x -> modify('bblsft'); + return $x if ref($x) && $x -> modify('bblsft'); # Let Math::BigInt do the job. @@ -5064,7 +5188,7 @@ sub bbrsft { # Don't modify constant (read-only) objects. - return $x if $x -> modify('bbrsft'); + return $x if ref($x) && $x -> modify('bbrsft'); # Let Math::BigInt do the job. @@ -5872,11 +5996,12 @@ sub fparts { my @flt_parts = ($x->{sign}, $x->{_m}, $x->{_es}, $x->{_e}); my @rat_parts = $class -> _flt_lib_parts_to_rat_lib_parts(@flt_parts); - my $num = $class -> new($LIB -> _str($rat_parts[1])); - my $den = $class -> new($LIB -> _str($rat_parts[2])); - $num = $num -> bneg() if $rat_parts[0] eq "-"; - return $num unless wantarray; - return $num, $den; + my $numer = $class -> new($LIB -> _str($rat_parts[1])); + $numer -> bneg() if $rat_parts[0] eq "-"; + return $numer unless wantarray; + + my $denom = $class -> new($LIB -> _str($rat_parts[2])); + return $numer, $denom; } # Given "123.4375", returns "1975", since "123.4375" is "1975/16". @@ -6582,6 +6707,179 @@ sub to_ieee754 { croak("The format '$format' is not yet supported."); } +sub to_fp80 { + my ($class, $x, $format, @r) = ref($_[0]) ? (ref($_[0]), @_) + : objectify(1, @_); + + carp "Rounding is not supported for ", (caller(0))[3], "()" if @r; + + # The maximum exponent, minimum exponent, and exponent bias. + + my $emax = Math::BigFloat -> new("16383"); + my $emin = 1 - $emax; + my $bias = $emax; + + # Get numerical sign, exponent, and mantissa/significand for bit string. + + my $sign = 0; + my $expo; + my $mant; + + if ($x -> is_nan()) { # nan + $sign = 1; + $expo = $emax -> copy() -> binc(); + $mant = $class -> new(2) -> bpow(64) -> bdec(); + + } elsif ($x -> is_inf()) { # inf + $sign = 1 if $x -> is_neg(); + $expo = $emax -> copy() -> binc(); + $mant = $class -> bzero(); + + } elsif ($x -> is_zero()) { # zero + $expo = $emin -> copy() -> bdec(); + $mant = $class -> bzero(); + + } else { # normal and subnormal + + $sign = 1 if $x -> is_neg(); + + # Now we need to compute the mantissa and exponent in base $b. + + my $binv = $class -> new("0.5"); + my $b = $class -> new("2"); + my $one = $class -> bone(); + + # We start off by initializing the exponent to zero and the + # mantissa to the input value. Then we increase the mantissa and + # decrease the exponent, or vice versa, until the mantissa is in + # the desired range or we hit one of the limits for the exponent. + + $mant = $x -> copy() -> babs(); + + # We need to find the base 2 exponent. First make an estimate of + # the base 2 exponent, before adjusting it below. We could skip + # this estimation and go straight to the while-loops below, but the + # loops are slow, especially when the final exponent is far from + # zero and even more so if the number of digits is large. This + # initial estimation speeds up the computation dramatically. + # + # log2($m * 10**$e) = log10($m + 10**$e) * log(10)/log(2) + # = (log10($m) + $e) * log(10)/log(2) + # = (log($m)/log(10) + $e) * log(10)/log(2) + + my ($m, $e) = $x -> nparts(); + my $ms = $m -> numify(); + my $es = $e -> numify(); + + my $expo_est = (log(abs($ms))/log(10) + $es) * log(10)/log(2); + $expo_est = int($expo_est); + + # Limit the exponent. + + if ($expo_est > $emax) { + $expo_est = $emax; + } elsif ($expo_est < $emin) { + $expo_est = $emin; + } + + # Don't multiply by a number raised to a negative exponent. This + # will cause a division, whose result is truncated to some fixed + # number of digits. Instead, multiply by the inverse number raised + # to a positive exponent. + + $expo = $class -> new($expo_est); + if ($expo_est > 0) { + $mant = $mant -> bmul($binv -> copy() -> bpow($expo)); + } elsif ($expo_est < 0) { + my $expo_abs = $expo -> copy() -> bneg(); + $mant = $mant -> bmul($b -> copy() -> bpow($expo_abs)); + } + + # Final adjustment of the estimate above. + + while ($mant >= $b && $expo <= $emax) { + $mant = $mant -> bmul($binv); + $expo = $expo -> binc(); + } + + while ($mant < $one && $expo >= $emin) { + $mant = $mant -> bmul($b); + $expo = $expo -> bdec(); + } + + # This is when the magnitude is larger than what can be represented in + # this format. Encode as infinity. + + if ($expo > $emax) { + $mant = $class -> bzero(); + $expo = $emax -> copy() -> binc(); + } + + # This is when the magnitude is so small that the number is encoded as + # a subnormal number. + # + # If the magnitude is smaller than that of the smallest subnormal + # number, and rounded downwards, it is encoded as zero. This works + # transparently and does not need to be treated as a special case. + # + # If the number is between the largest subnormal number and the + # smallest normal number, and the value is rounded upwards, the value + # must be encoded as a normal number. This must be treated as a special + # case. + + elsif ($expo < $emin) { + + # Scale up the mantissa (significand), and round to integer. + + my $const = $class -> new($b) -> bpow(62); + $mant -> bmul($const) -> bfround(0); + + # If the mantissa overflowed, encode as the smallest normal number. + + if ($mant == $const -> bmul($b)) { + $expo -> binc(); + } + } + + # This is when the magnitude is within the range of what can be encoded + # as a normal number. + + else { + + # Remove implicit leading bit, scale up the mantissa (significand) + # to an integer, and round. + + my $const = $class -> new($b) -> bpow(63); + $mant -> bmul($const) -> bfround(0); + + # If the mantissa overflowed, encode as the next larger value. If + # this caused the exponent to overflow, encode as infinity. + + if ($mant == $const -> copy() -> bmul($b)) { + $expo -> binc(); + if ($expo > $emax) { + $mant = $class -> bzero(); + } else { + $mant = $const; + } + } + } + } + + $expo = $expo -> badd($bias); # add bias + + my $signbit = "$sign"; + + my $mantbits = $mant -> to_bin(); + $mantbits = ("0" x (64 - CORE::length($mantbits))) . $mantbits; + + my $expobits = $expo -> to_bin(); + $expobits = ("0" x (15 - CORE::length($expobits))) . $expobits; + + my $bin = $signbit . $expobits . $mantbits; + return pack "B*", $bin; +} + sub as_hex { # return number as hexadecimal string (only for integers defined) @@ -7285,6 +7583,7 @@ Math::BigFloat - arbitrary size floating $x = Math::BigFloat->from_bytes($bytes); # from byte string $x = Math::BigFloat->from_base('why', 36); # from any base $x = Math::BigFloat->from_ieee754($b, $fmt); # from IEEE-754 bytes + $x = Math::BigFloat->from_fp80($b); # from x86 80-bit $x = Math::BigFloat->bzero(); # create a +0 $x = Math::BigFloat->bone(); # create a +1 $x = Math::BigFloat->bone('-'); # create a -1 @@ -7434,6 +7733,7 @@ Math::BigFloat - arbitrary size floating $x->to_oct(); # as signed octal string $x->to_bytes(); # as byte string $x->to_ieee754($fmt); # to bytes encoded according to IEEE 754-2008 + $x->to_fp80(); # encode value in x86 80-bit format $x->as_hex(); # as signed hexadecimal string with "0x" prefix $x->as_bin(); # as signed binary string with "0b" prefix @@ -7693,6 +7993,27 @@ etc. where the number of bits is a multi ("binary64"), "quadruple" ("binary128"), "octuple" ("binary256"), and "sexdecuple" ("binary512"). +See also L. + +=item from_fp80() + +Interpret the input as a value encoded as an x86 80-bit floating point number. The input +can be given as a 10 character byte string, 20 character hex string, or 80 character binary string. The input is +assumed to be in big-endian byte-order. + + # Both $xr, $xh, and $xb below are 3.141592... + + $dbl = unpack "d>", "\x40\x09\x21\xfb\x54\x44\x2d\x18"; + + $raw = "\x40\x00\xc9\x0f\xda\xa2\x21\x68\xc2\x35"; # raw bytes + $xr = Math::BigFloat -> from_fp80($raw); + + $hex = "4000c90fdaa22168c235"; + $xh = Math::BigFloat -> from_fp80($hex); + + $bin = "0100000000000000110010010000111111011010" + . "1010001000100001011010001100001000110101"; + $xb = Math::BigFloat -> from_fp80($bin); See also L. =item from_base() Index: gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigInt.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigInt.pm,v diff -u -p -a -u -p -r1.10 BigInt.pm --- gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigInt.pm 26 Dec 2025 22:14:14 -0000 1.10 +++ gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigInt.pm 16 Nov 2026 00:57:37 -0000 @@ -24,7 +24,7 @@ use warnings; use Carp qw< carp croak >; use Scalar::Util qw< blessed refaddr >; -our $VERSION = '2.005002'; +our $VERSION = '2.005003'; $VERSION =~ tr/_//d; require Exporter; @@ -1247,6 +1247,36 @@ sub from_ieee754 { return $self; } +sub from_fp80 { + my $self = shift; + my $selfref = ref $self; + my $class = $selfref || $self; + + # Make "require" work. + + $class -> import() if $IMPORT == 0; + + # Don't modify constant (read-only) objects. + + return $self if $selfref && $self -> modify('from_fp80'); + + my $in = shift; + my @r = @_; + + require Math::BigFloat; + my $tmp = Math::BigFloat -> from_fp80($in, @r); + return $self -> bnan(@r) unless $tmp -> is_inf() || $tmp -> is_int(); + $tmp = $tmp -> as_int(); + + # If called as a class method, initialize a new object. + + $self = $class -> bzero(@r) unless $selfref; + $self -> {sign} = $tmp -> {sign}; + $self -> {value} = $tmp -> {value}; + + return $self; +} + sub from_base { my $self = shift; my $selfref = ref $self; @@ -5834,7 +5864,11 @@ sub fparts { my $numer = $x -> copy() -> round(@r); return $numer unless wantarray; - my $denom = $class -> bone(@r); + + my $denom = $x -> copy(); + $denom -> {sign} = "+"; + $denom -> {value} = $LIB -> _one(); + $denom -> round(@r); return $numer, $denom; } @@ -6132,6 +6166,19 @@ sub to_ieee754 { return $x -> as_float() -> to_ieee754($format); } +sub to_fp80 { + my ($class, $x, @r) = ref($_[0]) ? (ref($_[0]), @_) + : objectify(1, @_); + + return $x -> _upg() -> to_fp80(@r) + if $class -> upgrade() && !$x -> isa(__PACKAGE__); + + croak("the value to convert must be an integer, +/-infinity, or NaN") + unless $x -> is_int() || $x -> is_inf() || $x -> is_nan(); + + return $x -> as_float(@r) -> to_fp80(); +} + sub to_base { # return a base anything string @@ -7510,6 +7557,7 @@ Math::BigInt - arbitrary size integer ma $x = Math::BigInt->from_base('why', 36); # from any base $x = Math::BigInt->from_base_num([1, 0], 2); # from any base $x = Math::BigInt->from_ieee754($b, $fmt); # from IEEE-754 bytes + $x = Math::BigInt->from_fp80($b); # from x86 80-bit $x = Math::BigInt->bzero(); # create a +0 $x = Math::BigInt->bone(); # create a +1 $x = Math::BigInt->bone('-'); # create a -1 @@ -7666,6 +7714,7 @@ Math::BigInt - arbitrary size integer ma $x->to_base($b); # as string in any base $x->to_base_num($b); # as array of integers in any base $x->to_ieee754($fmt); # to bytes encoded according to IEEE 754-2008 + $x->to_fp80(); # encode value in x86 80-bit format $x->as_hex(); # as signed hexadecimal string with "0x" prefix $x->as_bin(); # as signed binary string with "0b" prefix @@ -8042,6 +8091,16 @@ returned if the value is neither +/-infi See L. +=item from_fp80() + + # set $x to 314159 + $x = Math::BigInt -> from_fp80("40119965e00000000000"); + +Interpret the input as a value encoded in the x86 extended-precision 80-bit +format. + +See L. + =item from_base() Given a string, a base, and an optional collation sequence, interpret the @@ -9259,6 +9318,10 @@ The invocand must be a non-negative, fin =item to_ieee754() See L. + +=item to_fp80() + +See L. =item to_base() Index: gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigRat.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigRat.pm,v diff -u -p -a -u -p -r1.1.1.2 BigRat.pm --- gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigRat.pm 26 Dec 2025 22:12:36 -0000 1.1.1.2 +++ gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigRat.pm 16 Nov 2026 00:57:37 -0000 @@ -22,7 +22,7 @@ use Carp qw< carp croak >; use Scalar::Util qw< blessed >; use Math::BigFloat qw<>; -our $VERSION = '2.005002'; +our $VERSION = '2.005003'; $VERSION =~ tr/_//d; require Exporter; @@ -691,6 +691,37 @@ sub from_ieee754 { return $self; } +sub from_fp80 { + my $self = shift; + my $selfref = ref $self; + my $class = $selfref || $self; + + # Make "require" work. + + $class -> import() if $IMPORT == 0; + + # Don't modify constant (read-only) objects. + + return $self if $selfref && $self -> modify('from_fp80'); + + my $in = shift; + my @r = @_; + + my $tmp = Math::BigFloat -> from_fp80($in, @r); + + $tmp = $tmp -> as_rat(); + + # If called as a class method, initialize a new object. + + $self = $class -> bzero(@r) unless $selfref; + $self -> {sign} = $tmp -> {sign}; + $self -> {_n} = $tmp -> {_n}; + $self -> {_d} = $tmp -> {_d}; + + $self -> _dng() if $self -> is_int(); + return $self; +} + sub from_base { my $self = shift; my $selfref = ref $self; @@ -3070,7 +3101,7 @@ sub bblsft { # Don't modify constant (read-only) objects. - return $x if $x -> modify('bblsft'); + return $x if ref($x) && $x -> modify('bblsft'); # Let Math::BigInt do the job. @@ -3117,7 +3148,7 @@ sub bbrsft { # Don't modify constant (read-only) objects. - return $x if $x -> modify('bbrsft'); + return $x if ref($x) && $x -> modify('bbrsft'); # Let Math::BigInt do the job. @@ -3520,16 +3551,32 @@ sub fparts { my $x = shift; my $class = ref $x; - croak("fparts() is an instance method") unless $class; + # NaN => NaN/NaN - return ($class -> bnan(), - $class -> bnan()) if $x -> is_nan(); + if ($x -> is_nan()) { + return $class -> bnan(), $class -> bnan() if wantarray; + return $class -> bnan(); + } - my $numer = $x -> copy(); - my $denom = $class -> bzero(); + # ±Inf => ±Inf/1 - $denom -> {_n} = $numer -> {_d}; + if ($x -> is_inf()) { + return $class -> binf($x -> sign()), $class -> bone() if wantarray; + return $class -> binf($x -> sign()); + } + + # -3/2 -> -3/1 + + my $numer = $x -> copy(); $numer -> {_d} = $LIB -> _one(); + return $numer unless wantarray; + + # -3/2 -> 2/1 + + my $denom = $x -> copy(); + $denom -> {sign} = "+"; + $denom -> {_n} = $denom -> {_d}; + $denom -> {_d} = $LIB -> _one(); return $numer, $denom; } @@ -3773,6 +3820,13 @@ sub to_ieee754 { return $x -> as_float() -> to_ieee754($format); } +sub to_fp80 { + my ($class, $x, @r) = ref($_[0]) ? (ref($_[0]), @_) + : objectify(1, @_); + + return $x -> as_float(@r) -> to_fp80(); +} + sub as_hex { my ($class, $x) = ref($_[0]) ? (undef, $_[0]) : objectify(1, @_); @@ -3977,6 +4031,7 @@ Math::BigRat - arbitrary size rational n $x = Math::BigRat->from_base('why', 36); # from any base $x = Math::BigRat->from_base_num([1, 0], 2); # from any base $x = Math::BigRat->from_ieee754($b, $fmt); # from IEEE-754 bytes + $x = Math::BigRat->from_fp80($b); # from x86 80-bit $x = Math::BigRat->bzero(); # create a +0 $x = Math::BigRat->bone(); # create a +1 $x = Math::BigRat->bone('-'); # create a -1 @@ -4132,6 +4187,7 @@ Math::BigRat - arbitrary size rational n $x->to_base($b); # as string in any base $x->to_base_num($b); # as array of integers in any base $x->to_ieee754($fmt); # to bytes encoded according to IEEE 754-2008 + $x->to_fp80(); # encode value in x86 80-bit format $x->as_hex(); # as signed hexadecimal string with "0x" prefix $x->as_bin(); # as signed binary string with "0b" prefix @@ -4243,6 +4299,17 @@ Interpret the input as a value encoded a See L. +=item from_fp80() + + # set $x to 14488038916154245685/4611686018427387904, the closest value + # to pi that can be represented in the x86 80-bit format + $x = Math::BigRat -> from_fp80("4000c90fdaa22168c235"); + +Interpret the input as a value encoded in the x86 extended-precision 80-bit +format. + +See L. + =item from_base() See L. @@ -4749,6 +4816,10 @@ See L. =item to_ieee754() See L. + +=item to_fp80() + +See L. =item as_hex() Index: gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigInt/Calc.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigInt/Calc.pm,v diff -u -p -a -u -p -r1.10 Calc.pm --- gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigInt/Calc.pm 26 Dec 2025 22:14:14 -0000 1.10 +++ gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigInt/Calc.pm 16 Nov 2026 00:57:37 -0000 @@ -7,7 +7,7 @@ use warnings; use Carp qw< carp croak >; use Math::BigInt::Lib; -our $VERSION = '2.005002'; +our $VERSION = '2.005003'; $VERSION =~ tr/_//d; our @ISA = ('Math::BigInt::Lib'); Index: gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigInt/Lib.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigInt/Lib.pm,v diff -u -p -a -u -p -r1.1.1.7 Lib.pm --- gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigInt/Lib.pm 26 Dec 2025 22:12:36 -0000 1.1.1.7 +++ gnu/usr.bin/perl/cpan/Math-BigInt/lib/Math/BigInt/Lib.pm 16 Nov 2026 00:57:37 -0000 @@ -4,7 +4,7 @@ use 5.006001; use strict; use warnings; -our $VERSION = '2.005002'; +our $VERSION = '2.005003'; $VERSION =~ tr/_//d; use Carp; Index: gnu/usr.bin/perl/cpan/Module-Metadata/lib/Module/Metadata.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Module-Metadata/lib/Module/Metadata.pm,v diff -u -p -a -u -p -r1.6 Metadata.pm --- gnu/usr.bin/perl/cpan/Module-Metadata/lib/Module/Metadata.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Module-Metadata/lib/Module/Metadata.pm 16 Nov 2026 00:57:36 -0000 @@ -1,6 +1,6 @@ # -*- mode: cperl; tab-width: 8; indent-tabs-mode: nil; basic-offset: 2 -*- # vim:ts=8:sw=2:et:sta:sts=2:tw=78 -package Module::Metadata; # git description: v1.000037-8-g92dec6c +package Module::Metadata; # git description: v1.000038-5-g7f7baae # ABSTRACT: Gather package and POD information from perl module files # Adapted from Perl-licensed code originally distributed with @@ -14,7 +14,7 @@ sub __clean_eval { eval $_[0] } use strict; use warnings; -our $VERSION = '1.000038'; +our $VERSION = '1.000039'; use Carp qw/croak/; use File::Spec; @@ -87,7 +87,7 @@ my $CLASS_REGEXP = qr{ # match a class \s* # optional whitespace ($V_NUM_REGEXP)? # optional version number \s* # optional whitespace - [;\{] # semicolon line terminator or block start + [:;\{] # attribute start, semicolon line terminator or block start }x; my $VARNAME_REGEXP = qr{ # match fully-qualified VERSION name @@ -861,7 +861,7 @@ Module::Metadata - Gather package and PO =head1 VERSION -version 1.000038 +version 1.000039 =head1 SYNOPSIS @@ -1072,6 +1072,14 @@ Returns a boolean indicating whether the Note This only checks for valid C declarations, and does not take any ownership information into account. +=head1 GIVING THANKS + +=for stopwords MetaCPAN GitHub + +If you found this module to be useful, please show your appreciation by +adding a +1 in L +and a star in L. + =head1 SUPPORT Bugs may be submitted through L @@ -1093,7 +1101,7 @@ assistance from David Golden (xdg) + +=item * + +Erik Huelsmann =item * Index: gnu/usr.bin/perl/cpan/Module-Metadata/t/extract-package.t =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Module-Metadata/t/extract-package.t,v diff -u -p -a -u -p -r1.4 extract-package.t --- gnu/usr.bin/perl/cpan/Module-Metadata/t/extract-package.t 28 Jan 2025 01:06:12 -0000 1.4 +++ gnu/usr.bin/perl/cpan/Module-Metadata/t/extract-package.t 16 Nov 2026 00:57:36 -0000 @@ -142,6 +142,14 @@ our $foo = 1; class Simple::Edward; --- }, +{ + name => 'package and class declarations', + package => [ 'Ticket::Widget::Entry' ], + code => <<'---', +package Ticket::Widget::Entry 0.36; +class Ticket::Widget::Entry :strict(params) :isa(Tickit::Widget); +--- +}, ); my $test_num = 0; Index: gnu/usr.bin/perl/cpan/Module-Metadata/t/extract-version.t =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Module-Metadata/t/extract-version.t,v diff -u -p -a -u -p -r1.4 extract-version.t --- gnu/usr.bin/perl/cpan/Module-Metadata/t/extract-version.t 28 Jan 2025 01:06:12 -0000 1.4 +++ gnu/usr.bin/perl/cpan/Module-Metadata/t/extract-version.t 16 Nov 2026 00:57:36 -0000 @@ -387,6 +387,38 @@ our $VERSION = '1.23_00_00'; all_versions => { Simple => 'v1.2_3' }, }, { + name => 'class NAME VERSION ATTRIBUTE', + code => <<'---', + class Simple 1.23 :isa(Complex); +--- + vers => '1.23', + all_versions => { Simple => '1.23' }, +}, +{ + name => 'class NAME VERSION ATTRIBUTE', + code => <<'---', + class Simple 1.23_01 :isa(Complex); +--- + vers => '1.23_01', + all_versions => { Simple => '1.23_01' }, +}, +{ + name => 'class NAME VERSION ATTRIBUTE', + code => <<'---', + class Simple v1.2.3 :isa(Complex); +--- + vers => 'v1.2.3', + all_versions => { Simple => 'v1.2.3' }, +}, +{ + name => 'class NAME VERSION ATTRIBUTE', + code => <<'---', + class Simple v1.2_3 :isa(Complex); +--- + vers => 'v1.2_3', + all_versions => { Simple => 'v1.2_3' }, +}, +{ name => 'trailing crud', code => <<'---', package Simple; @@ -500,6 +532,46 @@ class Simple 1.23 { name => 'class NAME VERSION BLOCK (2)', code => <<'---', class Simple v1.2.3_4 { + 1; +} +--- + vers => 'v1.2.3_4', + all_versions => { Simple => 'v1.2.3_4' }, +}, +{ + name => 'class NAME ATTRIBUTE BLOCK, undef $VERSION', + code => <<'---', +class Simple :isa(Complex) { + our $VERSION; +} +--- + vers => $undef, + all_versions => {}, +}, +{ + name => 'class NAME ATTRIBUTE BLOCK, with $VERSION', + code => <<'---', +class Simple :isa(Complex) { + our $VERSION = '1.23'; +} +--- + vers => '1.23', + all_versions => { Simple => '1.23' }, +}, +{ + name => 'class NAME VERSION ATTRIBUTE BLOCK (1)', + code => <<'---', +class Simple 1.23 :isa(Complex) { + 1; +} +--- + vers => '1.23', + all_versions => { Simple => '1.23' }, +}, +{ + name => 'class NAME VERSION ATTRIBUTE BLOCK (2)', + code => <<'---', +class Simple v1.2.3_4 :isa(Complex) { 1; } --- Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple.pm,v diff -u -p -a -u -p -r1.6 Simple.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple.pm 16 Nov 2026 00:57:37 -0000 @@ -11,9 +11,9 @@ use Pod::Simple::TiedOutFH; #use utf8; our @ISA = ('Pod::Simple::BlackBox'); -our $VERSION = '3.45'; +our $VERSION = '3.48'; -our @Known_formatting_codes = qw(I B C L E F S X Z); +our @Known_formatting_codes = qw(I B C L E F S U X Z); our %Known_formatting_codes = map(($_=>1), @Known_formatting_codes); our @Known_directives = qw(head1 head2 head3 head4 head5 head6 item over back); our %Known_directives = map(($_=>'Plain'), @Known_directives); @@ -33,8 +33,8 @@ BEGIN { die "MANY_LINES is too small (", MANY_LINES(), ")!\nAborting"; } if(defined &UNICODE) { } - elsif($] >= 5.008) { *UNICODE = sub() {1} } - else { *UNICODE = sub() {''} } + elsif( do { no integer; "$]" >= 5.008 } ) { *UNICODE = sub() {1} } + else { *UNICODE = sub() {''} } } if(DEBUG > 2) { print STDERR "# We are ", ASCII ? '' : 'not ', "in ASCII-land\n"; @@ -42,8 +42,8 @@ if(DEBUG > 2) { } # The NO BREAK SPACE and SOFT HYHPEN are used in several submodules. -if ($] ge 5.007_003) { # On sufficiently modern Perls we can handle any - # character set +if ( do { no integer; "$]" >= 5.007_003 } ) { # On sufficiently modern Perls we can handle any + # character set $Pod::Simple::nbsp = chr utf8::unicode_to_native(0xA0); $Pod::Simple::shy = chr utf8::unicode_to_native(0xAD); } @@ -754,7 +754,7 @@ sub _remap_sequences { ref($map->{$_}) ? join(",", @{$map->{$_}}) : $map->{$_} ), sort keys %$map ), - ("B~C~E~F~I~L~S~X~Z" eq join '~', sort keys %$map) + ("B~C~E~F~I~L~S~U~X~Z" eq join '~', sort keys %$map) ? " (all normal)\n" : "\n" ; Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple.pod =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple.pod,v diff -u -p -a -u -p -r1.4 Simple.pod --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple.pod 28 Jan 2025 01:06:12 -0000 1.4 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple.pod 16 Nov 2026 00:57:37 -0000 @@ -5,7 +5,19 @@ Pod::Simple - framework for parsing Pod =head1 SYNOPSIS - TODO + # using an existing formatter + use Pod::Simple::XHTML; + my $parser = Pod::Simple::XHTML->new; + $parser->parse_file('path/to/file.pod'); + + # creating a new formatter + package Pod::Simple::SomeFormatter; + use parent qw(Pod::Simple); + sub _handle_element_start { + my ($parser, $element_name, $attr_hash_r) = @_; + ... + } + ... =head1 DESCRIPTION @@ -256,7 +268,7 @@ effected. =item C<< $parser->accept_code( @codes ) >>X -Alias for L<< accept_codes >>. +Alias for L<< accept_codes|/$parser->accept_codes( @codes ) >>. =item C<< $parser->accept_codes( @codes ) >>X @@ -285,11 +297,11 @@ can be used to implement user-defined di =item C<< $parser->accept_target( @targets ) >>X -Alias for L<< accept_targets >>. +Alias for L<< accept_targets|/$parser->accept_targets( @targets ) >>. =item C<< $parser->accept_target_as_text( @targets ) >>X -Alias for L<< accept_targets_as_text >>. +Alias for L<< accept_targets_as_text|/$parser->accept_targets_as_text( @targets ) >>. =item C<< $parser->accept_targets( @targets ) >>X @@ -339,7 +351,7 @@ Log an error that can't be ignored. =item C<< $parser->unaccept_code( @codes ) >>X -Alias for L<< unaccept_codes >>. +Alias for L<< unaccept_codes|/$parser->unaccept_codes( @codes ) >>. =item C<< $parser->unaccept_codes( @codes ) >>X @@ -347,7 +359,7 @@ Removes C<< @codes >> as valid codes for =item C<< $parser->unaccept_directive( @directives ) >>X -Alias for L<< unaccept_directives >>. +Alias for L<< unaccept_directives|/$parser->unaccept_directives( @directives ) >>. =item C<< $parser->unaccept_directives( @directives ) >>X @@ -355,7 +367,7 @@ Removes C<< @directives >> as valid dire =item C<< $parser->unaccept_target( @targets ) >>X -Alias for L<< unaccept_targets >>. +Alias for L<< unaccept_targets|/$parser->unaccept_targets( @targets ) >>. =item C<< $parser->unaccept_targets( @targets ) >>X Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm,v diff -u -p -a -u -p -r1.6 BlackBox.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm 16 Nov 2026 00:57:37 -0000 @@ -22,7 +22,7 @@ use integer; # vroom! use strict; use warnings; use Carp (); -our $VERSION = '3.45'; +our $VERSION = '3.48'; #use constant DEBUG => 7; sub my_qr ($$) { @@ -35,7 +35,7 @@ sub my_qr ($$) { my ($input_re, $should_match) = @_; # XXX could have a third parameter $shouldnt_match for extra safety - my $use_utf8 = ($] le 5.006002) ? 'use utf8;' : ""; + my $use_utf8 = do { no integer; $] <= 5.006002 } ? 'use utf8;' : ""; my $re = eval "no warnings; $use_utf8 qr/$input_re/"; #print STDERR __LINE__, ": $input_re: $@\n" if $@; @@ -93,7 +93,7 @@ my $deprecated_re = my_qr('\p{IsDeprecat $deprecated_re = qr/\x{149}/ unless $deprecated_re; my $utf8_bom; -if (($] ge 5.007_003)) { +if ( do { no integer; "$]" >= 5.007_003 }) { $utf8_bom = "\x{FEFF}"; utf8::encode($utf8_bom); } else { @@ -266,13 +266,13 @@ sub parse_lines { # Usage: $ # XXX probably if the line has E that evaluates to illegal CP1252, # then it is UTF-8. But we haven't processed E<> yet. - goto set_1252 if $] lt 5.006_000; # No UTF-8 on very early perls + goto set_1252 if do { no integer; "$]" < 5.006_000 }; # No UTF-8 on very early perls my $copy; no warnings 'utf8'; - if ($] ge 5.007_003) { + if ( do { no integer; "$]" >= 5.007_003 } ) { $copy = $line; # On perls that have this function, we can use it to easily see if the @@ -286,7 +286,7 @@ sub parse_lines { # Usage: $ } else { # ASCII, no decode(): do it ourselves using the fundamental # characteristics of UTF-8 - use if $] le 5.006002, 'utf8'; + use if do { no integer; "$]" <= 5.006002 }, 'utf8'; my $char_ord; my $needed; # How many continuation bytes to gobble up @@ -601,6 +601,158 @@ sub parse_lines { # Usage: $ #@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +sub _maybe_handle_element_start { + my $self = shift; + return $self->_handle_element_start(@_) + if !$self->{heading_filter}; + + my ($element_name, $attr) = @_; + + if ($element_name =~ /\Ahead(\d)\z/) { + $self->{_in_head} = { + element => $element_name, + level => $1 + 0, + events => [], + text => '', + }; + } + + if (my $head = $self->{_in_head}) { + push @{ $head->{events} }, [ '_handle_element_start', @_ ]; + return; + } + + return + if !$self->{_filter_allowed}; + + $self->_handle_element_start(@_); +} + +sub _maybe_handle_element_end { + my $self = shift; + return $self->_handle_element_end(@_) + if !$self->{heading_filter}; + + my ($element_name, $attr) = @_; + + if (my $head = $self->{_in_head}) { + if ($element_name ne $head->{element}) { + push @{ $head->{events} }, [ '_handle_element_end', @_ ]; + return; + } + + delete $self->{_in_head}; + + my $headings = $self->{_current_headings} ||= []; + @$headings = (@{$headings}[0 .. $head->{level} - 2], $head->{text}); + + my $allowed = $self->{_filter_allowed} = $self->_filter_allows(@$headings); + + if ($allowed) { + for my $event (@{ $head->{events} }) { + my ($method, @args) = @$event; + $self->$method(@args); + } + } + } + + return + if !$self->{_filter_allowed}; + + $self->_handle_element_end(@_); +} + +sub _maybe_handle_text { + my $self = shift; + return $self->_handle_text(@_) + if !$self->{heading_filter}; + + my ($text) = @_; + + if (my $head = $self->{_in_head}) { + push @{ $head->{events} }, [ '_handle_text', @_ ]; + $head->{text} .= $text; + return; + } + + return + if !$self->{_filter_allowed}; + + $self->_handle_text(@_); +} + +sub _filter_allows { + my $self = shift; + my @headings = @_; + + my $filter = $self->{heading_filter} + or return 1; + + SPEC: for my $spec ( @$filter ) { + for my $i (0 .. $#$spec) { + my $regex = $spec->[$i]; + my $heading = $headings[$i]; + $heading = '' + if !defined $heading; + next SPEC + if $heading !~ $regex; + } + return 1; + } + + return 0; +} + +sub set_heading_select { + my $self = shift; + my (@selections) = @_; + + my $filter = $self->{heading_filter} ||= []; + if (@selections && $selections[0] eq '+') { + shift @selections; + } + else { + @$filter = (); + } + + for my $spec (@selections) { + eval { + push @$filter, $self->_compile_heading_spec($spec); + 1; + } or do { + warn $@; + warn qq{Ignoring section spec "$spec"!\n}; + }; + } +} + +sub _compile_heading_spec { + my $self = shift; + my ($spec) = @_; + + my @bad; + my @parts = $spec =~ m{(?:\A|\G/)((?:[^/\\]|\\.)*)}g; + for my $part (@parts) { + $part =~ s{\\(.)}{$1}g; + my $negate = $part =~ s{\A!}{}; + $part = '.*' + if !length $part; + + eval { + $part = $negate ? qr{^(?!$part$)} : qr{^$part$}; + 1; + } or do { + push @bad, qq{Bad regular expression /$part/ in "$spec": $@\n}; + }; + } + + Carp::croak(join '', @bad) + if @bad; + + return \@parts; +} + + sub _handle_encoding_line { my($self, $line) = @_; @@ -1346,7 +1498,7 @@ sub _ponder_begin { DEBUG > 1 and print STDERR "Ignoring ignorable =begin\n"; } else { $self->{'content_seen'} ||= 1 unless $self->{'~tried_gen_errata'}; - $self->_handle_element_start((my $scratch='for'), $para->[1]); + $self->_maybe_handle_element_start((my $scratch='for'), $para->[1]); } return 1; @@ -1414,7 +1566,7 @@ sub _ponder_end { # what's that for? $self->{'content_seen'} ||= 1 unless $self->{'~tried_gen_errata'}; - $self->_handle_element_end( my $scratch = 'for', $para->[1]); + $self->_maybe_handle_element_end( my $scratch = 'for', $para->[1]); } DEBUG > 1 and print STDERR "Popping $curr_open->[-1][0] $curr_open->[-1][1]{'target'} because of =end $content\n"; pop @$curr_open; @@ -1536,7 +1688,7 @@ sub _ponder_over { DEBUG > 1 and print STDERR "=over found of type $list_type\n"; $self->{'content_seen'} ||= 1 unless $self->{'~tried_gen_errata'}; - $self->_handle_element_start((my $scratch = 'over-' . $list_type), $para->[1]); + $self->_maybe_handle_element_start((my $scratch = 'over-' . $list_type), $para->[1]); return; } @@ -1558,7 +1710,7 @@ sub _ponder_back { # Expected case: we're closing the most recently opened thing #my $over = pop @$curr_open; $self->{'content_seen'} ||= 1 unless $self->{'~tried_gen_errata'}; - $self->_handle_element_end( my $scratch = + $self->_maybe_handle_element_end( my $scratch = 'over-' . ( (pop @$curr_open)->[1]{'~type'} ), $para->[1] ); } else { @@ -1843,7 +1995,7 @@ sub _traverse_treelet_bit { # for use o my($self, $name) = splice @_,0,2; my $scratch; - $self->_handle_element_start(($scratch=$name), shift @_); + $self->_maybe_handle_element_start(($scratch=$name), shift @_); while (@_) { my $x = shift; @@ -1851,11 +2003,11 @@ sub _traverse_treelet_bit { # for use o &_traverse_treelet_bit($self, @$x); } else { $x .= shift while @_ && !ref($_[0]); - $self->_handle_text($x); + $self->_maybe_handle_text($x); } } - $self->_handle_element_end($scratch=$name); + $self->_maybe_handle_element_end($scratch=$name); return; } @@ -2426,7 +2578,7 @@ sub reinit { foreach (qw(source_dead source_filename doc_has_started start_of_pod_block content_seen last_was_blank paras curr_open line_count pod_para_count in_pod ~tried_gen_errata all_errata errata errors_seen -Title)) { +Title _current_headings _in_head _filter_allowed)) { delete $self->{$_}; } Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Checker.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Checker.pm,v diff -u -p -a -u -p -r1.6 Checker.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Checker.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Checker.pm 16 Nov 2026 00:57:37 -0000 @@ -8,7 +8,7 @@ use warnings; use Carp (); use Pod::Simple::Methody (); use Pod::Simple (); -our $VERSION = '3.45'; +our $VERSION = '3.48'; our @ISA = ('Pod::Simple::Methody'); BEGIN { *DEBUG = defined(&Pod::Simple::DEBUG) ? \&Pod::Simple::DEBUG Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Debug.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Debug.pm,v diff -u -p -a -u -p -r1.6 Debug.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Debug.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Debug.pm 16 Nov 2026 00:57:37 -0000 @@ -1,6 +1,6 @@ package Pod::Simple::Debug; use strict; -our $VERSION = '3.45'; +our $VERSION = '3.48'; sub import { my($value,$variable); Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/DumpAsText.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/DumpAsText.pm,v diff -u -p -a -u -p -r1.6 DumpAsText.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/DumpAsText.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/DumpAsText.pm 16 Nov 2026 00:57:37 -0000 @@ -1,6 +1,6 @@ package Pod::Simple::DumpAsText; use strict; -our $VERSION = '3.45'; +our $VERSION = '3.48'; use Pod::Simple (); BEGIN { our @ISA = ('Pod::Simple')} Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/DumpAsXML.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/DumpAsXML.pm,v diff -u -p -a -u -p -r1.6 DumpAsXML.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/DumpAsXML.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/DumpAsXML.pm 16 Nov 2026 00:57:37 -0000 @@ -1,6 +1,6 @@ package Pod::Simple::DumpAsXML; use strict; -our $VERSION = '3.45'; +our $VERSION = '3.48'; use Pod::Simple (); BEGIN {our @ISA = ('Pod::Simple')} @@ -67,7 +67,7 @@ sub _handle_element_end { sub _xml_escape { foreach my $x (@_) { # Escape things very cautiously: - if ($] ge 5.007_003) { + if ("$]" >= 5.007_003) { $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(utf8::native_to_unicode(ord($1))).';'/eg; } else { # Is broken for non-ASCII platforms on early perls $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(ord($1)).';'/eg; Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/HTML.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/HTML.pm,v diff -u -p -a -u -p -r1.6 HTML.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/HTML.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/HTML.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ use strict; use warnings; use Pod::Simple::PullParser (); our @ISA = ('Pod::Simple::PullParser'); -our $VERSION = '3.45'; +our $VERSION = '3.48'; BEGIN { if(defined &DEBUG) { } # no-op elsif( defined &Pod::Simple::DEBUG ) { *DEBUG = \&Pod::Simple::DEBUG } @@ -35,8 +35,8 @@ $Perldoc_URL_Postfix = '' unless defined $Perldoc_URL_Postfix; -our $Man_URL_Prefix = 'http://man.he.net/man'; -our $Man_URL_Postfix = ''; +our $Man_URL_Prefix = 'https://man7.org/linux/man-pages/man'; +our $Man_URL_Postfix = '.html'; our $Title_Prefix; $Title_Prefix = '' unless defined $Title_Prefix; @@ -59,7 +59,7 @@ __PACKAGE__->_accessorize( # In turning L into http://whatever/man/1/crontab, what # to put before the "1/crontab". 'man_url_postfix', - # what to put after the "1/crontab" in the URL. Normally "". + # what to put after the "1/crontab" in the URL. Normally ".html". 'batch_mode', # whether we're in batch mode 'batch_mode_current_level', @@ -125,7 +125,7 @@ our %Tagmap = ( changes(qw( Para=p - B=b I=i + B=b I=i U=u over-bullet=ul over-number=ol over-text=dl @@ -164,6 +164,7 @@ our %Tagmap = ( 'B' => "", '/B' => "", 'I' => "", '/I' => "", + 'U' => "", '/U' => "", 'F' => "", '/F' => "", 'C' => "", '/C' => "", 'L' => "", # ideally never used! @@ -701,7 +702,7 @@ sub section_name_tidy { $section =~ s/^\s+//; $section =~ s/\s+$//; $section =~ tr/ /_/; - if ($] ge 5.006) { + if ("$]" >= 5.006) { $section =~ s/[[:cntrl:][:^ascii:]]//g; # drop crazy characters } elsif ('A' eq chr(65)) { # But not on early EBCDIC $section =~ tr/\x00-\x1F\x80-\x9F//d; @@ -724,7 +725,7 @@ sub general_url_escape { # A pretty conservative escaping, behoovey even for query components # of a URL (see RFC 2396) - if ($] ge 5.007_003) { + if ("$]" >= 5.007_003) { $string =~ s/([^-_\.!~*()abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/sprintf('%%%02X',utf8::native_to_unicode(ord($1)))/eg; } else { # Is broken for non-ASCII platforms on early perls $string =~ s/([^-_\.!~*()abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/sprintf('%%%02X',ord($1))/eg; @@ -796,8 +797,9 @@ sub resolve_man_page_link { $section ||= 1; return $self->man_url_prefix . "$section/" - . $self->manpage_url_escape($page) - . $self->man_url_postfix; + . $self->manpage_url_escape($page) . ".$section" + . $self->man_url_postfix + . (defined $frag ? '#' . $frag : ''); } #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -862,7 +864,7 @@ sub esc { # a function. @_ = splice @_; # break aliasing } else { my $x = shift; - if ($] ge 5.007_003) { + if ("$]" >= 5.007_003) { $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(utf8::native_to_unicode(ord($1))).';'/eg; } else { # Is broken for non-ASCII platforms on early perls $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(ord($1)).';'/eg; @@ -873,7 +875,7 @@ sub esc { # a function. foreach my $x (@_) { # Escape things very cautiously: if (defined $x) { - if ($] ge 5.007_003) { + if ("$]" >= 5.007_003) { $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(utf8::native_to_unicode(ord($1))).';'/eg } else { # Is broken for non-ASCII platforms on early perls $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(ord($1)).';'/eg @@ -1134,14 +1136,6 @@ under the same terms as Perl itself. This program is distributed in the hope that it will be useful, but without any warranty; without even the implied warranty of merchantability or fitness for a particular purpose. - -=head1 ACKNOWLEDGEMENTS - -Thanks to L for permission to use its -L site for man page links. - -Thanks to L for permission to use the -site for Perl module links. =head1 AUTHOR Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/HTMLBatch.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/HTMLBatch.pm,v diff -u -p -a -u -p -r1.6 HTMLBatch.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/HTMLBatch.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/HTMLBatch.pm 16 Nov 2026 00:57:37 -0000 @@ -1,6 +1,6 @@ package Pod::Simple::HTMLBatch; use strict; -our $VERSION = '3.45'; +our $VERSION = '3.48'; our @ISA = (); # Yup, we're NOT a subclass of Pod::Simple::HTML! # TODO: nocontents stylesheets. Strike some of the color variations? @@ -717,12 +717,13 @@ sub _gen_css_wad { } # Now a few indexless variations: - for (my ($outfile, $variation) = each %{{ + my %variations = ( blkbluw => 'black_with_blue_on_white', whtpurk => 'white_with_purple_on_black', whtgrng => 'white_with_green_on_grey', grygrnw => 'grey_with_green_on_white', - }}) { + ); + for (my ($outfile, $variation) = each %variations) { my $this_css = join "\n", "/* This file is autogenerated. Do not edit. $outfile */\n", "\@import url(\"./_$variation.css\");", @@ -1112,7 +1113,7 @@ Example: =item $batchconv = Pod::Simple::HTMLBatch->new; This creates a new batch converter. The method doesn't take parameters. -To change the converter's attributes, use the L<"/ACCESSOR METHODS"> +To change the converter's attributes, use the L below. =item $batchconv->batch_convert( I, I ); Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/JustPod.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/JustPod.pm,v diff -u -p -a -u -p -r1.1.1.3 JustPod.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/JustPod.pm 28 Jan 2025 01:04:27 -0000 1.1.1.3 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/JustPod.pm 16 Nov 2026 00:57:37 -0000 @@ -214,6 +214,7 @@ sub start_E { _start_fcode('E', @_); } sub start_F { _start_fcode('F', @_); } sub start_I { _start_fcode('I', @_); } sub start_S { _start_fcode('S', @_); } +sub start_U { _start_fcode('U', @_); } sub start_X { _start_fcode('X', @_); } sub start_Z { _start_fcode('Z', @_); } @@ -242,6 +243,7 @@ sub _end_fcode { *end_F = *_end_fcode; *end_I = *_end_fcode; *end_S = *_end_fcode; +*end_U = *_end_fcode; *end_X = *_end_fcode; *end_Z = *_end_fcode; Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/LinkSection.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/LinkSection.pm,v diff -u -p -a -u -p -r1.6 LinkSection.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/LinkSection.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/LinkSection.pm 16 Nov 2026 00:57:37 -0000 @@ -4,7 +4,7 @@ package Pod::Simple::LinkSection; use strict; use warnings; use Pod::Simple::BlackBox; -our $VERSION = '3.45'; +our $VERSION = '3.48'; use overload( # So it'll stringify nice '""' => \&Pod::Simple::BlackBox::stringify_lol, Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Methody.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Methody.pm,v diff -u -p -a -u -p -r1.6 Methody.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Methody.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Methody.pm 16 Nov 2026 00:57:37 -0000 @@ -2,7 +2,7 @@ package Pod::Simple::Methody; use strict; use warnings; use Pod::Simple (); -our $VERSION = '3.45'; +our $VERSION = '3.48'; our @ISA = ('Pod::Simple'); # Yes, we could use named variables, but I want this to be impose Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Progress.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Progress.pm,v diff -u -p -a -u -p -r1.6 Progress.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Progress.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Progress.pm 16 Nov 2026 00:57:37 -0000 @@ -2,7 +2,7 @@ package Pod::Simple::Progress; use strict; use warnings; -our $VERSION = '3.45'; +our $VERSION = '3.48'; # Objects of this class are used for noting progress of an # operation every so often. Messages delivered more often than that Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParser.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParser.pm,v diff -u -p -a -u -p -r1.6 PullParser.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParser.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParser.pm 16 Nov 2026 00:57:37 -0000 @@ -1,6 +1,6 @@ package Pod::Simple::PullParser; use strict; -our $VERSION = '3.45'; +our $VERSION = '3.48'; use Pod::Simple (); BEGIN {our @ISA = ('Pod::Simple')} Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserEndToken.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserEndToken.pm,v diff -u -p -a -u -p -r1.6 PullParserEndToken.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserEndToken.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserEndToken.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ use strict; use warnings; use Pod::Simple::PullParserToken (); our @ISA = ('Pod::Simple::PullParserToken'); -our $VERSION = '3.45'; +our $VERSION = '3.48'; sub new { # Class->new(tagname); my $class = shift; Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserStartToken.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserStartToken.pm,v diff -u -p -a -u -p -r1.6 PullParserStartToken.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserStartToken.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserStartToken.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ use strict; use warnings; use Pod::Simple::PullParserToken (); our @ISA = ('Pod::Simple::PullParserToken'); -our $VERSION = '3.45'; +our $VERSION = '3.48'; sub new { # Class->new(tagname, optional_attrhash); my $class = shift; Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserTextToken.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserTextToken.pm,v diff -u -p -a -u -p -r1.6 PullParserTextToken.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserTextToken.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserTextToken.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ use strict; use warnings; use Pod::Simple::PullParserToken (); our @ISA = ('Pod::Simple::PullParserToken'); -our $VERSION = '3.45'; +our $VERSION = '3.48'; sub new { # Class->new(text); my $class = shift; Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserToken.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserToken.pm,v diff -u -p -a -u -p -r1.6 PullParserToken.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserToken.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/PullParserToken.pm 16 Nov 2026 00:57:37 -0000 @@ -1,7 +1,7 @@ package Pod::Simple::PullParserToken; # Base class for tokens gotten from Pod::Simple::PullParser's $parser->get_token our @ISA = (); -our $VERSION = '3.45'; +our $VERSION = '3.48'; use strict; sub new { # Class->new('type', stuff...); ## Overridden in derived classes anyway Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/RTF.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/RTF.pm,v diff -u -p -a -u -p -r1.6 RTF.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/RTF.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/RTF.pm 16 Nov 2026 00:57:37 -0000 @@ -6,7 +6,7 @@ use warnings; #sub Pod::Simple::DEBUG () {4}; #sub Pod::Simple::PullParser::DEBUG () {4}; -our $VERSION = '3.45'; +our $VERSION = '3.48'; use Pod::Simple::PullParser (); our @ISA; BEGIN {@ISA = ('Pod::Simple::PullParser')} @@ -18,7 +18,7 @@ sub to_uni ($) { # Convert native cod my $x = shift; # Broken for early EBCDICs - $x = chr utf8::native_to_unicode(ord $x) if $] ge 5.007_003 + $x = chr utf8::native_to_unicode(ord $x) if "$]" >= 5.007_003 && ord("A") != 65; return $x; } @@ -86,6 +86,7 @@ our %Tagmap = ( _openclose( 'B=cs18\b', 'I=cs16\i', + 'U=cs30\ul', 'C=cs19\f1\lang1024\noproof', 'F=cs17\i\lang1024\noproof', @@ -413,6 +414,7 @@ sub stylesheet { {\*\cs17 \additive \i\lang1024\noproof \sbasedon10 pod-F;} {\*\cs18 \additive \b \sbasedon10 pod-B;} {\*\cs19 \additive \f1\lang1024\noproof\sbasedon10 pod-C;} +{\*\cs30 \additive \ul \sbasedon10 pod-U;} {\s20\ql \li0\ri0\sa180\widctlpar\f1\fs%s\lang1024\noproof\sbasedon0 \snext0 pod-codeblock;} {\*\cs21 \additive \lang1024\noproof \sbasedon10 pod-computerese;} {\*\cs22 \additive \i\lang1024\noproof\sbasedon10 pod-L-pod;} @@ -549,7 +551,7 @@ my $other_unicode = Pod::Simple::BlackBox::my_qr('([\x{10000}-\x{10FFFF}])', "\x{10000}"); sub esc_uni($) { - use if $] le 5.006002, 'utf8'; + use if do { no integer; "$]" <= 5.006002 }, 'utf8'; my $x = shift; Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Search.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Search.pm,v diff -u -p -a -u -p -r1.9 Search.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Search.pm 28 Jan 2025 01:06:12 -0000 1.9 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Search.pm 16 Nov 2026 00:57:37 -0000 @@ -2,7 +2,7 @@ package Pod::Simple::Search; use strict; use warnings; -our $VERSION = '3.45'; ## Current version of this package +our $VERSION = '3.48'; ## Current version of this package BEGIN { *DEBUG = sub () {0} unless defined &DEBUG; } # set DEBUG level use Carp (); Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/SimpleTree.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/SimpleTree.pm,v diff -u -p -a -u -p -r1.6 SimpleTree.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/SimpleTree.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/SimpleTree.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ use strict; use warnings; use Carp (); use Pod::Simple (); -our $VERSION = '3.45'; +our $VERSION = '3.48'; BEGIN { our @ISA = ('Pod::Simple'); *DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG; Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Subclassing.pod =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Subclassing.pod,v diff -u -p -a -u -p -r1.4 Subclassing.pod --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Subclassing.pod 28 Jan 2025 01:06:12 -0000 1.4 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Subclassing.pod 16 Nov 2026 00:57:37 -0000 @@ -38,10 +38,10 @@ existing Pod formatter, instead see its docs in L. B in writing a Pod formatter is to make sure that there -isn't already a decent one in CPAN. See L, and +isn't already a decent one in CPAN. See L, and run a search on the name of the format you want to render to. Also consider joining the Pod People list -L and asking whether +L and asking whether anyone has a formatter for that format -- maybe someone cobbled one together but just hasn't released it. @@ -172,7 +172,7 @@ produces this event structure: in the document. -=item events with an element_name of B, C, F, or I. +=item events with an element_name of B, C, F, I, or U. Parsing a BE...E formatting code (or of course any of its semantically identical syntactic variants @@ -190,7 +190,7 @@ Parsing C, F, or I codes produce the sam different element name. If your parser object has been set to accept other formatting codes, -then they will be presented like these B/C/F/I codes -- i.e., without +then they will be presented like these B/C/F/I/U codes -- i.e., without any attributes. =item events with an element_name of S @@ -212,7 +212,7 @@ means non-breaking space. =item events with an element_name of X Normally, parsing an XE...E sequence produces this event -structure, just as if it were a B/C/F/I code: +structure, just as if it were a B/C/F/I/U code: ...stuff... @@ -367,7 +367,7 @@ produces this event structure: In cases of links to a section in a different Pod document, -there are both a I
attribute and a L attribute. +there are both a I
attribute and a I attribute. For example, this Pod source: L @@ -775,7 +775,7 @@ At time of writing, I don't think you'll =item C<< $parser->accept_codes( I, I... ) >> This tells the parser that you accept additional formatting codes, -beyond just the standard ones (I B C L F S X, plus the two weird ones +beyond just the standard ones (I B C L F S U X, plus the two weird ones you don't actually see in the parse tree, Z and E). For example, to also accept codes "N", "R", and "W": Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Text.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Text.pm,v diff -u -p -a -u -p -r1.6 Text.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Text.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Text.pm 16 Nov 2026 00:57:37 -0000 @@ -4,7 +4,7 @@ use warnings; use Carp (); use Pod::Simple::Methody (); use Pod::Simple (); -our $VERSION = '3.45'; +our $VERSION = '3.48'; our @ISA = ('Pod::Simple::Methody'); BEGIN { *DEBUG = defined(&Pod::Simple::DEBUG) ? \&Pod::Simple::DEBUG Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TextContent.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TextContent.pm,v diff -u -p -a -u -p -r1.6 TextContent.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TextContent.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TextContent.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ use strict; use warnings; use Carp (); use Pod::Simple (); -our $VERSION = '3.45'; +our $VERSION = '3.48'; our @ISA = ('Pod::Simple'); sub new { Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TiedOutFH.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TiedOutFH.pm,v diff -u -p -a -u -p -r1.6 TiedOutFH.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TiedOutFH.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TiedOutFH.pm 16 Nov 2026 00:57:37 -0000 @@ -3,7 +3,7 @@ use strict; use warnings; use Symbol ('gensym'); use Carp (); -our $VERSION = '3.45'; +our $VERSION = '3.48'; #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Transcode.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Transcode.pm,v diff -u -p -a -u -p -r1.6 Transcode.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Transcode.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/Transcode.pm 16 Nov 2026 00:57:37 -0000 @@ -1,6 +1,6 @@ package Pod::Simple::Transcode; use strict; -our $VERSION = '3.45'; +our $VERSION = '3.48'; BEGIN { if(defined &DEBUG) {;} # Okay Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TranscodeDumb.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TranscodeDumb.pm,v diff -u -p -a -u -p -r1.6 TranscodeDumb.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TranscodeDumb.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TranscodeDumb.pm 16 Nov 2026 00:57:37 -0000 @@ -1,6 +1,6 @@ package Pod::Simple::TranscodeDumb; use strict; -our $VERSION = '3.45'; +our $VERSION = '3.48'; # This module basically pretends it knows how to transcode, except # only for null-transcodings! We use this when Encode isn't # available. Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TranscodeSmart.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TranscodeSmart.pm,v diff -u -p -a -u -p -r1.6 TranscodeSmart.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TranscodeSmart.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/TranscodeSmart.pm 16 Nov 2026 00:57:37 -0000 @@ -7,7 +7,7 @@ use strict; use warnings; use Pod::Simple; use Encode; -our $VERSION = '3.45'; +our $VERSION = '3.48'; sub is_dumb {0} sub is_smart {1} Index: gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm =================================================================== RCS file: /home/afresh1/OpenBSD-perl/OP/cvs/src/gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm,v diff -u -p -a -u -p -r1.6 XHTML.pm --- gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm 28 Jan 2025 01:06:12 -0000 1.6 +++ gnu/usr.bin/perl/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm 16 Nov 2026 00:57:37 -0000 @@ -45,7 +45,7 @@ use warnings; package Pod::Simple::XHTML; use strict; -our $VERSION = '3.45'; +our $VERSION = '3.48'; use Pod::Simple::Methody (); our @ISA = ('Pod::Simple::Methody'); @@ -70,10 +70,11 @@ sub encode_entities { $ents =~ s,(? sprintf('%%%02X', $_) ), 0 .. 255; + sub encode_url { my ($self, $string) = @_; - $string =~ s{([^-_.!~*()abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZZ0123456789])}{ - sprintf('%%%02X', ord($1)) - }eg; + utf8::encode($string) if HAVE_UTF8_ENCODE; + $string =~ s{([^-_.!~*()a-zA-Z0-9])}{$percent_enc{$1}}g; return $string; } @@ -118,7 +124,7 @@ the call to C: =head2 perldoc_url_prefix -In turning L into http://whatever/Foo%3a%3aBar, what +In turning LEFoo::BarE into http://whatever/Foo%3a%3aBar, what to put before the "Foo%3a%3aBar". The default value is "https://metacpan.org/pod/". @@ -129,13 +135,14 @@ default. =head2 man_url_prefix -In turning C<< L >> into http://whatever/man/1/crontab, what -to put before the "1/crontab". The default value is -"http://man.he.net/man". +In turning C<< LEcrontab(5)E >> into http://whatever/man/1/crontab.1, what +to put before the "1/crontab.1". The default value is +"https://man7.org/linux/man-pages/man". =head2 man_url_postfix -What to put after "1/crontab" in the URL. This option is not set by default. +What to put after "1/crontab.1" in the URL. +This option is set to ".html" by default. =head2 title_prefix, title_postfix @@ -276,7 +283,8 @@ sub new { my $new = $self->SUPER::new(@_); $new->{'output_fh'} ||= *STDOUT{IO}; $new->perldoc_url_prefix('https://metacpan.org/pod/'); - $new->man_url_prefix('http://man.he.net/man'); + $new->man_url_prefix('https://man7.org/linux/man-pages/man'); + $new->man_url_postfix('.html'); $new->html_charset('ISO-8859-1'); $new->nix_X_codes(1); $new->{'scratch'} = ''; @@ -458,7 +466,7 @@ sub start_item_text { } sub start_over_bullet { $_[0]{'scratch'} = '