Simplify the CORE::__FOO__ op-generation code

It just happens that the (caller)[...] offsets for file and line are
the same as the keyword numbers.  KEY___PACKAGE__ is 3 and (caller)[0]
returns the package, so keyword_number % 3 can be used for the offset
instead of an unwieldy switch block.

1 files changed, 3 insertions, 10 deletions

diff --git a/op.c b/op.c
index 74d27dd4f4..1ca495c749 100644
--- a/op.c
+++ b/op.c
@@ -10336,20 +10336,13 @@ Perl_coresub_op(pTHX_ SV * const coreargssv, const int code,
 
     switch(opnum) {
     case 0:
-	{
-	    IV index = 0;
-	    switch(-code) {
-	    case KEY___FILE__   : index = 1; break;
-	    case KEY___LINE__   : index = 2; break;
-	    }
-	    return op_append_elem(OP_LINESEQ,
+	return op_append_elem(OP_LINESEQ,
 	               argop,
 	               newSLICEOP(0,
-	                          newSVOP(OP_CONST, 0, newSViv(index)),
+	                          newSVOP(OP_CONST, 0, newSViv(-code % 3)),
 	                          newOP(OP_CALLER,0)
 	               )
-	           );
-	}
+	       );
     default:
 	switch (PL_opargs[opnum] & OA_CLASS_MASK) {
 	case OA_BASEOP: