Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add default values to stored template arguments

Browse Source
This commit is contained in:
Charles Haley 2020-09-25 19:14:17 +01:00
parent 35acb2ccbd
commit c23eb2ae9d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,13 +347,18 @@ class _Parser(object):
self.parent.lex_scanner.scan(text)) self.parent.lex_scanner.scan(text))
return CallNode(subprog, arguments[1:]) return CallNode(subprog, arguments[1:])
if id_ == 'arguments': if id_ == 'arguments':
new_args = []
for arg in arguments: for arg in arguments:
if arg.node_type != Node.NODE_RVALUE: if arg.node_type not in (Node.NODE_ASSIGN, Node.NODE_RVALUE):
self.error(_("Parameters to 'arguments' must be variables")) self.error(_("Parameters to 'arguments' must be "
return ArgumentsNode(arguments) "variables or assignments"))
if arg.node_type == Node.NODE_RVALUE:
arg = AssignNode(arg.name, ConstantNode(''))
new_args.append(arg)
return ArgumentsNode(new_args)
cls = self.funcs[id_] cls = self.funcs[id_]
if cls.arg_count != -1 and len(arguments) != cls.arg_count: if cls.arg_count != -1 and len(arguments) != cls.arg_count:
self.error(_('Incorrect number of expression_list for function {0}').format(id_)) self.error(_('Incorrect number of arguments for function {0}').format(id_))
return FunctionNode(id_, arguments) return FunctionNode(id_, arguments)
elif self.token_is_constant(): elif self.token_is_constant():
# String or number # String or number
@ -460,7 +465,7 @@ class _Interpreter(object):
def do_node_arguments(self, prog): def do_node_arguments(self, prog):
for dex,arg in enumerate(prog.expression_list): for dex,arg in enumerate(prog.expression_list):
self.locals[arg.name] = self.locals.get('*arg_'+ str(dex), '') self.locals[arg.left] = self.locals.get('*arg_'+ str(dex), self.expr(arg.right))
return '' return ''
def do_node_constant(self, prog): def do_node_constant(self, prog):