postgrespro
diff --git a/‎jsquery.h
Copy file name to clipboardExpand all lines: jsquery.h
+36-47Lines changed: 36 additions & 47 deletions b/‎jsquery.h
Copy file name to clipboardExpand all lines: jsquery.h
+36-47Lines changed: 36 additions & 47 deletions
diff --git a/‎jsquery_io.c
Copy file name to clipboardExpand all lines: jsquery_io.c
-17Lines changed: 0 additions & 17 deletions b/‎jsquery_io.c
Copy file name to clipboardExpand all lines: jsquery_io.c
-17Lines changed: 0 additions & 17 deletions
diff --git a/‎jsquery_support.c
Copy file name to clipboardExpand all lines: jsquery_support.c
+11-1Lines changed: 11 additions & 1 deletion b/‎jsquery_support.c
Copy file name to clipboardExpand all lines: jsquery_support.c
+11-1Lines changed: 11 additions & 1 deletion
@@ -54,34 +54,6 @@ typedef enum JsQueryItemType {
 		jqiIn = 'I'
 } JsQueryItemType;
 
-typedef struct JsQueryItem JsQueryItem;
-
-struct JsQueryItem {
-	JsQueryItemType	type;
-	JsQueryItem	*next; /* next in path */
-
-	union {
-		struct {
-			JsQueryItem	*left;
-			JsQueryItem	*right;
-		} args;
-
-		JsQueryItem	*arg;
-
-		Numeric		numeric;
-		bool		boolean;
-		struct {
-			uint32      len;
-			char        *val; /* could not be not null-terminated */
-		} string;
-
-		struct {
-			int			nelems;
-			JsQueryItem	**elems;
-		} array;
-	};
-};
-
 typedef struct JsQueryItemR {
 	JsQueryItemType	type;
 	int32			nextPos;
@@ -121,34 +93,49 @@ extern void jsqIterateInit(JsQueryItemR *v);
 extern bool jsqIterateArray(JsQueryItemR *v, JsQueryItemR *e);
 
 /*
- * support
+ * Parsing
  */
 
-extern JsQueryItem* parsejsquery(const char *str, int len);
+typedef struct JsQueryItem JsQueryItem;
 
-int32 readJsQueryHeader(char *base, int32 pos, JsQueryItemType *type, int32 *nextPos);
+struct JsQueryItem {
+	JsQueryItemType	type;
+	JsQueryItem	*next; /* next in path */
 
-#define read_byte(v, b, p) do {     \
-	(v) = *(int8*)((b) + (p));      \
-	(p) += 1;                       \
-} while(0)                          \
+	union {
+		struct {
+			JsQueryItem	*left;
+			JsQueryItem	*right;
+		} args;
 
-#define read_int32(v, b, p) do {    \
-	(v) = *(int32*)((b) + (p));     \
-	(p) += sizeof(int32);           \
-} while(0)                          \
+		JsQueryItem	*arg;
+
+		Numeric		numeric;
+		bool		boolean;
+		struct {
+			uint32      len;
+			char        *val; /* could not be not null-terminated */
+		} string;
+
+		struct {
+			int			nelems;
+			JsQueryItem	**elems;
+		} array;
+	};
+};
+
+extern JsQueryItem* parsejsquery(const char *str, int len);
 
 void alignStringInfoInt(StringInfo buf);
-#endif
 
 /* jsquery_extract.c */
 
 typedef enum
 {
-	iAny = 1,
-	iAnyArray,
-	iKey,
-	iAnyKey
+	iAny 		= jqiAny,
+	iAnyArray 	= jqiAnyArray,
+	iKey 		= jqiKey,
+	iAnyKey 	= jqiAnyKey
 } PathItemType;
 
 typedef struct PathItem PathItem;
@@ -163,9 +150,9 @@ struct PathItem
 typedef enum
 {
 	eScalar = 1,
-	eAnd,
-	eOr,
-	eNot
+	eAnd	= jqiAnd,
+	eOr		= jqiOr,
+	eNot 	= jqiNot
 } ExtractedNodeType;
 
 typedef struct ExtractedNode ExtractedNode;
@@ -199,3 +186,5 @@ typedef int (*MakeEntryHandler)(ExtractedNode *node, Pointer extra);
 ExtractedNode *extractJsQuery(JsQuery *jq, MakeEntryHandler handler, Pointer extra);
 bool execRecursive(ExtractedNode *node, bool *check);
 bool execRecursiveTristate(ExtractedNode *node, GinTernaryValue *check);
+
+#endif
@@ -165,23 +165,6 @@ jsquery_in(PG_FUNCTION_ARGS)
 	PG_RETURN_NULL();
 }
 
-int32
-readJsQueryHeader(char *base, int32 pos, JsQueryItemType *type, int32 *nextPos)
-{
-	read_byte(*type, base, pos);
-	switch(INTALIGN(pos) - pos)
-	{
-		case 3: pos++;
-		case 2: pos++;
-		case 1: pos++;
-		default: break;
-	}
-	read_int32(*nextPos, base, pos);
-
-	return pos;
-}
-
-
 static void
 printOperation(StringInfo buf, JsQueryItemType type)
 {
 
@@ -16,6 +16,16 @@
 
 #include "jsquery.h"
 
+#define read_byte(v, b, p) do {		\
+	(v) = *(int8*)((b) + (p));		\
+	(p) += 1;						\
+} while(0)							\
+
+#define read_int32(v, b, p) do {	\
+	(v) = *(int32*)((b) + (p));		\
+	(p) += sizeof(int32);			\
+} while(0)							\
+
 void
 jsqInit(JsQueryItemR *v, JsQuery *js)
 {
@@ -78,7 +88,7 @@ jsqInitByBuffer(JsQueryItemR *v, char *base, int32 pos)
 			read_int32(v->arg, base, pos);
 			break;
 		default:
-			elog(ERROR, "Unknown JsQueryItem type: %d", v->type);
+			elog(ERROR, "Unknown type: %d", v->type);
 	}
 }