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

Add new list datatype #22

Merged
merged 1 commit into from
Mar 17, 2021
Merged

Add new list datatype #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 36 additions & 1 deletion src/cuttlefish_datatypes.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
bytesize |
{percent, integer} |
{percent, float} |
float.
float |
{list, datatype()}.
-type extended() :: { integer, integer() } |
{ string, string() } |
{ file, file:filename() } |
Expand Down Expand Up @@ -86,6 +87,11 @@ is_supported(bytesize) -> true;
is_supported({percent, integer}) -> true;
is_supported({percent, float}) -> true;
is_supported(float) -> true;
is_supported({list, {list, _}}) ->
% lists of lists are not supported
false;
is_supported({list, ListDatatype}) ->
is_supported(ListDatatype);
is_supported(_) -> false.

-spec is_extended(any()) -> boolean().
Expand Down Expand Up @@ -255,6 +261,12 @@ from_string(String, float) when is_list(String) ->
_:_ -> {error, {conversion, {String, float}}}
end;

from_string(List, {list, DataType}) when is_list(List) ->
lists:map(fun(El) ->
from_string(string:trim(El), DataType)
end,
string:split(List, ",", all));

from_string(Thing, InvalidDatatype) ->
{error, {type, {Thing, InvalidDatatype}}}.

Expand Down Expand Up @@ -451,6 +463,27 @@ from_string_float_test() ->
from_string_string_test() ->
?assertEqual("string", from_string("string", string)).

from_string_string_list_test() ->
%% more examples in the the cuttlefish_duration tests
?assertEqual(["v1", "v2", "v3"], from_string("v1, v2,v3", {list, string})),
ok.

from_string_integer_list_test() ->
%% more examples in the the cuttlefish_duration tests
?assertEqual([1, 2, 3], from_string("1, 2,3", {list, integer})),
ok.

from_string_atom_list_test() ->
%% more examples in the the cuttlefish_duration tests
?assertEqual([a, b, c], from_string("a, b,c", {list, atom})),
ok.

from_string_string_in_integer_list_test() ->
%% more examples in the the cuttlefish_duration tests
?assertEqual([{error, {conversion, {"a", integer}}}, 1, 2],
from_string("a, 1,2", {list, integer})),
ok.

from_string_unsupported_datatype_test() ->
?assertEqual("Tried to convert \"string\" but invalid datatype: unsupported_datatype", ?XLATE(from_string("string", unsupported_datatype))).

Expand All @@ -471,6 +504,8 @@ is_supported_test() ->
?assert(is_supported({duration, s})),
?assert(is_supported({duration, ms})),
?assert(is_supported(bytesize)),
?assert(is_supported({list, string})),
?assert(not(is_supported({list, {list, string}}))),
?assert(not(is_supported(some_unsupported_type))),
ok.

Expand Down