[pypy-svn] r34174 - in pypy/dist/pypy: jit/timeshifter/test lang/automata

[rxe at codespeak.net]

Author: rxe
Date: Sat Nov  4 15:37:39 2006
New Revision: 34174

Modified:
   pypy/dist/pypy/jit/timeshifter/test/test_portal.py
   pypy/dist/pypy/lang/automata/dfa.py
Log:
current state of dfa test

Modified: pypy/dist/pypy/jit/timeshifter/test/test_portal.py
==============================================================================
--- pypy/dist/pypy/jit/timeshifter/test/test_portal.py	(original)
+++ pypy/dist/pypy/jit/timeshifter/test/test_portal.py	Sat Nov  4 15:37:39 2006
@@ -155,11 +155,12 @@
 
     def test_dfa_compile2(self):
         py.test.skip('wip')
-        from pypy.lang.automata.dfa import getautomaton, recognizeparts
+        from pypy.lang.automata.dfa import getautomaton, convertagain, recognizeparts
         a = getautomaton()
         def main(gets):
+            alltrans, final_states = convertagain(a)
             s = ["aaaaaaaaaab", "aaaa"][gets]
-            return recognizeparts(a.transitions, a.final_states, s)
+            return recognizeparts(alltrans, final_states, s)
 
         res = self.timeshift_from_portal(main, recognizeparts, [0], policy=P_NOVIRTUAL)
         assert res

Modified: pypy/dist/pypy/lang/automata/dfa.py
==============================================================================
--- pypy/dist/pypy/lang/automata/dfa.py	(original)
+++ pypy/dist/pypy/lang/automata/dfa.py	Sat Nov  4 15:37:39 2006
@@ -121,7 +121,7 @@
         char = s[indx]
         char = hint(char, promote=True)
 
-        statetrans = alltrans[state]
+        statetrans = alltrans.get(state, None)
         state = statetrans.get(char, -1)
         
         hint(state, concrete=True)