Merge branch 'PHP-7.0' into PHP-7.1

9 years ago · bfa9362d43
3 changed files with 626 additions and 695 deletions
--- a/ext/json/README
+++ b/ext/json/README
@ -8,7 +8,7 @@ data-interchange format as specified in RFC 7159
 The parser is implemented using re2c and Bison. The used versions
 of both tools for generating files in the repository are following:

-re2c 0.14.3
+re2c 0.16
 Bison 3.0.4

 It is recommended to do all contributions to the JSON extension
--- a/ext/json/json_scanner.c
+++ b/ext/json/json_scanner.c
--- a/ext/json/php_json_scanner_defs.h
+++ b/ext/json/php_json_scanner_defs.h
@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 */
+/* Generated by re2c 0.16 */

 enum YYCONDTYPE {
 	yycJS,