This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regcomp.c: Make sure no future ambiguity on new alpha assertions
[perl5.git]
/
keywords.c
diff --git
a/keywords.c
b/keywords.c
index
7228d4b
..
9fa30e6
100644
(file)
--- a/
keywords.c
+++ b/
keywords.c
@@
-8,12
+8,11
@@
#define PERL_IN_KEYWORDS_C
#include "perl.h"
#include "keywords.h"
#define PERL_IN_KEYWORDS_C
#include "perl.h"
#include "keywords.h"
+#include "feature.h"
I32
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
{
I32
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
{
- dVAR;
-
PERL_ARGS_ASSERT_KEYWORD;
switch (len)
PERL_ARGS_ASSERT_KEYWORD;
switch (len)
@@
-50,7
+49,7
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
goto unknown;
}
goto unknown;
}
- case 2: /* 1
8
tokens of length 2 */
+ case 2: /* 1
9
tokens of length 2 */
switch (name[0])
{
case 'd':
switch (name[0])
{
case 'd':
@@
-69,6
+68,14
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
goto unknown;
goto unknown;
+ case 'f':
+ if (name[1] == 'c')
+ { /* fc */
+ return (all_keywords || FEATURE_FC_IS_ENABLED ? -KEY_fc : 0);
+ }
+
+ goto unknown;
+
case 'g':
switch (name[1])
{
case 'g':
switch (name[1])
{
@@
-416,7
+423,7
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
case 'a':
if (name[2] == 'y')
{ /* say */
case 'a':
if (name[2] == 'y')
{ /* say */
- return (all_keywords || FEATURE_
IS_ENABLED("say")
? KEY_say : 0);
+ return (all_keywords || FEATURE_
SAY_IS_ENABLED
? KEY_say : 0);
}
goto unknown;
}
goto unknown;
@@
-481,19
+488,9
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
goto unknown;
}
goto unknown;
}
- case 4: /* 4
1
tokens of length 4 */
+ case 4: /* 4
0
tokens of length 4 */
switch (name[0])
{
switch (name[0])
{
- case 'C':
- if (name[1] == 'O' &&
- name[2] == 'R' &&
- name[3] == 'E')
- { /* CORE */
- return -KEY_CORE;
- }
-
- goto unknown;
-
case 'I':
if (name[1] == 'N' &&
name[2] == 'I' &&
case 'I':
if (name[1] == 'N' &&
name[2] == 'I' &&
@@
-940,7
+937,7
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
if (name[2] == 'e' &&
name[3] == 'n')
{ /* when */
if (name[2] == 'e' &&
name[3] == 'n')
{ /* when */
- return (all_keywords || FEATURE_
IS_ENABLED("switch")
? KEY_when : 0);
+ return (all_keywords || FEATURE_
SWITCH_IS_ENABLED
? KEY_when : 0);
}
goto unknown;
}
goto unknown;
@@
-1023,7
+1020,7
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
name[3] == 'a' &&
name[4] == 'k')
{ /* break */
name[3] == 'a' &&
name[4] == 'k')
{ /* break */
- return (all_keywords || FEATURE_
IS_ENABLED("switch")
? -KEY_break : 0);
+ return (all_keywords || FEATURE_
SWITCH_IS_ENABLED
? -KEY_break : 0);
}
goto unknown;
}
goto unknown;
@@
-1151,7
+1148,7
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
name[3] == 'e' &&
name[4] == 'n')
{ /* given */
name[3] == 'e' &&
name[4] == 'n')
{ /* given */
- return (all_keywords || FEATURE_
IS_ENABLED("switch")
? KEY_given : 0);
+ return (all_keywords || FEATURE_
SWITCH_IS_ENABLED
? KEY_given : 0);
}
goto unknown;
}
goto unknown;
@@
-1319,7
+1316,7
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
if (name[3] == 't' &&
name[4] == 'e')
{ /* state */
if (name[3] == 't' &&
name[4] == 'e')
{ /* state */
- return (all_keywords || FEATURE_
IS_ENABLED("state")
? KEY_state : 0);
+ return (all_keywords || FEATURE_
STATE_IS_ENABLED
? KEY_state : 0);
}
goto unknown;
}
goto unknown;
@@
-1906,7
+1903,7
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
goto unknown;
}
goto unknown;
}
- case 7: /*
29
tokens of length 7 */
+ case 7: /*
30
tokens of length 7 */
switch (name[0])
{
case 'D':
switch (name[0])
{
case 'D':
@@
-1923,14
+1920,35
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
goto unknown;
case '_':
goto unknown;
case '_':
- if (name[1] == '_' &&
- name[2] == 'E' &&
- name[3] == 'N' &&
- name[4] == 'D' &&
- name[5] == '_' &&
- name[6] == '_')
- { /* __END__ */
- return KEY___END__;
+ if (name[1] == '_')
+ {
+ switch (name[2])
+ {
+ case 'E':
+ if (name[3] == 'N' &&
+ name[4] == 'D' &&
+ name[5] == '_' &&
+ name[6] == '_')
+ { /* __END__ */
+ return KEY___END__;
+ }
+
+ goto unknown;
+
+ case 'S':
+ if (name[3] == 'U' &&
+ name[4] == 'B' &&
+ name[5] == '_' &&
+ name[6] == '_')
+ { /* __SUB__ */
+ return (all_keywords || FEATURE___SUB___IS_ENABLED ? -KEY___SUB__ : 0);
+ }
+
+ goto unknown;
+
+ default:
+ goto unknown;
+ }
}
goto unknown;
}
goto unknown;
@@
-1986,7
+2004,7
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
name[5] == 'l' &&
name[6] == 't')
{ /* default */
name[5] == 'l' &&
name[6] == 't')
{ /* default */
- return (all_keywords || FEATURE_
IS_ENABLED("switch")
? KEY_default : 0);
+ return (all_keywords || FEATURE_
SWITCH_IS_ENABLED
? KEY_default : 0);
}
goto unknown;
}
goto unknown;
@@
-2740,7
+2758,7
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
goto unknown;
}
goto unknown;
}
- case 9: /*
9
tokens of length 9 */
+ case 9: /*
10
tokens of length 9 */
switch (name[0])
{
case 'U':
switch (name[0])
{
case 'U':
@@
-2759,19
+2777,39
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
goto unknown;
case 'e':
goto unknown;
case 'e':
- if (name[1] == 'n' &&
- name[2] == 'd' &&
- name[3] == 'n' &&
- name[4] == 'e' &&
- name[5] == 't' &&
- name[6] == 'e' &&
- name[7] == 'n' &&
- name[8] == 't')
- { /* endnetent */
- return -KEY_endnetent;
- }
+ switch (name[1])
+ {
+ case 'n':
+ if (name[2] == 'd' &&
+ name[3] == 'n' &&
+ name[4] == 'e' &&
+ name[5] == 't' &&
+ name[6] == 'e' &&
+ name[7] == 'n' &&
+ name[8] == 't')
+ { /* endnetent */
+ return -KEY_endnetent;
+ }
- goto unknown;
+ goto unknown;
+
+ case 'v':
+ if (name[2] == 'a' &&
+ name[3] == 'l' &&
+ name[4] == 'b' &&
+ name[5] == 'y' &&
+ name[6] == 't' &&
+ name[7] == 'e' &&
+ name[8] == 's')
+ { /* evalbytes */
+ return (all_keywords || FEATURE_EVALBYTES_IS_ENABLED ? -KEY_evalbytes : 0);
+ }
+
+ goto unknown;
+
+ default:
+ goto unknown;
+ }
case 'g':
if (name[1] == 'e' &&
case 'g':
if (name[1] == 'e' &&
@@
-3399,5
+3437,5
@@
unknown:
}
/* Generated from:
}
/* Generated from:
- *
71ce7e36f80b1103f4a197ed423fe2dbd92fd9f619e126bfcf9f0b0153586bab
regen/keywords.pl
+ *
db0472e0ad4f44bd0816cad799d63b60d1bbd7e11cef40ea15bf0d00f69669f6
regen/keywords.pl
* ex: set ro: */
* ex: set ro: */