archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Drop zend_indent() as it was never used, complete or working

Browse source
This commit is contained in:
Kalle Sommer Nielsen 2015-03-27 20:04:46 +01:00
parent c64f5e3332
commit 8153286efe
12 changed files with 4 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.frag
View file

@ -20,4 +20,4 @@ $(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
$(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l $(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l) @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
$(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h

2
Zend/Makefile.am
View file

@ -12,7 +12,7 @@ libZend_la_SOURCES=\
zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \ zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \ zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \ zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \ zend_list.c zend_builtin_functions.c zend_sprintf.c \
zend_ini.c zend_sort.c zend_objects.c zend_object_handlers.c \ zend_ini.c zend_sort.c zend_objects.c zend_object_handlers.c \
zend_objects_API.c zend_ts_hash.c zend_stream.c \ zend_objects_API.c zend_ts_hash.c zend_stream.c \
zend_default_classes.c \ zend_default_classes.c \

155
Zend/zend_indent.c
View file

@ -1,155 +0,0 @@
/*
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.zend.com/license/2_00.txt. |
| If you did not receive a copy of the Zend license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@zend.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Andi Gutmans <andi@zend.com> |
| Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
/* This indenter doesn't really work, it's here for no particular reason. */
#include "zend.h"
#include <zend_language_parser.h>
#include "zend_compile.h"
#include "zend_indent.h"
#define zendtext LANG_SCNG(yy_text)
#define zendleng LANG_SCNG(yy_leng)
static void handle_whitespace(unsigned int *emit_whitespace)
{
unsigned char c;
unsigned int i;
for (c=0; c<128; c++) {
if (emit_whitespace[c]>0) {
for (i=0; i<emit_whitespace[c]; i++) {
zend_write((char *) &c, 1);
}
}
}
memset(emit_whitespace, 0, sizeof(int)*256);
}
ZEND_API void zend_indent(void)
{
zval token;
int token_type;
int in_string=0;
unsigned int nest_level=0;
unsigned int emit_whitespace[256];
unsigned int i;
memset(emit_whitespace, 0, sizeof(int)*256);
/* highlight stuff coming back from zendlex() */
ZVAL_UNDEF(&token);
while ((token_type=lex_scan(&token))) {
switch (token_type) {
case T_INLINE_HTML:
zend_write((char*)LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
break;
case T_WHITESPACE: {
ZVAL_UNDEF(&token);
/* eat whitespace, emit newlines */
for (i=0; i<LANG_SCNG(yy_leng); i++) {
emit_whitespace[(unsigned char) LANG_SCNG(yy_text)[i]]++;
}
continue;
}
break;
case '"':
in_string = !in_string;
/* break missing intentionally */
default:
if (Z_TYPE(token) == IS_UNDEF) {
/* keyword */
switch (token_type) {
case ',':
ZEND_PUTS(", ");
goto dflt_printout;
break;
case '{':
nest_level++;
if (emit_whitespace['\n']>0) {
ZEND_PUTS(" {\n");
memset(emit_whitespace, 0, sizeof(int)*256);
} else {
ZEND_PUTS("{");
}
break;
case '}':
nest_level--;
if (emit_whitespace['\n']==0) {
ZEND_PUTS("\n");
}
for (i=0; i<nest_level; i++) {
ZEND_PUTS(" ");
}
goto dflt_printout;
break;
dflt_printout:
default:
if (emit_whitespace['\n']>0) {
for (i=0; i<emit_whitespace['\n']; i++) {
ZEND_PUTS("\n");
}
memset(emit_whitespace, 0, sizeof(int)*256);
for (i=0; i<nest_level; i++) {
ZEND_PUTS(" ");
}
} else {
handle_whitespace(emit_whitespace);
}
zend_write((char*)LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
break;
}
} else {
handle_whitespace(emit_whitespace);
if (in_string) {
zend_write((char*)LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
/* a part of a string */
} else {
zend_write((char*)LANG_SCNG(yy_text), LANG_SCNG(yy_leng));
}
}
break;
}
if (Z_TYPE(token) == IS_STRING) {
switch (token_type) {
case T_OPEN_TAG:
case T_CLOSE_TAG:
case T_WHITESPACE:
break;
default:
zend_string_release(Z_STR(token));
break;
}
}
ZVAL_UNDEF(&token);
}
}
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* indent-tabs-mode: t
* End:
*/

37
Zend/zend_indent.h
View file

@ -1,37 +0,0 @@
/*
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.zend.com/license/2_00.txt. |
| If you did not receive a copy of the Zend license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@zend.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Andi Gutmans <andi@zend.com> |
| Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#ifndef ZEND_INDENT_H
#define ZEND_INDENT_H
BEGIN_EXTERN_C()
ZEND_API void zend_indent(void);
END_EXTERN_C()
#endif /* ZEND_INDENT_H */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* indent-tabs-mode: t
* End:
*/

2
configure.in
View file

@ -1489,7 +1489,7 @@ PHP_ADD_SOURCES(Zend, \
zend_execute_API.c zend_highlight.c zend_llist.c \ zend_execute_API.c zend_highlight.c zend_llist.c \
zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \ zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \ zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \ zend_list.c zend_builtin_functions.c zend_sprintf.c \
zend_ini.c zend_sort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \ zend_ini.c zend_sort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \ zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \
zend_closures.c zend_float.c zend_string.c zend_signal.c zend_generators.c \ zend_closures.c zend_float.c zend_string.c zend_signal.c zend_generators.c \

1
ext/readline/readline_cli.c
View file

@ -58,7 +58,6 @@
#include "zend_compile.h" #include "zend_compile.h"
#include "zend_execute.h" #include "zend_execute.h"
#include "zend_highlight.h" #include "zend_highlight.h"
#include "zend_indent.h"
#include "zend_exceptions.h" #include "zend_exceptions.h"
#include "sapi/cli/cli.h" #include "sapi/cli/cli.h"

11
main/main.c
View file

@ -80,7 +80,6 @@
#include "zend_compile.h" #include "zend_compile.h"
#include "zend_execute.h" #include "zend_execute.h"
#include "zend_highlight.h" #include "zend_highlight.h"
#include "zend_indent.h"
#include "zend_extensions.h" #include "zend_extensions.h"
#include "zend_ini.h" #include "zend_ini.h"
#include "zend_dtrace.h" #include "zend_dtrace.h"
@ -2660,16 +2659,6 @@ PHPAPI int php_lint_script(zend_file_handle *file)
} }
/* }}} */ /* }}} */
#ifdef PHP_WIN32
/* {{{ dummy_indent
just so that this symbol gets exported... */
PHPAPI void dummy_indent(void)
{
zend_indent();
}
/* }}} */
#endif
/* /*
* Local variables: * Local variables:
* tab-width: 4 * tab-width: 4

18
sapi/cgi/cgi_main.c
View file

@ -87,7 +87,6 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
#include "zend_compile.h" #include "zend_compile.h"
#include "zend_execute.h" #include "zend_execute.h"
#include "zend_highlight.h" #include "zend_highlight.h"
#include "zend_indent.h"
#include "php_getopt.h" #include "php_getopt.h"
@ -127,7 +126,6 @@ static pid_t pgroup;
#define PHP_MODE_STANDARD 1 #define PHP_MODE_STANDARD 1
#define PHP_MODE_HIGHLIGHT 2 #define PHP_MODE_HIGHLIGHT 2
#define PHP_MODE_INDENT 3
#define PHP_MODE_LINT 4 #define PHP_MODE_LINT 4
#define PHP_MODE_STRIP 5 #define PHP_MODE_STRIP 5
@ -2180,12 +2178,6 @@ consult the installation file that came with this distribution, or visit \n\
exit_status = 0; exit_status = 0;
goto out; goto out;
#if 0 /* not yet operational, see also below ... */
case '': /* generate indented source mode*/
behavior=PHP_MODE_INDENT;
break;
#endif
case 'q': /* do not generate HTTP headers */ case 'q': /* do not generate HTTP headers */
no_headers = 1; no_headers = 1;
break; break;
@ -2471,16 +2463,6 @@ consult the installation file that came with this distribution, or visit \n\
return SUCCESS; return SUCCESS;
} }
break; break;
#if 0
/* Zeev might want to do something with this one day */
case PHP_MODE_INDENT:
open_file_for_scanning(&file_handle);
zend_indent();
zend_file_handle_dtor(&file_handle);
php_output_teardown();
return SUCCESS;
break;
#endif
} }
fastcgi_request_done: fastcgi_request_done:

21
sapi/cli/php_cli.c
View file

@ -77,7 +77,6 @@
#include "zend_compile.h" #include "zend_compile.h"
#include "zend_execute.h" #include "zend_execute.h"
#include "zend_highlight.h" #include "zend_highlight.h"
#include "zend_indent.h"
#include "zend_exceptions.h" #include "zend_exceptions.h"
#include "php_getopt.h" #include "php_getopt.h"
@ -109,7 +108,6 @@ ZEND_TSRMLS_CACHE_DEFINE();
#define PHP_MODE_STANDARD 1 #define PHP_MODE_STANDARD 1
#define PHP_MODE_HIGHLIGHT 2 #define PHP_MODE_HIGHLIGHT 2
#define PHP_MODE_INDENT 3
#define PHP_MODE_LINT 4 #define PHP_MODE_LINT 4
#define PHP_MODE_STRIP 5 #define PHP_MODE_STRIP 5
#define PHP_MODE_CLI_DIRECT 6 #define PHP_MODE_CLI_DIRECT 6
@ -770,16 +768,6 @@ static int do_cli(int argc, char **argv) /* {{{ */
behavior=PHP_MODE_LINT; behavior=PHP_MODE_LINT;
break; break;
#if 0 /* not yet operational, see also below ... */
case '': /* generate indented source mode*/
if (behavior == PHP_MODE_CLI_DIRECT || behavior == PHP_MODE_PROCESS_STDIN) {
param_error = "Source indenting only works for files.\n";
break;
}
behavior=PHP_MODE_INDENT;
break;
#endif
case 'q': /* do not generate HTTP headers */ case 'q': /* do not generate HTTP headers */
/* This is default so NOP */ /* This is default so NOP */
break; break;
@ -1005,15 +993,6 @@ static int do_cli(int argc, char **argv) /* {{{ */
goto out; goto out;
} }
break; break;
#if 0
/* Zeev might want to do something with this one day */
case PHP_MODE_INDENT:
open_file_for_scanning(&file_handle);
zend_indent();
zend_file_handle_dtor(file_handle.handle);
goto out;
break;
#endif
case PHP_MODE_CLI_DIRECT: case PHP_MODE_CLI_DIRECT:
cli_register_file_handles(); cli_register_file_handles();
if (zend_eval_string_ex(exec_direct, NULL, "Command line code", 1) == FAILURE) { if (zend_eval_string_ex(exec_direct, NULL, "Command line code", 1) == FAILURE) {

1
sapi/cli/php_cli_server.c
View file

@ -73,7 +73,6 @@
#include "zend_compile.h" #include "zend_compile.h"
#include "zend_execute.h" #include "zend_execute.h"
#include "zend_highlight.h" #include "zend_highlight.h"
#include "zend_indent.h"
#include "zend_exceptions.h" #include "zend_exceptions.h"
#include "php_getopt.h" #include "php_getopt.h"

1
sapi/fpm/fpm/fpm_main.c
View file

@ -93,7 +93,6 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
#include "zend_compile.h" #include "zend_compile.h"
#include "zend_execute.h" #include "zend_execute.h"
#include "zend_highlight.h" #include "zend_highlight.h"
#include "zend_indent.h"
#include "php_getopt.h" #include "php_getopt.h"

2
win32/build/config.w32
View file

@ -128,7 +128,7 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
zend_execute_API.c zend_highlight.c \ zend_execute_API.c zend_highlight.c \
zend_llist.c zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c \ zend_llist.c zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c \
zend_stack.c zend_variables.c zend.c zend_API.c zend_extensions.c \ zend_stack.c zend_variables.c zend.c zend_API.c zend_extensions.c \
zend_hash.c zend_list.c zend_indent.c zend_builtin_functions.c \ zend_hash.c zend_list.c zend_builtin_functions.c \
zend_sprintf.c zend_ini.c zend_sort.c zend_multibyte.c zend_ts_hash.c \ zend_sprintf.c zend_ini.c zend_sort.c zend_multibyte.c zend_ts_hash.c \
zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
zend_object_handlers.c zend_objects_API.c \ zend_object_handlers.c zend_objects_API.c \