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

Merge pull request #2714 from triska/graphic_token

Browse Source 
prevent accidental amalgamation of graphic token chars in output
This commit is contained in:
Mark Thom
2024-12-20 18:42:09 -07:00
committed by GitHub
parent e01a4cdc85 8dc80b815f
commit b7943837a0
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/format.pl
View File

@@ -593,7 +593,23 @@ portray_clause_(Term) -->
literal(Lit, VNs) --> literal(Lit, VNs) -->
{ write_term_to_chars(Lit, [quoted(true),variable_names(VNs),double_quotes(true)], Ls) }, { write_term_to_chars(Lit, [quoted(true),variable_names(VNs),double_quotes(true)], Ls) },
seq(Ls). ( { nonvar(Lit),
functor(Lit, F, A),
current_op(Pri, _, F),
( A =:= 0
; Pri >= 1000
) } ->
"(", seq(Ls), ")"
; seq(Ls)
).
literal_(Lit, VNs) -->
{ phrase(literal(Lit, VNs), Ls) },
seq(Ls),
( { phrase((...,[Last]), Ls), char_type(Last, graphic_token) } ->
" "
; ""
).
portray_(Var, VNs) --> { var(Var) }, !, literal(Var, VNs). portray_(Var, VNs) --> { var(Var) }, !, literal(Var, VNs).
portray_((Head :- Body), VNs) --> !, portray_((Head :- Body), VNs) --> !,
@@ -602,7 +618,7 @@ portray_((Head :- Body), VNs) --> !,
portray_((Head --> Body), VNs) --> !, portray_((Head --> Body), VNs) --> !,
literal(Head, VNs), " -->\n", literal(Head, VNs), " -->\n",
body_(Body, 0, 3, VNs). body_(Body, 0, 3, VNs).
portray_(Any, VNs) --> literal(Any, VNs). portray_(Any, VNs) --> literal_(Any, VNs).
body_(Var, C, I, VNs) --> { var(Var) }, !, body_(Var, C, I, VNs) --> { var(Var) }, !,
@@ -627,7 +643,7 @@ body_((A;B), C, I, VNs) --> !,
body_(A, C1, C1, VNs), "\n", body_(A, C1, C1, VNs), "\n",
else_branch(B, I, VNs). else_branch(B, I, VNs).
body_(Goal, C, I, VNs) --> body_(Goal, C, I, VNs) -->
indent_to(C, I), literal(Goal, VNs). indent_to(C, I), literal_(Goal, VNs).
% True iff Body has the shape ( If -> Then ; Else ). % True iff Body has the shape ( If -> Then ; Else ).