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

Merge pull request #578 from triska/format_improvements

Browse Source 
Various improvements for format_//2
This commit is contained in:
Mark Thom
2020-06-07 19:36:16 -03:00
committed by GitHub
parent bb013e78d2 c22816de08
commit 5d91c1af81
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/prolog/lib/format.pl
View File

@@ -158,7 +158,7 @@ element_gluevar(glue(_,V), N, N) --> [V].
cells([], Args, Tab, Es) --> cells([], Args, Tab, Es) -->
( { Args == [] } -> cell(Tab, Tab, Es) ( { Args == [] } -> cell(Tab, Tab, Es)
; { domain_error(no_remaining_arguments, Args, format_//2) } ; { domain_error(empty_list, Args, format_//2) }
). ).
cells([~,~|Fs], Args, Tab, Es) --> !, cells([~,~|Fs], Args, Tab, Es) --> !,
cells(Fs, Args, Tab, [chars("~")|Es]). cells(Fs, Args, Tab, [chars("~")|Es]).
@@ -172,9 +172,11 @@ cells([~,a|Fs], [Arg|Args], Tab, Es) --> !,
{ atom_chars(Arg, Chars) }, { atom_chars(Arg, Chars) },
cells(Fs, Args, Tab, [chars(Chars)|Es]). cells(Fs, Args, Tab, [chars(Chars)|Es]).
cells([~|Fs0], Args0, Tab, Es) --> cells([~|Fs0], Args0, Tab, Es) -->
{ numeric_argument(Fs0, Num, [d|Fs], Args0, [Arg|Args]) }, { numeric_argument(Fs0, Num, [d|Fs], Args0, [Arg0|Args]) },
!, !,
{ number_chars(Arg, Cs0) }, { Arg is Arg0, % evaluate compound expression
must_be(integer, Arg),
number_chars(Arg, Cs0) },
( { Num =:= 0 } -> { Cs = Cs0 } ( { Num =:= 0 } -> { Cs = Cs0 }
; { length(Cs0, L), ; { length(Cs0, L),
( L =< Num -> ( L =< Num ->
@@ -216,12 +218,12 @@ cells([~|Fs0], Args0, Tab, Es) -->
cells([~,s|Fs], [Arg|Args], Tab, Es) --> !, cells([~,s|Fs], [Arg|Args], Tab, Es) --> !,
cells(Fs, Args, Tab, [chars(Arg)|Es]). cells(Fs, Args, Tab, [chars(Arg)|Es]).
cells([~,f|Fs], [Arg|Args], Tab, Es) --> !, cells([~,f|Fs], [Arg|Args], Tab, Es) --> !,
{ number_chars(Arg, Chars) }, { format_number_chars(Arg, Chars) },
cells(Fs, Args, Tab, [chars(Chars)|Es]). cells(Fs, Args, Tab, [chars(Chars)|Es]).
cells([~|Fs0], Args0, Tab, Es) --> cells([~|Fs0], Args0, Tab, Es) -->
{ numeric_argument(Fs0, Num, [f|Fs], Args0, [Arg|Args]) }, { numeric_argument(Fs0, Num, [f|Fs], Args0, [Arg|Args]) },
!, !,
{ number_chars(Arg, Cs0), { format_number_chars(Arg, Cs0),
phrase(upto_what(Bs, .), Cs0, Cs), phrase(upto_what(Bs, .), Cs0, Cs),
( Num =:= 0 -> Chars = Bs ( Num =:= 0 -> Chars = Bs
; ( Cs = ['.'|Rest] -> ; ( Cs = ['.'|Rest] ->
@@ -279,6 +281,10 @@ cells(Fs0, Args, Tab, Es) -->
Fs1 = [_|_] }, Fs1 = [_|_] },
cells(Fs, Args, Tab, [chars(Fs1)|Es]). cells(Fs, Args, Tab, [chars(Fs1)|Es]).
format_number_chars(N0, Chars) :-
N is N0, % evaluate compound expression
number_chars(N, Chars).
n_newlines(0) --> !. n_newlines(0) --> !.
n_newlines(N0) --> { N0 > 0, N is N0 - 1 }, [newline], n_newlines(N). n_newlines(N0) --> { N0 > 0, N is N0 - 1 }, [newline], n_newlines(N).
@@ -327,7 +333,8 @@ pow10(D, N0-Pow0, N-Pow) :-
N is N0 + D*10^Pow0, N is N0 + D*10^Pow0,
Pow is Pow0 + 1. Pow is Pow0 + 1.
integer_to_radix(I, R, Which, Cs) :- integer_to_radix(I0, R, Which, Cs) :-
I is I0, % evaluate compound expression
must_be(integer, I), must_be(integer, I),
must_be(integer, R), must_be(integer, R),
( \+ between(2, 36, R) -> ( \+ between(2, 36, R) ->