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

add comparisons between partial strings and string constants (#263)

Browse Source
This commit is contained in:
Mark Thom
2020-02-22 00:51:27 -07:00
parent 545472f9c4
commit 003b4d0218
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/prolog/machine/machine_state.rs
View File

@@ -538,8 +538,8 @@ pub(crate) trait CallPolicy: Any {
attr_var_init_bindings_b,
);
machine_st.stack.truncate(machine_st.b);
machine_st.b = machine_st.stack.index_or_frame(b).prelude.b;
machine_st.stack.truncate(b);
machine_st.hb = machine_st.heap.h();
machine_st.p += offset;
@@ -578,8 +578,8 @@ pub(crate) trait CallPolicy: Any {
attr_var_init_bindings_b,
);
machine_st.stack.truncate(machine_st.b);
machine_st.b = machine_st.stack.index_or_frame(b).prelude.b;
machine_st.stack.truncate(b);
machine_st.hb = machine_st.heap.h();
machine_st.p += 1;
@@ -1032,7 +1032,7 @@ impl CWILCallPolicy {
pub(crate) trait CutPolicy: Any {
// returns true iff we fail or cut redirected the MachineState's p itself
fn cut(&mut self, _: &mut MachineState, _: RegType) -> bool;
fn cut(&mut self, machine_st: &mut MachineState, r: RegType) -> bool;
}
downcast!(dyn CutPolicy);

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

@@ -2204,6 +2204,13 @@ impl MachineState {
(HeapCellValue::Addr(Addr::PStrLocation(..)),
HeapCellValue::Addr(Addr::PStrLocation(..))) =>
continue,
(HeapCellValue::Addr(Addr::PStrLocation(..)),
HeapCellValue::Addr(Addr::Con(Constant::String(..))))
| (HeapCellValue::Addr(Addr::Con(Constant::String(..))),
HeapCellValue::Addr(Addr::PStrLocation(..)))
if self.flags.double_quotes.is_chars() => {
continue;
}
(HeapCellValue::Addr(Addr::Lis(_)), HeapCellValue::Addr(Addr::Lis(_))) =>
continue,
(HeapCellValue::Addr(Addr::Con(Constant::EmptyList)),

6
src/prolog/machine/stack.rs
View File

@@ -89,6 +89,8 @@ impl Index<usize> for AndFrame {
impl IndexMut<usize> for AndFrame {
fn index_mut(&mut self, index: usize) -> &mut Self::Output {
debug_assert!(self.prelude.univ_prelude.is_or_frame == 0);
let prelude_offset = prelude_size::<AndFramePrelude>();
let index_offset = (index - 1) * mem::size_of::<Addr>();
@@ -143,6 +145,8 @@ impl Index<usize> for OrFrame {
#[inline]
fn index(&self, index: usize) -> &Self::Output {
debug_assert!(self.prelude.univ_prelude.is_or_frame == 1);
let prelude_offset = prelude_size::<OrFramePrelude>();
let index_offset = index * mem::size_of::<Addr>();
@@ -158,6 +162,8 @@ impl Index<usize> for OrFrame {
impl IndexMut<usize> for OrFrame {
#[inline]
fn index_mut(&mut self, index: usize) -> &mut Self::Output {
debug_assert!(self.prelude.univ_prelude.is_or_frame == 1);
let prelude_offset = prelude_size::<OrFramePrelude>();
let index_offset = index * mem::size_of::<Addr>();