Add support for where target < initial val

WilliamQiufeng · Aug 29, 2022 · b281767 · b281767
1 parent e8eee13
commit b281767
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/PseudoCode.Core/Runtime/Operations/ForOperation.cs b/PseudoCode.Core/Runtime/Operations/ForOperation.cs
@@ -1,3 +1,4 @@
+using PseudoCode.Core.Runtime.Instances;
 using PseudoCode.Core.Runtime.Types;
 
 namespace PseudoCode.Core.Runtime.Operations;
@@ -13,15 +14,18 @@ public ForOperation(Scope parentScope, PseudoProgram program) : base(parentScope
     {
     }
 
+    public delegate Instance CompareFunc(Instance i1, Instance i2);
     public override void Operate()
     {
         base.Operate();
         // Initial Stack: [ref instance id]
         TargetValue.HandledOperate(); // [ref instance id, ref instance targ_val]
         var targetValue = Program.RuntimeStack.Pop();
         var incrementValue = Program.RuntimeStack.Pop();
+        var smaller = incrementValue.Type.SmallerEqual(incrementValue, targetValue).Get<bool>();
+        CompareFunc func = smaller ? incrementValue.Type.SmallerEqual : incrementValue.Type.GreaterEqual;
         // Stack empty
-        while (incrementValue.Type.SmallerEqual(incrementValue, targetValue).Get<bool>())
+        while (func(incrementValue, targetValue).Get<bool>())
         {
             ForBody.HandledOperate();
             Next.HandledOperate(); // [ref instance next]

diff --git a/PseudoCode.Core/Runtime/PseudoProgram.cs b/PseudoCode.Core/Runtime/PseudoProgram.cs
@@ -12,7 +12,7 @@ namespace PseudoCode.Core.Runtime;
 /// </summary>
 public class PseudoProgram
 {
-    public static readonly Version Version = new(1, 3, 2);
+    public static readonly Version Version = new(1, 3, 3);
 
     /// <summary>
     ///     Stores feedbacks during parsing and typechecking (metaoperation)

diff --git a/PseudoCode.Core/Runtime/Reflection/BuiltinFunctions.cs b/PseudoCode.Core/Runtime/Reflection/BuiltinFunctions.cs
@@ -154,7 +154,7 @@ public static int Find(string str, char chr)
     [BuiltinNativeFunction("INSTR")]
     public static int InString(int index, string str, char chr)
     {
-        return Find(str[(index - 1)..], chr);
+        return Find(str[(index - 1)..], chr) + index - 1;
     }
 
     [Documentation("Returns a random number [0..x)")]

diff --git a/PseudoCode.Core/run.pseudo b/PseudoCode.Core/run.pseudo
@@ -1,5 +1,7 @@
 
-
+FOR i <- 5 TO 1 STEP -1
+    OUTPUT i
+NEXT i
 arr <- [2]
 DECLARE a : REAL
 DECLARE b : ARRAY[1:3, 1:4] OF INTEGER