fix: use foldr instead of foldl

linsyking · May 9, 2023 · 24016e6 · 24016e6
1 parent 13dca7d
commit 24016e6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/elm.json b/elm.json
@@ -3,7 +3,7 @@
     "name": "linsyking/messenger-core",
     "summary": "Core library for Messenger.",
     "license": "BSD-3-Clause",
-    "version": "3.0.0",
+    "version": "3.0.1",
     "exposed-modules": {
         "Definitions": [
             "Messenger.Recursion",

diff --git a/src/Messenger/RecursionArray.elm b/src/Messenger/RecursionArray.elm
@@ -12,6 +12,7 @@ Array implementation for the recursion algorithm
 -}
 
 import Array exposing (Array)
+import Array.Extra exposing (insertAt)
 import Messenger.Recursion exposing (RecBody)
 
 
@@ -32,7 +33,7 @@ updateObjects rec env msg objs =
 
 updateOnce : RecBody a b c d -> c -> b -> Array a -> ( Array a, ( List ( d, b ), List b ), c )
 updateOnce rec env msg objs =
-    Array.foldl
+    Array.foldr
         (\ele ( lastObjs, ( lastMsgUnfinished, lastMsgFinished ), lastEnv ) ->
             let
                 ( newObjs, newMsg, newEnv ) =
@@ -52,7 +53,7 @@ updateOnce rec env msg objs =
                 unfinishedMsg =
                     List.filter (\( x, _ ) -> not (rec.super x)) newMsg
             in
-            ( Array.push newObjs lastObjs, ( lastMsgUnfinished ++ unfinishedMsg, lastMsgFinished ++ finishedMsg ), newEnv )
+            ( insertAt 0 newObjs lastObjs, ( unfinishedMsg ++ lastMsgUnfinished, finishedMsg ++ lastMsgFinished ), newEnv )
         )
         ( Array.empty, ( [], [] ), env )
         objs
@@ -72,7 +73,7 @@ updateRemain rec env ( unfinishedMsg, finishedMsg ) objs =
     else
         let
             ( newObjs, ( newUnfinishedMsg, newFinishedMsg ), newEnv ) =
-                Array.foldl
+                Array.foldr
                     (\ele ( lastObjs, ( lastMsgUnfinished, lastMsgFinished ), lastEnv ) ->
                         let
                             msgMatched =
@@ -88,14 +89,14 @@ updateRemain rec env ( unfinishedMsg, finishedMsg ) objs =
                         in
                         if List.isEmpty msgMatched then
                             -- No need to update
-                            ( Array.push ele lastObjs, ( lastMsgUnfinished, lastMsgFinished ), lastEnv )
+                            ( insertAt 0 ele lastObjs, ( lastMsgUnfinished, lastMsgFinished ), lastEnv )
 
                         else
                             -- Need update
                             let
                                 -- Update the object with all messages in msgMatched
                                 ( newObj, ( newMsgUnfinished, newMsgFinished ), newEnv2 ) =
-                                    List.foldl
+                                    List.foldr
                                         (\msg ( lastObj2, ( lastMsgUnfinished2, lastMsgFinished2 ), lastEnv2 ) ->
                                             let
                                                 ( newEle, newMsgs, newEnv3 ) =
@@ -115,14 +116,14 @@ updateRemain rec env ( unfinishedMsg, finishedMsg ) objs =
                                                 unfinishedMsgs =
                                                     List.filter (\( x, _ ) -> not (rec.super x)) newMsgs
                                             in
-                                            ( newEle, ( lastMsgUnfinished2 ++ unfinishedMsgs, lastMsgFinished2 ++ finishedMsgs ), newEnv3 )
+                                            ( newEle, ( unfinishedMsgs ++ lastMsgUnfinished2, finishedMsgs ++ lastMsgFinished2 ), newEnv3 )
                                         )
                                         ( ele, ( [], [] ), env )
                                         msgMatched
                             in
-                            ( Array.push newObj lastObjs, ( lastMsgUnfinished ++ newMsgUnfinished, lastMsgFinished ++ newMsgFinished ), newEnv2 )
+                            ( insertAt 0 newObj lastObjs, ( newMsgUnfinished ++ lastMsgUnfinished, newMsgFinished ++ lastMsgFinished ), newEnv2 )
                     )
                     ( Array.empty, ( [], [] ), env )
                     objs
         in
-        updateRemain rec newEnv ( newUnfinishedMsg, finishedMsg ++ newFinishedMsg ) newObjs
+        updateRemain rec newEnv ( newUnfinishedMsg, newFinishedMsg ++ finishedMsg ) newObjs
diff --git a/src/Messenger/RecursionList.elm b/src/Messenger/RecursionList.elm
@@ -31,7 +31,7 @@ updateObjects rec env msg objs =
 
 updateOnce : RecBody a b c d -> c -> b -> List a -> ( List a, ( List ( d, b ), List b ), c )
 updateOnce rec env msg objs =
-    List.foldl
+    List.foldr
         (\ele ( lastObjs, ( lastMsgUnfinished, lastMsgFinished ), lastEnv ) ->
             let
                 ( newObj, newMsg, newEnv ) =
@@ -51,7 +51,7 @@ updateOnce rec env msg objs =
                 unfinishedMsg =
                     List.filter (\( x, _ ) -> not (rec.super x)) newMsg
             in
-            ( lastObjs ++ [ newObj ], ( lastMsgUnfinished ++ unfinishedMsg, lastMsgFinished ++ finishedMsg ), newEnv )
+            ( newObj :: lastObjs, ( unfinishedMsg ++ lastMsgUnfinished, finishedMsg ++ lastMsgFinished ), newEnv )
         )
         ( [], ( [], [] ), env )
         objs
@@ -71,7 +71,7 @@ updateRemain rec env ( unfinishedMsg, finishedMsg ) objs =
     else
         let
             ( newObjs, ( newUnfinishedMsg, newFinishedMsg ), newEnv ) =
-                List.foldl
+                List.foldr
                     (\ele ( lastObjs, ( lastMsgUnfinished, lastMsgFinished ), lastEnv ) ->
                         let
                             msgMatched =
@@ -87,14 +87,14 @@ updateRemain rec env ( unfinishedMsg, finishedMsg ) objs =
                         in
                         if List.isEmpty msgMatched then
                             -- No need to update
-                            ( lastObjs ++ [ ele ], ( lastMsgUnfinished, lastMsgFinished ), lastEnv )
+                            ( ele :: lastObjs, ( lastMsgUnfinished, lastMsgFinished ), lastEnv )
 
                         else
                             -- Need update
                             let
                                 -- Update the object with all messages in msgMatched
                                 ( newObj, ( newMsgUnfinished, newMsgFinished ), newEnv2 ) =
-                                    List.foldl
+                                    List.foldr
                                         (\msg ( lastObj2, ( lastMsgUnfinished2, lastMsgFinished2 ), lastEnv2 ) ->
                                             let
                                                 ( newEle, newMsgs, newEnv3 ) =
@@ -114,14 +114,14 @@ updateRemain rec env ( unfinishedMsg, finishedMsg ) objs =
                                                 unfinishedMsgs =
                                                     List.filter (\( x, _ ) -> not (rec.super x)) newMsgs
                                             in
-                                            ( newEle, ( lastMsgUnfinished2 ++ unfinishedMsgs, lastMsgFinished2 ++ finishedMsgs ), newEnv3 )
+                                            ( newEle, ( unfinishedMsgs ++ lastMsgUnfinished2, finishedMsgs ++ lastMsgFinished2 ), newEnv3 )
                                         )
                                         ( ele, ( [], [] ), env )
                                         msgMatched
                             in
-                            ( lastObjs ++ [ newObj ], ( lastMsgUnfinished ++ newMsgUnfinished, lastMsgFinished ++ newMsgFinished ), newEnv2 )
+                            ( newObj :: lastObjs, ( newMsgUnfinished ++ lastMsgUnfinished, newMsgFinished ++ lastMsgFinished ), newEnv2 )
                     )
                     ( [], ( [], [] ), env )
                     objs
         in
-        updateRemain rec newEnv ( newUnfinishedMsg, finishedMsg ++ newFinishedMsg ) newObjs
+        updateRemain rec newEnv ( newUnfinishedMsg, newFinishedMsg ++ finishedMsg ) newObjs