csonpath 0.12.0__tar.gz → 0.12.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {csonpath-0.12.0 → csonpath-0.12.1}/Makefile +6 -2
- {csonpath-0.12.0/csonpath.egg-info → csonpath-0.12.1}/PKG-INFO +1 -1
- {csonpath-0.12.0 → csonpath-0.12.1/csonpath.egg-info}/PKG-INFO +1 -1
- {csonpath-0.12.0 → csonpath-0.12.1}/csonpath_do.h +4 -4
- {csonpath-0.12.0 → csonpath-0.12.1}/pyproject.toml +2 -2
- {csonpath-0.12.0 → csonpath-0.12.1}/LICENSE +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/MANIFEST.in +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/README.md +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/configure +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/csonpath.egg-info/SOURCES.txt +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/csonpath.egg-info/dependency_links.txt +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/csonpath.egg-info/requires.txt +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/csonpath.egg-info/top_level.txt +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/csonpath.h +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/csonpath_json-c.h +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/csonpath_python.c +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/csonpath_yyjson.h +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/setup.cfg +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/setup.py +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/.git +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/.github/workflows/c-cpp.yml +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/.gitignore +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/LICENSE +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/Makefile +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/README.md +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/clib.json +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/formal_verification.md +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/re.c +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/re.h +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/scripts/exrex.py +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/scripts/regex_test.py +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/scripts/regex_test_neg.py +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/tests/test1.c +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/tests/test2.c +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/tests/test3.c +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/tests/test_compile.c +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/tests/test_print.c +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/tests/test_rand.c +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/tests/test_rand_neg.c +0 -0
- {csonpath-0.12.0 → csonpath-0.12.1}/tiny-regex-c/tests/test_thread.c +0 -0
|
@@ -3,7 +3,7 @@ JSON_C_LDFLAGS=$(shell pkg-config --libs json-c)
|
|
|
3
3
|
|
|
4
4
|
include config.mk
|
|
5
5
|
|
|
6
|
-
all: test-json-c-get-a test-json-update test-json-filter test-json-subpath
|
|
6
|
+
all: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root
|
|
7
7
|
|
|
8
8
|
bench:
|
|
9
9
|
make -C bench
|
|
@@ -18,6 +18,9 @@ CFLAGS+= -Wall -Wextra -Wno-unused-function -Wno-unused-parameter -O0 -g
|
|
|
18
18
|
test-json-c-get-a: tests/json-c/get-a.c $(EXTRA_FILES) csonpath_json-c.h csonpath.h csonpath_do.h
|
|
19
19
|
$(CC) tests/json-c/get-a.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-c-get-a $(JSON_C_LDFLAGS) $(LDFLAGS)
|
|
20
20
|
|
|
21
|
+
test-json-c-array-root: tests/json-c/root-array.c $(EXTRA_FILES) csonpath_json-c.h csonpath.h csonpath_do.h
|
|
22
|
+
$(CC) tests/json-c/root-array.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-c-array-root $(JSON_C_LDFLAGS) $(LDFLAGS)
|
|
23
|
+
|
|
21
24
|
test-json-update: tests/json-c/set-a.c csonpath_json-c.h csonpath.h csonpath_do.h
|
|
22
25
|
$(CC) tests/json-c/set-a.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-update $(JSON_C_LDFLAGS) $(LDFLAGS)
|
|
23
26
|
|
|
@@ -27,11 +30,12 @@ test-json-filter: tests/json-c/filter.c csonpath_json-c.h csonpath.h csonpath_do
|
|
|
27
30
|
test-json-subpath: tests/json-c/subpath.c csonpath_json-c.h csonpath.h csonpath_do.h
|
|
28
31
|
$(CC) tests/json-c/subpath.c $(EXTRA_FILES) $(JSON_C_CFLAGS) $(CFLAGS) -Wno-format -I./ -o test-json-subpath $(JSON_C_LDFLAGS) $(LDFLAGS)
|
|
29
32
|
|
|
30
|
-
tests-c: test-json-c-get-a test-json-update test-json-filter test-json-subpath
|
|
33
|
+
tests-c: test-json-c-get-a test-json-update test-json-filter test-json-subpath test-json-c-array-root
|
|
31
34
|
./test-json-c-get-a
|
|
32
35
|
./test-json-update
|
|
33
36
|
./test-json-filter
|
|
34
37
|
./test-json-subpath
|
|
38
|
+
./test-json-c-array-root
|
|
35
39
|
|
|
36
40
|
pip-dev:
|
|
37
41
|
pip install -e .[dev] --force-reinstall
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#ifndef CSONPATH_DO_GET_NOTFOUND
|
|
2
2
|
#define CSONPATH_DO_GET_NOTFOUND(this_idx) \
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
do { \
|
|
4
|
+
walker += 1; \
|
|
5
5
|
while (*walker != CSONPATH_INST_END) { \
|
|
6
6
|
if (*walker == CSONPATH_INST_OR) { \
|
|
7
7
|
goto next_inst; \
|
|
@@ -369,10 +369,10 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(const struct csonpath cjp[const
|
|
|
369
369
|
this_idx = (int)walker[1];
|
|
370
370
|
CSONPATH_PRE_GET(this_idx);
|
|
371
371
|
tmp = CSONPATH_AT(tmp, this_idx);
|
|
372
|
+
walker += 1;
|
|
372
373
|
if (tmp == CSONPATH_NULL) {
|
|
373
374
|
CSONPATH_DO_GET_NOTFOUND(this_idx);
|
|
374
375
|
}
|
|
375
|
-
walker += 1;
|
|
376
376
|
CSONPATH_DO_POST_FIND_ARRAY;
|
|
377
377
|
break;
|
|
378
378
|
}
|
|
@@ -385,10 +385,10 @@ static CSONPATH_DO_RET_TYPE csonpath_do_internal(const struct csonpath cjp[const
|
|
|
385
385
|
this_idx = to_num.n;
|
|
386
386
|
CSONPATH_PRE_GET(this_idx);
|
|
387
387
|
tmp = CSONPATH_AT(tmp, to_num.n);
|
|
388
|
+
walker += 5;
|
|
388
389
|
if (tmp == CSONPATH_NULL) {
|
|
389
390
|
CSONPATH_DO_GET_NOTFOUND(this_idx);
|
|
390
391
|
}
|
|
391
|
-
walker += 5;
|
|
392
392
|
CSONPATH_DO_POST_FIND_ARRAY;
|
|
393
393
|
break;
|
|
394
394
|
}
|
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "csonpath"
|
|
7
|
-
version = "0.12.
|
|
7
|
+
version = "0.12.1"
|
|
8
8
|
readme = "README.md"
|
|
9
9
|
|
|
10
10
|
[tool.setuptools]
|
|
@@ -27,7 +27,7 @@ test-command = "pytest {project}/tests/python"
|
|
|
27
27
|
before-build = "choco install mingw -y"
|
|
28
28
|
|
|
29
29
|
[tool.bumpversion]
|
|
30
|
-
current_version = "0.12.
|
|
30
|
+
current_version = "0.12.1"
|
|
31
31
|
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
|
|
32
32
|
serialize = ["{major}.{minor}.{patch}"]
|
|
33
33
|
search = "{current_version}"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|