Merge pull request #71 from codingseb/dev

Dev

Author: codingseb

CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj

@@ -5,9 +5,9 @@
     <Product>CodingSeb.ExpressionEvaluator</Product>
     <Description>A Simple Math and Pseudo C# Expression Evaluator in One C# File. Can also execute small C# like scripts</Description>
     <Copyright>Copyright © Coding Seb 2017</Copyright>
-    <Version>1.4.17.0</Version>
-    <AssemblyVersion>1.4.17.0</AssemblyVersion>
-    <FileVersion>1.4.17.0</FileVersion>
+    <Version>1.4.18.0</Version>
+    <AssemblyVersion>1.4.18.0</AssemblyVersion>
+    <FileVersion>1.4.18.0</FileVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <Authors>Coding Seb</Authors>
     <PackageId>CodingSeb.ExpressionEvaluator</PackageId>
@@ -18,7 +18,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>* Add support for Null-coalescing assignation operator ??=</PackageReleaseNotes>
+    <PackageReleaseNotes>* Better exception when expression is empty</PackageReleaseNotes>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <RepositoryUrl>https://github.com/codingseb/ExpressionEvaluator</RepositoryUrl>
   </PropertyGroup>

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -2848,6 +2848,9 @@ protected virtual bool EvaluateString(string expression, Stack<object> stack, re
 
         protected virtual object ProcessStack(Stack<object> stack)
         {
+            if (stack.Count == 0)
+                throw new ExpressionEvaluatorSyntaxErrorException("Empty expression or no token found");
+
             List<object> list = stack
                 .Select(e => e is ValueTypeNestingTrace valueTypeNestingTrace ? valueTypeNestingTrace.Value : e)
                 .Select(e => e is SubExpression subExpression ? Evaluate(subExpression.Expression) : e)
@@ -2964,7 +2967,6 @@ protected virtual object ProcessStack(Stack<object> stack)
 
             return stack.Pop();
         }
-
         #endregion
 
         #region Remove comments