From 20d850d21f58c256abbad241e0c444d173c60834 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Sat, 10 Aug 2013 02:11:29 +0300
Subject: [PATCH] Precedence fix.

---
 interpreter.py | 4 +++-
 mparser.py     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/interpreter.py b/interpreter.py
index 45aa3b09f..509564028 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -1326,7 +1326,9 @@ class Interpreter():
             val2 = v2
         else:
             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() == '==':
             return val1 == val2
         elif node.get_ctype() == '!=':
diff --git a/mparser.py b/mparser.py
index ee0f22ffb..a1640bc11 100644
--- a/mparser.py
+++ b/mparser.py
@@ -69,10 +69,10 @@ t_ignore = ' \t'
 precedence = (
 ('left', 'COMMA'),
 ('left', 'ASSIGN'),
-('nonassoc', 'EQUALS', 'NEQUALS'),
 ('left', 'OR'),
 ('left', 'AND'),
 ('right', 'NOT'),
+('nonassoc', 'EQUALS', 'NEQUALS'),
 ('nonassoc', 'COLON'),
 ('left', 'DOT'),
 )