Merge branch 'release/1.0.0'

Author: rsmithsa

Formula.Parser.Tests/CompilerTests.fs

@@ -461,5 +461,27 @@ type CompilerTests () =
         | Success (ast, userState, endPos) ->
             let value = (compileFormula ast).Invoke(MapVariableProvider.Empty, DefaultFunctionProvider.Instance)
             Assert.AreEqual(None, value);
+        | Failure (msg, error, userState) ->
+            Assert.Fail(msg)
+            
+    [<TestMethod>]
+    member this.TestCompileBug51Variable () =
+        let result = parseFormulaString "MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar"
+        match result with
+        | Success (ast, userState, endPos) ->
+            let value = (compileFormula ast).Invoke(varMap, DefaultFunctionProvider.Instance)
+            let expected = Some(Helpers.castToDouble(varMap.Lookup "MyVar").Value * 20.0)
+            Assert.AreEqual(expected, value);
+        | Failure (msg, error, userState) ->
+            Assert.Fail(msg)
+            
+    [<TestMethod>]
+    member this.TestCompileBug51Constant () =
+        let result = parseFormulaString "1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20"
+        match result with
+        | Success (ast, userState, endPos) ->
+            let value = (compileFormula ast).Invoke(MapVariableProvider.Empty, DefaultFunctionProvider.Instance)
+            let expected = Some(210.0)
+            Assert.AreEqual(expected, value);
         | Failure (msg, error, userState) ->
             Assert.Fail(msg)

Formula.Parser.Tests/InterpreterTests.fs

@@ -462,5 +462,27 @@ type InterpreterTests () =
         | Success (ast, userState, endPos) ->
             let value = interpretFormula ast MapVariableProvider.Empty DefaultFunctionProvider.Instance
             Assert.AreEqual(None, value);
+        | Failure (msg, error, userState) ->
+            Assert.Fail(msg)
+            
+    [<TestMethod>]
+    member this.TestInterpretBug51Variable () =
+        let result = parseFormulaString "MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar + MyVar"
+        match result with
+        | Success (ast, userState, endPos) ->
+            let value = interpretFormula ast varMap DefaultFunctionProvider.Instance
+            let expected = Some(Helpers.castToDouble(varMap.Lookup "MyVar").Value * 20.0)
+            Assert.AreEqual(expected, value);
+        | Failure (msg, error, userState) ->
+            Assert.Fail(msg)
+            
+    [<TestMethod>]
+    member this.TestInterpretBug51Constant () =
+        let result = parseFormulaString "1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + 20"
+        match result with
+        | Success (ast, userState, endPos) ->
+            let value = interpretFormula ast MapVariableProvider.Empty DefaultFunctionProvider.Instance
+            let expected = Some(210.0)
+            Assert.AreEqual(expected, value);
         | Failure (msg, error, userState) ->
             Assert.Fail(msg)

Formula.Parser/AssemblyInfo.fs

@@ -9,11 +9,11 @@ module AssemblyInfo
 open System.Reflection
 open System.Runtime.InteropServices
 
-[<assembly: AssemblyFileVersionAttribute("0.13.0.0")>]
-[<assembly: AssemblyInformationalVersionAttribute("0.13.0")>]
+[<assembly: AssemblyFileVersionAttribute("1.0.0.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("1.0.0")>]
 [<assembly: AssemblyProductAttribute("Formula.Parser")>]
 [<assembly: AssemblyTitleAttribute("Formula.Parser")>]
-[<assembly: AssemblyVersionAttribute("0.13.0.0")>]
+[<assembly: AssemblyVersionAttribute("1.0.0.0")>]
 [<assembly: AssemblyDescriptionAttribute("A simple extensible formula language for .NET")>]
 [<assembly: AssemblyCopyrightAttribute("Richard Smith")>]
 do ()

Formula.Parser/Compiler.fs

@@ -167,6 +167,10 @@ module Compiler =
             let compileBranch cond a b =
                 let valueCond = castToBoolExpression(compileInternal cond)
                 Expression.Condition(valueCond, (compileInternal a), (compileInternal b)) :> Expression
+                
+            let compileIntermediate (ex: Expression) =
+                let inter = Expression.Lambda(ex, variableProvider, functionProvider).Compile()
+                Expression.Invoke(Expression.Constant(inter), variableProvider, functionProvider) :> Expression
 
             match ast.Item with
             | Constant c ->
@@ -176,7 +180,7 @@ module Compiler =
             | Negation n ->
                 compileNegation n
             | Arithmetic (a, op, b) ->
-                compileArithmetic a op.Item b
+                compileIntermediate (compileArithmetic a op.Item b)
             | Inversion i ->
                 compileInversion i
             | Comparison (a, op, b) ->

Formula.Parser/Formula.Parser.fsproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.13.0</Version>
+    <Version>1.0.0</Version>
     <Authors>Richard Smith</Authors>
     <Copyright>Richard Smith</Copyright>
     <RepositoryUrl>https://github.com/rsmithsa/formula</RepositoryUrl>

README.md

@@ -30,6 +30,9 @@ A simple extensible formula language for .NET
 
 ## Version History
 
+### 1.0.0
+- Bug fix for large expressions
+
 ### 0.13.0
 - Constant folder supports folding functions with constant arguments
   - Function implementations can declare they are deterministic