Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r44:3bd6b134d3b4
Date: 2013-09-21 10:29 +0200
http://bitbucket.org/pypy/lang-scheme/changeset/3bd6b134d3b4/
Log: Upgrade this repo to the current pypy
diff --git a/scheme/interactive.py b/scheme/interactive.py
--- a/scheme/interactive.py
+++ b/scheme/interactive.py
@@ -6,7 +6,7 @@
ContinuationReturn
from scheme.execution import ExecutionContext
from scheme.ssparser import parse
-from pypy.rlib.parsing.makepackrat import BacktrackException
+from rpython.rlib.parsing.makepackrat import BacktrackException
import os, sys
def check_parens(s):
diff --git a/scheme/object.py b/scheme/object.py
--- a/scheme/object.py
+++ b/scheme/object.py
@@ -36,7 +36,7 @@
__slots__ = []
def to_string(self):
- return ''
+ return '<%r>' % (self,)
def to_repr(self):
return "#<unknown>"
diff --git a/scheme/ssparser.py b/scheme/ssparser.py
--- a/scheme/ssparser.py
+++ b/scheme/ssparser.py
@@ -1,5 +1,5 @@
-from pypy.rlib.parsing.pypackrat import PackratParser
-from pypy.rlib.parsing.makepackrat import BacktrackException, Status
+from rpython.rlib.parsing.pypackrat import PackratParser
+from rpython.rlib.parsing.makepackrat import BacktrackException, Status
from scheme.object import W_Pair, W_Integer, W_String, symbol, \
w_nil, W_Boolean, W_Real, \
w_ellipsis, W_Character, SchemeSyntaxError, W_Vector
diff --git a/scheme/targetscheme.py b/scheme/targetscheme.py
--- a/scheme/targetscheme.py
+++ b/scheme/targetscheme.py
@@ -2,10 +2,9 @@
A simple standalone target for the scheme interpreter.
"""
-import autopath
import sys
-from pypy.rlib.streamio import open_file_as_stream
-from pypy.rlib.parsing.makepackrat import BacktrackException
+from rpython.rlib.streamio import open_file_as_stream
+from rpython.rlib.parsing.makepackrat import BacktrackException
from scheme.ssparser import parse
from scheme.object import SchemeQuit, ContinuationReturn
from scheme.execution import ExecutionContext
@@ -29,6 +28,7 @@
ctx = ExecutionContext()
try:
for sexpr in t:
+ print sexpr.to_string() # for debugging
try:
w_retval = sexpr.eval(ctx)
print w_retval.to_string()
diff --git a/scheme/test/test_parser.py b/scheme/test/test_parser.py
--- a/scheme/test/test_parser.py
+++ b/scheme/test/test_parser.py
@@ -3,7 +3,7 @@
from scheme.object import W_Boolean, W_Real, W_Integer, W_String
from scheme.object import W_Pair, W_Nil, W_Symbol, W_Character, W_Vector
from scheme.object import SchemeSyntaxError
-from pypy.rlib.parsing.makepackrat import BacktrackException
+from rpython.rlib.parsing.makepackrat import BacktrackException
def parse_sexpr(expr):
return parse(expr)[0]
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
