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

index Constant::Usize (#355)

Browse Source
This commit is contained in:
Mark Thom
2020-04-15 14:11:45 -06:00
parent 4d8f76e922
commit 57d739673a
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/prolog/indexing.rs
View File

@@ -6,6 +6,7 @@ use crate::prolog::rug::Integer;
use indexmap::IndexMap;
use std::collections::VecDeque;
use std::convert::TryFrom;
use std::hash::Hash;
use std::rc::Rc;
@@ -66,6 +67,16 @@ impl CodeOffsets {
.or_insert(vec![]);
code.push(Self::add_index(code.is_empty(), index));
if n >= 0 {
if let Ok(n) = usize::try_from(n) {
let code = self.constants
.entry(Constant::Usize(n))
.or_insert(vec![]);
code.push(Self::add_index(code.is_empty(), index));
}
}
}
&Constant::Integer(ref n) => {
if let Some(n) = n.to_isize() {
@@ -75,11 +86,34 @@ impl CodeOffsets {
code.push(Self::add_index(code.is_empty(), index));
}
if let Some(n) = n.to_usize() {
let code = self.constants
.entry(Constant::Usize(n))
.or_insert(vec![]);
code.push(Self::add_index(code.is_empty(), index));
}
}
&Constant::String(_) => {
let is_initial_index = self.lists.is_empty();
self.lists.push(Self::add_index(is_initial_index, index));
}
&Constant::Usize(n) => {
let code = self.constants
.entry(Constant::Integer(Rc::new(Integer::from(n))))
.or_insert(vec![]);
code.push(Self::add_index(code.is_empty(), index));
if let Ok(n) = isize::try_from(n) {
let code = self.constants
.entry(Constant::Fixnum(n))
.or_insert(vec![]);
code.push(Self::add_index(code.is_empty(), index));
}
}
_ => {
}
}

3
src/prolog/machine/machine_indices.rs
View File

@@ -283,6 +283,9 @@ impl Addr {
None
}
}
&Addr::Usize(n) => {
Some(Constant::Usize(n))
}
_ => {
None
}