A few fixes.

This commit is contained in:
Jussi Pakkanen 2013-03-10 01:37:20 +02:00
parent f456453883
commit 27d39fe605
3 changed files with 6 additions and 2 deletions

View File

@ -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')

View File

@ -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:

View File

@ -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'