affine/SHS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up build errors

Browse source
This commit is contained in:
Aidan 2020-06-20 22:56:22 -07:00
parent 72e1275e48
commit 30481d4f78
No known key found for this signature in database
GPG key ID: 327711E983899316
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ast/eval.go
View file

@ -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)