Changed tuples to ReturnResult

eigerproject · Aug 31, 2024 · ad93812 · ad93812
1 parent 18a5974
commit ad93812
Show file tree

Hide file tree

Showing 18 changed files with 230 additions and 112 deletions.
diff --git a/eiger/Execution/BuiltInFunctions/Ascii.cs b/eiger/Execution/BuiltInFunctions/Ascii.cs
@@ -12,9 +12,12 @@ class AsciiFunction : BuiltInFunction
 {
     public AsciiFunction() : base("ascii", ["chr"]) { }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string filepath)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string filepath)
     {
         CheckArgs(filepath, line, pos, args.Count);
-        return (false, false, new Number(filepath, line, pos, ((String)args[0]).value[0]));
+        return new()
+        {
+            result = new Number(filepath, line, pos, ((String)args[0]).value[0])
+        };
     }
 }
diff --git a/eiger/Execution/BuiltInFunctions/Cls.cs b/eiger/Execution/BuiltInFunctions/Cls.cs
@@ -11,10 +11,13 @@ class ClsFunction : BuiltInFunction
 {
     public ClsFunction() : base("cls", []) { }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string filepath)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string filepath)
     {
         CheckArgs(filepath, line, pos, args.Count);
         Console.Clear();
-        return (false, false, new Nix(filepath, line, pos));
+        return new()
+        {
+            result = new Nix(filepath, line, pos)
+        };
     }
 }
diff --git a/eiger/Execution/BuiltInFunctions/Color.cs b/eiger/Execution/BuiltInFunctions/Color.cs
@@ -11,13 +11,16 @@ class ColorFunction : BuiltInFunction
 {
     public ColorFunction() : base("color", ["fg", "bg"]) { }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string filepath)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string filepath)
     {
         CheckArgs(filepath, line, pos, args.Count);
         Console.ForegroundColor = (ConsoleColor)((Number)args[0]).value;
         Console.BackgroundColor = (ConsoleColor)((Number)args[1]).value;
         Interpreter.fgColor.value = (int)Console.ForegroundColor;
         Interpreter.bgColor.value = (int)Console.BackgroundColor;
-        return (false, false, new Nix(filepath, line, pos));
+        return new()
+        {
+            result = new Nix(filepath, line, pos)
+        };
     }
 }
diff --git a/eiger/Execution/BuiltInFunctions/Double.cs b/eiger/Execution/BuiltInFunctions/Double.cs
@@ -11,18 +11,24 @@ class DoubleFunction : BuiltInFunction
 {
     public DoubleFunction() : base("double", ["val"]) { }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string filepath)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string filepath)
     {
         CheckArgs(filepath, line, pos, args.Count);
         if (args[0] is Number n)
         {
-            return (false, true, new Number(filepath, line, pos, n.value));
+            return new()
+            {
+                result = new Number(filepath, line, pos, n.value)
+            };
         }
         else if (args[0] is BuiltInTypes.String s)
         {
             try
             {
-                return (false, true, new Number(filepath, line, pos, Convert.ToDouble(s.value)));
+                return new()
+                {
+                    result = new Number(filepath, line, pos, Convert.ToDouble(s.value))
+                };
             }
             catch (FormatException)
             {

diff --git a/eiger/Execution/BuiltInFunctions/Emit.cs b/eiger/Execution/BuiltInFunctions/Emit.cs
@@ -11,10 +11,13 @@ class EmitFunction : BuiltInFunction
 {
     public EmitFunction() : base("emit", ["value"]) { }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string filepath)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string filepath)
     {
         CheckArgs(filepath, line, pos, args.Count);
         Console.Write(args[0]);
-        return (false, false, new Nix(filepath, line, pos));
+        return new()
+        {
+            result = new Nix(filepath, line, pos)
+        };
     }
 }
diff --git a/eiger/Execution/BuiltInFunctions/Emitln.cs b/eiger/Execution/BuiltInFunctions/Emitln.cs
@@ -11,10 +11,13 @@ class EmitlnFunction : BuiltInFunction
 {
     public EmitlnFunction() : base("emitln", ["value"]) { }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string filepath)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string filepath)
     {
         CheckArgs(filepath, line, pos, args.Count);
         Console.WriteLine(args[0]);
-        return (false, false, new Nix(filepath, line, pos));
+        return new()
+        {
+            result = new Nix(filepath, line, pos)
+        };
     }
 }
diff --git a/eiger/Execution/BuiltInFunctions/Exit.cs b/eiger/Execution/BuiltInFunctions/Exit.cs
@@ -11,10 +11,13 @@ class ExitFunction : BuiltInFunction
 {
     public ExitFunction() : base("exit", ["code"]) { }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string filepath)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string filepath)
     {
         CheckArgs(filepath, line, pos, args.Count);
         System.Environment.Exit(Convert.ToInt32(((Number)args[0]).value));
-        return (false, false, new Nix(filepath, line, pos));
+        return new()
+        {
+            result = new Nix(filepath, line, pos)
+        };
     }
 }
diff --git a/eiger/Execution/BuiltInFunctions/Fread.cs b/eiger/Execution/BuiltInFunctions/Fread.cs
@@ -12,7 +12,7 @@ class FreadFunction : BuiltInFunction
 {
     public FreadFunction() : base("fread", ["path"]) { }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string filepath)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string filepath)
     {
         CheckArgs(filepath, line, pos, args.Count);
         if (args[0] is not String)
@@ -21,7 +21,10 @@ public override (bool, bool, Value) Execute(List<Value> args, int line, int pos,
         {
             string pathStr = path.value;
             if (File.Exists(pathStr))
-                return (false, false, new String(filepath, line, pos, File.ReadAllText(pathStr)));
+                return new()
+                {
+                    result = new String(filepath, line, pos, File.ReadAllText(pathStr))
+                };
             else
                 throw new Errors.EigerError(filepath, line, pos, "File doesn't exist", Errors.EigerError.ErrorType.IOError);
 

diff --git a/eiger/Execution/BuiltInFunctions/In.cs b/eiger/Execution/BuiltInFunctions/In.cs
@@ -11,9 +11,12 @@ class InFunction : BuiltInFunction
 {
     public InFunction() : base("in", []) { }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string filepath)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string filepath)
     {
         CheckArgs(filepath, line, pos, args.Count);
-        return (false, true, new BuiltInTypes.String(filepath, line, pos, Console.ReadLine() ?? ""));
+        return new()
+        {
+            result = new BuiltInTypes.String(filepath, line, pos, Console.ReadLine() ?? "")
+        };
     }
 }
diff --git a/eiger/Execution/BuiltInFunctions/Inchar.cs b/eiger/Execution/BuiltInFunctions/Inchar.cs
@@ -11,9 +11,12 @@ class IncharFunction : BuiltInFunction
 {
     public IncharFunction() : base("inchar", []) { }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string filepath)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string filepath)
     {
         CheckArgs(filepath, line, pos, args.Count);
-        return (false, true, new BuiltInTypes.String(filepath, line, pos, Console.ReadKey().KeyChar.ToString()));
+        return new()
+        {
+            result = new BuiltInTypes.String(filepath, line, pos, Console.ReadKey().KeyChar.ToString())
+        };
     }
 }
diff --git a/eiger/Execution/BuiltInFunctions/Int.cs b/eiger/Execution/BuiltInFunctions/Int.cs
@@ -11,18 +11,24 @@ class IntFunction : BuiltInFunction
 {
     public IntFunction() : base("int", ["val"]) { }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string filepath)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string filepath)
     {
         CheckArgs(filepath, line, pos, args.Count);
         if (args[0] is Number n)
         {
-            return (false, true, new Number(filepath, line, pos, Convert.ToInt32(n.value)));
+            return new()
+            {
+                result = new Number(filepath, line, pos, Convert.ToInt32(n.value))
+            };
         }
         else if (args[0] is BuiltInTypes.String s)
         {
             try
             {
-                return (false, true, new Number(filepath, line, pos, Convert.ToInt32(Convert.ToDouble(s.value))));
+                return new()
+                {
+                    result = new Number(filepath, line, pos, Convert.ToInt32(Convert.ToDouble(s.value)))
+                };
             }
             catch (FormatException)
             {

diff --git a/eiger/Execution/BuiltInFunctions/Rand.cs b/eiger/Execution/BuiltInFunctions/Rand.cs
@@ -12,9 +12,12 @@ class RandFunction : BuiltInFunction
     public RandFunction() : base("rand", []) { }
     readonly Random rand = new();
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string filepath)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string filepath)
     {
         CheckArgs(filepath, line, pos, args.Count);
-        return (false, false, new Number(filepath, line, pos, rand.NextDouble()));
+        return new()
+        {
+            result = new Number(filepath, line, pos, rand.NextDouble())
+        };
     }
 }
diff --git a/eiger/Execution/BuiltInFunctions/Time.cs b/eiger/Execution/BuiltInFunctions/Time.cs
@@ -11,11 +11,14 @@ class TimeFunction : BuiltInFunction
 {
     public TimeFunction() : base("time", []) { }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string filepath)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string filepath)
     {
         CheckArgs(filepath, line, pos, args.Count);
         DateTimeOffset now = DateTimeOffset.Now;
         DateTimeOffset epoch = new(1970, 1, 1, 0, 0, 0, TimeSpan.Zero);
-        return (false, false, new Number(filepath, line, pos, (now - epoch).TotalSeconds));
+        return new()
+        {
+            result = new Number(filepath, line, pos, (now - epoch).TotalSeconds)
+        };
     }
 }
diff --git a/eiger/Execution/BuiltInTypes/Class.cs b/eiger/Execution/BuiltInTypes/Class.cs
@@ -20,7 +20,7 @@ public Class(string filename, int line, int pos, string name, Dictionary<string,
         this.blockNode = blockNode;
     }
 
-    public (bool, bool, Instance) Execute(List<Value> args)
+    public ReturnResult Execute(List<Value> args)
     {
         // create local symbol table
         Dictionary<string, Value> localSymbolTable = new(symbolTable);
@@ -37,7 +37,7 @@ public Class(string filename, int line, int pos, string name, Dictionary<string,
             if (value is Function constructorFunc)
                 constructorFunc.Execute(args, line, pos, filename);
 
-        return (false, false, inst);
+        return new() { result = inst };
     }
 
     public override Value GetAttr(ASTNode attr)

diff --git a/eiger/Execution/Function.cs b/eiger/Execution/Function.cs
@@ -23,7 +23,7 @@ public void CheckArgs(string path, int line, int pos, int argCount)
             throw new EigerError(path, line, pos, $"Function {name} takes {arg_n.Count} arguments, got {argCount}", EigerError.ErrorType.ArgumentError);
     }
 
-    public abstract (bool, bool, Value) Execute(List<Value> args, int line, int pos, string path); // abstract execute function
+    public abstract ReturnResult Execute(List<Value> args, int line, int pos, string path); // abstract execute function
 }
 
 // custom functions
@@ -37,7 +37,7 @@ public Function(ASTNode node, string name, List<string> arg_n, ASTNode root, Dic
         this.root = root;
     }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string path)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string path)
     {
         CheckArgs(path, line, pos, args.Count);
 
@@ -71,7 +71,7 @@ public InlineFunction(ASTNode node, string name, List<string> arg_n, ASTNode roo
         this.root = root;
     }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string path)
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string path)
     {
         CheckArgs(path, line, pos, args.Count);
 
@@ -85,8 +85,9 @@ public override (bool, bool, Value) Execute(List<Value> args, int line, int pos,
         }
 
         // visit the body and return the result
-        (bool shouldBreak, bool shouldReturn, Value v) = Interpreter.VisitNode(root, localSymbolTable);
-        return (shouldBreak, true, v);
+        ReturnResult r = Interpreter.VisitNode(root, localSymbolTable);
+        r.shouldReturn = true;
+        return r;
     }
 
     public override string ToString()
@@ -101,7 +102,7 @@ abstract class BuiltInFunction : BaseFunction
 {
     public BuiltInFunction(string name, List<string> arg_n) : base(new(NodeType.Block, 0, 0, 0, "<unset>"), name, arg_n, Interpreter.globalSymbolTable) { }
 
-    public override (bool, bool, Value) Execute(List<Value> args, int line, int pos, string file) { return (false, false, new Nix(file, line, pos)); }
+    public override ReturnResult Execute(List<Value> args, int line, int pos, string file) { return new() { result = new Nix(file, line, pos) }; }
 
     public override string ToString()
     {