Changeset 1335 in svn for trunk

Timestamp:

2013-07-19T06:50:48Z (5 years ago)

Author:

Xuefer

Message:

Decompiler: update PHP4 support for static method call

Location:

trunk

Files:

• lib/Decompiler.class.php (modified) (5 diffs)
• mod_disassembler/sample.cpp.php (modified) (3 diffs)

trunk/lib/Decompiler.class.php

@@ -602 +602 @@
     function stripNamespace($name) // {{{
     {
+        if (!isset($name)) {
+            return $name;
+        }
+
         $name = str($name);
         $len = strlen($this->namespace) + 1;
@@ -1820 +1824 @@
             case XC_INIT_METHOD_CALL: // {{{
                 array_push($EX['arg_types_stack'], array($EX['fbc'], $EX['object'], $EX['called_scope']));
-                if ($opc == XC_INIT_STATIC_METHOD_CALL || $opc == XC_INIT_METHOD_CALL || $op1['op_type'] != XC_IS_UNUSED) {
+                if ($opc == XC_INIT_STATIC_METHOD_CALL) {
+                    $EX['object'] = null;
+                    $EX['called_scope'] = $this->stripNamespace(isset($op1['constant']) ? $op1['constant'] : $this->getOpVal($op1, $EX));
+                }
+                else {
                     $obj = $this->getOpVal($op1, $EX);
                     if (!isset($obj)) {
                         $obj = '$this';
                     }
-                    if ($opc == XC_INIT_STATIC_METHOD_CALL || /* PHP4 */ isset($op1['constant'])) {
-                        $EX['object'] = null;
-                        $EX['called_scope'] = $this->stripNamespace(unquoteName($obj, $EX));
-                    }
-                    else {
-                        $EX['object'] = $obj;
-                        $EX['called_scope'] = null;
-                    }
-                    if ($res['op_type'] != XC_IS_UNUSED) {
-                        $resvar = '$obj call$';
-                    }
-                }
-                else {
-                    $EX['object'] = null;
+                    $EX['object'] = $obj;
                     $EX['called_scope'] = null;
                 }
+                if ($res['op_type'] != XC_IS_UNUSED) {
+                    $resvar = '$obj call$';
+                }
 
                 $EX['fbc'] = isset($op2['constant']) ? $op2['constant'] : $this->getOpVal($op2, $EX);
-                if (($opc == XC_INIT_STATIC_METHOD_CALL || $opc == XC_INIT_METHOD_CALL) && !isset($EX['fbc'])) {
+                if (!isset($EX['fbc'])) {
                     $EX['fbc'] = '__construct';
                 }
@@ -1854 +1852 @@
                 }
                 array_push($EX['arg_types_stack'], array($EX['fbc'], $EX['object'], $EX['called_scope']));
-                $EX['object'] = null;
-                $EX['called_scope'] = null;
-                $EX['fbc'] = $this->getOpVal($op2, $EX);
+                if (!ZEND_ENGINE_2 && ($ext & ZEND_MEMBER_FUNC_CALL)) {
+                    if (isset($op1['constant'])) {
+                        $EX['object'] = null;
+                        $EX['called_scope'] = $this->stripNamespace($op1['constant']);
+                    }
+                    else {
+                        $EX['object'] = $this->getOpVal($op1, $EX);
+                        $EX['called_scope'] = null;
+                    }
+                }
+                else {
+                    $EX['object'] = null;
+                    $EX['called_scope'] = null;
+                }
+                $EX['fbc'] = isset($op2['constant']) ? $op2['constant'] : $this->getOpVal($op2, $EX);
                 break;
                 // }}}
@@ -1880 +1890 @@
                 $object = null;
 
-                $fname = unquoteName($EX['fbc'], $EX);
                 if (!is_int($EX['object'])) {
                     $object = $EX['object'];
@@ -1887 +1896 @@
                 $args = $this->popargs($EX, $ext);
 
-                $prefix = (isset($object) ? $object . '->' : '' )
-                    . (isset($EX['called_scope']) ? $EX['called_scope'] . '::' : '' );
+                $prefix = (isset($object) ? str($object) . '->' : '' )
+                    . (isset($EX['called_scope']) ? str($EX['called_scope']) . '::' : '' );
                 $resvar = $prefix
-                    . (!$prefix ? $this->stripNamespace($fname) : $fname)
+                    . (!$prefix ? $this->stripNamespace($EX['fbc']) : str($EX['fbc']))
                     . "($args)";
                 unset($args);

trunk/mod_disassembler/sample.cpp.php

@@ -1 +1 @@
 <?php
 #if PHP_VERSION >= 500
-#   define ClassClassName ClassName
 #   define PublicMethod public
 #else
-#   define ClassClassName classname
+#   define ClassName classname
 #   define PublicMethod
 #   define abstract
@@ -21 +20 @@
 #endif
 
-abstract class ClassClassName
+abstract class ClassName
 {
 #if PHP_VERSION >= 500
@@ -118 +117 @@
         echo $GLOBALS['var']->indexProp;
         ClassName::__construct();
+        ClassName::$func();
         echo __CLASS__;
         echo __METHOD__;