use defined macro

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 65995f0f35a23f7a6134b5a8db1566089251d410..8db317915df83526a1e0cc904e4a74666038e526 100644 (file)
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1344,7 +1344,7 @@ yy7:
        {
        if (CG(short_tags)) {
                BEGIN(ST_IN_SCRIPTING);
-               if (EXPECTED(elem != NULL)) {
+               if (PARSER_MODE()) {
                        SKIP_TOKEN(T_OPEN_TAG);
                }
                RETURN_TOKEN(T_OPEN_TAG);
@@ -1401,7 +1401,7 @@ yy15:
        {
        HANDLE_NEWLINE(yytext[yyleng-1]);
        BEGIN(ST_IN_SCRIPTING);
-       if (EXPECTED(elem != NULL)) {
+       if (PARSER_MODE()) {
                SKIP_TOKEN(T_OPEN_TAG);
        }
        RETURN_TOKEN(T_OPEN_TAG);
@@ -2445,7 +2445,7 @@ yy96:
 
        yyleng = YYCURSOR - SCNG(yy_text);
 
-       if (EXPECTED(elem != NULL)) {
+       if (PARSER_MODE()) {
                SKIP_TOKEN(T_COMMENT);
        }
        RETURN_TOKEN(T_COMMENT);
@@ -3522,13 +3522,13 @@ yy197:
 
        if (doc_com) {
                CG(doc_comment) = zend_string_init(yytext, yyleng, 0);
-               if (EXPECTED(elem != NULL)) {
+               if (PARSER_MODE()) {
                        SKIP_TOKEN(T_DOC_COMMENT);
                }
                RETURN_TOKEN(T_DOC_COMMENT);
        }
 
-       if (EXPECTED(elem != NULL)) {
+       if (PARSER_MODE()) {
                SKIP_TOKEN(T_COMMENT);
        }
        RETURN_TOKEN(T_COMMENT);

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index e1182d25e09cb62e33c2d5e3d421226d2378b101..78ae5f1d56eb771089246589195c0507d95085a6 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1916,7 +1916,7 @@ string:
 <INITIAL>"<?php"([ \t]|{NEWLINE}) {
        HANDLE_NEWLINE(yytext[yyleng-1]);
        BEGIN(ST_IN_SCRIPTING);
-       if (EXPECTED(elem != NULL)) {
+       if (PARSER_MODE()) {
                SKIP_TOKEN(T_OPEN_TAG);
        }
        RETURN_TOKEN(T_OPEN_TAG);
@@ -1926,7 +1926,7 @@ string:
 <INITIAL>"<?" {
        if (CG(short_tags)) {
                BEGIN(ST_IN_SCRIPTING);
-               if (EXPECTED(elem != NULL)) {
+               if (PARSER_MODE()) {
                        SKIP_TOKEN(T_OPEN_TAG);
                }
                RETURN_TOKEN(T_OPEN_TAG);
@@ -2053,7 +2053,7 @@ inline_char_handler:
 
        yyleng = YYCURSOR - SCNG(yy_text);
 
-       if (EXPECTED(elem != NULL)) {
+       if (PARSER_MODE()) {
                SKIP_TOKEN(T_COMMENT);
        }
        RETURN_TOKEN(T_COMMENT);
@@ -2086,13 +2086,13 @@ inline_char_handler:
 
        if (doc_com) {
                CG(doc_comment) = zend_string_init(yytext, yyleng, 0);
-               if (EXPECTED(elem != NULL)) {
+               if (PARSER_MODE()) {
                        SKIP_TOKEN(T_DOC_COMMENT);
                }
                RETURN_TOKEN(T_DOC_COMMENT);
        }
 
-       if (EXPECTED(elem != NULL)) {
+       if (PARSER_MODE()) {
                SKIP_TOKEN(T_COMMENT);
        }
        RETURN_TOKEN(T_COMMENT);