Mark
/
lamb
Archived
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More reliable ctrl-c

master
Mark 2022-11-12 17:47:41 -08:00
parent b26d968884
commit 495c947441
Signed by: Mark
GPG Key ID: AD62BB059C2AAEE4
1 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
lamb_engine/runner/runner.py
View File

@ -127,53 +127,55 @@ class Runner:
skip_to_end = False skip_to_end = False
while ( try:
( while (
(self.reduction_limit is None) or (
(k < self.reduction_limit) (self.reduction_limit is None) or
) and not only_macro (k < self.reduction_limit)
): ) and not only_macro
# Show reduction count
if (
( (k >= self.iter_update) and (k % self.iter_update == 0) )
and not (self.step_reduction and not skip_to_end)
): ):
print(f" Reducing... {k:,}", end = "\r")
try: # Show reduction count
if (
( (k >= self.iter_update) and (k % self.iter_update == 0) )
and not (self.step_reduction and not skip_to_end)
):
print(f" Reducing... {k:,}", end = "\r")
# Reduce
red_type, node = lamb_engine.nodes.reduce(node) red_type, node = lamb_engine.nodes.reduce(node)
except KeyboardInterrupt:
stop_reason = StopReason.INTERRUPT
break
# If we can't reduce this expression anymore, # If we can't reduce this expression anymore,
# it's in beta-normal form. # it's in beta-normal form.
if red_type == lamb_engine.nodes.ReductionType.NOTHING: if red_type == lamb_engine.nodes.ReductionType.NOTHING:
stop_reason = StopReason.BETA_NORMAL stop_reason = StopReason.BETA_NORMAL
break break
# Count reductions # Count reductions
k += 1 k += 1
if red_type == lamb_engine.nodes.ReductionType.FUNCTION_APPLY: if red_type == lamb_engine.nodes.ReductionType.FUNCTION_APPLY:
macro_expansions += 1 macro_expansions += 1
# Pause after step if necessary # Pause after step if necessary
if self.step_reduction and not skip_to_end: if self.step_reduction and not skip_to_end:
try: try:
s = prompt( s = prompt(
message = FormattedText([ message = FormattedText([
("class:prompt", lamb_engine.nodes.reduction_text[red_type]), ("class:prompt", lamb_engine.nodes.reduction_text[red_type]),
("class:prompt", f":{k:03} ") ("class:prompt", f":{k:03} ")
] + lamb_engine.utils.lex_str(str(node))), ] + lamb_engine.utils.lex_str(str(node))),
style = lamb_engine.utils.style, style = lamb_engine.utils.style,
key_bindings = step_bindings key_bindings = step_bindings
) )
except KeyboardInterrupt or EOFError: except KeyboardInterrupt or EOFError:
skip_to_end = True skip_to_end = True
printf(FormattedText([ printf(FormattedText([
("class:warn", "Skipping to end."), ("class:warn", "Skipping to end."),
]), style = lamb_engine.utils.style) ]), style = lamb_engine.utils.style)
# Gracefully catch keyboard interrupts
except KeyboardInterrupt:
stop_reason = StopReason.INTERRUPT
# Print a space between step messages # Print a space between step messages
if self.step_reduction: if self.step_reduction: