Skip to content

refactor: use the built-in max/min to simplify the code #2363

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
youzichuan wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −28
Open

refactor: use the built-in max/min to simplify the code #2363

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
16 changes: 4 additions & 12 deletions internal/gopher-lua/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,10 +386,8 @@ func (rg *registry) checkSize(requiredSize int) { // +inline-start
} // +inline-end

func (rg *registry) resize(requiredSize int) { // +inline-start
newSize := requiredSize + rg.growBy // give some padding
if newSize > rg.maxSize {
newSize = rg.maxSize
}
// give some padding
newSize := min(requiredSize+rg.growBy, rg.maxSize)
if newSize < requiredSize {
rg.handler.registryOverflow()
return
Expand Down Expand Up @@ -1037,10 +1035,7 @@ func (ls *LState) initCallFrame(cf *callFrame) { // +inline-start
namedparam1 <- lbase
namedparam2
*/
nvarargs := nargs - np
if nvarargs < 0 {
nvarargs = 0
}
nvarargs := max(nargs-np, 0)

ls.reg.SetTop(cf.LocalBase + nargs + np)
for i := 0; i < np; i++ {
Expand Down Expand Up @@ -1149,10 +1144,7 @@ func (ls *LState) pushCallFrame(cf callFrame, fn LValue, meta bool) { // +inline
namedparam1 <- lbase
namedparam2
*/
nvarargs := nargs - np
if nvarargs < 0 {
nvarargs = 0
}
nvarargs := max(nargs-np, 0)

ls.reg.SetTop(cf.LocalBase + nargs + np)
for i := 0; i < np; i++ {
Expand Down
15 changes: 3 additions & 12 deletions internal/gopher-lua/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,10 +783,7 @@ func init() {
namedparam1 <- lbase
namedparam2
*/
nvarargs := nargs - np
if nvarargs < 0 {
nvarargs = 0
}
nvarargs := max(nargs-np, 0)

ls.reg.SetTop(cf.LocalBase + nargs + np)
for i := 0; i < np; i++ {
Expand Down Expand Up @@ -965,10 +962,7 @@ func init() {
namedparam1 <- lbase
namedparam2
*/
nvarargs := nargs - np
if nvarargs < 0 {
nvarargs = 0
}
nvarargs := max(nargs-np, 0)

ls.reg.SetTop(cf.LocalBase + nargs + np)
for i := 0; i < np; i++ {
Expand Down Expand Up @@ -1452,10 +1446,7 @@ func init() {
RA := lbase + A
B := int(inst & 0x1ff) //GETB
nparams := int(cf.Fn.Proto.NumParameters)
nvarargs := cf.NArgs - nparams
if nvarargs < 0 {
nvarargs = 0
}
nvarargs := max(cf.NArgs-nparams, 0)
nwant := B - 1
if B == 0 {
nwant = nvarargs
Expand Down
5 changes: 1 addition & 4 deletions server/core_leaderboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,10 +846,7 @@ func getLeaderboardRecordsHaystack(ctx context.Context, logger *zap.Logger, db *
if start < 0 || len(firstRecords) < secondLimit {
start = 0
}
end := start + limit
if end > numRecords {
end = numRecords
}
end := min(start+limit, numRecords)

if start > 0 {
// There was a previous result that was discarded, the prev_cursor should be set.
Expand Down