remove compare_pstr_to_string and related result type

diff --git a/src/machine/heap.rs b/src/machine/heap.rs
index f682a1a0879f38443a3fa8a188dc777ffc46e4e1..c08ba03fbac5096414740a832de210b8defb55cb 100644 (file)
--- a/src/machine/heap.rs
+++ b/src/machine/heap.rs
@@ -657,33 +657,8 @@ impl Heap {
         self.inner.ptr = ptr::null_mut();
         self.inner.byte_len = 0;
         self.inner.byte_cap = 0;
-
-        // self.pstr_vec.clear();
     }
 
-    // pub(crate) fn append(&mut self, heap_slice: HeapView) -> Result<(), usize> {
-    //     unsafe {
-    //         loop {
-    //             if self.free_space() >= heap_index!(heap_slice.slice_cell_len) {
-    //                 ptr::copy_nonoverlapping(
-    //                     heap_slice.slice,
-    //                     self.inner.ptr.add(self.inner.byte_len),
-    //                     heap_index!(heap_slice.slice_cell_len),
-    //                 );
-
-    //                 self.inner.byte_len += heap_index!(heap_slice.slice_cell_len);
-    //                 // self.pstr_vec.extend(heap_slice.pstr_slice.iter());
-
-    //                 break;
-    //             } else if !self.grow() {
-    //                 return Err(self.resource_error_offset());
-    //             }
-    //         }
-    //     }
-
-    //     Ok(())
-    // }
-
     pub(crate) fn store_resource_error(&mut self) {
         RESOURCE_ERROR_OFFSET_INIT.call_once(move || {
             let stub = functor!(atom!("resource_error"), [atom_as_cell((atom!("memory")))]);

diff --git a/src/machine/mod.rs b/src/machine/mod.rs
index 674dda427ff2545c9bc64d1dbf61bb110a3817fe..8f70b96fa67f0e953986c95260d97f6f9dddc5f6 100644 (file)
--- a/src/machine/mod.rs
+++ b/src/machine/mod.rs
@@ -619,20 +619,16 @@ impl Machine {
                     );
                 }
                 &Instruction::GetPartialString(Level::Shallow, ref string, RegType::Temp(t)) => {
-                    use crate::machine::partial_string::HeapPStrIter;
                     let cell = self.deref_register(t);
 
                     read_heap_cell!(cell,
-                        (HeapCellValueTag::PStrLoc) => {
-                            self.machine_st.heap[0] = cell;
-                            let iter = HeapPStrIter::new(&self.machine_st.heap, 0);
+                        (HeapCellValueTag::PStrLoc, pstr_loc) => {
+                            let heap_slice = &self.machine_st.heap.as_slice()[pstr_loc ..];
 
-                            if iter.compare_pstr_to_string(string).is_none() {
-                                return false;
+                            match compare_pstr_slices(heap_slice, string.as_bytes()) {
+                                PStrSegmentCmpResult::Continue(..) => offset += 1,
+                                _ => return false,
                             }
-
-                            offset += 1;
-
                         }
                         (HeapCellValueTag::Lis) => {
                             offset += 1;

diff --git a/src/machine/partial_string.rs b/src/machine/partial_string.rs
index a8e908a9b6551b9ef88644753ac67d70839c0368..ee0c2be9f4e79afab1bd44e4713f48b2dbf003ca 100644 (file)
--- a/src/machine/partial_string.rs
+++ b/src/machine/partial_string.rs
@@ -6,7 +6,6 @@ use crate::machine::system_calls::BrentAlgState;
 use crate::types::*;
 
 use std::ops::Deref;
-use std::str;
 
 #[derive(Clone, Copy)]
 pub struct HeapPStrIter<'a> {
@@ -17,21 +16,6 @@ pub struct HeapPStrIter<'a> {
     stepper: fn(&mut HeapPStrIter<'a>) -> Option<PStrIteratee>,
 }
 
-#[derive(Debug, Clone, Copy)]
-pub enum PStrCmpResult<'a> {
-    ListMatch {
-        list_loc: usize,
-    },
-    CompletePStrMatch {
-        chars_matched: usize,
-        pstr_loc: usize,
-    },
-    PartialPStrMatch {
-        string: &'a str,
-        var_loc: usize,
-    },
-}
-
 struct PStrIterStep {
     iteratee: PStrIteratee,
     next_hare: usize,
@@ -60,85 +44,6 @@ impl<'a> HeapPStrIter<'a> {
         self.brent_st.hare
     }
 
-    pub fn compare_pstr_to_string(self, mut s: &str) -> Option<PStrCmpResult> {
-        let mut curr_hare = self.brent_st.hare;
-
-        while !s.is_empty() {
-            read_heap_cell!(self.heap[curr_hare],
-                (HeapCellValueTag::PStrLoc, h) => {
-                    let t = self.heap.slice_to_str(h, self.heap.byte_len() - h);
-
-                    let mut bytes_matched = 0;
-                    let mut chars_matched = 0;
-
-                    for (sc, tc) in s.chars().zip(t.chars()) {
-                        if sc != tc {
-                            if tc != '\u{0}' {
-                                return None;
-                            } else {
-                                break;
-                            }
-                        }
-
-                        bytes_matched += sc.len_utf8();
-                        chars_matched += 1;
-                    }
-
-                    s = &s[bytes_matched ..];
-
-                    if s.is_empty() {
-                        return Some(PStrCmpResult::CompletePStrMatch { chars_matched, pstr_loc: h });
-                    } else {
-                        let next_hare = Heap::pstr_tail_idx(h + bytes_matched);
-                        curr_hare = next_hare;
-                    }
-                }
-                (HeapCellValueTag::AttrVar | HeapCellValueTag::Var, h) => {
-                    if h == curr_hare {
-                        return Some(PStrCmpResult::PartialPStrMatch { string: s, var_loc: h });
-                    }
-
-                    curr_hare = h;
-                    continue;
-                }
-                _ => {
-                    match self.step(curr_hare).ok() {
-                        Some(PStrIterStep { iteratee, next_hare }) => {
-                            let value = if let PStrIteratee::Char { value, .. } = iteratee {
-                                value
-                            } else {
-                                unreachable!()
-                            };
-
-                            let c = s.chars().next().unwrap();
-
-                            if c == value {
-                                s = &s[c.len_utf8() ..];
-
-                                if s.is_empty() {
-                                    return Some(
-                                        PStrCmpResult::ListMatch {
-                                            list_loc: next_hare,
-                                        }
-                                    );
-                                }
-
-                                curr_hare = next_hare;
-                            } else {
-                                return None;
-                            }
-                        }
-                        None => {
-                            return None;
-                        }
-                    }
-                }
-            );
-        }
-
-        None
-    }
-
     fn walk_hare_to_cycle_end(&mut self) {
         // walk_hare_to_cycle_end assumes a cycle has been found,
         // so it is always safe to unwrap self.step()