Revert "Try to reorganize language scanner dependencies"

This reverts commit 18cfbfe.

Author: nikic

Zend/zend_compile.h

@@ -27,57 +27,6 @@
 
 #include "zend_llist.h"
 
-#include "zend_stack.h"
-#include "zend_ptr_stack.h"
-#include "zend_multibyte.h"
-#include "zend_arena.h"
-
-typedef enum {
-	ON_TOKEN,
-	ON_FEEDBACK,
-	ON_STOP
-} zend_php_scanner_event;
-
-typedef struct _zend_lex_state {
-	unsigned int yy_leng;
-	unsigned char *yy_start;
-	unsigned char *yy_text;
-	unsigned char *yy_cursor;
-	unsigned char *yy_marker;
-	unsigned char *yy_limit;
-	int yy_state;
-	zend_stack state_stack;
-	zend_ptr_stack heredoc_label_stack;
-
-	zend_file_handle *in;
-	uint32_t lineno;
-	zend_string *filename;
-
-	/* original (unfiltered) script */
-	unsigned char *script_org;
-	size_t script_org_size;
-
-	/* filtered script */
-	unsigned char *script_filtered;
-	size_t script_filtered_size;
-
-	/* input/output filters */
-	zend_encoding_filter input_filter;
-	zend_encoding_filter output_filter;
-	const zend_encoding *script_encoding;
-
-	/* hooks */
-	void (*on_event)(zend_php_scanner_event event, int token, int line, void *context);
-	void *on_event_context;
-
-	zend_ast *ast;
-	zend_arena *ast_arena;
-} zend_lex_state;
-
-ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state);
-ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state);
-ZEND_API int zend_prepare_string_for_scanning(zval *str, const char *filename);
-
 #define SET_UNUSED(op)  op ## _type = IS_UNUSED
 
 #define MAKE_NOP(opline) do { \
@@ -432,7 +381,7 @@ typedef struct _zend_internal_arg_info {
 typedef struct _zend_arg_info {
 	zend_string *name;
 	zend_type type;
-	void *_unused;
+	zend_string *default_value;
 } zend_arg_info;
 
 /* the following structure repeats the layout of zend_internal_arg_info,

Zend/zend_globals.h

@@ -266,6 +266,12 @@ struct _zend_ini_scanner_globals {
 	int scanner_mode;
 };
 
+typedef enum {
+	ON_TOKEN,
+	ON_FEEDBACK,
+	ON_STOP
+} zend_php_scanner_event;
+
 struct _zend_php_scanner_globals {
 	zend_file_handle *yy_in;
 	zend_file_handle *yy_out;

Zend/zend_language_scanner.h

@@ -20,6 +20,42 @@
 #ifndef ZEND_SCANNER_H
 #define ZEND_SCANNER_H
 
+typedef struct _zend_lex_state {
+	unsigned int yy_leng;
+	unsigned char *yy_start;
+	unsigned char *yy_text;
+	unsigned char *yy_cursor;
+	unsigned char *yy_marker;
+	unsigned char *yy_limit;
+	int yy_state;
+	zend_stack state_stack;
+	zend_ptr_stack heredoc_label_stack;
+
+	zend_file_handle *in;
+	uint32_t lineno;
+	zend_string *filename;
+
+	/* original (unfiltered) script */
+	unsigned char *script_org;
+	size_t script_org_size;
+
+	/* filtered script */
+	unsigned char *script_filtered;
+	size_t script_filtered_size;
+
+	/* input/output filters */
+	zend_encoding_filter input_filter;
+	zend_encoding_filter output_filter;
+	const zend_encoding *script_encoding;
+
+	/* hooks */
+	void (*on_event)(zend_php_scanner_event event, int token, int line, void *context);
+	void *on_event_context;
+
+	zend_ast *ast;
+	zend_arena *ast_arena;
+} zend_lex_state;
+
 typedef struct _zend_heredoc_label {
 	char *label;
 	int length;
@@ -28,6 +64,9 @@ typedef struct _zend_heredoc_label {
 } zend_heredoc_label;
 
 BEGIN_EXTERN_C()
+ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state);
+ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state);
+ZEND_API int zend_prepare_string_for_scanning(zval *str, const char *filename);
 ZEND_API void zend_multibyte_yyinput_again(zend_encoding_filter old_input_filter, const zend_encoding *old_encoding);
 ZEND_API int zend_multibyte_set_filter(const zend_encoding *onetime_encoding);
 ZEND_API void zend_lex_tstring(zval *zv);

ext/reflection/Makefile.frag

@@ -0,0 +1,4 @@
+$(top_srcdir)/Zend/zend_language_parser.c:
+$(top_srcdir)/Zend/zend_language_scanner.c:
+$(top_srcdir)/ext/reflection/php_reflection.c: $(top_srcdir)/Zend/zend_language_parser.h
+$(builddir)/reflection.lo: $(top_srcdir)/Zend/zend_language_parser.c $(top_srcdir)/Zend/zend_language_scanner.c

ext/reflection/config.m4

@@ -1 +1,2 @@
 PHP_NEW_EXTENSION(reflection, php_reflection.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+PHP_ADD_MAKEFILE_FRAGMENT

ext/reflection/php_reflection.c

@@ -31,6 +31,8 @@
 
 #include "zend.h"
 #include "zend_API.h"
+#include "zend_language_scanner.h"
+#include "zend_language_scanner_defs.h"
 #include "zend_exceptions.h"
 #include "zend_operators.h"
 #include "zend_constants.h"

scripts/dev/genfiles

@@ -124,6 +124,11 @@ $MAKE RE2C="$RE2C" RE2C_FLAGS="$RE2C_FLAGS" srcdir=ext/pdo builddir=ext/pdo top_
   -f ext/pdo/Makefile.frag \
   ext/pdo/pdo_sql_parser.c
 
+echo "genfiles: Generating reflection extension lexer files"
+$MAKE RE2C="$RE2C" RE2C_FLAGS="$RE2C_FLAGS" srcdir=ext/reflection builddir=ext/reflection top_srcdir=. \
+  -f ext/reflection/Makefile.frag \
+  ext/reflection/php_reflection.c
+
 echo "genfiles: Generating standard extension lexer files"
 $MAKE RE2C="$RE2C" RE2C_FLAGS="$RE2C_FLAGS" srcdir=ext/standard builddir=ext/standard top_srcdir=. \
   -f ext/standard/Makefile.frag \