All: add keywords.

Also, fix nth and count to match cloure.

1 files changed, 4 insertions, 4 deletions

diff --git a/go/src/step4_if_fn_do/step4_if_fn_do.go b/go/src/step4_if_fn_do/step4_if_fn_do.go
index f63017b..d90a720 100644
--- a/go/src/step4_if_fn_do/step4_if_fn_do.go
+++ b/go/src/step4_if_fn_do/step4_if_fn_do.go
@@ -24,7 +24,7 @@ func READ(str string) (MalType, error) {
 func eval_ast(ast MalType, env EnvType) (MalType, error) {
     //fmt.Printf("eval_ast: %#v\n", ast)
     if Symbol_Q(ast) {
-        return env.Get(ast.(Symbol).Val)
+        return env.Get(ast.(Symbol))
     } else if List_Q(ast) {
         lst := []MalType{}
         for _, a := range ast.(List).Val {
@@ -84,7 +84,7 @@ func EVAL(ast MalType, env EnvType) (MalType, error) {
     case "def!":
         res, e := EVAL(a2, env)
         if e != nil { return nil, e }
-        return env.Set(a1.(Symbol).Val, res), nil
+        return env.Set(a1.(Symbol), res), nil
     case "let*":
         let_env, e := NewEnv(env, nil, nil)
         if e != nil { return nil, e }
@@ -96,7 +96,7 @@ func EVAL(ast MalType, env EnvType) (MalType, error) {
             }
             exp, e := EVAL(arr1[i+1], let_env)
             if e != nil { return nil, e }
-            let_env.Set(arr1[i].(Symbol).Val, exp)
+            let_env.Set(arr1[i].(Symbol), exp)
         }
         return EVAL(a2, let_env)
     case "do":
@@ -154,7 +154,7 @@ func rep(str string) (MalType, error) {
 func main() {
     // core.go: defined using go
     for k, v := range core.NS {
-        repl_env.Set(k, v)
+        repl_env.Set(Symbol{k}, v)
     }
 
     // core.mal: defined using the language itself