summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Zend/zend_language_parser.y2
-rw-r--r--Zend/zend_language_scanner.l2
2 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index adfdd5d539..59b0262e20 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -127,6 +127,7 @@
%token T_LIST
%token T_ARRAY
%token T_CLASS_C
+%token T_METHOD_C
%token T_FUNC_C
%token T_LINE
%token T_FILE
@@ -667,6 +668,7 @@ common_scalar:
| T_LINE { $$ = $1; }
| T_FILE { $$ = $1; }
| T_CLASS_C { $$ = $1; }
+ | T_METHOD_C { $$ = $1; }
| T_FUNC_C { $$ = $1; }
;
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index fe6b17d9f9..7d3467010e 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1285,7 +1285,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
);
zendlval->value.str.len = strlen(zendlval->value.str.val);
zendlval->type = IS_STRING;
- return T_CLASS_C;
+ return T_METHOD_C;
}
<ST_IN_SCRIPTING>"__LINE__" {