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

extend partial evaluation to computing lengths when statically possible

Browse Source
This commit is contained in:
Markus Triska
2024-03-20 19:48:33 +01:00
parent 58f7c94e74
commit bc04790fd5
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/format.pl
View File

@@ -305,9 +305,14 @@ cells([~,'`',Char,t|Fs], Args, Tab, Es, VNs) --> !,
cells([~,t|Fs], Args, Tab, Es, VNs) --> !, cells([~,t|Fs], Args, Tab, Es, VNs) --> !,
cells(Fs, Args, Tab, [glue(' ',_)|Es], VNs). cells(Fs, Args, Tab, [glue(' ',_)|Es], VNs).
cells([~,'|'|Fs], Args, Tab0, Es, VNs) --> !, cells([~,'|'|Fs], Args, Tab0, Es, VNs) --> !,
{ G = (phrase(elements_gluevars(Es, 0, Width), _), ( { ground(Tab0), Es = [chars(Cs)], ground(Cs) } ->
{ length(Cs, Width),
Tab is Tab0 + Width },
cell(Tab0, Tab, Es)
; { G = (phrase(elements_gluevars(Es, 0, Width), _),
Tab is Tab0 + Width) }, Tab is Tab0 + Width) },
cell(Tab0, Tab, [goal(G)|Es]), cell(Tab0, Tab, [goal(G)|Es])
),
cells(Fs, Args, Tab, [], VNs). cells(Fs, Args, Tab, [], VNs).
cells([~|Fs0], Args0, Tab, Es, VNs) --> cells([~|Fs0], Args0, Tab, Es, VNs) -->
{ numeric_argument(Fs0, Num, ['|'|Fs], Args0, Args) }, { numeric_argument(Fs0, Num, ['|'|Fs], Args0, Args) },
@@ -317,8 +322,12 @@ cells([~|Fs0], Args0, Tab, Es, VNs) -->
cells([~|Fs0], Args0, Tab0, Es, VNs) --> cells([~|Fs0], Args0, Tab0, Es, VNs) -->
{ numeric_argument(Fs0, Num, [+|Fs], Args0, Args) }, { numeric_argument(Fs0, Num, [+|Fs], Args0, Args) },
!, !,
{ G = (Tab is Tab0 + Num) }, ( { ground(Tab0+Num) } ->
cell(Tab0, Tab, [goal(G)|Es]), { Tab is Tab0 + Num },
cell(Tab0, Tab, Es)
; { G = (Tab is Tab0 + Num) },
cell(Tab0, Tab, [goal(G)|Es])
),
cells(Fs, Args, Tab, [], VNs). cells(Fs, Args, Tab, [], VNs).
cells([~|Cs], Args, _, _, _) --> cells([~|Cs], Args, _, _, _) -->
( { Args == [] } -> ( { Args == [] } ->