Index: /trunk/decompilesample.php
===================================================================
--- /trunk/decompilesample.php	(revision 802)
+++ /trunk/decompilesample.php	(revision 805)
@@ -204,5 +204,4 @@
 $a = $obj->b--;
 $a = --$obj->b;
-$a = $b xor $c;
 $a = !$b;
 $a = $b === $c;
@@ -252,6 +251,7 @@
 $a = ($b ? $c : $d);
 $a = (f1() ? f2() : f3());
-$a = $b and $c;
-$a = $b or $c;
+($a = $b) xor $c;
+($a = $b) and $c;
+($a = $b) or $c;
 $a = $b && $c;
 $a = $b || $c;
@@ -408,7 +408,7 @@
 $a = ($b ?: $d) + $c;
 $a = f1() ?: f2();
-$a = $b ? $c : $d;
+$a = ($b ? $c : $d);
 $a = ($b ? $c : $d) + $c;
-$a = f1() ? f3() : f2();
+$a = (f1() ? f3() : f2());
 
 if ($b ?: $d) {