svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/zend_language_scanner.l trunk/Zend/zend_language_scanner.l

rasmus Thu, 19 May 2011 16:26:29 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=311260 Log: Decouple <?= from the short_tags setting and make it always enabled Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l U php/php-src/trunk/Zend/zend_language_scanner.l Modified: php/php-src/branches/PHP_5_4/NEWS =================================================================== --- php/php-src/branches/PHP_5_4/NEWS 2011-05-19 16:07:49 UTC (rev 311259) +++ php/php-src/branches/PHP_5_4/NEWS 2011-05-19 16:26:29 UTC (rev 311260) @@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 201?, PHP 5.3.99 +?? ??? 201?, PHP 5.4.0 - Upgraded bundled Sqlite3 to version 3.7.4. (Ilia) - Upgraded bundled PCRE to version 8.10. (Ilia) @@ -29,6 +29,7 @@ - Changed third parameter of preg_match_all() to optional. FR #53238. (Adam) - Changed silent casting of null/''/false into an Object when adding a property into a warning. (Scott) +- <?= is now always available regardless of the short_tags setting (Rasmus) - General improvements: . Added multibyte support by default. Previously php had to be compiled Modified: php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l =================================================================== --- php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l 2011-05-19 16:07:49 UTC (rev 311259) +++ php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l 2011-05-19 16:26:29 UTC (rev 311260) @@ -1668,15 +1668,11 @@ <INITIAL>"<?=" { - if (CG(short_tags)) { - zendlval->value.str.val = yytext; /* no copying - intentional */ - zendlval->value.str.len = yyleng; - zendlval->type = IS_STRING; - BEGIN(ST_IN_SCRIPTING); - return T_OPEN_TAG_WITH_ECHO; - } else { - goto inline_char_handler; - } + zendlval->value.str.val = yytext; /* no copying - intentional */ + zendlval->value.str.len = yyleng; + zendlval->type = IS_STRING; + BEGIN(ST_IN_SCRIPTING); + return T_OPEN_TAG_WITH_ECHO; } Modified: php/php-src/trunk/Zend/zend_language_scanner.l =================================================================== --- php/php-src/trunk/Zend/zend_language_scanner.l 2011-05-19 16:07:49 UTC (rev 311259) +++ php/php-src/trunk/Zend/zend_language_scanner.l 2011-05-19 16:26:29 UTC (rev 311260) @@ -1668,15 +1668,11 @@ <INITIAL>"<?=" { - if (CG(short_tags)) { - zendlval->value.str.val = yytext; /* no copying - intentional */ - zendlval->value.str.len = yyleng; - zendlval->type = IS_STRING; - BEGIN(ST_IN_SCRIPTING); - return T_OPEN_TAG_WITH_ECHO; - } else { - goto inline_char_handler; - } + zendlval->value.str.val = yytext; /* no copying - intentional */ + zendlval->value.str.len = yyleng; + zendlval->type = IS_STRING; + BEGIN(ST_IN_SCRIPTING); + return T_OPEN_TAG_WITH_ECHO; }