CVS update: php3
| From: | zeev | Date: | Thu, 13 Aug 1998 20:22:54 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-170@lists.php.net to get a copy of this message | ||
Date: Thursday August 13, 1998 @ 16:22
Author: zeev
Update of /repository/php3
In directory asf:/tmp/cvs-serv300
Modified Files:
ChangeLog operators.c
Log Message:
Fix the comparison warning code
Index: php3/ChangeLog
diff -c php3/ChangeLog:1.437 php3/ChangeLog:1.438
*** php3/ChangeLog:1.437 Thu Aug 13 15:45:07 1998
--- php3/ChangeLog Thu Aug 13 16:22:53 1998
***************
*** 1,6 ****
--- 1,8 ----
PHP 3.0 CHANGE LOG ChangeLog
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? 1998 Version 3.0.3
+ - Comparing between arrays and/or objects now generates a warning (it always
+ returns false, as it used to; no comparison is made)
- Fixed a bug in the syntax highlighting code, that made ending-double-quotes
appear twice under certain circumstances.
- Fix bug in filetype() function related to symlinks
Index: php3/operators.c
diff -c php3/operators.c:1.95 php3/operators.c:1.96
*** php3/operators.c:1.95 Mon Aug 10 17:28:09 1998
--- php3/operators.c Thu Aug 13 16:22:53 1998
***************
*** 29,35 ****
*/
! /* $Id: operators.c,v 1.95 1998/08/10 21:28:09 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 29,35 ----
*/
! /* $Id: operators.c,v 1.96 1998/08/13 20:22:53 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 773,779 ****
result->value.dval = (op1->type == IS_LONG ? (double) op1->value.lval :
op1->value.dval) - (op2->type == IS_LONG ? (double) op2->value.lval : op2->value.dval);
return SUCCESS;
}
! php3_error(E_WARNING,"Unsupported argument types in comparison function");
yystype_destructor(op1 _INLINE_TLS);
yystype_destructor(op2 _INLINE_TLS);
var_reset(result);
--- 773,781 ----
result->value.dval = (op1->type == IS_LONG ? (double) op1->value.lval :
op1->value.dval) - (op2->type == IS_LONG ? (double) op2->value.lval : op2->value.dval);
return SUCCESS;
}
! if ((op1->type & IS_HASH) && (op2->type & IS_HASH)) {
! php3_error(E_WARNING,"Cannot compare arrays or objects");
! }
yystype_destructor(op1 _INLINE_TLS);
yystype_destructor(op2 _INLINE_TLS);
var_reset(result);
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net