summaryrefslogtreecommitdiff
path: root/ext/json
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-14 12:54:08 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-14 12:54:08 +0200
commit60a69daec60f1886e166e8060556777819c66f98 (patch)
tree728557dc23dcef2e95983fd272042912f5c1f712 /ext/json
parent6f343d29a5561c846b1c9d95af56ecb2d659166c (diff)
downloadphp-git-60a69daec60f1886e166e8060556777819c66f98.tar.gz
Sync leading and final newlines in source code files
This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
Diffstat (limited to 'ext/json')
-rw-r--r--ext/json/Makefile.frag.w321
-rw-r--r--ext/json/config.w321
-rw-r--r--ext/json/json_scanner.re1
-rw-r--r--ext/json/php_json_parser.h1
-rw-r--r--ext/json/php_json_scanner.h1
5 files changed, 0 insertions, 5 deletions
diff --git a/ext/json/Makefile.frag.w32 b/ext/json/Makefile.frag.w32
index eaf47e22be..ee71c7a997 100644
--- a/ext/json/Makefile.frag.w32
+++ b/ext/json/Makefile.frag.w32
@@ -1,4 +1,3 @@
-
ext\json\json_scanner.c: ext\json\json_scanner.re
$(RE2C) -t ext/json/php_json_scanner_defs.h --no-generation-date -bci -o ext/json/json_scanner.c ext/json/json_scanner.re
diff --git a/ext/json/config.w32 b/ext/json/config.w32
index d16e0686d3..58c2c5b672 100644
--- a/ext/json/config.w32
+++ b/ext/json/config.w32
@@ -21,4 +21,3 @@ if (PHP_JSON != "no") {
PHP_INSTALL_HEADERS("ext/json/", "php_json.h php_json_parser.h php_json_scanner.h");
}
-
diff --git a/ext/json/json_scanner.re b/ext/json/json_scanner.re
index 3fda1df5ad..cf45b90ea0 100644
--- a/ext/json/json_scanner.re
+++ b/ext/json/json_scanner.re
@@ -393,4 +393,3 @@ std:
*/
}
-
diff --git a/ext/json/php_json_parser.h b/ext/json/php_json_parser.h
index 5378e50104..d8af613878 100644
--- a/ext/json/php_json_parser.h
+++ b/ext/json/php_json_parser.h
@@ -84,4 +84,3 @@ PHP_JSON_API int php_json_parse(php_json_parser *parser);
int php_json_yyparse(php_json_parser *parser);
#endif /* PHP_JSON_PARSER_H */
-
diff --git a/ext/json/php_json_scanner.h b/ext/json/php_json_scanner.h
index b707e230eb..4fd5f217fd 100644
--- a/ext/json/php_json_scanner.h
+++ b/ext/json/php_json_scanner.h
@@ -46,4 +46,3 @@ void php_json_scanner_init(php_json_scanner *scanner, char *str, size_t str_len,
int php_json_scan(php_json_scanner *s);
#endif /* PHP_JSON_SCANNER_H */
-