From 5d3295c40cceefeb2995576ffc6bbbb17df86482 Mon Sep 17 00:00:00 2001 From: Markus Triska Date: Sun, 16 Jul 2023 09:14:02 +0200 Subject: [PATCH] ENHANCED: use newly available read_term_from_chars/3 for better errors Examples, previously: $ scryer-prolog -g "member(X,Ls" ?- $ scryer-prolog -g "member(X,Ls)" member(_542,_543) causes: error(existence_error(procedure,member/2),member/2) ?- Now: $ scryer-prolog -g "member(X,Ls" "member(X,Ls" cannot be read: error(syntax_error(incomplete_reduction),read_term_from_chars/3:0) $ scryer-prolog -g "member(X,Ls)" member(X,Ls) causes: error(existence_error(procedure,member/2),member/2) ?- This also addresses #1185. --- src/toplevel.pl | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/toplevel.pl b/src/toplevel.pl index 8318f43b..5431bad1 100644 --- a/src/toplevel.pl +++ b/src/toplevel.pl @@ -115,18 +115,27 @@ layout_and_dot([C|Cs]) :- layout_and_dot(Cs). run_goals([]). -run_goals([g(Gs0)|Goals]) :- +run_goals([g(Gs0)|Goals]) :- !, ( ends_with_dot(Gs0) -> Gs1 = Gs0 ; append(Gs0, ".", Gs1) ), - read_from_chars(Gs1, Goal), - ( catch( - user:Goal, - Exception, - (write(Goal), write(' causes: '), write(Exception), nl) % halt? - ) - ; write('Warning: initialization failed for '), - write(Gs0), nl + double_quotes_option(DQ), + catch(read_term_from_chars(Gs1, Goal, [variable_names(VNs)]), + E, + ( write_term(Gs0, [double_quotes(DQ)]), + write(' cannot be read: '), write(E), nl, + halt + ) + ), + ( catch(user:Goal, + Exception, + ( write_term(Goal, [variable_names(VNs),double_quotes(DQ)]), + write(' causes: '), + write_term(Exception, [double_quotes(DQ)]), nl % halt? + ) + ) -> true + ; write('Warning: initialization failed for: '), + write_term(Goal, [variable_names(VNs),double_quotes(DQ)]), nl ), run_goals(Goals). run_goals([Goal|_]) :- -- 2.54.0