Fix bug #55445 (Incomplete implementation of <?= being independant of short_open_tag)

diff --git a/Zend/tests/bug55445.phpt b/Zend/tests/bug55445.phpt
new file mode 100644 (file)
index 0000000..0f36ac5
--- /dev/null
+++ b/Zend/tests/bug55445.phpt
@@ -0,0 +1,8 @@
+--TEST--
+Bug #55445 (Lexer error with short open tags)
+--INI--
+short_open_tag=0
+--FILE--
+<?php $u = "chris"; ?><p>Welcome <?= $u ?></p>
+--EXPECTF--
+<p>Welcome chris</p>

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 3678dd0d63fda9069825e8ecc585d8fd2b796e0f..acc42455c2e1e37811daa490d90c0f9094174b6e 100644 (file)
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Aug 16 10:45:19 2011 */
+/* Generated by re2c 0.13.5 on Thu Aug 18 01:36:01 2011 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -1099,7 +1099,7 @@ inline_char_handler:
                if (YYCURSOR < YYLIMIT) {
                        switch (*YYCURSOR) {
                                case '?':
-                                       if (CG(short_tags) || !strncasecmp(YYCURSOR + 1, "php", 3)) { /* Assume [ \t\n\r] follows "php" */
+                                       if (CG(short_tags) || !strncasecmp(YYCURSOR + 1, "php", 3) || (*(YYCURSOR + 1) == '=')) { /* Assume [ \t\n\r] follows "php" */
                                                break;
                                        }
                                        continue;

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 0e3583472f79eb43def689b07c5e7e0b34ecb51d..827b7bf3d72816903f20334db7037fc58b4b9b0a 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1780,7 +1780,7 @@ inline_char_handler:
                if (YYCURSOR < YYLIMIT) {
                        switch (*YYCURSOR) {
                                case '?':
-                                       if (CG(short_tags) || !strncasecmp(YYCURSOR + 1, "php", 3)) { /* Assume [ \t\n\r] follows "php" */
+                                       if (CG(short_tags) || !strncasecmp(YYCURSOR + 1, "php", 3) || (*(YYCURSOR + 1) == '=')) { /* Assume [ \t\n\r] follows "php" */
                                                break;
                                        }
                                        continue;

diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h
index 1fbeabfc9d9df993c4dca1f1af116720ad6c9b66..3a8e30a0271a6f89d2b5aab85e9ee23523caf955 100644 (file)
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Jul 31 20:09:48 2011 */
+/* Generated by re2c 0.13.5 on Thu Aug 18 01:36:01 2011 */
 #line 3 "Zend/zend_language_scanner_defs.h"
 
 enum YYCONDTYPE {