clean up build errors

ast/eval.go

@@ -22,7 +22,6 @@ func (t *Token) Eval(funcs FuncTable, vars VarTable) *Token {
         return nil
     }
 
-    var iter *Token
     eligibleForSystemCall := true
 
     var reduce func(*Token) *Token
@@ -33,17 +32,17 @@ func (t *Token) Eval(funcs FuncTable, vars VarTable) *Token {
 
         switch (t_.Tag) {
         case SYMBOL:
-            maybeToken := GetVar(t_.Inner.(string), vars)
+            maybeToken := vars.GetVar(t_.Inner.(string))
             if maybeToken != nil {
                 tok := maybeToken.Eval(funcs, vars)
-                if tok == LIST {
+                if tok.Tag == LIST {
                     eligibleForSystemCall = false
                 }
             }
 
         case LIST:
             eligibleForSystemCall = false
-            t.Inner = Eval(t_.Inner)
+            t_.Inner = t_.Inner.(*Token).Eval(funcs, vars)
         }
 
         return t_
@@ -51,7 +50,7 @@ func (t *Token) Eval(funcs FuncTable, vars VarTable) *Token {
 
     ret := reduce(t)
     if ret.Tag == SYMBOL {
-        f := funcs.GetFunction(ret.Inner)
+        f := funcs.GetFunction(ret.Inner.(string))
         if f == nil {
             if !eligibleForSystemCall {
                 // TODO: log error
@@ -59,7 +58,7 @@ func (t *Token) Eval(funcs FuncTable, vars VarTable) *Token {
             }
 
             // hook into stdlib exec
-            return
+            return nil // TODO: Thats gotta change
         }
 
         return (*f).CallFunction(ret.Next)

ast/func_table.go

@@ -28,14 +28,14 @@ type Function struct {
 type FuncTable map[string]*Function
 
 // TODO: Currently only checks arg list length
-func (Function f) ParseFunction(args *ast.Token) bool {
+func (f Function) ParseFunction(args *Token) bool {
     // HANDLE EXEC
-    if target.args < 0 {
+    if f.args < 0 {
         return true
     }
 
-    i := target.args
-    for iter := &args; *iter != nil; iter = &((*iter).next) {
+    i := f.args
+    for iter := args; iter != nil; iter = iter.Next {
         i -= 1
     }
 
@@ -47,8 +47,8 @@ func (Function f) ParseFunction(args *ast.Token) bool {
     return true
 }
 
-func (Function f) CallFunction(args *Token) *Token {
-    if !ParseFunction(f, args) {
+func (f Function) CallFunction(args *Token) *Token {
+    if !f.ParseFunction(args) {
         return nil
     }
 
@@ -56,7 +56,7 @@ func (Function f) CallFunction(args *Token) *Token {
     return f.function(args)
 }
 
-func (FuncTable table) GetFunction(arg string) *Function {
+func (table FuncTable) GetFunction(arg string) *Function {
     target, ok := table[arg]
     if !ok {
         return nil

ast/var_table.go

@@ -19,7 +19,7 @@ package ast
 
 type VarTable map[string]*Token
 
-func (VarTable vt) GetVar(arg string) *Token {
+func (vt VarTable) GetVar(arg string) *Token {
     val, ok := vt[arg]
     if !ok {
         return nil