Fix tests

This commit is contained in:
Adam
2015-12-31 13:20:46 -05:00
parent a495c5c905
commit c5941c5f6a
4 changed files with 37 additions and 6 deletions

View File

@@ -38,7 +38,7 @@ public class Execution
private MultiValueMap<InstructionContext, Method> invokes = new MultiValueMap<>();
public MultiValueMap<Instruction, InstructionContext> contexts = new MultiValueMap<>();
public boolean paused;
public boolean step = true;
public boolean step = false;
public Execution(ClassGroup group)
{
@@ -107,7 +107,9 @@ public class Execution
public Frame invoke(InstructionContext from, Method to)
{
if(!step) return null;//THIS BREAKS THIS
if (step) // step executor
return null;
if (hasInvoked(from, to))
return null;

View File

@@ -228,7 +228,7 @@ public class Frame
/* jump */
}
if (!execution.step && oldCur instanceof MappableInstruction)
if (execution.step && oldCur instanceof MappableInstruction)
{
execution.paused = true;
return;

View File

@@ -17,7 +17,7 @@ public class ParallellMappingExecutor
p1 = p2 = null;
if (e.frames.isEmpty())
if (e.frames.isEmpty() || e2.frames.isEmpty())
return false;
Frame f1 = e.frames.get(0), f2 = e2.frames.get(0);