mirror of
https://github.com/php/php-src.git
synced 2026-10-28 17:56:50 +08:00
MarcandTim Düsterhus
13169cd2fe
Instead of tracking columns during lexing, which costs performance for something that will only be required in the unexpected failure path, we now only track the line numbers and calculate the column on demand when an error occurs. As part of this we also fix GH-22487 by adjusting the logic to report the column based on the (UTF-8) column in the source, instead of treating `\uXXXX` escapes as a single column, which users will need to count manually instead of being able to rely on their editor or `mb_substr()` or similar. [tim: (re)written the commit message] Co-authored-by: Tim Düsterhus <tim@bastelstu.be>
46 lines
2.2 KiB
C
46 lines
2.2 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| Copyright © The PHP Group and Contributors. |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to the Modified BSD License that is |
|
|
| bundled with this package in the file LICENSE, and is available |
|
|
| through the World Wide Web at <https://www.php.net/license/>. |
|
|
| |
|
|
| SPDX-License-Identifier: BSD-3-Clause |
|
|
+----------------------------------------------------------------------+
|
|
| Author: Jakub Zelenka <bukka@php.net> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifndef PHP_JSON_SCANNER_H
|
|
#define PHP_JSON_SCANNER_H
|
|
|
|
#include "php.h"
|
|
#include "php_json.h"
|
|
|
|
typedef unsigned char php_json_ctype;
|
|
|
|
typedef struct _php_json_scanner {
|
|
php_json_ctype *cursor; /* cursor position */
|
|
php_json_ctype *token; /* token position */
|
|
php_json_ctype *limit; /* the last read character + 1 position */
|
|
php_json_ctype *marker; /* marker position for backtracking */
|
|
php_json_ctype *ctxmarker; /* marker position for context backtracking */
|
|
php_json_ctype *str_start; /* start position of the string */
|
|
php_json_ctype *pstr; /* string pointer for escapes conversion */
|
|
php_json_ctype *line_start; /* start position of the current line */
|
|
uint64_t line; /* current line number (1-based) */
|
|
zval value; /* value */
|
|
int str_esc; /* number of extra characters for escaping */
|
|
int state; /* condition state */
|
|
int options; /* options */
|
|
php_json_error_code errcode; /* error type if there is an error */
|
|
int utf8_invalid; /* whether utf8 is invalid */
|
|
int utf8_invalid_count; /* number of extra character for invalid utf8 */
|
|
} php_json_scanner;
|
|
|
|
void php_json_scanner_init(php_json_scanner *scanner, const char *str, size_t str_len, int options);
|
|
int php_json_scan(php_json_scanner *s);
|
|
|
|
#endif /* PHP_JSON_SCANNER_H */
|