felipe Fri, 09 Jul 2010 13:21:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301128
Log:
- Added Lemon check and flag setting
Changed paths:
U php/php-src/branches/LEMON/Makefile.frag
U php/php-src/branches/LEMON/Makefile.global
U php/php-src/branches/LEMON/Zend/Makefile.am
U php/php-src/branches/LEMON/Zend/zend_compile.c
U php/php-src/branches/LEMON/Zend/zend_language_parser.y
U php/php-src/branches/LEMON/acinclude.m4
U php/php-src/branches/LEMON/configure.in
Modified: php/php-src/branches/LEMON/Makefile.frag
===================================================================
--- php/php-src/branches/LEMON/Makefile.frag 2010-07-09 13:19:54 UTC (rev
301127)
+++ php/php-src/branches/LEMON/Makefile.frag 2010-07-09 13:21:08 UTC (rev
301128)
@@ -11,7 +11,7 @@
$(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
$(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
- $(LEMON) -q -c $(srcdir)/zend_language_parser.y || test $$? -eq 25
+ $(LEMON) $(LEMON_FLAGS) $(srcdir)/zend_language_parser.y || test $$?
-eq 25
$(srcdir)/zend_ini_parser.h: $(srcdir)/zend_ini_parser.c
$(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
Modified: php/php-src/branches/LEMON/Makefile.global
===================================================================
--- php/php-src/branches/LEMON/Makefile.global 2010-07-09 13:19:54 UTC (rev
301127)
+++ php/php-src/branches/LEMON/Makefile.global 2010-07-09 13:21:08 UTC (rev
301128)
@@ -1,7 +1,6 @@
mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
INSTALL = $(top_srcdir)/build/shtool install -c
INSTALL_DATA = $(INSTALL) -m 644
-LEMON=lemon
DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main
-I$(top_srcdir)
COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)
$(PHP_FRAMEWORKPATH)
Modified: php/php-src/branches/LEMON/Zend/Makefile.am
===================================================================
--- php/php-src/branches/LEMON/Zend/Makefile.am 2010-07-09 13:19:54 UTC (rev
301127)
+++ php/php-src/branches/LEMON/Zend/Makefile.am 2010-07-09 13:21:08 UTC (rev
301128)
@@ -35,7 +35,7 @@
zend_language_parser.h: zend_language_parser.c
zend_language_parser.c: $(srcdir)/zend_language_parser.y
- $(LEMON) -q -c $(srcdir)/zend_language_parser.y || test $$? -eq 25
+ $(LEMON) $(LEMON_FLAGS) $(srcdir)/zend_language_parser.y || test $$?
-eq 25
# INI parser/scanner rules
Modified: php/php-src/branches/LEMON/Zend/zend_compile.c
===================================================================
--- php/php-src/branches/LEMON/Zend/zend_compile.c 2010-07-09 13:19:54 UTC
(rev 301127)
+++ php/php-src/branches/LEMON/Zend/zend_compile.c 2010-07-09 13:21:08 UTC
(rev 301128)
@@ -6105,9 +6105,6 @@
{
int token;
void *pParser;
-#ifndef ZTS
- void ***tsrm_ls;
-#endif
if ((pParser = ParseAlloc(malloc)) == NULL) {
ParseFree(pParser, free);
@@ -6148,7 +6145,7 @@
break;
}
default:
- Parse(pParser, token, zendlval, tsrm_ls);
+ Parse(pParser, token, zendlval TSRMLS_CC);
break;
}
if (token == 0) {
Modified: php/php-src/branches/LEMON/Zend/zend_language_parser.y
===================================================================
--- php/php-src/branches/LEMON/Zend/zend_language_parser.y 2010-07-09
13:19:54 UTC (rev 301127)
+++ php/php-src/branches/LEMON/Zend/zend_language_parser.y 2010-07-09
13:21:08 UTC (rev 301128)
@@ -48,7 +48,7 @@
%token_type {znode}
%ifdef ZTS
- %extra_argument {void ***tsrm_ls}
+ %extra_argument {void ***tsrm_ls}
%endif
%type function_call_ns_i {znode_array}
Modified: php/php-src/branches/LEMON/acinclude.m4
===================================================================
--- php/php-src/branches/LEMON/acinclude.m4 2010-07-09 13:19:54 UTC (rev
301127)
+++ php/php-src/branches/LEMON/acinclude.m4 2010-07-09 13:21:08 UTC (rev
301128)
@@ -2096,7 +2096,26 @@
PHP_SUBST(YACC)
])
+
dnl
+dnl PHP_PROG_LEMON
+dnl
+dnl Search for lemon binary and check its version
+dnl
+AC_DEFUN([PHP_PROG_LEMON],[
+ AC_CHECK_PROG(LEMON, lemon, lemon)
+ if test "$LEMON"; then
+ AC_CACHE_CHECK([for lemon version], php_cv_lemon_version, [
+ lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'`
+ php_cv_lemon_version="$lemon_check_version (ok)"
+ ])
+ else
+ lemon_version=none
+ fi
+ PHP_SUBST(LEMON)
+])
+
+dnl
dnl PHP_PROG_LEX
dnl
dnl Search for (f)lex and check it's version
Modified: php/php-src/branches/LEMON/configure.in
===================================================================
--- php/php-src/branches/LEMON/configure.in 2010-07-09 13:19:54 UTC (rev
301127)
+++ php/php-src/branches/LEMON/configure.in 2010-07-09 13:21:08 UTC (rev
301128)
@@ -149,6 +149,7 @@
dnl Checks for some support/generator progs
PHP_PROG_AWK
PHP_PROG_BISON
+PHP_PROG_LEMON
PHP_PROG_RE2C
dnl Check if bison generated files exist when bison does not..
@@ -1053,9 +1054,12 @@
if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
AC_DEFINE(ZTS,1,[ ])
PHP_THREAD_SAFETY=yes
+ LEMON_FLAGS="-c -q D=ZTS"
else
PHP_THREAD_SAFETY=no
+ LEMON_FLAGS="-c -q"
fi
+PHP_SUBST(LEMON_FLAGS)
INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM"
INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
