Skip to content

Isolated change to compile greedy range #1101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
franzhaas wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Isolated change to compile greedy range #1101

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
489f8d3
- compiling GreedyRange
franzhaas Oct 2, 2024
b508082
- fixed handling of StopFieldError in GreedyRanges
franzhaas Oct 4, 2024
12f0f34
- optimised greedyrange
franzhaas Oct 7, 2024
c00555f
- further compacted compiling greedyrange
franzhaas Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions construct/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2633,6 +2633,32 @@ def _sizeof(self, context, path):
def _emitfulltype(self, ksy, bitwise):
return dict(type=self.subcon._compileprimitivetype(ksy, bitwise), repeat="eos")

def _emitparse(self, code):
fname = f"parse_greedyrange_{code.allocateId()}"
work_item = {False: f"yield {self.subcon._compileparse(code)}",
True: f"{self.subcon._compileparse(code)}"}[self.discard]
block = f"""
def {fname}(io, this):
try:
while True:
fallback = io.tell()
{work_item}
except StopFieldError:
pass
except ExplicitError:
raise
except Exception:
io.seek(fallback)
"""
code.append(block)
if False == self.discard:
return f"ListContainer({fname}(io, this))"
else:
return f"({fname}(io, this), ListContainer())[1]"

def _emitbuild(self, code):
return f"ListContainer([{self.subcon._compilebuild(code)} for obj in iter(obj)])"


class RepeatUntil(Subconstruct):
r"""
Expand Down