diff options
author | David Mitchell <davem@iabyn.com> | 2014-09-05 17:40:07 +0100 |
---|---|---|
committer | David Mitchell <davem@iabyn.com> | 2014-09-10 14:25:05 +0100 |
commit | c486bd5c4f0d6a8e8e2a4bf5701a47abaed5b2ca (patch) | |
tree | 416a96641412408c60f0432318f93757a92dfdd5 /ext | |
parent | d0c8136d16b18be562680c1f71b02490218427f2 (diff) | |
download | perl-c486bd5c4f0d6a8e8e2a4bf5701a47abaed5b2ca.tar.gz |
add missing op_private labels to Concise etc
Concise wasn't decoding a few op_private bits. I spotted this during my
jumbo regen/op_private commit, but deferred fixing them up to a separate
commit since they change the output expected in a bunch of Concise tests.
Specifically, these have now been added:
OPpHINT_STRICT_REFS => STRICT
OPpITER_DEF => DEF
OPpEVAL_RE_REPARSING => REPARSE
Diffstat (limited to 'ext')
-rw-r--r-- | ext/B/t/f_map.t | 4 | ||||
-rw-r--r-- | ext/B/t/optree_samples.t | 20 | ||||
-rw-r--r-- | ext/B/t/optree_specials.t | 36 |
3 files changed, 30 insertions, 30 deletions
diff --git a/ext/B/t/f_map.t b/ext/B/t/f_map.t index a7a9c26880..88b871c634 100644 --- a/ext/B/t/f_map.t +++ b/ext/B/t/f_map.t @@ -170,7 +170,7 @@ checkOptree(note => q{}, # c <1> rv2av[t6] sKRM/1 # d <#> gv[*_] s # e <1> rv2gv sKRM/1 -# f <{> enteriter(next->q last->t redo->g) lKS/8 +# f <{> enteriter(next->q last->t redo->g) lKS/DEF # r <0> iter s # s <|> and(other->g) K/1 # g <;> nextstate(main 475 (eval 10):1) v:{ @@ -204,7 +204,7 @@ EOT_EOT # c <1> rv2av[t3] sKRM/1 # d <$> gv(*_) s # e <1> rv2gv sKRM/1 -# f <{> enteriter(next->q last->t redo->g) lKS/8 +# f <{> enteriter(next->q last->t redo->g) lKS/DEF # r <0> iter s # s <|> and(other->g) K/1 # g <;> nextstate(main 559 (eval 15):1) v:{ diff --git a/ext/B/t/optree_samples.t b/ext/B/t/optree_samples.t index 2a9c010542..61b0d18559 100644 --- a/ext/B/t/optree_samples.t +++ b/ext/B/t/optree_samples.t @@ -240,7 +240,7 @@ checkOptree ( name => '-exec sub { foreach (1..10) {print "foo $_"} }', # 3 <$> const[IV 1] s # 4 <$> const[IV 10] s # 5 <#> gv[*_] s -# 6 <{> enteriter(next->d last->g redo->7) lKS/8 +# 6 <{> enteriter(next->d last->g redo->7) lKS/DEF # e <0> iter s # f <|> and(other->7) K/1 # 7 <;> nextstate(main 442 optree.t:158) v:>,<,% @@ -259,7 +259,7 @@ EOT_EOT # 3 <$> const(IV 1) s # 4 <$> const(IV 10) s # 5 <$> gv(*_) s -# 6 <{> enteriter(next->d last->g redo->7) lKS/8 +# 6 <{> enteriter(next->d last->g redo->7) lKS/DEF # e <0> iter s # f <|> and(other->7) K/1 # 7 <;> nextstate(main 443 optree_samples.t:182) v:>,<,% @@ -283,7 +283,7 @@ checkOptree ( name => '-basic sub { print "foo $_" foreach (1..10) }', # - <@> lineseq KP ->g # 1 <;> nextstate(main 445 optree.t:167) v:>,<,% ->2 # f <2> leaveloop K/2 ->g -# 6 <{> enteriter(next->c last->f redo->7) lKS/8 ->d +# 6 <{> enteriter(next->c last->f redo->7) lKS/DEF ->d # - <0> ex-pushmark s ->2 # - <1> ex-list lK ->5 # 2 <0> pushmark s ->3 @@ -308,7 +308,7 @@ EOT_EOT # - <@> lineseq KP ->g # 1 <;> nextstate(main 446 optree_samples.t:192) v:>,<,% ->2 # f <2> leaveloop K/2 ->g -# 6 <{> enteriter(next->c last->f redo->7) lKS/8 ->d +# 6 <{> enteriter(next->c last->f redo->7) lKS/DEF ->d # - <0> ex-pushmark s ->2 # - <1> ex-list lK ->5 # 2 <0> pushmark s ->3 @@ -341,7 +341,7 @@ checkOptree ( name => '-exec -e foreach (1..10) {print qq{foo $_}}', # 4 <$> const[IV 1] s # 5 <$> const[IV 10] s # 6 <#> gv[*_] s -# 7 <{> enteriter(next->e last->h redo->8) lKS/8 +# 7 <{> enteriter(next->e last->h redo->8) lKS/DEF # f <0> iter s # g <|> and(other->8) vK/1 # 8 <;> nextstate(main 1 -e:1) v:>,<,% @@ -361,7 +361,7 @@ EOT_EOT # 4 <$> const(IV 1) s # 5 <$> const(IV 10) s # 6 <$> gv(*_) s -# 7 <{> enteriter(next->e last->h redo->8) lKS/8 +# 7 <{> enteriter(next->e last->h redo->8) lKS/DEF # f <0> iter s # g <|> and(other->8) vK/1 # 8 <;> nextstate(main 1 -e:1) v:>,<,% @@ -386,7 +386,7 @@ checkOptree ( name => '-exec sub { print "foo $_" foreach (1..10) }', # 3 <$> const[IV 1] s # 4 <$> const[IV 10] s # 5 <#> gv[*_] s -# 6 <{> enteriter(next->c last->f redo->7) lKS/8 +# 6 <{> enteriter(next->c last->f redo->7) lKS/DEF # d <0> iter s # e <|> and(other->7) K/1 # 7 <0> pushmark s @@ -404,7 +404,7 @@ EOT_EOT # 3 <$> const(IV 1) s # 4 <$> const(IV 10) s # 5 <$> gv(*_) s -# 6 <{> enteriter(next->c last->f redo->7) lKS/8 +# 6 <{> enteriter(next->c last->f redo->7) lKS/DEF # d <0> iter s # e <|> and(other->7) K/1 # 7 <0> pushmark s @@ -530,7 +530,7 @@ checkOptree ( name => '%h=(); for $_(@a){$h{getkey($_)} = $_}', # a <1> rv2av[t6] sKRM/1 # b <#> gv[*_] s # c <1> rv2gv sKRM/1 -# d <{> enteriter(next->o last->r redo->e) lKS/8 +# d <{> enteriter(next->o last->r redo->e) lKS/DEF # p <0> iter s # q <|> and(other->e) K/1 # e <;> nextstate(main 505 (eval 24):1) v:{ @@ -561,7 +561,7 @@ EOT_EOT # a <1> rv2av[t3] sKRM/1 # b <$> gv(*_) s # c <1> rv2gv sKRM/1 -# d <{> enteriter(next->o last->r redo->e) lKS/8 +# d <{> enteriter(next->o last->r redo->e) lKS/DEF # p <0> iter s # q <|> and(other->e) K/1 # e <;> nextstate(main 505 (eval 24):1) v:{ diff --git a/ext/B/t/optree_specials.t b/ext/B/t/optree_specials.t index 3cf354c826..414fa79ce2 100644 --- a/ext/B/t/optree_specials.t +++ b/ext/B/t/optree_specials.t @@ -48,7 +48,7 @@ checkOptree ( name => 'BEGIN', # 4 <;> nextstate(B::Concise -275 Concise.pm:356) v:*,&,{,x*,x&,x$,$ ->5 # - <@> lineseq K ->- # - <0> null ->5 -# 9 <1> entersub[t1] KS*/TARG,2 ->a +# 9 <1> entersub[t1] KS*/TARG,STRICT ->a # 5 <0> pushmark s ->6 # 6 <$> const[PV "strict"] sM ->7 # 7 <$> const[PV "refs"] sM ->8 @@ -62,7 +62,7 @@ checkOptree ( name => 'BEGIN', # e <;> nextstate(B::Concise -265 Concise.pm:367) v:*,&,x*,x&,x$,$ ->f # - <@> lineseq K ->- # - <0> null ->f -# j <1> entersub[t1] KS*/TARG,2 ->k +# j <1> entersub[t1] KS*/TARG,STRICT ->k # f <0> pushmark s ->g # g <$> const[PV "strict"] sM ->h # h <$> const[PV "refs"] sM ->i @@ -76,7 +76,7 @@ checkOptree ( name => 'BEGIN', # o <;> nextstate(B::Concise -254 Concise.pm:386) v:*,&,{,x*,x&,x$,$ ->p # - <@> lineseq K ->- # - <0> null ->p -# t <1> entersub[t1] KS*/TARG,2 ->u +# t <1> entersub[t1] KS*/TARG,STRICT ->u # p <0> pushmark s ->q # q <$> const[PV "warnings"] sM ->r # r <$> const[PV "qw"] sM ->s @@ -98,7 +98,7 @@ EOT_EOT # 4 <;> nextstate(B::Concise -275 Concise.pm:356) v:*,&,{,x*,x&,x$,$ ->5 # - <@> lineseq K ->- # - <0> null ->5 -# 9 <1> entersub[t1] KS*/TARG,2 ->a +# 9 <1> entersub[t1] KS*/TARG,STRICT ->a # 5 <0> pushmark s ->6 # 6 <$> const(PV "strict") sM ->7 # 7 <$> const(PV "refs") sM ->8 @@ -112,7 +112,7 @@ EOT_EOT # e <;> nextstate(B::Concise -265 Concise.pm:367) v:*,&,x*,x&,x$,$ ->f # - <@> lineseq K ->- # - <0> null ->f -# j <1> entersub[t1] KS*/TARG,2 ->k +# j <1> entersub[t1] KS*/TARG,STRICT ->k # f <0> pushmark s ->g # g <$> const(PV "strict") sM ->h # h <$> const(PV "refs") sM ->i @@ -126,7 +126,7 @@ EOT_EOT # o <;> nextstate(B::Concise -254 Concise.pm:386) v:*,&,{,x*,x&,x$,$ ->p # - <@> lineseq K ->- # - <0> null ->p -# t <1> entersub[t1] KS*/TARG,2 ->u +# t <1> entersub[t1] KS*/TARG,STRICT ->u # p <0> pushmark s ->q # q <$> const(PV "warnings") sM ->r # r <$> const(PV "qw") sM ->s @@ -246,7 +246,7 @@ checkOptree ( name => 'all of BEGIN END INIT CHECK UNITCHECK -exec', # 6 <$> const[PV "strict"] sM # 7 <$> const[PV "refs"] sM # 8 <$> method_named[PV "unimport"] -# 9 <1> entersub[t1] KS*/TARG,2 +# 9 <1> entersub[t1] KS*/TARG,STRICT # a <1> leavesub[1 ref] K/REFC,1 # BEGIN 2: # b <;> nextstate(B::Concise -265 Concise.pm:367) v:*,&,x*,x&,x$,$ @@ -257,7 +257,7 @@ checkOptree ( name => 'all of BEGIN END INIT CHECK UNITCHECK -exec', # g <$> const[PV "strict"] sM # h <$> const[PV "refs"] sM # i <$> method_named[PV "unimport"] -# j <1> entersub[t1] KS*/TARG,2 +# j <1> entersub[t1] KS*/TARG,STRICT # k <1> leavesub[1 ref] K/REFC,1 # BEGIN 3: # l <;> nextstate(B::Concise -254 Concise.pm:386) v:*,&,{,x*,x&,x$,$ @@ -268,7 +268,7 @@ checkOptree ( name => 'all of BEGIN END INIT CHECK UNITCHECK -exec', # q <$> const[PV "warnings"] sM # r <$> const[PV "qw"] sM # s <$> method_named[PV "unimport"] -# t <1> entersub[t1] KS*/TARG,2 +# t <1> entersub[t1] KS*/TARG,STRICT # u <1> leavesub[1 ref] K/REFC,1 # BEGIN 4: # v <;> nextstate(main 2 -e:1) v:>,<,%,{ @@ -305,7 +305,7 @@ EOT_EOT # 6 <$> const(PV "strict") sM # 7 <$> const(PV "refs") sM # 8 <$> method_named(PV "unimport") -# 9 <1> entersub[t1] KS*/TARG,2 +# 9 <1> entersub[t1] KS*/TARG,STRICT # a <1> leavesub[1 ref] K/REFC,1 # BEGIN 2: # b <;> nextstate(B::Concise -265 Concise.pm:367) v:*,&,x*,x&,x$,$ @@ -316,7 +316,7 @@ EOT_EOT # g <$> const(PV "strict") sM # h <$> const(PV "refs") sM # i <$> method_named(PV "unimport") -# j <1> entersub[t1] KS*/TARG,2 +# j <1> entersub[t1] KS*/TARG,STRICT # k <1> leavesub[1 ref] K/REFC,1 # BEGIN 3: # l <;> nextstate(B::Concise -254 Concise.pm:386) v:*,&,{,x*,x&,x$,$ @@ -327,7 +327,7 @@ EOT_EOT # q <$> const(PV "warnings") sM # r <$> const(PV "qw") sM # s <$> method_named(PV "unimport") -# t <1> entersub[t1] KS*/TARG,2 +# t <1> entersub[t1] KS*/TARG,STRICT # u <1> leavesub[1 ref] K/REFC,1 # BEGIN 4: # v <;> nextstate(main 2 -e:1) v:>,<,%,{ @@ -374,7 +374,7 @@ checkOptree ( name => 'regression test for patch 25352', # 6 <$> const[PV "strict"] sM # 7 <$> const[PV "refs"] sM # 8 <$> method_named[PV "unimport"] -# 9 <1> entersub[t1] KS*/TARG,2 +# 9 <1> entersub[t1] KS*/TARG,STRICT # a <1> leavesub[1 ref] K/REFC,1 # BEGIN 2: # b <;> nextstate(B::Concise -265 Concise.pm:367) v:*,&,x*,x&,x$,$ @@ -385,7 +385,7 @@ checkOptree ( name => 'regression test for patch 25352', # g <$> const[PV "strict"] sM # h <$> const[PV "refs"] sM # i <$> method_named[PV "unimport"] -# j <1> entersub[t1] KS*/TARG,2 +# j <1> entersub[t1] KS*/TARG,STRICT # k <1> leavesub[1 ref] K/REFC,1 # BEGIN 3: # l <;> nextstate(B::Concise -254 Concise.pm:386) v:*,&,{,x*,x&,x$,$ @@ -396,7 +396,7 @@ checkOptree ( name => 'regression test for patch 25352', # q <$> const[PV "warnings"] sM # r <$> const[PV "qw"] sM # s <$> method_named[PV "unimport"] -# t <1> entersub[t1] KS*/TARG,2 +# t <1> entersub[t1] KS*/TARG,STRICT # u <1> leavesub[1 ref] K/REFC,1 EOT_EOT # BEGIN 1: @@ -408,7 +408,7 @@ EOT_EOT # 6 <$> const(PV "strict") sM # 7 <$> const(PV "refs") sM # 8 <$> method_named(PV "unimport") -# 9 <1> entersub[t1] KS*/TARG,2 +# 9 <1> entersub[t1] KS*/TARG,STRICT # a <1> leavesub[1 ref] K/REFC,1 # BEGIN 2: # b <;> nextstate(B::Concise -265 Concise.pm:367) v:*,&,x*,x&,x$,$ @@ -419,7 +419,7 @@ EOT_EOT # g <$> const(PV "strict") sM # h <$> const(PV "refs") sM # i <$> method_named(PV "unimport") -# j <1> entersub[t1] KS*/TARG,2 +# j <1> entersub[t1] KS*/TARG,STRICT # k <1> leavesub[1 ref] K/REFC,1 # BEGIN 3: # l <;> nextstate(B::Concise -254 Concise.pm:386) v:*,&,{,x*,x&,x$,$ @@ -430,6 +430,6 @@ EOT_EOT # q <$> const(PV "warnings") sM # r <$> const(PV "qw") sM # s <$> method_named(PV "unimport") -# t <1> entersub[t1] KS*/TARG,2 +# t <1> entersub[t1] KS*/TARG,STRICT # u <1> leavesub[1 ref] K/REFC,1 EONT_EONT |