merge leavegiven op type into leaveloop

The leaveloop op type can already do the whole job, with leavegiven being
a near duplicate of it.  Replace all uses of leavegiven with leaveloop.

1 files changed, 178 insertions, 179 deletions

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