Fix associativity fix. #136 (#137)

finos · Sep 1, 2020 · e891495 · e891495
1 parent 109efb5
commit e891495
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/Morphir/Elm/Frontend.elm b/src/Morphir/Elm/Frontend.elm
@@ -1631,6 +1631,7 @@ fixAssociativity expr =
         Expression.OperatorApplication o d (Node lr l) (Node _ (Expression.OperatorApplication ro rd (Node rlr rl) (Node rrr rr))) ->
             if (o == ro) && d == Infix.Left then
                 Expression.OperatorApplication o d (Node (Range.combine [ lr, rlr ]) (Expression.OperatorApplication ro rd (Node lr l) (Node rlr rl))) (Node rrr rr)
+                    |> fixAssociativity
 
             else
                 expr

diff --git a/tests/Morphir/Elm/FrontendTests.elm b/tests/Morphir/Elm/FrontendTests.elm
@@ -267,6 +267,9 @@ valueTests =
                     , "d : Int"
                     , "d = 4"
                     , ""
+                    , "e : Int"
+                    , "e = 4"
+                    , ""
                     , "f : Int"
                     , "f = 5"
                     , ""
@@ -357,6 +360,9 @@ valueTests =
         , checkIR "case a of\n  1 -> foo\n  _ -> bar" <| PatternMatch () (ref "a") [ ( LiteralPattern () (IntLiteral 1), ref "foo" ), ( WildcardPattern (), ref "bar" ) ]
         , checkIR "a <| b" <| Apply () (ref "a") (ref "b")
         , checkIR "a |> b" <| Apply () (ref "b") (ref "a")
+        , checkIR "a |> b |> c" <| Apply () (ref "c") (Apply () (ref "b") (ref "a"))
+        , checkIR "a |> b |> c |> d" <| Apply () (ref "d") (Apply () (ref "c") (Apply () (ref "b") (ref "a")))
+        , checkIR "a |> b |> c |> d |> e" <| Apply () (ref "e") (Apply () (ref "d") (Apply () (ref "c") (Apply () (ref "b") (ref "a"))))
         , checkIR "a || b" <| binary SDKBasics.or (ref "a") (ref "b")
         , checkIR "a && b" <| binary SDKBasics.and (ref "a") (ref "b")
         , checkIR "a == b" <| binary SDKBasics.equal (ref "a") (ref "b")