optimize(ctxext): storage

fumiama · fumiama · commit 35f149bccf9a · 2025-12-21T22:15:27.000+08:00
diff --git a/ctxext/storage.go b/ctxext/storage.go
@@ -41,7 +41,7 @@ func (s Storage) SaveTo(ctx *zero.Ctx, gid int64) error {
 // Get bmp is a continuous 1's sequence like 0x00ff00
 func (s Storage) Get(bmp int64) int64 {
 	sft := bits.TrailingZeros64(uint64(bmp))
-	return (int64(s) & bmp) >> int64(sft)
+	return (int64(s) >> int64(sft)) & (bmp >> int64(sft))
 }
 
 // Set bmp is a continuous 1's sequence like 0x00ff00
@@ -50,7 +50,7 @@ func (s Storage) Set(x int64, bmp int64) Storage {
 		panic("cannot use bmp == 0")
 	}
 	sft := bits.TrailingZeros64(uint64(bmp))
-	return Storage((int64(s) & (^bmp)) | ((x & (bmp >> int64(sft))) << int64(sft)))
+	return Storage((int64(s) & (^bmp)) | ((x << int64(sft)) & bmp))
 }
 
 // GetBool bmp must be 1-bit-long

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func (s Storage) SaveTo(ctx *zero.Ctx, gid int64) error {`
`41`	`41`	`// Get bmp is a continuous 1's sequence like 0x00ff00`
`42`	`42`	`func (s Storage) Get(bmp int64) int64 {`
`43`	`43`	`sft := bits.TrailingZeros64(uint64(bmp))`
`44`		`- return (int64(s) & bmp) >> int64(sft)`
	`44`	`+ return (int64(s) >> int64(sft)) & (bmp >> int64(sft))`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// Set bmp is a continuous 1's sequence like 0x00ff00`
`@@ -50,7 +50,7 @@ func (s Storage) Set(x int64, bmp int64) Storage {`
`50`	`50`	`panic("cannot use bmp == 0")`
`51`	`51`	`}`
`52`	`52`	`sft := bits.TrailingZeros64(uint64(bmp))`
`53`		`- return Storage((int64(s) & (^bmp)) \| ((x & (bmp >> int64(sft))) << int64(sft)))`
	`53`	`+ return Storage((int64(s) & (^bmp)) \| ((x << int64(sft)) & bmp))`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// GetBool bmp must be 1-bit-long`