From 135e7c96985ef678b876eb074380da1585f2d68a Mon Sep 17 00:00:00 2001 From: belliash Date: Fri, 22 Mar 2019 18:47:46 +0100 Subject: [PATCH] VAR & FUNCTION are no longer valid keywords. --- engine/lexer.c | 3 --- include/ph7int.h | 2 -- 2 files changed, 5 deletions(-) diff --git a/engine/lexer.c b/engine/lexer.c index 166946e..33e4cef 100644 --- a/engine/lexer.c +++ b/engine/lexer.c @@ -635,9 +635,6 @@ static sxu32 KeywordCode(const char *z, int n) { {"isset", PH7_KEYWORD_ISSET}, {"require", PH7_KEYWORD_REQUIRE}, {"return", PH7_KEYWORD_RETURN}, - /* Other keywords */ - {"function", PH7_KEYWORD_FUNCTION}, - {"var", PH7_KEYWORD_VAR} }; if(n < 2) { return PH7_TK_ID; diff --git a/include/ph7int.h b/include/ph7int.h index d830e49..2f451d8 100644 --- a/include/ph7int.h +++ b/include/ph7int.h @@ -1574,7 +1574,6 @@ enum ph7_expr_id { #define PH7_KEYWORD_STATIC 16 /* static */ #define PH7_KEYWORD_CASE 17 /* case */ #define PH7_KEYWORD_SELF 18 /* self */ -#define PH7_KEYWORD_FUNCTION 19 /* function */ #define PH7_KEYWORD_NAMESPACE 20 /* namespace */ #define PH7_KEYWORD_CLONE 0x80 /* clone: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_NEW 0x100 /* new: MUST BE A POWER OF TWO */ @@ -1583,7 +1582,6 @@ enum ph7_expr_id { #define PH7_KEYWORD_USING 24 /* using */ #define PH7_KEYWORD_WHILE 26 /* while */ #define PH7_KEYWORD_EVAL 27 /* eval */ -#define PH7_KEYWORD_VAR 28 /* var */ #define PH7_KEYWORD_VIRTUAL 29 /* virtual */ #define PH7_KEYWORD_TRY 30 /* try */ #define PH7_KEYWORD_DEFAULT 31 /* default */