X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=opcode.h;h=b3da7c3651a0b68a9cc4b7ee75b9c8787279c366;hb=2d8142c661f64cf38c31c13eb111172cbf9b67fc;hp=42f4d9de61b34927b279bc3bd76358c4b640abbf;hpb=a567e93b903bc9849952c06533059c2f2e2fb226;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/opcode.h b/opcode.h
index 42f4d9d..b3da7c3 100644
--- a/opcode.h
+++ b/opcode.h
@@ -11,6 +11,12 @@
 
 START_EXTERN_C
 
+
+#define OP_NAME(o) (o->op_type == OP_CUSTOM ? custom_op_name(o) : \
+                    PL_op_name[o->op_type])
+#define OP_DESC(o) (o->op_type == OP_CUSTOM ? custom_op_desc(o) : \
+                    PL_op_desc[o->op_type])
+
 #ifndef DOINIT
 EXT char *PL_op_name[];
 #else
@@ -366,6 +372,7 @@ EXT char *PL_op_name[] = {
 	"threadsv",
 	"setstate",
 	"method_named",
+	"custom",
 };
 #endif
 
@@ -724,6 +731,7 @@ EXT char *PL_op_desc[] = {
 	"per-thread value",
 	"set statement info",
 	"method with known name",
+	"unknown custom operator",
 };
 #endif
 
@@ -1178,13 +1186,13 @@ EXT OP * (CPERLscope(*PL_check)[]) (pTHX_ OP *op) = {
 	MEMBER_TO_FPTR(Perl_ck_null),	/* i_ne */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* ncmp */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* i_ncmp */
-	MEMBER_TO_FPTR(Perl_ck_scmp),	/* slt */
-	MEMBER_TO_FPTR(Perl_ck_scmp),	/* sgt */
-	MEMBER_TO_FPTR(Perl_ck_scmp),	/* sle */
-	MEMBER_TO_FPTR(Perl_ck_scmp),	/* sge */
+	MEMBER_TO_FPTR(Perl_ck_null),	/* slt */
+	MEMBER_TO_FPTR(Perl_ck_null),	/* sgt */
+	MEMBER_TO_FPTR(Perl_ck_null),	/* sle */
+	MEMBER_TO_FPTR(Perl_ck_null),	/* sge */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* seq */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* sne */
-	MEMBER_TO_FPTR(Perl_ck_scmp),	/* scmp */
+	MEMBER_TO_FPTR(Perl_ck_null),	/* scmp */
 	MEMBER_TO_FPTR(Perl_ck_bitop),	/* bit_and */
 	MEMBER_TO_FPTR(Perl_ck_bitop),	/* bit_xor */
 	MEMBER_TO_FPTR(Perl_ck_bitop),	/* bit_or */
@@ -1209,15 +1217,15 @@ EXT OP * (CPERLscope(*PL_check)[]) (pTHX_ OP *op) = {
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* vec */
 	MEMBER_TO_FPTR(Perl_ck_index),	/* index */
 	MEMBER_TO_FPTR(Perl_ck_index),	/* rindex */
-	MEMBER_TO_FPTR(Perl_ck_fun_locale),	/* sprintf */
+	MEMBER_TO_FPTR(Perl_ck_fun),	/* sprintf */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* formline */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* ord */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* chr */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* crypt */
-	MEMBER_TO_FPTR(Perl_ck_fun_locale),	/* ucfirst */
-	MEMBER_TO_FPTR(Perl_ck_fun_locale),	/* lcfirst */
-	MEMBER_TO_FPTR(Perl_ck_fun_locale),	/* uc */
-	MEMBER_TO_FPTR(Perl_ck_fun_locale),	/* lc */
+	MEMBER_TO_FPTR(Perl_ck_fun),	/* ucfirst */
+	MEMBER_TO_FPTR(Perl_ck_fun),	/* lcfirst */
+	MEMBER_TO_FPTR(Perl_ck_fun),	/* uc */
+	MEMBER_TO_FPTR(Perl_ck_fun),	/* lc */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* quotemeta */
 	MEMBER_TO_FPTR(Perl_ck_rvconst),	/* rv2av */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* aelemfast */
@@ -1265,7 +1273,7 @@ EXT OP * (CPERLscope(*PL_check)[]) (pTHX_ OP *op) = {
 	MEMBER_TO_FPTR(Perl_ck_null),	/* leavesublv */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* caller */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* warn */
-	MEMBER_TO_FPTR(Perl_ck_fun),	/* die */
+	MEMBER_TO_FPTR(Perl_ck_die),	/* die */
 	MEMBER_TO_FPTR(Perl_ck_fun),	/* reset */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* lineseq */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* nextstate */
@@ -1445,6 +1453,7 @@ EXT OP * (CPERLscope(*PL_check)[]) (pTHX_ OP *op) = {
 	MEMBER_TO_FPTR(Perl_ck_null),	/* threadsv */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* setstate */
 	MEMBER_TO_FPTR(Perl_ck_null),	/* method_named */
+	MEMBER_TO_FPTR(Perl_ck_null),	/* custom */
 };
 #endif
 
@@ -1478,8 +1487,8 @@ EXT U32 PL_opargs[] = {
 	0x00122804,	/* bless */
 	0x00001608,	/* backtick */
 	0x00012808,	/* glob */
-	0x00001608,	/* readline */
-	0x00001608,	/* rcatline */
+	0x0001d608,	/* readline */
+	0x00000c08,	/* rcatline */
 	0x00002204,	/* regcmaybe */
 	0x00002204,	/* regcreset */
 	0x00002604,	/* regcomp */
@@ -1803,6 +1812,7 @@ EXT U32 PL_opargs[] = {
 	0x00000044,	/* threadsv */
 	0x00001404,	/* setstate */
 	0x00000c40,	/* method_named */
+	0x00000000,	/* custom */
 };
 #endif