Changeset 817 for branches/1.3/decompilesample.php

Timestamp:

2011-06-04T05:34:36+02:00 (2 years ago)

Author:

moo

Message:

merge from trunk: disassembler/decompiler improvements

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• decompilesample.php (modified) (10 diffs)

branches/1.3/decompilesample.php

@@ -65 +65 @@
     /** doc */
     protected function protectedMethod(ClassName $a, $b = array(
-        array('array')
-        ))
+            array('array')
+            ))
     {
         $runtimeArray = array('1');
@@ -155 +155 @@
 
 if ($late) {
-class LateBindingClass
-{}
-
-function lateBindingFunction($arg)
-{
-    echo 'lateFunction';
-}
+    class LateBindingClass
+    {
+        public function __construct()
+        {
+        }
+    }
+
+    function lateBindingFunction($arg)
+    {
+        echo 'lateFunction';
+    }
 }
 
@@ -204 +208 @@
 $a = $obj->b--;
 $a = --$obj->b;
-$a = $b xor $c;
 $a = !$b;
 $a = $b === $c;
@@ -250 +253 @@
 $a = (object) $b;
 // PHP6+ $a = (scalar) $b;
-$a = $b ? $c : $d;
-$a = f1() ? f2() : f3();
-$a = $b and $c;
-$a = $b or $c;
+$a = ($b ? $c : $d);
+$a = (f1() ? f2() : f3());
+($a = $b) xor $c;
+($a = $b) and $c;
+($a = $b) or $c;
 $a = $b && $c;
 $a = $b || $c;
 
-try {
-    echo 'outer try 1';
+do {
     try {
-        echo 'inner try';
-    }
-    catch (InnerException $e) {
+        echo 'outer try 1';
+
+        try {
+            echo 'inner try';
+        }
+        catch (InnerException $e) {
+            echo $e;
+        }
+
+        echo 'outer try 2';
+    }
+    catch (OuterException $e) {
         echo $e;
     }
-    echo 'outer try 2';
-}
-catch (OuterException $e) {
-    echo $e;
-}
-
-if ($a) {
-    echo 'if ($a)';
-}
-else if ($b) {
-    echo 'else if ($b)';
+} while (0);
+
+if (if_()) {
+    echo 'if';
+
+    if (innerIf_()) {
+        echo 'if innerIf';
+    }
+}
+else if (elseif_()) {
+    echo 'else if';
+
+    if (innerIf_()) {
+        echo 'if innerIf';
+    }
 }
 else {
+    if (innerIf_()) {
+        echo 'if innerIf';
+    }
+
     echo 'else';
 }
@@ -289 +309 @@
 } while (false);
 
-for ($i = 1; $i < 10; ++$i) {
+$i = 1;
+
+for (; $i < 10; ++$i) {
     echo $i;
     break;
@@ -295 +317 @@
 
 foreach ($array as $key => $value) {
-    foreach ($array as $key => $value) {
+    foreach ($value as $key => $value) {
         echo $key . ' = ' . $value . "\n";
         break 2;
@@ -302 +324 @@
 }
 
-switch ($switch) {
+switch ($normalSwitch) {
 case 'case1':
     echo 'case1';
+
+    switch ($nestedSwitch) {
+    case 1:
+    }
+
     break;
 
@@ -312 +339 @@
 
 default:
+    switch ($nestedSwitch) {
+    case 1:
+    }
+
     echo 'default';
     break;
+}
+
+switch ($switchWithoutDefault) {
+case 'case1':
+    echo 'case1';
+    break;
+
+case 'case2':
+    echo 'case2';
+    break;
+}
+
+switch ($switchWithMiddleDefault) {
+case 'case1':
+    echo 'case1';
+    break;
+
+default:
+    echo 'default';
+    break;
+
+case 'case2':
+    echo 'case2';
+    break;
+}
+
+switch ($switchWithInitialDefault) {
+default:
+    echo 'default';
+    break;
+
+case 'case1':
+    echo 'case1';
+    break;
+
+case 'case2':
+    echo 'case2';
+    break;
+}
+
+switch (emptySwitch()) {
+}
+
+switch (emptySwitch()) {
+default:
 }
 
 declare (ticks=1) {
     echo 1;
-    echo 2;
+    while (1) {
+        echo 2;
+    }
 }
 
@@ -336 +414 @@
 $this::__construct();
 $obj::__construct();
-
 $a = $b ?: $d;
 $a = ($b ?: $d) + $c;
 $a = f1() ?: f2();
+$a = ($b ? $c : $d);
+$a = ($b ? $c : $d) + $c;
+$a = (f1() ? f3() : f2());
+
+if ($b ?: $d) {
+    echo 'if ($b ?: $d)';
+}
+
+if (($b ?: $d) + $c) {
+    echo 'if (($b ?: $d) + $c)';
+}
+
+if (f1() ?: f2()) {
+    echo 'if (f1() ?: f2())';
+}
 
 echo 'goto a';
 goto a;
 
-for ($i = 1; $i <= 2; ++$i) {
+$i = 1;
+
+for (; $i <= 2; ++$i) {
     goto a;
 }
@@ -350 +444 @@
 a:
 echo 'label a';
-echo preg_replace_callback('~-([a-z])~', function ($match) {
+echo preg_replace_callback('~-([a-z])~', function($match) {
     return strtoupper($match[1]);
 }, 'hello-world');
-$greet = function ($name) {
+$greet = function($name) {
     printf("Hello %s\r\n", $name);
 };