mirror of
https://github.com/mikpe/pdp10-tools.git
synced 2026-05-04 06:59:36 +00:00
strtol: include Base in invalid_base errors
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
%%% -*- erlang-indent-level: 2 -*-
|
%%% -*- erlang-indent-level: 2 -*-
|
||||||
%%%
|
%%%
|
||||||
%%% strtol() clone for Erlang
|
%%% strtol() clone for Erlang
|
||||||
%%% Copyright (C) 2018-2019 Mikael Pettersson
|
%%% Copyright (C) 2018-2020 Mikael Pettersson
|
||||||
%%%
|
%%%
|
||||||
%%% This file is part of pdp10-tools.
|
%%% This file is part of pdp10-tools.
|
||||||
%%%
|
%%%
|
||||||
@@ -73,7 +73,7 @@ scan_base(String, Base, Minus) ->
|
|||||||
_ when Base >= 2, Base =< 36 ->
|
_ when Base >= 2, Base =< 36 ->
|
||||||
scan_digits(String, Base, Minus);
|
scan_digits(String, Base, Minus);
|
||||||
_ ->
|
_ ->
|
||||||
invalid_base()
|
{error, {?MODULE, {invalid_base, Base}}}
|
||||||
end.
|
end.
|
||||||
|
|
||||||
scan_digits(String, Base, Minus) ->
|
scan_digits(String, Base, Minus) ->
|
||||||
@@ -104,9 +104,6 @@ return(Rest, Value0, Minus) ->
|
|||||||
no_digits() ->
|
no_digits() ->
|
||||||
mkerror(no_digits).
|
mkerror(no_digits).
|
||||||
|
|
||||||
invalid_base() ->
|
|
||||||
mkerror(invalid_base).
|
|
||||||
|
|
||||||
isspace(C) ->
|
isspace(C) ->
|
||||||
case C of
|
case C of
|
||||||
$\s -> true;
|
$\s -> true;
|
||||||
@@ -134,6 +131,6 @@ mkerror(Tag) ->
|
|||||||
format_error(Reason) ->
|
format_error(Reason) ->
|
||||||
case Reason of
|
case Reason of
|
||||||
no_digits -> "no valid digits found";
|
no_digits -> "no valid digits found";
|
||||||
invalid_base -> "invalid base";
|
{invalid_base, Base} -> io_lib:format("invalid base: ~p", [Base]);
|
||||||
_ -> io_lib:format("~p", [Reason])
|
_ -> io_lib:format("~p", [Reason])
|
||||||
end.
|
end.
|
||||||
|
|||||||
Reference in New Issue
Block a user