From c8a9f8dcf584454f78edb409f53dc661fef11af5 Mon Sep 17 00:00:00 2001
From: Markus Triska <triska@metalevel.at>
Date: Sun, 7 Jun 2020 23:04:42 +0200
Subject: [PATCH 1/3] better domain error in format_//2

Example:

    ?- format("", [hello]).
    caught: error(domain_error(empty_list,[hello]),format_//2)
---
 src/prolog/lib/format.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/prolog/lib/format.pl b/src/prolog/lib/format.pl
index 18289094..8b090cf6 100644
--- a/src/prolog/lib/format.pl
+++ b/src/prolog/lib/format.pl
@@ -158,7 +158,7 @@ element_gluevar(glue(_,V), N, N) --> [V].
 
 cells([], Args, 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, [chars("~")|Es]).

From 9bb851d437f6eb49dbf2f4c47b5a9ee392dd8b21 Mon Sep 17 00:00:00 2001
From: Markus Triska <triska@metalevel.at>
Date: Sun, 7 Jun 2020 23:14:23 +0200
Subject: [PATCH 2/3] ENHANCED: format_//2 now evaluates arithmetic expressions
 for ~d, ~D, ~f, ~r and ~R

Example:

    ?- phrase(format_("~d", [1+2]), Cs).
       Cs = "3"
    ;  false.
---
 src/prolog/lib/format.pl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/prolog/lib/format.pl b/src/prolog/lib/format.pl
index 8b090cf6..d91fdc91 100644
--- a/src/prolog/lib/format.pl
+++ b/src/prolog/lib/format.pl
@@ -174,7 +174,7 @@ cells([~,a|Fs], [Arg|Args], Tab, Es) --> !,
 cells([~|Fs0], Args0, Tab, Es) -->
         { numeric_argument(Fs0, Num, [d|Fs], Args0, [Arg|Args]) },
         !,
-        { number_chars(Arg, Cs0) },
+        { format_number_chars(Arg, Cs0) },
         (   { Num =:= 0 } -> { Cs = Cs0 }
         ;   { length(Cs0, L),
               (   L =< Num ->
@@ -216,12 +216,12 @@ cells([~|Fs0], Args0, Tab, Es) -->
 cells([~,s|Fs], [Arg|Args], Tab, Es) --> !,
         cells(Fs, Args, Tab, [chars(Arg)|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([~|Fs0], Args0, Tab, Es) -->
         { numeric_argument(Fs0, Num, [f|Fs], Args0, [Arg|Args]) },
         !,
-        { number_chars(Arg, Cs0),
+        { format_number_chars(Arg, Cs0),
           phrase(upto_what(Bs, .), Cs0, Cs),
           (   Num =:= 0 -> Chars = Bs
           ;   (   Cs = ['.'|Rest] ->
@@ -279,6 +279,10 @@ cells(Fs0, Args, Tab, Es) -->
           Fs1 = [_|_] },
         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(N0) --> { N0 > 0, N is N0 - 1 }, [newline], n_newlines(N).
 
@@ -327,7 +331,8 @@ pow10(D, N0-Pow0, N-Pow) :-
         N is N0 + D*10^Pow0,
         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, R),
         (   \+ between(2, 36, R) ->

From c22816de08fc1682ea2f3d48b5167c141608a92a Mon Sep 17 00:00:00 2001
From: Markus Triska <triska@metalevel.at>
Date: Mon, 8 Jun 2020 00:07:24 +0200
Subject: [PATCH 3/3] type check for ~d and ~D specifiers

---
 src/prolog/lib/format.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/prolog/lib/format.pl b/src/prolog/lib/format.pl
index d91fdc91..e8be4df3 100644
--- a/src/prolog/lib/format.pl
+++ b/src/prolog/lib/format.pl
@@ -172,9 +172,11 @@ cells([~,a|Fs], [Arg|Args], Tab, Es) --> !,
         { atom_chars(Arg, Chars) },
         cells(Fs, Args, Tab, [chars(Chars)|Es]).
 cells([~|Fs0], Args0, Tab, Es) -->
-        { numeric_argument(Fs0, Num, [d|Fs], Args0, [Arg|Args]) },
+        { numeric_argument(Fs0, Num, [d|Fs], Args0, [Arg0|Args]) },
         !,
-        { format_number_chars(Arg, Cs0) },
+        { Arg is Arg0, % evaluate compound expression
+          must_be(integer, Arg),
+          number_chars(Arg, Cs0) },
         (   { Num =:= 0 } -> { Cs = Cs0 }
         ;   { length(Cs0, L),
               (   L =< Num ->