Changeset 796

Timestamp:

04/26/2011 07:33:03 AM (2 years ago)

Author:

moo

Message:

code format cleanup

Files:

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

trunk/Decompiler.class.php

@@ -742 +742 @@
 
             $this->beginComplexBlock($EX);
-            echo $indent, 'try {', PHP_EOL;
+            echo $indent, "try {", PHP_EOL;
             $this->recognizeAndDecompileClosedBlocks($EX, $tryFirst, $tryLast, $indent . INDENT);
             echo $indent, '}', PHP_EOL;
@@ -750 +750 @@
                 $this->recognizeAndDecompileClosedBlocks($EX, $catchFirst, $catchOpLine, $indent);
                 $catchOp = &$opcodes[$catchOpLine];
-                echo $indent, 'catch (', str($this->getOpVal($catchOp['op1'], $EX)), ' ', str($this->getOpVal($catchOp['op2'], $EX)), ') {', PHP_EOL;
+                echo $indent, 'catch (', str($this->getOpVal($catchOp['op1'], $EX)), ' ', str($this->getOpVal($catchOp['op2'], $EX)), ") {", PHP_EOL;
                 unset($catchOp);
 
@@ -761 +761 @@
         }
         // }}}
-
+        // {{{ switch/case
         if ($firstOp['opcode'] == XC_SWITCH_FREE && isset($T[$firstOp['op1']['var']])) {
             // TODO: merge this code to CASE code. use SWITCH_FREE to detect begin of switch by using $Ts if possible
             $this->beginComplexBlock($EX);
-            echo $indent, 'switch (' . str($this->getOpVal($firstOp['op1'], $EX)) . ') {', PHP_EOL;
+            echo $indent, 'switch (', str($this->getOpVal($firstOp['op1'], $EX)), ") {", PHP_EOL;
             echo $indent, '}', PHP_EOL;
             $this->endComplexBlock($EX);
@@ -806 +806 @@
             $this->beginComplexBlock($EX);
 
-            echo $indent, 'switch (', str($this->getOpVal($caseOp['op1'], $EX, true, true), $EX), ') {', PHP_EOL;
+            echo $indent, 'switch (', str($this->getOpVal($caseOp['op1'], $EX, true, true), $EX), ") {", PHP_EOL;
             $caseIsOut = false;
             foreach ($cases as $caseFirst => $caseLast) {
@@ -860 +860 @@
             return;
         }
-
+        // }}}
+        // {{{ do/while
         if ($lastOp['opcode'] == XC_JMPNZ && !empty($lastOp['jmpouts'])
          && $lastOp['jmpouts'][0] == $first) {
@@ -866 +867 @@
             $this->beginComplexBlock($EX);
 
-            echo $indent, 'do {', PHP_EOL;
+            echo $indent, "do {", PHP_EOL;
             $this->recognizeAndDecompileClosedBlocks($EX, $first, $last, $indent . INDENT);
-            echo $indent, '} while (', str($this->getOpVal($lastOp['op1'], $EX)), ');', PHP_EOL;
+            echo $indent, "} while (", str($this->getOpVal($lastOp['op1'], $EX)), ');', PHP_EOL;
 
             $this->endComplexBlock($EX);
             return;
         }
-
+        // }}}
+
+        // {{{ search firstJmpOp
         $firstJmp = null;
         $firstJmpOp = null;
@@ -883 +886 @@
             }
         }
-
+        // }}}
+
+        // {{{ while
         if (isset($firstJmpOp)
          && $firstJmpOp['opcode'] == XC_JMPZ
@@ -897 +902 @@
             $body = ob_get_clean();
 
-            echo $indent, 'while (', str($this->getOpVal($firstJmpOp['op1'], $EX)), ') {', PHP_EOL;
+            echo $indent, 'while (', str($this->getOpVal($firstJmpOp['op1'], $EX)), ") {", PHP_EOL;
             echo $body;
             echo $indent, '}', PHP_EOL;
@@ -904 +909 @@
             return;
         }
-
+        // }}}
+        // {{{ foreach
         if (isset($firstJmpOp)
          && $firstJmpOp['opcode'] == XC_FE_FETCH
@@ -930 +936 @@
             return;
         }
+        // }}}
 
         $this->decompileBasicBlock($EX, $first, $last, $indent);