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

treat functors with PI '.'/2 as lists (#1570)

Browse Source
This commit is contained in:
Mark Thom
2022-08-14 16:14:53 -06:00
parent 4e6c138099
commit 069e132c0e
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/indexing.rs
View File

@@ -1466,17 +1466,20 @@ impl<I: Indexer> CodeOffsets<I> {
atom_tbl: &mut AtomTable, atom_tbl: &mut AtomTable,
) { ) {
match optimal_arg { match optimal_arg {
&Term::Clause(_, atom!("."), ref terms) if terms.len() == 2 => {
clause_index_info.opt_arg_index_key = OptArgIndexKey::List(self.optimal_index, 0);
self.index_list(index);
}
&Term::Cons(..) | &Term::Literal(_, Literal::String(_)) | &Term::PartialString(..) => {
clause_index_info.opt_arg_index_key = OptArgIndexKey::List(self.optimal_index, 0);
self.index_list(index);
}
&Term::Clause(_, name, ref terms) => { &Term::Clause(_, name, ref terms) => {
clause_index_info.opt_arg_index_key = clause_index_info.opt_arg_index_key =
OptArgIndexKey::Structure(self.optimal_index, 0, name.clone(), terms.len()); OptArgIndexKey::Structure(self.optimal_index, 0, name.clone(), terms.len());
self.index_structure(name, terms.len(), index); self.index_structure(name, terms.len(), index);
} }
&Term::Cons(..) | &Term::Literal(_, Literal::String(_)) | &Term::PartialString(..) => {
clause_index_info.opt_arg_index_key = OptArgIndexKey::List(self.optimal_index, 0);
self.index_list(index);
}
&Term::Literal(_, constant) => { &Term::Literal(_, constant) => {
let overlapping_constants = self.index_constant(atom_tbl, constant, index); let overlapping_constants = self.index_constant(atom_tbl, constant, index);

23
src/machine/dispatch.rs
View File

@@ -371,8 +371,14 @@ impl Machine {
c c
} }
(HeapCellValueTag::Str, st) => { (HeapCellValueTag::Str, st) => {
let arity = cell_as_atom_cell!(self.machine_st.heap[st]).get_arity(); let (name, arity) = cell_as_atom_cell!(self.machine_st.heap[st])
if arity == 0 { c } else { s } .get_name_and_arity();
match (name, arity) {
(atom!("."), 2) => l,
(_, 0) => c,
_ => s,
}
} }
(HeapCellValueTag::Cons, ptr) => { (HeapCellValueTag::Cons, ptr) => {
match ptr.get_tag() { match ptr.get_tag() {
@@ -2812,6 +2818,19 @@ impl Machine {
self.machine_st.s_offset = 0; self.machine_st.s_offset = 0;
self.machine_st.mode = MachineMode::Read; self.machine_st.mode = MachineMode::Read;
} }
(HeapCellValueTag::Str, s) => {
let (name, arity) = cell_as_atom_cell!(self.machine_st.heap[s])
.get_name_and_arity();
if name == atom!(".") && arity == 2 {
self.machine_st.s = HeapPtr::HeapCell(s+1);
self.machine_st.s_offset = 0;
self.machine_st.mode = MachineMode::Read;
} else {
self.machine_st.backtrack();
continue;
}
}
(HeapCellValueTag::Lis, l) => { (HeapCellValueTag::Lis, l) => {
self.machine_st.s = HeapPtr::HeapCell(l); self.machine_st.s = HeapPtr::HeapCell(l);
self.machine_st.s_offset = 0; self.machine_st.s_offset = 0;