diff options
| -rw-r--r-- | Zend/zend_language_parser.y | 6 | ||||
| -rw-r--r-- | Zend/zend_language_scanner.l | 16 |
2 files changed, 22 insertions, 0 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 6d85f8be7a..257849fd26 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -142,6 +142,9 @@ %token T_DOLLAR_OPEN_CURLY_BRACES %token T_CURLY_OPEN %token T_PAAMAYIM_NEKUDOTAYIM +%token T_NULL +%token T_FALSE +%token T_TRUE %% /* Rules */ @@ -675,6 +678,9 @@ common_scalar: | T_CLASS_C { $$ = $1; } | T_METHOD_C { $$ = $1; } | T_FUNC_C { $$ = $1; } + | T_NULL { $$ = $1; } + | T_FALSE { $$ = $1; } + | T_TRUE { $$ = $1; } ; diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index e6efbcc827..00deccd731 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -57,6 +57,7 @@ #include "zend_constants.h" #include "zend_variables.h" #include "zend_operators.h" +#include "zend_API.h" #ifdef HAVE_STDARG_H # include <stdarg.h> @@ -1303,6 +1304,21 @@ NEWLINE ("\r"|"\n"|"\r\n") return T_FILE; } +<ST_IN_SCRIPTING>"NULL" { + ZVAL_NULL(zendlval); + return T_NULL; +} + +<ST_IN_SCRIPTING>"FALSE" { + ZVAL_FALSE(zendlval); + return T_FALSE; +} + +<ST_IN_SCRIPTING>"TRUE" { + ZVAL_TRUE(zendlval); + return T_TRUE; +} + <INITIAL>(([^<]|"<"[^?%s<]){1,400})|"<s"|"<" { #ifdef ZEND_MULTIBYTE if (SCNG(output_filter)) { |