throw keyword

Author: codingseb

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

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

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

@@ -1135,14 +1135,14 @@ public static IEnumerable<TestCaseData> TestCasesForExceptionThrowingScriptEvalu
                     OptionOnNoReturnKeywordFoundInScriptAction = OptionOnNoReturnKeywordFoundInScriptAction.ThrowSyntaxException
                 };
 
-                yield return new TestCaseData(evaluator, Resources.Script0008.Replace("[valx]", "1"), typeof(ExpressionEvaluatorSyntaxErrorException))
+                yield return new TestCaseData(evaluator, Resources.Script0008.Replace("[valx]", "1"), typeof(ExpressionEvaluatorSyntaxErrorException), null)
                     .SetCategory("Script")
                     .SetCategory("return")
                     .SetCategory("if")
                     .SetCategory("variable assignation")
                     .SetCategory("Options")
                     .SetCategory("OptionOnNoReturnKeywordFoundInScriptAction = ThrowSyntaxException");
-                yield return new TestCaseData(evaluator, Resources.Script0008.Replace("[valx]", "2"), typeof(ExpressionEvaluatorSyntaxErrorException))
+                yield return new TestCaseData(evaluator, Resources.Script0008.Replace("[valx]", "2"), typeof(ExpressionEvaluatorSyntaxErrorException), null)
                     .SetCategory("Script")
                     .SetCategory("return")
                     .SetCategory("if")
@@ -1153,13 +1153,35 @@ public static IEnumerable<TestCaseData> TestCasesForExceptionThrowingScriptEvalu
                 #endregion
 
                 #endregion
+
+                #region Throw Exception and try finally
+
+                yield return new TestCaseData(new ExpressionEvaluator(), Resources.Script0025, typeof(Exception), "Exception for test")
+                    .SetCategory("Script")
+                    .SetCategory("Throw")
+                    .SetCategory("Exception");
+
+                #endregion
             }
         }
 
         [TestCaseSource(nameof(TestCasesForExceptionThrowingScriptEvaluation))]
-        public void ExceptionThrowingScriptEvaluation(ExpressionEvaluator evaluator, string script, Type exceptionType)
+        public void ExceptionThrowingScriptEvaluation(ExpressionEvaluator evaluator, string script, Type exceptionType, string exceptionMessage)
         {
-            Assert.Catch(exceptionType, () => evaluator.ScriptEvaluate(script));
+            Assert.Catch(exceptionType, () => evaluator.ScriptEvaluate(evaluator.RemoveComments(script)));
+
+            if (exceptionMessage != null)
+            {
+                try
+                {
+                    evaluator.ScriptEvaluate(evaluator.RemoveComments(script));
+                }
+                catch(Exception exception)
+                {
+                    exception.Message.ShouldEqual(exceptionMessage);
+                }
+            }
+                
         }
 
         #endregion

CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs

@@ -190,4 +190,7 @@
   <data name="Script0024" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>resources\script0024.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="Script0025" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\script0025.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,3 @@
+/* Script0025 */
+
+throw new Exception("Exception for test");

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0025.txt

@@ -749,6 +749,11 @@ object ManageJumpStatementsOrExpressionEval(string expression)
                     return lastResult;
                 }
 
+                if(expressionToTest.StartsWith("throw "))
+                {
+                    throw Evaluate(expressionToTest.Remove(0, 6)) as Exception;
+                }
+
                 expression = returnKeywordRegex.Replace(expression, match =>
                 {
                     if (OptionCaseSensitiveEvaluationActive && !match.Value.StartsWith("return"))