Changeset 730 for trunk/Decompiler.class.php

Timestamp:

04/10/2011 09:58:58 AM (2 years ago)

Author:

moo

Message:

PHP_6: disassembler/decompiler: fix property

Files:

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

trunk/Decompiler.class.php

@@ -1670 +1670 @@
         // }}}
         // {{{ properties
-        if (!empty($class['default_properties']) || !empty($class['default_static_members'])) {
+        $member_variables = isset($class['properties_info']) ? $class['properties_info'] : ($class['default_static_members'] + $class['default_properties']);
+        if ($member_variables) {
             echo "\n";
             $infos = !empty($class['properties_info']) ? $class['properties_info'] : null;
-            foreach (!empty($class['properties_info']) ? $class['properties_info'] : ($class['default_static_members'] + $class['default_properties']) as $name => $dummy) {
+            foreach ($member_variables as $name => $dummy) {
                 $info = (isset($infos) && isset($infos[$name])) ? $infos[$name] : null;
                 if (isset($info)) {
@@ -1726 +1727 @@
                 echo '$', $name;
 
-                $key = isset($info) ? $info['name'] . ($mangled ? "\000" : "") : $name;
-
-                $value = $class[$static ? 'default_static_members' : 'default_properties'][$key];
+                if (isset($info['offset'])) {
+                    $value = $class[$static ? 'default_static_members_table' : 'default_properties_table'][$info['offset']];
+                }
+                else {
+                    $key = isset($info) ? $info['name'] . ($mangled ? "\000" : "") : $name;
+
+                    $value = $class[$static ? 'default_static_members' : 'default_properties'][$key];
+                }
                 if (isset($value)) {
                     echo ' = ';