Update NumericExpressionReslover.cs

Author: Elektryk-Andrzej

Code/Helpers/NumericExpressionReslover.cs

@@ -82,11 +82,16 @@ public static TryGet<CompiledExpression> CompileExpression(BaseToken[] tokens)
                     break;
             }
         }
-        
-        var expression = new Expression(sb.ToString(), EvaluateOptions.None);
+
+        var rawRep = sb.ToString();
+        var expression = new Expression(rawRep, EvaluateOptions.None);
 
         // Now we have the expression string and a variables dictionary.
-        return new CompiledExpression(expression, variables);
+        return new CompiledExpression(
+            expression, 
+            variables, 
+            rawRep
+        );
 
         string MakeTempName()
         {
@@ -100,67 +105,34 @@ void AppendRaw(string s)
         }
     }
 
-    // --- Evaluate helper that sets typed params and uses EvaluateParameter ---
-    private static TryGet<object> Evaluate(string exprString, Dictionary<string, object> variables, Result rs)
-    {
-        var expression = new Expression(exprString, EvaluateOptions.None)
-        {
-            // Supply our typed parameter dictionary:
-            Parameters = new Dictionary<string, object>(variables, StringComparer.OrdinalIgnoreCase)
-        };
-
-        // As a safe fallback, respond to EvaluateParameter requests by resolving from variables
-        expression.EvaluateParameter += (name, args) =>
-        {
-            if (variables.TryGetValue(name, out var val))
-            {
-                args.Result = val;
-                return;
-            }
-
-            // if not found, return a helpful error via exception. NCalc will bubble it.
-            throw new ArgumentException($"Unknown identifier '{name}' in expression.");
-        };
-
-        try
-        {
-            var result = expression.Evaluate();
-            return new TryGet<object>(result, null); // adapt to your TryGet ctor
-        }
-        catch (Exception ex)
-        {
-            // Keep error messages friendly and actionable
-            return rs + $"{ex.GetType().AccurateName}: {ex.Message}";
-        }
-    }
-
     public readonly struct CompiledExpression(
         Expression expression, 
-        Dictionary<string, DynamicTryGet<object>> parameters
+        Dictionary<string, DynamicTryGet<object>> parameters,
+        string rawRepresentation
     )
     {
         public TryGet<object> Evaluate()
         {
-            Dictionary<string, object> values = [];
-            foreach (var (key, dtg) in parameters)
+            try
             {
-                if (dtg.Invoke().HasErrored(out var err, out var value))
+                Dictionary<string, object> values = [];
+                foreach (var (key, dtg) in parameters)
                 {
-                    return err;
-                }
+                    if (dtg.Invoke().HasErrored(out var err, out var value))
+                    {
+                        return err;
+                    }
 
-                values[key] = value;
-            }
+                    values[key] = value;
+                }
 
-            expression.Parameters = values;
-            
-            try
-            {
+                expression.Parameters = values;
+                
                 return expression.Evaluate();
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-                return $"{ex.GetType().AccurateName}: {ex.Message}";
+                return $"Expression '{rawRepresentation}' is invalid.";
             }
         }
     }