Commit 153c5b6053bc6f45291438016be05e353d9369b7 - Pixley

Generalize tower.sh more; we have some success with tinyscheme now. catseye 13 years ago

3 changed file(s) with 47 addition(s) and 30 deletion(s). Raw diff Collapse all Expand all

+34

-11

script/tower.sh less more

3	3
4	4	# See tower.scm for documentation.
5	5
6		if [ "${R5RS}x" = "x" ]; then
7		R5RS=plt-r5rs
	6	if [ "${SCHEME}x" = "x" ]; then
	7	SCHEME=plt-r5rs
	8	fi
	9
	10	if [ "${USE_EVAL}x" = "x" ]; then
	11	USE_EVAL=yes
	12	fi
	13
	14	if [ "${SCHEME}" = "miniscm" -o "${SCHEME}" = "tinyscheme" ]; then
	15	USE_EVAL=no
8	16	fi
9	17
10	18	SCRIPT=`realpath $0`
11	19	SCRIPTDIR=`dirname ${SCRIPT}`
12	20
13	21	cd ${SCRIPTDIR}/..
14		echo -n '' >init.scm
15		if [ $R5RS = your-weird-scheme ]; then
16		cat >>init.scm <<EOF
	22	echo -n '' >t.scm
	23	if [ "$SCHEME" = "your-weird-scheme" ]; then
	24	cat >>t.scm <<EOF
17	25	(stuff (to support your weird scheme))
18	26	EOF
19	27	fi
20		cat <src/tower.scm >>init.scm
21		echo '(tower (quote (' >>init.scm
	28	cat <src/tower.scm >>t.scm
	29
	30	echo '(define tower (make-tower (quote (' >>t.scm
22	31	for SEXPFILE do
23		cat $SEXPFILE >>init.scm
	32	cat $SEXPFILE >>t.scm
24	33	done
25		echo ')))' >>init.scm
	34	echo '))))' >>t.scm
26	35
27		${R5RS} init.scm
28		rm -f init.scm
	36	if [ "${USE_EVAL}" = "yes" ]; then
	37	cat >>t.scm <<EOF
	38	(eval tower (scheme-report-environment 5))
	39	EOF
	40	${SCHEME} t.scm
	41	else
	42	cat >>t.scm <<EOF
	43	(display tower)
	44	EOF
	45	echo >init.scm '(display'
	46	${SCHEME} t.scm >>init.scm
	47	echo >>init.scm ') (newline)'
	48	${SCHEME} init.scm
	49	fi
	50
	51	rm -f t.scm init.scm

-3

src/tower.scm less more

18	18	; while there are sexps remaining on the tower:
19	19	; pop the top sexp off the tower
20	20	; wrap the current sexp with it as an interpreter -> current sexp
21		; evaluate current sexp as Scheme
	21	; you now have a sexp that you can evaluate as Scheme
22	22
23	23	(define wrap-sexp
24	24	(lambda (wrapee-sexp wrapper-sexp)

29	29	(define tower-rec
30	30	(lambda (sexp-tower sexp)
31	31	(if (null? sexp-tower)
32		(eval sexp (scheme-report-environment 5))
	32	sexp
33	33	(let* ((interpreter-sexp (car sexp-tower))
34	34	(rest (cdr sexp-tower)))
35	35	(tower-rec rest (wrap-sexp sexp interpreter-sexp))))))
36	36
37		(define tower
	37	(define make-tower
38	38	(lambda (sexp-tower)
39	39	(let* ((sexp-tower (reverse sexp-tower)))
40	40	(if (null? sexp-tower)

+10

-16

test.sh less more

20	20	rm -f expected.sexp out.sexp
21	21
22	22	echo "Testing Pixley programs as Scheme programs..."
23
24	23	falderal test -f 'Interpret Pixley Program:shell command "script/tower.sh %(test) >%(output)"' src/tests.falderal
25	24
26	25	echo "Testing Pixley programs on Pixley reference interpreter..."
27
28	26	falderal test -f 'Interpret Pixley Program:shell command "script/tower.sh src/pixley.pix %(test) >%(output)"' src/tests.falderal
29	27
30		echo "Testing Pixley programs on (Pixley reference interpreter)^2..."
31
	28	echo "Testing Pixley programs on Pixley interpreter on Pixley interpreter..."
32	29	falderal test -f 'Interpret Pixley Program:shell command "script/tower.sh src/pixley.pix src/pixley.pix %(test) >%(output)"' src/tests.falderal
33	30
34		echo "Testing Pixley programs on (Pixley reference interpreter)^3..."
	31	# On my computer, the following test takes about 19 seconds on plt-r5rs, but
	32	# about 32 minutes with tinyscheme -- possibly because of frequent GC?
35	33
36		# Takes about 19 seconds on plt-r5rs on my computer
37		falderal test -f 'Interpret Pixley Program:shell command "script/tower.sh src/pixley.pix src/pixley.pix src/pixley.pix %(test) >%(output)"' src/tests.falderal
	34	# echo "Testing Pixley programs on (Pixley reference interpreter)^3..."
	35	# falderal test -f 'Interpret Pixley Program:shell command "script/tower.sh src/pixley.pix src/pixley.pix src/pixley.pix %(test) >%(output)"' src/tests.falderal
38	36
39		# If you have an hour or so to kill, you can try the next level up!
	37	# And if you have an hour or so to kill, you can try the next level up!
	38	# (That's with plt-r5rs; I imagine tinyscheme would take much longer)
	39
40	40	# echo "Testing Pixley programs on (Pixley reference interpreter)^4..."
41	41	# time falderal test -f 'Interpret Pixley Program:shell command "script/tower.sh src/pixley.pix src/pixley.pix src/pixley.pix src/pixley.pix %(test) >%(output)"' src/tests.falderal
42	42
	43	# Tinyscheme doesn't pass this yet, because it insists on abbreviating quote
	44	# forms in its output.
43	45	echo "Running Falderal tests for P-Normalizer..."
44
45	46	falderal test dialect/p-normal.falderal
46	47
47	48	echo "P-Normalizing Pixley interpreter..."
48
49	49	script/tower.sh src/pixley.pix dialect/p-normal.pix src/pixley.pix > src/p-normal-pixley.pix
50	50
51	51	echo "Testing Pixley programs on P-Normalized interpreter..."
52
53	52	falderal test -f 'Interpret Pixley Program:shell command "script/tower.sh src/p-normal-pixley.pix %(test) >%(output)"' src/tests.falderal
54	53
55	54	rm -f src/p-normal-pixley.pix
56	55
57	56	echo "Testing Pixley programs on Pixley interpreter in Pifxley..."
58
59	57	falderal test -f 'Interpret Pixley Program:shell command "script/tower.sh dialect/pixley.pifx %(test) >%(output)"' src/tests.falderal
60	58
61	59	echo "Testing Pifxley programs as Scheme..."
62
63	60	falderal test -f 'Interpret Pifxley Program:shell command "script/tower.sh %(test) >%(output)"' dialect/pifxley.falderal
64	61
65	62	echo "Testing Pifxley programs on Pifxley interpreter in Pifxley..."
66
67	63	falderal test -f 'Interpret Pifxley Program:shell command "script/tower.sh dialect/pifxley.pifx %(test) >%(output)"' dialect/pifxley.falderal
68	64
69	65	echo "Testing Pixley programs on Crabwell interpreter..."
70
71	66	falderal test -f 'Interpret Pixley Program:shell command "script/tower.sh dialect/crabwell.pix %(test) >%(output)"' src/tests.falderal
72	67
73	68	echo "Testing Crabwell-specific programs..."
74
75	69	falderal test -f 'Interpret Crabwell Program:shell command "script/tower.sh dialect/crabwell.pix %(test) >%(output)"' dialect/crabwell.falderal
76	70
77	71	# Optional Mini-Scheme tests