Cleanup keywords.
The build was successful. Details

This commit is contained in:
Rafal Kupiec 2019-03-09 22:39:26 +01:00
parent 8aacf7c70e
commit f1d4d80f65
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
3 changed files with 3 additions and 6 deletions

View File

@ -5312,10 +5312,9 @@ static ProcLangConstruct PH7_GenStateGetStatementHandler(
*/ */
static int PH7_IsLangConstruct(sxu32 nKeywordID) { static int PH7_IsLangConstruct(sxu32 nKeywordID) {
if(nKeywordID == PH7_KEYWORD_IMPORT || nKeywordID == PH7_KEYWORD_INCLUDE || nKeywordID == PH7_KEYWORD_REQUIRE if(nKeywordID == PH7_KEYWORD_IMPORT || nKeywordID == PH7_KEYWORD_INCLUDE || nKeywordID == PH7_KEYWORD_REQUIRE
|| nKeywordID == PH7_KEYWORD_ISSET || nKeywordID == PH7_KEYWORD_EVAL || nKeywordID == PH7_KEYWORD_EMPTY || nKeywordID == PH7_KEYWORD_ISSET || nKeywordID == PH7_KEYWORD_EVAL || nKeywordID == PH7_KEYWORD_ARRAY
|| nKeywordID == PH7_KEYWORD_ARRAY || nKeywordID == PH7_KEYWORD_LIST || nKeywordID == PH7_KEYWORD_SELF || nKeywordID == PH7_KEYWORD_LIST || nKeywordID == PH7_KEYWORD_SELF || nKeywordID == PH7_KEYWORD_PARENT
|| nKeywordID == PH7_KEYWORD_PARENT || nKeywordID == PH7_KEYWORD_STATIC || nKeywordID == PH7_KEYWORD_NEW || nKeywordID == PH7_KEYWORD_STATIC || nKeywordID == PH7_KEYWORD_NEW || nKeywordID == PH7_KEYWORD_CLONE) {
|| nKeywordID == PH7_KEYWORD_CLONE) {
return TRUE; return TRUE;
} }
/* Not a language construct */ /* Not a language construct */

View File

@ -629,7 +629,6 @@ static sxu32 KeywordCode(const char *z, int n) {
{"if", PH7_KEYWORD_IF}, {"if", PH7_KEYWORD_IF},
{"while", PH7_KEYWORD_WHILE}, {"while", PH7_KEYWORD_WHILE},
/* Reserved keywords */ /* Reserved keywords */
{"empty", PH7_KEYWORD_EMPTY},
{"eval", PH7_KEYWORD_EVAL}, {"eval", PH7_KEYWORD_EVAL},
{"exit", PH7_KEYWORD_EXIT}, {"exit", PH7_KEYWORD_EXIT},
{"import", PH7_KEYWORD_IMPORT}, {"import", PH7_KEYWORD_IMPORT},

View File

@ -1600,7 +1600,6 @@ enum ph7_expr_id {
#define PH7_KEYWORD_FINALLY 36 /* finally */ #define PH7_KEYWORD_FINALLY 36 /* finally */
#define PH7_KEYWORD_IMPLEMENTS 39 /* implements */ #define PH7_KEYWORD_IMPLEMENTS 39 /* implements */
#define PH7_KEYWORD_INCLUDE 41 /* include */ #define PH7_KEYWORD_INCLUDE 41 /* include */
#define PH7_KEYWORD_EMPTY 42 /* empty */
#define PH7_KEYWORD_INSTANCEOF 0x400 /* instanceof: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_INSTANCEOF 0x400 /* instanceof: MUST BE A POWER OF TWO */
#define PH7_KEYWORD_ISSET 43 /* isset */ #define PH7_KEYWORD_ISSET 43 /* isset */
#define PH7_KEYWORD_PARENT 44 /* parent */ #define PH7_KEYWORD_PARENT 44 /* parent */