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.

Sign up for GitHub

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

Map string <-> ettBinary, []byte -> ettBitBinary #68

Closed
wants to merge 3 commits into from
Closed

Map string <-> ettBinary, []byte -> ettBitBinary #68

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ca83f6
Map string <-> ettBinary, []byte -> ettBitBinary
heri16 Aug 2, 2021
ff9a3c3
fix StrangeList issue
heri16 Aug 4, 2021
340eb3d
termIntoStruct: string -> Atom, string -> []byte
heri16 Aug 5, 2021
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
8 changes: 5 additions & 3 deletions etf/decode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func Decode(packet []byte, cache []Atom) (retTerm Term, retByte []byte, retErr e
return nil, nil, errMalformedString
}

term = string(packet[2 : n+2])
term = String(packet[2 : n+2])
packet = packet[n+2:]

case ettCacheRef:
Expand Down Expand Up @@ -360,7 +360,7 @@ func Decode(packet []byte, cache []Atom) (retTerm Term, retByte []byte, retErr e
b := make([]byte, n)
copy(b, packet[4:n+4])

term = b
term = string(b)
heri16 marked this conversation as resolved.
Show resolved Hide resolved
packet = packet[n+4:]

case ettNil:
Expand Down Expand Up @@ -438,7 +438,9 @@ func Decode(packet []byte, cache []Atom) (retTerm Term, retByte []byte, retErr e

b := make([]byte, n)
copy(b, packet[5:n+5])
b[n-1] = b[n-1] >> (8 - bits)
if bits != 8 {
b[n-1] = b[n-1] >> (8 - bits)
}
Comment on lines +439 to +441
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

useless

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark data first before coming to a conclusion?


term = b
packet = packet[n+5:]
Expand Down
29 changes: 22 additions & 7 deletions etf/decode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestDecodeAtom(t *testing.T) {
}

func TestDecodeString(t *testing.T) {
expected := "abc"
expected := String("abc")
packet := []byte{ettString, 0, 3, 97, 98, 99}
term, _, err := Decode(packet, []Atom{})
if err != nil || term != expected {
Expand Down Expand Up @@ -198,7 +198,7 @@ func TestDecodeMap(t *testing.T) {
Atom("abc"): 123,
"abc": 4.56,
}
packet := []byte{116, 0, 0, 0, 2, 100, 0, 3, 97, 98, 99, 97, 123, 107, 0, 3, 97, 98,
packet := []byte{116, 0, 0, 0, 2, 100, 0, 3, 97, 98, 99, 97, 123, 109, 0, 0, 0, 3, 97, 98,
99, 70, 64, 18, 61, 112, 163, 215, 10, 61}

term, _, err := Decode(packet, []Atom{})
Expand All @@ -214,8 +214,23 @@ func TestDecodeMap(t *testing.T) {
}

func TestDecodeBinary(t *testing.T) {
expected := "abc"
packet := []byte{ettBinary, 0, 0, 0, 3, 97, 98, 99}
term, _, err := Decode(packet, []Atom{})
if err != nil || term != expected {
t.Fatal(err)
}

packet = []byte{ettBinary, 0, 3, 97, 98, 99}
term, _, err = Decode(packet, []Atom{})
if err != errMalformedBinary {
t.Fatal(err)
}
}

func TestDecodeBitBinary(t *testing.T) {
expected := []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 0}
packet := []byte{ettBinary, 0, 0, 0, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0}
packet := []byte{ettBitBinary, 0, 0, 0, 10, 8, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0}

term, _, err := Decode(packet, []Atom{})
if err != nil {
Expand All @@ -228,9 +243,9 @@ func TestDecodeBinary(t *testing.T) {
}
}

func TestDecodeBitBinary(t *testing.T) {
func TestDecodeBitBinaryWithLastBits(t *testing.T) {
expected := []byte{1, 2, 3, 4, 5}
packet := []byte{77, 0, 0, 0, 5, 3, 1, 2, 3, 4, 160}
packet := []byte{ettBitBinary, 0, 0, 0, 5, 3, 1, 2, 3, 4, 160}

term, _, err := Decode(packet, []Atom{})
if err != nil {
Expand Down Expand Up @@ -401,9 +416,9 @@ func TestDecodeComplex(t *testing.T) {
expected := Tuple{"hello", List{},
Map{Atom("v1"): List{Tuple{3, 13, 3.13}, Tuple{Atom("abc"), "abc"}},
Atom("v2"): int64(12345)}}
packet := []byte{104, 3, 107, 0, 5, 104, 101, 108, 108, 111, 106, 116, 0, 0, 0, 2,
packet := []byte{104, 3, 109, 0, 0, 0, 5, 104, 101, 108, 108, 111, 106, 116, 0, 0, 0, 2,
100, 0, 2, 118, 49, 108, 0, 0, 0, 2, 104, 3, 97, 3, 97, 13, 70, 64, 9, 10,
61, 112, 163, 215, 10, 104, 2, 100, 0, 3, 97, 98, 99, 107, 0, 3, 97, 98,
61, 112, 163, 215, 10, 104, 2, 100, 0, 3, 97, 98, 99, 109, 0, 0, 0, 3, 97, 98,
99, 106, 100, 0, 2, 118, 50, 98, 0, 0, 48, 57}
term, _, err := Decode(packet, []Atom{})
if err != nil {
Expand Down
21 changes: 18 additions & 3 deletions etf/encode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,20 @@ func Encode(term Term, b *lib.Buffer,
}
lenString := len(t)

if lenString > 4294967295 {
heri16 marked this conversation as resolved.
Show resolved Hide resolved
return ErrStringTooLong
}

// 1 (ettBinary) + 4 (len) + string
buf := b.Extend(1 + 4 + lenString)
buf[0] = ettBinary
binary.BigEndian.PutUint32(buf[1:5], uint32(lenString))
copy(buf[5:], t)

case String:
// ASCII-only string
lenString := len(t)

if lenString > 65535 {
return ErrStringTooLong
}
Expand Down Expand Up @@ -529,10 +543,11 @@ func Encode(term Term, b *lib.Buffer,

case []byte:
lenBinary := len(t)
buf := b.Extend(1 + 4 + lenBinary)
buf[0] = ettBinary
buf := b.Extend(1 + 4 + 1 + lenBinary)
buf[0] = ettBitBinary
Copy link
Collaborator

@halturin halturin Aug 2, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see your idea to use ettBinary as a transport for the string and ettBitBinary for the real binary data but it makes Ergo-Ergo interaction a bit harder for the case of string usage or for the case if I sent real binary (not a string) from the Erlang side. That's why I prefer to see

Ergo -> transport -> Erlang -> transport -> Ergo
[]byte ettBinary <<...>> ettBinary []byte
string (no utf8) ettString ".." ettString string
string (utf8) ettString [byte()] ettList string (via TermIntoStruct, TermMapIntoStruct, TermToString)
etf.Charlist ettList charlist ettList etf.Charlist (via ...)
etf.String ettBinary <<..>> ettBinary etf.String (via ...)

and here are prioritized transitions for me so far as it doesn't require any extra conversions.

Ergo -> transport -> Ergo
string (utf8) ettString string
[]byte ettBinary []byte

Copy link
Author

@heri16 heri16 Aug 2, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit was based on your previous input that this library's priority is Ergo <-> Ergo.

If we start considering the case for Erlang, we should also consider the case for Elixir. Elixir strings are binaries.

Do also note that the current ergo implementation can only send ASCII strings to Erlang and there are no safety checks to ensure that the user passes only ASCII goStrings.

Rather than have golang side waste CPU cycles to check if a string contains utf8 or not, it's why etf.String was added to support sending legacy style ASCII-only strings to Erlang.

Ergo -> transport -> Elixir transport -> Ergo
[]byte ettBitBinary <<.....>> ettBitBinary []byte
string (ascii) ettBinary "...." ettBinary string
string (utf8) ettBinary "...." ettBinary string
etf.String ettString '....' or [ , , ] ettString etf.String

Note single quotes in Elixir produce charlists (and only support ascii characters), unlike double quotes .
Charlists are defined as a linked list of positive integers that can use [ h | tail ] pattern matching. (Charlist is not a concrete type in elixir).

ettString automatically becomes a charlist in Elixir (and are displayed as string with single quotes in Elixir shell).

List of positive integers (charlist) are also displayed as string with quotes in Erlang shell: https://erlang.org/doc/apps/stdlib/unicode_usage.html#heuristic-string-detection
This is because "..." in Erlang by default creates a list of integers (i.e. charlist).

There is no impact on Ergo <-> Ergo integration.

Ergo -> transport -> Ergo
string (utf8) ettBinary string
byte[] ettBitBinary []byte

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure about Elixir <<...>>> -> ettBitBinary. May I ask you to show the same output

16> term_to_binary(<<1,2,3>>).
<<131,109,0,0,0,3,1,2,3>>

but in Elixir shell? (I'm not familiar with it)

Copy link
Collaborator

@halturin halturin Aug 2, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just found

iex(1)> :erlang.term_to_binary(<<1,2,3>>);
<<131, 109, 0, 0, 0, 3, 1, 2, 3>>

as you may notice it was encoded as ettBinary (109) which means there is no way to get []byte on the Ergo side using your approach.

Copy link
Author

@heri16 heri16 Aug 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Elixir:

Interactive Elixir (1.12.2) - press Ctrl+C to exit (type h() ENTER for help)
iex(1)> <<195,165,195,164,195,182>> 
"åäö"
iex(2)> :erlang.term_to_binary("åäö")
<<131, 109, 0, 0, 0, 6, 195, 165, 195, 164, 195, 182>>
iex(3)> :erlang.term_to_binary("123")
<<131, 109, 0, 0, 0, 3, 49, 50, 51>>
iex(4)> :erlang.term_to_binary("日本")
<<131, 109, 0, 0, 0, 6, 230, 151, 165, 230, 156, 172>>

Erlang:

Eshell V10.7.2.12  (abort with ^G)
1> <<195,165,195,164,195,182>>.
<<"åäö"/utf8>>
2> term_to_binary(<<"åäö"/utf8>>).
<<131,109,0,0,0,6,195,165,195,164,195,182>>
3> term_to_binary("åäö").
<<131,107,0,3,229,228,246>>
4> term_to_binary("123"). 
<<131,107,0,3,49,50,51>>
5> term_to_binary("日本").
<<131,108,0,0,0,2,98,0,0,101,229,98,0,0,103,44,106>>

I do understand your point, but it's not a coincidence that we can Use Strings as Byte Slices in golang: https://go101.org/article/string.html#use-string-as-byte-slice
(Not just for copy/append, but even when indexing a string.)

Since string is just an immutable []byte according to Rob Pike...

So i think the question would be, should decoded binary values be immutable or mutable?
Does immutability in this case help prevent a class programming bugs?

This topic is still a big contention even within the Golang Issue Tracker:
See "Strengths of This Proposal" from:

Which is why I would approach it from language design: what is a string in Elixir, what is a string in Erlang, and what is a String in Golang?

And i find that the common denominator is that strings are just an immutable sequence of bytes in all three languages.

Copy link
Author

@heri16 heri16 Aug 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In other words, 107 is just an optimisation on 108 (or 109).

Try searching for "StrangeList" in the Erlang docs. (Those are caused by 107).

Copy link
Author

@heri16 heri16 Aug 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another Interesting Side Note:

All of Erlang standard lib and modern 3rd-party Erlang libraries, can always accept (and behave the same on) either 108 (CharList) or 109 (Binary), but not always 107 (StrangeList).

We have tested this pretty extensively.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we just make this configurable?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I appreciate your effort to make this project better, but seemingly this approach differs from the way this project goes.

binary.BigEndian.PutUint32(buf[1:5], uint32(lenBinary))
copy(buf[5:], t)
buf[5] = 8 // 1 byte = 8 bits
copy(buf[6:], t)

default:
v := reflect.ValueOf(t)
Expand Down
37 changes: 27 additions & 10 deletions etf/encode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func TestEncodeString(t *testing.T) {
defer lib.ReleaseBuffer(b)

expected := []byte{ettString, 0, 52, 72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 46, 32, 228, 189, 160, 229, 165, 189, 228, 184, 150, 231, 149, 140, 46, 32, 208, 159, 209, 128, 208, 184, 208, 178, 208, 181, 209, 130, 32, 208, 188, 208, 184, 209, 128, 46, 32, 240, 159, 154, 128}
err := Encode("Hello World. 你好世界. Привет мир. 🚀", b, nil, nil, nil)
err := Encode(String("Hello World. 你好世界. Привет мир. 🚀"), b, nil, nil, nil)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -312,12 +312,29 @@ func TestEncodeBinary(t *testing.T) {
b := lib.TakeBuffer()
defer lib.ReleaseBuffer(b)

expected := []byte{ettBinary, 0, 0, 0, 52, 72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 46, 32, 228, 189, 160, 229, 165, 189, 228, 184, 150, 231, 149, 140, 46, 32, 208, 159, 209, 128, 208, 184, 208, 178, 208, 181, 209, 130, 32, 208, 188, 208, 184, 209, 128, 46, 32, 240, 159, 154, 128}
err := Encode("Hello World. 你好世界. Привет мир. 🚀", b, nil, nil, nil)
if err != nil {
t.Fatal(err)
}

if !reflect.DeepEqual(b.B, expected) {
fmt.Println("exp", expected)
fmt.Println("got", b.B)
t.Fatal("incorrect value")
}
}

func TestEncodeBitBinary(t *testing.T) {
b := lib.TakeBuffer()
defer lib.ReleaseBuffer(b)

err := Encode([]byte{1, 2, 3, 4, 5}, b, nil, nil, nil)
if err != nil {
t.Fatal(err)
}

expected := []byte{ettBinary, 0, 0, 0, 5, 1, 2, 3, 4, 5}
expected := []byte{ettBitBinary, 0, 0, 0, 5, 8, 1, 2, 3, 4, 5}
if !reflect.DeepEqual(b.B, expected) {
t.Fatal("incorrect value")
}
Expand Down Expand Up @@ -421,9 +438,9 @@ func TestEncodeMap(t *testing.T) {

// map has no guarantee of key order, so the result could be different
expected := []byte{116, 0, 0, 0, 2, 119, 4, 107, 101, 121, 49, 98, 0, 0, 48, 57, 119, 4,
107, 101, 121, 50, 107, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111,
107, 101, 121, 50, 109, 0, 0, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111,
114, 108, 100}
expected1 := []byte{116, 0, 0, 0, 2, 119, 4, 107, 101, 121, 50, 107, 0, 11, 104, 101,
expected1 := []byte{116, 0, 0, 0, 2, 119, 4, 107, 101, 121, 50, 109, 0, 0, 0, 11, 104, 101,
108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 107, 101, 121, 49, 98, 0, 0,
48, 57}
term := Map{
Expand All @@ -449,9 +466,9 @@ func TestEncodeGoMap(t *testing.T) {

// map has no guarantee of key order, so the result could be different
expected := []byte{116, 0, 0, 0, 2, 119, 4, 107, 101, 121, 49, 98, 0, 0, 48, 57, 119, 4,
107, 101, 121, 50, 107, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111,
107, 101, 121, 50, 109, 0, 0, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111,
114, 108, 100}
expected1 := []byte{116, 0, 0, 0, 2, 119, 4, 107, 101, 121, 50, 107, 0, 11, 104, 101,
expected1 := []byte{116, 0, 0, 0, 2, 119, 4, 107, 101, 121, 50, 109, 0, 0, 0, 11, 104, 101,
108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 107, 101, 121, 49, 98, 0, 0,
48, 57}
term := map[Atom]interface{}{
Expand All @@ -475,7 +492,7 @@ func TestEncodeStruct(t *testing.T) {
b := lib.TakeBuffer()
defer lib.ReleaseBuffer(b)

expected := []byte{116, 0, 0, 0, 3, 119, 15, 83, 116, 114, 117, 99, 116, 84, 111, 77, 97, 112, 75, 101, 121, 49, 98, 0, 0, 48, 57, 119, 15, 83, 116, 114, 117, 99, 116, 84, 111, 77, 97, 112, 75, 101, 121, 50, 107, 0, 22, 112, 111, 105, 110, 116, 101, 114, 32, 116, 111, 32, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 15, 83, 116, 114, 117, 99, 116, 84, 111, 77, 97, 112, 75, 101, 121, 51, 107, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100}
expected := []byte{116, 0, 0, 0, 3, 119, 15, 83, 116, 114, 117, 99, 116, 84, 111, 77, 97, 112, 75, 101, 121, 49, 98, 0, 0, 48, 57, 119, 15, 83, 116, 114, 117, 99, 116, 84, 111, 77, 97, 112, 75, 101, 121, 50, 109, 0, 0, 0, 22, 112, 111, 105, 110, 116, 101, 114, 32, 116, 111, 32, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 15, 83, 116, 114, 117, 99, 116, 84, 111, 77, 97, 112, 75, 101, 121, 51, 109, 0, 0, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100}

s := "pointer to hello world"
term := struct {
Expand Down Expand Up @@ -561,7 +578,7 @@ func TestEncodeStructWithNestedPointers(t *testing.T) {
Key9: &nested,
}

expected := []byte{116, 0, 0, 0, 2, 119, 6, 78, 101, 115, 116, 101, 100, 116, 0, 0, 0, 8, 119, 4, 75, 101, 121, 49, 107, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 75, 101, 121, 50, 107, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 75, 101, 121, 51, 97, 123, 119, 4, 75, 101, 121, 52, 97, 123, 119, 4, 75, 101, 121, 53, 70, 64, 9, 30, 184, 81, 235, 133, 31, 119, 4, 75, 101, 121, 54, 70, 64, 9, 30, 184, 81, 235, 133, 31, 119, 4, 75, 101, 121, 55, 115, 4, 116, 114, 117, 101, 119, 4, 75, 101, 121, 56, 115, 4, 116, 114, 117, 101, 119, 4, 75, 101, 121, 57, 116, 0, 0, 0, 8, 119, 4, 75, 101, 121, 49, 107, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 75, 101, 121, 50, 107, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 75, 101, 121, 51, 97, 123, 119, 4, 75, 101, 121, 52, 97, 123, 119, 4, 75, 101, 121, 53, 70, 64, 9, 30, 184, 81, 235, 133, 31, 119, 4, 75, 101, 121, 54, 70, 64, 9, 30, 184, 81, 235, 133, 31, 119, 4, 75, 101, 121, 55, 115, 4, 116, 114, 117, 101, 119, 4, 75, 101, 121, 56, 115, 4, 116, 114, 117, 101}
expected := []byte{116, 0, 0, 0, 2, 119, 6, 78, 101, 115, 116, 101, 100, 116, 0, 0, 0, 8, 119, 4, 75, 101, 121, 49, 109, 0, 0, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 75, 101, 121, 50, 109, 0, 0, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 75, 101, 121, 51, 97, 123, 119, 4, 75, 101, 121, 52, 97, 123, 119, 4, 75, 101, 121, 53, 70, 64, 9, 30, 184, 81, 235, 133, 31, 119, 4, 75, 101, 121, 54, 70, 64, 9, 30, 184, 81, 235, 133, 31, 119, 4, 75, 101, 121, 55, 115, 4, 116, 114, 117, 101, 119, 4, 75, 101, 121, 56, 115, 4, 116, 114, 117, 101, 119, 4, 75, 101, 121, 57, 116, 0, 0, 0, 8, 119, 4, 75, 101, 121, 49, 109, 0, 0, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 75, 101, 121, 50, 109, 0, 0, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 75, 101, 121, 51, 97, 123, 119, 4, 75, 101, 121, 52, 97, 123, 119, 4, 75, 101, 121, 53, 70, 64, 9, 30, 184, 81, 235, 133, 31, 119, 4, 75, 101, 121, 54, 70, 64, 9, 30, 184, 81, 235, 133, 31, 119, 4, 75, 101, 121, 55, 115, 4, 116, 114, 117, 101, 119, 4, 75, 101, 121, 56, 115, 4, 116, 114, 117, 101}

err := Encode(term, b, nil, nil, nil)
if err != nil {
Expand All @@ -578,7 +595,7 @@ func TestEncodeStructWithNestedPointers(t *testing.T) {
termWithNil := Tst{
Nested: nested,
}
expectedWithNil := []byte{116, 0, 0, 0, 2, 119, 6, 78, 101, 115, 116, 101, 100, 116, 0, 0, 0, 8, 119, 4, 75, 101, 121, 49, 107, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 75, 101, 121, 50, 107, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 75, 101, 121, 51, 97, 123, 119, 4, 75, 101, 121, 52, 97, 123, 119, 4, 75, 101, 121, 53, 70, 64, 9, 30, 184, 81, 235, 133, 31, 119, 4, 75, 101, 121, 54, 70, 64, 9, 30, 184, 81, 235, 133, 31, 119, 4, 75, 101, 121, 55, 115, 4, 116, 114, 117, 101, 119, 4, 75, 101, 121, 56, 115, 4, 116, 114, 117, 101, 119, 4, 75, 101, 121, 57, 106}
expectedWithNil := []byte{116, 0, 0, 0, 2, 119, 6, 78, 101, 115, 116, 101, 100, 116, 0, 0, 0, 8, 119, 4, 75, 101, 121, 49, 109, 0, 0, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 75, 101, 121, 50, 109, 0, 0, 0, 11, 104, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 119, 4, 75, 101, 121, 51, 97, 123, 119, 4, 75, 101, 121, 52, 97, 123, 119, 4, 75, 101, 121, 53, 70, 64, 9, 30, 184, 81, 235, 133, 31, 119, 4, 75, 101, 121, 54, 70, 64, 9, 30, 184, 81, 235, 133, 31, 119, 4, 75, 101, 121, 55, 115, 4, 116, 114, 117, 101, 119, 4, 75, 101, 121, 56, 115, 4, 116, 114, 117, 101, 119, 4, 75, 101, 121, 57, 106}

err = Encode(termWithNil, b1, nil, nil, nil)
if err != nil {
Expand All @@ -595,7 +612,7 @@ func TestEncodeStructWithTags(t *testing.T) {
b := lib.TakeBuffer()
defer lib.ReleaseBuffer(b)

expected := []byte{116, 0, 0, 0, 4, 119, 4, 75, 101, 121, 49, 107, 0, 12, 72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33, 119, 17, 99, 117, 115, 116, 111, 109, 95, 102, 105, 101, 108, 100, 95, 110, 97, 109, 101, 108, 0, 0, 0, 3, 108, 0, 0, 0, 7, 98, 0, 0, 79, 96, 98, 0, 0, 89, 125, 98, 0, 0, 78, 22, 98, 0, 0, 117, 76, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 108, 0, 0, 0, 13, 98, 0, 0, 4, 31, 98, 0, 0, 4, 64, 98, 0, 0, 4, 56, 98, 0, 0, 4, 50, 98, 0, 0, 4, 53, 98, 0, 0, 4, 66, 97, 32, 98, 0, 0, 4, 28, 98, 0, 0, 4, 56, 98, 0, 0, 4, 64, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 108, 0, 0, 0, 14, 97, 72, 97, 101, 97, 108, 97, 108, 97, 111, 97, 32, 97, 87, 97, 111, 97, 114, 97, 108, 97, 100, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 106, 119, 4, 75, 101, 121, 51, 116, 0, 0, 0, 2, 119, 10, 78, 101, 115, 116, 101, 100, 75, 101, 121, 49, 107, 0, 52, 72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33, 32, 228, 189, 160, 229, 165, 189, 228, 184, 150, 231, 149, 140, 33, 32, 208, 159, 209, 128, 208, 184, 208, 178, 208, 181, 209, 130, 32, 208, 156, 208, 184, 209, 128, 33, 32, 240, 159, 154, 128, 119, 5, 102, 105, 101, 108, 100, 116, 0, 0, 0, 1, 107, 0, 7, 109, 97, 112, 95, 107, 101, 121, 108, 0, 0, 0, 32, 97, 72, 97, 101, 97, 108, 97, 108, 97, 111, 97, 32, 97, 87, 97, 111, 97, 114, 97, 108, 97, 100, 97, 33, 97, 32, 98, 0, 0, 79, 96, 98, 0, 0, 89, 125, 98, 0, 0, 78, 22, 98, 0, 0, 117, 76, 97, 33, 97, 32, 98, 0, 0, 4, 31, 98, 0, 0, 4, 64, 98, 0, 0, 4, 56, 98, 0, 0, 4, 50, 98, 0, 0, 4, 53, 98, 0, 0, 4, 66, 97, 32, 98, 0, 0, 4, 28, 98, 0, 0, 4, 56, 98, 0, 0, 4, 64, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 119, 4, 75, 101, 121, 52, 108, 0, 0, 0, 2, 108, 0, 0, 0, 3, 108, 0, 0, 0, 7, 98, 0, 0, 79, 96, 98, 0, 0, 89, 125, 98, 0, 0, 78, 22, 98, 0, 0, 117, 76, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 108, 0, 0, 0, 13, 98, 0, 0, 4, 31, 98, 0, 0, 4, 64, 98, 0, 0, 4, 56, 98, 0, 0, 4, 50, 98, 0, 0, 4, 53, 98, 0, 0, 4, 66, 97, 32, 98, 0, 0, 4, 28, 98, 0, 0, 4, 56, 98, 0, 0, 4, 64, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 108, 0, 0, 0, 14, 97, 72, 97, 101, 97, 108, 97, 108, 97, 111, 97, 32, 97, 87, 97, 111, 97, 114, 97, 108, 97, 100, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 106, 108, 0, 0, 0, 3, 108, 0, 0, 0, 7, 98, 0, 0, 79, 96, 98, 0, 0, 89, 125, 98, 0, 0, 78, 22, 98, 0, 0, 117, 76, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 108, 0, 0, 0, 13, 98, 0, 0, 4, 31, 98, 0, 0, 4, 64, 98, 0, 0, 4, 56, 98, 0, 0, 4, 50, 98, 0, 0, 4, 53, 98, 0, 0, 4, 66, 97, 32, 98, 0, 0, 4, 28, 98, 0, 0, 4, 56, 98, 0, 0, 4, 64, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 108, 0, 0, 0, 14, 97, 72, 97, 101, 97, 108, 97, 108, 97, 111, 97, 32, 97, 87, 97, 111, 97, 114, 97, 108, 97, 100, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 106, 106}
expected := []byte{116, 0, 0, 0, 4, 119, 4, 75, 101, 121, 49, 109, 0, 0, 0, 12, 72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33, 119, 17, 99, 117, 115, 116, 111, 109, 95, 102, 105, 101, 108, 100, 95, 110, 97, 109, 101, 108, 0, 0, 0, 3, 108, 0, 0, 0, 7, 98, 0, 0, 79, 96, 98, 0, 0, 89, 125, 98, 0, 0, 78, 22, 98, 0, 0, 117, 76, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 108, 0, 0, 0, 13, 98, 0, 0, 4, 31, 98, 0, 0, 4, 64, 98, 0, 0, 4, 56, 98, 0, 0, 4, 50, 98, 0, 0, 4, 53, 98, 0, 0, 4, 66, 97, 32, 98, 0, 0, 4, 28, 98, 0, 0, 4, 56, 98, 0, 0, 4, 64, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 108, 0, 0, 0, 14, 97, 72, 97, 101, 97, 108, 97, 108, 97, 111, 97, 32, 97, 87, 97, 111, 97, 114, 97, 108, 97, 100, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 106, 119, 4, 75, 101, 121, 51, 116, 0, 0, 0, 2, 119, 10, 78, 101, 115, 116, 101, 100, 75, 101, 121, 49, 109, 0, 0, 0, 52, 72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 33, 32, 228, 189, 160, 229, 165, 189, 228, 184, 150, 231, 149, 140, 33, 32, 208, 159, 209, 128, 208, 184, 208, 178, 208, 181, 209, 130, 32, 208, 156, 208, 184, 209, 128, 33, 32, 240, 159, 154, 128, 119, 5, 102, 105, 101, 108, 100, 116, 0, 0, 0, 1, 109, 0, 0, 0, 7, 109, 97, 112, 95, 107, 101, 121, 108, 0, 0, 0, 32, 97, 72, 97, 101, 97, 108, 97, 108, 97, 111, 97, 32, 97, 87, 97, 111, 97, 114, 97, 108, 97, 100, 97, 33, 97, 32, 98, 0, 0, 79, 96, 98, 0, 0, 89, 125, 98, 0, 0, 78, 22, 98, 0, 0, 117, 76, 97, 33, 97, 32, 98, 0, 0, 4, 31, 98, 0, 0, 4, 64, 98, 0, 0, 4, 56, 98, 0, 0, 4, 50, 98, 0, 0, 4, 53, 98, 0, 0, 4, 66, 97, 32, 98, 0, 0, 4, 28, 98, 0, 0, 4, 56, 98, 0, 0, 4, 64, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 119, 4, 75, 101, 121, 52, 108, 0, 0, 0, 2, 108, 0, 0, 0, 3, 108, 0, 0, 0, 7, 98, 0, 0, 79, 96, 98, 0, 0, 89, 125, 98, 0, 0, 78, 22, 98, 0, 0, 117, 76, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 108, 0, 0, 0, 13, 98, 0, 0, 4, 31, 98, 0, 0, 4, 64, 98, 0, 0, 4, 56, 98, 0, 0, 4, 50, 98, 0, 0, 4, 53, 98, 0, 0, 4, 66, 97, 32, 98, 0, 0, 4, 28, 98, 0, 0, 4, 56, 98, 0, 0, 4, 64, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 108, 0, 0, 0, 14, 97, 72, 97, 101, 97, 108, 97, 108, 97, 111, 97, 32, 97, 87, 97, 111, 97, 114, 97, 108, 97, 100, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 106, 108, 0, 0, 0, 3, 108, 0, 0, 0, 7, 98, 0, 0, 79, 96, 98, 0, 0, 89, 125, 98, 0, 0, 78, 22, 98, 0, 0, 117, 76, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 108, 0, 0, 0, 13, 98, 0, 0, 4, 31, 98, 0, 0, 4, 64, 98, 0, 0, 4, 56, 98, 0, 0, 4, 50, 98, 0, 0, 4, 53, 98, 0, 0, 4, 66, 97, 32, 98, 0, 0, 4, 28, 98, 0, 0, 4, 56, 98, 0, 0, 4, 64, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 108, 0, 0, 0, 14, 97, 72, 97, 101, 97, 108, 97, 108, 97, 111, 97, 32, 97, 87, 97, 111, 97, 114, 97, 108, 97, 100, 97, 33, 97, 32, 98, 0, 1, 246, 128, 106, 106, 106}

type Nested struct {
NestedKey1 string
Expand Down
6 changes: 6 additions & 0 deletions etf/etf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ type Term interface{}
type Tuple []Term
type List []Term
type Atom string
type String string // ASCII-only string
type Map map[Term]Term

type Pid struct {
Expand Down Expand Up @@ -57,6 +58,8 @@ func StringTerm(t Term) (s string, ok bool) {
switch x := t.(type) {
case Atom:
s = string(x)
case String:
s = string(x)
case string:
s = x
case []byte:
Expand Down Expand Up @@ -208,6 +211,9 @@ func termIntoStruct(term Term, dest reflect.Value, charlistToString bool) error
case Atom:
dest.SetString(string(v))
return nil
case String:
dest.SetString(string(v))
return nil
case string:
dest.SetString(v)
return nil
Expand Down