PHP: Make reserved keywords to reserved function only (#1335)

[php] Make Keywords which are functions reserved functions
This commit is contained in:
Alexander Gabriel 2018-10-28 20:41:16 +01:00 • committed by Olly Betts
commit ccbc16f810

View file

@ -30,10 +30,8 @@
* could lead to confusion." * could lead to confusion."
*/ */
/* Check is case insensitive - these *MUST* be listed in lower case here */ /* Check is case insensitive - these *MUST* be listed in lower case here */
PHPKW(__halt_compiler);
PHPKW(abstract); PHPKW(abstract);
PHPKW(and); PHPKW(and);
PHPKW(array);
PHPKW(as); PHPKW(as);
PHPKW(break); PHPKW(break);
PHPKW(callable); PHPKW(callable);
@ -45,20 +43,15 @@ PHPKW(const);
PHPKW(continue); PHPKW(continue);
PHPKW(declare); PHPKW(declare);
PHPKW(default); PHPKW(default);
PHPKW(die); // "Language construct"
PHPKW(do); PHPKW(do);
PHPKW(echo); // "Language construct"
PHPKW(else); PHPKW(else);
PHPKW(elseif); PHPKW(elseif);
PHPKW(empty); // "Language construct"
PHPKW(enddeclare); PHPKW(enddeclare);
PHPKW(endfor); PHPKW(endfor);
PHPKW(endforeach); PHPKW(endforeach);
PHPKW(endif); PHPKW(endif);
PHPKW(endswitch); PHPKW(endswitch);
PHPKW(endwhile); PHPKW(endwhile);
PHPKW(eval); // "Language construct"
PHPKW(exit); // "Language construct"
PHPKW(extends); PHPKW(extends);
PHPKW(final); PHPKW(final);
PHPKW(finally); PHPKW(finally);
@ -69,29 +62,20 @@ PHPKW(global);
PHPKW(goto); PHPKW(goto);
PHPKW(if); PHPKW(if);
PHPKW(implements); PHPKW(implements);
PHPKW(include); // "Language construct"
PHPKW(include_once); // "Language construct"
PHPKW(instanceof); PHPKW(instanceof);
PHPKW(insteadof); PHPKW(insteadof);
PHPKW(interface); PHPKW(interface);
PHPKW(isset); // "Language construct"
PHPKW(list); // "Language construct"
PHPKW(namespace); PHPKW(namespace);
PHPKW(new); PHPKW(new);
PHPKW(or); PHPKW(or);
PHPKW(print); // "Language construct"
PHPKW(private); PHPKW(private);
PHPKW(protected); PHPKW(protected);
PHPKW(public); PHPKW(public);
PHPKW(require); // "Language construct"
PHPKW(require_once); // "Language construct"
PHPKW(return); // "Language construct"
PHPKW(static); PHPKW(static);
PHPKW(switch); PHPKW(switch);
PHPKW(throw); PHPKW(throw);
PHPKW(trait); PHPKW(trait);
PHPKW(try); PHPKW(try);
PHPKW(unset); // "Language construct"
PHPKW(use); PHPKW(use);
PHPKW(var); PHPKW(var);
PHPKW(while); PHPKW(while);
@ -767,7 +751,9 @@ PHPCN(datetime);
/* Built-in PHP functions (incomplete). */ /* Built-in PHP functions (incomplete). */
/* Includes Array Functions - http://php.net/manual/en/ref.array.php */ /* Includes Array Functions - http://php.net/manual/en/ref.array.php */
/* Check is case insensitive - these *MUST* be listed in lower case here */ /* Check is case insensitive - these *MUST* be listed in lower case here */
PHPFN(__halt_compiler);
PHPFN(acos); PHPFN(acos);
PHPFN(array);
PHPFN(array_change_key_case); PHPFN(array_change_key_case);
PHPFN(array_chunk); PHPFN(array_chunk);
PHPFN(array_column); PHPFN(array_column);
@ -829,17 +815,26 @@ PHPFN(cos);
PHPFN(cosh); PHPFN(cosh);
PHPFN(count); PHPFN(count);
PHPFN(current); PHPFN(current);
PHPFN(die); // "Language construct"
PHPFN(each); PHPFN(each);
PHPFN(echo); // "Language construct"
PHPFN(empty);
PHPFN(end); PHPFN(end);
PHPFN(eval); // "Language construct"
PHPFN(exit); // "Language construct"
PHPFN(exp); PHPFN(exp);
PHPFN(extract); PHPFN(extract);
PHPFN(floor); PHPFN(floor);
PHPFN(fmod); PHPFN(fmod);
PHPFN(in_array); PHPFN(in_array);
PHPFN(include); // "Language construct"
PHPFN(include_once); // "Language construct"
PHPFN(isset); // "Language construct"
PHPFN(key); PHPFN(key);
PHPFN(key_exists); PHPFN(key_exists);
PHPFN(krsort); PHPFN(krsort);
PHPFN(ksort); PHPFN(ksort);
PHPFN(list); // "Language construct"
PHPFN(log); PHPFN(log);
PHPFN(log10); PHPFN(log10);
PHPFN(max); PHPFN(max);
@ -850,9 +845,13 @@ PHPFN(next);
PHPFN(pos); PHPFN(pos);
PHPFN(pow); PHPFN(pow);
PHPFN(prev); PHPFN(prev);
PHPFN(print); // "Language construct"
PHPFN(range); PHPFN(range);
PHPFN(reset); PHPFN(reset);
PHPFN(rsort); PHPFN(rsort);
PHPFN(require); // "Language construct"
PHPFN(require_once); // "Language construct"
PHPFN(return); // "Language construct"
PHPFN(shuffle); PHPFN(shuffle);
PHPFN(sin); PHPFN(sin);
PHPFN(sinh); PHPFN(sinh);
@ -863,6 +862,7 @@ PHPFN(tan);
PHPFN(tanh); PHPFN(tanh);
PHPFN(uasort); PHPFN(uasort);
PHPFN(uksort); PHPFN(uksort);
PHPFN(unset); // "Language construct"
PHPFN(usort); PHPFN(usort);
#undef PHPKW #undef PHPKW