Changeset 14744 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/ShoveExpressions.cs

Timestamp:

03/10/17 21:42:09 (7 years ago)

Author:

pkimmesw

Message:

#2665 Renamings due to typos, ManagedPool tests, Skip Noops in Debugger

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/ShoveExpressions.cs (modified) (8 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/ShoveExpressions.cs

@@ -6 +6 @@
 
   public abstract class ShoveExpression<T> : StatelessExpression {
-    protected void Eval(IStack<T> stack, IStack<long> integerStack, int count = 1) {
+    protected bool Eval(IStack<T> stack, IStack<long> integerStack, int count = 1) {
       if (integerStack.Count == 0 ||
           integerStack.Top > stack.Count - count ||
           integerStack.Top < 0 ||
           stack.Count < 2)
-        return;
+        return false;
 
       var index = (int)integerStack.Pop();
@@ -17 +17 @@
 
       stack.Insert(index, item);
+      return true;
     }
   }
@@ -22 +23 @@
   [PushExpression(StackType.Integer, "INTEGER.SHOVE")]
   public class IntegerShoveExpression : ShoveExpression<long> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.IntegerStack, interpreter.IntegerStack, 2);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.IntegerStack, interpreter.IntegerStack, 2);
     }
   }
@@ -29 +30 @@
   [PushExpression(StackType.Float, "FLOAT.SHOVE")]
   public class FloatShoveExpression : ShoveExpression<double> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.FloatStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.FloatStack, interpreter.IntegerStack);
     }
   }
@@ -36 +37 @@
   [PushExpression(StackType.Boolean, "BOOLEAN.SHOVE")]
   public class BooleanShoveExpression : ShoveExpression<bool> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.BooleanStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.BooleanStack, interpreter.IntegerStack);
     }
   }
@@ -43 +44 @@
   [PushExpression(StackType.Name, "NAME.SHOVE")]
   public class NameShoveExpression : ShoveExpression<string> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.NameStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.NameStack, interpreter.IntegerStack);
     }
   }
@@ -50 +51 @@
   [PushExpression(StackType.Exec, "EXEC.SHOVE")]
   public class ExecShoveExpression : ShoveExpression<Expression> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.ExecStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.ExecStack, interpreter.IntegerStack);
     }
   }
@@ -57 +58 @@
   [PushExpression(StackType.Code, "CODE.SHOVE")]
   public class CodeShoveExpression : ShoveExpression<Expression> {
-    public override void Eval(IPushInterpreter interpreter) {
-      Eval(interpreter.CodeStack, interpreter.IntegerStack);
+    public override bool Eval(IPushInterpreter interpreter) {
+      return Eval(interpreter.CodeStack, interpreter.IntegerStack);
     }
   }