altos/scheme: Split tests out from build sources

Run tests on both tiny and full scheme test programs.

Signed-off-by: Keith Packard <keithp@keithp.com>

3 files changed, 58 insertions, 116 deletions

diff --git a/src/scheme/tiny-test/Makefile b/src/scheme/tiny-test/Makefile
index ca71a665..61ef687a 100644
--- a/src/scheme/tiny-test/Makefile
+++ b/src/scheme/tiny-test/Makefile
@@ -2,6 +2,7 @@ include ../Makefile-inc
 
 vpath %.o .
 vpath %.c ..
+vpath ao_scheme_test.c ../test
 vpath %.h ..
 vpath %.scheme ..
 vpath ao_scheme_make_const ../make-const
@@ -17,6 +18,7 @@ CFLAGS=-O0 -g -Wall -Wextra -I. -I.. -Wpointer-arith -Wmissing-declarations -Wfo
 
 ao-scheme-tiny: $(OBJS)
 	cc $(CFLAGS) -o $@ $(OBJS) -lm
+	./ao-scheme-tiny ao_scheme_tiny_test.scheme
 
 $(OBJS): $(HDRS)
 
diff --git a/src/scheme/tiny-test/ao_scheme_test.c b/src/scheme/tiny-test/ao_scheme_test.c
deleted file mode 100644
index 89b8e5fa..00000000
--- a/src/scheme/tiny-test/ao_scheme_test.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright © 2016 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- */
-
-#include "ao_scheme.h"
-#include <stdio.h>
-
-static char save_file[] = "scheme.image";
-
-int
-ao_scheme_os_save(void)
-{
-	FILE	*save = fopen(save_file, "w");
-
-	if (!save) {
-		perror(save_file);
-		return 0;
-	}
-	fwrite(ao_scheme_pool, 1, AO_SCHEME_POOL_TOTAL, save);
-	fclose(save);
-	return 1;
-}
-
-int
-ao_scheme_os_restore_save(struct ao_scheme_os_save *save, int offset)
-{
-	FILE	*restore = fopen(save_file, "r");
-	size_t	ret;
-
-	if (!restore) {
-		perror(save_file);
-		return 0;
-	}
-	fseek(restore, offset, SEEK_SET);
-	ret = fread(save, sizeof (struct ao_scheme_os_save), 1, restore);
-	fclose(restore);
-	if (ret != 1)
-		return 0;
-	return 1;
-}
-
-int
-ao_scheme_os_restore(void)
-{
-	FILE	*restore = fopen(save_file, "r");
-	size_t	ret;
-
-	if (!restore) {
-		perror(save_file);
-		return 0;
-	}
-	ret = fread(ao_scheme_pool, 1, AO_SCHEME_POOL_TOTAL, restore);
-	fclose(restore);
-	if (ret != AO_SCHEME_POOL_TOTAL)
-		return 0;
-	return 1;
-}
-
-int
-main (int argc, char **argv)
-{
-	(void) argc;
-
-	while (*++argv) {
-		FILE *in = fopen(*argv, "r");
-		if (!in) {
-			perror(*argv);
-			exit(1);
-		}
-		ao_scheme_read_eval_print(in, stdout, false);
-		fclose(in);
-	}
-	ao_scheme_read_eval_print(stdin, stdout, true);
-
-#ifdef DBG_MEM_STATS
-	printf ("collects: full: %lu incremental %lu\n",
-		ao_scheme_collects[AO_SCHEME_COLLECT_FULL],
-		ao_scheme_collects[AO_SCHEME_COLLECT_INCREMENTAL]);
-
-	printf ("freed: full %lu incremental %lu\n",
-		ao_scheme_freed[AO_SCHEME_COLLECT_FULL],
-		ao_scheme_freed[AO_SCHEME_COLLECT_INCREMENTAL]);
-
-	printf("loops: full %lu incremental %lu\n",
-		ao_scheme_loops[AO_SCHEME_COLLECT_FULL],
-		ao_scheme_loops[AO_SCHEME_COLLECT_INCREMENTAL]);
-
-	printf("loops per collect: full %f incremental %f\n",
-	       (double) ao_scheme_loops[AO_SCHEME_COLLECT_FULL] /
-	       (double) ao_scheme_collects[AO_SCHEME_COLLECT_FULL],
-	       (double) ao_scheme_loops[AO_SCHEME_COLLECT_INCREMENTAL] /
-	       (double) ao_scheme_collects[AO_SCHEME_COLLECT_INCREMENTAL]);
-
-	printf("freed per collect: full %f incremental %f\n",
-	       (double) ao_scheme_freed[AO_SCHEME_COLLECT_FULL] /
-	       (double) ao_scheme_collects[AO_SCHEME_COLLECT_FULL],
-	       (double) ao_scheme_freed[AO_SCHEME_COLLECT_INCREMENTAL] /
-	       (double) ao_scheme_collects[AO_SCHEME_COLLECT_INCREMENTAL]);
-
-	printf("freed per loop: full %f incremental %f\n",
-	       (double) ao_scheme_freed[AO_SCHEME_COLLECT_FULL] /
-	       (double) ao_scheme_loops[AO_SCHEME_COLLECT_FULL],
-	       (double) ao_scheme_freed[AO_SCHEME_COLLECT_INCREMENTAL] /
-	       (double) ao_scheme_loops[AO_SCHEME_COLLECT_INCREMENTAL]);
-#endif
-}
diff --git a/src/scheme/tiny-test/ao_scheme_tiny_test.scheme b/src/scheme/tiny-test/ao_scheme_tiny_test.scheme
new file mode 100644
index 00000000..94c90ffe
--- /dev/null
+++ b/src/scheme/tiny-test/ao_scheme_tiny_test.scheme
@@ -0,0 +1,56 @@
+					; Basic syntax tests
+
+(define _assert-eq_
+  (macro (a b)
+	   (list cond
+		 (list (list eq? a b)
+		       )
+		 (list 'else
+		       (list display "failed: ")
+		       (list write (list quote a))
+		       (list newline)
+		       (list exit 1)
+		       )
+		 )
+	   )
+  )
+
+(define _assert-equal_
+  (macro (a b)
+	   (list cond
+		 (list (list equal? a b)
+		       )
+		 (list 'else
+		       (list display "failed: ")
+		       (list write (list quote a))
+		       (list newline)
+		       (list exit 1)
+		       )
+		 )
+	   )
+  )
+
+(_assert-eq_ (or #f #t) #t)
+(_assert-eq_ (and #t #f) #f)
+(_assert-eq_ (if (> 3 2) 'yes) 'yes)
+(_assert-eq_ (if (> 3 2) 'yes 'no) 'yes)
+(_assert-eq_ (if (> 2 3) 'no 'yes) 'yes)
+(_assert-eq_ (if (> 2 3) 'no) #f)
+
+(_assert-eq_ (letrec ((a 1) (b a)) (+ a b)) 2)
+
+(_assert-eq_ (equal? '(a b c) '(a b c)) #t)
+(_assert-eq_ (equal? '(a b c) '(a b b)) #f)
+
+(_assert-equal_ (member '(2) '((1) (2) (3)))  '((2) (3)))
+(_assert-equal_ (member '(4) '((1) (2) (3))) #f)
+
+(_assert-equal_ (memq 2 '(1 2 3)) '(2 3))
+(_assert-equal_ (memq 4 '(1 2 3)) #f)
+(_assert-equal_ (memq '(2) '((1) (2) (3))) #f)
+
+(_assert-equal_ (assq 'a '((a 1) (b 2) (c 3))) '(a 1))
+(_assert-equal_ (assoc '(c) '((a 1) (b 2) ((c) 3))) '((c) 3))
+
+(_assert-equal_ (map cadr '((a b) (d e) (g h))) '(b e h))
+