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

relocate most instruction routines from MachineState to Machine

Browse Source
This commit is contained in:
Mark Thom
2021-12-17 22:02:20 -07:00
parent 6f9b6a29c4
commit 3db86f1e25
17 changed files with 3571 additions and 4016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/machine/compile.rs
View File

@@ -1371,12 +1371,16 @@ impl<'a, LS: LoadState<'a>> Loader<'a, LS> {
term: Term,
settings: CodeGenSettings,
) -> Result<StandaloneCompileResult, SessionError> {
let mut preprocessor = Preprocessor::new(LS::machine_st(&mut self.payload).flags);
let mut preprocessor = Preprocessor::new();
let clause = self.try_term_to_tl(term, &mut preprocessor)?;
let queue = preprocessor.parse_queue(self)?;
let mut cg = CodeGenerator::<DebrayAllocator>::new(&mut LS::machine_st(&mut self.payload).atom_tbl, settings);
let mut cg = CodeGenerator::<DebrayAllocator>::new(
&mut LS::machine_st(&mut self.payload).atom_tbl,
settings,
);
let mut clause_code = cg.compile_predicate(&vec![clause])?;
compile_appendix(
@@ -1405,7 +1409,7 @@ impl<'a, LS: LoadState<'a>> Loader<'a, LS> {
let mut code_ptr = code_len;
let mut clauses = vec![];
let mut preprocessor = Preprocessor::new(LS::machine_st(&mut self.payload).flags);
let mut preprocessor = Preprocessor::new();
for term in predicates.predicates.drain(0..) {
clauses.push(self.try_term_to_tl(term, &mut preprocessor)?);