Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved debugging facility for ranges

Browse Source
This commit is contained in:
Charles Haley 2022-05-13 19:23:38 +01:00
parent 5ea687fc06
commit dd52fe86df
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/utils/formatter.py
View File

@ -929,10 +929,10 @@ class _Interpreter:
self.error(_("{0}: {1} must be an integer").format('for', 'limit'), line_number) self.error(_("{0}: {1} must be an integer").format('for', 'limit'), line_number)
var = prog.variable var = prog.variable
if (self.break_reporter): if (self.break_reporter):
self.break_reporter("'for' 'start' value", str(start_val), line_number) self.break_reporter("'for': start value", str(start_val), line_number)
self.break_reporter("'for' 'stop' value", str(stop_val), line_number) self.break_reporter("'for': stop value", str(stop_val), line_number)
self.break_reporter("'for' 'step' value", str(step_val), line_number) self.break_reporter("'for': step value", str(step_val), line_number)
self.break_reporter("'for' 'limit' value", str(limit_val), line_number) self.break_reporter("'for': limit value", str(limit_val), line_number)
ret = '' ret = ''
try: try:
range_gen = range(start_val, stop_val, step_val) range_gen = range(start_val, stop_val, step_val)
@ -940,9 +940,11 @@ class _Interpreter:
self.error( self.error(
_("{0}: the range length ({1}) is larger than the limit ({2})").format _("{0}: the range length ({1}) is larger than the limit ({2})").format
('for', str(len(range_gen)), str(limit_val)), line_number) ('for', str(len(range_gen)), str(limit_val)), line_number)
for x in range_gen: for x in (str(x) for x in range_gen):
try: try:
self.locals[var] = str(x) if (self.break_reporter):
self.break_reporter(f"'for': assign to loop index '{var}'", x, line_number)
self.locals[var] = x
ret = self.expression_list(prog.block) ret = self.expression_list(prog.block)
except ContinueExecuted as e: except ContinueExecuted as e:
ret = e.get_value() ret = e.get_value()