Ditch built-in lexer

inducer · Dec 28, 2014 · 610141d · 610141d
1 parent c633ce4
commit 610141d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 128 deletions.
diff --git a/setup.py b/setup.py
@@ -41,6 +41,7 @@ def main():
               "SQLAlchemy>=0.8",
               "sqlalchemy-migrate>=0.7.2.24",
               "parsedatetime>=0.8.6",
+              "pytools>=2014.3.5",
               "ipaddr",
               ],
 

diff --git a/synoptic/lex.py b/synoptic/lex.py
diff --git a/synoptic/query.py b/synoptic/query.py
@@ -422,7 +422,7 @@ def visit_date_query(self, q):
 _whitespace = intern("whitespace")
 
 
-from synoptic.lex import RE
+from pytools.lex import RE
 _LEX_TABLE = [
     (_and, RE(r"and\b")),
     (_or, RE(r"or\b")),
@@ -526,10 +526,11 @@ def inner_parse(pstate, min_precedence=0):
 
         return left_query
 
-    from synoptic.lex import LexIterator, lex
+    from pytools.lex import LexIterator, lex
     pstate = LexIterator(
         [(tag, s, idx, matchobj)
-         for (tag, s, idx, matchobj) in lex(_LEX_TABLE, expr_str)
+         for (tag, s, idx, matchobj) in lex(
+             _LEX_TABLE, expr_str, match_objects=True)
          if tag is not _whitespace], expr_str)
 
     if pstate.is_at_end():