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

add catch/throw support, make exceptions and arithmetic tests pass.

Browse Source
This commit is contained in:
Mark Thom
2018-05-10 01:43:36 -06:00
parent bae107f8cd
commit 954c29b103
9 changed files with 314 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/prolog/machine/machine_state_impl.rs
View File

@@ -80,7 +80,7 @@ impl MachineState {
};
}
fn bind(&mut self, r1: Ref, a2: Addr) {
pub(super) fn bind(&mut self, r1: Ref, a2: Addr) {
let t2 = self.store(a2);
match r1 {
@@ -273,7 +273,7 @@ impl MachineState {
}
}
fn write_constant_to_var(&mut self, addr: Addr, c: Constant) {
pub(super) fn write_constant_to_var(&mut self, addr: Addr, c: Constant) {
let addr = self.deref(addr);
match self.store(addr) {
@@ -1011,9 +1011,9 @@ impl MachineState {
}
}
pub(super) fn handle_internal_call_n(&mut self)
pub(super) fn handle_internal_call_n(&mut self, arity: usize)
{
let arity = self.num_of_args + 1;
let arity = arity + 1;
let pred = self.registers[1].clone();
for i in 2 .. arity {
@@ -1310,12 +1310,9 @@ impl MachineState {
Ordering::Equal
}
fn reset_block(&mut self, addr: Addr) {
pub(super) fn reset_block(&mut self, addr: Addr) {
match self.store(addr) {
Addr::Con(Constant::Usize(b)) => {
self.block = b;
self.p += 1;
},
Addr::Con(Constant::Usize(b)) => self.block = b,
_ => self.fail = true
};
}