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

removed unnecessary lookup function

Browse Source
This commit is contained in:
Mark Thom
2017-02-22 16:04:24 -07:00
parent 4cdfc211e2
commit cde396650c
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/l2/machine.rs
View File

@@ -147,19 +147,11 @@ impl MachineState {
registers: vec![HeapCellValue::Ref(0); 32] } registers: vec![HeapCellValue::Ref(0); 32] }
} }
fn lookup(&self, a: Addr) -> &HeapCellValue {
match a {
Addr::HeapCell(hc) => &self.heap[hc],
Addr::RegNum(reg) => &self.registers[reg],
Addr::StackCell(sc) => &self.stack[sc]
}
}
fn deref(&self, a: Addr) -> Addr { fn deref(&self, a: Addr) -> Addr {
let mut a = a; let mut a = a;
loop { loop {
if let &HeapCellValue::Ref(value) = self.lookup(a) { if let &HeapCellValue::Ref(value) = &self[a] {
if let Addr::HeapCell(av) = a { if let Addr::HeapCell(av) = a {
if value != av { if value != av {
a = Addr::HeapCell(value); a = Addr::HeapCell(value);
@@ -224,7 +216,7 @@ impl MachineState {
let d2 = self.deref(pdl.pop().unwrap()); let d2 = self.deref(pdl.pop().unwrap());
if d1 != d2 { if d1 != d2 {
match (self.lookup(d1), self.lookup(d2)) { match (&self[d1], &self[d2]) {
(&HeapCellValue::Ref(hc), _) => (&HeapCellValue::Ref(hc), _) =>
self.bind(d2, hc), self.bind(d2, hc),
(_, &HeapCellValue::Ref(hc)) => (_, &HeapCellValue::Ref(hc)) =>
@@ -293,7 +285,7 @@ impl MachineState {
&FactInstruction::GetStructure(_, ref name, arity, reg) => { &FactInstruction::GetStructure(_, ref name, arity, reg) => {
let addr = self.deref(Addr::from(reg)); let addr = self.deref(Addr::from(reg));
match self.lookup(addr) { match &self[addr] {
&HeapCellValue::Str(a) => { &HeapCellValue::Str(a) => {
let result = &self.heap[a]; let result = &self.heap[a];