fix builds
This commit is contained in:
parent
ae9ca588d6
commit
26e331f331
4 changed files with 20 additions and 21 deletions
|
|
@ -23,7 +23,13 @@ import (
|
|||
"gitlab.com/whom/shs/ast"
|
||||
)
|
||||
|
||||
func bool_cast(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
/* Takes one argument, must be a string
|
||||
* attempts to cast to bool (T or F are valid values)
|
||||
* returns nil on failure
|
||||
*
|
||||
* Example: (bool "F")
|
||||
*/
|
||||
func BoolCast(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
in = in.Eval(ft, vt, false)
|
||||
if in.Tag == ast.LIST || in.Tag == ast.NUMBER {
|
||||
log.Log(log.ERR,
|
||||
|
|
@ -45,7 +51,7 @@ func bool_cast(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
|||
return res
|
||||
}
|
||||
|
||||
func not(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
func Not(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
in = in.Eval(ft, vt, false)
|
||||
|
||||
if in.Tag != ast.BOOL {
|
||||
|
|
@ -63,7 +69,7 @@ func not(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
|||
return t
|
||||
}
|
||||
|
||||
func eq(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
func Eq(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
out := ast.TRUE
|
||||
|
||||
in = in.Eval(ft, vt, false)
|
||||
|
|
@ -145,7 +151,7 @@ func eq(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
|||
return t
|
||||
}
|
||||
|
||||
func lt(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
func Lt(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
out := ast.TRUE
|
||||
second := in.Next
|
||||
|
||||
|
|
@ -168,7 +174,7 @@ func lt(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
|||
return t
|
||||
}
|
||||
|
||||
func gt(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
func Gt(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
out := ast.TRUE
|
||||
second := in.Next
|
||||
|
||||
|
|
@ -191,14 +197,14 @@ func gt(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
|||
return t
|
||||
}
|
||||
|
||||
func ne(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
return not(eq(in, vt, ft), vt, ft)
|
||||
func Ne(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
return Not(Eq(in, vt, ft), vt, ft)
|
||||
}
|
||||
|
||||
func gte(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
return not(lt(in, vt, ft), vt, ft)
|
||||
func Gte(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
return Not(Lt(in, vt, ft), vt, ft)
|
||||
}
|
||||
|
||||
func lte(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
return not(gt(in, vt, ft), vt, ft)
|
||||
func Lte(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
return Not(Gt(in, vt, ft), vt, ft)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue