Remove the internal TOMLChar wrapper#492
Open
tfoutrein wants to merge 4 commits into
Open
Conversation
`Source.__init__` built `iter([(i, TOMLChar(c)) for i, c in enumerate(self)])`, allocating one tuple and one TOMLChar per character of the whole input up front. Track an integer index into the underlying string instead: `inc()` bumps the index and reads `self[idx]`, and state save/restore snapshots the index rather than copying an iterator. Construction is O(1) and per-character work is deferred to the read. No behaviour change (full suite incl. the toml-test conformance submodule passes); ~1.07-1.14x faster parsing across document sizes.
The parser advanced one character at a time through runs of whitespace, bare-key and number characters, paying a `Source.inc()` call (attribute lookups + a `TOMLChar` build + bounds check) for every character. Add `Source.advance_while(charset)` / `advance_until(stopset)`, which scan the underlying string in a single pass and update the index and current character only once, and use them for the leading-whitespace, bare-key and number/date runs. Same value contract as the `while ... and self.inc()` loops they replace. No behaviour change (full suite incl. the toml-test conformance submodule passes; round-trip output byte-identical on a varied corpus). ~1.05-1.32x faster parsing depending on shape (e.g. ~1.26x on a poetry.lock-like file).
Parsing a single-line string appended its body one character at a time (`value += current; inc()`). For long string values this dominates. Scan the run of ordinary characters up to the next delimiter, backslash or control character in a single pass (`Source.advance_until`) and append the whole slice at once; the stop character is then handled by the existing branch on the next iteration. Multiline strings keep the per-character loop (CRLF handling). The stop-set is exactly the control characters the per-character loop rejects, so InvalidControlChar / escape / delimiter handling is unchanged. No behaviour change (972 tests incl. the toml-test conformance submodule; plus a 4135-input adversarial differential — output and error-type byte-identical to the per-char loop). Up to ~5x faster parsing on string-heavy single-line documents.
After the bulk run-scans, the parser only built a `TOMLChar` (a `str` subclass) at run boundaries and used a handful of its `is_*()` helpers. Drop the class entirely: `Source` now yields plain `str` characters and detects end-of-input positionally (`_idx >= len` / `Source.end()`) instead of an identity sentinel, and the remaining character-class checks use module-level frozensets. A real NUL byte is still rejected as an invalid control char and is never mistaken for end-of-input, since EOF is now positional rather than a sentinel comparison. No behaviour change (972 tests incl. the toml-test conformance submodule; plus an 11.5k-input adversarial differential over EOF/truncation, real-NUL placement, empty/whitespace and structural fuzz — output and error-type byte-identical to master). Removes the per-character object construction and method dispatch (~1.1-1.18x over the previous step).
tfoutrein
force-pushed
the
perf/remove-tomlchar
branch
from
b4509b9 to
1c43d4d
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
After the bulk run-scans (#490/#491), the parser only constructs a
TOMLChar(astrsubclass) at run boundaries and uses a handful of itsis_*()helpers. This removes the class entirely:Sourceyields plainstrcharacters;inc()/advance_*readself[i]directly._idx >= len/Source.end()) instead of an identity sentinel.A real NUL byte is still rejected as an invalid control char and is never mistaken for end-of-input, since EOF is now positional rather than a value/identity comparison.
Benchmarks
Median, interleaved A/B vs
master(includes #489–#491):The removal itself adds ~1.1–1.18× over #491. No regression on any shape.
Tests
Full suite passes (972, incl. the toml-test conformance submodule). On top of that, an 11.5k-input adversarial differential — EOF/truncation at every prefix length, real-NUL placement in every position, empty/whitespace/BOM, and structural fuzz — is byte-identical in output and exception type to
master. No public API change (TOMLCharwas not exported).