1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-18 17:42:25 +03:00

Get rid of jsonpath_gram.h and jsonpath_scanner.h

Jsonpath grammar and scanner are both quite small.  It doesn't worth complexity
to compile them separately.  This commit makes grammar and scanner be compiled
at once.  Therefore, jsonpath_gram.h and jsonpath_gram.h are no longer needed.
This commit also does some reorganization of code in jsonpath_gram.y.

Discussion: https://postgr.es/m/d47b2023-3ecb-5f04-d253-d557547cf74f%402ndQuadrant.com
This commit is contained in:
Alexander Korotkov
2019-03-20 11:09:07 +03:00
parent 641fde2523
commit 550b9d26f8
9 changed files with 268 additions and 311 deletions

View File

@ -1,3 +1,4 @@
%{
/*-------------------------------------------------------------------------
*
* jsonpath_scan.l
@ -11,12 +12,10 @@
*-------------------------------------------------------------------------
*/
%{
#include "postgres.h"
#include "mb/pg_wchar.h"
#include "nodes/pg_list.h"
#include "utils/jsonpath_scanner.h"
static JsonPathString scanstring;
@ -46,7 +45,6 @@ fprintf_to_ereport(const char *fmt, const char *msg)
ereport(ERROR, (errmsg_internal("%s", msg)));
}
#define yyerror jsonpath_yyerror
%}
%option 8bit