Changeset 713

Timestamp:

2011-04-08T20:27:55+02:00 (2 years ago)

Author:

moo

Message:

disassembler: refix previous partial

Location:

trunk

Files:

• Decompiler.class.php (modified) (10 diffs)
• processor/processor.m4 (modified) (1 diff)
• xcache.c (modified) (1 diff)

trunk/Decompiler.class.php

@@ -29 +29 @@
     if (is_array($src)) {
         die_error('array str');
-        $src = new Decompiler_Array($src, false, $indent);
+        $src = new Decompiler_Array($src, $indent);
         return $src->__toString();
     }
@@ -38 +38 @@
             die_error('no __toString');
         }
-        return $src->__toString($indent);
+        return $src->__toString();
     }
 
@@ -56 +56 @@
 
     if (is_array($value)) {
-        $value = new Decompiler_Array($value, true);
+        $value = new Decompiler_Array($value);
     }
     else {
-        $value = new Decompiler_Value($value, true);
+        $value = new Decompiler_Value($value);
     }
     return $value;
@@ -257 +257 @@
 class Decompiler_Array extends Decompiler_Value // {{{
 {
-    var $needExport = false;
     var $indent = '';
 
-    function Decompiler_Array($value = array(), $needexport = false, $indent = '')
+    function Decompiler_Array($value = array(), $indent = '')
     {
         $this->value = $value;
-        $this->needExport = $needexport;
         $this->indent = $indent;
     }
@@ -286 +284 @@
             ++ $i;
         }
-        if ($assoclen && $this->needExport) {
+        if ($assoclen) {
             $assoclen += 2;
         }
@@ -306 +304 @@
             }
 
-            if ($this->needExport) {
-                $k = var_export($k, true);
-            }
+            $k = var_export($k, true);
             if ($multiline) {
                 $exp .= sprintf("%{$assoclen}s => ", $k);
@@ -316 +312 @@
             }
 
-            if (is_array($v)) {
-                $v = new Decompiler_Array($v, $this->needExport);
-            }
-            $exp .= str($v, $subindent);
+            $exp .= str(value($v), $subindent);
 
             $i ++;
@@ -1608 +1601 @@
         if (!empty($class['default_properties'])) {
             echo "\n";
-            $infos = empty($class['properties_info']) ? null : $class['properties_info'];
-            foreach ($class['default_properties'] as $name => $v) {
+            $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) {
                 $info = (isset($infos) && isset($infos[$name])) ? $infos[$name] : null;
                 if (isset($info)) {
@@ -1620 +1613 @@
 
                 echo $newindent;
+                $static = false;
+                if (isset($info)) {
+                    if ($info['flags'] & ZEND_ACC_STATIC) {
+                        $static = true;
+                    }
+                }
+                else if (isset($class['default_static_members'][$name])) {
+                    $static = true;
+                }
+
+                if ($static) {
+                    echo "static ";
+                }
+
+                $mangled = false;
                 if (PHP_VERSION < 5) {
                     echo 'var ';
@@ -1636 +1644 @@
                     case ZEND_ACC_PRIVATE:
                         echo "private ";
+                        $mangled = true;
                         break;
                     case ZEND_ACC_PROTECTED:
                         echo "protected ";
+                        $mangled = true;
                         break;
                     }
-                    if ($info['flags'] & ZEND_ACC_STATIC) {
-                        echo "static ";
-                    }
                 }
 
                 echo '$', $name;
-                if (isset($v)) {
+
+                $key = isset($info) ? $info['name'] . ($mangled ? "\000" : "") : $name;
+
+                $value = $class[$static ? 'default_static_members' : 'default_properties'][$key];
+                if (isset($value)) {
                     echo ' = ';
-                    echo str(value($v));
+                    echo str(value($value));
                 }
                 echo ";\n";

trunk/processor/processor.m4

@@ -75 +75 @@
         zval_copy_ctor(dst);
         Z_SET_REFCOUNT(*dst, 1);
-        switch ((Z_TYPE_P(src) & IS_CONSTANT_TYPE_MASK)) {
-        case IS_CONSTANT:
-            dst->type = UNISW(IS_STRING, UG(unicode) ? IS_UNICODE : IS_STRING);
-            break;
-        case IS_CONSTANT_ARRAY:
-            dst->type = IS_ARRAY;
-            break;
-        }
         DONE(value)
         DONE(type)

trunk/xcache.c

@@ -3013 +3013 @@
     }
 
-    if (value->type == IS_CONSTANT) {
+    switch ((Z_TYPE_P(value) & IS_CONSTANT_TYPE_MASK)) {
+    case IS_CONSTANT:
         *return_value = *value;
         zval_copy_ctor(return_value);
         return_value->type = UNISW(IS_STRING, UG(unicode) ? IS_UNICODE : IS_STRING);
-        return;
-    }
-
-    if (value->type == IS_CONSTANT_ARRAY) {
+        break;
+
+    case IS_CONSTANT_ARRAY:
         *return_value = *value;
         zval_copy_ctor(return_value);
         return_value->type = IS_ARRAY;
-        return;
-    }
-
-    RETURN_NULL();
+        break;
+
+    default:
+        RETURN_NULL();
+    }
 }
 /* }}} */