Add OptionScriptNeedSemicolonAtTheEndOfLastExpression

+ Tests

Author: Sébastien Geiser

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

@@ -298,4 +298,10 @@
   <data name="Script0060" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>resources\script0060.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="Script0061" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\script0061.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="Script0062" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\script0062.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>

CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs

@@ -0,0 +1,3 @@
+/* Script0061 */
+var x = new List<int> {1,2,3,4};
+x.Json

CodingSeb.ExpressionEvaluator.Tests/Resources.resx

@@ -0,0 +1,2 @@
+/* Script0062 */
+var x = new List<int> {1,2,3,4}

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0061.txt

@@ -1,6 +1,6 @@
 /******************************************************************************************************
     Title : ExpressionEvaluator (https://github.com/codingseb/ExpressionEvaluator)
-    Version : 1.4.2.0 
+    Version : 1.4.2.1 
     (if last digit (the forth) is not a zero, the version is an intermediate version and can be unstable)
 
     Author : Coding Seb
@@ -775,6 +775,13 @@ public bool OptionNewFunctionEvaluationActive
         /// </summary>
         public OptionOnNoReturnKeywordFoundInScriptAction OptionOnNoReturnKeywordFoundInScriptAction { get; set; } = OptionOnNoReturnKeywordFoundInScriptAction.ReturnAutomaticallyLastEvaluatedExpression;
 
+        /// <summary>
+        /// If <c>true</c> ScriptEvaluate need to have a semicolon [;] after each expression.
+        /// If <c>false</c> Allow to omit the semicolon for the last expression of the script.
+        /// Default : true
+        /// </summary>
+        public bool OptionScriptNeedSemicolonAtTheEndOfLastExpression { get; set; } = true;
+
         #endregion
 
         #region Reflection flags
@@ -1345,11 +1352,18 @@ void forAction(int index)
                     {
                         lastResult = ScriptExpressionEvaluate(ref i);
                     }
+                    else if (!OptionScriptNeedSemicolonAtTheEndOfLastExpression && i == script.Length - 1)
+                    {
+                        i++;
+                        lastResult = ScriptExpressionEvaluate(ref i);
+                        startOfExpression--;
+                    }
 
                     ifBlockEvaluatedState = IfBlockEvaluatedState.NoBlockEvaluated;
                     tryBlockEvaluatedState = TryBlockEvaluatedState.NoBlockEvaluated;
 
-                    i++;
+                    if (OptionScriptNeedSemicolonAtTheEndOfLastExpression || i < script.Length - 1)
+                        i++;
                 }
             }
 

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0062.txt

@@ -7,7 +7,7 @@
         xmlns:ae="http://icsharpcode.net/sharpdevelop/avalonedit"
         Closing="Window_Closing"
         mc:Ignorable="d"
-        Title="Expression Evaluate" Width="400" Height="300">
+        Title="Expression Evaluate" Width="400" Height="320">
     <DockPanel>
 
         <StackPanel DockPanel.Dock="Bottom">
@@ -24,6 +24,11 @@
                          Text="1" />
 
             </DockPanel>
+
+            <WrapPanel>
+                <CheckBox x:Name="NeedSemicolonAtTheEndCheckBox"
+                          Content="Need semicolon [;] At the end" />
+            </WrapPanel>
 
             <Button x:Name="CalculateButton" Content="_Execute" IsDefault="True" Click="CalculateButton_Click" />
             <Button x:Name="CancelButton" 

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -36,7 +36,10 @@ private async void CalculateButton_Click(object sender, RoutedEventArgs e)
             CalculateButton.IsEnabled = false;
             CancelButton.IsEnabled = true;
 
-            ExpressionEvaluator evaluator = new ExpressionEvaluator();
+            ExpressionEvaluator evaluator = new ExpressionEvaluator()
+            {
+                OptionScriptNeedSemicolonAtTheEndOfLastExpression = NeedSemicolonAtTheEndCheckBox.IsChecked.GetValueOrDefault(),
+            };
 
             if (UseCachesCheckbox.IsChecked ?? false)
                 evaluator.CacheTypesResolutions = true;