First simple try catch finally test OK

Author: codingseb

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

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

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

@@ -812,6 +812,17 @@ public static IEnumerable<TestCaseData> TestCasesForScriptEvaluateTests
 
                 #endregion
 
+                #region try, catch, finally
+
+                yield return new TestCaseData(Resources.Script0028, null, null, null)
+                    .SetCategory("Script")
+                    .SetCategory("Try")
+                    .SetCategory("Catch")
+                    .SetCategory("Finally")
+                    .SetCategory("Exception")
+                    .Returns("catch : True, finally : True");
+                #endregion
+
                 #region block for lambda body
 
                 yield return new TestCaseData(Resources.Script0006, null, null, null)
@@ -1170,7 +1181,7 @@ public static IEnumerable<TestCaseData> TestCasesForExceptionThrowingScriptEvalu
 
                 #endregion
 
-                #region Throw Exception and try finally
+                #region Throw Exception
 
                 yield return new TestCaseData(new ExpressionEvaluator(), Resources.Script0025, typeof(Exception), "Exception for test")
                     .SetCategory("Script")

CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs

@@ -199,4 +199,7 @@
   <data name="Script0027" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>resources\script0027.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="Script0028" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\script0028.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>

CodingSeb.ExpressionEvaluator.Tests/Resources.resx

@@ -0,0 +1,22 @@
+/* Script0028 */
+
+x = 5;
+y = 0;
+
+c = false;
+f = false;
+
+try
+{
+	x / y;
+}
+catch(exception)
+{
+	c = true;
+}
+finally
+{
+	f = true;
+}
+
+return $"catch : {c}, finally : {f}";

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0028.txt

@@ -824,7 +824,38 @@ void ExecuteTryList()
             {
                 if(tryStatementsList.Count > 0)
                 {
+                    if(tryStatementsList.Count == 1)
+                    {
+                        throw new ExpressionEvaluatorSyntaxErrorException("a try statement need at least one catch or one finally statement.");
+                    }
+
+                    try
+                    {
+                        lastResult = ScriptEvaluate(tryStatementsList[0][0], ref isReturn, ref isBreak, ref isContinue);
+                    }
+                    catch(Exception exception)
+                    {
+                        if(tryStatementsList[1][0].ToString().Equals("catch"))
+                        {
+                            if(tryStatementsList[1][1] != null)
+                            {
+                                string[] exceptionVariable = tryStatementsList[1][1].ToString().Trim().Split(new char[] {' '}, StringSplitOptions.RemoveEmptyEntries);
+
+                                Variables[exceptionVariable[0]] = exception;
+                            }
+
+                            lastResult = ScriptEvaluate(tryStatementsList[1][2], ref isReturn, ref isBreak, ref isContinue);
+                        }
+                    }
+                    finally
+                    {
+                        if(tryStatementsList.Last()[0].Equals("finally"))
+                        {
+                            lastResult = ScriptEvaluate(tryStatementsList.Last()[1], ref isReturn, ref isBreak, ref isContinue);
+                        }
+                    }
 
+                    tryStatementsList.Clear();
                 }
             }
 
@@ -916,6 +947,30 @@ void ExecuteBlocksStacks()
                             ifBlockEvaluatedState = IfBlockEvaluatedState.NoBlockEvaluated;
                         }
                     }
+                    else if (keyword.Equals("catch"))
+                    {
+                        if (tryBlockEvaluatedState == TryBlockEvaluatedState.NoBlockEvaluated)
+                        {
+                            throw new ExpressionEvaluatorSyntaxErrorException("No corresponding [try] for [catch] statement.");
+                        }
+                        else
+                        {
+                            tryStatementsList.Add(new List<string>() { "catch", keywordAttributes.Count > 0 ? keywordAttributes[0] : null, subScript });
+                            tryBlockEvaluatedState = TryBlockEvaluatedState.Catch;
+                        }
+                    }
+                    else if (keyword.Equals("finally"))
+                    {
+                        if (tryBlockEvaluatedState == TryBlockEvaluatedState.NoBlockEvaluated)
+                        {
+                            throw new ExpressionEvaluatorSyntaxErrorException("No corresponding [try] for [finally] statement.");
+                        }
+                        else
+                        {
+                            tryStatementsList.Add(new List<string>() { "finally", subScript });
+                            tryBlockEvaluatedState = TryBlockEvaluatedState.NoBlockEvaluated;
+                        }
+                    }
                     else
                     {
                         ExecuteBlocksStacks();
@@ -1071,6 +1126,7 @@ void forAction(int index)
                     }
 
                     ifBlockEvaluatedState = IfBlockEvaluatedState.NoBlockEvaluated;
+                    tryBlockEvaluatedState = TryBlockEvaluatedState.NoBlockEvaluated;
 
                     i++;
                 }