Separate out my script engine for further improvements

Fix some stupid bugs in the test and the actual engine.

Author: LoneWandererProductions

InterpreteTests/CommandBuilder.cs

@@ -10,6 +10,7 @@
 using System.Diagnostics;
 using ExtendedSystemObjects;
 using Interpreter;
+using Interpreter.ScriptEngine;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace InterpreteTests
@@ -45,10 +46,12 @@ public void ParseIfElseClausesSingleIfClauseReturnsOneIfElseObj()
             // Act
             var result = ConditionalExpressions.ParseIfElseClauses(input);
 
-            // Assert
+            // Assert: only one IfElseObj should exist
+            Assert.IsNotNull(result);
             Assert.AreEqual(1, result.Count);
 
-            var ifElseObj = result[0];
+            // Grab the only object
+            Assert.IsTrue(result.TryGetValue(0, out var ifElseObj));
             Assert.AreEqual(0, ifElseObj.Id);
             Assert.AreEqual(-1, ifElseObj.ParentId);
             Assert.AreEqual(0, ifElseObj.Position);
@@ -57,34 +60,34 @@ public void ParseIfElseClausesSingleIfClauseReturnsOneIfElseObj()
             Assert.IsFalse(ifElseObj.Nested);
             Assert.AreEqual("if (condition1) {com1; }", ifElseObj.Input);
 
-            foreach (var value in result)
-            {
-                Trace.WriteLine(value.ToString());
-            }
-
-
-            var commands = IrtParserCommand.BuildCommand(input);
-
-            Trace.WriteLine(commands.ToString());
+            // Output debug info
+            Trace.WriteLine(ifElseObj.ToString());
 
+            // Validate commands inside the IfElseObj
             var expectedResults = new List<(int Key, string Category, string Value)>
             {
-                (0, "IF", "condition1"), (1, "COMMAND", "com1")
+                (0, "If_Condition", "condition1"),
+                (1, "If", "com1;")
             };
 
-            //// Assert
-            foreach (var expected in expectedResults)
+            foreach (var (key, cat, val) in ifElseObj.Commands)
             {
-                var (key, category, value) = expected;
-                //Assert.IsTrue(result.TryGetCategory(key, out var actualCategory));
+                Trace.WriteLine($"Parsed Command -> Key: {key}, Category: {cat}, Value: {val}");
+            }
 
-                //Assert.AreEqual(category, actualCategory, $"Category mismatch for key {key}");
-                //Assert.IsTrue(result.TryGetValue(key, out var actualValue));
-                //TODO error here
-                //Assert.AreEqual(value, actualValue, $"Value mismatch for key {key}");
+            foreach (var (key, category, value) in expectedResults)
+            {
+                Assert.IsTrue(ifElseObj.Commands.TryGetCategory(key, out var actualCategory),
+                    $"Missing category for key {key}");
+                Assert.AreEqual(category, actualCategory, $"Category mismatch for key {key}");
+
+                Assert.IsTrue(ifElseObj.Commands.TryGetValue(key, out var actualValue),
+                    $"Missing value for key {key}");
+                Assert.AreEqual(value, actualValue, $"Value mismatch for key {key}");
             }
         }
 
+
         /// <summary>
         ///     Parses if else clauses single if clause returns correct object.
         /// </summary>
@@ -94,13 +97,13 @@ public void ParseIfElseClausesSingleIfClauseReturnsCorrectObject()
             const string input = "if (condition) { doSomething(); }";
             var result = ConditionalExpressions.ParseIfElseClauses(input);
 
-            //Assert.AreEqual(3, result.Count, "There should be one IfElseObj in the result.");
-            //var obj = result[0];
-            //Assert.IsFalse(obj.Else, "The 'Else' flag should be false for an 'if' clause.");
-            //Assert.AreEqual(-1, obj.ParentId, "The ParentId should be -1 for a top-level 'if' clause.");
-            //Assert.AreEqual(0, obj.Layer, "The Layer should be 0 for a top-level 'if' clause.");
-            //Assert.AreEqual(0, obj.Position, "The Position should be 0 for a top-level 'if' clause.");
-            //Assert.AreEqual("if (condition) { doSomething(); }", obj.Input, "The Input string should match.");
+            Assert.AreEqual(1, result.Count, "There should be one IfElseObj in the result.");
+            var obj = result[0];
+            Assert.IsFalse(obj.Else, "The 'Else' flag should be false for an 'if' clause.");
+            Assert.AreEqual(-1, obj.ParentId, "The ParentId should be -1 for a top-level 'if' clause.");
+            Assert.AreEqual(0, obj.Layer, "The Layer should be 0 for a top-level 'if' clause.");
+            Assert.AreEqual(0, obj.Position, "The Position should be 0 for a top-level 'if' clause.");
+            Assert.AreEqual("if (condition) { doSomething(); }", obj.Input, "The Input string should match.");
         }
 
         /// <summary>

Interpreter/ConditionalExpressions.cs …r/ScriptEngine/ConditionalExpressions.csInterpreter/ConditionalExpressions.cs renamed to Interpreter/ScriptEngine/ConditionalExpressions.cs Interpreter/ConditionalExpressions.cs renamed to Interpreter/ScriptEngine/ConditionalExpressions.cs

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Interpreter
- * FILE:        Interpreter/ConditionalExpressions.cs
+ * PROJECT:     Interpreter.ScriptEngine
+ * FILE:        Interpreter.ScriptEngine/ConditionalExpressions.cs
  * PURPOSE:     Handle all logical Operations of the parser
  * PROGRAMMER:  Peter Geinitz (Wayfarer)
  * 
@@ -28,7 +28,7 @@
 using ExtendedSystemObjects;
 using Interpreter.Resources;
 
-namespace Interpreter
+namespace Interpreter.ScriptEngine
 {
     /// <summary>
     ///     Create Category Dictionary and handle nested structures
@@ -71,7 +71,8 @@ private static void ProcessInput(string input, bool isElse, int parentId, int la
                 if (!containsIf)
                 {
                     //position indicates current block pretty useless for now
-                    obj.Commands.Add(category, key, position.ToString()); // Add the block if it doesn't contain 'if'
+                    //obj.Commands.Add(category, key, position.ToString()); // Add the block if it doesn't contain 'if'
+                    obj.Commands.Add(category, key, value);
                     continue;
                 }
 

Interpreter/IfElseClause.cs Interpreter/ScriptEngine/IfElseClause.csInterpreter/IfElseClause.cs renamed to Interpreter/ScriptEngine/IfElseClause.cs

@@ -1,12 +1,12 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Interpreter
- * FILE:        IfElseClause.cs
+ * PROJECT:     Interpreter.ScriptEngine
+ * FILE:        Interpreter.ScriptEngine/IfElseClause.cs
  * PURPOSE:     Your file purpose here
  * PROGRAMMER:  Peter Geinitz (Wayfarer)
  */
 
-namespace Interpreter
+namespace Interpreter.ScriptEngine
 {
     public sealed class IfElseClause
     {

Interpreter/IfElseObj.cs Interpreter/ScriptEngine/IfElseObj.csInterpreter/IfElseObj.cs renamed to Interpreter/ScriptEngine/IfElseObj.cs

@@ -1,14 +1,14 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Interpreter
- * FILE:        IfElseObj.cs
+ * PROJECT:     Interpreter.ScriptEngine
+ * FILE:        Interpreter.ScriptEngine/IfElseObj.cs
  * PURPOSE:     Your file purpose here
  * PROGRAMMER:  Peter Geinitz (Wayfarer)
  */
 
 using ExtendedSystemObjects;
 
-namespace Interpreter
+namespace Interpreter.ScriptEngine
 {
     internal sealed class IfElseObj
     {

Interpreter/IrtParserCommand.cs …rpreter/ScriptEngine/IrtParserCommand.csInterpreter/IrtParserCommand.cs renamed to Interpreter/ScriptEngine/IrtParserCommand.cs Interpreter/IrtParserCommand.cs renamed to Interpreter/ScriptEngine/IrtParserCommand.cs

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Interpreter
- * FILE:        IrtParserCommand.cs
+ * PROJECT:     Interpreter.ScriptEngine
+ * FILE:        Interpreter.ScriptEngine/IrtParserCommand.cs
  * PURPOSE:     Your file purpose here
  * PROGRAMMER:  Peter Geinitz (Wayfarer)
  */
@@ -10,7 +10,7 @@
 using ExtendedSystemObjects;
 using Interpreter.Resources;
 
-namespace Interpreter
+namespace Interpreter.ScriptEngine
 {
     internal static class IrtParserCommand
     {

Interpreter/IrtParserIfElse.cs …erpreter/ScriptEngine/IrtParserIfElse.csInterpreter/IrtParserIfElse.cs renamed to Interpreter/ScriptEngine/IrtParserIfElse.cs Interpreter/IrtParserIfElse.cs renamed to Interpreter/ScriptEngine/IrtParserIfElse.cs

@@ -1,22 +1,25 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Interpreter
- * FILE:        IrtParserIfElse.cs
- * PURPOSE:     Your file purpose here
+ * PROJECT:     Interpreter.ScriptEngine
+ * FILE:        Interpreter.ScriptEngine/IrtParserIfElse.cs
+ * PURPOSE:     Generate a Category for each command, here we parse if else for each nesting we create 
  * PROGRAMMER:  Peter Geinitz (Wayfarer)
  */
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Interpreter
+namespace Interpreter.ScriptEngine
 {
     /// <summary>
-    ///     Basic if else Parser
+    /// Basic if else Parser
     /// </summary>
     internal static class IrtParserIfElse
     {
+        /// <summary>
+        /// The identifier counter
+        /// </summary>
         private static int _idCounter;
 
         /// <summary>