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

add more tests that pass.

Browse Source
This commit is contained in:
Mark Thom
2018-05-10 19:47:53 -06:00
parent 954c29b103
commit 0f980e204d
3 changed files with 83 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/prolog/ast.rs
View File

@@ -1402,8 +1402,8 @@ impl ControlInstruction {
#[derive(Clone)]
pub enum IndexingInstruction {
SwitchOnTerm(usize, usize, usize, usize),
SwitchOnConstant(usize, HashMap<Constant, usize>),
SwitchOnStructure(usize, HashMap<(ClauseName, usize), usize>)
SwitchOnConstant(usize, Rc<HashMap<Constant, usize>>),
SwitchOnStructure(usize, Rc<HashMap<(ClauseName, usize), usize>>)
}
impl From<IndexingInstruction> for Line {

5
src/prolog/indexing.rs
View File

@@ -2,6 +2,7 @@ use prolog::ast::*;
use std::collections::{HashMap, VecDeque};
use std::hash::Hash;
use std::rc::Rc;
#[derive(Clone, Copy)]
enum IntIndex {
@@ -132,7 +133,7 @@ impl CodeOffsets {
if con_ind.len() > 1 {
let index = Self::flatten_index(con_ind, prelude.len());
let instr = IndexingInstruction::SwitchOnConstant(index.len(), index);
let instr = IndexingInstruction::SwitchOnConstant(index.len(), Rc::new(index));
prelude.push_front(Line::from(instr));
@@ -152,7 +153,7 @@ impl CodeOffsets {
if str_ind.len() > 1 {
let index = Self::flatten_index(str_ind, prelude.len());
let instr = IndexingInstruction::SwitchOnStructure(index.len(), index);
let instr = IndexingInstruction::SwitchOnStructure(index.len(), Rc::new(index));
prelude.push_front(Line::from(instr));