Some start of stuffs

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -868,7 +868,7 @@ public void TypeTesting(string expression, Type type)
         [TestCase("List(\"hello\", \"bye\").Select(x => x.ToUpper()).ToList().FluidAdd(\"test\")[1]", ExpectedResult = "BYE", Category = "Complex expression,Fluid Functions")]
         [TestCase("List(\"hello\", \"bye\").Select(x => x.ToUpper()).ToList().FluidAdd(\"test\")[2]", ExpectedResult = "test", Category = "Complex expression,Fluid Functions")]
         [TestCase("List(\"hello\", \"bye\").Select(x => x.ToUpper()).ToList().FluidAdd(\"test\")[2]", ExpectedResult = "test", Category = "Complex expression,Fluid Functions")]
-        [TestCase("$\"https://www.google.ch/search?q={System.Net.WebUtility.UrlEncode(\"test of request with url encode() ?\")}\"", ExpectedResult = "https://www.google.ch/search?q=test+of+request+with+url+encode()+%3F", Category = "Complex expression,Inline namespace")]
+        [TestCase("$\"https://www.google.com/search?q={System.Net.WebUtility.UrlEncode(\"test of request with url encode() ?\")}\"", ExpectedResult = "https://www.google.com/search?q=test+of+request+with+url+encode()+%3F", Category = "Complex expression,Inline namespace")]
         #endregion
 
         #endregion

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -237,7 +237,10 @@ private enum TryBlockEvaluatedState
         {
             new Dictionary<ExpressionOperator, Func<dynamic, dynamic, object>>()
             {
-                {ExpressionOperator.Indexing, (dynamic left, dynamic right) => left is IDictionary<string,object> dictionaryLeft ? dictionaryLeft[right] : left[right] },
+                {ExpressionOperator.Indexing, (dynamic left, dynamic right) => {
+                        return left is IDictionary<string,object> dictionaryLeft ? dictionaryLeft[right] : left[right];
+                    }
+                },
                 {ExpressionOperator.IndexingWithNullConditional, (dynamic left, dynamic right) => left is IDictionary<string,object> dictionaryLeft ? dictionaryLeft[right] : left?[right] },
             },
             new Dictionary<ExpressionOperator, Func<dynamic, dynamic, object>>()
@@ -486,29 +489,6 @@ private StringComparer StringComparerForCasing
         /// </summary>
         public bool OptionFluidPrefixingActive { get; set; } = true;
 
-        /// <summary>
-        /// if <c>true</c> allow to create instance of object with the C# syntax new ClassName(...).
-        /// if <c>false</c> unactive this functionality.
-        /// By default : true
-        /// </summary>
-        public bool OptionNewKeywordEvaluationActive { get; set; } = true;
-
-        /// <summary>
-        /// if <c>true</c> allow the use of inline namespace (Can be slow, and is less secure). 
-        /// if <c>false</c> unactive inline namespace (only namespaces in Namespaces list are available). 
-        /// By default : true
-        /// </summary>
-        public bool OptionInlineNamespacesEvaluationActive
-        {
-            get { return optionInlineNamespacesEvaluationActive; }
-            set
-            {
-                optionInlineNamespacesEvaluationActive = value;
-                instanceCreationWithNewKeywordRegex = new Regex(InstanceCreationWithNewKeywordRegexPattern, (optionCaseSensitiveEvaluationActive ? RegexOptions.None : RegexOptions.IgnoreCase));
-                castRegex = new Regex(CastRegexPattern, (optionCaseSensitiveEvaluationActive ? RegexOptions.None : RegexOptions.IgnoreCase));
-            }
-        }
-
         private Func<ExpressionEvaluator, List<string>, object> newMethodMem;
 
         /// <summary>
@@ -534,6 +514,29 @@ public bool OptionNewFunctionEvaluationActive
             }
         }
 
+        /// <summary>
+        /// if <c>true</c> allow to create instance of object with the C# syntax new ClassName(...).
+        /// if <c>false</c> unactive this functionality.
+        /// By default : true
+        /// </summary>
+        public bool OptionNewKeywordEvaluationActive { get; set; } = true;
+
+        /// <summary>
+        /// if <c>true</c> allow the use of inline namespace (Can be slow, and is less secure). 
+        /// if <c>false</c> unactive inline namespace (only namespaces in Namespaces list are available). 
+        /// By default : true
+        /// </summary>
+        public bool OptionInlineNamespacesEvaluationActive
+        {
+            get { return optionInlineNamespacesEvaluationActive; }
+            set
+            {
+                optionInlineNamespacesEvaluationActive = value;
+                instanceCreationWithNewKeywordRegex = new Regex(InstanceCreationWithNewKeywordRegexPattern, (optionCaseSensitiveEvaluationActive ? RegexOptions.None : RegexOptions.IgnoreCase));
+                castRegex = new Regex(CastRegexPattern, (optionCaseSensitiveEvaluationActive ? RegexOptions.None : RegexOptions.IgnoreCase));
+            }
+        }
+
         /// <summary>
         /// if <c>true</c> allow to call static methods on classes.
         /// if <c>false</c> unactive this functionality.

TryWindow/MainWindow.xaml.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
@@ -102,9 +103,20 @@ private async void CalculateButton_Click(object sender, RoutedEventArgs e)
 
         private void Evaluator_EvaluateVariable(object sender, VariableEvaluationEventArg e)
         {
-            if(e.This != null && e.Name.Equals("Json"))
+            if (e.This != null)
             {
-                e.Value = JsonConvert.SerializeObject(e.This); 
+                if (e.Name.Equals("Json"))
+                {
+                    e.Value = JsonConvert.SerializeObject(e.This);
+                }
+                else if (e.Name.Equals("MethodsNames"))
+                {
+                    e.Value = JsonConvert.SerializeObject(e.This.GetType().GetMethods().Select(m => m.Name));
+                }
+                else if (e.Name.Equals("PropertiesNames"))
+                {
+                    e.Value = JsonConvert.SerializeObject(e.This.GetType().GetProperties().Select(m => m.Name));
+                }
             }
         }