StrongTyped Variables more limited

Author: Sébastien Geiser

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

@@ -1573,7 +1573,6 @@ public static IEnumerable<TestCaseData> TestCasesForExceptionThrowingScriptEvalu
                     .SetCategory("Exception");
 
                 #endregion
-
             }
         }
 
@@ -1582,15 +1581,14 @@ public void ExceptionThrowingScriptEvaluation(ExpressionEvaluator evaluator, str
         {
             evaluator.Namespaces.Add("CodingSeb.ExpressionEvaluator.Tests");
 
-            Assert.Catch(exceptionType, () => evaluator.ScriptEvaluate(evaluator.RemoveComments(script)));
-
-            if (exceptionMessage != null)
+            try
             {
-                try
-                {
-                    evaluator.ScriptEvaluate(evaluator.RemoveComments(script));
-                }
-                catch(Exception exception)
+                evaluator.ScriptEvaluate(evaluator.RemoveComments(script));
+            }
+            catch(Exception exception)
+            {
+                exception.ShouldBeAssignableTo(exceptionType);
+                if (exceptionMessage != null)
                 {
                     exception.Message.ShouldBe(exceptionMessage);
                 }

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -2123,6 +2123,10 @@ protected virtual bool EvaluateVarOrFunc(string expression, Stack<object> stack,
                             {
                                 if (Variables.ContainsKey(varFuncName))
                                     throw new ExpressionEvaluatorSyntaxErrorException($"Can not declare a new variable named [{varFuncName}]. A variable with this name already exists");
+                                else if (varFuncMatch.Groups["varKeyword"].Success)
+                                    throw new ExpressionEvaluatorSyntaxErrorException($"Can not declare a variable wih type and var keyword.");
+                                else if (varFuncMatch.Groups["dynamicKeyword"].Success)
+                                    throw new ExpressionEvaluatorSyntaxErrorException($"Can not declare a variable wih type and dynamic keyword.");
 
                                 stack.Pop();