From 319a4622b340ef8021635c978b15dad4cc691a1f Mon Sep 17 00:00:00 2001 From: notoria Date: Sat, 2 May 2020 01:02:06 +0200 Subject: [PATCH 1/2] Enhanced command line --- src/prolog/toplevel.pl | 106 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 98 insertions(+), 8 deletions(-) diff --git a/src/prolog/toplevel.pl b/src/prolog/toplevel.pl index 7072017d..8f534917 100644 --- a/src/prolog/toplevel.pl +++ b/src/prolog/toplevel.pl @@ -1,18 +1,107 @@ -:- module('$toplevel', ['$repl'/1, consult/1, use_module/1, use_module/2]). +:- module('$toplevel', ['$repl'/1, consult/1, use_module/1, use_module/2, + argv/1]). :- use_module(library(charsio)). :- use_module(library(lists)). :- use_module(library(si)). -'$repl'([_|Args]) :- - maplist(use_list_of_modules, Args), - false. -'$repl'(_) :- repl. +:- dynamic(argv/1). -use_list_of_modules(Mod0) :- - atom_chars(Mod, Mod0), - catch(use_module(Mod), E, print_exception(E)). +'$repl'([_|Args0]) :- + \+ argv(_), + ( append(Args1, ["--"|Args2], Args0) -> + asserta(argv(Args2)), + Args = Args1 + ; asserta(argv([])), + Args = Args0 + ), + delegate_task(Args, []), + repl. +'$repl'(_) :- + ( \+ argv(_) -> asserta(argv([])) + ; true + ), + repl. + +delegate_task([], []). +delegate_task([], Goals0) :- + reverse(Goals0, Goals), + run_goals(Goals), + repl. +delegate_task([Arg0|Args], Goals0) :- + ( member(Arg0, ["-h", "--help"]) -> print_help(Args) + ; member(Arg0, ["-v", "--version"]) -> print_version(Args) + ; member(Arg0, ["-g", "--goal"]) -> gather_goal(g, Args, Goals0) + ; atom_chars(Mod, Arg0), + catch(use_module(Mod), E, print_exception(E)) + ), + delegate_task(Args, Goals0). + +print_help(_) :- + write('Usage: scryer-prolog [OPTIONS] [FILES] [-- ARGUMENTS]'), + nl, nl, + write('Options:'), nl, + write(' -h, --help '), + write('Display this message'), nl, + write(' -v, --version '), + write('Print version information and exit'), nl, + write(' -g, --goal GOAL '), + write('Run the query GOAL'), nl, + % write(' '), + halt. + +print_version(_) :- + '$scryer_prolog_version'(Version), + write(Version), nl, + halt. + +gather_goal(Type, Args0, Goals) :- + length(Args0, N), + ( N < 1 -> print_help(_), halt + ; true + ), + [Gs1|Args] = Args0, + ( Type = g -> Gs =.. [Type, Gs1] + ; write('caught: '), + write(error(domain_error(arg_type, Type), gather_goal/3)), nl, + halt + ), + delegate_task(Args, [Gs|Goals]). + +arg_type(g). +arg_type(t). +arg_type(g(_)). +arg_type(t(_)). + +ends_with_dot(Ls0) :- + reverse(Ls0, Ls), + layout_and_dot(Ls). + +layout_and_dot(['.'|_]). +layout_and_dot([C|Cs]) :- + char_type(C, layout), + layout_and_dot(Cs). + +run_goals([]). +run_goals([g(Gs0)|Goals]) :- + ( ends_with_dot(Gs0) -> Gs1 = Gs0 + ; append(Gs0, ".", Gs1) + ), + read_term_from_chars(Gs1, Goal), + ( catch( + Goal, + Exception, + (write(Gs0), write(' causes: '), write(Exception), nl) % halt? + ) + ; write('Warning: initialization failed for '), + write(Gs0), nl + ), + run_goals(Goals). +run_goals([Goal|_]) :- + write('caught: '), + write(error(domain_error(arg_type, Goal), run_goals/1)), nl, + halt. repl :- catch(read_and_match, E, print_exception(E)), @@ -363,3 +452,4 @@ thread_goals(Goals0, Goals1, Functor) :- ) ; Goals1 = Goals0 ). + From 98d38d763be8ec3bde557e54ff852967a8a38038 Mon Sep 17 00:00:00 2001 From: notoria Date: Sat, 2 May 2020 01:52:53 +0200 Subject: [PATCH 2/2] Added $scryer_prolog_version/1 --- src/main.rs | 7 +------ src/prolog/clause_types.rs | 3 +++ src/prolog/machine/system_calls.rs | 9 +++++++++ src/prolog/toplevel.pl | 16 ++++++---------- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/main.rs b/src/main.rs index c8866b38..ff24d88c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -28,7 +28,7 @@ use std::sync::atomic::Ordering; extern fn handle_sigint(signal: libc::c_int) { let signal = signal::Signal::from_c_int(signal).unwrap(); if signal == signal::Signal::SIGINT { - INTERRUPT.store(true, Ordering::Relaxed); + INTERRUPT.store(true, Ordering::Relaxed); } } @@ -36,11 +36,6 @@ fn main() { let handler = signal::SigHandler::Handler(handle_sigint); unsafe { signal::signal(signal::Signal::SIGINT, handler) }.unwrap(); - if env::args().skip(1).any(|a| a == "-v" || a == "--version") { - println!("{:}", git_version!(cargo_prefix = "cargo:", fallback = "unknown")); - return; - } - let mut wam = Machine::new(readline::input_stream(), Stream::stdout()); wam.run_top_level(); } diff --git a/src/prolog/clause_types.rs b/src/prolog/clause_types.rs index 9b550c35..83e144eb 100644 --- a/src/prolog/clause_types.rs +++ b/src/prolog/clause_types.rs @@ -264,6 +264,7 @@ pub enum SystemClauseType { WAMInstructions, WriteTerm, WriteTermToChars, + ScryerPrologVersion, } impl SystemClauseType { @@ -418,6 +419,7 @@ impl SystemClauseType { &SystemClauseType::WAMInstructions => clause_name!("$wam_instructions"), &SystemClauseType::WriteTerm => clause_name!("$write_term"), &SystemClauseType::WriteTermToChars => clause_name!("$write_term_to_chars"), + &SystemClauseType::ScryerPrologVersion => clause_name!("$scryer_prolog_version"), } } @@ -552,6 +554,7 @@ impl SystemClauseType { ("$wam_instructions", 3) => Some(SystemClauseType::WAMInstructions), ("$write_term", 6) => Some(SystemClauseType::WriteTerm), ("$write_term_to_chars", 7) => Some(SystemClauseType::WriteTermToChars), + ("$scryer_prolog_version", 1) => Some(SystemClauseType::ScryerPrologVersion), _ => None, } } diff --git a/src/prolog/machine/system_calls.rs b/src/prolog/machine/system_calls.rs index d3932626..a976423f 100644 --- a/src/prolog/machine/system_calls.rs +++ b/src/prolog/machine/system_calls.rs @@ -3543,6 +3543,15 @@ impl MachineState { unreachable!() } } + &SystemClauseType::ScryerPrologVersion => { + use crate::git_version::git_version; + let version = self[temp_v!(1)]; + let buffer = + git_version!(cargo_prefix = "cargo:", fallback = "unknown"); + let chars = buffer.chars().map(|c| Addr::Char(c)); + let result = Addr::HeapCell(self.heap.to_list(chars)); + self.unify(version, result); + } }; return_from_clause!(self.last_call, self) diff --git a/src/prolog/toplevel.pl b/src/prolog/toplevel.pl index 8f534917..ad095c19 100644 --- a/src/prolog/toplevel.pl +++ b/src/prolog/toplevel.pl @@ -30,15 +30,15 @@ delegate_task([], Goals0) :- run_goals(Goals), repl. delegate_task([Arg0|Args], Goals0) :- - ( member(Arg0, ["-h", "--help"]) -> print_help(Args) - ; member(Arg0, ["-v", "--version"]) -> print_version(Args) + ( member(Arg0, ["-h", "--help"]) -> print_help + ; member(Arg0, ["-v", "--version"]) -> print_version ; member(Arg0, ["-g", "--goal"]) -> gather_goal(g, Args, Goals0) ; atom_chars(Mod, Arg0), catch(use_module(Mod), E, print_exception(E)) ), delegate_task(Args, Goals0). -print_help(_) :- +print_help :- write('Usage: scryer-prolog [OPTIONS] [FILES] [-- ARGUMENTS]'), nl, nl, write('Options:'), nl, @@ -51,22 +51,18 @@ print_help(_) :- % write(' '), halt. -print_version(_) :- +print_version :- '$scryer_prolog_version'(Version), write(Version), nl, halt. gather_goal(Type, Args0, Goals) :- length(Args0, N), - ( N < 1 -> print_help(_), halt + ( N < 1 -> print_help, halt ; true ), [Gs1|Args] = Args0, - ( Type = g -> Gs =.. [Type, Gs1] - ; write('caught: '), - write(error(domain_error(arg_type, Type), gather_goal/3)), nl, - halt - ), + Gs =.. [Type, Gs1], delegate_task(Args, [Gs|Goals]). arg_type(g).