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

move forall/2 to non_iso, correct test cases.

Browse Source
This commit is contained in:
Mark Thom
2019-04-03 18:12:36 -06:00
parent 9ad809680d
commit 535a6c17e9
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/prolog/lib/builtins.pl
View File

@@ -10,7 +10,7 @@
bb_get/2, bb_put/2, call_cleanup/2, bb_get/2, bb_put/2, call_cleanup/2,
call_with_inference_limit/3, catch/3, clause/2, call_with_inference_limit/3, catch/3, clause/2,
current_predicate/1, current_prolog_flag/2, expand_goal/2, current_predicate/1, current_prolog_flag/2, expand_goal/2,
expand_term/2, findall/3, findall/4, forall/2, halt/0, once/1, op/3, expand_term/2, findall/3, findall/4, halt/0, once/1, op/3,
repeat/0, retract/1, set_prolog_flag/2, setof/3, repeat/0, retract/1, set_prolog_flag/2, setof/3,
setup_call_cleanup/3, term_variables/2, throw/1, true/0, setup_call_cleanup/3, term_variables/2, throw/1, true/0,
false/0, write/1, write_canonical/1, writeq/1, write_term/2]). false/0, write/1, write_canonical/1, writeq/1, write_term/2]).
@@ -405,9 +405,6 @@ findall(Template, Goal, Solutions0, Solutions1) :-
Error, Error,
( truncate_lh_to(LhLength), throw(Error) ))). ( truncate_lh_to(LhLength), throw(Error) ))).
forall(Generate, Test) :-
\+ (Generate, \+ Test).
set_difference([X|Xs], [Y|Ys], Zs) :- set_difference([X|Xs], [Y|Ys], Zs) :-
X == Y, !, set_difference(Xs, [Y|Ys], Zs). X == Y, !, set_difference(Xs, [Y|Ys], Zs).
set_difference([X|Xs], [Y|Ys], [X|Zs]) :- set_difference([X|Xs], [Y|Ys], [X|Zs]) :-

2
src/prolog/machine/mod.rs
View File

@@ -143,6 +143,7 @@ impl SubModuleUser for IndexStore {
} }
static BUILTINS: &str = include_str!("../lib/builtins.pl"); static BUILTINS: &str = include_str!("../lib/builtins.pl");
static NON_ISO: &str = include_str!("../lib/non_iso.pl");
static LISTS: &str = include_str!("../lib/lists.pl"); static LISTS: &str = include_str!("../lib/lists.pl");
static QUEUES: &str = include_str!("../lib/queues.pl"); static QUEUES: &str = include_str!("../lib/queues.pl");
static ERROR: &str = include_str!("../lib/error.pl"); static ERROR: &str = include_str!("../lib/error.pl");
@@ -176,6 +177,7 @@ impl Machine {
} }
fn compile_libraries(&mut self) { fn compile_libraries(&mut self) {
compile_user_module(self, NON_ISO.as_bytes());
compile_user_module(self, LISTS.as_bytes()); compile_user_module(self, LISTS.as_bytes());
compile_user_module(self, QUEUES.as_bytes()); compile_user_module(self, QUEUES.as_bytes());
compile_user_module(self, ERROR.as_bytes()); compile_user_module(self, ERROR.as_bytes());

8
src/tests.rs
View File

@@ -1801,9 +1801,11 @@ fn test_queries_on_builtins()
assert_prolog_success!(&mut wam, "?- setof(X, Y^((X = 1 ; Y = 1) ; (X = 2, Y = 2)), S).", assert_prolog_success!(&mut wam, "?- setof(X, Y^((X = 1 ; Y = 1) ; (X = 2, Y = 2)), S).",
[["S = [_240, 1, 2]", "X = _0", "Y = _5"]]); [["S = [_240, 1, 2]", "X = _0", "Y = _5"]]);
assert_prolog_success!(&mut wam, "?- setof(X, (exists(U,V) ^ member(X, [V,U,f(U),f(V)])), [a,b,f(b),f(a)])."); assert_prolog_success!(&mut wam, "?- setof(X, (exists(U,V) ^ member(X, [V,U,f(U),f(V)])), [a,b,f(b),f(a)]).");
assert_prolog_failure!(&mut wam, "?- forall(true, fail)."); submit(&mut wam, ":- use_module(library(non_iso)).");
assert_prolog_success!(&mut wam, "?- forall(fail, true)");
assert_prolog_failure!(&mut wam, "?- forall(true, false).");
assert_prolog_success!(&mut wam, "?- forall(false, true).");
assert_prolog_success!(&mut wam, "?- catch(forall(_, true), error(instantiation_error, _), true)."); assert_prolog_success!(&mut wam, "?- catch(forall(_, true), error(instantiation_error, _), true).");
assert_prolog_success!(&mut wam, "?- catch(forall(true, _), error(instantiation_error, _), true)."); assert_prolog_success!(&mut wam, "?- catch(forall(true, _), error(instantiation_error, _), true).");
assert_prolog_success!(&mut wam, "?- catch(forall(1, true), error(type_error(callable, 1), _), true)."); assert_prolog_success!(&mut wam, "?- catch(forall(1, true), error(type_error(callable, 1), _), true).");