QPQ-AG/hakuzaru
12
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'Add naked reads to read/1' (#16) from nekkid into master

Browse Source 
Reviewed-on: #16
This commit is contained in:
Craig Everett 2025-12-23 13:48:19 +09:00
commit 17a2b867fe
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/hz_format.erl
View File

@ -553,7 +553,6 @@ read_w_gajus([32, $G], A) ->
read_w_gajus([32, $P], A) -> read_w_gajus([32, $P], A) ->
calc([], [{$P, A}]); calc([], [{$P, A}]);
read_w_gajus(A, B) -> read_w_gajus(A, B) ->
io:format("A: ~ts, B: ~p~n", [A, B]),
error. error.
read_w_pucks([C | Rest], A) when $0 =< C andalso C =< $9 -> read_w_pucks([C | Rest], A) when $0 =< C andalso C =< $9 ->
@ -599,10 +598,23 @@ read([32, $P], A, P) ->
calc([], [{$P, A} | P]); calc([], [{$P, A} | P]);
read([C, 32 | Rest], A, G) -> read([C, 32 | Rest], A, G) ->
read(Rest, [], [{C, A} | G]); read(Rest, [], [{C, A} | G]);
read([$, | Rest], A, []) ->
read_w_gajus(Rest, A);
read([$_ | Rest], A, []) ->
read_w_gajus(Rest, A);
read([$. | Rest], A, []) ->
case read_w_pucks(Rest, []) of
{ok, P} ->
G = list_to_integer(lists:reverse(A)) * one(gaju),
{ok, G + P};
Error ->
Error
end;
read([C | Rest], A, G) -> read([C | Rest], A, G) ->
read(Rest, [], [{C, A} | G]); read(Rest, [], [{C, A} | G]);
read([], A, []) ->
read_w_gajus([], A);
read(Rest, A, G) -> read(Rest, A, G) ->
io:format("read(\"~ts\", ~tp, ~tp) -> died!~n", [Rest, A, G]),
error. error.
@ -622,7 +634,6 @@ read([C, 32 | Rest], A, G, P) ->
read([C | Rest], A, G, P) -> read([C | Rest], A, G, P) ->
read(Rest, [], G, [{C, A} | P]); read(Rest, [], G, [{C, A} | P]);
read(_, _, _, _) -> read(_, _, _, _) ->
io:format("read/4 died!~n"),
error. error.
calc(G, P) -> calc(G, P) ->