Skip to content

Update reader.ex #2

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

Open
Q-in wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update reader.ex #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
065e45f
Update reader.ex
Q-in Jun 21, 2021
804cc17
is_binary -> is_atom
Q-in Jun 28, 2021
ba91755
keep it atom too
Q-in Jun 28, 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
5 changes: 2 additions & 3 deletions lib/reader.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ defmodule Eflatbuffers.Reader do
case Map.get(members, index) do
nil ->
throw({:error, {:not_in_enum, index, members}})
value_atom ->
Atom.to_string(value_atom)
value_atom -> value_atom
end
end

Expand Down Expand Up @@ -173,7 +172,7 @@ defmodule Eflatbuffers.Reader do
{_, enum_options} = Map.get(tables, options.name)
{_, %{ default: default }} = enum_options.type

map_new = Map.put(map, name, Atom.to_string(Map.get(enum_options.members, default)))
map_new = Map.put(map, name, Map.get(enum_options.members, default))
read_table_fields(fields, vtable, data_buffer_pointer, data, schema, map_new)
end
def read_table_fields([{name, { _type, options }} | fields], << 0, 0, vtable :: binary >>, data_buffer_pointer, data, schema, map) do
Expand Down
7 changes: 3 additions & 4 deletions lib/writer.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,16 @@ defmodule Eflatbuffers.Writer do
[ << vector_length :: little-size(32) >>, data_buffer_and_data(index_types, values, path, schema) ]
end

def write({:enum, options = %{ name: enum_name }}, value, path, {tables, _} = schema) when is_binary(value) do
def write({:enum, options = %{ name: enum_name }}, value, path, {tables, _} = schema) when is_atom(value) do
{:enum, enum_options} = Map.get(tables, enum_name)
members = enum_options.members
{type, type_options} = enum_options.type
# if we got handed some defaults from outside,
# we put them in here
type_options = Map.merge(type_options, options)
value_atom = :erlang.binary_to_existing_atom(value, :utf8)
index = Map.get(members, value_atom)
index = Map.get(members, value)
case index do
nil -> throw({:error, {:not_in_enum, value_atom, members}})
nil -> throw({:error, {:not_in_enum, value, members}})
_ -> write({type, type_options}, index, path, schema)
end
end
Expand Down