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

remove string/1, use a more general test for the partial_string/1 type test (#328)

Browse Source
This commit is contained in:
Mark Thom
2020-04-11 22:47:52 -06:00
parent 0499005db5
commit 4f0adad78e
5 changed files with 17 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2364,14 +2364,16 @@ impl MachineState {
Some(iter.first_to_expire)
}
pub(super) fn reset_block(&mut self, addr: Addr) {
pub(super)
fn reset_block(&mut self, addr: Addr) {
match self.store(addr) {
Addr::Usize(b) => self.block = b,
_ => self.fail = true,
};
}
pub(super) fn execute_inlined(&mut self, inlined: &InlinedClauseType) {
pub(super)
fn execute_inlined(&mut self, inlined: &InlinedClauseType) {
match inlined {
&InlinedClauseType::CompareNumber(cmp, ref at_1, ref at_2) => {
let n1 = try_or_fail!(self, self.get_number(at_1));
@@ -2466,14 +2468,6 @@ impl MachineState {
}
};
}
&InlinedClauseType::IsString(r1) => {
let d = self.store(self.deref(self[r1]));
match d {
Addr::PStrLocation(..) => self.p += 1,
_ => self.fail = true,
};
}
&InlinedClauseType::IsNonVar(r1) => {
let d = self.store(self.deref(self[r1]));

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

@@ -1196,15 +1196,20 @@ impl MachineState {
}
}
&SystemClauseType::IsPartialString => {
let pstr = self.store(self.deref(self[temp_v!(1)]));
let mut heap_pstr_iter = self.heap_pstr_iter(self[temp_v!(1)]);
match pstr {
Addr::PStrLocation(..) => {
}
_ => {
self.fail = true;
}
}
while let Some(_) = heap_pstr_iter.next() {}
self.fail =
match heap_pstr_iter.focus() {
Addr::AttrVar(_) | Addr::HeapCell(_) | Addr::StackCell(..) |
Addr::EmptyList => {
false
}
_ => {
true
}
};
}
&SystemClauseType::PartialStringTail => {
let pstr = self.store(self.deref(self[temp_v!(1)]));