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

fix faulty tidy_trail

Browse Source
This commit is contained in:
Mark Thom
2018-11-15 23:04:52 -07:00
parent 81f4128bc6
commit 6e20f82d6f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/prolog/lib/dcgs.pl
View File

@@ -6,7 +6,7 @@
:- op(1200, xfx, -->).
phrase(G, G) :-
nonvar(G), G = [_|_], !. %, append(G, _, Ls0).
nonvar(G), G = [_|_], !.
phrase(G, Ls0) :-
nonvar(G), G = (G1, G2), !, phrase(G1, Ls0, Ls1), phrase(G2, Ls1, []).
phrase(G, Ls0) :-
@@ -50,7 +50,7 @@ expand_body(Term0, (ModTerm, ModTerms), N0, N) :-
nonvar(Term),
expand_body_term(Term, ModTerm, N0, N1),
expand_body(Terms, ModTerms, N1, N).
expand_body(Term0, ModTerm, N0, N) :-
expand_body(Term0, ModTerm, N0, N) :-
nonvar(Term0),
expand_body_term(Term0, ModTerm, N0, N).

8
src/prolog/machine/machine_state_impl.rs
View File

@@ -32,7 +32,7 @@ macro_rules! try_or_fail {
impl MachineState {
pub(super) fn new() -> Self {
MachineState {
MachineState {
s: 0,
p: CodePtr::default(),
b: 0,
@@ -132,10 +132,10 @@ impl MachineState {
output.append(" = ");
let mut printer = HCPrinter::from_heap_locs(&self, output, var_dir);
printer.numbervars = false;
printer.quoted = true;
let mut output = printer.print(addr);
let bad_ending = format!("= {}", &var);
@@ -428,6 +428,7 @@ impl MachineState {
let tr = self.tr;
let val = self.trail[tr - 1];
self.trail[i] = val;
self.trail.pop();
self.tr -= 1;
},
Ref::StackCell(fr, _) => {
@@ -445,6 +446,7 @@ impl MachineState {
let tr = self.tr;
let val = self.trail[tr - 1];
self.trail[i] = val;
self.trail.pop();
self.tr -= 1;
}
}