use separate JsQueryItemType enum instead of included in struct

Author: feodor

jsquery.h

@@ -29,11 +29,7 @@ typedef struct
 #define PG_GETARG_JSQUERY(x)	DatumGetJsQueryP(PG_GETARG_DATUM(x))
 #define PG_RETURN_JSQUERY(p)	PG_RETURN_POINTER(p)
 
-
-typedef struct JsQueryItem JsQueryItem;
-
-struct JsQueryItem {
-	enum {
+typedef enum JsQueryItemType {
 		jqiNull = jbvNull, 
 		jqiString = jbvString, 
 		jqiNumeric = jbvNumeric, 
@@ -56,7 +52,12 @@ struct JsQueryItem {
 		jqiKey = 'K',
 		jqiCurrent = '$',
 		jqiIn = 'I'
-	} type;
+} JsQueryItemType;
+
+typedef struct JsQueryItem JsQueryItem;
+
+struct JsQueryItem {
+	JsQueryItemType	type;
 
 	union {
 		struct {
@@ -88,7 +89,7 @@ struct JsQueryItem {
 
 extern JsQueryItem* parsejsquery(const char *str, int len);
 
-int32 readJsQueryHeader(char *base, int32 pos, int32 *type, int32 *nextPos);
+int32 readJsQueryHeader(char *base, int32 pos, JsQueryItemType *type, int32 *nextPos);
 
 #define read_byte(v, b, p) do {     \
 	(v) = *(int8*)((b) + (p));      \

jsquery_constr.c

@@ -22,8 +22,9 @@
 static int32
 copyJsQuery(StringInfo buf, char *jqBase, int32 jqPos)
 {
-	int32 	resPos = buf->len - VARHDRSZ; /* position from begining of jsquery data */
-	int32	type, nextPos, chld, next;
+	int32 			resPos = buf->len - VARHDRSZ; /* position from begining of jsquery data */
+	JsQueryItemType	type;
+	int32			nextPos, chld, next;
 
 	check_stack_depth();
 
@@ -131,7 +132,7 @@ copyJsQuery(StringInfo buf, char *jqBase, int32 jqPos)
 }
 
 static JsQuery*
-joinJsQuery(int32 type, JsQuery *jq1, JsQuery *jq2)
+joinJsQuery(JsQueryItemType type, JsQuery *jq1, JsQuery *jq2)
 {
 	JsQuery			*out;
 	StringInfoData	buf;

jsquery_extract.c

@@ -22,12 +22,12 @@ static int compareJsQueryValue(JsQueryValue *v1, JsQueryValue *v2);
 static ExtractedNode *
 recursiveExtract(char *jqBase, int32 jqPos,	bool indirect, PathItem *path)
 {
-	int32	type, childType;
-	int32	nextPos;
-	int32	left, right, arg;
-	ExtractedNode *leftNode, *rightNode, *result;
-	int32	len, *arrayPos, nelems, i;
-	PathItem	*pathItem;
+	JsQueryItemType	type, childType;
+	int32			nextPos;
+	int32			left, right, arg;
+	ExtractedNode 	*leftNode, *rightNode, *result;
+	int32			len, *arrayPos, nelems, i;
+	PathItem		*pathItem;
 
 	check_stack_depth();
 

jsquery_io.c

@@ -166,7 +166,7 @@ jsquery_in(PG_FUNCTION_ARGS)
 }
 
 int32
-readJsQueryHeader(char *base, int32 pos, int32 *type, int32 *nextPos)
+readJsQueryHeader(char *base, int32 pos, JsQueryItemType *type, int32 *nextPos)
 {
 	read_byte(*type, base, pos);
 	switch(INTALIGN(pos) - pos)
@@ -183,7 +183,7 @@ readJsQueryHeader(char *base, int32 pos, int32 *type, int32 *nextPos)
 
 
 static void
-printOperation(StringInfo buf, int type)
+printOperation(StringInfo buf, JsQueryItemType type)
 {
 	switch(type)
 	{
@@ -215,8 +215,8 @@ printOperation(StringInfo buf, int type)
 static void
 printJsQueryItem(StringInfo buf, char *base, int32 pos, bool inKey, bool printBracketes)
 {
-	int32		type;
-	int32		nextPos;
+	JsQueryItemType		type;
+	int32			nextPos;
 
 	check_stack_depth();
 

jsquery_op.c

@@ -92,7 +92,7 @@ recursiveAny(char *jqBase, int32 jqPos, JsonbValue *jb)
 }
 
 static bool
-checkEquality(char *jqBase, int32 jqPos, int32 type, JsonbValue *jb)
+checkEquality(char *jqBase, int32 jqPos, JsQueryItemType type, JsonbValue *jb)
 {
 	int		len;
 
@@ -123,7 +123,7 @@ checkEquality(char *jqBase, int32 jqPos, int32 type, JsonbValue *jb)
 }
 
 static bool
-checkArrayEquality(char *jqBase, int32 jqPos, int32 type, JsonbValue *jb)
+checkArrayEquality(char *jqBase, int32 jqPos, JsQueryItemType type, JsonbValue *jb)
 {
 	int32   		i, nelems, *arrayPos;
 	int32			r;
@@ -159,7 +159,7 @@ checkArrayEquality(char *jqBase, int32 jqPos, int32 type, JsonbValue *jb)
 }
 
 static bool
-checkIn(char *jqBase, int32 jqPos, int32 type, JsonbValue *jb)
+checkIn(char *jqBase, int32 jqPos, JsQueryItemType type, JsonbValue *jb)
 {
 	int32   i, nelems, *arrayPos;
 
@@ -180,7 +180,7 @@ checkIn(char *jqBase, int32 jqPos, int32 type, JsonbValue *jb)
 }
 
 static bool
-executeArrayOp(char *jqBase, int32 jqPos, int32 type, int32 op, JsonbValue *jb)
+executeArrayOp(char *jqBase, int32 jqPos, JsQueryItemType type, int32 op, JsonbValue *jb)
 {
 	int32   		i, nelems, *arrayPos;
 	int32			r;
@@ -252,7 +252,7 @@ executeArrayOp(char *jqBase, int32 jqPos, int32 type, int32 op, JsonbValue *jb)
 }
 
 static bool
-makeCompare(char *jqBase, int32 jqPos, int32 type, int32 op, JsonbValue *jb)
+makeCompare(char *jqBase, int32 jqPos, JsQueryItemType type, int32 op, JsonbValue *jb)
 {
 	int	res;
 
@@ -283,8 +283,8 @@ makeCompare(char *jqBase, int32 jqPos, int32 type, int32 op, JsonbValue *jb)
 static bool
 executeExpr(char *jqBase, int32 jqPos, int32 op, JsonbValue *jb)
 {
-	int32	type;
-	int32	nextPos;
+	JsQueryItemType	type;
+	int32			nextPos;
 
 	check_stack_depth();
 
@@ -324,10 +324,10 @@ executeExpr(char *jqBase, int32 jqPos, int32 op, JsonbValue *jb)
 static bool
 recursiveExecute(char *jqBase, int32 jqPos, JsonbValue *jb)
 {
-	int32	type;
-	int32	nextPos;
-	int32	left, right, arg;
-	bool	res = false;
+	JsQueryItemType	type;
+	int32			nextPos;
+	int32			left, right, arg;
+	bool			res = false;
 
 	check_stack_depth();
 
@@ -497,11 +497,11 @@ json_jsquery_exec(PG_FUNCTION_ARGS)
 static int
 compareJsQuery(char *base1, int32 pos1, char *base2, int32 pos2)
 {
-	int32	type1,
-			nextPos1,
-			type2,
-			nextPos2;
-	int32	res = 0;
+	JsQueryItemType	type1,
+					type2;
+	int32			nextPos1,
+					nextPos2;
+	int32			res = 0;
 
 	check_stack_depth();
 
@@ -730,8 +730,8 @@ jsquery_gt(PG_FUNCTION_ARGS)
 static void
 hashJsQuery(char *base, int32 pos, pg_crc32 *crc)
 {
-	int32	type;
-	int32	nextPos;
+	JsQueryItemType	type;
+	int32			nextPos;
 
 	check_stack_depth();