From 72e1275e48dc4148f2d558c3cb57c5d1eaecfd53 Mon Sep 17 00:00:00 2001 From: Aidan Date: Sat, 20 Jun 2020 21:38:46 -0700 Subject: [PATCH] we didnt need that type anyways --- ast/eval.go | 11 +++++------ ast/func_table.go | 6 +----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/ast/eval.go b/ast/eval.go index 85c7c36..f41cdcb 100644 --- a/ast/eval.go +++ b/ast/eval.go @@ -17,24 +17,23 @@ package ast -type Tree *Token - -func (Tree t) Eval(FuncTable funcs, VarTable vars) Tree { +func (t *Token) Eval(funcs FuncTable, vars VarTable) *Token { if t == nil { - return + return nil } var iter *Token eligibleForSystemCall := true - reduce := func(Tree t_) Tree { + var reduce func(*Token) *Token + reduce = func(t_ *Token) *Token { if t_.Next != nil { t_.Next = reduce(t_.Next) } switch (t_.Tag) { case SYMBOL: - maybeToken := GetVar(t_.Inner, vars) + maybeToken := GetVar(t_.Inner.(string), vars) if maybeToken != nil { tok := maybeToken.Eval(funcs, vars) if tok == LIST { diff --git a/ast/func_table.go b/ast/func_table.go index eec2bc1..c461c9e 100644 --- a/ast/func_table.go +++ b/ast/func_table.go @@ -15,11 +15,7 @@ * along with this program. If not, see . */ -package stdlib - -import ( - "git.callpipe.com/aidan/shs/ast" -) +package ast type Operation func(*Token) *Token