Changeset 754 for trunk

Timestamp:

2011-04-17T07:31:08+02:00 (2 years ago)

Author:

moo

Message:

Decompiler: foldToCode/str clean up

File:

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

trunk/Decompiler.class.php

@@ -267 +267 @@
             $dim->value = $this->src;
             if (!isset($dim->assign)) {
-                return foldToCode($dim, $indent);
-            }
-            return foldToCode($this->dims[0]->assign, $indent) . ' = ' . str($dim, $indent);
+                return str($dim, $indent);
+            }
+            return str($this->dims[0]->assign, $indent) . ' = ' . str($dim, $indent);
         }
         /* flatten dims */
@@ -280 +280 @@
             $assign = foldToCode($dim->assign, $indent);
         }
-        return $this->toList($assigns) . ' = ' . str($this->src, $indent);
+        return str($this->toList($assigns)) . ' = ' . str($this->src, $indent);
     }
 
@@ -1104 +1104 @@
                     if (is_a($rvalue, 'Decompiler_Fetch')) {
                         $src = str($rvalue->src, $EX);
-                        if (substr($src, 1, -1) == substr($lvalue, 1)) {
+                        if ('$' . unquoteName($src) == $lvalue) {
                             switch ($rvalue->fetchType) {
                             case ZEND_FETCH_GLOBAL:
@@ -1113 +1113 @@
                                 $statics = &$EX['op_array']['static_variables'];
                                 $resvar = 'static ' . $lvalue;
-                                $name = substr($src, 1, -1);
+                                $name = unquoteName($src);
                                 if (isset($statics[$name])) {
                                     $var = $statics[$name];
+                                    var_dump(str(value($statics)));
                                     $resvar .= ' = ';
                                     $resvar .= str(value($var), $EX);
@@ -1126 +1127 @@
                     }
                     // TODO: PHP_6 global
-                    $rvalue = foldToCode($rvalue, $EX);
+                    $rvalue = str($rvalue, $EX);
                     $resvar = "$lvalue = &$rvalue";
                     break;