diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-03-10 01:37:20 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-03-10 01:37:20 +0200 |
commit | 27d39fe6056a1bf8af12a41065bd01cc809ebd83 (patch) | |
tree | d6542cf3764bbb1b244462f3581fae746ab086e0 | |
parent | f45645388363372f77e0d63523383e07dcdacd82 (diff) | |
download | meson-27d39fe6056a1bf8af12a41065bd01cc809ebd83.zip meson-27d39fe6056a1bf8af12a41065bd01cc809ebd83.tar.gz meson-27d39fe6056a1bf8af12a41065bd01cc809ebd83.tar.bz2 |
A few fixes.
-rwxr-xr-x | backends.py | 2 | ||||
-rwxr-xr-x | interpreter.py | 2 | ||||
-rw-r--r-- | mparser.py | 4 |
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: @@ -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' |