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

select variable names in write_eq based on whether RHS is a variable (#326)

Browse Source
This commit is contained in:
Mark Thom
2020-04-29 10:56:17 -03:00
parent 7e765fe726
commit 2495fb796d
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/prolog/toplevel.pl
View File

@@ -80,13 +80,17 @@ needs_bracketing(Value, Op) :-
write_goal(G, VarList, MasterVarList, MaxDepth) :- write_goal(G, VarList, MasterVarList, MaxDepth) :-
( G = (Var = Value) -> ( G = (Var = Value) ->
( var(Value) ->
select((Var = _), VarList, NewVarList)
; VarList = NewVarList
),
write(Var), write(Var),
write(' = '), write(' = '),
( needs_bracketing(Value, (=)) -> ( needs_bracketing(Value, (=)) ->
write('('), write('('),
write_term(Value, [quoted(true), variable_names(VarList), max_depth(MaxDepth)]), write_term(Value, [quoted(true), variable_names(NewVarList), max_depth(MaxDepth)]),
write(')') write(')')
; write_term(Value, [quoted(true), variable_names(VarList), max_depth(MaxDepth)]) ; write_term(Value, [quoted(true), variable_names(NewVarList), max_depth(MaxDepth)])
) )
; G == [] -> ; G == [] ->
write('true') write('true')
@@ -95,24 +99,28 @@ write_goal(G, VarList, MasterVarList, MaxDepth) :-
write_last_goal(G, VarList, MasterVarList, MaxDepth) :- write_last_goal(G, VarList, MasterVarList, MaxDepth) :-
( G = (Var = Value) -> ( G = (Var = Value) ->
( var(Value) ->
select((Var = _), VarList, NewVarList)
; VarList = NewVarList
),
write(Var), write(Var),
write(' = '), write(' = '),
( needs_bracketing(Value, (=)) -> ( needs_bracketing(Value, (=)) ->
write('('), write('('),
write_term(Value, [quoted(true), variable_names(VarList), max_depth(MaxDepth)]), write_term(Value, [quoted(true), variable_names(NewVarList), max_depth(MaxDepth)]),
write(')') write(')')
; write_term(Value, [quoted(true), variable_names(VarList), max_depth(MaxDepth)]), ; write_term(Value, [quoted(true), variable_names(NewVarList), max_depth(MaxDepth)]),
( trailing_period_is_ambiguous(Value) -> ( trailing_period_is_ambiguous(Value) ->
write(' ') write(' ')
; true ; true
) )
) )
; G == [] -> ; G == [] ->
write('true') write('true')
; write_term(G, [quoted(true), variable_names(MasterVarList), max_depth(MaxDepth)]) ; write_term(G, [quoted(true), variable_names(MasterVarList), max_depth(MaxDepth)])
). ).
write_eq((G1, G2), [_|VarList], MasterVarList, MaxDepth) :- write_eq((G1, G2), VarList, MasterVarList, MaxDepth) :-
!, !,
write_goal(G1, VarList, MasterVarList, MaxDepth), write_goal(G1, VarList, MasterVarList, MaxDepth),
write(', '), write(', '),
@@ -176,7 +184,7 @@ read_input(ThreadedGoals, NewVarList) :-
read_input(ThreadedGoals, NewVarList) read_input(ThreadedGoals, NewVarList)
; member(C, ['\n', .]) -> ; member(C, ['\n', .]) ->
nl, write('; ...'), nl nl, write('; ...'), nl
; read_input(ThreadedGoals, NewVarList) ; read_input(ThreadedGoals, NewVarList)
). ).
help_message :- help_message :-