[pypy-commit] lang-scheme default: Move Parser helper-functions from object.py to ssparser.py

[boemmels]

Author: Juergen Boemmels <boemmels at web.de>
Branch: 
Changeset: r31:9eb92cb30772
Date: 2011-12-29 21:32 +0100
http://bitbucket.org/pypy/lang-scheme/changeset/9eb92cb30772/

Log:	Move Parser helper-functions from object.py to ssparser.py

diff --git a/scheme/object.py b/scheme/object.py
--- a/scheme/object.py
+++ b/scheme/object.py
@@ -607,21 +607,6 @@
 
         return self.body.eval_tr(local_ctx)
 
-##
-# Parser helpers
-##
-def quote(sexpr):
-    return W_Pair(symbol('quote'), W_Pair(sexpr, w_nil))
-
-def qq(sexpr):
-    return W_Pair(symbol('quasiquote'), W_Pair(sexpr, w_nil))
-
-def unquote(sexpr):
-    return W_Pair(symbol('unquote'), W_Pair(sexpr, w_nil))
-
-def unquote_splicing(sexpr):
-    return W_Pair(symbol('unquote-splicing'), W_Pair(sexpr, w_nil))
-
 
 ##
 # General helpers
diff --git a/scheme/ssparser.py b/scheme/ssparser.py
--- a/scheme/ssparser.py
+++ b/scheme/ssparser.py
@@ -1,7 +1,7 @@
 from pypy.rlib.parsing.pypackrat import PackratParser
 from pypy.rlib.parsing.makepackrat import BacktrackException, Status
 from scheme.object import W_Pair, W_Integer, W_String, symbol, \
-        w_nil, W_Boolean, W_Real, quote, qq, unquote, unquote_splicing, \
+        w_nil, W_Boolean, W_Real, \
         w_ellipsis, W_Character, SchemeSyntaxError, W_Vector
 
 def str_unquote(s):
@@ -141,3 +141,17 @@
     p = SchemeParser(code)
     return p.file()
 
+##
+# Parser helpers
+##
+def quote(sexpr):
+    return W_Pair(symbol('quote'), W_Pair(sexpr, w_nil))
+
+def qq(sexpr):
+    return W_Pair(symbol('quasiquote'), W_Pair(sexpr, w_nil))
+
+def unquote(sexpr):
+    return W_Pair(symbol('unquote'), W_Pair(sexpr, w_nil))
+
+def unquote_splicing(sexpr):
+    return W_Pair(symbol('unquote-splicing'), W_Pair(sexpr, w_nil))