Commit 1b02bfb
committed
parsers + file: Buf migration, _Generic type safety, encapsulation cleanup
Big refactor that lands several related cleanups in one commit:
1. Parser structs migrate from `Allocator * + u8 *data + size data_size`
to a single `Buf data` field. ElfFile, MachoFile, PeFile, PdbFile all
now own a Buf and free it through `BufDeinit`. The L-form
`*_open_from_memory` signature drops to `(<Foo>File *out, Buf *in)`:
parser snapshots the Buf and MemSets the caller's view to zero, so
any post-call use is a fresh empty Buf instead of a stale alias.
No data copy in the L-form (only the 4 struct fields move). The
R-form `_copy` still does a MemCopy through a fresh Buf, no change
to its contract.
2. `FileRead(File *, Buf *)` overload added next to the existing Str
form. Five parser callers (Elf/MachO/Pe/Pdb/Http) slurp into Buf
now -- semantically correct for binary inputs, and the cast +
manual-disassembly dance is gone. `BufFmt` declarations moved out
of Buf.h into Io.h (they're an I/O concern; Buf.h was pulling Io.h
transitively which formed a File.h <-> Buf.h cycle).
3. `_Generic` type safety: 14 path-API macros (FileOpen, FileGetSize,
File/DirRemove, DirCreate/CreateAll/RemoveAll, DirGetContents, and
the four parser `_Open` overloads) previously had a `default:` arm
that silently cast any input to `const char *` -- passing an
`int *` or struct pointer compiled clean. Replaced with explicit
`char *:` and `const char *:` associations so unsupported types
now fail to compile (no matching `_Generic` association). `IOFMT`
and `ARG_TARGET` keep their `default:` arms intentionally -- both
route to runtime LOG_FATAL sentinels (`UnsupportedType` /
`ARG_KIND_INVALID`), documented in their headers.
4. `BufAllocator(b)` accessor macro added; ~60 sites of direct
`b->length` / `b->data` / `b->allocator` access in parsers, Http,
KvConfig, MachoCache replaced with `BufLength` / `BufData` /
`BufAllocator` / `StrLen` / `StrBegin` / `StrCharAt`. Container
fields are accessed only inside the container's own `.c`; outside
code goes through the public macro surface.
5. `FileOpenTemp` drops its `prefix` argument -- the name is now just
`Prng64()` rendered as 16-hex, file lands in CWD. Removes the
`_Generic`-on-path complexity entirely (no string-shaped input to
dispatch on). Iter test files include Buf.h directly now that
Buf.h doesn't transitively pull it through Iter.h's chain.
Verified:
Linux sanitised: 104/104 OK
Mac sanitised: 99/99 OK in 40s wall
Mac freestanding: 99/99 OK in 19s wall
Mac libc-diet: beam + resolve dyld-only (no libSystem refs)1 parent bcd6f72 commit 1b02bfb
22 files changed
Lines changed: 451 additions & 477 deletions
File tree
- Include/Misra
- Parsers
- Std
- Container
- Sys
- Source/Misra
- Parsers
- Std
- Sys
- Tests/Std
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
174 | 175 | | |
175 | 176 | | |
176 | 177 | | |
177 | | - | |
178 | | - | |
179 | | - | |
| 178 | + | |
180 | 179 | | |
181 | 180 | | |
182 | 181 | | |
| |||
209 | 208 | | |
210 | 209 | | |
211 | 210 | | |
212 | | - | |
| 211 | + | |
| 212 | + | |
213 | 213 | | |
214 | 214 | | |
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
218 | 218 | | |
219 | | - | |
| 219 | + | |
| 220 | + | |
220 | 221 | | |
221 | 222 | | |
222 | 223 | | |
223 | 224 | | |
224 | 225 | | |
225 | 226 | | |
226 | | - | |
227 | | - | |
228 | | - | |
229 | | - | |
230 | | - | |
231 | | - | |
232 | | - | |
233 | | - | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
234 | 234 | | |
235 | 235 | | |
236 | | - | |
237 | | - | |
238 | | - | |
239 | | - | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
240 | 240 | | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | | - | |
245 | | - | |
246 | | - | |
247 | | - | |
248 | | - | |
249 | | - | |
250 | | - | |
251 | | - | |
252 | | - | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
253 | 249 | | |
254 | 250 | | |
255 | 251 | | |
256 | | - | |
257 | | - | |
258 | | - | |
259 | | - | |
260 | | - | |
261 | | - | |
| 252 | + | |
| 253 | + | |
262 | 254 | | |
263 | 255 | | |
264 | 256 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
| |||
99 | 100 | | |
100 | 101 | | |
101 | 102 | | |
102 | | - | |
103 | | - | |
104 | | - | |
| 103 | + | |
105 | 104 | | |
106 | 105 | | |
107 | 106 | | |
| |||
128 | 127 | | |
129 | 128 | | |
130 | 129 | | |
131 | | - | |
| 130 | + | |
| 131 | + | |
132 | 132 | | |
133 | 133 | | |
134 | 134 | | |
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
138 | | - | |
| 138 | + | |
| 139 | + | |
139 | 140 | | |
140 | 141 | | |
141 | 142 | | |
142 | 143 | | |
143 | 144 | | |
144 | 145 | | |
145 | | - | |
146 | | - | |
147 | | - | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
148 | 150 | | |
149 | | - | |
150 | | - | |
151 | | - | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
152 | 156 | | |
153 | | - | |
154 | | - | |
155 | | - | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
156 | 160 | | |
157 | 161 | | |
158 | 162 | | |
159 | | - | |
160 | | - | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | | - | |
| 163 | + | |
| 164 | + | |
165 | 165 | | |
166 | 166 | | |
167 | 167 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| 29 | + | |
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
| |||
81 | 82 | | |
82 | 83 | | |
83 | 84 | | |
84 | | - | |
85 | | - | |
86 | | - | |
| 85 | + | |
87 | 86 | | |
88 | 87 | | |
89 | 88 | | |
| |||
123 | 122 | | |
124 | 123 | | |
125 | 124 | | |
126 | | - | |
| 125 | + | |
| 126 | + | |
127 | 127 | | |
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
131 | 131 | | |
132 | 132 | | |
133 | | - | |
| 133 | + | |
| 134 | + | |
134 | 135 | | |
135 | 136 | | |
136 | 137 | | |
| |||
151 | 152 | | |
152 | 153 | | |
153 | 154 | | |
154 | | - | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
| 155 | + | |
| 156 | + | |
160 | 157 | | |
161 | 158 | | |
162 | 159 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| 20 | + | |
20 | 21 | | |
21 | 22 | | |
22 | 23 | | |
| |||
94 | 95 | | |
95 | 96 | | |
96 | 97 | | |
97 | | - | |
98 | | - | |
99 | | - | |
| 98 | + | |
100 | 99 | | |
101 | 100 | | |
102 | 101 | | |
| |||
125 | 124 | | |
126 | 125 | | |
127 | 126 | | |
128 | | - | |
| 127 | + | |
| 128 | + | |
129 | 129 | | |
130 | 130 | | |
131 | 131 | | |
132 | 132 | | |
133 | 133 | | |
134 | 134 | | |
135 | | - | |
| 135 | + | |
| 136 | + | |
136 | 137 | | |
137 | 138 | | |
138 | 139 | | |
| |||
153 | 154 | | |
154 | 155 | | |
155 | 156 | | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
160 | | - | |
161 | | - | |
| 157 | + | |
| 158 | + | |
162 | 159 | | |
163 | 160 | | |
164 | 161 | | |
| |||
0 commit comments