Support interactive mode in thread-safe builds

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index c8f5aaa9811500bb30015e3ce1acc946da84a0ec..0328a4d49d689769597da04a6700d68c7e43ab3d 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -35,11 +35,7 @@
 
 #define DEBUG_ZEND 0
 
-#ifndef ZTS
-# define SUPPORT_INTERACTIVE 1
-#else
-# define SUPPORT_INTERACTIVE 0
-#endif
+#define SUPPORT_INTERACTIVE 1
 
 #define FREE_PNODE(znode)      zval_dtor(&znode->u.constant);
 #define FREE_OP(op, should_free) if (should_free) zval_dtor(&Ts[(op)->u.var].tmp_var);

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 528c09e765ca6d277839d029b37173684c53dac6..b1ddec2f127ed00d1097acf1cd779832e76fd0e9 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -139,7 +139,7 @@ start:
 ;
 
 top_statement_list:    
-               top_statement_list  { zend_do_extended_info(CLS_C); } top_statement { HANDLE_INTERACTIVE(); }
+               top_statement_list  { zend_do_extended_info(CLS_C); } top_statement { ELS_FETCH(); HANDLE_INTERACTIVE(); }
        |       /* empty */
 ;
 
@@ -151,7 +151,7 @@ top_statement:
 
 
 inner_statement_list:
-               inner_statement_list  { zend_do_extended_info(CLS_C); } inner_statement { HANDLE_INTERACTIVE(); }
+               inner_statement_list  { zend_do_extended_info(CLS_C); } inner_statement { ELS_FETCH(); HANDLE_INTERACTIVE(); }
        |       /* empty */
 ;
 

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 5e5ecb0d4faa0bf2b301215a24bf83d69d1236f3..82aa8b9a03e860ee3c3cfb941b573624db67c56b 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -78,6 +78,10 @@
 #define YY_DECL int lex_scan(zval *zendlval CLS_DC)
 #endif
 
+#if SUPPORT_INTERACTIVE
+#define YY_INTERACTIVE
+#endif
+
 #define ECHO { ZEND_WRITE( yytext, yyleng ); }
 
 #ifdef ZTS