From 13d0a7f353280758dc25e5527c2b1f120cb9a137 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 18 Jan 2018 10:05:39 +0530
Subject: [PATCH] ...

---
 src/calibre/utils/search_query_parser.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py
index d2592ea793..5b5dd570ff 100644
--- a/src/calibre/utils/search_query_parser.py
+++ b/src/calibre/utils/search_query_parser.py
@@ -145,10 +145,10 @@ class Parser(object):
 
     # Had to translate named constants to numeric values
     lex_scanner = re.Scanner([
-            (r'[()]', lambda x,t: (1, t)),
-            (r'@.+?:[^")\s]+', lambda x,t: (2, unicode(t))),
-            (r'[^"()\s]+', lambda x,t: (2, unicode(t))),
-            (r'".*?((?<!\\)")', lambda x,t: (3, t[1:-1])),
+            (r'[()]', lambda x,t: (Parser.OPCODE, t)),
+            (r'@.+?:[^")\s]+', lambda x,t: (Parser.WORD, unicode(t))),
+            (r'[^"()\s]+', lambda x,t: (Parser.WORD, unicode(t))),
+            (r'".*?((?<!\\)")', lambda x,t: (Parser.QUOTED_WORD, t[1:-1])),
             (r'\s+',              None)
     ], flags=re.DOTALL)