refactoring: modules: Rule->Generate, Parse->Rules

examples/vcard.py

@@ -155,4 +155,5 @@ class VCardCtx(object):
 g = grammar(VCardCtx(), mk_options(is_remember = False))
 
 pos, value = g.parse(source(vc))
+from parsed.Rules import CachingParser
 print value

examples/xml_parser.py

@@ -196,7 +196,7 @@ def element_close(elem, children, closing):
     print sw.dt
 
 
-    from parsed.Parse import CachingParser
+    from parsed.Rules import CachingParser
 
     with codecs.open(sys.argv[1], encoding = 'utf-8') as f:
         s = u'\n'.join(f.readlines())

parsed/Rule.py → parsed/Generate.py

@@ -4,7 +4,7 @@
 # Copyright (c) 2012 Denis Zalevskiy
 # Licensed under MIT License
 
-from Parse import *
+from Rule import *
 from cor import is_iterable, Err, integers
 from Common import *
 

parsed/Parse.py → parsed/Rules.py

@@ -229,7 +229,6 @@ def fn(src):
 
     return fn
 
-
 def match_string(name, s, action, options):
     if not (isinstance(s, str) or isinstance(s, unicode)):
         raise Err("{} is not a string", s)

parsed/__init__.py

@@ -6,23 +6,24 @@
 
 import string
 
-import Rule
-import Parse
+import Generate
+import Rules
 from Common import *
 
-def rule(fn): return Rule.TopRule(fn)
+def rule(fn): return Generate.TopRule(fn)
 
-def char(c): return Rule.mk_first_match_rule(c)
-def text(s): return Rule.StringRule(s)
+def char(c): return Generate.mk_first_match_rule(c)
+def text(s): return Generate.StringRule(s)
+def equal(c): return Generate.FirstEqualRule(c)
 
 def source(src, begin = 0, end = None):
-    return Parse.InfiniteInput(src, begin, end)
+    return Rules.InfiniteInput(src, begin, end)
 
 def cache_clean(rules_dict):
     '''rules_dict is ordinary result of grammar module globals()
     call'''
     for x in rules_dict.values():
-        if isinstance(x, Rule.Rule):
+        if isinstance(x, Generate.Rule):
             x.parser_cache_reset()
 
 

tests/basic.py

@@ -4,7 +4,7 @@
 # Copyright (c) 2012 Denis Zalevskiy
 # Licensed under MIT License
 
-from parsed.Parse import InfiniteInput
+from parsed.Rules import InfiniteInput
 import unittest
 from parsed import mk_options, rule, char, cache_clean
 import parsed.Parse as P