csonpath 0.0.3__tar.gz → 0.0.4__tar.gz

{csonpath-0.0.3/csonpath.egg-info → csonpath-0.0.4}/PKG-INFO

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

{csonpath-0.0.3 → csonpath-0.0.4/csonpath.egg-info}/PKG-INFO

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

{csonpath-0.0.3 → csonpath-0.0.4}/csonpath.h

@@ -30,6 +30,7 @@ enum csonpath_instuction_raw {
 	CSONPATH_INST_GET_ARRAY_SMALL,
 	CSONPATH_INST_GET_ARRAY_BIG,
 	CSONPATH_INST_FILTER_KEY_EQ,
+	CSONPATH_INST_FILTER_KEY_NOT_EQ,
 	CSONPATH_INST_FILTER_OPERAND_STR,
 	CSONPATH_INST_FILTER_OPERAND_BYTE, /* store the same way it's in ARRAY_SMALL  */
 	CSONPATH_INST_FILTER_OPERAND_INT, /* store the same way it's in ARRAY_BIG  */
@@ -181,6 +182,7 @@ again:
 	{
 		int end;
 
+	  do_array:
 		cjp->inst_lst[cjp->inst_idx - 1].next += 1;
 		++walker;
 		if (*walker == '*') {
@@ -193,25 +195,49 @@ again:
 			to_check = *walker;
 			goto again;
 		} else if (*walker == '?') {
+			int have_blank;
 			cjp->inst_lst[cjp->inst_idx - 1].next += 1;
 			++walker;
 			for (next = walker; isalnum(*next); ++next);
 			if (!*next) {
+				CSONPATH_COMPILE_ERR(tmp, walker - orig,
+						     "filter miss condition");
 				goto error;
 			}
 			to_check = *next;
 			*next = 0;
-			for (++next; isblank(*next); ++next);
-			if (!*next)
+			have_blank = isblank(to_check);
+
+			for (++next; isblank(*next); ++next) {
+				have_blank = 1;
+			}
+
+			if (*next && have_blank &&
+			    to_check != '=' && to_check != '!') {
+				to_check = *next;
+				++next;
+			}
+
+			if (!*next) {
+				CSONPATH_COMPILE_ERR(tmp, next - orig,
+						     "filter miss condition");
+
 				goto error;
+			}
 			/* = and == are the same here */
 			if (to_check == '=') {
 				csonpath_push_inst(cjp, CSONPATH_INST_FILTER_KEY_EQ);
 				if (next[0] == '=')
 					++next;
+			} else if (to_check == '!' && next[0] == '=') {
+				csonpath_push_inst(cjp, CSONPATH_INST_FILTER_KEY_NOT_EQ);
+				++next;
 			} else {
+				CSONPATH_COMPILE_ERR(tmp, next - orig,
+						     "'%c': unsuported operation", to_check);
 				goto error;
 			}
+			for (;isblank(*next); ++next);
 			cjp->inst_lst[cjp->inst_idx - 1].next = next - walker;
 			walker = next;
 			if (*walker == '"' || *walker == '\'') {
@@ -220,8 +246,11 @@ again:
 				cjp->inst_lst[cjp->inst_idx - 1].next++;
 				csonpath_push_inst(cjp, CSONPATH_INST_FILTER_OPERAND_STR);
 				for (next = walker; *next && *next != end; ++next);
-				if (!*next)
+				if (!*next) {
+					CSONPATH_COMPILE_ERR(tmp, walker - orig,
+							     "broken filter");
 					goto error;
+				}
 				*next = 0;
 				++next;
 				to_check = *next;
@@ -229,8 +258,12 @@ again:
 				int n;
 
 				for (next = walker; isdigit(*next); ++next);
-				if (next == walker)
+				if (next == walker) {
+					CSONPATH_COMPILE_ERR(tmp, walker - orig,
+							     "'%c': broken filter with number",
+							     *walker);
 					goto error;
+				}
 				n = atoi(walker);
 				if (n < 100) {
 					*walker = n;
@@ -241,6 +274,8 @@ again:
 					csonpath_push_inst(cjp, CSONPATH_INST_FILTER_OPERAND_INT);
 				}
 				if (!*next) {
+					CSONPATH_COMPILE_ERR(tmp, walker - orig,
+							     "compilation error");
 					goto error;
 				}
 				to_check = *next;
@@ -328,9 +363,22 @@ again:
 			inst = CSONPATH_INST_FIND_ALL;
 			cjp->inst_lst[cjp->inst_idx - 1].next += 1;
 			++walker;
-		}
+		} else if (*walker == '*') {
+		    inst = CSONPATH_INST_GET_ALL;
+		    ++walker;
+		    if (*walker != '.' && *walker != '[' && *walker != '\0')
+			CSONPATH_COMPILE_ERR(tmp, walker - orig, "unsuported characters '%c' after '*'", *walker);
+		    csonpath_push_inst(cjp, inst);
+		    to_check = *walker;
+		    goto again;
+		} 
 		for (next = walker; *next && *next != '[' && *next != '.' && *next != '|';
 		     ++next);
+		if (next == walker) {
+		    if (*next == '[')
+			goto do_array;
+		    CSONPATH_COMPILE_ERR(tmp, walker - orig, "empty getter");
+		}
 		to_check = *next;
 		*next = 0;
 

{csonpath-0.0.3 → csonpath-0.0.4}/csonpath_do.h

@@ -161,9 +161,11 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(struct csonpath cjp[static 1],
 	    walker += cjp->inst_lst[idx].next;
 	    break;
 	case CSONPATH_INST_FILTER_KEY_EQ:
+	case CSONPATH_INST_FILTER_KEY_NOT_EQ:
 	{
 	    CSONPATH_JSON el;
 	    char *filter_key = walker;
+	    int operation = cjp->inst_lst[idx].inst;
 	    walker += cjp->inst_lst[idx].next;
 	    ++idx;
 
@@ -178,7 +180,9 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(struct csonpath cjp[static 1],
 
 			CSONPATH_FOREACH_EXT(el, el2, {
 				if (!strcmp((char *)neested_key, filter_key)) {
-				    if (CSONPATH_EQUAL_STR(el2, walker)) {
+				    _Bool eq_ret = CSONPATH_EQUAL_STR(el2, walker);
+				    if ((operation == CSONPATH_INST_FILTER_KEY_NOT_EQ && !eq_ret) ||
+					(operation == CSONPATH_INST_FILTER_KEY_EQ && eq_ret)) {
 					CSONPATH_DO_RET_TYPE tret =
 					    csonpath_do_internal(cjp, origin, el, tmp, idx + 1,
 								 walker + cjp->inst_lst[idx].next
@@ -281,7 +285,8 @@ static CSONPATH_DO_RET_TYPE csonpath_do_(struct csonpath cjp[static 1],
     (void)ctx;
     csonpath_compile(cjp);
     if (cjp->inst_lst[0].inst == CSONPATH_INST_BROKEN) {
-	CSONPATH_GETTER_ERR("fail to compile: %s\n", cjp->compile_error);
+	CSONPATH_GETTER_ERR("fail to compile: %s\n", cjp->compile_error ?
+			    cjp->compile_error : "(unknow error)");
 	return CSONPATH_NONE_FOUND_RET;
     }
 

{csonpath-0.0.3 → csonpath-0.0.4}/csonpath_python.c

@@ -149,7 +149,7 @@ static PyObject *PyCsonPath_new(PyTypeObject *subtype, PyObject* args,
 
   if (csonpath_compile(ret) < 0) {
     char *error = ret->compile_error;
-    PyErr_Format(PyExc_ValueError, "compilation fail %s", error);
+    PyErr_Format(PyExc_ValueError, "compilation fail %s", error ? error : "(unknow error)");
     csonpath_destroy(ret);
     return NULL;
   }

{csonpath-0.0.3 → csonpath-0.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "csonpath"
-version = "0.0.3"
+version = "0.0.4"
 readme = "README.md"
 
 [tool.setuptools]