diff options
Diffstat (limited to 'Zend/zend_highlight.c')
| -rw-r--r-- | Zend/zend_highlight.c | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c index a229fb6dda..171789b83b 100644 --- a/Zend/zend_highlight.c +++ b/Zend/zend_highlight.c @@ -26,7 +26,7 @@ #include "zend_ptr_stack.h" #include "zend_globals.h" -ZEND_API void zend_html_putc(char c) /* {{{ */ +ZEND_API void zend_html_putc(char c) { switch (c) { case '\n': @@ -52,9 +52,9 @@ ZEND_API void zend_html_putc(char c) /* {{{ */ break; } } -/* }}} */ -ZEND_API void zend_html_puts(const char *s, uint len TSRMLS_DC) /* {{{ */ + +ZEND_API void zend_html_puts(const char *s, uint len TSRMLS_DC) { const char *ptr=s, *end=s+len; @@ -85,9 +85,9 @@ ZEND_API void zend_html_puts(const char *s, uint len TSRMLS_DC) /* {{{ */ } #endif /* ZEND_MULTIBYTE */ } -/* }}} */ -ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini TSRMLS_DC) /* {{{ */ + +ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini TSRMLS_DC) { zval token; int token_type; @@ -97,7 +97,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini zend_printf("<code>"); zend_printf("<span style=\"color: %s\">\n", last_color); /* highlight stuff coming back from zendlex() */ - Z_TYPE(token) = 0; + token.type = 0; while ((token_type=lex_scan(&token TSRMLS_CC))) { switch (token_type) { case T_INLINE_HTML: @@ -121,11 +121,11 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini break; case T_WHITESPACE: zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(yy_leng) TSRMLS_CC); /* no color needed */ - Z_TYPE(token) = 0; + token.type = 0; continue; break; default: - if (Z_TYPE(token) == 0) { + if (token.type == 0) { next_color = syntax_highlighter_ini->highlight_keyword; } else { next_color = syntax_highlighter_ini->highlight_default; @@ -145,7 +145,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini zend_html_puts(LANG_SCNG(yy_text), LANG_SCNG(yy_leng) TSRMLS_CC); - if (Z_TYPE(token) == IS_STRING) { + if (token.type == IS_STRING) { switch (token_type) { case T_OPEN_TAG: case T_OPEN_TAG_WITH_ECHO: @@ -155,13 +155,13 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini case T_DOC_COMMENT: break; default: - efree(Z_STRVAL(token)); + efree(token.value.str.val); break; } } else if (token_type == T_END_HEREDOC) { - efree(Z_STRVAL(token)); + efree(token.value.str.val); } - Z_TYPE(token) = 0; + token.type = 0; } if (last_color != syntax_highlighter_ini->highlight_html) { @@ -170,15 +170,14 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini zend_printf("</span>\n"); zend_printf("</code>"); } -/* }}} */ -ZEND_API void zend_strip(TSRMLS_D) /* {{{ */ +ZEND_API void zend_strip(TSRMLS_D) { zval token; int token_type; int prev_space = 0; - Z_TYPE(token) = 0; + token.type = 0; while ((token_type=lex_scan(&token TSRMLS_CC))) { switch (token_type) { case T_WHITESPACE: @@ -189,19 +188,19 @@ ZEND_API void zend_strip(TSRMLS_D) /* {{{ */ /* lack of break; is intentional */ case T_COMMENT: case T_DOC_COMMENT: - Z_TYPE(token) = 0; + token.type = 0; continue; - + case T_END_HEREDOC: zend_write(LANG_SCNG(yy_text), LANG_SCNG(yy_leng)); - efree(Z_STRVAL(token)); + efree(token.value.str.val); /* read the following character, either newline or ; */ if (lex_scan(&token TSRMLS_CC) != T_WHITESPACE) { zend_write(LANG_SCNG(yy_text), LANG_SCNG(yy_leng)); } zend_write("\n", sizeof("\n") - 1); prev_space = 1; - Z_TYPE(token) = 0; + token.type = 0; continue; default: @@ -209,7 +208,7 @@ ZEND_API void zend_strip(TSRMLS_D) /* {{{ */ break; } - if (Z_TYPE(token) == IS_STRING) { + if (token.type == IS_STRING) { switch (token_type) { case T_OPEN_TAG: case T_OPEN_TAG_WITH_ECHO: @@ -220,14 +219,13 @@ ZEND_API void zend_strip(TSRMLS_D) /* {{{ */ break; default: - efree(Z_STRVAL(token)); + efree(token.value.str.val); break; } } - prev_space = Z_TYPE(token) = 0; + prev_space = token.type = 0; } } -/* }}} */ /* * Local variables: @@ -236,3 +234,4 @@ ZEND_API void zend_strip(TSRMLS_D) /* {{{ */ * indent-tabs-mode: t * End: */ + |