Remove redundant JSON parser typedefs

JsonNonTerminal and JsonParserSem were added in commit 3311ea86ed

These names of these two enums are not actually used, so there is no
need for typedefs. Instead use plain enums to declare the constants.

Noticed by Alvaro Herera.

diff --git a/src/common/jsonapi.c b/src/common/jsonapi.c
index 12fabcaccf44a8d51f6cc8c53fe709ee3e6ed034..fc0cb3697499c27b233e07b23e8968df7dff9451 100644 (file)
--- 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 90a7c389b2186593e436ceab36fb907edabd610a..e10ff28ee5495f4bbabc62d86baa115cf9ac86a6 100644 (file)
--- 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