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

Prevent overwriting local functions by another with the same name defined in a stored template.

Browse Source
This commit is contained in:
Charles Haley 2022-04-01 15:14:33 +01:00
parent 95215eded1
commit 6f22d674b4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -493,7 +493,9 @@ class _Parser:
line_number = self.line_number line_number = self.line_number
if not self.token_is_id(): if not self.token_is_id():
self.error(_("'{0}' statement: expected a function name identifier").format('def')) self.error(_("'{0}' statement: expected a function name identifier").format('def'))
variable = self.token() function_name = self.token()
if function_name in self.local_functions:
self.error(_("Function name '{0}' is already defined").format(function_name))
if not self.token_op_is('('): if not self.token_op_is('('):
self.error(_("'{0}' statement: expected a '('").format('def')) self.error(_("'{0}' statement: expected a '('").format('def'))
self.consume() self.consume()
@ -519,8 +521,8 @@ class _Parser:
if not self.token_is('fed'): if not self.token_is('fed'):
self.error(_("'{0}' statement: missing the closing '{1}'").format('def', 'fed')) self.error(_("'{0}' statement: missing the closing '{1}'").format('def', 'fed'))
self.consume() self.consume()
self.local_functions.add(variable) self.local_functions.add(function_name)
return LocalFunctionDefineNode(line_number, variable, arguments, block) return LocalFunctionDefineNode(line_number, function_name, arguments, block)
def local_call_expression(self, name, arguments): def local_call_expression(self, name, arguments):
return LocalFunctionCallNode(self.line_number, name, arguments) return LocalFunctionCallNode(self.line_number, name, arguments)
@ -895,7 +897,9 @@ class _Interpreter:
# evaluate the expression (recursive call) # evaluate the expression (recursive call)
args.append(self.expr(arg)) args.append(self.expr(arg))
saved_locals = self.locals saved_locals = self.locals
saved_local_functions = self.local_functions
self.locals = {} self.locals = {}
self.local_functions = {}
for dex, v in enumerate(args): for dex, v in enumerate(args):
self.locals['*arg_'+ str(dex)] = v self.locals['*arg_'+ str(dex)] = v
if (self.break_reporter): if (self.break_reporter):
@ -911,6 +915,7 @@ class _Interpreter:
val = e.get_value() val = e.get_value()
self.override_line_number = saved_line_number self.override_line_number = saved_line_number
self.locals = saved_locals self.locals = saved_locals
self.local_functions = saved_local_functions
if (self.break_reporter): if (self.break_reporter):
self.break_reporter(prog.node_name + _(' returned value'), val, prog.line_number) self.break_reporter(prog.node_name + _(' returned value'), val, prog.line_number)
return val return val