Changeset 735 for trunk/Decompiler.class.php

Timestamp:

04/10/2011 04:09:17 PM (2 years ago)

Author:

moo

Message:

decompiler: fix array assoc handling, remove default return

Files:

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

trunk/Decompiler.class.php

@@ -252 +252 @@
         $exp = "array(";
         $indent = $indent . INDENT;
-        $assoclen = 0;
+        $assocWidth = 0;
         $multiline = 0;
         $i = 0;
         foreach ($this->value as $k => $v) {
             if ($i !== $k) {
+                $assocWidth = 1;
+            }
+            ++$i;
+        }
+        foreach ($this->value as $k => $v) {
+            if ($assocWidth) {
                 $len = strlen($k);
-                if ($assoclen < $len) {
-                    $assoclen = $len;
+                if ($assocWidth < $len) {
+                    $assocWidth = $len;
                 }
             }
@@ -266 +272 @@
                 $multiline ++;
             }
-            ++ $i;
-        }
-        if ($assoclen) {
-            $assoclen += 2;
+        }
+        if ($assocWidth) {
+            $assocWidth += 2;
         }
 
@@ -289 +294 @@
 
             $k = var_export($k, true);
-            if ($multiline) {
-                $exp .= sprintf("%{$assoclen}s => ", $k);
-            }
-            else if ($assoclen) {
-                $exp .= $k . ' => ';
+            if ($assocWidth) {
+                if ($multiline) {
+                    $exp .= sprintf("%{$assocWidth}s => ", $k);
+                }
+                else {
+                    $exp .= $k . ' => ';
+                }
             }
 
@@ -447 +454 @@
     }
     // }}}
-    function &fixOpcode($opcodes, $removeTailing = false) // {{{
-    {
-        if ($removeTailing) {
-            $last = count($opcodes) - 1;
-            if ($opcodes[$last]['opcode'] == XC_HANDLE_EXCEPTION) {
-                unset($opcodes[$last]);
-            }
-        }
+    function &fixOpcode($opcodes, $removeTailing = false, $defaultReturnValue = null) // {{{
+    {
         for ($i = 0, $cnt = count($opcodes); $i < $cnt; $i ++) {
             if (function_exists('xcache_get_fixed_opcode')) {
@@ -486 +487 @@
             }
         }
+
+        if ($removeTailing) {
+            $last = count($opcodes) - 1;
+            if ($opcodes[$last]['opcode'] == XC_HANDLE_EXCEPTION) {
+                unset($opcodes[$last]);
+                --$last;
+            }
+            if ($opcodes[$last]['opcode'] == XC_RETURN) {
+                $op1 = $opcodes[$last]['op1'];
+                if ($op1['op_type'] == XC_IS_CONST && array_key_exists('constant', $op1) && $op1['constant'] === $defaultReturnValue) {
+                    unset($opcodes[$last]);
+                    --$last;
+                }
+            }
+        }
         return $opcodes;
     }
@@ -491 +507 @@
     function &dop_array($op_array, $indent = '') // {{{
     {
-        $op_array['opcodes'] = $this->fixOpcode($op_array['opcodes'], true);
+        $op_array['opcodes'] = $this->fixOpcode($op_array['opcodes'], true, $indent == '' ? 1 : null);
         $opcodes = &$op_array['opcodes'];
         $EX['indent'] = '';