Zip added

Author: c-mateo

Project/src/Golfscript.cs

@@ -97,6 +97,7 @@ public void ResetVariables()
             SetVariable("until", Operators.Until);
             SetVariable("rand", Operators.Rand);
             SetVariable("while", Operators.While);
+            SetVariable("zip", Operators.Zip);
 
             SetVariable("n", new StringItem("\n"));
             SetVariable("p", new BlockItem("`puts"));

Project/src/Operators.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.Numerics;
 using System.Text;
@@ -458,10 +460,10 @@ internal static void Division(Stack context)
             context.Push(result);
         }
 
-        internal static void Each(Stack context, Item first, Item second)
+        internal static void Each(Stack context, Item str, Item array)
         {
-            var code = first.GetString();
-            foreach (var item in second.GetArray())
+            var code = str.GetString();
+            foreach (var item in array.GetArray())
             {
                 context.Push(item);
                 context.Golfscript.Run(code);
@@ -492,6 +494,14 @@ internal static void Modulus(Stack context)
                 var value = split.Where(str => str.Length > 0).Select(str => new StringItem(str));
                 result = new ArrayItem(value);
             }
+            // TODO: Array implementation
+            else if (tuple == (ItemType.Array, ItemType.Array))
+            {
+                var separator = first.GetArray();
+                var split = second.GetArray().Split(separator);
+                var value = split.Where(arr => arr.Any()).Select(str => new ArrayItem(str));
+                result = new ArrayItem(value);
+            }
             else if (tuple == (ItemType.Block, ItemType.Array))
             {
                 context.PushFrame();
@@ -1046,7 +1056,7 @@ internal static void Peek(Stack context)
                 if (context.Size == 0)
                     return;
 
-                //var second = context.Pop();
+                var second = context.Pop();
                 // TODO: Mapping sort
                 //if (second.Type == ItemType.String)
                 //{
@@ -1187,6 +1197,76 @@ internal static void While(Stack context)
             }
         }
 
+
+        internal static void Zip(Stack context)
+        {
+            if (context.Size == 0)
+                return;
+
+            var first = context.Pop();
+
+            if (first.Type != ItemType.Array)
+            {
+                Console.WriteLine("It must be an array");
+                return;
+            }
+
+            var matrix = first.GetArray();
+
+            if (ItemType.Array.MatchAll(matrix.ToArray()))
+            {
+                var columnCount = matrix.Count;
+                var rowCount = (int)matrix.Max(row => row.Size);
+
+                var rows = new List<List<Item>>(rowCount);
+
+                for (int i = 0; i < rowCount; i++)
+                    rows.Add(new List<Item>(matrix.Count));
+
+                for (int i = 0; i < columnCount; i++)
+                {
+                    var row = matrix[i].GetArray();
+                    for (int j = 0; j < row.Count; j++)
+                    {
+                        var item = row[j];
+                        rows[j].Add(item);
+                    }
+                }
+
+                context.PushFrame();
+                for (int i = 0; i < rowCount; i++)
+                    context.Push(new ArrayItem(rows[i]));
+
+                context.PopFrame(true);
+            }
+            else if (ItemType.String.MatchAll(matrix.ToArray()))
+            {
+                var columnCount = matrix.Count;
+                var rowCount = (int)matrix.Max(row => row.Size);
+
+                var rows = new List<StringBuilder>(rowCount);
+
+                for (int i = 0; i < rowCount; i++)
+                    rows.Add(new StringBuilder(matrix.Count));
+
+                for (int i = 0; i < columnCount; i++)
+                {
+                    var row = matrix[i].GetString();
+                    for (int j = 0; j < row.Length; j++)
+                    {
+                        var item = row[j];
+                        rows[j].Append(item);
+                    }
+                }
+
+                context.PushFrame();
+                for (int i = 0; i < rowCount; i++)
+                    context.Push(new StringItem(rows[i].ToString()));
+
+                context.PopFrame(true);
+            }
+        }
+
         #endregion
 
         #region Utils

Project/src/Program.cs

@@ -10,7 +10,6 @@ class Program
         static void Main(string[] args)
         {
             //Format();
-
             var golfscript = new Golfscript();
 
             if (args.Length > 0)
@@ -44,45 +43,5 @@ static void Main(string[] args)
             } while (line == null || !line.StartsWith("quit"));
 
         }
-
-        const string SEPARATOR = "->";
-
-        static void Format()
-        {
-            Console.WriteLine("File?");
-            string file = Console.ReadLine();
-
-            var lines = File.ReadAllLines(file);
-
-            Console.WriteLine("Save to?");
-            file = Console.ReadLine();
-
-            using var stream = new StreamWriter(file);
-            stream.WriteLine("[Fact]");
-            stream.WriteLine("void Function(){");
-
-            foreach (string line in lines)
-            {
-                if (line.StartsWith("args"))
-                {
-                    stream.WriteLine("}\n\n");
-                    stream.WriteLine("[Fact]");
-                    stream.WriteLine("void Function(){");
-                }
-
-                if (!line.Contains(SEPARATOR))
-                    continue;
-
-                var split = line.Split(SEPARATOR);
-                var code = split[0].Trim().Replace("\"", "\\\"").Replace("\\", "\\\\");
-                var expected = split[1].Trim().Replace("\"", "\\\"").Replace("\\", "\\\\");
-
-                stream.Write("    Test(\"");
-                stream.Write(code);
-                stream.Write("\", \"");
-                stream.Write(expected);
-                stream.WriteLine("\");");
-            }
-        }
     }
 }