Integrate from maint-5.8 : changes 18290-1, 18293-5, 18297

[p5sagit/p5-mst-13.2.git] / opcode.h

diff --git a/opcode.h b/opcode.h
index 01b89da..ff3c48f 100644 (file)
--- a/opcode.h
+++ b/opcode.h
@@ -380,6 +380,8 @@ EXT char *PL_op_name[] = {
        "threadsv",
        "setstate",
        "method_named",
+       "dor",
+       "dorassign",
        "custom",
 };
 #endif
@@ -739,6 +741,8 @@ EXT char *PL_op_desc[] = {
        "per-thread value",
        "set statement info",
        "method with known name",
+       "defined or (//)",
+       "defined or assignment (//=)",
        "unknown custom operator",
 };
 #endif
@@ -1103,6 +1107,8 @@ EXT OP * (CPERLscope(*PL_ppaddr)[])(pTHX) = {
        MEMBER_TO_FPTR(Perl_pp_threadsv),
        MEMBER_TO_FPTR(Perl_pp_setstate),
        MEMBER_TO_FPTR(Perl_pp_method_named),
+       MEMBER_TO_FPTR(Perl_pp_dor),
+       MEMBER_TO_FPTR(Perl_pp_dorassign),
 };
 #endif
 
@@ -1461,6 +1467,8 @@ 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),   /* dor */
+       MEMBER_TO_FPTR(Perl_ck_null),   /* dorassign */
        MEMBER_TO_FPTR(Perl_ck_null),   /* custom */
 };
 #endif
@@ -1744,7 +1752,7 @@ EXT U32 PL_opargs[] = {
        0x0001368c,     /* readlink */
        0x0012291c,     /* mkdir */
        0x0001379c,     /* rmdir */
-       0x0122c814,     /* open_dir */
+       0x0002c814,     /* open_dir */
        0x0000d600,     /* readdir */
        0x0000d60c,     /* telldir */
        0x0002c804,     /* seekdir */
@@ -1820,6 +1828,8 @@ EXT U32 PL_opargs[] = {
        0x00000044,     /* threadsv */
        0x00001404,     /* setstate */
        0x00000c40,     /* method_named */
+       0x00000600,     /* dor */
+       0x00000604,     /* dorassign */
        0x00000000,     /* custom */
 };
 #endif