Merge pull request #11 from codingseb/dev

Dev

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/CodingSeb.ExpressionEvaluator.Tests.csproj

@@ -122,6 +122,9 @@
   <ItemGroup>
     <None Include="Resources\Script0017.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Script0018.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

@@ -667,6 +667,17 @@ public static IEnumerable<TestCaseData> TestCasesForScriptEvaluateTests
 
                 #endregion
 
+                #region foreach
+
+                yield return new TestCaseData(Resources.Script0018, null, null, null)
+                    .SetCategory("Script")
+                    .SetCategory("foreach")
+                    .SetCategory("variable assignation")
+                    .SetCategory("+=")
+                    .Returns("This is a splitted text");
+
+                #endregion
+
                 #region if, else if, else
 
                 yield return new TestCaseData(Resources.Script0004.Replace("[valx]", "0").Replace("[valy]", "1"), null, null, null)

CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs

@@ -169,4 +169,7 @@
   <data name="Script0017" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>resources\script0017.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="Script0018" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\script0018.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
 </root>

CodingSeb.ExpressionEvaluator.Tests/Resources.resx

@@ -0,0 +1,12 @@
+/* Script0018 */
+
+result = string.Empty;
+elements = List("This", "is", "a", "splitted", "text");
+
+foreach(element in elements)
+{
+	result += element;
+	result += " ";
+}
+
+result.Remove(result.Length - 1);

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0018.txt

@@ -44,7 +44,8 @@ public class ExpressionEvaluator
         private static readonly Regex newLineCharsRegex = new Regex(@"\r\n|\r|\n");
 
         // For script only
-        private static readonly Regex blockKeywordsBeginningRegex = new Regex(@"^\s*(?<keyword>while|for|if|else\s+if)\s*[(]", RegexOptions.IgnoreCase);
+        private static readonly Regex blockKeywordsBeginningRegex = new Regex(@"^\s*(?<keyword>while|for|foreach|if|else\s+if)\s*[(]", RegexOptions.IgnoreCase);
+        private static readonly Regex foreachParenthisEvaluationRegex = new Regex(@"^\s*(?<variableName>[a-zA-Z_][a-zA-Z0-9_]*)\s+(?<in>in)\s+(?<collection>.*)", RegexOptions.IgnoreCase);
         private static readonly Regex blockKeywordsWithoutParenthesesBeginningRegex = new Regex(@"^\s*(?<keyword>else|do)(?![a-zA-Z0-9_])", RegexOptions.IgnoreCase);
         private static readonly Regex blockBeginningRegex = new Regex(@"^\s*[{]");
         private static readonly Regex returnKeywordRegex = new Regex(@"^return(\s+|\()", RegexOptions.IgnoreCase | RegexOptions.Singleline);
@@ -946,7 +947,10 @@ void ExecuteIfList()
                         else if (keyword.Equals("for"))
                         {
                             void forAction(int index)
-                            { if (keywordAttributes.Count > index && !keywordAttributes[index].Trim().Equals(string.Empty)) ManageJumpStatementsOrExpressionEval(keywordAttributes[index]); }
+                            {
+                                if (keywordAttributes.Count > index && !keywordAttributes[index].Trim().Equals(string.Empty))
+                                    ManageJumpStatementsOrExpressionEval(keywordAttributes[index]);
+                            }
 
                             for (forAction(0); !isReturn && (bool)ManageJumpStatementsOrExpressionEval(keywordAttributes[1]); forAction(2))
                             {
@@ -964,6 +968,41 @@ void forAction(int index)
                                 }
                             }
                         }
+                        else if(keyword.Equals("foreach"))
+                        {
+                            Match foreachParenthisEvaluationMatch = foreachParenthisEvaluationRegex.Match(keywordAttributes[0]);
+
+                            if(!foreachParenthisEvaluationMatch.Success)
+                            {
+                                throw new ExpressionEvaluatorSyntaxErrorException("wrong foreach syntax");
+                            }
+                            else if(!foreachParenthisEvaluationMatch.Groups["in"].Value.ManageCasing(OptionCaseSensitiveEvaluationActive).Equals("in"))
+                            {
+                                throw new ExpressionEvaluatorSyntaxErrorException("no [in] keyword found in foreach");
+                            }
+                            else
+                            {
+                                dynamic collection = Evaluate(foreachParenthisEvaluationMatch.Groups["collection"].Value);
+
+                                foreach(dynamic foreachValue in collection)
+                                {
+                                    Variables[foreachParenthisEvaluationMatch.Groups["variableName"].Value] = foreachValue;
+
+                                    lastResult = ScriptEvaluate(subScript, ref isReturn, ref isBreak, ref isContinue);
+
+                                    if (isBreak)
+                                    {
+                                        isBreak = false;
+                                        break;
+                                    }
+                                    if (isContinue)
+                                    {
+                                        isContinue = false;
+                                        continue;
+                                    }
+                                }
+                            }
+                        }
                     }
 
                     startOfExpression = i;

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -32,5 +32,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]

CodingSeb.ExpressionEvaluator/Properties/AssemblyInfo.cs

@@ -29,12 +29,12 @@ It is largely based on and inspired by the following resources [this post on st
 * Classes like File, Directory, Regex, List ... available ([You can extend the list of Namespaces](#namespaces))
 * Create instance with [new(MyClassName, constructorArgs)](#standard-functions) or [new MyClassName(constructorArgs)](#operators)
 * [Call void methods with fluid prefix convention to chain operations](#go-fluid-with-a-simple-methods-prefixing-convention)
-* Manage now assignation operators like =, +=, -=, *= ... (On variables and sub properties)
-* Manage now postfix operators ++ and -- (On variables and sub properties)
+* Manage now [assignation operators](#assignation-operators) like =, +=, -=, *= ...
+* Manage now postfix [operators](#operators) ++ and --
 
 ## And with [ScriptEvaluate](#scripts) method
 * Small C# like script evaluation (Multi expressions separated by ;)
-* Some conditional and loop blocks [keywords](#script-keywords) (if, while, for ...)
+* Some conditional and loop blocks [keywords](#script-keywords) (if, while, for, foreach ...)
 * Multi-line (multi expression) Lambda expressions.
 
 ## Getting started
@@ -376,7 +376,7 @@ The following functions are internally defined. (Most of these are [System.Math
 
 ## On the fly variables and functions evaluation
 In addition to custom variables, you can add variables and/or functions with on the fly evaluation.
-2 C# events are provided that are fired when variables or functions are not fund as standard ones in evaluation time.
+2 C# events are provided that are fired when variables or functions are not found as standard ones in evaluation time.
 
 *Remark : Can be use to define or redefine on object instances methods or properties*
 ```C#
@@ -526,7 +526,7 @@ Here is a list of which operators are supported in ExpressionEvaluator or not
 |Conditional AND|[x && y](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/operators/conditional-and-operator)|Supported|
 |Conditional OR|[x || y](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/operators/conditional-or-operator)|Supported|
 |Null-coalescing|[x ?? y](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/operators/null-conditional-operator)|Supported|
-|Conditional|[t ? x : y](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/operators/conditional-operator)|Supported equivalent to the [if() function](#standard-functions)|
+|Conditional|[t ? x : y](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/operators/conditional-operator)|Supported|
 |Lambda|[=>](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/operators/lambda-operator)|Supported|
 
 ### Assignation operators
@@ -596,7 +596,7 @@ Currently the following script keywords are supported
 |Selection|[switch case](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/switch)|Not yet supported|
 |Iteration|[do ... while](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/do)|Supported|
 |Iteration|[for](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/for)|Supported|
-|Iteration|[foreach, in](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/foreach-in)|Not yet supported|
+|Iteration|[foreach, in](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/foreach-in)|Supported|
 |Iteration|[while](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/while)|Supported|
 |Jump|[break](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/break)|Supported in do, for and while blocks|
 |Jump|[continue](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/continue)|Supported in do, for and while blocks|