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

treat consultation of command line modules as regular goals (#2314)

Browse Source
This commit is contained in:
Mark
2024-02-02 15:35:00 -07:00
parent 75a94fd0b3
commit de6c460a51
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/toplevel.pl
View File

@@ -28,7 +28,6 @@ load_scryerrc :-
'$repl' :- '$repl' :-
asserta('$toplevel':started), asserta('$toplevel':started),
(\+ disabled_init_file -> load_scryerrc ; true),
raw_argv(Args0), raw_argv(Args0),
( append(Args1, ["--"|_], Args0) -> ( append(Args1, ["--"|_], Args0) ->
Args = Args1 Args = Args1
@@ -38,6 +37,7 @@ load_scryerrc :-
delegate_task(TaskArgs, []) delegate_task(TaskArgs, [])
; true ; true
), ),
(\+ disabled_init_file -> load_scryerrc ; true),
repl. repl.
delegate_task([], []). delegate_task([], []).
@@ -48,15 +48,17 @@ delegate_task([], Goals0) :-
repl. repl.
delegate_task([Arg0|Args], Goals0) :- delegate_task([Arg0|Args], Goals0) :-
( member(Arg0, ["-h", "--help"]) -> print_help ( ( member(Arg0, ["-h", "--help"]) -> print_help
; member(Arg0, ["-v", "--version"]) -> print_version ; member(Arg0, ["-v", "--version"]) -> print_version
; member(Arg0, ["-g", "--goal"]) -> gather_goal(g, Args, Goals0) ; member(Arg0, ["-g", "--goal"]) -> gather_goal(g, Args, Goals0)
; member(Arg0, ["-f"]) -> disable_init_file ; member(Arg0, ["-f"]) -> disable_init_file
; member(Arg0, ["--no-add-history"]) -> ignore_machine_arg ; member(Arg0, ["--no-add-history"]) -> ignore_machine_arg
; atom_chars(Mod, Arg0),
catch(consult(Mod), E, print_exception(E))
), ),
delegate_task(Args, Goals0). !,
delegate_task(Args, Goals0)
; atom_chars(Mod, Arg0),
delegate_task(Args, [t(consult(Mod))|Goals0])
).
print_help :- print_help :-
write('Usage: scryer-prolog [OPTIONS] [FILES] [-- ARGUMENTS]'), write('Usage: scryer-prolog [OPTIONS] [FILES] [-- ARGUMENTS]'),
@@ -132,6 +134,14 @@ run_goals([g(Gs0)|Goals]) :- !,
write_term(Goal, [variable_names(VNs),double_quotes(DQ)]), nl write_term(Goal, [variable_names(VNs),double_quotes(DQ)]), nl
), ),
run_goals(Goals). run_goals(Goals).
run_goals([t(Goal)|Goals]) :- !,
( catch(user:Goal, E, print_exception(E)) ->
true
; write('% Warning: initialization failed for: '),
double_quotes_option(DQ),
write_term(Goal, [double_quotes(DQ)]), nl
),
run_goals(Goals).
run_goals([Goal|_]) :- run_goals([Goal|_]) :-
loader:write_error(error(domain_error(arg_type, Goal), run_goals/1)), loader:write_error(error(domain_error(arg_type, Goal), run_goals/1)),
nl, nl,