cvs: ZendEngine2 / zend_execute_API.c

helly           Mon Feb 20 20:03:37 2006 UTC

  Modified files:              
    /ZendEngine2        zend_execute_API.c 
  Log:
  - Synch zend_call_function() with VM function call helper
  
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_execute_API.c?r1=1.357&r2=1.358&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.357 
ZendEngine2/zend_execute_API.c:1.358
--- ZendEngine2/zend_execute_API.c:1.357        Mon Feb 20 20:00:46 2006
+++ ZendEngine2/zend_execute_API.c      Mon Feb 20 20:03:36 2006
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c,v 1.357 2006/02/20 20:00:46 helly Exp $ */
+/* $Id: zend_execute_API.c,v 1.358 2006/02/20 20:03:36 helly Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -861,11 +861,16 @@
                fci->object_pp = fci_cache->object_pp;
        }
        
-       if (EX(function_state).function->common.fn_flags & ZEND_ACC_DEPRECATED) 
{ 
-               zend_error(E_NOTICE, "Function %s%s%s() is deprecated", 
-                       EX(function_state).function->common.scope ? 
EX(function_state).function->common.scope->name : "",
-                       EX(function_state).function->common.scope ? "::" : "",
-                       EX(function_state).function->common.function_name);
+       if (EX(function_state).function->common.fn_flags & 
(ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED)) { 
+               if (EX(function_state).function->common.fn_flags & 
ZEND_ACC_ABSTRACT) {
+                       zend_error_noreturn(E_ERROR, "Cannot call abstract 
method %v::%v()", EX(function_state).function->common.scope->name, 
EX(function_state).function->common.function_name);
+               }
+               if (EX(function_state).function->common.fn_flags & 
ZEND_ACC_DEPRECATED) { 
+                       zend_error(E_NOTICE, "Function %s%s%s() is deprecated", 
+                               EX(function_state).function->common.scope ? 
EX(function_state).function->common.scope->name : "",
+                               EX(function_state).function->common.scope ? 
"::" : "",
+                               
EX(function_state).function->common.function_name);
+               }
        }
 
        for (i=0; i<fci->param_count; i++) {

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php