Version 0.6: Use parsley instead of parsimonious

[phdru.name/cgi-bin/blog-ru/search-tags.git] / parser / parser.py

diff --git a/parser/parser.py b/parser/parser.py
old mode 100644 (file)
new mode 100755 (executable)
index c74eb78..3f51d3f
--- a/parser/parser.py
+++ b/parser/parser.py
@@ -1,52 +1,33 @@
-# Parse query
+#! /usr/bin/env python
 
-from ply import lex, yacc
+import os
+from parsley import makeGrammar
 
-literals = '()'
 
-tokens = ('NAME', 'AND_OP', 'OR_OP', 'NOT_OP')
+# cache
+_grammar = None
 
-t_NAME = '[a-z][a-z0-9_]+'
 
-t_AND_OP = '&'
+def load_grammar():
+    global _grammar
+    parser_dir = os.path.dirname(__file__)
+    with open(os.path.join(parser_dir, 'grammar.ebnf'), 'rt') as grammar_file:
+        grammar_text = grammar_file.read()
+    _grammar = makeGrammar(grammar_text, {}, 'Tags')
 
-t_OR_OP = r'\|'
 
-t_NOT_OP = '!'
+def parse(input):
+    if _grammar is None:
+        load_grammar()
+    return _grammar(input).expression()
 
-def t_error(t):
-    """Avoid warnings on stderr"""
 
-lexer = lex.lex()
-
-def p_expression_name(p):
-    """expression : NAME"""
-    p[0] = ('NAME', p[1])
-
-def p_expression_and(p):
-    """expression : expression AND_OP expression"""
-    p[0] = ('AND', p[1], p[3])
-
-def p_expression_not(p):
-    """expression : NOT_OP expression"""
-    p[0] = ('NOT', p[2])
-
-def p_expression_or(p):
-    """expression : expression OR_OP expression"""
-    p[0] = ('OR', p[1], p[3])
-
-def p_expression_parens(p):
-    """expression : '(' expression ')'"""
-    p[0] = ('PARENS', p[2])
-
-def p_error(p):
-    """Avoid warnings on stderr"""
-    yacc.restart()
-
-precedence = (
-    ('left', 'OR_OP'),
-    ('left', 'AND_OP'),
-    ('right', 'NOT_OP'),
-)
-
-parser = yacc.yacc()
+if __name__ == '__main__':
+    print parse('test')
+    print parse('!test')
+    print parse('not test')
+    print parse('foo or bar')
+    print parse('foo && bar')
+    print parse('(test)')
+    print parse('(foo || bar)')
+    print parse('(foo and !bar)')