diff options
| author | Father Chrysostomos <sprout@cpan.org> | 2012-05-24 14:04:02 -0700 |
|---|---|---|
| committer | Father Chrysostomos <sprout@cpan.org> | 2012-05-29 23:55:22 -0700 |
| commit | 43e373e63c219121304886fa2ecda701fe46cd7f (patch) | |
| tree | 0929c11c205a4abc6fd2849134f6f19893d0292f | |
| parent | 9e3f0d16dbcc317a6b02a468a3501297984f7d6b (diff) | |
| download | perl-43e373e63c219121304886fa2ecda701fe46cd7f.tar.gz | |
Expunge study magic
I’m running out of synonyms for ‘remove’.
| -rw-r--r-- | mg.c | 3 | ||||
| -rw-r--r-- | mg_names.c | 1 | ||||
| -rw-r--r-- | mg_raw.h | 2 | ||||
| -rw-r--r-- | mg_vtable.h | 1 | ||||
| -rw-r--r-- | pod/perlguts.pod | 1 | ||||
| -rw-r--r-- | regen/mg_vtable.pl | 2 |
6 files changed, 0 insertions, 10 deletions
@@ -2432,9 +2432,6 @@ Perl_magic_setregexp(pTHX_ SV *sv, MAGIC *mg) } else if (type == PERL_MAGIC_bm) { SvTAIL_off(sv); SvVALID_off(sv); - } else if (type == PERL_MAGIC_study) { - if (!isGV_with_GP(sv)) - SvSCREAM_off(sv); } else { assert(type == PERL_MAGIC_fm); } diff --git a/mg_names.c b/mg_names.c index 62ba922fa8..51a49626f5 100644 --- a/mg_names.c +++ b/mg_names.c @@ -20,7 +20,6 @@ { PERL_MAGIC_env, "env(E)" }, { PERL_MAGIC_envelem, "envelem(e)" }, { PERL_MAGIC_fm, "fm(f)" }, - { PERL_MAGIC_study, "study(G)" }, { PERL_MAGIC_regex_global, "regex_global(g)" }, { PERL_MAGIC_hints, "hints(H)" }, { PERL_MAGIC_hintselem, "hintselem(h)" }, @@ -34,8 +34,6 @@ "/* envelem 'e' %ENV hash element */" }, { 'f', "want_vtbl_regdata | PERL_MAGIC_READONLY_ACCEPTABLE | PERL_MAGIC_VALUE_MAGIC", "/* fm 'f' Formline ('compiled' format) */" }, - { 'G', "want_vtbl_regexp | PERL_MAGIC_READONLY_ACCEPTABLE | PERL_MAGIC_VALUE_MAGIC", - "/* study 'G' study()ed string */" }, { 'g', "want_vtbl_mglob | PERL_MAGIC_READONLY_ACCEPTABLE | PERL_MAGIC_VALUE_MAGIC", "/* regex_global 'g' m//g target */" }, { 'H', "want_vtbl_hints", diff --git a/mg_vtable.h b/mg_vtable.h index f6d910474f..d2379f26e9 100644 --- a/mg_vtable.h +++ b/mg_vtable.h @@ -27,7 +27,6 @@ #define PERL_MAGIC_env 'E' /* %ENV hash */ #define PERL_MAGIC_envelem 'e' /* %ENV hash element */ #define PERL_MAGIC_fm 'f' /* Formline ('compiled' format) */ -#define PERL_MAGIC_study 'G' /* study()ed string */ #define PERL_MAGIC_regex_global 'g' /* m//g target */ #define PERL_MAGIC_hints 'H' /* %^H hash */ #define PERL_MAGIC_hintselem 'h' /* %^H hash element */ diff --git a/pod/perlguts.pod b/pod/perlguts.pod index 4fe4fd5679..b9f2ed3a6c 100644 --- a/pod/perlguts.pod +++ b/pod/perlguts.pod @@ -1071,7 +1071,6 @@ will be lost. e PERL_MAGIC_envelem vtbl_envelem %ENV hash element f PERL_MAGIC_fm vtbl_regdata Formline ('compiled' format) - G PERL_MAGIC_study vtbl_regexp study()ed string g PERL_MAGIC_regex_global vtbl_mglob m//g target H PERL_MAGIC_hints vtbl_hints %^H hash h PERL_MAGIC_hintselem vtbl_hintselem %^H hash element diff --git a/regen/mg_vtable.pl b/regen/mg_vtable.pl index b4ed0c6dd3..5d0710f904 100644 --- a/regen/mg_vtable.pl +++ b/regen/mg_vtable.pl @@ -42,8 +42,6 @@ my %mg = desc => '%ENV hash element' }, fm => { char => 'f', vtable => 'regdata', value_magic => 1, readonly_acceptable => 1, desc => "Formline ('compiled' format)" }, - study => { char => 'G', vtable => 'regexp', value_magic => 1, - readonly_acceptable => 1, desc => 'study()ed string' }, regex_global => { char => 'g', vtable => 'mglob', value_magic => 1, readonly_acceptable => 1, desc => 'm//g target' }, hints => { char => 'H', vtable => 'hints', desc => '%^H hash' }, |