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

fix recursive calls to call/N

Browse Source
This commit is contained in:
Mark Thom
2017-07-28 17:02:08 -06:00
parent 8a99b6d3bc
commit 3aa8780086
10 changed files with 955 additions and 2753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main.rs
View File

@@ -3,7 +3,6 @@ mod prolog;
use prolog::io::*;
use prolog::machine::*;
use prolog::prolog_parser::*;
#[cfg(test)]
mod tests {
@@ -13,8 +12,8 @@ mod tests {
fn submit(wam: &mut Machine, buffer: &str) -> bool {
wam.reset();
match parse_TopLevel(buffer.trim()) {
Ok(tl) =>
match parse_code(buffer.trim()) {
Some(tl) =>
match eval(wam, &tl) {
EvalSession::InitialQuerySuccess(_, _) |
EvalSession::EntrySuccess |
@@ -22,7 +21,7 @@ mod tests {
true,
_ => false
},
Err(_) => panic!("Bad parse in test case!")
None => panic!("Grammatical error of some kind!")
}
}
@@ -647,19 +646,31 @@ mod tests {
assert_eq!(submit(&mut wam, "?- call_mult(p(X), one)."), true);
assert_eq!(submit(&mut wam, "?- call_mult(p(two), one)."), false);
assert_eq!(submit(&mut wam, "?- call_mult(p(two), two)."), true);
submit(&mut wam, "f(call(f, undefined)). f(undefined).");
submit(&mut wam, "call_var(P) :- P.");
assert_eq!(submit(&mut wam, "?- f(X), call_var(X)."), true);
assert_eq!(submit(&mut wam, "?- f(call(f, Q)), call_var(call(f, Q))."), true);
assert_eq!(submit(&mut wam, "?- call_var(call(undefined, Q))."), false);
assert_eq!(submit(&mut wam, "?- call(call)."), false);
assert_eq!(submit(&mut wam, "?- call(call(call))."), false);
assert_eq!(submit(&mut wam, "?- call(call(call(call)))."), false);
assert_eq!(submit(&mut wam, "?- call(call(call(call(call))))."), false);
assert_eq!(submit(&mut wam, "?- call(call(call(call(call(call)))))."), false);
assert_eq!(submit(&mut wam, "?- call(call(call(call(call(call(p(X)))))))."), true);
}
}
fn process_buffer(wam: &mut Machine, buffer: &str)
{
match parse_TopLevel(buffer.trim()) {
Ok(tl) => {
match parse_code(buffer.trim()) {
Some(tl) => {
let result = eval(wam, &tl);
print(wam, result);
},
Err(_) => {
println!("Grammatical error of some kind!");
}
None => println!("Grammatical error!")
};
}