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

fix copy_partial_string bug (#572)

Browse Source
This commit is contained in:
Mark Thom
2020-06-16 18:47:39 -06:00
parent 0f017339b7
commit 53f99ca434
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/tabling/trie.pl
View File

@@ -66,7 +66,7 @@
% p_trie_arity_univ(+Term,-FunctorData,-ArgumentsList). % p_trie_arity_univ(+Term,-FunctorData,-ArgumentsList).
p_trie_arity_univ(Term,functor_data(Name,Arity),Arguments) :- p_trie_arity_univ(Term,functor_data(Name,Arity),Arguments) :-
( var(Term) -> ( var(Term) ->
Name = var, Name = Term,
Arity = 0, Arity = 0,
Arguments = [] Arguments = []
; Term =.. [Name|Arguments], ; Term =.. [Name|Arguments],

8
src/machine/copier.rs
View File

@@ -104,7 +104,7 @@ impl<T: CopierTarget> CopyTermState<T> {
fn copy_partial_string(&mut self, addr: usize, n: usize) { fn copy_partial_string(&mut self, addr: usize, n: usize) {
if let &HeapCellValue::Addr(Addr::PStrLocation(h, _)) = &self.target[addr] { if let &HeapCellValue::Addr(Addr::PStrLocation(h, _)) = &self.target[addr] {
if h >= self.old_h { if h >= self.old_h {
*self.value_at_scan() = HeapCellValue::Addr(Addr::PStrLocation(h, 0)); *self.value_at_scan() = HeapCellValue::Addr(Addr::PStrLocation(h, n));
self.scan += 1; self.scan += 1;
return; return;
@@ -114,14 +114,14 @@ impl<T: CopierTarget> CopyTermState<T> {
let threshold = self.target.threshold(); let threshold = self.target.threshold();
*self.value_at_scan() = *self.value_at_scan() =
HeapCellValue::Addr(Addr::PStrLocation(threshold, 0)); HeapCellValue::Addr(Addr::PStrLocation(threshold, n));
self.scan += 1; self.scan += 1;
let (pstr, has_tail) = let (pstr, has_tail) =
match &self.target[addr] { match &self.target[addr] {
&HeapCellValue::PartialString(ref pstr, has_tail) => { &HeapCellValue::PartialString(ref pstr, has_tail) => {
(pstr.clone_from_offset(n), has_tail) (pstr.clone_from_offset(0), has_tail)
} }
_ => { _ => {
unreachable!() unreachable!()
@@ -130,7 +130,7 @@ impl<T: CopierTarget> CopyTermState<T> {
self.target.push(HeapCellValue::PartialString(pstr, has_tail)); self.target.push(HeapCellValue::PartialString(pstr, has_tail));
let replacement = HeapCellValue::Addr(Addr::PStrLocation(threshold, 0)); let replacement = HeapCellValue::Addr(Addr::PStrLocation(threshold, n));
let trail_item = mem::replace( let trail_item = mem::replace(
&mut self.target[addr], &mut self.target[addr],