Changeset 451

Timestamp:

08/21/07 07:25:45 (11 months ago)

Author:

athomas

Message:

pyndexter: Added sub-expression and attr:value support to the query parser.

Files:

• pyndexter/trunk/pyndexter/__init__.py (modified) (9 diffs)

pyndexter/trunk/pyndexter/__init__.py

@@ -196 +196 @@
-
-
+    # TODO Separate lexer and parser identifiers
-    NULL = 0
-    TERM = 1
@@ -201 +202 @@
-    AND = 3
-    OR = 4
+    ATTR = 5
+    BEGINSUB = 6
+    ENDSUB = 7
-
-    __slots__ = ('type', 'value', 'left', 'right')
@@ -211 +215 @@
-
-    def __repr__(self):
-
+
+
-        def show(node, depth=0):
-            if node.type == QueryNode.TERM:
-                text = '%s("%s"' % ('  ' * depth, node.value)
+            elif node.type == QueryNode.ATTR:
+                text = '%s(%s:"%s"' % ('  ' * depth, node.value[0], node.value[1])
-            else:
-node.value
+(node.value,)
-            if node.left or node.right:
-                text += "\n"
@@ -244 +251 @@
-        -<term>           exclude documents containing this term
-        <term> or <term>  return documents matching either term
+        <attr>:<term>     return documents with term in the specified attribute
-
-    eg.
@@ -270 +278 @@
-    """
-
-te>(?:\S)
+ss>\()|(?P<se>\))|(?P<at>\w+?:\w+)|(?P<te>\w
-    _group_map = {'dq': QueryNode.TERM, 'sq': QueryNode.TERM, 'te': QueryNode.TERM,
-
+
+
-
-    def __init__(self, phrase):
@@ -286 +295 @@
-
-    def parse(self, tokens):
-        # TODO: add support for sub-expressions eg. "(a b) or c"
-        left = self.parse_unary(tokens)
-        if tokens:
+            if tokens[0][0] == QueryNode.ENDSUB:
+                return left
-            if tokens[0][0] == QueryNode.OR:
-                tokens.pop(0)
@@ -307 +317 @@
-        if not tokens:
-            return None
+        if tokens[0][0] == QueryNode.BEGINSUB:
+            tokens.pop(0)
+            node = self.parse(tokens)
+            if not tokens or tokens[0][0] != QueryNode.ENDSUB:
+                raise InvalidQuery('Expected ) at end of sub-expression')
+            tokens.pop(0)
+            return node
-        if tokens[0][0] == QueryNode.NOT:
-            tokens.pop(0)
@@ -322 +339 @@
-        if not tokens:
-            raise InvalidQuery('Unexpected end of string')
+        if tokens[0][0] == QueryNode.ATTR:
+            token = tokens.pop(0)
+            attr, value = token[1].split(':', 1)
+            return QueryNode(QueryNode.ATTR, (attr, value))
-        if tokens[0][0] in (QueryNode.TERM, QueryNode.OR):
-            token = tokens.pop(0)
@@ -350 +371 @@
-        from compiler import ast, misc, pycodegen
-
+        # TODO Make Query.ATTR work
-        def _generate(node):
-            if node.type == node.TERM: