archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix and clean up exporting of json parser

Browse source
This commit is contained in:
Jakub Zelenka 2016-05-11 20:54:42 +01:00
parent afb4062c2c
commit b91c05ea14
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/json/json_parser.tab.c
View file

@ -1917,7 +1917,7 @@ static void php_json_yyerror(php_json_parser *parser, char const *msg)
} }
} }
php_json_error_code php_json_parser_error_code(const php_json_parser *parser) PHP_JSON_API php_json_error_code php_json_parser_error_code(const php_json_parser *parser)
{ {
return parser->scanner.errcode; return parser->scanner.errcode;
} }
@ -1934,7 +1934,7 @@ static const php_json_parser_methods default_parser_methods =
NULL, NULL,
}; };
void php_json_parser_init_ex(php_json_parser *parser, PHP_JSON_API void php_json_parser_init_ex(php_json_parser *parser,
zval *return_value, zval *return_value,
char *str, char *str,
size_t str_len, size_t str_len,
@ -1950,7 +1950,7 @@ void php_json_parser_init_ex(php_json_parser *parser,
memcpy(&parser->methods, parser_methods, sizeof(php_json_parser_methods)); memcpy(&parser->methods, parser_methods, sizeof(php_json_parser_methods));
} }
void php_json_parser_init(php_json_parser *parser, PHP_JSON_API void php_json_parser_init(php_json_parser *parser,
zval *return_value, zval *return_value,
char *str, char *str,
size_t str_len, size_t str_len,
@ -1966,3 +1966,8 @@ void php_json_parser_init(php_json_parser *parser,
max_depth, max_depth,
&default_parser_methods); &default_parser_methods);
} }
PHP_JSON_API int php_json_parse(php_json_parser *parser)
{
return php_json_yyparse(parser);
}

11
ext/json/json_parser.y
View file

@ -309,7 +309,7 @@ static void php_json_yyerror(php_json_parser *parser, char const *msg)
} }
} }
php_json_error_code php_json_parser_error_code(const php_json_parser *parser) PHP_JSON_API php_json_error_code php_json_parser_error_code(const php_json_parser *parser)
{ {
return parser->scanner.errcode; return parser->scanner.errcode;
} }
@ -326,7 +326,7 @@ static const php_json_parser_methods default_parser_methods =
NULL, NULL,
}; };
void php_json_parser_init_ex(php_json_parser *parser, PHP_JSON_API void php_json_parser_init_ex(php_json_parser *parser,
zval *return_value, zval *return_value,
char *str, char *str,
size_t str_len, size_t str_len,
@ -342,7 +342,7 @@ void php_json_parser_init_ex(php_json_parser *parser,
memcpy(&parser->methods, parser_methods, sizeof(php_json_parser_methods)); memcpy(&parser->methods, parser_methods, sizeof(php_json_parser_methods));
} }
void php_json_parser_init(php_json_parser *parser, PHP_JSON_API void php_json_parser_init(php_json_parser *parser,
zval *return_value, zval *return_value,
char *str, char *str,
size_t str_len, size_t str_len,
@ -358,3 +358,8 @@ void php_json_parser_init(php_json_parser *parser,
max_depth, max_depth,
&default_parser_methods); &default_parser_methods);
} }
PHP_JSON_API int php_json_parse(php_json_parser *parser)
{
return php_json_yyparse(parser);
}

2
ext/json/php_json_parser.h
View file

@ -79,7 +79,7 @@ PHP_JSON_API void php_json_parser_init(
PHP_JSON_API php_json_error_code php_json_parser_error_code(const php_json_parser *parser); PHP_JSON_API php_json_error_code php_json_parser_error_code(const php_json_parser *parser);
PHP_JSON_API int php_json_yyparse(php_json_parser *parser); PHP_JSON_API int php_json_parse(php_json_parser *parser);
#endif /* PHP_JSON_PARSER_H */ #endif /* PHP_JSON_PARSER_H */