From 8153286efef5d0b642a4beff839257ef205c4545 Mon Sep 17 00:00:00 2001 From: Kalle Sommer Nielsen Date: Fri, 27 Mar 2015 20:04:46 +0100 Subject: Drop zend_indent() as it was never used, complete or working --- Makefile.frag | 2 +- Zend/Makefile.am | 2 +- Zend/zend_indent.c | 155 -------------------------------------------- Zend/zend_indent.h | 37 ----------- configure.in | 2 +- ext/readline/readline_cli.c | 1 - main/main.c | 11 ---- sapi/cgi/cgi_main.c | 18 ----- sapi/cli/php_cli.c | 21 ------ sapi/cli/php_cli_server.c | 1 - sapi/fpm/fpm/fpm_main.c | 1 - win32/build/config.w32 | 2 +- 12 files changed, 4 insertions(+), 249 deletions(-) delete mode 100644 Zend/zend_indent.c delete mode 100644 Zend/zend_indent.h diff --git a/Makefile.frag b/Makefile.frag index 12646c20ad..cbea640966 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -20,4 +20,4 @@ $(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y $(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) -$(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 diff --git a/Zend/Makefile.am b/Zend/Makefile.am index 416f82a401..fedbffe4ce 100644 --- a/Zend/Makefile.am +++ b/Zend/Makefile.am @@ -12,7 +12,7 @@ libZend_la_SOURCES=\ 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_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_objects_API.c zend_ts_hash.c zend_stream.c \ zend_default_classes.c \ diff --git a/Zend/zend_indent.c b/Zend/zend_indent.c deleted file mode 100644 index 6c8f23d9a6..0000000000 --- a/Zend/zend_indent.c +++ /dev/null @@ -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 | - | Zeev Suraski | - +----------------------------------------------------------------------+ -*/ - -/* $Id$ */ - -/* This indenter doesn't really work, it's here for no particular reason. */ - - -#include "zend.h" -#include -#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; i0) { - 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; i0) { - for (i=0; i | - | Zeev Suraski | - +----------------------------------------------------------------------+ -*/ - -/* $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: - */ diff --git a/configure.in b/configure.in index 8f9844dc10..4575405403 100644 --- a/configure.in +++ b/configure.in @@ -1489,7 +1489,7 @@ PHP_ADD_SOURCES(Zend, \ 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_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_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 \ diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c index df3ba20c85..ec006af2d3 100644 --- a/ext/readline/readline_cli.c +++ b/ext/readline/readline_cli.c @@ -58,7 +58,6 @@ #include "zend_compile.h" #include "zend_execute.h" #include "zend_highlight.h" -#include "zend_indent.h" #include "zend_exceptions.h" #include "sapi/cli/cli.h" diff --git a/main/main.c b/main/main.c index b0400463f0..2a808dd7c5 100644 --- a/main/main.c +++ b/main/main.c @@ -80,7 +80,6 @@ #include "zend_compile.h" #include "zend_execute.h" #include "zend_highlight.h" -#include "zend_indent.h" #include "zend_extensions.h" #include "zend_ini.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: * tab-width: 4 diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index e6ca667fbe..b479d4df4e 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -87,7 +87,6 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS; #include "zend_compile.h" #include "zend_execute.h" #include "zend_highlight.h" -#include "zend_indent.h" #include "php_getopt.h" @@ -127,7 +126,6 @@ static pid_t pgroup; #define PHP_MODE_STANDARD 1 #define PHP_MODE_HIGHLIGHT 2 -#define PHP_MODE_INDENT 3 #define PHP_MODE_LINT 4 #define PHP_MODE_STRIP 5 @@ -2180,12 +2178,6 @@ consult the installation file that came with this distribution, or visit \n\ exit_status = 0; 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 */ no_headers = 1; break; @@ -2471,16 +2463,6 @@ consult the installation file that came with this distribution, or visit \n\ return SUCCESS; } 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: diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 4f3351726a..3c9c5a8475 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -77,7 +77,6 @@ #include "zend_compile.h" #include "zend_execute.h" #include "zend_highlight.h" -#include "zend_indent.h" #include "zend_exceptions.h" #include "php_getopt.h" @@ -109,7 +108,6 @@ ZEND_TSRMLS_CACHE_DEFINE(); #define PHP_MODE_STANDARD 1 #define PHP_MODE_HIGHLIGHT 2 -#define PHP_MODE_INDENT 3 #define PHP_MODE_LINT 4 #define PHP_MODE_STRIP 5 #define PHP_MODE_CLI_DIRECT 6 @@ -770,16 +768,6 @@ static int do_cli(int argc, char **argv) /* {{{ */ behavior=PHP_MODE_LINT; 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 */ /* This is default so NOP */ break; @@ -1005,15 +993,6 @@ static int do_cli(int argc, char **argv) /* {{{ */ goto out; } 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: cli_register_file_handles(); if (zend_eval_string_ex(exec_direct, NULL, "Command line code", 1) == FAILURE) { diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 5e368355cf..568fc9f2d1 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -73,7 +73,6 @@ #include "zend_compile.h" #include "zend_execute.h" #include "zend_highlight.h" -#include "zend_indent.h" #include "zend_exceptions.h" #include "php_getopt.h" diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index c4ebc8bd3b..ecfc9be024 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -93,7 +93,6 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS; #include "zend_compile.h" #include "zend_execute.h" #include "zend_highlight.h" -#include "zend_indent.h" #include "php_getopt.h" diff --git a/win32/build/config.w32 b/win32/build/config.w32 index f96b8c51c9..076a7008a1 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -128,7 +128,7 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.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_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_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ zend_object_handlers.c zend_objects_API.c \ -- cgit v1.2.1