diff pyrect/regexp/__init__.py @ 98:4d498b002de5

refactor for data-structure (dict -> Transition).
author Ryoma SHINYA <shinya@firefly.cr.ie.u-ryukyu.ac.jp>
date Sun, 12 Dec 2010 23:04:31 +0900
parents d23f12ce0369
children 8102bf4bbec6
line wrap: on
line diff
--- a/pyrect/regexp/__init__.py	Sun Dec 12 19:02:37 2010 +0900
+++ b/pyrect/regexp/__init__.py	Sun Dec 12 23:04:31 2010 +0900
@@ -5,7 +5,6 @@
 from pyrect.regexp.nfa import NFA
 from pyrect.regexp.nfa_translator import NFATranslator
 from pyrect.regexp.dfa_translator import DFATranslator, SuffixDFATranslator, SuffixTrieTranslator
-from pyrect.regexp.callgraph import CallGraph
 from pyrect.regexp.analyzer import Analyzer
 from pyrect.regexp.char_collector import CharCollector
 
@@ -13,8 +12,8 @@
     """Regexp is basic class in Pyrect.
     this contains regexp, dfa, nfa,, actually it's include all.
     >>> regexp = Regexp('(A|B)*C')
-    >>> regexp.dfacg.map
-    {'1': {}, '0': {(Character:'A'): '0', (Character:'B'): '0', (Character:'C'): '1'}}
+    >>> print(regexp.dfa.transition)
+    Transition: 0 x 'A' -> 0, 0 x 'B' -> 0, 0 x 'C' -> 1,
     >>> regexp.matches('ABC')
     True
     >>> regexp = Regexp('(a|b)*cd*e')
@@ -29,8 +28,6 @@
         self.ast    = Parser().parse(regexp)
         self.nfa    = NFATranslator().translate(self.ast)
         self.dfa    = DFATranslator().translate(self.nfa)
-        self.nfacg  = CallGraph(self.nfa)
-        self.dfacg  = CallGraph(self.dfa)
         an = Analyzer()
         self.max_len, self.min_len, self.must_words =\
                       an.analyze(self.ast)