beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Better consecutive echo handling

Browse source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1020 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2009-08-26 12:36:59 +00:00
parent e2e5123bb8
commit dbf95669b5
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
compile.php
View file

@ -103,20 +103,19 @@ function php_shrink($input) {
if (!is_array($token)) { if (!is_array($token)) {
$token = array(0, $token); $token = array(0, $token);
} }
if ($tokens[$i+2][0] === T_CLOSE_TAG && $tokens[$i+3][0] === T_INLINE_HTML && $tokens[$i+4][0] === T_OPEN_TAG
&& strlen(addcslashes($tokens[$i+3][1], "'\\")) < strlen($tokens[$i+3][1]) + 3
) {
$tokens[$i+2] = array(T_ECHO, 'echo');
$tokens[$i+3] = array(T_CONSTANT_ENCAPSED_STRING, "'" . addcslashes($tokens[$i+3][1], "'\\") . "'");
$tokens[$i+4] = array(0, ';');
}
if ($token[0] == T_COMMENT || $token[0] == T_WHITESPACE || ($token[0] == T_DOC_COMMENT && $doc_comment)) { if ($token[0] == T_COMMENT || $token[0] == T_WHITESPACE || ($token[0] == T_DOC_COMMENT && $doc_comment)) {
$space = "\n"; $space = "\n";
} else { } else {
if ($token[0] == T_DOC_COMMENT) { if ($token[0] == T_DOC_COMMENT) {
$doc_comment = true; $doc_comment = true;
} }
if ($token[0] == T_CLOSE_TAG && $tokens[$i+1][0] == T_INLINE_HTML && $tokens[$i+2][0] == T_OPEN_TAG
&& strlen(addcslashes($tokens[$i+1][1], "'\\")) < strlen($tokens[$i+1][1]) + 4
) {
$tokens[$i] = array(T_ECHO, 'echo');
$tokens[$i+1] = array(T_CONSTANT_ENCAPSED_STRING, "'" . addcslashes($tokens[$i+1][1], "'\\") . "'");
$tokens[$i+2] = array(0, ';');
$token = $tokens[$i];
}
if ($token[0] == T_VAR) { if ($token[0] == T_VAR) {
$shortening = false; $shortening = false;
} elseif (!$shortening) { } elseif (!$shortening) {
@ -126,8 +125,7 @@ function php_shrink($input) {
} elseif ($token[0] == T_ECHO) { } elseif ($token[0] == T_ECHO) {
$in_echo = true; $in_echo = true;
} elseif ($token[1] == ';' && $in_echo) { } elseif ($token[1] == ';' && $in_echo) {
$in_echo = false; if (in_array($tokens[$i+1][0], array(T_WHITESPACE, T_COMMENT)) && $tokens[$i+2][0] === T_ECHO) {
if ($tokens[$i+1][0] === T_WHITESPACE && $tokens[$i+2][0] === T_ECHO) {
next($tokens); next($tokens);
$i++; $i++;
} }
@ -135,6 +133,8 @@ function php_shrink($input) {
// join two consecutive echos // join two consecutive echos
next($tokens); next($tokens);
$token[1] = '.'; //! join ''.'' and ""."" $token[1] = '.'; //! join ''.'' and "".""
} else {
$in_echo = false;
} }
} elseif ($token[0] === T_VARIABLE && !isset($special_variables[$token[1]])) { } elseif ($token[0] === T_VARIABLE && !isset($special_variables[$token[1]])) {
$token[1] = '$' . $short_variables[$token[1]]; $token[1] = '$' . $short_variables[$token[1]];