From 7d058bc9453370017e3a3e70a0897188891b03cb Mon Sep 17 00:00:00 2001 From: Father Chrysostomos Date: Thu, 22 Dec 2011 21:42:54 -0800 Subject: [PATCH] Move FEATURE_IS_ENABLED to feature.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It makes little sense to have it in perl.h any more. (Until recently, feature.h didn’t exist.) --- feature.h | 7 +++++++ perl.h | 9 --------- regen/feature.pl | 11 +++++++++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/feature.h b/feature.h index 31547fb..1cbd047 100644 --- a/feature.h +++ b/feature.h @@ -19,6 +19,13 @@ (PL_curcop == &PL_compiling ? PL_hints : PL_curcop->cop_hints) #define CURRENT_FEATURE_BUNDLE (CURRENT_HINTS >> HINT_FEATURE_SHIFT) +#define FEATURE_IS_ENABLED(name) \ + (((PL_curcop == &PL_compiling ? PL_hints : PL_curcop->cop_hints) \ + & HINT_LOCALIZE_HH) \ + && Perl_feature_is_enabled(aTHX_ STR_WITH_LEN(name))) +/* The longest string we pass in. */ +#define MAX_FEATURE_LEN (sizeof("unicode_strings")-1) + #define FEATURE_SAY_IS_ENABLED \ ( \ (CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \ diff --git a/perl.h b/perl.h index 4dcd259..184d4b5 100644 --- a/perl.h +++ b/perl.h @@ -5747,15 +5747,6 @@ extern void moncontrol(int); #define PERL_PV_PRETTY_DUMP PERL_PV_PRETTY_ELLIPSES|PERL_PV_PRETTY_QUOTE #define PERL_PV_PRETTY_REGPROP PERL_PV_PRETTY_ELLIPSES|PERL_PV_PRETTY_LTGT|PERL_PV_ESCAPE_RE|PERL_PV_ESCAPE_NONASCII -#if defined(PERL_CORE) || defined(PERL_EXT) -# define FEATURE_IS_ENABLED(name) \ - (((PL_curcop == &PL_compiling ? PL_hints : PL_curcop->cop_hints) \ - & HINT_LOCALIZE_HH) \ - && Perl_feature_is_enabled(aTHX_ STR_WITH_LEN(name))) -/* The longest string we pass in. */ -# define MAX_FEATURE_LEN (sizeof("unicode_strings")-1) -#endif - /* (KEEP THIS LAST IN perl.h!) diff --git a/regen/feature.pl b/regen/feature.pl index ab60389..32d7123 100755 --- a/regen/feature.pl +++ b/regen/feature.pl @@ -209,13 +209,20 @@ for (@HintedBundles) { print $h "#define FEATURE_BUNDLE_$key ", $count++, "\n"; } -print $h <> HINT_FEATURE_SHIFT) -#define CURRENT_HINTS \\ +#define CURRENT_HINTS \ (PL_curcop == &PL_compiling ? PL_hints : PL_curcop->cop_hints) #define CURRENT_FEATURE_BUNDLE (CURRENT_HINTS >> HINT_FEATURE_SHIFT) +#define FEATURE_IS_ENABLED(name) \ + (((PL_curcop == &PL_compiling ? PL_hints : PL_curcop->cop_hints) \ + & HINT_LOCALIZE_HH) \ + && Perl_feature_is_enabled(aTHX_ STR_WITH_LEN(name))) +/* The longest string we pass in. */ +#define MAX_FEATURE_LEN (sizeof("unicode_strings")-1) + EOH for ( -- 2.7.4