增加bs类型

Author: injoyai

conv_any.go

@@ -151,17 +151,17 @@ func Array(i interface{}) []interface{} {
 	return toInterfaces(i)
 }
 
-// BIN 任意类型转 []bool 返回长度8的倍数且大于0,true代表二进制的1.
-func BIN(i interface{}) []bool {
+// BINBool 任意类型转二进制 []bool 返回长度8的倍数且大于0,true代表二进制的1.
+func BINBool(i interface{}) []bool {
 	return toBIN(i)
 }
 
-// BINStr 任意类型转 string 长度8的倍数且大于0,由'1'和'0'组成,
+// BIN 任意类型转 []bool 返回长度8的倍数且大于0,true代表二进制的1.
 // +1 >>> "00000001"
 // -1 >>> "11111111"
-func BINStr(i interface{}) string {
+func BIN(i interface{}) string {
 	result := ""
-	for _, v := range BIN(i) {
+	for _, v := range toBIN(i) {
 		result += func() string {
 			if v {
 				return "1"
@@ -172,27 +172,35 @@ func BINStr(i interface{}) string {
 	return result
 }
 
+// BINStr 任意类型转 string 长度8的倍数且大于0,由'1'和'0'组成,
+// +1 >>> "00000001"
+// -1 >>> "11111111"
+func BINStr(i interface{}) string {
+	return BIN(i)
+}
+
+// OCT 任意类型转8进制 string 长度固定22,8进制,'0'-'7'.
+// -1 >>> "1777777777777777777777"
+// +1 >>> "0000000000000000000001"
+func OCT(i interface{}) string {
+	return toOCT(i)
+}
+
 // OCTStr 任意类型转 string 长度固定22,8进制,'0'-'7'.
 // -1 >>> "1777777777777777777777"
 // +1 >>> "0000000000000000000001"
 func OCTStr(i interface{}) string {
 	return toOCT(i)
 }
 
-// HEXStr 转16进制字符串
-func HEXStr(i interface{}) string {
+// HEX 转16进制字符串
+func HEX(i interface{}) string {
 	return hex.EncodeToString(Bytes(i))
 }
 
-// HEXBytes 16进制的方式转字节
-func HEXBytes(i interface{}) []byte {
-	bs, _ := hex.DecodeString(String(i))
-	return bs
-}
-
-// HEXInt 先16进制转字节,在转Int
-func HEXInt(i interface{}) int {
-	return Int(HEXBytes(i))
+// HEXStr 转16进制字符串
+func HEXStr(i interface{}) string {
+	return hex.EncodeToString(Bytes(i))
 }
 
 // Copy 复制任意数据

conv_base.go

@@ -50,7 +50,7 @@ func toBytes(i interface{}) []byte {
 		}
 		return toBytes(result)
 	case *Var:
-		return toBytes(value.Val())
+		return value.Bytes()
 	}
 	if IsNumber(i) {
 		// int 类型无法解析
@@ -120,7 +120,7 @@ func toString(i interface{}) string {
 		bs, _ := ioutil.ReadAll(value)
 		return string(bs)
 	case *Var:
-		return toString(value.Val())
+		return value.String()
 	default:
 		if value == nil {
 			return ""
@@ -210,7 +210,7 @@ func toInt64(i interface{}) int64 {
 	case apiInt64:
 		return value.Int64()
 	case *Var:
-		return toInt64(value.Val())
+		return value.Int64()
 	default:
 		s := toString(value)
 		base := int64(1)
@@ -299,7 +299,7 @@ func toUint64(i interface{}) uint64 {
 	case apiUint64:
 		return value.Uint64()
 	case *Var:
-		return toUint64(value.Val())
+		return value.Uint64()
 	default:
 		s := toString(value)
 		// HEX 十六进制
@@ -349,7 +349,7 @@ func toFloat64(i interface{}) float64 {
 		}
 		return math.Float64frombits(binary.BigEndian.Uint64(padding(value, 8)))
 	case *Var:
-		return toFloat64(value.Val())
+		return value.Float64()
 	default:
 		v, _ := strconv.ParseFloat(toString(i), 64)
 		return v
@@ -369,7 +369,7 @@ func toBool(i interface{}) bool {
 	case apiBool:
 		return value.Bool()
 	case *Var:
-		return toBool(value.Val())
+		return value.Bool()
 	default:
 		rv := reflect.ValueOf(i)
 		switch rv.Kind() {

conv_bytes.go

@@ -20,19 +20,44 @@ func (this Bs) Len() int {
 	return len(this)
 }
 
+// Cap cap()
 func (this Bs) Cap() int {
 	return cap(this)
 }
 
+// Error 实现error
 func (this Bs) Error() string {
 	return this.String()
 }
 
+func (this Bs) Copy() Bs {
+	cp := Bs(make([]byte, this.Len()))
+	copy(cp, this)
+	return cp
+}
+
+// Append just append
+func (this Bs) Append(b ...byte) Bs {
+	return append(this, b...)
+}
+
+// Upper ASCII小写字母转大小字母
+func (this Bs) Upper() Bs {
+	return bytes.ToUpper(this)
+}
+
+// Lower ASCII大写字母转小写字母
+func (this Bs) Lower() Bs {
+	return bytes.ToLower(this)
+}
+
+// WriteTo 实现io.WriterTo
 func (this Bs) WriteTo(w io.Writer) (int64, error) {
 	n, err := w.Write(this)
 	return int64(n), err
 }
 
+// Sum 校验和
 func (this Bs) Sum() byte {
 	b := byte(0)
 	for _, v := range this {
@@ -41,18 +66,9 @@ func (this Bs) Sum() byte {
 	return b
 }
 
-func (this Bs) Copy() Bs {
-	cp := make([]byte, len(this))
-	copy(cp, this)
-	return cp
-}
-
-func (this Bs) Upper() Bs {
-	return bytes.ToUpper(this)
-}
-
-func (this Bs) Lower() Bs {
-	return bytes.ToLower(this)
+// Bytes 字节数组
+func (this Bs) Bytes() []byte {
+	return this
 }
 
 // String []{0x31,0x32} >>> "12"
@@ -65,9 +81,13 @@ func (this Bs) UTF8() string {
 	return string(this)
 }
 
-// ASCII []{0x31,0x32} >>> "12"
-func (this Bs) ASCII() string {
-	return string(this)
+// BIN 字节转2进制字符串
+func (this Bs) BIN() string {
+	return BIN(this)
+}
+
+func (this Bs) OCT() string {
+	return OCT(this)
 }
 
 // HEX []{0x01,0x02} >>> "0102"
@@ -82,12 +102,7 @@ func (this Bs) Base64() string {
 
 // HEXBase64 HEX() then Base64()
 func (this Bs) HEXBase64() string {
-	return Bs(this.HEX()).Base64()
-}
-
-// Bytes 字节数组
-func (this Bs) Bytes() []byte {
-	return this
+	return base64.StdEncoding.EncodeToString([]byte(this.HEX()))
 }
 
 // Reader io.Reader
@@ -167,101 +182,82 @@ func (this Bs) Uint64() uint64 {
 	return Uint64(this.Bytes())
 }
 
-// BINStr 字节转2进制字符串
-func (this Bs) BINStr() string {
-	return BINStr(this)
+func (this Bs) Float32() float32 {
+	return Float32(this.Bytes())
 }
 
-// BIN 字节转2进制字符串
-func (this Bs) BIN() string {
-	return BINStr(this)
+func (this Bs) Float64() float64 {
+	return Float64(this.Bytes())
 }
 
-// Append just append
-func (this Bs) Append(b ...byte) Bs {
-	return append(this, b...)
+func (this Bs) Float() float64 {
+	return Float64(this.Bytes())
 }
 
-// UTF8ToInt []{0x31,0x32} >>> 12
-func (this Bs) UTF8ToInt() (int, error) {
-	return strconv.Atoi(this.ASCII())
+func (this Bs) Bool() bool {
+	return Bool(this.Bytes())
 }
 
-// UTF8ToFloat64 字节utf8编码再转int,再转float64
-func (this Bs) UTF8ToFloat64(decimals int) (float64, error) {
-	i, err := this.UTF8ToInt()
-	return float64(i) / math.Pow10(decimals), err
-}
-
-// HEXToInt []{0x01,0x02} >>> 102
-func (this Bs) HEXToInt() (int, error) {
-	return strconv.Atoi(this.HEX())
+func (this Bs) Float64frombits() float64 {
+	return math.Float64frombits(this.Uint64())
 }
 
-// HEXToFloat64 字节hex编码再转int,再转float64
-func (this Bs) HEXToFloat64(decimals int) (float64, error) {
-	i, err := this.HEXToInt()
-	return float64(i) / math.Pow10(decimals), err
+func (this Bs) Float32frombits() float32 {
+	return math.Float32frombits(this.Uint32())
 }
 
 // Reverse 倒序
 func (this Bs) Reverse() Bs {
-	x := make([]byte, len(this))
-	for i, v := range this {
-		x[len(this)-i-1] = v
+	for i := 0; i < this.Len()/2; i++ {
+		this[i], this[this.Len()-i-1] = this[this.Len()-i-1], this[i]
 	}
-	return x
-}
-
-// ReverseASCII 倒序再ASCII
-func (this Bs) ReverseASCII() string {
-	return this.Reverse().ASCII()
+	return this
 }
 
-// ReverseHEX 倒序再hex
-func (this Bs) ReverseHEX() string {
-	return this.Reverse().HEX()
+// Add 每个字节加add
+func (this Bs) Add(add byte) Bs {
+	for i, v := range this {
+		this[i] = v + add
+	}
+	return this
 }
 
-// ReverseBase64 倒序再base64
-func (this Bs) ReverseBase64() string {
-	return this.Reverse().Base64()
+// Sub 每个字节减sub
+func (this Bs) Sub(sub byte) Bs {
+	for i, v := range this {
+		this[i] = v - sub
+	}
+	return this
 }
 
-// AddByte 每个字节加add
-func (this Bs) AddByte(add byte) Bs {
-	result := make([]byte, len(this))
-	for _, v := range this {
-		result = append(result, v+add)
-	}
-	return result
+// UTF8ToInt []{0x31,0x32} >>> 12
+func (this Bs) UTF8ToInt() (int, error) {
+	return strconv.Atoi(this.UTF8())
 }
 
-// SubByte 每个字节减sub
-func (this Bs) SubByte(sub byte) Bs {
-	result := make([]byte, len(this))
-	for _, v := range this {
-		result = append(result, v-sub)
-	}
-	return result
+// UTF8ToFloat64 字节utf8编码再转int,再转float64
+func (this Bs) UTF8ToFloat64(decimals int) (float64, error) {
+	i, err := this.UTF8ToInt()
+	return float64(i) / math.Pow10(decimals), err
 }
 
-// Sub0x33 每个字节减0x33
-func (this Bs) Sub0x33() Bs {
-	return this.SubByte(0x33)
+// HEXToInt []{0x01,0x02} >>> 102
+func (this Bs) HEXToInt() (int, error) {
+	return strconv.Atoi(this.HEX())
 }
 
-// Add0x33 每个字节加0x33
-func (this Bs) Add0x33() Bs {
-	return this.AddByte(0x33)
+// HEXToFloat64 字节hex编码再转int,再转float64
+func (this Bs) HEXToFloat64(decimals int) (float64, error) {
+	i, err := this.HEXToInt()
+	return float64(i) / math.Pow10(decimals), err
 }
 
 // Sub0x33ReverseHEXToInt DLT645协议流程,先减0x33,再倒序,再转hex,再转int
 func (this Bs) Sub0x33ReverseHEXToInt() (int, error) {
-	return this.Sub0x33().Reverse().HEXToInt()
+	return this.Sub(0x33).Reverse().HEXToInt()
 }
 
 // Sub0x33ReverseHEXToFloat DLT645协议流程,先减0x33,再倒序,再转hex,再转float64
 func (this Bs) Sub0x33ReverseHEXToFloat(decimals int) (float64, error) {
-	return this.Sub0x33().Reverse().HEXToFloat64(decimals)
+	return this.Sub(0x33).Reverse().HEXToFloat64(decimals)
 }