diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-05-10 18:08:16 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-05-10 18:08:16 +0100 |
| commit | 359df4dea8aa87f7b0c86471c312f60697e71b75 (patch) | |
| tree | 934091b6b91df2764e8ce0f6abd61d90c3868cb9 /ext/json/json_parser.y | |
| parent | c93a3606616aff45560ea4e98e78a3697c783f91 (diff) | |
| download | php-git-359df4dea8aa87f7b0c86471c312f60697e71b75.tar.gz | |
Tidy up and regenerate json parser with latest bison version
Diffstat (limited to 'ext/json/json_parser.y')
| -rw-r--r-- | ext/json/json_parser.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y index 4d3dcfe706..044b82eb51 100644 --- a/ext/json/json_parser.y +++ b/ext/json/json_parser.y @@ -187,11 +187,11 @@ void php_json_parser_object_init(php_json_parser *parser, zval *object) void php_json_parser_object_update(php_json_parser *parser, zval *object, zend_string *key, zval *zvalue) { - if (Z_TYPE_P(object) == IS_ARRAY/*parser->scanner.options & PHP_JSON_OBJECT_AS_ARRAY*/) { + /* if JSON_OBJECT_AS_ARRAY is set */ + if (Z_TYPE_P(object) == IS_ARRAY) { zend_symtable_update(Z_ARRVAL_P(object), key, zvalue); } else { zval zkey; - /* ZEND_ASSERT(Z_TYPE_P(object) == IS_OBJECT); */ if (key->len == 0) { zend_string_release(key); key = zend_string_init("_empty_", sizeof("_empty_") - 1, 0); |