On 2024-04-23 Tu 06:23, Alvaro Herrera wrote:
But there are others: InjectionPointEntry, ResourceOwnerData,
JsonNonTerminal, JsonParserSem, ...
The last two are down to me. Let's just get rid of them like the
attached (no need for a typedef at all)
cheers
andrew
--
Andrew Dunstan
EDB:https://www.enterprisedb.com
diff --git a/src/common/jsonapi.c b/src/common/jsonapi.c
index 12fabcaccf..fc0cb36974 100644
--- a/src/common/jsonapi.c
+++ b/src/common/jsonapi.c
@@ -50,16 +50,16 @@ typedef enum /* contexts of JSON parser */
* tokens, non-terminals, and semantic action markers.
*/
-typedef enum
+enum JsonNonTerminal
{
JSON_NT_JSON = 32,
JSON_NT_ARRAY_ELEMENTS,
JSON_NT_MORE_ARRAY_ELEMENTS,
JSON_NT_KEY_PAIRS,
JSON_NT_MORE_KEY_PAIRS,
-} JsonNonTerminal;
+};
-typedef enum
+enum JsonParserSem
{
JSON_SEM_OSTART = 64,
JSON_SEM_OEND,
@@ -72,7 +72,7 @@ typedef enum
JSON_SEM_AELEM_END,
JSON_SEM_SCALAR_INIT,
JSON_SEM_SCALAR_CALL,
-} JsonParserSem;
+};
/*
* struct containing the 3 stacks used in non-recursive parsing,
diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index d551ada325..ba48a3371d 100644
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -1312,14 +1312,12 @@ JsonManifestParseIncrementalState
JsonManifestParseState
JsonManifestSemanticState
JsonManifestWALRangeField
-JsonNonTerminal
JsonObjectAgg
JsonObjectConstructor
JsonOutput
JsonParseExpr
JsonParseContext
JsonParseErrorType
-JsonParserSem
JsonParserStack
JsonPath
JsonPathBool
