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

copy terms to global variable blackboard, fix attribute_goals//1

Browse Source
This commit is contained in:
Mark Thom
2019-10-09 14:11:31 -06:00
parent 3409db010f
commit f898b98b06
12 changed files with 113 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/prolog/machine/system_calls.rs
View File

@@ -840,8 +840,14 @@ impl MachineState {
let addr = self[temp_v!(2)].clone();
match indices.global_variables.get(&key).cloned() {
Some(sought_addr) => self.unify(addr, sought_addr),
match indices.global_variables.get(&key) {
Some(ref ball) => {
let h = self.heap.h;
let stub = ball.copy_and_align(h);
self.heap.extend(stub.into_iter());
self.unify(addr, Addr::HeapCell(h));
}
None => self.fail = true,
};
}
@@ -1671,7 +1677,7 @@ impl MachineState {
let h = self.heap.h;
if self.ball.stub.len() > 0 {
let stub = self.copy_and_align_ball();
let stub = self.ball.copy_and_align(h);
self.heap.append(stub);
} else {
self.fail = true;
@@ -1759,9 +1765,16 @@ impl MachineState {
_ => unreachable!(),
};
let value = self[temp_v!(2)].clone();
indices.global_variables.insert(key, value);
let value = self[temp_v!(2)].clone();
let mut ball = Ball::new();
ball.boundary = self.heap.h;
copy_term(
CopyBallTerm::new(&mut self.and_stack, &mut self.heap, &mut ball.stub),
value,
);
indices.global_variables.insert(key, ball);
}
&SystemClauseType::Succeed => {}
&SystemClauseType::TermVariables => {