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

Merge pull request #1852 from triska/needs_bracketing

Browse Source 
Improvements to needs_bracketing/2
This commit is contained in:
Mark Thom
2023-06-30 11:13:24 -06:00
committed by GitHub
parent 4953cfd10e 42282c6e6e
commit 1d2f5053d6
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/toplevel.pl
View File

@@ -208,20 +208,19 @@ needs_bracketing(Value, Op) :-
nonvar(Value), nonvar(Value),
\+ integer(Value), \+ integer(Value),
functor(Value, F, Arity), functor(Value, F, Arity),
current_op(FPrec, _, F), current_op(FPrec, FSpec, F),
current_op(EqPrec, EqSpec, Op), current_op(EqPrec, EqSpec, Op),
( Arity =:= 0 -> arity_specifier(Arity, FSpec),
true ( Arity =:= 0
; EqPrec < FPrec -> ; EqPrec < FPrec
true ; EqPrec =:= FPrec,
; FPrec > 0, F == Value, graphic_token_char(F) -> member(EqSpec, [fx,xfx,yfx])
true
; F \== '.', '$quoted_token'(F) ->
true
; EqPrec == FPrec,
memberchk(EqSpec, [fx,xfx,yfx])
). ).
arity_specifier(0, _).
arity_specifier(1, S) :- atom_chars(S, [_,_]).
arity_specifier(2, S) :- atom_chars(S, [_,_,_]).
write_goal(G, VarList, MaxDepth) :- write_goal(G, VarList, MaxDepth) :-
( G = (Var = Value) -> ( G = (Var = Value) ->
( var(Value) -> ( var(Value) ->