Integrate thrperl 5.003->5.004.

p4raw-id: //depot/perl@24

1 files changed, 247 insertions, 245 deletions

diff --git a/keywords.h b/keywords.h
index a6dabf3e61..7d7164945f 100644
--- a/keywords.h
+++ b/keywords.h
@@ -1,246 +1,248 @@
 #define KEY_NULL		0
-#define KEY___LINE__		1
-#define KEY___FILE__		2
-#define KEY___DATA__		3
-#define KEY___END__		4
-#define KEY_AUTOLOAD		5
-#define KEY_BEGIN		6
-#define KEY_CORE		7
-#define KEY_DESTROY		8
-#define KEY_END			9
-#define KEY_EQ			10
-#define KEY_GE			11
-#define KEY_GT			12
-#define KEY_LE			13
-#define KEY_LT			14
-#define KEY_NE			15
-#define KEY_RESTART		16
-#define KEY_abs			17
-#define KEY_accept		18
-#define KEY_alarm		19
-#define KEY_and			20
-#define KEY_atan2		21
-#define KEY_bind		22
-#define KEY_binmode		23
-#define KEY_bless		24
-#define KEY_caller		25
-#define KEY_chdir		26
-#define KEY_chmod		27
-#define KEY_chomp		28
-#define KEY_chop		29
-#define KEY_chown		30
-#define KEY_chr			31
-#define KEY_chroot		32
-#define KEY_close		33
-#define KEY_closedir		34
-#define KEY_cmp			35
-#define KEY_connect		36
-#define KEY_continue		37
-#define KEY_cos			38
-#define KEY_crypt		39
-#define KEY_dbmclose		40
-#define KEY_dbmopen		41
-#define KEY_defined		42
-#define KEY_delete		43
-#define KEY_die			44
-#define KEY_do			45
-#define KEY_dump		46
-#define KEY_each		47
-#define KEY_else		48
-#define KEY_elsif		49
-#define KEY_endgrent		50
-#define KEY_endhostent		51
-#define KEY_endnetent		52
-#define KEY_endprotoent		53
-#define KEY_endpwent		54
-#define KEY_endservent		55
-#define KEY_eof			56
-#define KEY_eq			57
-#define KEY_eval		58
-#define KEY_exec		59
-#define KEY_exists		60
-#define KEY_exit		61
-#define KEY_exp			62
-#define KEY_fcntl		63
-#define KEY_fileno		64
-#define KEY_flock		65
-#define KEY_for			66
-#define KEY_foreach		67
-#define KEY_fork		68
-#define KEY_format		69
-#define KEY_formline		70
-#define KEY_ge			71
-#define KEY_getc		72
-#define KEY_getgrent		73
-#define KEY_getgrgid		74
-#define KEY_getgrnam		75
-#define KEY_gethostbyaddr	76
-#define KEY_gethostbyname	77
-#define KEY_gethostent		78
-#define KEY_getlogin		79
-#define KEY_getnetbyaddr	80
-#define KEY_getnetbyname	81
-#define KEY_getnetent		82
-#define KEY_getpeername		83
-#define KEY_getpgrp		84
-#define KEY_getppid		85
-#define KEY_getpriority		86
-#define KEY_getprotobyname	87
-#define KEY_getprotobynumber	88
-#define KEY_getprotoent		89
-#define KEY_getpwent		90
-#define KEY_getpwnam		91
-#define KEY_getpwuid		92
-#define KEY_getservbyname	93
-#define KEY_getservbyport	94
-#define KEY_getservent		95
-#define KEY_getsockname		96
-#define KEY_getsockopt		97
-#define KEY_glob		98
-#define KEY_gmtime		99
-#define KEY_goto		100
-#define KEY_grep		101
-#define KEY_gt			102
-#define KEY_hex			103
-#define KEY_if			104
-#define KEY_index		105
-#define KEY_int			106
-#define KEY_ioctl		107
-#define KEY_join		108
-#define KEY_keys		109
-#define KEY_kill		110
-#define KEY_last		111
-#define KEY_lc			112
-#define KEY_lcfirst		113
-#define KEY_le			114
-#define KEY_length		115
-#define KEY_link		116
-#define KEY_listen		117
-#define KEY_local		118
-#define KEY_localtime		119
-#define KEY_log			120
-#define KEY_lstat		121
-#define KEY_lt			122
-#define KEY_m			123
-#define KEY_map			124
-#define KEY_mkdir		125
-#define KEY_msgctl		126
-#define KEY_msgget		127
-#define KEY_msgrcv		128
-#define KEY_msgsnd		129
-#define KEY_my			130
-#define KEY_ne			131
-#define KEY_next		132
-#define KEY_no			133
-#define KEY_not			134
-#define KEY_oct			135
-#define KEY_open		136
-#define KEY_opendir		137
-#define KEY_or			138
-#define KEY_ord			139
-#define KEY_pack		140
-#define KEY_package		141
-#define KEY_pipe		142
-#define KEY_pop			143
-#define KEY_pos			144
-#define KEY_print		145
-#define KEY_printf		146
-#define KEY_prototype		147
-#define KEY_push		148
-#define KEY_q			149
-#define KEY_qq			150
-#define KEY_quotemeta		151
-#define KEY_qw			152
-#define KEY_qx			153
-#define KEY_rand		154
-#define KEY_read		155
-#define KEY_readdir		156
-#define KEY_readline		157
-#define KEY_readlink		158
-#define KEY_readpipe		159
-#define KEY_recv		160
-#define KEY_redo		161
-#define KEY_ref			162
-#define KEY_rename		163
-#define KEY_require		164
-#define KEY_reset		165
-#define KEY_return		166
-#define KEY_reverse		167
-#define KEY_rewinddir		168
-#define KEY_rindex		169
-#define KEY_rmdir		170
-#define KEY_s			171
-#define KEY_scalar		172
-#define KEY_seek		173
-#define KEY_seekdir		174
-#define KEY_select		175
-#define KEY_semctl		176
-#define KEY_semget		177
-#define KEY_semop		178
-#define KEY_send		179
-#define KEY_setgrent		180
-#define KEY_sethostent		181
-#define KEY_setnetent		182
-#define KEY_setpgrp		183
-#define KEY_setpriority		184
-#define KEY_setprotoent		185
-#define KEY_setpwent		186
-#define KEY_setservent		187
-#define KEY_setsockopt		188
-#define KEY_shift		189
-#define KEY_shmctl		190
-#define KEY_shmget		191
-#define KEY_shmread		192
-#define KEY_shmwrite		193
-#define KEY_shutdown		194
-#define KEY_sin			195
-#define KEY_sleep		196
-#define KEY_socket		197
-#define KEY_socketpair		198
-#define KEY_sort		199
-#define KEY_splice		200
-#define KEY_split		201
-#define KEY_sprintf		202
-#define KEY_sqrt		203
-#define KEY_srand		204
-#define KEY_stat		205
-#define KEY_study		206
-#define KEY_sub			207
-#define KEY_substr		208
-#define KEY_symlink		209
-#define KEY_syscall		210
-#define KEY_sysopen		211
-#define KEY_sysread		212
-#define KEY_system		213
-#define KEY_syswrite		214
-#define KEY_tell		215
-#define KEY_telldir		216
-#define KEY_tie			217
-#define KEY_tied		218
-#define KEY_time		219
-#define KEY_times		220
-#define KEY_tr			221
-#define KEY_truncate		222
-#define KEY_uc			223
-#define KEY_ucfirst		224
-#define KEY_umask		225
-#define KEY_undef		226
-#define KEY_unless		227
-#define KEY_unlink		228
-#define KEY_unpack		229
-#define KEY_unshift		230
-#define KEY_untie		231
-#define KEY_until		232
-#define KEY_use			233
-#define KEY_utime		234
-#define KEY_values		235
-#define KEY_vec			236
-#define KEY_wait		237
-#define KEY_waitpid		238
-#define KEY_wantarray		239
-#define KEY_warn		240
-#define KEY_while		241
-#define KEY_write		242
-#define KEY_x			243
-#define KEY_xor			244
-#define KEY_y			245
+#define KEY___FILE__		1
+#define KEY___LINE__		2
+#define KEY___PACKAGE__		3
+#define KEY___DATA__		4
+#define KEY___END__		5
+#define KEY_AUTOLOAD		6
+#define KEY_BEGIN		7
+#define KEY_CORE		8
+#define KEY_DESTROY		9
+#define KEY_END			10
+#define KEY_EQ			11
+#define KEY_GE			12
+#define KEY_GT			13
+#define KEY_LE			14
+#define KEY_LT			15
+#define KEY_NE			16
+#define KEY_RESTART		17
+#define KEY_abs			18
+#define KEY_accept		19
+#define KEY_alarm		20
+#define KEY_and			21
+#define KEY_atan2		22
+#define KEY_bind		23
+#define KEY_binmode		24
+#define KEY_bless		25
+#define KEY_caller		26
+#define KEY_chdir		27
+#define KEY_chmod		28
+#define KEY_chomp		29
+#define KEY_chop		30
+#define KEY_chown		31
+#define KEY_chr			32
+#define KEY_chroot		33
+#define KEY_close		34
+#define KEY_closedir		35
+#define KEY_cmp			36
+#define KEY_connect		37
+#define KEY_continue		38
+#define KEY_cos			39
+#define KEY_crypt		40
+#define KEY_dbmclose		41
+#define KEY_dbmopen		42
+#define KEY_defined		43
+#define KEY_delete		44
+#define KEY_die			45
+#define KEY_do			46
+#define KEY_dump		47
+#define KEY_each		48
+#define KEY_else		49
+#define KEY_elsif		50
+#define KEY_endgrent		51
+#define KEY_endhostent		52
+#define KEY_endnetent		53
+#define KEY_endprotoent		54
+#define KEY_endpwent		55
+#define KEY_endservent		56
+#define KEY_eof			57
+#define KEY_eq			58
+#define KEY_eval		59
+#define KEY_exec		60
+#define KEY_exists		61
+#define KEY_exit		62
+#define KEY_exp			63
+#define KEY_fcntl		64
+#define KEY_fileno		65
+#define KEY_flock		66
+#define KEY_for			67
+#define KEY_foreach		68
+#define KEY_fork		69
+#define KEY_format		70
+#define KEY_formline		71
+#define KEY_ge			72
+#define KEY_getc		73
+#define KEY_getgrent		74
+#define KEY_getgrgid		75
+#define KEY_getgrnam		76
+#define KEY_gethostbyaddr	77
+#define KEY_gethostbyname	78
+#define KEY_gethostent		79
+#define KEY_getlogin		80
+#define KEY_getnetbyaddr	81
+#define KEY_getnetbyname	82
+#define KEY_getnetent		83
+#define KEY_getpeername		84
+#define KEY_getpgrp		85
+#define KEY_getppid		86
+#define KEY_getpriority		87
+#define KEY_getprotobyname	88
+#define KEY_getprotobynumber	89
+#define KEY_getprotoent		90
+#define KEY_getpwent		91
+#define KEY_getpwnam		92
+#define KEY_getpwuid		93
+#define KEY_getservbyname	94
+#define KEY_getservbyport	95
+#define KEY_getservent		96
+#define KEY_getsockname		97
+#define KEY_getsockopt		98
+#define KEY_glob		99
+#define KEY_gmtime		100
+#define KEY_goto		101
+#define KEY_grep		102
+#define KEY_gt			103
+#define KEY_hex			104
+#define KEY_if			105
+#define KEY_index		106
+#define KEY_int			107
+#define KEY_ioctl		108
+#define KEY_join		109
+#define KEY_keys		110
+#define KEY_kill		111
+#define KEY_last		112
+#define KEY_lc			113
+#define KEY_lcfirst		114
+#define KEY_le			115
+#define KEY_length		116
+#define KEY_link		117
+#define KEY_listen		118
+#define KEY_local		119
+#define KEY_localtime		120
+#define KEY_log			121
+#define KEY_lstat		122
+#define KEY_lt			123
+#define KEY_m			124
+#define KEY_map			125
+#define KEY_mkdir		126
+#define KEY_msgctl		127
+#define KEY_msgget		128
+#define KEY_msgrcv		129
+#define KEY_msgsnd		130
+#define KEY_my			131
+#define KEY_ne			132
+#define KEY_next		133
+#define KEY_no			134
+#define KEY_not			135
+#define KEY_oct			136
+#define KEY_open		137
+#define KEY_opendir		138
+#define KEY_or			139
+#define KEY_ord			140
+#define KEY_pack		141
+#define KEY_package		142
+#define KEY_pipe		143
+#define KEY_pop			144
+#define KEY_pos			145
+#define KEY_print		146
+#define KEY_printf		147
+#define KEY_prototype		148
+#define KEY_push		149
+#define KEY_q			150
+#define KEY_qq			151
+#define KEY_quotemeta		152
+#define KEY_qw			153
+#define KEY_qx			154
+#define KEY_rand		155
+#define KEY_read		156
+#define KEY_readdir		157
+#define KEY_readline		158
+#define KEY_readlink		159
+#define KEY_readpipe		160
+#define KEY_recv		161
+#define KEY_redo		162
+#define KEY_ref			163
+#define KEY_rename		164
+#define KEY_require		165
+#define KEY_reset		166
+#define KEY_return		167
+#define KEY_reverse		168
+#define KEY_rewinddir		169
+#define KEY_rindex		170
+#define KEY_rmdir		171
+#define KEY_s			172
+#define KEY_scalar		173
+#define KEY_seek		174
+#define KEY_seekdir		175
+#define KEY_select		176
+#define KEY_semctl		177
+#define KEY_semget		178
+#define KEY_semop		179
+#define KEY_send		180
+#define KEY_setgrent		181
+#define KEY_sethostent		182
+#define KEY_setnetent		183
+#define KEY_setpgrp		184
+#define KEY_setpriority		185
+#define KEY_setprotoent		186
+#define KEY_setpwent		187
+#define KEY_setservent		188
+#define KEY_setsockopt		189
+#define KEY_shift		190
+#define KEY_shmctl		191
+#define KEY_shmget		192
+#define KEY_shmread		193
+#define KEY_shmwrite		194
+#define KEY_shutdown		195
+#define KEY_sin			196
+#define KEY_sleep		197
+#define KEY_socket		198
+#define KEY_socketpair		199
+#define KEY_sort		200
+#define KEY_splice		201
+#define KEY_split		202
+#define KEY_sprintf		203
+#define KEY_sqrt		204
+#define KEY_srand		205
+#define KEY_stat		206
+#define KEY_study		207
+#define KEY_sub			208
+#define KEY_substr		209
+#define KEY_symlink		210
+#define KEY_syscall		211
+#define KEY_sysopen		212
+#define KEY_sysread		213
+#define KEY_sysseek		214
+#define KEY_system		215
+#define KEY_syswrite		216
+#define KEY_tell		217
+#define KEY_telldir		218
+#define KEY_tie			219
+#define KEY_tied		220
+#define KEY_time		221
+#define KEY_times		222
+#define KEY_tr			223
+#define KEY_truncate		224
+#define KEY_uc			225
+#define KEY_ucfirst		226
+#define KEY_umask		227
+#define KEY_undef		228
+#define KEY_unless		229
+#define KEY_unlink		230
+#define KEY_unpack		231
+#define KEY_unshift		232
+#define KEY_untie		233
+#define KEY_until		234
+#define KEY_use			235
+#define KEY_utime		236
+#define KEY_values		237
+#define KEY_vec			238
+#define KEY_wait		239
+#define KEY_waitpid		240
+#define KEY_wantarray		241
+#define KEY_warn		242
+#define KEY_while		243
+#define KEY_write		244
+#define KEY_x			245
+#define KEY_xor			246
+#define KEY_y			247