[pypy-svn] r34559 - in pypy/dist/pypy/lang/prolog: builtin interpreter

[cfbolz at codespeak.net]

Author: cfbolz
Date: Mon Nov 13 14:08:42 2006
New Revision: 34559

Modified:
   pypy/dist/pypy/lang/prolog/builtin/formatting.py
   pypy/dist/pypy/lang/prolog/interpreter/choice.py
   pypy/dist/pypy/lang/prolog/interpreter/engine.py
   pypy/dist/pypy/lang/prolog/interpreter/term.py
Log:
fix some imports


Modified: pypy/dist/pypy/lang/prolog/builtin/formatting.py
==============================================================================
--- pypy/dist/pypy/lang/prolog/builtin/formatting.py	(original)
+++ pypy/dist/pypy/lang/prolog/builtin/formatting.py	Mon Nov 13 14:08:42 2006
@@ -57,7 +57,7 @@
             return self.format_var(term)
 
     def format_atom(self, s):
-        from algorithm.automaton.deterministic import LexerError
+        from pypy.rlib.parsing.deterministic import LexerError
         if self.quoted:
             try:
                 tokens = parsing.lexer.tokenize(s)

Modified: pypy/dist/pypy/lang/prolog/interpreter/choice.py
==============================================================================
--- pypy/dist/pypy/lang/prolog/interpreter/choice.py	(original)
+++ pypy/dist/pypy/lang/prolog/interpreter/choice.py	Mon Nov 13 14:08:42 2006
@@ -2,7 +2,7 @@
 import py
 
 from py.magic import greenlet
-from pypy.rpython.objectmodel import we_are_translated
+from pypy.rlib.objectmodel import we_are_translated
 from pypy.rpython.rstack import yield_current_frame_to_caller
 from pypy.translator.c.test.test_stackless import StacklessTest
 

Modified: pypy/dist/pypy/lang/prolog/interpreter/engine.py
==============================================================================
--- pypy/dist/pypy/lang/prolog/interpreter/engine.py	(original)
+++ pypy/dist/pypy/lang/prolog/interpreter/engine.py	Mon Nov 13 14:08:42 2006
@@ -91,7 +91,7 @@
         self.operations = None
     
     def add_rule(self, rule, end=True):
-        from prolog import builtin
+        from pypy.lang.prolog import builtin
         if DEBUG:
             debug_print("add_rule", rule)
         if isinstance(rule, Term):

Modified: pypy/dist/pypy/lang/prolog/interpreter/term.py
==============================================================================
--- pypy/dist/pypy/lang/prolog/interpreter/term.py	(original)
+++ pypy/dist/pypy/lang/prolog/interpreter/term.py	Mon Nov 13 14:08:42 2006
@@ -1,5 +1,5 @@
 import math
-from pypy.rpython.objectmodel import we_are_translated, UnboxedValue
+from pypy.rlib.objectmodel import we_are_translated, UnboxedValue
 from pypy.rlib.rarithmetic import intmask
 from pypy.lang.prolog.interpreter.error import UnificationFailed, UncatchableError