From bb447cc80fc4ffdb136af97dd08414a524cc55f3 Mon Sep 17 00:00:00 2001
From: Xuefer <xuefer@gmail.com>
Date: Fri, 12 Jul 2013 03:32:26 +0000
Subject: [PATCH] Decompiler: remove PHP 4 support. adds XC_QM_ASSIGN_VAR

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1296 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
---
 lib/Decompiler.class.php    | 60 +++++++++----------------------------
 mod_disassembler/sample.php |  4 +--
 2 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/lib/Decompiler.class.php b/lib/Decompiler.class.php
index 4a45f91..12ebdfe 100644
--- a/lib/Decompiler.class.php
+++ b/lib/Decompiler.class.php
@@ -1464,7 +1464,7 @@ class Decompiler
 				$resvar = str($resvar) . '::' . unquoteName($this->getOpVal($op2, $EX));
 				break;
 				// }}}
-				// {{{ case XC_FETCH_*
+				// {{{ case FETCH_*
 			case XC_FETCH_R:
 			case XC_FETCH_W:
 			case XC_FETCH_RW:
@@ -1499,7 +1499,7 @@ class Decompiler
 				}
 				break;
 				// }}}
-				// {{{ case XC_FETCH_DIM_*
+				// {{{ case FETCH_DIM_*
 			case XC_FETCH_DIM_TMP_VAR:
 			case XC_FETCH_DIM_R:
 			case XC_FETCH_DIM_W:
@@ -1643,7 +1643,7 @@ class Decompiler
 				$resvar = new Decompiler_Binop($this, $lvalue, XC_ASSIGN_REF, $rvalue);
 				break;
 				// }}}
-			// {{{ case XC_FETCH_OBJ_*
+			// {{{ case FETCH_OBJ_*
 			case XC_FETCH_OBJ_R:
 			case XC_FETCH_OBJ_W:
 			case XC_FETCH_OBJ_RW:
@@ -1692,10 +1692,10 @@ class Decompiler
 						if (!isset($container)) {
 							$container = '$this';
 						}
-						$rvalue = $container . "->" . unquoteVariableName($dim);
+						$rvalue = str($container, $EX) . "->" . unquoteVariableName($dim);
 					}
 					else {
-						$rvalue = $container . '[' . str($dim) .']';
+						$rvalue = str($container, $EX) . '[' . str($dim) .']';
 					}
 				}
 
@@ -2777,51 +2777,19 @@ if (preg_match_all('!XC_[A-Z_]+!', file_get_contents(__FILE__), $ms)) {
 		}
 	}
 	var_export($verdiff);
+	exit;
 }
-/*/
+//*/
 foreach (array (
-	'XC_HANDLE_EXCEPTION' => -1,
-	'XC_FETCH_CLASS' => -1,
-	'XC_FETCH_' => -1,
-	'XC_FETCH_DIM_' => -1,
-	'XC_ASSIGN_DIM' => -1,
-	'XC_UNSET_DIM' => -1,
-	'XC_UNSET_OBJ' => -1,
-	'XC_ASSIGN_OBJ' => -1,
-	'XC_ISSET_ISEMPTY_DIM_OBJ' => -1,
-	'XC_ISSET_ISEMPTY_PROP_OBJ' => -1,
-	'XC_ISSET_ISEMPTY_VAR' => -1,
-	'XC_INIT_STATIC_METHOD_CALL' => -1,
-	'XC_INIT_METHOD_CALL' => -1,
-	'XC_VERIFY_ABSTRACT_CLASS' => -1,
-	'XC_DECLARE_CLASS' => -1,
-	'XC_DECLARE_INHERITED_CLASS' => -1,
-	'XC_DECLARE_INHERITED_CLASS_DELAYED' => -1,
-	'XC_ADD_INTERFACE' => -1,
-	'XC_POST_DEC_OBJ' => -1,
-	'XC_POST_INC_OBJ' => -1,
-	'XC_PRE_DEC_OBJ' => -1,
-	'XC_PRE_INC_OBJ' => -1,
-	'XC_UNSET_OBJ' => -1,
-	'XC_JMP_NO_CTOR' => -1,
-	'XC_FETCH_' => -1,
-	'XC_FETCH_DIM_' => -1,
-	'XC_UNSET_DIM_OBJ' => -1,
-	'XC_ISSET_ISEMPTY' => -1,
-	'XC_INIT_FCALL_BY_FUNC' => -1,
-	'XC_DO_FCALL_BY_FUNC' => -1,
 	'XC_DECLARE_FUNCTION_OR_CLASS' => -1,
-	'XC_INIT_NS_FCALL_BY_NAME' => -1,
-	'XC_GOTO' => -1,
-	'XC_CATCH' => -1,
-	'XC_THROW' => -1,
-	'XC_INSTANCEOF' => -1,
-	'XC_DECLARE_FUNCTION' => -1,
-	'XC_RAISE_ABSTRACT_ERROR' => -1,
-	'XC_DECLARE_CONST' => -1,
-	'XC_USER_OPCODE' => -1,
-	'XC_JMP_SET' => -1,
 	'XC_DECLARE_LAMBDA_FUNCTION' => -1,
+	'XC_DO_FCALL_BY_FUNC' => -1,
+	'XC_INIT_FCALL_BY_FUNC' => -1,
+	'XC_ISSET_ISEMPTY' => -1,
+	'XC_JMP_NO_CTOR' => -1,
+	'XC_JMP_SET' => -1,
+	'XC_QM_ASSIGN_VAR' => -1,
+	'XC_UNSET_DIM_OBJ' => -1,
 ) as $k => $v) {
 	if (!defined($k)) {
 		define($k, $v);
diff --git a/mod_disassembler/sample.php b/mod_disassembler/sample.php
index 6d03439..cfbbc47 100644
--- a/mod_disassembler/sample.php
+++ b/mod_disassembler/sample.php
@@ -1,6 +1,6 @@
 <?php
 
-//* >= PHP 5.3
+/* >= PHP 5.3
 namespace ns;
 // */
 
@@ -416,7 +416,7 @@ include_once 'include_once.php';
 echo __FILE__;
 echo __LINE__;
 
-//*
+/*
 echo 'PHP 5.3+ code testing';
 const CONST_VALUE = 1;
 echo $this::CONST_VALUE;