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

correct handling of strings and partial strings as lists, print bar operator with surrounding spaces (#274)

Browse Source
This commit is contained in:
Mark Thom
2020-03-01 00:00:40 -07:00
parent b2cf6a6ea8
commit d8e0bea110
3 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -650,7 +650,7 @@ impl MachineState {
HeapPtr::HeapCell(ref mut h) => {
*h += rhs;
}
HeapPtr::PStrLocation(h, n) => {
HeapPtr::PStrChar(h, n) | HeapPtr::PStrTail(h, n) => {
match &self.heap[*h] {
HeapCellValue::PartialString(ref pstr) => {
let s = pstr.block_as_str();
@@ -658,16 +658,20 @@ impl MachineState {
for c in s[*n ..].chars().take(rhs) {
*n += c.len_utf8();
}
self.s = HeapPtr::PStrTail(*h, *n);
}
_ => {
unreachable!()
}
}
}
HeapPtr::String(ref mut n, ref s) => {
HeapPtr::StringChar(n, s) | HeapPtr::StringTail(n, s) => {
for c in s[*n ..].chars().take(rhs) {
*n += c.len_utf8();
}
self.s = HeapPtr::StringTail(*n, s.clone());
}
}
}
@@ -1606,7 +1610,7 @@ impl MachineState {
match self.flags.double_quotes {
DoubleQuotes::Chars | DoubleQuotes::Codes
if s.len() > n => {
self.s = HeapPtr::String(n, s);
self.s = HeapPtr::StringChar(n, s);
self.mode = MachineMode::Read;
}
_ => {
@@ -1614,7 +1618,7 @@ impl MachineState {
}
},
Addr::PStrLocation(h, n) => {
self.s = HeapPtr::PStrLocation(h, n);
self.s = HeapPtr::PStrChar(h, n);
self.mode = MachineMode::Read;
}
addr @ Addr::AttrVar(_)
@@ -1675,7 +1679,7 @@ impl MachineState {
&FactInstruction::UnifyConstant(ref c) => {
match self.mode {
MachineMode::Read => {
let addr = self.s.as_addr();
let addr = self.s.read(&self.heap);
self.write_constant_to_var(addr, c.clone());
}
MachineMode::Write => {
@@ -1687,7 +1691,7 @@ impl MachineState {
}
&FactInstruction::UnifyVariable(reg) => {
match self.mode {
MachineMode::Read => self[reg] = self.s.as_addr(),
MachineMode::Read => self[reg] = self.s.read(&self.heap),
MachineMode::Write => {
let h = self.heap.h();
@@ -1702,7 +1706,7 @@ impl MachineState {
match self.mode {
MachineMode::Read => {
let reg_addr = self[reg].clone();
self.unify(reg_addr, self.s.as_addr());
self.unify(reg_addr, self.s.read(&self.heap));
}
MachineMode::Write => {
let addr = self.deref(self[reg].clone());
@@ -1730,7 +1734,7 @@ impl MachineState {
match self.mode {
MachineMode::Read => {
let reg_addr = self[reg].clone();
self.unify(reg_addr, self.s.as_addr());
self.unify(reg_addr, self.s.read(&self.heap));
}
MachineMode::Write => {
let heap_val = self.store(self[reg].clone());