Repository navigation
Commit cbda1b1
committed
Merge fu/toon-output into fu/integration
Resolve src/operations/read.c conflicts for detail, diagnostics and project cleanup by retaining cbm_operation_arg_free; release the new format argument with the same class. Keep stable project tree tables and the unchanged explicit-JSON construction.
Resolve src/operations/search.c copy_text and cleanup conflicts with CBM_MEM_CLASS_OPERATION_ARG allocation/releases while retaining grouped/flat and ranked tree rendering, output budgets and continuation. Release both added format arguments through cbm_operation_arg_free. Keep string builders owning temporary buffers until cbm_sb_free and reuse result disposal for encoded metadata and oversized responses to hold the raw-allocation ratchet. Normalize libc glob output into memory-core ownership before BM25 cleanup.
Resolve tests/test_integration.c include conflict by retaining result_wire.h and cbm.h and adding mem_core.h. Keep both inherited tests and TOON tests; extend the existing BM25 regression to compare wildcard/literal file-filter JSON bytes and verify operation arguments are released.
src/operations/index.c auto-merges the explicit JSON internal listing with the argument migration. src/main.c retains outer --json format selection. Scan all four both-side changed files, including Windows and Apple conditionals, for duplicate functions/declarations/TEST bodies/RUN_TEST registrations; none added. Regenerate and strictly lint the baseline: search stays at 5, read drops from 7 to 6, no file exceeds the argparse branch. Vendored contents unchanged.8 files changed
Lines changed: 836 additions & 66 deletions
File tree
- scripts
- src
- operations
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
66 | | - | |
| 66 | + | |
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
| 34 | + | |
33 | 35 | | |
34 | 36 | | |
35 | 37 | | |
| |||
847 | 849 | | |
848 | 850 | | |
849 | 851 | | |
850 | | - | |
| 852 | + | |
851 | 853 | | |
852 | 854 | | |
853 | 855 | | |
| |||
954 | 956 | | |
955 | 957 | | |
956 | 958 | | |
| 959 | + | |
| 960 | + | |
| 961 | + | |
| 962 | + | |
| 963 | + | |
| 964 | + | |
| 965 | + | |
| 966 | + | |
| 967 | + | |
| 968 | + | |
| 969 | + | |
| 970 | + | |
| 971 | + | |
| 972 | + | |
| 973 | + | |
| 974 | + | |
| 975 | + | |
| 976 | + | |
| 977 | + | |
| 978 | + | |
| 979 | + | |
| 980 | + | |
| 981 | + | |
| 982 | + | |
| 983 | + | |
| 984 | + | |
957 | 985 | | |
958 | 986 | | |
959 | 987 | | |
| |||
1120 | 1148 | | |
1121 | 1149 | | |
1122 | 1150 | | |
1123 | | - | |
| 1151 | + | |
1124 | 1152 | | |
1125 | 1153 | | |
1126 | 1154 | | |
| |||
1139 | 1167 | | |
1140 | 1168 | | |
1141 | 1169 | | |
1142 | | - | |
| 1170 | + | |
1143 | 1171 | | |
1144 | 1172 | | |
1145 | 1173 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1045 | 1045 | | |
1046 | 1046 | | |
1047 | 1047 | | |
1048 | | - | |
| 1048 | + | |
| 1049 | + | |
1049 | 1050 | | |
1050 | 1051 | | |
1051 | 1052 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
3 | 5 | | |
4 | 6 | | |
5 | 7 | | |
| |||
113 | 115 | | |
114 | 116 | | |
115 | 117 | | |
116 | | - | |
| 118 | + | |
117 | 119 | | |
118 | 120 | | |
119 | 121 | | |
| |||
126 | 128 | | |
127 | 129 | | |
128 | 130 | | |
129 | | - | |
130 | | - | |
| 131 | + | |
| 132 | + | |
131 | 133 | | |
132 | 134 | | |
133 | 135 | | |
| |||
212 | 214 | | |
213 | 215 | | |
214 | 216 | | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
215 | 269 | | |
216 | 270 | | |
217 | 271 | | |
| |||
341 | 395 | | |
342 | 396 | | |
343 | 397 | | |
344 | | - | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
345 | 407 | | |
346 | 408 | | |
347 | 409 | | |
| |||
0 commit comments