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

add more tests

Browse Source
This commit is contained in:
Mark Thom
2018-02-22 18:33:00 -07:00
parent bdd4fe6eb3
commit 5c5257bdbd
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -370,7 +370,7 @@ impl CallWithInferenceLimitCallPolicy {
*policy = Box::new(new_policy); *policy = Box::new(new_policy);
} }
fn increment(&mut self) -> CallResult { fn increment(&mut self) -> CallResult {
if let Some(&(ref limit, bp)) = self.limits.last() { if let Some(&(ref limit, bp)) = self.limits.last() {
if self.count == **limit { if self.count == **limit {
return Err(functor!(self.atom_tbl, return Err(functor!(self.atom_tbl,

21
src/tests.rs
View File

@@ -1326,7 +1326,7 @@ fn test_queries_on_builtins()
assert_prolog_failure!(&mut wam, "?- string(atom)."); assert_prolog_failure!(&mut wam, "?- string(atom).");
assert_prolog_failure!(&mut wam, "?- string([1,2,3])."); assert_prolog_failure!(&mut wam, "?- string([1,2,3]).");
assert_prolog_failure!(&mut wam, "?- string([1,2,X])."); assert_prolog_failure!(&mut wam, "?- string([1,2,X]).");
assert_prolog_success!(&mut wam, "?- X = nonvar, nonvar(X)."); assert_prolog_success!(&mut wam, "?- X = nonvar, nonvar(X).");
assert_prolog_failure!(&mut wam, "?- nonvar(X)."); assert_prolog_failure!(&mut wam, "?- nonvar(X).");
assert_prolog_success!(&mut wam, "?- nonvar(f(X))."); assert_prolog_success!(&mut wam, "?- nonvar(f(X)).");
@@ -1441,15 +1441,14 @@ fn test_queries_on_setup_call_cleanup()
assert_prolog_success!(&mut wam, "?- catch(setup_call_cleanup(true,throw(goal),throw(cl)), Pat, true).", assert_prolog_success!(&mut wam, "?- catch(setup_call_cleanup(true,throw(goal),throw(cl)), Pat, true).",
[["Pat = goal"]]); [["Pat = goal"]]);
assert_prolog_success!(&mut wam, "?- catch(( setup_call_cleanup(true,(G=1;G=2),throw(cl)), throw(cont)), Pat, true).", assert_prolog_success!(&mut wam, "?- catch(( setup_call_cleanup(true,(G=1;G=2),throw(cl)), throw(cont)), Pat, true).",
[["Pat = cont", "G = _1"]]); [["Pat = cont", "G = _1"]]);
} }
#[test] #[test]
fn test_queries_on_call_with_inference_limit() fn test_queries_on_call_with_inference_limit()
{ {
let mut wam = Machine::new(); let mut wam = Machine::new();
// inference_limit_exceeded thrown on 0 limit.
assert_prolog_success!(&mut wam, "?- call_with_inference_limit(throw(error), 0, R).", assert_prolog_success!(&mut wam, "?- call_with_inference_limit(throw(error), 0, R).",
[["R = inference_limit_exceeded"]]); [["R = inference_limit_exceeded"]]);
assert_prolog_success!(&mut wam, "?- catch(call_with_inference_limit(throw(error), 1, R), assert_prolog_success!(&mut wam, "?- catch(call_with_inference_limit(throw(error), 1, R),
@@ -1457,7 +1456,7 @@ fn test_queries_on_call_with_inference_limit()
true)."); true).");
assert_prolog_failure!(&mut wam, "?- call_with_inference_limit(g(X), 5, R)."); assert_prolog_failure!(&mut wam, "?- call_with_inference_limit(g(X), 5, R).");
submit(&mut wam, "g(1). g(2). g(3). g(4). g(5)."); submit(&mut wam, "g(1). g(2). g(3). g(4). g(5).");
assert_prolog_success!(&mut wam, "?- call_with_inference_limit(g(X), 5, R).", assert_prolog_success!(&mut wam, "?- call_with_inference_limit(g(X), 5, R).",
@@ -1466,6 +1465,12 @@ fn test_queries_on_call_with_inference_limit()
["R = true", "X = 3"], ["R = true", "X = 3"],
["R = true", "X = 4"], ["R = true", "X = 4"],
["R = !", "X = 5"]]); ["R = !", "X = 5"]]);
assert_prolog_success!(&mut wam, "?- call_with_inference_limit(g(X), 5, R), call(true).",
[["R = true", "X = 1"],
["R = true", "X = 2"],
["R = true", "X = 3"],
["R = true", "X = 4"],
["R = !", "X = 5"]]);
assert_prolog_success!(&mut wam, "?- call_with_inference_limit(g(X), 2, R).", assert_prolog_success!(&mut wam, "?- call_with_inference_limit(g(X), 2, R).",
[["R = true", "X = 1"], [["R = true", "X = 1"],
["R = true", "X = 2"], ["R = true", "X = 2"],
@@ -1496,7 +1501,7 @@ fn test_queries_on_call_with_inference_limit()
[["R = inference_limit_exceeded", "X = _1"]]); [["R = inference_limit_exceeded", "X = _1"]]);
submit(&mut wam, "e(X) :- call_with_inference_limit(f(X), 10, _)."); submit(&mut wam, "e(X) :- call_with_inference_limit(f(X), 10, _).");
assert_prolog_success!(&mut wam, "?- call_with_inference_limit(e(X), 7, R).", assert_prolog_success!(&mut wam, "?- call_with_inference_limit(e(X), 7, R).",
[["R = true", "X = 1"], [["R = true", "X = 1"],
["R = true", "X = 2"], ["R = true", "X = 2"],
@@ -1520,11 +1525,11 @@ fn test_queries_on_call_with_inference_limit()
[["R = inference_limit_exceeded", "X = _1"]]); [["R = inference_limit_exceeded", "X = _1"]]);
submit(&mut wam, "f(X, R) :- call_with_inference_limit(g(X), 5, R)."); submit(&mut wam, "f(X, R) :- call_with_inference_limit(g(X), 5, R).");
assert_prolog_success!(&mut wam, "?- call_with_inference_limit(f(X, R), 3, S).", assert_prolog_success!(&mut wam, "?- call_with_inference_limit(f(X, R), 3, S).",
[["S = true", "X = 1", "R = true"], [["S = true", "X = 1", "R = true"],
["S = true", "X = 2", "R = true"], ["S = true", "X = 2", "R = true"],
["S = inference_limit_exceeded", "X = _1", "R = _2"]]); ["S = inference_limit_exceeded", "X = _1", "R = _2"]]);
assert_prolog_success!(&mut wam, "?- call_with_inference_limit(f(X, R), 7, R).", assert_prolog_success!(&mut wam, "?- call_with_inference_limit(f(X, R), 7, R).",
[["R = true", "X = 1"], [["R = true", "X = 1"],
["R = true", "X = 2"], ["R = true", "X = 2"],