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
Update perlhist for Perl 5.19.4
[perl5.git]
/
keywords.c
diff --git
a/keywords.c
b/keywords.c
index
a37752f
..
23d550d
100644
(file)
--- a/
keywords.c
+++ b/
keywords.c
@@
-8,6
+8,7
@@
#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)
@@
-50,7
+51,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
+70,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
+425,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;
@@
-940,7
+949,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
+1032,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
+1160,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
+1328,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;
@@
-1944,7
+1953,7
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
name[5] == '_' &&
name[6] == '_')
{ /* __SUB__ */
name[5] == '_' &&
name[6] == '_')
{ /* __SUB__ */
- return (all_keywords || FEATURE_
IS_ENABLED("__SUB__")
? -KEY___SUB__ : 0);
+ return (all_keywords || FEATURE_
__SUB___IS_ENABLED
? -KEY___SUB__ : 0);
}
goto unknown;
}
goto unknown;
@@
-2007,7
+2016,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;
@@
-2805,7
+2814,7
@@
Perl_keyword (pTHX_ const char *name, I32 len, bool all_keywords)
name[7] == 'e' &&
name[8] == 's')
{ /* evalbytes */
name[7] == 'e' &&
name[8] == 's')
{ /* evalbytes */
- return (all_keywords || FEATURE_
IS_ENABLED("evalbytes")
? -KEY_evalbytes : 0);
+ return (all_keywords || FEATURE_
EVALBYTES_IS_ENABLED
? -KEY_evalbytes : 0);
}
goto unknown;
}
goto unknown;
@@
-3440,5
+3449,5
@@
unknown:
}
/* Generated from:
}
/* Generated from:
- *
76ce12941a02bdb120222155311eb8772ba4a4e8965a42ba347a077cac5b426e
regen/keywords.pl
+ *
e5a540774760ea54c761ef17ee4a153cc264e9a700b817d561e390730c457406
regen/keywords.pl
* ex: set ro: */
* ex: set ro: */