Clean up and document declaration block expression case in Fir language

pine-vm · Dec 25, 2023 · c2905b9 · c2905b9
1 parent 7643c7f
commit c2905b9
Show file tree

Hide file tree

Showing 4 changed files with 167 additions and 193 deletions.
diff --git a/implement/elm-time/ElmTime/compile-elm-program/src/ElmCompiler.elm b/implement/elm-time/ElmTime/compile-elm-program/src/ElmCompiler.elm
@@ -20,7 +20,6 @@ import FirCompiler
         , ElmModuleInCompilation
         , EmitStack
         , Expression(..)
-        , LetBlockStruct
         , ModuleImports
         , countListElementsExpression
         , emitExpressionInDeclarationBlock
@@ -775,7 +774,6 @@ compileElmSyntaxExpression stack elmExpression =
 
         Elm.Syntax.Expression.LetExpression letBlock ->
             compileElmSyntaxLetBlock stack letBlock
-                |> Result.map LetBlockExpression
 
         Elm.Syntax.Expression.ParenthesizedExpression parenthesizedExpression ->
             compileElmSyntaxExpression stack (Elm.Syntax.Node.value parenthesizedExpression)
@@ -885,7 +883,7 @@ compileElmSyntaxApplication stack appliedFunctionElmSyntax argumentsElmSyntax =
 compileElmSyntaxLetBlock :
     CompilationStack
     -> Elm.Syntax.Expression.LetBlock
-    -> Result String LetBlockStruct
+    -> Result String Expression
 compileElmSyntaxLetBlock stackBefore letBlock =
     letBlock.declarations
         |> List.concatMap
@@ -937,11 +935,7 @@ compileElmSyntaxLetBlock stackBefore letBlock =
                     Ok letEntries ->
                         compileElmSyntaxExpression stack (Elm.Syntax.Node.value letBlock.expression)
                             |> Result.map
-                                (\expression ->
-                                    { declarations = List.concat letEntries
-                                    , expression = expression
-                                    }
-                                )
+                                (DeclarationBlockExpression (Dict.fromList (List.concat letEntries)))
             )
 
 
@@ -1174,14 +1168,15 @@ compileElmSyntaxCaseBlockCase stackBefore caseBlockValueExpression ( elmPatternN
                                     >> (|>) caseBlockValueExpression
                                 )
                             )
+                        |> Dict.fromList
 
                 stack =
                     { stackBefore
                         | availableDeclarations =
                             stackBefore.availableDeclarations
                                 |> Dict.union
                                     (Dict.map (always DeconstructionDeclaration)
-                                        (Dict.fromList deconstructionDeclarations)
+                                        deconstructionDeclarations
                                     )
                     }
             in
@@ -1196,10 +1191,9 @@ compileElmSyntaxCaseBlockCase stackBefore caseBlockValueExpression ( elmPatternN
                                 expression
 
                             else
-                                LetBlockExpression
-                                    { declarations = deconstructionDeclarations
-                                    , expression = expression
-                                    }
+                                DeclarationBlockExpression
+                                    deconstructionDeclarations
+                                    expression
                         }
                     )
 

diff --git a/implement/elm-time/ElmTime/compile-elm-program/src/ElmInteractive.elm b/implement/elm-time/ElmTime/compile-elm-program/src/ElmInteractive.elm
@@ -634,15 +634,12 @@ transformExpressionWithOptionalReplacement findReplacement expression =
                         mappedFunctionExpression
                         mappedArguments
 
-                LetBlockExpression letBlock ->
-                    LetBlockExpression
-                        { letBlock
-                            | declarations =
-                                letBlock.declarations
-                                    |> List.map (Tuple.mapSecond (transformExpressionWithOptionalReplacement findReplacement))
-                            , expression =
-                                transformExpressionWithOptionalReplacement findReplacement letBlock.expression
-                        }
+                DeclarationBlockExpression declarations innerExpression ->
+                    DeclarationBlockExpression
+                        (declarations
+                            |> Dict.map (always (transformExpressionWithOptionalReplacement findReplacement))
+                        )
+                        (transformExpressionWithOptionalReplacement findReplacement innerExpression)
 
                 StringTagExpression tag tagged ->
                     StringTagExpression tag (transformExpressionWithOptionalReplacement findReplacement tagged)
@@ -1090,8 +1087,8 @@ expressionAsJson expression =
               )
             ]
 
-        LetBlockExpression _ ->
-            [ ( "LetBlock"
+        DeclarationBlockExpression _ _ ->
+            [ ( "DeclarationBlock"
               , []
                     |> Json.Encode.object
               )