csonpath 0.9.0__tar.gz → 0.10.0__tar.gz

{csonpath-0.9.0/csonpath.egg-info → csonpath-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csonpath
-Version: 0.9.0
+Version: 0.10.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev

{csonpath-0.9.0 → csonpath-0.10.0/csonpath.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csonpath
-Version: 0.9.0
+Version: 0.10.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev

{csonpath-0.9.0 → csonpath-0.10.0}/csonpath.h

@@ -57,6 +57,7 @@ enum csonpath_instuction_raw {
 	CSONPATH_INST_FILTER_AND,
 	CSONPATH_INST_GET_ALL,
 	CSONPATH_INST_FIND_ALL,
+	CSONPATH_INST_RANGE,
 	CSONPATH_INST_OR,
 	CSONPATH_INST_END,
 	CSONPATH_INST_BROKEN
@@ -80,6 +81,7 @@ CSONPATH_UNUSED static const char *csonpath_instuction_str[] = {
 	"FILTER_AND",
 	"GET_ALL",
 	"FIND_ALL",
+	"RANGE",
 	"OR",
 	"END",
 	"BROKEN"
@@ -240,6 +242,43 @@ static inline _Bool csonpath_is_dot_operand(int c)
     return isalnum(c) || c == '_' || c == '-';
 }
 
+
+static int csonpath_fill_walker_with_int(char *walker, int num, int first_ret)
+{
+    if (num < 100) {
+	 *walker = num;
+	 return first_ret;
+    }
+    union {
+	int n;
+	char c[4];
+    } u = {.n=num};
+    walker[0] = u.c[0];
+    walker[1] = u.c[1];
+    walker[2] = u.c[2];
+    walker[3] = u.c[3];
+    return first_ret + 1;
+}
+
+static int csonpath_int_from_walker(int operand_instruction, char *walker)
+{
+    switch(operand_instruction) {
+    case CSONPATH_INST_FILTER_OPERAND_BYTE:
+    case CSONPATH_INST_GET_ARRAY_SMALL:
+	return *walker;
+    case CSONPATH_INST_GET_ARRAY_BIG:
+    case CSONPATH_INST_FILTER_OPERAND_INT:
+    {
+	union {int n; char c[4];} to_num =
+	    { .c= { walker[0], walker[1], walker[2], walker[3] } };
+	return to_num.n;
+    }
+    default:
+	break;
+    }
+    return -1;
+}
+
 static int csonpath_compile(struct csonpath cjp[static 1])
 {
 	char *walker = cjp->path;
@@ -479,20 +518,8 @@ static int csonpath_compile(struct csonpath cjp[static 1])
 
 		    n = atoi(walker);
 		    to_check = *next;
-		    if (n < 100) {
-			*walker = n;
-			csonpath_push_inst(cjp, CSONPATH_INST_FILTER_OPERAND_BYTE, &inst_idx);
-		    } else {
-			union {
-			    int n;
-			    char c[4];
-			} u = {.n=n};
-			walker[0] = u.c[0];
-			walker[1] = u.c[1];
-			walker[2] = u.c[2];
-			walker[3] = u.c[3];
-			csonpath_push_inst(cjp, CSONPATH_INST_FILTER_OPERAND_INT, &inst_idx);
-		    }
+		    csonpath_push_inst(cjp, csonpath_fill_walker_with_int(
+					   walker, n, CSONPATH_INST_FILTER_OPERAND_BYTE), &inst_idx);
 		}
 
 		/* skip space */
@@ -537,11 +564,23 @@ static int csonpath_compile(struct csonpath cjp[static 1])
 
 		next = walker;
 		do {
-		    if (*next < '0' || *next > '9') {
-			CSONPATH_COMPILE_ERR(tmp, walker - orig,
-					     "unexpected '%c', sting, filter or number require\n", *next);
-		    }
-		    next++;
+		  if (*next == ':') {
+		    csonpath_push_inst(cjp, CSONPATH_INST_RANGE, &inst_idx);
+		    num = atoi(walker);
+		    csonpath_push_inst(
+			cjp, csonpath_fill_walker_with_int(
+			    walker, num, CSONPATH_INST_GET_ARRAY_SMALL),
+			&inst_idx);
+		    cjp->inst_lst[inst_idx - 1].next = next - walker + 1;
+		    walker = next + 1;
+		    ++next;
+		    continue;
+		  }
+		  if (*next < '0' || *next > '9') {
+		    CSONPATH_COMPILE_ERR(tmp, walker - orig,
+					 "unexpected '%c', sting, filter or number require\n", *next);
+		  }
+		  next++;
 		} while (*next && *next != ']');
 		if (!*next) {
 		    CSONPATH_COMPILE_ERR(tmp, walker - orig,
@@ -549,20 +588,9 @@ static int csonpath_compile(struct csonpath cjp[static 1])
 		}
 		*next = 0;
 		num = atoi(walker);
-		if (num < 100) {
-		    csonpath_push_inst(cjp, CSONPATH_INST_GET_ARRAY_SMALL, &inst_idx);
-		    *walker = num;
-		} else {
-		    union {
-			int n;
-			char c[4];
-		    } u = {.n=num};
-		    walker[0] = u.c[0];
-		    walker[1] = u.c[1];
-		    walker[2] = u.c[2];
-		    walker[3] = u.c[3];
-		    csonpath_push_inst(cjp, CSONPATH_INST_GET_ARRAY_BIG, &inst_idx);
-		}
+		csonpath_push_inst(cjp, csonpath_fill_walker_with_int(
+				       walker, num, CSONPATH_INST_GET_ARRAY_SMALL),
+				   &inst_idx);
 		cjp->inst_lst[inst_idx - 1].next = next - walker + 1;
 		walker = next + 1;
 		to_check = *walker;
@@ -656,19 +684,6 @@ static int csonpath_compile(struct csonpath cjp[static 1])
 	return -1;
 }
 
-static int csonpath_int_from_walker(int operand_instruction, char *walker)
-{
-    if (operand_instruction == CSONPATH_INST_FILTER_OPERAND_BYTE)
-	return *walker;
-    else if (operand_instruction == CSONPATH_INST_FILTER_OPERAND_INT) {
-	union {int n; char c[4];} to_num =
-	    { .c= { walker[0], walker[1], walker[2], walker[3] } };
-
-	return to_num.n;
-    }
-    return -1;
-}
-
 static _Bool csonpath_do_match(int operand_instruction, CSONPATH_JSON el2, char *owalker)
 {
     switch (operand_instruction) {
@@ -881,15 +896,26 @@ need_reloop_in = 0;
 #define CSONPATH_DO_FILTER_FIND nb_res += tret;
 
 #define CSONPATH_DO_FIND_ALL ({					\
-			if (tret < 0) return -1;		\
-			nb_res += tret;				\
-			if (need_reloop_in){ goto again; };	\
-		})
+	    if (tret < 0) return -1;				\
+	    nb_res += tret;					\
+	    if (need_reloop_in){ goto again; };			\
+	})
+
+#define CSONPATH_DO_RANGE ({						\
+	    if (tret < 0) return -1;					\
+	    nb_res += tret;						\
+	    --end;							\
+	    if (need_reloop_in){ goto range_again; };			\
+	})
 
 #define CSONPATH_DO_EXTRA_DECLATION , struct csonpath_child_info child_info, int *need_reloop
 
 #define CSONPATH_DO_EXTRA_ARGS_IN , (struct csonpath_child_info) {.type = CSONPATH_NONE}, NULL
 
+#define CSONPATH_DO_RANGE_PRE_LOOP		\
+    int need_reloop_in;				\
+range_again:
+
 #define CSONPATH_DO_FILTER_PRE_LOOP		\
 	int need_reloop_in;
 
@@ -1046,17 +1072,16 @@ static int csonpath_sync_root_obj(CSONPATH_JSON parent, CSONPATH_JSON to_update)
 #define CSONPATH_DO_RETURN						\
 	if (tmp == value) {						\
 		*need_reloop = 1;					\
-		CSONPATH_CALL_CALLBACK(callback, ctx, child_info, tmp, udata); \
-		return 1;						\
 	}								\
-	return 0;
+	CSONPATH_CALL_CALLBACK(callback, ctx, child_info, tmp, udata);	\
+	return 1;
 
 #define CSONPATH_DO_EXTRA_ARGS_FIND_ALL , callback, udata, NULL, need_reloop
 #define CSONPATH_DO_EXTRA_ARGS_NEESTED , callback, udata,	\
 	csonpath_child_info_set(&(struct csonpath_child_info ){}, tmp, (intptr_t)key_idx), \
 	&need_reloop_in
 #define CSONPATH_DO_EXTRA_ARGS , CSONPATH_CALLBACK callback, CSONPATH_CALLBACK_DATA udata
-#define CSONPATH_DO_EXTRA_ARGS_IN , callback, udata, NULL, NULL
+#define CSONPATH_DO_EXTRA_ARGS_IN , callback, udata, &(struct csonpath_child_info ){}, NULL
 #define CSONPATH_DO_EXTRA_DECLATION CSONPATH_DO_EXTRA_ARGS, struct csonpath_child_info *child_info, int *need_reloop
 #define CSONPATH_DO_FIND_ALL nb_res += tret;
 #define CSONPATH_DO_FILTER_FIND CSONPATH_GOTO_ON_RELOOP(filter_again)
@@ -1075,19 +1100,8 @@ static int csonpath_sync_root_obj(CSONPATH_JSON parent, CSONPATH_JSON to_update)
   }
 
 #define CSONPATH_PRE_GET(this_idx)					\
-    int check_at = idx + 1;						\
-    int to_check;							\
-    do {								\
-	to_check = cjp->inst_lst[check_at].inst;			\
-	++check_at;							\
-    } while (to_check == CSONPATH_INST_GET_ALL || to_check == CSONPATH_INST_FIND_ALL); \
-    if (to_check == CSONPATH_INST_END || to_check == CSONPATH_INST_OR) { \
-	CSONPATH_CALL_CALLBACK(						\
-	    callback, ctx,						\
-	    csonpath_child_info_set(&(struct csonpath_child_info ){},	\
-				    ctx, (intptr_t)this_idx), tmp, udata); \
-	return 1;							\
-    }
+  int to_check = cjp->inst_lst[idx].inst;				\
+  csonpath_child_info_set(child_info, ctx, (intptr_t)this_idx)
 
 
 #define CSONPATH_DO_GET_NOTFOUND(this_idx)		\

{csonpath-0.9.0 → csonpath-0.10.0}/csonpath_do.h

@@ -93,6 +93,18 @@
 #define CSONPATH_DO_FILTER_LOOP_PRE_SET
 #endif
 
+#ifndef CSONPATH_DO_RANGE
+#define CSONPATH_DO_RANGE CSONPATH_DO_FIND_ALL
+#endif
+
+#ifndef CSONPATH_DO_RANGE
+#define CSONPATH_DO_RANGE CSONPATH_DO_FIND_ALL
+#endif
+
+#ifndef CSONPATH_DO_RANGE_PRE_LOOP
+#define CSONPATH_DO_RANGE_PRE_LOOP CSONPATH_DO_FIND_ALL_PRE_LOOP
+#endif
+
 #ifndef CAT
 # define CATCAT(a, b, c) a ## b ## c
 # define CAT(a, b) a ## b
@@ -234,6 +246,46 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(struct csonpath cjp[static 1],
 	    CSONPATH_DO_FIND_ALL_CLEAUP;
 	    return tret;
 	}
+	case CSONPATH_INST_RANGE:
+	{
+	    if (!CSONPATH_IS_ARRAY(tmp)) {
+		return CSONPATH_NONE_FOUND_RET;
+	    }
+
+	    CSONPATH_JSON el;
+	    intptr_t key_idx;
+
+	    (void)key_idx;
+	    int next_0 = cjp->inst_lst[idx].next;
+	    int next_1 = cjp->inst_lst[idx + 1].next;
+	    int next_2 = cjp->inst_lst[idx + 2].next;
+	    unsigned int beg = csonpath_int_from_walker(cjp->inst_lst[idx + 1].inst, walker + next_0);
+	    unsigned int end = csonpath_int_from_walker(cjp->inst_lst[idx + 2].inst,
+							walker + next_0 + next_1);
+
+	    if (!end)
+		end = -1;
+
+	    CSONPATH_DO_RANGE_PRE_LOOP;
+	    CSONPATH_FOREACH_ARRAY(tmp, el, key_idx) {
+		if (key_idx < beg) {
+		    key_idx = beg - 1;
+		    continue;
+		}
+		if (key_idx >= end)
+		    break;
+		CSONPATH_DO_FOREACH_PRE_SET
+			CSONPATH_DO_RET_TYPE tret =
+			csonpath_do_internal(cjp, origin, el, tmp, idx + 3,
+					     walker + next_0 + next_1 + next_2
+					     CSONPATH_DO_EXTRA_ARGS_NEESTED);
+
+		CSONPATH_DO_RANGE;
+	    }
+
+	    CSONPATH_DO_GET_ALL_OUT;
+	    break;
+	}
 	case CSONPATH_INST_GET_ALL:
 	{
 	    CSONPATH_JSON el;
@@ -361,5 +413,7 @@ static CSONPATH_DO_RET_TYPE csonpath_do_(struct csonpath cjp[static 1],
 #undef CSONPATH_DO_FILTER_PRE_LOOP
 #undef CSONPATH_DO_FILTER_FIND
 #undef CSONPATH_DO_FILTER_LOOP_PRE_SET
+#undef CSONPATH_DO_RANGE
+#undef CSONPATH_DO_RANGE_PRE_LOOP
 
 #endif

{csonpath-0.9.0 → csonpath-0.10.0}/csonpath_python.c

@@ -131,7 +131,18 @@ static int python_set_or_insert_item(PyObject *array,  Py_ssize_t at, PyObject *
 	) (array, at, el)
 
 
+#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 13)
+/* PyList_Clear was introduced in Python 3.13 */
 #define CSONPATH_ARRAY_CLEAR(o) PyList_Clear(o)
+#else
+/* For older versions, manually clear the list */
+#define CSONPATH_ARRAY_CLEAR(o)            \
+    do {                                   \
+        while (PyList_Size(o) > 0) {       \
+            PyList_SetSlice(o, 0, PyList_Size(o), NULL); \
+        }                                  \
+    } while (0)
+#endif
 
 #define CSONPATH_OBJ_CLEAR(o) PyDict_Clear(o)
 

{csonpath-0.9.0 → csonpath-0.10.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "csonpath"
-version = "0.9.0"
+version = "0.10.0"
 readme = "README.md"
 
 [tool.setuptools]
@@ -22,7 +22,7 @@ dev = [
 testpaths = ["tests/python"]
 
 [tool.bumpversion]
-current_version = "0.9.0"
+current_version = "0.10.0"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"