From d0840d7eeacbdedb851ab8d411e87207133c55f4 Mon Sep 17 00:00:00 2001 From: belliash Date: Mon, 3 Jun 2019 12:31:28 +0200 Subject: [PATCH] Cleanup after switching from 'parent' constant to '$parent' variable. --- engine/compiler.c | 4 ++-- engine/lexer.c | 1 - include/ph7int.h | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/engine/compiler.c b/engine/compiler.c index 5505b49..4a20ece 100644 --- a/engine/compiler.c +++ b/engine/compiler.c @@ -4878,8 +4878,8 @@ static ProcLangConstruct PH7_GenStateGetStatementHandler( */ static int PH7_IsLangConstruct(sxu32 nKeywordID) { if(nKeywordID == PH7_KEYWORD_IMPORT || nKeywordID == PH7_KEYWORD_INCLUDE || nKeywordID == PH7_KEYWORD_REQUIRE - || nKeywordID == PH7_KEYWORD_EVAL || nKeywordID == PH7_KEYWORD_PARENT - || nKeywordID == PH7_KEYWORD_STATIC || nKeywordID == PH7_KEYWORD_NEW || nKeywordID == PH7_KEYWORD_CLONE) { + || nKeywordID == PH7_KEYWORD_EVAL || nKeywordID == PH7_KEYWORD_STATIC + || nKeywordID == PH7_KEYWORD_NEW || nKeywordID == PH7_KEYWORD_CLONE) { return TRUE; } /* Not a language construct */ diff --git a/engine/lexer.c b/engine/lexer.c index 022d64f..61951fc 100644 --- a/engine/lexer.c +++ b/engine/lexer.c @@ -532,7 +532,6 @@ static sxu32 KeywordCode(const char *z, int n) { {"interface", PH7_KEYWORD_INTERFACE}, {"namespace", PH7_KEYWORD_NAMESPACE}, {"new", PH7_KEYWORD_NEW}, - {"parent", PH7_KEYWORD_PARENT}, {"throw", PH7_KEYWORD_THROW}, {"try", PH7_KEYWORD_TRY}, {"using", PH7_KEYWORD_USING}, diff --git a/include/ph7int.h b/include/ph7int.h index 25ccd56..3046145 100644 --- a/include/ph7int.h +++ b/include/ph7int.h @@ -1589,7 +1589,6 @@ enum ph7_expr_id { #define PH7_KEYWORD_IMPLEMENTS 39 /* implements */ #define PH7_KEYWORD_INCLUDE 41 /* include */ #define PH7_KEYWORD_INSTANCEOF 0x400 /* instanceof: MUST BE A POWER OF TWO */ -#define PH7_KEYWORD_PARENT 44 /* parent */ #define PH7_KEYWORD_PRIVATE 45 /* private */ #define PH7_KEYWORD_FOR 48 /* for */ #define PH7_KEYWORD_FOREACH 49 /* foreach */