rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more elegant solution for parsing numeric arguments, using a DCG

Browse Source
This commit is contained in:
Markus Triska
2021-11-16 18:25:35 +01:00
parent 23df16ecf9
commit bd75e9c184
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/format.pl
View File

@@ -328,30 +328,28 @@ cell(From, To, Es0) -->
[cell(From,To,Es)] [cell(From,To,Es)]
). ).
%?- numeric_argument("2f", Num, ['f'|Fs], Args0, Args). %?- format:numeric_argument("2f", Num, ['f'|Fs], Args0, Args).
%?- numeric_argument("100b", Num, Rs, Args0, Args). %?- format:numeric_argument("100b", Num, Rs, Args0, Args).
numeric_argument(Ds, Num, Rest, Args0, Args) :- numeric_argument(Ds, Num, Rest, Args0, Args) :-
( Ds = [*|Rest] -> ( Ds = [*|Rest] ->
Args0 = [Num|Args] Args0 = [Num|Args]
; numeric_argument_(Ds, [], Ns, Rest), ; phrase(numeric_argument_(Ds, Rest), Ns),
foldl(pow10, Ns, 0-0, Num-_), foldl(plus_times10, Ns, 0, Num),
Args0 = Args Args0 = Args
). ).
numeric_argument_([D|Ds], Ns0, Ns, Rest) :- numeric_argument_([D|Ds], Rest) -->
( member(D, "0123456789") -> ( { member(D, "0123456789") } ->
number_chars(N, [D]), { number_chars(N, [D]) },
numeric_argument_(Ds, [N|Ns0], Ns, Rest) [N],
; Ns = Ns0, numeric_argument_(Ds, Rest)
Rest = [D|Ds] ; { Rest = [D|Ds] }
). ).
pow10(D, N0-Pow0, N-Pow) :- plus_times10(D, N0, N) :- N is D + N0*10.
N is N0 + D*10^Pow0,
Pow is Pow0 + 1.
radix_error(lowercase, R) --> format_("~~~dr", [R]). radix_error(lowercase, R) --> format_("~~~dr", [R]).
radix_error(uppercase, R) --> format_("~~~dR", [R]). radix_error(uppercase, R) --> format_("~~~dR", [R]).