comments support, script loading support
This commit is contained in:
parent
654e8bd55b
commit
bd22b84699
11 changed files with 145 additions and 69 deletions
|
|
@ -60,30 +60,34 @@ func decl_func(input *ast.Token, vars ast.VarTable, funcs ast.FuncTable) *ast.To
|
|||
|
||||
ASTSYNCSTATE := ast.SyncTablesWithOSEnviron
|
||||
inner := func(in *ast.Token, vt ast.VarTable, ft ast.FuncTable) *ast.Token {
|
||||
temp := in.Eval(ft, vt, false)
|
||||
if temp == nil {
|
||||
log.Log(log.ERR,
|
||||
"error parsing arguments",
|
||||
name.Value())
|
||||
return nil
|
||||
}
|
||||
|
||||
ast.SyncTablesWithOSEnviron = false
|
||||
key_iter := args.Expand()
|
||||
val_iter := temp
|
||||
|
||||
for key_iter != nil {
|
||||
if val_iter == nil {
|
||||
var temp *ast.Token
|
||||
if numArgs != 0 || in != nil {
|
||||
temp = in.Eval(ft, vt, false)
|
||||
if temp == nil {
|
||||
log.Log(log.ERR,
|
||||
"Not enough arguments supplied",
|
||||
"error parsing arguments",
|
||||
name.Value())
|
||||
return nil
|
||||
}
|
||||
|
||||
ast.SetVar(key_iter.Value(), val_iter, vt)
|
||||
key_iter = key_iter.Next
|
||||
val_iter = val_iter.Next
|
||||
ast.SyncTablesWithOSEnviron = false
|
||||
key_iter := args.Expand()
|
||||
val_iter := temp
|
||||
|
||||
for key_iter != nil {
|
||||
if val_iter == nil {
|
||||
log.Log(log.ERR,
|
||||
"Not enough arguments supplied",
|
||||
name.Value())
|
||||
}
|
||||
|
||||
ast.SetVar(key_iter.Value(), val_iter, vt)
|
||||
key_iter = key_iter.Next
|
||||
val_iter = val_iter.Next
|
||||
}
|
||||
}
|
||||
|
||||
// maybe we actually should put the inner scope var into the env
|
||||
ast.SyncTablesWithOSEnviron = ASTSYNCSTATE
|
||||
ret := form.Eval(ft, vt, false)
|
||||
ast.SyncTablesWithOSEnviron = false
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue