derick Sun Jun 19 18:15:28 2005 EDT
Removed files:
/php-src/ext/standard parsedate.y php_parsedate.h
Modified files:
/php-src genfiles
/php-src/ext/date .cvsignore TODO php_date.c php_date.h
/php-src/ext/date/lib/resource .cvsignore
/php-src/ext/standard .cvsignore Makefile.frag config.m4 config.w32
datetime.c
/php-src/ext/wddx wddx.c
/php-src/netware BisonExtStandard.bat phplib.mak
/php-src/win32 php5dll.dsp php5dllts.dsp
/php-src/win32/build Makefile
Log:
- Added backward compability wrapper "php_parse_date()".
- Changed WDDX extension to use new date parsing code.
- Removed all remnants to the old parser.
#- I hope that I didn't break the .dsp's...
http://cvs.php.net/diff.php/php-src/genfiles?r1=1.21&r2=1.22&ty=u
Index: php-src/genfiles
diff -u php-src/genfiles:1.21 php-src/genfiles:1.22
--- php-src/genfiles:1.21 Mon May 27 10:47:03 2002
+++ php-src/genfiles Sun Jun 19 18:15:24 2005
@@ -5,7 +5,6 @@
(eval "$STD Zend/zend_language_parser.c Zend/zend_language_scanner.c
Zend/zend_ini_parser.c Zend/zend_ini_scanner.c")
set -x
-bison -d -y -l ext/standard/parsedate.y -o ext/standard/parsedate.c
for f in ext/standard/url_scanner_ex.c ext/standard/var_unserializer.c; do
cp $f $f.orig
http://cvs.php.net/diff.php/php-src/ext/date/.cvsignore?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/date/.cvsignore
diff -u php-src/ext/date/.cvsignore:1.2 php-src/ext/date/.cvsignore:1.3
--- php-src/ext/date/.cvsignore:1.2 Sun Jun 19 11:02:28 2005
+++ php-src/ext/date/.cvsignore Sun Jun 19 18:15:25 2005
@@ -45,9 +45,6 @@
missing
mkinstalldirs
modules
-parsedate.c
-parsedate.h
-parsedate.output
scan_makefile_in.awk
*.gcda
*.gcno
http://cvs.php.net/diff.php/php-src/ext/date/TODO?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/date/TODO
diff -u php-src/ext/date/TODO:1.5 php-src/ext/date/TODO:1.6
--- php-src/ext/date/TODO:1.5 Sat Jun 18 16:23:18 2005
+++ php-src/ext/date/TODO Sun Jun 19 18:15:25 2005
@@ -1,5 +1,4 @@
- Port over my 200 test cases to .phpt format.
- Write an error handler for unexpected characters while parsing dates.
-- Remove old parsedate.* code from ext/standard
- Move all date/time related functions from ext/standard to ext/date
- Move all date/time related tests from ext/standard/tests to ext/data/tests
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.12&r2=1.13&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.12 php-src/ext/date/php_date.c:1.13
--- php-src/ext/date/php_date.c:1.12 Sun Jun 19 01:28:39 2005
+++ php-src/ext/date/php_date.c Sun Jun 19 18:15:25 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.12 2005/06/19 05:28:39 sebastian Exp $ */
+/* $Id: php_date.c,v 1.13 2005/06/19 22:15:25 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -85,6 +85,22 @@
php_info_print_table_end();
}
+signed long php_parse_date(char *string, signed long *now)
+{
+ timelib_time *parsed_time;
+ int error;
+ signed long retval;
+
+ parsed_time = timelib_strtotime(string);
+ timelib_update_ts(parsed_time, NULL);
+ retval = timelib_date_to_int(parsed_time, &error);
+ timelib_time_dtor(parsed_time);
+ if (error) {
+ return -1;
+ }
+ return retval;
+}
+
static char* guess_timezone(TSRMLS_D)
{
char *env;
http://cvs.php.net/diff.php/php-src/ext/date/php_date.h?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.4 php-src/ext/date/php_date.h:1.5
--- php-src/ext/date/php_date.h:1.4 Sat Jun 18 16:23:18 2005
+++ php-src/ext/date/php_date.h Sun Jun 19 18:15:25 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.h,v 1.4 2005/06/18 20:23:18 derick Exp $ */
+/* $Id: php_date.h,v 1.5 2005/06/19 22:15:25 derick Exp $ */
#ifndef PHP_DATE_H
#define PHP_DATE_H
@@ -40,4 +40,7 @@
#define DATEG(v) (date_globals.v)
#endif
+/* Backwards compability wrapper */
+signed long php_parse_date(char *string, signed long *now);
+
#endif /* PHP_DATE_H */
http://cvs.php.net/diff.php/php-src/ext/date/lib/resource/.cvsignore?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/date/lib/resource/.cvsignore
diff -u php-src/ext/date/lib/resource/.cvsignore:1.1
php-src/ext/date/lib/resource/.cvsignore:1.2
--- php-src/ext/date/lib/resource/.cvsignore:1.1 Tue Jun 14 17:32:27 2005
+++ php-src/ext/date/lib/resource/.cvsignore Sun Jun 19 18:15:25 2005
@@ -44,9 +44,6 @@
missing
mkinstalldirs
modules
-parsedate.c
-parsedate.h
-parsedate.output
scan_makefile_in.awk
*.gcda
*.gcno
http://cvs.php.net/diff.php/php-src/ext/standard/.cvsignore?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/standard/.cvsignore
diff -u php-src/ext/standard/.cvsignore:1.13
php-src/ext/standard/.cvsignore:1.14
--- php-src/ext/standard/.cvsignore:1.13 Sun Oct 10 12:10:15 2004
+++ php-src/ext/standard/.cvsignore Sun Jun 19 18:15:25 2005
@@ -44,9 +44,6 @@
missing
mkinstalldirs
modules
-parsedate.c
-parsedate.h
-parsedate.output
scan_makefile_in.awk
*.gcda
*.gcno
http://cvs.php.net/diff.php/php-src/ext/standard/Makefile.frag?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/standard/Makefile.frag
diff -u php-src/ext/standard/Makefile.frag:1.7
php-src/ext/standard/Makefile.frag:1.8
--- php-src/ext/standard/Makefile.frag:1.7 Thu Nov 11 01:57:06 2004
+++ php-src/ext/standard/Makefile.frag Sun Jun 19 18:15:25 2005
@@ -1,7 +1,4 @@
-$(srcdir)/parsedate.c: $(srcdir)/parsedate.y
- $(YACC) $(srcdir)/parsedate.y -o $@
-
$(srcdir)/var_unserializer.c: $(srcdir)/var_unserializer.re
$(RE2C) -b $(srcdir)/var_unserializer.re > $@
http://cvs.php.net/diff.php/php-src/ext/standard/config.m4?r1=1.79&r2=1.80&ty=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.79 php-src/ext/standard/config.m4:1.80
--- php-src/ext/standard/config.m4:1.79 Sun May 29 19:16:44 2005
+++ php-src/ext/standard/config.m4 Sun Jun 19 18:15:25 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.79 2005/05/29 23:16:44 sniper Exp $ -*- autoconf -*-
+dnl $Id: config.m4,v 1.80 2005/06/19 22:15:25 derick Exp $ -*- autoconf -*-
divert(3)dnl
@@ -483,7 +483,7 @@
cyr_convert.c datetime.c dir.c dl.c dns.c exec.c
file.c filestat.c \
flock_compat.c formatted_print.c fsock.c head.c
html.c image.c \
info.c iptc.c lcg.c link.c mail.c math.c md5.c
metaphone.c \
- microtime.c pack.c pageinfo.c parsedate.c
quot_print.c rand.c \
+ microtime.c pack.c pageinfo.c quot_print.c rand.c \
reg.c soundex.c string.c scanf.c syslog.c type.c
uniqid.c url.c \
url_scanner.c var.c versioning.c assert.c
strnatcmp.c levenshtein.c \
incomplete_class.c url_scanner_ex.c
ftp_fopen_wrapper.c \
http://cvs.php.net/diff.php/php-src/ext/standard/config.w32?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/standard/config.w32
diff -u php-src/ext/standard/config.w32:1.3 php-src/ext/standard/config.w32:1.4
--- php-src/ext/standard/config.w32:1.3 Sat Dec 6 11:04:33 2003
+++ php-src/ext/standard/config.w32 Sun Jun 19 18:15:26 2005
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.3 2003/12/06 16:04:33 wez Exp $
+// $Id: config.w32,v 1.4 2005/06/19 22:15:26 derick Exp $
ARG_WITH("config-file-scan-dir", "Dir to check for additional php ini files",
"");
AC_DEFINE("PHP_CONFIG_FILE_SCAN_DIR", PHP_CONFIG_FILE_SCAN_DIR);
@@ -8,7 +8,7 @@
crc32.c crypt.c cyr_convert.c datetime.c dir.c dl.c dns.c exec.c \
file.c filestat.c formatted_print.c fsock.c head.c html.c image.c \
info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c microtime.c \
- pack.c pageinfo.c parsedate.c quot_print.c rand.c reg.c soundex.c \
+ pack.c pageinfo.c quot_print.c rand.c reg.c soundex.c \
string.c scanf.c syslog.c type.c uniqid.c url.c url_scanner.c var.c \
versioning.c assert.c strnatcmp.c levenshtein.c incomplete_class.c \
url_scanner_ex.c ftp_fopen_wrapper.c http_fopen_wrapper.c \
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.128&r2=1.129&ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.128
php-src/ext/standard/datetime.c:1.129
--- php-src/ext/standard/datetime.c:1.128 Tue Jun 14 17:32:29 2005
+++ php-src/ext/standard/datetime.c Sun Jun 19 18:15:26 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: datetime.c,v 1.128 2005/06/14 21:32:29 derick Exp $ */
+/* $Id: datetime.c,v 1.129 2005/06/19 22:15:26 derick Exp $ */
#if HAVE_STRPTIME
#define _XOPEN_SOURCE
@@ -35,8 +35,6 @@
#endif
#include <stdio.h>
-#include "php_parsedate.h"
-
char *mon_full_names[] = {
"January", "February", "March", "April",
"May", "June", "July", "August",
http://cvs.php.net/diff.php/php-src/ext/wddx/wddx.c?r1=1.117&r2=1.118&ty=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.117 php-src/ext/wddx/wddx.c:1.118
--- php-src/ext/wddx/wddx.c:1.117 Mon May 30 11:14:12 2005
+++ php-src/ext/wddx/wddx.c Sun Jun 19 18:15:26 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.117 2005/05/30 15:14:12 sniper Exp $ */
+/* $Id: wddx.c,v 1.118 2005/06/19 22:15:26 derick Exp $ */
#include "php.h"
@@ -34,7 +34,7 @@
#include "ext/standard/php_smart_str.h"
#include "ext/standard/html.h"
#include "ext/standard/php_string.h"
-#include "ext/standard/php_parsedate.h"
+#include "ext/date/php_date.h"
#define WDDX_BUF_LEN 256
#define PHP_CLASS_NAME_VAR "php_class_name"
http://cvs.php.net/diff.php/php-src/netware/BisonExtStandard.bat?r1=1.2&r2=1.3&ty=u
Index: php-src/netware/BisonExtStandard.bat
diff -u php-src/netware/BisonExtStandard.bat:1.2
php-src/netware/BisonExtStandard.bat:1.3
--- php-src/netware/BisonExtStandard.bat:1.2 Fri Jan 3 07:15:36 2003
+++ php-src/netware/BisonExtStandard.bat Sun Jun 19 18:15:27 2005
@@ -1,3 +1,2 @@
@echo off
-bison --output=ext\standard\parsedate.c -v -d -p phplib
ext\standard\parsedate.y
http://cvs.php.net/diff.php/php-src/netware/phplib.mak?r1=1.6&r2=1.7&ty=u
Index: php-src/netware/phplib.mak
diff -u php-src/netware/phplib.mak:1.6 php-src/netware/phplib.mak:1.7
--- php-src/netware/phplib.mak:1.6 Sat Jan 17 08:00:00 2004
+++ php-src/netware/phplib.mak Sun Jun 19 18:15:27 2005
@@ -105,7 +105,6 @@
ext/standard/microtime.c \
ext/standard/pack.c \
ext/standard/pageinfo.c \
- ext/standard/parsedate.c \
ext/standard/php_fopen_wrapper.c \
ext/standard/quot_print.c \
ext/standard/rand.c \
@@ -368,9 +367,6 @@
.PHONY: cleansrc
cleansrc:
@echo Deleting all generated source files...
- [EMAIL PROTECTED] "ext\standard\parsedate.c"
- [EMAIL PROTECTED] "ext\standard\parsedate.h"
- [EMAIL PROTECTED] "ext\standard\parsedate.output"
.PHONY: cleanobj
cleanobj:
http://cvs.php.net/diff.php/php-src/win32/php5dll.dsp?r1=1.2&r2=1.3&ty=u
Index: php-src/win32/php5dll.dsp
diff -u php-src/win32/php5dll.dsp:1.2 php-src/win32/php5dll.dsp:1.3
--- php-src/win32/php5dll.dsp:1.2 Tue May 24 11:16:24 2005
+++ php-src/win32/php5dll.dsp Sun Jun 19 18:15:27 2005
@@ -500,10 +500,6 @@
# End Source File
# Begin Source File
-SOURCE=..\ext\standard\parsedate.c
-# End Source File
-# Begin Source File
-
SOURCE=..\ext\standard\php_fopen_wrapper.c
# End Source File
# Begin Source File
@@ -1664,50 +1660,6 @@
# End Source File
# End Group
# End Group
-# Begin Group "Parsers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\ext\standard\parsedate.y
-
-!IF "$(CFG)" == "php5dll - Win32 Debug"
-
-# Begin Custom Build - Generating ext/standard/parsedate.c
-InputPath=..\ext\standard\parsedate.y
-
-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- cd ..\ext\standard
- bison --output=parsedate.c -v -d parsedate.y
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
-
-# Begin Custom Build - Generating ext/standard/parsedate.c
-InputPath=..\ext\standard\parsedate.y
-
-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- cd ..\ext\standard
- bison --output=parsedate.c -v -d parsedate.y
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
-
-# Begin Custom Build - Generating ext/standard/parsedate.c
-InputPath=..\ext\standard\parsedate.y
-
-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- cd ..\ext\standard
- bison --output=parsedate.c -v -d parsedate.y
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Group
# Begin Group "Text Files"
# PROP Default_Filter ""
http://cvs.php.net/diff.php/php-src/win32/php5dllts.dsp?r1=1.5&r2=1.6&ty=u
Index: php-src/win32/php5dllts.dsp
diff -u php-src/win32/php5dllts.dsp:1.5 php-src/win32/php5dllts.dsp:1.6
--- php-src/win32/php5dllts.dsp:1.5 Tue May 24 11:16:24 2005
+++ php-src/win32/php5dllts.dsp Sun Jun 19 18:15:27 2005
@@ -1704,10 +1704,6 @@
# End Source File
# Begin Source File
-SOURCE=..\ext\standard\parsedate.c
-# End Source File
-# Begin Source File
-
SOURCE=..\ext\standard\php_fopen_wrapper.c
# End Source File
# Begin Source File
@@ -2148,61 +2144,6 @@
# End Source File
# End Group
# End Group
-# Begin Group "Parsers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\ext\standard\parsedate.y
-
-!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
-
-# Begin Custom Build - Generating ext/standard/parsedate.c
-InputPath=..\ext\standard\parsedate.y
-
-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- cd ..\ext\standard
- bison --output=parsedate.c -v -d parsedate.y
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
-
-# Begin Custom Build - Generating ext/standard/parsedate.c
-InputPath=..\ext\standard\parsedate.y
-
-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- cd ..\ext\standard
- bison --output=parsedate.c -v -d parsedate.y
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
-
-# Begin Custom Build - Generating ext/standard/parsedate.c
-InputPath=..\ext\standard\parsedate.y
-
-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- cd ..\ext\standard
- bison --output=parsedate.c -v -d parsedate.y
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
-
-# Begin Custom Build - Generating ext/standard/parsedate.c
-InputPath=..\ext\standard\parsedate.y
-
-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- cd ..\ext\standard
- bison --output=parsedate.c -v -d parsedate.y
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Group
# Begin Group "Text Files"
# PROP Default_Filter ""
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.33&r2=1.34&ty=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.33 php-src/win32/build/Makefile:1.34
--- php-src/win32/build/Makefile:1.33 Sat Jun 4 22:33:26 2005
+++ php-src/win32/build/Makefile Sun Jun 19 18:15:27 2005
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.33 2005/06/05 02:33:26 wez Exp $
+# $Id: Makefile,v 1.34 2005/06/19 22:15:27 derick Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -30,7 +30,6 @@
generated_files: build_dirs Zend\zend_ini_parser.c \
Zend\zend_language_parser.c Zend\zend_ini_scanner.c \
Zend\zend_language_scanner.c \
- ext\standard\parsedate.c \
$(PHPDEF) $(MCFILE)
$(BUILD_DIR)\$(PHPDLL).def: $(PHP_DLL_DEF_SOURCES)
@@ -48,9 +47,6 @@
Zend\zend_language_scanner.c: Zend\flex.skl Zend\zend_language_scanner.l
$(FLEX) -i -SZend/flex.skl -Pzend -oZend/zend_language_scanner.c
Zend/zend_language_scanner.l
-ext\standard\parsedate.c ext\standard\parsedate.h: ext\standard\parsedate.y
- $(BISON) --output=ext/standard/parsedate.c -v -d
ext/standard/parsedate.y
-
PHPDLL_RES=$(BUILD_DIR)\$(PHPDLL).res
$(MCFILE): win32\build\wsyslog.mc
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
