aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbackends.py2
-rwxr-xr-xinterpreter.py2
-rw-r--r--mparser.py4
3 files changed, 6 insertions, 2 deletions
diff --git a/backends.py b/backends.py
index 5fa6e89..a631f33 100755
--- a/backends.py
+++ b/backends.py
@@ -386,7 +386,7 @@ class NinjaBackend(Backend):
ninja_quote(self.environment.get_build_command()),
ninja_quote(self.environment.get_source_dir()),
ninja_quote(self.environment.get_build_dir()))
- outfile.write(" command = '%s' %s' '%s' '%s' --backend ninja\n" % c)
+ outfile.write(" command = '%s' '%s' '%s' '%s' --backend ninja\n" % c)
outfile.write(' description = Regenerating build files\n')
outfile.write(' generator = 1\n\n')
diff --git a/interpreter.py b/interpreter.py
index a9027fc..878b460 100755
--- a/interpreter.py
+++ b/interpreter.py
@@ -562,7 +562,7 @@ class Interpreter():
return self.builtin[varname]
if varname in self.variables:
return self.variables[varname]
- raise InvalidCode('Line %d: unknown variable "%s".' % varname)
+ raise InvalidCode('Unknown variable "%s".' % varname)
def set_variable(self, varname, variable):
if varname in self.builtin:
diff --git a/mparser.py b/mparser.py
index 75ab035..8954a9f 100644
--- a/mparser.py
+++ b/mparser.py
@@ -147,6 +147,10 @@ def p_statement_array(t):
def p_statement_array2(t):
'''statement : LBRACKET args EOL RBRACKET
| LBRACKET EOL args EOL RBRACKET'''
+ if len(t) == 5:
+ t[0] = nodes.ArrayStatement(t[2], t.lineno(1))
+ else:
+ t[0] = nodes.ArrayStatement(t[3], t.lineno(1))
def p_statement_func_call(t):
'statement : expression LPAREN args RPAREN'