From 49e024bdd88ffd55f0bcb5115f795249e8ca8283 Mon Sep 17 00:00:00 2001 From: Skgland Date: Thu, 11 Nov 2021 19:32:35 +0100 Subject: [PATCH] remove unused fields instead, prompting more dead_code removal --- src/forms.rs | 3 --- src/heap_print.rs | 4 ---- src/machine/compile.rs | 4 ++-- src/machine/mod.rs | 3 --- src/machine/preprocessor.rs | 4 +--- src/machine/stack.rs | 1 - 6 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/forms.rs b/src/forms.rs index b24884ab..4f579c8c 100644 --- a/src/forms.rs +++ b/src/forms.rs @@ -435,7 +435,6 @@ pub(crate) struct Module { pub(crate) meta_predicates: MetaPredicateDir, pub(crate) extensible_predicates: ExtensiblePredicates, pub(crate) local_extensible_predicates: LocalExtensiblePredicates, - pub(crate) _is_impromptu_module: bool, pub(crate) listing_src: ListingSource, } @@ -447,7 +446,6 @@ impl Module { code_dir: CodeDir::new(), op_dir: default_op_dir(), meta_predicates: MetaPredicateDir::new(), - _is_impromptu_module: false, extensible_predicates: ExtensiblePredicates::new(), local_extensible_predicates: LocalExtensiblePredicates::new(), listing_src, @@ -460,7 +458,6 @@ impl Module { code_dir: CodeDir::new(), op_dir: OpDir::new(), meta_predicates: MetaPredicateDir::new(), - _is_impromptu_module: false, extensible_predicates: ExtensiblePredicates::new(), local_extensible_predicates: LocalExtensiblePredicates::new(), listing_src: ListingSource::DynamicallyGenerated, diff --git a/src/heap_print.rs b/src/heap_print.rs index 68554d5b..09af815f 100644 --- a/src/heap_print.rs +++ b/src/heap_print.rs @@ -339,7 +339,6 @@ pub(crate) struct HCPrinter<'a, Outputter> { state_stack: Vec, toplevel_spec: Option, heap_locs: ReverseHeapVarDict, - _printed_vars: IndexSet, last_item_idx: usize, cyclic_terms: IndexMap, non_cyclic_terms: IndexSet, @@ -348,7 +347,6 @@ pub(crate) struct HCPrinter<'a, Outputter> { pub(crate) numbervars: bool, pub(crate) quoted: bool, pub(crate) ignore_ops: bool, - pub(crate) _print_strings_as_strs: bool, pub(crate) max_depth: usize, } @@ -466,7 +464,6 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> { state_stack: vec![], heap_locs: ReverseHeapVarDict::new(), toplevel_spec: None, - _printed_vars: IndexSet::new(), last_item_idx: 0, numbervars: false, numbervars_offset: Integer::from(0), @@ -475,7 +472,6 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> { cyclic_terms: IndexMap::new(), non_cyclic_terms: IndexSet::new(), var_names: IndexMap::new(), - _print_strings_as_strs: false, max_depth: 0, } } diff --git a/src/machine/compile.rs b/src/machine/compile.rs index b0242aac..ef99df34 100644 --- a/src/machine/compile.rs +++ b/src/machine/compile.rs @@ -1351,7 +1351,7 @@ impl<'a> LoadState<'a> { settings: CodeGenSettings, atom_tbl: TabledData, ) -> Result { - let mut preprocessor = Preprocessor::new(self.wam.machine_st.flags); + let mut preprocessor = Preprocessor::new(); let mut cg = CodeGenerator::::new(atom_tbl.clone(), settings); let clause = self.try_term_to_tl(term, &mut preprocessor)?; @@ -1389,7 +1389,7 @@ impl<'a> LoadState<'a> { CodeGenerator::::new(self.wam.machine_st.atom_tbl.clone(), settings); 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..) { clauses.push(self.try_term_to_tl(term, &mut preprocessor)?); diff --git a/src/machine/mod.rs b/src/machine/mod.rs index 11095caa..1f7ef41a 100644 --- a/src/machine/mod.rs +++ b/src/machine/mod.rs @@ -7,7 +7,6 @@ use lazy_static::lazy_static; use crate::clause_types::*; use crate::forms::*; use crate::instructions::*; -use crate::machine::heap::*; use crate::machine::loader::*; use crate::machine::term_stream::{LiveTermStream, LoadStatePayload, TermStream}; use crate::read::*; @@ -109,7 +108,6 @@ impl LoadContext { #[derive(Debug)] pub struct Machine { pub(super) machine_st: MachineState, - pub(super) _inner_heap: Heap, pub(super) policies: MachinePolicies, pub(super) indices: IndexStore, pub(super) code_repo: CodeRepo, @@ -280,7 +278,6 @@ impl Machine { let mut wam = Machine { machine_st: MachineState::new(), - _inner_heap: Heap::new(), policies: MachinePolicies::new(), indices: IndexStore::new(), code_repo: CodeRepo::new(), diff --git a/src/machine/preprocessor.rs b/src/machine/preprocessor.rs index 317a6b94..b93f270e 100644 --- a/src/machine/preprocessor.rs +++ b/src/machine/preprocessor.rs @@ -553,14 +553,12 @@ fn qualified_clause_to_query_term<'a>( #[derive(Debug)] pub(crate) struct Preprocessor { - _flags: MachineFlags, queue: VecDeque>, } impl Preprocessor { - pub(super) fn new(flags: MachineFlags) -> Self { + pub(super) fn new() -> Self { Preprocessor { - _flags: flags, queue: VecDeque::new(), } } diff --git a/src/machine/stack.rs b/src/machine/stack.rs index 11b0a8f0..a3c91713 100644 --- a/src/machine/stack.rs +++ b/src/machine/stack.rs @@ -109,7 +109,6 @@ pub(crate) struct OrFramePrelude { pub(crate) b: usize, pub(crate) bp: LocalCodePtr, pub(crate) tr: usize, - pub(crate) _pstr_tr: usize, pub(crate) h: usize, pub(crate) b0: usize, } -- 2.54.0