1
0
mirror of https://github.com/charlienet/go-mixed.git synced 2025-07-18 00:22:41 +08:00
This commit is contained in:
2022-04-07 09:15:12 +08:00
parent 44aae0c3b0
commit 8736d84913
5 changed files with 26 additions and 26 deletions

View File

@ -3,7 +3,7 @@ package collections
import "fmt" import "fmt"
type CircleQueue struct { type CircleQueue struct {
data []interface{} data []any
cap int cap int
front int front int
rear int rear int
@ -13,12 +13,12 @@ func NewCircleQueue(cap int) *CircleQueue {
cap++ cap++
return &CircleQueue{ return &CircleQueue{
data: make([]interface{}, cap), data: make([]any, cap),
cap: cap, cap: cap,
} }
} }
func (q *CircleQueue) Push(data interface{}) bool { func (q *CircleQueue) Push(data any) bool {
if (q.rear+1)%q.cap == q.front { if (q.rear+1)%q.cap == q.front {
return false return false
} }
@ -27,7 +27,7 @@ func (q *CircleQueue) Push(data interface{}) bool {
q.rear = (q.rear + 1) % q.cap q.rear = (q.rear + 1) % q.cap
return true return true
} }
func (q *CircleQueue) Pop() interface{} { func (q *CircleQueue) Pop() any {
if q.rear == q.front { if q.rear == q.front {
return nil return nil
} }

View File

@ -4,7 +4,7 @@ import "sync"
// 数组队列,先进先出 // 数组队列,先进先出
type ArrayQueue struct { type ArrayQueue struct {
array []interface{} // 底层切片 array []any // 底层切片
size int // 队列的元素数量 size int // 队列的元素数量
lock sync.Mutex // 为了并发安全使用的锁 lock sync.Mutex // 为了并发安全使用的锁
} }
@ -14,7 +14,7 @@ func NewArrayQueue[T any]() *ArrayQueue {
} }
// 入队 // 入队
func (queue *ArrayQueue) Add(v interface{}) { func (queue *ArrayQueue) Add(v any) {
queue.lock.Lock() queue.lock.Lock()
defer queue.lock.Unlock() defer queue.lock.Unlock()
@ -26,7 +26,7 @@ func (queue *ArrayQueue) Add(v interface{}) {
} }
// 出队 // 出队
func (queue *ArrayQueue) Remove() interface{} { func (queue *ArrayQueue) Remove() any {
queue.lock.Lock() queue.lock.Lock()
defer queue.lock.Unlock() defer queue.lock.Unlock()
@ -48,7 +48,7 @@ func (queue *ArrayQueue) Remove() interface{} {
*/ */
// 创建新的数组,移动次数过多 // 创建新的数组,移动次数过多
newArray := make([]interface{}, queue.size-1) newArray := make([]any, queue.size-1)
for i := 1; i < queue.size; i++ { for i := 1; i < queue.size; i++ {
// 从老数组的第一位开始进行数据移动 // 从老数组的第一位开始进行数据移动
newArray[i-1] = queue.array[i] newArray[i-1] = queue.array[i]

View File

@ -3,9 +3,9 @@ package collections
import "sync" import "sync"
type ArrayStack struct { type ArrayStack struct {
array []interface{} // 底层切片 array []any // 底层切片
size int // 栈的元素数量 size int // 栈的元素数量
lock sync.Mutex // 为了并发安全使用的锁 lock sync.Mutex // 为了并发安全使用的锁
} }
func NewArrayStack[T any]() *ArrayStack { func NewArrayStack[T any]() *ArrayStack {
@ -13,7 +13,7 @@ func NewArrayStack[T any]() *ArrayStack {
} }
// 入栈 // 入栈
func (stack *ArrayStack) Push(v interface{}) { func (stack *ArrayStack) Push(v any) {
stack.lock.Lock() stack.lock.Lock()
defer stack.lock.Unlock() defer stack.lock.Unlock()
@ -24,7 +24,7 @@ func (stack *ArrayStack) Push(v interface{}) {
stack.size = stack.size + 1 stack.size = stack.size + 1
} }
func (stack *ArrayStack) Pop() interface{} { func (stack *ArrayStack) Pop() any {
stack.lock.Lock() stack.lock.Lock()
defer stack.lock.Unlock() defer stack.lock.Unlock()
@ -39,7 +39,7 @@ func (stack *ArrayStack) Pop() interface{} {
//stack.array = stack.array[0 : stack.size-1] //stack.array = stack.array[0 : stack.size-1]
// 创建新的数组,空间占用不会越来越大,但可能移动元素次数过多 // 创建新的数组,空间占用不会越来越大,但可能移动元素次数过多
newArray := make([]interface{}, stack.size-1, stack.size-1) newArray := make([]any, stack.size-1, stack.size-1)
for i := 0; i < stack.size-1; i++ { for i := 0; i < stack.size-1; i++ {
newArray[i] = stack.array[i] newArray[i] = stack.array[i]
} }
@ -51,7 +51,7 @@ func (stack *ArrayStack) Pop() interface{} {
} }
// 获取栈顶元素 // 获取栈顶元素
func (stack *ArrayStack) Peek() interface{} { func (stack *ArrayStack) Peek() any {
// 栈中元素已空 // 栈中元素已空
if stack.size == 0 { if stack.size == 0 {
panic("empty") panic("empty")

View File

@ -13,7 +13,7 @@ import (
// 下划线 // 下划线
type SnakeCase struct { type SnakeCase struct {
Value interface{} Value any
} }
func (c SnakeCase) MarshalJSON() ([]byte, error) { func (c SnakeCase) MarshalJSON() ([]byte, error) {
@ -35,7 +35,7 @@ func (c SnakeCase) MarshalJSON() ([]byte, error) {
// 驼峰 // 驼峰
type CamelCase struct { type CamelCase struct {
Value interface{} Value any
} }
func (c CamelCase) MarshalJSON() ([]byte, error) { func (c CamelCase) MarshalJSON() ([]byte, error) {
@ -106,7 +106,7 @@ func NewBuffer() *Buffer {
return &Buffer{Buffer: new(bytes.Buffer)} return &Buffer{Buffer: new(bytes.Buffer)}
} }
func (b *Buffer) Append(i interface{}) *Buffer { func (b *Buffer) Append(i any) *Buffer {
switch val := i.(type) { switch val := i.(type) {
case int: case int:
b.append(strconv.Itoa(val)) b.append(strconv.Itoa(val))

View File

@ -7,18 +7,18 @@ import (
) )
// 结构转换为json字符串 // 结构转换为json字符串
func StructToJsonIndent(obj interface{}) string { func StructToJsonIndent(obj any) string {
b, _ := MarshalIndent(obj, "", " ") b, _ := MarshalIndent(obj, "", " ")
return bytesconv.BytesToString(b) return bytesconv.BytesToString(b)
} }
// 结构转换为json字符串 // 结构转换为json字符串
func StructToJson(obj interface{}) string { func StructToJson(obj any) string {
b, _ := Marshal(obj) b, _ := Marshal(obj)
return bytesconv.BytesToString(b) return bytesconv.BytesToString(b)
} }
func StructToMap(obj interface{}) map[string]interface{} { func StructToMap(obj any) map[string]any {
typ := reflect.TypeOf(obj) typ := reflect.TypeOf(obj)
kind := typ.Kind() kind := typ.Kind()
@ -28,7 +28,7 @@ func StructToMap(obj interface{}) map[string]interface{} {
val := reflect.ValueOf(obj) val := reflect.ValueOf(obj)
m := make(map[string]interface{}) m := make(map[string]any)
for i := 0; i < val.NumField(); i++ { for i := 0; i < val.NumField(); i++ {
m[typ.Field(i).Name] = val.Field(i).Interface() m[typ.Field(i).Name] = val.Field(i).Interface()
} }
@ -36,8 +36,8 @@ func StructToMap(obj interface{}) map[string]interface{} {
return m return m
} }
func StructToMapViaJson(obj interface{}) map[string]interface{} { func StructToMapViaJson(obj any) map[string]any {
m := make(map[string]interface{}) m := make(map[string]any)
j, _ := Marshal(obj) j, _ := Marshal(obj)
_ = Unmarshal(j, &m) _ = Unmarshal(j, &m)
@ -45,8 +45,8 @@ func StructToMapViaJson(obj interface{}) map[string]interface{} {
return m return m
} }
func toMap(obj interface{}) map[string]interface{} { func toMap(obj any) map[string]any {
if h, ok := obj.(map[string]interface{}); ok { if h, ok := obj.(map[string]any); ok {
return h return h
} }