1. Carl Friedrich Bolz
  2. Pyrolog

Commits

Armin Rigo  committed fbcc141

Rename the imports: "from pypy..." => "from rpython..."

  • Participants
  • Parent commits aa127d3
  • Branches default

Comments (0)

Files changed (25)

File prolog/builtin/formatting.py

View file
  • Ignore whitespace
             return '?'
 
     def format_atom(self, s):
-        from pypy.rlib.parsing.deterministic import LexerError
+        from rpython.rlib.parsing.deterministic import LexerError
         if self.quoted:
             try:
                 tokens = parsing.lexer.tokenize(s)

File prolog/builtin/numberchars.py

View file
  • Ignore whitespace
 from prolog.builtin.register import expose_builtin
 from prolog.interpreter.term import Callable
 from prolog.interpreter.term import specialized_term_classes
-from pypy.rlib.rarithmetic import ovfcheck
-from pypy.rlib.rbigint import rbigint
+from rpython.rlib.rarithmetic import ovfcheck
+from rpython.rlib.rbigint import rbigint
 from prolog.interpreter.signature import Signature
 from prolog.interpreter.helper import wrap_list
 from pypy.objspace.std.strutil import string_to_int, ParseStringOverflowError

File prolog/builtin/register.py

View file
  • Ignore whitespace
 from prolog.interpreter.signature import Signature
 from prolog.interpreter.arithmetic import eval_arithmetic
 
-from pypy.rlib.objectmodel import we_are_translated
-from pypy.rlib import jit
+from rpython.rlib.objectmodel import we_are_translated
+from rpython.rlib import jit
 
 import inspect
 

File prolog/builtin/streams.py

View file
  • Ignore whitespace
 from prolog.interpreter.heap import Heap
 from prolog.interpreter import error
 from prolog.interpreter import term
-from pypy.rlib.streamio import fdopen_as_stream, open_file_as_stream
+from rpython.rlib.streamio import fdopen_as_stream, open_file_as_stream
 from prolog.interpreter.stream import PrologStream, PrologInputStream, \
 PrologOutputStream
 from prolog.interpreter import helper

File prolog/builtin/term_variables.py

View file
  • Ignore whitespace
 import py
-from pypy.rlib.objectmodel import specialize
+from rpython.rlib.objectmodel import specialize
 from prolog.builtin.register import expose_builtin
 from prolog.interpreter import term
 from prolog.interpreter.helper import wrap_list, is_term

File prolog/builtin/termconstruction.py

View file
  • Ignore whitespace
 import py
 from prolog.interpreter import helper, term, error, continuation
 from prolog.builtin.register import expose_builtin
-from pypy.rlib import jit
+from rpython.rlib import jit
 # ___________________________________________________________________
 # analysing and construction terms
 

File prolog/interpreter/arithmetic.py

View file
  • Ignore whitespace
 from prolog.interpreter import helper, term, error
 from prolog.interpreter.signature import Signature
 from prolog.interpreter.error import UnificationFailed
-from pypy.rlib.rarithmetic import intmask, ovfcheck_float_to_int
-from pypy.rlib.unroll import unrolling_iterable
-from pypy.rlib import jit, rarithmetic
-from pypy.rlib.rbigint import rbigint
+from rpython.rlib.rarithmetic import intmask, ovfcheck_float_to_int
+from rpython.rlib.unroll import unrolling_iterable
+from rpython.rlib import jit, rarithmetic
+from rpython.rlib.rbigint import rbigint
 
 Signature.register_extr_attr("arithmetic")
 

File prolog/interpreter/continuation.py

View file
  • Ignore whitespace
 import py
 import time
-from pypy.rlib import jit
-from pypy.rlib.objectmodel import we_are_translated, specialize
+from rpython.rlib import jit
+from rpython.rlib.objectmodel import we_are_translated, specialize
 from prolog.interpreter import error
 from prolog.interpreter import helper
 from prolog.interpreter.term import Term, Atom, BindingVar, Callable, Var

File prolog/interpreter/function.py

View file
  • Ignore whitespace
 from prolog.interpreter.term import Callable, Atom, Var
 from prolog.interpreter.memo import EnumerationMemo
 from prolog.interpreter.signature import Signature
-from pypy.rlib import jit, objectmodel, unroll
+from rpython.rlib import jit, objectmodel, unroll
 from prolog.interpreter.helper import is_callable
 # XXX needs tests
 

File prolog/interpreter/heap.py

View file
  • Ignore whitespace
-from pypy.rlib import debug
+from rpython.rlib import debug
 from prolog.interpreter.term import BindingVar, AttVar
 
-from pypy.rlib import jit
+from rpython.rlib import jit
 
 INIT_TRAIL_VAR = []
 INIT_TRAIL_BINDING = []

File prolog/interpreter/helper.py

View file
  • Ignore whitespace
 from prolog.interpreter import term
 from prolog.interpreter import error
 from prolog.interpreter.signature import Signature
-from pypy.rlib import jit
+from rpython.rlib import jit
 from prolog.interpreter.stream import PrologOutputStream, PrologInputStream,\
         PrologStream
 

File prolog/interpreter/module.py

View file
  • Ignore whitespace
 import py
-from pypy.rlib import jit
+from rpython.rlib import jit
 from prolog.interpreter.signature import Signature
 from prolog.interpreter import error
 from prolog.interpreter.term import Callable, Atom

File prolog/interpreter/parsing.py

View file
  • Ignore whitespace
 import py
-from pypy.rlib.parsing.ebnfparse import parse_ebnf
-from pypy.rlib.parsing.regexparse import parse_regex
-from pypy.rlib.parsing.lexer import Lexer, DummyLexer
-from pypy.rlib.parsing.deterministic import DFA
-from pypy.rlib.parsing.tree import Nonterminal, Symbol, RPythonVisitor
-from pypy.rlib.parsing.parsing import PackratParser, LazyParseTable, Rule
-from pypy.rlib.parsing.regex import StringExpression
+from rpython.rlib.parsing.ebnfparse import parse_ebnf
+from rpython.rlib.parsing.regexparse import parse_regex
+from rpython.rlib.parsing.lexer import Lexer, DummyLexer
+from rpython.rlib.parsing.deterministic import DFA
+from rpython.rlib.parsing.tree import Nonterminal, Symbol, RPythonVisitor
+from rpython.rlib.parsing.parsing import PackratParser, LazyParseTable, Rule
+from rpython.rlib.parsing.regex import StringExpression
 from pypy.objspace.std.strutil import string_to_int, ParseStringOverflowError, ParseStringError
-from pypy.rlib.rarithmetic import ovfcheck
+from rpython.rlib.rarithmetic import ovfcheck
 from pypy.objspace.std.strutil import string_to_int
-from pypy.rlib.rbigint import rbigint
+from rpython.rlib.rbigint import rbigint
 from prolog.interpreter.continuation import Engine
 from prolog.interpreter.module import Module
 
     def visit_STRING(self, node):
         from prolog.interpreter import helper
         from prolog.interpreter.term import Callable, Number
-        from pypy.rlib.runicode import str_decode_utf_8
+        from rpython.rlib.runicode import str_decode_utf_8
         info = node.additional_info
         s = info.strip('"')
         s, _ = str_decode_utf_8(s, len(s), 'strict')

File prolog/interpreter/signature.py

View file
  • Ignore whitespace
-from pypy.rlib import jit
-from pypy.rlib.objectmodel import specialize, we_are_translated
-from pypy.rlib.unroll import unrolling_iterable
+from rpython.rlib import jit
+from rpython.rlib.objectmodel import specialize, we_are_translated
+from rpython.rlib.unroll import unrolling_iterable
 
 class SignatureFactory(object):
     def __init__(self):

File prolog/interpreter/stream.py

View file
  • Ignore whitespace
-from pypy.rlib.streamio import fdopen_as_stream
+from rpython.rlib.streamio import fdopen_as_stream
 from prolog.interpreter.term import NonVar
 from prolog.interpreter.error import UnificationFailed
 

File prolog/interpreter/term.py

View file
  • Ignore whitespace
 from prolog.interpreter.error import UnificationFailed
 from prolog.interpreter import error
 from prolog.interpreter.signature import Signature
-from pypy.rlib.objectmodel import we_are_translated, UnboxedValue
-from pypy.rlib.objectmodel import compute_unique_id
-from pypy.rlib.objectmodel import specialize
-from pypy.rlib.debug import make_sure_not_resized
-from pypy.rlib import jit, debug
-from pypy.tool.pairtype import extendabletype
-from pypy.rlib.rbigint import rbigint
+from rpython.rlib.objectmodel import we_are_translated, UnboxedValue
+from rpython.rlib.objectmodel import compute_unique_id
+from rpython.rlib.objectmodel import specialize
+from rpython.rlib.debug import make_sure_not_resized
+from rpython.rlib import jit, debug
+from rpython.tool.pairtype import extendabletype
+from rpython.rlib.rbigint import rbigint
 
 DEBUG = False
 OPTIMIZED_TERM_SIZE_MAX = 10
     return obj1.cmp_standard_order(obj2, heap)
 
 def generate_class(cname, fname, n_args, immutable=True):
-    from pypy.rlib.unroll import unrolling_iterable
+    from rpython.rlib.unroll import unrolling_iterable
     arg_iter = unrolling_iterable(range(n_args))
     parent = callables['Abstract', n_args]
     if not immutable:
     return specific_class
 
 def generate_abstract_class(n_args, immutable=True):
-    from pypy.rlib.unroll import unrolling_iterable
+    from rpython.rlib.unroll import unrolling_iterable
     arg_iter = unrolling_iterable(range(n_args))
     if immutable:
         base = Callable

File prolog/interpreter/test/dont_test_translate.py

View file
  • Ignore whitespace
-from pypy.translator.interactive import Translation
-from pypy.rpython.test.test_llinterp import interpret
+from rpython.translator.interactive import Translation
+from rpython.rpython.test.test_llinterp import interpret
 from prolog.interpreter import parsing
 from prolog.interpreter.term import Atom
 from prolog.interpreter.test.tool import *

File prolog/interpreter/test/test_arithmetic.py

View file
  • Ignore whitespace
 from prolog.interpreter.term import Number, Float, BigInt
 import prolog.interpreter.arithmetic # has side-effects, changes Number etc
 
-from pypy.rlib.rbigint import rbigint
+from rpython.rlib.rbigint import rbigint
 
 def is_64_bit():
     return sys.maxint > 2147483647

File prolog/interpreter/test/test_console_output.py

View file
  • Ignore whitespace
 from __future__ import with_statement
 import py
 import sys, os, re
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
 
 app_main = py.path.local(__file__).dirpath().dirpath().join("translatedmain.py")
 app_main.check()

File prolog/interpreter/test/test_helper.py

View file
  • Ignore whitespace
 from prolog.interpreter.helper import convert_to_str, unwrap_list
 from prolog.interpreter.term import Callable, BigInt, BindingVar, Atom
 from prolog.interpreter.heap import Heap
-from pypy.rlib.rbigint import rbigint
+from rpython.rlib.rbigint import rbigint
 
 def test_convert_to_str():
     assert "a" == convert_to_str(Callable.build("a"))

File prolog/interpreter/translatedmain.py

View file
  • Ignore whitespace
 import os, sys
-from pypy.rlib.parsing.parsing import ParseError
-from pypy.rlib.parsing.deterministic import LexerError
+from rpython.rlib.parsing.parsing import ParseError
+from rpython.rlib.parsing.deterministic import LexerError
 from prolog.interpreter.parsing import parse_file, get_query_and_vars
 from prolog.interpreter.parsing import get_engine
 from prolog.interpreter.continuation import Continuation, Engine, \

File prolog/jittest/interpjit.py

View file
  • Ignore whitespace
 import sys
-from pypy import conftest
+from rpython import conftest
 class o:
     view = False
     viewloops = True
 conftest.option = o
-from pypy.jit.metainterp.test.test_ajit import LLJitMixin
+from rpython.jit.metainterp.test.test_ajit import LLJitMixin
 
 from prolog.interpreter.parsing import parse_query_term, get_engine
 from prolog.interpreter.parsing import get_query_and_vars

File prolog/jittest/model.py

View file
  • Ignore whitespace
 except ImportError:   # e.g. Python 2.5
     newinterpret = None
 
-from pypy.tool.jitlogparser.parser import SimpleParser, Function, TraceForOpcode
-from pypy.tool.jitlogparser.storage import LoopStorage
+from rpython.tool.jitlogparser.parser import SimpleParser, Function, TraceForOpcode
+from rpython.tool.jitlogparser.storage import LoopStorage
 
 
 class Log(object):

File prolog/jittest/test_00_model.py

View file
  • Ignore whitespace
 import subprocess
 import py
 from lib_pypy import disassembler
-from pypy.tool.udir import udir
-from pypy.tool import logparser
-from pypy.jit.tool.jitoutput import parse_prof
+from rpython.tool.udir import udir
+from rpython.tool import logparser
+from rpython.jit.tool.jitoutput import parse_prof
 from prolog.jittest.model import Log, \
     OpMatcher
 
 class TestOpMatcher(object):
 
     def match(self, src1, src2, **kwds):
-        from pypy.tool.jitlogparser.parser import SimpleParser
+        from rpython.tool.jitlogparser.parser import SimpleParser
         loop = SimpleParser.parse_from_input(src1)
         matcher = OpMatcher(loop.operations, src=src1)
         return matcher.match(src2, **kwds)

File targetprologstandalone.py

View file
  • Ignore whitespace
 from prolog.interpreter import arithmetic # for side effects
 from prolog import builtin # for side effects
 
-from pypy.rlib import jit
+from rpython.rlib import jit
 
 e = Engine(load_system=True)
 term.DEBUG = False
     return get_portal(driver)
 
 def jitpolicy(self):
-    from pypy.jit.codewriter.policy import JitPolicy
+    from rpython.jit.codewriter.policy import JitPolicy
     return JitPolicy()
 
 if __name__ == '__main__':