csonpath 0.1.0__tar.gz → 0.3.0__tar.gz

{csonpath-0.1.0/csonpath.egg-info → csonpath-0.3.0}/PKG-INFO

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

{csonpath-0.1.0 → csonpath-0.3.0/csonpath.egg-info}/PKG-INFO

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

{csonpath-0.1.0 → csonpath-0.3.0}/csonpath.h

@@ -129,13 +129,16 @@ struct csonpath_child_info {
 	goto error;					\
     } while (0)
 
-#define CSONPATH_SKIP(c, on) do {			\
-	if (*on != c) {					\
-	    CSONPATH_REQUIRE_ERR(c, on);		\
-	}						\
-	++on;						\
+#define CSONPATH_SKIP_2(c, check, on) do {			\
+	if (check) {						\
+	    CSONPATH_REQUIRE_ERR(c, on);			\
+	}							\
+	++on;							\
     } while (0)
 
+#define CSONPATH_SKIP(c, on)			\
+    CSONPATH_SKIP_2(c, *on != c, on)
+
 
 static inline struct csonpath_child_info *csonpath_child_info_set(struct csonpath_child_info *child_info,
 								  CSONPATH_JSON j, const intptr_t key)
@@ -212,6 +215,11 @@ static void csonpath_print_instruction(struct csonpath cjp[static 1])
     printf("%d: END\n", idx);
 }
 
+static inline _Bool csonpath_is_dot_operand(int c)
+{
+    return isalnum(c) || c == '_' || c == '-';
+}
+
 static int csonpath_compile(struct csonpath cjp[static 1])
 {
 	char *walker = cjp->path;
@@ -253,23 +261,45 @@ again:
 		int have_parentesis = 0;
 		int nb_getter_inst = 0;
 		struct csonpath_instruction filter_getter[CSONPATH_TMP_BUF_SIZE];
+		struct csonpath_instruction *last_inst;
 		int regex_idx = -1;
 		int inst;
+		int getter_end = 0;
 
 		inst = CSONPATH_INST_GET_OBJ;
 		cjp->inst_lst[cjp->inst_idx - 1].next += 1;
 		++walker;
+		last_inst = &cjp->inst_lst[cjp->inst_idx - 1];
 		if (*walker == '(') {
 		    have_parentesis = 1;
 		    ++walker;
 		    CSONPATH_SKIP('@', walker);
-		    CSONPATH_SKIP('.', walker);
+		    if (*walker == '[') {
+			++walker;
+			getter_end = *walker;
+		    } else {
+			CSONPATH_SKIP('.', walker);
+		    }
 		    cjp->inst_lst[cjp->inst_idx - 1].next += 3;
 		    for (; isblank(*walker); ++walker)
 			cjp->inst_lst[cjp->inst_idx - 1].next += 1;
+		} else if (*walker == '[') {
+		    ++walker;
+		    last_inst->next++;
+		    getter_end = *walker;
 		}
 	      filter_again:
-		for (next = walker; isalnum(*next) || *next == '_' || *next == '-'; ++next);
+		if (getter_end) {
+		    if (getter_end != '\'' && getter_end != '"') {
+			CSONPATH_COMPILE_ERR(tmp, walker - orig,
+					     "string require here, got '%c'", getter_end);
+		    }
+		    last_inst->next += 1;
+		    ++walker;
+		    for (next = walker; *next != getter_end; ++next);
+		} else {
+		    for (next = walker; csonpath_is_dot_operand(*next); ++next);
+		}
 		if (!*next) {
 		    CSONPATH_COMPILE_ERR(tmp, next - orig,
 					 "filter miss condition");
@@ -277,14 +307,27 @@ again:
 		}
 		to_check = *next;
 		*next = 0;
+		if (getter_end) {
+		    CSONPATH_SKIP_2(getter_end, to_check != getter_end, next);
+		    CSONPATH_SKIP(']', next);
+		    to_check = *next;
+		    getter_end = 0;
+		}
 		filter_getter[nb_getter_inst++] = (struct csonpath_instruction){.inst=inst,
 		    .next=next - walker};
+		last_inst = &filter_getter[nb_getter_inst - 1];
 		if (to_check == '.') {
-		    filter_getter[nb_getter_inst-1].next += 1;
+		    filter_getter[nb_getter_inst - 1].next += 1;
+		    walker = next + 1;
+		    goto filter_again;
+		} else if (to_check == '[') {
+		    filter_getter[nb_getter_inst - 1].next += 1;
 		    walker = next + 1;
+		    getter_end = *walker;
 		    goto filter_again;
 		}
 
+
 		if (have_parentesis && to_check == ')') {
 		    filter_getter[nb_getter_inst-1].next += 1;
 		    ++next;
@@ -337,7 +380,7 @@ again:
 		}
 		cjp->inst_lst[cjp->inst_idx - 1].next += next - walker;
 		walker = next;
-		if (*walker == '"' || *walker == '\'') {
+		if (*walker == '"' || *walker == '\'' || *walker == '/') {
 		    char end = *walker;
 		    ++walker;
 		    cjp->inst_lst[cjp->inst_idx - 1].next++;
@@ -487,8 +530,7 @@ again:
 		to_check = *walker;
 		goto again;
 	    } 
-	    for (next = walker; *next && *next != '[' && *next != '.' && *next != '|';
-		 ++next);
+	    for (next = walker; csonpath_is_dot_operand(*next); ++next);
 	    if (next == walker) {
 		if (*next == '[')
 		    goto do_array;
@@ -509,11 +551,18 @@ again:
 	    cjp->inst_lst[cjp->inst_idx - 1].next += 1;
 	    goto root_again;
 	}
-	if (*walker == 0) {
+	if (isblank(*walker)) {
+	    cjp->inst_lst[cjp->inst_idx - 1].next += 1;
+	    ++walker;
+	    goto again;
+	}
+	else if (*walker == 0) {
 	    csonpath_push_inst(cjp, CSONPATH_INST_END);
 	    cjp->compiled = 1;
 	    free(tmp);
 	    return 0;
+	} else {
+	    CSONPATH_COMPILE_ERR(tmp, walker - orig, "unexpected char '%c'", to_check);
 	}
   error:
 	cjp->inst_lst[0] = (struct csonpath_instruction){.inst=CSONPATH_INST_BROKEN};
@@ -522,16 +571,20 @@ again:
 }
 
 /* helper use multiple times */
-#define CSONPATH_DO_GET_NOTFOUND_UPDATER(this_idx)		\
-	if (to_check == CSONPATH_INST_GET_OBJ) {	\
-		tmp = CSONPATH_NEW_OBJECT();		\
-		CSONPATH_APPEND_AT(ctx, this_idx, tmp);	\
-	} else {					\
-		tmp = CSONPATH_NEW_ARRAY();		\
-		CSONPATH_APPEND_AT(ctx, this_idx, tmp);	\
-	}						\
-	walker += cjp->inst_lst[idx].next;		\
-	goto next_inst;
+#define CSONPATH_DO_GET_NOTFOUND_UPDATER(this_idx)			\
+    do {								\
+	int append_ret = 0;						\
+	if (to_check == CSONPATH_INST_GET_OBJ) {			\
+	    tmp = CSONPATH_NEW_OBJECT();				\
+	    append_ret = CSONPATH_APPEND_AT(ctx, this_idx, tmp);	\
+	} else {							\
+	    tmp = CSONPATH_NEW_ARRAY();					\
+	    append_ret = CSONPATH_APPEND_AT(ctx, this_idx, tmp);	\
+	}								\
+	walker += cjp->inst_lst[idx].next;				\
+	if (append_ret < 0) return append_ret;				\
+	goto next_inst;							\
+    } while (0)
 
 #define CSONPATH_GOTO_ON_RELOOP(where)		\
     nb_res += tret; if (need_reloop_in) goto where;
@@ -681,9 +734,9 @@ again:
 	if (tmp == value) {						\
 		*need_reloop = 1;					\
 		if (child_info->type == CSONPATH_INTEGER)		\
-			CSONPATH_APPEND_AT(ctx, child_info->idx, to_update); \
+			return CSONPATH_APPEND_AT(ctx, child_info->idx, to_update); \
 		else							\
-			CSONPATH_APPEND_AT(ctx, child_info->key, to_update); \
+			return CSONPATH_APPEND_AT(ctx, child_info->key, to_update); \
 		return 1;						\
 	}								\
 	return 0;

{csonpath-0.1.0 → csonpath-0.3.0}/csonpath_python.c

@@ -62,30 +62,45 @@
       PyList_Append(array, el);				\
     })
 
-static void python_set_or_insert_item(PyObject *array,  Py_ssize_t at, PyObject *el)
+static int pydict_try_setitemstring(PyObject *obj,  const char * const at, PyObject *el)
 {
+    if (!PyDict_Check(obj)) {
+	PyErr_Format(PyExc_ValueError, "Unable to follow path: Dict expected");
+	return -1;
+    }
+    PyDict_SetItemString(obj, at, el);
+    return 1;
+}
+
+static int python_set_or_insert_item(PyObject *array,  Py_ssize_t at, PyObject *el)
+{
+    if (!PyList_Check(array)) {
+	PyErr_Format(PyExc_ValueError, "Unable to follow path: List expected");
+	return -1;
+    }
     if (at >= PyList_Size(array)) {
 	PyList_Insert(array, at, el);
     } else {
 	Py_INCREF(el);
 	PyList_SetItem(array, at, el);
     }
+    return 1;
 }
 
 #define CSONPATH_APPEND_AT(array, at, el)			\
-	_Generic((at),						\
-		 int: python_set_or_insert_item,				\
-		 unsigned int: python_set_or_insert_item,			\
-		 long: python_set_or_insert_item,				\
-		 unsigned long: python_set_or_insert_item,			\
-		 long long: python_set_or_insert_item,			\
-		 unsigned long long: python_set_or_insert_item,		\
-		 const char *: PyDict_SetItemString,		\
-		 char *: PyDict_SetItemString			\
-		 ) (array, at, el)
-
-
-#define CSONPATH_FOREACH_EXT(obj, el, code, key_idx)				\
+    _Generic((at),						\
+	     int: python_set_or_insert_item,			\
+	     unsigned int: python_set_or_insert_item,		\
+	     long: python_set_or_insert_item,			\
+	     unsigned long: python_set_or_insert_item,		\
+	     long long: python_set_or_insert_item,		\
+	     unsigned long long: python_set_or_insert_item,	\
+	     const char *: pydict_try_setitemstring,		\
+	     char *: pydict_try_setitemstring			\
+	) (array, at, el)
+
+
+#define CSONPATH_FOREACH_EXT(obj, el, code, key_idx)			\
   if (PyDict_Check(obj)) {						\
     PyObject *key_;							\
     Py_ssize_t pos_ = 0;						\
@@ -220,6 +235,8 @@ static PyObject *update_or_create(PyCsonPathObject *self, PyObject* args)
   if (!PyArg_ParseTuple(args, "OO", &json, &value))
     BAD_ARG();
   int ret = csonpath_update_or_ceate(self->cp, json, value);
+  if (ret < 0)
+      return NULL;
   return PyLong_FromLong(ret);
 }
 
@@ -243,10 +260,6 @@ static void PyCsonPath_dealloc(PyCsonPathObject *self) {
 }
 
 
-static PyObject *PyCsonPath_get_path(PyCsonPathObject *self) {
-    return PyUnicode_FromString(self->cp->path);
-}
-
 static PyObject *PyCsonPath_set_path(PyCsonPathObject *self, PyObject* args) {
     const char *new_path;
     if (!PyArg_ParseTuple(args, "s", &new_path))
@@ -258,7 +271,6 @@ static PyObject *PyCsonPath_set_path(PyCsonPathObject *self, PyObject* args) {
 }
 
 static PyMethodDef csonpath_py_method[] = {
-    {"get_path", (PyCFunction)PyCsonPath_get_path, METH_VARARGS, "get_path"},
     {"set_path", (PyCFunction)PyCsonPath_set_path, METH_VARARGS, "set_path"},
     {"callback", (PyCFunction)callback, METH_VARARGS, "callback"},
     {"update_or_create_callback", (PyCFunction)update_or_create_callback, METH_VARARGS, "update_or_create_callback"},

csonpath-0.3.0/pyproject.toml

@@ -0,0 +1,44 @@
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "csonpath"
+version = "0.3.0"
+readme = "README.md"
+
+[tool.setuptools]
+packages = []  # no Python packages, just an extension
+ext-modules = [
+	 {name="csonpath", sources = ["csonpath_python.c"]}
+]
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=8.3.5"
+]
+
+[tool.pytest.ini_options]
+testpaths = ["tests/python"]
+
+[tool.bumpversion]
+current_version = "0.3.0"
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
+serialize = ["{major}.{minor}.{patch}"]
+search = "{current_version}"
+replace = "{new_version}"
+regex = true
+ignore_missing_version = false
+ignore_missing_files = false
+tag = true
+sign_tags = false
+tag_name = "v{new_version}"
+tag_message = "version {new_version}"
+allow_dirty = true
+commit = true
+message = "Bump to {new_version}"
+moveable_tags = []
+commit_args = ""
+setup_hooks = []
+pre_commit_hooks = []
+post_commit_hooks = []

csonpath-0.1.0/pyproject.toml

@@ -1,22 +0,0 @@
-[build-system]
-requires = ["setuptools>=61.0", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "csonpath"
-version = "0.1.0"
-readme = "README.md"
-
-[tool.setuptools]
-packages = []  # no Python packages, just an extension
-ext-modules = [
-	 {name="csonpath", sources = ["csonpath_python.c"]}
-]
-
-[project.optional-dependencies]
-dev = [
-    "pytest>=8.3.5"
-]
-
-[tool.pytest.ini_options]
-testpaths = ["tests/python"]