Some fixes

Author: c-mateo

Project/Properties/launchSettings.json

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Transactions;
 
 namespace Golfscript
 {
@@ -15,6 +16,33 @@ public static IEnumerable<T> Difference<T>(this IEnumerable<T> left, IEnumerable
             }
         }
 
+        public static IEnumerable<int> FindAll<T>(this List<T> left, List<T> right, int offset = 0)
+        {
+            int match = 0;
+            for (int i = 0; i < left.Count; i++)
+            {
+                if (match == right.Count)
+                {
+                    yield return i - right.Count;
+                    match = 0;
+                }
+
+                match = left[i].Equals(right[match]) ? match + 1 : 0;
+            }
+        }
+
+
+        public static IEnumerable<IEnumerable<T>> Split<T>(this List<T> left, List<T> right)
+        {
+            int start = 0;
+            foreach (var index in left.FindAll(right))
+            {
+                yield return left.GetRange(start, index - start);
+                start = index + right.Count;
+            }
+            yield return left.GetRange(start, left.Count - start);
+        }
+
         public static IEnumerable<T> SymmetricDifference<T>(this IEnumerable<T> left, IEnumerable<T> right)
         {
             var union = left.Union(right);

Project/src/Extensions.cs

@@ -95,7 +95,7 @@ public void ResetVariables()
             SetVariable("if", Operators.If);
             SetVariable("print", Operators.Print);
             SetVariable("until", Operators.Until);
-            SetVariable("rand", Operators.Until);
+            SetVariable("rand", Operators.Rand);
             SetVariable("while", Operators.While);
 
             SetVariable("n", new StringItem("\n"));

Project/src/Golfscript.cs

@@ -390,26 +390,66 @@ internal static void Division(Stack context)
                 var value = second.GetInt() / first.GetInt();
                 result = new IntegerItem(value);
             }
+            #region Split Matches
             else if (tuple == (ItemType.String, ItemType.String))
             {
-                var separator = second.GetString();
-                var split = first.GetString().Split(separator);
-                var value = split.Where(str => str.Length > 0).Select(str => new StringItem(str));
+                var separator = first.GetString();
+                var split = second.GetString().Split(separator);
+                var value = split.Select(str => new StringItem(str));
                 result = new ArrayItem(value);
             }
-            // TODO: Array implementation
-            //else if (tuple == (ItemType.Array, ItemType.Array))
-            //{
-            //    var separator = second.GetArray();
-            //    var split = first.GetArray().Split(separator);
-            //    var value = split.Where(str => str.Length > 0).Select(str => new StringItem(str));
-            //    result = new ArrayItem(value);
-            //}
+            else if (tuple == (ItemType.Array, ItemType.Array))
+            {
+                var separator = first.GetArray();
+                var split = second.GetArray().Split(separator);
+                var value = split.Select(str => new ArrayItem(str));
+                result = new ArrayItem(value);
+            }
+            #endregion
+            #region Split Size
+            else if (tuple == (ItemType.String, ItemType.Integer))
+            {
+                var size = (int)second.GetInt();
+                var split = first.GetString().Chunk(size);
+                var value = split.Select(str => new StringItem(str));
+                result = new ArrayItem(value);
+            }
+            else if (tuple == (ItemType.Array, ItemType.Integer))
+            {
+                var size = (int)second.GetInt();
+                var split = first.GetArray().Chunk(size);
+                var value = split.Select(arr => new ArrayItem(arr));
+                result = new ArrayItem(value);
+            }
+            #endregion
             else if (tuple == (ItemType.Block, ItemType.Array))
             {
                 Each(context, first, second);
                 return;
             }
+            else if (tuple == (ItemType.Block, ItemType.Block))
+            {
+                var condition = second.GetString();
+                var code = first.GetString();
+
+                var list = new List<Item>();
+
+                while (true)
+                {
+                    Duplicate(context);
+                    context.Golfscript.Run(condition);
+
+                    if (!context.Pop().Truthy)
+                        break;
+
+                    list.Add(context.Peek());
+                    context.Golfscript.Run(code);
+                }
+
+                context.Pop();
+                context.Push(new ArrayItem(list));
+                return;
+            }
             else
             {
                 return;
@@ -722,6 +762,24 @@ internal static void Pow(Stack context)
                 var index = str.IndexOf(value);
                 context.Push(new IntegerItem(index));
             }
+            else if (tuple == (ItemType.Block, ItemType.Array))
+            {
+                var array = second.GetArray();
+                var condition = first.GetString();
+
+                foreach (var item in array)
+                {
+                    context.Push(item);
+                    context.Golfscript.Run(condition);
+
+                    if (context.Pop().Truthy)
+                    {
+                        context.Push(item);
+                        break;
+                    }
+                }
+                return;
+            }
             else if (first.Type == ItemType.Array)
             {
                 var array = first.GetArray();

Project/src/Operators.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 
 namespace Golfscript

Project/src/Program.cs

@@ -68,8 +68,9 @@ public Item Peek(int index = 0)
 
         StackFrame? FindFrame(ref int index)
         {
-            foreach (var frame in stackFrames)
+            for (int i = stackFrames.Count - 1; i >= 0; i--)
             {
+                var frame = stackFrames[i];
                 if (frame.Size > index)
                     return frame;