[Rust] Refactor union case handling

ncave · Oct 20, 2024 · 37fa7b2 · 37fa7b2
1 parent 8ae48e9
commit 37fa7b2
Show file tree

Hide file tree

Showing 3 changed files with 208 additions and 187 deletions.
diff --git a/src/Fable.Transforms/Dart/Fable2Dart.fs b/src/Fable.Transforms/Dart/Fable2Dart.fs
@@ -1590,7 +1590,7 @@ module Util =
         else
             failwith "Target idents/values lengths differ"
 
-    let getDecisionTargetAndBindValues (com: IDartCompiler) (ctx: Context) targetIndex boundValues =
+    let getDecisionTargetAndBoundValues (com: IDartCompiler) (ctx: Context) targetIndex boundValues =
         let idents, target = getDecisionTarget ctx targetIndex
         let identsAndValues = matchTargetIdentAndValues idents boundValues
 
@@ -1605,9 +1605,9 @@ module Util =
                 )
 
             let target = FableTransforms.replaceValues replacements target
-            List.rev bindings, target
+            target, List.rev bindings
         else
-            identsAndValues, target
+            target, identsAndValues
 
     let transformDecisionTreeSuccess (com: IDartCompiler) (ctx: Context) returnStrategy targetIndex boundValues =
         match returnStrategy with
@@ -1627,8 +1627,8 @@ module Util =
 
             targetAssignment :: assignments, None
         | ret ->
-            let bindings, target =
-                getDecisionTargetAndBindValues com ctx targetIndex boundValues
+            let target, bindings =
+                getDecisionTargetAndBoundValues com ctx targetIndex boundValues
 
             let ctx, bindings =
                 ((ctx, []), bindings)

diff --git a/src/Fable.Transforms/Python/Fable2Python.fs b/src/Fable.Transforms/Python/Fable2Python.fs
@@ -2590,9 +2590,8 @@ module Util =
         else
             failwith "Target idents/values lengths differ"
 
-    let getDecisionTargetAndBindValues (com: IPythonCompiler) (ctx: Context) targetIndex boundValues =
+    let getDecisionTargetAndBoundValues (com: IPythonCompiler) (ctx: Context) targetIndex boundValues =
         let idents, target = getDecisionTarget ctx targetIndex
-
         let identsAndValues = matchTargetIdentAndValues idents boundValues
 
         if not com.Options.DebugMode then
@@ -2606,13 +2605,13 @@ module Util =
                 )
 
             let target = FableTransforms.replaceValues replacements target
-            List.rev bindings, target
+            target, List.rev bindings
         else
-            identsAndValues, target
+            target, identsAndValues
 
     let transformDecisionTreeSuccessAsExpr (com: IPythonCompiler) (ctx: Context) targetIndex boundValues =
-        let bindings, target =
-            getDecisionTargetAndBindValues com ctx targetIndex boundValues
+        let target, bindings =
+            getDecisionTargetAndBoundValues com ctx targetIndex boundValues
 
         match bindings with
         | [] -> com.TransformAsExpr(ctx, target)
@@ -2667,8 +2666,8 @@ module Util =
 
             targetAssignment @ assignments
         | ret ->
-            let bindings, target =
-                getDecisionTargetAndBindValues com ctx targetIndex boundValues
+            let target, bindings =
+                getDecisionTargetAndBoundValues com ctx targetIndex boundValues
 
             let bindings =
                 bindings