From 7896dde7482a2851e73f0ac2c32d1c71f6e97dca Mon Sep 17 00:00:00 2001 From: Zefram Date: Fri, 29 Dec 2017 12:39:31 +0000 Subject: revert smartmatch to 5.27.6 behaviour The pumpking has determined that the CPAN breakage caused by changing smartmatch [perl #132594] is too great for the smartmatch changes to stay in for 5.28. This reverts most of the merge in commit da4e040f42421764ef069371d77c008e6b801f45. All core behaviour and documentation is reverted. The removal of use of smartmatch from a couple of tests (that aren't testing smartmatch) remains. Customisation of a couple of CPAN modules to make them portable across smartmatch types remains. A small bugfix in scope.c also remains. --- dump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dump.c') diff --git a/dump.c b/dump.c index 2636ad85eb..b2f0fc5ef2 100644 --- a/dump.c +++ b/dump.c @@ -1200,7 +1200,6 @@ S_do_op_dump_bar(pTHX_ I32 level, UV bar, PerlIO *file, const OP *o) case OP_ENTERITER: case OP_ENTERLOOP: - case OP_ENTERGIVEN: S_opdump_indent(aTHX_ o, level, bar, file, "REDO"); S_opdump_link(aTHX_ cLOOPo->op_redoop, file); S_opdump_indent(aTHX_ o, level, bar, file, "NEXT"); @@ -1222,7 +1221,8 @@ S_do_op_dump_bar(pTHX_ I32 level, UV bar, PerlIO *file, const OP *o) case OP_DORASSIGN: case OP_ANDASSIGN: case OP_ARGDEFELEM: - case OP_ENTERWHERESO: + case OP_ENTERGIVEN: + case OP_ENTERWHEN: case OP_ENTERTRY: case OP_ONCE: S_opdump_indent(aTHX_ o, level, bar, file, "OTHER"); -- cgit v1.2.1