database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-08 11:42:09 +03:00
Code Activity

Rename typedef in jsonpath_gram.y from "string" to "JsonPathString"

Browse Source 
Reason is the same as in 75c57058b0.
This commit is contained in:
Alexander Korotkov
2019-03-19 20:56:13 +03:00
parent 1009920aaa
commit 5e28b778bf
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/utils/adt/jsonpath_gram.y
View File

@ -48,7 +48,7 @@ makeItemType(int type)
} }
static JsonPathParseItem* static JsonPathParseItem*
makeItemString(string *s) makeItemString(JsonPathString *s)
{ {
JsonPathParseItem *v; JsonPathParseItem *v;
@ -67,7 +67,7 @@ makeItemString(string *s)
} }
static JsonPathParseItem* static JsonPathParseItem*
makeItemVariable(string *s) makeItemVariable(JsonPathString *s)
{ {
JsonPathParseItem *v; JsonPathParseItem *v;
@ -79,7 +79,7 @@ makeItemVariable(string *s)
} }
static JsonPathParseItem* static JsonPathParseItem*
makeItemKey(string *s) makeItemKey(JsonPathString *s)
{ {
JsonPathParseItem *v; JsonPathParseItem *v;
@ -90,7 +90,7 @@ makeItemKey(string *s)
} }
static JsonPathParseItem* static JsonPathParseItem*
makeItemNumeric(string *s) makeItemNumeric(JsonPathString *s)
{ {
JsonPathParseItem *v; JsonPathParseItem *v;
@ -210,7 +210,8 @@ makeAny(int first, int last)
} }
static JsonPathParseItem * static JsonPathParseItem *
makeItemLikeRegex(JsonPathParseItem *expr, string *pattern, string *flags) makeItemLikeRegex(JsonPathParseItem *expr, JsonPathString *pattern,
JsonPathString *flags)
{ {
JsonPathParseItem *v = makeItemType(jpiLikeRegex); JsonPathParseItem *v = makeItemType(jpiLikeRegex);
int i; int i;
@ -267,7 +268,7 @@ makeItemLikeRegex(JsonPathParseItem *expr, string *pattern, string *flags)
%parse-param {JsonPathParseResult **result} %parse-param {JsonPathParseResult **result}
%union { %union {
string str; JsonPathString str;
List *elems; /* list of JsonPathParseItem */ List *elems; /* list of JsonPathParseItem */
List *indexs; /* list of integers */ List *indexs; /* list of integers */
JsonPathParseItem *value; JsonPathParseItem *value;

2
src/backend/utils/adt/jsonpath_scan.l
View File

@ -18,7 +18,7 @@
#include "nodes/pg_list.h" #include "nodes/pg_list.h"
#include "utils/jsonpath_scanner.h" #include "utils/jsonpath_scanner.h"
static string scanstring; static JsonPathString scanstring;
/* No reason to constrain amount of data slurped */ /* No reason to constrain amount of data slurped */
/* #define YY_READ_BUF_SIZE 16777216 */ /* #define YY_READ_BUF_SIZE 16777216 */

6
src/include/utils/jsonpath_scanner.h
View File

@ -13,13 +13,13 @@
#ifndef JSONPATH_SCANNER_H #ifndef JSONPATH_SCANNER_H
#define JSONPATH_SCANNER_H #define JSONPATH_SCANNER_H
/* struct string is shared between scan and gram */ /* struct JsonPathString is shared between scan and gram */
typedef struct string typedef struct JsonPathString
{ {
char *val; char *val;
int len; int len;
int total; int total;
} string; } JsonPathString;
#include "utils/jsonpath.h" #include "utils/jsonpath.h"
#include "utils/jsonpath_gram.h" #include "utils/jsonpath_gram.h"