mirror of
https://github.com/postgres/postgres.git
synced 2025-11-19 13:42:17 +03:00
jsonpath scanner: reentrant scanner
Use the flex %option reentrant to make the generated scanner reentrant and thread-safe. Note: The parser was already pure. Simplify flex scan buffer management: Instead of constructing the buffer from pieces and then using yy_scan_buffer(), we can just use yy_scan_string(), which does the same thing internally. (Actually, we use yy_scan_bytes() here because we already have the length.) Use flex yyextra to handle context information, instead of global variables. This complements the other changes to make the scanner reentrant. Reviewed-by: Heikki Linnakangas <hlinnaka@iki.fi> Reviewed-by: Andreas Karlsson <andreas@proxel.se> Discussion: https://www.postgresql.org/message-id/flat/eb6faeac-2a8a-4b69-9189-c33c520e5b7b@eisentraut.org
This commit is contained in:
@@ -22,17 +22,25 @@ typedef struct JsonPathString
|
||||
int total;
|
||||
} JsonPathString;
|
||||
|
||||
#ifndef YY_TYPEDEF_YY_SCANNER_T
|
||||
#define YY_TYPEDEF_YY_SCANNER_T
|
||||
typedef void *yyscan_t;
|
||||
#endif
|
||||
|
||||
#include "utils/jsonpath.h"
|
||||
#include "jsonpath_gram.h"
|
||||
|
||||
#define YY_DECL extern int jsonpath_yylex(YYSTYPE *yylval_param, \
|
||||
JsonPathParseResult **result, \
|
||||
struct Node *escontext)
|
||||
struct Node *escontext, \
|
||||
yyscan_t yyscanner)
|
||||
YY_DECL;
|
||||
extern int jsonpath_yyparse(JsonPathParseResult **result,
|
||||
struct Node *escontext);
|
||||
struct Node *escontext,
|
||||
yyscan_t yyscanner);
|
||||
extern void jsonpath_yyerror(JsonPathParseResult **result,
|
||||
struct Node *escontext,
|
||||
yyscan_t yyscanner,
|
||||
const char *message);
|
||||
|
||||
#endif /* JSONPATH_INTERNAL_H */
|
||||
|
||||
Reference in New Issue
Block a user