Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Precedence fix.

This commit is contained in:
Jussi Pakkanen 2013-08-10 02:11:29 +03:00
parent 98da65f8cc
commit 20d850d21f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interpreter.py
View File

@ -1326,7 +1326,9 @@ class Interpreter():
val2 = v2 val2 = v2
else: else:
val2 = v2.get_value() val2 = v2.get_value()
assert(type(val1) == type(val2)) if type(val1) != type(val2):
raise InterpreterException('Comparison of different types %s and %s.' %
(str(type(val1)), str(type(val2))))
if node.get_ctype() == '==': if node.get_ctype() == '==':
return val1 == val2 return val1 == val2
elif node.get_ctype() == '!=': elif node.get_ctype() == '!=':

2
mparser.py
View File

@ -69,10 +69,10 @@ t_ignore = ' \t'
precedence = ( precedence = (
('left', 'COMMA'), ('left', 'COMMA'),
('left', 'ASSIGN'), ('left', 'ASSIGN'),
('nonassoc', 'EQUALS', 'NEQUALS'),
('left', 'OR'), ('left', 'OR'),
('left', 'AND'), ('left', 'AND'),
('right', 'NOT'), ('right', 'NOT'),
('nonassoc', 'EQUALS', 'NEQUALS'),
('nonassoc', 'COLON'), ('nonassoc', 'COLON'),
('left', 'DOT'), ('left', 'DOT'),
) )