1 files changed, 13 insertions, 13 deletions
diff --git a/src/Base.hs b/src/Base.hs
index 08131e8..8defd91 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -1,6 +1,5 @@
 module Base (Expr (..)
            , Env (..)
-            , Function (..)
            ) where
 import           Data.IORef
@@ -16,10 +15,10 @@ data Expr = List [Expr]
          | FloatLiteral Double
          | BoolLiteral Bool
          | Id String
-          deriving (Eq)
+          | Function Fn
-data Function =
+data Fn =
-    Function {
+    Fn {
    params        :: [String]
    , body        :: Expr
    , environment :: Env
@@ -31,12 +30,13 @@ showLispList :: [Expr] -> String
 showLispList = unwords . map show
 instance Show Expr where
-    show (DottedList xs x)   = "(" ++ showLispList xs ++ " . " ++ show x ++ ")"
+    show (DottedList xs x)               = "(" ++ showLispList xs ++ " . " ++ show x ++ ")"
-    show (List xs)           = "(" ++ showLispList xs ++ ")"
+    show (List xs)                       = "(" ++ showLispList xs ++ ")"
-    show (Vector xs)         = "#(" ++ showLispList xs ++ ")"
+    show (Vector xs)                     = "#(" ++ showLispList xs ++ ")"
-    show (StringLiteral s)   = "\"" ++ s ++ "\""
+    show (StringLiteral s)               = "\"" ++ s ++ "\""
-    show (IntLiteral n)      = show n
+    show (IntLiteral n)                  = show n
-    show (FloatLiteral n)    = show n
+    show (FloatLiteral n)                = show n
-    show (BoolLiteral True)  = "#t"
+    show (BoolLiteral True)              = "#t"
-    show (BoolLiteral False) = "#f"
+    show (BoolLiteral False)             = "#f"
-    show (Id i)              = i
+    show (Id i)                          = i
+    show (Function (Fn params body env)) = "<#procedure " ++ unwords params ++ ">"

diff --git a/src/Base.hs b/src/Base.hs index 08131e8..8defd91 100644 --- a/src/Base.hs +++ b/src/Base.hs
@@ -1,6 +1,5 @@
1	module Base (Expr (..)	1	module Base (Expr (..)
2	, Env (..)	2	, Env (..)
3	, Function (..)
4	) where	3	) where
5		4
6	import Data.IORef	5	import Data.IORef
@@ -16,10 +15,10 @@ data Expr = List [Expr]
16	\| FloatLiteral Double	15	\| FloatLiteral Double
17	\| BoolLiteral Bool	16	\| BoolLiteral Bool
18	\| Id String	17	\| Id String
19	deriving (Eq)	18	\| Function Fn
20		19
21	data Function =	20	data Fn =
22	Function {	21	Fn {
23	params :: [String]	22	params :: [String]
24	, body :: Expr	23	, body :: Expr
25	, environment :: Env	24	, environment :: Env
@@ -31,12 +30,13 @@ showLispList :: [Expr] -> String
31	showLispList = unwords . map show	30	showLispList = unwords . map show
32		31
33	instance Show Expr where	32	instance Show Expr where
34	show (DottedList xs x) = "(" ++ showLispList xs ++ " . " ++ show x ++ ")"	33	show (DottedList xs x) = "(" ++ showLispList xs ++ " . " ++ show x ++ ")"
35	show (List xs) = "(" ++ showLispList xs ++ ")"	34	show (List xs) = "(" ++ showLispList xs ++ ")"
36	show (Vector xs) = "#(" ++ showLispList xs ++ ")"	35	show (Vector xs) = "#(" ++ showLispList xs ++ ")"
37	show (StringLiteral s) = "\"" ++ s ++ "\""	36	show (StringLiteral s) = "\"" ++ s ++ "\""
38	show (IntLiteral n) = show n	37	show (IntLiteral n) = show n
39	show (FloatLiteral n) = show n	38	show (FloatLiteral n) = show n
40	show (BoolLiteral True) = "#t"	39	show (BoolLiteral True) = "#t"
41	show (BoolLiteral False) = "#f"	40	show (BoolLiteral False) = "#f"
42	show (Id i) = i	41	show (Id i) = i
		42	show (Function (Fn params body env)) = "<#procedure " ++ unwords params ++ ">"