diff pyrect/regexp/fa.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 5db856953793
children 5e509a9c951c
line wrap: on
line diff
--- a/pyrect/regexp/fa.py	Sun Dec 12 19:02:37 2010 +0900
+++ b/pyrect/regexp/fa.py	Sun Dec 12 23:04:31 2010 +0900
@@ -1,11 +1,10 @@
 #!/usr/bin/env python
 
 class FA(object):
-    def __init__(self, transition, start, accepts, map_, states=None):
+    def __init__(self, transition, start, accepts, states=None):
         self.transition = transition
         self.start = start
         self.accepts = accepts
-        self.map = map_
         self.states = states
 
     def accept(self, laungage):
@@ -39,12 +38,12 @@
 
     def __str__(self):
         string = "Transition:"
-        for (s, i), ns in self.iterallitems():
+        for (s, i), ns in self.itertrans():
             string += " %s x %s -> %s," % (s, i, ns)
         return string
 
     def iterstates(self):
-        for s, t self.iteritems():
+        for s, t in self.iteritems():
             yield s, t
 
     def itertrans(self):