CVS update: php3
| From: | zeev | Date: | Mon, 12 Oct 1998 23:55:03 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1834@lists.php.net to get a copy of this message | ||
Date: Monday October 12, 1998 @ 19:55
Author: zeev
Update of /repository/php3
In directory asf:/u2/tmp/cvs-serv16377
Modified Files:
ChangeLog language-scanner.lex main.c
Log Message:
line number fix for unterminated comments
Index: php3/ChangeLog
diff -c php3/ChangeLog:1.511 php3/ChangeLog:1.512
*** php3/ChangeLog:1.511 Mon Oct 12 18:40:33 1998
--- php3/ChangeLog Mon Oct 12 19:55:01 1998
***************
*** 1,6 ****
--- 1,8 ----
'PHP 3.0 CHANGE LOG ChangeLog
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
??, Version 3.0.6
+ - Unterimated comments in include files were being reported with the wrong line
+ number. Fixed.
- Added ImageCopy() and ImageColorDeallocate(). ImageCopy() is about
20% faster than ImageCopyResized(). ImageColorDeallocate() marks
palette entries free for reuse. <mka@satama.com>
Index: php3/language-scanner.lex
diff -c php3/language-scanner.lex:1.174 php3/language-scanner.lex:1.175
*** php3/language-scanner.lex:1.174 Tue Sep 22 12:23:21 1998
--- php3/language-scanner.lex Mon Oct 12 19:55:01 1998
***************
*** 956,962 ****
}
if (c==EOF) {
! php3_error(E_WARNING,"Unterminated comment starting line %d.\n",start_lineno);
break;
} else {
HANDLE_NEWLINE(c);
--- 956,962 ----
}
if (c==EOF) {
! php3_error(E_WARNING,"Unterminated comment starting line
%d.\n",php3_get_lineno(start_lineno));
break;
} else {
HANDLE_NEWLINE(c);
Index: php3/main.c
diff -c php3/main.c:1.473 php3/main.c:1.474
*** php3/main.c:1.473 Sun Oct 11 08:54:23 1998
--- php3/main.c Mon Oct 12 19:55:01 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 1.473 1998/10/11 12:54:23 zeev Exp $ */
/* #define CRASH_DETECTION */
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 1.474 1998/10/12 23:55:01 zeev Exp $ */
/* #define CRASH_DETECTION */
***************
*** 356,362 ****
if(php3_ini.error_prepend_string) {
PUTS(php3_ini.error_prepend_string);
}
! php3_printf("<br>\n<b>%s</b>: %s in <b>%s</b> on line
<b>%d</b><br>\n", error_type_str, buffer, filename, GLOBAL(current_lineno) %
MAX_TOKENS_PER_CACHE);
if(php3_ini.error_append_string) {
PUTS(php3_ini.error_append_string);
}
--- 356,362 ----
if(php3_ini.error_prepend_string) {
PUTS(php3_ini.error_prepend_string);
}
! php3_printf("<br>\n<b>%s</b>: %s in <b>%s</b> on line
<b>%d</b><br>\n", error_type_str, buffer, filename,
php3_get_lineno(GLOBAL(current_lineno)));
if(php3_ini.error_append_string) {
PUTS(php3_ini.error_append_string);
}
--
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