diff options
| author | Marcus Boerger <helly@php.net> | 2008-03-16 21:06:55 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2008-03-16 21:06:55 +0000 |
| commit | af316021e8f69896cd0d246114962e48b973972f (patch) | |
| tree | 7bf0e294155631040c03c6b76ab3b96dce967b94 /Zend/zend_highlight.c | |
| parent | eb8f83a98e7fbfa206601fa5016cc211eb78e024 (diff) | |
| download | php-git-af316021e8f69896cd0d246114962e48b973972f.tar.gz | |
- 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.txt
Diffstat (limited to 'Zend/zend_highlight.c')
| -rw-r--r-- | Zend/zend_highlight.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c index f21ed23557..ff3f8fe0b9 100644 --- a/Zend/zend_highlight.c +++ b/Zend/zend_highlight.c @@ -58,17 +58,6 @@ ZEND_API void zend_html_puts(const char *s, uint len TSRMLS_DC) { const char *ptr=s, *end=s+len; -#ifdef ZEND_MULTIBYTE - char *filtered; - int filtered_len; - - if (LANG_SCNG(output_filter)) { - LANG_SCNG(output_filter)(&filtered, &filtered_len, s, len TSRMLS_CC); - ptr = filtered; - end = filtered + filtered_len; - } -#endif /* ZEND_MULTIBYTE */ - while (ptr<end) { if (*ptr==' ') { do { @@ -78,16 +67,9 @@ ZEND_API void zend_html_puts(const char *s, uint len TSRMLS_DC) zend_html_putc(*ptr++); } } - -#ifdef ZEND_MULTIBYTE - if (LANG_SCNG(output_filter)) { - efree(filtered); - } -#endif /* ZEND_MULTIBYTE */ } - ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini TSRMLS_DC) { zval token; @@ -180,7 +162,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini } /* handler for trailing comments, see bug #42767 */ - if (LANG_SCNG(yy_leng) && LANG_SCNG(_yy_more_len)) { + if (LANG_SCNG(yy_leng) && LANG_SCNG(yy_text) < LANG_SCNG(yy_limit)) { if (last_color != syntax_highlighter_ini->highlight_comment) { if (last_color != syntax_highlighter_ini->highlight_html) { zend_printf("</span>"); @@ -189,7 +171,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini zend_printf("<span style=\"color: %s\">", syntax_highlighter_ini->highlight_comment); } } - zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(_yy_more_len) TSRMLS_CC); + zend_html_puts(LANG_SCNG(yy_text), (LANG_SCNG(yy_limit) - LANG_SCNG(yy_text)) TSRMLS_CC); } done: if (last_color != syntax_highlighter_ini->highlight_html) { |