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. --- opnames.h | 358 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 180 insertions(+), 178 deletions(-) (limited to 'opnames.h') diff --git a/opnames.h b/opnames.h index b6a63fdafc..d87ba88f01 100644 --- a/opnames.h +++ b/opnames.h @@ -232,187 +232,189 @@ typedef enum opcode { OP_METHOD_REDIR = 215, OP_METHOD_REDIR_SUPER = 216, OP_ENTERGIVEN = 217, - OP_ENTERWHERESO = 218, - OP_LEAVEWHERESO = 219, - OP_CONTINUE = 220, - OP_OPEN = 221, - OP_CLOSE = 222, - OP_PIPE_OP = 223, - OP_FILENO = 224, - OP_UMASK = 225, - OP_BINMODE = 226, - OP_TIE = 227, - OP_UNTIE = 228, - OP_TIED = 229, - OP_DBMOPEN = 230, - OP_DBMCLOSE = 231, - OP_SSELECT = 232, - OP_SELECT = 233, - OP_GETC = 234, - OP_READ = 235, - OP_ENTERWRITE = 236, - OP_LEAVEWRITE = 237, - OP_PRTF = 238, - OP_PRINT = 239, - OP_SAY = 240, - OP_SYSOPEN = 241, - OP_SYSSEEK = 242, - OP_SYSREAD = 243, - OP_SYSWRITE = 244, - OP_EOF = 245, - OP_TELL = 246, - OP_SEEK = 247, - OP_TRUNCATE = 248, - OP_FCNTL = 249, - OP_IOCTL = 250, - OP_FLOCK = 251, - OP_SEND = 252, - OP_RECV = 253, - OP_SOCKET = 254, - OP_SOCKPAIR = 255, - OP_BIND = 256, - OP_CONNECT = 257, - OP_LISTEN = 258, - OP_ACCEPT = 259, - OP_SHUTDOWN = 260, - OP_GSOCKOPT = 261, - OP_SSOCKOPT = 262, - OP_GETSOCKNAME = 263, - OP_GETPEERNAME = 264, - OP_LSTAT = 265, - OP_STAT = 266, - OP_FTRREAD = 267, - OP_FTRWRITE = 268, - OP_FTREXEC = 269, - OP_FTEREAD = 270, - OP_FTEWRITE = 271, - OP_FTEEXEC = 272, - OP_FTIS = 273, - OP_FTSIZE = 274, - OP_FTMTIME = 275, - OP_FTATIME = 276, - OP_FTCTIME = 277, - OP_FTROWNED = 278, - OP_FTEOWNED = 279, - OP_FTZERO = 280, - OP_FTSOCK = 281, - OP_FTCHR = 282, - OP_FTBLK = 283, - OP_FTFILE = 284, - OP_FTDIR = 285, - OP_FTPIPE = 286, - OP_FTSUID = 287, - OP_FTSGID = 288, - OP_FTSVTX = 289, - OP_FTLINK = 290, - OP_FTTTY = 291, - OP_FTTEXT = 292, - OP_FTBINARY = 293, - OP_CHDIR = 294, - OP_CHOWN = 295, - OP_CHROOT = 296, - OP_UNLINK = 297, - OP_CHMOD = 298, - OP_UTIME = 299, - OP_RENAME = 300, - OP_LINK = 301, - OP_SYMLINK = 302, - OP_READLINK = 303, - OP_MKDIR = 304, - OP_RMDIR = 305, - OP_OPEN_DIR = 306, - OP_READDIR = 307, - OP_TELLDIR = 308, - OP_SEEKDIR = 309, - OP_REWINDDIR = 310, - OP_CLOSEDIR = 311, - OP_FORK = 312, - OP_WAIT = 313, - OP_WAITPID = 314, - OP_SYSTEM = 315, - OP_EXEC = 316, - OP_KILL = 317, - OP_GETPPID = 318, - OP_GETPGRP = 319, - OP_SETPGRP = 320, - OP_GETPRIORITY = 321, - OP_SETPRIORITY = 322, - OP_TIME = 323, - OP_TMS = 324, - OP_LOCALTIME = 325, - OP_GMTIME = 326, - OP_ALARM = 327, - OP_SLEEP = 328, - OP_SHMGET = 329, - OP_SHMCTL = 330, - OP_SHMREAD = 331, - OP_SHMWRITE = 332, - OP_MSGGET = 333, - OP_MSGCTL = 334, - OP_MSGSND = 335, - OP_MSGRCV = 336, - OP_SEMOP = 337, - OP_SEMGET = 338, - OP_SEMCTL = 339, - OP_REQUIRE = 340, - OP_DOFILE = 341, - OP_HINTSEVAL = 342, - OP_ENTEREVAL = 343, - OP_LEAVEEVAL = 344, - OP_ENTERTRY = 345, - OP_LEAVETRY = 346, - OP_GHBYNAME = 347, - OP_GHBYADDR = 348, - OP_GHOSTENT = 349, - OP_GNBYNAME = 350, - OP_GNBYADDR = 351, - OP_GNETENT = 352, - OP_GPBYNAME = 353, - OP_GPBYNUMBER = 354, - OP_GPROTOENT = 355, - OP_GSBYNAME = 356, - OP_GSBYPORT = 357, - OP_GSERVENT = 358, - OP_SHOSTENT = 359, - OP_SNETENT = 360, - OP_SPROTOENT = 361, - OP_SSERVENT = 362, - OP_EHOSTENT = 363, - OP_ENETENT = 364, - OP_EPROTOENT = 365, - OP_ESERVENT = 366, - OP_GPWNAM = 367, - OP_GPWUID = 368, - OP_GPWENT = 369, - OP_SPWENT = 370, - OP_EPWENT = 371, - OP_GGRNAM = 372, - OP_GGRGID = 373, - OP_GGRENT = 374, - OP_SGRENT = 375, - OP_EGRENT = 376, - OP_GETLOGIN = 377, - OP_SYSCALL = 378, - OP_LOCK = 379, - OP_ONCE = 380, - OP_CUSTOM = 381, - OP_COREARGS = 382, - OP_AVHVSWITCH = 383, - OP_RUNCV = 384, - OP_FC = 385, - OP_PADCV = 386, - OP_INTROCV = 387, - OP_CLONECV = 388, - OP_PADRANGE = 389, - OP_REFASSIGN = 390, - OP_LVREF = 391, - OP_LVREFSLICE = 392, - OP_LVAVREF = 393, - OP_ANONCONST = 394, + OP_LEAVEGIVEN = 218, + OP_ENTERWHEN = 219, + OP_LEAVEWHEN = 220, + OP_BREAK = 221, + OP_CONTINUE = 222, + OP_OPEN = 223, + OP_CLOSE = 224, + OP_PIPE_OP = 225, + OP_FILENO = 226, + OP_UMASK = 227, + OP_BINMODE = 228, + OP_TIE = 229, + OP_UNTIE = 230, + OP_TIED = 231, + OP_DBMOPEN = 232, + OP_DBMCLOSE = 233, + OP_SSELECT = 234, + OP_SELECT = 235, + OP_GETC = 236, + OP_READ = 237, + OP_ENTERWRITE = 238, + OP_LEAVEWRITE = 239, + OP_PRTF = 240, + OP_PRINT = 241, + OP_SAY = 242, + OP_SYSOPEN = 243, + OP_SYSSEEK = 244, + OP_SYSREAD = 245, + OP_SYSWRITE = 246, + OP_EOF = 247, + OP_TELL = 248, + OP_SEEK = 249, + OP_TRUNCATE = 250, + OP_FCNTL = 251, + OP_IOCTL = 252, + OP_FLOCK = 253, + OP_SEND = 254, + OP_RECV = 255, + OP_SOCKET = 256, + OP_SOCKPAIR = 257, + OP_BIND = 258, + OP_CONNECT = 259, + OP_LISTEN = 260, + OP_ACCEPT = 261, + OP_SHUTDOWN = 262, + OP_GSOCKOPT = 263, + OP_SSOCKOPT = 264, + OP_GETSOCKNAME = 265, + OP_GETPEERNAME = 266, + OP_LSTAT = 267, + OP_STAT = 268, + OP_FTRREAD = 269, + OP_FTRWRITE = 270, + OP_FTREXEC = 271, + OP_FTEREAD = 272, + OP_FTEWRITE = 273, + OP_FTEEXEC = 274, + OP_FTIS = 275, + OP_FTSIZE = 276, + OP_FTMTIME = 277, + OP_FTATIME = 278, + OP_FTCTIME = 279, + OP_FTROWNED = 280, + OP_FTEOWNED = 281, + OP_FTZERO = 282, + OP_FTSOCK = 283, + OP_FTCHR = 284, + OP_FTBLK = 285, + OP_FTFILE = 286, + OP_FTDIR = 287, + OP_FTPIPE = 288, + OP_FTSUID = 289, + OP_FTSGID = 290, + OP_FTSVTX = 291, + OP_FTLINK = 292, + OP_FTTTY = 293, + OP_FTTEXT = 294, + OP_FTBINARY = 295, + OP_CHDIR = 296, + OP_CHOWN = 297, + OP_CHROOT = 298, + OP_UNLINK = 299, + OP_CHMOD = 300, + OP_UTIME = 301, + OP_RENAME = 302, + OP_LINK = 303, + OP_SYMLINK = 304, + OP_READLINK = 305, + OP_MKDIR = 306, + OP_RMDIR = 307, + OP_OPEN_DIR = 308, + OP_READDIR = 309, + OP_TELLDIR = 310, + OP_SEEKDIR = 311, + OP_REWINDDIR = 312, + OP_CLOSEDIR = 313, + OP_FORK = 314, + OP_WAIT = 315, + OP_WAITPID = 316, + OP_SYSTEM = 317, + OP_EXEC = 318, + OP_KILL = 319, + OP_GETPPID = 320, + OP_GETPGRP = 321, + OP_SETPGRP = 322, + OP_GETPRIORITY = 323, + OP_SETPRIORITY = 324, + OP_TIME = 325, + OP_TMS = 326, + OP_LOCALTIME = 327, + OP_GMTIME = 328, + OP_ALARM = 329, + OP_SLEEP = 330, + OP_SHMGET = 331, + OP_SHMCTL = 332, + OP_SHMREAD = 333, + OP_SHMWRITE = 334, + OP_MSGGET = 335, + OP_MSGCTL = 336, + OP_MSGSND = 337, + OP_MSGRCV = 338, + OP_SEMOP = 339, + OP_SEMGET = 340, + OP_SEMCTL = 341, + OP_REQUIRE = 342, + OP_DOFILE = 343, + OP_HINTSEVAL = 344, + OP_ENTEREVAL = 345, + OP_LEAVEEVAL = 346, + OP_ENTERTRY = 347, + OP_LEAVETRY = 348, + OP_GHBYNAME = 349, + OP_GHBYADDR = 350, + OP_GHOSTENT = 351, + OP_GNBYNAME = 352, + OP_GNBYADDR = 353, + OP_GNETENT = 354, + OP_GPBYNAME = 355, + OP_GPBYNUMBER = 356, + OP_GPROTOENT = 357, + OP_GSBYNAME = 358, + OP_GSBYPORT = 359, + OP_GSERVENT = 360, + OP_SHOSTENT = 361, + OP_SNETENT = 362, + OP_SPROTOENT = 363, + OP_SSERVENT = 364, + OP_EHOSTENT = 365, + OP_ENETENT = 366, + OP_EPROTOENT = 367, + OP_ESERVENT = 368, + OP_GPWNAM = 369, + OP_GPWUID = 370, + OP_GPWENT = 371, + OP_SPWENT = 372, + OP_EPWENT = 373, + OP_GGRNAM = 374, + OP_GGRGID = 375, + OP_GGRENT = 376, + OP_SGRENT = 377, + OP_EGRENT = 378, + OP_GETLOGIN = 379, + OP_SYSCALL = 380, + OP_LOCK = 381, + OP_ONCE = 382, + OP_CUSTOM = 383, + OP_COREARGS = 384, + OP_AVHVSWITCH = 385, + OP_RUNCV = 386, + OP_FC = 387, + OP_PADCV = 388, + OP_INTROCV = 389, + OP_CLONECV = 390, + OP_PADRANGE = 391, + OP_REFASSIGN = 392, + OP_LVREF = 393, + OP_LVREFSLICE = 394, + OP_LVAVREF = 395, + OP_ANONCONST = 396, OP_max } opcode; -#define MAXO 395 +#define MAXO 397 #define OP_FREED MAXO /* the OP_IS_* macros are optimized to a simple range check because -- cgit v1.2.1