]> granicus.if.org Git - php/commitdiff
Drop zend_indent() as it was never used, complete or working
authorKalle Sommer Nielsen <kalle@php.net>
Fri, 27 Mar 2015 19:04:46 +0000 (20:04 +0100)
committerKalle Sommer Nielsen <kalle@php.net>
Fri, 27 Mar 2015 19:04:46 +0000 (20:04 +0100)
12 files changed:
Makefile.frag
Zend/Makefile.am
Zend/zend_indent.c [deleted file]
Zend/zend_indent.h [deleted file]
configure.in
ext/readline/readline_cli.c
main/main.c
sapi/cgi/cgi_main.c
sapi/cli/php_cli.c
sapi/cli/php_cli_server.c
sapi/fpm/fpm/fpm_main.c
win32/build/config.w32

index 12646c20add756b21e12fd91de0a41f2a2c55156..cbea640966d8bba9eff4083381adcca21b2ce829 100644 (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
        @(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
index 416f82a401ae0ed3ef9c2ef9d9f2d0d77896d31f..fedbffe4ce71848b11802dee28883b738b189db1 100644 (file)
@@ -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 (file)
index 6c8f23d..0000000
+++ /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 <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:
- */
diff --git a/Zend/zend_indent.h b/Zend/zend_indent.h
deleted file mode 100644 (file)
index 66a9213..0000000
+++ /dev/null
@@ -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:
- */
index 8f9844dc10c67eea22a79e3b5630850e343ce54e..457540540318341c7ce0837763291aaba3c63c08 100644 (file)
@@ -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 \
index df3ba20c85221389feb3a4ecd960624adce90fbd..ec006af2d3a9f6dfca2a14bbeb67219bfa37ecd8 100644 (file)
@@ -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"
index b0400463f035d6c0f0b2a509428311ef5ac1fdf1..2a808dd7c5b1d82c6585571ec80fad807673f77e 100644 (file)
@@ -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
index e6ca667fbe024ff6b8576c2422a188d0822d9df5..b479d4df4e5e96b3e884fda78af6d01c05f42e7f 100644 (file)
@@ -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:
index 4f3351726ab86314ff361ca99c01f52ba4a6d887..3c9c5a8475121415667271f31ac46fc69867df48 100644 (file)
@@ -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) {
index 5e368355cf3ae76ea19cae3f0c893aa9c2467e27..568fc9f2d1a1ef37a0e5286ec40814270c92d60a 100644 (file)
@@ -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"
index c4ebc8bd3b8a1c94749cfb6334f20c539c65ca74..ecfc9be0246778018068165964cfc01774ef1aca 100644 (file)
@@ -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"
 
index f96b8c51c900b85de40b207078580a58e37bf297..076a7008a15f7c14d59900cc8d63fe7cd2020f5e 100644 (file)
@@ -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 \