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

correct assertz/1 bugs (#922)

Browse Source
This commit is contained in:
Mark Thom
2021-05-04 17:53:02 -06:00
parent d9e42bfcba
commit c9e32c449a
1 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/machine/compile.rs
View File

@@ -224,8 +224,20 @@ fn find_inner_choice_instr(code: &Code, mut index: usize, index_loc: usize) -> u
index = index_loc; index = index_loc;
} }
} }
&Line::Choice(ChoiceInstruction::DynamicElse(_, _, next_or_fail)) &Line::Choice(ChoiceInstruction::DynamicElse(_, _, next_or_fail)) => match next_or_fail
| &Line::Choice(ChoiceInstruction::DynamicInternalElse(_, _, next_or_fail)) => { {
NextOrFail::Next(i) => {
if i == 0 {
index = index_loc;
} else {
return index;
}
}
NextOrFail::Fail(_) => {
index = index_loc;
}
},
&Line::Choice(ChoiceInstruction::DynamicInternalElse(_, _, next_or_fail)) => {
match next_or_fail { match next_or_fail {
NextOrFail::Next(i) => { NextOrFail::Next(i) => {
if i == 0 { if i == 0 {
@@ -656,16 +668,12 @@ fn thread_choice_instr_at_to(
*o = target_loc - instr_loc; *o = target_loc - instr_loc;
return; return;
} }
Line::Choice(ChoiceInstruction::DynamicElse(_, _, NextOrFail::Next(ref mut o))) Line::Choice(ChoiceInstruction::DynamicElse(_, _, NextOrFail::Next(o)))
| Line::Choice(ChoiceInstruction::DynamicInternalElse( | Line::Choice(ChoiceInstruction::DynamicInternalElse(_, _, NextOrFail::Next(o))) => {
_,
_,
NextOrFail::Next(ref mut o),
)) => {
instr_loc += *o; instr_loc += *o;
} }
Line::Choice(ChoiceInstruction::TryMeElse(ref mut o)) Line::Choice(ChoiceInstruction::TryMeElse(o))
| Line::Choice(ChoiceInstruction::RetryMeElse(ref mut o)) => { | Line::Choice(ChoiceInstruction::RetryMeElse(o)) => {
instr_loc += *o; instr_loc += *o;
} }
Line::Control(ControlInstruction::RevJmpBy(ref mut o)) if instr_loc >= target_loc => { Line::Control(ControlInstruction::RevJmpBy(ref mut o)) if instr_loc >= target_loc => {
@@ -725,6 +733,12 @@ fn thread_choice_instr_at_to(
instr_loc += *o; instr_loc += *o;
} }
_ => { _ => {
println!("failing code: \n");
for index in instr_loc - 40..instr_loc + 40 {
println!("{:07} | {}", index, code[index]);
}
unreachable!() unreachable!()
} }
} }
@@ -1224,6 +1238,23 @@ fn append_compiled_clause(
skeleton.clauses[target_pos].opt_arg_index_key += clause_loc; skeleton.clauses[target_pos].opt_arg_index_key += clause_loc;
code.extend(clause_code.drain(1..)); code.extend(clause_code.drain(1..));
match skeleton.clauses[target_pos]
.opt_arg_index_key
.switch_on_term_loc()
{
Some(index_loc) => {
// point to the inner-threaded TryMeElse(0) if target_pos is
// indexed, and make switch_on_term point one line after it in
// its variable offset.
skeleton.clauses[target_pos].clause_start += 2;
if !skeleton.core.is_dynamic {
set_switch_var_offset(code, index_loc, 2, retraction_info);
}
}
None => {}
}
match skeleton.clauses[lower_bound] match skeleton.clauses[lower_bound]
.opt_arg_index_key .opt_arg_index_key
.switch_on_term_loc() .switch_on_term_loc()
@@ -1240,23 +1271,6 @@ fn append_compiled_clause(
code_ptr_opt = Some(skeleton.clauses[lower_bound].clause_start); code_ptr_opt = Some(skeleton.clauses[lower_bound].clause_start);
} }
match skeleton.clauses[target_pos]
.opt_arg_index_key
.switch_on_term_loc()
{
Some(index_loc) => {
// point to the inner-threaded TryMeElse(0) if target_pos is
// indexed, and make switch_on_term point one line after it in
// its variable offset.
skeleton.clauses[target_pos].clause_start += 2;
if !skeleton.core.is_dynamic {
set_switch_var_offset(code, index_loc, 2, retraction_info);
}
}
None => {}
}
find_outer_choice_instr(code, skeleton.clauses[lower_bound].clause_start) find_outer_choice_instr(code, skeleton.clauses[lower_bound].clause_start)
} }
} }