better tests and results

test.sh

@@ -21,7 +21,7 @@ for input in $listfic; do
         (($?!=0)) && {done=1;continue}
         read <&3 expected
         (($?!=0)) && {done=1;continue}
-        result="$( runghc y.hs "$program")"
+        result="$(runghc y.hs "$program")"
         printf "%18s (line %3d): " ${input:t} $num
         if [[ $expected == $result ]]; then
             print -- "OK"

tests/binarynumber

@@ -1,2 +1,6 @@
+32
+32
+#x012
+18
 #b001010
-Number 10
+10

tests/char

@@ -1,2 +1,2 @@
 #\a
-Character 'a'
+'a'

tests/float

@@ -1,2 +1,2 @@
 3.14
-Float 3.14
+3.14

tests/list

@@ -1,4 +0,0 @@
-(a list)
-List [Atom "a",Atom "list"]
-(a (nested) list)
-List [Atom "a",List [Atom "nested"],Atom "list"]

tests/number

@@ -1,2 +1,2 @@
 32
-Number 32
+32

tests/string

@@ -1,6 +1,6 @@
 "This is a simple string"
-String "This is a simple string"
+"This is a simple string"
-"This is a string with a return ->\n<- Here"
+"A tab ->\t<- Here"
-String "This is a string with a return ->\n<- Here"
+"A tab ->	<- Here"
-"More difficult string \n, \r, \t, \\, \x, \A"
+"\S\o\m\e\ \pr\ot\e\ct\e\d\ \w\it\h\ \\"
-String "More difficult string \n, \r, \t, \\, x, A"
+"Some protected with \"

y.hs

@@ -28,7 +28,16 @@ main = do
 readExpr :: String -> String
 readExpr input = case parse parseExpr "lisp" input of
                     Left  err -> "No match: " ++ show err
-                    Right val -> show val
+                    Right val -> showVal val
+
+showVal :: LispVal -> String
+showVal (String contents) = "\"" ++ contents ++ "\""
+showVal (Atom name) = name
+showVal (Number contents) = show contents
+showVal (Float contents) = show contents
+showVal (Character c) = '\'':c:'\'':[]
+showVal (Bool True) = "#t"
+showVal (Bool False) = "#f"
 
 -- parseExpr will parse the Expression
 parseExpr :: Parser LispVal