This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Remove boolkeys op
authorFather Chrysostomos <sprout@cpan.org>
Sun, 26 Aug 2012 19:28:45 +0000 (12:28 -0700)
committerFather Chrysostomos <sprout@cpan.org>
Sun, 26 Aug 2012 20:16:55 +0000 (13:16 -0700)
ext/Opcode/Opcode.pm
opcode.h
opnames.h
regen/opcode.pl
regen/opcodes

index a9d5ab2..dda7277 100644 (file)
@@ -311,7 +311,7 @@ invert_opset function.
     rv2av aassign aelem aelemfast aelemfast_lex aslice av2arylen
 
     rv2hv helem hslice each values keys exists delete aeach akeys avalues
-    boolkeys reach rvalues rkeys
+    reach rvalues rkeys
 
     preinc i_preinc predec i_predec postinc i_postinc postdec i_postdec
     int hex oct abs pow multiply i_multiply divide i_divide
index 30f3f7e..aeee45c 100644 (file)
--- a/opcode.h
+++ b/opcode.h
@@ -43,7 +43,6 @@
 #define Perl_pp_values Perl_do_kv
 #define Perl_pp_keys Perl_do_kv
 #define Perl_pp_rv2hv Perl_pp_rv2av
-#define Perl_pp_boolkeys Perl_unimplemented_op
 #define Perl_pp_pop Perl_pp_shift
 #define Perl_pp_mapstart Perl_unimplemented_op
 #define Perl_pp_dor Perl_pp_defined
@@ -292,7 +291,6 @@ EXTCONST char* const PL_op_name[] = {
        "rv2hv",
        "helem",
        "hslice",
-       "boolkeys",
        "unpack",
        "pack",
        "split",
@@ -674,7 +672,6 @@ EXTCONST char* const PL_op_desc[] = {
        "hash dereference",
        "hash element",
        "hash slice",
-       "boolkeys",
        "unpack",
        "pack",
        "split",
@@ -1070,7 +1067,6 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
        Perl_pp_rv2hv,  /* implemented by Perl_pp_rv2av */
        Perl_pp_helem,
        Perl_pp_hslice,
-       Perl_pp_boolkeys,       /* implemented by Perl_unimplemented_op */
        Perl_pp_unpack,
        Perl_pp_pack,
        Perl_pp_split,
@@ -1462,7 +1458,6 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
        Perl_ck_rvconst,        /* rv2hv */
        Perl_ck_null,           /* helem */
        Perl_ck_null,           /* hslice */
-       Perl_ck_fun,            /* boolkeys */
        Perl_ck_fun,            /* unpack */
        Perl_ck_fun,            /* pack */
        Perl_ck_split,          /* split */
@@ -1848,7 +1843,6 @@ EXTCONST U32 PL_opargs[] = {
        0x00000148,     /* rv2hv */
        0x00014204,     /* helem */
        0x00024401,     /* hslice */
-       0x00004b00,     /* boolkeys */
        0x00091480,     /* unpack */
        0x0002140f,     /* pack */
        0x00111408,     /* split */
index fd86d2a..53699fd 100644 (file)
--- a/opnames.h
+++ b/opnames.h
@@ -157,241 +157,240 @@ typedef enum opcode {
        OP_RV2HV         = 140,
        OP_HELEM         = 141,
        OP_HSLICE        = 142,
-       OP_BOOLKEYS      = 143,
-       OP_UNPACK        = 144,
-       OP_PACK          = 145,
-       OP_SPLIT         = 146,
-       OP_JOIN          = 147,
-       OP_LIST          = 148,
-       OP_LSLICE        = 149,
-       OP_ANONLIST      = 150,
-       OP_ANONHASH      = 151,
-       OP_SPLICE        = 152,
-       OP_PUSH          = 153,
-       OP_POP           = 154,
-       OP_SHIFT         = 155,
-       OP_UNSHIFT       = 156,
-       OP_SORT          = 157,
-       OP_REVERSE       = 158,
-       OP_GREPSTART     = 159,
-       OP_GREPWHILE     = 160,
-       OP_MAPSTART      = 161,
-       OP_MAPWHILE      = 162,
-       OP_RANGE         = 163,
-       OP_FLIP          = 164,
-       OP_FLOP          = 165,
-       OP_AND           = 166,
-       OP_OR            = 167,
-       OP_XOR           = 168,
-       OP_DOR           = 169,
-       OP_COND_EXPR     = 170,
-       OP_ANDASSIGN     = 171,
-       OP_ORASSIGN      = 172,
-       OP_DORASSIGN     = 173,
-       OP_METHOD        = 174,
-       OP_ENTERSUB      = 175,
-       OP_LEAVESUB      = 176,
-       OP_LEAVESUBLV    = 177,
-       OP_CALLER        = 178,
-       OP_WARN          = 179,
-       OP_DIE           = 180,
-       OP_RESET         = 181,
-       OP_LINESEQ       = 182,
-       OP_NEXTSTATE     = 183,
-       OP_DBSTATE       = 184,
-       OP_UNSTACK       = 185,
-       OP_ENTER         = 186,
-       OP_LEAVE         = 187,
-       OP_SCOPE         = 188,
-       OP_ENTERITER     = 189,
-       OP_ITER          = 190,
-       OP_ENTERLOOP     = 191,
-       OP_LEAVELOOP     = 192,
-       OP_RETURN        = 193,
-       OP_LAST          = 194,
-       OP_NEXT          = 195,
-       OP_REDO          = 196,
-       OP_DUMP          = 197,
-       OP_GOTO          = 198,
-       OP_EXIT          = 199,
-       OP_METHOD_NAMED  = 200,
-       OP_ENTERGIVEN    = 201,
-       OP_LEAVEGIVEN    = 202,
-       OP_ENTERWHEN     = 203,
-       OP_LEAVEWHEN     = 204,
-       OP_BREAK         = 205,
-       OP_CONTINUE      = 206,
-       OP_OPEN          = 207,
-       OP_CLOSE         = 208,
-       OP_PIPE_OP       = 209,
-       OP_FILENO        = 210,
-       OP_UMASK         = 211,
-       OP_BINMODE       = 212,
-       OP_TIE           = 213,
-       OP_UNTIE         = 214,
-       OP_TIED          = 215,
-       OP_DBMOPEN       = 216,
-       OP_DBMCLOSE      = 217,
-       OP_SSELECT       = 218,
-       OP_SELECT        = 219,
-       OP_GETC          = 220,
-       OP_READ          = 221,
-       OP_ENTERWRITE    = 222,
-       OP_LEAVEWRITE    = 223,
-       OP_PRTF          = 224,
-       OP_PRINT         = 225,
-       OP_SAY           = 226,
-       OP_SYSOPEN       = 227,
-       OP_SYSSEEK       = 228,
-       OP_SYSREAD       = 229,
-       OP_SYSWRITE      = 230,
-       OP_EOF           = 231,
-       OP_TELL          = 232,
-       OP_SEEK          = 233,
-       OP_TRUNCATE      = 234,
-       OP_FCNTL         = 235,
-       OP_IOCTL         = 236,
-       OP_FLOCK         = 237,
-       OP_SEND          = 238,
-       OP_RECV          = 239,
-       OP_SOCKET        = 240,
-       OP_SOCKPAIR      = 241,
-       OP_BIND          = 242,
-       OP_CONNECT       = 243,
-       OP_LISTEN        = 244,
-       OP_ACCEPT        = 245,
-       OP_SHUTDOWN      = 246,
-       OP_GSOCKOPT      = 247,
-       OP_SSOCKOPT      = 248,
-       OP_GETSOCKNAME   = 249,
-       OP_GETPEERNAME   = 250,
-       OP_LSTAT         = 251,
-       OP_STAT          = 252,
-       OP_FTRREAD       = 253,
-       OP_FTRWRITE      = 254,
-       OP_FTREXEC       = 255,
-       OP_FTEREAD       = 256,
-       OP_FTEWRITE      = 257,
-       OP_FTEEXEC       = 258,
-       OP_FTIS          = 259,
-       OP_FTSIZE        = 260,
-       OP_FTMTIME       = 261,
-       OP_FTATIME       = 262,
-       OP_FTCTIME       = 263,
-       OP_FTROWNED      = 264,
-       OP_FTEOWNED      = 265,
-       OP_FTZERO        = 266,
-       OP_FTSOCK        = 267,
-       OP_FTCHR         = 268,
-       OP_FTBLK         = 269,
-       OP_FTFILE        = 270,
-       OP_FTDIR         = 271,
-       OP_FTPIPE        = 272,
-       OP_FTSUID        = 273,
-       OP_FTSGID        = 274,
-       OP_FTSVTX        = 275,
-       OP_FTLINK        = 276,
-       OP_FTTTY         = 277,
-       OP_FTTEXT        = 278,
-       OP_FTBINARY      = 279,
-       OP_CHDIR         = 280,
-       OP_CHOWN         = 281,
-       OP_CHROOT        = 282,
-       OP_UNLINK        = 283,
-       OP_CHMOD         = 284,
-       OP_UTIME         = 285,
-       OP_RENAME        = 286,
-       OP_LINK          = 287,
-       OP_SYMLINK       = 288,
-       OP_READLINK      = 289,
-       OP_MKDIR         = 290,
-       OP_RMDIR         = 291,
-       OP_OPEN_DIR      = 292,
-       OP_READDIR       = 293,
-       OP_TELLDIR       = 294,
-       OP_SEEKDIR       = 295,
-       OP_REWINDDIR     = 296,
-       OP_CLOSEDIR      = 297,
-       OP_FORK          = 298,
-       OP_WAIT          = 299,
-       OP_WAITPID       = 300,
-       OP_SYSTEM        = 301,
-       OP_EXEC          = 302,
-       OP_KILL          = 303,
-       OP_GETPPID       = 304,
-       OP_GETPGRP       = 305,
-       OP_SETPGRP       = 306,
-       OP_GETPRIORITY   = 307,
-       OP_SETPRIORITY   = 308,
-       OP_TIME          = 309,
-       OP_TMS           = 310,
-       OP_LOCALTIME     = 311,
-       OP_GMTIME        = 312,
-       OP_ALARM         = 313,
-       OP_SLEEP         = 314,
-       OP_SHMGET        = 315,
-       OP_SHMCTL        = 316,
-       OP_SHMREAD       = 317,
-       OP_SHMWRITE      = 318,
-       OP_MSGGET        = 319,
-       OP_MSGCTL        = 320,
-       OP_MSGSND        = 321,
-       OP_MSGRCV        = 322,
-       OP_SEMOP         = 323,
-       OP_SEMGET        = 324,
-       OP_SEMCTL        = 325,
-       OP_REQUIRE       = 326,
-       OP_DOFILE        = 327,
-       OP_HINTSEVAL     = 328,
-       OP_ENTEREVAL     = 329,
-       OP_LEAVEEVAL     = 330,
-       OP_ENTERTRY      = 331,
-       OP_LEAVETRY      = 332,
-       OP_GHBYNAME      = 333,
-       OP_GHBYADDR      = 334,
-       OP_GHOSTENT      = 335,
-       OP_GNBYNAME      = 336,
-       OP_GNBYADDR      = 337,
-       OP_GNETENT       = 338,
-       OP_GPBYNAME      = 339,
-       OP_GPBYNUMBER    = 340,
-       OP_GPROTOENT     = 341,
-       OP_GSBYNAME      = 342,
-       OP_GSBYPORT      = 343,
-       OP_GSERVENT      = 344,
-       OP_SHOSTENT      = 345,
-       OP_SNETENT       = 346,
-       OP_SPROTOENT     = 347,
-       OP_SSERVENT      = 348,
-       OP_EHOSTENT      = 349,
-       OP_ENETENT       = 350,
-       OP_EPROTOENT     = 351,
-       OP_ESERVENT      = 352,
-       OP_GPWNAM        = 353,
-       OP_GPWUID        = 354,
-       OP_GPWENT        = 355,
-       OP_SPWENT        = 356,
-       OP_EPWENT        = 357,
-       OP_GGRNAM        = 358,
-       OP_GGRGID        = 359,
-       OP_GGRENT        = 360,
-       OP_SGRENT        = 361,
-       OP_EGRENT        = 362,
-       OP_GETLOGIN      = 363,
-       OP_SYSCALL       = 364,
-       OP_LOCK          = 365,
-       OP_ONCE          = 366,
-       OP_CUSTOM        = 367,
-       OP_REACH         = 368,
-       OP_RKEYS         = 369,
-       OP_RVALUES       = 370,
-       OP_COREARGS      = 371,
-       OP_RUNCV         = 372,
-       OP_FC            = 373,
+       OP_UNPACK        = 143,
+       OP_PACK          = 144,
+       OP_SPLIT         = 145,
+       OP_JOIN          = 146,
+       OP_LIST          = 147,
+       OP_LSLICE        = 148,
+       OP_ANONLIST      = 149,
+       OP_ANONHASH      = 150,
+       OP_SPLICE        = 151,
+       OP_PUSH          = 152,
+       OP_POP           = 153,
+       OP_SHIFT         = 154,
+       OP_UNSHIFT       = 155,
+       OP_SORT          = 156,
+       OP_REVERSE       = 157,
+       OP_GREPSTART     = 158,
+       OP_GREPWHILE     = 159,
+       OP_MAPSTART      = 160,
+       OP_MAPWHILE      = 161,
+       OP_RANGE         = 162,
+       OP_FLIP          = 163,
+       OP_FLOP          = 164,
+       OP_AND           = 165,
+       OP_OR            = 166,
+       OP_XOR           = 167,
+       OP_DOR           = 168,
+       OP_COND_EXPR     = 169,
+       OP_ANDASSIGN     = 170,
+       OP_ORASSIGN      = 171,
+       OP_DORASSIGN     = 172,
+       OP_METHOD        = 173,
+       OP_ENTERSUB      = 174,
+       OP_LEAVESUB      = 175,
+       OP_LEAVESUBLV    = 176,
+       OP_CALLER        = 177,
+       OP_WARN          = 178,
+       OP_DIE           = 179,
+       OP_RESET         = 180,
+       OP_LINESEQ       = 181,
+       OP_NEXTSTATE     = 182,
+       OP_DBSTATE       = 183,
+       OP_UNSTACK       = 184,
+       OP_ENTER         = 185,
+       OP_LEAVE         = 186,
+       OP_SCOPE         = 187,
+       OP_ENTERITER     = 188,
+       OP_ITER          = 189,
+       OP_ENTERLOOP     = 190,
+       OP_LEAVELOOP     = 191,
+       OP_RETURN        = 192,
+       OP_LAST          = 193,
+       OP_NEXT          = 194,
+       OP_REDO          = 195,
+       OP_DUMP          = 196,
+       OP_GOTO          = 197,
+       OP_EXIT          = 198,
+       OP_METHOD_NAMED  = 199,
+       OP_ENTERGIVEN    = 200,
+       OP_LEAVEGIVEN    = 201,
+       OP_ENTERWHEN     = 202,
+       OP_LEAVEWHEN     = 203,
+       OP_BREAK         = 204,
+       OP_CONTINUE      = 205,
+       OP_OPEN          = 206,
+       OP_CLOSE         = 207,
+       OP_PIPE_OP       = 208,
+       OP_FILENO        = 209,
+       OP_UMASK         = 210,
+       OP_BINMODE       = 211,
+       OP_TIE           = 212,
+       OP_UNTIE         = 213,
+       OP_TIED          = 214,
+       OP_DBMOPEN       = 215,
+       OP_DBMCLOSE      = 216,
+       OP_SSELECT       = 217,
+       OP_SELECT        = 218,
+       OP_GETC          = 219,
+       OP_READ          = 220,
+       OP_ENTERWRITE    = 221,
+       OP_LEAVEWRITE    = 222,
+       OP_PRTF          = 223,
+       OP_PRINT         = 224,
+       OP_SAY           = 225,
+       OP_SYSOPEN       = 226,
+       OP_SYSSEEK       = 227,
+       OP_SYSREAD       = 228,
+       OP_SYSWRITE      = 229,
+       OP_EOF           = 230,
+       OP_TELL          = 231,
+       OP_SEEK          = 232,
+       OP_TRUNCATE      = 233,
+       OP_FCNTL         = 234,
+       OP_IOCTL         = 235,
+       OP_FLOCK         = 236,
+       OP_SEND          = 237,
+       OP_RECV          = 238,
+       OP_SOCKET        = 239,
+       OP_SOCKPAIR      = 240,
+       OP_BIND          = 241,
+       OP_CONNECT       = 242,
+       OP_LISTEN        = 243,
+       OP_ACCEPT        = 244,
+       OP_SHUTDOWN      = 245,
+       OP_GSOCKOPT      = 246,
+       OP_SSOCKOPT      = 247,
+       OP_GETSOCKNAME   = 248,
+       OP_GETPEERNAME   = 249,
+       OP_LSTAT         = 250,
+       OP_STAT          = 251,
+       OP_FTRREAD       = 252,
+       OP_FTRWRITE      = 253,
+       OP_FTREXEC       = 254,
+       OP_FTEREAD       = 255,
+       OP_FTEWRITE      = 256,
+       OP_FTEEXEC       = 257,
+       OP_FTIS          = 258,
+       OP_FTSIZE        = 259,
+       OP_FTMTIME       = 260,
+       OP_FTATIME       = 261,
+       OP_FTCTIME       = 262,
+       OP_FTROWNED      = 263,
+       OP_FTEOWNED      = 264,
+       OP_FTZERO        = 265,
+       OP_FTSOCK        = 266,
+       OP_FTCHR         = 267,
+       OP_FTBLK         = 268,
+       OP_FTFILE        = 269,
+       OP_FTDIR         = 270,
+       OP_FTPIPE        = 271,
+       OP_FTSUID        = 272,
+       OP_FTSGID        = 273,
+       OP_FTSVTX        = 274,
+       OP_FTLINK        = 275,
+       OP_FTTTY         = 276,
+       OP_FTTEXT        = 277,
+       OP_FTBINARY      = 278,
+       OP_CHDIR         = 279,
+       OP_CHOWN         = 280,
+       OP_CHROOT        = 281,
+       OP_UNLINK        = 282,
+       OP_CHMOD         = 283,
+       OP_UTIME         = 284,
+       OP_RENAME        = 285,
+       OP_LINK          = 286,
+       OP_SYMLINK       = 287,
+       OP_READLINK      = 288,
+       OP_MKDIR         = 289,
+       OP_RMDIR         = 290,
+       OP_OPEN_DIR      = 291,
+       OP_READDIR       = 292,
+       OP_TELLDIR       = 293,
+       OP_SEEKDIR       = 294,
+       OP_REWINDDIR     = 295,
+       OP_CLOSEDIR      = 296,
+       OP_FORK          = 297,
+       OP_WAIT          = 298,
+       OP_WAITPID       = 299,
+       OP_SYSTEM        = 300,
+       OP_EXEC          = 301,
+       OP_KILL          = 302,
+       OP_GETPPID       = 303,
+       OP_GETPGRP       = 304,
+       OP_SETPGRP       = 305,
+       OP_GETPRIORITY   = 306,
+       OP_SETPRIORITY   = 307,
+       OP_TIME          = 308,
+       OP_TMS           = 309,
+       OP_LOCALTIME     = 310,
+       OP_GMTIME        = 311,
+       OP_ALARM         = 312,
+       OP_SLEEP         = 313,
+       OP_SHMGET        = 314,
+       OP_SHMCTL        = 315,
+       OP_SHMREAD       = 316,
+       OP_SHMWRITE      = 317,
+       OP_MSGGET        = 318,
+       OP_MSGCTL        = 319,
+       OP_MSGSND        = 320,
+       OP_MSGRCV        = 321,
+       OP_SEMOP         = 322,
+       OP_SEMGET        = 323,
+       OP_SEMCTL        = 324,
+       OP_REQUIRE       = 325,
+       OP_DOFILE        = 326,
+       OP_HINTSEVAL     = 327,
+       OP_ENTEREVAL     = 328,
+       OP_LEAVEEVAL     = 329,
+       OP_ENTERTRY      = 330,
+       OP_LEAVETRY      = 331,
+       OP_GHBYNAME      = 332,
+       OP_GHBYADDR      = 333,
+       OP_GHOSTENT      = 334,
+       OP_GNBYNAME      = 335,
+       OP_GNBYADDR      = 336,
+       OP_GNETENT       = 337,
+       OP_GPBYNAME      = 338,
+       OP_GPBYNUMBER    = 339,
+       OP_GPROTOENT     = 340,
+       OP_GSBYNAME      = 341,
+       OP_GSBYPORT      = 342,
+       OP_GSERVENT      = 343,
+       OP_SHOSTENT      = 344,
+       OP_SNETENT       = 345,
+       OP_SPROTOENT     = 346,
+       OP_SSERVENT      = 347,
+       OP_EHOSTENT      = 348,
+       OP_ENETENT       = 349,
+       OP_EPROTOENT     = 350,
+       OP_ESERVENT      = 351,
+       OP_GPWNAM        = 352,
+       OP_GPWUID        = 353,
+       OP_GPWENT        = 354,
+       OP_SPWENT        = 355,
+       OP_EPWENT        = 356,
+       OP_GGRNAM        = 357,
+       OP_GGRGID        = 358,
+       OP_GGRENT        = 359,
+       OP_SGRENT        = 360,
+       OP_EGRENT        = 361,
+       OP_GETLOGIN      = 362,
+       OP_SYSCALL       = 363,
+       OP_LOCK          = 364,
+       OP_ONCE          = 365,
+       OP_CUSTOM        = 366,
+       OP_REACH         = 367,
+       OP_RKEYS         = 368,
+       OP_RVALUES       = 369,
+       OP_COREARGS      = 370,
+       OP_RUNCV         = 371,
+       OP_FC            = 372,
        OP_max          
 } opcode;
 
-#define MAXO 374
+#define MAXO 373
 #define OP_FREED MAXO
 
 /* the OP_IS_* macros are optimized to a simple range check because
index a776582..2ef64ec 100755 (executable)
@@ -67,8 +67,7 @@ my %alias;
 # Format is "this function" => "does these op names"
 my @raw_alias = (
                 Perl_do_kv => [qw( keys values )],
-                Perl_unimplemented_op => [qw(padany mapstart custom
-                                             boolkeys)],
+                Perl_unimplemented_op => [qw(padany mapstart custom)],
                 # All the ops with a body of { return NORMAL; }
                 Perl_pp_null => [qw(scalar regcmaybe lineseq scope)],
 
index e249407..ad10c17 100644 (file)
@@ -232,7 +232,6 @@ exists              exists                  ck_exists       is%     S
 rv2hv          hash dereference        ck_rvconst      dt1     
 helem          hash element            ck_null         s2      H S
 hslice         hash slice              ck_null         m@      H L
-boolkeys       boolkeys                ck_fun          %       H
 
 # Explosives and implosives.