[pypy-svn] r34525 - in pypy/dist/pypy/rlib/parsing: . test

cfbolz at codespeak.net cfbolz at codespeak.net
Sun Nov 12 01:26:06 CET 2006


Author: cfbolz
Date: Sun Nov 12 01:26:02 2006
New Revision: 34525

Modified:
   pypy/dist/pypy/rlib/parsing/ebnfparse.py
   pypy/dist/pypy/rlib/parsing/lexer.py
   pypy/dist/pypy/rlib/parsing/parsing.py
   pypy/dist/pypy/rlib/parsing/regex.py
   pypy/dist/pypy/rlib/parsing/regexparse.py
   pypy/dist/pypy/rlib/parsing/test/test_deterministic.py
   pypy/dist/pypy/rlib/parsing/test/test_ebnfparse.py
   pypy/dist/pypy/rlib/parsing/test/test_lexer.py
   pypy/dist/pypy/rlib/parsing/test/test_parse.py
   pypy/dist/pypy/rlib/parsing/test/test_parseerrors.py
   pypy/dist/pypy/rlib/parsing/test/test_regex.py
   pypy/dist/pypy/rlib/parsing/test/test_regexparse.py
   pypy/dist/pypy/rlib/parsing/test/test_translate.py
Log:
fix all imports


Modified: pypy/dist/pypy/rlib/parsing/ebnfparse.py
==============================================================================
--- pypy/dist/pypy/rlib/parsing/ebnfparse.py	(original)
+++ pypy/dist/pypy/rlib/parsing/ebnfparse.py	Sun Nov 12 01:26:02 2006
@@ -1,12 +1,12 @@
 import py
-from algorithm.automaton.parsing import PackratParser, Rule
-from algorithm.automaton.tree import Nonterminal, Symbol, RPythonVisitor
-from algorithm.automaton.regexparse import parse_regex
+from pypy.rlib.parsing.parsing import PackratParser, Rule
+from pypy.rlib.parsing.tree import Nonterminal, Symbol, RPythonVisitor
+from pypy.rlib.parsing.regexparse import parse_regex
 import string
-from algorithm.automaton.regex import *
-from algorithm.automaton.deterministic import DFA
+from pypy.rlib.parsing.regex import *
+from pypy.rlib.parsing.deterministic import DFA
 from algorithm.tool.makeondemand import make_on_demand
-from algorithm.automaton.lexer import Lexer, DummyLexer
+from pypy.rlib.parsing.lexer import Lexer, DummyLexer
 
 def make_ebnf_parser():
     NONTERMINALNAME = parse_regex("([a-z]|_)[a-z0-9_]*")
@@ -54,7 +54,7 @@
     return zip(visitor.names, visitor.regexs), visitor.rules, ToAstVisitor
 
 def make_parse_function(regexs, rules, eof=False):
-    from algorithm.automaton.lexer import Lexer
+    from pypy.rlib.parsing.lexer import Lexer
     names, regexs = zip(*regexs)
     if "IGNORE" in names:
         ignore = ["IGNORE"]

Modified: pypy/dist/pypy/rlib/parsing/lexer.py
==============================================================================
--- pypy/dist/pypy/rlib/parsing/lexer.py	(original)
+++ pypy/dist/pypy/rlib/parsing/lexer.py	Sun Nov 12 01:26:02 2006
@@ -1,6 +1,6 @@
 import py
 from pypy.rlib.objectmodel import we_are_translated
-from algorithm.automaton import deterministic, regex
+from pypy.rlib.parsing import deterministic, regex
 
 class Lexer(object):
     def __init__(self, token_regexs, names, ignore=None):

Modified: pypy/dist/pypy/rlib/parsing/parsing.py
==============================================================================
--- pypy/dist/pypy/rlib/parsing/parsing.py	(original)
+++ pypy/dist/pypy/rlib/parsing/parsing.py	Sun Nov 12 01:26:02 2006
@@ -1,5 +1,5 @@
 import py
-from algorithm.automaton.tree import Node, Symbol, Nonterminal, Epsilon
+from pypy.rlib.parsing.tree import Node, Symbol, Nonterminal, Epsilon
 
 class Rule(object):
     def __init__(self, nonterminal, expansions):

Modified: pypy/dist/pypy/rlib/parsing/regex.py
==============================================================================
--- pypy/dist/pypy/rlib/parsing/regex.py	(original)
+++ pypy/dist/pypy/rlib/parsing/regex.py	Sun Nov 12 01:26:02 2006
@@ -1,4 +1,4 @@
-from algorithm.automaton.deterministic import NFA
+from pypy.rlib.parsing.deterministic import NFA
 
 class RegularExpression(object):
     def __init__(self):

Modified: pypy/dist/pypy/rlib/parsing/regexparse.py
==============================================================================
--- pypy/dist/pypy/rlib/parsing/regexparse.py	(original)
+++ pypy/dist/pypy/rlib/parsing/regexparse.py	Sun Nov 12 01:26:02 2006
@@ -1,8 +1,8 @@
 import py
-from algorithm.automaton.parsing import PackratParser, Rule
-from algorithm.automaton.regex import StringExpression, RangeExpression
-from algorithm.automaton.lexer import Lexer, DummyLexer
-from algorithm.automaton.deterministic import compress_char_set, DFA
+from pypy.rlib.parsing.parsing import PackratParser, Rule
+from pypy.rlib.parsing.regex import StringExpression, RangeExpression
+from pypy.rlib.parsing.lexer import Lexer, DummyLexer
+from pypy.rlib.parsing.deterministic import compress_char_set, DFA
 import string
 
 ESCAPES = {
@@ -17,7 +17,7 @@
 }
 
 def make_regex_parser():
-    from algorithm.automaton.ebnfparse import parse_ebnf, make_parse_function
+    from pypy.rlib.parsing.ebnfparse import parse_ebnf, make_parse_function
     # construct regular expressions by hand, to not go completely insane
     # because of quoting
     special_chars = "*+()[]{}|.-?,^"

Modified: pypy/dist/pypy/rlib/parsing/test/test_deterministic.py
==============================================================================
--- pypy/dist/pypy/rlib/parsing/test/test_deterministic.py	(original)
+++ pypy/dist/pypy/rlib/parsing/test/test_deterministic.py	Sun Nov 12 01:26:02 2006
@@ -1,4 +1,4 @@
-from algorithm.automaton.deterministic import *
+from pypy.rlib.parsing.deterministic import *
 
 def test_DFA_simple():
     a = DFA()

Modified: pypy/dist/pypy/rlib/parsing/test/test_ebnfparse.py
==============================================================================
--- pypy/dist/pypy/rlib/parsing/test/test_ebnfparse.py	(original)
+++ pypy/dist/pypy/rlib/parsing/test/test_ebnfparse.py	Sun Nov 12 01:26:02 2006
@@ -1,8 +1,8 @@
 import py
-from algorithm.automaton.tree import Nonterminal, Symbol, RPythonVisitor
-from algorithm.automaton.parsing import PackratParser, Symbol, ParseError, Rule
-from algorithm.automaton.ebnfparse import parse_ebnf, make_parse_function
-from algorithm.automaton.test.test_parse import EvaluateVisitor
+from pypy.rlib.parsing.tree import Nonterminal, Symbol, RPythonVisitor
+from pypy.rlib.parsing.parsing import PackratParser, Symbol, ParseError, Rule
+from pypy.rlib.parsing.ebnfparse import parse_ebnf, make_parse_function
+from pypy.rlib.parsing.test.test_parse import EvaluateVisitor
 
 
 def test_simple():

Modified: pypy/dist/pypy/rlib/parsing/test/test_lexer.py
==============================================================================
--- pypy/dist/pypy/rlib/parsing/test/test_lexer.py	(original)
+++ pypy/dist/pypy/rlib/parsing/test/test_lexer.py	Sun Nov 12 01:26:02 2006
@@ -1,7 +1,7 @@
 import py
-from algorithm.automaton.lexer import *
-from algorithm.automaton.regex import *
-from algorithm.automaton import deterministic
+from pypy.rlib.parsing.lexer import *
+from pypy.rlib.parsing.regex import *
+from pypy.rlib.parsing import deterministic
 
 
 class TestDirectLexer(object):

Modified: pypy/dist/pypy/rlib/parsing/test/test_parse.py
==============================================================================
--- pypy/dist/pypy/rlib/parsing/test/test_parse.py	(original)
+++ pypy/dist/pypy/rlib/parsing/test/test_parse.py	Sun Nov 12 01:26:02 2006
@@ -1,4 +1,4 @@
-from algorithm.automaton.parsing import *
+from pypy.rlib.parsing.parsing import *
 
 class EvaluateVisitor(object):
     def visit_additive(self, node):

Modified: pypy/dist/pypy/rlib/parsing/test/test_parseerrors.py
==============================================================================
--- pypy/dist/pypy/rlib/parsing/test/test_parseerrors.py	(original)
+++ pypy/dist/pypy/rlib/parsing/test/test_parseerrors.py	Sun Nov 12 01:26:02 2006
@@ -1,9 +1,9 @@
 import py
-from algorithm.automaton.parsing import PackratParser, Rule, Nonterminal
-from algorithm.automaton.parsing import Symbol, ParseError
-from algorithm.automaton.ebnfparse import parse_ebnf, make_parse_function
-from algorithm.automaton.deterministic import LexerError
-from algorithm.automaton.tree import RPythonVisitor
+from pypy.rlib.parsing.parsing import PackratParser, Rule, Nonterminal
+from pypy.rlib.parsing.parsing import Symbol, ParseError
+from pypy.rlib.parsing.ebnfparse import parse_ebnf, make_parse_function
+from pypy.rlib.parsing.deterministic import LexerError
+from pypy.rlib.parsing.tree import RPythonVisitor
 
 class TestDictError(object):
     dictebnf = """

Modified: pypy/dist/pypy/rlib/parsing/test/test_regex.py
==============================================================================
--- pypy/dist/pypy/rlib/parsing/test/test_regex.py	(original)
+++ pypy/dist/pypy/rlib/parsing/test/test_regex.py	Sun Nov 12 01:26:02 2006
@@ -1,4 +1,4 @@
-from algorithm.automaton.regex import *
+from pypy.rlib.parsing.regex import *
 
 def compile_rex(rex, view=False):
     try:

Modified: pypy/dist/pypy/rlib/parsing/test/test_regexparse.py
==============================================================================
--- pypy/dist/pypy/rlib/parsing/test/test_regexparse.py	(original)
+++ pypy/dist/pypy/rlib/parsing/test/test_regexparse.py	Sun Nov 12 01:26:02 2006
@@ -1,5 +1,5 @@
 def make_runner(regex, view=False):
-    from algorithm.automaton.regexparse import parse_regex
+    from pypy.rlib.parsing.regexparse import parse_regex
     r = parse_regex(regex)
     dfa = r.make_automaton().make_deterministic()
     if view:

Modified: pypy/dist/pypy/rlib/parsing/test/test_translate.py
==============================================================================
--- pypy/dist/pypy/rlib/parsing/test/test_translate.py	(original)
+++ pypy/dist/pypy/rlib/parsing/test/test_translate.py	Sun Nov 12 01:26:02 2006
@@ -1,9 +1,9 @@
 import py
 from pypy.translator.interactive import Translation
-from algorithm.automaton.lexer import *
-from algorithm.automaton.regex import *
-from algorithm.automaton.parsing import *
-from algorithm.automaton import deterministic
+from pypy.rlib.parsing.lexer import *
+from pypy.rlib.parsing.regex import *
+from pypy.rlib.parsing.parsing import *
+from pypy.rlib.parsing import deterministic
 
 
 class TestTranslateLexer(object):
@@ -93,12 +93,12 @@
     assert res1 == res2
 
 def make_transformer(transformer):
-    from algorithm.automaton.tree import RPythonVisitor
+    from pypy.rlib.parsing.tree import RPythonVisitor
     exec py.code.Source(transformer).compile()
     return ToAST
 
 def test_translate_ast_visitor():
-    from algorithm.automaton.ebnfparse import parse_ebnf, make_parse_function
+    from pypy.rlib.parsing.ebnfparse import parse_ebnf, make_parse_function
     regexs, rules, transformer = parse_ebnf("""
 DECIMAL: "0|[1-9][0-9]*";
 IGNORE: " ";



More information about the Pypy-commit mailing list