Skip to content

Commit

Permalink
bare and bareL working with the same code too
Browse files Browse the repository at this point in the history
to do: tests and wrap and esc
  • Loading branch information
Tea Age committed Jan 2, 2021
1 parent 4e32e99 commit e8b4f14
Show file tree
Hide file tree
Showing 20 changed files with 728 additions and 932 deletions.
560 changes: 328 additions & 232 deletions internal/decoder/bareDecoder.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/decoder/bareDecoder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func TestBare(t *testing.T) {
t.Fail()
}

p := NewBareFormat(list, rc) // p is a new decoder instance
p := NewBareDecoder(list, rc, littleEndian) // p is a new decoder instance

ss := make([]string, 100)
n, err := p.StringsRead(ss)
Expand Down
291 changes: 0 additions & 291 deletions internal/decoder/bareLFormat.go

This file was deleted.

31 changes: 20 additions & 11 deletions internal/decoder/decoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

const (
// receive and sync buffer size
buffSize = 1024
buffSize = 4096
littleEndian = true
bigEndian = false
)
Expand Down Expand Up @@ -112,48 +112,57 @@ func Translate(sw *emitter.TriceLineComposer, list *id.List, rc io.ReadCloser /*
}
}
case "pack":
dec := NewPackDecoder(list.ItemList, rc, false)
dec := NewPackDecoder(list.ItemList, rc, bigEndian)
for {
err := run(sw, dec)
if nil != err {
time.Sleep(2 * time.Second)
dec = NewPackDecoder(list.ItemList, rc, false) // read list again - it could have changed
dec = NewPackDecoder(list.ItemList, rc, bigEndian) // read list again - it could have changed
}
}
case "packl", "packL":
dec := NewPackDecoder(list.ItemList, rc, true)
dec := NewPackDecoder(list.ItemList, rc, littleEndian)
for {
err := run(sw, dec)
if nil != err {
time.Sleep(2 * time.Second)
dec = NewPackDecoder(list.ItemList, rc, true) // read list again - it could have changed
dec = NewPackDecoder(list.ItemList, rc, littleEndian) // read list again - it could have changed
}
}
case "bare":
dec := NewBareFormat(list.ItemList, rc)
dec := NewBareDecoder(list.ItemList, rc, bigEndian)
for {
err := run(sw, dec)
if nil != err {
time.Sleep(2 * time.Second)
dec = NewBareFormat(list.ItemList, rc) // read list again - it could have changed
dec = NewBareDecoder(list.ItemList, rc, bigEndian) // read list again - it could have changed
}
}
case "barel", "bareL":
dec := NewBareLFormat(list.ItemList, rc)
dec := NewBareDecoder(list.ItemList, rc, littleEndian)
for {
err := run(sw, dec)
if nil != err {
time.Sleep(2 * time.Second)
dec = NewBareLFormat(list.ItemList, rc) // read list again - it could have changed
dec = NewBareDecoder(list.ItemList, rc, littleEndian) // read list again - it could have changed
}
}
case "wrap":
dec := NewBareFormat(list.ItemList, NewBareReaderFromWrap(rc))
dec := NewBareDecoder(list.ItemList, NewBareReaderFromWrap(rc), bigEndian)
for {
err := run(sw, dec)
if nil != err {
time.Sleep(2 * time.Second)
dec = NewBareFormat(list.ItemList, NewBareReaderFromWrap(rc)) // read list again - it could have changed
dec = NewBareDecoder(list.ItemList, NewBareReaderFromWrap(rc), bigEndian) // read list again - it could have changed
}
}
case "wrapl", "wrapL":
dec := NewBareDecoder(list.ItemList, NewBareReaderFromWrap(rc), littleEndian)
for {
err := run(sw, dec)
if nil != err {
time.Sleep(2 * time.Second)
dec = NewBareDecoder(list.ItemList, NewBareReaderFromWrap(rc), littleEndian) // read list again - it could have changed
}
}

Expand Down
Loading

0 comments on commit e8b4f14

Please sign in to comment.