Changeset 784 for branches/1.3/Decompiler.class.php

Timestamp:

2011-04-22T17:18:42+02:00 (2 years ago)

Author:

moo

Message:

merge from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• Decompiler.class.php (modified) (10 diffs)

branches/1.3/Decompiler.class.php

@@ -737 +737 @@
         $EX['last'] = count($opcodes) - 1;
         $EX['silence'] = 0;
+        $EX['recvs'] = array();
+        $EX['uses'] = array();
 
         for ($next = 0, $last = $EX['last'];
@@ -1139 +1141 @@
                         break;
                     }
+                    if (is_a($rvalue, 'Decompiler_Fetch')) {
+                        $src = str($rvalue->src, $EX);
+                        if ('$' . unquoteName($src) == $lvalue) {
+                            switch ($rvalue->fetchType) {
+                            case ZEND_FETCH_STATIC:
+                                $statics = &$EX['op_array']['static_variables'];
+                                if ((xcache_get_type($statics[$name]) & IS_LEXICAL_VAR)) {
+                                    $EX['uses'][] = str($lvalue);
+                                    unset($statics);
+                                    break 2;
+                                }
+                                unset($statics);
+                            }
+                        }
+                    }
                     $resvar = "$lvalue = " . str($rvalue, $EX);
                     break;
@@ -1155 +1172 @@
                             case ZEND_FETCH_STATIC:
                                 $statics = &$EX['op_array']['static_variables'];
+                                if ((xcache_get_type($statics[$name]) & IS_LEXICAL_REF)) {
+                                    $EX['uses'][] = '&' . str($lvalue);
+                                    unset($statics);
+                                    break 2;
+                                }
+
                                 $resvar = 'static ' . $lvalue;
                                 $name = unquoteName($src);
@@ -1203 +1226 @@
                     if ($opc == XC_ISSET_ISEMPTY_VAR) {
                         $rvalue = $this->getOpVal($op1, $EX);
+                        // for < PHP_5_3
+                        if ($op1['op_type'] == XC_IS_CONST) {
+                            $rvalue = '$' . unquoteVariableName($this->getOpVal($op1, $EX));
+                        }
                         if ($op2['EA.type'] == ZEND_FETCH_STATIC_MEMBER) {
                             $class = $this->getOpVal($op2, $EX);
@@ -1227 +1254 @@
                     switch ((!ZEND_ENGINE_2 ? $op['op2']['var'] /* constant */ : $ext) & (ZEND_ISSET|ZEND_ISEMPTY)) {
                     case ZEND_ISSET:
-                        $rvalue = "isset($rvalue)";
+                        $rvalue = "isset(" . str($rvalue) . ")";
                         break;
                     case ZEND_ISEMPTY:
-                        $rvalue = "empty($rvalue)";
+                        $rvalue = "empty(" . str($rvalue) . ")";
                         break;
                     }
@@ -1838 +1865 @@
     }
     // }}}
+    function duses(&$EX, $indent) // {{{
+    {
+        if ($EX['uses']) {
+            echo ' use(', implode(', ', $EX['uses']), ')';
+        }
+    }
+    // }}}
     function dfunction($func, $indent = '', $nobody = false) // {{{
     {
@@ -1846 +1880 @@
             $EX['op_array'] = &$func['op_array'];
             $EX['recvs'] = array();
+            $EX['uses'] = array();
         }
         else {
@@ -1852 +1887 @@
             $EX = &$this->dop_array($func['op_array'], $newindent);
             $body = ob_get_clean();
-            if (!isset($EX['recvs'])) {
-                $EX['recvs'] = array();
-            }
         }
 
@@ -1861 +1893 @@
             $functionName = '';
         }
-        echo 'function ', $functionName, '(';
+        echo 'function', $functionName ? ' ' . $functionName : '', '(';
         $this->dargs($EX, $indent);
         echo ")";
+        $this->duses($EX, $indent);
         if ($nobody) {
             echo ";\n";
@@ -2231 +2264 @@
 define('IS_CONSTANT', 8);
 define('IS_CONSTANT_ARRAY',   9);
+/* Ugly hack to support constants as static array indices */
+define('IS_CONSTANT_TYPE_MASK',   0x0f);
+define('IS_CONSTANT_UNQUALIFIED', 0x10);
+define('IS_CONSTANT_INDEX',       0x80);
+define('IS_LEXICAL_VAR',          0x20);
+define('IS_LEXICAL_REF',          0x40);
 
 @define('XC_IS_CV', 16);