Skip to content

Issue #67 : fix a bug about dofile #68

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

Closed
kohkimakimoto wants to merge 1 commit into from
Closed

Issue #67 : fix a bug about dofile #68

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions _state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1571,6 +1571,8 @@ func (ls *LState) PCall(nargs, nret int, errfunc *LFunction) (err error) {
ls.stack.SetSp(sp)
if sp == 0 {
ls.currentFrame = nil
} else {
ls.currentFrame = ls.stack.Last()
}
}()

Expand Down
5 changes: 5 additions & 0 deletions baselib.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ func baseDoFile(L *LState) int {
src := L.ToString(1)
top := L.GetTop()
if err := L.DoFile(src); err != nil {
if _, ok := err.(*ApiError); ok {
// if the error is *ApiError, runs panic directly to prevent overriding a stacktrace in the error object.
panic(err)
}

L.RaiseError(err.Error())
}
return L.GetTop() - top
Expand Down
2 changes: 2 additions & 0 deletions state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,6 +1656,8 @@ func (ls *LState) PCall(nargs, nret int, errfunc *LFunction) (err error) {
ls.stack.SetSp(sp)
if sp == 0 {
ls.currentFrame = nil
} else {
ls.currentFrame = ls.stack.Last()
}
}()

Expand Down