csonpath 0.2.0__tar.gz → 0.4.0__tar.gz

{csonpath-0.2.0/csonpath.egg-info → csonpath-0.4.0}/PKG-INFO

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

{csonpath-0.2.0 → csonpath-0.4.0/csonpath.egg-info}/PKG-INFO

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

{csonpath-0.2.0 → csonpath-0.4.0}/csonpath.h

@@ -571,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;
@@ -719,7 +723,7 @@ again:
 	int nb_res = 0;
 
 #define CSONPATH_DO_RET_TYPE int
-#define CSONPATH_DO_FUNC_NAME update_or_ceate
+#define CSONPATH_DO_FUNC_NAME update_or_create
 
 /*
  * assuming tmp == value can only be true,
@@ -730,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;
@@ -809,7 +813,7 @@ again:
 	int nb_res = 0;
 
 #define CSONPATH_DO_RET_TYPE int
-#define CSONPATH_DO_FUNC_NAME update_or_ceate_callback
+#define CSONPATH_DO_FUNC_NAME update_or_create_callback
 #define CSONPATH_DO_RETURN						\
 	if (tmp == value) {						\
 		*need_reloop = 1;					\

{csonpath-0.2.0 → csonpath-0.4.0}/csonpath_python.c

@@ -62,14 +62,33 @@
       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 (at >= PyList_Size(array)) {
+    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;
+    }
+    size_t s = PyList_Size(array); 
+    if (at >= s) {
+	for (;s < at; ++s)
+	    PyList_Insert(array, s, Py_None);
+
 	PyList_Insert(array, at, el);
     } else {
 	Py_INCREF(el);
 	PyList_SetItem(array, at, el);
     }
+    return 1;
 }
 
 #define CSONPATH_APPEND_AT(array, at, el)			\
@@ -80,12 +99,12 @@ static void python_set_or_insert_item(PyObject *array,  Py_ssize_t at, PyObject
 	     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			\
+	     const char *: pydict_try_setitemstring,		\
+	     char *: pydict_try_setitemstring			\
 	) (array, at, el)
 
 
-#define CSONPATH_FOREACH_EXT(obj, el, code, key_idx)				\
+#define CSONPATH_FOREACH_EXT(obj, el, code, key_idx)			\
   if (PyDict_Check(obj)) {						\
     PyObject *key_;							\
     Py_ssize_t pos_ = 0;						\
@@ -219,7 +238,9 @@ 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);
+  int ret = csonpath_update_or_create(self->cp, json, value);
+  if (ret < 0)
+      return NULL;
   return PyLong_FromLong(ret);
 }
 
@@ -229,7 +250,7 @@ static PyObject *update_or_create_callback(PyCsonPathObject *self, PyObject* arg
 
     if (!PyArg_ParseTuple(args, "OO|O", &json, &callback, &udata))
 	BAD_ARG();
-    int ret = csonpath_update_or_ceate_callback(self->cp, json, callback, udata);
+    int ret = csonpath_update_or_create_callback(self->cp, json, callback, udata);
     return PyLong_FromLong(ret);
 }
 

{csonpath-0.2.0 → csonpath-0.4.0}/pyproject.toml

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