Skip to content

implementing fixes 1023, 1024, 1025 #960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
refaktor wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −13
Open

implementing fixes 1023, 1024, 1025 #960

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions evaldo/builtins_base_iteration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,7 +1699,7 @@ var builtins_iteration = map[string]*env.Builtin{
}
EvalBlockInj(ps, curval, true)
MaybeDisplayFailureOrError(ps, ps.Idx, "group")
if ps.ErrorFlag || ps.ReturnFlag {
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
ps.Ser = ser
return ps.Res
}
Expand Down Expand Up @@ -1736,7 +1736,7 @@ var builtins_iteration = map[string]*env.Builtin{
}
res := DirectlyCallBuiltin(ps, block, curval, nil)
MaybeDisplayFailureOrError(ps, ps.Idx, "group")
if ps.ErrorFlag || ps.ReturnFlag {
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
return ps.Res
}
// TODO !!! -- currently only works if results are strings
Expand Down Expand Up @@ -1830,7 +1830,7 @@ var builtins_iteration = map[string]*env.Builtin{
}
EvalBlockInj(ps, env.ToRyeValue(item), true)
MaybeDisplayFailureOrError(ps, ps.Idx, "filter")
if ps.ErrorFlag || ps.ReturnFlag {
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
ps.Ser = ser
return ps.Res
}
Expand All @@ -1857,6 +1857,9 @@ var builtins_iteration = map[string]*env.Builtin{
item = env.ToRyeValue(ls[i])
}
CallFunctionArgsN(block, ps, ps.Ctx, env.ToRyeValue(item)) // , env.NewInteger(int64(i)))
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
return ps.Res
}
if util.IsTruthy(ps.Res) { // todo -- move these to util or something
if modeObj == 1 {
newll = append(newll, ll[i])
Expand All @@ -1879,7 +1882,7 @@ var builtins_iteration = map[string]*env.Builtin{
}
res := DirectlyCallBuiltin(ps, block, env.ToRyeValue(item), nil)
MaybeDisplayFailureOrError(ps, ps.Idx, "filter")
if ps.ErrorFlag || ps.ReturnFlag {
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
return ps.Res
}
if util.IsTruthy(res) { // todo -- move these to util or something
Expand Down Expand Up @@ -1968,7 +1971,7 @@ var builtins_iteration = map[string]*env.Builtin{
}
EvalBlockInj(ps, env.ToRyeValue(item), true)
MaybeDisplayFailureOrError(ps, ps.Idx, "seek")
if ps.ErrorFlag || ps.ReturnFlag {
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
ps.Ser = ser
return ps.Res
}
Expand All @@ -1991,7 +1994,7 @@ var builtins_iteration = map[string]*env.Builtin{
}
res := DirectlyCallBuiltin(ps, block, env.ToRyeValue(item), nil)
MaybeDisplayFailureOrError(ps, ps.Idx, "seek")
if ps.ErrorFlag || ps.ReturnFlag {
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
return ps.Res
}
if util.IsTruthy(res) {
Expand All @@ -2009,7 +2012,7 @@ var builtins_iteration = map[string]*env.Builtin{
item = *env.NewString(string(ls[i]))
}
CallFunctionArgsN(block, ps, ps.Ctx, env.ToRyeValue(item))
if ps.ErrorFlag || ps.ReturnFlag {
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
return ps.Res
}
if util.IsTruthy(ps.Res) {
Expand Down Expand Up @@ -2058,7 +2061,7 @@ var builtins_iteration = map[string]*env.Builtin{
ps.Ser.Reset()
Eval(ps)
MaybeDisplayFailureOrError(ps, ps.Idx, "while")
if ps.ErrorFlag || ps.ReturnFlag {
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
ps.Ser = ser
return ps.Res
}
Expand All @@ -2078,7 +2081,7 @@ var builtins_iteration = map[string]*env.Builtin{
ps.Ser.Reset()
Eval(ps)
MaybeDisplayFailureOrError(ps, ps.Idx, "while")
if ps.ErrorFlag || ps.ReturnFlag {
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
ps.Ser = ser
return ps.Res
}
Expand Down Expand Up @@ -2124,7 +2127,7 @@ var builtins_iteration = map[string]*env.Builtin{
ps.Ser.Reset()
Eval(ps)
MaybeDisplayFailureOrError(ps, ps.Idx, "until")
if ps.ErrorFlag || ps.ReturnFlag {
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
ps.Ser = ser
return ps.Res
}
Expand All @@ -2135,7 +2138,7 @@ var builtins_iteration = map[string]*env.Builtin{
ps.Ser.Reset()
Eval(ps)
MaybeDisplayFailureOrError(ps, ps.Idx, "until")
if ps.ErrorFlag || ps.ReturnFlag {
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
ps.Ser = ser
return ps.Res
}
Expand Down Expand Up @@ -2195,7 +2198,7 @@ var builtins_iteration = map[string]*env.Builtin{
}
Eval(ps)
MaybeDisplayFailureOrError(ps, ps.Idx, "for\\")
if ps.ErrorFlag || ps.ReturnFlag {
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
ps.Ser = ser
return ps.Res
}
Expand All @@ -2213,7 +2216,7 @@ var builtins_iteration = map[string]*env.Builtin{
}
Eval(ps)
MaybeDisplayFailureOrError(ps, ps.Idx, "for\\")
if ps.ErrorFlag || ps.ReturnFlag {
if ps.ErrorFlag || ps.ReturnFlag || ps.FailureFlag {
ps.Ser = ser
return ps.Res
}
Expand Down
Loading