Complete reworking of the REPL

which is good in itself, but not what I was meant to be working on.

unit-tests/add.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='5'
-actual=`echo "(add 2 3)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(add 2 3)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then
@@ -12,7 +12,7 @@ else
 fi
 
 expected='5.5'
-actual=`echo "(add 2.5 3)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(add 2.5 3)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then
@@ -24,7 +24,7 @@ else
 fi
 
 expected='1/4'
-actual=`echo "(+ 3/14 1/28)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(+ 3/14 1/28)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then
@@ -36,7 +36,7 @@ fi
 
 # (+ integer ratio) should be ratio
 expected='25/4'
-actual=`echo "(+ 6 1/4)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(+ 6 1/4)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then
@@ -48,7 +48,7 @@ fi
 
 # (+ ratio integer) should be ratio
 expected='25/4'
-actual=`echo "(+ 1/4 6)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(+ 1/4 6)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/apply.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='1'
-actual=`echo "(apply 'add '(1))"| target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(apply 'add '(1))"| target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/complex-list.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='(1 2 3 ("Fred") nil 77354)'
-actual=`echo "'(1 2 3 (\"Fred\") () 77354)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "'(1 2 3 (\"Fred\") () 77354)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/cond.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='5'
-actual=`echo "(cond ((equal 2 2) 5))" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(cond ((equal 2 2) 5))" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then
@@ -12,7 +12,7 @@ else
 fi
 
 expected='"should"'
-actual=`echo "(cond ((equal 2 3) \"shouldn't\")(t \"should\"))" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(cond ((equal 2 3) \"shouldn't\")(t \"should\"))" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/empty-list.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# 
+#
 # File:   empty-list.sh.bash
 # Author: simon
 #
@@ -7,7 +7,7 @@
 #
 
 expected=nil
-actual=`echo "'()" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "'()" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/empty-string.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected="\"\""
-actual=`echo '""' | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo '""' | target/psse | tail -1`
 
 if [ "$expected" = "$actual" ]
 then

unit-tests/eval-integer.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='5'
-actual=`echo "(eval 5)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(eval 5)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/eval-quote-sexpr.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='5'
-actual=`echo "(eval '(add 2 3))" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(eval '(add 2 3))" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/eval-quote-symbol.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='(Special form)'
-actual=`echo "(eval 'cond)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(eval 'cond)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/eval-real.sh

@@ -5,12 +5,11 @@ expected='5.05'
 actual=`echo "(eval 5.05)" |\
   target/psse 2> /dev/null |\
   sed 's/0*$//' |\
-  head -2 |\
   tail -1`
 
+# one part in a million is close enough...
 outcome=`echo "sqrt((${expected} - ${actual})^2) < 0.0000001" | bc`
 
-
 if [ "${outcome}" = "1" ]
 then
     echo "OK"

unit-tests/eval-string.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='"5"'
-actual=`echo '(eval "5")' | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo '(eval "5")' | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/fred.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='"Fred"'
-actual=`echo ${expected} | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo ${expected} | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/integer.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-expected="354"
-actual=`echo ${expected} | target/psse 2> /dev/null | head -2 | tail -1`
+expected='354'
+actual=`echo ${expected} | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/intepreter.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='6'
-actual=`echo "(apply '(lambda (x y z) (/ (* y z) x)) '(2 3 4))" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(apply '(lambda (x y z) (/ (* y z) x)) '(2 3 4))" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/lambda.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
 
-expected='(lambda (l) l)(1 2 3 4 5 6 7 8 9 10)'
-actual=`target/psse 2>/dev/null <<EOF
+expected='(lambda (l) l) (1 2 3 4 5 6 7 8 9 10)'
+output=`target/psse 2>/dev/null <<EOF
 (set! list (lambda (l) l))
 (list '(1 2 3 4 5 6 7 8 9 10))
 EOF`
+actual=`echo $output | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/many-args.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected="120"
-actual=`echo "(+ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(+ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/multiply.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='6'
-actual=`echo "(multiply 2 3)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(multiply 2 3)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then
@@ -12,7 +12,7 @@ else
 fi
 
 expected='7.5'
-actual=`echo "(multiply 2.5 3)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(multiply 2.5 3)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/nil.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected=nil
-actual=`echo 'nil' | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo 'nil' | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/nlambda.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='a'
-actual=`echo "((nlambda (x) x) a)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "((nlambda (x) x) a)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/progn.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='5'
-actual=`echo "(progn (add 2 3))" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(progn (add 2 3))" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then
@@ -12,7 +12,7 @@ else
 fi
 
 expected='"foo"'
-actual=`echo "(progn (add 2.5 3) \"foo\")" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(progn (add 2.5 3) \"foo\")" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/quote.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='Fred'
-actual=`echo "'Fred" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "'Fred" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/quoted-list.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='(123 (4 (5 nil)) Fred)'
-actual=`echo "'(123 (4 (5 ())) Fred)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "'(123 (4 (5 ())) Fred)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/ratio-addition.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='1/4'
-actual=`echo "(+ 3/14 1/28)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(+ 3/14 1/28)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/recursion.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-expected='nil3628800'
-actual=`target/psse 2>/dev/null <<EOF
+expected='nil 3628800'
+output=`target/psse 2>/dev/null <<EOF
 (progn
   (set! fact
     (lambda (n)
@@ -10,6 +10,7 @@ actual=`target/psse 2>/dev/null <<EOF
   nil)
 (fact 10)
 EOF`
+actual=`echo $output | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/reverse.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='"god yzal eht revo depmuj xof nworb kciuq ehT"'
-actual=`echo '(reverse "The quick brown fox jumped over the lazy dog")' | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo '(reverse "The quick brown fox jumped over the lazy dog")' | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then
@@ -12,7 +12,7 @@ else
 fi
 
 expected='(1024 512 256 128 64 32 16 8 4 2)'
-actual=`echo "(reverse '(2 4 8 16 32 64 128 256 512 1024))" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(reverse '(2 4 8 16 32 64 128 256 512 1024))" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then
@@ -23,7 +23,7 @@ else
 fi
 
 expected='esrever'
-actual=`echo "(reverse 'reverse)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "(reverse 'reverse)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/simple-list.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected="(1 2 3)"
-actual=`echo "'(1 2 3)" | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo "'(1 2 3)" | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/string-with-spaces.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 expected='"Strings should be able to include spaces (and other stuff)!"'
-actual=`echo ${expected} | target/psse 2> /dev/null | head -2 | tail -1`
+actual=`echo ${expected} | target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then

unit-tests/varargs.sh

@@ -1,10 +1,7 @@
 #!/bin/bash
 
-expected='(lambda l l)(1 2 3 4 5 6 7 8 9 10)'
-actual=`target/psse 2>/dev/null <<EOF
-(set! list (lambda l l))
-(list 1 2 3 4 5 6 7 8 9 10)
-EOF`
+expected='(1 2 3 4 5 6 7 8 9 10)'
+actual=`echo "(set! list (lambda l l))(list 1 2 3 4 5 6 7 8 9 10)" |target/psse | tail -1`
 
 if [ "${expected}" = "${actual}" ]
 then