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.
This commit is contained in:
Andrew Dunstan 2024-04-27 07:02:57 -04:00
parent ed52df3b19
commit e00b4f79e7
2 changed files with 4 additions and 6 deletions

View File

@ -50,16 +50,16 @@ typedef enum /* contexts of JSON parser */
* tokens, non-terminals, and semantic action markers. * tokens, non-terminals, and semantic action markers.
*/ */
typedef enum enum JsonNonTerminal
{ {
JSON_NT_JSON = 32, JSON_NT_JSON = 32,
JSON_NT_ARRAY_ELEMENTS, JSON_NT_ARRAY_ELEMENTS,
JSON_NT_MORE_ARRAY_ELEMENTS, JSON_NT_MORE_ARRAY_ELEMENTS,
JSON_NT_KEY_PAIRS, JSON_NT_KEY_PAIRS,
JSON_NT_MORE_KEY_PAIRS, JSON_NT_MORE_KEY_PAIRS,
} JsonNonTerminal; };
typedef enum enum JsonParserSem
{ {
JSON_SEM_OSTART = 64, JSON_SEM_OSTART = 64,
JSON_SEM_OEND, JSON_SEM_OEND,
@ -72,7 +72,7 @@ typedef enum
JSON_SEM_AELEM_END, JSON_SEM_AELEM_END,
JSON_SEM_SCALAR_INIT, JSON_SEM_SCALAR_INIT,
JSON_SEM_SCALAR_CALL, JSON_SEM_SCALAR_CALL,
} JsonParserSem; };
/* /*
* struct containing the 3 stacks used in non-recursive parsing, * struct containing the 3 stacks used in non-recursive parsing,

View File

@ -1312,14 +1312,12 @@ JsonManifestParseIncrementalState
JsonManifestParseState JsonManifestParseState
JsonManifestSemanticState JsonManifestSemanticState
JsonManifestWALRangeField JsonManifestWALRangeField
JsonNonTerminal
JsonObjectAgg JsonObjectAgg
JsonObjectConstructor JsonObjectConstructor
JsonOutput JsonOutput
JsonParseExpr JsonParseExpr
JsonParseContext JsonParseContext
JsonParseErrorType JsonParseErrorType
JsonParserSem
JsonParserStack JsonParserStack
JsonPath JsonPath
JsonPathBool JsonPathBool