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

Merge pull request #1029 from triska/format

Browse Source 
ENHANCED: Domain error non_empty_list for empty arguments, addressing #1024
This commit is contained in:
Mark Thom
2021-08-15 08:59:06 -06:00
committed by GitHub
parent 2905f6b465 9e13f18463
commit fce7f8aa68
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/format.pl
View File

@@ -284,9 +284,11 @@ cells([~|Fs0], Args0, Tab0, Es, VNs) -->
{ Tab is Tab0 + Num }, { Tab is Tab0 + Num },
cell(Tab0, Tab, Es), cell(Tab0, Tab, Es),
cells(Fs, Args, Tab, [], VNs). cells(Fs, Args, Tab, [], VNs).
cells([~,C|_], _, _, _, _) --> cells([~|Cs], Args, _, _, _) -->
{ atom_chars(A, [~,C]), ( { Args == [] } ->
domain_error(format_string, A, format_//2) }. { domain_error(non_empty_list, [], format_//2) }
; { domain_error(format_string, [~|Cs], format_//2) }
).
cells(Fs0, Args, Tab, Es, VNs) --> cells(Fs0, Args, Tab, Es, VNs) -->
{ phrase(upto_what(Fs1, ~), Fs0, Fs), { phrase(upto_what(Fs1, ~), Fs0, Fs),
Fs1 = [_|_] }, Fs1 = [_|_] },