Changeset 781 for trunk/Decompiler.class.php

Timestamp:

2011-04-22T14:05:08+02:00 (2 years ago)

Author:

moo

Message:

Decompiler: handle closure use()

File:

• trunk/Decompiler.class.php (modified) (5 diffs)

trunk/Decompiler.class.php

@@ -1141 +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);
-                    if (0) {
-                    if ($op2['op_type'] == XC_IS_VAR) {
-                        $resvar .= ' /* isvar */';
-                    }
-                    else if ($op2['op_type'] == XC_IS_TMP_VAR) {
-                        $resvar .= ' /* istmp */';
-                    }
-                    }
                     break;
                     // }}}
@@ -1165 +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);
@@ -1854 +1867 @@
     function duses(&$EX, $indent) // {{{
     {
-        if (!$EX['uses']) {
-            return;
-        }
-
-        $uses = array();
-        foreach ($EX['uses'] as $name => $value) {
-            $uses = '$' . $name;
-        }
-        echo ' use(', implode(', ', $uses), ')';
+        if ($EX['uses']) {
+            echo ' use(', implode(', ', $EX['uses']), ')';
+        }
     }
     // }}}
@@ -1886 +1893 @@
             $functionName = '';
         }
-        echo 'function ', $functionName, '(';
+        echo 'function', $functionName ? ' ' . $functionName : '', '(';
         $this->dargs($EX, $indent);
         echo ")";
@@ -2257 +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);