Changeset 746 in svn

Timestamp:

2011-04-14T05:21:26Z (9 years ago)

Author:

Xuefer

Message:

Decompiler: fix ticks, str

File:

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

trunk/Decompiler.class.php

@@ -434 +434 @@
             $op = $opcodes[$i];
             if (isset($op['php'])) {
-                $toticks = isset($op['ticks']) ? $op['ticks'] : 0;
+                $toticks = isset($op['ticks']) ? (int) str($op['ticks']) : 0;
                 if ($curticks != $toticks) {
-                    if (!$toticks) {
+                    $oldticks = $curticks;
+                    $curticks = $toticks;
+                    if (!$curticks) {
                         echo $origindent, "}\n";
                         $indent = $origindent;
                     }
                     else {
-                        if ($curticks) {
+                        if ($oldticks) {
                             echo $origindent, "}\n";
                         }
-                        else if (!$curticks) {
+                        else if (!$oldticks) {
                             $indent .= INDENT;
                         }
-                        echo $origindent, "declare(ticks=$curticks) {\n";
-                    }
-                    $curticks = $toticks;
+                        echo $origindent, "declare (ticks=$curticks) {\n";
+                    }
                 }
                 echo $indent, str($op['php'], $indent), ";\n";
@@ -719 +720 @@
         if (!empty($op['jmpouts']) && isset($op['isjmp'])) {
             if (isset($op['cond'])) {
-                echo "{$indent}check ($op[cond]) {\n";
+                echo "{$indent}check (" . str($op["cond"]) . ") {\n";
                 echo INDENT;
             }
@@ -1327 +1328 @@
                     $type = $op2['var']; // hack
                     $keyword = $this->includeTypes[$type];
-                    $resvar = "$keyword(" . $this->getOpVal($op1, $EX) . ")";
+                    $resvar = "$keyword(" . str($this->getOpVal($op1, $EX)) . ")";
                     break;
                     // }}}