go: add step5_tco. Refactor env.

Move EnvType interface definition to types.go. Remove Env pointers.

1 files changed, 35 insertions, 11 deletions

diff --git a/go/src/types/types.go b/go/src/types/types.go
index 95bdc1f..f0ab427 100644
--- a/go/src/types/types.go
+++ b/go/src/types/types.go
@@ -6,34 +6,54 @@ import (
     //"fmt"
 )
 
-//type Error interface {
-//    error
-//}
+//import (
+//    "env"
+//)
 
 type MalType interface {
 }
 
+type EnvType interface {
+    //Find(key string) *EnvType
+    Find(key string) EnvType
+    Set(key string, value MalType) MalType
+    Get(key string) (MalType, error)
+}
+
+// Symbols
 type Symbol struct {
     Val string
 }
 
-type List struct {
-    Val []MalType
+func Symbol_Q(obj MalType) bool {
+    switch obj.(type) {
+    case Symbol: return true
+    default:     return false
+    }
 }
 
-type Vector struct {
-    Val []MalType
+
+// Functions
+type MalFunc struct {
+    Eval   func(MalType, EnvType) (MalType, error)
+    Exp    MalType
+    Env    EnvType
+    Params MalType
 }
 
-// Symbols
-func Symbol_Q(obj MalType) bool {
+func MalFunc_Q(obj MalType) bool {
     switch obj.(type) {
-    case Symbol: return true
-    default:     return false
+    case MalFunc: return true
+    default:      return false
     }
 }
 
+
 // Lists
+type List struct {
+    Val []MalType
+}
+
 func List_Q(obj MalType) bool {
     switch obj.(type) {
     case List: return true
@@ -42,6 +62,10 @@ func List_Q(obj MalType) bool {
 }
 
 // Vectors
+type Vector struct {
+    Val []MalType
+}
+
 func Vector_Q(obj MalType) bool {
     switch obj.(type) {
     case Vector: return true