Merge pull request #8 from codingseb/dev

Dev

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/Properties/AssemblyInfo.cs

@@ -1,13 +1,12 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("CodingSeb.ExpressionEvaluator.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("EMP/PTM")]
+[assembly: AssemblyCompany("Coding Seb")]
 [assembly: AssemblyProduct("CodingSeb.ExpressionEvaluator.Tests")]
-[assembly: AssemblyCopyright("Copyright © EMP/PTM 2018")]
+[assembly: AssemblyCopyright("Copyright © Coding Seb 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.nuspec

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>CodingSeb.ExpressionEvaluator</id>
@@ -10,9 +10,9 @@
         <projectUrl>https://github.com/codingseb/ExpressionEvaluator</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>A Simple Math and Pseudo C# Expression Evaluator in One C# File</description>
-        <tags>evaluation math expression-evaluator expression parser eval evaluate fluid</tags>
+        <tags>evaluation math expression-evaluator expression parser eval evaluate fluid C# calculation execute</tags>
     </metadata>
     <files>
         <file src="bin\Release\CodingSeb.ExpressionEvaluator.dll" target="lib\net45\CodingSeb.ExpressionEvaluator.dll" />
     </files>
-</package>
+</package>

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -473,35 +473,46 @@ public ExpressionEvaluator(Dictionary<string, object> variables) : this()
         /// <summary>
         /// Evaluate the specified math or pseudo C# expression
         /// </summary>
-        /// <param name="expr">the math or pseudo C# expression to evaluate</param>
+        /// <typeparam name="T">The type in which to cast the result of the expression</typeparam>
+        /// <param name="expression">the math or pseudo C# expression to evaluate</param>
+        /// <returns>The result of the operation if syntax is correct casted in the specified type</returns>
+        public T Evaluate<T>(string expression)
+        {
+            return (T)Evaluate(expression);
+        }
+
+        /// <summary>
+        /// Evaluate the specified math or pseudo C# expression
+        /// </summary>
+        /// <param name="expression">the math or pseudo C# expression to evaluate</param>
         /// <returns>The result of the operation if syntax is correct</returns>
-        public object Evaluate(string expr)
+        public object Evaluate(string expression)
         {
             bool continueEvaluation = true;
 
-            expr = expr.Trim();
+            expression = expression.Trim();
 
             Stack<object> stack = new Stack<object>();
 
-            if (GetLambdaExpression(expr, stack))
+            if (GetLambdaExpression(expression, stack))
                 return stack.Pop();
 
-            for (int i = 0; i < expr.Length && continueEvaluation; i++)
+            for (int i = 0; i < expression.Length && continueEvaluation; i++)
             {
-                string restOfExpression = expr.Substring(i, expr.Length - i);
+                string restOfExpression = expression.Substring(i, expression.Length - i);
 
                 if (!(EvaluateCast(restOfExpression, stack, ref i)
                     || EvaluateNumber(restOfExpression, stack, ref i)
-                    || EvaluateInstanceCreationWithNewKeyword(expr, restOfExpression, stack, ref i)
-                    || EvaluateVarOrFunc(expr, restOfExpression, stack, ref i)
-                    || EvaluateTwoCharsOperators(expr, stack, ref i)))
+                    || EvaluateInstanceCreationWithNewKeyword(expression, restOfExpression, stack, ref i)
+                    || EvaluateVarOrFunc(expression, restOfExpression, stack, ref i)
+                    || EvaluateTwoCharsOperators(expression, stack, ref i)))
                 {
-                    string s = expr.Substring(i, 1);
+                    string s = expression.Substring(i, 1);
 
-                    if (EvaluateChar(expr, s, stack, ref i)
-                        || EvaluateParenthis(expr, s, stack, ref i)
-                        || EvaluateIndexing(expr, s, stack, ref i)
-                        || EvaluateString(expr, s, restOfExpression, stack, ref i))
+                    if (EvaluateChar(expression, s, stack, ref i)
+                        || EvaluateParenthis(expression, s, stack, ref i)
+                        || EvaluateIndexing(expression, s, stack, ref i)
+                        || EvaluateString(expression, s, restOfExpression, stack, ref i))
                     { }
                     else if (operatorsDictionary.ContainsKey(s))
                     {

CodingSeb.ExpressionEvaluator/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.2.0")]

README.md

@@ -10,7 +10,7 @@ It is largely based on and inspired by the following resources [this post on st
 |---|---|
 |master|[![Build Status](https://coding-seb.visualstudio.com/_apis/public/build/definitions/cbe8d2f2-9c7a-48aa-8366-89ef39381eff/1/badge)](https://coding-seb.visualstudio.com/ExpressionEvaluator/_build/index?definitionId=1)|
 |dev|[![Dev Status](https://coding-seb.visualstudio.com/_apis/public/build/definitions/cbe8d2f2-9c7a-48aa-8366-89ef39381eff/2/badge)](https://coding-seb.visualstudio.com/ExpressionEvaluator/_build/index?definitionId=2)|
-
+|nuget|[![NuGet Status](http://img.shields.io/nuget/v/CodingSeb.ExpressionEvaluator.svg?style=flat&max-age=86400)](https://www.nuget.org/packages/CodingSeb.ExpressionEvaluator/)|
 
 ## Features
 * Basic mathematical expression evaluation
@@ -281,7 +281,7 @@ To do so, you only need to prefix the method name with "Fluid" or "Fluent"
 
 ```C#
 // Example Add on List
-List("hello", "bye").FluidAdd(\"test\").Count
+List("hello", "bye").FluidAdd("test").Count
 3
 
 List("hello", "bye").Select(x => x.ToUpper()).ToList().FluentAdd("test")[0]