diff options
| author | Karl Williamson <khw@cpan.org> | 2020-02-24 09:31:02 -0700 |
|---|---|---|
| committer | Karl Williamson <khw@cpan.org> | 2020-03-02 11:45:21 -0700 |
| commit | b619f93d98570480c34b948b01fb808e098a5ed9 (patch) | |
| tree | b581ff0d92ac006addb3999b1bad3742ba56b345 | |
| parent | f360f88464218e68de6e1d4d8741f069b335f90c (diff) | |
| download | perl-b619f93d98570480c34b948b01fb808e098a5ed9.tar.gz | |
regen/mk_invlists.pl: Allow enums/defines to be in re_comp.c
Tables, to save memory, that are for regcomp.c are excluded from
re_comp.c, but enums use no resources, and a later commit will want them
accessible from re_comp.c. So change the code so that they can be
requested to be in re_comp.c
| -rw-r--r-- | charclass_invlists.h | 2 | ||||
| -rw-r--r-- | lib/unicore/uni_keywords.pl | 2 | ||||
| -rw-r--r-- | regen/mk_invlists.pl | 6 | ||||
| -rw-r--r-- | uni_keywords.h | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/charclass_invlists.h b/charclass_invlists.h index fb489e8326..4fe899fe3e 100644 --- a/charclass_invlists.h +++ b/charclass_invlists.h @@ -419852,5 +419852,5 @@ static const U8 WB_table[23][23] = { * 50b85a67451145545a65cea370dab8d3444fbfe07e9c34cef560c5b7da9d3eef lib/unicore/version * 2680b9254eb236c5c090f11b149605043e8c8433661b96efc4a42fb4709342a5 regen/charset_translations.pl * 6bbad21de0848e0236b02f34f5fa0edd3cdae9ba8173cc9469a5513936b9e728 regen/mk_PL_charclass.pl - * fb429fcdab7fc74f015ade1ddb6a8826880a239b290d59fc8b00a08bed58fc71 regen/mk_invlists.pl + * e41af0b13d98ffb8a360ee580822fa351f9df7b82783cab90aa2596ad5bb2c61 regen/mk_invlists.pl * ex: set ro: */ diff --git a/lib/unicore/uni_keywords.pl b/lib/unicore/uni_keywords.pl index 99db077e98..3269010f28 100644 --- a/lib/unicore/uni_keywords.pl +++ b/lib/unicore/uni_keywords.pl @@ -1299,5 +1299,5 @@ # 50b85a67451145545a65cea370dab8d3444fbfe07e9c34cef560c5b7da9d3eef lib/unicore/version # 2680b9254eb236c5c090f11b149605043e8c8433661b96efc4a42fb4709342a5 regen/charset_translations.pl # 6bbad21de0848e0236b02f34f5fa0edd3cdae9ba8173cc9469a5513936b9e728 regen/mk_PL_charclass.pl -# fb429fcdab7fc74f015ade1ddb6a8826880a239b290d59fc8b00a08bed58fc71 regen/mk_invlists.pl +# e41af0b13d98ffb8a360ee580822fa351f9df7b82783cab90aa2596ad5bb2c61 regen/mk_invlists.pl # ex: set ro: diff --git a/regen/mk_invlists.pl b/regen/mk_invlists.pl index ee7a51af6f..67df77dea7 100644 --- a/regen/mk_invlists.pl +++ b/regen/mk_invlists.pl @@ -238,8 +238,10 @@ sub switch_pound_if ($$;$) { foreach my $element (@new_pound_if) { # regcomp.c is arranged so that the tables are not compiled in - # re_comp.c */ - my $no_xsub = 1 if $element =~ / PERL_IN_ (?: REGCOMP ) _C /x; + # re_comp.c, but general enums and defines (which take no space) are + # compiled */ + my $no_xsub = 1 if $name !~ /enum|define/ + && $element =~ / PERL_IN_ (?: REGCOMP ) _C /x; $element = "defined($element)"; $element = "($element && ! defined(PERL_IN_XSUB_RE))" if $no_xsub; } diff --git a/uni_keywords.h b/uni_keywords.h index a6a4712dfa..5ad551f279 100644 --- a/uni_keywords.h +++ b/uni_keywords.h @@ -7541,6 +7541,6 @@ MPH_VALt match_uniprop( const unsigned char * const key, const U16 key_len ) { * 50b85a67451145545a65cea370dab8d3444fbfe07e9c34cef560c5b7da9d3eef lib/unicore/version * 2680b9254eb236c5c090f11b149605043e8c8433661b96efc4a42fb4709342a5 regen/charset_translations.pl * 6bbad21de0848e0236b02f34f5fa0edd3cdae9ba8173cc9469a5513936b9e728 regen/mk_PL_charclass.pl - * fb429fcdab7fc74f015ade1ddb6a8826880a239b290d59fc8b00a08bed58fc71 regen/mk_invlists.pl + * e41af0b13d98ffb8a360ee580822fa351f9df7b82783cab90aa2596ad5bb2c61 regen/mk_invlists.pl * cf1d68efb7d919d302c4005641eae8d36da6d7850816ad374b0c00b45e609f43 regen/mph.pl * ex: set ro: */ |