Skip to content
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.

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

Support Write function #11

Merged
merged 6 commits into from
Oct 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 6 additions & 48 deletions pkg/bit/v2/decode.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,52 +22,10 @@ import (
"fmt"
"github.com/goccy/go-reflect"
"io"
"strings"
)

const (
tagKeyName = "bit"
)

var errCannotInterface = errors.New("CanInterface returns false")

// tagConfig represents StructTag.
// "-" : ignore the field
// "skip": ignore but offset will be updated
// "BE" : the field is treated as big endian
// "LE" : the field is treated as little endian
type tagConfig struct {
ignore bool
skip bool
endian binary.ByteOrder
}

func parseStructTag(t reflect.StructTag) *tagConfig {
s, ok := t.Lookup(tagKeyName)
if !ok {
return nil
}
ret := &tagConfig{}

strs := strings.Split(s, ",")
for _, v := range strs {
switch v {
case "-":
ret.ignore = true
return ret
case "skip":
ret.skip = true
return ret
case "BE":
ret.endian = binary.BigEndian
case "LE":
ret.endian = binary.LittleEndian
}

}
return ret
}

// Size returns size of v in bits.
/*
func Size(v interface{}) int {
Expand Down Expand Up @@ -117,8 +75,8 @@ func sizeOfValueInBits(c *int, v reflect.Value, structtag bool) {
}
}

// filldata reads from b and fill v.
func fillData(b []byte, order binary.ByteOrder, v reflect.Value, o *Offset) error {
// read reads from b and fill v.
func read(b []byte, order binary.ByteOrder, v reflect.Value, o *Offset) error {
var off Offset
var err error
var val reflect.Value
Expand Down Expand Up @@ -220,7 +178,7 @@ func fillData(b []byte, order binary.ByteOrder, v reflect.Value, o *Offset) erro
return nil
} else {
for i := 0; i < v.Len(); i++ {
err := fillData(b, order, v.Index(i), o)
err := read(b, order, v.Index(i), o)
if err != nil && err != errCannotInterface {
return err
}
Expand All @@ -246,14 +204,14 @@ func fillData(b []byte, order binary.ByteOrder, v reflect.Value, o *Offset) erro
}
continue
} else if cnf.endian != nil {
err := fillData(b, cnf.endian, v.Field(i), o)
err := read(b, cnf.endian, v.Field(i), o)
if err != nil && err != errCannotInterface {
return err
}
continue
}
}
err := fillData(b, order, v.Field(i), o)
err := read(b, order, v.Field(i), o)
if err != nil && err != errCannotInterface {
return err
}
Expand Down Expand Up @@ -298,7 +256,7 @@ func Read(r io.Reader, order binary.ByteOrder, data interface{}) error {
} else if n != byteSize {
return fmt.Errorf("bit.Read:short read, expect=%d byte, read=%d byte", byteSize, n)
}
err = fillData(barr, order, reflect.Indirect(v), &Offset{})
err = read(barr, order, reflect.Indirect(v), &Offset{})
if err != io.EOF && err != errCannotInterface {
return err
}
Expand Down
209 changes: 209 additions & 0 deletions pkg/bit/v2/encode.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
/*
Copyright 2020 Takahiro Yamashita

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package bit

import (
"encoding/binary"
"fmt"
"github.com/goccy/go-reflect"
"io"
)

// write writes v to b.
func write(v reflect.Value, order binary.ByteOrder, b []byte, o *Offset) error {
var off Offset
var err error

if !v.CanInterface() {
// skip unexported field
var size int
sizeOfValueInBits(&size, v, false)
*o, err = o.AddOffset(Offset{Bit: uint64(size)})
if err != nil {
return err
}
return errCannotInterface
}

d := v.Interface()

switch d.(type) {
case uint8:
val := d.(uint8)
bits, err := GetBits([]byte{byte(val)}, Offset{0, 0}, 8, order)
if err != nil {
return err
}
if err := SetBits(b, *o, bits, binary.LittleEndian); err != nil {
return err
}
off = Offset{1, 0}
case uint16:
val := d.(uint16)
bs := make([]byte, 2)
order.PutUint16(bs, val)
bits, err := GetBits(bs, Offset{0, 0}, 16, binary.LittleEndian)
if err != nil {
return err
}
if err := SetBits(b, *o, bits, binary.LittleEndian); err != nil {
return err
}
off = Offset{2, 0}

case uint32:
val := d.(uint32)
bs := make([]byte, 4)
order.PutUint32(bs, val)
bits, err := GetBits(bs, Offset{0, 0}, 32, binary.LittleEndian)
if err != nil {
return err
}
if err := SetBits(b, *o, bits, binary.LittleEndian); err != nil {
return err
}
off = Offset{4, 0}
case uint64:
val := d.(uint64)
bs := make([]byte, 8)
order.PutUint64(bs, val)
bits, err := GetBits(bs, Offset{0, 0}, 64, binary.LittleEndian)
if err != nil {
return err
}
if err := SetBits(b, *o, bits, binary.LittleEndian); err != nil {
return err
}
off = Offset{8, 0}
case Bit:
val := d.(Bit)
if err := SetBitsBitEndian(b, *o, []Bit{val}, order); err != nil {
return err
}
off = Offset{0, 1}
default:
switch v.Kind() {
case reflect.Slice, reflect.Array:
if v.Len() > 0 {
if v.Index(0).Kind() == reflect.Bool {
/* Bit array */
/* when order is Big Endian, we should read the entire bits at once */
bitSize := v.Len()
bits := make([]Bit, bitSize)
for i := 0; i < bitSize; i++ {
bits[i] = Bit(v.Index(i).Bool())
}

if err := SetBitsBitEndian(b, *o, bits, order); err != nil {
return err
}
off = Offset{0, uint64(bitSize)}

} else if v.Index(0).Kind() == reflect.Uint8 {
// byte slice / byte array
var bs []byte
if v.Kind() == reflect.Slice {
bs = v.Bytes()
} else {
// array
bs = make([]byte, v.Len())
for i := 0; i < v.Len(); i++ {
bs[i] = byte(v.Index(i).Uint())
}
}
bits, err := GetBits(bs, Offset{0, 0}, uint64(v.Len()*8), order)
if err != nil {
return err
}
if err := SetBits(b, *o, bits, binary.LittleEndian); err != nil {
return err
}
off = Offset{uint64(v.Len()), 0}
} else {
for i := 0; i < v.Len(); i++ {
err := write(v.Index(i), order, b, o)
if err != nil && err != errCannotInterface {
return err
}
}
}
}
case reflect.Struct:
for i := 0; i < v.Type().NumField(); i++ {
f := v.Type().Field(i)
cnf := parseStructTag(f.Tag)
if cnf != nil {
/* struct tag is defined */
if cnf.ignore {
continue
} else if cnf.skip {
var bitSize int
/* only updates offset. not fill. */
sizeOfValueInBits(&bitSize, v.Field(i), true)
*o, err = o.AddOffset(Offset{Bit: uint64(bitSize)})
if err != nil {
return err
}
continue
} else if cnf.endian != nil {
err := write(v.Field(i), cnf.endian, b, o)
if err != nil && err != errCannotInterface {
return err
}
continue
}
}
err := write(v.Field(i), order, b, o)
if err != nil && err != errCannotInterface {
return err
}
}
return nil
default:
return fmt.Errorf("Not Supported %s", v.Kind())
}
}

*o, err = o.AddOffset(off)

return err
}

// Write writes structured binary data from input into w.
func Write(w io.Writer, order binary.ByteOrder, input interface{}) error {
v := reflect.ValueOf(input)
var vv reflect.Value

switch v.Kind() {
case reflect.Ptr:
vv = reflect.Indirect(reflect.ValueOf(input))
case reflect.Array, reflect.Slice, reflect.Struct:
vv = reflect.ValueOf(input)
default:
return binary.Write(w, order, input)
}

var c int = 0
var off Offset
sizeOfValueInBits(&c, vv, true)
byteSize := sizeOfBits(c)
barr := make([]byte, byteSize)

err := write(vv, order, barr, &off)
_, err = w.Write(barr)
return err
}
Loading