Browse Source
- Rewrite scanner to be based on re2c instead of flex
- Rewrite scanner to be based on re2c instead of flex
The full patch is available as: http://php.net/~helly/php-re2c-5.3-20080316.diff.txt This is against php-re2c repository version 98 An older patch against version 97 is available under: http://php.net/~helly/php-re2c-97-20080316.diff.txtPECL
Marcus Boerger
18 years ago
59 changed files with 1049 additions and 2995 deletions
-
4Makefile.frag
-
1NEWS
-
186Zend/FlexLexer.h
-
6Zend/Makefile.am
-
15Zend/Zend.m4
-
1Zend/configure.in
-
1648Zend/flex.skl
-
7Zend/tests/bug42767.phpt
-
35Zend/zend.c
-
63Zend/zend_compile.c
-
8Zend/zend_compile.h
-
82Zend/zend_globals.h
-
11Zend/zend_globals_macros.h
-
22Zend/zend_highlight.c
-
2Zend/zend_ini_parser.y
-
1Zend/zend_ini_scanner.h
-
217Zend/zend_ini_scanner.l
-
28Zend/zend_language_scanner.h
-
740Zend/zend_language_scanner.l
-
11Zend/zend_stack.c
-
310Zend/zend_stream.c
-
63Zend/zend_stream.h
-
2Zend/zend_strtod.c
-
2Zend/zend_vm_def.h
-
8Zend/zend_vm_execute.h
-
71acinclude.m4
-
31configure.in
-
2ext/spl/php_spl.c
-
8ext/standard/tests/strings/006.phpt
-
6ext/standard/tests/strings/007.phpt
-
17ext/standard/tests/strings/highlight_file.phpt
-
2ext/standard/tests/strings/strip_tags_basic1.phpt
-
2ext/standard/tests/strings/strip_tags_basic2.phpt
-
2ext/standard/tests/strings/strip_tags_error.phpt
-
2ext/standard/tests/strings/strip_tags_variation1.phpt
-
2ext/standard/tests/strings/strip_tags_variation10.phpt
-
2ext/standard/tests/strings/strip_tags_variation2.phpt
-
2ext/standard/tests/strings/strip_tags_variation3.phpt
-
2ext/standard/tests/strings/strip_tags_variation4.phpt
-
2ext/standard/tests/strings/strip_tags_variation5.phpt
-
2ext/standard/tests/strings/strip_tags_variation6.phpt
-
2ext/standard/tests/strings/strip_tags_variation7.phpt
-
2ext/standard/tests/strings/strip_tags_variation8.phpt
-
2ext/standard/tests/strings/strip_tags_variation9.phpt
-
4ext/tokenizer/Makefile.frag
-
13ext/tokenizer/tests/token_get_all_variation14.phpt
-
62ext/tokenizer/tokenizer.c
-
48main/main.c
-
8sapi/apache/mod_php5.c
-
8sapi/apache_hooks/mod_php5.c
-
6sapi/cgi/cgi_main.c
-
4sapi/cgi/tests/007.phpt
-
5sapi/cli/php_cli.c
-
23sapi/cli/tests/010.phpt
-
105sapi/cli/tests/016.phpt
-
106sapi/cli/tests/017.phpt
-
6sapi/tests/test003.phpt
-
6sapi/tests/test004.phpt
-
6win32/build/config.w32
@ -1,186 +0,0 @@ |
|||
// $Header$ |
|||
|
|||
// FlexLexer.h -- define interfaces for lexical analyzer classes generated |
|||
// by flex |
|||
|
|||
// Copyright (c) 1993 The Regents of the University of California. |
|||
// All rights reserved. |
|||
// |
|||
// This code is derived from software contributed to Berkeley by |
|||
// Kent Williams and Tom Epperly. |
|||
// |
|||
// Redistribution and use in source and binary forms with or without |
|||
// modification are permitted provided that: (1) source distributions retain |
|||
// this entire copyright notice and comment, and (2) distributions including |
|||
// binaries display the following acknowledgement: ``This product includes |
|||
// software developed by the University of California, Berkeley and its |
|||
// contributors'' in the documentation or other materials provided with the |
|||
// distribution and in all advertising materials mentioning features or use |
|||
// of this software. Neither the name of the University nor the names of |
|||
// its contributors may be used to endorse or promote products derived from |
|||
// this software without specific prior written permission. |
|||
|
|||
// THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED |
|||
// WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF |
|||
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
|||
|
|||
// This file defines FlexLexer, an abstract class which specifies the |
|||
// external interface provided to flex C++ lexer objects, and yyFlexLexer, |
|||
// which defines a particular lexer class. |
|||
// |
|||
// If you want to create multiple lexer classes, you use the -P flag |
|||
// to rename each yyFlexLexer to some other xxFlexLexer. You then |
|||
// include <FlexLexer.h> in your other sources once per lexer class: |
|||
// |
|||
// #undef yyFlexLexer |
|||
// #define yyFlexLexer xxFlexLexer |
|||
// #include <FlexLexer.h> |
|||
// |
|||
// #undef yyFlexLexer |
|||
// #define yyFlexLexer zzFlexLexer |
|||
// #include <FlexLexer.h> |
|||
// ... |
|||
|
|||
#ifndef FLEXLEXER_H |
|||
// Never included before - need to define base class. |
|||
#define FLEXLEXER_H |
|||
#include <iostream.h> |
|||
|
|||
extern "C++" { |
|||
|
|||
struct yy_buffer_state; |
|||
typedef int yy_state_type; |
|||
|
|||
class FlexLexer { |
|||
public: |
|||
virtual ~FlexLexer() { } |
|||
|
|||
const char* YYText() { return yytext; } |
|||
int YYLeng() { return yyleng; } |
|||
|
|||
virtual void |
|||
yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0; |
|||
virtual struct yy_buffer_state* |
|||
yy_create_buffer( istream* s, int size ) = 0; |
|||
virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0; |
|||
virtual void yyrestart( istream* s ) = 0; |
|||
|
|||
virtual int yylex() = 0; |
|||
|
|||
// Call yylex with new input/output sources. |
|||
int yylex( istream* new_in, ostream* new_out = 0 ) |
|||
{ |
|||
switch_streams( new_in, new_out ); |
|||
return yylex(); |
|||
} |
|||
|
|||
// Switch to new input/output streams. A nil stream pointer |
|||
// indicates "keep the current one". |
|||
virtual void switch_streams( istream* new_in = 0, |
|||
ostream* new_out = 0 ) = 0; |
|||
|
|||
int lineno() const { return yylineno; } |
|||
|
|||
int debug() const { return yy_flex_debug; } |
|||
void set_debug( int flag ) { yy_flex_debug = flag; } |
|||
|
|||
protected: |
|||
char* yytext; |
|||
int yyleng; |
|||
int yylineno; // only maintained if you use %option yylineno |
|||
int yy_flex_debug; // only has effect with -d or "%option debug" |
|||
}; |
|||
|
|||
} |
|||
#endif |
|||
|
|||
#if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce) |
|||
// Either this is the first time through (yyFlexLexerOnce not defined), |
|||
// or this is a repeated include to define a different flavor of |
|||
// yyFlexLexer, as discussed in the flex man page. |
|||
#define yyFlexLexerOnce |
|||
|
|||
class yyFlexLexer : public FlexLexer { |
|||
public: |
|||
// arg_yyin and arg_yyout default to the cin and cout, but we |
|||
// only make that assignment when initializing in yylex(). |
|||
yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 ); |
|||
|
|||
virtual ~yyFlexLexer(); |
|||
|
|||
void yy_switch_to_buffer( struct yy_buffer_state* new_buffer ); |
|||
struct yy_buffer_state* yy_create_buffer( istream* s, int size ); |
|||
void yy_delete_buffer( struct yy_buffer_state* b ); |
|||
void yyrestart( istream* s ); |
|||
|
|||
virtual int yylex(); |
|||
virtual void switch_streams( istream* new_in, ostream* new_out ); |
|||
|
|||
protected: |
|||
virtual int LexerInput( char* buf, int max_size ); |
|||
virtual void LexerOutput( const char* buf, int size ); |
|||
virtual void LexerError( const char* msg ); |
|||
|
|||
void yyunput( int c, char* buf_ptr ); |
|||
int yyinput(); |
|||
|
|||
void yy_load_buffer_state(); |
|||
void yy_init_buffer( struct yy_buffer_state* b, istream* s ); |
|||
void yy_flush_buffer( struct yy_buffer_state* b ); |
|||
|
|||
int yy_start_stack_ptr; |
|||
int yy_start_stack_depth; |
|||
int* yy_start_stack; |
|||
|
|||
void yy_push_state( int new_state ); |
|||
void yy_pop_state(); |
|||
int yy_top_state(); |
|||
|
|||
yy_state_type yy_get_previous_state(); |
|||
yy_state_type yy_try_NUL_trans( yy_state_type current_state ); |
|||
int yy_get_next_buffer(); |
|||
|
|||
istream* yyin; // input source for default LexerInput |
|||
ostream* yyout; // output sink for default LexerOutput |
|||
|
|||
struct yy_buffer_state* yy_current_buffer; |
|||
|
|||
// yy_hold_char holds the character lost when yytext is formed. |
|||
char yy_hold_char; |
|||
|
|||
// Number of characters read into yy_ch_buf. |
|||
int yy_n_chars; |
|||
|
|||
// Points to current character in buffer. |
|||
char* yy_c_buf_p; |
|||
|
|||
int yy_init; // whether we need to initialize |
|||
int yy_start; // start state number |
|||
|
|||
// Flag which is used to allow yywrap()'s to do buffer switches |
|||
// instead of setting up a fresh yyin. A bit of a hack ... |
|||
int yy_did_buffer_switch_on_eof; |
|||
|
|||
// The following are not always needed, but may be depending |
|||
// on use of certain flex features (like REJECT or yymore()). |
|||
|
|||
yy_state_type yy_last_accepting_state; |
|||
char* yy_last_accepting_cpos; |
|||
|
|||
yy_state_type* yy_state_buf; |
|||
yy_state_type* yy_state_ptr; |
|||
|
|||
char* yy_full_match; |
|||
int* yy_full_state; |
|||
int yy_full_lp; |
|||
|
|||
int yy_lp; |
|||
int yy_looking_for_trail_begin; |
|||
|
|||
int yy_more_flag; |
|||
int yy_more_len; |
|||
int yy_more_offset; |
|||
int yy_prev_more_offset; |
|||
}; |
|||
|
|||
#endif |
|||
1648
Zend/flex.skl
File diff suppressed because it is too large
View File
File diff suppressed because it is too large
View File
740
Zend/zend_language_scanner.l
File diff suppressed because it is too large
View File
File diff suppressed because it is too large
View File
@ -1,2 +1,2 @@ |
|||
$(top_srcdir)/Zend/zend_language_parser.h: |
|||
$(builddir)/tokenizer.lo: $(top_srcdir)/Zend/zend_language_parser.h |
|||
|
|||
$(builddir)/tokenizer.lo: $(top_srcdir)/Zend/zend_language_parser.c $(top_srcdir)/Zend/zend_language_scanner.c |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue