sync back weaver

Author: Wayfarer

CommonLibraryTests/IoFileSearch.cs

@@ -167,7 +167,6 @@ public async Task GetFileInformationAsync()
             Assert.IsFalse(check, "File not deleted");
         }
 
-
         /// <summary>
         ///     Simple Check for getting files Contained in a Folder
         ///     Check Lock Status

CoreLibrary.sln

@@ -77,7 +77,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonExtendedObjectsTests"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Projektmappenelemente", "Projektmappenelemente", "{84D27F74-D2BA-6C25-2661-968F101900D9}"
 	ProjectSection(SolutionItems) = preProject
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
 		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
+		License.txt = License.txt
+		README.md = README.md
+		Todo.txt = Todo.txt
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreViewer", "CoreViewer\CoreViewer.csproj", "{B17F7012-EB24-4A3A-9A97-9779E5116D66}"

Lector/SampleCommand.cs

@@ -92,14 +92,5 @@ public CommandResult Execute(params string[] args)
             var target = args[0];
             return new CommandResult { Message = $"[Preview] This would process '{target}'", Success = true };
         }
-
-        /// <inheritdoc />
-        /// <summary>
-        /// No extension handling required: all feedback handled via IFeedback.
-        /// </summary>
-        public CommandResult InvokeExtension(string extensionName, params string[] args)
-        {
-            return CommandResult.Fail($"Unknown extension '{extensionName}'.");
-        }
     }
 }

Lector/SampleExtension.cs

@@ -34,8 +34,7 @@ public sealed class SampleExtension : ICommandExtension
         /// <summary>
         /// Wraps the execution of the command. Can run before/after logic or inject feedback.
         /// </summary>
-        public CommandResult Invoke(ICommand command, string[] extensionArgs, Func<string[], CommandResult> executor,
-            string[] commandArgs)
+        public CommandResult Invoke(ICommand command, string[] extensionArgs, Func<string[], CommandResult> executor, string[] commandArgs)
         {
             // Before hook
             BeforeExecute(command, commandArgs);

Todo.txt

@@ -9,12 +9,6 @@ CommonControls
 - Improve ImageZoom, especial zooming and start Position of scrollbars on screen and positioning, overwork generation of the circle
 - rework color picker
 
-Lightvector
-- Add save function for curves, etc
-- finish and add more features
-
-Make a separate Interpreter Project with Mathmatics as an example
-
 Enum at RunTime
 
 https://stackoverflow.com/questions/857414/dynamically-create-an-enum
@@ -42,16 +36,4 @@ eb.DefineLiteral("High", 1);
 
 // Create the type and save the assembly.
 Type finished = eb.CreateType();
-ab.Save(aName.Name + ".dll");
-
-
-
-Using:
-
-System.Reflection.Assembly ass = System.Reflection.Assembly.LoadFrom("TempAssembly.dll");
-System.Type enumTest = ass.GetType("Elevation");
-string[] values = enumTest .GetEnumNames();
-
-
-TODO Debugger
-Add search lines with like, not like!
+ab.Save(aName.Name + ".dll");

Weaver/CommandSignature.cs

@@ -15,4 +15,4 @@ namespace Weaver
     /// <param name="Name">The name of the command.</param>
     /// <param name="ParameterCount">The number of parameters the command expects.</param>
     public record CommandSignature(string Namespace, string Name, int ParameterCount);
-}
+}

Weaver/Core/CommandExtension.cs

@@ -46,4 +46,4 @@ public sealed class CommandExtension
         /// </value>
         public bool IsPreview { get; init; }
     }
-}
+}

Weaver/Core/DeleteValueCommand.cs …aver/Core/Commands/DeleteValueCommand.csWeaver/Core/DeleteValueCommand.cs renamed to Weaver/Core/Commands/DeleteValueCommand.cs Weaver/Core/DeleteValueCommand.cs renamed to Weaver/Core/Commands/DeleteValueCommand.cs

@@ -1,6 +1,6 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Weaver.Core
+ * PROJECT:     Weaver.Core.Commands
  * FILE:        DeleteValueCommand.cs
  * PURPOSE:     Deletes a stored value from the Scripter Engine.
  * PROGRAMMER:  Peter Geinitz (Wayfarer)
@@ -61,9 +61,5 @@ public CommandResult Execute(params string[] args)
                 ? CommandResult.Ok($"Deleted variable '{key}'.")
                 : CommandResult.Fail($"Variable '{key}' not found.");
         }
-
-        /// <inheritdoc />
-        public CommandResult InvokeExtension(string extensionName, params string[] args)
-            => CommandResult.Fail("'deleteValue' has no extensions.");
     }
-}
+}

Weaver/Core/EvaluateCommand.cs Weaver/Core/Commands/EvaluateCommand.csWeaver/Core/EvaluateCommand.cs renamed to Weaver/Core/Commands/EvaluateCommand.cs

@@ -1,6 +1,6 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Weaver.Core
+ * PROJECT:     Weaver.Core.Commands
  * FILE:        EvaluateCommand.cs
  * PURPOSE:     Does double duty as internal command and extension to evaluate expressions. It can be either used as calculator or expression evaluator.
  * PROGRAMMER:  Peter Geinitz (Wayfarer)
@@ -10,12 +10,12 @@
 using Weaver.Interfaces;
 using Weaver.Messages;
 
-namespace Weaver.Core
+namespace Weaver.Core.Commands
 {
     /// <summary>
     /// Simple Commmand to evaluate expressions or do simple calculations.
     /// </summary>
-    /// <seealso cref="Weaver.Interfaces.ICommand" />
+    /// <seealso cref="ICommand" />
     internal class EvaluateCommand : ICommand
     {
         /// <inheritdoc />
@@ -64,7 +64,6 @@ public CommandResult Execute(string[] args)
             // If no expression, maybe store previous pipeline value or return null
             if (string.IsNullOrWhiteSpace(expression))
             {
-                // Allow empty input if .store() will handle it
                 return CommandResult.Ok(null);
             }
 
@@ -73,30 +72,40 @@ public CommandResult Execute(string[] args)
             {
                 foreach (var variable in _registry.GetAll())
                 {
-                    if (variable.Value.Value == null)
+                    var key = variable.Key;
+                    var (valueObj, valueType) = variable.Value;
+
+                    if (valueObj == null)
                         continue;
 
-                    var key = variable.Key;
-                    var val = variable.Value.Value.ToString() ?? "0";
-                    expression = expression.Replace(key, val, StringComparison.OrdinalIgnoreCase);
+                    string replacement = valueType switch
+                    {
+                        EnumTypes.Wint => Convert.ToInt64(valueObj).ToString(),
+                        EnumTypes.Wdouble => Convert.ToDouble(valueObj).ToString(CultureInfo.InvariantCulture),
+                        EnumTypes.Wbool => Convert.ToBoolean(valueObj) ? "1" : "0",
+                        EnumTypes.Wstring => valueObj.ToString() ?? "",
+                        _ => valueObj.ToString() ?? ""
+                    };
+
+                    expression = expression.Replace(key, replacement, StringComparison.OrdinalIgnoreCase);
                 }
             }
 
             object? result;
             EnumTypes type;
 
-            var isBooleanExpr = _evaluator.IsBooleanExpression(expression);
+            bool isBooleanExpr = _evaluator.IsBooleanExpression(expression);
 
             try
             {
                 if (isBooleanExpr)
                 {
-                    result = _evaluator.Evaluate(expression);
+                    result = _evaluator.Evaluate(expression); // returns bool
                     type = EnumTypes.Wbool;
                 }
                 else
                 {
-                    result = _evaluator.EvaluateNumeric(expression);
+                    result = _evaluator.EvaluateNumeric(expression); // returns double
                     type = EnumTypes.Wdouble;
                 }
             }
@@ -120,6 +129,7 @@ public CommandResult Execute(string[] args)
                 }
 
                 _registry.Set(targetVar, result!, type);
+
                 return CommandResult.Ok(
                     $"Stored '{result}' in '{targetVar}'.",
                     result,
@@ -128,7 +138,7 @@ public CommandResult Execute(string[] args)
             }
 
             // Return computed result
-            var message = type switch
+            string message = type switch
             {
                 EnumTypes.Wbool => result?.ToString() ?? "false",
                 EnumTypes.Wdouble => Convert.ToDouble(result).ToString(CultureInfo.InvariantCulture),
@@ -138,10 +148,5 @@ public CommandResult Execute(string[] args)
             return CommandResult.Ok(message, result, type);
         }
 
-        /// <inheritdoc />
-        public CommandResult InvokeExtension(string extensionName, string[] args)
-        {
-            return CommandResult.Fail($"'{Name}' has no extensions.");
-        }
     }
-}
+}

Weaver/Core/GetValueCommand.cs Weaver/Core/Commands/GetValueCommand.csWeaver/Core/GetValueCommand.cs renamed to Weaver/Core/Commands/GetValueCommand.cs

@@ -1,6 +1,6 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     Weaver.Core
+ * PROJECT:     Weaver.Core.Commands
  * FILE:        GetValueCommand.cs
  * PURPOSE:     Retrieves a stored value and type from the Scripter Engine.
  * PROGRAMMER:  Peter Geinitz (Wayfarer)
@@ -9,7 +9,7 @@
 using Weaver.Interfaces;
 using Weaver.Messages;
 
-namespace Weaver.Core
+namespace Weaver.Core.Commands
 {
     /// <inheritdoc />
     /// <summary>
@@ -75,11 +75,5 @@ public CommandResult Execute(params string[] args)
                 type
             );
         }
-
-        /// <inheritdoc />
-        public CommandResult InvokeExtension(string extensionName, params string[] args)
-        {
-            return CommandResult.Fail($"'{Name}' has no extensions.");
-        }
     }
-}
+}