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

speed unification of pairs of partial strings

Browse Source
This commit is contained in:
Mark Thom
2020-04-20 11:37:32 -06:00
parent ee425bb7f0
commit 443c4b6cd0
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,19 +281,18 @@ impl MachineState {
(Addr::PStrLocation(h1, n1), Addr::PStrLocation(h2, n2)) => { (Addr::PStrLocation(h1, n1), Addr::PStrLocation(h2, n2)) => {
if let &HeapCellValue::PartialString(ref pstr1, has_tail_1) = &self.heap[h1] { if let &HeapCellValue::PartialString(ref pstr1, has_tail_1) = &self.heap[h1] {
if let &HeapCellValue::PartialString(ref pstr2, has_tail_2) = &self.heap[h2] { if let &HeapCellValue::PartialString(ref pstr2, has_tail_2) = &self.heap[h2] {
let pstr1_iter = pstr1.range_from(n1 ..); let pstr1_s = pstr1.as_str_from(n1);
let pstr2_iter = pstr2.range_from(n2 ..); let pstr2_s = pstr2.as_str_from(n2);
let mut m_len = 0; let m_len =
if pstr1_s.starts_with(pstr2_s) {
for (c1, c2) in pstr1_iter.zip(pstr2_iter) { pstr2_s.len()
if c1 != c2 { } else if pstr2_s.starts_with(pstr1_s) {
pstr1_s.len()
} else {
self.fail = true; self.fail = true;
return; return;
} };
m_len += c1.len_utf8();
}
if pstr1.at_end(n1 + m_len) { if pstr1.at_end(n1 + m_len) {
if has_tail_1 { if has_tail_1 {
@@ -499,19 +498,18 @@ impl MachineState {
(Addr::PStrLocation(h1, n1), Addr::PStrLocation(h2, n2)) => { (Addr::PStrLocation(h1, n1), Addr::PStrLocation(h2, n2)) => {
if let &HeapCellValue::PartialString(ref pstr1, has_tail_1) = &self.heap[h1] { if let &HeapCellValue::PartialString(ref pstr1, has_tail_1) = &self.heap[h1] {
if let &HeapCellValue::PartialString(ref pstr2, has_tail_2) = &self.heap[h2] { if let &HeapCellValue::PartialString(ref pstr2, has_tail_2) = &self.heap[h2] {
let pstr1_iter = pstr1.range_from(n1 ..); let pstr1_s = pstr1.as_str_from(n1);
let pstr2_iter = pstr2.range_from(n2 ..); let pstr2_s = pstr2.as_str_from(n2);
let mut m_len = 0; let m_len =
if pstr1_s.starts_with(pstr2_s) {
for (c1, c2) in pstr1_iter.zip(pstr2_iter) { pstr2_s.len()
if c1 != c2 { } else if pstr2_s.starts_with(pstr1_s) {
pstr1_s.len()
} else {
self.fail = true; self.fail = true;
return; return;
} };
m_len += c1.len_utf8();
}
if pstr1.at_end(n1 + m_len) { if pstr1.at_end(n1 + m_len) {
if has_tail_1 { if has_tail_1 {