Changeset 623 for branches/1.3/Decompiler.class.php

Timestamp:

07/05/2009 10:41:16 AM (4 years ago)

Author:

moo

Message:

merged r514-r539 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• Decompiler.class.php (modified) (4 diffs)

branches/1.3/Decompiler.class.php

@@ -29 +29 @@
     if (is_array($src)) {
         die_error('array str');
-        $src = new Decompiler_Array($src);
-        return $src->__toString($indent);
+        $src = new Decompiler_Array($src, false, $indent);
+        return $src->__toString();
     }
 
@@ -165 +165 @@
     }
 
-    function __toString($indent)
-    {
-        return $this->obj->__toString($indent);
+    function __toString()
+    {
+        return $this->obj->__toString();
     }
 }
@@ -258 +258 @@
 {
     var $needExport = false;
-
-    function Decompiler_Array($value = array(), $needexport = false)
+    var $indent = '';
+
+    function Decompiler_Array($value = array(), $needexport = false, $indent = '')
     {
         $this->value = $value;
         $this->needExport = $needexport;
-    }
-
-    function __toString($indent)
+        $this->indent = $indent;
+    }
+
+    function __toString()
     {
         $exp = "array(";
-        $indent .= INDENT;
+        $indent = $this->indent . INDENT;
         $assoclen = 0;
         $multiline = 0;
@@ -335 +337 @@
     var $iskey;
 
-    function __toString($indent)
+    function __toString()
     {
         return 'foreach (' . '';