Merge pull request #103 from codingseb/dev

Dev

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -1330,7 +1330,7 @@ public object OnTheFlyIndexingEvaluation(string expression)
 
         private void Evaluator_PreEvaluateIndexing(object sender, IndexingPreEvaluationEventArg e)
         {
-            if(e.This is int intValue && e.EvaluateArg() is string text)
+            if(e.This is int intValue && e.EvaluateArg(0) is string text)
             {
                 e.Value = string.Join(",", Enumerable.Repeat(text, intValue));
             }
@@ -2701,6 +2701,16 @@ ExpressionEvaluator evaluatorForMethodArgs()
 
                 #endregion
 
+                #region For multidimensional indexing
+
+                yield return new TestCaseData(new ExpressionEvaluator(new Dictionary<string, object> { { "doubleIndexObject", new ClassForIndexing() } })
+                    , "doubleIndexObject[2,3]"
+                    , null)
+                    .Returns(5)
+                    .SetCategory("Multidimensional indexing");
+
+                #endregion
+
                 #endregion
             }
         }

CodingSeb.ExpressionEvaluator.Tests/TestsUtils/ClassForIndexing.cs

@@ -0,0 +1,25 @@
+namespace CodingSeb.ExpressionEvaluator.Tests
+{
+    public class ClassForIndexing
+    {
+        public int this[int i1, int i2]
+        {
+            get
+            {
+                return i1 + i2;
+            }
+            set
+            {}
+        }
+
+        public string this[string test]
+        {
+            get
+            {
+                return test + test;
+            }
+            set
+            {}
+        }
+    }
+}

CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj

@@ -5,9 +5,9 @@
     <Product>CodingSeb.ExpressionEvaluator</Product>
     <Description>A Simple Math and Pseudo C# Expression Evaluator in One C# File. Can also execute small C# like scripts</Description>
     <Copyright>Copyright © Coding Seb 2017</Copyright>
-    <Version>1.4.28.0</Version>
-    <AssemblyVersion>1.4.28.0</AssemblyVersion>
-    <FileVersion>1.4.28.0</FileVersion>
+    <Version>1.4.29.0</Version>
+    <AssemblyVersion>1.4.29.0</AssemblyVersion>
+    <FileVersion>1.4.29.0</FileVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <Authors>Coding Seb</Authors>
     <PackageId>CodingSeb.ExpressionEvaluator</PackageId>
@@ -19,8 +19,7 @@
     <PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
     <PackageIcon>Icon.png</PackageIcon>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>* Correction of a bug : Int32, Int16 and Int64 were not evaluated when OptionCaseSensitiveEvaluationActive = false
-* Array types are now correctly evaluate in typeof and cast ex: typeof(double[]) or (string[])myArray</PackageReleaseNotes>
+    <PackageReleaseNotes>* Add Multidimensional indexing management like myStuffToIndex[1,4]</PackageReleaseNotes>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <RepositoryUrl>https://github.com/codingseb/ExpressionEvaluator</RepositoryUrl>
   </PropertyGroup>