remove unused fields instead, prompting more dead_code removal
This commit is contained in:
@@ -435,7 +435,6 @@ pub(crate) struct Module {
|
|||||||
pub(crate) meta_predicates: MetaPredicateDir,
|
pub(crate) meta_predicates: MetaPredicateDir,
|
||||||
pub(crate) extensible_predicates: ExtensiblePredicates,
|
pub(crate) extensible_predicates: ExtensiblePredicates,
|
||||||
pub(crate) local_extensible_predicates: LocalExtensiblePredicates,
|
pub(crate) local_extensible_predicates: LocalExtensiblePredicates,
|
||||||
pub(crate) _is_impromptu_module: bool,
|
|
||||||
pub(crate) listing_src: ListingSource,
|
pub(crate) listing_src: ListingSource,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -447,7 +446,6 @@ impl Module {
|
|||||||
code_dir: CodeDir::new(),
|
code_dir: CodeDir::new(),
|
||||||
op_dir: default_op_dir(),
|
op_dir: default_op_dir(),
|
||||||
meta_predicates: MetaPredicateDir::new(),
|
meta_predicates: MetaPredicateDir::new(),
|
||||||
_is_impromptu_module: false,
|
|
||||||
extensible_predicates: ExtensiblePredicates::new(),
|
extensible_predicates: ExtensiblePredicates::new(),
|
||||||
local_extensible_predicates: LocalExtensiblePredicates::new(),
|
local_extensible_predicates: LocalExtensiblePredicates::new(),
|
||||||
listing_src,
|
listing_src,
|
||||||
@@ -460,7 +458,6 @@ impl Module {
|
|||||||
code_dir: CodeDir::new(),
|
code_dir: CodeDir::new(),
|
||||||
op_dir: OpDir::new(),
|
op_dir: OpDir::new(),
|
||||||
meta_predicates: MetaPredicateDir::new(),
|
meta_predicates: MetaPredicateDir::new(),
|
||||||
_is_impromptu_module: false,
|
|
||||||
extensible_predicates: ExtensiblePredicates::new(),
|
extensible_predicates: ExtensiblePredicates::new(),
|
||||||
local_extensible_predicates: LocalExtensiblePredicates::new(),
|
local_extensible_predicates: LocalExtensiblePredicates::new(),
|
||||||
listing_src: ListingSource::DynamicallyGenerated,
|
listing_src: ListingSource::DynamicallyGenerated,
|
||||||
|
|||||||
@@ -339,7 +339,6 @@ pub(crate) struct HCPrinter<'a, Outputter> {
|
|||||||
state_stack: Vec<TokenOrRedirect>,
|
state_stack: Vec<TokenOrRedirect>,
|
||||||
toplevel_spec: Option<DirectedOp>,
|
toplevel_spec: Option<DirectedOp>,
|
||||||
heap_locs: ReverseHeapVarDict,
|
heap_locs: ReverseHeapVarDict,
|
||||||
_printed_vars: IndexSet<Addr>,
|
|
||||||
last_item_idx: usize,
|
last_item_idx: usize,
|
||||||
cyclic_terms: IndexMap<Addr, usize>,
|
cyclic_terms: IndexMap<Addr, usize>,
|
||||||
non_cyclic_terms: IndexSet<usize>,
|
non_cyclic_terms: IndexSet<usize>,
|
||||||
@@ -348,7 +347,6 @@ pub(crate) struct HCPrinter<'a, Outputter> {
|
|||||||
pub(crate) numbervars: bool,
|
pub(crate) numbervars: bool,
|
||||||
pub(crate) quoted: bool,
|
pub(crate) quoted: bool,
|
||||||
pub(crate) ignore_ops: bool,
|
pub(crate) ignore_ops: bool,
|
||||||
pub(crate) _print_strings_as_strs: bool,
|
|
||||||
pub(crate) max_depth: usize,
|
pub(crate) max_depth: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -466,7 +464,6 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
|
|||||||
state_stack: vec![],
|
state_stack: vec![],
|
||||||
heap_locs: ReverseHeapVarDict::new(),
|
heap_locs: ReverseHeapVarDict::new(),
|
||||||
toplevel_spec: None,
|
toplevel_spec: None,
|
||||||
_printed_vars: IndexSet::new(),
|
|
||||||
last_item_idx: 0,
|
last_item_idx: 0,
|
||||||
numbervars: false,
|
numbervars: false,
|
||||||
numbervars_offset: Integer::from(0),
|
numbervars_offset: Integer::from(0),
|
||||||
@@ -475,7 +472,6 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
|
|||||||
cyclic_terms: IndexMap::new(),
|
cyclic_terms: IndexMap::new(),
|
||||||
non_cyclic_terms: IndexSet::new(),
|
non_cyclic_terms: IndexSet::new(),
|
||||||
var_names: IndexMap::new(),
|
var_names: IndexMap::new(),
|
||||||
_print_strings_as_strs: false,
|
|
||||||
max_depth: 0,
|
max_depth: 0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1351,7 +1351,7 @@ impl<'a> LoadState<'a> {
|
|||||||
settings: CodeGenSettings,
|
settings: CodeGenSettings,
|
||||||
atom_tbl: TabledData<Atom>,
|
atom_tbl: TabledData<Atom>,
|
||||||
) -> Result<StandaloneCompileResult, SessionError> {
|
) -> Result<StandaloneCompileResult, SessionError> {
|
||||||
let mut preprocessor = Preprocessor::new(self.wam.machine_st.flags);
|
let mut preprocessor = Preprocessor::new();
|
||||||
let mut cg = CodeGenerator::<DebrayAllocator>::new(atom_tbl.clone(), settings);
|
let mut cg = CodeGenerator::<DebrayAllocator>::new(atom_tbl.clone(), settings);
|
||||||
|
|
||||||
let clause = self.try_term_to_tl(term, &mut preprocessor)?;
|
let clause = self.try_term_to_tl(term, &mut preprocessor)?;
|
||||||
@@ -1389,7 +1389,7 @@ impl<'a> LoadState<'a> {
|
|||||||
CodeGenerator::<DebrayAllocator>::new(self.wam.machine_st.atom_tbl.clone(), settings);
|
CodeGenerator::<DebrayAllocator>::new(self.wam.machine_st.atom_tbl.clone(), settings);
|
||||||
|
|
||||||
let mut clauses = vec![];
|
let mut clauses = vec![];
|
||||||
let mut preprocessor = Preprocessor::new(self.wam.machine_st.flags);
|
let mut preprocessor = Preprocessor::new();
|
||||||
|
|
||||||
for term in predicates.predicates.drain(0..) {
|
for term in predicates.predicates.drain(0..) {
|
||||||
clauses.push(self.try_term_to_tl(term, &mut preprocessor)?);
|
clauses.push(self.try_term_to_tl(term, &mut preprocessor)?);
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ use lazy_static::lazy_static;
|
|||||||
use crate::clause_types::*;
|
use crate::clause_types::*;
|
||||||
use crate::forms::*;
|
use crate::forms::*;
|
||||||
use crate::instructions::*;
|
use crate::instructions::*;
|
||||||
use crate::machine::heap::*;
|
|
||||||
use crate::machine::loader::*;
|
use crate::machine::loader::*;
|
||||||
use crate::machine::term_stream::{LiveTermStream, LoadStatePayload, TermStream};
|
use crate::machine::term_stream::{LiveTermStream, LoadStatePayload, TermStream};
|
||||||
use crate::read::*;
|
use crate::read::*;
|
||||||
@@ -109,7 +108,6 @@ impl LoadContext {
|
|||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Machine {
|
pub struct Machine {
|
||||||
pub(super) machine_st: MachineState,
|
pub(super) machine_st: MachineState,
|
||||||
pub(super) _inner_heap: Heap,
|
|
||||||
pub(super) policies: MachinePolicies,
|
pub(super) policies: MachinePolicies,
|
||||||
pub(super) indices: IndexStore,
|
pub(super) indices: IndexStore,
|
||||||
pub(super) code_repo: CodeRepo,
|
pub(super) code_repo: CodeRepo,
|
||||||
@@ -280,7 +278,6 @@ impl Machine {
|
|||||||
|
|
||||||
let mut wam = Machine {
|
let mut wam = Machine {
|
||||||
machine_st: MachineState::new(),
|
machine_st: MachineState::new(),
|
||||||
_inner_heap: Heap::new(),
|
|
||||||
policies: MachinePolicies::new(),
|
policies: MachinePolicies::new(),
|
||||||
indices: IndexStore::new(),
|
indices: IndexStore::new(),
|
||||||
code_repo: CodeRepo::new(),
|
code_repo: CodeRepo::new(),
|
||||||
|
|||||||
@@ -553,14 +553,12 @@ fn qualified_clause_to_query_term<'a>(
|
|||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub(crate) struct Preprocessor {
|
pub(crate) struct Preprocessor {
|
||||||
_flags: MachineFlags,
|
|
||||||
queue: VecDeque<VecDeque<Term>>,
|
queue: VecDeque<VecDeque<Term>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Preprocessor {
|
impl Preprocessor {
|
||||||
pub(super) fn new(flags: MachineFlags) -> Self {
|
pub(super) fn new() -> Self {
|
||||||
Preprocessor {
|
Preprocessor {
|
||||||
_flags: flags,
|
|
||||||
queue: VecDeque::new(),
|
queue: VecDeque::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -109,7 +109,6 @@ pub(crate) struct OrFramePrelude {
|
|||||||
pub(crate) b: usize,
|
pub(crate) b: usize,
|
||||||
pub(crate) bp: LocalCodePtr,
|
pub(crate) bp: LocalCodePtr,
|
||||||
pub(crate) tr: usize,
|
pub(crate) tr: usize,
|
||||||
pub(crate) _pstr_tr: usize,
|
|
||||||
pub(crate) h: usize,
|
pub(crate) h: usize,
|
||||||
pub(crate) b0: usize,
|
pub(crate) b0: usize,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user