From 847d7b1e20d878f1ddc4e6093b38fd7163524c64 Mon Sep 17 00:00:00 2001 From: Sei Lisa Date: Fri, 1 Aug 2014 02:02:24 +0200 Subject: [PATCH] Oops, forgot these in the editor without saving. They belong to the output module general preparation for renaming. --- lslopt/lsloutput.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lslopt/lsloutput.py b/lslopt/lsloutput.py index a973134..ebcf699 100644 --- a/lslopt/lsloutput.py +++ b/lslopt/lsloutput.py @@ -196,7 +196,7 @@ class outscript(object): return '<' + self.OutExprList(child) + '>' if nt == 'FNCALL': - return expr['name'] + '(' + self.OutExprList(child) + ')' + return self.FindName(expr) + '(' + self.OutExprList(child) + ')' if nt == 'PRINT': return 'print(' + self.OutExpr(child[0]) + ')' @@ -286,7 +286,7 @@ class outscript(object): if node['name'] == 'default': ret = self.dent() + 'default\n' else: - ret = self.dent() + 'state ' + node['name'] + '\n' + ret = self.dent() + 'state ' + self.FindName(node) + '\n' ret += self.dent() + '{\n' self.indentlevel += 1 @@ -299,7 +299,7 @@ class outscript(object): ret = self.dent() if node['t'] is not None: ret += node['t'] + ' ' - ret += node['name'] + '(' + ret += self.FindName(node) + '(' ret += ', '.join(typ + ' ' + name for typ, name in zip(node['ptypes'], node['pnames'])) return ret + ')\n' + self.OutCode(child[0])